From 9e8f33d6059fd499ed2a70dcdee4e5f3ca2ba279 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 11:30:17 -0500 Subject: [PATCH 001/135] Cleaner roammon and treemon data --- constants/pokemon_data_constants.asm | 33 +++++------- constants/script_constants.asm | 76 ++++++++++++++++------------ data/wild/roammon_maps.asm | 40 +++++++-------- data/wild/treemon_maps.asm | 6 +-- data/wild/treemons.asm | 4 +- 5 files changed, 80 insertions(+), 79 deletions(-) diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index cc9e4407b..c95b27d6c 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -188,12 +188,23 @@ MONMENU_MENUOPTION EQU 1 NUM_MONMENU_ITEMS EQU 8 +; wild data + +NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size +NUM_WATERMON EQU 3 ; data/wild/*_water.asm table size + +GRASS_WILDDATA_LENGTH EQU (NUM_GRASSMON * 2 + 1) * 3 + 2 +WATER_WILDDATA_LENGTH EQU (NUM_WATERMON * 2 + 1) * 1 + 2 + +NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm) + + ; treemon sets ; TreeMons indexes (see data/wild/treemons.asm) const_def const TREEMON_SET_CITY const TREEMON_SET_CANYON - const TREEMON_SET_AZALEA + const TREEMON_SET_TOWN const TREEMON_SET_ROUTE const TREEMON_SET_KANTO const TREEMON_SET_LAKE @@ -208,26 +219,6 @@ NUM_TREEMON_SETS EQU const_value const TREEMON_SCORE_RARE ; 2 -; wild data - -NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size -NUM_WATERMON EQU 3 ; data/wild/*_water.asm table size - -GRASS_WILDDATA_LENGTH EQU (NUM_GRASSMON * 2 + 1) * 3 + 2 -WATER_WILDDATA_LENGTH EQU (NUM_WATERMON * 2 + 1) * 1 + 2 - -NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm) - - -; swarms - -SWARM_DUNSPARCE EQU 0 -SWARM_YANMA EQU 1 - -FISHSWARM_QWILFISH EQU 1 -FISHSWARM_REMORAID EQU 2 - - ; significant happiness values BASE_HAPPINESS EQU 70 FRIEND_BALL_HAPPINESS EQU 200 diff --git a/constants/script_constants.asm b/constants/script_constants.asm index fd5affce6..952837065 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -115,6 +115,40 @@ NUM_PLAYER_EVENTS EQU const_value const OBJECTTYPE_6 +; command queue members +CMDQUEUE_TYPE EQU 0 +CMDQUEUE_ADDR EQU 1 +CMDQUEUE_03 EQU 3 +CMDQUEUE_04 EQU 4 +CMDQUEUE_05 EQU 5 +CMDQUEUE_ENTRY_SIZE EQU 6 +CMDQUEUE_CAPACITY EQU 4 + +; command queue types +CMDQUEUE_STONETABLE EQU 2 + + +; elevfloor macro values +; ElevatorFloorNames indexes (see data/elevator_floors.asm) + const_def + const FLOOR_B4F + const FLOOR_B3F + const FLOOR_B2F + const FLOOR_B1F + const FLOOR_1F + const FLOOR_2F + const FLOOR_3F + const FLOOR_4F + const FLOOR_5F + const FLOOR_6F + const FLOOR_7F + const FLOOR_8F + const FLOOR_9F + const FLOOR_10F + const FLOOR_11F + const FLOOR_ROOF + + ; showemote arguments ; Emotes indexes (see data/sprites/emotes.asm) const_def @@ -132,7 +166,6 @@ NUM_PLAYER_EVENTS EQU const_value const EMOTE_GRASS_RUSTLE ; 11 EMOTE_MEM EQU -1 - ; fruittree arguments ; FruitTreeItems indexes (see data/items/fruit_trees.asm) const_value set 1 @@ -168,7 +201,6 @@ const_value set 1 const FRUITTREE_FUCHSIA_CITY ; 1e NUM_FRUIT_TREES EQU const_value +- 1 - ; describedecoration arguments ; DescribeDecoration.JumpTable indexes (see engine/decorations.asm) const_def @@ -178,40 +210,18 @@ NUM_FRUIT_TREES EQU const_value +- 1 const DECODESC_BIG_DOLL ; 3 const DECODESC_CONSOLE ; 4 - -; elevfloor macro values -; ElevatorFloorNames indexes (see data/elevator_floors.asm) +; swarm arguments +; StoreSwarmMapIndices arguments const_def - const FLOOR_B4F - const FLOOR_B3F - const FLOOR_B2F - const FLOOR_B1F - const FLOOR_1F - const FLOOR_2F - const FLOOR_3F - const FLOOR_4F - const FLOOR_5F - const FLOOR_6F - const FLOOR_7F - const FLOOR_8F - const FLOOR_9F - const FLOOR_10F - const FLOOR_11F - const FLOOR_ROOF + const SWARM_DUNSPARCE ; 0 + const SWARM_YANMA ; 1 -; command queue members -CMDQUEUE_TYPE EQU 0 -CMDQUEUE_ADDR EQU 1 -CMDQUEUE_03 EQU 3 -CMDQUEUE_04 EQU 4 -CMDQUEUE_05 EQU 5 -CMDQUEUE_ENTRY_SIZE EQU 6 -CMDQUEUE_CAPACITY EQU 4 - -; command queue types -CMDQUEUE_STONETABLE EQU 2 - +; Special_ActivateFishingSwarm writebyte arguments + const_def + const FISHSWARM_NONE ; 0 + const FISHSWARM_QWILFISH ; 1 + const FISHSWARM_REMORAID ; 2 ; SpecialGameboyCheck return values const_def diff --git a/data/wild/roammon_maps.asm b/data/wild/roammon_maps.asm index 07bb7a9d9..c94ebfce0 100644 --- a/data/wild/roammon_maps.asm +++ b/data/wild/roammon_maps.asm @@ -2,11 +2,10 @@ ; Notably missing are Route 40 and Route 41, which are water routes. roam_map: MACRO -; map, # of other maps, other maps map \1 - db \2 -rept \2 - map \3 + db _NARG - 1 +rept _NARG +- 1 + map \2 shift endr db 0 @@ -14,21 +13,22 @@ ENDM RoamMaps: ; 2a40f ; there are NUM_ROAMMON_MAPS entries - roam_map ROUTE_29, 2, ROUTE_30, ROUTE_46 - roam_map ROUTE_30, 2, ROUTE_29, ROUTE_31 - roam_map ROUTE_31, 3, ROUTE_30, ROUTE_32, ROUTE_36 - roam_map ROUTE_32, 3, ROUTE_36, ROUTE_31, ROUTE_33 - roam_map ROUTE_33, 2, ROUTE_32, ROUTE_34 - roam_map ROUTE_34, 2, ROUTE_33, ROUTE_35 - roam_map ROUTE_35, 2, ROUTE_34, ROUTE_36 - roam_map ROUTE_36, 4, ROUTE_35, ROUTE_31, ROUTE_32, ROUTE_37 - roam_map ROUTE_37, 3, ROUTE_36, ROUTE_38, ROUTE_42 - roam_map ROUTE_38, 3, ROUTE_37, ROUTE_39, ROUTE_42 - roam_map ROUTE_39, 1, ROUTE_38 - roam_map ROUTE_42, 4, ROUTE_43, ROUTE_44, ROUTE_37, ROUTE_38 - roam_map ROUTE_43, 2, ROUTE_42, ROUTE_44 - roam_map ROUTE_44, 3, ROUTE_42, ROUTE_43, ROUTE_45 - roam_map ROUTE_45, 2, ROUTE_44, ROUTE_46 - roam_map ROUTE_46, 2, ROUTE_45, ROUTE_29 + ; start map, ...other maps + roam_map ROUTE_29, ROUTE_30, ROUTE_46 + roam_map ROUTE_30, ROUTE_29, ROUTE_31 + roam_map ROUTE_31, ROUTE_30, ROUTE_32, ROUTE_36 + roam_map ROUTE_32, ROUTE_36, ROUTE_31, ROUTE_33 + roam_map ROUTE_33, ROUTE_32, ROUTE_34 + roam_map ROUTE_34, ROUTE_33, ROUTE_35 + roam_map ROUTE_35, ROUTE_34, ROUTE_36 + roam_map ROUTE_36, ROUTE_35, ROUTE_31, ROUTE_32, ROUTE_37 + roam_map ROUTE_37, ROUTE_36, ROUTE_38, ROUTE_42 + roam_map ROUTE_38, ROUTE_37, ROUTE_39, ROUTE_42 + roam_map ROUTE_39, ROUTE_38 + roam_map ROUTE_42, ROUTE_43, ROUTE_44, ROUTE_37, ROUTE_38 + roam_map ROUTE_43, ROUTE_42, ROUTE_44 + roam_map ROUTE_44, ROUTE_42, ROUTE_43, ROUTE_45 + roam_map ROUTE_45, ROUTE_44, ROUTE_46 + roam_map ROUTE_46, ROUTE_45, ROUTE_29 db -1 ; end ; 2a4a0 diff --git a/data/wild/treemon_maps.asm b/data/wild/treemon_maps.asm index 7860110ca..4e30a51a5 100644 --- a/data/wild/treemon_maps.asm +++ b/data/wild/treemon_maps.asm @@ -11,7 +11,7 @@ TreeMonMaps: ; b825e treemon_map ROUTE_30, TREEMON_SET_ROUTE treemon_map ROUTE_31, TREEMON_SET_ROUTE treemon_map ROUTE_32, TREEMON_SET_KANTO - treemon_map ROUTE_33, TREEMON_SET_AZALEA + treemon_map ROUTE_33, TREEMON_SET_TOWN treemon_map ROUTE_34, TREEMON_SET_ROUTE treemon_map ROUTE_35, TREEMON_SET_ROUTE treemon_map ROUTE_36, TREEMON_SET_ROUTE @@ -20,7 +20,7 @@ TreeMonMaps: ; b825e treemon_map ROUTE_39, TREEMON_SET_ROUTE treemon_map ROUTE_40, TREEMON_SET_CITY treemon_map ROUTE_41, TREEMON_SET_CITY - treemon_map ROUTE_42, TREEMON_SET_AZALEA + treemon_map ROUTE_42, TREEMON_SET_TOWN treemon_map ROUTE_43, TREEMON_SET_LAKE treemon_map ROUTE_44, TREEMON_SET_CANYON treemon_map ROUTE_45, TREEMON_SET_CANYON @@ -28,7 +28,7 @@ TreeMonMaps: ; b825e treemon_map NEW_BARK_TOWN, TREEMON_SET_CITY treemon_map CHERRYGROVE_CITY, TREEMON_SET_CITY treemon_map VIOLET_CITY, TREEMON_SET_CITY - treemon_map AZALEA_TOWN, TREEMON_SET_AZALEA + treemon_map AZALEA_TOWN, TREEMON_SET_TOWN treemon_map CIANWOOD_CITY, TREEMON_SET_CITY treemon_map GOLDENROD_CITY, TREEMON_SET_CITY treemon_map OLIVINE_CITY, TREEMON_SET_CITY diff --git a/data/wild/treemons.asm b/data/wild/treemons.asm index 21cef29ec..5a29d675c 100644 --- a/data/wild/treemons.asm +++ b/data/wild/treemons.asm @@ -2,7 +2,7 @@ TreeMons: ; b82e8 ; entries correspond to TREEMON_SET_* constants dw TreeMonSet_City dw TreeMonSet_Canyon - dw TreeMonSet_Azalea + dw TreeMonSet_Town dw TreeMonSet_Route dw TreeMonSet_Kanto dw TreeMonSet_Lake @@ -33,7 +33,7 @@ TreeMonSet_Canyon: ; b82fa db 5, AIPOM, 10 db -1 -TreeMonSet_Azalea: ; b8320 +TreeMonSet_Town: ; b8320 ; common db 50, SPEAROW, 10 db 15, EKANS, 10 From 2e0a9ea081e6978ec723933c1fb4d5dc52a46296 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 11:36:39 -0500 Subject: [PATCH 002/135] Rearrange Makefile by content --- Makefile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 89d7af7a7..0e0f9ca4f 100644 --- a/Makefile +++ b/Makefile @@ -9,12 +9,7 @@ RGBFIX := rgbfix RGBGFX := rgbgfx RGBLINK := rgblink -.SUFFIXES: -.PHONY: all clean tools compare crystal crystal11 -.SECONDEXPANSION: -.PRECIOUS: -.SECONDARY: - +roms := pokecrystal.gbc pokecrystal11.gbc crystal_obj := \ audio.o \ @@ -35,7 +30,13 @@ lib/mobile/main.o crystal11_obj := $(crystal_obj:.o=11.o) -roms := pokecrystal.gbc pokecrystal11.gbc +### Build targets + +.SUFFIXES: +.PHONY: all crystal crystal11 clean compare tools +.SECONDEXPANSION: +.PRECIOUS: +.SECONDARY: all: crystal crystal: pokecrystal.gbc @@ -222,6 +223,8 @@ gfx/mobile/pichu_animated.2bpp: tools/gfx += --trim-whitespace gfx/unknown/unknown_egg.2bpp: rgbgfx += -h +### Catch-all graphics rules + %.bin: ; %.blk: ; From 6ecf18aa52b79131fbf0cce85c41d3cae617100a Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 12:03:18 -0500 Subject: [PATCH 003/135] Engine flag bit constants for wPokegearFlags --- Makefile | 10 +-- constants/wram_constants.asm | 113 +++++++++++++++++---------------- data/engine_flags.asm | 42 ++++++------- engine/pokegear.asm | 30 ++++----- engine/start_menu.asm | 117 +++++++++++++++++++++-------------- 5 files changed, 171 insertions(+), 141 deletions(-) diff --git a/Makefile b/Makefile index 0e0f9ca4f..d29f69a5d 100644 --- a/Makefile +++ b/Makefile @@ -76,16 +76,16 @@ $(foreach obj, $(crystal_obj), $(eval $(call DEP,$(obj),$(obj:.o=.asm)))) endif -pokecrystal11.gbc: $(crystal11_obj) pokecrystal.link - $(RGBLINK) -n pokecrystal11.sym -m pokecrystal11.map -l pokecrystal.link -o $@ $(crystal11_obj) - $(RGBFIX) -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@ - tools/sort_symfile.sh pokecrystal11.sym - pokecrystal.gbc: $(crystal_obj) pokecrystal.link $(RGBLINK) -n pokecrystal.sym -m pokecrystal.map -l pokecrystal.link -o $@ $(crystal_obj) $(RGBFIX) -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ tools/sort_symfile.sh pokecrystal.sym +pokecrystal11.gbc: $(crystal11_obj) pokecrystal.link + $(RGBLINK) -n pokecrystal11.sym -m pokecrystal11.map -l pokecrystal.link -o $@ $(crystal11_obj) + $(RGBFIX) -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@ + tools/sort_symfile.sh pokecrystal11.sym + # For files that the compressor can't match, there will be a .lz file suffixed with the md5 hash of the correct uncompressed file. # If the hash of the uncompressed file matches, use this .lz instead. diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 6faa87be4..d21f0095c 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -1,3 +1,13 @@ +; InputType: ; c2c7 +AUTO_INPUT EQU $ff + +; wCurrentDexMode: ; c7d4 + const_def + const DEXMODE_NEW + const DEXMODE_OLD + const DEXMODE_ABC + const DEXMODE_UNOWN + ; MonType: ; cf5f const_def const PARTYMON ; 0 @@ -6,14 +16,14 @@ const TEMPMON ; 3 const WILDMON ; 4 -; Options: (bits) ; cfcc +; Options: ; cfcc + const_value set 4 const NO_TEXT_SCROLL ; 4 const STEREO ; 5 const BATTLE_SHIFT ; 6 const BATTLE_SCENE ; 7 -; Options: (bits 0-2) TEXT_DELAY_FAST EQU 1 TEXT_DELAY_MED EQU 3 TEXT_DELAY_SLOW EQU 5 @@ -30,22 +40,22 @@ TEXT_DELAY_SLOW EQU 5 const FRAME_8 ; 7 NUM_FRAMES EQU const_value -; TextBoxFlags: +; TextBoxFlags: ; cfcf const_def const FAST_TEXT_DELAY_F ; 0 const NO_TEXT_DELAY_F ; 1 -; Options2: - const_def - const MENU_ACCOUNT ; 0 - -; GBPrinter: +; GBPrinter: ; cfd0 GBPRINTER_LIGHTEST EQU $00 GBPRINTER_LIGHTER EQU $20 GBPRINTER_NORMAL EQU $40 GBPRINTER_DARKER EQU $60 GBPRINTER_DARKEST EQU $7f +; Options2: ; cfd1 + const_def + const MENU_ACCOUNT ; 0 + ; WalkingDirection: ; d043 const_value set -1 const STANDING ; -1 @@ -62,10 +72,23 @@ RIGHT_MASK EQU 1 << RIGHT ; FacingDirection: ; d044 FACE_CURRENT EQU 0 -FACE_DOWN EQU 8 -FACE_UP EQU 4 -FACE_LEFT EQU 2 -FACE_RIGHT EQU 1 +FACE_DOWN EQU 8 +FACE_UP EQU 4 +FACE_LEFT EQU 2 +FACE_RIGHT EQU 1 + +; wPokemonWithdrawDepositParameter: ; d10b +PC_WITHDRAW EQU 0 +PC_DEPOSIT EQU 1 +DAY_CARE_WITHDRAW EQU 2 +DAY_CARE_DEPOSIT EQU 3 + +; wInitListType: ; d263 +INIT_ENEMYOT_LIST EQU 1 +INIT_BAG_ITEM_LIST EQU 2 +INIT_OTHER_ITEM_LIST EQU 3 +INIT_PLAYEROT_LIST EQU 4 +INIT_MON_LIST EQU 5 ; TimeOfDay: ; d269 const_def @@ -91,6 +114,10 @@ SCRIPT_READ EQU 1 SCRIPT_WAIT_MOVEMENT EQU 2 SCRIPT_WAIT EQU 3 +; wSpawnAfterChampion: ; d4b5 +SPAWN_LANCE EQU 1 +SPAWN_RED EQU 2 + ; CurDay: ; d4cb const_def const SUNDAY ; 0 @@ -102,43 +129,10 @@ SCRIPT_WAIT EQU 3 const SATURDAY ; 6 ; MapObjects: ; d71e - PLAYER_OBJECT EQU 0 - NUM_OBJECTS EQU $10 -; InputType: ; c2c7 -AUTO_INPUT EQU $ff - -; WhichRegisteredItem: ; d95b -REGISTERED_POCKET EQU %11000000 -REGISTERED_NUMBER EQU %00111111 - -; PlayerState: ; d95d -PLAYER_NORMAL EQU 0 -PLAYER_BIKE EQU 1 -PLAYER_SKATE EQU 2 -PLAYER_SURF EQU 4 -PLAYER_SURF_PIKA EQU 8 - -; After-Champion Spawn -SPAWN_LANCE EQU 1 -SPAWN_RED EQU 2 - -; wPokemonWithdrawDepositParameter -PC_WITHDRAW EQU 0 -PC_DEPOSIT EQU 1 -DAY_CARE_WITHDRAW EQU 2 -DAY_CARE_DEPOSIT EQU 3 - -; wCurrentDexMode - const_def - const DEXMODE_NEW - const DEXMODE_OLD - const DEXMODE_ABC - const DEXMODE_UNOWN - -; wJohtoBadges: +; wJohtoBadges: ; d857 const_def const ZEPHYRBADGE const HIVEBADGE @@ -150,7 +144,7 @@ DAY_CARE_DEPOSIT EQU 3 const RISINGBADGE NUM_JOHTO_BADGES EQU const_value -; wKantoBadges: +; wKantoBadges: ; d858 const_def const BOULDERBADGE const CASCADEBADGE @@ -163,9 +157,22 @@ NUM_JOHTO_BADGES EQU const_value NUM_KANTO_BADGES EQU const_value NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES -; wInitListType: -INIT_ENEMYOT_LIST EQU 1 -INIT_BAG_ITEM_LIST EQU 2 -INIT_OTHER_ITEM_LIST EQU 3 -INIT_PLAYEROT_LIST EQU 4 -INIT_MON_LIST EQU 5 +; wPokegearFlags: ; d957 + const_def + const POKEGEAR_MAP_CARD_F ; 0 + const POKEGEAR_RADIO_CARD_F ; 1 + const POKEGEAR_PHONE_CARD_F ; 2 + const POKEGEAR_EXPN_CARD_F ; 3 + +POKEGEAR_OBTAINED_F EQU 7 + +; WhichRegisteredItem: ; d95b +REGISTERED_POCKET EQU %11000000 +REGISTERED_NUMBER EQU %00111111 + +; PlayerState: ; d95d +PLAYER_NORMAL EQU 0 +PLAYER_BIKE EQU 1 +PLAYER_SKATE EQU 2 +PLAYER_SURF EQU 4 +PLAYER_SURF_PIKA EQU 8 diff --git a/data/engine_flags.asm b/data/engine_flags.asm index 9c2dda5a6..42f30813a 100644 --- a/data/engine_flags.asm +++ b/data/engine_flags.asm @@ -7,11 +7,11 @@ EngineFlags: ; 80462 ; (all locations are in WRAM bank 1) ; pokegear - engine_flag wPokegearFlags, 1 ; radio card ; $0 - engine_flag wPokegearFlags, 0 ; map card - engine_flag wPokegearFlags, 2 ; phone card - engine_flag wPokegearFlags, 3 ; expn card - engine_flag wPokegearFlags, 7 ; on/off + engine_flag wPokegearFlags, POKEGEAR_RADIO_CARD_F ; $0 + 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 ; wDayCareMan, 7 ; day-care 1 on engine_flag wDayCareMan, 6 ; egg is ready @@ -44,23 +44,23 @@ EngineFlags: ; 80462 engine_flag wBikeFlags, 1 ; always on bike (cant surf) engine_flag wBikeFlags, 2 ; downhill (cycling road) - engine_flag wJohtoBadges, 0 ; zephyrbadge - engine_flag wJohtoBadges, 1 ; hivebadge - engine_flag wJohtoBadges, 2 ; plainbadge - engine_flag wJohtoBadges, 3 ; fogbadge - engine_flag wJohtoBadges, 4 ; mineralbadge - engine_flag wJohtoBadges, 5 ; stormbadge ; $20 - engine_flag wJohtoBadges, 6 ; glacierbadge - engine_flag wJohtoBadges, 7 ; risingbadge + engine_flag wJohtoBadges, ZEPHYRBADGE + engine_flag wJohtoBadges, HIVEBADGE + engine_flag wJohtoBadges, PLAINBADGE + engine_flag wJohtoBadges, FOGBADGE + engine_flag wJohtoBadges, MINERALBADGE + engine_flag wJohtoBadges, STORMBADGE ; $20 + engine_flag wJohtoBadges, GLACIERBADGE + engine_flag wJohtoBadges, RISINGBADGE - engine_flag wKantoBadges, 0 ; boulderbadge - engine_flag wKantoBadges, 1 ; cascadebadge - engine_flag wKantoBadges, 2 ; thunderbadge - engine_flag wKantoBadges, 3 ; rainbowbadge - engine_flag wKantoBadges, 4 ; soulbadge - engine_flag wKantoBadges, 5 ; marshbadge ; $28 - engine_flag wKantoBadges, 6 ; volcanobadge - engine_flag wKantoBadges, 7 ; earthbadge + engine_flag wKantoBadges, BOULDERBADGE + engine_flag wKantoBadges, CASCADEBADGE + engine_flag wKantoBadges, THUNDERBADGE + engine_flag wKantoBadges, RAINBOWBADGE + engine_flag wKantoBadges, SOULBADGE + engine_flag wKantoBadges, MARSHBADGE ; $28 + engine_flag wKantoBadges, VOLCANOBADGE + engine_flag wKantoBadges, EARTHBADGE ; unown sets engine_flag wUnlockedUnowns, 0 ; 1 diff --git a/engine/pokegear.asm b/engine/pokegear.asm index f65f394be..cfb8857fa 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -411,13 +411,13 @@ Pokegear_FinishTilemap: ; 90eb0 (24:4eb0) call ByteFill ld de, wPokegearFlags ld a, [de] - bit 0, a ; ENGINE_MAP_CARD + bit POKEGEAR_MAP_CARD_F, a call nz, .PlaceMapIcon ld a, [de] - bit 2, a ; ENGINE_PHONE_CARD + bit POKEGEAR_PHONE_CARD_F, a call nz, .PlacePhoneIcon ld a, [de] - bit 1, a ; ENGINE_RADIO_CARD + bit POKEGEAR_RADIO_CARD_F, a call nz, .PlaceRadioIcon hlcoord 0, 0 ld a, $46 @@ -496,7 +496,7 @@ PokegearClock_Joypad: ; 90f3e (24:4f3e) and D_RIGHT ret z ld a, [wPokegearFlags] - bit 0, a ; ENGINE_MAP_CARD + bit POKEGEAR_MAP_CARD_F, a jr z, .no_map_card ld c, POKEGEARSTATE_MAPCHECKREGION ld b, POKEGEARCARD_MAP @@ -504,7 +504,7 @@ PokegearClock_Joypad: ; 90f3e (24:4f3e) .no_map_card ld a, [wPokegearFlags] - bit 2, a ; ENGINE_PHONE_CARD + bit POKEGEAR_PHONE_CARD_F, a jr z, .no_phone_card ld c, POKEGEARSTATE_PHONEINIT ld b, POKEGEARCARD_PHONE @@ -512,7 +512,7 @@ PokegearClock_Joypad: ; 90f3e (24:4f3e) .no_phone_card ld a, [wPokegearFlags] - bit 1, a ; ENGINE_RADIO_CARD + bit POKEGEAR_RADIO_CARD_F, a ret z ld c, POKEGEARSTATE_RADIOINIT ld b, POKEGEARCARD_RADIO @@ -613,7 +613,7 @@ PokegearMap_ContinueMap: ; 90ff2 (24:4ff2) .right ld a, [wPokegearFlags] - bit 2, a ; ENGINE_PHONE_CARD + bit POKEGEAR_PHONE_CARD_F, a jr z, .no_phone ld c, POKEGEARSTATE_PHONEINIT ld b, POKEGEARCARD_PHONE @@ -621,7 +621,7 @@ PokegearMap_ContinueMap: ; 90ff2 (24:4ff2) .no_phone ld a, [wPokegearFlags] - bit 1, a ; ENGINE_RADIO_CARD + bit POKEGEAR_RADIO_CARD_F, a ret z ld c, POKEGEARSTATE_RADIOINIT ld b, POKEGEARCARD_RADIO @@ -810,7 +810,7 @@ PokegearRadio_Joypad: ; 91112 (24:5112) .left ld a, [wPokegearFlags] - bit 2, a ; ENGINE_PHONE_CARD + bit POKEGEAR_PHONE_CARD_F, a jr z, .no_phone ld c, POKEGEARSTATE_PHONEINIT ld b, POKEGEARCARD_PHONE @@ -818,7 +818,7 @@ PokegearRadio_Joypad: ; 91112 (24:5112) .no_phone ld a, [wPokegearFlags] - bit 0, a ; ENGINE_MAP_CARD + bit POKEGEAR_MAP_CARD_F, a jr z, .no_map ld c, POKEGEARSTATE_MAPCHECKREGION ld b, POKEGEARCARD_MAP @@ -869,7 +869,7 @@ PokegearPhone_Joypad: ; 91171 (24:5171) .left ld a, [wPokegearFlags] - bit 0, a ; ENGINE_MAP_CARD + bit POKEGEAR_MAP_CARD_F, a jr z, .no_map ld c, POKEGEARSTATE_MAPCHECKREGION ld b, POKEGEARCARD_MAP @@ -882,7 +882,7 @@ PokegearPhone_Joypad: ; 91171 (24:5171) .right ld a, [wPokegearFlags] - bit 1, a ; ENGINE_RADIO_CARD + bit POKEGEAR_RADIO_CARD_F, a ret z ld c, POKEGEARSTATE_RADIOINIT ld b, POKEGEARCARD_RADIO @@ -1590,7 +1590,7 @@ RadioChannels: call .InJohto jr c, .NoSignal ld a, [wPokegearFlags] - bit 3, a ; ENGINE_EXPN_CARD + bit POKEGEAR_EXPN_CARD_F, a jr z, .NoSignal jp LoadStation_PlacesAndPeople @@ -1598,7 +1598,7 @@ RadioChannels: call .InJohto jr c, .NoSignal ld a, [wPokegearFlags] - bit 3, a ; ENGINE_EXPN_CARD + bit POKEGEAR_EXPN_CARD_F, a jr z, .NoSignal jp LoadStation_LetsAllSing @@ -1606,7 +1606,7 @@ RadioChannels: call .InJohto jr c, .NoSignal ld a, [wPokegearFlags] - bit 3, a ; ENGINE_EXPN_CARD + bit POKEGEAR_EXPN_CARD_F, a jr z, .NoSignal jp LoadStation_PokeFluteRadio diff --git a/engine/start_menu.asm b/engine/start_menu.asm index c0c4a38a3..20ab75ff4 100755 --- a/engine/start_menu.asm +++ b/engine/start_menu.asm @@ -1,3 +1,16 @@ +; StartMenu.Items indexes + const_def + const STARTMENUITEM_POKEDEX ; 0 + const STARTMENUITEM_POKEMON ; 1 + const STARTMENUITEM_PACK ; 2 + const STARTMENUITEM_STATUS ; 3 + const STARTMENUITEM_SAVE ; 4 + const STARTMENUITEM_OPTION ; 5 + const STARTMENUITEM_EXIT ; 6 + const STARTMENUITEM_POKEGEAR ; 7 + const STARTMENUITEM_QUIT ; 8 + + StartMenu:: ; 125cd call ClearWindowData @@ -171,6 +184,7 @@ StartMenu:: ; 125cd dw .Items .Items: +; entries correspond to STARTMENUITEM_* constants dw StartMenu_Pokedex, .PokedexString, .PokedexDesc dw StartMenu_Pokemon, .PartyString, .PartyDesc dw StartMenu_Pack, .PackString, .PackDesc @@ -181,41 +195,50 @@ StartMenu:: ; 125cd dw StartMenu_Pokegear, .PokegearString, .PokegearDesc dw StartMenu_Quit, .QuitString, .QuitDesc -.PokedexString: db "#DEX@" -.PartyString: db "#MON@" -.PackString: db "PACK@" -.StatusString: db "@" -.SaveString: db "SAVE@" -.OptionString: db "OPTION@" -.ExitString: db "EXIT@" -.PokegearString: db "GEAR@" -.QuitString: db "QUIT@" +.PokedexString: db "#DEX@" +.PartyString: db "#MON@" +.PackString: db "PACK@" +.StatusString: db "@" +.SaveString: db "SAVE@" +.OptionString: db "OPTION@" +.ExitString: db "EXIT@" +.PokegearString: db "GEAR@" +.QuitString: db "QUIT@" -.PokedexDesc: db "#MON" +.PokedexDesc: + db "#MON" next "database@" -.PartyDesc: db "Party " +.PartyDesc: + db "Party " next "status@" -.PackDesc: db "Contains" +.PackDesc: + db "Contains" next "items@" -.PokegearDesc: db "Trainer's" +.PokegearDesc: + db "Trainer's" next "key device@" -.StatusDesc: db "Your own" +.StatusDesc: + db "Your own" next "status@" -.SaveDesc: db "Save your" +.SaveDesc: + db "Save your" next "progress@" -.OptionDesc: db "Change" +.OptionDesc: + db "Change" next "settings@" -.ExitDesc: db "Close this" +.ExitDesc: + db "Close this" next "menu@" -.QuitDesc: db "Quit and" +.QuitDesc: + db "Quit and" next "be judged.@" @@ -285,14 +308,14 @@ endr ld hl, wStatusFlags bit 0, [hl] jr z, .no_pokedex - ld a, 0 ; pokedex + ld a, STARTMENUITEM_POKEDEX call .AppendMenuList .no_pokedex ld a, [PartyCount] and a jr z, .no_pokemon - ld a, 1 ; pokemon + ld a, STARTMENUITEM_POKEMON call .AppendMenuList .no_pokemon @@ -302,14 +325,14 @@ endr ld hl, wStatusFlags2 bit 2, [hl] ; bug catching contest jr nz, .no_pack - ld a, 2 ; pack + ld a, STARTMENUITEM_PACK call .AppendMenuList .no_pack ld hl, wPokegearFlags - bit 7, [hl] + bit POKEGEAR_OBTAINED_F, [hl] jr z, .no_pokegear - ld a, 7 ; pokegear + ld a, STARTMENUITEM_POKEGEAR call .AppendMenuList .no_pokegear @@ -321,16 +344,16 @@ endr jr nz, .no_save ld hl, wStatusFlags2 bit 2, [hl] ; bug catching contest - ld a, 8 ; quit + ld a, STARTMENUITEM_QUIT jr nz, .write - ld a, 4 ; save + ld a, STARTMENUITEM_SAVE .write call .AppendMenuList .no_save - ld a, 5 ; option + ld a, STARTMENUITEM_OPTION call .AppendMenuList - ld a, 6 ; exit + ld a, STARTMENUITEM_EXIT call .AppendMenuList ld a, c ld [MenuItemsList], a @@ -383,7 +406,7 @@ endr .IsMenuAccountOn: ; 128cb ld a, [Options2] - and 1 + and 1 << MENU_ACCOUNT ret ; 128d1 @@ -706,26 +729,26 @@ PokemonActionSubmenu: ; 12a88 ret .Actions: - dbw MONMENU_CUT, MonMenu_Cut ; Cut - dbw MONMENU_FLY, MonMenu_Fly ; Fly - dbw MONMENU_SURF, MonMenu_Surf ; Surf - dbw MONMENU_STRENGTH, MonMenu_Strength ; Strength - dbw MONMENU_FLASH, MonMenu_Flash ; Flash - dbw MONMENU_WHIRLPOOL, MonMenu_Whirlpool ; Whirlpool - dbw MONMENU_DIG, MonMenu_Dig ; Dig - dbw MONMENU_TELEPORT, MonMenu_Teleport ; Teleport - dbw MONMENU_SOFTBOILED, MonMenu_Softboiled_MilkDrink ; Softboiled - dbw MONMENU_MILKDRINK, MonMenu_Softboiled_MilkDrink ; MilkDrink - dbw MONMENU_HEADBUTT, MonMenu_Headbutt ; Headbutt - dbw MONMENU_WATERFALL, MonMenu_Waterfall ; Waterfall - dbw MONMENU_ROCKSMASH, MonMenu_RockSmash ; RockSmash - dbw MONMENU_SWEETSCENT, MonMenu_SweetScent ; SweetScent + dbw MONMENU_CUT, MonMenu_Cut + dbw MONMENU_FLY, MonMenu_Fly + dbw MONMENU_SURF, MonMenu_Surf + dbw MONMENU_STRENGTH, MonMenu_Strength + dbw MONMENU_FLASH, MonMenu_Flash + dbw MONMENU_WHIRLPOOL, MonMenu_Whirlpool + dbw MONMENU_DIG, MonMenu_Dig + dbw MONMENU_TELEPORT, MonMenu_Teleport + dbw MONMENU_SOFTBOILED, MonMenu_Softboiled_MilkDrink + dbw MONMENU_MILKDRINK, MonMenu_Softboiled_MilkDrink + dbw MONMENU_HEADBUTT, MonMenu_Headbutt + dbw MONMENU_WATERFALL, MonMenu_Waterfall + dbw MONMENU_ROCKSMASH, MonMenu_RockSmash + dbw MONMENU_SWEETSCENT, MonMenu_SweetScent dbw MONMENU_STATS, OpenPartyStats dbw MONMENU_SWITCH, SwitchPartyMons dbw MONMENU_ITEM, GiveTakePartyMonItem dbw MONMENU_CANCEL, CancelPokemonAction - dbw MONMENU_MOVE, ManagePokemonMoves ; move - dbw MONMENU_MAIL, MonMailAction ; mail + dbw MONMENU_MOVE, ManagePokemonMoves + dbw MONMENU_MAIL, MonMailAction ; 12aec @@ -749,7 +772,7 @@ SwitchPartyMons: ; 12aec farcall PrintPartyMenuText hlcoord 0, 1 - ld bc, 20 * 2 + ld bc, SCREEN_WIDTH * 2 ld a, [wSwitchMon] dec a call AddNTimes @@ -1038,7 +1061,7 @@ GetPartyItemLocation: ; 12cd7 ReceiveItemFromPokemon: ; 12cdf - ld a, $1 + ld a, 1 ld [wItemQuantityChangeBuffer], a ld hl, NumItems jp ReceiveItem @@ -1046,7 +1069,7 @@ ReceiveItemFromPokemon: ; 12cdf GiveItemToPokemon: ; 12cea (4:6cea) - ld a, $1 + ld a, 1 ld [wItemQuantityChangeBuffer], a ld hl, NumItems jp TossItem From 7cef012335f0bb335833a3ea36fd02dfa31cfbea Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 13:00:35 -0500 Subject: [PATCH 004/135] wUnlockedUnowns engine flag constants Use local labels for "End"ings --- constants/engine_flags.asm | 16 +- constants/map_data_constants.asm | 2 +- data/decorations/mystery_gift_decos.asm | 2 +- data/engine_flags.asm | 194 +++++++++--------- data/items/buena_prizes.asm | 2 +- data/items/marts.asm | 2 +- data/items/mom_phone.asm | 4 +- data/items/mystery_gift_items.asm | 2 +- data/maps/flypoints.asm | 48 ++--- data/radio/oaks_pkmn_talk_routes.asm | 2 +- data/radio/pnp_hidden_places.asm | 2 +- data/sprites/facings.asm | 4 +- data/trainers/gendered_trainers.asm | 4 +- data/wild/unlocked_unowns.asm | 20 ++ engine/battle/core.asm | 24 +-- .../events/battle_tower/get_trainer_class.asm | 4 +- engine/events/buena.asm | 2 +- engine/events/mom_phone.asm | 4 +- engine/intro_menu.asm | 4 +- engine/mart.asm | 2 +- engine/mystery_gift.asm | 4 +- engine/mystery_gift_2.asm | 4 +- engine/radio.asm | 4 +- engine/scripting.asm | 4 +- lib/mobile/main.asm | 28 +-- maps/RuinsOfAlphAerodactylChamber.asm | 2 +- maps/RuinsOfAlphHoOhChamber.asm | 2 +- maps/RuinsOfAlphKabutoChamber.asm | 2 +- maps/RuinsOfAlphOmanyteChamber.asm | 2 +- mobile/fixed_words.asm | 4 +- mobile/mobile_46.asm | 2 - 31 files changed, 199 insertions(+), 203 deletions(-) create mode 100644 data/wild/unlocked_unowns.asm diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index ad8632db0..d4e0a37fc 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -54,14 +54,14 @@ const ENGINE_VOLCANOBADGE const ENGINE_EARTHBADGE ; wUnlockedUnowns - const ENGINE_UNLOCKED_UNOWNS_1 - const ENGINE_UNLOCKED_UNOWNS_2 - const ENGINE_UNLOCKED_UNOWNS_3 - const ENGINE_UNLOCKED_UNOWNS_4 - const ENGINE_UNLOCKED_UNOWNS_5 - const ENGINE_UNLOCKED_UNOWNS_6 ; 30 - const ENGINE_UNLOCKED_UNOWNS_7 - const ENGINE_UNLOCKED_UNOWNS_8 + const ENGINE_UNLOCKED_UNOWNS_A_TO_K + const ENGINE_UNLOCKED_UNOWNS_L_TO_R + const ENGINE_UNLOCKED_UNOWNS_S_TO_W + const ENGINE_UNLOCKED_UNOWNS_X_TO_Z + const ENGINE_UNLOCKED_UNOWNS_UNUSED_5 + const ENGINE_UNLOCKED_UNOWNS_UNUSED_6 ; 30 + const ENGINE_UNLOCKED_UNOWNS_UNUSED_7 + const ENGINE_UNLOCKED_UNOWNS_UNUSED_8 ; wVisitedSpawns const ENGINE_FLYPOINT_KRISS_HOUSE const ENGINE_FLYPOINT_VIRIDIAN_POKECENTER diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 7bb9dbd70..d35966b28 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -97,7 +97,7 @@ const_value = -1 const SPAWN_OLIVINE const SPAWN_ECRUTEAK const SPAWN_MAHOGANY - const SPAWN_LAKE + const SPAWN_LAKE_OF_RAGE const SPAWN_BLACKTHORN const SPAWN_MT_SILVER const SPAWN_FAST_SHIP diff --git a/data/decorations/mystery_gift_decos.asm b/data/decorations/mystery_gift_decos.asm index bdd4694c6..94a5935de 100644 --- a/data/decorations/mystery_gift_decos.asm +++ b/data/decorations/mystery_gift_decos.asm @@ -36,5 +36,5 @@ MysteryGiftDecos: ; 2c74a db DECOFLAG_PIKACHU_BED db DECOFLAG_GRIMER_DOLL db DECOFLAG_UNOWN_DOLL -MysteryGiftDecosEnd +.End ; 2c76f diff --git a/data/engine_flags.asm b/data/engine_flags.asm index 42f30813a..119697466 100644 --- a/data/engine_flags.asm +++ b/data/engine_flags.asm @@ -1,10 +1,11 @@ engine_flag: MACRO - dwb \1, 1 << \2 +; location, bit +; (all locations are in WRAM bank 1) + dwb \1 + (\2 / 8), 1 << (\2 % 8) ENDM EngineFlags: ; 80462 - ; location, bit - ; (all locations are in WRAM bank 1) +; entries correspond to ENGINE_* constants ; pokegear engine_flag wPokegearFlags, POKEGEAR_RADIO_CARD_F ; $0 @@ -31,7 +32,7 @@ EngineFlags: ; 80462 engine_flag wStatusFlags, 3 ; pokerus engine_flag wStatusFlags, 4 ; rocket signal on ch20 engine_flag wStatusFlags, 6 ; credits skip - engine_flag wStatusFlags, 7 ; bug contest on ; $10 + engine_flag wStatusFlags, 7 ; bug contest on ; $10 engine_flag wStatusFlags2, 2 ; bug contest timer engine_flag wStatusFlags2, 1 ; safari zone? engine_flag wStatusFlags2, 0 ; rockets in radio tower @@ -40,7 +41,7 @@ EngineFlags: ; 80462 engine_flag wStatusFlags2, 6 ; berry -> berry juice when trading? engine_flag wStatusFlags2, 7 ; rockets in mahogany - engine_flag wBikeFlags, 0 ; strength active ; $18 + engine_flag wBikeFlags, 0 ; strength active ; $18 engine_flag wBikeFlags, 1 ; always on bike (cant surf) engine_flag wBikeFlags, 2 ; downhill (cycling road) @@ -63,50 +64,48 @@ EngineFlags: ; 80462 engine_flag wKantoBadges, EARTHBADGE ; unown sets - engine_flag wUnlockedUnowns, 0 ; 1 - engine_flag wUnlockedUnowns, 1 ; 2 - engine_flag wUnlockedUnowns, 2 ; 3 - engine_flag wUnlockedUnowns, 3 ; 4 - engine_flag wUnlockedUnowns, 4 ; 5 - engine_flag wUnlockedUnowns, 5 ; 6 ; $30 - engine_flag wUnlockedUnowns, 6 ; 7 - engine_flag wUnlockedUnowns, 7 ; 8 + 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 5 + engine_flag wUnlockedUnowns, 5 ; unused 6 ; $30 + engine_flag wUnlockedUnowns, 6 ; unused 7 + engine_flag wUnlockedUnowns, 7 ; unused 8 ; fly - engine_flag wVisitedSpawns, 0 ; your house - engine_flag wVisitedSpawns, 1 ; viridian pokecenter - engine_flag wVisitedSpawns, 2 ; pallet - engine_flag wVisitedSpawns, 3 ; viridian - engine_flag wVisitedSpawns, 4 ; pewter - engine_flag wVisitedSpawns, 5 ; cerulean ; $38 - engine_flag wVisitedSpawns, 6 ; rock tunnel - engine_flag wVisitedSpawns, 7 ; vermilion - engine_flag wVisitedSpawns + 1, 0 ; lavender - engine_flag wVisitedSpawns + 1, 1 ; saffron - engine_flag wVisitedSpawns + 1, 2 ; celadon - engine_flag wVisitedSpawns + 1, 3 ; fuchsia - engine_flag wVisitedSpawns + 1, 4 ; cinnabar - engine_flag wVisitedSpawns + 1, 5 ; indigo plateau ; $40 - engine_flag wVisitedSpawns + 1, 6 ; new bark - engine_flag wVisitedSpawns + 1, 7 ; cherrygrove - engine_flag wVisitedSpawns + 2, 0 ; violet - ; union cave - engine_flag wVisitedSpawns + 2, 2 ; azalea - engine_flag wVisitedSpawns + 2, 3 ; cianwood - engine_flag wVisitedSpawns + 2, 4 ; goldenrod - engine_flag wVisitedSpawns + 2, 5 ; olivine - engine_flag wVisitedSpawns + 2, 6 ; ecruteak ; $48 - engine_flag wVisitedSpawns + 2, 7 ; mahogany - engine_flag wVisitedSpawns + 3, 0 ; lake of rage - engine_flag wVisitedSpawns + 3, 1 ; blackthorn - engine_flag wVisitedSpawns + 3, 2 ; silver cave - ; fast ship - engine_flag wVisitedSpawns + 3, 4 ; unused + 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 ; $38 + 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 ; $40 + 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 ; $48 + 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, 0 ; lucky number show engine_flag wStatusFlags2, 3 ; ???? - engine_flag wDailyFlags, 0 ; kurt making balls ; $50 + engine_flag wDailyFlags, 0 ; kurt making balls ; $50 engine_flag wDailyFlags, 1 ; ???? engine_flag wDailyFlags, 2 ; special wilddata? engine_flag wDailyFlags, 3 ; time capsule (24h wait) @@ -115,7 +114,7 @@ EngineFlags: ; 80462 engine_flag wDailyFlags, 6 ; goldenrod underground merchant closed engine_flag wDailyFlags, 7 ; fought in trainer hall today - engine_flag wWeeklyFlags, 0 ; mt moon square clefairy ; $58 + engine_flag wWeeklyFlags, 0 ; mt moon square clefairy ; $58 engine_flag wWeeklyFlags, 1 ; union cave lapras engine_flag wWeeklyFlags, 2 ; goldenrod underground haircut used engine_flag wWeeklyFlags, 3 ; goldenrod mall happiness event floor05 object07 @@ -134,73 +133,70 @@ EngineFlags: ; 80462 engine_flag wCelebiEvent, 2 ; have gs ball after kurt examined it ; rematches - engine_flag wDailyRematchFlags, 0 ; jack - engine_flag wDailyRematchFlags, 1 ; huey - engine_flag wDailyRematchFlags, 2 ; gaven - engine_flag wDailyRematchFlags, 3 ; beth ; $68 - engine_flag wDailyRematchFlags, 4 ; jose - engine_flag wDailyRematchFlags, 5 ; reena - engine_flag wDailyRematchFlags, 6 ; joey - engine_flag wDailyRematchFlags, 7 ; wade - engine_flag wDailyRematchFlags + 1, 0 ; ralph - engine_flag wDailyRematchFlags + 1, 1 ; liz - engine_flag wDailyRematchFlags + 1, 2 ; anthony - engine_flag wDailyRematchFlags + 1, 3 ; todd ; $70 - engine_flag wDailyRematchFlags + 1, 4 ; gina - engine_flag wDailyRematchFlags + 1, 5 ; arnie - engine_flag wDailyRematchFlags + 1, 6 ; alan - engine_flag wDailyRematchFlags + 1, 7 ; dana - engine_flag wDailyRematchFlags + 2, 0 ; chad - engine_flag wDailyRematchFlags + 2, 1 ; tully - engine_flag wDailyRematchFlags + 2, 2 ; brent - engine_flag wDailyRematchFlags + 2, 3 ; tiffany ; $78 - engine_flag wDailyRematchFlags + 2, 4 ; vance - engine_flag wDailyRematchFlags + 2, 5 ; wilton - engine_flag wDailyRematchFlags + 2, 6 ; parry - engine_flag wDailyRematchFlags + 2, 7 ; erin + engine_flag wDailyRematchFlags, 0 ; jack + engine_flag wDailyRematchFlags, 1 ; huey + engine_flag wDailyRematchFlags, 2 ; gaven + engine_flag wDailyRematchFlags, 3 ; beth ; $68 + engine_flag wDailyRematchFlags, 4 ; jose + engine_flag wDailyRematchFlags, 5 ; reena + engine_flag wDailyRematchFlags, 6 ; joey + engine_flag wDailyRematchFlags, 7 ; wade + engine_flag wDailyRematchFlags, 8 ; ralph + engine_flag wDailyRematchFlags, 9 ; liz + engine_flag wDailyRematchFlags, 10 ; anthony + engine_flag wDailyRematchFlags, 11 ; todd ; $70 + engine_flag wDailyRematchFlags, 12 ; gina + engine_flag wDailyRematchFlags, 13 ; arnie + engine_flag wDailyRematchFlags, 14 ; alan + engine_flag wDailyRematchFlags, 15 ; dana + engine_flag wDailyRematchFlags, 16 ; chad + engine_flag wDailyRematchFlags, 17 ; tully + engine_flag wDailyRematchFlags, 18 ; brent + engine_flag wDailyRematchFlags, 19 ; tiffany ; $78 + engine_flag wDailyRematchFlags, 20 ; vance + engine_flag wDailyRematchFlags, 21 ; wilton + engine_flag wDailyRematchFlags, 22 ; parry + engine_flag wDailyRematchFlags, 23 ; erin engine_flag wDailyPhoneItemFlags, 0 ; beverly has nugget engine_flag wDailyPhoneItemFlags, 1 ; jose has star piece engine_flag wDailyPhoneItemFlags, 2 ; wade has item (see EVENT_WADE_HAS_*** in constants/event_flags.asm) - engine_flag wDailyPhoneItemFlags, 3 ; gina has leaf stone ; $80 + engine_flag wDailyPhoneItemFlags, 3 ; gina has leaf stone ; $80 engine_flag wDailyPhoneItemFlags, 4 ; alan has fire stone engine_flag wDailyPhoneItemFlags, 5 ; liz has thunderstone engine_flag wDailyPhoneItemFlags, 6 ; derek has nugget engine_flag wDailyPhoneItemFlags, 7 ; tully has water stone + engine_flag wDailyPhoneItemFlags, 8 ; tiffany has pink bow + engine_flag wDailyPhoneItemFlags, 9 ; wilton has item (see EVENT_WILTON_HAS_*** in constants/event_flags.asm) - engine_flag wDailyPhoneItemFlags + 1, 0 ; tiffany has pink bow - engine_flag wDailyPhoneItemFlags + 1, 1 ; wilton has item (see EVENT_WILTON_HAS_*** in constants/event_flags.asm) - - engine_flag wDailyPhoneTimeOfDayFlags, 0 - engine_flag wDailyPhoneTimeOfDayFlags, 1 ; $88 - engine_flag wDailyPhoneTimeOfDayFlags, 2 - engine_flag wDailyPhoneTimeOfDayFlags, 3 - engine_flag wDailyPhoneTimeOfDayFlags, 4 - engine_flag wDailyPhoneTimeOfDayFlags, 5 - engine_flag wDailyPhoneTimeOfDayFlags, 6 - engine_flag wDailyPhoneTimeOfDayFlags, 7 - - engine_flag wDailyPhoneTimeOfDayFlags + 1, 0 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 1 ; $90 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 2 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 3 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 4 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 5 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 6 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 7 - - engine_flag wDailyPhoneTimeOfDayFlags + 2, 0 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 1 ; $98 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 2 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 3 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 4 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 5 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 6 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 7 + engine_flag wDailyPhoneTimeOfDayFlags, 0 ; jack + engine_flag wDailyPhoneTimeOfDayFlags, 1 ; huey ; $88 + engine_flag wDailyPhoneTimeOfDayFlags, 2 ; gaven + engine_flag wDailyPhoneTimeOfDayFlags, 3 ; beth + engine_flag wDailyPhoneTimeOfDayFlags, 4 ; jose + engine_flag wDailyPhoneTimeOfDayFlags, 5 ; reena + engine_flag wDailyPhoneTimeOfDayFlags, 6 ; joey + engine_flag wDailyPhoneTimeOfDayFlags, 7 ; wade + engine_flag wDailyPhoneTimeOfDayFlags, 8 ; ralph + engine_flag wDailyPhoneTimeOfDayFlags, 9 ; liz ; $90 + engine_flag wDailyPhoneTimeOfDayFlags, 10 ; anthony + engine_flag wDailyPhoneTimeOfDayFlags, 11 ; todd + engine_flag wDailyPhoneTimeOfDayFlags, 12 ; gina + engine_flag wDailyPhoneTimeOfDayFlags, 13 ; arnie + engine_flag wDailyPhoneTimeOfDayFlags, 14 ; alan + engine_flag wDailyPhoneTimeOfDayFlags, 15 ; dana + engine_flag wDailyPhoneTimeOfDayFlags, 16 ; chad + engine_flag wDailyPhoneTimeOfDayFlags, 17 ; tully ; $98 + engine_flag wDailyPhoneTimeOfDayFlags, 18 ; brent + engine_flag wDailyPhoneTimeOfDayFlags, 19 ; tiffany + engine_flag wDailyPhoneTimeOfDayFlags, 20 ; vance + engine_flag wDailyPhoneTimeOfDayFlags, 21 ; wilton + engine_flag wDailyPhoneTimeOfDayFlags, 22 ; parry + engine_flag wDailyPhoneTimeOfDayFlags, 23 ; erin engine_flag wPlayerSpriteSetupFlags, 2 ; female player has been transformed into male - engine_flag wSwarmFlags, 2 ; dunsparce swarm ; $a0 + engine_flag wSwarmFlags, 2 ; dunsparce swarm ; $a0 engine_flag wSwarmFlags, 3 ; yanma swarm ; 80648 diff --git a/data/items/buena_prizes.asm b/data/items/buena_prizes.asm index d0a0e6b88..baac8a56d 100644 --- a/data/items/buena_prizes.asm +++ b/data/items/buena_prizes.asm @@ -9,5 +9,5 @@ BuenaPrizeItems: ; 8b15e db CARBOS, 5 db CALCIUM, 5 db HP_UP, 5 -BuenaPrizeItemsEnd: +.End ; 8b170 diff --git a/data/items/marts.asm b/data/items/marts.asm index fd156225d..a9fad3e69 100644 --- a/data/items/marts.asm +++ b/data/items/marts.asm @@ -34,7 +34,7 @@ Marts: ; 160a9 dw MartMtMoon dw MartIndigoPlateau dw MartUnderground -MartsEnd +.End ; 160ed diff --git a/data/items/mom_phone.asm b/data/items/mom_phone.asm index 288a14acc..5a5087c0e 100644 --- a/data/items/mom_phone.asm +++ b/data/items/mom_phone.asm @@ -11,7 +11,7 @@ MomItems_1: ; fd136 momitem 0, 180, MOM_ITEM, POKE_BALL momitem 0, 450, MOM_ITEM, ESCAPE_ROPE momitem 0, 500, MOM_ITEM, GREAT_BALL -MomItems_1End: ; fd15e +.End ; fd15e MomItems_2: ; fd15e momitem 900, 600, MOM_ITEM, SUPER_POTION @@ -24,4 +24,4 @@ MomItems_2: ; fd15e momitem 40000, 900, MOM_ITEM, HYPER_POTION momitem 50000, 8000, MOM_DOLL, DECO_PIKACHU_DOLL momitem 100000, 22800, MOM_DOLL, DECO_BIG_SNORLAX_DOLL -MomItems_2End: ; fd1ae +.End ; fd1ae diff --git a/data/items/mystery_gift_items.asm b/data/items/mystery_gift_items.asm index b2379071e..7f7125ef7 100644 --- a/data/items/mystery_gift_items.asm +++ b/data/items/mystery_gift_items.asm @@ -36,5 +36,5 @@ MysteryGiftItems: ; 2c725 db RARE_CANDY db BLUESKY_MAIL db MIRAGE_MAIL -MysteryGiftItemsEnd: +.End ; 2c74a diff --git a/data/maps/flypoints.asm b/data/maps/flypoints.asm index b41db0ea1..c24cd8d89 100644 --- a/data/maps/flypoints.asm +++ b/data/maps/flypoints.asm @@ -7,32 +7,32 @@ Flypoints: ; 91c5e ; landmark, spawn point const_def ; Johto - flypoint NEW_BARK, NEW_BARK_TOWN - flypoint CHERRYGROVE, CHERRYGROVE_CITY - flypoint VIOLET, VIOLET_CITY - flypoint AZALEA, AZALEA_TOWN - flypoint GOLDENROD, GOLDENROD_CITY - flypoint ECRUTEAK, ECRUTEAK_CITY - flypoint OLIVINE, OLIVINE_CITY - flypoint CIANWOOD, CIANWOOD_CITY - flypoint MAHOGANY, MAHOGANY_TOWN - flypoint LAKE, LAKE_OF_RAGE - flypoint BLACKTHORN, BLACKTHORN_CITY - flypoint MT_SILVER, SILVER_CAVE + flypoint NEW_BARK, NEW_BARK_TOWN + flypoint CHERRYGROVE, CHERRYGROVE_CITY + flypoint VIOLET, VIOLET_CITY + flypoint AZALEA, AZALEA_TOWN + flypoint GOLDENROD, GOLDENROD_CITY + flypoint ECRUTEAK, ECRUTEAK_CITY + flypoint OLIVINE, OLIVINE_CITY + flypoint CIANWOOD, CIANWOOD_CITY + flypoint MAHOGANY, MAHOGANY_TOWN + flypoint LAKE_OF_RAGE, LAKE_OF_RAGE + flypoint BLACKTHORN, BLACKTHORN_CITY + flypoint MT_SILVER, SILVER_CAVE ; Kanto KANTO_FLYPOINT EQU const_value - flypoint PALLET, PALLET_TOWN - flypoint VIRIDIAN, VIRIDIAN_CITY - flypoint PEWTER, PEWTER_CITY - flypoint CERULEAN, CERULEAN_CITY - flypoint VERMILION, VERMILION_CITY - flypoint ROCK_TUNNEL, ROCK_TUNNEL - flypoint LAVENDER, LAVENDER_TOWN - flypoint CELADON, CELADON_CITY - flypoint SAFFRON, SAFFRON_CITY - flypoint FUCHSIA, FUCHSIA_CITY - flypoint CINNABAR, CINNABAR_ISLAND - flypoint INDIGO, INDIGO_PLATEAU + flypoint PALLET, PALLET_TOWN + flypoint VIRIDIAN, VIRIDIAN_CITY + flypoint PEWTER, PEWTER_CITY + flypoint CERULEAN, CERULEAN_CITY + flypoint VERMILION, VERMILION_CITY + flypoint ROCK_TUNNEL, ROCK_TUNNEL + flypoint LAVENDER, LAVENDER_TOWN + flypoint CELADON, CELADON_CITY + flypoint SAFFRON, SAFFRON_CITY + flypoint FUCHSIA, FUCHSIA_CITY + flypoint CINNABAR, CINNABAR_ISLAND + flypoint INDIGO, INDIGO_PLATEAU db -1 ; 91c8f diff --git a/data/radio/oaks_pkmn_talk_routes.asm b/data/radio/oaks_pkmn_talk_routes.asm index ad7b6529d..419c4ec79 100644 --- a/data/radio/oaks_pkmn_talk_routes.asm +++ b/data/radio/oaks_pkmn_talk_routes.asm @@ -16,4 +16,4 @@ OaksPkmnTalkRoutes: map ROUTE_45 map ROUTE_36 map ROUTE_31 -OaksPkmnTalkRoutesEnd +.End diff --git a/data/radio/pnp_hidden_places.asm b/data/radio/pnp_hidden_places.asm index 4cf1987d3..3314976f5 100644 --- a/data/radio/pnp_hidden_places.asm +++ b/data/radio/pnp_hidden_places.asm @@ -10,4 +10,4 @@ PnP_HiddenPlaces: map ROUTE_16 map ROUTE_14 map CINNABAR_POKECENTER_2F_BETA -PnP_HiddenPlacesEnd +.End diff --git a/data/sprites/facings.asm b/data/sprites/facings.asm index 4d2a55364..166455707 100644 --- a/data/sprites/facings.asm +++ b/data/sprites/facings.asm @@ -32,10 +32,10 @@ Facings: ; 4049 dw FacingBoulderDust2 dw FacingGrass1 dw FacingGrass2 -FacingsEnd: +.End dw 0 -NUM_FACINGS EQU (FacingsEnd - Facings) / 2 +NUM_FACINGS EQU (Facings.End - Facings) / 2 ; Tables used as a reference to transform OAM data. diff --git a/data/trainers/gendered_trainers.asm b/data/trainers/gendered_trainers.asm index 758e3f0a4..90df4c5f8 100644 --- a/data/trainers/gendered_trainers.asm +++ b/data/trainers/gendered_trainers.asm @@ -26,7 +26,7 @@ MaleTrainers: ; 4e95d db SAGE db BIKER db SCIENTIST -MaleTrainersEnd +.End FemaleTrainers: ; 4e976 db MEDIUM @@ -39,4 +39,4 @@ FemaleTrainers: ; 4e976 db KIMONO_GIRL db POKEFANF db COOLTRAINERF -FemaleTrainersEnd +.End diff --git a/data/wild/unlocked_unowns.asm b/data/wild/unlocked_unowns.asm new file mode 100644 index 000000000..71b639036 --- /dev/null +++ b/data/wild/unlocked_unowns.asm @@ -0,0 +1,20 @@ +UnlockedUnownLetterSets: +; entries correspond to wUnlockedUnowns bits + dw .Set1 ; ENGINE_UNLOCKED_UNOWNS_A_TO_K + dw .Set2 ; ENGINE_UNLOCKED_UNOWNS_L_TO_R + dw .Set3 ; ENGINE_UNLOCKED_UNOWNS_S_TO_W + dw .Set4 ; ENGINE_UNLOCKED_UNOWNS_X_TO_Z +.End + +.Set1: + ; A B C D E F G H I J K + db 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, -1 +.Set2: + ; L M N O P Q R + db 12, 13, 14, 15, 16, 17, 18, -1 +.Set3: + ; S T U V W + db 19, 20, 21, 22, 23, -1 +.Set4: + ; X Y Z + db 24, 25, 26, -1 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 1a58b3df5..cc15e0c3a 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6642,7 +6642,7 @@ CheckUnownLetter: ; 3eb75 jr nc, .next ; Is our letter in the set? - ld hl, .LetterSets + ld hl, UnlockedUnownLetterSets add hl, de ld a, [hli] ld h, [hl] @@ -6663,7 +6663,7 @@ CheckUnownLetter: ; 3eb75 inc e inc e ld a, e - cp .Set1 - .LetterSets + cp UnlockedUnownLetterSets.End - UnlockedUnownLetterSets jr c, .loop ; Hasn't been unlocked, or the letter is invalid @@ -6675,26 +6675,8 @@ CheckUnownLetter: ; 3eb75 and a ret -.LetterSets: - dw .Set1 - dw .Set2 - dw .Set3 - dw .Set4 +INCLUDE "data/wild/unlocked_unowns.asm" -.Set1: - ; A B C D E F G H I J K - db 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, $ff -.Set2: - ; L M N O P Q R - db 12, 13, 14, 15, 16, 17, 18, $ff -.Set3: - ; S T U V W - db 19, 20, 21, 22, 23, $ff -.Set4: - ; X Y Z - db 24, 25, 26, $ff - -; 3ebc7 Unreferenced_SwapBattlerLevels: ; 3ebc7 push bc diff --git a/engine/events/battle_tower/get_trainer_class.asm b/engine/events/battle_tower/get_trainer_class.asm index 37fe91c56..570104a2a 100644 --- a/engine/events/battle_tower/get_trainer_class.asm +++ b/engine/events/battle_tower/get_trainer_class.asm @@ -15,7 +15,7 @@ GetMobileOTTrainerClass: ; mobile function .male_trainer_loop srl c ld a, c - cp MaleTrainersEnd - MaleTrainers - 1 + cp MaleTrainers.End - MaleTrainers - 1 jr nc, .male_trainer_loop inc c @@ -33,7 +33,7 @@ GetMobileOTTrainerClass: ; mobile function .female_trainer_loop srl c ld a, c - cp FemaleTrainersEnd - FemaleTrainers - 1 + cp FemaleTrainers.End - FemaleTrainers - 1 jr nc, .female_trainer_loop inc c diff --git a/engine/events/buena.asm b/engine/events/buena.asm index d5a80ef2e..96290a882 100644 --- a/engine/events/buena.asm +++ b/engine/events/buena.asm @@ -288,7 +288,7 @@ Buena_PrizeMenu: ; 8b0e2 dba .prizepoints ; 8b129 -NUM_BUENA_PRIZES EQU 9 ; ((BuenaPrizeItemsEnd - BuenaPrizeItems) / 2) +NUM_BUENA_PRIZES EQU 9 ; ((BuenaPrizeItems.End - BuenaPrizeItems) / 2) .indices ; 8b129 db NUM_BUENA_PRIZES diff --git a/engine/events/mom_phone.asm b/engine/events/mom_phone.asm index d12bf0155..acc0540db 100755 --- a/engine/events/mom_phone.asm +++ b/engine/events/mom_phone.asm @@ -1,5 +1,5 @@ -NUM_MOM_ITEMS_1 EQUS "((MomItems_1End - MomItems_1) / 8)" -NUM_MOM_ITEMS_2 EQUS "((MomItems_2End - MomItems_2) / 8)" +NUM_MOM_ITEMS_1 EQUS "((MomItems_1.End - MomItems_1) / 8)" +NUM_MOM_ITEMS_2 EQUS "((MomItems_2.End - MomItems_2) / 8)" const_value = 1 const MOM_ITEM diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index a26ac1f81..c9270358b 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -902,7 +902,7 @@ ShrinkPlayer: ; 610f Intro_RotatePalettesLeftFrontpic: ; 616a ld hl, IntroFadePalettes - ld b, IntroFadePalettesEnd - IntroFadePalettes + ld b, IntroFadePalettes.End - IntroFadePalettes .loop ld a, [hli] call DmgToCgbBGPals @@ -920,7 +920,7 @@ IntroFadePalettes: ; 0x617c db %11111000 db %11110100 db %11100100 -IntroFadePalettesEnd +.End ; 6182 Intro_WipeInFrontpic: ; 6182 diff --git a/engine/mart.asm b/engine/mart.asm index d4c0b623b..b427037c1 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -121,7 +121,7 @@ LoadMartPointer: ; 15b10 GetMart: ; 15b31 ld a, e - cp (MartsEnd - Marts) / 2 + cp (Marts.End - Marts) / 2 jr c, .IsAMart ld b, BANK(DefaultMart) ld de, DefaultMart diff --git a/engine/mystery_gift.asm b/engine/mystery_gift.asm index fccdcfcbc..0fb73a56c 100755 --- a/engine/mystery_gift.asm +++ b/engine/mystery_gift.asm @@ -1279,7 +1279,7 @@ InitMysteryGiftLayout: ; 105153 (41:5153) ld hl, MysteryGiftGFX ld de, vTiles2 tile $00 ld a, BANK(MysteryGiftGFX) - ld bc, MysteryGiftGFXEnd - MysteryGiftGFX + ld bc, MysteryGiftGFX.End - MysteryGiftGFX call FarCopyBytes hlcoord 0, 0 ld a, $42 @@ -1412,7 +1412,7 @@ InitMysteryGiftLayout: ; 105153 (41:5153) MysteryGiftGFX: ; 105258 INCBIN "gfx/mystery_gift/mystery_gift.2bpp" -MysteryGiftGFXEnd: +.End Function105688: ; 105688 (41:5688) call ClearTileMap diff --git a/engine/mystery_gift_2.asm b/engine/mystery_gift_2.asm index 72767aa17..786b5b35f 100755 --- a/engine/mystery_gift_2.asm +++ b/engine/mystery_gift_2.asm @@ -123,7 +123,7 @@ PrepMysteryGiftDataToSend: ; 2c642 (b:4642) MysteryGiftGetItemHeldEffect: ; 2c708 (b:4708) ld a, c - cp MysteryGiftItemsEnd - MysteryGiftItems + cp MysteryGiftItems.End - MysteryGiftItems jr nc, MysteryGiftFallbackItem ld hl, MysteryGiftItems ld b, 0 @@ -133,7 +133,7 @@ MysteryGiftGetItemHeldEffect: ; 2c708 (b:4708) MysteryGiftGetDecoration: ; 2c715 (b:4715) ld a, c - cp MysteryGiftDecosEnd - MysteryGiftDecos + cp MysteryGiftDecos.End - MysteryGiftDecos jr nc, MysteryGiftFallbackItem ld hl, MysteryGiftDecos ld b, 0 diff --git a/engine/radio.asm b/engine/radio.asm index df0d81679..67485dc03 100644 --- a/engine/radio.asm +++ b/engine/radio.asm @@ -205,7 +205,7 @@ OaksPkmnTalk4: .sample call Random and %11111 - cp (OaksPkmnTalkRoutesEnd - OaksPkmnTalkRoutes) / 2 + cp (OaksPkmnTalkRoutes.End - OaksPkmnTalkRoutes) / 2 jr nc, .sample ; We now have a number between 0 and 14. ld hl, OaksPkmnTalkRoutes @@ -1330,7 +1330,7 @@ PnP_odd: PeoplePlaces6: ; Places call Random - cp (PnP_HiddenPlacesEnd - PnP_HiddenPlaces) / 2 + cp (PnP_HiddenPlaces.End - PnP_HiddenPlaces) / 2 jr nc, PeoplePlaces6 ld hl, PnP_HiddenPlaces ld c, a diff --git a/engine/scripting.asm b/engine/scripting.asm index 84590f3c0..c847ed96d 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1294,7 +1294,7 @@ Script_earthquake: ld hl, EarthquakeMovement ld de, wEarthquakeMovementDataBuffer - ld bc, EarthquakeMovementEnd - EarthquakeMovement + ld bc, EarthquakeMovement.End - EarthquakeMovement call CopyBytes call GetScriptByte ld [wEarthquakeMovementDataBuffer + 1], a @@ -1312,7 +1312,7 @@ EarthquakeMovement: step_shake 16 ; the 16 gets overwritten with the script byte step_sleep 16 ; the 16 gets overwritten with the lower 6 bits of the script byte step_end -EarthquakeMovementEnd +.End Script_loadpikachudata: diff --git a/lib/mobile/main.asm b/lib/mobile/main.asm index fc4ae2883..ef0b0edf3 100644 --- a/lib/mobile/main.asm +++ b/lib/mobile/main.asm @@ -2169,7 +2169,7 @@ Function110ddd: ; 110ddd push de push bc push hl - ld b, URIPrefixEnd - URIPrefix + ld b, URIPrefix.End - URIPrefix ld de, URIPrefix .asm_110e53 ld a, [de] @@ -2180,7 +2180,7 @@ Function110ddd: ; 110ddd dec b jr nz, .asm_110e53 push hl - ld b, HTTPUploadURLEnd - HTTPUploadURL + ld b, HTTPUploadURL.End - HTTPUploadURL ld c, $0 ld de, HTTPUploadURL .asm_110e64 @@ -2197,7 +2197,7 @@ Function110ddd: ; 110ddd .asm_110e70 pop hl push hl - ld b, HTTPRankingURLEnd - HTTPRankingURL + ld b, HTTPRankingURL.End - HTTPRankingURL ld c, $0 ld de, HTTPRankingURL .asm_110e79 @@ -2214,7 +2214,7 @@ Function110ddd: ; 110ddd .asm_110e86 pop hl push hl - ld b, HTTPUtilityURLEnd - HTTPUtilityURL + ld b, HTTPUtilityURL.End - HTTPUtilityURL ld c, $0 ld de, HTTPUtilityURL .asm_110e8f @@ -2233,7 +2233,7 @@ Function110ddd: ; 110ddd .asm_110ea2 pop hl - ld b, HTTPDownloadURLEnd - HTTPDownloadURL + ld b, HTTPDownloadURL.End - HTTPDownloadURL ld c, $0 ld de, HTTPDownloadURL .asm_110eaa @@ -2391,23 +2391,23 @@ Function110f07: ; 110f07 URIPrefix: ; 0x110fad db "http://" -URIPrefixEnd +.End HTTPDownloadURL: ; 0x110fb4 db "gameboy.datacenter.ne.jp/cgb/download" -HTTPDownloadURLEnd +.End HTTPUploadURL: ; 0x110fd9 db "gameboy.datacenter.ne.jp/cgb/upload" -HTTPUploadURLEnd +.End HTTPUtilityURL: ; 0x110ffc db "gameboy.datacenter.ne.jp/cgb/utility" -HTTPUtilityURLEnd +.End HTTPRankingURL: ; 0x111020 db "gameboy.datacenter.ne.jp/cgb/ranking" -HTTPRankingURLEnd +.End Function111044: ; 111044 ld hl, $c827 @@ -2749,7 +2749,7 @@ endr jp z, Function1113f7 .asm_111251 - ld b, URIPrefixEnd - URIPrefix + ld b, URIPrefix.End - URIPrefix ld de, URIPrefix .asm_111256 ld a, [de] @@ -2760,7 +2760,7 @@ endr dec b jr nz, .asm_111256 push hl - ld b, HTTPDownloadURLEnd - HTTPDownloadURL + ld b, HTTPDownloadURL.End - HTTPDownloadURL ld c, $0 ld de, HTTPDownloadURL .asm_111268 @@ -2777,7 +2777,7 @@ endr .asm_111275 pop hl push hl - ld b, HTTPRankingURLEnd - HTTPRankingURL + ld b, HTTPRankingURL.End - HTTPRankingURL ld c, $0 ld de, HTTPRankingURL .asm_11127e @@ -2795,7 +2795,7 @@ endr .asm_11128f pop hl - ld b, HTTPUploadURLEnd - HTTPUploadURL + ld b, HTTPUploadURL.End - HTTPUploadURL ld c, $0 ld de, HTTPUploadURL .asm_111297 diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 91f2967a3..583dcc8ff 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -58,7 +58,7 @@ MapRuinsOfAlphAerodactylChamberSignpost2Script: UnknownScript_0x58df7: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_AERODACTYL_PUZZLE - setflag ENGINE_UNLOCKED_UNOWNS_3 + setflag ENGINE_UNLOCKED_UNOWNS_S_TO_W setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 173f35e39..fd1f21ea0 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -59,7 +59,7 @@ MapRuinsOfAlphHoOhChamberSignpost2Script: UnknownScript_0x585ba: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_HO_OH_PUZZLE - setflag ENGINE_UNLOCKED_UNOWNS_4 + setflag ENGINE_UNLOCKED_UNOWNS_X_TO_Z setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index df4bcb881..96f7af16e 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -65,7 +65,7 @@ MapRuinsOfAlphKabutoChamberSignpost2Script: UnknownScript_0x58778: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_KABUTO_PUZZLE - setflag ENGINE_UNLOCKED_UNOWNS_1 + setflag ENGINE_UNLOCKED_UNOWNS_A_TO_K setevent EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 earthquake 30 diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index e9c937526..6d1892f9e 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -59,7 +59,7 @@ MapRuinsOfAlphOmanyteChamberSignpost2Script: UnknownScript_0x58c36: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_OMANYTE_PUZZLE - setflag ENGINE_UNLOCKED_UNOWNS_2 + setflag ENGINE_UNLOCKED_UNOWNS_L_TO_R setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index a57722747..78c623f48 100755 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -3037,7 +3037,7 @@ EZChat_GetSeenPokemonByKana: ; 11d3ba ld [wcd34], a ld hl, EZChat_SortedWords - ld a, (EZChat_SortedWordsEnd - EZChat_SortedWords) / 4 + ld a, (EZChat_SortedWords.End - EZChat_SortedWords) / 4 .MasterLoop: ; 11d3ef push af @@ -4196,4 +4196,4 @@ x = $d012 macro_11f23c $15 ; wa x = $d000 macro_11f23c $09 ; end -EZChat_SortedWordsEnd: +.End diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 8090c3a9b..98e896789 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -4105,12 +4105,10 @@ BattleTowerRoomMenu_IncrementJumptable: ; 119e2e (46:5e2e) XGameCodePrefix: ; 119e33 INCBIN "data/mobile/x-game-code-prefix.txt" -XGameCodePrefixEnd: ;119e40 XGameResultPrefix: ; 119e40 INCBIN "data/mobile/x-game-result-prefix.txt" -XGameResultPrefixEnd: ; 119e4f Function119e4f: ; 119e4f From e135091f09cbd92e7cd5ec851f874501ee5090a2 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 13:18:23 -0500 Subject: [PATCH 005/135] Day-Care bit flags --- constants/wram_constants.asm | 56 +++++++++++++++++++-------------- data/engine_flags.asm | 11 +++---- engine/breeding.asm | 8 ++--- engine/events/daycare.asm | 33 +++++++++---------- engine/events/happiness_egg.asm | 10 +++--- wram.asm | 4 +-- 6 files changed, 65 insertions(+), 57 deletions(-) diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index d21f0095c..6dd54f72b 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -1,14 +1,14 @@ -; InputType: ; c2c7 +; InputType:: ; c2c7 AUTO_INPUT EQU $ff -; wCurrentDexMode: ; c7d4 +; wCurrentDexMode:: ; c7d4 const_def const DEXMODE_NEW const DEXMODE_OLD const DEXMODE_ABC const DEXMODE_UNOWN -; MonType: ; cf5f +; MonType:: ; cf5f const_def const PARTYMON ; 0 const OTPARTYMON ; 1 @@ -16,7 +16,7 @@ AUTO_INPUT EQU $ff const TEMPMON ; 3 const WILDMON ; 4 -; Options: ; cfcc +; Options:: ; cfcc const_value set 4 const NO_TEXT_SCROLL ; 4 @@ -28,7 +28,7 @@ TEXT_DELAY_FAST EQU 1 TEXT_DELAY_MED EQU 3 TEXT_DELAY_SLOW EQU 5 -; TextBoxFrame: ; cfce +; TextBoxFrame:: ; cfce const_def const FRAME_1 ; 0 const FRAME_2 ; 1 @@ -40,23 +40,23 @@ TEXT_DELAY_SLOW EQU 5 const FRAME_8 ; 7 NUM_FRAMES EQU const_value -; TextBoxFlags: ; cfcf +; TextBoxFlags:: ; cfcf const_def const FAST_TEXT_DELAY_F ; 0 const NO_TEXT_DELAY_F ; 1 -; GBPrinter: ; cfd0 +; GBPrinter:: ; cfd0 GBPRINTER_LIGHTEST EQU $00 GBPRINTER_LIGHTER EQU $20 GBPRINTER_NORMAL EQU $40 GBPRINTER_DARKER EQU $60 GBPRINTER_DARKEST EQU $7f -; Options2: ; cfd1 +; Options2:: ; cfd1 const_def const MENU_ACCOUNT ; 0 -; WalkingDirection: ; d043 +; WalkingDirection:: ; d043 const_value set -1 const STANDING ; -1 const DOWN ; 0 @@ -70,27 +70,27 @@ UP_MASK EQU 1 << UP LEFT_MASK EQU 1 << LEFT RIGHT_MASK EQU 1 << RIGHT -; FacingDirection: ; d044 +; FacingDirection:: ; d044 FACE_CURRENT EQU 0 FACE_DOWN EQU 8 FACE_UP EQU 4 FACE_LEFT EQU 2 FACE_RIGHT EQU 1 -; wPokemonWithdrawDepositParameter: ; d10b +; wPokemonWithdrawDepositParameter:: ; d10b PC_WITHDRAW EQU 0 PC_DEPOSIT EQU 1 DAY_CARE_WITHDRAW EQU 2 DAY_CARE_DEPOSIT EQU 3 -; wInitListType: ; d263 +; wInitListType:: ; d263 INIT_ENEMYOT_LIST EQU 1 INIT_BAG_ITEM_LIST EQU 2 INIT_OTHER_ITEM_LIST EQU 3 INIT_PLAYEROT_LIST EQU 4 INIT_MON_LIST EQU 5 -; TimeOfDay: ; d269 +; TimeOfDay:: ; d269 const_def const MORN_F ; 0 const DAY_F ; 1 @@ -105,20 +105,20 @@ DARKNESS EQU 1 << DARKNESS_F ANYTIME EQU MORN | DAY | NITE -; ScriptFlags: ; d434 +; ScriptFlags:: ; d434 SCRIPT_RUNNING EQU 2 -; ScriptMode: ; d437 +; ScriptMode:: ; d437 SCRIPT_OFF EQU 0 SCRIPT_READ EQU 1 SCRIPT_WAIT_MOVEMENT EQU 2 SCRIPT_WAIT EQU 3 -; wSpawnAfterChampion: ; d4b5 +; wSpawnAfterChampion:: ; d4b5 SPAWN_LANCE EQU 1 SPAWN_RED EQU 2 -; CurDay: ; d4cb +; CurDay:: ; d4cb const_def const SUNDAY ; 0 const MONDAY ; 1 @@ -128,11 +128,11 @@ SPAWN_RED EQU 2 const FRIDAY ; 5 const SATURDAY ; 6 -; MapObjects: ; d71e +; MapObjects:: ; d71e PLAYER_OBJECT EQU 0 NUM_OBJECTS EQU $10 -; wJohtoBadges: ; d857 +; wJohtoBadges:: ; d857 const_def const ZEPHYRBADGE const HIVEBADGE @@ -144,7 +144,7 @@ NUM_OBJECTS EQU $10 const RISINGBADGE NUM_JOHTO_BADGES EQU const_value -; wKantoBadges: ; d858 +; wKantoBadges:: ; d858 const_def const BOULDERBADGE const CASCADEBADGE @@ -157,7 +157,7 @@ NUM_JOHTO_BADGES EQU const_value NUM_KANTO_BADGES EQU const_value NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES -; wPokegearFlags: ; d957 +; wPokegearFlags:: ; d957 const_def const POKEGEAR_MAP_CARD_F ; 0 const POKEGEAR_RADIO_CARD_F ; 1 @@ -166,13 +166,23 @@ NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES POKEGEAR_OBTAINED_F EQU 7 -; WhichRegisteredItem: ; d95b +; WhichRegisteredItem:: ; d95b REGISTERED_POCKET EQU %11000000 REGISTERED_NUMBER EQU %00111111 -; PlayerState: ; d95d +; PlayerState:: ; d95d PLAYER_NORMAL EQU 0 PLAYER_BIKE EQU 1 PLAYER_SKATE EQU 2 PLAYER_SURF EQU 4 PLAYER_SURF_PIKA EQU 8 + +; wDayCareMan:: ; def5 +DAYCAREMAN_HAS_MON_F EQU 0 +DAYCAREMAN_MONS_COMPATIBLE_F EQU 5 +DAYCAREMAN_HAS_EGG_F EQU 6 +DAYCAREMAN_ACTIVE_F EQU 7 + +; wDayCareLady:: ; df2c +DAYCARELADY_HAS_MON_F EQU 0 +DAYCARELADY_ACTIVE_F EQU 7 diff --git a/data/engine_flags.asm b/data/engine_flags.asm index 119697466..f75b050c6 100644 --- a/data/engine_flags.asm +++ b/data/engine_flags.asm @@ -14,13 +14,10 @@ EngineFlags: ; 80462 engine_flag wPokegearFlags, POKEGEAR_EXPN_CARD_F engine_flag wPokegearFlags, POKEGEAR_OBTAINED_F - ; wDayCareMan, 7 ; day-care 1 on - engine_flag wDayCareMan, 6 ; egg is ready - ; wDayCareMan, 5 ; monster 1 and 2 are compatible - engine_flag wDayCareMan, 0 ; monster 1 in day-care - - ; wDayCareLady, 7 = day-care 2 on - engine_flag wDayCareLady, 0 ; monster 2 in day-care + ; 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, 0 ; mom saving money ; $8 engine_flag wMomSavingMoney, 7 ; dst diff --git a/engine/breeding.asm b/engine/breeding.asm index b16747089..b379ec195 100755 --- a/engine/breeding.asm +++ b/engine/breeding.asm @@ -288,7 +288,7 @@ HatchEggs: ; 16f70 (5:6f70) push hl ld bc, MON_STAT_EXP - 1 add hl, bc - ld b, $0 + ld b, FALSE predef CalcPkmnStats pop bc ld hl, MON_MAXHP @@ -705,7 +705,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f) call DisableLCD ld hl, EggHatchGFX ld de, vTiles0 tile $00 - ld bc, $20 + ld bc, 2 tiles ld a, BANK(EggHatchGFX) call FarCopyBytes farcall ClearSpriteAnims @@ -893,7 +893,7 @@ Special_DayCareMon1: ; 17421 ld a, [wBreedMon1Species] call PlayMonCry ld a, [wDayCareLady] - bit 0, a + bit DAYCARELADY_HAS_MON_F, a jr z, DayCareMonCursor call ButtonSound ld hl, wBreedMon2Nick @@ -906,7 +906,7 @@ Special_DayCareMon2: ; 17440 ld a, [wBreedMon2Species] call PlayMonCry ld a, [wDayCareMan] - bit 0, a + bit DAYCAREMAN_HAS_MON_F, a jr z, DayCareMonCursor call ButtonSound ld hl, wBreedMon1Nick diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm index f65464a8d..3f9dbf84e 100755 --- a/engine/events/daycare.asm +++ b/engine/events/daycare.asm @@ -23,7 +23,7 @@ Special_DayCareMan: ; 166d6 ld hl, wDayCareMan - bit 0, [hl] + bit DAYCAREMAN_HAS_MON_F, [hl] jr nz, .AskWithdrawMon ld hl, wDayCareMan ld a, DAYCARETEXT_MAN_INTRO @@ -33,7 +33,7 @@ Special_DayCareMan: ; 166d6 jr c, .print_text farcall DepositMonWithDayCareMan ld hl, wDayCareMan - set 0, [hl] + set DAYCAREMAN_HAS_MON_F, [hl] call DayCare_DepositPokemonText call DayCare_InitBreeding ret @@ -47,8 +47,8 @@ Special_DayCareMan: ; 166d6 farcall RetrievePokemonFromDayCareMan call DayCare_GetBackMonForMoney ld hl, wDayCareMan - res 0, [hl] - res 5, [hl] + res DAYCAREMAN_HAS_MON_F, [hl] + res DAYCAREMAN_MONS_COMPATIBLE_F, [hl] jr .cancel .print_text @@ -62,7 +62,7 @@ Special_DayCareMan: ; 166d6 Special_DayCareLady: ; 1672a ld hl, wDayCareLady - bit 0, [hl] + bit DAYCARELADY_HAS_MON_F, [hl] jr nz, .AskWithdrawMon ld hl, wDayCareLady ld a, DAYCARETEXT_LADY_INTRO @@ -72,7 +72,7 @@ Special_DayCareLady: ; 1672a jr c, .print_text farcall DepositMonWithDayCareLady ld hl, wDayCareLady - set 0, [hl] + set DAYCARELADY_HAS_MON_F, [hl] call DayCare_DepositPokemonText call DayCare_InitBreeding ret @@ -86,9 +86,9 @@ Special_DayCareLady: ; 1672a farcall RetrievePokemonFromDayCareLady call DayCare_GetBackMonForMoney ld hl, wDayCareLady - res 0, [hl] + res DAYCARELADY_HAS_MON_F, [hl] ld hl, wDayCareMan - res 5, [hl] + res DAYCAREMAN_MONS_COMPATIBLE_F, [hl] jr .cancel .print_text @@ -101,9 +101,9 @@ Special_DayCareLady: ; 1672a ; 16781 DayCareLadyIntroText: ; 16781 - bit 7, [hl] + bit DAYCARELADY_ACTIVE_F, [hl] jr nz, .okay - set 7, [hl] + set DAYCARELADY_ACTIVE_F, [hl] inc a .okay call PrintDayCareText @@ -112,7 +112,7 @@ DayCareLadyIntroText: ; 16781 ; 1678f DayCareManIntroText: ; 1678f - set 7, [hl] + set DAYCAREMAN_ACTIVE_F, [hl] call PrintDayCareText call YesNoBox ret @@ -429,7 +429,7 @@ PrintDayCareText: ; 1689b Special_DayCareManOutside: ; 16936 ld hl, wDayCareMan - bit 6, [hl] + bit DAYCAREMAN_HAS_EGG_F, [hl] jr nz, .AskGiveEgg ld hl, .NotYet call PrintText @@ -451,7 +451,7 @@ Special_DayCareManOutside: ; 16936 jr nc, .PartyFull call DayCare_GiveEgg ld hl, wDayCareMan - res 6, [hl] + res DAYCAREMAN_HAS_EGG_F, [hl] call DayCare_InitBreeding ld hl, .GotEggText call PrintText @@ -593,10 +593,10 @@ DayCare_GetCurrentPartyMember: ; 16a31 DayCare_InitBreeding: ; 16a3b ld a, [wDayCareLady] - bit 0, a + bit DAYCARELADY_HAS_MON_F, a ret z ld a, [wDayCareMan] - bit 0, a + bit DAYCAREMAN_HAS_MON_F, a ret z callfar CheckBreedmonCompatibility ld a, [wd265] @@ -605,7 +605,7 @@ DayCare_InitBreeding: ; 16a3b inc a ret z ld hl, wDayCareMan - set 5, [hl] + set DAYCAREMAN_MONS_COMPATIBLE_F, [hl] .loop call Random cp 150 @@ -660,6 +660,7 @@ DayCare_InitBreeding: ; 16a3b ld a, EGG_LEVEL ld [CurPartyLevel], a +; Nidoran♀ can give birth to either gender of Nidoran ld a, [CurPartySpecies] cp NIDORAN_F jr nz, .GotEggSpecies diff --git a/engine/events/happiness_egg.asm b/engine/events/happiness_egg.asm index 2db54a1a7..8a5ade3c8 100755 --- a/engine/events/happiness_egg.asm +++ b/engine/events/happiness_egg.asm @@ -146,7 +146,7 @@ DayCareStep:: ; 7282 ; Raise the experience of Day-Care Pokémon every step cycle. ld a, [wDayCareMan] - bit 0, a + bit DAYCAREMAN_HAS_MON_F, a jr z, .day_care_lady ld a, [wBreedMon1Level] ; level @@ -168,7 +168,7 @@ DayCareStep:: ; 7282 .day_care_lady ld a, [wDayCareLady] - bit 0, a + bit DAYCARELADY_HAS_MON_F, a jr z, .check_egg ld a, [wBreedMon2Level] ; level @@ -190,7 +190,7 @@ DayCareStep:: ; 7282 .check_egg ld hl, wDayCareMan - bit 5, [hl] ; egg + bit DAYCAREMAN_MONS_COMPATIBLE_F, [hl] ret z ld hl, wStepsToEgg dec [hl] @@ -218,6 +218,6 @@ DayCareStep:: ; 7282 cp b ret nc ld hl, wDayCareMan - res 5, [hl] - set 6, [hl] + res DAYCAREMAN_MONS_COMPATIBLE_F, [hl] + set DAYCAREMAN_HAS_EGG_F, [hl] ret diff --git a/wram.asm b/wram.asm index 05b91389c..845666742 100644 --- a/wram.asm +++ b/wram.asm @@ -2787,8 +2787,8 @@ wFirstUnownSeen:: db wDayCareMan:: ; def5 ; bit 7: active -; bit 6: monsters are compatible -; bit 5: egg ready +; bit 6: egg ready +; bit 5: monsters are compatible ; bit 0: monster 1 in day-care db From f75bfbeac3aa826e1f402a649fa1389e889b5af9 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 13:25:49 -0500 Subject: [PATCH 006/135] Actually use PLAYER_OBJECT --- engine/player_object.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/player_object.asm b/engine/player_object.asm index b630078a2..802cf6ade 100755 --- a/engine/player_object.asm +++ b/engine/player_object.asm @@ -25,7 +25,7 @@ SpawnPlayer: ; 8029 call CopyPlayerObjectTemplate ld b, $0 call PlayerSpawn_ConvertCoords - ld a, $0 + ld a, PLAYER_OBJECT call GetMapObject ld hl, MAPOBJECT_COLOR add hl, bc @@ -40,10 +40,10 @@ SpawnPlayer: ; 8029 .ok ld [hl], e - ld a, $0 + ld a, PLAYER_OBJECT ld [hMapObjectIndexBuffer], a ld bc, MapObjects - ld a, $0 + ld a, PLAYER_OBJECT ld [hObjectStructIndexBuffer], a ld de, ObjectStructs call CopyMapObjectToObjectStruct From 125d51b3b2e91230b693406de153e172f752bf41 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 13:57:44 -0500 Subject: [PATCH 007/135] More engine bit flag constants --- constants/engine_flags.asm | 2 +- constants/pokemon_constants.asm | 31 ++++++++++++++++++++-- constants/wram_constants.asm | 14 ++++++++++ data/engine_flags.asm | 20 +++++++------- data/wild/unlocked_unowns.asm | 36 ++++++++++++++----------- engine/battle/core.asm | 26 +++++++++--------- engine/events/mom.asm | 16 +++++------ engine/events/overworld.asm | 10 +++---- engine/map_setup.asm | 2 +- engine/phone/phone_scripts.asm | 2 +- engine/player_movement.asm | 6 ++--- wram.asm | 47 +++++++++++++++++++-------------- 12 files changed, 132 insertions(+), 80 deletions(-) diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index d4e0a37fc..f28a38fb5 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -13,7 +13,7 @@ const ENGINE_DAY_CARE_LADY_HAS_MON ; wMomSavingMoney const ENGINE_MOM_SAVING_MONEY - const ENGINE_DST + const ENGINE_MOM_ACTIVE ; wUnusedTwoDayTimerOn const ENGINE_0A ; wStatusFlags diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index d4c49c5f5..fc2c3cace 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -276,5 +276,32 @@ NUM_POKEMON EQU const_value +- 1 const EGG ; fd const MON_FE ; fe -; number of Unown forms -NUM_UNOWN EQU 26 +; Unown forms +const_value set 1 + const UNOWN_A ; 1 + const UNOWN_B ; 2 + const UNOWN_C ; 3 + const UNOWN_D ; 4 + const UNOWN_E ; 5 + const UNOWN_F ; 6 + const UNOWN_G ; 7 + const UNOWN_H ; 8 + const UNOWN_I ; 9 + const UNOWN_J ; 10 + const UNOWN_K ; 11 + const UNOWN_L ; 12 + const UNOWN_M ; 13 + const UNOWN_N ; 14 + const UNOWN_O ; 15 + const UNOWN_P ; 16 + const UNOWN_Q ; 17 + const UNOWN_R ; 18 + const UNOWN_S ; 19 + const UNOWN_T ; 20 + const UNOWN_U ; 21 + const UNOWN_V ; 22 + const UNOWN_W ; 23 + const UNOWN_X ; 24 + const UNOWN_Y ; 25 + const UNOWN_Z ; 26 +NUM_UNOWN EQU const_value +- 1 ; 26 diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 6dd54f72b..5bd6ad80c 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -132,6 +132,14 @@ SPAWN_RED EQU 2 PLAYER_OBJECT EQU 0 NUM_OBJECTS EQU $10 +; wMomSavingMoney:: ; d854 +MOM_SAVING_SOME_MONEY_F EQU 0 +MOM_SAVING_HALF_MONEY_F EQU 1 +MOM_SAVING_ALL_MONEY_F EQU 2 +MOM_ACTIVE_F EQU 7 + +MOM_SAVING_MONEY_MASK EQU (1 << MOM_SAVING_SOME_MONEY_F) | (1 << MOM_SAVING_HALF_MONEY_F) | (1 << MOM_SAVING_ALL_MONEY_F) + ; wJohtoBadges:: ; d857 const_def const ZEPHYRBADGE @@ -177,6 +185,12 @@ PLAYER_SKATE EQU 2 PLAYER_SURF EQU 4 PLAYER_SURF_PIKA EQU 8 +; wBikeFlags:: ; dbf5 + const_def + const BIKEFLAGS_STRENGTH_ACTIVE_F ; 0 + const BIKEFLAGS_ALWAYS_ON_BIKE_F ; 1 + const BIKEFLAGS_DOWNHILL_F ; 2 + ; wDayCareMan:: ; def5 DAYCAREMAN_HAS_MON_F EQU 0 DAYCAREMAN_MONS_COMPATIBLE_F EQU 5 diff --git a/data/engine_flags.asm b/data/engine_flags.asm index f75b050c6..8ad4fb4a3 100644 --- a/data/engine_flags.asm +++ b/data/engine_flags.asm @@ -19,8 +19,8 @@ EngineFlags: ; 80462 engine_flag wDayCareMan, DAYCAREMAN_HAS_MON_F engine_flag wDayCareLady, DAYCARELADY_HAS_MON_F - engine_flag wMomSavingMoney, 0 ; mom saving money ; $8 - engine_flag wMomSavingMoney, 7 ; dst + engine_flag wMomSavingMoney, MOM_SAVING_SOME_MONEY_F ; $8 + engine_flag wMomSavingMoney, MOM_ACTIVE_F engine_flag wUnusedTwoDayTimerOn, 0 ; unused, possibly related to a 2-day timer @@ -38,9 +38,9 @@ EngineFlags: ; 80462 engine_flag wStatusFlags2, 6 ; berry -> berry juice when trading? engine_flag wStatusFlags2, 7 ; rockets in mahogany - engine_flag wBikeFlags, 0 ; strength active ; $18 - engine_flag wBikeFlags, 1 ; always on bike (cant surf) - engine_flag wBikeFlags, 2 ; downhill (cycling road) + engine_flag wBikeFlags, BIKEFLAGS_STRENGTH_ACTIVE_F ; $18 + engine_flag wBikeFlags, BIKEFLAGS_ALWAYS_ON_BIKE_F + engine_flag wBikeFlags, BIKEFLAGS_DOWNHILL_F engine_flag wJohtoBadges, ZEPHYRBADGE engine_flag wJohtoBadges, HIVEBADGE @@ -60,15 +60,15 @@ EngineFlags: ; 80462 engine_flag wKantoBadges, VOLCANOBADGE engine_flag wKantoBadges, EARTHBADGE - ; unown sets + ; 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 5 - engine_flag wUnlockedUnowns, 5 ; unused 6 ; $30 - engine_flag wUnlockedUnowns, 6 ; unused 7 - engine_flag wUnlockedUnowns, 7 ; unused 8 + engine_flag wUnlockedUnowns, 4 ; unused + engine_flag wUnlockedUnowns, 5 ; unused ; $30 + engine_flag wUnlockedUnowns, 6 ; unused + engine_flag wUnlockedUnowns, 7 ; unused ; fly engine_flag wVisitedSpawns, SPAWN_HOME diff --git a/data/wild/unlocked_unowns.asm b/data/wild/unlocked_unowns.asm index 71b639036..d09064c4b 100644 --- a/data/wild/unlocked_unowns.asm +++ b/data/wild/unlocked_unowns.asm @@ -1,20 +1,24 @@ +unown_set: MACRO +rept _NARG + db UNOWN_\1 + shift +endr + db -1 +ENDM + UnlockedUnownLetterSets: ; entries correspond to wUnlockedUnowns bits - dw .Set1 ; ENGINE_UNLOCKED_UNOWNS_A_TO_K - dw .Set2 ; ENGINE_UNLOCKED_UNOWNS_L_TO_R - dw .Set3 ; ENGINE_UNLOCKED_UNOWNS_S_TO_W - dw .Set4 ; ENGINE_UNLOCKED_UNOWNS_X_TO_Z + dw .Set_A_K ; ENGINE_UNLOCKED_UNOWNS_A_TO_K + dw .Set_L_R ; ENGINE_UNLOCKED_UNOWNS_L_TO_R + dw .Set_S_W ; ENGINE_UNLOCKED_UNOWNS_S_TO_W + dw .Set_X_Z ; ENGINE_UNLOCKED_UNOWNS_X_TO_Z .End -.Set1: - ; A B C D E F G H I J K - db 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, -1 -.Set2: - ; L M N O P Q R - db 12, 13, 14, 15, 16, 17, 18, -1 -.Set3: - ; S T U V W - db 19, 20, 21, 22, 23, -1 -.Set4: - ; X Y Z - db 24, 25, 26, -1 +.Set_A_K: + unown_set A, B, C, D, E, F, G, H, I, J, K +.Set_L_R: + unown_set L, M, N, O, P, Q, R +.Set_S_W: + unown_set S, T, U, V, W +.Set_X_Z: + unown_set X, Y, Z diff --git a/engine/battle/core.asm b/engine/battle/core.asm index cc15e0c3a..d62e2014b 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2471,22 +2471,22 @@ WinTrainerBattle: ; 3cfa4 call nz, .DoubleReward call .CheckMaxedOutMomMoney push af - ld a, $0 + ld a, FALSE jr nc, .okay ld a, [wMomSavingMoney] - and $7 - cp $3 + and MOM_SAVING_MONEY_MASK + cp (1 << MOM_SAVING_SOME_MONEY_F) | (1 << MOM_SAVING_HALF_MONEY_F) jr nz, .okay - inc a + inc a ; TRUE .okay ld b, a - ld c, $4 + ld c, 4 .loop ld a, b and a jr z, .loop2 - call .SendMoneyToMom + call .AddMoneyToMom dec c dec b jr .loop @@ -2505,7 +2505,7 @@ WinTrainerBattle: ; 3cfa4 pop af jr nc, .KeepItAll ld a, [wMomSavingMoney] - and $7 + and MOM_SAVING_MONEY_MASK jr z, .KeepItAll ld hl, .SentToMomTexts dec a @@ -2523,7 +2523,7 @@ WinTrainerBattle: ; 3cfa4 jp StdBattleTextBox ; 3d081 -.SendMoneyToMom: ; 3d081 +.AddMoneyToMom: ; 3d081 push bc ld hl, wBattleReward + 2 ld de, wMomsMoney + 2 @@ -2557,9 +2557,9 @@ WinTrainerBattle: ; 3cfa4 ; 3d0ab .SentToMomTexts: ; 3d0ab - dw SentSomeToMomText - dw SentHalfToMomText - dw SentAllToMomText + dw SentSomeToMomText ; MOM_SAVING_SOME_MONEY_F + dw SentHalfToMomText ; MOM_SAVING_HALF_MONEY_F + dw SentAllToMomText ; MOM_SAVING_ALL_MONEY_F ; 3d0b1 .CheckMaxedOutMomMoney: ; 3d0b1 @@ -2574,7 +2574,7 @@ WinTrainerBattle: ; 3cfa4 ; 3d0be AddBattleMoneyToAccount: ; 3d0be - ld c, $3 + ld c, 3 and a push de push hl @@ -2653,7 +2653,7 @@ IsGymLeader: ; 0x3d128 IsGymLeaderCommon: push de ld a, [OtherTrainerClass] - ld de, $1 + ld de, 1 call IsInArray pop de ret diff --git a/engine/events/mom.asm b/engine/events/mom.asm index c7e1cd6e9..31350ed0e 100644 --- a/engine/events/mom.asm +++ b/engine/events/mom.asm @@ -46,9 +46,9 @@ Special_BankOfMom: ; 16218 .CheckIfBankInitialized: ; 16254 ld a, [wMomSavingMoney] - bit 7, a + bit MOM_ACTIVE_F, a jr nz, .savingmoneyalready - set 7, a + set MOM_ACTIVE_F, a ld [wMomSavingMoney], a ld a, $1 jr .done_0 @@ -68,11 +68,11 @@ Special_BankOfMom: ; 16218 jr c, .DontSaveMoney ld hl, UnknownText_0x1664e call PrintText - ld a, %10000001 + ld a, (1 << MOM_ACTIVE_F) | (1 << MOM_SAVING_SOME_MONEY_F) jr .done_1 .DontSaveMoney: - ld a, %10000000 + ld a, 1 << MOM_ACTIVE_F .done_1 ld [wMomSavingMoney], a @@ -145,7 +145,7 @@ Special_BankOfMom: ; 16218 ld [hli], a ld [hli], a ld [hl], a - ld a, $5 + ld a, 5 ld [wMomBankDigitCursorPosition], a call LoadStandardMenuDataHeader call Mom_SetUpDepositMenu @@ -212,7 +212,7 @@ Special_BankOfMom: ; 16218 ld [hli], a ld [hli], a ld [hl], a - ld a, $5 + ld a, 5 ld [wMomBankDigitCursorPosition], a call LoadStandardMenuDataHeader call Mom_SetUpWithdrawMenu @@ -276,7 +276,7 @@ Special_BankOfMom: ; 16218 call PrintText call YesNoBox jr c, .StopSavingMoney - ld a, $81 + ld a, (1 << MOM_ACTIVE_F) | (1 << MOM_SAVING_SOME_MONEY_F) ld [wMomSavingMoney], a ld hl, UnknownText_0x16685 call PrintText @@ -285,7 +285,7 @@ Special_BankOfMom: ; 16218 ret .StopSavingMoney: - ld a, $80 + ld a, 1 << MOM_ACTIVE_F ld [wMomSavingMoney], a ld a, $7 ld [wJumptableIndex], a diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index c9e0a5fe5..44a50034a 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -358,7 +358,7 @@ SurfFunction: ; c909 call CheckBadge jr c, .asm_c956 ld hl, wBikeFlags - bit 1, [hl] ; always on bike + bit BIKEFLAGS_ALWAYS_ON_BIKE_F, [hl] jr nz, .cannotsurf ld a, [PlayerState] cp PLAYER_SURF @@ -520,7 +520,7 @@ TrySurfOW:: ; c9e7 jr c, .quit ld hl, wBikeFlags - bit 1, [hl] ; always on bike (can't surf) + bit BIKEFLAGS_ALWAYS_ON_BIKE_F, [hl] jr nz, .quit call GetSurfType @@ -1008,7 +1008,7 @@ StrengthFunction: ; cce5 SetStrengthFlag: ; cd12 ld hl, wBikeFlags - set 0, [hl] + set BIKEFLAGS_STRENGTH_ACTIVE_F, [hl] ld a, [CurPartyMon] ld e, a ld d, 0 @@ -1086,7 +1086,7 @@ TryStrengthOW: ; cd78 jr c, .nope ld hl, wBikeFlags - bit 0, [hl] + bit BIKEFLAGS_STRENGTH_ACTIVE_F, [hl] jr z, .already_using ld a, 2 @@ -1683,7 +1683,7 @@ BikeFunction: ; d0b3 .GetOffBike: ld hl, wBikeFlags - bit 1, [hl] + bit BIKEFLAGS_ALWAYS_ON_BIKE_F, [hl] jr nz, .CantGetOffBike ld hl, Script_GetOffBike ld de, Script_GetOffBike_Register diff --git a/engine/map_setup.asm b/engine/map_setup.asm index b3905b71e..5e593e04e 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -169,7 +169,7 @@ CheckReplaceKrisSprite: ; 154f7 .CheckBiking: ; 1550c (5:550c) and a ld hl, wBikeFlags - bit 1, [hl] + bit BIKEFLAGS_ALWAYS_ON_BIKE_F, [hl] ret z ld a, PLAYER_BIKE ld [PlayerState], a diff --git a/engine/phone/phone_scripts.asm b/engine/phone/phone_scripts.asm index 646040641..501f4b757 100644 --- a/engine/phone/phone_scripts.asm +++ b/engine/phone/phone_scripts.asm @@ -140,7 +140,7 @@ MomPhoneNoGymQuestScript: ; 0xbcfac MomPhoneLectureScript: ; 0xbcfb1 setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST - setflag ENGINE_DST + setflag ENGINE_MOM_ACTIVE specialphonecall SPECIALCALL_NONE farwritetext MomPhoneLectureText yesorno diff --git a/engine/player_movement.asm b/engine/player_movement.asm index d6d10aea1..192860200 100755 --- a/engine/player_movement.asm +++ b/engine/player_movement.asm @@ -19,7 +19,7 @@ DoPlayerMovement:: ; 80000 ; Standing downhill instead moves down. ld hl, wBikeFlags - bit 2, [hl] ; downhill + bit BIKEFLAGS_DOWNHILL_F, [hl] ret z ld c, a @@ -286,7 +286,7 @@ DoPlayerMovement:: ; 80000 jr nz, .walk ld hl, wBikeFlags - bit 2, [hl] ; downhill + bit BIKEFLAGS_DOWNHILL_F, [hl] jr z, .fast ld a, [WalkingDirection] @@ -673,7 +673,7 @@ DoPlayerMovement:: ; 80000 .CheckStrengthBoulder: ; 8036f ld hl, wBikeFlags - bit 0, [hl] ; using strength + bit BIKEFLAGS_STRENGTH_ACTIVE_F, [hl] jr z, .not_boulder ld hl, OBJECT_DIRECTION_WALKING diff --git a/wram.asm b/wram.asm index 845666742..efd8345de 100644 --- a/wram.asm +++ b/wram.asm @@ -2338,7 +2338,9 @@ StartMinute:: db ; d4b8 StartSecond:: db ; d4b9 wRTC:: ds 8 ; d4ba -wDST:: db ; d4c2 +wDST:: ; d4c2 +; bit 7: dst + db GameTime:: GameTimeCap:: db ; d4c3 @@ -2414,30 +2416,36 @@ CurTimeOfDay:: db ; d848 wSecretID:: dw wStatusFlags:: ; d84c - ; 0 - pokedex - ; 1 - unown dex - ; 2 - - ; 3 - pokerus - ; 4 - rocket signal - ; 5 - wild encounters on/off - ; 6 - hall of fame - ; 7 - bug contest on +; bit 0: pokedex +; bit 1: unown dex +; bit 2: unused +; bit 3: pokerus +; bit 4: rocket signal +; bit 5: wild encounters on/off +; bit 6: hall of fame +; bit 7: bug contest on db wStatusFlags2:: ; d84d - ; 0 - rockets - ; 1 - - ; 2 - bug contest timer - ; 3 - - ; 4 - bike shop call - ; 5 - pokerus - ; 6 - berry juice? - ; 7 - rockets in mahogany +; bit 0: rockets +; bit 1: unused +; bit 2: bug contest timer +; bit 3: unused +; bit 4: bike shop call +; bit 5: pokerus +; bit 6: berry juice +; bit 7: rockets in mahogany db Money:: ds 3 ; d84e wMomsMoney:: ds 3 ; d851 -wMomSavingMoney:: db ; d854 + +wMomSavingMoney:: ; d854 +; bit 0: saving some money +; bit 1: saving half money (unused) +; bit 2: saving all money (unused) +; bit 7: active + db Coins:: dw ; d855 @@ -2627,8 +2635,7 @@ wBikeFlags:: ; dbf5 ; bit 1: always on bike ; bit 2: downhill db - - ds 1 + ds 1 ; also cleared by ResetBikeFlags wCurrMapSceneScriptPointer:: dw ; dbf7 From 4d8528f90329e2ddfac16046ad8bf309ec1887f2 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 14:34:55 -0500 Subject: [PATCH 008/135] More engine flag constants --- constants/engine_flags.asm | 2 +- constants/wram_constants.asm | 16 ++++++++++++++++ data/engine_flags.asm | 8 ++++---- engine/battle/core.asm | 4 ++-- engine/caught_data.asm | 2 +- engine/cgb_layouts.asm | 4 ++-- engine/color.asm | 2 +- engine/events/loadfishinggfx.asm | 2 +- engine/events/magnet_train.asm | 2 +- engine/intro_menu.asm | 4 ++-- engine/map_objects.asm | 6 +++--- engine/map_setup.asm | 4 ++-- engine/overworld.asm | 4 ++-- engine/pack.asm | 2 +- engine/player_gfx.asm | 20 ++++++++++---------- engine/player_object.asm | 4 ++-- engine/pokegear.asm | 6 +++--- engine/scripting.asm | 2 +- engine/specials.asm | 2 +- engine/tileset_anims.asm | 8 ++++---- engine/warp_connection.asm | 2 +- home/text.asm | 2 +- maps/AzaleaTown.asm | 2 +- maps/IlexForest.asm | 2 +- mobile/mobile_12.asm | 4 ++-- mobile/mobile_22.asm | 4 ++-- wram.asm | 9 +++++++-- 27 files changed, 75 insertions(+), 54 deletions(-) diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index f28a38fb5..0b5695dd3 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -120,7 +120,7 @@ ; wPlayerGender const ENGINE_PLAYER_IS_FEMALE ; wCelebiEvent - const ENGINE_HAVE_EXAMINED_GS_BALL + const ENGINE_FOREST_IS_RESTLESS ; wDailyRematchFlags const ENGINE_JACK const ENGINE_HUEY diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 5bd6ad80c..dce4ab551 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -105,6 +105,16 @@ DARKNESS EQU 1 << DARKNESS_F ANYTIME EQU MORN | DAY | NITE +; wPlayerSpriteSetupFlags:: ; d45b +PLAYERSPRITESETUP_FACING_MASK EQU %11 +PLAYERSPRITESETUP_FEMALE_TO_MALE_F EQU 2 +PLAYERSPRITESETUP_CUSTOM_FACING_F EQU 5 +PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F EQU 6 +PLAYERSPRITESETUP_RESET_ACTION_F EQU 7 + +; wPlayerGender:: ; d472 +PLAYERGENDER_FEMALE_F EQU 0 + ; ScriptFlags:: ; d434 SCRIPT_RUNNING EQU 2 @@ -185,12 +195,18 @@ PLAYER_SKATE EQU 2 PLAYER_SURF EQU 4 PLAYER_SURF_PIKA EQU 8 +; wCelebiEvent:: ; dbf3 +CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2 + ; wBikeFlags:: ; dbf5 const_def const BIKEFLAGS_STRENGTH_ACTIVE_F ; 0 const BIKEFLAGS_ALWAYS_ON_BIKE_F ; 1 const BIKEFLAGS_DOWNHILL_F ; 2 +; wLuckyNumberShowFlag:: ; dc9d +LUCKYNUMBERSHOW_GAME_OVER_F EQU 0 + ; wDayCareMan:: ; def5 DAYCAREMAN_HAS_MON_F EQU 0 DAYCAREMAN_MONS_COMPATIBLE_F EQU 5 diff --git a/data/engine_flags.asm b/data/engine_flags.asm index 8ad4fb4a3..064f08de3 100644 --- a/data/engine_flags.asm +++ b/data/engine_flags.asm @@ -99,7 +99,7 @@ EngineFlags: ; 80462 engine_flag wVisitedSpawns, SPAWN_MT_SILVER engine_flag wVisitedSpawns, NUM_SPAWNS ; unused - engine_flag wLuckyNumberShowFlag, 0 ; lucky number show + engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F engine_flag wStatusFlags2, 3 ; ???? engine_flag wDailyFlags, 0 ; kurt making balls ; $50 @@ -125,9 +125,9 @@ EngineFlags: ; 80462 engine_flag wGameTimerPause, 7 ; $62 - engine_flag wPlayerGender, 0 ; player is female + engine_flag wPlayerGender, PLAYERGENDER_FEMALE_F - engine_flag wCelebiEvent, 2 ; have gs ball after kurt examined it + engine_flag wCelebiEvent, CELEBIEVENT_FOREST_IS_RESTLESS_F ; rematches engine_flag wDailyRematchFlags, 0 ; jack @@ -191,7 +191,7 @@ EngineFlags: ; 80462 engine_flag wDailyPhoneTimeOfDayFlags, 22 ; parry engine_flag wDailyPhoneTimeOfDayFlags, 23 ; erin - engine_flag wPlayerSpriteSetupFlags, 2 ; female player has been transformed into male + engine_flag wPlayerSpriteSetupFlags, PLAYERSPRITESETUP_FEMALE_TO_MALE_F engine_flag wSwarmFlags, 2 ; dunsparce swarm ; $a0 engine_flag wSwarmFlags, 3 ; yanma swarm diff --git a/engine/battle/core.asm b/engine/battle/core.asm index d62e2014b..fd3125420 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -9263,10 +9263,10 @@ GetTrainerBackpic: ; 3fbff ; What gender are we? ld a, [wPlayerSpriteSetupFlags] - bit 2, a ; transformed to male + bit PLAYERSPRITESETUP_FEMALE_TO_MALE_F, a jr nz, .Chris ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .Chris ; It's a girl. diff --git a/engine/caught_data.asm b/engine/caught_data.asm index 9310b7b90..f194ce1f0 100644 --- a/engine/caught_data.asm +++ b/engine/caught_data.asm @@ -194,7 +194,7 @@ SetBoxmonOrEggmonCaughtData: ; 4db53 call GetWorldMapLocation ld b, a ld a, [wPlayerGender] - rrca + rrca ; shift bit 0 (PLAYERGENDER_FEMALE_F) to bit 7 (CAUGHT_GENDER_MASK) or b ld [hl], a ret diff --git a/engine/cgb_layouts.asm b/engine/cgb_layouts.asm index 84fb6c9de..cf43a0607 100644 --- a/engine/cgb_layouts.asm +++ b/engine/cgb_layouts.asm @@ -184,7 +184,7 @@ InitPartyMenuBGPal0: ; 8e9f _CGB_PokegearPals: ; 8eb9 ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .male ld hl, FemalePokegearPals jr .got_pals @@ -821,7 +821,7 @@ _CGB_PackPals: ; 93d3 jr z, .tutorial_male ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .tutorial_male ld hl, .KrisPackPals diff --git a/engine/color.asm b/engine/color.asm index 485125821..0cce49655 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -707,7 +707,7 @@ GetPlayerOrMonPalettePointer: and a jp nz, GetMonNormalOrShinyPalettePointer ld a, [wPlayerSpriteSetupFlags] - bit 2, a ; transformed to male + bit PLAYERSPRITESETUP_FEMALE_TO_MALE_F, a jr nz, .male ld a, [wPlayerGender] and a diff --git a/engine/events/loadfishinggfx.asm b/engine/events/loadfishinggfx.asm index f67c51d8b..3d3ab0ba0 100644 --- a/engine/events/loadfishinggfx.asm +++ b/engine/events/loadfishinggfx.asm @@ -6,7 +6,7 @@ LoadFishingGFX: ; b84b3 ld de, FishingGFX ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .got_gender ld de, KrisFishingGFX .got_gender diff --git a/engine/events/magnet_train.asm b/engine/events/magnet_train.asm index 232372dbd..be3faac28 100755 --- a/engine/events/magnet_train.asm +++ b/engine/events/magnet_train.asm @@ -327,7 +327,7 @@ MagnetTrain_Jumptable: ; 8cdf7 ld a, BANK(wPlayerGender) ld [rSVBK], a ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .got_gender ld b, SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index c9270358b..c825a6216 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -812,7 +812,7 @@ NamePlayer: ; 0x6074 ld hl, PlayerName ld de, .Chris ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .Male ld de, .Kris .Male: @@ -988,7 +988,7 @@ Intro_PlacePlayerSprite: ; 61cd ld b, PAL_OW_RED ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .male ld b, PAL_OW_BLUE .male diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 00ce599e3..398a3ff59 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -2543,7 +2543,7 @@ RefreshPlayerSprite: ; 579d .TryResetPlayerAction: ; 57bc ld hl, wPlayerSpriteSetupFlags - bit 7, [hl] + bit PLAYERSPRITESETUP_RESET_ACTION_F, [hl] jr nz, .ok ret @@ -2555,10 +2555,10 @@ RefreshPlayerSprite: ; 579d .SpawnInCustomFacing: ; 57ca ld hl, wPlayerSpriteSetupFlags - bit 5, [hl] + bit PLAYERSPRITESETUP_CUSTOM_FACING_F, [hl] ret z ld a, [wPlayerSpriteSetupFlags] - and 3 + and PLAYERSPRITESETUP_FACING_MASK add a add a jr ContinueSpawnFacing diff --git a/engine/map_setup.asm b/engine/map_setup.asm index 5e593e04e..d2140c569 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -143,13 +143,13 @@ LoadObjectsRunCallback_02: ; 154d7 DelayClearingOldSprites: ; 154eb ld hl, wPlayerSpriteSetupFlags - set 7, [hl] + set PLAYERSPRITESETUP_RESET_ACTION_F, [hl] ret ; 154f1 DelayLoadingNewSprites: ; 154f1 ld hl, wPlayerSpriteSetupFlags - set 6, [hl] + set PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl] ret CheckReplaceKrisSprite: ; 154f7 diff --git a/engine/overworld.asm b/engine/overworld.asm index 4c379711d..2cac7df02 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -62,10 +62,10 @@ GetPlayerSprite: ; 14183 ; Get Chris or Kris's sprite. ld hl, .Chris ld a, [wPlayerSpriteSetupFlags] - bit 2, a + bit PLAYERSPRITESETUP_FEMALE_TO_MALE_F, a jr nz, .go ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .go ld hl, .Kris diff --git a/engine/pack.asm b/engine/pack.asm index f9c7490af..da75b71b1 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -1288,7 +1288,7 @@ DrawPackGFX: ; 1089d cp BATTLETYPE_TUTORIAL jr z, .male_dude ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr nz, .female .male_dude ld hl, PackGFXPointers diff --git a/engine/player_gfx.asm b/engine/player_gfx.asm index 21929e32c..28441e700 100644 --- a/engine/player_gfx.asm +++ b/engine/player_gfx.asm @@ -1,7 +1,7 @@ Unreferenced_Function88248: ; 88248 ld c, CAL ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .okay ld c, KAREN @@ -58,7 +58,7 @@ MovePlayerPic: ; 88266 ShowPlayerNamingChoices: ; 88297 ld hl, ChrisNameMenuDataHeader ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .GotGender ld hl, KrisNameMenuDataHeader .GotGender: @@ -76,7 +76,7 @@ GetPlayerNameArray: ; 88318 This Function is never called ld hl, PlayerName ld de, MalePlayerNameArray ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .done ld de, FemalePlayerNameArray @@ -92,7 +92,7 @@ GetPlayerIcon: ; 8832c ld b, BANK(ChrisSpriteGFX) ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .done ; Female @@ -105,7 +105,7 @@ GetPlayerIcon: ; 8832c GetCardPic: ; 8833e ld hl, ChrisCardPic ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .GotClass ld hl, KrisCardPic .GotClass: @@ -131,7 +131,7 @@ INCBIN "gfx/trainer_card/trainer_card.2bpp" GetPlayerBackpic: ; 88825 ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, GetChrisBackpic call GetKrisBackpic ret @@ -150,7 +150,7 @@ HOF_LoadTrainerFrontpic: ; 88840 ld [hBGMapMode], a ld e, 0 ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .GotClass ld e, 1 @@ -159,7 +159,7 @@ HOF_LoadTrainerFrontpic: ; 88840 ld [TrainerClass], a ld de, ChrisPic ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .GotPic ld de, KrisPic @@ -179,7 +179,7 @@ DrawIntroPlayerPic: ; 88874 ; Get class ld e, CHRIS ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .GotClass ld e, KRIS .GotClass: @@ -189,7 +189,7 @@ DrawIntroPlayerPic: ; 88874 ; Load pic ld de, ChrisPic ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .GotPic ld de, KrisPic .GotPic: diff --git a/engine/player_object.asm b/engine/player_object.asm index 802cf6ade..f89a63fb1 100755 --- a/engine/player_object.asm +++ b/engine/player_object.asm @@ -31,10 +31,10 @@ SpawnPlayer: ; 8029 add hl, bc ln e, PAL_NPC_RED, OBJECTTYPE_SCRIPT ld a, [wPlayerSpriteSetupFlags] - bit 2, a + bit PLAYERSPRITESETUP_FEMALE_TO_MALE_F, a jr nz, .ok ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .ok ln e, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT diff --git a/engine/pokegear.asm b/engine/pokegear.asm index cfb8857fa..86c538253 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -687,7 +687,7 @@ PokegearMap_InitPlayerIcon: ; 9106a depixel 0, 0 ld b, SPRITE_ANIM_INDEX_RED_WALK ld a, [wPlayerGender] - bit 0, a ; ENGINE_PLAYER_IS_FEMALE + bit PLAYERGENDER_FEMALE_F, a jr z, .got_gender ld b, SPRITE_ANIM_INDEX_BLUE_WALK .got_gender @@ -2690,7 +2690,7 @@ Pokedex_GetArea: ; 91d11 push bc ld c, PAL_OW_RED ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .male inc c ; PAL_OW_BLUE .male @@ -2917,7 +2917,7 @@ TownMapPlayerIcon: ; 91fa6 depixel 0, 0 ld b, SPRITE_ANIM_INDEX_RED_WALK ; Male ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .got_gender ld b, SPRITE_ANIM_INDEX_BLUE_WALK ; Female .got_gender diff --git a/engine/scripting.asm b/engine/scripting.asm index c847ed96d..eebebb752 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -2477,7 +2477,7 @@ Script_warpfacing: maskbits NUM_DIRECTIONS ld c, a ld a, [wPlayerSpriteSetupFlags] - set 5, a + set PLAYERSPRITESETUP_CUSTOM_FACING_F, a or c ld [wPlayerSpriteSetupFlags], a ; fall through diff --git a/engine/specials.asm b/engine/specials.asm index 965e3d58b..429b752c3 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -350,7 +350,7 @@ Special_CheckPokerus: ; c419 Special_ResetLuckyNumberShowFlag: ; c422 farcall RestartLuckyNumberCountdown ld hl, wLuckyNumberShowFlag - res 0, [hl] + res LUCKYNUMBERSHOW_GAME_OVER_F, [hl] farcall LoadOrRegenerateLuckyIDNumber ret ; c434 diff --git a/engine/tileset_anims.asm b/engine/tileset_anims.asm index 5113ae9a3..62e84a401 100644 --- a/engine/tileset_anims.asm +++ b/engine/tileset_anims.asm @@ -502,7 +502,7 @@ ForestTreeLeftAnimation: ; fc45c ; Only during the Celebi event. ld a, [wCelebiEvent] - bit 2, a + bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a jr nz, .asm_fc46c ld hl, ForestTreeLeftFrames jr .asm_fc47d @@ -544,7 +544,7 @@ ForestTreeRightAnimation: ; fc4c4 ; Only during the Celebi event. ld a, [wCelebiEvent] - bit 2, a + bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a jr nz, .asm_fc4d4 ld hl, ForestTreeRightFrames jr .asm_fc4eb @@ -579,7 +579,7 @@ ForestTreeLeftAnimation2: ; fc4f2 ; Only during the Celebi event. ld a, [wCelebiEvent] - bit 2, a + bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a jr nz, .asm_fc502 ld hl, ForestTreeLeftFrames jr .asm_fc515 @@ -611,7 +611,7 @@ ForestTreeRightAnimation2: ; fc51c ; Only during the Celebi event. ld a, [wCelebiEvent] - bit 2, a + bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a jr nz, .asm_fc52c ld hl, ForestTreeRightFrames jr .asm_fc545 diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm index e15809c04..a16a2885e 100755 --- a/engine/warp_connection.asm +++ b/engine/warp_connection.asm @@ -322,7 +322,7 @@ RefreshMapSprites: ; 1047f0 farcall RefreshPlayerSprite farcall CheckReplaceKrisSprite ld hl, wPlayerSpriteSetupFlags - bit 6, [hl] + bit PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl] jr nz, .skip ld hl, VramState set 0, [hl] diff --git a/home/text.asm b/home/text.asm index 2dbb85f6d..ef8832857 100644 --- a/home/text.asm +++ b/home/text.asm @@ -399,7 +399,7 @@ PlaceGenderedPlayerName:: ; 1252 ld h, b ld l, c ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a ld de, KunSuffixText jr z, PlaceCommandCharacter ld de, ChanSuffixText diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 16889aa51..bb637fa26 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -167,7 +167,7 @@ AzaleaTownCelebiScene: waitbutton verbosegiveitem GS_BALL spriteface AZALEATOWN_KURT_OUTSIDE, LEFT - setflag ENGINE_HAVE_EXAMINED_GS_BALL + setflag ENGINE_FOREST_IS_RESTLESS clearevent EVENT_ILEX_FOREST_LASS setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS setscene 0 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 01351cd84..4d818133f 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -464,7 +464,7 @@ MapIlexForestSignpost4Script: pause 30 spriteface PLAYER, DOWN pause 20 - clearflag ENGINE_HAVE_EXAMINED_GS_BALL + clearflag ENGINE_FOREST_IS_RESTLESS special Special_CelebiShrineEvent loadwildmon CELEBI, 30 startbattle diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index 934afb457..9d08c9284 100755 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -315,7 +315,7 @@ asm_4828d: ; 4828d (12:428d) ld a, [hli] cp $50 jr nz, .asm_482e1 - ld a, $1 + ld a, 1 << PLAYERGENDER_FEMALE_F ld [wPlayerGender], a jr .asm_482f1 .asm_482ed @@ -800,7 +800,7 @@ Function4873c: ; 4873c (12:473c) add B_BUTTON ld [hli], a ; joypad filter ; ld a, [wPlayerGender] - ; xor 1 + ; xor 1 << PLAYERGENDER_FEMALE_F ; inc a ld a, [wPlayerGender] and a diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index 618c8a312..e96fd1e8f 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -619,7 +619,7 @@ Function89481: ; 89481 Function89492: ; 89492 (22:5492) ld d, 0 ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a ret z inc d ret @@ -1269,7 +1269,7 @@ Function897d5: ; 897d5 Function89807: ; 89807 (22:5807) ld hl, MobileAdapterGFX + $20 tiles ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .asm_89814 ld hl, MobileAdapterGFX + $43 tiles .asm_89814 diff --git a/wram.asm b/wram.asm index efd8345de..8eb667c58 100644 --- a/wram.asm +++ b/wram.asm @@ -2285,7 +2285,9 @@ wXYComparePointer:: dw ; d453 wBattleScriptFlags:: dw ; d459 wPlayerSpriteSetupFlags:: ; d45b ; bit 7: if set, cancel PlayerAction +; bit 6: RefreshMapSprites doesn't reload player sprite ; bit 5: if set, set facing according to bits 0-1 +; bit 2: female player has been transformed into male ; bits 0-1: direction facing db wMapReentryScriptQueueFlag:: db ; d45c MemScriptFlag @@ -2626,7 +2628,9 @@ wCurBox:: db ; db72 ; 8 chars + $50 wBoxNames:: ds BOX_NAME_LENGTH * NUM_BOXES ; db75 -wCelebiEvent:: db +wCelebiEvent:: ; dbf3 +; bit 2: forest is restless + db ds 1 @@ -2720,7 +2724,8 @@ wPhoneList:: ds CONTACT_LIST_SIZE ; dc7c ; dc86 ds 23 -wLuckyNumberShowFlag:: dw ; dc9d +wLuckyNumberShowFlag:: db ; dc9d + ds 1 wLuckyIDNumber:: dw ; dc9f wRepelEffect:: db ; If a Repel is in use, it contains the nr of steps it's still active From 3a7f518de4bbced15cbf5bb877a988055de7d063 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 15:40:43 -0500 Subject: [PATCH 009/135] wStatusFlags/2 bit constants --- constants/engine_flags.asm | 12 +++++----- constants/wram_constants.asm | 30 ++++++++++++++++++++++++ data/engine_flags.asm | 38 ++++++++++++++++--------------- engine/events.asm | 2 +- engine/events/field_moves.asm | 2 +- engine/events/halloffame.asm | 2 +- engine/events/pokerus/pokerus.asm | 15 ++++++------ engine/events/std_scripts.asm | 4 ++-- engine/events/sweet_scent.asm | 2 +- engine/events_2.asm | 12 +++++----- engine/intro_menu.asm | 4 ++-- engine/main_menu.asm | 6 +++-- engine/mart.asm | 2 +- engine/pokedex/pokedex.asm | 2 +- engine/pokegear.asm | 8 +++---- engine/radio.asm | 4 ++-- engine/scripting.asm | 4 ++-- engine/start_menu.asm | 14 ++++++------ engine/timeofdaypals.asm | 2 +- engine/trainer_card.asm | 2 +- engine/wildmons.asm | 4 ++-- home/audio.asm | 2 +- home/flag.asm | 12 +++++----- home/map.asm | 4 ++-- maps/GoldenrodCity.asm | 2 +- mobile/mobile_40.asm | 12 +++++----- mobile/mobile_46.asm | 10 ++++---- wram.asm | 10 ++++---- 28 files changed, 129 insertions(+), 94 deletions(-) diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index 0b5695dd3..40ba221d4 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -19,7 +19,7 @@ ; wStatusFlags const ENGINE_POKEDEX const ENGINE_UNOWN_DEX - const ENGINE_POKERUS + const ENGINE_CAUGHT_POKERUS const ENGINE_ROCKET_SIGNAL_ON_CH20 const ENGINE_CREDITS_SKIP const ENGINE_BUG_CONTEST_ON ; 10 @@ -28,8 +28,8 @@ const ENGINE_SAFARI_ZONE const ENGINE_ROCKETS_IN_RADIO_TOWER const ENGINE_BIKE_SHOP_CALL_ENABLED - const ENGINE_GIVE_POKERUS - const ENGINE_FLORIA + const ENGINE_CAN_USE_SWEET_SCENT + const ENGINE_REACHED_GOLDENROD const ENGINE_ROCKETS_IN_MAHOGANY ; wBikeFlags const ENGINE_STRENGTH_ACTIVE @@ -58,10 +58,10 @@ const ENGINE_UNLOCKED_UNOWNS_L_TO_R const ENGINE_UNLOCKED_UNOWNS_S_TO_W const ENGINE_UNLOCKED_UNOWNS_X_TO_Z - const ENGINE_UNLOCKED_UNOWNS_UNUSED_5 - const ENGINE_UNLOCKED_UNOWNS_UNUSED_6 ; 30 + const ENGINE_UNLOCKED_UNOWNS_UNUSED_4 + const ENGINE_UNLOCKED_UNOWNS_UNUSED_5 ; 30 + const ENGINE_UNLOCKED_UNOWNS_UNUSED_6 const ENGINE_UNLOCKED_UNOWNS_UNUSED_7 - const ENGINE_UNLOCKED_UNOWNS_UNUSED_8 ; wVisitedSpawns const ENGINE_FLYPOINT_KRISS_HOUSE const ENGINE_FLYPOINT_VIRIDIAN_POKECENTER diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index dce4ab551..59ca28c36 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -142,6 +142,28 @@ SPAWN_RED EQU 2 PLAYER_OBJECT EQU 0 NUM_OBJECTS EQU $10 +; wStatusFlags:: ; d84c + const_def + const STATUSFLAGS_POKEDEX_F ; 0 + const STATUSFLAGS_UNOWN_DEX_F ; 1 + const STATUSFLAGS_FLASH_F ; 2 + const STATUSFLAGS_CAUGHT_POKERUS_F ; 3 + const STATUSFLAGS_ROCKET_SIGNAL_F ; 4 + const STATUSFLAGS_NO_WILD_ENCOUNTERS_F ; 5 + const STATUSFLAGS_HALL_OF_FAME_F ; 6 + const STATUSFLAGS_BUG_CONTEST_ON_F ; 7 + +; wStatusFlags2:: ; d84d + const_def + const STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F ; 0 + const STATUSFLAGS2_SAFARI_GAME_F ; 1 + const STATUSFLAGS2_BUG_CONTEST_TIMER_F ; 2 + const STATUSFLAGS2_UNUSED_F ; 3 + const STATUSFLAGS2_BIKE_SHOP_CALL_F ; 4 + const STATUSFLAGS2_CAN_USE_SWEET_SCENT_F ; 5 + const STATUSFLAGS2_REACHED_GOLDENROD_F ; 6 + const STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F ; 7 + ; wMomSavingMoney:: ; d854 MOM_SAVING_SOME_MONEY_F EQU 0 MOM_SAVING_HALF_MONEY_F EQU 1 @@ -204,6 +226,14 @@ CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2 const BIKEFLAGS_ALWAYS_ON_BIKE_F ; 1 const BIKEFLAGS_DOWNHILL_F ; 2 +; wSwarmFlags:: ; dc20 + const_def + const SWARMFLAGS_BUENAS_PASSWORD_F ; 0 + const SWARMFLAGS_GOLDENROD_DEPT_STORE_SALE_F ; 1 + const SWARMFLAGS_DUNSPARCE_SWARM_F ; 2 + const SWARMFLAGS_YANMA_SWARM_F ; 3 + const SWARMFLAGS_MOBILE_4_F ; 4 + ; wLuckyNumberShowFlag:: ; dc9d LUCKYNUMBERSHOW_GAME_OVER_F EQU 0 diff --git a/data/engine_flags.asm b/data/engine_flags.asm index 064f08de3..74f4535a0 100644 --- a/data/engine_flags.asm +++ b/data/engine_flags.asm @@ -24,19 +24,20 @@ EngineFlags: ; 80462 engine_flag wUnusedTwoDayTimerOn, 0 ; unused, possibly related to a 2-day timer - engine_flag wStatusFlags, 0 ; pokedex - engine_flag wStatusFlags, 1 ; unown dex - engine_flag wStatusFlags, 3 ; pokerus - engine_flag wStatusFlags, 4 ; rocket signal on ch20 - engine_flag wStatusFlags, 6 ; credits skip - engine_flag wStatusFlags, 7 ; bug contest on ; $10 - engine_flag wStatusFlags2, 2 ; bug contest timer - engine_flag wStatusFlags2, 1 ; safari zone? - engine_flag wStatusFlags2, 0 ; rockets in radio tower - engine_flag wStatusFlags2, 4 ; bike shop call enabled (1024 bike steps reqd) - engine_flag wStatusFlags2, 5 ; give pokerus - engine_flag wStatusFlags2, 6 ; berry -> berry juice when trading? - engine_flag wStatusFlags2, 7 ; rockets in mahogany + 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 wStatusFlags, STATUSFLAGS_BUG_CONTEST_ON_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_CAN_USE_SWEET_SCENT_F + engine_flag wStatusFlags2, STATUSFLAGS2_REACHED_GOLDENROD_F + engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F engine_flag wBikeFlags, BIKEFLAGS_STRENGTH_ACTIVE_F ; $18 engine_flag wBikeFlags, BIKEFLAGS_ALWAYS_ON_BIKE_F @@ -100,7 +101,8 @@ EngineFlags: ; 80462 engine_flag wVisitedSpawns, NUM_SPAWNS ; unused engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F - engine_flag wStatusFlags2, 3 ; ???? + + engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_F engine_flag wDailyFlags, 0 ; kurt making balls ; $50 engine_flag wDailyFlags, 1 ; ???? @@ -120,8 +122,8 @@ EngineFlags: ; 80462 engine_flag wWeeklyFlags, 6 ; move tutor engine_flag wWeeklyFlags, 7 ; buenas password - engine_flag wSwarmFlags, 0 ; buenas password 2 - engine_flag wSwarmFlags, 1 ; goldenrod dept store sale is on + engine_flag wSwarmFlags, SWARMFLAGS_BUENAS_PASSWORD_F + engine_flag wSwarmFlags, SWARMFLAGS_GOLDENROD_DEPT_STORE_SALE_F engine_flag wGameTimerPause, 7 ; $62 @@ -193,7 +195,7 @@ EngineFlags: ; 80462 engine_flag wPlayerSpriteSetupFlags, PLAYERSPRITESETUP_FEMALE_TO_MALE_F - engine_flag wSwarmFlags, 2 ; dunsparce swarm ; $a0 - engine_flag wSwarmFlags, 3 ; yanma swarm + engine_flag wSwarmFlags, SWARMFLAGS_DUNSPARCE_SWARM_F ; $a0 + engine_flag wSwarmFlags, SWARMFLAGS_YANMA_SWARM_F ; 80648 diff --git a/engine/events.asm b/engine/events.asm index 96108730a..fd355744a 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -493,7 +493,7 @@ CheckTimeEvents: ; 9693a jr nz, .nothing ld hl, wStatusFlags2 - bit 2, [hl] ; bug contest + bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl] jr z, .do_daily farcall CheckBugContestTimer diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index 3fb1fe9e6..e6c0629de 100755 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm @@ -9,7 +9,7 @@ PlayWhirlpoolSound: ; 8c7d4 BlindingFlash: ; 8c7e1 farcall Special_FadeOutPalettes ld hl, wStatusFlags - set 2, [hl] ; Flash + set STATUSFLAGS_FLASH_F, [hl] farcall ReplaceTimeOfDayPals farcall UpdateTimeOfDayPal ld b, SCGB_MAPPALS diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index dbd3a2d5a..3de91fa5c 100755 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -12,7 +12,7 @@ HallOfFame:: ; 0x8640e ; Enable the Pokégear map to cycle through all of Kanto ld hl, wStatusFlags - set 6, [hl] ; hall of fame + set STATUSFLAGS_HALL_OF_FAME_F, [hl] farcall HallOfFame_InitSaveIfNeeded diff --git a/engine/events/pokerus/pokerus.asm b/engine/events/pokerus/pokerus.asm index d47bcb6c1..ab717407a 100644 --- a/engine/events/pokerus/pokerus.asm +++ b/engine/events/pokerus/pokerus.asm @@ -19,7 +19,7 @@ GivePokerusAndConvertBerries: ; 2ed44 ; If we haven't been to Goldenrod City at least once, ; prevent the contraction of Pokerus. ld hl, wStatusFlags2 - bit 6, [hl] + bit STATUSFLAGS2_REACHED_GOLDENROD_F, [hl] ret z call Random ld a, [hRandomAdd] @@ -61,7 +61,7 @@ GivePokerusAndConvertBerries: ; 2ed44 .TrySpreadPokerus: call Random - cp 1 + 33 percent + cp 33 percent + 1 ret nc ; 1/3 chance ld a, [PartyCount] @@ -74,7 +74,7 @@ GivePokerusAndConvertBerries: ; 2ed44 jr c, .checkPreviousMonsLoop ; no more mons after this one, go backwards call Random - cp 1 + 50 percent + cp 50 percent + 1 jr c, .checkPreviousMonsLoop ; 1/2 chance, go backwards .checkFollowingMonsLoop add hl, de @@ -121,14 +121,15 @@ GivePokerusAndConvertBerries: ; 2ed44 ld [hl], a ret -; any berry held by a Shuckle may be converted to berry juice ConvertBerriesToBerryJuice: ; 2ede6 +; If we haven't been to Goldenrod City at least once, +; prevent Shuckle from turning held Berry into Berry Juice. ld hl, wStatusFlags2 - bit 6, [hl] + bit STATUSFLAGS2_REACHED_GOLDENROD_F, [hl] ret z call Random - cp $10 - ret nc ; 1/16 chance + cp 6 percent + 1 ; 1/16 chance + ret nc ld hl, PartyMons ld a, [PartyCount] .partyMonLoop diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 216ce0058..e4dd586b0 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -122,7 +122,7 @@ PokecenterNurseScript: checkphonecall ; elm already called about pokerus iftrue .no - checkflag ENGINE_POKERUS ; nurse already talked about pokerus + checkflag ENGINE_CAUGHT_POKERUS iftrue .no special Special_CheckPokerus iftrue .pokerus @@ -158,7 +158,7 @@ PokecenterNurseScript: closetext .pokerus_done - setflag ENGINE_POKERUS + setflag ENGINE_CAUGHT_POKERUS specialphonecall SPECIALCALL_POKERUS end diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm index 9b75eb9b8..e936369c8 100755 --- a/engine/events/sweet_scent.asm +++ b/engine/events/sweet_scent.asm @@ -37,7 +37,7 @@ SweetScentEncounter: ; 506ef farcall CanUseSweetScent jr nc, .no_battle ld hl, wStatusFlags2 - bit 2, [hl] + bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl] jr nz, .not_in_bug_contest farcall GetMapEncounterRate ld a, b diff --git a/engine/events_2.asm b/engine/events_2.asm index 1149c2431..93044a23b 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -3,8 +3,8 @@ Special_WarpToSpawnPoint:: ; 97c28 ld hl, wStatusFlags2 - res 1, [hl] ; safari zone? - res 2, [hl] ; bug contest + res STATUSFLAGS2_SAFARI_GAME_F, [hl] + res STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl] ret ; 97c30 @@ -109,7 +109,7 @@ RandomEncounter:: ; 97cc0 call CanUseSweetScent jr nc, .nope ld hl, wStatusFlags2 - bit 2, [hl] ; bug contest + bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl] jr nz, .bug_contest farcall TryWildEncounter jr nz, .nope @@ -150,7 +150,7 @@ WildBattleScript: ; 97cf9 CanUseSweetScent:: ; 97cfd ld hl, wStatusFlags - bit 5, [hl] + bit STATUSFLAGS2_CAN_USE_SWEET_SCENT_F, [hl] jr nz, .no ld a, [wEnvironment] cp CAVE @@ -264,7 +264,7 @@ DoBikeStep:: ; 97db3 ; if we've already gotten the call, we don't have to ; be here. ld hl, wStatusFlags2 - bit 4, [hl] ; bike shop call + bit STATUSFLAGS2_BIKE_SHOP_CALL_F, [hl] jr z, .NoCall ; If we're not on the bike, we don't have to be here. @@ -315,7 +315,7 @@ DoBikeStep:: ; 97db3 xor a ld [wSpecialPhoneCallID + 1], a ld hl, wStatusFlags2 - res 4, [hl] ; bike shop call + res STATUSFLAGS2_BIKE_SHOP_CALL_F, [hl] scf ret diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index c825a6216..a99303cf0 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -541,7 +541,7 @@ Continue_LoadMenuHeader: ; 5ebf ld [hBGMapMode], a ld hl, .MenuDataHeader_Dex ld a, [wStatusFlags] - bit 0, a ; pokedex + bit STATUSFLAGS_POKEDEX_F, a jr nz, .show_menu ld hl, .MenuDataHeader_NoDex @@ -640,7 +640,7 @@ Continue_DisplayBadgeCount: ; 5f58 Continue_DisplayPokedexNumCaught: ; 5f6b ld a, [wStatusFlags] - bit 0, a ; Pokedex + bit STATUSFLAGS_POKEDEX_F, a ret z push hl ld hl, PokedexCaught diff --git a/engine/main_menu.asm b/engine/main_menu.asm index f82c6072a..3bb3a6293 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -166,8 +166,9 @@ MainMenu_GetWhichMenu: ; 49da4 cp -1 call CloseSRAM jr nz, .mystery_gift + ; This check makes no difference. ld a, [wStatusFlags] - bit 7, a + bit STATUSFLAGS_BUG_CONTEST_ON_F, a ld a, $1 ; Continue jr z, .ok jr .ok @@ -180,8 +181,9 @@ MainMenu_GetWhichMenu: ; 49da4 ret .mystery_gift + ; This check makes no difference. ld a, [wStatusFlags] - bit 7, a + bit STATUSFLAGS_BUG_CONTEST_ON_F, a jr z, .ok3 jr .ok3 diff --git a/engine/mart.asm b/engine/mart.asm index b427037c1..ed93cbb81 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -82,7 +82,7 @@ RooftopSale: ; 15ac4 ld b, BANK(RooftopSaleData1) ld de, RooftopSaleData1 ld hl, wStatusFlags - bit 6, [hl] ; hall of fame + bit STATUSFLAGS_HALL_OF_FAME_F, [hl] jr z, .ok ld b, BANK(RooftopSaleData2) ld de, RooftopSaleData2 diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index e96d0a7d7..00321d07a 100644 --- a/engine/pokedex/pokedex.asm +++ b/engine/pokedex/pokedex.asm @@ -108,7 +108,7 @@ InitPokedex: ; 40063 Pokedex_CheckUnlockedUnownMode: ; 400a2 ld a, [wStatusFlags] - bit 1, a + bit STATUSFLAGS_UNOWN_DEX_F, a jr nz, .unlocked xor a diff --git a/engine/pokegear.asm b/engine/pokegear.asm index 86c538253..2bb819bf5 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -764,7 +764,7 @@ PokegearMap_UpdateCursorPosition: ; 910d4 TownMap_GetKantoLandmarkLimits: ; 910e8 ld a, [wStatusFlags] - bit 6, a ; ENGINE_CREDITS_SKIP + bit STATUSFLAGS_HALL_OF_FAME_F, a jr z, .not_hof ld d, ROUTE_28 ld e, PALLET_TOWN @@ -1613,7 +1613,7 @@ RadioChannels: .EvolutionRadio: ; This station airs in the Lake of Rage area when Rocket are still in Mahogany. ld a, [wStatusFlags] - bit 4, a ; ENGINE_ROCKET_SIGNAL_ON_CH20 + bit STATUSFLAGS_ROCKET_SIGNAL_F, a jr z, .NoSignal ld a, [wPokegearMapPlayerIconLandmark] cp MAHOGANY_TOWN @@ -1699,7 +1699,7 @@ LoadStation_BuenasPassword: ; 917a5 (24:57a5) call Radio_BackUpFarCallParams ld de, NotBuenasPasswordName ld a, [wStatusFlags2] - bit 0, a ; ENGINE_ROCKETS_IN_RADIO_TOWER + bit STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F, a ret z ld de, BuenasPasswordName ret @@ -2561,7 +2561,7 @@ Pokedex_GetArea: ; 91d11 .right ld a, [wStatusFlags] - bit 6, a ; ENGINE_CREDITS_SKIP + bit STATUSFLAGS_HALL_OF_FAME_F, a ret z ld a, [hWY] and a diff --git a/engine/radio.asm b/engine/radio.asm index 67485dc03..9e9646505 100644 --- a/engine/radio.asm +++ b/engine/radio.asm @@ -5,7 +5,7 @@ PlayRadioShow: jr nc, .ok ; If Team Rocket is not occupying the radio tower, we don't need to be here. ld a, [wStatusFlags2] - bit 0, a ; checkflag ENGINE_ROCKETS_IN_RADIO_TOWER + bit STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F, a jr z, .ok ; If we're in Kanto, we don't need to be here. call IsInJohto @@ -1171,7 +1171,7 @@ PeoplePlaces4: ; People push af ld hl, PnP_HiddenPeople ld a, [wStatusFlags] - bit 6, a ; ENGINE_CREDITS_SKIP + bit STATUSFLAGS_HALL_OF_FAME_F, a jr z, .ok ld hl, PnP_HiddenPeople_BeatE4 ld a, [wKantoBadges] diff --git a/engine/scripting.asm b/engine/scripting.asm index eebebb752..1ecdc016c 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -2449,14 +2449,14 @@ Script_wildoff: ; script command 0x38 ld hl, wStatusFlags - set 5, [hl] + set STATUSFLAGS_NO_WILD_ENCOUNTERS_F, [hl] ret Script_wildon: ; script command 0x37 ld hl, wStatusFlags - res 5, [hl] + res STATUSFLAGS_NO_WILD_ENCOUNTERS_F, [hl] ret Script_xycompare: diff --git a/engine/start_menu.asm b/engine/start_menu.asm index 20ab75ff4..a60a8b3ce 100755 --- a/engine/start_menu.asm +++ b/engine/start_menu.asm @@ -21,7 +21,7 @@ StartMenu:: ; 125cd farcall ReanchorBGMap_NoOAMUpdate ld hl, wStatusFlags2 - bit 2, [hl] ; bug catching contest + bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl] ld hl, .MenuDataHeader jr z, .GotMenuData ld hl, .ContestMenuDataHeader @@ -306,7 +306,7 @@ endr call .FillMenuList ld hl, wStatusFlags - bit 0, [hl] + bit STATUSFLAGS_POKEDEX_F, [hl] jr z, .no_pokedex ld a, STARTMENUITEM_POKEDEX call .AppendMenuList @@ -323,7 +323,7 @@ endr and a jr nz, .no_pack ld hl, wStatusFlags2 - bit 2, [hl] ; bug catching contest + bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl] jr nz, .no_pack ld a, STARTMENUITEM_PACK call .AppendMenuList @@ -336,14 +336,14 @@ endr call .AppendMenuList .no_pokegear - ld a, 3 ; status + ld a, STARTMENUITEM_STATUS call .AppendMenuList ld a, [wLinkMode] and a jr nz, .no_save ld hl, wStatusFlags2 - bit 2, [hl] ; bug catching contest + bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl] ld a, STARTMENUITEM_QUIT jr nz, .write ld a, STARTMENUITEM_SAVE @@ -412,7 +412,7 @@ endr .DrawBugContestStatusBox: ; 128d1 ld hl, wStatusFlags2 - bit 2, [hl] ; bug catching contest + bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl] ret z farcall StartMenu_DrawBugContestStatusBox ret @@ -420,7 +420,7 @@ endr .DrawBugContestStatus: ; 128de ld hl, wStatusFlags2 - bit 2, [hl] ; bug catching contest + bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl] jr nz, .contest ret .contest diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index 6dfa5657a..2e4d4eec0 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -216,7 +216,7 @@ ReplaceTimeOfDayPals: ; 8c0e5 .DarkCave: ld a, [wStatusFlags] - bit 2, a ; Flash + bit STATUSFLAGS_FLASH_F, a jr nz, .UsedFlash ld a, %11111111 ; 3, 3, 3, 3 ld [wTimeOfDayPalset], a diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm index 6d59660f7..29c4b202f 100755 --- a/engine/trainer_card.asm +++ b/engine/trainer_card.asm @@ -290,7 +290,7 @@ TrainerCard_Page1_PrintDexCaught_GameTime: ; 2530a (9:530a) ld de, .StatusTilemap call TrainerCardSetup_PlaceTilemapString ld a, [wStatusFlags] - bit 0, a ; ENGINE_POKEDEX + bit STATUSFLAGS_POKEDEX_F, a ret nz hlcoord 1, 9 lb bc, 2, 17 diff --git a/engine/wildmons.asm b/engine/wildmons.asm index 50d4ea250..d2da42611 100755 --- a/engine/wildmons.asm +++ b/engine/wildmons.asm @@ -429,7 +429,7 @@ _SwarmWildmonCheck call CopyCurrMapDE push hl ld hl, wSwarmFlags - bit 2, [hl] + bit SWARMFLAGS_DUNSPARCE_SWARM_F, [hl] pop hl jr z, .CheckYanma ld a, [wDunsparceMapGroup] @@ -446,7 +446,7 @@ _SwarmWildmonCheck .CheckYanma: push hl ld hl, wSwarmFlags - bit 3, [hl] + bit SWARMFLAGS_YANMA_SWARM_F, [hl] pop hl jr z, _NoSwarmWildmon ld a, [wYanmaMapGroup] diff --git a/home/audio.asm b/home/audio.asm index 44786ee29..7508d569c 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -462,7 +462,7 @@ SpecialMapMusic:: ; 3d62 jr z, .surf ld a, [wStatusFlags2] - bit 2, a + bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, a jr nz, .contest .no diff --git a/home/flag.asm b/home/flag.asm index 5f1d783af..040333a5f 100644 --- a/home/flag.asm +++ b/home/flag.asm @@ -15,15 +15,15 @@ ResetBikeFlags:: ; 2e56 ResetFlashIfOutOfCave:: ; 2e5d ld a, [wEnvironment] - cp $2 - jr z, .asm_2e69 - cp $1 - jr z, .asm_2e69 + cp ROUTE + jr z, .outdoors + cp TOWN + jr z, .outdoors ret -.asm_2e69 +.outdoors ld hl, wStatusFlags - res 2, [hl] + res STATUSFLAGS_FLASH_F, [hl] ret ; 2e6f diff --git a/home/map.asm b/home/map.asm index a66391896..1ed0e5ca8 100644 --- a/home/map.asm +++ b/home/map.asm @@ -2306,7 +2306,7 @@ GetMapMusic:: ; 2cbd .radiotower ld a, [wStatusFlags2] - bit 0, a + bit STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F, a jr z, .clearedradiotower ld de, MUSIC_ROCKET_OVERTURE jr .done @@ -2321,7 +2321,7 @@ GetMapMusic:: ; 2cbd .mahoganymart ld a, [wStatusFlags2] - bit 7, a + bit STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F, a jr z, .clearedmahogany ld de, MUSIC_ROCKET_HIDEOUT jr .done diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 89ca2bb0d..f9f506fdd 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -26,7 +26,7 @@ GoldenrodCity_MapScripts: .FlyPointAndFloria: setflag ENGINE_FLYPOINT_GOLDENROD - setflag ENGINE_FLORIA + setflag ENGINE_REACHED_GOLDENROD checkevent EVENT_MET_FLORIA iftrue .FloriaDone clearevent EVENT_FLORIA_AT_SUDOWOODO diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 48751e4fa..0a04453a0 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -7894,7 +7894,7 @@ Function1036f9: ; 1036f9 Function103700: ; 103700 ld c, $0a ld hl, wSwarmFlags - bit 4, [hl] + bit SWARMFLAGS_MOBILE_4_F, [hl] jr z, .asm_10370f farcall Function1008a6 @@ -7991,18 +7991,18 @@ Special_Function103780: ; 103780 Function10378c: ; 10378c ld c, 0 ld hl, wSwarmFlags - bit 4, [hl] + bit SWARMFLAGS_MOBILE_4_F, [hl] jr nz, .already_set - ld c, $01 + ld c, 1 ld hl, wSwarmFlags - set 4, [hl] + set SWARMFLAGS_MOBILE_4_F, [hl] .already_set push bc farcall Link_SaveGame pop bc jr c, .failed_to_save - ld a, $01 + ld a, 1 ld [ScriptVar], a ld a, c and a @@ -8017,7 +8017,7 @@ Function10378c: ; 10378c and a ret z ld hl, wSwarmFlags - res 4, [hl] + res SWARMFLAGS_MOBILE_4_F, [hl] ret ; 1037c2 diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 98e896789..51ae92703 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -1199,15 +1199,15 @@ BattleTowerRoomMenu_PlacePickLevelMenu: ld a, $1 ld [rSVBK], a ld a, [wStatusFlags] - bit 6, a ; Hall Of Fame + bit STATUSFLAGS_HALL_OF_FAME_F, a jr nz, .asm_11896b - ld hl, Strings_Ll0ToL40 ; Address to list of strings with the choosable levels - ld a, 5 ; 4 levels to choose from, including 'Cancel'-option + ld hl, Strings_Ll0ToL40 ; Address to list of strings with the choosable levels + ld a, 5 ; 4 levels to choose from, including 'Cancel'-option jr .asm_118970 .asm_11896b - ld hl, Strings_L10ToL100 ; Address to list of strings with the choosable levels - ld a, 11 ; 10 levels to choose from, including 'Cancel'-option + ld hl, Strings_L10ToL100 ; Address to list of strings with the choosable levels + ld a, 11 ; 10 levels to choose from, including 'Cancel'-option .asm_118970 ld [wcd4a], a diff --git a/wram.asm b/wram.asm index 8eb667c58..362dc5699 100644 --- a/wram.asm +++ b/wram.asm @@ -2420,8 +2420,8 @@ wSecretID:: dw wStatusFlags:: ; d84c ; bit 0: pokedex ; bit 1: unown dex -; bit 2: unused -; bit 3: pokerus +; bit 2: flash +; bit 3: caught pokerus ; bit 4: rocket signal ; bit 5: wild encounters on/off ; bit 6: hall of fame @@ -2430,12 +2430,12 @@ wStatusFlags:: ; d84c wStatusFlags2:: ; d84d ; bit 0: rockets -; bit 1: unused +; bit 1: safari game (unused) ; bit 2: bug contest timer ; bit 3: unused ; bit 4: bike shop call -; bit 5: pokerus -; bit 6: berry juice +; bit 5: can use sweet scent +; bit 6: reached goldenrod ; bit 7: rockets in mahogany db From efe6981a0db99aa2deeb7fbea5a51c9e40dd4138 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 15:59:24 -0500 Subject: [PATCH 010/135] Add daily+weekly bit flags (close issue #429) --- constants/engine_flags.asm | 8 ++++---- constants/wram_constants.asm | 23 ++++++++++++++++++++++- data/engine_flags.asm | 32 ++++++++++++++++---------------- engine/events/fish.asm | 2 +- engine/events/fruit_trees.asm | 4 ++-- engine/events/special.asm | 2 +- engine/mart.asm | 2 +- engine/phone/phone_scripts.asm | 6 +++--- engine/radio.asm | 10 +++++----- engine/time.asm | 12 ++++++------ maps/BluesHouse.asm | 4 ++-- maps/GoldenrodDeptStore5F.asm | 6 +++--- maps/ManiasHouse.asm | 2 +- maps/Route32.asm | 2 +- 14 files changed, 68 insertions(+), 47 deletions(-) diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index 40ba221d4..d3ccdbf06 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -97,18 +97,18 @@ ; wDailyFlags const ENGINE_KURT_MAKING_BALLS ; 50 const ENGINE_DAILY_BUG_CONTEST - const ENGINE_SPECIAL_WILDDATA + const ENGINE_FISH_SWARM const ENGINE_TIME_CAPSULE const ENGINE_ALL_FRUIT_TREES - const ENGINE_SHUCKLE_GIVEN + const ENGINE_GOT_SHUCKIE_TODAY const ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED const ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY ; wWeeklyFlags const ENGINE_MT_MOON_SQUARE_CLEFAIRY const ENGINE_UNION_CAVE_LAPRAS const ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT - const ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT - const ENGINE_TEA_IN_BLUES_HOUSE + const ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN + const ENGINE_DAISYS_GROOMING const ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT const ENGINE_DAILY_MOVE_TUTOR const ENGINE_BUENAS_PASSWORD diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 59ca28c36..422334e47 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -17,7 +17,6 @@ AUTO_INPUT EQU $ff const WILDMON ; 4 ; Options:: ; cfcc - const_value set 4 const NO_TEXT_SCROLL ; 4 const STEREO ; 5 @@ -226,6 +225,28 @@ CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2 const BIKEFLAGS_ALWAYS_ON_BIKE_F ; 1 const BIKEFLAGS_DOWNHILL_F ; 2 +; wDailyFlags:: ; dc1e + const_def + const DAILYFLAGS_KURT_MAKING_BALLS_F ; 0 + const DAILYFLAGS_BUG_CONTEST_F ; 1 + const DAILYFLAGS_FISH_SWARM_F ; 2 + const DAILYFLAGS_TIME_CAPSULE_F ; 3 + const DAILYFLAGS_ALL_FRUIT_TREES_F ; 4 + const DAILYFLAGS_GOT_SHUCKIE_TODAY_F ; 5 + const DAILYFLAGS_GOLDENROD_UNDERGROUND_BARGAIN_F ; 6 + const DAILYFLAGS_TRAINER_HOUSE_F ; 7 + +; wWeeklyFlags:: ; dc1f + const_def + const WEEKLYFLAGS_MT_MOON_SQUARE_CLEFAIRY_F ; 0 + const WEEKLYFLAGS_UNION_CAVE_LAPRAS_F ; 1 + const WEEKLYFLAGS_GOLDENROD_UNDERGROUND_GOT_HAIRCUT_F ; 2 + const WEEKLYFLAGS_GOLDENROD_DEPT_STORE_TM27_RETURN_F ; 3 + const WEEKLYFLAGS_DAISYS_GROOMING_F ; 4 + const WEEKLYFLAGS_INDIGO_PLATEAU_RIVAL_FIGHT_F ; 5 + const WEEKLYFLAGS_DAILY_MOVE_TUTOR_F ; 6 + const WEEKLYFLAGS_BUENAS_PASSWORD_F ; 7 + ; wSwarmFlags:: ; dc20 const_def const SWARMFLAGS_BUENAS_PASSWORD_F ; 0 diff --git a/data/engine_flags.asm b/data/engine_flags.asm index 74f4535a0..ac46cad4c 100644 --- a/data/engine_flags.asm +++ b/data/engine_flags.asm @@ -104,23 +104,23 @@ EngineFlags: ; 80462 engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_F - engine_flag wDailyFlags, 0 ; kurt making balls ; $50 - engine_flag wDailyFlags, 1 ; ???? - engine_flag wDailyFlags, 2 ; special wilddata? - engine_flag wDailyFlags, 3 ; time capsule (24h wait) - engine_flag wDailyFlags, 4 ; all fruit trees - engine_flag wDailyFlags, 5 ; shuckle given - engine_flag wDailyFlags, 6 ; goldenrod underground merchant closed - engine_flag wDailyFlags, 7 ; fought in trainer hall today + engine_flag wDailyFlags, DAILYFLAGS_KURT_MAKING_BALLS_F ; $50 + engine_flag wDailyFlags, DAILYFLAGS_BUG_CONTEST_F + engine_flag wDailyFlags, DAILYFLAGS_FISH_SWARM_F + engine_flag wDailyFlags, DAILYFLAGS_TIME_CAPSULE_F + engine_flag wDailyFlags, DAILYFLAGS_ALL_FRUIT_TREES_F + engine_flag wDailyFlags, DAILYFLAGS_GOT_SHUCKIE_TODAY_F + engine_flag wDailyFlags, DAILYFLAGS_GOLDENROD_UNDERGROUND_BARGAIN_F + engine_flag wDailyFlags, DAILYFLAGS_TRAINER_HOUSE_F - engine_flag wWeeklyFlags, 0 ; mt moon square clefairy ; $58 - engine_flag wWeeklyFlags, 1 ; union cave lapras - engine_flag wWeeklyFlags, 2 ; goldenrod underground haircut used - engine_flag wWeeklyFlags, 3 ; goldenrod mall happiness event floor05 object07 - engine_flag wWeeklyFlags, 4 ; tea in blues house - engine_flag wWeeklyFlags, 5 ; indigo plateau rival fight - engine_flag wWeeklyFlags, 6 ; move tutor - engine_flag wWeeklyFlags, 7 ; buenas password + engine_flag wWeeklyFlags, WEEKLYFLAGS_MT_MOON_SQUARE_CLEFAIRY_F ; $58 + engine_flag wWeeklyFlags, WEEKLYFLAGS_UNION_CAVE_LAPRAS_F + engine_flag wWeeklyFlags, WEEKLYFLAGS_GOLDENROD_UNDERGROUND_GOT_HAIRCUT_F + engine_flag wWeeklyFlags, WEEKLYFLAGS_GOLDENROD_DEPT_STORE_TM27_RETURN_F + engine_flag wWeeklyFlags, WEEKLYFLAGS_DAISYS_GROOMING_F + engine_flag wWeeklyFlags, WEEKLYFLAGS_INDIGO_PLATEAU_RIVAL_FIGHT_F + engine_flag wWeeklyFlags, WEEKLYFLAGS_DAILY_MOVE_TUTOR_F + engine_flag wWeeklyFlags, WEEKLYFLAGS_BUENAS_PASSWORD_F engine_flag wSwarmFlags, SWARMFLAGS_BUENAS_PASSWORD_F engine_flag wSwarmFlags, SWARMFLAGS_GOLDENROD_DEPT_STORE_SALE_F diff --git a/engine/events/fish.asm b/engine/events/fish.asm index 39644847d..5924180f6 100644 --- a/engine/events/fish.asm +++ b/engine/events/fish.asm @@ -98,7 +98,7 @@ GetFishGroupIndex: ; 9245b push hl ld hl, wDailyFlags - bit 2, [hl] + bit DAILYFLAGS_FISH_SWARM_F, [hl] pop hl jr z, .done diff --git a/engine/events/fruit_trees.asm b/engine/events/fruit_trees.asm index 44f2315a0..99b38873f 100644 --- a/engine/events/fruit_trees.asm +++ b/engine/events/fruit_trees.asm @@ -44,7 +44,7 @@ GetCurTreeFruit: ; 44041 TryResetFruitTrees: ; 4404c ld hl, wDailyFlags - bit 4, [hl] + bit DAILYFLAGS_ALL_FRUIT_TREES_F, [hl] ret nz jp ResetFruitTrees ; 44055 @@ -71,7 +71,7 @@ ResetFruitTrees: ; 4406a ld [hli], a ld [hl], a ld hl, wDailyFlags - set 4, [hl] + set DAILYFLAGS_ALL_FRUIT_TREES_F, [hl] ret ; 44078 diff --git a/engine/events/special.asm b/engine/events/special.asm index 128e7af29..304cfcbb9 100755 --- a/engine/events/special.asm +++ b/engine/events/special.asm @@ -56,7 +56,7 @@ Special_GiveShuckle: ; 7305 ; Engine flag for this event. ld hl, wDailyFlags - set 5, [hl] ; ENGINE_SHUCKLE_GIVEN + set DAILYFLAGS_GOT_SHUCKIE_TODAY_F, [hl] ld a, 1 ld [ScriptVar], a ret diff --git a/engine/mart.asm b/engine/mart.asm index ed93cbb81..0306a3e49 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -59,7 +59,7 @@ BargainShop: ; 15a84 or [hl] jr z, .skip_set ld hl, wDailyFlags - set 6, [hl] + set DAILYFLAGS_GOLDENROD_UNDERGROUND_BARGAIN_F, [hl] .skip_set ld hl, Text_BargainShop_ComeAgain diff --git a/engine/phone/phone_scripts.asm b/engine/phone/phone_scripts.asm index 501f4b757..d087a59f1 100644 --- a/engine/phone/phone_scripts.asm +++ b/engine/phone/phone_scripts.asm @@ -788,7 +788,7 @@ RalphPhoneScript1: checkmorn iftrue Ralph_WednesdayMorning Ralph_CheckSwarm: - checkflag ENGINE_SPECIAL_WILDDATA + checkflag ENGINE_FISH_SWARM iftrue Ralph_ReportSwarm farjump UnknownScript_0xa0940 @@ -824,9 +824,9 @@ Ralph_FightMe: farjump PhoneScript_WantsToBattle_Male Ralph_SetUpSwarm: - checkflag ENGINE_SPECIAL_WILDDATA + checkflag ENGINE_FISH_SWARM iftrue .Generic - setflag ENGINE_SPECIAL_WILDDATA + setflag ENGINE_FISH_SWARM pokenamemem QWILFISH, MEM_BUFFER_1 landmarktotext ROUTE_32, MEM_BUFFER_2 writebyte FISHSWARM_QWILFISH diff --git a/engine/radio.asm b/engine/radio.asm index 9e9646505..d2e36e572 100644 --- a/engine/radio.asm +++ b/engine/radio.asm @@ -1560,7 +1560,7 @@ BuenasPassword4: ld a, [wBuenasPassword] ; If we already generated the password today, we don't need to generate a new one. ld hl, wWeeklyFlags - bit 7, [hl] ; ENGINE_BUENAS_PASSWORD + bit WEEKLYFLAGS_BUENAS_PASSWORD_F, [hl] jr nz, .AlreadyGotIt ; There are only 11 groups to choose from. .greater_than_11 @@ -1582,7 +1582,7 @@ BuenasPassword4: ld [wBuenasPassword], a ; Set the flag so that we don't generate a new password this week. ld hl, wWeeklyFlags - set 7, [hl] ; ENGINE_BUENAS_PASSWORD + set WEEKLYFLAGS_BUENAS_PASSWORD_F, [hl] .AlreadyGotIt: ld c, a call GetBuenasPassword @@ -1703,14 +1703,14 @@ BuenasPassword7: BuenasPasswordAfterMidnight: push hl ld hl, wWeeklyFlags - res 7, [hl] ; ENGINE_BUENAS_PASSWORD + res WEEKLYFLAGS_BUENAS_PASSWORD_F, [hl] pop hl ld a, BUENAS_PASSWORD_8 jp NextRadioLine BuenasPassword8: ld hl, wWeeklyFlags - res 7, [hl] ; ENGINE_BUENAS_PASSWORD + res WEEKLYFLAGS_BUENAS_PASSWORD_F, [hl] ld hl, BuenaRadioMidnightText10 ld a, BUENAS_PASSWORD_9 jp NextRadioLine @@ -1778,7 +1778,7 @@ BuenasPassword20: pop af ld [hBGMapMode], a ld hl, wWeeklyFlags - res 7, [hl] + res WEEKLYFLAGS_BUENAS_PASSWORD_F, [hl] ld a, BUENAS_PASSWORD ld [wCurrentRadioLine], a xor a diff --git a/engine/time.asm b/engine/time.asm index 29c811810..9d1a249c5 100755 --- a/engine/time.asm +++ b/engine/time.asm @@ -102,10 +102,10 @@ CheckDailyResetTimer:: ; 11452 ret nc xor a ld hl, wDailyFlags - ld [hli], a - ld [hli], a - ld [hli], a - ld [hl], a + ld [hli], a ; wDailyFlags + ld [hli], a ; wWeeklyFlags + ld [hli], a ; wSwarmFlags + ld [hl], a ; wSwarmFlags + 1 ld hl, wDailyRematchFlags rept 4 ld [hli], a @@ -227,14 +227,14 @@ CheckUnusedTwoDayTimer: ; 1150c ; unused ld hl, wDailyFlags - set 2, [hl] + set DAILYFLAGS_FISH_SWARM_F, [hl] ret ; 11522 ; unused and a ld hl, wDailyFlags - bit 2, [hl] + bit DAILYFLAGS_FISH_SWARM_F, [hl] ret nz scf ret diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index f31fefb9d..e66bb2312 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -19,7 +19,7 @@ DaisyScript: end .ThreePM: - checkflag ENGINE_TEA_IN_BLUES_HOUSE + checkflag ENGINE_DAISYS_GROOMING iftrue .AlreadyGroomedMon writetext DaisyOfferGroomingText yesorno @@ -29,7 +29,7 @@ DaisyScript: special Special_DaisyMassage if_equal $0, .Refused if_equal $1, .CantGroomEgg - setflag ENGINE_TEA_IN_BLUES_HOUSE + setflag ENGINE_DAISYS_GROOMING writetext DaisyAlrightText waitbutton closetext diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 94da64d2f..dbea8e55c 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -63,7 +63,7 @@ ReceptionistScript_0x560ce: opentext checkcode VAR_WEEKDAY if_not_equal SUNDAY, .EventIsOver - checkflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT + checkflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN iftrue .EventIsOver special Special_GetFirstPokemonHappiness writetext UnknownText_0x56143 @@ -77,7 +77,7 @@ ReceptionistScript_0x560ce: buttonsound verbosegiveitem TM_RETURN iffalse .Done - setflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT + setflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN closetext end @@ -92,7 +92,7 @@ ReceptionistScript_0x560ce: buttonsound verbosegiveitem TM_FRUSTRATION iffalse .Done - setflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT + setflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN closetext end diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index d5d3febb6..b3ec5a564 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -31,7 +31,7 @@ ManiaScript: end .alreadyhaveshuckie - checkflag ENGINE_SHUCKLE_GIVEN + checkflag ENGINE_GOT_SHUCKIE_TODAY iffalse .returnshuckie writetext ManiaText_TakeCareOfShuckle waitbutton diff --git a/maps/Route32.asm b/maps/Route32.asm index afd946c2b..6b82252dc 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -174,7 +174,7 @@ TrainerFisherRalph1: opentext checkflag ENGINE_RALPH iftrue .Rematch - checkflag ENGINE_SPECIAL_WILDDATA + checkflag ENGINE_FISH_SWARM iftrue .Swarm checkcellnum PHONE_FISHER_RALPH iftrue .NumberAccepted From cb5e3378de0582217cdb308d33cee7afb4d7cb89 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 16:23:34 -0500 Subject: [PATCH 011/135] Move type data to data/types/ --- constants/type_constants.asm | 3 ++- data/{battle => types}/type_boost_items.asm | 0 data/{battle => types}/type_matchups.asm | 0 engine/battle/effect_commands.asm | 4 ++-- 4 files changed, 4 insertions(+), 3 deletions(-) rename data/{battle => types}/type_boost_items.asm (100%) rename data/{battle => types}/type_matchups.asm (100%) diff --git a/constants/type_constants.asm b/constants/type_constants.asm index 6587c3a70..c3524e9d9 100644 --- a/constants/type_constants.asm +++ b/constants/type_constants.asm @@ -2,7 +2,8 @@ ; also used in: ; - PokedexTypeSearchConversionTable (see data/types/search_types.asm) ; - PokedexTypeSearchStrings (see data/types/search_strings.asm) -; - TypeMatchups (see data/battle/type_matchups.asm) +; - TypeMatchups (see data/types/type_matchups.asm) +; - TypeBoostItems (see data/types/type_boost_items.asm) const_def PHYSICAL EQU const_value diff --git a/data/battle/type_boost_items.asm b/data/types/type_boost_items.asm similarity index 100% rename from data/battle/type_boost_items.asm rename to data/types/type_boost_items.asm diff --git a/data/battle/type_matchups.asm b/data/types/type_matchups.asm similarity index 100% rename from data/battle/type_matchups.asm rename to data/types/type_matchups.asm diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index c1bc3752a..ba4dc72f8 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -1639,7 +1639,7 @@ BattleCommand_ResetTypeMatchup: ; 34833 INCLUDE "engine/battle/ai/switch.asm" -INCLUDE "data/battle/type_matchups.asm" +INCLUDE "data/types/type_matchups.asm" BattleCommand_DamageVariation: ; 34cfd ; damagevariation @@ -3642,7 +3642,7 @@ BattleCommand_DamageCalc: ; 35612 ; 35703 -INCLUDE "data/battle/type_boost_items.asm" +INCLUDE "data/types/type_boost_items.asm" BattleCommand_ConstantDamage: ; 35726 From f44b7ad5c30f80d1032a9cab2e3272ef0a7efe86 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 17:33:52 -0500 Subject: [PATCH 012/135] Add data/text/ --- Makefile | 2 +- constants/pokemon_constants.asm | 2 +- data/common_text/common_text.asm | 16 ---------------- ...by_base_special.asm => gen1_base_special.asm} | 0 data/pokemon/{rby_order.asm => gen1_order.asm} | 0 data/{battle => text}/battle_text.asm | 0 data/text/common_text.asm | 16 ++++++++++++++++ data/{common_text => text}/common_text_1.asm | 0 data/{common_text => text}/common_text_2.asm | 0 data/{common_text => text}/common_text_3.asm | 0 data/{ => text}/mail_input_chars.asm | 0 data/{ => text}/name_input_chars.asm | 0 data/{ => text}/std_text.asm | 0 .../dakutens.asm => text/unused_dakutens.asm} | 0 .../unused_gen1_trainer_names.asm} | 0 .../unused_sweet_honey_text.asm} | 0 .../unknown_53d84.asm => unused_53d84.asm} | 0 engine/naming_screen.asm | 6 +++--- .../unreferenced_getgen1trainerclassname.asm | 2 +- engine/time_capsule.asm | 2 +- engine/time_capsule_2.asm | 2 +- main.asm | 6 +++--- maps/GoldenrodNameRater.asm | 2 +- 23 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 data/common_text/common_text.asm rename data/pokemon/{rby_base_special.asm => gen1_base_special.asm} (100%) rename data/pokemon/{rby_order.asm => gen1_order.asm} (100%) rename data/{battle => text}/battle_text.asm (100%) create mode 100644 data/text/common_text.asm rename data/{common_text => text}/common_text_1.asm (100%) rename data/{common_text => text}/common_text_2.asm (100%) rename data/{common_text => text}/common_text_3.asm (100%) rename data/{ => text}/mail_input_chars.asm (100%) rename data/{ => text}/name_input_chars.asm (100%) rename data/{ => text}/std_text.asm (100%) rename data/{unused/dakutens.asm => text/unused_dakutens.asm} (100%) rename data/{unused/gen_1_trainer_names.asm => text/unused_gen1_trainer_names.asm} (100%) rename data/{unused/sweet_honey_text.asm => text/unused_sweet_honey_text.asm} (100%) rename data/{unused/unknown_53d84.asm => unused_53d84.asm} (100%) diff --git a/Makefile b/Makefile index d29f69a5d..203bd4aa7 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ audio.o \ home.o \ main.o \ wram.o \ -data/common_text/common_text.o \ +data/text/common_text.o \ data/maps/maps.o \ data/pokemon/dex_entries.o \ data/pokemon/egg_moves.o \ diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index fc2c3cace..f3d03b3a0 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -12,7 +12,7 @@ ; - AlphabeticalPokedexOrder (see data/pokemon/dex_order_alpha.asm) ; - EZChat_SortedPokemon (see data/pokemon/ezchat_order.asm) ; - NewPokedexOrder (see data/pokemon/dex_order_new.asm) -; - Pokered_MonIndices (see data/pokemon/rby_order.asm) +; - Pokered_MonIndices (see data/pokemon/gen1_order.asm) ; - AnimationPointers (see gfx/pokemon/anim_pointers.asm) ; - AnimationIdlePointers (see gfx/pokemon/idle_pointers.asm) ; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm) diff --git a/data/common_text/common_text.asm b/data/common_text/common_text.asm deleted file mode 100644 index 2f88b4e9d..000000000 --- a/data/common_text/common_text.asm +++ /dev/null @@ -1,16 +0,0 @@ -INCLUDE "constants.asm" - - -SECTION "Text 1", ROMX - -INCLUDE "data/common_text/common_text_1.asm" - - -SECTION "Text 2", ROMX - -INCLUDE "data/common_text/common_text_2.asm" - - -SECTION "Text 3", ROMX - -INCLUDE "data/common_text/common_text_3.asm" diff --git a/data/pokemon/rby_base_special.asm b/data/pokemon/gen1_base_special.asm similarity index 100% rename from data/pokemon/rby_base_special.asm rename to data/pokemon/gen1_base_special.asm diff --git a/data/pokemon/rby_order.asm b/data/pokemon/gen1_order.asm similarity index 100% rename from data/pokemon/rby_order.asm rename to data/pokemon/gen1_order.asm diff --git a/data/battle/battle_text.asm b/data/text/battle_text.asm similarity index 100% rename from data/battle/battle_text.asm rename to data/text/battle_text.asm diff --git a/data/text/common_text.asm b/data/text/common_text.asm new file mode 100644 index 000000000..72ef91fea --- /dev/null +++ b/data/text/common_text.asm @@ -0,0 +1,16 @@ +INCLUDE "constants.asm" + + +SECTION "Text 1", ROMX + +INCLUDE "data/text/common_text_1.asm" + + +SECTION "Text 2", ROMX + +INCLUDE "data/text/common_text_2.asm" + + +SECTION "Text 3", ROMX + +INCLUDE "data/text/common_text_3.asm" diff --git a/data/common_text/common_text_1.asm b/data/text/common_text_1.asm similarity index 100% rename from data/common_text/common_text_1.asm rename to data/text/common_text_1.asm diff --git a/data/common_text/common_text_2.asm b/data/text/common_text_2.asm similarity index 100% rename from data/common_text/common_text_2.asm rename to data/text/common_text_2.asm diff --git a/data/common_text/common_text_3.asm b/data/text/common_text_3.asm similarity index 100% rename from data/common_text/common_text_3.asm rename to data/text/common_text_3.asm diff --git a/data/mail_input_chars.asm b/data/text/mail_input_chars.asm similarity index 100% rename from data/mail_input_chars.asm rename to data/text/mail_input_chars.asm diff --git a/data/name_input_chars.asm b/data/text/name_input_chars.asm similarity index 100% rename from data/name_input_chars.asm rename to data/text/name_input_chars.asm diff --git a/data/std_text.asm b/data/text/std_text.asm similarity index 100% rename from data/std_text.asm rename to data/text/std_text.asm diff --git a/data/unused/dakutens.asm b/data/text/unused_dakutens.asm similarity index 100% rename from data/unused/dakutens.asm rename to data/text/unused_dakutens.asm diff --git a/data/unused/gen_1_trainer_names.asm b/data/text/unused_gen1_trainer_names.asm similarity index 100% rename from data/unused/gen_1_trainer_names.asm rename to data/text/unused_gen1_trainer_names.asm diff --git a/data/unused/sweet_honey_text.asm b/data/text/unused_sweet_honey_text.asm similarity index 100% rename from data/unused/sweet_honey_text.asm rename to data/text/unused_sweet_honey_text.asm diff --git a/data/unused/unknown_53d84.asm b/data/unused_53d84.asm similarity index 100% rename from data/unused/unknown_53d84.asm rename to data/unused_53d84.asm diff --git a/engine/naming_screen.asm b/engine/naming_screen.asm index b53a3b09d..9e5fa3508 100755 --- a/engine/naming_screen.asm +++ b/engine/naming_screen.asm @@ -771,7 +771,7 @@ NamingScreen_AdvanceCursor_CheckEndOfString: ; 11b27 ; 11b56 -INCLUDE "data/unused/dakutens.asm" +INCLUDE "data/text/unused_dakutens.asm" ; 11bbc @@ -945,7 +945,7 @@ NamingScreenGFX_Cursor: ; 11cc7 INCBIN "gfx/naming_screen/cursor.2bpp" ; 11ce7 -INCLUDE "data/name_input_chars.asm" +INCLUDE "data/text/name_input_chars.asm" ; 11e5d NamingScreenGFX_End: ; unused @@ -1462,6 +1462,6 @@ MailComposition_TryAddLastCharacter: ; 121ac (4:61ac) ; 121dd -INCLUDE "data/mail_input_chars.asm" +INCLUDE "data/text/mail_input_chars.asm" ; 122c1 diff --git a/engine/routines/unreferenced_getgen1trainerclassname.asm b/engine/routines/unreferenced_getgen1trainerclassname.asm index 64c55ed84..3e23fa711 100644 --- a/engine/routines/unreferenced_getgen1trainerclassname.asm +++ b/engine/routines/unreferenced_getgen1trainerclassname.asm @@ -18,4 +18,4 @@ Unreferenced_GetGen1TrainerClassName: ; 50a28 jr nz, .copy ret -INCLUDE "data/unused/gen_1_trainer_names.asm" +INCLUDE "data/text/unused_gen1_trainer_names.asm" diff --git a/engine/time_capsule.asm b/engine/time_capsule.asm index 96f61833b..b7e5d28c8 100755 --- a/engine/time_capsule.asm +++ b/engine/time_capsule.asm @@ -144,4 +144,4 @@ PlaceTradePartnerNamesAndParty: ; fb60d jr .loop ; fb656 -INCLUDE "data/pokemon/rby_base_special.asm" +INCLUDE "data/pokemon/gen1_base_special.asm" diff --git a/engine/time_capsule_2.asm b/engine/time_capsule_2.asm index 0378ed697..a56e51785 100644 --- a/engine/time_capsule_2.asm +++ b/engine/time_capsule_2.asm @@ -36,4 +36,4 @@ ConvertMon_1to2: ; fb908 ; fb91c -INCLUDE "data/pokemon/rby_order.asm" +INCLUDE "data/pokemon/gen1_order.asm" diff --git a/main.asm b/main.asm index 11f4fd39e..8ce0db6ff 100644 --- a/main.asm +++ b/main.asm @@ -262,7 +262,7 @@ INCLUDE "engine/load_pics.asm" INCLUDE "engine/move_mon_wo_mail.asm" INCLUDE "data/pokemon/base_stats.asm" INCLUDE "data/pokemon/names.asm" -INCLUDE "data/unused/unknown_53d84.asm" +INCLUDE "data/unused_53d84.asm" UnknownEggPic:: ; 53d9c ; Another egg pic. This is shifted up a few pixels. @@ -279,7 +279,7 @@ SECTION "bank20", ROMX INCLUDE "engine/player_movement.asm" INCLUDE "engine/engine_flags.asm" INCLUDE "engine/variables.asm" -INCLUDE "data/battle/battle_text.asm" +INCLUDE "data/text/battle_text.asm" INCLUDE "engine/debug.asm" @@ -541,7 +541,7 @@ INCLUDE "mobile/mobile_5f.asm" SECTION "Common Text 1", ROMX -INCLUDE "data/std_text.asm" +INCLUDE "data/text/std_text.asm" INCLUDE "data/phone/text/jack_overworld.asm" INCLUDE "data/phone/text/beverly_overworld.asm" INCLUDE "data/phone/text/huey_overworld.asm" diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index fc3369a21..d90aed911 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -22,7 +22,7 @@ GoldenrodNameRaterBookshelf: GoldenrodNameRaterRadio: jumpstd radio2 -INCLUDE "data/unused/sweet_honey_text.asm" +INCLUDE "data/text/unused_sweet_honey_text.asm" GoldenrodNameRater_MapEvents: ; filler From 7f187be36c7977dce03c9ee96e863c7797b740cb Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 18:29:21 -0500 Subject: [PATCH 013/135] Don't say "House" twice --- constants/map_constants.asm | 4 +- data/maps/blocks.asm | 4 +- data/maps/data.asm | 4 +- data/maps/definitions.asm | 4 +- data/maps/scripts.asm | 4 +- maps/VermilionCity.asm | 4 +- maps/VermilionDiglettsCaveSpeechHouse.asm | 40 +++++++++++++++++++ ...se.asm => VermilionFishingSpeechHouse.asm} | 6 +-- .../VermilionHouseDiglettsCaveSpeechHouse.asm | 40 ------------------- 9 files changed, 55 insertions(+), 55 deletions(-) create mode 100644 maps/VermilionDiglettsCaveSpeechHouse.asm rename maps/{VermilionHouseFishingSpeechHouse.asm => VermilionFishingSpeechHouse.asm} (89%) delete mode 100644 maps/VermilionHouseDiglettsCaveSpeechHouse.asm diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 204b2cf20..30756d456 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -270,13 +270,13 @@ ENDM mapconst ROUTE_6, 9, 10 ; 1 mapconst ROUTE_11, 9, 20 ; 2 mapconst VERMILION_CITY, 18, 20 ; 3 - mapconst VERMILION_HOUSE_FISHING_SPEECH_HOUSE, 4, 4 ; 4 + mapconst VERMILION_FISHING_SPEECH_HOUSE, 4, 4 ; 4 mapconst VERMILION_POKECENTER_1F, 4, 5 ; 5 mapconst VERMILION_POKECENTER_2F_BETA, 4, 8 ; 6 mapconst POKEMON_FAN_CLUB, 4, 5 ; 7 mapconst VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 4, 4 ; 8 mapconst VERMILION_MART, 4, 6 ; 9 - mapconst VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, 4, 4 ; 10 + mapconst VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE, 4, 4 ; 10 mapconst VERMILION_GYM, 9, 5 ; 11 mapconst ROUTE_6_SAFFRON_GATE, 4, 5 ; 12 mapconst ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 4, 4 ; 13 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 7f008b5b2..825437cee 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -168,9 +168,9 @@ GoldenrodHappinessRater_Blocks: GoldenrodBillsHouse_Blocks: GoldenrodPPSpeechHouse_Blocks: GoldenrodNameRater_Blocks: -VermilionHouseFishingSpeechHouse_Blocks: +VermilionFishingSpeechHouse_Blocks: VermilionMagnetTrainSpeechHouse_Blocks: -VermilionHouseDiglettsCaveSpeechHouse_Blocks: +VermilionDiglettsCaveSpeechHouse_Blocks: BluesHouse_Blocks: PewterNidoranSpeechHouse_Blocks: PewterSnoozeSpeechHouse_Blocks: diff --git a/data/maps/data.asm b/data/maps/data.asm index 0cdfb0826..7b51a0b64 100644 --- a/data/maps/data.asm +++ b/data/maps/data.asm @@ -543,13 +543,13 @@ ENDM map_data IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $00, 0 map_data Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $00, 0 map_data DayCare, DAY_CARE, $00, 0 - map_data VermilionHouseFishingSpeechHouse, VERMILION_HOUSE_FISHING_SPEECH_HOUSE, $00, 0 + map_data VermilionFishingSpeechHouse, VERMILION_FISHING_SPEECH_HOUSE, $00, 0 map_data VermilionPokecenter1F, VERMILION_POKECENTER_1F, $00, 0 map_data VermilionPokecenter2FBeta, VERMILION_POKECENTER_2F_BETA, $00, 0 map_data PokemonFanClub, POKEMON_FAN_CLUB, $00, 0 map_data VermilionMagnetTrainSpeechHouse, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, $00, 0 map_data VermilionMart, VERMILION_MART, $00, 0 - map_data VermilionHouseDiglettsCaveSpeechHouse, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, $00, 0 + map_data VermilionDiglettsCaveSpeechHouse, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE, $00, 0 map_data VermilionGym, VERMILION_GYM, $00, 0 map_data Route6SaffronGate, ROUTE_6_SAFFRON_GATE, $00, 0 map_data Route6UndergroundPathEntrance, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, $00, 0 diff --git a/data/maps/definitions.asm b/data/maps/definitions.asm index 44cb85ac6..8a4a94b61 100644 --- a/data/maps/definitions.asm +++ b/data/maps/definitions.asm @@ -280,13 +280,13 @@ MapGroup_Vermilion: map_def Route6, TILESET_KANTO, ROUTE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND map_def Route11, TILESET_KANTO, ROUTE, ROUTE_11, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map_def VermilionCity, TILESET_KANTO, TOWN, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN - map_def VermilionHouseFishingSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def VermilionFishingSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def VermilionPokecenter1F, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def VermilionPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def PokemonFanClub, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def VermilionMagnetTrainSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def VermilionMart, TILESET_MART, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def VermilionHouseDiglettsCaveSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def VermilionDiglettsCaveSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def VermilionGym, TILESET_GAME_CORNER, INDOOR, VERMILION_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE map_def Route6SaffronGate, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route6UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index 51725fb4f..b8e9e4a68 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -329,13 +329,13 @@ SECTION "Map Scripts 17", ROMX INCLUDE "maps/MahoganyTown.asm" INCLUDE "maps/Route32.asm" -INCLUDE "maps/VermilionHouseFishingSpeechHouse.asm" +INCLUDE "maps/VermilionFishingSpeechHouse.asm" INCLUDE "maps/VermilionPokecenter1F.asm" INCLUDE "maps/VermilionPokecenter2FBeta.asm" INCLUDE "maps/PokemonFanClub.asm" INCLUDE "maps/VermilionMagnetTrainSpeechHouse.asm" INCLUDE "maps/VermilionMart.asm" -INCLUDE "maps/VermilionHouseDiglettsCaveSpeechHouse.asm" +INCLUDE "maps/VermilionDiglettsCaveSpeechHouse.asm" INCLUDE "maps/VermilionGym.asm" INCLUDE "maps/Route6SaffronGate.asm" INCLUDE "maps/Route6UndergroundPathEntrance.asm" diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 2430b97d3..d3e270ed7 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -273,12 +273,12 @@ VermilionCity_MapEvents: .Warps: db 10 - warp_def 5, 5, 1, VERMILION_HOUSE_FISHING_SPEECH_HOUSE + warp_def 5, 5, 1, VERMILION_FISHING_SPEECH_HOUSE warp_def 9, 5, 1, VERMILION_POKECENTER_1F warp_def 7, 13, 1, POKEMON_FAN_CLUB warp_def 13, 13, 1, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE warp_def 21, 13, 2, VERMILION_MART - warp_def 21, 17, 1, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE + warp_def 21, 17, 1, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE warp_def 10, 19, 1, VERMILION_GYM warp_def 19, 31, 1, VERMILION_PORT_PASSAGE warp_def 20, 31, 2, VERMILION_PORT_PASSAGE diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm new file mode 100644 index 000000000..a0992d777 --- /dev/null +++ b/maps/VermilionDiglettsCaveSpeechHouse.asm @@ -0,0 +1,40 @@ +const_value set 2 + const VERMILIONDIGLETTSCAVESPEECHHOUSE_GENTLEMAN + +VermilionDiglettsCaveSpeechHouse_MapScripts: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +VermilionDiglettsCaveSpeechHouseGentlemanScript: + jumptextfaceplayer VermilionDiglettsCaveSpeechHouseGentlemanText + +VermilionDiglettsCaveSpeechHouseGentlemanText: + text "Over many years," + line "DIGLETT dug a" + cont "large tunnel." + + para "That tunnel goes" + line "to a distant town." + done + +VermilionDiglettsCaveSpeechHouse_MapEvents: + ; filler + db 0, 0 + +.Warps: + db 2 + warp_def 2, 7, 6, VERMILION_CITY + warp_def 3, 7, 6, VERMILION_CITY + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 1 + object_event 1, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionDiglettsCaveSpeechHouseGentlemanScript, -1 diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm similarity index 89% rename from maps/VermilionHouseFishingSpeechHouse.asm rename to maps/VermilionFishingSpeechHouse.asm index 72ed1ba4a..9ae7daaff 100644 --- a/maps/VermilionHouseFishingSpeechHouse.asm +++ b/maps/VermilionFishingSpeechHouse.asm @@ -1,7 +1,7 @@ const_value set 2 - const VERMILIONHOUSEFISHINGSPEECHHOUSE_FISHING_GURU + const VERMILIONFISHINGSPEECHHOUSE_FISHING_GURU -VermilionHouseFishingSpeechHouse_MapScripts: +VermilionFishingSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -50,7 +50,7 @@ FishingDudesHousePhotoText: line "great time…" done -VermilionHouseFishingSpeechHouse_MapEvents: +VermilionFishingSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm deleted file mode 100644 index 718d5e005..000000000 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ /dev/null @@ -1,40 +0,0 @@ -const_value set 2 - const VERMILIONHOUSEDIGLETTSCAVESPEECHHOUSE_GENTLEMAN - -VermilionHouseDiglettsCaveSpeechHouse_MapScripts: -.SceneScripts: - db 0 - -.MapCallbacks: - db 0 - -VermilionHouseDiglettsCaveSpeechHouseGentlemanScript: - jumptextfaceplayer VermilionHouseDiglettsCaveSpeechHouseGentlemanText - -VermilionHouseDiglettsCaveSpeechHouseGentlemanText: - text "Over many years," - line "DIGLETT dug a" - cont "large tunnel." - - para "That tunnel goes" - line "to a distant town." - done - -VermilionHouseDiglettsCaveSpeechHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 6, VERMILION_CITY - warp_def 3, 7, 6, VERMILION_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 - object_event 1, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionHouseDiglettsCaveSpeechHouseGentlemanScript, -1 From 363d8b92421b065eaa61650a06777e9f684cb46f Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 19:10:09 -0500 Subject: [PATCH 014/135] =?UTF-8?q?KrissHouse=20=E2=86=92=20PlayersHouse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/engine_flags.asm | 2 +- constants/event_flags.asm | 18 ++--- constants/map_constants.asm | 6 +- data/maps/blocks.asm | 10 +-- data/maps/data.asm | 6 +- data/maps/definitions.asm | 6 +- data/maps/scenes.asm | 2 +- data/maps/scripts.asm | 6 +- data/maps/spawn_points.asm | 2 +- data/phone/phone_contacts.asm | 72 +++++++++---------- data/special_pointers.asm | 2 +- data/text/common_text_2.asm | 12 ++-- engine/decorations.asm | 12 ++-- engine/events/pokecenter_pc.asm | 62 ++++++++-------- engine/events/std_scripts.asm | 12 ++-- engine/mail.asm | 2 +- engine/specials.asm | 4 +- maps/MrPokemonsHouse.asm | 4 +- maps/NewBarkTown.asm | 4 +- maps/{KrissHouse1F.asm => PlayersHouse1F.asm} | 44 ++++++------ maps/{KrissHouse1F.blk => PlayersHouse1F.blk} | 0 maps/{KrissHouse2F.asm => PlayersHouse2F.asm} | 60 ++++++++-------- maps/{KrissHouse2F.blk => PlayersHouse2F.blk} | 0 ...orsHouse.asm => PlayersNeighborsHouse.asm} | 52 +++++++------- mobile/mobile_5f.asm | 6 +- wram.asm | 2 +- 26 files changed, 204 insertions(+), 204 deletions(-) rename maps/{KrissHouse1F.asm => PlayersHouse1F.asm} (86%) rename maps/{KrissHouse1F.blk => PlayersHouse1F.blk} (100%) rename maps/{KrissHouse2F.asm => PlayersHouse2F.asm} (61%) rename maps/{KrissHouse2F.blk => PlayersHouse2F.blk} (100%) rename maps/{KrissNeighborsHouse.asm => PlayersNeighborsHouse.asm} (57%) diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index d3ccdbf06..af8bebe95 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -63,7 +63,7 @@ const ENGINE_UNLOCKED_UNOWNS_UNUSED_6 const ENGINE_UNLOCKED_UNOWNS_UNUSED_7 ; wVisitedSpawns - const ENGINE_FLYPOINT_KRISS_HOUSE + const ENGINE_FLYPOINT_PLAYERS_HOUSE const ENGINE_FLYPOINT_VIRIDIAN_POKECENTER const ENGINE_FLYPOINT_PALLET const ENGINE_FLYPOINT_VIRIDIAN diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 4c7e9a582..ffe74f1f3 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -730,7 +730,7 @@ const EVENT_DECO_GEODUDE_DOLL const EVENT_DECO_MACHOP_DOLL const EVENT_DECO_TENTACOOL_DOLL - const EVENT_KRISS_ROOM_POSTER + const EVENT_PLAYERS_ROOM_POSTER const EVENT_DECO_GOLD_TROPHY const EVENT_DECO_SILVER_TROPHY const EVENT_DECO_BIG_SNORLAX_DOLL @@ -1806,8 +1806,8 @@ const EVENT_RIVAL_SPROUT_TOWER const EVENT_RIVAL_BURNED_TOWER const EVENT_RIVAL_DRAGONS_DEN - const EVENT_KRISS_HOUSE_MOM_1 - const EVENT_KRISS_HOUSE_MOM_2 + const EVENT_PLAYERS_HOUSE_MOM_1 + const EVENT_PLAYERS_HOUSE_MOM_2 const EVENT_MR_POKEMONS_HOUSE_OAK const EVENT_VIOLET_CITY_EARL const EVENT_EARLS_ACADEMY_EARL @@ -1928,10 +1928,10 @@ const EVENT_KURTS_HOUSE_KURT_1 const EVENT_KURTS_HOUSE_KURT_2 const EVENT_SLOWPOKE_WELL_KURT ; 740 - const EVENT_KRISS_HOUSE_2F_CONSOLE - const EVENT_KRISS_HOUSE_2F_DOLL_1 - const EVENT_KRISS_HOUSE_2F_DOLL_2 - const EVENT_KRISS_HOUSE_2F_BIG_DOLL + const EVENT_PLAYERS_HOUSE_2F_CONSOLE + const EVENT_PLAYERS_HOUSE_2F_DOLL_1 + const EVENT_PLAYERS_HOUSE_2F_DOLL_2 + const EVENT_PLAYERS_HOUSE_2F_BIG_DOLL const EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY const EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY const EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY @@ -2012,8 +2012,8 @@ const EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS const EVENT_DRAGON_SHRINE_CLAIR ; 790 const EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER - const EVENT_KRISS_HOUSE_1F_NEIGHBOR - const EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR + const EVENT_PLAYERS_HOUSE_1F_NEIGHBOR + const EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR const EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM const EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM const EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 30756d456..b2f1f5f11 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -447,9 +447,9 @@ ENDM mapconst ROUTE_29, 9, 30 ; 3 mapconst NEW_BARK_TOWN, 9, 10 ; 4 mapconst ELMS_LAB, 6, 5 ; 5 - mapconst KRISS_HOUSE_1F, 4, 5 ; 6 - mapconst KRISS_HOUSE_2F, 3, 4 ; 7 - mapconst KRISS_NEIGHBORS_HOUSE, 4, 4 ; 8 + mapconst PLAYERS_HOUSE_1F, 4, 5 ; 6 + mapconst PLAYERS_HOUSE_2F, 3, 4 ; 7 + mapconst PLAYERS_NEIGHBORS_HOUSE, 4, 4 ; 8 mapconst ELMS_HOUSE, 4, 4 ; 9 mapconst ROUTE_26_HEAL_SPEECH_HOUSE, 4, 4 ; 10 mapconst ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 825437cee..aa5fb9ae9 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -188,7 +188,7 @@ CianwoodLugiaSpeechHouse_Blocks: PokeSeersHouse_Blocks: ViridianNicknameSpeechHouse_Blocks: Route2NuggetSpeechHouse_Blocks: -KrissNeighborsHouse_Blocks: +PlayersNeighborsHouse_Blocks: Route26HealSpeechHouse_Blocks: Route26DayofWeekSiblingsHouse_Blocks: Route27SandstormHouse_Blocks: @@ -265,8 +265,8 @@ Route43_Blocks: Route39_Blocks: INCBIN "maps/Route39.blk" -KrissHouse1F_Blocks: - INCBIN "maps/KrissHouse1F.blk" +PlayersHouse1F_Blocks: + INCBIN "maps/PlayersHouse1F.blk" Route38EcruteakGate_Blocks: Route42EcruteakGate_Blocks: @@ -846,8 +846,8 @@ OlivineCafe_Blocks: SafariZoneMainOffice_Blocks: INCBIN "maps/OlivineCafe.blk" -KrissHouse2F_Blocks: - INCBIN "maps/KrissHouse2F.blk" +PlayersHouse2F_Blocks: + INCBIN "maps/PlayersHouse2F.blk" SaffronMagnetTrainStation_Blocks: INCBIN "maps/SaffronMagnetTrainStation.blk" diff --git a/data/maps/data.asm b/data/maps/data.asm index 7b51a0b64..6257f4051 100644 --- a/data/maps/data.asm +++ b/data/maps/data.asm @@ -654,9 +654,9 @@ ENDM map_data Route2Gate, ROUTE_2_GATE, $00, 0 map_data VictoryRoadGate, VICTORY_ROAD_GATE, $00, 0 map_data ElmsLab, ELMS_LAB, $00, 0 - map_data KrissHouse1F, KRISS_HOUSE_1F, $00, 0 - map_data KrissHouse2F, KRISS_HOUSE_2F, $00, 0 - map_data KrissNeighborsHouse, KRISS_NEIGHBORS_HOUSE, $00, 0 + map_data PlayersHouse1F, PLAYERS_HOUSE_1F, $00, 0 + map_data PlayersHouse2F, PLAYERS_HOUSE_2F, $00, 0 + map_data PlayersNeighborsHouse, PLAYERS_NEIGHBORS_HOUSE, $00, 0 map_data ElmsHouse, ELMS_HOUSE, $00, 0 map_data Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $00, 0 map_data Route26DayofWeekSiblingsHouse, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, $00, 0 diff --git a/data/maps/definitions.asm b/data/maps/definitions.asm index 8a4a94b61..797d2ffee 100644 --- a/data/maps/definitions.asm +++ b/data/maps/definitions.asm @@ -445,9 +445,9 @@ MapGroup_NewBark: map_def Route29, TILESET_JOHTO, ROUTE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map_def NewBarkTown, TILESET_JOHTO, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN map_def ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def KrissHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def KrissHouse2F, TILESET_PLAYERS_ROOM, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def KrissNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def PlayersHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def PlayersHouse2F, TILESET_PLAYERS_ROOM, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def PlayersNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route26HealSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route26DayofWeekSiblingsHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm index a835d4895..46358f284 100644 --- a/data/maps/scenes.asm +++ b/data/maps/scenes.asm @@ -28,7 +28,7 @@ MapScenes:: ; 4d01e scene_def ROUTE_27, wRoute27SceneID scene_def NEW_BARK_TOWN, wNewBarkTownSceneID scene_def ELMS_LAB, wElmsLabSceneID - scene_def KRISS_HOUSE_1F, wKrissHouse1FSceneID + scene_def PLAYERS_HOUSE_1F, wPlayersHouse1FSceneID scene_def ROUTE_29, wRoute29SceneID scene_def CHERRYGROVE_CITY, wCherrygroveCitySceneID scene_def MR_POKEMONS_HOUSE, wMrPokemonsHouseSceneID diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index b8e9e4a68..94be9db35 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -151,9 +151,9 @@ SECTION "Map Scripts 9", ROMX INCLUDE "maps/Route34.asm" INCLUDE "maps/ElmsLab.asm" -INCLUDE "maps/KrissHouse1F.asm" -INCLUDE "maps/KrissHouse2F.asm" -INCLUDE "maps/KrissNeighborsHouse.asm" +INCLUDE "maps/PlayersHouse1F.asm" +INCLUDE "maps/PlayersHouse2F.asm" +INCLUDE "maps/PlayersNeighborsHouse.asm" INCLUDE "maps/ElmsHouse.asm" INCLUDE "maps/Route26HealSpeechHouse.asm" INCLUDE "maps/Route26DayofWeekSiblingsHouse.asm" diff --git a/data/maps/spawn_points.asm b/data/maps/spawn_points.asm index e0f913fab..51e32d855 100644 --- a/data/maps/spawn_points.asm +++ b/data/maps/spawn_points.asm @@ -7,7 +7,7 @@ ENDM SpawnPoints: ; 0x152ab ; entries correspond to SPAWN_* constants - spawn KRISS_HOUSE_2F, 3, 3 + spawn PLAYERS_HOUSE_2F, 3, 3 spawn VIRIDIAN_POKECENTER_1F, 5, 3 spawn PALLET_TOWN, 5, 6 diff --git a/data/phone/phone_contacts.asm b/data/phone/phone_contacts.asm index bec40a12a..488a54f06 100644 --- a/data/phone/phone_contacts.asm +++ b/data/phone/phone_contacts.asm @@ -10,42 +10,42 @@ ENDM PhoneContacts: ; 9045f ; entries correspond to PHONE_* constants - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONECONTACT_MOM, KRISS_HOUSE_1F, ANYTIME, MomPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONECONTACT_BILL, N_A, ANYTIME, BillPhoneScript1, 0, BillPhoneScript2 - phone TRAINER_NONE, PHONECONTACT_ELM, ELMS_LAB, ANYTIME, ElmPhoneScript1, 0, ElmPhoneScript2 - phone SCHOOLBOY, JACK1, NATIONAL_PARK, ANYTIME, JackPhoneScript1, ANYTIME, JackPhoneScript2 - phone POKEFANF, BEVERLY1, NATIONAL_PARK, ANYTIME, BeverlyPhoneScript1, ANYTIME, BeverlyPhoneScript2 + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONECONTACT_MOM, PLAYERS_HOUSE_1F, ANYTIME, MomPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONECONTACT_BILL, N_A, ANYTIME, BillPhoneScript1, 0, BillPhoneScript2 + phone TRAINER_NONE, PHONECONTACT_ELM, ELMS_LAB, ANYTIME, ElmPhoneScript1, 0, ElmPhoneScript2 + phone SCHOOLBOY, JACK1, NATIONAL_PARK, ANYTIME, JackPhoneScript1, ANYTIME, JackPhoneScript2 + phone POKEFANF, BEVERLY1, NATIONAL_PARK, ANYTIME, BeverlyPhoneScript1, ANYTIME, BeverlyPhoneScript2 phone SAILOR, HUEY1, OLIVINE_LIGHTHOUSE_2F, ANYTIME, HueyPhoneScript1, ANYTIME, HueyPhoneScript2 - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone COOLTRAINERM, GAVEN3, ROUTE_26, ANYTIME, GavenPhoneScript1, ANYTIME, GavenPhoneScript2 - phone COOLTRAINERF, BETH1, ROUTE_26, ANYTIME, BethPhoneScript1, ANYTIME, BethPhoneScript2 - phone BIRD_KEEPER, JOSE2, ROUTE_27, ANYTIME, JosePhoneScript1, ANYTIME, JosePhoneScript2 - phone COOLTRAINERF, REENA1, ROUTE_27, ANYTIME, ReenaPhoneScript1, ANYTIME, ReenaPhoneScript2 - phone YOUNGSTER, JOEY1, ROUTE_30, ANYTIME, JoeyPhoneScript1, ANYTIME, JoeyPhoneScript2 - phone BUG_CATCHER, WADE1, ROUTE_31, ANYTIME, WadePhoneScript1, ANYTIME, WadePhoneScript2 - phone FISHER, RALPH1, ROUTE_32, ANYTIME, RalphPhoneScript1, ANYTIME, RalphPhoneScript2 - phone PICNICKER, LIZ1, ROUTE_32, ANYTIME, LizPhoneScript1, ANYTIME, LizPhoneScript2 - phone HIKER, ANTHONY2, ROUTE_33, ANYTIME, AnthonyPhoneScript1, ANYTIME, AnthonyPhoneScript2 - phone CAMPER, TODD1, ROUTE_34, ANYTIME, ToddPhoneScript1, ANYTIME, ToddPhoneScript2 - phone PICNICKER, GINA1, ROUTE_34, ANYTIME, GinaPhoneScript1, ANYTIME, GinaPhoneScript2 - phone JUGGLER, IRWIN1, ROUTE_35, ANYTIME, IrwinPhoneScript1, ANYTIME, IrwinPhoneScript2 - phone BUG_CATCHER, ARNIE1, ROUTE_35, ANYTIME, ArniePhoneScript1, ANYTIME, ArniePhoneScript2 - phone SCHOOLBOY, ALAN1, ROUTE_36, ANYTIME, AlanPhoneScript1, ANYTIME, AlanPhoneScript2 - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone LASS, DANA1, ROUTE_38, ANYTIME, DanaPhoneScript1, ANYTIME, DanaPhoneScript2 - phone SCHOOLBOY, CHAD1, ROUTE_38, ANYTIME, ChadPhoneScript1, ANYTIME, ChadPhoneScript2 - phone POKEFANM, DEREK1, ROUTE_39, ANYTIME, DerekPhoneScript1, ANYTIME, DerekPhoneScript2 - phone FISHER, TULLY1, ROUTE_42, ANYTIME, TullyPhoneScript1, ANYTIME, TullyPhoneScript2 - phone POKEMANIAC, BRENT1, ROUTE_43, ANYTIME, BrentPhoneScript1, ANYTIME, BrentPhoneScript2 - phone PICNICKER, TIFFANY3, ROUTE_43, ANYTIME, TiffanyPhoneScript1, ANYTIME, TiffanyPhoneScript2 - phone BIRD_KEEPER, VANCE1, ROUTE_44, ANYTIME, VancePhoneScript1, ANYTIME, VancePhoneScript2 - phone FISHER, WILTON1, ROUTE_44, ANYTIME, WiltonPhoneScript1, ANYTIME, WiltonPhoneScript2 - phone BLACKBELT_T, KENJI3, ROUTE_45, ANYTIME, KenjiPhoneScript1, ANYTIME, KenjiPhoneScript2 - phone HIKER, PARRY1, ROUTE_45, ANYTIME, ParryPhoneScript1, ANYTIME, ParryPhoneScript2 - phone PICNICKER, ERIN1, ROUTE_46, ANYTIME, ErinPhoneScript1, ANYTIME, ErinPhoneScript2 + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone COOLTRAINERM, GAVEN3, ROUTE_26, ANYTIME, GavenPhoneScript1, ANYTIME, GavenPhoneScript2 + phone COOLTRAINERF, BETH1, ROUTE_26, ANYTIME, BethPhoneScript1, ANYTIME, BethPhoneScript2 + phone BIRD_KEEPER, JOSE2, ROUTE_27, ANYTIME, JosePhoneScript1, ANYTIME, JosePhoneScript2 + phone COOLTRAINERF, REENA1, ROUTE_27, ANYTIME, ReenaPhoneScript1, ANYTIME, ReenaPhoneScript2 + phone YOUNGSTER, JOEY1, ROUTE_30, ANYTIME, JoeyPhoneScript1, ANYTIME, JoeyPhoneScript2 + phone BUG_CATCHER, WADE1, ROUTE_31, ANYTIME, WadePhoneScript1, ANYTIME, WadePhoneScript2 + phone FISHER, RALPH1, ROUTE_32, ANYTIME, RalphPhoneScript1, ANYTIME, RalphPhoneScript2 + phone PICNICKER, LIZ1, ROUTE_32, ANYTIME, LizPhoneScript1, ANYTIME, LizPhoneScript2 + phone HIKER, ANTHONY2, ROUTE_33, ANYTIME, AnthonyPhoneScript1, ANYTIME, AnthonyPhoneScript2 + phone CAMPER, TODD1, ROUTE_34, ANYTIME, ToddPhoneScript1, ANYTIME, ToddPhoneScript2 + phone PICNICKER, GINA1, ROUTE_34, ANYTIME, GinaPhoneScript1, ANYTIME, GinaPhoneScript2 + phone JUGGLER, IRWIN1, ROUTE_35, ANYTIME, IrwinPhoneScript1, ANYTIME, IrwinPhoneScript2 + phone BUG_CATCHER, ARNIE1, ROUTE_35, ANYTIME, ArniePhoneScript1, ANYTIME, ArniePhoneScript2 + phone SCHOOLBOY, ALAN1, ROUTE_36, ANYTIME, AlanPhoneScript1, ANYTIME, AlanPhoneScript2 + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone LASS, DANA1, ROUTE_38, ANYTIME, DanaPhoneScript1, ANYTIME, DanaPhoneScript2 + phone SCHOOLBOY, CHAD1, ROUTE_38, ANYTIME, ChadPhoneScript1, ANYTIME, ChadPhoneScript2 + phone POKEFANM, DEREK1, ROUTE_39, ANYTIME, DerekPhoneScript1, ANYTIME, DerekPhoneScript2 + phone FISHER, TULLY1, ROUTE_42, ANYTIME, TullyPhoneScript1, ANYTIME, TullyPhoneScript2 + phone POKEMANIAC, BRENT1, ROUTE_43, ANYTIME, BrentPhoneScript1, ANYTIME, BrentPhoneScript2 + phone PICNICKER, TIFFANY3, ROUTE_43, ANYTIME, TiffanyPhoneScript1, ANYTIME, TiffanyPhoneScript2 + phone BIRD_KEEPER, VANCE1, ROUTE_44, ANYTIME, VancePhoneScript1, ANYTIME, VancePhoneScript2 + phone FISHER, WILTON1, ROUTE_44, ANYTIME, WiltonPhoneScript1, ANYTIME, WiltonPhoneScript2 + phone BLACKBELT_T, KENJI3, ROUTE_45, ANYTIME, KenjiPhoneScript1, ANYTIME, KenjiPhoneScript2 + phone HIKER, PARRY1, ROUTE_45, ANYTIME, ParryPhoneScript1, ANYTIME, ParryPhoneScript2 + phone PICNICKER, ERIN1, ROUTE_46, ANYTIME, ErinPhoneScript1, ANYTIME, ErinPhoneScript2 phone TRAINER_NONE, PHONECONTACT_BUENA, GOLDENROD_DEPT_STORE_ROOF, ANYTIME, BuenaPhoneScript1, ANYTIME, BuenaPhoneScript2 ; 90627 diff --git a/data/special_pointers.asm b/data/special_pointers.asm index 6320838fc..480fc0a04 100644 --- a/data/special_pointers.asm +++ b/data/special_pointers.asm @@ -40,7 +40,7 @@ SpecialsPointers:: ; c029 add_special Special_MagikarpHouseSign add_special HealParty ; this is both a special and a predef add_special Special_PokemonCenterPC - add_special Special_KrissHousePC + add_special Special_PlayersHousePC add_special Special_DayCareMan add_special Special_DayCareLady add_special Special_DayCareManOutside diff --git a/data/text/common_text_2.asm b/data/text/common_text_2.asm index bddd0d470..aaf14cc48 100644 --- a/data/text/common_text_2.asm +++ b/data/text/common_text_2.asm @@ -1071,12 +1071,12 @@ UnknownText_0x1c1368:: line "to do?" done -_KrissPCHowManyWithdrawText:: +_PlayersPCHowManyWithdrawText:: text "How many do you" line "want to withdraw?" done -_KrissPCWithdrewItemsText:: +_PlayersPCWithdrewItemsText:: text "Withdrew @" deciram wItemQuantityChangeBuffer, 1, 2 text_start @@ -1085,7 +1085,7 @@ _KrissPCWithdrewItemsText:: text "(S)." prompt -_KrissPCNoRoomWithdrawText:: +_PlayersPCNoRoomWithdrawText:: text "There's no room" line "for more items." prompt @@ -1094,12 +1094,12 @@ UnknownText_0x1c13df:: text "No items here!" prompt -_KrissPCHowManyDepositText:: +_PlayersPCHowManyDepositText:: text "How many do you" line "want to deposit?" done -_KrissPCDepositItemsText:: +_PlayersPCDepositItemsText:: text "Deposited @" deciram wItemQuantityChangeBuffer, 1, 2 text_start @@ -1108,7 +1108,7 @@ _KrissPCDepositItemsText:: text "(S)." prompt -_KrissPCNoRoomDepositText:: +_PlayersPCNoRoomDepositText:: text "There's no room to" line "store items." prompt diff --git a/engine/decorations.asm b/engine/decorations.asm index 413a049a2..9c00f51b1 100755 --- a/engine/decorations.asm +++ b/engine/decorations.asm @@ -5,7 +5,7 @@ InitDecorations: ; 26751 (9:6751) ld [Poster], a ret -_KrisDecorationMenu: ; 0x2675c +_PlayerDecorationMenu: ; 0x2675c ld a, [wWhichIndexSet] push af ld hl, .MenuDataHeader @@ -1233,7 +1233,7 @@ SetPosterVisibility: ; 27027 ld b, RESET_FLAG .ok - ld de, EVENT_KRISS_ROOM_POSTER + ld de, EVENT_PLAYERS_ROOM_POSTER jp EventFlagAction ; 27037 @@ -1249,19 +1249,19 @@ SetDecorationTile: ; 27037 ; 27043 Special_ToggleDecorationsVisibility: ; 27043 - ld de, EVENT_KRISS_HOUSE_2F_CONSOLE + ld de, EVENT_PLAYERS_HOUSE_2F_CONSOLE ld hl, VariableSprites + SPRITE_CONSOLE - SPRITE_VARS ld a, [Console] call ToggleDecorationVisibility - ld de, EVENT_KRISS_HOUSE_2F_DOLL_1 + ld de, EVENT_PLAYERS_HOUSE_2F_DOLL_1 ld hl, VariableSprites + SPRITE_DOLL_1 - SPRITE_VARS ld a, [LeftOrnament] call ToggleDecorationVisibility - ld de, EVENT_KRISS_HOUSE_2F_DOLL_2 + ld de, EVENT_PLAYERS_HOUSE_2F_DOLL_2 ld hl, VariableSprites + SPRITE_DOLL_2 - SPRITE_VARS ld a, [RightOrnament] call ToggleDecorationVisibility - ld de, EVENT_KRISS_HOUSE_2F_BIG_DOLL + ld de, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL ld hl, VariableSprites + SPRITE_BIG_DOLL - SPRITE_VARS ld a, [BigDoll] call ToggleDecorationVisibility diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index 75d2d5392..213427119 100755 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -171,7 +171,7 @@ PC_WaitPlaySFX: ; 156d0 ret ; 156d9 -_KrissHousePC: ; 156d9 +_PlayersHousePC: ; 156d9 call PC_PlayBootSound ld hl, UnknownText_0x156ff call PC_DisplayText @@ -212,7 +212,7 @@ Function15715: ; 15715 xor a ld [wPCItemsCursor], a ld [wPCItemsScrollPosition], a - ld hl, KrissPCMenuData + ld hl, PlayersPCMenuData call LoadMenuDataHeader .asm_15722 call UpdateTimePals @@ -230,28 +230,28 @@ Function15715: ; 15715 ret ; 15736 -KrissPCMenuData: ; 0x15736 +PlayersPCMenuData: ; 0x15736 db MENU_BACKUP_TILES ; flags db 0, 0 ; top left corner coords (y, x) db 12, 15 ; bottom right corner coords (y, x) - dw .KrissPCMenuData2 + dw .PlayersPCMenuData2 db 1 ; default selected option -.KrissPCMenuData2: +.PlayersPCMenuData2: db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 0 ; # items? - dw .KrissPCMenuList1 + dw .PlayersPCMenuList1 dw PlaceNthMenuStrings - dw .KrissPCMenuPointers + dw .PlayersPCMenuPointers -.KrissPCMenuPointers: ; 0x15746 - dw KrisWithdrawItemMenu, .WithdrawItem - dw KrisDepositItemMenu, .DepositItem - dw KrisTossItemMenu, .TossItem - dw KrisMailBoxMenu, .MailBox - dw KrisDecorationMenu, .Decoration - dw KrisLogOffMenu, .LogOff - dw KrisLogOffMenu, .TurnOff +.PlayersPCMenuPointers: ; 0x15746 + dw PlayerWithdrawItemMenu, .WithdrawItem + dw PlayerDepositItemMenu, .DepositItem + dw PlayerTossItemMenu, .TossItem + dw PlayerMailBoxMenu, .MailBox + dw PlayerDecorationMenu, .Decoration + dw PlayerLogOffMenu, .LogOff + dw PlayerLogOffMenu, .TurnOff .WithdrawItem: db "WITHDRAW ITEM@" .DepositItem: db "DEPOSIT ITEM@" @@ -269,7 +269,7 @@ DECORATION EQU 4 TURN_OFF EQU 5 LOG_OFF EQU 6 -.KrissPCMenuList1: +.PlayersPCMenuList1: db 5 db WITHDRAW_ITEM db DEPOSIT_ITEM @@ -278,7 +278,7 @@ LOG_OFF EQU 6 db TURN_OFF db -1 -.KrissPCMenuList2: +.PlayersPCMenuList2: db 6 db WITHDRAW_ITEM db DEPOSIT_ITEM @@ -305,7 +305,7 @@ UnknownText_0x157cc: ; 0x157cc db "@" ; 0x157d1 -KrisWithdrawItemMenu: ; 0x157d1 +PlayerWithdrawItemMenu: ; 0x157d1 call LoadStandardMenuDataHeader farcall ClearPCItemScreen .loop @@ -370,18 +370,18 @@ KrisWithdrawItemMenu: ; 0x157d1 ret .HowManyText: ; 0x15850 - text_jump _KrissPCHowManyWithdrawText + text_jump _PlayersPCHowManyWithdrawText db "@" .WithdrewText: ; 0x15855 - text_jump _KrissPCWithdrewItemsText + text_jump _PlayersPCWithdrewItemsText db "@" .NoRoomText: ; 0x1585a - text_jump _KrissPCNoRoomWithdrawText + text_jump _PlayersPCNoRoomWithdrawText db "@" -KrisTossItemMenu: ; 0x1585f +PlayerTossItemMenu: ; 0x1585f call LoadStandardMenuDataHeader farcall ClearPCItemScreen .loop @@ -397,8 +397,8 @@ KrisTossItemMenu: ; 0x1585f ret ; 0x1587d -KrisDecorationMenu: ; 0x1587d - farcall _KrisDecorationMenu +PlayerDecorationMenu: ; 0x1587d + farcall _PlayerDecorationMenu ld a, c and a ret z @@ -406,13 +406,13 @@ KrisDecorationMenu: ; 0x1587d ret ; 0x15888 -KrisLogOffMenu: ; 0x15888 +PlayerLogOffMenu: ; 0x15888 xor a scf ret ; 0x1588b -KrisDepositItemMenu: ; 0x1588b +PlayerDepositItemMenu: ; 0x1588b call .CheckItemsInBag jr c, .nope call DisableSpriteUpdates @@ -532,19 +532,19 @@ KrisDepositItemMenu: ; 0x1588b ret .HowManyText: ; 0x1596e - text_jump _KrissPCHowManyDepositText + text_jump _PlayersPCHowManyDepositText db "@" .DepositText: ; 0x15973 - text_jump _KrissPCDepositItemsText + text_jump _PlayersPCDepositItemsText db "@" .NoRoomText: ; 0x15978 - text_jump _KrissPCNoRoomDepositText + text_jump _PlayersPCNoRoomDepositText db "@" -KrisMailBoxMenu: ; 0x1597d - farcall _KrisMailBoxMenu +PlayerMailBoxMenu: ; 0x1597d + farcall _PlayerMailBoxMenu xor a ret ; 0x15985 diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index e4dd586b0..eff1ab8f6 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -539,10 +539,10 @@ InitializeEventsScript: setevent EVENT_MAHOGANY_MART_OWNERS setevent EVENT_TIN_TOWER_ROOF_HO_OH setevent EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA - setevent EVENT_KRISS_HOUSE_2F_CONSOLE - setevent EVENT_KRISS_HOUSE_2F_DOLL_1 - setevent EVENT_KRISS_HOUSE_2F_DOLL_2 - setevent EVENT_KRISS_HOUSE_2F_BIG_DOLL + setevent EVENT_PLAYERS_HOUSE_2F_CONSOLE + setevent EVENT_PLAYERS_HOUSE_2F_DOLL_1 + setevent EVENT_PLAYERS_HOUSE_2F_DOLL_2 + setevent EVENT_PLAYERS_HOUSE_2F_BIG_DOLL setevent EVENT_DECO_BED_1 setevent EVENT_DECO_PLANT_4 setevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN @@ -576,7 +576,7 @@ InitializeEventsScript: setevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS setevent EVENT_DRAGON_SHRINE_CLAIR setevent EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER - setevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR + setevent EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR setevent EVENT_AZALEA_TOWN_KURT setevent EVENT_AZALEA_TOWN_KURT setevent EVENT_ILEX_FOREST_KURT @@ -585,7 +585,7 @@ InitializeEventsScript: setevent EVENT_GOLDENROD_SALE_OFF setevent EVENT_ECRUTEAK_CITY_GRAMPS setevent EVENT_EUSINE_IN_BURNED_TOWER - setevent EVENT_KRISS_HOUSE_MOM_2 + setevent EVENT_PLAYERS_HOUSE_MOM_2 setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 setevent EVENT_CIANWOOD_CITY_EUSINE setevent EVENT_TIN_TOWER_1F_EUSINE diff --git a/engine/mail.asm b/engine/mail.asm index 68b16fd10..d2649bdc5 100755 --- a/engine/mail.asm +++ b/engine/mail.asm @@ -310,7 +310,7 @@ IsAnyMonHoldingMail: ; 44781 ret ; 447a0 -_KrisMailBoxMenu: ; 0x447a0 +_PlayerMailBoxMenu: ; 0x447a0 call InitMail jr z, .nomail call LoadStandardMenuDataHeader diff --git a/engine/specials.asm b/engine/specials.asm index 429b752c3..0cf0948e7 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -129,10 +129,10 @@ Special_DisplayLinkRecord: ; c2da ret ; c2e7 -Special_KrissHousePC: ; c2e7 +Special_PlayersHousePC: ; c2e7 xor a ld [ScriptVar], a - farcall _KrissHousePC + farcall _PlayersHousePC ld a, c ld [ScriptVar], a ret diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 8ac7d0a09..be806d610 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -123,8 +123,8 @@ MrPokemonsHouse_OakScript: waitbutton closetext setevent EVENT_RIVAL_NEW_BARK_TOWN - setevent EVENT_KRISS_HOUSE_1F_NEIGHBOR - clearevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR + setevent EVENT_PLAYERS_HOUSE_1F_NEIGHBOR + clearevent EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR setscene 1 setmapscene CHERRYGROVE_CITY, 1 setmapscene ELMS_LAB, 3 diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index f4cad71eb..34b023038 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -288,8 +288,8 @@ NewBarkTown_MapEvents: .Warps: db 4 warp_def 6, 3, 1, ELMS_LAB - warp_def 13, 5, 1, KRISS_HOUSE_1F - warp_def 3, 11, 1, KRISS_NEIGHBORS_HOUSE + warp_def 13, 5, 1, PLAYERS_HOUSE_1F + warp_def 3, 11, 1, PLAYERS_NEIGHBORS_HOUSE warp_def 11, 13, 1, ELMS_HOUSE .CoordEvents: diff --git a/maps/KrissHouse1F.asm b/maps/PlayersHouse1F.asm similarity index 86% rename from maps/KrissHouse1F.asm rename to maps/PlayersHouse1F.asm index f94534332..6c9411e32 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -1,11 +1,11 @@ const_value set 2 - const KRISSHOUSE1F_MOM1 - const KRISSHOUSE1F_MOM2 - const KRISSHOUSE1F_MOM3 - const KRISSHOUSE1F_MOM4 - const KRISSHOUSE1F_POKEFAN_F + const PLAYERSHOUSE1F_MOM1 + const PLAYERSHOUSE1F_MOM2 + const PLAYERSHOUSE1F_MOM3 + const PLAYERSHOUSE1F_MOM4 + const PLAYERSHOUSE1F_POKEFAN_F -KrissHouse1F_MapScripts: +PlayersHouse1F_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -25,15 +25,15 @@ UnknownScript_0x7a4d8: UnknownScript_0x7a4db: playmusic MUSIC_MOM - showemote EMOTE_SHOCK, KRISSHOUSE1F_MOM1, 15 + showemote EMOTE_SHOCK, PLAYERSHOUSE1F_MOM1, 15 spriteface PLAYER, LEFT checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x7a4f2 - applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a5fc + applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fc jump UnknownScript_0x7a4f6 UnknownScript_0x7a4f2: - applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a5fe + applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fe UnknownScript_0x7a4f6: opentext writetext UnknownText_0x7a604 @@ -44,8 +44,8 @@ UnknownScript_0x7a4f6: setflag ENGINE_PHONE_CARD addcellnum PHONE_MOM setscene 1 - setevent EVENT_KRISS_HOUSE_MOM_1 - clearevent EVENT_KRISS_HOUSE_MOM_2 + setevent EVENT_PLAYERS_HOUSE_MOM_1 + clearevent EVENT_PLAYERS_HOUSE_MOM_2 writetext UnknownText_0x7a6bd buttonsound special Special_SetDayOfWeek @@ -89,16 +89,16 @@ UnknownScript_0x7a549: jump UnknownScript_0x7a56b UnknownScript_0x7a55d: - applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a600 + applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a600 jump UnknownScript_0x7a56b UnknownScript_0x7a564: - applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a602 + applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a602 jump UnknownScript_0x7a56b UnknownScript_0x7a56b: special RestartMapMusic - spriteface KRISSHOUSE1F_MOM1, LEFT + spriteface PLAYERSHOUSE1F_MOM1, LEFT end UnknownScript_0x7a572: @@ -181,7 +181,7 @@ NeighborScript: writetext NeighborText waitbutton closetext - spriteface KRISSHOUSE1F_POKEFAN_F, RIGHT + spriteface PLAYERSHOUSE1F_POKEFAN_F, RIGHT end TVScript: @@ -385,7 +385,7 @@ TVText: line "rolling too!" done -KrissHouse1F_MapEvents: +PlayersHouse1F_MapEvents: ; filler db 0, 0 @@ -393,7 +393,7 @@ KrissHouse1F_MapEvents: db 3 warp_def 6, 7, 2, NEW_BARK_TOWN warp_def 7, 7, 2, NEW_BARK_TOWN - warp_def 9, 0, 1, KRISS_HOUSE_2F + warp_def 9, 0, 1, PLAYERS_HOUSE_2F .CoordEvents: db 2 @@ -409,8 +409,8 @@ KrissHouse1F_MapEvents: .ObjectEvents: db 5 - object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1 - object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - object_event 4, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR + object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_1 + object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2 + object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2 + object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2 + object_event 4, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_PLAYERS_HOUSE_1F_NEIGHBOR diff --git a/maps/KrissHouse1F.blk b/maps/PlayersHouse1F.blk similarity index 100% rename from maps/KrissHouse1F.blk rename to maps/PlayersHouse1F.blk diff --git a/maps/KrissHouse2F.asm b/maps/PlayersHouse2F.asm similarity index 61% rename from maps/KrissHouse2F.asm rename to maps/PlayersHouse2F.asm index dcd63af1e..4610fd644 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -1,10 +1,10 @@ const_value set 2 - const KRISSHOUSE2F_CONSOLE - const KRISSHOUSE2F_DOLL_1 - const KRISSHOUSE2F_DOLL_2 - const KRISSHOUSE2F_BIG_DOLL + const PLAYERSHOUSE2F_CONSOLE + const PLAYERSHOUSE2F_DOLL_1 + const PLAYERSHOUSE2F_DOLL_2 + const PLAYERSHOUSE2F_BIG_DOLL -KrissHouse2F_MapScripts: +PlayersHouse2F_MapScripts: .SceneScripts: db 0 @@ -46,27 +46,27 @@ BigDoll: GameConsole: describedecoration DECODESC_CONSOLE -KrissHousePoster: - conditional_event EVENT_KRISS_ROOM_POSTER, .Script +PlayersHousePoster: + conditional_event EVENT_PLAYERS_ROOM_POSTER, .Script .Script: describedecoration DECODESC_POSTER -KrissHouseRadio: +PlayersHouseRadio: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue .NormalRadio checkevent EVENT_LISTENED_TO_INITIAL_RADIO iftrue .AbbreviatedRadio playmusic MUSIC_POKEMON_TALK opentext - writetext KrisRadioText1 + writetext PlayersRadioText1 pause 45 - writetext KrisRadioText2 + writetext PlayersRadioText2 pause 45 - writetext KrisRadioText3 + writetext PlayersRadioText3 pause 45 musicfadeout MUSIC_NEW_BARK_TOWN, 16 - writetext KrisRadioText4 + writetext PlayersRadioText4 pause 45 closetext setevent EVENT_LISTENED_TO_INITIAL_RADIO @@ -77,17 +77,17 @@ KrissHouseRadio: .AbbreviatedRadio: opentext - writetext KrisRadioText4 + writetext PlayersRadioText4 pause 45 closetext end -KrissHouseBookshelf: +PlayersHouseBookshelf: jumpstd picturebookshelf -KrissHousePC: +PlayersHousePC: opentext - special Special_KrissHousePC + special Special_PlayersHousePC iftrue .Warp closetext end @@ -95,47 +95,47 @@ KrissHousePC: warp NONE, 0, 0 end -KrisRadioText1: +PlayersRadioText1: text "PROF.OAK'S #MON" line "TALK! Please tune" cont "in next time!" done -KrisRadioText2: +PlayersRadioText2: text "#MON CHANNEL!" done -KrisRadioText3: +PlayersRadioText3: text "This is DJ MARY," line "your co-host!" done -KrisRadioText4: +PlayersRadioText4: text "#MON!" line "#MON CHANNEL…" done -KrissHouse2F_MapEvents: +PlayersHouse2F_MapEvents: ; filler db 0, 0 .Warps: db 1 - warp_def 7, 0, 3, KRISS_HOUSE_1F + warp_def 7, 0, 3, PLAYERS_HOUSE_1F .CoordEvents: db 0 .BGEvents: db 4 - bg_event 2, 1, BGEVENT_UP, KrissHousePC - bg_event 3, 1, BGEVENT_READ, KrissHouseRadio - bg_event 5, 1, BGEVENT_READ, KrissHouseBookshelf - bg_event 6, 0, BGEVENT_IFSET, KrissHousePoster + bg_event 2, 1, BGEVENT_UP, PlayersHousePC + bg_event 3, 1, BGEVENT_READ, PlayersHouseRadio + bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelf + bg_event 6, 0, BGEVENT_IFSET, PlayersHousePoster .ObjectEvents: db 4 - object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE - object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1 - object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2 - object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL + object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsole, EVENT_PLAYERS_HOUSE_2F_CONSOLE + object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1, EVENT_PLAYERS_HOUSE_2F_DOLL_1 + object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2, EVENT_PLAYERS_HOUSE_2F_DOLL_2 + object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDoll, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL diff --git a/maps/KrissHouse2F.blk b/maps/PlayersHouse2F.blk similarity index 100% rename from maps/KrissHouse2F.blk rename to maps/PlayersHouse2F.blk diff --git a/maps/KrissNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm similarity index 57% rename from maps/KrissNeighborsHouse.asm rename to maps/PlayersNeighborsHouse.asm index 457660d97..dffa89c9e 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/PlayersNeighborsHouse.asm @@ -1,38 +1,38 @@ const_value set 2 - const KRISSNEIGHBORSHOUSE_COOLTRAINER_F - const KRISSNEIGHBORSHOUSE_POKEFAN_F + const PLAYERSNEIGHBORSHOUSE_COOLTRAINER_F + const PLAYERSNEIGHBORSHOUSE_POKEFAN_F -KrissNeighborsHouse_MapScripts: +PlayersNeighborsHouse_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -KrissNeighborsDaughter: - jumptextfaceplayer KrissNeighborsDaughterText +PlayersNeighborsDaughter: + jumptextfaceplayer PlayersNeighborsDaughterText -KrissNeighbor: - jumptextfaceplayer KrissNeighborText +PlayersNeighbor: + jumptextfaceplayer PlayersNeighborText -KrissNeighborsHouseBookshelf: +PlayersNeighborsHouseBookshelf: jumpstd magazinebookshelf -KrissNeighborsHouseRadio: +PlayersNeighborsHouseRadio: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue .NormalRadio checkevent EVENT_LISTENED_TO_INITIAL_RADIO iftrue .AbbreviatedRadio playmusic MUSIC_POKEMON_TALK opentext - writetext KrisNeighborRadioText1 + writetext PlayerNeighborRadioText1 pause 45 - writetext KrisNeighborRadioText2 + writetext PlayerNeighborRadioText2 pause 45 - writetext KrisNeighborRadioText3 + writetext PlayerNeighborRadioText3 pause 45 musicfadeout MUSIC_NEW_BARK_TOWN, 16 - writetext KrisNeighborRadioText4 + writetext PlayerNeighborRadioText4 pause 45 closetext setevent EVENT_LISTENED_TO_INITIAL_RADIO @@ -41,12 +41,12 @@ KrissNeighborsHouseRadio: jumpstd radio1 .AbbreviatedRadio: opentext - writetext KrisNeighborRadioText4 + writetext PlayerNeighborRadioText4 pause 45 closetext end -KrissNeighborsDaughterText: +PlayersNeighborsDaughterText: text "PIKACHU is an" line "evolved #MON." @@ -65,7 +65,7 @@ KrissNeighborsDaughterText: cont "him…" done -KrissNeighborText: +PlayersNeighborText: text "My daughter is" line "adamant about" @@ -78,27 +78,27 @@ KrissNeighborText: para "But then, so do I!" done -KrisNeighborRadioText1: +PlayerNeighborRadioText1: text "PROF.OAK'S #MON" line "TALK! Please tune" cont "in next time!" done -KrisNeighborRadioText2: +PlayerNeighborRadioText2: text "#MON CHANNEL!" done -KrisNeighborRadioText3: +PlayerNeighborRadioText3: text "This is DJ MARY," line "your co-host!" done -KrisNeighborRadioText4: +PlayerNeighborRadioText4: text "#MON!" line "#MON CHANNEL…" done -KrissNeighborsHouse_MapEvents: +PlayersNeighborsHouse_MapEvents: ; filler db 0, 0 @@ -112,11 +112,11 @@ KrissNeighborsHouse_MapEvents: .BGEvents: db 3 - bg_event 0, 1, BGEVENT_READ, KrissNeighborsHouseBookshelf - bg_event 1, 1, BGEVENT_READ, KrissNeighborsHouseBookshelf - bg_event 7, 1, BGEVENT_READ, KrissNeighborsHouseRadio + bg_event 0, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelf + bg_event 1, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelf + bg_event 7, 1, BGEVENT_READ, PlayersNeighborsHouseRadio .ObjectEvents: db 2 - object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighborsDaughter, -1 - object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR + object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborsDaughter, -1 + object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighbor, EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 6eeffa34a..2d9ccf847 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -328,14 +328,14 @@ Function17d0f3: ; 17d0f3 ; 17d187 Mobile_CopyDefaultOTName: ; 17d187 - ld hl, Mobile5F_KrissName + ld hl, Mobile5F_PlayersName ld de, $c63d ld bc, 5 call CopyBytes ret ; 17d194 -Mobile5F_KrissName: +Mobile5F_PlayersName: db "クりス@@" ; 17d198 @@ -371,7 +371,7 @@ Mobile_CopyDefaultMailAuthor: ; 17d1c9 ld de, $c668 ld bc, 5 call ByteFill - ld hl, Mobile5F_KrissName + ld hl, Mobile5F_PlayersName ld de, $c668 ld bc, 5 call CopyBytes diff --git a/wram.asm b/wram.asm index 362dc5699..7830cef72 100644 --- a/wram.asm +++ b/wram.asm @@ -2523,7 +2523,7 @@ wHallOfFameSceneID:: db ; d984 wRoute27SceneID:: db ; d985 wNewBarkTownSceneID:: db ; d986 wElmsLabSceneID:: db ; d987 -wKrissHouse1FSceneID:: db ; d988 +wPlayersHouse1FSceneID:: db ; d988 wRoute29SceneID:: db ; d989 wCherrygroveCitySceneID:: db ; d98a wMrPokemonsHouseSceneID:: db ; d98b From fa3192e3da7e3ce9550b40a2ab2c3640c996ea46 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 19:25:14 -0500 Subject: [PATCH 015/135] No significance to what data is at the dummied-out broken pointers --- engine/sprites.asm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/engine/sprites.asm b/engine/sprites.asm index 7928fe1f0..09f6ae89a 100755 --- a/engine/sprites.asm +++ b/engine/sprites.asm @@ -559,16 +559,17 @@ INCLUDE "data/sprite_anims/framesets.asm" INCLUDE "data/sprite_anims/oam.asm" -BrokenStdGFXPointers: ; Broken 2bpp pointers - dbbw $80, $01, .deleted ; 128-tile 2bpp at 1:672a (inside Multiply) - dbbw $80, $01, .deleted - dbbw $80, $01, .deleted - dbbw $80, $01, .deleted - dbbw $10, $37, .deleted ; 16-tile 2bpp at 37:672a (within TilesetTrainStationGFX) - dbbw $10, $11, .deleted ; 16-tile 2bpp at 11:672a (empty data) - dbbw $10, $39, .deleted ; 16-tile 2bpp at 39:672a (empty data) - dbbw $10, $24, .deleted ; 16-tile 2bpp at 24:672a (inside Function926f7) - dbbw $10, $21, .deleted ; 16-tile 2bpp at 21:672a (inside Function8671c) +BrokenStdGFXPointers: + ; tile count, bank, pointer + ; (all pointers were dummied out to .deleted) +rept 4 + dbbw 128, $01, .deleted +endr + dbbw 16, $37, .deleted + dbbw 16, $11, .deleted + dbbw 16, $39, .deleted + dbbw 16, $24, .deleted + dbbw 16, $21, .deleted .deleted ; 8e72a (23:672a) From f81add782affc2ca3b196e0beb98e9c89d0f09ff Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 19:29:22 -0500 Subject: [PATCH 016/135] $20 is BG_MAP_WIDTH --- engine/crystal_intro.asm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm index ea6828f14..6576daf41 100755 --- a/engine/crystal_intro.asm +++ b/engine/crystal_intro.asm @@ -1860,11 +1860,10 @@ Intro_LoadTilemap: ; e541b (39:541b) inc de dec c jr nz, .col - ; add hl, $20 - SCREEN_WIDTH - ld a, $20 - SCREEN_WIDTH + ld a, BG_MAP_WIDTH - SCREEN_WIDTH add l ld l, a - ld a, $0 + ld a, 0 adc h ld h, a dec b From a73c532738d055bb3d28a46b59f7fc87d2c998d4 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 19:40:17 -0500 Subject: [PATCH 017/135] tile+color macros in gfx.asm --- constants/gfx_constants.asm | 1 + engine/color.asm | 8 ++++---- engine/tileset_anims.asm | 8 ++++---- home/palettes.asm | 2 +- macros.asm | 5 +---- macros/{color.asm => gfx.asm} | 4 ++++ mobile/mobile_5b.asm | 4 ++-- 7 files changed, 17 insertions(+), 15 deletions(-) rename macros/{color.asm => gfx.asm} (73%) diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 864a4bd50..bfa2140e7 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -3,6 +3,7 @@ LEN_1BPP_TILE EQU 1 * TILE_WIDTH ; bytes LEN_2BPP_TILE EQU 2 * TILE_WIDTH ; bytes NUM_PAL_COLORS EQU 4 +PAL_COLOR_SIZE EQU 2 PALRGB_WHITE EQUS "palred 31 + palgreen 31 + palblue 31" ; $7fff diff --git a/engine/color.asm b/engine/color.asm index 0cce49655..b9c0419f8 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -337,11 +337,11 @@ ApplyHPBarPals: ret .Enemy: - ld de, wBGPals2 palette PAL_BATTLE_BG_ENEMY_HP + 2 + ld de, wBGPals2 palette PAL_BATTLE_BG_ENEMY_HP color 1 jr .okay .Player: - ld de, wBGPals2 palette PAL_BATTLE_BG_PLAYER_HP + 2 + ld de, wBGPals2 palette PAL_BATTLE_BG_PLAYER_HP color 1 .okay ld l, c @@ -521,7 +521,7 @@ LoadPalette_White_Col1_Col2_Black: ld [de], a inc de - ld c, 2 * 2 + ld c, 2 * PAL_COLOR_SIZE .loop ld a, [hli] ld [de], a @@ -1308,7 +1308,7 @@ rept 4 inc hl endr .morn_day - ld de, wBGPals1 palette PAL_BG_ROOF + 2 + ld de, wBGPals1 palette PAL_BG_ROOF color 1 ld bc, 4 ld a, BANK(wBGPals1) call FarCopyWRAM diff --git a/engine/tileset_anims.asm b/engine/tileset_anims.asm index 62e84a401..4e4698d5e 100644 --- a/engine/tileset_anims.asm +++ b/engine/tileset_anims.asm @@ -952,7 +952,7 @@ TileAnimationPalette: ; fc6d7 jr z, .color2 .color1 - ld hl, wBGPals1 palette PAL_BG_WATER + 2 + ld hl, wBGPals1 palette PAL_BG_WATER color 1 ld a, [hli] ld [rBGPD], a ld a, [hli] @@ -960,7 +960,7 @@ TileAnimationPalette: ; fc6d7 jr .end .color0 - ld hl, wBGPals1 palette PAL_BG_WATER + ld hl, wBGPals1 palette PAL_BG_WATER color 0 ld a, [hli] ld [rBGPD], a ld a, [hli] @@ -968,7 +968,7 @@ TileAnimationPalette: ; fc6d7 jr .end .color2 - ld hl, wBGPals1 palette PAL_BG_WATER + 4 + ld hl, wBGPals1 palette PAL_BG_WATER color 2 ld a, [hli] ld [rBGPD], a ld a, [hli] @@ -1009,7 +1009,7 @@ FlickeringCaveEntrancePalette: ; fc71e jr .okay .bit1set - ld hl, wBGPals1 palette PAL_BG_YELLOW + 2 + ld hl, wBGPals1 palette PAL_BG_YELLOW color 1 .okay ld a, [hli] diff --git a/home/palettes.asm b/home/palettes.asm index 9f10da118..e47b73e99 100644 --- a/home/palettes.asm +++ b/home/palettes.asm @@ -280,7 +280,7 @@ CopyPals:: ; d50 jr nz, .loop ; de += 8 (next pal) - ld a, NUM_PAL_COLORS * 2 + ld a, NUM_PAL_COLORS * PAL_COLOR_SIZE add e jr nc, .ok inc d diff --git a/macros.asm b/macros.asm index 7036b6419..76cbe790d 100644 --- a/macros.asm +++ b/macros.asm @@ -3,8 +3,8 @@ INCLUDE "macros/predef.asm" INCLUDE "macros/rst.asm" INCLUDE "macros/data.asm" INCLUDE "macros/code.asm" +INCLUDE "macros/gfx.asm" INCLUDE "macros/coords.asm" -INCLUDE "macros/color.asm" INCLUDE "macros/scripts/audio.asm" INCLUDE "macros/scripts/maps.asm" @@ -17,6 +17,3 @@ INCLUDE "macros/scripts/trade_anims.asm" INCLUDE "macros/scripts/gfx_anims.asm" percent EQUS "* $ff / 100" - -tiles EQUS "* LEN_2BPP_TILE" -tile EQUS "+ LEN_2BPP_TILE *" diff --git a/macros/color.asm b/macros/gfx.asm similarity index 73% rename from macros/color.asm rename to macros/gfx.asm index 5ebaae218..d9b1c46b0 100644 --- a/macros/color.asm +++ b/macros/gfx.asm @@ -13,3 +13,7 @@ palblue EQUS "(1 << 10) *" palettes EQUS "* 8" palette EQUS "+ 8 *" +color EQUS "+ 2 *" + +tiles EQUS "* LEN_2BPP_TILE" +tile EQUS "+ LEN_2BPP_TILE *" diff --git a/mobile/mobile_5b.asm b/mobile/mobile_5b.asm index bb005b564..4c72661a5 100755 --- a/mobile/mobile_5b.asm +++ b/mobile/mobile_5b.asm @@ -681,8 +681,8 @@ Function16cbd1: ; 16cbd1 ld bc, 2 ld hl, Unknown_16cfa3 call AddNTimes - ld de, wBGPals1 + 1 palettes + 4 - ld bc, 2 + ld de, wBGPals1 palette 1 color 2 + ld bc, PAL_COLOR_SIZE ld a, $5 call FarCopyWRAM farcall ApplyPals From 14ef9d3066ddf48f392b8afb698d85f0a7583f6f Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 19:57:35 -0500 Subject: [PATCH 018/135] PALETTE_SIZE --- constants/gfx_constants.asm | 1 + engine/color.asm | 2 +- home/palettes.asm | 2 +- macros/gfx.asm | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index bfa2140e7..584a62cda 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -4,6 +4,7 @@ LEN_2BPP_TILE EQU 2 * TILE_WIDTH ; bytes NUM_PAL_COLORS EQU 4 PAL_COLOR_SIZE EQU 2 +PALETTE_SIZE EQU NUM_PAL_COLORS * PAL_COLOR_SIZE PALRGB_WHITE EQUS "palred 31 + palgreen 31 + palblue 31" ; $7fff diff --git a/engine/color.asm b/engine/color.asm index b9c0419f8..35a17f868 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -497,7 +497,7 @@ LoadHLPaletteIntoDE: push af ld a, BANK(wOBPals1) ld [rSVBK], a - ld c, $8 + ld c, PALETTE_SIZE .loop ld a, [hli] ld [de], a diff --git a/home/palettes.asm b/home/palettes.asm index e47b73e99..8dafb23e7 100644 --- a/home/palettes.asm +++ b/home/palettes.asm @@ -280,7 +280,7 @@ CopyPals:: ; d50 jr nz, .loop ; de += 8 (next pal) - ld a, NUM_PAL_COLORS * PAL_COLOR_SIZE + ld a, PALETTE_SIZE add e jr nc, .ok inc d diff --git a/macros/gfx.asm b/macros/gfx.asm index d9b1c46b0..ff07ba468 100644 --- a/macros/gfx.asm +++ b/macros/gfx.asm @@ -11,9 +11,9 @@ palred EQUS "(1 << 0) *" palgreen EQUS "(1 << 5) *" palblue EQUS "(1 << 10) *" -palettes EQUS "* 8" -palette EQUS "+ 8 *" -color EQUS "+ 2 *" +palettes EQUS "* PALETTE_SIZE" +palette EQUS "+ PALETTE_SIZE *" +color EQUS "+ PAL_COLOR_SIZE *" tiles EQUS "* LEN_2BPP_TILE" tile EQUS "+ LEN_2BPP_TILE *" From 0261bd2ff5379ced32b59508ed0f9aef9f6abbbb Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 00:11:23 -0500 Subject: [PATCH 019/135] Daisy offers "grooming", not "massage" --- constants/misc_constants.asm | 2 +- data/special_pointers.asm | 2 +- docs/bugs_and_glitches.md | 14 +++++++------- engine/events/special.asm | 17 +++++++++-------- maps/BluesHouse.asm | 2 +- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index adcaf9a49..9af003e5a 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -81,7 +81,7 @@ const_value = 1 const HAPPINESS_BITTERPOWDER ; 0f const HAPPINESS_ENERGYROOT ; 10 const HAPPINESS_REVIVALHERB ; 11 - const HAPPINESS_MASSAGE ; 12 + const HAPPINESS_GROOMING ; 12 const HAPPINESS_GAINLEVELATHOME ; 13 ; day-care diff --git a/data/special_pointers.asm b/data/special_pointers.asm index 480fc0a04..10ba7ddca 100644 --- a/data/special_pointers.asm +++ b/data/special_pointers.asm @@ -110,7 +110,7 @@ SpecialsPointers:: ; c029 add_special Special_SnorlaxAwake add_special Special_YoungerHaircutBrother add_special Special_OlderHaircutBrother - add_special Special_DaisyMassage + add_special Special_DaisysGrooming add_special Special_PlayCurMonCry add_special Special_ProfOaksPCBoot add_special Special_GameboyCheck diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 5abf9d08a..07c0deba3 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -712,12 +712,12 @@ This is a bug with `ItemAttributes` in [items/attributes.asm](/items/attributes. ## Daisy's grooming doesn't always increase happiness -This is a bug with `MassageOrHaircut` in [engine/events/special.asm](/engine/events/special.asm): +This is a bug with `HaircutOrGrooming` in [engine/events/special.asm](/engine/events/special.asm): ```asm ; Bug: Subtracting $ff from $ff fails to set c. ; This can result in overflow into the next data array. -; In the case of getting a massage from Daisy, we bleed +; In the case of getting a grooming from Daisy, we bleed ; into CopyPokemonName_Buffer1_Buffer3, which passes ; $d0 to ChangeHappiness and returns $73 to the script. ; The end result is that there is a 0.4% chance your @@ -740,8 +740,8 @@ This is a bug with `MassageOrHaircut` in [engine/events/special.asm](/engine/eve ... -Data_DaisyMassage: ; 746b - db $ff, 2, HAPPINESS_MASSAGE ; 99.6% chance +Data_DaisysGrooming: ; 746b + db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance CopyPokemonName_Buffer1_Buffer3: ; 746e ld hl, StringBuffer1 @@ -753,9 +753,9 @@ CopyPokemonName_Buffer1_Buffer3: ; 746e **Fix:** ```asm -Data_DaisyMassage: ; 746b - db $80, 2, HAPPINESS_MASSAGE ; 50% chance - db $ff, 2, HAPPINESS_MASSAGE ; 50% chance +Data_DaisysGrooming: ; 746b + db $80, 2, HAPPINESS_GROOMING ; 50% chance + db $ff, 2, HAPPINESS_GROOMING ; 50% chance ``` diff --git a/engine/events/special.asm b/engine/events/special.asm index 304cfcbb9..7f87195e1 100755 --- a/engine/events/special.asm +++ b/engine/events/special.asm @@ -157,16 +157,17 @@ Special_BillsGrandfather: ; 73f7 Special_YoungerHaircutBrother: ; 7413 ld hl, Data_YoungerHaircutBrother - jr MassageOrHaircut + jr HaircutOrGrooming Special_OlderHaircutBrother: ; 7418 ld hl, Data_OlderHaircutBrother - jr MassageOrHaircut + jr HaircutOrGrooming -Special_DaisyMassage: ; 741d - ld hl, Data_DaisyMassage +Special_DaisysGrooming: ; 741d + ld hl, Data_DaisysGrooming + ; fallthrough -MassageOrHaircut: ; 7420 +HaircutOrGrooming: ; 7420 push hl farcall SelectMonFromParty pop hl @@ -181,7 +182,7 @@ MassageOrHaircut: ; 7420 call Random ; Bug: Subtracting $ff from $ff fails to set c. ; This can result in overflow into the next data array. -; In the case of getting a massage from Daisy, we bleed +; In the case of getting a grooming from Daisy, we bleed ; into CopyPokemonName_Buffer1_Buffer3, which passes ; $d0 to ChangeHappiness and returns $73 to the script. ; The end result is that there is a 0.4% chance your @@ -222,8 +223,8 @@ Data_OlderHaircutBrother: ; 7462 db $4c, 3, HAPPINESS_OLDERCUT2 ; 10% chance db $ff, 4, HAPPINESS_OLDERCUT3 ; 30% chance -Data_DaisyMassage: ; 746b - db $ff, 2, HAPPINESS_MASSAGE ; 99.6% chance +Data_DaisysGrooming: ; 746b + db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance CopyPokemonName_Buffer1_Buffer3: ; 746e ld hl, StringBuffer1 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index e66bb2312..33510e154 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -26,7 +26,7 @@ DaisyScript: iffalse .Refused writetext DaisyWhichMonText waitbutton - special Special_DaisyMassage + special Special_DaisysGrooming if_equal $0, .Refused if_equal $1, .CantGroomEgg setflag ENGINE_DAISYS_GROOMING From f3ac209db2a33777d2bbc41ec253bf73b307808f Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 00:16:55 -0500 Subject: [PATCH 020/135] New username --- FAQ.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FAQ.md b/FAQ.md index 26957631e..d0c34044f 100644 --- a/FAQ.md +++ b/FAQ.md @@ -51,4 +51,4 @@ Try asking on IRC or Discord (see [README.md](README.md)). [cygwin]: https://cygwin.com/install.html [rgbds]: https://github.com/rednex/rgbds/releases [crowdmap]: https://github.com/yenatch/crowdmap/ -[polished-map]: https://github.com/roukaour/polished-map +[polished-map]: https://github.com/Rangi42/polished-map From 689de5e3795ba47e3b0991a7a1baff551245bf52 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 00:20:38 -0500 Subject: [PATCH 021/135] Fix formatting --- FAQ.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FAQ.md b/FAQ.md index d0c34044f..c6f0dd813 100644 --- a/FAQ.md +++ b/FAQ.md @@ -31,7 +31,7 @@ If you are using 64-bit Windows, download [**64-bit Cygwin**][cygwin] and [**64- If you have not changed any of the asm, make sure you have the latest version of pokecrystal and the correct version of rgbds (see [INSTALL.md](INSTALL.md)). -If you added or changed any code, it has to fit in the **memory banks**. The 2MB ROM is divided into 128 banks of 4KB each, numbered $00 to $7F. The linkerscript **pokecrystal.link** lists which **`SECTION`**s go in which banks. Try moving some code into a new section. +If you added or changed any code, it has to fit in the **memory banks**. The 2MB ROM is divided into 128 banks of 4KB each, numbered $00 to $7F. The linkerscript **pokecrystal.link** lists which `SECTION`s go in which banks. Try moving some code into a new section. ## How do I edit maps? From 14cb5a3cb097d808e839d677d54a66f176b2e0b7 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 00:30:07 -0500 Subject: [PATCH 022/135] =?UTF-8?q?EcruteakHouse=20=E2=86=92=20EcruteakTin?= =?UTF-8?q?TowerEntrance?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/event_flags.asm | 2 +- constants/map_constants.asm | 2 +- data/maps/blocks.asm | 4 +- data/maps/data.asm | 2 +- data/maps/definitions.asm | 2 +- data/maps/scenes.asm | 2 +- data/maps/scripts.asm | 2 +- maps/EcruteakCity.asm | 2 +- maps/EcruteakGym.asm | 2 +- ...House.asm => EcruteakTinTowerEntrance.asm} | 60 +++++++++---------- ...House.blk => EcruteakTinTowerEntrance.blk} | 0 maps/RadioTower5F.asm | 2 +- maps/WiseTriosRoom.asm | 2 +- wram.asm | 2 +- 14 files changed, 43 insertions(+), 43 deletions(-) rename maps/{EcruteakHouse.asm => EcruteakTinTowerEntrance.asm} (76%) rename maps/{EcruteakHouse.blk => EcruteakTinTowerEntrance.blk} (100%) diff --git a/constants/event_flags.asm b/constants/event_flags.asm index ffe74f1f3..dc1aaafde 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -2043,7 +2043,7 @@ const EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY const EVENT_SAW_SUICUNE_ON_ROUTE_42 const EVENT_SAW_SUICUNE_ON_ROUTE_36 ; 7b0 - const EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + const EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE const EVENT_TIN_TOWER_1F_SUICUNE const EVENT_TIN_TOWER_1F_ENTEI const EVENT_TIN_TOWER_1F_RAIKOU diff --git a/constants/map_constants.asm b/constants/map_constants.asm index b2f1f5f11..9dbe66a8a 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -145,7 +145,7 @@ ENDM newgroup ; 4 - mapconst ECRUTEAK_HOUSE, 9, 10 ; 1 + mapconst ECRUTEAK_TIN_TOWER_ENTRANCE, 9, 10 ; 1 mapconst WISE_TRIOS_ROOM, 4, 4 ; 2 mapconst ECRUTEAK_POKECENTER_1F, 4, 5 ; 3 mapconst ECRUTEAK_LUGIA_SPEECH_HOUSE, 4, 4 ; 4 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index aa5fb9ae9..764ab0a70 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -806,8 +806,8 @@ GoldenrodBikeShop_Blocks: DanceTheatre_Blocks: INCBIN "maps/DanceTheatre.blk" -EcruteakHouse_Blocks: - INCBIN "maps/EcruteakHouse.blk" +EcruteakTinTowerEntrance_Blocks: + INCBIN "maps/EcruteakTinTowerEntrance.blk" GoldenrodGameCorner_Blocks: INCBIN "maps/GoldenrodGameCorner.blk" diff --git a/data/maps/data.asm b/data/maps/data.asm index 6257f4051..b0c7ba02b 100644 --- a/data/maps/data.asm +++ b/data/maps/data.asm @@ -470,7 +470,7 @@ ENDM map_data SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $00, 0 map_data SafariZoneBeta, SAFARI_ZONE_BETA, $13, 0 map_data VictoryRoad, VICTORY_ROAD, $1d, 0 - map_data EcruteakHouse, ECRUTEAK_HOUSE, $00, 0 + map_data EcruteakTinTowerEntrance, ECRUTEAK_TIN_TOWER_ENTRANCE, $00, 0 map_data WiseTriosRoom, WISE_TRIOS_ROOM, $00, 0 map_data EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $00, 0 map_data EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $00, 0 diff --git a/data/maps/definitions.asm b/data/maps/definitions.asm index 797d2ffee..25b7246bc 100644 --- a/data/maps/definitions.asm +++ b/data/maps/definitions.asm @@ -163,7 +163,7 @@ MapGroup_Dungeons: map_def VictoryRoad, TILESET_CAVE, CAVE, VICTORY_ROAD, MUSIC_VICTORY_ROAD, TRUE, PALETTE_NITE, FISHGROUP_SHORE MapGroup_Ecruteak: - map_def EcruteakHouse, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def EcruteakTinTowerEntrance, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def WiseTriosRoom, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE map_def EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def EcruteakLugiaSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm index 46358f284..89ec3ad31 100644 --- a/data/maps/scenes.asm +++ b/data/maps/scenes.asm @@ -43,7 +43,7 @@ MapScenes:: ; 4d01e scene_def OLIVINE_CITY, wOlivineCitySceneID scene_def ROUTE_34, wRoute34SceneID scene_def ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateSceneID - scene_def ECRUTEAK_HOUSE, wEcruteakHouseSceneID + scene_def ECRUTEAK_TIN_TOWER_ENTRANCE, wEcruteakTinTowerEntranceSceneID scene_def WISE_TRIOS_ROOM, wWiseTriosRoomSceneID scene_def ECRUTEAK_POKECENTER_1F, wEcruteakPokecenter1FSceneID scene_def ECRUTEAK_GYM, wEcruteakGymSceneID diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index 94be9db35..e7631dcaf 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -191,7 +191,7 @@ INCLUDE "maps/Route12SuperRodHouse.asm" SECTION "Map Scripts 11", ROMX -INCLUDE "maps/EcruteakHouse.asm" +INCLUDE "maps/EcruteakTinTowerEntrance.asm" INCLUDE "maps/WiseTriosRoom.asm" INCLUDE "maps/EcruteakPokecenter1F.asm" INCLUDE "maps/EcruteakLugiaSpeechHouse.asm" diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 5e3dada98..4f8c46c7a 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -267,7 +267,7 @@ EcruteakCity_MapEvents: db 15 warp_def 35, 26, 1, ROUTE_42_ECRUTEAK_GATE warp_def 35, 27, 2, ROUTE_42_ECRUTEAK_GATE - warp_def 18, 11, 1, ECRUTEAK_HOUSE + warp_def 18, 11, 1, ECRUTEAK_TIN_TOWER_ENTRANCE warp_def 20, 2, 1, WISE_TRIOS_ROOM warp_def 20, 3, 2, WISE_TRIOS_ROOM warp_def 23, 27, 1, ECRUTEAK_POKECENTER_1F diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 70776d1ee..ea6448ecc 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -43,7 +43,7 @@ MortyScript_0x99d58: setflag ENGINE_FOGBADGE checkcode VAR_BADGES scall EcruteakGymActivateRockets - setmapscene ECRUTEAK_HOUSE, 1 + setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, 1 setevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_RANG_CLEAR_BELL_2 .FightDone: diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakTinTowerEntrance.asm similarity index 76% rename from maps/EcruteakHouse.asm rename to maps/EcruteakTinTowerEntrance.asm index 436bdd0e3..f94e462e4 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -1,10 +1,10 @@ const_value set 2 - const ECRUTEAKHOUSE_SAGE1 - const ECRUTEAKHOUSE_SAGE2 - const ECRUTEAKHOUSE_SAGE3 - const ECRUTEAKHOUSE_GRAMPS + const ECRUTEAKTINTOWERENTRANCE_SAGE1 + const ECRUTEAKTINTOWERENTRANCE_SAGE2 + const ECRUTEAKTINTOWERENTRANCE_SAGE3 + const ECRUTEAKTINTOWERENTRANCE_GRAMPS -EcruteakHouse_MapScripts: +EcruteakTinTowerEntrance_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -32,7 +32,7 @@ EcruteakHouse_MapScripts: .BlockTower: clearevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_RANG_CLEAR_BELL_2 - setevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + setevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE checkitem CLEAR_BELL iftrue .NoClearBell setscene 0 @@ -40,30 +40,30 @@ EcruteakHouse_MapScripts: return .DontBlockTower: - clearevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + clearevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE return -EcruteakHouse_CoordEvent1: +EcruteakTinTowerEntrance_CoordEvent1: checkevent EVENT_RANG_CLEAR_BELL_2 - iftrue EcruteakHouse_CoordEvent_DontMove - applymovement ECRUTEAKHOUSE_SAGE2, MovementData_0x980c7 - moveobject ECRUTEAKHOUSE_SAGE1, 4, 6 - appear ECRUTEAKHOUSE_SAGE1 + iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove + applymovement ECRUTEAKTINTOWERENTRANCE_SAGE2, MovementData_0x980c7 + moveobject ECRUTEAKTINTOWERENTRANCE_SAGE1, 4, 6 + appear ECRUTEAKTINTOWERENTRANCE_SAGE1 pause 5 - disappear ECRUTEAKHOUSE_SAGE2 + disappear ECRUTEAKTINTOWERENTRANCE_SAGE2 end -EcruteakHouse_CoordEvent2: +EcruteakTinTowerEntrance_CoordEvent2: checkevent EVENT_RANG_CLEAR_BELL_1 - iftrue EcruteakHouse_CoordEvent_DontMove - applymovement ECRUTEAKHOUSE_SAGE1, MovementData_0x980cc - moveobject ECRUTEAKHOUSE_SAGE2, 5, 6 - appear ECRUTEAKHOUSE_SAGE2 + iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove + applymovement ECRUTEAKTINTOWERENTRANCE_SAGE1, MovementData_0x980cc + moveobject ECRUTEAKTINTOWERENTRANCE_SAGE2, 5, 6 + appear ECRUTEAKTINTOWERENTRANCE_SAGE2 pause 5 - disappear ECRUTEAKHOUSE_SAGE1 + disappear ECRUTEAKTINTOWERENTRANCE_SAGE1 end -EcruteakHouse_CoordEvent_DontMove: +EcruteakTinTowerEntrance_CoordEvent_DontMove: end SageScript_0x98062: @@ -134,8 +134,8 @@ SageScript_0x980b0: closetext end -EcruteakHouseGrampsScript: - jumptextfaceplayer EcruteakHouseGrampsText +EcruteakTinTowerEntranceGrampsScript: + jumptextfaceplayer EcruteakTinTowerEntranceGrampsText MovementData_0x980c7: fix_facing @@ -266,7 +266,7 @@ UnknownText_0x9846f: line "to the top!" done -EcruteakHouseGrampsText: +EcruteakTinTowerEntranceGrampsText: text "Two towers…" line "Two #MON…" @@ -277,7 +277,7 @@ EcruteakHouseGrampsText: line "never to return." done -EcruteakHouse_MapEvents: +EcruteakTinTowerEntrance_MapEvents: ; filler db 0, 0 @@ -285,14 +285,14 @@ EcruteakHouse_MapEvents: db 5 warp_def 4, 17, 3, ECRUTEAK_CITY warp_def 5, 17, 3, ECRUTEAK_CITY - warp_def 5, 3, 4, ECRUTEAK_HOUSE - warp_def 17, 15, 3, ECRUTEAK_HOUSE + warp_def 5, 3, 4, ECRUTEAK_TIN_TOWER_ENTRANCE + warp_def 17, 15, 3, ECRUTEAK_TIN_TOWER_ENTRANCE warp_def 17, 3, 3, WISE_TRIOS_ROOM .CoordEvents: db 2 - coord_event 4, 7, 0, EcruteakHouse_CoordEvent1 - coord_event 5, 7, 0, EcruteakHouse_CoordEvent2 + coord_event 4, 7, 0, EcruteakTinTowerEntrance_CoordEvent1 + coord_event 5, 7, 0, EcruteakTinTowerEntrance_CoordEvent2 .BGEvents: db 0 @@ -301,5 +301,5 @@ EcruteakHouse_MapEvents: db 4 object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1 object_event 5, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2 - object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE - object_event 3, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHouseGrampsScript, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE + object_event 3, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceGrampsScript, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE diff --git a/maps/EcruteakHouse.blk b/maps/EcruteakTinTowerEntrance.blk similarity index 100% rename from maps/EcruteakHouse.blk rename to maps/EcruteakTinTowerEntrance.blk diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 009c1e91d..fe9f38792 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -127,7 +127,7 @@ RadioTower5FRocketBossScene: waitbutton closetext setscene 2 - setmapscene ECRUTEAK_HOUSE, 0 + setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, 0 setevent EVENT_GOT_CLEAR_BELL setevent EVENT_TEAM_ROCKET_DISBANDED jump .UselessJump diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index ef30655c2..128fa2632 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -352,7 +352,7 @@ WiseTriosRoom_MapEvents: db 3 warp_def 7, 4, 4, ECRUTEAK_CITY warp_def 7, 5, 5, ECRUTEAK_CITY - warp_def 1, 4, 5, ECRUTEAK_HOUSE + warp_def 1, 4, 5, ECRUTEAK_TIN_TOWER_ENTRANCE .CoordEvents: db 1 diff --git a/wram.asm b/wram.asm index 7830cef72..c26a6f386 100644 --- a/wram.asm +++ b/wram.asm @@ -2538,7 +2538,7 @@ wGoldenrodPokecenter1FSceneID:: db ; d993 wOlivineCitySceneID:: db ; d994 wRoute34SceneID:: db ; d995 wRoute34IlexForestGateSceneID:: db ; d996 -wEcruteakHouseSceneID:: db ; d997 +wEcruteakTinTowerEntranceSceneID:: db ; d997 wWiseTriosRoomSceneID:: db ; d998 wEcruteakPokecenter1FSceneID:: db ; d999 wEcruteakGymSceneID:: db ; d99a From fc61d58dc45e1a205ab63cdb7a8df62450383bf9 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 01:03:47 -0500 Subject: [PATCH 023/135] =?UTF-8?q?Rename=20some=20more=20maps=20The=20Pok?= =?UTF-8?q?=C3=A9com=20Center's=20.blk=20contains=201F=20and=20the=20Admin?= =?UTF-8?q?istration=20room,=20but=20the=20.asm=20script=20is=20just=20for?= =?UTF-8?q?=20the=20Admin=20room;=201F-related=20text=20and=20scripts=20ar?= =?UTF-8?q?e=20in=20GoldenrodPokecenter1F.asm.=20Presumably=20both=20map?= =?UTF-8?q?=20scripts=20shared=20the=20same=20.blk.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/map_constants.asm | 8 ++-- data/maps/blocks.asm | 10 ++-- data/maps/data.asm | 8 ++-- data/maps/definitions.asm | 8 ++-- data/maps/scripts.asm | 8 ++-- maps/BillsBrothersHouse.asm | 48 +++++++++++++++++++ ...odBillsHouse.asm => BillsFamilysHouse.asm} | 22 ++++----- ...gsHouse.asm => DayOfWeekSiblingsHouse.asm} | 6 +-- maps/FuchsiaBillSpeechHouse.asm | 48 ------------------- maps/FuchsiaCity.asm | 2 +- maps/GoldenrodCity.asm | 2 +- maps/GoldenrodPokecenter1F.asm | 2 +- ...e.asm => PokecomCenterAdminRoomMobile.asm} | 46 +++++++++--------- ...e.blk => PokecomCenterAdminRoomMobile.blk} | 0 maps/Route26.asm | 2 +- 15 files changed, 110 insertions(+), 110 deletions(-) create mode 100644 maps/BillsBrothersHouse.asm rename maps/{GoldenrodBillsHouse.asm => BillsFamilysHouse.asm} (91%) rename maps/{Route26DayofWeekSiblingsHouse.asm => DayOfWeekSiblingsHouse.asm} (90%) delete mode 100644 maps/FuchsiaBillSpeechHouse.asm rename maps/{GoldenrodPokeComCenter2FMobile.asm => PokecomCenterAdminRoomMobile.asm} (76%) rename maps/{GoldenrodPokeComCenter2FMobile.blk => PokecomCenterAdminRoomMobile.blk} (100%) diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 9dbe66a8a..f327cd407 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -245,7 +245,7 @@ ENDM mapconst GOLDENROD_GYM, 9, 10 ; 3 mapconst GOLDENROD_BIKE_SHOP, 4, 4 ; 4 mapconst GOLDENROD_HAPPINESS_RATER, 4, 4 ; 5 - mapconst GOLDENROD_BILLS_HOUSE, 4, 4 ; 6 + mapconst BILLS_FAMILYS_HOUSE, 4, 4 ; 6 mapconst GOLDENROD_MAGNET_TRAIN_STATION, 9, 10 ; 7 mapconst GOLDENROD_FLOWER_SHOP, 4, 4 ; 8 mapconst GOLDENROD_PP_SPEECH_HOUSE, 4, 4 ; 9 @@ -260,7 +260,7 @@ ENDM mapconst GOLDENROD_DEPT_STORE_ROOF, 4, 8 ; 18 mapconst GOLDENROD_GAME_CORNER, 7, 10 ; 19 mapconst GOLDENROD_POKECENTER_1F, 4, 5 ; 20 - mapconst GOLDENROD_POKECOM_CENTER_2F_MOBILE, 16, 16 ; 21 + mapconst POKECOM_CENTER_ADMIN_ROOM_MOBILE, 16, 16 ; 21 mapconst ILEX_FOREST_AZALEA_GATE, 4, 5 ; 22 mapconst ROUTE_34_ILEX_FOREST_GATE, 4, 5 ; 23 mapconst DAY_CARE, 4, 5 ; 24 @@ -337,7 +337,7 @@ ENDM mapconst FUCHSIA_MART, 4, 6 ; 6 mapconst SAFARI_ZONE_MAIN_OFFICE, 4, 4 ; 7 mapconst FUCHSIA_GYM, 9, 5 ; 8 - mapconst FUCHSIA_BILL_SPEECH_HOUSE, 4, 4 ; 9 + mapconst BILLS_BROTHERS_HOUSE, 4, 4 ; 9 mapconst FUCHSIA_POKECENTER_1F, 4, 5 ; 10 mapconst FUCHSIA_POKECENTER_2F_BETA, 4, 8 ; 11 mapconst SAFARI_ZONE_WARDENS_HOME, 4, 5 ; 12 @@ -452,7 +452,7 @@ ENDM mapconst PLAYERS_NEIGHBORS_HOUSE, 4, 4 ; 8 mapconst ELMS_HOUSE, 4, 4 ; 9 mapconst ROUTE_26_HEAL_SPEECH_HOUSE, 4, 4 ; 10 - mapconst ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11 + mapconst DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11 mapconst ROUTE_27_SANDSTORM_HOUSE, 4, 4 ; 12 mapconst ROUTE_29_ROUTE_46_GATE, 4, 5 ; 13 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 764ab0a70..1b3eda585 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -165,7 +165,7 @@ CharcoalKiln_Blocks: LakeOfRageHiddenPowerHouse_Blocks: LakeOfRageMagikarpHouse_Blocks: GoldenrodHappinessRater_Blocks: -GoldenrodBillsHouse_Blocks: +BillsFamilysHouse_Blocks: GoldenrodPPSpeechHouse_Blocks: GoldenrodNameRater_Blocks: VermilionFishingSpeechHouse_Blocks: @@ -174,7 +174,7 @@ VermilionDiglettsCaveSpeechHouse_Blocks: BluesHouse_Blocks: PewterNidoranSpeechHouse_Blocks: PewterSnoozeSpeechHouse_Blocks: -FuchsiaBillSpeechHouse_Blocks: +BillsBrothersHouse_Blocks: LavenderSpeechHouse_Blocks: LavenderNameRater_Blocks: Route12SuperRodHouse_Blocks: @@ -190,7 +190,7 @@ ViridianNicknameSpeechHouse_Blocks: Route2NuggetSpeechHouse_Blocks: PlayersNeighborsHouse_Blocks: Route26HealSpeechHouse_Blocks: -Route26DayofWeekSiblingsHouse_Blocks: +DayOfWeekSiblingsHouse_Blocks: Route27SandstormHouse_Blocks: MrPsychicsHouse_Blocks: Route5CleanseTagSpeechHouse_Blocks: @@ -1022,8 +1022,8 @@ BattleTower1F_Blocks: BattleTowerBattleRoom_Blocks: INCBIN "maps/BattleTowerBattleRoom.blk" -GoldenrodPokeComCenter2FMobile_Blocks: - INCBIN "maps/GoldenrodPokeComCenter2FMobile.blk" +PokecomCenterAdminRoomMobile_Blocks: + INCBIN "maps/PokecomCenterAdminRoomMobile.blk" MobileTradeRoomMobile_Blocks: INCBIN "maps/MobileTradeRoomMobile.blk" diff --git a/data/maps/data.asm b/data/maps/data.asm index b0c7ba02b..16a972437 100644 --- a/data/maps/data.asm +++ b/data/maps/data.asm @@ -524,7 +524,7 @@ ENDM map_data GoldenrodGym, GOLDENROD_GYM, $00, 0 map_data GoldenrodBikeShop, GOLDENROD_BIKE_SHOP, $00, 0 map_data GoldenrodHappinessRater, GOLDENROD_HAPPINESS_RATER, $00, 0 - map_data GoldenrodBillsHouse, GOLDENROD_BILLS_HOUSE, $00, 0 + map_data BillsFamilysHouse, BILLS_FAMILYS_HOUSE, $00, 0 map_data GoldenrodMagnetTrainStation, GOLDENROD_MAGNET_TRAIN_STATION, $00, 0 map_data GoldenrodFlowerShop, GOLDENROD_FLOWER_SHOP, $00, 0 map_data GoldenrodPPSpeechHouse, GOLDENROD_PP_SPEECH_HOUSE, $00, 0 @@ -539,7 +539,7 @@ ENDM map_data GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0 map_data GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $00, 0 map_data GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $00, 0 - map_data GoldenrodPokeComCenter2FMobile, GOLDENROD_POKECOM_CENTER_2F_MOBILE, $00, 0 + map_data PokecomCenterAdminRoomMobile, POKECOM_CENTER_ADMIN_ROOM_MOBILE, $00, 0 map_data IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $00, 0 map_data Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $00, 0 map_data DayCare, DAY_CARE, $00, 0 @@ -585,7 +585,7 @@ ENDM map_data FuchsiaMart, FUCHSIA_MART, $00, 0 map_data SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $00, 0 map_data FuchsiaGym, FUCHSIA_GYM, $00, 0 - map_data FuchsiaBillSpeechHouse, FUCHSIA_BILL_SPEECH_HOUSE, $00, 0 + map_data BillsBrothersHouse, BILLS_BROTHERS_HOUSE, $00, 0 map_data FuchsiaPokecenter1F, FUCHSIA_POKECENTER_1F, $00, 0 map_data FuchsiaPokecenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $00, 0 map_data SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $00, 0 @@ -659,7 +659,7 @@ ENDM map_data PlayersNeighborsHouse, PLAYERS_NEIGHBORS_HOUSE, $00, 0 map_data ElmsHouse, ELMS_HOUSE, $00, 0 map_data Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $00, 0 - map_data Route26DayofWeekSiblingsHouse, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, $00, 0 + map_data DayOfWeekSiblingsHouse, DAY_OF_WEEK_SIBLINGS_HOUSE, $00, 0 map_data Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $00, 0 map_data Route29Route46Gate, ROUTE_29_ROUTE_46_GATE, $00, 0 map_data FightingDojo, FIGHTING_DOJO, $00, 0 diff --git a/data/maps/definitions.asm b/data/maps/definitions.asm index 25b7246bc..ccc723177 100644 --- a/data/maps/definitions.asm +++ b/data/maps/definitions.asm @@ -256,7 +256,7 @@ MapGroup_Goldenrod: map_def GoldenrodGym, TILESET_ELITE_FOUR_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodBikeShop, TILESET_CHAMPIONS_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodHappinessRater, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodBillsHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def BillsFamilysHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodFlowerShop, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodPPSpeechHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -271,7 +271,7 @@ MapGroup_Goldenrod: map_def GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodPokeComCenter2FMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def PokecomCenterAdminRoomMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def DayCare, TILESET_HOUSE, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -342,7 +342,7 @@ MapGroup_Fuchsia: map_def FuchsiaMart, TILESET_MART, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def FuchsiaGym, TILESET_LAB, INDOOR, FUCHSIA_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def FuchsiaBillSpeechHouse, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def BillsBrothersHouse, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def FuchsiaPokecenter1F, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def FuchsiaPokecenter2FBeta, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def SafariZoneWardensHome, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -450,7 +450,7 @@ MapGroup_NewBark: map_def PlayersNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route26HealSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route26DayofWeekSiblingsHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def DayOfWeekSiblingsHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route27SandstormHouse, TILESET_HOUSE, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route29Route46Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_DAY, FISHGROUP_SHORE diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index e7631dcaf..fd4288a57 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -3,7 +3,7 @@ SECTION "Map Scripts 1", ROMX INCLUDE "maps/GoldenrodGym.asm" INCLUDE "maps/GoldenrodBikeShop.asm" INCLUDE "maps/GoldenrodHappinessRater.asm" -INCLUDE "maps/GoldenrodBillsHouse.asm" +INCLUDE "maps/BillsFamilysHouse.asm" INCLUDE "maps/GoldenrodMagnetTrainStation.asm" INCLUDE "maps/GoldenrodFlowerShop.asm" INCLUDE "maps/GoldenrodPPSpeechHouse.asm" @@ -63,7 +63,7 @@ INCLUDE "maps/RadioTower5F.asm" INCLUDE "maps/OlivineLighthouse5F.asm" INCLUDE "maps/OlivineLighthouse6F.asm" INCLUDE "maps/GoldenrodPokecenter1F.asm" -INCLUDE "maps/GoldenrodPokeComCenter2FMobile.asm" +INCLUDE "maps/PokecomCenterAdminRoomMobile.asm" INCLUDE "maps/IlexForestAzaleaGate.asm" INCLUDE "maps/Route34IlexForestGate.asm" INCLUDE "maps/DayCare.asm" @@ -156,7 +156,7 @@ INCLUDE "maps/PlayersHouse2F.asm" INCLUDE "maps/PlayersNeighborsHouse.asm" INCLUDE "maps/ElmsHouse.asm" INCLUDE "maps/Route26HealSpeechHouse.asm" -INCLUDE "maps/Route26DayofWeekSiblingsHouse.asm" +INCLUDE "maps/DayOfWeekSiblingsHouse.asm" INCLUDE "maps/Route27SandstormHouse.asm" INCLUDE "maps/Route29Route46Gate.asm" @@ -361,7 +361,7 @@ INCLUDE "maps/MoveDeletersHouse.asm" INCLUDE "maps/FuchsiaMart.asm" INCLUDE "maps/SafariZoneMainOffice.asm" INCLUDE "maps/FuchsiaGym.asm" -INCLUDE "maps/FuchsiaBillSpeechHouse.asm" +INCLUDE "maps/BillsBrothersHouse.asm" INCLUDE "maps/FuchsiaPokecenter1F.asm" INCLUDE "maps/FuchsiaPokecenter2FBeta.asm" INCLUDE "maps/SafariZoneWardensHome.asm" diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm new file mode 100644 index 000000000..4e56146fa --- /dev/null +++ b/maps/BillsBrothersHouse.asm @@ -0,0 +1,48 @@ +const_value set 2 + const BILLSBROTHERSHOUSE_POKEFAN_F + const BILLSBROTHERSHOUSE_YOUNGSTER + +BillsBrothersHouse_MapScripts: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +BillsBrotherScript: + jumptextfaceplayer BillsBrotherText + +BillsBrothersHouseYoungsterScript: + jumptextfaceplayer BillsBrothersHouseYoungsterText + +BillsBrotherText: + text "My grandpa is at " + line "my brother BILL's" + cont "on CERULEAN CAPE." + done + +BillsBrothersHouseYoungsterText: + text "I saw these weird," + line "slow #MON on" + cont "CYCLING ROAD." + done + +BillsBrothersHouse_MapEvents: + ; filler + db 0, 0 + +.Warps: + db 2 + warp_def 2, 7, 4, FUCHSIA_CITY + warp_def 3, 7, 4, FUCHSIA_CITY + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 2 + object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BillsBrotherScript, -1 + object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsBrothersHouseYoungsterScript, -1 diff --git a/maps/GoldenrodBillsHouse.asm b/maps/BillsFamilysHouse.asm similarity index 91% rename from maps/GoldenrodBillsHouse.asm rename to maps/BillsFamilysHouse.asm index 33c8dbd17..6aa014301 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -1,16 +1,16 @@ const_value set 2 - const GOLDENRODBILLSHOUSE_BILL - const GOLDENRODBILLSHOUSE_POKEFAN_F - const GOLDENRODBILLSHOUSE_TWIN + const BILLSFAMILYSHOUSE_BILL + const BILLSFAMILYSHOUSE_POKEFAN_F + const BILLSFAMILYSHOUSE_TWIN -GoldenrodBillsHouse_MapScripts: +BillsFamilysHouse_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -BillsHouseBill: +BillScript: faceplayer opentext checkevent EVENT_GOT_EEVEE @@ -51,7 +51,7 @@ UnknownScript_0x54c1f: closetext end -BillsMom: +BillsMomScript: faceplayer opentext checkevent EVENT_MET_BILL @@ -67,7 +67,7 @@ UnknownScript_0x54c33: closetext end -BillsSister: +BillsSisterScript: faceplayer opentext checkcellnum PHONE_BILL @@ -242,7 +242,7 @@ UnknownText_0x55069: line "system." done -GoldenrodBillsHouse_MapEvents: +BillsFamilysHouse_MapEvents: ; filler db 0, 0 @@ -262,6 +262,6 @@ GoldenrodBillsHouse_MapEvents: .ObjectEvents: db 3 - object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsHouseBill, EVENT_MET_BILL - object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMom, -1 - object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSister, -1 + object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillScript, EVENT_MET_BILL + object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMomScript, -1 + object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSisterScript, -1 diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm similarity index 90% rename from maps/Route26DayofWeekSiblingsHouse.asm rename to maps/DayOfWeekSiblingsHouse.asm index e958d81f2..de1272660 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/DayOfWeekSiblingsHouse.asm @@ -1,7 +1,7 @@ const_value set 2 - const ROUTE26DAYOFWEEKSIBLINGSHOUSE_POKEDEX + const DAYOFWEEKSIBLINGSHOUSE_POKEDEX -Route26DayofWeekSiblingsHouse_MapScripts: +DayOfWeekSiblingsHouse_MapScripts: .SceneScripts: db 0 @@ -70,7 +70,7 @@ UnknownText_0x7b2b9: line "ROUTE 37" done -Route26DayofWeekSiblingsHouse_MapEvents: +DayOfWeekSiblingsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm deleted file mode 100644 index 8a72256b6..000000000 --- a/maps/FuchsiaBillSpeechHouse.asm +++ /dev/null @@ -1,48 +0,0 @@ -const_value set 2 - const FUCHSIABILLSPEECHHOUSE_POKEFAN_F - const FUCHSIABILLSPEECHHOUSE_YOUNGSTER - -FuchsiaBillSpeechHouse_MapScripts: -.SceneScripts: - db 0 - -.MapCallbacks: - db 0 - -FuchsiaBillSpeechHousePokefanFScript: - jumptextfaceplayer FuchsiaBillSpeechHousePokefanFText - -FuchsiaBillSpeechHouseYoungsterScript: - jumptextfaceplayer FuchsiaBillSpeechHouseYoungsterText - -FuchsiaBillSpeechHousePokefanFText: - text "My grandpa is at " - line "my brother BILL's" - cont "on CERULEAN CAPE." - done - -FuchsiaBillSpeechHouseYoungsterText: - text "I saw these weird," - line "slow #MON on" - cont "CYCLING ROAD." - done - -FuchsiaBillSpeechHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 4, FUCHSIA_CITY - warp_def 3, 7, 4, FUCHSIA_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 2 - object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaBillSpeechHousePokefanFScript, -1 - object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaBillSpeechHouseYoungsterScript, -1 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 34a636aaf..319dae2cd 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -133,7 +133,7 @@ FuchsiaCity_MapEvents: warp_def 5, 13, 2, FUCHSIA_MART warp_def 22, 13, 1, SAFARI_ZONE_MAIN_OFFICE warp_def 8, 27, 1, FUCHSIA_GYM - warp_def 11, 27, 1, FUCHSIA_BILL_SPEECH_HOUSE + warp_def 11, 27, 1, BILLS_BROTHERS_HOUSE warp_def 19, 27, 1, FUCHSIA_POKECENTER_1F warp_def 27, 27, 1, SAFARI_ZONE_WARDENS_HOME warp_def 18, 3, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index f9f506fdd..8b64a4435 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -560,7 +560,7 @@ GoldenrodCity_MapEvents: warp_def 24, 7, 1, GOLDENROD_GYM warp_def 29, 29, 1, GOLDENROD_BIKE_SHOP warp_def 31, 21, 1, GOLDENROD_HAPPINESS_RATER - warp_def 5, 25, 1, GOLDENROD_BILLS_HOUSE + warp_def 5, 25, 1, BILLS_FAMILYS_HOUSE warp_def 9, 13, 2, GOLDENROD_MAGNET_TRAIN_STATION warp_def 29, 5, 1, GOLDENROD_FLOWER_SHOP warp_def 33, 9, 1, GOLDENROD_PP_SPEECH_HOUSE diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index f01194311..9402f8743 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -812,7 +812,7 @@ GoldenrodPokecenter1F_MapEvents: db 4 warp_def 3, 7, 15, GOLDENROD_CITY warp_def 4, 7, 15, GOLDENROD_CITY - warp_def 0, 6, 1, GOLDENROD_POKECOM_CENTER_2F_MOBILE + warp_def 0, 6, 1, POKECOM_CENTER_ADMIN_ROOM_MOBILE warp_def 0, 7, 1, POKECENTER_2F .CoordEvents: diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm similarity index 76% rename from maps/GoldenrodPokeComCenter2FMobile.asm rename to maps/PokecomCenterAdminRoomMobile.asm index d45b3ac56..53a1043f8 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/PokecomCenterAdminRoomMobile.asm @@ -1,25 +1,25 @@ const_value set 2 - const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST1 - const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST2 - const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST3 + const POKECOMCENTERADMINROOMMOBILE_SCIENTIST1 + const POKECOMCENTERADMINROOMMOBILE_SCIENTIST2 + const POKECOMCENTERADMINROOMMOBILE_SCIENTIST3 -GoldenrodPokeComCenter2FMobile_MapScripts: +PokecomCenterAdminRoomMobile_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -GoldenrodPokeComCenter2FMobileScientist1Script: - jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist1Text +PokecomCenterAdminRoomMobileScientist1Script: + jumptextfaceplayer PokecomCenterAdminRoomMobileScientist1Text -GoldenrodPokeComCenter2FMobileScientist2Script: - jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist2Text +PokecomCenterAdminRoomMobileScientist2Script: + jumptextfaceplayer PokecomCenterAdminRoomMobileScientist2Text -GoldenrodPokeComCenter2FMobileScientist3Script: - jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist3Text +PokecomCenterAdminRoomMobileScientist3Script: + jumptextfaceplayer PokecomCenterAdminRoomMobileScientist3Text -MapGoldenrodPokeComCenter2FMobileSignpost0Script: +PokecomCenterAdminRoomMobileSignpost0Script: opentext writetext UnknownText_0x627ee waitbutton @@ -61,7 +61,7 @@ MenuDataHeader_0x62602: db "モバイルセンター@" ; MOBILE CENTER db "やめる@" ; QUIT -MapGoldenrodPokeComCenter2FMobileSignpost1Script: +PokecomCenterAdminRoomMobileSignpost1Script: opentext writetext UnknownText_0x62989 waitbutton @@ -103,10 +103,10 @@ MenuDataHeader_0x6264c: db "でんわつながらないとき@" ; Don't use phone db "やめる@" ; QUIT -MapGoldenrodPokeComCenter2FMobileSignpost2Script: +PokecomCenterAdminRoomMobileSignpost2Script: jumptext UnknownText_0x62b26 -GoldenrodPokeComCenter2FMobileScientist1Text: +PokecomCenterAdminRoomMobileScientist1Text: text "#COM CENTER and" line "MOBILE CENTER were" @@ -120,7 +120,7 @@ GoldenrodPokeComCenter2FMobileScientist1Text: line "strangers." done -GoldenrodPokeComCenter2FMobileScientist2Text: +PokecomCenterAdminRoomMobileScientist2Text: text "When you linked" line "with someone by" @@ -137,7 +137,7 @@ GoldenrodPokeComCenter2FMobileScientist2Text: line "got the shakes!" done -GoldenrodPokeComCenter2FMobileScientist3Text: +PokecomCenterAdminRoomMobileScientist3Text: text "They were able to" line "build this huge" @@ -262,7 +262,7 @@ UnknownText_0x62b26: para "<……> <……> <……>" done -GoldenrodPokeComCenter2FMobile_MapEvents: +PokecomCenterAdminRoomMobile_MapEvents: ; filler db 0, 0 @@ -276,12 +276,12 @@ GoldenrodPokeComCenter2FMobile_MapEvents: .BGEvents: db 3 - bg_event 6, 26, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost0Script - bg_event 6, 28, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost1Script - bg_event 3, 26, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost2Script + bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost0Script + bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost1Script + bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost2Script .ObjectEvents: db 3 - object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist1Script, -1 - object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist2Script, -1 - object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist3Script, -1 + object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist1Script, -1 + object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist2Script, -1 + object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist3Script, -1 diff --git a/maps/GoldenrodPokeComCenter2FMobile.blk b/maps/PokecomCenterAdminRoomMobile.blk similarity index 100% rename from maps/GoldenrodPokeComCenter2FMobile.blk rename to maps/PokecomCenterAdminRoomMobile.blk diff --git a/maps/Route26.asm b/maps/Route26.asm index 293a0add7..75599372b 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -420,7 +420,7 @@ Route26_MapEvents: db 3 warp_def 7, 5, 3, VICTORY_ROAD_GATE warp_def 15, 57, 1, ROUTE_26_HEAL_SPEECH_HOUSE - warp_def 5, 71, 1, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE + warp_def 5, 71, 1, DAY_OF_WEEK_SIBLINGS_HOUSE .CoordEvents: db 0 From 94ae404732b512c60cf82111bb2f65013fdfbf39 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 10:46:26 -0500 Subject: [PATCH 024/135] Separate data/mon_menu.asm --- constants/gfx_constants.asm | 16 +++++++ constants/menu_constants.asm | 34 ++++++++++++++ constants/pokemon_data_constants.asm | 46 ------------------- data/mon_menu.asm | 48 ++++++++++++++++++++ engine/mon_menu.asm | 67 +++++++--------------------- engine/start_menu.asm | 40 ++++++++--------- 6 files changed, 134 insertions(+), 117 deletions(-) create mode 100644 data/mon_menu.asm diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 584a62cda..1b287b236 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -8,6 +8,7 @@ PALETTE_SIZE EQU NUM_PAL_COLORS * PAL_COLOR_SIZE PALRGB_WHITE EQUS "palred 31 + palgreen 31 + palblue 31" ; $7fff + SCREEN_WIDTH EQU 20 ; tiles SCREEN_HEIGHT EQU 18 ; tiles SCREEN_WIDTH_PX EQU SCREEN_WIDTH * TILE_WIDTH ; pixels @@ -18,11 +19,13 @@ BG_MAP_HEIGHT EQU 32 ; tiles WMISC_WIDTH EQU 6 * 4 WMISC_HEIGHT EQU 5 * 4 + HP_BAR_LENGTH EQU 6 ; tiles EXP_BAR_LENGTH EQU 8 ; tiles HP_BAR_LENGTH_PX EQU HP_BAR_LENGTH * TILE_WIDTH ; pixels EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * TILE_WIDTH ; pixels + ; sprite_oam_struct members (see macros/wram.asm) const_def const SPRITEOAMSTRUCT_YCOORD ; 0 @@ -31,3 +34,16 @@ EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * TILE_WIDTH ; pixels const SPRITEOAMSTRUCT_ATTRIBUTES ; 3 SPRITEOAMSTRUCT_LENGTH EQU const_value NUM_SPRITE_OAM_STRUCTS EQU 40 ; see Sprites + + +; PokeAnims indexes (see engine/pic_animation.asm) + const_def + const ANIM_MON_SLOW + const ANIM_MON_NORMAL + const ANIM_MON_MENU + const ANIM_MON_TRADE + const ANIM_MON_EVOLVE + const ANIM_MON_HATCH + const ANIM_MON_UNUSED + const ANIM_MON_EGG1 + const ANIM_MON_EGG2 diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm index 9174159ea..e8f85a8db 100644 --- a/constants/menu_constants.asm +++ b/constants/menu_constants.asm @@ -31,3 +31,37 @@ shift_const SCROLLINGMENU_ENABLE_FUNCTION3 shift_const SCROLLINGMENU_ENABLE_START shift_const SCROLLINGMENU_ENABLE_SELECT + + +; MonMenuOptions indexes (see data/mon_menu.asm) +; used by PokemonActionSubmenu (see engine/start_menu.asm) +const_value set 1 +; moves + const MONMENUITEM_CUT ; 1 + const MONMENUITEM_FLY ; 2 + const MONMENUITEM_SURF ; 3 + const MONMENUITEM_STRENGTH ; 4 + const MONMENUITEM_WATERFALL ; 5 + const MONMENUITEM_FLASH ; 6 + const MONMENUITEM_WHIRLPOOL ; 7 + const MONMENUITEM_DIG ; 8 + const MONMENUITEM_TELEPORT ; 9 + const MONMENUITEM_SOFTBOILED ; 10 + const MONMENUITEM_HEADBUTT ; 11 + const MONMENUITEM_ROCKSMASH ; 12 + const MONMENUITEM_MILKDRINK ; 13 + const MONMENUITEM_SWEETSCENT ; 14 +; options + const MONMENUITEM_STATS ; 15 + const MONMENUITEM_SWITCH ; 16 + const MONMENUITEM_ITEM ; 17 + const MONMENUITEM_CANCEL ; 18 + const MONMENUITEM_MOVE ; 19 + const MONMENUITEM_MAIL ; 20 + const MONMENUITEM_ERROR ; 21 + +; MonMenuOptions categories +MONMENU_FIELD_MOVE EQU 0 +MONMENU_MENUOPTION EQU 1 + +NUM_MONMENU_ITEMS EQU 8 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index c95b27d6c..b223f2e15 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -142,52 +142,6 @@ const_value set 1 const ATK_EQ_DEF -; PokeAnims indexes (see engine/pic_animation.asm) - const_def - const ANIM_MON_SLOW - const ANIM_MON_NORMAL - const ANIM_MON_MENU - const ANIM_MON_TRADE - const ANIM_MON_EVOLVE - const ANIM_MON_HATCH - const ANIM_MON_UNUSED - const ANIM_MON_EGG1 - const ANIM_MON_EGG2 - - -; MonMenuOptions indexes (see engine/mon_menu.asm) -const_value set 1 -; moves - const MONMENU_CUT ; 1 - const MONMENU_FLY ; 2 - const MONMENU_SURF ; 3 - const MONMENU_STRENGTH ; 4 - const MONMENU_WATERFALL ; 5 - const MONMENU_FLASH ; 6 - const MONMENU_WHIRLPOOL ; 7 - const MONMENU_DIG ; 8 - const MONMENU_TELEPORT ; 9 - const MONMENU_SOFTBOILED ; 10 - const MONMENU_HEADBUTT ; 11 - const MONMENU_ROCKSMASH ; 12 - const MONMENU_MILKDRINK ; 13 - const MONMENU_SWEETSCENT ; 14 -; options - const MONMENU_STATS ; 15 - const MONMENU_SWITCH ; 16 - const MONMENU_ITEM ; 17 - const MONMENU_CANCEL ; 18 - const MONMENU_MOVE ; 19 - const MONMENU_MAIL ; 20 - const MONMENU_ERROR ; 21 - -; MonMenuOptions types -MONMENU_FIELD_MOVE EQU 0 -MONMENU_MENUOPTION EQU 1 - -NUM_MONMENU_ITEMS EQU 8 - - ; wild data NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size diff --git a/data/mon_menu.asm b/data/mon_menu.asm new file mode 100644 index 000000000..e8a262059 --- /dev/null +++ b/data/mon_menu.asm @@ -0,0 +1,48 @@ +; MonMenuOptionStrings indexes +const_value set 1 + const MONMENUVALUE_STATS ; 1 + const MONMENUVALUE_SWITCH ; 2 + const MONMENUVALUE_ITEM ; 3 + const MONMENUVALUE_CANCEL ; 4 + const MONMENUVALUE_MOVE ; 5 + const MONMENUVALUE_MAIL ; 6 + const MONMENUVALUE_ERROR ; 7 + +MonMenuOptionStrings: ; 24caf +; entries correspond to MONMENUVALUE_* constants + db "STATS@" + db "SWITCH@" + db "ITEM@" + db "CANCEL@" + db "MOVE@" + db "MAIL@" + db "ERROR!@" +; 24cd9 + +MonMenuOptions: ; 24cd9 +; category, item, value; actions are in PokemonActionSubmenu (see engine/start_menu.asm) +; moves + db MONMENU_FIELD_MOVE, MONMENUITEM_CUT, CUT + db MONMENU_FIELD_MOVE, MONMENUITEM_FLY, FLY + db MONMENU_FIELD_MOVE, MONMENUITEM_SURF, SURF + db MONMENU_FIELD_MOVE, MONMENUITEM_STRENGTH, STRENGTH + db MONMENU_FIELD_MOVE, MONMENUITEM_FLASH, FLASH + db MONMENU_FIELD_MOVE, MONMENUITEM_WATERFALL, WATERFALL + db MONMENU_FIELD_MOVE, MONMENUITEM_WHIRLPOOL, WHIRLPOOL + db MONMENU_FIELD_MOVE, MONMENUITEM_DIG, DIG + db MONMENU_FIELD_MOVE, MONMENUITEM_TELEPORT, TELEPORT + db MONMENU_FIELD_MOVE, MONMENUITEM_SOFTBOILED, SOFTBOILED + db MONMENU_FIELD_MOVE, MONMENUITEM_HEADBUTT, HEADBUTT + db MONMENU_FIELD_MOVE, MONMENUITEM_ROCKSMASH, ROCK_SMASH + db MONMENU_FIELD_MOVE, MONMENUITEM_MILKDRINK, MILK_DRINK + db MONMENU_FIELD_MOVE, MONMENUITEM_SWEETSCENT, SWEET_SCENT +; options + db MONMENU_MENUOPTION, MONMENUITEM_STATS, MONMENUVALUE_STATS + db MONMENU_MENUOPTION, MONMENUITEM_SWITCH, MONMENUVALUE_SWITCH + db MONMENU_MENUOPTION, MONMENUITEM_ITEM, MONMENUVALUE_ITEM + db MONMENU_MENUOPTION, MONMENUITEM_CANCEL, MONMENUVALUE_CANCEL + db MONMENU_MENUOPTION, MONMENUITEM_MOVE, MONMENUVALUE_MOVE + db MONMENU_MENUOPTION, MONMENUITEM_MAIL, MONMENUVALUE_MAIL + db MONMENU_MENUOPTION, MONMENUITEM_ERROR, MONMENUVALUE_ERROR + db -1 +; 24d19 diff --git a/engine/mon_menu.asm b/engine/mon_menu.asm index d7e8446d0..cb070e555 100755 --- a/engine/mon_menu.asm +++ b/engine/mon_menu.asm @@ -1,39 +1,4 @@ -MonMenuOptionStrings: ; 24caf - db "STATS@" - db "SWITCH@" - db "ITEM@" - db "CANCEL@" - db "MOVE@" - db "MAIL@" - db "ERROR!@" -; 24cd9 - -MonMenuOptions: ; 24cd9 -; moves - db MONMENU_FIELD_MOVE, MONMENU_CUT, CUT - db MONMENU_FIELD_MOVE, MONMENU_FLY, FLY - db MONMENU_FIELD_MOVE, MONMENU_SURF, SURF - db MONMENU_FIELD_MOVE, MONMENU_STRENGTH, STRENGTH - db MONMENU_FIELD_MOVE, MONMENU_FLASH, FLASH - db MONMENU_FIELD_MOVE, MONMENU_WATERFALL, WATERFALL - db MONMENU_FIELD_MOVE, MONMENU_WHIRLPOOL, WHIRLPOOL - db MONMENU_FIELD_MOVE, MONMENU_DIG, DIG - db MONMENU_FIELD_MOVE, MONMENU_TELEPORT, TELEPORT - db MONMENU_FIELD_MOVE, MONMENU_SOFTBOILED, SOFTBOILED - db MONMENU_FIELD_MOVE, MONMENU_HEADBUTT, HEADBUTT - db MONMENU_FIELD_MOVE, MONMENU_ROCKSMASH, ROCK_SMASH - db MONMENU_FIELD_MOVE, MONMENU_MILKDRINK, MILK_DRINK - db MONMENU_FIELD_MOVE, MONMENU_SWEETSCENT, SWEET_SCENT -; options - db MONMENU_MENUOPTION, MONMENU_STATS, 1 ; STATS - db MONMENU_MENUOPTION, MONMENU_SWITCH, 2 ; SWITCH - db MONMENU_MENUOPTION, MONMENU_ITEM, 3 ; ITEM - db MONMENU_MENUOPTION, MONMENU_CANCEL, 4 ; CANCEL - db MONMENU_MENUOPTION, MONMENU_MOVE, 5 ; MOVE - db MONMENU_MENUOPTION, MONMENU_MAIL, 6 ; MAIL - db MONMENU_MENUOPTION, MONMENU_ERROR, 7 ; ERROR! - db -1 -; 24d19 +INCLUDE "data/mon_menu.asm" MonSubmenu: ; 24d19 xor a @@ -95,7 +60,7 @@ MonMenuLoop: ; 24d59 jr .loop .cancel - ld a, MONMENU_CANCEL ; CANCEL + ld a, MONMENUITEM_CANCEL ret .select @@ -111,7 +76,7 @@ MonMenuLoop: ; 24d59 PopulateMonMenu: ; 24d91 call MenuBoxCoord2Tile - ld bc, $2a ; 42 + ld bc, 2 * SCREEN_WIDTH + 2 add hl, bc ld de, Buffer2 .loop @@ -124,7 +89,7 @@ PopulateMonMenu: ; 24d91 call GetMonMenuString pop hl call PlaceString - ld bc, $28 ; 40 + ld bc, 2 * SCREEN_WIDTH add hl, bc pop de jr .loop @@ -136,7 +101,7 @@ GetMonMenuString: ; 24db0 call IsInArray dec hl ld a, [hli] - cp 1 + cp MONMENU_MENUOPTION jr z, .NotMove inc hl ld a, [hl] @@ -188,11 +153,11 @@ GetMonSubmenuItems: ; 24dd4 jr nz, .loop .skip_moves - ld a, MONMENU_STATS + ld a, MONMENUITEM_STATS call AddMonMenuItem - ld a, MONMENU_SWITCH + ld a, MONMENUITEM_SWITCH call AddMonMenuItem - ld a, MONMENU_MOVE + ld a, MONMENUITEM_MOVE call AddMonMenuItem ld a, [wLinkMode] and a @@ -203,9 +168,9 @@ GetMonSubmenuItems: ; 24dd4 ld d, [hl] farcall ItemIsMail pop hl - ld a, MONMENU_MAIL + ld a, MONMENUITEM_MAIL jr c, .ok - ld a, MONMENU_ITEM + ld a, MONMENUITEM_ITEM .ok call AddMonMenuItem @@ -214,7 +179,7 @@ GetMonSubmenuItems: ; 24dd4 ld a, [Buffer1] cp NUM_MONMENU_ITEMS jr z, .ok2 - ld a, MONMENU_CANCEL + ld a, MONMENUITEM_CANCEL call AddMonMenuItem .ok2 @@ -222,11 +187,11 @@ GetMonSubmenuItems: ; 24dd4 ret .egg - ld a, MONMENU_STATS + ld a, MONMENUITEM_STATS call AddMonMenuItem - ld a, MONMENU_SWITCH + ld a, MONMENUITEM_SWITCH call AddMonMenuItem - ld a, MONMENU_CANCEL + ld a, MONMENUITEM_CANCEL call AddMonMenuItem call TerminateMonSubmenu ret @@ -265,7 +230,7 @@ ResetMonSubmenu: ; 24e68 TerminateMonSubmenu: ; 24e76 ld a, [Buffer1] ld e, a - ld d, $0 + ld d, 0 ld hl, Buffer2 add hl, de ld [hl], -1 @@ -280,7 +245,7 @@ AddMonMenuItem: ; 24e83 ld e, a inc a ld [Buffer1], a - ld d, $0 + ld d, 0 ld hl, Buffer2 add hl, de pop af diff --git a/engine/start_menu.asm b/engine/start_menu.asm index a60a8b3ce..8784c6bb6 100755 --- a/engine/start_menu.asm +++ b/engine/start_menu.asm @@ -729,26 +729,26 @@ PokemonActionSubmenu: ; 12a88 ret .Actions: - dbw MONMENU_CUT, MonMenu_Cut - dbw MONMENU_FLY, MonMenu_Fly - dbw MONMENU_SURF, MonMenu_Surf - dbw MONMENU_STRENGTH, MonMenu_Strength - dbw MONMENU_FLASH, MonMenu_Flash - dbw MONMENU_WHIRLPOOL, MonMenu_Whirlpool - dbw MONMENU_DIG, MonMenu_Dig - dbw MONMENU_TELEPORT, MonMenu_Teleport - dbw MONMENU_SOFTBOILED, MonMenu_Softboiled_MilkDrink - dbw MONMENU_MILKDRINK, MonMenu_Softboiled_MilkDrink - dbw MONMENU_HEADBUTT, MonMenu_Headbutt - dbw MONMENU_WATERFALL, MonMenu_Waterfall - dbw MONMENU_ROCKSMASH, MonMenu_RockSmash - dbw MONMENU_SWEETSCENT, MonMenu_SweetScent - dbw MONMENU_STATS, OpenPartyStats - dbw MONMENU_SWITCH, SwitchPartyMons - dbw MONMENU_ITEM, GiveTakePartyMonItem - dbw MONMENU_CANCEL, CancelPokemonAction - dbw MONMENU_MOVE, ManagePokemonMoves - dbw MONMENU_MAIL, MonMailAction + dbw MONMENUITEM_CUT, MonMenu_Cut + dbw MONMENUITEM_FLY, MonMenu_Fly + dbw MONMENUITEM_SURF, MonMenu_Surf + dbw MONMENUITEM_STRENGTH, MonMenu_Strength + dbw MONMENUITEM_FLASH, MonMenu_Flash + dbw MONMENUITEM_WHIRLPOOL, MonMenu_Whirlpool + dbw MONMENUITEM_DIG, MonMenu_Dig + dbw MONMENUITEM_TELEPORT, MonMenu_Teleport + dbw MONMENUITEM_SOFTBOILED, MonMenu_Softboiled_MilkDrink + dbw MONMENUITEM_MILKDRINK, MonMenu_Softboiled_MilkDrink + dbw MONMENUITEM_HEADBUTT, MonMenu_Headbutt + dbw MONMENUITEM_WATERFALL, MonMenu_Waterfall + dbw MONMENUITEM_ROCKSMASH, MonMenu_RockSmash + dbw MONMENUITEM_SWEETSCENT, MonMenu_SweetScent + dbw MONMENUITEM_STATS, OpenPartyStats + dbw MONMENUITEM_SWITCH, SwitchPartyMons + dbw MONMENUITEM_ITEM, GiveTakePartyMonItem + dbw MONMENUITEM_CANCEL, CancelPokemonAction + dbw MONMENUITEM_MOVE, ManagePokemonMoves + dbw MONMENUITEM_MAIL, MonMailAction ; 12aec From 7c0553b2d25b8e76615afd83e2d6a65d4df9c4fd Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 10:56:36 -0500 Subject: [PATCH 025/135] x is the standard temp variable --- engine/events/battle_tower/battle_tower.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index 94a29cdab..b1d12bc5f 100755 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -407,11 +407,11 @@ ValidateBTParty: ; 170394 ld c, l ld a, [hl] and a -idx = $ff +x = $ff rept ($ff +- NUM_POKEMON) jr z, .invalid - cp idx -idx = idx +- 1 + cp x +x = x +- 1 endr jr nz, .valid From fdda670f406c9eb2b323d3b251c67f69f970a071 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 11:17:21 -0500 Subject: [PATCH 026/135] Cry headers and map headers were eliminated --- constants/map_data_constants.asm | 2 +- data/maps/definitions.asm | 2 +- home/audio.asm | 2 +- home/cry.asm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index d35966b28..11063bec0 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -4,7 +4,7 @@ GROUP_NONE EQU 0 MAP_NONE EQU 0 -; map header struct members (see data/maps/definitions.asm) +; map_def struct members (see data/maps/definitions.asm) const_def const MAPDEF_MAPDATA_BANK ; 0 const MAPDEF_TILESET ; 1 diff --git a/data/maps/definitions.asm b/data/maps/definitions.asm index ccc723177..e9afbf31c 100644 --- a/data/maps/definitions.asm +++ b/data/maps/definitions.asm @@ -15,7 +15,7 @@ map_def: MACRO ENDM MapGroupPointers:: -; pointers to the first map header of each map group +; pointers to the first map_def of each map group dw MapGroup_Olivine ; 1 dw MapGroup_Mahogany ; 2 dw MapGroup_Dungeons ; 3 diff --git a/home/audio.asm b/home/audio.asm index 7508d569c..c7e49721a 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -142,7 +142,7 @@ PlayMusic2:: ; 3bbc PlayCry:: ; 3be3 -; Play cry header de. +; Play cry de. push hl push de diff --git a/home/cry.asm b/home/cry.asm index 204b02ba4..c671c5fd0 100644 --- a/home/cry.asm +++ b/home/cry.asm @@ -55,7 +55,7 @@ _PlayMonCry:: ; 37e2 ; 37f3 LoadCry:: ; 37f3 -; Load cry header bc. +; Load cry bc. call GetCryIndex ret c From 682548493be7f20b8b7fb26ab0c367c3c24430ed Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 11:40:32 -0500 Subject: [PATCH 027/135] Struct macros should have their main label outside the macro --- macros/wram.asm | 3 --- sram.asm | 31 +++++++++++++------------- wram.asm | 58 ++++++++++++++++++++++++------------------------- 3 files changed, 45 insertions(+), 47 deletions(-) diff --git a/macros/wram.asm b/macros/wram.asm index 47138e40c..830b5680d 100755 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -103,7 +103,6 @@ battle_struct: MACRO ENDM box: MACRO -\1:: \1Count:: db \1Species:: ds MONS_PER_BOX + 1 \1Mons:: @@ -285,7 +284,6 @@ slot_reel: MACRO ENDM object_struct: MACRO -\1Struct:: \1Sprite:: db \1MapObjectIndex:: db \1SpriteTile:: db @@ -323,7 +321,6 @@ object_struct: MACRO ENDM map_object: MACRO -\1Object:: \1ObjectStructID:: db \1ObjectSprite:: db \1ObjectYCoord:: db diff --git a/sram.asm b/sram.asm index ddfc6faf6..848330034 100644 --- a/sram.asm +++ b/sram.asm @@ -122,7 +122,7 @@ sCheckValue2:: db ; loaded with SAVE_CHECK_VALUE_2, used to check save corruptio SECTION "Active Box", SRAM ; ad10 - box sBox +sBox:: box sBox ; b160 ds $f4 @@ -220,24 +220,25 @@ sBTPkmnPrevPrevTrainer3:: db SECTION "Boxes 1-7", SRAM, BANK [2] - box sBox1 - box sBox2 - box sBox3 - box sBox4 - box sBox5 - box sBox6 - box sBox7 +sBox1:: box sBox1 +sBox2:: box sBox2 +sBox3:: box sBox3 +sBox4:: box sBox4 +sBox5:: box sBox5 +sBox6:: box sBox6 +sBox7:: box sBox7 SECTION "Boxes 8-14", SRAM - box sBox8 - box sBox9 - box sBox10 - box sBox11 - box sBox12 - box sBox13 - box sBox14 +sBox8:: box sBox8 +sBox9:: box sBox9 +sBox10:: box sBox10 +sBox11:: box sBox11 +sBox12:: box sBox12 +sBox13:: box sBox13 +sBox14:: box sBox14 + SECTION "SRAM Mobile", SRAM, BANK [5] diff --git a/wram.asm b/wram.asm index c26a6f386..3a3df1392 100644 --- a/wram.asm +++ b/wram.asm @@ -2364,19 +2364,19 @@ wFollowerMovementQueueLength:: db wFollowMovementQueue:: ds 5 ObjectStructs:: ; d4d6 - object_struct Player - object_struct Object1 - object_struct Object2 - object_struct Object3 - object_struct Object4 - object_struct Object5 - object_struct Object6 - object_struct Object7 - object_struct Object8 - object_struct Object9 - object_struct Object10 - object_struct Object11 - object_struct Object12 +PlayerStruct:: object_struct Player +Object1Struct:: object_struct Object1 +Object2Struct:: object_struct Object2 +Object3Struct:: object_struct Object3 +Object4Struct:: object_struct Object4 +Object5Struct:: object_struct Object5 +Object6Struct:: object_struct Object6 +Object7Struct:: object_struct Object7 +Object8Struct:: object_struct Object8 +Object9Struct:: object_struct Object9 +Object10Struct:: object_struct Object10 +Object11Struct:: object_struct Object11 +Object12Struct:: object_struct Object12 ObjectStructsEnd:: ; d6de wCmdQueue:: ds CMDQUEUE_CAPACITY * CMDQUEUE_ENTRY_SIZE @@ -2384,22 +2384,22 @@ wCmdQueue:: ds CMDQUEUE_CAPACITY * CMDQUEUE_ENTRY_SIZE ds 40 MapObjects:: ; d71e - map_object Player - map_object Map1 - map_object Map2 - map_object Map3 - map_object Map4 - map_object Map5 - map_object Map6 - map_object Map7 - map_object Map8 - map_object Map9 - map_object Map10 - map_object Map11 - map_object Map12 - map_object Map13 - map_object Map14 - map_object Map15 +PlayerObject:: map_object Player +Map1Object:: map_object Map1 +Map2Object:: map_object Map2 +Map3Object:: map_object Map3 +Map4Object:: map_object Map4 +Map5Object:: map_object Map5 +Map6Object:: map_object Map6 +Map7Object:: map_object Map7 +Map8Object:: map_object Map8 +Map9Object:: map_object Map9 +Map10Object:: map_object Map10 +Map11Object:: map_object Map11 +Map12Object:: map_object Map12 +Map13Object:: map_object Map13 +Map14Object:: map_object Map14 +Map15Object:: map_object Map15 MapObjectsEnd:: wObjectMasks:: ds NUM_OBJECTS ; d81e From c5cc23a35fa2c544e3fa8f5101878ba2127ca83e Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 12:40:29 -0500 Subject: [PATCH 028/135] wGameTimerPause bit flag constants --- constants/wram_constants.asm | 4 ++++ data/engine_flags.asm | 4 ++-- engine/intro_menu.asm | 4 ++-- engine/main_menu.asm | 2 +- engine/scripting.asm | 4 ++-- home/game_time.asm | 2 +- mobile/mobile_22.asm | 6 +++--- mobile/mobile_40.asm | 6 +++--- wram.asm | 3 ++- 9 files changed, 20 insertions(+), 15 deletions(-) diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 422334e47..15846d896 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -16,6 +16,10 @@ AUTO_INPUT EQU $ff const TEMPMON ; 3 const WILDMON ; 4 +; wGameTimerPause:: ; cfbc +GAMETIMERPAUSE_TIMER_PAUSED_F EQU 0 +GAMETIMERPAUSE_MOBILE_7_F EQU 7 + ; Options:: ; cfcc const_value set 4 const NO_TEXT_SCROLL ; 4 diff --git a/data/engine_flags.asm b/data/engine_flags.asm index ac46cad4c..261d38d7f 100644 --- a/data/engine_flags.asm +++ b/data/engine_flags.asm @@ -122,10 +122,10 @@ EngineFlags: ; 80462 engine_flag wWeeklyFlags, WEEKLYFLAGS_DAILY_MOVE_TUTOR_F engine_flag wWeeklyFlags, WEEKLYFLAGS_BUENAS_PASSWORD_F - engine_flag wSwarmFlags, SWARMFLAGS_BUENAS_PASSWORD_F + engine_flag wSwarmFlags, SWARMFLAGS_BUENAS_PASSWORD_F ; $60 engine_flag wSwarmFlags, SWARMFLAGS_GOLDENROD_DEPT_STORE_SALE_F - engine_flag wGameTimerPause, 7 ; $62 + engine_flag wGameTimerPause, GAMETIMERPAUSE_MOBILE_7_F engine_flag wPlayerGender, PLAYERGENDER_FEMALE_F diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index a99303cf0..e8a3f221a 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -484,8 +484,8 @@ FinishContinueFunction: ; 5e5d ld [wDontPlayMapMusicOnReload], a ld [wLinkMode], a ld hl, wGameTimerPause - set 0, [hl] - res 7, [hl] + set GAMETIMERPAUSE_TIMER_PAUSED_F, [hl] + res GAMETIMERPAUSE_MOBILE_7_F, [hl] ld hl, wEnteredMapFromContinue set 1, [hl] farcall OverworldLoop diff --git a/engine/main_menu.asm b/engine/main_menu.asm index 3bb3a6293..ff2d187d2 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -10,7 +10,7 @@ MainMenu: ; 49cdc call GetSGBLayout call SetPalettes ld hl, wGameTimerPause - res 0, [hl] + res GAMETIMERPAUSE_TIMER_PAUSED_F, [hl] call MainMenu_GetWhichMenu ld [wWhichIndexSet], a call MainMenu_PrintCurrentTimeAndDay diff --git a/engine/scripting.asm b/engine/scripting.asm index 1ecdc016c..a3c906a83 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -2804,12 +2804,12 @@ Script_halloffame: ; script command 0xa1 ld hl, wGameTimerPause - res 0, [hl] + res GAMETIMERPAUSE_TIMER_PAUSED_F, [hl] farcall StubbedTrainerRankings_HallOfFame farcall StubbedTrainerRankings_HallOfFame2 farcall HallOfFame ld hl, wGameTimerPause - set 0, [hl] + set GAMETIMERPAUSE_TIMER_PAUSED_F, [hl] jr ReturnFromCredits Script_credits: diff --git a/home/game_time.asm b/home/game_time.asm index 36dcaa282..14edda452 100644 --- a/home/game_time.asm +++ b/home/game_time.asm @@ -39,7 +39,7 @@ UpdateGameTimer:: ; 20ad ; Is the timer paused? ld hl, wGameTimerPause - bit 0, [hl] + bit GAMETIMERPAUSE_TIMER_PAUSED_F, [hl] ret z ; Is the timer already capped? diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index e96fd1e8f..779d8964b 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -26,17 +26,17 @@ OpenSRAMBank4: ; 89160 Function89168: ; 89168 (22:5168) ld hl, wGameTimerPause - set 7, [hl] + set GAMETIMERPAUSE_MOBILE_7_F, [hl] ret Function8916e: ; 8916e (22:516e) ld hl, wGameTimerPause - res 7, [hl] + res GAMETIMERPAUSE_MOBILE_7_F, [hl] ret Function89174: ; 89174 (22:5174) ld hl, wGameTimerPause - bit 7, [hl] + bit GAMETIMERPAUSE_MOBILE_7_F, [hl] ret Function8917a: ; 8917a (22:517a) diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 0a04453a0..3dc3f2682 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -2812,7 +2812,7 @@ Special_Function1011f1: ; 1011f1 ld hl, wdc41 res 4, [hl] ld hl, wGameTimerPause - bit 7, [hl] + bit GAMETIMERPAUSE_MOBILE_7_F, [hl] jr z, .skip ld hl, wdc41 set 4, [hl] @@ -4703,7 +4703,7 @@ Function101e98: ; 101e98 farcall Function8adb3 ret c ld hl, wGameTimerPause - set 7, [hl] + set GAMETIMERPAUSE_MOBILE_7_F, [hl] ld hl, wdc41 set 4, [hl] ret @@ -4711,7 +4711,7 @@ Function101e98: ; 101e98 Function101ead: ; 101ead ld hl, wGameTimerPause - bit 7, [hl] + bit GAMETIMERPAUSE_MOBILE_7_F, [hl] jr nz, .asm_101ec8 ld hl, wdc41 bit 2, [hl] diff --git a/wram.asm b/wram.asm index 3a3df1392..37f951e5b 100644 --- a/wram.asm +++ b/wram.asm @@ -1491,7 +1491,8 @@ wFarCallBCBuffer:: dw ; cfb9 wcfbb:: db wGameTimerPause:: ; cfbc -; bit 0 +; bit 0: game timer paused +; bit 7: something mobile db ds 1 From 517eab65267bfd64e29ed173c668b00c7e67d843 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 12:54:17 -0500 Subject: [PATCH 029/135] "Speech" houses just have dialog NPCs --- constants/map_constants.asm | 10 +++++----- data/maps/blocks.asm | 10 +++++----- data/maps/data.asm | 10 +++++----- data/maps/definitions.asm | 10 +++++----- data/maps/scripts.asm | 10 +++++----- maps/Route2.asm | 2 +- maps/Route26.asm | 2 +- ...6HealSpeechHouse.asm => Route26HealHouse.asm} | 6 +++--- ...SpeechHouse.asm => Route28SteelWingHouse.asm} | 8 ++++---- ...ggetSpeechHouse.asm => Route2NuggetHouse.asm} | 8 ++++---- maps/Route30.asm | 2 +- ...errySpeechHouse.asm => Route30BerryHouse.asm} | 12 ++++++------ maps/Route5.asm | 2 +- ...SpeechHouse.asm => Route5CleanseTagHouse.asm} | 16 ++++++++-------- 14 files changed, 54 insertions(+), 54 deletions(-) rename maps/{Route26HealSpeechHouse.asm => Route26HealHouse.asm} (91%) rename maps/{Route28FamousSpeechHouse.asm => Route28SteelWingHouse.asm} (90%) rename maps/{Route2NuggetSpeechHouse.asm => Route2NuggetHouse.asm} (88%) rename maps/{Route30BerrySpeechHouse.asm => Route30BerryHouse.asm} (79%) rename maps/{Route5CleanseTagSpeechHouse.asm => Route5CleanseTagHouse.asm} (80%) diff --git a/constants/map_constants.asm b/constants/map_constants.asm index f327cd407..4407bdd7f 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -365,7 +365,7 @@ ENDM mapconst ROUTE_28, 9, 20 ; 1 mapconst SILVER_CAVE_OUTSIDE, 18, 20 ; 2 mapconst SILVER_CAVE_POKECENTER_1F, 4, 5 ; 3 - mapconst ROUTE_28_FAMOUS_SPEECH_HOUSE, 4, 4 ; 4 + mapconst ROUTE_28_STEEL_WING_HOUSE, 4, 4 ; 4 newgroup ; 20 @@ -436,7 +436,7 @@ ENDM mapconst VIRIDIAN_MART, 4, 6 ; 8 mapconst VIRIDIAN_POKECENTER_1F, 4, 5 ; 9 mapconst VIRIDIAN_POKECENTER_2F_BETA, 4, 8 ; 10 - mapconst ROUTE_2_NUGGET_SPEECH_HOUSE, 4, 4 ; 11 + mapconst ROUTE_2_NUGGET_HOUSE, 4, 4 ; 11 mapconst ROUTE_2_GATE, 4, 5 ; 12 mapconst VICTORY_ROAD_GATE, 9, 10 ; 13 @@ -451,7 +451,7 @@ ENDM mapconst PLAYERS_HOUSE_2F, 3, 4 ; 7 mapconst PLAYERS_NEIGHBORS_HOUSE, 4, 4 ; 8 mapconst ELMS_HOUSE, 4, 4 ; 9 - mapconst ROUTE_26_HEAL_SPEECH_HOUSE, 4, 4 ; 10 + mapconst ROUTE_26_HEAL_HOUSE, 4, 4 ; 10 mapconst DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11 mapconst ROUTE_27_SANDSTORM_HOUSE, 4, 4 ; 12 mapconst ROUTE_29_ROUTE_46_GATE, 4, 5 ; 13 @@ -472,7 +472,7 @@ ENDM mapconst COPYCATS_HOUSE_2F, 3, 5 ; 12 mapconst ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 4, 4 ; 13 mapconst ROUTE_5_SAFFRON_GATE, 4, 5 ; 14 - mapconst ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, 4, 4 ; 15 + mapconst ROUTE_5_CLEANSE_TAG_HOUSE, 4, 4 ; 15 newgroup ; 26 @@ -484,6 +484,6 @@ ENDM mapconst CHERRYGROVE_GYM_SPEECH_HOUSE, 4, 4 ; 6 mapconst GUIDE_GENTS_HOUSE, 4, 4 ; 7 mapconst CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 4, 4 ; 8 - mapconst ROUTE_30_BERRY_SPEECH_HOUSE, 4, 4 ; 9 + mapconst ROUTE_30_BERRY_HOUSE, 4, 4 ; 9 mapconst MR_POKEMONS_HOUSE, 4, 4 ; 10 mapconst ROUTE_31_VIOLET_GATE, 4, 5 ; 11 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 1b3eda585..dbfa49b5a 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -178,7 +178,7 @@ BillsBrothersHouse_Blocks: LavenderSpeechHouse_Blocks: LavenderNameRater_Blocks: Route12SuperRodHouse_Blocks: -Route28FamousSpeechHouse_Blocks: +Route28SteelWingHouse_Blocks: CeladonMansionRoofHouse_Blocks: Route16FuchsiaSpeechHouse_Blocks: ManiasHouse_Blocks: @@ -187,17 +187,17 @@ CianwoodPhotoStudio_Blocks: CianwoodLugiaSpeechHouse_Blocks: PokeSeersHouse_Blocks: ViridianNicknameSpeechHouse_Blocks: -Route2NuggetSpeechHouse_Blocks: +Route2NuggetHouse_Blocks: PlayersNeighborsHouse_Blocks: -Route26HealSpeechHouse_Blocks: +Route26HealHouse_Blocks: DayOfWeekSiblingsHouse_Blocks: Route27SandstormHouse_Blocks: MrPsychicsHouse_Blocks: -Route5CleanseTagSpeechHouse_Blocks: +Route5CleanseTagHouse_Blocks: CherrygroveGymSpeechHouse_Blocks: GuideGentsHouse_Blocks: CherrygroveEvolutionSpeechHouse_Blocks: -Route30BerrySpeechHouse_Blocks: +Route30BerryHouse_Blocks: INCBIN "maps/House1.blk" SafariZoneFuchsiaGateBeta_Blocks: diff --git a/data/maps/data.asm b/data/maps/data.asm index 16a972437..ef8c4996c 100644 --- a/data/maps/data.asm +++ b/data/maps/data.asm @@ -601,7 +601,7 @@ ENDM map_data Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $00, 0 map_data Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, $00, 0 map_data SilverCavePokecenter1F, SILVER_CAVE_POKECENTER_1F, $00, 0 - map_data Route28FamousSpeechHouse, ROUTE_28_FAMOUS_SPEECH_HOUSE, $00, 0 + map_data Route28SteelWingHouse, ROUTE_28_STEEL_WING_HOUSE, $00, 0 map_data Pokecenter2F, POKECENTER_2F, $00, 0 map_data TradeCenter, TRADE_CENTER, $00, 0 map_data Colosseum, COLOSSEUM, $00, 0 @@ -650,7 +650,7 @@ ENDM map_data ViridianMart, VIRIDIAN_MART, $00, 0 map_data ViridianPokecenter1F, VIRIDIAN_POKECENTER_1F, $00, 0 map_data ViridianPokecenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $00, 0 - map_data Route2NuggetSpeechHouse, ROUTE_2_NUGGET_SPEECH_HOUSE, $00, 0 + map_data Route2NuggetHouse, ROUTE_2_NUGGET_HOUSE, $00, 0 map_data Route2Gate, ROUTE_2_GATE, $00, 0 map_data VictoryRoadGate, VICTORY_ROAD_GATE, $00, 0 map_data ElmsLab, ELMS_LAB, $00, 0 @@ -658,7 +658,7 @@ ENDM map_data PlayersHouse2F, PLAYERS_HOUSE_2F, $00, 0 map_data PlayersNeighborsHouse, PLAYERS_NEIGHBORS_HOUSE, $00, 0 map_data ElmsHouse, ELMS_HOUSE, $00, 0 - map_data Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $00, 0 + map_data Route26HealHouse, ROUTE_26_HEAL_HOUSE, $00, 0 map_data DayOfWeekSiblingsHouse, DAY_OF_WEEK_SIBLINGS_HOUSE, $00, 0 map_data Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $00, 0 map_data Route29Route46Gate, ROUTE_29_ROUTE_46_GATE, $00, 0 @@ -674,12 +674,12 @@ ENDM map_data CopycatsHouse2F, COPYCATS_HOUSE_2F, $00, 0 map_data Route5UndergroundPathEntrance, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, $00, 0 map_data Route5SaffronGate, ROUTE_5_SAFFRON_GATE, $00, 0 - map_data Route5CleanseTagSpeechHouse, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, $00, 0 + map_data Route5CleanseTagHouse, ROUTE_5_CLEANSE_TAG_HOUSE, $00, 0 map_data CherrygroveMart, CHERRYGROVE_MART, $00, 0 map_data CherrygrovePokecenter1F, CHERRYGROVE_POKECENTER_1F, $00, 0 map_data CherrygroveGymSpeechHouse, CHERRYGROVE_GYM_SPEECH_HOUSE, $00, 0 map_data GuideGentsHouse, GUIDE_GENTS_HOUSE, $00, 0 map_data CherrygroveEvolutionSpeechHouse, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, $00, 0 - map_data Route30BerrySpeechHouse, ROUTE_30_BERRY_SPEECH_HOUSE, $00, 0 + map_data Route30BerryHouse, ROUTE_30_BERRY_HOUSE, $00, 0 map_data MrPokemonsHouse, MR_POKEMONS_HOUSE, $00, 0 map_data Route31VioletGate, ROUTE_31_VIOLET_GATE, $00, 0 diff --git a/data/maps/definitions.asm b/data/maps/definitions.asm index e9afbf31c..6772ecc97 100644 --- a/data/maps/definitions.asm +++ b/data/maps/definitions.asm @@ -368,7 +368,7 @@ MapGroup_Silver: map_def Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND map_def SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND map_def SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route28FamousSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def Route28SteelWingHouse, TILESET_HOUSE, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE MapGroup_CableClub: map_def Pokecenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, TRUE, PALETTE_DAY, FISHGROUP_SHORE @@ -435,7 +435,7 @@ MapGroup_Viridian: map_def ViridianMart, TILESET_MART, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def ViridianPokecenter1F, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def ViridianPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route2NuggetSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def Route2NuggetHouse, TILESET_HOUSE, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route2Gate, TILESET_GATE, GATE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def VictoryRoadGate, TILESET_GATE, GATE, ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -449,7 +449,7 @@ MapGroup_NewBark: map_def PlayersHouse2F, TILESET_PLAYERS_ROOM, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def PlayersNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route26HealSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def Route26HealHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def DayOfWeekSiblingsHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route27SandstormHouse, TILESET_HOUSE, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route29Route46Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -469,7 +469,7 @@ MapGroup_Saffron: map_def CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route5UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route5SaffronGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route5CleanseTagSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def Route5CleanseTagHouse, TILESET_HOUSE, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE MapGroup_Cherrygrove: map_def Route30, TILESET_JOHTO, ROUTE, ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND @@ -480,6 +480,6 @@ MapGroup_Cherrygrove: map_def CherrygroveGymSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def GuideGentsHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def CherrygroveEvolutionSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route30BerrySpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def Route30BerryHouse, TILESET_HOUSE, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def MrPokemonsHouse, TILESET_FACILITY, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route31VioletGate, TILESET_GATE, GATE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index fd4288a57..331418d6c 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -155,7 +155,7 @@ INCLUDE "maps/PlayersHouse1F.asm" INCLUDE "maps/PlayersHouse2F.asm" INCLUDE "maps/PlayersNeighborsHouse.asm" INCLUDE "maps/ElmsHouse.asm" -INCLUDE "maps/Route26HealSpeechHouse.asm" +INCLUDE "maps/Route26HealHouse.asm" INCLUDE "maps/DayOfWeekSiblingsHouse.asm" INCLUDE "maps/Route27SandstormHouse.asm" INCLUDE "maps/Route29Route46Gate.asm" @@ -206,7 +206,7 @@ INCLUDE "maps/TrainerHouseB1F.asm" INCLUDE "maps/ViridianMart.asm" INCLUDE "maps/ViridianPokecenter1F.asm" INCLUDE "maps/ViridianPokecenter2FBeta.asm" -INCLUDE "maps/Route2NuggetSpeechHouse.asm" +INCLUDE "maps/Route2NuggetHouse.asm" INCLUDE "maps/Route2Gate.asm" INCLUDE "maps/VictoryRoadGate.asm" @@ -294,7 +294,7 @@ INCLUDE "maps/CopycatsHouse1F.asm" INCLUDE "maps/CopycatsHouse2F.asm" INCLUDE "maps/Route5UndergroundPathEntrance.asm" INCLUDE "maps/Route5SaffronGate.asm" -INCLUDE "maps/Route5CleanseTagSpeechHouse.asm" +INCLUDE "maps/Route5CleanseTagHouse.asm" SECTION "Map Scripts 16", ROMX @@ -371,7 +371,7 @@ INCLUDE "maps/CherrygrovePokecenter1F.asm" INCLUDE "maps/CherrygroveGymSpeechHouse.asm" INCLUDE "maps/GuideGentsHouse.asm" INCLUDE "maps/CherrygroveEvolutionSpeechHouse.asm" -INCLUDE "maps/Route30BerrySpeechHouse.asm" +INCLUDE "maps/Route30BerryHouse.asm" INCLUDE "maps/MrPokemonsHouse.asm" INCLUDE "maps/Route31VioletGate.asm" @@ -477,7 +477,7 @@ INCLUDE "maps/Route4.asm" INCLUDE "maps/Route10South.asm" INCLUDE "maps/Route23.asm" INCLUDE "maps/SilverCavePokecenter1F.asm" -INCLUDE "maps/Route28FamousSpeechHouse.asm" +INCLUDE "maps/Route28SteelWingHouse.asm" SECTION "Map Scripts 25", ROMX diff --git a/maps/Route2.asm b/maps/Route2.asm index 09b885df3..f4d910194 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -152,7 +152,7 @@ Route2_MapEvents: .Warps: db 5 - warp_def 15, 15, 1, ROUTE_2_NUGGET_SPEECH_HOUSE + warp_def 15, 15, 1, ROUTE_2_NUGGET_HOUSE warp_def 15, 31, 3, ROUTE_2_GATE warp_def 16, 27, 1, ROUTE_2_GATE warp_def 17, 27, 2, ROUTE_2_GATE diff --git a/maps/Route26.asm b/maps/Route26.asm index 75599372b..1e3bbf59f 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -419,7 +419,7 @@ Route26_MapEvents: .Warps: db 3 warp_def 7, 5, 3, VICTORY_ROAD_GATE - warp_def 15, 57, 1, ROUTE_26_HEAL_SPEECH_HOUSE + warp_def 15, 57, 1, ROUTE_26_HEAL_HOUSE warp_def 5, 71, 1, DAY_OF_WEEK_SIBLINGS_HOUSE .CoordEvents: diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealHouse.asm similarity index 91% rename from maps/Route26HealSpeechHouse.asm rename to maps/Route26HealHouse.asm index d1759dc9d..e24f7dcc3 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealHouse.asm @@ -1,7 +1,7 @@ const_value set 2 - const ROUTE26HEALSPEECHHOUSE_TEACHER + const ROUTE26HEALHOUSE_TEACHER -Route26HealSpeechHouse_MapScripts: +Route26HealHouse_MapScripts: .SceneScripts: db 0 @@ -48,7 +48,7 @@ UnknownText_0x7b18b: para "Keep at it!" done -Route26HealSpeechHouse_MapEvents: +Route26HealHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28SteelWingHouse.asm similarity index 90% rename from maps/Route28FamousSpeechHouse.asm rename to maps/Route28SteelWingHouse.asm index 662e7279b..8f9e3b39d 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28SteelWingHouse.asm @@ -1,8 +1,8 @@ const_value set 2 - const ROUTE28FAMOUSSPEECHHOUSE_CELEBRITY - const ROUTE28FAMOUSSPEECHHOUSE_FEAROW + const ROUTE28STEELWINGHOUSE_CELEBRITY + const ROUTE28STEELWINGHOUSE_FEAROW -Route28FamousSpeechHouse_MapScripts: +Route28SteelWingHouse_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -70,7 +70,7 @@ CelebritysFearowText: text "FEAROW: Feero!" done -Route28FamousSpeechHouse_MapEvents: +Route28SteelWingHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetHouse.asm similarity index 88% rename from maps/Route2NuggetSpeechHouse.asm rename to maps/Route2NuggetHouse.asm index 231b568ed..d1fcedee6 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetHouse.asm @@ -1,7 +1,7 @@ const_value set 2 - const ROUTE2NUGGETSPEECHHOUSE_FISHER + const ROUTE2NUGGETHOUSE_FISHER -Route2NuggetSpeechHouse_MapScripts: +Route2NuggetHouse_MapScripts: .SceneScripts: db 0 @@ -25,7 +25,7 @@ FisherScript_0x9b847: closetext end -Route2NuggetSpeechHouseBookshelf: +Route2NuggetHouseBookshelf: ; unused jumpstd difficultbookshelf @@ -52,7 +52,7 @@ UnknownText_0x9b8e5: line "have to do!" done -Route2NuggetSpeechHouse_MapEvents: +Route2NuggetHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route30.asm b/maps/Route30.asm index df8b593d6..5d6fc0de8 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -412,7 +412,7 @@ Route30_MapEvents: .Warps: db 2 - warp_def 7, 39, 1, ROUTE_30_BERRY_SPEECH_HOUSE + warp_def 7, 39, 1, ROUTE_30_BERRY_HOUSE warp_def 17, 5, 1, MR_POKEMONS_HOUSE .CoordEvents: diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerryHouse.asm similarity index 79% rename from maps/Route30BerrySpeechHouse.asm rename to maps/Route30BerryHouse.asm index 96605b3c8..f304957ba 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerryHouse.asm @@ -1,7 +1,7 @@ const_value set 2 - const ROUTE30BERRYSPEECHHOUSE_POKEFAN_M + const ROUTE30BERRYHOUSE_POKEFAN_M -Route30BerrySpeechHouse_MapScripts: +Route30BerryHouse_MapScripts: .SceneScripts: db 0 @@ -25,7 +25,7 @@ UnknownScript_0x196d7d: closetext end -Route30BerrySpeechHouseBookshelf: +Route30BerryHouseBookshelf: jumpstd magazinebookshelf UnknownText_0x196d82: @@ -46,7 +46,7 @@ UnknownText_0x196dec: cont "drop right off." done -Route30BerrySpeechHouse_MapEvents: +Route30BerryHouse_MapEvents: ; filler db 0, 0 @@ -60,8 +60,8 @@ Route30BerrySpeechHouse_MapEvents: .BGEvents: db 2 - bg_event 0, 1, BGEVENT_READ, Route30BerrySpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, Route30BerrySpeechHouseBookshelf + bg_event 0, 1, BGEVENT_READ, Route30BerryHouseBookshelf + bg_event 1, 1, BGEVENT_READ, Route30BerryHouseBookshelf .ObjectEvents: db 1 diff --git a/maps/Route5.asm b/maps/Route5.asm index 9bdf8a023..02fd4113c 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -48,7 +48,7 @@ Route5_MapEvents: warp_def 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE warp_def 8, 17, 1, ROUTE_5_SAFFRON_GATE warp_def 9, 17, 2, ROUTE_5_SAFFRON_GATE - warp_def 10, 11, 1, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE + warp_def 10, 11, 1, ROUTE_5_CLEANSE_TAG_HOUSE .CoordEvents: db 0 diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagHouse.asm similarity index 80% rename from maps/Route5CleanseTagSpeechHouse.asm rename to maps/Route5CleanseTagHouse.asm index f044a48b0..ec05c99fb 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagHouse.asm @@ -1,8 +1,8 @@ const_value set 2 - const ROUTE5CLEANSETAGSPEECHHOUSE_GRANNY - const ROUTE5CLEANSETAGSPEECHHOUSE_TEACHER + const ROUTE5CLEANSETAGHOUSE_GRANNY + const ROUTE5CLEANSETAGHOUSE_TEACHER -Route5CleanseTagSpeechHouse_MapScripts: +Route5CleanseTagHouse_MapScripts: .SceneScripts: db 0 @@ -26,8 +26,8 @@ UnknownScript_0x18b64d: closetext end -Route5CleanseTagSpeechHouseTeacherScript: - jumptextfaceplayer Route5CleanseTagSpeechHouseTeacherText +Route5CleanseTagHouseTeacherScript: + jumptextfaceplayer Route5CleanseTagHouseTeacherText HouseForSaleBookshelf: jumpstd difficultbookshelf @@ -49,7 +49,7 @@ UnknownText_0x18b6a7: cont "are protected now." done -Route5CleanseTagSpeechHouseTeacherText: +Route5CleanseTagHouseTeacherText: text "My grandma is into" line "warding off what" @@ -60,7 +60,7 @@ Route5CleanseTagSpeechHouseTeacherText: line "startled you." done -Route5CleanseTagSpeechHouse_MapEvents: +Route5CleanseTagHouse_MapEvents: ; filler db 0, 0 @@ -80,4 +80,4 @@ Route5CleanseTagSpeechHouse_MapEvents: .ObjectEvents: db 2 object_event 2, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x18b634, -1 - object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagSpeechHouseTeacherScript, -1 + object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseTeacherScript, -1 From b88928e9aa8aa9ee72b17b62462ef5ed82e8638d Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 12:55:02 -0500 Subject: [PATCH 030/135] Missed a file --- maps/Route28.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/Route28.asm b/maps/Route28.asm index 0599fd9d9..5c1b58992 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -21,7 +21,7 @@ Route28_MapEvents: .Warps: db 2 - warp_def 7, 3, 1, ROUTE_28_FAMOUS_SPEECH_HOUSE + warp_def 7, 3, 1, ROUTE_28_STEEL_WING_HOUSE warp_def 33, 5, 7, VICTORY_ROAD_GATE .CoordEvents: From dea26c663961a19073927e11c140d5ae576f275f Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 12:59:21 -0500 Subject: [PATCH 031/135] hiddenitem, like itemball and object_event, puts the item first and the event last --- docs/map_scripts.md | 4 ++-- macros/scripts/maps.asm | 6 +++--- maps/AzaleaTown.asm | 2 +- maps/BurnedTower1F.asm | 4 ++-- maps/CeladonCity.asm | 2 +- maps/CeruleanCity.asm | 2 +- maps/CeruleanGym.asm | 2 +- maps/CianwoodCity.asm | 4 ++-- maps/CinnabarIsland.asm | 2 +- maps/DarkCaveVioletEntrance.asm | 2 +- maps/DiglettsCave.asm | 2 +- maps/DragonsDenB1F.asm | 6 +++--- maps/EcruteakCity.asm | 2 +- maps/GoldenrodUnderground.asm | 6 +++--- maps/GoldenrodUndergroundSwitchRoomEntrances.asm | 4 ++-- maps/IcePathB1F.asm | 2 +- maps/IcePathB2FBlackthornSide.asm | 2 +- maps/IcePathB2FMahoganySide.asm | 2 +- maps/IlexForest.asm | 6 +++--- maps/LakeOfRage.asm | 6 +++--- maps/MountMoonSquare.asm | 2 +- maps/MountMortar1FInside.asm | 2 +- maps/MountMortar1FOutside.asm | 2 +- maps/MountMortar2FInside.asm | 2 +- maps/MountMortarB1F.asm | 2 +- maps/NationalPark.asm | 2 +- maps/NationalParkBugContest.asm | 2 +- maps/OlivineLighthouse5F.asm | 2 +- maps/OlivinePort.asm | 2 +- maps/RockTunnel1F.asm | 4 ++-- maps/RockTunnelB1F.asm | 2 +- maps/Route11.asm | 2 +- maps/Route12.asm | 2 +- maps/Route13.asm | 2 +- maps/Route17.asm | 4 ++-- maps/Route2.asm | 8 ++++---- maps/Route25.asm | 2 +- maps/Route28.asm | 2 +- maps/Route30.asm | 2 +- maps/Route32.asm | 4 ++-- maps/Route34.asm | 4 ++-- maps/Route37.asm | 2 +- maps/Route39.asm | 2 +- maps/Route4.asm | 2 +- maps/Route40.asm | 2 +- maps/Route41.asm | 2 +- maps/Route42.asm | 2 +- maps/Route44.asm | 2 +- maps/Route45.asm | 2 +- maps/Route9.asm | 2 +- maps/SilverCaveOutside.asm | 2 +- maps/SilverCaveRoom1.asm | 4 ++-- maps/SilverCaveRoom2.asm | 2 +- maps/TeamRocketBaseB1F.asm | 2 +- maps/TeamRocketBaseB2F.asm | 2 +- maps/TinTower4F.asm | 2 +- maps/TinTower5F.asm | 4 ++-- maps/UndergroundPath.asm | 4 ++-- maps/VermilionCity.asm | 2 +- maps/VermilionPort.asm | 2 +- maps/VictoryRoad.asm | 4 ++-- maps/VioletCity.asm | 2 +- maps/WhirlIslandB1F.asm | 6 +++--- 63 files changed, 90 insertions(+), 90 deletions(-) diff --git a/docs/map_scripts.md b/docs/map_scripts.md index 2302257e7..ba5a58784 100644 --- a/docs/map_scripts.md +++ b/docs/map_scripts.md @@ -110,7 +110,7 @@ BG event types: - `BGEVENT_ITEM` 
-	hiddenitem event_flag, item_id
+	hiddenitem item_id, event_flag
- `BGEVENT_COPY` @@ -162,7 +162,7 @@ Object types: - `OBJECTTYPE_ITEMBALL` 
-	itemball item_id
+	itemball item_id[, quantity=1]
- `OBJECTTYPE_TRAINER` diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 31a1f16d9..f7452080e 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -99,9 +99,9 @@ endc ENDM hiddenitem: MACRO -;\1: flag: an EVENT_* constant -;\2: item: from constants/item_constants.asm - dwb \1, \2 +;\1: item: from constants/item_constants.asm +;\2: flag: an EVENT_* constant + dwb \2, \1 ENDM elevfloor: MACRO diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index bb637fa26..83a29e7ad 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -211,7 +211,7 @@ WhiteApricornTree: fruittree FRUITTREE_AZALEA_TOWN AzaleaTownHiddenFullHeal: - hiddenitem EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL AzaleaTownRivalBattleApproachMovement1: step LEFT diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index f8e5ef52f..71b3c1caa 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -131,10 +131,10 @@ BurnedTower1FRock: jumpstd smashrock BurnedTower1FHiddenEther: - hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER + hiddenitem ETHER, EVENT_BURNED_TOWER_1F_HIDDEN_ETHER BurnedTower1FHiddenUltraBall: - hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem ULTRA_BALL, EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL BurnedTower1FHPUp: itemball HP_UP diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 8075a5343..d1a116a40 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -75,7 +75,7 @@ CeladonCityPokecenterSign: jumpstd pokecentersign CeladonCityHiddenPpUp: - hiddenitem EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP + hiddenitem PP_UP, EVENT_CELADON_CITY_HIDDEN_PP_UP CeladonCityFisherText: text "This POLIWRATH is" diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 9980a4487..b30d1f310 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -147,7 +147,7 @@ CeruleanCityMartSign: jumpstd martsign CeruleanCityHiddenBerserkGene: - hiddenitem EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE + hiddenitem BERSERK_GENE, EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY CeruleanCityCooltrainerMText1: text "KANTO's POWER" diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index b1076ded5..bbc942b07 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -135,7 +135,7 @@ CeruleanGymGuyScript: end CeruleanGymHiddenMachinePart: - hiddenitem EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART + hiddenitem MACHINE_PART, EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM CeruleanGymStatue1: checkevent EVENT_TRAINERS_IN_CERULEAN_GYM diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index f05b7aeb3..82be11a81 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -145,10 +145,10 @@ CianwoodCityRock: jumpstd smashrock CianwoodCityHiddenRevive: - hiddenitem EVENT_CIANWOOD_CITY_HIDDEN_REVIVE, REVIVE + hiddenitem REVIVE, EVENT_CIANWOOD_CITY_HIDDEN_REVIVE CianwoodCityHiddenMaxEther: - hiddenitem EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem MAX_ETHER, EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER MovementData_0x1a00da: set_sliding diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index ed4765d18..c817510ab 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -35,7 +35,7 @@ CinnabarIslandPokecenterSign: jumpstd pokecentersign CinnabarIslandHiddenRareCandy: - hiddenitem EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem RARE_CANDY, EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY CinnabarIslandBlueTeleport: teleport_from diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 3eed4f41c..cea6b588b 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -31,7 +31,7 @@ DarkCaveVioletEntranceRock: jumpstd smashrock DarkCaveVioletEntranceHiddenElixer: - hiddenitem EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER + hiddenitem ELIXER, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER DarkCaveVioletEntrance_MapEvents: ; filler diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index b7ff38465..c894b3aeb 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -12,7 +12,7 @@ DiglettsCavePokefanMScript: jumptextfaceplayer DiglettsCavePokefanMText DiglettsCaveHiddenMaxRevive: - hiddenitem EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE + hiddenitem MAX_REVIVE, EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE DiglettsCavePokefanMText: text "A bunch of DIGLETT" diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 10b079edf..0a858f4f5 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -183,13 +183,13 @@ DragonsDenB1FMaxElixer: itemball MAX_ELIXER DragonsDenB1FHiddenRevive: - hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE + hiddenitem REVIVE, EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE DragonsDenB1FHiddenMaxPotion: - hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION DragonsDenB1FHiddenMaxElixer: - hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER + hiddenitem MAX_ELIXER, EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER MovementDragonsDen_ClairWalksToYou: slow_step RIGHT diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 4f8c46c7a..f2d7ebba9 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -88,7 +88,7 @@ EcruteakCityMartSign: jumpstd martsign EcruteakCityHiddenHyperPotion: - hiddenitem EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem HYPER_POTION, EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION UnusedMissingDaughterText: ; This text is neither used nor referenced in the final game. diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index e8e566666..b8e35d8cf 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -409,13 +409,13 @@ MapGoldenrodUndergroundSignpost1Script: jumptext UnknownText_0x7c91a GoldenrodUndergroundHiddenParlyzHeal: - hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL + hiddenitem PARLYZ_HEAL, EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL GoldenrodUndergroundHiddenSuperPotion: - hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem SUPER_POTION, EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION GoldenrodUndergroundHiddenAntidote: - hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE, ANTIDOTE + hiddenitem ANTIDOTE, EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE SupernerdEricSeenText: text "I got booted out" diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index 621c133fd..34104f302 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -631,10 +631,10 @@ GoldenrodUndergroundSwitchRoomEntrancesFullHeal: itemball FULL_HEAL GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion: - hiddenitem EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive: - hiddenitem EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE + hiddenitem REVIVE, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE UndergroundSilverApproachMovement1: step DOWN diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 2df927ebd..b0cba6d34 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -68,7 +68,7 @@ IcePathB1FIron: itemball IRON IcePathB1FHiddenMaxPotion: - hiddenitem EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION IcePathBoulderFellThroughText: text "The boulder fell" diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 1fe814b66..00caf4394 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -12,7 +12,7 @@ IcePathB2FBlackthornSideTMRest: itemball TM_REST IcePathB2FBlackthornSideHiddenIceHeal: - hiddenitem EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL + hiddenitem ICE_HEAL, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL IcePathB2FBlackthornSide_MapEvents: ; filler diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index d70dc8492..6ee9284fe 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -23,7 +23,7 @@ IcePathB2FMahoganySideMaxPotion: itemball MAX_POTION IcePathB2FMahoganySideHiddenCarbos: - hiddenitem EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS + hiddenitem CARBOS, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS IcePathB2FMahoganySideBoulderText: text "It's immovably" diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 4d818133f..27f5528cd 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -414,13 +414,13 @@ IlexForestEther: itemball ETHER IlexForestHiddenEther: - hiddenitem EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER + hiddenitem ETHER, EVENT_ILEX_FOREST_HIDDEN_ETHER IlexForestHiddenSuperPotion: - hiddenitem EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem SUPER_POTION, EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION IlexForestHiddenFullHeal: - hiddenitem EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL IlexForestBoulder: ; unused diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index fdbbeb438..a624862ef 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -232,13 +232,13 @@ LakeOfRageTMDetect: itemball TM_DETECT LakeOfRageHiddenFullRestore: - hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE LakeOfRageHiddenRareCandy: - hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem RARE_CANDY, EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY LakeOfRageHiddenMaxPotion: - hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION MovementData_0x70155: teleport_from diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 1d9848f3b..685924675 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -75,7 +75,7 @@ ClefairyDance: end MountMoonSquareHiddenMoonStone: - hiddenitem EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE + hiddenitem MOON_STONE, EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE DontLitterSign: jumptext DontLitterSignText diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index a67ba1144..ab9964a42 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -64,7 +64,7 @@ MountMortar1FInsideUltraBall: itemball ULTRA_BALL MountMortar1FInsideHiddenMaxRepel: - hiddenitem EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL + hiddenitem MAX_REPEL, EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL PokemaniacMillerSeenText: text "I'm not losing" diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index d38f4f732..fbb7f8898 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -16,7 +16,7 @@ MountMortar1FOutsideRevive: itemball REVIVE MountMortar1FOutsideHiddenHyperPotion: - hiddenitem EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem HYPER_POTION, EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION MountMortar1FOutside_MapEvents: ; filler diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 66120731f..94212e538 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -44,7 +44,7 @@ MountMortar2FInsideEscapeRope: itemball ESCAPE_ROPE MountMortar2FInsideHiddenFullRestore: - hiddenitem EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE SupernerdHughSeenText: text "Yo! MARKUS!" diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 7d798c22e..44149c357 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -72,7 +72,7 @@ MountMortarB1FPPUp: itemball PP_UP MountMortarB1FHiddenMaxRevive: - hiddenitem EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE + hiddenitem MAX_REVIVE, EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE UnknownText_0x7e24d: text "Hey!" diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 9429c5845..0e4c1005c 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -305,7 +305,7 @@ NationalParkTMDig: itemball TM_DIG NationalParkHiddenFullHeal: - hiddenitem EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL NationalParkLassText: text "Look! Check out my" diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index c69e55854..cc659bf43 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -115,7 +115,7 @@ NationalParkBugContestTMDig: itemball TM_DIG NationalParkBugContestHiddenFullHeal: - hiddenitem EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL UnknownText_0x5c94c: text "DON: I'm going to" diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index ccee7f0c7..7c0ab40f2 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -44,7 +44,7 @@ OlivineLighthouse5FTMSwagger: itemball TM_SWAGGER OlivineLighthouse5FHiddenHyperPotion: - hiddenitem EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem HYPER_POTION, EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION SailorErnestSeenText: text "I wanted to battle" diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 0b9b8882a..6d78948fd 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -234,7 +234,7 @@ CooltrainerFScript_0x74a22: end OlivinePortHiddenProtein: - hiddenitem EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN + hiddenitem PROTEIN, EVENT_OLIVINE_PORT_HIDDEN_PROTEIN MovementData_0x74a30: step DOWN diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 570b4b2f5..bd58c797f 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -16,10 +16,10 @@ RockTunnel1FTMSteelWing: itemball TM_STEEL_WING RockTunnel1FHiddenXAccuracy: - hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY + hiddenitem X_ACCURACY, EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY RockTunnel1FHiddenXDefend: - hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND + hiddenitem X_DEFEND, EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND RockTunnel1F_MapEvents: ; filler diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index d94f1f412..579c76532 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -20,7 +20,7 @@ RockTunnelB1FRevive: itemball REVIVE RockTunnelB1FHiddenMaxPotion: - hiddenitem EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION RockTunnelB1F_MapEvents: ; filler diff --git a/maps/Route11.asm b/maps/Route11.asm index 353877969..af83ce56c 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -63,7 +63,7 @@ FruitTreeScript_0x68055: fruittree FRUITTREE_ROUTE_11 Route11HiddenRevive: - hiddenitem EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE + hiddenitem REVIVE, EVENT_ROUTE_11_HIDDEN_REVIVE YoungsterOwenSeenText: text "There's no cheat-" diff --git a/maps/Route12.asm b/maps/Route12.asm index 3aaf37991..0d3dedca7 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -70,7 +70,7 @@ Route12Nugget: itemball NUGGET Route12HiddenElixer: - hiddenitem EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER + hiddenitem ELIXER, EVENT_ROUTE_12_HIDDEN_ELIXER FisherMartinSeenText: text "Patience is the" diff --git a/maps/Route13.asm b/maps/Route13.asm index 88753afbb..ae06e1051 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -77,7 +77,7 @@ Route13DirectionsSign: jumptext Route13DirectionsSignText Route13HiddenCalcium: - hiddenitem EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM + hiddenitem CALCIUM, EVENT_ROUTE_13_HIDDEN_CALCIUM PokefanmAlexSeenText: text "Bow down before my" diff --git a/maps/Route17.asm b/maps/Route17.asm index b2c1a820d..aeaf26f10 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -62,10 +62,10 @@ TrainerBikerGlenn: end Route17HiddenMaxEther: - hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem MAX_ETHER, EVENT_ROUTE_17_HIDDEN_MAX_ETHER Route17HiddenMaxElixer: - hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER + hiddenitem MAX_ELIXER, EVENT_ROUTE_17_HIDDEN_MAX_ELIXER BikerRileySeenText: text "Hey, you! You're" diff --git a/maps/Route2.asm b/maps/Route2.asm index f4d910194..084dff802 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -70,16 +70,16 @@ FruitTreeScript_0x1ac306: fruittree FRUITTREE_ROUTE_2 Route2HiddenMaxEther: - hiddenitem EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem MAX_ETHER, EVENT_ROUTE_2_HIDDEN_MAX_ETHER Route2HiddenFullHeal: - hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_ROUTE_2_HIDDEN_FULL_HEAL Route2HiddenFullRestore: - hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_ROUTE_2_HIDDEN_FULL_RESTORE Route2HiddenRevive: - hiddenitem EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE + hiddenitem REVIVE, EVENT_ROUTE_2_HIDDEN_REVIVE BugCatcherRobSeenText: text "My bug #MON are" diff --git a/maps/Route25.asm b/maps/Route25.asm index 616a8ff8f..e6ca7eb77 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -191,7 +191,7 @@ Route25Protein: itemball PROTEIN Route25HiddenPotion: - hiddenitem EVENT_ROUTE_25_HIDDEN_POTION, POTION + hiddenitem POTION, EVENT_ROUTE_25_HIDDEN_POTION MovementData_0x19efe8: big_step DOWN diff --git a/maps/Route28.asm b/maps/Route28.asm index 5c1b58992..32a47f415 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -9,7 +9,7 @@ Route28Sign: jumptext Route28SignText Route28HiddenRareCandy: - hiddenitem EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem RARE_CANDY, EVENT_ROUTE_28_HIDDEN_RARE_CANDY Route28SignText: text "ROUTE 28" diff --git a/maps/Route30.asm b/maps/Route30.asm index 5d6fc0de8..c4276c3f9 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -248,7 +248,7 @@ Route30FruitTree2: fruittree FRUITTREE_ROUTE_30_2 Route30HiddenPotion: - hiddenitem EVENT_ROUTE_30_HIDDEN_POTION, POTION + hiddenitem POTION, EVENT_ROUTE_30_HIDDEN_POTION Route30_JoeysRattataAttacksMovement: fix_facing diff --git a/maps/Route32.asm b/maps/Route32.asm index 6b82252dc..451d719aa 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -506,10 +506,10 @@ Route32PokecenterSign: jumpstd pokecentersign Route32HiddenGreatBall: - hiddenitem EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL + hiddenitem GREAT_BALL, EVENT_ROUTE_32_HIDDEN_GREAT_BALL Route32HiddenSuperPotion: - hiddenitem EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem SUPER_POTION, EVENT_ROUTE_32_HIDDEN_SUPER_POTION Movement_Route32CooltrainerMPushesYouBackToViolet: step UP diff --git a/maps/Route34.asm b/maps/Route34.asm index 786ffb022..8d78baad4 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -488,10 +488,10 @@ Route34Nugget: itemball NUGGET Route34HiddenRareCandy: - hiddenitem EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem RARE_CANDY, EVENT_ROUTE_34_HIDDEN_RARE_CANDY Route34HiddenSuperPotion: - hiddenitem EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem SUPER_POTION, EVENT_ROUTE_34_HIDDEN_SUPER_POTION Route34MovementData_DayCareManWalksBackInside: slow_step LEFT diff --git a/maps/Route37.asm b/maps/Route37.asm index 27dd38893..442e76ab7 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -114,7 +114,7 @@ FruitTreeScript_0x1a8e0d: fruittree FRUITTREE_ROUTE_37_3 Route37HiddenEther: - hiddenitem EVENT_ROUTE_37_HIDDEN_ETHER, ETHER + hiddenitem ETHER, EVENT_ROUTE_37_HIDDEN_ETHER TwinsAnnandanne1SeenText: text "ANN: ANNE and I" diff --git a/maps/Route39.asm b/maps/Route39.asm index 9af608cbc..bf4ce814c 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -180,7 +180,7 @@ FruitTreeScript_0x1a5bf4: fruittree FRUITTREE_ROUTE_39 Route39HiddenNugget: - hiddenitem EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET + hiddenitem NUGGET, EVENT_ROUTE_39_HIDDEN_NUGGET Route39MiltankText: text "MILTANK: Mooo!" diff --git a/maps/Route4.asm b/maps/Route4.asm index a0bf7c4bc..b3dcede9d 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -51,7 +51,7 @@ Route4HPUp: itemball HP_UP Route4HiddenUltraBall: - hiddenitem EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem ULTRA_BALL, EVENT_ROUTE_4_HIDDEN_ULTRA_BALL BirdKeeperHankSeenText: text "I'm raising my" diff --git a/maps/Route40.asm b/maps/Route40.asm index 9124da140..c9e052b52 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -135,7 +135,7 @@ Route40Rock: jumpstd smashrock Route40HiddenHyperPotion: - hiddenitem EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem HYPER_POTION, EVENT_ROUTE_40_HIDDEN_HYPER_POTION MovementData_0x1a621c: step RIGHT diff --git a/maps/Route41.asm b/maps/Route41.asm index 4b66164dd..20340e7cd 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -132,7 +132,7 @@ Route41Rock: jumpstd smashrock Route41HiddenMaxEther: - hiddenitem EVENT_ROUTE_41_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem MAX_ETHER, EVENT_ROUTE_41_HIDDEN_MAX_ETHER SwimmermCharlieSeenText: text "The water's warm" diff --git a/maps/Route42.asm b/maps/Route42.asm index c9d9ac30e..c9069e7a6 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -212,7 +212,7 @@ FruitTreeScript_0x1a9351: fruittree FRUITTREE_ROUTE_42_3 Route42HiddenMaxPotion: - hiddenitem EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_ROUTE_42_HIDDEN_MAX_POTION MovementData_0x1a9356: set_sliding diff --git a/maps/Route44.asm b/maps/Route44.asm index 6ab469c04..1995c4cb2 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -318,7 +318,7 @@ Route44MaxRepel: itemball MAX_REPEL Route44HiddenElixer: - hiddenitem EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER + hiddenitem ELIXER, EVENT_ROUTE_44_HIDDEN_ELIXER FisherWilton1SeenText: text "Aack! You made me" diff --git a/maps/Route45.asm b/maps/Route45.asm index 2b026b8d4..205f6b12a 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -312,7 +312,7 @@ Route45MaxPotion: itemball MAX_POTION Route45HiddenPpUp: - hiddenitem EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP + hiddenitem PP_UP, EVENT_ROUTE_45_HIDDEN_PP_UP HikerErikSeenText: text "Be prepared for" diff --git a/maps/Route9.asm b/maps/Route9.asm index cd1831f98..e7796bf31 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -83,7 +83,7 @@ Route9Sign: jumptext Route9SignText Route9HiddenEther: - hiddenitem EVENT_ROUTE_9_HIDDEN_ETHER, ETHER + hiddenitem ETHER, EVENT_ROUTE_9_HIDDEN_ETHER CamperDeanSeenText: text "I came to explore" diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 3e51cf7b2..7613026a3 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -17,7 +17,7 @@ MtSilverSign: jumptext MtSilverSignText SilverCaveOutsideHiddenFullRestore: - hiddenitem EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE MtSilverSignText: text "MT.SILVER" diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index fd04a1a6d..8ea6cf362 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -24,10 +24,10 @@ SilverCaveRoom1UltraBall: itemball ULTRA_BALL SilverCaveRoom1HiddenDireHit: - hiddenitem EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT + hiddenitem DIRE_HIT, EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT SilverCaveRoom1HiddenUltraBall: - hiddenitem EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem ULTRA_BALL, EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL SilverCaveRoom1_MapEvents: ; filler diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index eb6b9fd69..daa1bf0a2 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -20,7 +20,7 @@ SilverCaveRoom2PPUp: itemball PP_UP SilverCaveRoom2HiddenMaxPotion: - hiddenitem EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION SilverCaveRoom2_MapEvents: ; filler diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 7ecb7b71a..841b80f09 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -540,7 +540,7 @@ TeamRocketBaseB1FGuardSpec: itemball GUARD_SPEC TeamRocketBaseB1FHiddenRevive: - hiddenitem EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE + hiddenitem REVIVE, EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE SecurityCameraMovement1: big_step RIGHT diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index abfd227a1..d7af45ca2 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -356,7 +356,7 @@ TeamRocketBaseB2FTMThief: itemball TM_THIEF TeamRocketBaseB2FHiddenFullHeal: - hiddenitem EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL MovementData_0x6d212: step RIGHT diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 67fd4fda6..f58971358 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -20,7 +20,7 @@ TinTower4FEscapeRope: itemball ESCAPE_ROPE TinTower4FHiddenMaxPotion: - hiddenitem EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION TinTower4F_MapEvents: ; filler diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index ee2980b33..5bad496ee 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -12,10 +12,10 @@ TinTower5FRareCandy: itemball RARE_CANDY TinTower5FHiddenFullRestore: - hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE TinTower5FHiddenCarbos: - hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS + hiddenitem CARBOS, EVENT_TIN_TOWER_5F_HIDDEN_CARBOS TinTower5F_MapEvents: ; filler diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm index 6834c043e..fd23de3d9 100644 --- a/maps/UndergroundPath.asm +++ b/maps/UndergroundPath.asm @@ -6,10 +6,10 @@ UndergroundPath_MapScripts: db 0 UndergroundPathHiddenFullRestore: - hiddenitem EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE UndergroundPathHiddenXSpecial: - hiddenitem EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL, X_SPECIAL + hiddenitem X_SPECIAL, EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL UndergroundPath_MapEvents: ; filler diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index d3e270ed7..978ac943d 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -123,7 +123,7 @@ VermilionCityMartSign: jumpstd martsign VermilionCityHiddenFullHeal: - hiddenitem EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL VermilionCityTeacherText: text "VERMILION PORT is" diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index c71739ef6..793e841d1 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -195,7 +195,7 @@ SuperNerdScript_0x74ee6: end VermilionPortHiddenIron: - hiddenitem EVENT_VERMILION_PORT_HIDDEN_IRON, IRON + hiddenitem IRON, EVENT_VERMILION_PORT_HIDDEN_IRON MovementData_0x74ef1: step DOWN diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index e0389faeb..7bc86ec04 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -112,10 +112,10 @@ VictoryRoadHPUp: itemball HP_UP VictoryRoadHiddenMaxPotion: - hiddenitem EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION VictoryRoadHiddenFullHeal: - hiddenitem EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL MovementData_0x74539: step LEFT diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 6890ffa8a..684deb7e2 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -98,7 +98,7 @@ VioletCityFruitTreeScript: fruittree FRUITTREE_VIOLET_CITY VioletCityHiddenHyperPotion: - hiddenitem EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem HYPER_POTION, EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION VioletCityFollowEarl_MovementData: big_step DOWN diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 8b816062f..3d6a94aac 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -32,13 +32,13 @@ WhirlIslandB1FBoulder: jumpstd strengthboulder WhirlIslandB1FHiddenRareCandy: - hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem RARE_CANDY, EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY WhirlIslandB1FHiddenUltraBall: - hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem ULTRA_BALL, EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL WhirlIslandB1FHiddenFullRestore: - hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE WhirlIslandB1F_MapEvents: ; filler From 8f2878c37e6755a4ac41ea65568bbfabd77bbe83 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 13:08:48 -0500 Subject: [PATCH 032/135] trainers put the class and id first: `trainer YOUNGSTER, JOEY1, ...` --- docs/map_scripts.md | 2 +- macros/scripts/maps.asm | 10 +++++----- maps/AzaleaGym.asm | 10 +++++----- maps/BlackthornGym1F.asm | 6 +++--- maps/BlackthornGym2F.asm | 4 ++-- maps/CeladonGym.asm | 10 +++++----- maps/CeruleanGym.asm | 6 +++--- maps/CianwoodGym.asm | 8 ++++---- maps/DanceTheatre.asm | 10 +++++----- maps/DragonsDenB1F.asm | 8 ++++---- maps/EcruteakGym.asm | 8 ++++---- maps/FastShipB1F.asm | 20 +++++++++---------- maps/FastShipCabins_NNW_NNE_NE.asm | 12 +++++------ maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 14 ++++++------- maps/FastShipCabins_SW_SSW_NW.asm | 8 ++++---- maps/GoldenrodGym.asm | 8 ++++---- maps/GoldenrodUnderground.asm | 8 ++++---- ...oldenrodUndergroundSwitchRoomEntrances.asm | 12 +++++------ maps/GoldenrodUndergroundWarehouse.asm | 6 +++--- maps/IlexForest.asm | 2 +- maps/LakeOfRage.asm | 8 ++++---- maps/MahoganyGym.asm | 10 +++++----- maps/MountMortar1FInside.asm | 4 ++-- maps/MountMortar2FInside.asm | 2 +- maps/NationalPark.asm | 8 ++++---- maps/OlivineLighthouse2F.asm | 4 ++-- maps/OlivineLighthouse3F.asm | 6 +++--- maps/OlivineLighthouse4F.asm | 4 ++-- maps/OlivineLighthouse5F.asm | 4 ++-- maps/PewterGym.asm | 2 +- maps/RadioTower1F.asm | 2 +- maps/RadioTower2F.asm | 8 ++++---- maps/RadioTower3F.asm | 8 ++++---- maps/RadioTower4F.asm | 8 ++++---- maps/RadioTower5F.asm | 2 +- maps/Route1.asm | 4 ++-- maps/Route10South.asm | 4 ++-- maps/Route11.asm | 8 ++++---- maps/Route12.asm | 8 ++++---- maps/Route13.asm | 10 +++++----- maps/Route14.asm | 6 +++--- maps/Route15.asm | 12 +++++------ maps/Route17.asm | 8 ++++---- maps/Route18.asm | 4 ++-- maps/Route19.asm | 8 ++++---- maps/Route2.asm | 6 +++--- maps/Route20.asm | 6 +++--- maps/Route21.asm | 6 +++--- maps/Route25.asm | 14 ++++++------- maps/Route26.asm | 12 +++++------ maps/Route27.asm | 12 +++++------ maps/Route3.asm | 8 ++++---- maps/Route30.asm | 6 +++--- maps/Route31.asm | 2 +- maps/Route32.asm | 16 +++++++-------- maps/Route33.asm | 2 +- maps/Route34.asm | 16 +++++++-------- maps/Route35.asm | 16 +++++++-------- maps/Route36.asm | 4 ++-- maps/Route37.asm | 6 +++--- maps/Route38.asm | 12 +++++------ maps/Route39.asm | 8 ++++---- maps/Route4.asm | 6 +++--- maps/Route40.asm | 8 ++++---- maps/Route41.asm | 20 +++++++++---------- maps/Route42.asm | 6 +++--- maps/Route43.asm | 12 +++++------ maps/Route44.asm | 14 ++++++------- maps/Route45.asm | 14 ++++++------- maps/Route46.asm | 6 +++--- maps/Route6.asm | 4 ++-- maps/Route8.asm | 10 +++++----- maps/Route9.asm | 12 +++++------ maps/RuinsOfAlphOutside.asm | 4 ++-- maps/SaffronGym.asm | 8 ++++---- maps/SlowpokeWellB1F.asm | 8 ++++---- maps/SproutTower1F.asm | 2 +- maps/SproutTower2F.asm | 4 ++-- maps/SproutTower3F.asm | 6 +++--- maps/TeamRocketBaseB1F.asm | 4 ++-- maps/TeamRocketBaseB2F.asm | 6 +++--- maps/TeamRocketBaseB3F.asm | 8 ++++---- maps/UnionCave1F.asm | 10 +++++----- maps/UnionCaveB1F.asm | 8 ++++---- maps/UnionCaveB2F.asm | 6 +++--- maps/VermilionGym.asm | 6 +++--- maps/VioletGym.asm | 4 ++-- maps/WiseTriosRoom.asm | 6 +++--- 88 files changed, 339 insertions(+), 339 deletions(-) diff --git a/docs/map_scripts.md b/docs/map_scripts.md index ba5a58784..aa7ed6f32 100644 --- a/docs/map_scripts.md +++ b/docs/map_scripts.md @@ -168,5 +168,5 @@ Object types: - `OBJECTTYPE_TRAINER` 
-	trainer event_flag, group_id, trainer_id, seen_text, beaten_text, loss_text, script
+	trainer group_id, trainer_id, event_flag, seen_text, beaten_text, loss_text, script
diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index f7452080e..48c8f0104 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -76,15 +76,15 @@ ENDM trainer: MACRO -;\1: flag: an EVENT_BEAT_* constant -;\2: trainer group -;\3: trainer id +;\1: trainer group +;\2: trainer id +;\3: flag: an EVENT_BEAT_* constant ;\4: seen text ;\5: win text ;\6: loss text ;\7: after-battle text - dw \1 - db \2, \3 + dw \3 + db \1, \2 dw \4, \5, \6, \7 ENDM diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 3675392fc..48f229cf7 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -70,7 +70,7 @@ AzaleaGymActivateRockets: jumpstd radiotowerrockets TrainerTwinsAmyandmay1: - trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript + trainer TWINS, AMYANDMAY1, EVENT_BEAT_TWINS_AMY_AND_MAY, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript .AfterScript: end_if_just_battled @@ -81,7 +81,7 @@ TrainerTwinsAmyandmay1: end TrainerTwinsAmyandmay2: - trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, 0, .AfterScript + trainer TWINS, AMYANDMAY2, EVENT_BEAT_TWINS_AMY_AND_MAY, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, 0, .AfterScript .AfterScript: end_if_just_battled @@ -92,7 +92,7 @@ TrainerTwinsAmyandmay2: end TrainerBugCatcherBenny: - trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, BugCatcherBennySeenText, BugCatcherBennyBeatenText, 0, .AfterScript + trainer BUG_CATCHER, BUG_CATCHER_BENNY, EVENT_BEAT_BUG_CATCHER_BENNY, BugCatcherBennySeenText, BugCatcherBennyBeatenText, 0, .AfterScript .AfterScript: end_if_just_battled @@ -103,7 +103,7 @@ TrainerBugCatcherBenny: end TrainerBugCatcherAl: - trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, BugCatcherAlSeenText, BugCatcherAlBeatenText, 0, .AfterScript + trainer BUG_CATCHER, AL, EVENT_BEAT_BUG_CATCHER_AL, BugCatcherAlSeenText, BugCatcherAlBeatenText, 0, .AfterScript .AfterScript: end_if_just_battled @@ -114,7 +114,7 @@ TrainerBugCatcherAl: end TrainerBugCatcherJosh: - trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, BugCatcherJoshSeenText, BugCatcherJoshBeatenText, 0, .AfterScript + trainer BUG_CATCHER, JOSH, EVENT_BEAT_BUG_CATCHER_JOSH, BugCatcherJoshSeenText, BugCatcherJoshBeatenText, 0, .AfterScript .AfterScript: end_if_just_battled diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 25de39246..f194fe1c6 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -93,7 +93,7 @@ BlackthornGymClairScript: end TrainerCooltrainermPaul: - trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, .Script + trainer COOLTRAINERM, PAUL, EVENT_BEAT_COOLTRAINERM_PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, .Script .Script: end_if_just_battled @@ -104,7 +104,7 @@ TrainerCooltrainermPaul: end TrainerCooltrainermMike: - trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, .Script + trainer COOLTRAINERM, MIKE, EVENT_BEAT_COOLTRAINERM_MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, .Script .Script: end_if_just_battled @@ -115,7 +115,7 @@ TrainerCooltrainermMike: end TrainerCooltrainerfLola: - trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, .Script + trainer COOLTRAINERF, LOLA, EVENT_BEAT_COOLTRAINERF_LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 7d08bcebb..239d9ed62 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -59,7 +59,7 @@ BlackthornGymBoulder: jumpstd strengthboulder TrainerCooltrainermCody: - trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, .Script + trainer COOLTRAINERM, CODY, EVENT_BEAT_COOLTRAINERM_CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, .Script .Script: end_if_just_battled @@ -70,7 +70,7 @@ TrainerCooltrainermCody: end TrainerCooltrainerfFran: - trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, .Script + trainer COOLTRAINERF, FRAN, EVENT_BEAT_COOLTRAINERF_FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 53f09324a..1a3a64894 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -50,7 +50,7 @@ UnknownScript_0x72aae: end TrainerLassMichelle: - trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, .Script + trainer LASS, MICHELLE, EVENT_BEAT_LASS_MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, .Script .Script: end_if_just_battled @@ -61,7 +61,7 @@ TrainerLassMichelle: end TrainerPicnickerTanya: - trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, .Script + trainer PICNICKER, TANYA, EVENT_BEAT_PICNICKER_TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, .Script .Script: end_if_just_battled @@ -72,7 +72,7 @@ TrainerPicnickerTanya: end TrainerBeautyJulia: - trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, .Script + trainer BEAUTY, JULIA, EVENT_BEAT_BEAUTY_JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, .Script .Script: end_if_just_battled @@ -83,7 +83,7 @@ TrainerBeautyJulia: end TrainerTwinsJoandzoe1: - trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, .Script + trainer TWINS, JOANDZOE1, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, .Script .Script: end_if_just_battled @@ -94,7 +94,7 @@ TrainerTwinsJoandzoe1: end TrainerTwinsJoandzoe2: - trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, .Script + trainer TWINS, JOANDZOE2, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index bbc942b07..8546b5a60 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -86,7 +86,7 @@ MistyScript_0x188432: end TrainerSwimmerfDiana: - trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, .Script + trainer SWIMMERF, DIANA, EVENT_BEAT_SWIMMERF_DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, .Script .Script: end_if_just_battled @@ -97,7 +97,7 @@ TrainerSwimmerfDiana: end TrainerSwimmerfBriana: - trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, .Script + trainer SWIMMERF, BRIANA, EVENT_BEAT_SWIMMERF_BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, .Script .Script: end_if_just_battled @@ -108,7 +108,7 @@ TrainerSwimmerfBriana: end TrainerSwimmermParker: - trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, .Script + trainer SWIMMERM, PARKER, EVENT_BEAT_SWIMMERM_PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 1ca8a0a5e..a9ac0bddd 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -87,7 +87,7 @@ CianwoodGymActivateRockets: jumpstd radiotowerrockets TrainerBlackbeltYoshi: - trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, .Script + trainer BLACKBELT_T, YOSHI, EVENT_BEAT_BLACKBELT_YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, .Script .Script: end_if_just_battled @@ -98,7 +98,7 @@ TrainerBlackbeltYoshi: end TrainerBlackbeltLao: - trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, 0, .Script + trainer BLACKBELT_T, LAO, EVENT_BEAT_BLACKBELT_LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, 0, .Script .Script: end_if_just_battled @@ -109,7 +109,7 @@ TrainerBlackbeltLao: end TrainerBlackbeltNob: - trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, 0, .Script + trainer BLACKBELT_T, NOB, EVENT_BEAT_BLACKBELT_NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, 0, .Script .Script: end_if_just_battled @@ -120,7 +120,7 @@ TrainerBlackbeltNob: end TrainerBlackbeltLung: - trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, 0, .Script + trainer BLACKBELT_T, LUNG, EVENT_BEAT_BLACKBELT_LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index bb698becd..99a01feac 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -17,7 +17,7 @@ DanceTheatre_MapScripts: db 0 TrainerKimonoGirlNaoko2: - trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, KimonoGirlNaoko2SeenText, KimonoGirlNaoko2BeatenText, 0, .Script + trainer KIMONO_GIRL, NAOKO2, EVENT_BEAT_KIMONO_GIRL_NAOKO, KimonoGirlNaoko2SeenText, KimonoGirlNaoko2BeatenText, 0, .Script .Script: end_if_just_battled @@ -28,7 +28,7 @@ TrainerKimonoGirlNaoko2: end TrainerKimonoGirlSayo: - trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, KimonoGirlSayoSeenText, KimonoGirlSayoBeatenText, 0, .Script + trainer KIMONO_GIRL, SAYO, EVENT_BEAT_KIMONO_GIRL_SAYO, KimonoGirlSayoSeenText, KimonoGirlSayoBeatenText, 0, .Script .Script: end_if_just_battled @@ -39,7 +39,7 @@ TrainerKimonoGirlSayo: end TrainerKimonoGirlZuki: - trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, KimonoGirlZukiSeenText, KimonoGirlZukiBeatenText, 0, .Script + trainer KIMONO_GIRL, ZUKI, EVENT_BEAT_KIMONO_GIRL_ZUKI, KimonoGirlZukiSeenText, KimonoGirlZukiBeatenText, 0, .Script .Script: end_if_just_battled @@ -50,7 +50,7 @@ TrainerKimonoGirlZuki: end TrainerKimonoGirlKuni: - trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, KimonoGirlKuniSeenText, KimonoGirlKuniBeatenText, 0, .Script + trainer KIMONO_GIRL, KUNI, EVENT_BEAT_KIMONO_GIRL_KUNI, KimonoGirlKuniSeenText, KimonoGirlKuniBeatenText, 0, .Script .Script: end_if_just_battled @@ -61,7 +61,7 @@ TrainerKimonoGirlKuni: end TrainerKimonoGirlMiki: - trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, KimonoGirlMikiSeenText, KimonoGirlMikiBeatenText, 0, .Script + trainer KIMONO_GIRL, MIKI, EVENT_BEAT_KIMONO_GIRL_MIKI, KimonoGirlMikiSeenText, KimonoGirlMikiBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 0a858f4f5..1bab71a14 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -84,7 +84,7 @@ DragonsDenB1F_ClairScene: end TrainerCooltrainermDarin: - trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, .Script + trainer COOLTRAINERM, DARIN, EVENT_BEAT_COOLTRAINERM_DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, .Script .Script: end_if_just_battled @@ -95,7 +95,7 @@ TrainerCooltrainermDarin: end TrainerCooltrainerfCara: - trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, .Script + trainer COOLTRAINERF, CARA, EVENT_BEAT_COOLTRAINERF_CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, .Script .Script: end_if_just_battled @@ -106,7 +106,7 @@ TrainerCooltrainerfCara: end TrainerTwinsLeaandpia1: - trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, .Script + trainer TWINS, LEAANDPIA1, EVENT_BEAT_TWINS_LEA_AND_PIA, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, .Script .Script: end_if_just_battled @@ -117,7 +117,7 @@ TrainerTwinsLeaandpia1: end TrainerTwinsLeaandpia2: - trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, .Script + trainer TWINS, LEAANDPIA1, EVENT_BEAT_TWINS_LEA_AND_PIA, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index ea6448ecc..30a7f5f35 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -98,7 +98,7 @@ EcruteakGymClosed: end TrainerSageJeffrey: - trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, .Script + trainer SAGE, JEFFREY, EVENT_BEAT_SAGE_JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, .Script .Script: end_if_just_battled @@ -109,7 +109,7 @@ TrainerSageJeffrey: end TrainerSagePing: - trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, 0, .Script + trainer SAGE, PING, EVENT_BEAT_SAGE_PING, SagePingSeenText, SagePingBeatenText, 0, .Script .Script: end_if_just_battled @@ -120,7 +120,7 @@ TrainerSagePing: end TrainerMediumMartha: - trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, .Script + trainer MEDIUM, MARTHA, EVENT_BEAT_MEDIUM_MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, .Script .Script: end_if_just_battled @@ -131,7 +131,7 @@ TrainerMediumMartha: end TrainerMediumGrace: - trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, .Script + trainer MEDIUM, GRACE, EVENT_BEAT_MEDIUM_GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index c179b490a..e5d935e66 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -94,7 +94,7 @@ UnknownScript_0x767a0: end TrainerSailorJeff: - trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, .Script + trainer SAILOR, JEFF, EVENT_BEAT_SAILOR_JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, .Script .Script: end_if_just_battled @@ -105,7 +105,7 @@ TrainerSailorJeff: end TrainerPicnickerDebra: - trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, .Script + trainer PICNICKER, DEBRA, EVENT_BEAT_PICNICKER_DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, .Script .Script: end_if_just_battled @@ -116,7 +116,7 @@ TrainerPicnickerDebra: end TrainerJugglerFritz: - trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, .Script + trainer JUGGLER, FRITZ, EVENT_BEAT_JUGGLER_FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, .Script .Script: end_if_just_battled @@ -127,7 +127,7 @@ TrainerJugglerFritz: end TrainerSailorGarrett: - trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, .Script + trainer SAILOR, GARRETT, EVENT_BEAT_SAILOR_GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, .Script .Script: end_if_just_battled @@ -138,7 +138,7 @@ TrainerSailorGarrett: end TrainerFisherJonah: - trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, .Script + trainer FISHER, JONAH, EVENT_BEAT_FISHER_JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, .Script .Script: end_if_just_battled @@ -149,7 +149,7 @@ TrainerFisherJonah: end TrainerBlackbeltWai: - trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, .Script + trainer BLACKBELT_T, WAI, EVENT_BEAT_BLACKBELT_WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, .Script .Script: end_if_just_battled @@ -160,7 +160,7 @@ TrainerBlackbeltWai: end TrainerSailorKenneth: - trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, .Script + trainer SAILOR, KENNETH, EVENT_BEAT_SAILOR_KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, .Script .Script: end_if_just_battled @@ -171,7 +171,7 @@ TrainerSailorKenneth: end TrainerTeacherShirley: - trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, .Script + trainer TEACHER, SHIRLEY, EVENT_BEAT_TEACHER_SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, .Script .Script: end_if_just_battled @@ -182,7 +182,7 @@ TrainerTeacherShirley: end TrainerSchoolboyNate: - trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, .Script + trainer SCHOOLBOY, NATE, EVENT_BEAT_SCHOOLBOY_NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, .Script .Script: end_if_just_battled @@ -193,7 +193,7 @@ TrainerSchoolboyNate: end TrainerSchoolboyRicky: - trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, .Script + trainer SCHOOLBOY, RICKY, EVENT_BEAT_SCHOOLBOY_RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index a6ff922dd..68fd528dd 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -15,7 +15,7 @@ FastShipCabins_NNW_NNE_NE_MapScripts: db 0 TrainerCooltrainermSean: - trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, .Script + trainer COOLTRAINERM, SEAN, EVENT_BEAT_COOLTRAINERM_SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, .Script .Script: end_if_just_battled @@ -26,7 +26,7 @@ TrainerCooltrainermSean: end TrainerCooltrainerfCarol: - trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, .Script + trainer COOLTRAINERF, CAROL, EVENT_BEAT_COOLTRAINERF_CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, .Script .Script: end_if_just_battled @@ -37,7 +37,7 @@ TrainerCooltrainerfCarol: end TrainerPokemaniacEthan: - trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, .Script + trainer POKEMANIAC, ETHAN, EVENT_BEAT_POKEMANIAC_ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, .Script .Script: end_if_just_battled @@ -48,7 +48,7 @@ TrainerPokemaniacEthan: end TrainerHikerNoland: - trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, .Script + trainer HIKER, NOLAND, EVENT_BEAT_HIKER_NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, .Script .Script: end_if_just_battled @@ -59,7 +59,7 @@ TrainerHikerNoland: end TrainerGentlemanEdward: - trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, .Script + trainer GENTLEMAN, EDWARD, EVENT_BEAT_GENTLEMAN_EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, .Script .Script: end_if_just_battled @@ -70,7 +70,7 @@ TrainerGentlemanEdward: end TrainerBurglarCorey: - trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, .Script + trainer BURGLAR, COREY, EVENT_BEAT_BURGLAR_COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 5c038275d..c6997603c 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -141,7 +141,7 @@ SSAquaGranddaughterAfter: end TrainerPokefanmColin: - trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, .Script + trainer POKEFANM, COLIN, EVENT_BEAT_POKEFANM_COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, .Script .Script: end_if_just_battled @@ -152,7 +152,7 @@ TrainerPokefanmColin: end TrainerTwinsMegandpeg1: - trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, .Script + trainer TWINS, MEGANDPEG1, EVENT_BEAT_TWINS_MEG_AND_PEG, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, .Script .Script: end_if_just_battled @@ -163,7 +163,7 @@ TrainerTwinsMegandpeg1: end TrainerTwinsMegandpeg2: - trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, .Script + trainer TWINS, MEGANDPEG2, EVENT_BEAT_TWINS_MEG_AND_PEG, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, .Script .Script: end_if_just_battled @@ -174,7 +174,7 @@ TrainerTwinsMegandpeg2: end TrainerPsychicRodney: - trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, .Script + trainer PSYCHIC_T, RODNEY, EVENT_BEAT_PSYCHIC_RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, .Script .Script: end_if_just_battled @@ -185,7 +185,7 @@ TrainerPsychicRodney: end TrainerPokefanmJeremy: - trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, .Script + trainer POKEFANM, JEREMY, EVENT_BEAT_POKEFANM_JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, .Script .Script: end_if_just_battled @@ -196,7 +196,7 @@ TrainerPokefanmJeremy: end TrainerPokefanfGeorgia: - trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, .Script + trainer POKEFANF, GEORGIA, EVENT_BEAT_POKEFANF_GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, .Script .Script: end_if_just_battled @@ -207,7 +207,7 @@ TrainerPokefanfGeorgia: end TrainerSupernerdShawn: - trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, .Script + trainer SUPER_NERD, SHAWN, EVENT_BEAT_SUPER_NERD_SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index d4d35f584..c979ec074 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -12,7 +12,7 @@ FastShipCabins_SW_SSW_NW_MapScripts: db 0 TrainerFirebreatherLyle: - trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, .Script + trainer FIREBREATHER, LYLE, EVENT_BEAT_FIREBREATHER_LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, .Script .Script: end_if_just_battled @@ -23,7 +23,7 @@ TrainerFirebreatherLyle: end TrainerBugCatcherKen: - trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, BugCatcherKenSeenText, BugCatcherKenBeatenText, 0, .Script + trainer BUG_CATCHER, KEN, EVENT_BEAT_BUG_CATCHER_KEN, BugCatcherKenSeenText, BugCatcherKenBeatenText, 0, .Script .Script: end_if_just_battled @@ -34,7 +34,7 @@ TrainerBugCatcherKen: end TrainerBeautyCassie: - trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, .Script + trainer BEAUTY, CASSIE, EVENT_BEAT_BEAUTY_CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, .Script .Script: end_if_just_battled @@ -45,7 +45,7 @@ TrainerBeautyCassie: end TrainerGuitaristClyde: - trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, .Script + trainer GUITARIST, CLYDE, EVENT_BEAT_GUITARIST_CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index f4eac1b6b..98ec66658 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -93,7 +93,7 @@ GoldenrodGymActivateRockets: jumpstd radiotowerrockets TrainerLassCarrie: - trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, .Script + trainer LASS, CARRIE, EVENT_BEAT_LASS_CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, .Script .Script: end_if_just_battled @@ -117,7 +117,7 @@ WhitneyCriesScript: end TrainerLassBridget: - trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, .Script + trainer LASS, BRIDGET, EVENT_BEAT_LASS_BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, .Script .Script: end_if_just_battled @@ -128,7 +128,7 @@ TrainerLassBridget: end TrainerBeautyVictoria: - trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, .Script + trainer BEAUTY, VICTORIA, EVENT_BEAT_BEAUTY_VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, .Script .Script: end_if_just_battled @@ -139,7 +139,7 @@ TrainerBeautyVictoria: end TrainerBeautySamantha: - trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, .Script + trainer BEAUTY, SAMANTHA, EVENT_BEAT_BEAUTY_SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index b8e35d8cf..e2e91dd1d 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -111,7 +111,7 @@ GoldenrodUnderground_MapScripts: return TrainerSupernerdEric: - trainer EVENT_BEAT_SUPER_NERD_ERIC, SUPER_NERD, ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, .Script + trainer SUPER_NERD, ERIC, EVENT_BEAT_SUPER_NERD_ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, .Script .Script: end_if_just_battled @@ -122,7 +122,7 @@ TrainerSupernerdEric: end TrainerSupernerdTeru: - trainer EVENT_BEAT_SUPER_NERD_TERU, SUPER_NERD, TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, .Script + trainer SUPER_NERD, TERU, EVENT_BEAT_SUPER_NERD_TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, .Script .Script: end_if_just_battled @@ -133,7 +133,7 @@ TrainerSupernerdTeru: end TrainerPokemaniacIssac: - trainer EVENT_BEAT_POKEMANIAC_ISSAC, POKEMANIAC, ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, .Script + trainer POKEMANIAC, ISSAC, EVENT_BEAT_POKEMANIAC_ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, .Script .Script: end_if_just_battled @@ -144,7 +144,7 @@ TrainerPokemaniacIssac: end TrainerPokemaniacDonald: - trainer EVENT_BEAT_POKEMANIAC_DONALD, POKEMANIAC, DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, .Script + trainer POKEMANIAC, DONALD, EVENT_BEAT_POKEMANIAC_DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index 34104f302..561ee9df0 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -207,7 +207,7 @@ UndergroundSilverBattleScript: end TrainerGruntM11: - trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, GRUNTM_11, GruntM11SeenText, GruntM11BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_11, EVENT_BEAT_ROCKET_GRUNTM_11, GruntM11SeenText, GruntM11BeatenText, 0, .Script .Script: end_if_just_battled @@ -218,7 +218,7 @@ TrainerGruntM11: end TrainerGruntM25: - trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, GRUNTM_25, GruntM25SeenText, GruntM25BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_25, EVENT_BEAT_ROCKET_GRUNTM_25, GruntM25SeenText, GruntM25BeatenText, 0, .Script .Script: end_if_just_battled @@ -229,7 +229,7 @@ TrainerGruntM25: end TrainerBurglarDuncan: - trainer EVENT_BEAT_BURGLAR_DUNCAN, BURGLAR, DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, .Script + trainer BURGLAR, DUNCAN, EVENT_BEAT_BURGLAR_DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, .Script .Script: end_if_just_battled @@ -240,7 +240,7 @@ TrainerBurglarDuncan: end TrainerBurglarEddie: - trainer EVENT_BEAT_BURGLAR_EDDIE, BURGLAR, EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, .Script + trainer BURGLAR, EDDIE, EVENT_BEAT_BURGLAR_EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, .Script .Script: end_if_just_battled @@ -251,7 +251,7 @@ TrainerBurglarEddie: end TrainerGruntM13: - trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, GRUNTM_13, GruntM13SeenText, GruntM13BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_13, EVENT_BEAT_ROCKET_GRUNTM_13, GruntM13SeenText, GruntM13BeatenText, 0, .Script .Script: end_if_just_battled @@ -262,7 +262,7 @@ TrainerGruntM13: end TrainerGruntF3: - trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, GRUNTF_3, GruntF3SeenText, GruntF3BeatenText, 0, .Script + trainer GRUNTF, GRUNTF_3, EVENT_BEAT_ROCKET_GRUNTF_3, GruntF3SeenText, GruntF3BeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index be5aa7e31..e132b81b9 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -36,7 +36,7 @@ GoldenrodUndergroundWarehouse_MapScripts: return TrainerGruntM24: - trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_24, EVENT_BEAT_ROCKET_GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, .Script .Script: end_if_just_battled @@ -47,7 +47,7 @@ TrainerGruntM24: end TrainerGruntM14: - trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, GRUNTM_14, GruntM14SeenText, GruntM14BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_14, EVENT_BEAT_ROCKET_GRUNTM_14, GruntM14SeenText, GruntM14BeatenText, 0, .Script .Script: end_if_just_battled @@ -58,7 +58,7 @@ TrainerGruntM14: end TrainerGruntM15: - trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, GRUNTM_15, GruntM15SeenText, GruntM15BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_15, EVENT_BEAT_ROCKET_GRUNTM_15, GruntM15SeenText, GruntM15BeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 27f5528cd..e5eff3a32 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -388,7 +388,7 @@ IlexForestHeadbuttGuyScript: end TrainerBugCatcherWayne: - trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, BugCatcherWayneSeenText, BugCatcherWayneBeatenText, 0, .Script + trainer BUG_CATCHER, WAYNE, EVENT_BEAT_BUG_CATCHER_WAYNE, BugCatcherWayneSeenText, BugCatcherWayneBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index a624862ef..f8e525971 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -146,7 +146,7 @@ UnknownScript_0x700b8: end TrainerFisherAndre: - trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, .Script + trainer FISHER, ANDRE, EVENT_BEAT_FISHER_ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, .Script .Script: end_if_just_battled @@ -157,7 +157,7 @@ TrainerFisherAndre: end TrainerFisherRaymond: - trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, .Script + trainer FISHER, RAYMOND, EVENT_BEAT_FISHER_RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, .Script .Script: end_if_just_battled @@ -168,7 +168,7 @@ TrainerFisherRaymond: end TrainerCooltrainermAaron: - trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, .Script + trainer COOLTRAINERM, AARON, EVENT_BEAT_COOLTRAINERM_AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, .Script .Script: end_if_just_battled @@ -179,7 +179,7 @@ TrainerCooltrainermAaron: end TrainerCooltrainerfLois: - trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, .Script + trainer COOLTRAINERF, LOIS, EVENT_BEAT_COOLTRAINERF_LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 20ab72ab1..3a872a26c 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -71,7 +71,7 @@ MahoganyGymActivateRockets: jumpstd radiotowerrockets TrainerSkierRoxanne: - trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, .Script + trainer SKIER, ROXANNE, EVENT_BEAT_SKIER_ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, .Script .Script: end_if_just_battled @@ -82,7 +82,7 @@ TrainerSkierRoxanne: end TrainerSkierClarissa: - trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, .Script + trainer SKIER, CLARISSA, EVENT_BEAT_SKIER_CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, .Script .Script: end_if_just_battled @@ -93,7 +93,7 @@ TrainerSkierClarissa: end TrainerBoarderRonald: - trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, .Script + trainer BOARDER, RONALD, EVENT_BEAT_BOARDER_RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, .Script .Script: end_if_just_battled @@ -104,7 +104,7 @@ TrainerBoarderRonald: end TrainerBoarderBrad: - trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, .Script + trainer BOARDER, BRAD, EVENT_BEAT_BOARDER_BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, .Script .Script: end_if_just_battled @@ -115,7 +115,7 @@ TrainerBoarderBrad: end TrainerBoarderDouglas: - trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, .Script + trainer BOARDER, DOUGLAS, EVENT_BEAT_BOARDER_DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index ab9964a42..d7f328688 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -18,7 +18,7 @@ MountMortar1FInside_MapScripts: db 0 TrainerPokemaniacMiller: - trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, .Script + trainer POKEMANIAC, MILLER, EVENT_BEAT_POKEMANIAC_MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, .Script .Script: end_if_just_battled @@ -29,7 +29,7 @@ TrainerPokemaniacMiller: end TrainerSupernerdMarkus: - trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, .Script + trainer SUPER_NERD, MARKUS, EVENT_BEAT_SUPER_NERD_MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 94212e538..bcc7b4205 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -15,7 +15,7 @@ MountMortar2FInside_MapScripts: db 0 TrainerSupernerdHugh: - trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, .Script + trainer SUPER_NERD, HUGH, EVENT_BEAT_SUPER_NERD_HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 0e4c1005c..b8485121a 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -72,7 +72,7 @@ GameboyKidScript_0x5c037: end TrainerSchoolboyJack1: - trainer EVENT_BEAT_SCHOOLBOY_JACK, SCHOOLBOY, JACK1, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, 0, .Script + trainer SCHOOLBOY, JACK1, EVENT_BEAT_SCHOOLBOY_JACK, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_JACK @@ -189,7 +189,7 @@ UnknownScript_0x5c114: end TrainerPokefanmWilliam: - trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, .Script + trainer POKEFANM, WILLIAM, EVENT_BEAT_POKEFANM_WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, .Script .Script: end_if_just_battled @@ -200,7 +200,7 @@ TrainerPokefanmWilliam: end TrainerPokefanfBeverly1: - trainer EVENT_BEAT_POKEFANF_BEVERLY, POKEFANF, BEVERLY1, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, 0, .Script + trainer POKEFANF, BEVERLY1, EVENT_BEAT_POKEFANF_BEVERLY, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_POKEFAN_BEVERLY @@ -279,7 +279,7 @@ UnknownScript_0x5c1ab: end TrainerLassKrise: - trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, 0, .Script + trainer LASS, KRISE, EVENT_BEAT_LASS_KRISE, LassKriseSeenText, LassKriseBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index d2fd6427f..ac99289da 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -10,7 +10,7 @@ OlivineLighthouse2F_MapScripts: db 0 TrainerGentlemanAlfred: - trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, .Script + trainer GENTLEMAN, ALFRED, EVENT_BEAT_GENTLEMAN_ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, .Script .Script: end_if_just_battled @@ -21,7 +21,7 @@ TrainerGentlemanAlfred: end TrainerSailorHuey1: - trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, 0, .Script + trainer SAILOR, HUEY1, EVENT_BEAT_SAILOR_HUEY, SailorHuey1SeenText, SailorHuey1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_SAILOR_HUEY diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 2cd0dc64c..7bcbf5aec 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -12,7 +12,7 @@ OlivineLighthouse3F_MapScripts: db 0 TrainerBirdKeeperTheo: - trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, BirdKeeperTheoSeenText, BirdKeeperTheoBeatenText, 0, .Script + trainer BIRD_KEEPER, THEO, EVENT_BEAT_BIRD_KEEPER_THEO, BirdKeeperTheoSeenText, BirdKeeperTheoBeatenText, 0, .Script .Script: end_if_just_battled @@ -23,7 +23,7 @@ TrainerBirdKeeperTheo: end TrainerGentlemanPreston: - trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, .Script + trainer GENTLEMAN, PRESTON, EVENT_BEAT_GENTLEMAN_PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, .Script .Script: end_if_just_battled @@ -34,7 +34,7 @@ TrainerGentlemanPreston: end TrainerSailorTerrell: - trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, .Script + trainer SAILOR, TERRELL, EVENT_BEAT_SAILOR_TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 7580d3499..69ca04afd 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -10,7 +10,7 @@ OlivineLighthouse4F_MapScripts: db 0 TrainerLassConnie: - trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, 0, .Script + trainer LASS, CONNIE1, EVENT_BEAT_LASS_CONNIE, LassConnie1SeenText, LassConnie1BeatenText, 0, .Script .Script: end_if_just_battled @@ -21,7 +21,7 @@ TrainerLassConnie: end TrainerSailorKent: - trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, 0, .Script + trainer SAILOR, KENT, EVENT_BEAT_SAILOR_KENT, SailorKentSeenText, SailorKentBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 7c0ab40f2..677e75158 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -13,7 +13,7 @@ OlivineLighthouse5F_MapScripts: db 0 TrainerBirdKeeperDenis: - trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, BirdKeeperDenisSeenText, BirdKeeperDenisBeatenText, 0, .Script + trainer BIRD_KEEPER, DENIS, EVENT_BEAT_BIRD_KEEPER_DENIS, BirdKeeperDenisSeenText, BirdKeeperDenisBeatenText, 0, .Script .Script: end_if_just_battled @@ -24,7 +24,7 @@ TrainerBirdKeeperDenis: end TrainerSailorErnest: - trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, .Script + trainer SAILOR, ERNEST, EVENT_BEAT_SAILOR_ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 9e6395f13..b9240fa8b 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -41,7 +41,7 @@ BrockScript_0x1a2864: end TrainerCamperJerry: - trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, .Script + trainer CAMPER, JERRY, EVENT_BEAT_CAMPER_JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 96cd013c6..eb1561801 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -186,7 +186,7 @@ RadioTower1FYoungsterScript: jumptextfaceplayer RadioTower1FYoungsterText TrainerGruntM3: - trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, GRUNTM_3, GruntM3SeenText, GruntM3BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_3, EVENT_BEAT_ROCKET_GRUNTM_3, GruntM3SeenText, GruntM3BeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 99f4dbe4c..605b019aa 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -55,7 +55,7 @@ RadioTower2FBlackBelt2Script: jumptextfaceplayer RadioTower2FBlackBelt2Text TrainerGruntM4: - trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, GRUNTM_4, GruntM4SeenText, GruntM4BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_4, EVENT_BEAT_ROCKET_GRUNTM_4, GruntM4SeenText, GruntM4BeatenText, 0, .Script .Script: end_if_just_battled @@ -66,7 +66,7 @@ TrainerGruntM4: end TrainerGruntM5: - trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, GRUNTM_5, GruntM5SeenText, GruntM5BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_5, EVENT_BEAT_ROCKET_GRUNTM_5, GruntM5SeenText, GruntM5BeatenText, 0, .Script .Script: end_if_just_battled @@ -77,7 +77,7 @@ TrainerGruntM5: end TrainerGruntM6: - trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, GRUNTM_6, GruntM6SeenText, GruntM6BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_6, EVENT_BEAT_ROCKET_GRUNTM_6, GruntM6SeenText, GruntM6BeatenText, 0, .Script .Script: end_if_just_battled @@ -88,7 +88,7 @@ TrainerGruntM6: end TrainerGruntF2: - trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, GRUNTF_2, GruntF2SeenText, GruntF2BeatenText, 0, .Script + trainer GRUNTF, GRUNTF_2, EVENT_BEAT_ROCKET_GRUNTF_2, GruntF2SeenText, GruntF2BeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 0efc9e2db..5156b1332 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -83,7 +83,7 @@ UnknownScript_0x5e5a1: end TrainerGruntM7: - trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, GRUNTM_7, GruntM7SeenText, GruntM7BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_7, EVENT_BEAT_ROCKET_GRUNTM_7, GruntM7SeenText, GruntM7BeatenText, 0, .Script .Script: end_if_just_battled @@ -94,7 +94,7 @@ TrainerGruntM7: end TrainerGruntM8: - trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, GRUNTM_8, GruntM8SeenText, GruntM8BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_8, EVENT_BEAT_ROCKET_GRUNTM_8, GruntM8SeenText, GruntM8BeatenText, 0, .Script .Script: end_if_just_battled @@ -105,7 +105,7 @@ TrainerGruntM8: end TrainerGruntM9: - trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, GRUNTM_9, GruntM9SeenText, GruntM9BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_9, EVENT_BEAT_ROCKET_GRUNTM_9, GruntM9SeenText, GruntM9BeatenText, 0, .Script .Script: end_if_just_battled @@ -116,7 +116,7 @@ TrainerGruntM9: end TrainerScientistMarc: - trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, .Script + trainer SCIENTIST, MARC, EVENT_BEAT_SCIENTIST_MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 99815f819..89538265b 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -56,7 +56,7 @@ RadioTowerMeowth: end TrainerGruntM10: - trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, GRUNTM_10, GruntM10SeenText, GruntM10BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_10, EVENT_BEAT_ROCKET_GRUNTM_10, GruntM10SeenText, GruntM10BeatenText, 0, .Script .Script: end_if_just_battled @@ -67,7 +67,7 @@ TrainerGruntM10: end TrainerExecutivem2: - trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, EXECUTIVEM_2, Executivem2SeenText, Executivem2BeatenText, 0, .Script + trainer EXECUTIVEM, EXECUTIVEM_2, EVENT_BEAT_ROCKET_EXECUTIVEM_2, Executivem2SeenText, Executivem2BeatenText, 0, .Script .Script: end_if_just_battled @@ -78,7 +78,7 @@ TrainerExecutivem2: end TrainerGruntF4: - trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, GRUNTF_4, GruntF4SeenText, GruntF4BeatenText, 0, .Script + trainer GRUNTF, GRUNTF_4, EVENT_BEAT_ROCKET_GRUNTF_4, GruntF4SeenText, GruntF4BeatenText, 0, .Script .Script: end_if_just_battled @@ -89,7 +89,7 @@ TrainerGruntF4: end TrainerScientistRich: - trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, .Script + trainer SCIENTIST, RICH, EVENT_BEAT_SCIENTIST_RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index fe9f38792..5d452c157 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -68,7 +68,7 @@ Director: end TrainerExecutivef1: - trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, EXECUTIVEF_1, Executivef1SeenText, Executivef1BeatenText, 0, .Script + trainer EXECUTIVEF, EXECUTIVEF_1, EVENT_BEAT_ROCKET_EXECUTIVEF_1, Executivef1SeenText, Executivef1BeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route1.asm b/maps/Route1.asm index 8be70d4d6..09c9cc395 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -11,7 +11,7 @@ Route1_MapScripts: db 0 TrainerSchoolboyDanny: - trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, .Script + trainer SCHOOLBOY, DANNY, EVENT_BEAT_SCHOOLBOY_DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, .Script .Script: end_if_just_battled @@ -22,7 +22,7 @@ TrainerSchoolboyDanny: end TrainerCooltrainerfQuinn: - trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, .Script + trainer COOLTRAINERF, QUINN, EVENT_BEAT_COOLTRAINERF_QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route10South.asm b/maps/Route10South.asm index a03a5d485..1a4ec1960 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -10,7 +10,7 @@ Route10South_MapScripts: db 0 TrainerHikerJim: - trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, 0, .Script + trainer HIKER, JIM, EVENT_BEAT_HIKER_JIM, HikerJimSeenText, HikerJimBeatenText, 0, .Script .Script: end_if_just_battled @@ -21,7 +21,7 @@ TrainerHikerJim: end TrainerPokefanmRobert: - trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, .Script + trainer POKEFANM, ROBERT, EVENT_BEAT_POKEFANM_ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route11.asm b/maps/Route11.asm index af83ce56c..7febe3423 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -13,7 +13,7 @@ Route11_MapScripts: db 0 TrainerYoungsterOwen: - trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, .Script + trainer YOUNGSTER, OWEN, EVENT_BEAT_YOUNGSTER_OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, .Script .Script: end_if_just_battled @@ -24,7 +24,7 @@ TrainerYoungsterOwen: end TrainerYoungsterJason: - trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, .Script + trainer YOUNGSTER, JASON, EVENT_BEAT_YOUNGSTER_JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, .Script .Script: end_if_just_battled @@ -35,7 +35,7 @@ TrainerYoungsterJason: end TrainerPsychicHerman: - trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, .Script + trainer PSYCHIC_T, HERMAN, EVENT_BEAT_PSYCHIC_HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, .Script .Script: end_if_just_battled @@ -46,7 +46,7 @@ TrainerPsychicHerman: end TrainerPsychicFidel: - trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, .Script + trainer PSYCHIC_T, FIDEL, EVENT_BEAT_PSYCHIC_FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route12.asm b/maps/Route12.asm index 0d3dedca7..0a5700f09 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -14,7 +14,7 @@ Route12_MapScripts: db 0 TrainerFisherKyle: - trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, .Script + trainer FISHER, KYLE, EVENT_BEAT_FISHER_KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, .Script .Script: end_if_just_battled @@ -25,7 +25,7 @@ TrainerFisherKyle: end TrainerFisherMartin: - trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, .Script + trainer FISHER, MARTIN, EVENT_BEAT_FISHER_MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, .Script .Script: end_if_just_battled @@ -36,7 +36,7 @@ TrainerFisherMartin: end TrainerFisherStephen: - trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, .Script + trainer FISHER, STEPHEN, EVENT_BEAT_FISHER_STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, .Script .Script: end_if_just_battled @@ -47,7 +47,7 @@ TrainerFisherStephen: end TrainerFisherBarney: - trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, .Script + trainer FISHER, BARNEY, EVENT_BEAT_FISHER_BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route13.asm b/maps/Route13.asm index ae06e1051..c10063908 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -13,7 +13,7 @@ Route13_MapScripts: db 0 TrainerPokefanmAlex: - trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, .Script + trainer POKEFANM, ALEX, EVENT_BEAT_POKEFANM_ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, .Script .Script: end_if_just_battled @@ -24,7 +24,7 @@ TrainerPokefanmAlex: end TrainerPokefanmJoshua: - trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, .Script + trainer POKEFANM, JOSHUA, EVENT_BEAT_POKEFANM_JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, .Script .Script: end_if_just_battled @@ -35,7 +35,7 @@ TrainerPokefanmJoshua: end TrainerBirdKeeperPerry: - trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, BirdKeeperPerrySeenText, BirdKeeperPerryBeatenText, 0, .Script + trainer BIRD_KEEPER, PERRY, EVENT_BEAT_BIRD_KEEPER_PERRY, BirdKeeperPerrySeenText, BirdKeeperPerryBeatenText, 0, .Script .Script: end_if_just_battled @@ -46,7 +46,7 @@ TrainerBirdKeeperPerry: end TrainerBirdKeeperBret: - trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, BirdKeeperBretSeenText, BirdKeeperBretBeatenText, 0, .Script + trainer BIRD_KEEPER, BRET, EVENT_BEAT_BIRD_KEEPER_BRET, BirdKeeperBretSeenText, BirdKeeperBretBeatenText, 0, .Script .Script: end_if_just_battled @@ -57,7 +57,7 @@ TrainerBirdKeeperBret: end TrainerHikerKenny: - trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, .Script + trainer HIKER, KENNY, EVENT_BEAT_HIKER_KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route14.asm b/maps/Route14.asm index 3f5a58357..4dc203a4a 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -20,7 +20,7 @@ Kim: end TrainerPokefanmCarter: - trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, .Script + trainer POKEFANM, CARTER, EVENT_BEAT_POKEFANM_CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, .Script .Script: end_if_just_battled @@ -31,7 +31,7 @@ TrainerPokefanmCarter: end TrainerBirdKeeperRoy: - trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, BirdKeeperRoySeenText, BirdKeeperRoyBeatenText, 0, .Script + trainer BIRD_KEEPER, ROY, EVENT_BEAT_BIRD_KEEPER_ROY, BirdKeeperRoySeenText, BirdKeeperRoyBeatenText, 0, .Script .Script: end_if_just_battled @@ -42,7 +42,7 @@ TrainerBirdKeeperRoy: end TrainerPokefanmTrevor: - trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, .Script + trainer POKEFANM, TREVOR, EVENT_BEAT_POKEFANM_TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route15.asm b/maps/Route15.asm index 58fe79c9b..8127f60a0 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -15,7 +15,7 @@ Route15_MapScripts: db 0 TrainerTeacherColette: - trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, .Script + trainer TEACHER, COLETTE, EVENT_BEAT_TEACHER_COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, .Script .Script: end_if_just_battled @@ -26,7 +26,7 @@ TrainerTeacherColette: end TrainerTeacherHillary: - trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, .Script + trainer TEACHER, HILLARY, EVENT_BEAT_TEACHER_HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, .Script .Script: end_if_just_battled @@ -37,7 +37,7 @@ TrainerTeacherHillary: end TrainerSchoolboyKipp: - trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, .Script + trainer SCHOOLBOY, KIPP, EVENT_BEAT_SCHOOLBOY_KIP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, .Script .Script: end_if_just_battled @@ -48,7 +48,7 @@ TrainerSchoolboyKipp: end TrainerSchoolboyTommy: - trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, .Script + trainer SCHOOLBOY, TOMMY, EVENT_BEAT_SCHOOLBOY_TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, .Script .Script: end_if_just_battled @@ -59,7 +59,7 @@ TrainerSchoolboyTommy: end TrainerSchoolboyJohnny: - trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, .Script + trainer SCHOOLBOY, JOHNNY, EVENT_BEAT_SCHOOLBOY_JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, .Script .Script: end_if_just_battled @@ -70,7 +70,7 @@ TrainerSchoolboyJohnny: end TrainerSchoolboyBilly: - trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, .Script + trainer SCHOOLBOY, BILLY, EVENT_BEAT_SCHOOLBOY_BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route17.asm b/maps/Route17.asm index aeaf26f10..ff012b40a 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -18,7 +18,7 @@ Route17_MapScripts: return TrainerBikerCharles: - trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, .Script + trainer BIKER, CHARLES, EVENT_BEAT_BIKER_CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, .Script .Script: end_if_just_battled @@ -29,7 +29,7 @@ TrainerBikerCharles: end TrainerBikerRiley: - trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, .Script + trainer BIKER, RILEY, EVENT_BEAT_BIKER_RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, .Script .Script: end_if_just_battled @@ -40,7 +40,7 @@ TrainerBikerRiley: end TrainerBikerJoel: - trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, .Script + trainer BIKER, JOEL, EVENT_BEAT_BIKER_JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, .Script .Script: end_if_just_battled @@ -51,7 +51,7 @@ TrainerBikerJoel: end TrainerBikerGlenn: - trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, .Script + trainer BIKER, GLENN, EVENT_BEAT_BIKER_GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route18.asm b/maps/Route18.asm index 8cff37f09..3980a7569 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -10,7 +10,7 @@ Route18_MapScripts: db 0 TrainerBirdKeeperBoris: - trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, BirdKeeperBorisSeenText, BirdKeeperBorisBeatenText, 0, .Script + trainer BIRD_KEEPER, BORIS, EVENT_BEAT_BIRD_KEEPER_BORIS, BirdKeeperBorisSeenText, BirdKeeperBorisBeatenText, 0, .Script .Script: end_if_just_battled @@ -21,7 +21,7 @@ TrainerBirdKeeperBoris: end TrainerBirdKeeperBob: - trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, BirdKeeperBobSeenText, BirdKeeperBobBeatenText, 0, .Script + trainer BIRD_KEEPER, BOB, EVENT_BEAT_BIRD_KEEPER_BOB, BirdKeeperBobSeenText, BirdKeeperBobBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route19.asm b/maps/Route19.asm index 8767a8b3b..1d1680575 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -27,7 +27,7 @@ Route19_MapScripts: return TrainerSwimmerfDawn: - trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, .Script + trainer SWIMMERF, DAWN, EVENT_BEAT_SWIMMERF_DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, .Script .Script: end_if_just_battled @@ -38,7 +38,7 @@ TrainerSwimmerfDawn: end TrainerSwimmermHarold: - trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, .Script + trainer SWIMMERM, HAROLD, EVENT_BEAT_SWIMMERM_HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, .Script .Script: end_if_just_battled @@ -49,7 +49,7 @@ TrainerSwimmermHarold: end TrainerSwimmermJerome: - trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, .Script + trainer SWIMMERM, JEROME, EVENT_BEAT_SWIMMERM_JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, .Script .Script: end_if_just_battled @@ -60,7 +60,7 @@ TrainerSwimmermJerome: end TrainerSwimmermTucker: - trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, .Script + trainer SWIMMERM, TUCKER, EVENT_BEAT_SWIMMERM_TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route2.asm b/maps/Route2.asm index 084dff802..28aa2373a 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -16,7 +16,7 @@ Route2_MapScripts: db 0 TrainerBugCatcherRob: - trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, BugCatcherRobSeenText, BugCatcherRobBeatenText, 0, .Script + trainer BUG_CATCHER, ROB, EVENT_BEAT_BUG_CATCHER_ROB, BugCatcherRobSeenText, BugCatcherRobBeatenText, 0, .Script .Script: end_if_just_battled @@ -27,7 +27,7 @@ TrainerBugCatcherRob: end TrainerBugCatcherEd: - trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, BugCatcherEdSeenText, BugCatcherEdBeatenText, 0, .Script + trainer BUG_CATCHER, ED, EVENT_BEAT_BUG_CATCHER_ED, BugCatcherEdSeenText, BugCatcherEdBeatenText, 0, .Script .Script: end_if_just_battled @@ -38,7 +38,7 @@ TrainerBugCatcherEd: end TrainerBugCatcherDoug: - trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, BugCatcherDougSeenText, BugCatcherDougBeatenText, 0, .Script + trainer BUG_CATCHER, DOUG, EVENT_BEAT_BUG_CATCHER_DOUG, BugCatcherDougSeenText, BugCatcherDougBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route20.asm b/maps/Route20.asm index e7a776b2b..18ab5b200 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -16,7 +16,7 @@ Route20_MapScripts: return TrainerSwimmerfNicole: - trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, .Script + trainer SWIMMERF, NICOLE, EVENT_BEAT_SWIMMERF_NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, .Script .Script: end_if_just_battled @@ -27,7 +27,7 @@ TrainerSwimmerfNicole: end TrainerSwimmerfLori: - trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, .Script + trainer SWIMMERF, LORI, EVENT_BEAT_SWIMMERF_LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, .Script .Script: end_if_just_battled @@ -38,7 +38,7 @@ TrainerSwimmerfLori: end TrainerSwimmermCameron: - trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, .Script + trainer SWIMMERM, CAMERON, EVENT_BEAT_SWIMMERM_CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route21.asm b/maps/Route21.asm index e6b4eb564..e44d47b96 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -11,7 +11,7 @@ Route21_MapScripts: db 0 TrainerSwimmermSeth: - trainer EVENT_BEAT_SWIMMERM_SETH, SWIMMERM, SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, .Script + trainer SWIMMERM, SETH, EVENT_BEAT_SWIMMERM_SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, .Script .Script: end_if_just_battled @@ -22,7 +22,7 @@ TrainerSwimmermSeth: end TrainerSwimmerfNikki: - trainer EVENT_BEAT_SWIMMERF_NIKKI, SWIMMERF, NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, .Script + trainer SWIMMERF, NIKKI, EVENT_BEAT_SWIMMERF_NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, .Script .Script: end_if_just_battled @@ -33,7 +33,7 @@ TrainerSwimmerfNikki: end TrainerFisherArnold: - trainer EVENT_BEAT_FISHER_ARNOLD, FISHER, ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, .Script + trainer FISHER, ARNOLD, EVENT_BEAT_FISHER_ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route25.asm b/maps/Route25.asm index e6ca7eb77..7d412cdc4 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -79,7 +79,7 @@ UnknownScript_0x19eee0: end TrainerSchoolboyDudley: - trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, .Script + trainer SCHOOLBOY, DUDLEY, EVENT_BEAT_SCHOOLBOY_DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, .Script .Script: end_if_just_battled @@ -90,7 +90,7 @@ TrainerSchoolboyDudley: end TrainerLassEllen: - trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, .Script + trainer LASS, ELLEN, EVENT_BEAT_LASS_ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, .Script .Script: end_if_just_battled @@ -101,7 +101,7 @@ TrainerLassEllen: end TrainerSchoolboyJoe: - trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, .Script + trainer SCHOOLBOY, JOE, EVENT_BEAT_SCHOOLBOY_JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, .Script .Script: end_if_just_battled @@ -112,7 +112,7 @@ TrainerSchoolboyJoe: end TrainerLassLaura: - trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, 0, .Script + trainer LASS, LAURA, EVENT_BEAT_LASS_LAURA, LassLauraSeenText, LassLauraBeatenText, 0, .Script .Script: end_if_just_battled @@ -123,7 +123,7 @@ TrainerLassLaura: end TrainerCamperLloyd: - trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, .Script + trainer CAMPER, LLOYD, EVENT_BEAT_CAMPER_LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, .Script .Script: end_if_just_battled @@ -134,7 +134,7 @@ TrainerCamperLloyd: end TrainerLassShannon: - trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, .Script + trainer LASS, SHANNON, EVENT_BEAT_LASS_SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, .Script .Script: end_if_just_battled @@ -145,7 +145,7 @@ TrainerLassShannon: end TrainerSupernerdPat: - trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, .Script + trainer SUPER_NERD, PAT, EVENT_BEAT_SUPER_NERD_PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route26.asm b/maps/Route26.asm index 1e3bbf59f..6e8d5e5de 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -16,7 +16,7 @@ Route26_MapScripts: db 0 TrainerCooltrainermJake: - trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, .Script + trainer COOLTRAINERM, JAKE, EVENT_BEAT_COOLTRAINERM_JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, .Script .Script: end_if_just_battled @@ -27,7 +27,7 @@ TrainerCooltrainermJake: end TrainerCooltrainermGaven3: - trainer EVENT_BEAT_COOLTRAINERM_GAVEN, COOLTRAINERM, GAVEN3, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, 0, .Script + trainer COOLTRAINERM, GAVEN3, EVENT_BEAT_COOLTRAINERM_GAVEN, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN @@ -120,7 +120,7 @@ UnknownScript_0x1a4dd7: end TrainerCooltrainerfJoyce: - trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, .Script + trainer COOLTRAINERF, JOYCE, EVENT_BEAT_COOLTRAINERF_JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, .Script .Script: end_if_just_battled @@ -131,7 +131,7 @@ TrainerCooltrainerfJoyce: end TrainerCooltrainerfBeth1: - trainer EVENT_BEAT_COOLTRAINERF_BETH, COOLTRAINERF, BETH1, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, 0, .Script + trainer COOLTRAINERF, BETH1, EVENT_BEAT_COOLTRAINERF_BETH, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_BETH @@ -224,7 +224,7 @@ UnknownScript_0x1a4e93: end TrainerPsychicRichard: - trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, .Script + trainer PSYCHIC_T, RICHARD, EVENT_BEAT_PSYCHIC_RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, .Script .Script: end_if_just_battled @@ -235,7 +235,7 @@ TrainerPsychicRichard: end TrainerFisherScott: - trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, .Script + trainer FISHER, SCOTT, EVENT_BEAT_FISHER_SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route27.asm b/maps/Route27.asm index 513466a18..2c1388ffa 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -49,7 +49,7 @@ Route27FisherScript: jumptextfaceplayer Route27FisherText TrainerPsychicGilbert: - trainer EVENT_BEAT_PSYCHIC_GILBERT, PSYCHIC_T, GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, .Script + trainer PSYCHIC_T, GILBERT, EVENT_BEAT_PSYCHIC_GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, .Script .Script: end_if_just_battled @@ -60,7 +60,7 @@ TrainerPsychicGilbert: end TrainerBirdKeeperJose2: - trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, BirdKeeperJose2SeenText, BirdKeeperJose2BeatenText, 0, .Script + trainer BIRD_KEEPER, JOSE2, EVENT_BEAT_BIRD_KEEPER_JOSE2, BirdKeeperJose2SeenText, BirdKeeperJose2BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE @@ -173,7 +173,7 @@ UnknownScript_0x1a0977: end TrainerCooltrainermBlake: - trainer EVENT_BEAT_COOLTRAINERM_BLAKE, COOLTRAINERM, BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, .Script + trainer COOLTRAINERM, BLAKE, EVENT_BEAT_COOLTRAINERM_BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, .Script .Script: end_if_just_battled @@ -184,7 +184,7 @@ TrainerCooltrainermBlake: end TrainerCooltrainermBrian: - trainer EVENT_BEAT_COOLTRAINERM_BRIAN, COOLTRAINERM, BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, .Script + trainer COOLTRAINERM, BRIAN, EVENT_BEAT_COOLTRAINERM_BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, .Script .Script: end_if_just_battled @@ -195,7 +195,7 @@ TrainerCooltrainermBrian: end TrainerCooltrainerfReena: - trainer EVENT_BEAT_COOLTRAINERF_REENA, COOLTRAINERF, REENA1, CooltrainerfReena1SeenText, CooltrainerfReena1BeatenText, 0, .Script + trainer COOLTRAINERF, REENA1, EVENT_BEAT_COOLTRAINERF_REENA, CooltrainerfReena1SeenText, CooltrainerfReena1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_REENA @@ -288,7 +288,7 @@ UnknownScript_0x1a0a47: end TrainerCooltrainerfMegan: - trainer EVENT_BEAT_COOLTRAINERF_MEGAN, COOLTRAINERF, MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, .Script + trainer COOLTRAINERF, MEGAN, EVENT_BEAT_COOLTRAINERF_MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route3.asm b/maps/Route3.asm index 6ce01aeb1..aeb1e68df 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -12,7 +12,7 @@ Route3_MapScripts: db 0 TrainerFirebreatherOtis: - trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, .Script + trainer FIREBREATHER, OTIS, EVENT_BEAT_FIREBREATHER_OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, .Script .Script: end_if_just_battled @@ -23,7 +23,7 @@ TrainerFirebreatherOtis: end TrainerYoungsterWarren: - trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, .Script + trainer YOUNGSTER, WARREN, EVENT_BEAT_YOUNGSTER_WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, .Script .Script: end_if_just_battled @@ -34,7 +34,7 @@ TrainerYoungsterWarren: end TrainerYoungsterJimmy: - trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, .Script + trainer YOUNGSTER, JIMMY, EVENT_BEAT_YOUNGSTER_JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, .Script .Script: end_if_just_battled @@ -45,7 +45,7 @@ TrainerYoungsterJimmy: end TrainerFirebreatherBurt: - trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, .Script + trainer FIREBREATHER, BURT, EVENT_BEAT_FIREBREATHER_BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route30.asm b/maps/Route30.asm index c4276c3f9..f01aaa022 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -39,7 +39,7 @@ YoungsterJoey_ImportantBattleScript: end TrainerYoungsterJoey: - trainer EVENT_BEAT_YOUNGSTER_JOEY, YOUNGSTER, JOEY1, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, 0, .Script + trainer YOUNGSTER, JOEY1, EVENT_BEAT_YOUNGSTER_JOEY, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_YOUNGSTER_JOEY @@ -186,7 +186,7 @@ TrainerYoungsterJoey: end TrainerYoungsterMikey: - trainer EVENT_BEAT_YOUNGSTER_MIKEY, YOUNGSTER, MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, .Script + trainer YOUNGSTER, MIKEY, EVENT_BEAT_YOUNGSTER_MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, .Script .Script: end_if_just_battled @@ -197,7 +197,7 @@ TrainerYoungsterMikey: end TrainerBugCatcherDon: - trainer EVENT_BEAT_BUG_CATCHER_DON, BUG_CATCHER, DON, BugCatcherDonSeenText, BugCatcherDonBeatenText, 0, .Script + trainer BUG_CATCHER, DON, EVENT_BEAT_BUG_CATCHER_DON, BugCatcherDonSeenText, BugCatcherDonBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route31.asm b/maps/Route31.asm index f8ea93d2a..60b594d32 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -25,7 +25,7 @@ Route31_MapScripts: return TrainerBugCatcherWade1: - trainer EVENT_BEAT_BUG_CATCHER_WADE, BUG_CATCHER, WADE1, BugCatcherWade1SeenText, BugCatcherWade1BeatenText, 0, .Script + trainer BUG_CATCHER, WADE1, EVENT_BEAT_BUG_CATCHER_WADE, BugCatcherWade1SeenText, BugCatcherWade1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_WADE diff --git a/maps/Route32.asm b/maps/Route32.asm index 451d719aa..7e4b8a24f 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -144,7 +144,7 @@ _OfferToSellSlowpokeTail: end TrainerCamperRoland: - trainer EVENT_BEAT_CAMPER_ROLAND, CAMPER, ROLAND, CamperRolandSeenText, CamperRolandBeatenText, 0, .Script + trainer CAMPER, ROLAND, EVENT_BEAT_CAMPER_ROLAND, CamperRolandSeenText, CamperRolandBeatenText, 0, .Script .Script: end_if_just_battled @@ -155,7 +155,7 @@ TrainerCamperRoland: end TrainerFisherJustin: - trainer EVENT_BEAT_FISHER_JUSTIN, FISHER, JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, 0, .Script + trainer FISHER, JUSTIN, EVENT_BEAT_FISHER_JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, 0, .Script .Script: end_if_just_battled @@ -166,7 +166,7 @@ TrainerFisherJustin: end TrainerFisherRalph1: - trainer EVENT_BEAT_FISHER_RALPH, FISHER, RALPH1, FisherRalph1SeenText, FisherRalph1BeatenText, 0, .Script + trainer FISHER, RALPH1, EVENT_BEAT_FISHER_RALPH, FisherRalph1SeenText, FisherRalph1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_FISHER_RALPH @@ -291,7 +291,7 @@ TrainerFisherRalph1: end TrainerFisherHenry: - trainer EVENT_BEAT_FISHER_HENRY, FISHER, HENRY, FisherHenrySeenText, FisherHenryBeatenText, 0, .Script + trainer FISHER, HENRY, EVENT_BEAT_FISHER_HENRY, FisherHenrySeenText, FisherHenryBeatenText, 0, .Script .Script: end_if_just_battled @@ -302,7 +302,7 @@ TrainerFisherHenry: end TrainerPicnickerLiz1: - trainer EVENT_BEAT_PICNICKER_LIZ, PICNICKER, LIZ1, PicnickerLiz1SeenText, PicnickerLiz1BeatenText, 0, .Script + trainer PICNICKER, LIZ1, EVENT_BEAT_PICNICKER_LIZ, PicnickerLiz1SeenText, PicnickerLiz1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_PICNICKER_LIZ @@ -419,7 +419,7 @@ TrainerPicnickerLiz1: end TrainerYoungsterAlbert: - trainer EVENT_BEAT_YOUNGSTER_ALBERT, YOUNGSTER, ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, 0, .Script + trainer YOUNGSTER, ALBERT, EVENT_BEAT_YOUNGSTER_ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, 0, .Script .Script: end_if_just_battled @@ -430,7 +430,7 @@ TrainerYoungsterAlbert: end TrainerYoungsterGordon: - trainer EVENT_BEAT_YOUNGSTER_GORDON, YOUNGSTER, GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, 0, .Script + trainer YOUNGSTER, GORDON, EVENT_BEAT_YOUNGSTER_GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, 0, .Script .Script: end_if_just_battled @@ -441,7 +441,7 @@ TrainerYoungsterGordon: end TrainerBirdKeeperPeter: - trainer EVENT_BEAT_BIRD_KEEPER_PETER, BIRD_KEEPER, PETER, BirdKeeperPeterSeenText, BirdKeeperPeterBeatenText, 0, .Script + trainer BIRD_KEEPER, PETER, EVENT_BEAT_BIRD_KEEPER_PETER, BirdKeeperPeterSeenText, BirdKeeperPeterBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route33.asm b/maps/Route33.asm index be2abbf4c..c506b4988 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -14,7 +14,7 @@ Route33LassScript: jumptextfaceplayer Route33LassText TrainerHikerAnthony: - trainer EVENT_BEAT_HIKER_ANTHONY, HIKER, ANTHONY2, HikerAnthony2SeenText, HikerAnthony2BeatenText, 0, .Script + trainer HIKER, ANTHONY2, EVENT_BEAT_HIKER_ANTHONY, HikerAnthony2SeenText, HikerAnthony2BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_HIKER_ANTHONY diff --git a/maps/Route34.asm b/maps/Route34.asm index 8d78baad4..aeb532ae9 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -88,7 +88,7 @@ DayCareMon2Script: end TrainerCamperTodd1: - trainer EVENT_BEAT_CAMPER_TODD, CAMPER, TODD1, CamperTodd1SeenText, CamperTodd1BeatenText, 0, .Script + trainer CAMPER, TODD1, EVENT_BEAT_CAMPER_TODD, CamperTodd1SeenText, CamperTodd1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_CAMPER_TODD @@ -213,7 +213,7 @@ TrainerCamperTodd1: end TrainerPicnickerGina1: - trainer EVENT_BEAT_PICNICKER_GINA, PICNICKER, GINA1, PicnickerGina1SeenText, PicnickerGina1BeatenText, 0, .Script + trainer PICNICKER, GINA1, EVENT_BEAT_PICNICKER_GINA, PicnickerGina1SeenText, PicnickerGina1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_PICNICKER_GINA @@ -382,7 +382,7 @@ OfficerKeithScript: end TrainerYoungsterSamuel: - trainer EVENT_BEAT_YOUNGSTER_SAMUEL, YOUNGSTER, SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, 0, .Script + trainer YOUNGSTER, SAMUEL, EVENT_BEAT_YOUNGSTER_SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, 0, .Script .Script: end_if_just_battled @@ -393,7 +393,7 @@ TrainerYoungsterSamuel: end TrainerYoungsterIan: - trainer EVENT_BEAT_YOUNGSTER_IAN, YOUNGSTER, IAN, YoungsterIanSeenText, YoungsterIanBeatenText, 0, .Script + trainer YOUNGSTER, IAN, EVENT_BEAT_YOUNGSTER_IAN, YoungsterIanSeenText, YoungsterIanBeatenText, 0, .Script .Script: end_if_just_battled @@ -404,7 +404,7 @@ TrainerYoungsterIan: end TrainerPokefanmBrandon: - trainer EVENT_BEAT_POKEFANM_BRANDON, POKEFANM, BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, 0, .Script + trainer POKEFANM, BRANDON, EVENT_BEAT_POKEFANM_BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, 0, .Script .Script: end_if_just_battled @@ -415,7 +415,7 @@ TrainerPokefanmBrandon: end TrainerCooltrainerfIrene: - trainer EVENT_BEAT_COOLTRAINERF_IRENE, COOLTRAINERF, IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, 0, .Script + trainer COOLTRAINERF, IRENE, EVENT_BEAT_COOLTRAINERF_IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, 0, .Script .Script: end_if_just_battled @@ -434,7 +434,7 @@ TrainerCooltrainerfIrene: end TrainerCooltrainerfJenn: - trainer EVENT_BEAT_COOLTRAINERF_JENN, COOLTRAINERF, JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, 0, .Script + trainer COOLTRAINERF, JENN, EVENT_BEAT_COOLTRAINERF_JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, 0, .Script .Script: end_if_just_battled @@ -453,7 +453,7 @@ TrainerCooltrainerfJenn: end TrainerCooltrainerfKate: - trainer EVENT_BEAT_COOLTRAINERF_KATE, COOLTRAINERF, KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, 0, .Script + trainer COOLTRAINERF, KATE, EVENT_BEAT_COOLTRAINERF_KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route35.asm b/maps/Route35.asm index 467fb6c5a..e19c7ff2d 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -19,7 +19,7 @@ Route35_MapScripts: db 0 TrainerBirdKeeperBryan: - trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, BirdKeeperBryanSeenText, BirdKeeperBryanBeatenText, 0, .Script + trainer BIRD_KEEPER, BRYAN, EVENT_BEAT_BIRD_KEEPER_BRYAN, BirdKeeperBryanSeenText, BirdKeeperBryanBeatenText, 0, .Script .Script: end_if_just_battled @@ -30,7 +30,7 @@ TrainerBirdKeeperBryan: end TrainerJugglerIrwin: - trainer EVENT_BEAT_JUGGLER_IRWIN, JUGGLER, IRWIN1, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, 0, .Script + trainer JUGGLER, IRWIN1, EVENT_BEAT_JUGGLER_IRWIN, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_JUGGLER_IRWIN @@ -85,7 +85,7 @@ UnknownScript_0x19c91b: end TrainerCamperIvan: - trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, .Script + trainer CAMPER, IVAN, EVENT_BEAT_CAMPER_IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, .Script .Script: end_if_just_battled @@ -96,7 +96,7 @@ TrainerCamperIvan: end TrainerCamperElliot: - trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, .Script + trainer CAMPER, ELLIOT, EVENT_BEAT_CAMPER_ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, .Script .Script: end_if_just_battled @@ -107,7 +107,7 @@ TrainerCamperElliot: end TrainerPicnickerBrooke: - trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, .Script + trainer PICNICKER, BROOKE, EVENT_BEAT_PICNICKER_BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, .Script .Script: end_if_just_battled @@ -118,7 +118,7 @@ TrainerPicnickerBrooke: end TrainerPicnickerKim: - trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, .Script + trainer PICNICKER, KIM, EVENT_BEAT_PICNICKER_KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, .Script .Script: end_if_just_battled @@ -129,7 +129,7 @@ TrainerPicnickerKim: end TrainerBugCatcherArnie1: - trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, BugCatcherArnie1SeenText, BugCatcherArnie1BeatenText, 0, .Script + trainer BUG_CATCHER, ARNIE1, EVENT_BEAT_BUG_CATCHER_ARNIE, BugCatcherArnie1SeenText, BugCatcherArnie1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE @@ -226,7 +226,7 @@ UnknownScript_0x19ca2f: end TrainerFirebreatherWalt: - trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, .Script + trainer FIREBREATHER, WALT, EVENT_BEAT_FIREBREATHER_WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route36.asm b/maps/Route36.asm index fceef3306..cb3cedfed 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -167,7 +167,7 @@ LassScript_0x1940e0: end TrainerSchoolboyAlan1: - trainer EVENT_BEAT_SCHOOLBOY_ALAN, SCHOOLBOY, ALAN1, SchoolboyAlan1SeenText, SchoolboyAlan1BeatenText, 0, .Script + trainer SCHOOLBOY, ALAN1, EVENT_BEAT_SCHOOLBOY_ALAN, SchoolboyAlan1SeenText, SchoolboyAlan1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_ALAN @@ -305,7 +305,7 @@ TrainerSchoolboyAlan1: end TrainerPsychicMark: - trainer EVENT_BEAT_PSYCHIC_MARK, PSYCHIC_T, MARK, PsychicMarkSeenText, PsychicMarkBeatenText, 0, .Script + trainer PSYCHIC_T, MARK, EVENT_BEAT_PSYCHIC_MARK, PsychicMarkSeenText, PsychicMarkBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route37.asm b/maps/Route37.asm index 442e76ab7..09af64530 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -26,7 +26,7 @@ Route37_MapScripts: return TrainerTwinsAnnandanne1: - trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, .Script + trainer TWINS, ANNANDANNE1, EVENT_BEAT_TWINS_ANN_AND_ANNE, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, .Script .Script: end_if_just_battled @@ -37,7 +37,7 @@ TrainerTwinsAnnandanne1: end TrainerTwinsAnnandanne2: - trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, .Script + trainer TWINS, ANNANDANNE2, EVENT_BEAT_TWINS_ANN_AND_ANNE, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, .Script .Script: end_if_just_battled @@ -48,7 +48,7 @@ TrainerTwinsAnnandanne2: end TrainerPsychicGreg: - trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, .Script + trainer PSYCHIC_T, GREG, EVENT_BEAT_PSYCHIC_GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route38.asm b/maps/Route38.asm index c228429ba..6272d3a51 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -15,7 +15,7 @@ Route38_MapScripts: db 0 TrainerBirdKeeperToby: - trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, BirdKeeperTobySeenText, BirdKeeperTobyBeatenText, 0, .Script + trainer BIRD_KEEPER, TOBY, EVENT_BEAT_BIRD_KEEPER_TOBY, BirdKeeperTobySeenText, BirdKeeperTobyBeatenText, 0, .Script .Script end_if_just_battled @@ -26,7 +26,7 @@ TrainerBirdKeeperToby: end TrainerSailorHarry: - trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .Script + trainer SAILOR, HARRY, EVENT_BEAT_SAILOR_HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .Script .Script end_if_just_battled @@ -37,7 +37,7 @@ TrainerSailorHarry: end TrainerLassDana1: - trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, 0, .Script + trainer LASS, DANA1, EVENT_BEAT_LASS_DANA, LassDana1SeenText, LassDana1BeatenText, 0, .Script .Script writecode VAR_CALLERID, PHONE_LASS_DANA @@ -175,7 +175,7 @@ TrainerLassDana1: end TrainerSchoolboyChad1: - trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .Script + trainer SCHOOLBOY, CHAD1, EVENT_BEAT_SCHOOLBOY_CHAD, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .Script .Script writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD @@ -292,7 +292,7 @@ TrainerSchoolboyChad1: end TrainerBeautyValerie: - trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .Script + trainer BEAUTY, VALERIE, EVENT_BEAT_BEAUTY_VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .Script .Script end_if_just_battled @@ -303,7 +303,7 @@ TrainerBeautyValerie: end TrainerBeautyOlivia: - trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .Script + trainer BEAUTY, OLIVIA, EVENT_BEAT_BEAUTY_OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .Script .Script end_if_just_battled diff --git a/maps/Route39.asm b/maps/Route39.asm index bf4ce814c..d48be62e2 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -26,7 +26,7 @@ Route39Miltank: end TrainerPokefanmDerek1: - trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerek1SeenText, PokefanmDerek1BeatenText, 0, .Script + trainer POKEFANM, DEREK1, EVENT_BEAT_POKEFANM_DEREK, PokefanmDerek1SeenText, PokefanmDerek1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_POKEFANM_DEREK @@ -105,7 +105,7 @@ PackIsFull: end TrainerPokefanfRuth: - trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, .Script + trainer POKEFANF, RUTH, EVENT_BEAT_POKEFANF_RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, .Script .Script: end_if_just_battled @@ -116,7 +116,7 @@ TrainerPokefanfRuth: end TrainerSailorEugene: - trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, .Script + trainer SAILOR, EUGENE, EVENT_BEAT_SAILOR_EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, .Script .Script: end_if_just_battled @@ -127,7 +127,7 @@ TrainerSailorEugene: end TrainerPsychicNorman: - trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, .Script + trainer PSYCHIC_T, NORMAN, EVENT_BEAT_PSYCHIC_NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route4.asm b/maps/Route4.asm index b3dcede9d..1615a9652 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -12,7 +12,7 @@ Route4_MapScripts: db 0 TrainerBirdKeeperHank: - trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, BirdKeeperHankSeenText, BirdKeeperHankBeatenText, 0, .Script + trainer BIRD_KEEPER, HANK, EVENT_BEAT_BIRD_KEEPER_HANK, BirdKeeperHankSeenText, BirdKeeperHankBeatenText, 0, .Script .Script: end_if_just_battled @@ -23,7 +23,7 @@ TrainerBirdKeeperHank: end TrainerPicnickerHope: - trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, .Script + trainer PICNICKER, HOPE, EVENT_BEAT_PICNICKER_HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, .Script .Script: end_if_just_battled @@ -34,7 +34,7 @@ TrainerPicnickerHope: end TrainerPicnickerSharon: - trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, .Script + trainer PICNICKER, SHARON, EVENT_BEAT_PICNICKER_SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route40.asm b/maps/Route40.asm index c9e052b52..6f1c2fef5 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -32,7 +32,7 @@ Route40_MapScripts: return TrainerSwimmerfElaine: - trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, .Script + trainer SWIMMERF, ELAINE, EVENT_BEAT_SWIMMERF_ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, .Script .Script: end_if_just_battled @@ -43,7 +43,7 @@ TrainerSwimmerfElaine: end TrainerSwimmerfPaula: - trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, .Script + trainer SWIMMERF, PAULA, EVENT_BEAT_SWIMMERF_PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, .Script .Script: end_if_just_battled @@ -54,7 +54,7 @@ TrainerSwimmerfPaula: end TrainerSwimmermSimon: - trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, .Script + trainer SWIMMERM, SIMON, EVENT_BEAT_SWIMMERM_SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, .Script .Script: end_if_just_battled @@ -65,7 +65,7 @@ TrainerSwimmermSimon: end TrainerSwimmermRandall: - trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, .Script + trainer SWIMMERM, RANDALL, EVENT_BEAT_SWIMMERM_RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route41.asm b/maps/Route41.asm index 20340e7cd..dbd625c32 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -18,7 +18,7 @@ Route41_MapScripts: db 0 TrainerSwimmerfKaylee: - trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, .Script + trainer SWIMMERF, KAYLEE, EVENT_BEAT_SWIMMERF_KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, .Script .Script: end_if_just_battled @@ -29,7 +29,7 @@ TrainerSwimmerfKaylee: end TrainerSwimmerfSusie: - trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, .Script + trainer SWIMMERF, SUSIE, EVENT_BEAT_SWIMMERF_SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, .Script .Script: end_if_just_battled @@ -40,7 +40,7 @@ TrainerSwimmerfSusie: end TrainerSwimmerfDenise: - trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, .Script + trainer SWIMMERF, DENISE, EVENT_BEAT_SWIMMERF_DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, .Script .Script: end_if_just_battled @@ -51,7 +51,7 @@ TrainerSwimmerfDenise: end TrainerSwimmerfKara: - trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, .Script + trainer SWIMMERF, KARA, EVENT_BEAT_SWIMMERF_KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, .Script .Script: end_if_just_battled @@ -62,7 +62,7 @@ TrainerSwimmerfKara: end TrainerSwimmerfWendy: - trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, .Script + trainer SWIMMERF, WENDY, EVENT_BEAT_SWIMMERF_WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, .Script .Script: end_if_just_battled @@ -73,7 +73,7 @@ TrainerSwimmerfWendy: end TrainerSwimmermCharlie: - trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, .Script + trainer SWIMMERM, CHARLIE, EVENT_BEAT_SWIMMERM_CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, .Script .Script: end_if_just_battled @@ -84,7 +84,7 @@ TrainerSwimmermCharlie: end TrainerSwimmermGeorge: - trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, .Script + trainer SWIMMERM, GEORGE, EVENT_BEAT_SWIMMERM_GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, .Script .Script: end_if_just_battled @@ -95,7 +95,7 @@ TrainerSwimmermGeorge: end TrainerSwimmermBerke: - trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, .Script + trainer SWIMMERM, BERKE, EVENT_BEAT_SWIMMERM_BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, .Script .Script: end_if_just_battled @@ -106,7 +106,7 @@ TrainerSwimmermBerke: end TrainerSwimmermKirk: - trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, .Script + trainer SWIMMERM, KIRK, EVENT_BEAT_SWIMMERM_KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, .Script .Script: end_if_just_battled @@ -117,7 +117,7 @@ TrainerSwimmermKirk: end TrainerSwimmermMathew: - trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, .Script + trainer SWIMMERM, MATHEW, EVENT_BEAT_SWIMMERM_MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route42.asm b/maps/Route42.asm index c9069e7a6..04a4fa64d 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -37,7 +37,7 @@ Route42SuicuneScript: end TrainerFisherTully1: - trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTully1SeenText, FisherTully1BeatenText, 0, .Script + trainer FISHER, TULLY1, EVENT_BEAT_FISHER_TULLY, FisherTully1SeenText, FisherTully1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_FISHER_TULLY @@ -163,7 +163,7 @@ UnknownScript_0x1a9311: end TrainerPokemaniacShane: - trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, .Script + trainer POKEMANIAC, SHANE, EVENT_BEAT_POKEMANIAC_SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, .Script .Script: end_if_just_battled @@ -174,7 +174,7 @@ TrainerPokemaniacShane: end TrainerHikerBenjamin: - trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, .Script + trainer HIKER, BENJAMIN, EVENT_BEAT_HIKER_BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route43.asm b/maps/Route43.asm index 890acfaf8..404211f17 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -27,7 +27,7 @@ Route43_MapScripts: return TrainerCamperSpencer: - trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, .Script + trainer CAMPER, SPENCER, EVENT_BEAT_CAMPER_SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, .Script .Script: end_if_just_battled @@ -38,7 +38,7 @@ TrainerCamperSpencer: end TrainerPokemaniacBen: - trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, .Script + trainer POKEMANIAC, BEN, EVENT_BEAT_POKEMANIAC_BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, .Script .Script: end_if_just_battled @@ -49,7 +49,7 @@ TrainerPokemaniacBen: end TrainerPokemaniacBrent1: - trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrent1SeenText, PokemaniacBrent1BeatenText, 0, .Script + trainer POKEMANIAC, BRENT1, EVENT_BEAT_POKEMANIAC_BRENT, PokemaniacBrent1SeenText, PokemaniacBrent1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT @@ -154,7 +154,7 @@ UnknownScript_0x19d144: end TrainerPokemaniacRon: - trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, .Script + trainer POKEMANIAC, RON, EVENT_BEAT_POKEMANIAC_RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, .Script .Script: end_if_just_battled @@ -165,7 +165,7 @@ TrainerPokemaniacRon: end TrainerFisherMarvin: - trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, .Script + trainer FISHER, MARVIN, EVENT_BEAT_FISHER_MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, .Script .Script: end_if_just_battled @@ -176,7 +176,7 @@ TrainerFisherMarvin: end TrainerPicnickerTiffany3: - trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffany3SeenText, PicnickerTiffany3BeatenText, 0, .Script + trainer PICNICKER, TIFFANY3, EVENT_BEAT_PICNICKER_TIFFANY, PicnickerTiffany3SeenText, PicnickerTiffany3BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY diff --git a/maps/Route44.asm b/maps/Route44.asm index 1995c4cb2..58bc46bbf 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -19,7 +19,7 @@ Route44_MapScripts: db 0 TrainerBirdKeeperVance1: - trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, BirdKeeperVance1SeenText, BirdKeeperVance1BeatenText, 0, .Script + trainer BIRD_KEEPER, VANCE1, EVENT_BEAT_BIRD_KEEPER_VANCE, BirdKeeperVance1SeenText, BirdKeeperVance1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE @@ -150,7 +150,7 @@ UnknownScript_0x19d90a: end TrainerPsychicPhil: - trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, .Script + trainer PSYCHIC_T, PHIL, EVENT_BEAT_PSYCHIC_PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, .Script .Script: end_if_just_battled @@ -161,7 +161,7 @@ TrainerPsychicPhil: end TrainerFisherWilton1: - trainer EVENT_BEAT_FISHER_WILTON, FISHER, WILTON1, FisherWilton1SeenText, FisherWilton1BeatenText, 0, .Script + trainer FISHER, WILTON1, EVENT_BEAT_FISHER_WILTON, FisherWilton1SeenText, FisherWilton1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_FISHER_WILTON @@ -256,7 +256,7 @@ UnknownScript_0x19d9e7: jump UnknownScript_0x19d8ff TrainerFisherEdgar: - trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script + trainer FISHER, EDGAR, EVENT_BEAT_FISHER_EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script .Script: end_if_just_battled @@ -267,7 +267,7 @@ TrainerFisherEdgar: end TrainerCooltrainerfCybil: - trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, .Script + trainer COOLTRAINERF, CYBIL, EVENT_BEAT_COOLTRAINERF_CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, .Script .Script: end_if_just_battled @@ -278,7 +278,7 @@ TrainerCooltrainerfCybil: end TrainerPokemaniacZach: - trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, .Script + trainer POKEMANIAC, ZACH, EVENT_BEAT_POKEMANIAC_ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, .Script .Script: end_if_just_battled @@ -289,7 +289,7 @@ TrainerPokemaniacZach: end TrainerCooltrainermAllen: - trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, .Script + trainer COOLTRAINERM, ALLEN, EVENT_BEAT_COOLTRAINERM_ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route45.asm b/maps/Route45.asm index 205f6b12a..728fcdb03 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -21,7 +21,7 @@ Route45_MapScripts: db 0 TrainerBlackbeltKenji: - trainer EVENT_BEAT_BLACKBELT_KENJI, BLACKBELT_T, KENJI3, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, .Script + trainer BLACKBELT_T, KENJI3, EVENT_BEAT_BLACKBELT_KENJI, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BLACKBELT_KENJI @@ -125,7 +125,7 @@ UnknownScript_0x19e146: end TrainerHikerErik: - trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, 0, .Script + trainer HIKER, ERIK, EVENT_BEAT_HIKER_ERIK, HikerErikSeenText, HikerErikBeatenText, 0, .Script .Script: end_if_just_battled @@ -136,7 +136,7 @@ TrainerHikerErik: end TrainerHikerMichael: - trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, .Script + trainer HIKER, MICHAEL, EVENT_BEAT_HIKER_MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, .Script .Script: end_if_just_battled @@ -147,7 +147,7 @@ TrainerHikerMichael: end TrainerHikerParry: - trainer EVENT_BEAT_HIKER_PARRY, HIKER, PARRY3, HikerParry3SeenText, HikerParry3BeatenText, 0, .Script + trainer HIKER, PARRY3, EVENT_BEAT_HIKER_PARRY, HikerParry3SeenText, HikerParry3BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_HIKER_PARRY @@ -233,7 +233,7 @@ UnknownScript_0x19e219: jump UnknownScript_0x19e127 TrainerHikerTimothy: - trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, .Script + trainer HIKER, TIMOTHY, EVENT_BEAT_HIKER_TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, .Script .Script: end_if_just_battled @@ -244,7 +244,7 @@ TrainerHikerTimothy: end TrainerCooltrainermRyan: - trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, .Script + trainer COOLTRAINERM, RYAN, EVENT_BEAT_COOLTRAINERM_RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, .Script .Script: end_if_just_battled @@ -255,7 +255,7 @@ TrainerCooltrainermRyan: end TrainerCooltrainerfKelly: - trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, .Script + trainer COOLTRAINERF, KELLY, EVENT_BEAT_COOLTRAINERF_KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route46.asm b/maps/Route46.asm index 777e63501..88efec5a6 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -14,7 +14,7 @@ Route46_MapScripts: db 0 TrainerCamperTed: - trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script + trainer CAMPER, TED, EVENT_BEAT_CAMPER_TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script .Script: end_if_just_battled @@ -25,7 +25,7 @@ TrainerCamperTed: end TrainerPicnickerErin1: - trainer EVENT_BEAT_PICNICKER_ERIN, PICNICKER, ERIN1, PicnickerErin1SeenText, PicnickerErin1BeatenText, 0, .Script + trainer PICNICKER, ERIN1, EVENT_BEAT_PICNICKER_ERIN, PicnickerErin1SeenText, PicnickerErin1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_PICNICKER_ERIN @@ -148,7 +148,7 @@ UnknownScript_0x1a9772: end TrainerHikerBailey: - trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, .Script + trainer HIKER, BAILEY, EVENT_BEAT_HIKER_BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route6.asm b/maps/Route6.asm index 9a66c5844..98f57147e 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -11,7 +11,7 @@ Route6_MapScripts: db 0 TrainerPokefanmRex: - trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, .Script + trainer POKEFANM, REX, EVENT_BEAT_POKEFANM_REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, .Script .Script: end_if_just_battled @@ -22,7 +22,7 @@ TrainerPokefanmRex: end TrainerPokefanmAllan: - trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, .Script + trainer POKEFANM, ALLAN, EVENT_BEAT_POKEFANM_ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route8.asm b/maps/Route8.asm index 10df64842..47fb03c0f 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -14,7 +14,7 @@ Route8_MapScripts: db 0 TrainerBikerDwayne: - trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, .Script + trainer BIKER, DWAYNE, EVENT_BEAT_BIKER_DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, .Script .Script: end_if_just_battled @@ -25,7 +25,7 @@ TrainerBikerDwayne: end TrainerBikerHarris: - trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, .Script + trainer BIKER, HARRIS, EVENT_BEAT_BIKER_HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, .Script .Script: end_if_just_battled @@ -36,7 +36,7 @@ TrainerBikerHarris: end TrainerBikerZeke: - trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, .Script + trainer BIKER, ZEKE, EVENT_BEAT_BIKER_ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, .Script .Script: end_if_just_battled @@ -47,7 +47,7 @@ TrainerBikerZeke: end TrainerSupernerdSam: - trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, .Script + trainer SUPER_NERD, SAM, EVENT_BEAT_SUPER_NERD_SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, .Script .Script: end_if_just_battled @@ -58,7 +58,7 @@ TrainerSupernerdSam: end TrainerSupernerdTom: - trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, .Script + trainer SUPER_NERD, TOM, EVENT_BEAT_SUPER_NERD_TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/Route9.asm b/maps/Route9.asm index e7796bf31..be000b4b4 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -14,7 +14,7 @@ Route9_MapScripts: db 0 TrainerCamperDean: - trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, .Script + trainer CAMPER, DEAN, EVENT_BEAT_CAMPER_DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, .Script .Script: end_if_just_battled @@ -25,7 +25,7 @@ TrainerCamperDean: end TrainerPicnickerHeidi: - trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, .Script + trainer PICNICKER, HEIDI, EVENT_BEAT_PICNICKER_HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, .Script .Script: end_if_just_battled @@ -36,7 +36,7 @@ TrainerPicnickerHeidi: end TrainerCamperSid: - trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, 0, .Script + trainer CAMPER, SID, EVENT_BEAT_CAMPER_SID, CamperSidSeenText, CamperSidBeatenText, 0, .Script .Script: end_if_just_battled @@ -47,7 +47,7 @@ TrainerCamperSid: end TrainerPicnickerEdna: - trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, .Script + trainer PICNICKER, EDNA, EVENT_BEAT_PICNICKER_EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, .Script .Script: end_if_just_battled @@ -58,7 +58,7 @@ TrainerPicnickerEdna: end TrainerHikerTim: - trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, 0, .Script + trainer HIKER, TIM, EVENT_BEAT_HIKER_TIM, HikerTimSeenText, HikerTimBeatenText, 0, .Script .Script: end_if_just_battled @@ -69,7 +69,7 @@ TrainerHikerTim: end TrainerHikerSidney: - trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, .Script + trainer HIKER, SIDNEY, EVENT_BEAT_HIKER_SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 3c674d8c8..f386024c9 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -102,7 +102,7 @@ YoungsterScript_0x5807e: end TrainerPsychicNathan: - trainer EVENT_BEAT_PSYCHIC_NATHAN, PSYCHIC_T, NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, .Script + trainer PSYCHIC_T, NATHAN, EVENT_BEAT_PSYCHIC_NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, .Script .Script: end_if_just_battled @@ -113,7 +113,7 @@ TrainerPsychicNathan: end TrainerSuperNerdStan: - trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, .Script + trainer SUPER_NERD, STAN, EVENT_BEAT_SUPER_NERD_STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, .Script .Script: end_if_just_battled diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index a2ba7497d..730b0aa87 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -47,7 +47,7 @@ SabrinaScript_0x189c2e: end TrainerMediumRebecca: - trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, .Script + trainer MEDIUM, REBECCA, EVENT_BEAT_MEDIUM_REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, .Script .Script: end_if_just_battled @@ -58,7 +58,7 @@ TrainerMediumRebecca: end TrainerPsychicFranklin: - trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, .Script + trainer PSYCHIC_T, FRANKLIN, EVENT_BEAT_PSYCHIC_FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, .Script .Script: end_if_just_battled @@ -69,7 +69,7 @@ TrainerPsychicFranklin: end TrainerMediumDoris: - trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, .Script + trainer MEDIUM, DORIS, EVENT_BEAT_MEDIUM_DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, .Script .Script: end_if_just_battled @@ -80,7 +80,7 @@ TrainerMediumDoris: end TrainerPsychicJared: - trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, .Script + trainer PSYCHIC_T, JARED, EVENT_BEAT_PSYCHIC_JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 4937a259f..7c2490b45 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -20,7 +20,7 @@ SlowpokeWellB1FKurtScript: jumptextfaceplayer SlowpokeWellB1FKurtText TrainerGruntM29: - trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, GRUNTM_29, GruntM29SeenText, GruntM29BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_29, EVENT_BEAT_ROCKET_GRUNTM_29, GruntM29SeenText, GruntM29BeatenText, 0, .Script .Script: end_if_just_battled @@ -31,7 +31,7 @@ TrainerGruntM29: end TrainerGruntM1: - trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, GRUNTM_1, GruntM1SeenText, GruntM1BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_1, EVENT_BEAT_ROCKET_GRUNTM_1, GruntM1SeenText, GruntM1BeatenText, 0, .Script .Script: opentext @@ -74,7 +74,7 @@ TrainerGruntM1: end TrainerGruntM2: - trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, GRUNTM_2, GruntM2SeenText, GruntM2BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_2, EVENT_BEAT_ROCKET_GRUNTM_2, GruntM2SeenText, GruntM2BeatenText, 0, .Script .Script: end_if_just_battled @@ -85,7 +85,7 @@ TrainerGruntM2: end TrainerGruntF1: - trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, GRUNTF_1, GruntF1SeenText, GruntF1BeatenText, 0, .Script + trainer GRUNTF, GRUNTF_1, EVENT_BEAT_ROCKET_GRUNTF_1, GruntF1SeenText, GruntF1BeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 3f9887fe2..40ec6be64 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -26,7 +26,7 @@ SproutTower1FTeacherScript: jumptextfaceplayer SproutTower1FTeacherText TrainerSageChow: - trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, 0, .Script + trainer SAGE, CHOW, EVENT_BEAT_SAGE_CHOW, SageChowSeenText, SageChowBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index cd0c46fd7..c399e404d 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -11,7 +11,7 @@ SproutTower2F_MapScripts: db 0 TrainerSageNico: - trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, 0, .Script + trainer SAGE, NICO, EVENT_BEAT_SAGE_NICO, SageNicoSeenText, SageNicoBeatenText, 0, .Script .Script: end_if_just_battled @@ -22,7 +22,7 @@ TrainerSageNico: end TrainerSageEdmond: - trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, .Script + trainer SAGE, EDMOND, EVENT_BEAT_SAGE_EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 2b459c55d..e160dd872 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -93,7 +93,7 @@ UnknownScript_0x1849d1: end TrainerSageJin: - trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, 0, .Script + trainer SAGE, JIN, EVENT_BEAT_SAGE_JIN, SageJinSeenText, SageJinBeatenText, 0, .Script .Script: end_if_just_battled @@ -104,7 +104,7 @@ TrainerSageJin: end TrainerSageTroy: - trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, 0, .Script + trainer SAGE, TROY, EVENT_BEAT_SAGE_TROY, SageTroySeenText, SageTroyBeatenText, 0, .Script .Script: end_if_just_battled @@ -115,7 +115,7 @@ TrainerSageTroy: end TrainerSageNeal: - trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, 0, .Script + trainer SAGE, NEAL, EVENT_BEAT_SAGE_NEAL, SageNealSeenText, SageNealBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 841b80f09..f4705a131 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -481,7 +481,7 @@ NoExplodingTrap: end TrainerScientistJed: - trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, 0, .Script + trainer SCIENTIST, JED, EVENT_BEAT_SCIENTIST_JED, ScientistJedSeenText, ScientistJedBeatenText, 0, .Script .Script: end_if_just_battled @@ -492,7 +492,7 @@ TrainerScientistJed: end TrainerGruntM16: - trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, GRUNTM_16, GruntM16SeenText, GruntM16BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_16, EVENT_BEAT_ROCKET_GRUNTM_16, GruntM16SeenText, GruntM16BeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index d7af45ca2..f29337812 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -189,7 +189,7 @@ UnknownScript_0x6d0be: end TrainerGruntM17: - trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_17, EVENT_BEAT_ROCKET_GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, .Script .Script: end_if_just_battled @@ -200,7 +200,7 @@ TrainerGruntM17: end TrainerGruntM18: - trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_18, EVENT_BEAT_ROCKET_GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, .Script .Script: end_if_just_battled @@ -211,7 +211,7 @@ TrainerGruntM18: end TrainerGruntM19: - trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_19, EVENT_BEAT_ROCKET_GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 3f7fe5d39..7b64414a6 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -128,7 +128,7 @@ RocketBaseMurkrow: end SlowpokeTailGrunt: - trainer EVENT_BEAT_ROCKET_GRUNTF_5, GRUNTF, GRUNTF_5, GruntF5SeenText, GruntF5BeatenText, 0, GruntF5Script + trainer GRUNTF, GRUNTF_5, EVENT_BEAT_ROCKET_GRUNTF_5, GruntF5SeenText, GruntF5BeatenText, 0, GruntF5Script GruntF5Script: end_if_just_battled @@ -140,7 +140,7 @@ GruntF5Script: end RaticateTailGrunt: - trainer EVENT_BEAT_ROCKET_GRUNTM_28, GRUNTM, GRUNTM_28, GruntM28SeenText, GruntM28BeatenText, 0, GruntM28Script + trainer GRUNTM, GRUNTM_28, EVENT_BEAT_ROCKET_GRUNTM_28, GruntM28SeenText, GruntM28BeatenText, 0, GruntM28Script GruntM28Script: end_if_just_battled @@ -152,7 +152,7 @@ GruntM28Script: end TrainerScientistRoss: - trainer EVENT_BEAT_SCIENTIST_ROSS, SCIENTIST, ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, .Script + trainer SCIENTIST, ROSS, EVENT_BEAT_SCIENTIST_ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, .Script .Script: end_if_just_battled @@ -163,7 +163,7 @@ TrainerScientistRoss: end TrainerScientistMitch: - trainer EVENT_BEAT_SCIENTIST_MITCH, SCIENTIST, MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, .Script + trainer SCIENTIST, MITCH, EVENT_BEAT_SCIENTIST_MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 77ed8bbb6..077c9fd7b 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -17,7 +17,7 @@ UnionCave1F_MapScripts: db 0 TrainerPokemaniacLarry: - trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, .Script + trainer POKEMANIAC, LARRY, EVENT_BEAT_POKEMANIAC_LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, .Script .Script: end_if_just_battled @@ -28,7 +28,7 @@ TrainerPokemaniacLarry: end TrainerHikerRussell: - trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, .Script + trainer HIKER, RUSSELL, EVENT_BEAT_HIKER_RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, .Script .Script: end_if_just_battled @@ -39,7 +39,7 @@ TrainerHikerRussell: end TrainerHikerDaniel: - trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, .Script + trainer HIKER, DANIEL, EVENT_BEAT_HIKER_DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, .Script .Script: end_if_just_battled @@ -50,7 +50,7 @@ TrainerHikerDaniel: end TrainerFirebreatherBill: - trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, .Script + trainer FIREBREATHER, BILL, EVENT_BEAT_FIREBREATHER_BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, .Script .Script: end_if_just_battled @@ -61,7 +61,7 @@ TrainerFirebreatherBill: end TrainerFirebreatherRay: - trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, .Script + trainer FIREBREATHER, RAY, EVENT_BEAT_FIREBREATHER_RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 980855221..b2aa2159d 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -15,7 +15,7 @@ UnionCaveB1F_MapScripts: db 0 TrainerPokemaniacAndrew: - trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, .Script + trainer POKEMANIAC, ANDREW, EVENT_BEAT_POKEMANIAC_ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, .Script .Script: end_if_just_battled @@ -26,7 +26,7 @@ TrainerPokemaniacAndrew: end TrainerPokemaniacCalvin: - trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, .Script + trainer POKEMANIAC, CALVIN, EVENT_BEAT_POKEMANIAC_CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, .Script .Script: end_if_just_battled @@ -37,7 +37,7 @@ TrainerPokemaniacCalvin: end TrainerHikerPhillip: - trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, .Script + trainer HIKER, PHILLIP, EVENT_BEAT_HIKER_PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, .Script .Script: end_if_just_battled @@ -48,7 +48,7 @@ TrainerHikerPhillip: end TrainerHikerLeonard: - trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, .Script + trainer HIKER, LEONARD, EVENT_BEAT_HIKER_LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 5f2baabf2..b39352227 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -38,7 +38,7 @@ UnionCaveLapras: end TrainerCooltrainermNick: - trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, .Script + trainer COOLTRAINERM, NICK, EVENT_BEAT_COOLTRAINERM_NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, .Script .Script: end_if_just_battled @@ -49,7 +49,7 @@ TrainerCooltrainermNick: end TrainerCooltrainerfGwen: - trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, .Script + trainer COOLTRAINERF, GWEN, EVENT_BEAT_COOLTRAINERF_GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, .Script .Script: end_if_just_battled @@ -60,7 +60,7 @@ TrainerCooltrainerfGwen: end TrainerCooltrainerfEmma: - trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, .Script + trainer COOLTRAINERF, EMMA, EVENT_BEAT_COOLTRAINERF_EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 31f19615d..1f7e92d7c 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -45,7 +45,7 @@ SurgeScript_0x1920a5: end TrainerGentlemanGregory: - trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, .Script + trainer GENTLEMAN, GREGORY, EVENT_BEAT_GENTLEMAN_GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, .Script .Script: end_if_just_battled @@ -56,7 +56,7 @@ TrainerGentlemanGregory: end TrainerGuitaristVincent: - trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, .Script + trainer GUITARIST, VINCENT, EVENT_BEAT_GUITARIST_VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, .Script .Script: end_if_just_battled @@ -67,7 +67,7 @@ TrainerGuitaristVincent: end TrainerJugglerHorton: - trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, .Script + trainer JUGGLER, HORTON, EVENT_BEAT_JUGGLER_HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 12480e21f..48eca3995 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -67,7 +67,7 @@ VioletGymActivateRockets: jumpstd radiotowerrockets TrainerBirdKeeperRod: - trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, BirdKeeperRodSeenText, BirdKeeperRodBeatenText, 0, .Script + trainer BIRD_KEEPER, ROD, EVENT_BEAT_BIRD_KEEPER_ROD, BirdKeeperRodSeenText, BirdKeeperRodBeatenText, 0, .Script .Script: end_if_just_battled @@ -78,7 +78,7 @@ TrainerBirdKeeperRod: end TrainerBirdKeeperAbe: - trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, BirdKeeperAbeSeenText, BirdKeeperAbeBeatenText, 0, .Script + trainer BIRD_KEEPER, ABE, EVENT_BEAT_BIRD_KEEPER_ABE, BirdKeeperAbeSeenText, BirdKeeperAbeBeatenText, 0, .Script .Script: end_if_just_battled diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 128fa2632..776a21cef 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -69,7 +69,7 @@ UnknownScript_0x985a3: end TrainerSageGaku: - trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, 0, .Script + trainer SAGE, GAKU, EVENT_BEAT_SAGE_GAKU, SageGakuSeenText, SageGakuBeatenText, 0, .Script .Script: opentext @@ -79,7 +79,7 @@ TrainerSageGaku: end TrainerSageMasa: - trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, 0, .Script + trainer SAGE, MASA, EVENT_BEAT_SAGE_MASA, SageMasaSeenText, SageMasaBeatenText, 0, .Script .Script: opentext @@ -89,7 +89,7 @@ TrainerSageMasa: end TrainerSageKoji: - trainer EVENT_BEAT_SAGE_KOJI, SAGE, KOJI, SageKojiSeenText, SageKojiBeatenText, 0, .Script + trainer SAGE, KOJI, EVENT_BEAT_SAGE_KOJI, SageKojiSeenText, SageKojiBeatenText, 0, .Script .Script: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER From ead103d2c6d21cd4774e5c32b9c66f9435f7adbb Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 16:08:43 -0500 Subject: [PATCH 033/135] =?UTF-8?q?MenuDataHeader=20=E2=86=92=20MenuHeader?= =?UTF-8?q?,=20MenuData2=20=E2=86=92=20MenuData=20(might=20complete=20issu?= =?UTF-8?q?e=20#440)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/menu_constants.asm | 6 +- constants/script_constants.asm | 2 +- data/items/rooftop_sale.asm | 4 +- data/player_names.asm | 4 +- data/unown_walls.asm | 2 +- docs/event_commands.md | 2 +- docs/menu.md | 40 ++--- engine/battle/core.asm | 12 +- engine/battle/effect_commands.asm | 6 +- engine/battle/menu.asm | 18 +-- engine/battle/returntobattle_useball.asm | 2 +- engine/billspc.asm | 58 +++---- engine/billspctop.asm | 18 +-- engine/breeding.asm | 2 +- engine/buy_sell_toss.asm | 22 +-- engine/clock_reset.asm | 2 +- engine/decorations.asm | 42 +++--- engine/delete_save_change_clock.asm | 20 +-- engine/events/buena.asm | 36 ++--- engine/events/buena_menu.asm | 4 +- engine/events/elevator.asm | 12 +- engine/events/kurt.asm | 18 +-- engine/events/mom.asm | 16 +- engine/events/move_deleter.asm | 2 +- engine/events/move_tutor.asm | 6 +- engine/events/overworld.asm | 2 +- engine/events/pokecenter_pc.asm | 24 +-- engine/events/pokepic.asm | 10 +- engine/events/std_scripts.asm | 8 +- engine/events/unown_walls.asm | 4 +- engine/init_gender.asm | 10 +- engine/intro_menu.asm | 22 +-- engine/link.asm | 2 +- engine/link_trade.asm | 4 +- engine/mail.asm | 22 +-- engine/main_menu.asm | 10 +- engine/mart.asm | 40 ++--- engine/menu.asm | 42 +++--- engine/menu_2.asm | 22 +-- engine/mon_menu.asm | 24 +-- engine/move_mon.asm | 2 +- engine/pack.asm | 184 +++++++++++------------ engine/player_gfx.asm | 6 +- engine/save.asm | 2 +- engine/scripting.asm | 8 +- engine/scrolling_menu.asm | 54 +++---- engine/slot_machine.asm | 10 +- engine/start_menu.asm | 28 ++-- engine/switch_items.asm | 6 +- engine/timeset.asm | 2 +- home.asm | 2 +- home/map.asm | 2 +- home/menu.asm | 80 +++++----- home/tilemap.asm | 18 +-- macros/scripts/events.asm | 8 +- maps/CeladonDeptStore6F.asm | 8 +- maps/CeladonGameCornerPrizeRoom.asm | 16 +- maps/DragonShrine.asm | 40 ++--- maps/EarlsPokemonAcademy.asm | 8 +- maps/GoldenrodCity.asm | 8 +- maps/GoldenrodDeptStore6F.asm | 8 +- maps/GoldenrodGameCorner.asm | 16 +- maps/PokecomCenterAdminRoomMobile.asm | 16 +- mobile/mobile_12.asm | 44 +++--- mobile/mobile_12_2.asm | 12 +- mobile/mobile_22.asm | 72 ++++----- mobile/mobile_22_2.asm | 36 ++--- mobile/mobile_40.asm | 76 +++++----- mobile/mobile_45.asm | 32 ++-- mobile/mobile_45_sprite_engine.asm | 2 +- mobile/mobile_46.asm | 42 +++--- mobile/mobile_5c.asm | 6 +- mobile/mobile_5e.asm | 2 +- mobile/mobile_5f.asm | 22 +-- mobile/mobile_menu.asm | 16 +- wram.asm | 52 +++---- 76 files changed, 774 insertions(+), 774 deletions(-) diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm index e8f85a8db..390d3921c 100644 --- a/constants/menu_constants.asm +++ b/constants/menu_constants.asm @@ -1,4 +1,4 @@ -; MenuDataHeader flags +; MenuHeader flags const_def shift_const MENU_RESTORE_TILES ; Will be set if MENU_BACKUP_TILES(_2) is set. shift_const MENU_UNUSED_1 @@ -9,7 +9,7 @@ shift_const MENU_BACKUP_TILES shift_const MENU_BACKUP_TILES_2 -; VerticalMenu/DoNthMenu/SetUpMenu/_2DMenu MenuDataHeader2 flags +; VerticalMenu/DoNthMenu/SetUpMenu/_2DMenu MenuData flags ; Per flag the comment specifies which menus actually implement it const_def shift_const STATICMENU_DISABLE_B ; VerticalMenu/_2DMenu @@ -21,7 +21,7 @@ shift_const STATICMENU_NO_TOP_SPACING ; VerticalMenu/_2DMenu shift_const STATICMENU_CURSOR ; VerticalMenu/_2DMenu -; ScrollingMenu MenuDataHeader2 flags +; ScrollingMenu MenuData flags const_def shift_const SCROLLINGMENU_CALL_FUNCTION1_CANCEL shift_const SCROLLINGMENU_CALL_FUNCTION3_NO_SWITCH diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 952837065..cfab61c87 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -267,7 +267,7 @@ NUM_FRUIT_TREES EQU const_value +- 1 NUM_UNOWN_PUZZLES EQU const_value ; Special_DisplayUnownWords writebyte arguments -; UnownWalls and MenuDataHeaders_UnownWalls indexes (see data/unown_walls.asm) +; UnownWalls and MenuHeaders_UnownWalls indexes (see data/unown_walls.asm) const_def const UNOWNWORDS_ESCAPE ; 0 const UNOWNWORDS_LIGHT ; 1 diff --git a/data/items/rooftop_sale.asm b/data/items/rooftop_sale.asm index b16724cdc..87165fa5a 100644 --- a/data/items/rooftop_sale.asm +++ b/data/items/rooftop_sale.asm @@ -1,4 +1,4 @@ -RooftopSaleData1: ; 15aee +RooftopSaleMart1: ; 15aee db 5 dbw POKE_BALL, 150 dbw GREAT_BALL, 500 @@ -7,7 +7,7 @@ RooftopSaleData1: ; 15aee dbw REVIVE, 1200 db -1 -RooftopSaleData2: ; 15aff +RooftopSaleMart2: ; 15aff db 5 dbw HYPER_POTION, 1000 dbw FULL_RESTORE, 2000 diff --git a/data/player_names.asm b/data/player_names.asm index 04eac7508..3c5a34c77 100644 --- a/data/player_names.asm +++ b/data/player_names.asm @@ -1,4 +1,4 @@ -ChrisNameMenuDataHeader: ; 882b5 +ChrisNameMenuHeader: ; 882b5 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, TEXTBOX_Y - 1 dw .MaleNames @@ -17,7 +17,7 @@ MalePlayerNameArray: ; 882c9 db 2 ; displacement db " NAME @" ; title -KrisNameMenuDataHeader: ; 882e5 +KrisNameMenuHeader: ; 882e5 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, TEXTBOX_Y - 1 dw .FemaleNames diff --git a/data/unown_walls.asm b/data/unown_walls.asm index eae376730..c05d37004 100644 --- a/data/unown_walls.asm +++ b/data/unown_walls.asm @@ -38,7 +38,7 @@ UnownWalls: ; 8aebc unownwall "H", "O", "-", "O", "H" ; 8aed5 -MenuDataHeaders_UnownWalls: ; 0x8aed5 +MenuHeaders_UnownWalls: ; 0x8aed5 ; UNOWNWORDS_ESCAPE db MENU_BACKUP_TILES ; flags menu_coords 3, 4, 16, 9 diff --git a/docs/event_commands.md b/docs/event_commands.md index 91486ad06..90e7864cb 100644 --- a/docs/event_commands.md +++ b/docs/event_commands.md @@ -165,7 +165,7 @@ Defined in [macros/scripts/events.asm](/macros/scripts/events.asm) and [engine/s ## `$4E`: `yesorno` -## `$4F`: loadmenudata data_pointer +## `$4F`: loadmenuheader menu_header ## `$50`: `closewindow` diff --git a/docs/menu.md b/docs/menu.md index 71186a905..80d64ada1 100644 --- a/docs/menu.md +++ b/docs/menu.md @@ -19,13 +19,13 @@ This is the only menu that does scrolling. It doesn't draw any `TextBox` around Structure: ```asm -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 2, 4, SCREEN_WIDTH - 1, 13 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db 0 ; flags db 5, 0 ; rows, columns db 1 ; horizontal spacing @@ -35,7 +35,7 @@ Structure: dba Function3 ``` -`wMenuData2Flags`: +`wMenuDataFlags`: ``` 7: Select is functional @@ -48,9 +48,9 @@ Structure: 0: Call Function1 to display the cancel entry ``` -If the columns entry in `MenuDataHeader2` of a scrolling menu is 0, `Function2` isn't called either. It doesn't affect the position of the arrows. +If the columns entry in `MenuData` of a scrolling menu is 0, `Function2` isn't called either. It doesn't affect the position of the arrows. -Call state for functions in `MenuDataHeader2` of `ScrollingMenu`: +Call state for functions in `MenuData` of `ScrollingMenu`: ``` All of them: @@ -68,7 +68,7 @@ Function3: Called to display anything else, whenever the cursor is moved. There is no register of importance that should be preserved in any of these functions. -The `; horizontal spacing` item in each `MenuData2` is a misnomer. It changes how the `Items` struct looks. +The `; horizontal spacing` item in each `MenuData` is a misnomer. It changes how the `Items` struct looks. If it's 1: @@ -99,14 +99,14 @@ This, like is implied by the name, is a 2-dimensional menu, where you can move y Structure: ```asm -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags db 12, 08 ; start coords db 17, 19 ; end coords - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags dn 2, 2 ; rows, columns db 6 ; spacing @@ -114,7 +114,7 @@ Structure: dba Function ``` -`wMenuData2Flags`: +`wMenuDataFlags`: ``` 7: Leave one tile of spacing between the left textbox border and the text, enabling the cursor. @@ -141,13 +141,13 @@ These are like the regular `VerticalMenu`, except they allow for creating slight Structure: ``` -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, 7 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 0 ; items dw Items @@ -155,7 +155,7 @@ Structure: dw StringPointers ``` -`wMenuData2Flags`: +`wMenuDataFlags`: ``` 7: Unused @@ -219,20 +219,20 @@ This is the simplest menu. Like, the most boring. Nothing special. Just normal. Structure: ```asm -.MenuDataHeader: +.MenuHeader: db MENU_SPRITE_ANIMS | MENU_BACKUP_TILES ; flags menu_coords 12, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 2 ; # items db "GIVE@" db "TAKE@" ``` -`wMenuData2Flags`: +`wMenuDataFlags`: ``` 7: Leave one tile of spacing between the left textbox border and the text @@ -259,7 +259,7 @@ This is used in the menu for selecting the character's name. ## Misc/Generic -`MenuDataHeader` flags (`wMenuFlags`): +`MenuHeader` flags (`wMenuFlags`): ``` 7: Save a backup of the tiles diff --git a/engine/battle/core.asm b/engine/battle/core.asm index fd3125420..cd2424769 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2781,7 +2781,7 @@ AskUseNextPokemon: ; 3d1f8 ForcePlayerMonChoice: ; 3d227 call EmptyBattleTextBox - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call SetUpBattlePartyMenu_NoLoop call ForcePickPartyMonInBattle ld a, [wLinkMode] @@ -3300,7 +3300,7 @@ ResetEnemyBattleVars: ; 3d557 ld a, 8 call SlideBattlePicOut call EmptyBattleTextBox - jp LoadStandardMenuDataHeader + jp LoadStandardMenuHeader ; 3d57a ResetBattleParticipants: ; 3d57a @@ -5107,7 +5107,7 @@ BattleMenu_Pack: ; 3e1c7 and a jp nz, .ItemsCantBeUsed - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld a, [BattleType] cp BATTLETYPE_TUTORIAL @@ -5202,10 +5202,10 @@ BattleMenu_Pack: ; 3e1c7 ; 3e28d BattleMenu_PKMN: ; 3e28d - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader BattleMenuPKMN_ReturnFromStats: call ExitMenu - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call ClearBGPalettes BattleMenuPKMN_Loop: call SetUpBattlePartyMenu @@ -5345,7 +5345,7 @@ PlayerSwitch: ; 3e3ad ld a, [wLinkMode] and a jr z, .not_linked - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call LinkBattleSendReceiveAction call CloseWindow diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index ba4dc72f8..166904472 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -8973,7 +8973,7 @@ BattleCommand_BatonPass: ; 379c9 call DelayFrames ; Transition into switchmon menu - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall SetUpBattlePartyMenu_NoLoop farcall ForcePickSwitchMonInBattle @@ -9048,7 +9048,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67 ld a, 1 ld [wPlayerAction], a - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld hl, LinkBattleSendReceiveAction call CallBattleCore call CloseWindow @@ -9065,7 +9065,7 @@ BatonPass_LinkEnemySwitch: ; 37a82 and a ret z - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld hl, LinkBattleSendReceiveAction call CallBattleCore diff --git a/engine/battle/menu.asm b/engine/battle/menu.asm index c97cd7854..705df3729 100755 --- a/engine/battle/menu.asm +++ b/engine/battle/menu.asm @@ -1,6 +1,6 @@ LoadBattleMenu: ; 24ef2 - ld hl, BattleMenuDataHeader - call LoadMenuDataHeader + ld hl, BattleMenuHeader + call LoadMenuHeader ld a, [wBattleMenuCursorBuffer] ld [wMenuCursorBuffer], a call InterpretBattleMenu @@ -12,14 +12,14 @@ LoadBattleMenu: ; 24ef2 SafariBattleMenu: ; 24f0b ; untranslated - ld hl, MenuDataHeader_0x24f4e - call LoadMenuDataHeader + ld hl, MenuHeader_0x24f4e + call LoadMenuHeader jr Function24f19 ; 24f13 ContestBattleMenu: ; 24f13 - ld hl, MenuDataHeader_0x24f89 - call LoadMenuDataHeader + ld hl, MenuHeader_0x24f89 + call LoadMenuHeader ; 24f19 Function24f19: ; 24f19 @@ -32,7 +32,7 @@ Function24f19: ; 24f19 ret ; 24f2c -BattleMenuDataHeader: ; 24f2c +BattleMenuHeader: ; 24f2c db MENU_BACKUP_TILES ; flags menu_coords 8, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw MenuData_0x24f34 @@ -54,7 +54,7 @@ Strings24f3d: ; 0x24f3d db "RUN@" ; 24f4e -MenuDataHeader_0x24f4e: ; 24f4e +MenuHeader_0x24f4e: ; 24f4e db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw MenuData_0x24f56 @@ -84,7 +84,7 @@ Function24f7c: ; 24f7c ret ; 24f89 -MenuDataHeader_0x24f89: ; 24f89 +MenuHeader_0x24f89: ; 24f89 db MENU_BACKUP_TILES ; flags menu_coords 2, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw MenuData_0x24f91 diff --git a/engine/battle/returntobattle_useball.asm b/engine/battle/returntobattle_useball.asm index e6e33f900..417f29ab1 100644 --- a/engine/battle/returntobattle_useball.asm +++ b/engine/battle/returntobattle_useball.asm @@ -14,6 +14,6 @@ _ReturnToBattle_UseBall: ; 2715c farcall _LoadBattleFontsHPBar call GetMemSGBLayout call CloseWindow - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call WaitBGMap jp SetPalettes diff --git a/engine/billspc.asm b/engine/billspc.asm index 5fa590c41..53f2c176e 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -128,8 +128,8 @@ _DepositPKMN: ; e2391 (38:6391) ret .Submenu: ; e247d (38:647d) - ld hl, BillsPCDepositMenuDataHeader - call CopyMenuDataHeader + ld hl, BillsPCDepositMenuHeader + call CopyMenuHeader ld a, [wMenuCursorY] call StoreTo_wMenuCursorBuffer call VerticalMenu @@ -172,7 +172,7 @@ BillsPCDepositFuncDeposit: ; e24a9 (38:64a9) ret BillsPCDepositFuncStats: ; e24c8 (38:64c8) - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call BillsPC_StatsScreen call ExitMenu call PCMonInfo @@ -191,7 +191,7 @@ BillsPCDepositFuncRelease: ; e24e0 (38:64e0) push af ld de, PCString_ReleasePKMN call BillsPC_PlaceString - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader lb bc, 14, 11 call PlaceYesNoBox ld a, [wMenuCursorY] @@ -228,14 +228,14 @@ BillsPCDepositFuncCancel: ; e2537 (38:6537) ret ; e253d (38:653d) -BillsPCDepositMenuDataHeader: ; 0xe253d (38:653d) +BillsPCDepositMenuHeader: ; 0xe253d (38:653d) db MENU_BACKUP_TILES ; flags menu_coords 9, 4, SCREEN_WIDTH - 1, 13 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0xe2545 -.MenuData2: ; 0xe2545 (38:6545) +.MenuData: ; 0xe2545 (38:6545) db STATICMENU_CURSOR ; flags db 4 ; items db "DEPOSIT@" @@ -391,8 +391,8 @@ _WithdrawPKMN: ; e2583 (38:6583) ret BillsPC_Withdraw: ; e2675 (38:6675) - ld hl, .MenuDataHeader - call CopyMenuDataHeader + ld hl, .MenuHeader + call CopyMenuHeader ld a, [wMenuCursorY] call StoreTo_wMenuCursorBuffer call VerticalMenu @@ -434,7 +434,7 @@ BillsPC_Withdraw: ; e2675 (38:6675) ret .stats ; e26c0 (38:66c0) - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call BillsPC_StatsScreen call ExitMenu call PCMonInfo @@ -451,7 +451,7 @@ BillsPC_Withdraw: ; e2675 (38:6675) jr c, .FailedRelease ld de, PCString_ReleasePKMN call BillsPC_PlaceString - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader lb bc, 14, 11 call PlaceYesNoBox ld a, [wMenuCursorY] @@ -487,7 +487,7 @@ BillsPC_Withdraw: ; e2675 (38:6675) ret ; e2731 (38:6731) -.MenuDataHeader: ; 0xe2731 +.MenuHeader: ; 0xe2731 db MENU_BACKUP_TILES ; flags menu_coords 9, 4, SCREEN_WIDTH - 1, 13 dw .MenuData @@ -652,8 +652,8 @@ _MovePKMNWithoutMail: ; e2759 ; e285d .MoveMonWOMailSubmenu: ; e285d - ld hl, .MenuDataHeader - call CopyMenuDataHeader + ld hl, .MenuHeader + call CopyMenuHeader ld a, [wMenuCursorY] call StoreTo_wMenuCursorBuffer call VerticalMenu @@ -693,7 +693,7 @@ _MovePKMNWithoutMail: ; e2759 ; e28a5 .Stats: ; e28a5 - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call BillsPC_StatsScreen call ExitMenu call PCMonInfo @@ -710,14 +710,14 @@ _MovePKMNWithoutMail: ; e2759 ret ; e28c3 -.MenuDataHeader: ; 0xe28c3 +.MenuHeader: ; 0xe28c3 db MENU_BACKUP_TILES ; flags menu_coords 9, 4, SCREEN_WIDTH - 1, 13 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0xe28cb -.MenuData2: ; 0xe28cb +.MenuData: ; 0xe28cb db STATICMENU_CURSOR ; flags db 3 ; items db "MOVE@" @@ -2293,15 +2293,15 @@ PCString_NoReleasingEGGS: db "No releasing EGGS!@" _ChangeBox: ; e35aa (38:75aa) - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call BillsPC_ClearTilemap .loop xor a ld [hBGMapMode], a call BillsPC_PrintBoxName call BillsPC_PlaceChooseABoxString - ld hl, _ChangeBox_menudataheader - call CopyMenuDataHeader + ld hl, _ChangeBox_MenuHeader + call CopyMenuHeader xor a ld [wMenuScrollPosition], a hlcoord 0, 4 @@ -2328,14 +2328,14 @@ BillsPC_ClearTilemap: ; e35e2 (38:75e2) ret ; e35f1 (38:75f1) -_ChangeBox_menudataheader: ; 0xe35f1 +_ChangeBox_MenuHeader: ; 0xe35f1 db MENU_BACKUP_TILES ; flags menu_coords 1, 5, 9, 12 - dw .menudata2 + dw .MenuData db 1 ; default option ; 0xe35f9 -.menudata2 ; 0xe35f9 +.MenuData ; 0xe35f9 db MENU_UNUSED_1 | MENU_UNUSED_3 ; flags db 4, 0 db 1 @@ -2487,8 +2487,8 @@ BillsPC_PrintBoxName: ; e36cf (38:76cf) ; e36f9 BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9) - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader call VerticalMenu call ExitMenu ret c @@ -2556,14 +2556,14 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9) hlcoord 11, 7 ; unused -.MenuDataHeader: ; 0xe377b +.MenuHeader: ; 0xe377b db MENU_BACKUP_TILES ; flags menu_coords 11, 4, SCREEN_WIDTH - 1, 13 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0xe3783 -.MenuData2: ; 0xe3783 +.MenuData: ; 0xe3783 db STATICMENU_CURSOR ; flags db 4 ; items db "SWITCH@" diff --git a/engine/billspctop.asm b/engine/billspctop.asm index ac70082d6..cad479d9e 100755 --- a/engine/billspctop.asm +++ b/engine/billspctop.asm @@ -22,7 +22,7 @@ _BillsPC: ; e3fd .LogIn: ; e41c (3:641c) xor a ld [hBGMapMode], a - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call ClearPCItemScreen ld hl, Options ld a, [hl] @@ -45,8 +45,8 @@ _BillsPC: ; e3fd ret .UseBillsPC: ; e443 (3:6443) - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader ld a, $1 .loop ld [wMenuCursorBuffer], a @@ -68,13 +68,13 @@ _BillsPC: ; e3fd call CloseWindow ret -.MenuDataHeader: ; 0xe46f +.MenuHeader: ; 0xe46f db MENU_BACKUP_TILES ; flags menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: ; 0xe477 +.MenuData: ; 0xe477 db STATICMENU_CURSOR ; flags db 0 ; items dw .items @@ -109,7 +109,7 @@ BillsPC_SeeYa: ; e4cb ret BillsPC_MovePKMNMenu: ; e4cd - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall IsAnyMonHoldingMail jr nc, .no_mail ld hl, .Text_MonHoldingMail @@ -134,7 +134,7 @@ BillsPC_MovePKMNMenu: ; e4cd db "@" BillsPC_DepositMenu: ; e4fe (3:64fe) - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall _DepositPKMN call ReturnToMapFromSubmenu call ClearPCItemScreen @@ -203,7 +203,7 @@ CheckCurPartyMonFainted: ; e538 ret BillsPC_WithdrawMenu: ; e559 (3:6559) - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall _WithdrawPKMN call ReturnToMapFromSubmenu call ClearPCItemScreen diff --git a/engine/breeding.asm b/engine/breeding.asm index b379ec195..a03eda082 100755 --- a/engine/breeding.asm +++ b/engine/breeding.asm @@ -202,7 +202,7 @@ DoEggStep:: ; 16f3e OverworldHatchEgg:: ; 16f5e call RefreshScreen - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call HatchEggs call ExitAllMenus call RestartMapMusic diff --git a/engine/buy_sell_toss.asm b/engine/buy_sell_toss.asm index ff2bd2967..d16a52ed6 100755 --- a/engine/buy_sell_toss.asm +++ b/engine/buy_sell_toss.asm @@ -1,6 +1,6 @@ SelectQuantityToToss: ; 24fbf - ld hl, TossItem_MenuDataHeader - call LoadMenuDataHeader + ld hl, TossItem_MenuHeader + call LoadMenuHeader call Toss_Sell_Loop ret ; 24fc9 @@ -12,8 +12,8 @@ RooftopSale_SelectQuantityToBuy: ; 24fcf ld [Buffer1], a ld a, e ld [Buffer2], a - ld hl, BuyItem_MenuDataHeader - call LoadMenuDataHeader + ld hl, BuyItem_MenuHeader + call LoadMenuHeader call Toss_Sell_Loop ret ; 24fe1 @@ -24,8 +24,8 @@ SelectQuantityToSell: ; 24fe1 ld [Buffer1], a ld a, e ld [Buffer2], a - ld hl, SellItem_MenuDataHeader - call LoadMenuDataHeader + ld hl, SellItem_MenuHeader + call LoadMenuHeader call Toss_Sell_Loop ret ; 24ff9 @@ -138,9 +138,9 @@ BuySellToss_UpdateQuantityDisplay: ; 25072 ld de, wItemQuantityChangeBuffer lb bc, PRINTNUM_LEADINGZEROS | 1, 2 call PrintNum - ld a, [wMenuData2Pointer] + ld a, [wMenuDataPointer] ld e, a - ld a, [wMenuData2Pointer + 1] + ld a, [wMenuDataPointer + 1] ld d, a ld a, [wMenuDataBank] call FarCall_de @@ -213,21 +213,21 @@ BuySell_DisplaySubtotal: ; 250d1 ret ; 250ed -TossItem_MenuDataHeader: ; 0x250ed +TossItem_MenuHeader: ; 0x250ed db MENU_BACKUP_TILES ; flags menu_coords 15, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw ret_25097 db 0 ; default option ; 0x250f5 -BuyItem_MenuDataHeader: ; 0x250f5 +BuyItem_MenuHeader: ; 0x250f5 db MENU_BACKUP_TILES ; flags menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw DisplayPurchasePrice db -1 ; default option ; 0x250fd -SellItem_MenuDataHeader: ; 0x250fd +SellItem_MenuHeader: ; 0x250fd db MENU_BACKUP_TILES ; flags menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw DisplaySellingPrice diff --git a/engine/clock_reset.asm b/engine/clock_reset.asm index 82b81b85c..12bdf41e7 100755 --- a/engine/clock_reset.asm +++ b/engine/clock_reset.asm @@ -38,7 +38,7 @@ RestartClock: ; 20021 (8:4021) ld a, [hl] push af set NO_TEXT_SCROLL, [hl] - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call ClearTileMap ld hl, .Text_SetWithControlPad call PrintText diff --git a/engine/decorations.asm b/engine/decorations.asm index 9c00f51b1..e004febc3 100755 --- a/engine/decorations.asm +++ b/engine/decorations.asm @@ -8,8 +8,8 @@ InitDecorations: ; 26751 (9:6751) _PlayerDecorationMenu: ; 0x2675c ld a, [wWhichIndexSet] push af - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader xor a ld [Buffer5], a ld a, $1 @@ -36,14 +36,14 @@ _PlayerDecorationMenu: ; 0x2675c ret ; 0x2679a -.MenuDataHeader: ; 0x2679a +.MenuHeader: ; 0x2679a db MENU_BACKUP_TILES ; flags menu_coords 5, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x267a2 -.MenuData2: ; 0x267a2 +.MenuData: ; 0x267a2 db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 0 ; items dw wd002 @@ -374,8 +374,8 @@ PopulateDecoCategoryMenu: ; 2695b jr nc, .beyond_eight xor a ld [wWhichIndexSet], a - ld hl, .NonscrollingMenuDataHeader - call LoadMenuDataHeader + ld hl, .NonscrollingMenuHeader + call LoadMenuHeader call DoNthMenu jr c, .no_action_1 call DoDecorationAction2 @@ -391,9 +391,9 @@ PopulateDecoCategoryMenu: ; 2695b ld d, 0 add hl, de ld [hl], -1 - call LoadStandardMenuDataHeader - ld hl, .ScrollingMenuDataHeader - call CopyMenuDataHeader + call LoadStandardMenuHeader + ld hl, .ScrollingMenuHeader + call CopyMenuHeader xor a ld [hBGMapMode], a call InitScrollingMenu @@ -421,14 +421,14 @@ PopulateDecoCategoryMenu: ; 2695b db "@" ; 0x269b5 -.NonscrollingMenuDataHeader: ; 0x269b5 +.NonscrollingMenuHeader: ; 0x269b5 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 - dw .NonscrollingMenuData2 + dw .NonscrollingMenuData db 1 ; default option ; 0x269bd -.NonscrollingMenuData2: ; 0x269bd +.NonscrollingMenuData: ; 0x269bd db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 0 ; items dw wd002 @@ -436,14 +436,14 @@ PopulateDecoCategoryMenu: ; 2695b dw DecorationAttributes ; 0x269c5 -.ScrollingMenuDataHeader: ; 0x269c5 +.ScrollingMenuHeader: ; 0x269c5 db MENU_BACKUP_TILES ; flags menu_coords 1, 1, SCREEN_WIDTH - 2, SCREEN_HEIGHT - 2 - dw .ScrollingMenuData2 + dw .ScrollingMenuData db 1 ; default option ; 0x269cd -.ScrollingMenuData2: ; 0x269cd +.ScrollingMenuData: ; 0x269cd db SCROLLINGMENU_DISPLAY_ARROWS ; flags db 8, 0 ; rows, columns db 1 ; horizontal spacing @@ -912,10 +912,10 @@ DecoText_WhichSide: ; 0x26e6b DecoAction_AskWhichSide: ; 26e70 call MenuTextBox - ld hl, MenuDataHeader_0x26eab + ld hl, MenuHeader_0x26eab call GetMenu2 call ExitMenu - call CopyMenuData2 + call CopyMenuData jr c, .nope ld a, [wMenuCursorY] cp 3 @@ -947,14 +947,14 @@ QueryWhichSide: ; 26e9a ret ; 26eab -MenuDataHeader_0x26eab: ; 0x26eab +MenuHeader_0x26eab: ; 0x26eab db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 13, 7 - dw MenuData2_0x26eb3 + dw MenuData_0x26eb3 db 1 ; default option ; 0x26eb3 -MenuData2_0x26eb3: ; 0x26eb3 +MenuData_0x26eb3: ; 0x26eb3 db STATICMENU_CURSOR ; flags db 3 ; items db "RIGHT SIDE@" diff --git a/engine/delete_save_change_clock.asm b/engine/delete_save_change_clock.asm index 8a711cc5e..d419234ba 100755 --- a/engine/delete_save_change_clock.asm +++ b/engine/delete_save_change_clock.asm @@ -8,8 +8,8 @@ _ResetClock: ; 4d3b1 call PlayMusic ld hl, .text_askreset call PrintText - ld hl, .NoYes_MenuDataHeader - call CopyMenuDataHeader + ld hl, .NoYes_MenuHeader + call CopyMenuHeader call VerticalMenu ret c ld a, [wMenuCursorY] @@ -46,13 +46,13 @@ _ResetClock: ; 4d3b1 text_jump UnknownText_0x1c561c db "@" -.NoYes_MenuDataHeader: ; 0x4d40d +.NoYes_MenuHeader: ; 0x4d40d db 0 ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .NoYes_MenuData2 + dw .NoYes_MenuData db 1 ; default option -.NoYes_MenuData2: ; 0x4d415 +.NoYes_MenuData: ; 0x4d415 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 ; items db "NO@" @@ -268,8 +268,8 @@ _DeleteSaveData: ; 4d54c call PlayMusic ld hl, .Text_ClearAllSaveData call PrintText - ld hl, .NoYesMenuDataHeader - call CopyMenuDataHeader + ld hl, .NoYesMenuHeader + call CopyMenuHeader call VerticalMenu ret c ld a, [wMenuCursorY] @@ -283,13 +283,13 @@ _DeleteSaveData: ; 4d54c text_jump UnknownText_0x1c564a db "@" -.NoYesMenuDataHeader: ; 0x4d585 +.NoYesMenuHeader: ; 0x4d585 db 0 ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: ; 0x4d58d +.MenuData: ; 0x4d58d db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 ; items db "NO@" diff --git a/engine/events/buena.asm b/engine/events/buena.asm index 96290a882..26043b534 100644 --- a/engine/events/buena.asm +++ b/engine/events/buena.asm @@ -1,8 +1,8 @@ Special_BuenasPassword: ; 8af6b xor a ld [wWhichIndexSet], a - ld hl, .MenuDataHeader - call CopyMenuDataHeader + ld hl, .MenuHeader + call CopyMenuHeader ld a, [wBuenasPassword] ld c, a farcall GetBuenasPassword @@ -28,16 +28,16 @@ Special_BuenasPassword: ; 8af6b ret ; 8afa9 -.MenuDataHeader: ; 0x8afa9 +.MenuHeader: ; 0x8afa9 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, 7 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x8afb1 db 0 -.MenuData2: ; 0x8afb2 +.MenuData: ; 0x8afb2 db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 0 ; items dw .PasswordIndices @@ -187,8 +187,8 @@ Special_BuenaPrize: ; 8afd4 ; 0x8b090 Buena_DisplayBlueCardBalance: ; 8b090 - ld hl, BlueCardBalanceMenuDataHeader - call LoadMenuDataHeader + ld hl, BlueCardBalanceMenuHeader + call LoadMenuHeader ret ; 8b097 @@ -202,8 +202,8 @@ PrintBlueCardBalance: ; 8b097 push de xor a ld [hBGMapMode], a - ld hl, BlueCardBalanceMenuDataHeader - call CopyMenuDataHeader + ld hl, BlueCardBalanceMenuHeader + call CopyMenuHeader call MenuBox call UpdateSprites call MenuBoxCoord2Tile @@ -227,25 +227,25 @@ PrintBlueCardBalance: ; 8b097 db "Points@" ; 8b0d1 -BlueCardBalanceMenuDataHeader: ; 0x8b0d1 +BlueCardBalanceMenuHeader: ; 0x8b0d1 db MENU_BACKUP_TILES ; flags menu_coords 0, 11, 11, 13 ; 8b0d6 Buena_PlacePrizeMenuBox: ; 8b0d6 - ld hl, .menudataheader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader ret ; 8b0dd -.menudataheader ; 0x8b0dd +.MenuHeader ; 0x8b0dd db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 17, TEXTBOX_Y - 1 ; 8b0e2 Buena_PrizeMenu: ; 8b0e2 - ld hl, .MenuDataHeader - call CopyMenuDataHeader + ld hl, .MenuHeader + call CopyMenuHeader ld a, [MenuSelection] ld [wMenuCursorBuffer], a xor a @@ -270,16 +270,16 @@ Buena_PrizeMenu: ; 8b0e2 ret ; 8b113 -.MenuDataHeader: ; 0x8b113 +.MenuHeader: ; 0x8b113 db MENU_BACKUP_TILES ; flags menu_coords 1, 1, 16, 9 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x8b11b db 0 -.MenuData2: ; 0x8b11c +.MenuData: ; 0x8b11c db SCROLLINGMENU_DISPLAY_ARROWS ; flags db 4, 13 ; rows, columns db 1 ; spacing diff --git a/engine/events/buena_menu.asm b/engine/events/buena_menu.asm index cf6fecf72..5436b590e 100644 --- a/engine/events/buena_menu.asm +++ b/engine/events/buena_menu.asm @@ -11,8 +11,8 @@ Special_AskRememberPassword: ; 4ae12 .DoMenu: ; 4ae1f lb bc, 14, 7 push bc - ld hl, YesNoMenuDataHeader - call CopyMenuDataHeader + ld hl, YesNoMenuHeader + call CopyMenuHeader pop bc ld a, b ld [wMenuBorderLeftCoord], a diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm index e0426c5bd..fba2cb0ef 100755 --- a/engine/events/elevator.asm +++ b/engine/events/elevator.asm @@ -119,12 +119,12 @@ Elevator_GoToFloor: ; 134c0 ; 134dd Elevator_AskWhichFloor: ; 134dd - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld hl, Elevator_WhichFloorText call PrintText call Elevator_GetCurrentFloorText - ld hl, Elevator_MenuDataHeader - call CopyMenuDataHeader + ld hl, Elevator_MenuHeader + call CopyMenuHeader call InitScrollingMenu call UpdateSprites xor a @@ -187,14 +187,14 @@ Elevator_GetCurrentFloorString: ; 1353f ret ; 13550 -Elevator_MenuDataHeader: ; 0x13550 +Elevator_MenuHeader: ; 0x13550 db MENU_BACKUP_TILES ; flags menu_coords 12, 1, 18, 9 - dw Elevator_MenuData2 + dw Elevator_MenuData db 1 ; default option ; 0x13558 -Elevator_MenuData2: ; 0x13558 +Elevator_MenuData: ; 0x13558 db SCROLLINGMENU_DISPLAY_ARROWS ; flags db 4, 0 ; rows, columns db 1 ; horizontal spacing diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm index 13bde6f7e..6547a7f30 100644 --- a/engine/events/kurt.asm +++ b/engine/events/kurt.asm @@ -23,7 +23,7 @@ Kurt_PrintTextHowMany: ; 8800c ; 0x88018 Special_SelectApricornForKurt: ; 88018 - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld c, $1 xor a ld [wMenuScrollPosition], a @@ -59,8 +59,8 @@ Special_SelectApricornForKurt: ; 88018 Kurt_SelectApricorn: ; 88055 farcall FindApricornsInBag jr c, .nope - ld hl, .MenuDataHeader - call CopyMenuDataHeader + ld hl, .MenuHeader + call CopyMenuHeader ld a, [MenuSelection] ld [wMenuCursorBuffer], a xor a @@ -83,16 +83,16 @@ Kurt_SelectApricorn: ; 88055 ret ; 88086 -.MenuDataHeader: ; 0x88086 +.MenuHeader: ; 0x88086 db MENU_BACKUP_TILES ; flags menu_coords 1, 1, 13, 10 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x8808e db 0 ; XXX -.MenuData2: ; 0x8808f +.MenuData: ; 0x8808f db SCROLLINGMENU_DISPLAY_ARROWS ; flags db 4, 7 db 1 @@ -129,8 +129,8 @@ Kurt_SelectQuantity: ; 880c2 ld [wItemQuantityBuffer], a ld a, $1 ld [wItemQuantityChangeBuffer], a - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader .loop xor a ld [hBGMapMode], a @@ -157,7 +157,7 @@ Kurt_SelectQuantity: ; 880c2 ret ; 8810d -.MenuDataHeader: ; 0x8810d +.MenuHeader: ; 0x8810d db MENU_BACKUP_TILES ; flags menu_coords 6, 9, SCREEN_WIDTH - 1, 12 dw NULL diff --git a/engine/events/mom.asm b/engine/events/mom.asm index 31350ed0e..d8719e58d 100644 --- a/engine/events/mom.asm +++ b/engine/events/mom.asm @@ -103,9 +103,9 @@ Special_BankOfMom: ; 16218 .AccessBankOfMom: ; 162a8 ld hl, UnknownText_0x1665d call PrintText - call LoadStandardMenuDataHeader - ld hl, MenuDataHeader_0x166b5 - call CopyMenuDataHeader + call LoadStandardMenuHeader + ld hl, MenuHeader_0x166b5 + call CopyMenuHeader call VerticalMenu call CloseWindow jr c, .cancel @@ -147,7 +147,7 @@ Special_BankOfMom: ; 16218 ld [hl], a ld a, 5 ld [wMomBankDigitCursorPosition], a - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call Mom_SetUpDepositMenu call Mom_Wait10Frames call Mom_WithdrawDepositMenuJoypad @@ -214,7 +214,7 @@ Special_BankOfMom: ; 16218 ld [hl], a ld a, 5 ld [wMomBankDigitCursorPosition], a - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call Mom_SetUpWithdrawMenu call Mom_Wait10Frames call Mom_WithdrawDepositMenuJoypad @@ -727,14 +727,14 @@ Mom_HeldString: ; 166b0 db "HELD@" ; 166b5 -MenuDataHeader_0x166b5: ; 0x166b5 +MenuHeader_0x166b5: ; 0x166b5 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, 10 - dw MenuData2_0x166bd + dw MenuData_0x166bd db 1 ; default option ; 0x166bd -MenuData2_0x166bd: ; 0x166bd +MenuData_0x166bd: ; 0x166bd db STATICMENU_CURSOR ; flags db 4 ; items db "GET@" diff --git a/engine/events/move_deleter.asm b/engine/events/move_deleter.asm index 3e06113ae..d5e4c56bf 100644 --- a/engine/events/move_deleter.asm +++ b/engine/events/move_deleter.asm @@ -19,7 +19,7 @@ Special_MoveDeletion: jr z, .onlyonemove ld hl, .AskWhichMoveText call PrintText - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall ChooseMoveToDelete push af call ReturnToMapWithSpeechTextbox diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm index be5f37564..31cb20bbb 100644 --- a/engine/events/move_tutor.asm +++ b/engine/events/move_tutor.asm @@ -52,8 +52,8 @@ Special_MoveTutor: ; 4925b ret CheckCanLearnMoveTutorMove: ; 492b9 - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader predef CanLearnTMHMMove @@ -98,6 +98,6 @@ CheckCanLearnMoveTutorMove: ; 492b9 scf ret -.MenuDataHeader: ; 0x4930a +.MenuHeader: ; 0x4930a db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 44a50034a..686f8560d 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -578,7 +578,7 @@ FlyFunction: ; ca3b .outdoors xor a ld [hMapAnims], a - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call ClearSprites farcall _FlyMap ld a, e diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index 213427119..ce50e80ac 100755 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -7,7 +7,7 @@ Special_PokemonCenterPC: ; 1559a ld hl, PokecenterPCText_AccessWhosePC call PC_DisplayTextWaitMenu ld hl, .TopMenu - call LoadMenuDataHeader + call LoadMenuHeader .loop xor a ld [hBGMapMode], a @@ -29,10 +29,10 @@ Special_PokemonCenterPC: ; 1559a .TopMenu: db MENU_BACKUP_TILES | MENU_NO_CLICK_SFX ; flags menu_coords 0, 0, 15, 12 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 0 ; items dw .WhichPC @@ -213,7 +213,7 @@ Function15715: ; 15715 ld [wPCItemsCursor], a ld [wPCItemsScrollPosition], a ld hl, PlayersPCMenuData - call LoadMenuDataHeader + call LoadMenuHeader .asm_15722 call UpdateTimePals call DoNthMenu @@ -234,10 +234,10 @@ PlayersPCMenuData: ; 0x15736 db MENU_BACKUP_TILES ; flags db 0, 0 ; top left corner coords (y, x) db 12, 15 ; bottom right corner coords (y, x) - dw .PlayersPCMenuData2 + dw .PlayersPCMenuData db 1 ; default selected option -.PlayersPCMenuData2: +.PlayersPCMenuData: db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 0 ; # items? dw .PlayersPCMenuList1 @@ -306,7 +306,7 @@ UnknownText_0x157cc: ; 0x157cc ; 0x157d1 PlayerWithdrawItemMenu: ; 0x157d1 - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall ClearPCItemScreen .loop call PCItemsJoypad @@ -382,7 +382,7 @@ PlayerWithdrawItemMenu: ; 0x157d1 db "@" PlayerTossItemMenu: ; 0x1585f - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall ClearPCItemScreen .loop call PCItemsJoypad @@ -416,7 +416,7 @@ PlayerDepositItemMenu: ; 0x1588b call .CheckItemsInBag jr c, .nope call DisableSpriteUpdates - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall DepositSellInitPackBuffers .loop farcall DepositSellPack @@ -558,7 +558,7 @@ PCItemsJoypad: ; 0x15985 ld a, $0 ld [wSpriteUpdatesEnabled], a ld hl, .PCItemsMenuData - call CopyMenuDataHeader + call CopyMenuHeader hlcoord 0, 0 ld b, 10 ld c, 18 @@ -621,10 +621,10 @@ PCItemsJoypad: ; 0x15985 .PCItemsMenuData: db MENU_BACKUP_TILES ; flags menu_coords 4, 1, 18, 10 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db SCROLLINGMENU_ENABLE_SELECT | SCROLLINGMENU_ENABLE_FUNCTION3 | SCROLLINGMENU_DISPLAY_ARROWS ; flags db 4, 8 ; rows/cols? db 2 ; horizontal spacing? diff --git a/engine/events/pokepic.asm b/engine/events/pokepic.asm index e9e14bbf4..be1cad82a 100755 --- a/engine/events/pokepic.asm +++ b/engine/events/pokepic.asm @@ -1,6 +1,6 @@ Pokepic:: ; 244e3 - ld hl, PokepicMenuDataHeader - call CopyMenuDataHeader + ld hl, PokepicMenuHeader + call CopyMenuHeader call MenuBox call UpdateSprites call ApplyTilemap @@ -28,8 +28,8 @@ Pokepic:: ; 244e3 ret ClosePokepic:: ; 24528 - ld hl, PokepicMenuDataHeader - call CopyMenuDataHeader + ld hl, PokepicMenuHeader + call CopyMenuHeader call ClearMenuBoxInterior call WaitBGMap call GetMemSGBLayout @@ -41,7 +41,7 @@ ClosePokepic:: ; 24528 call LoadStandardFont ret -PokepicMenuDataHeader: ; 0x24547 +PokepicMenuHeader: ; 0x24547 db MENU_BACKUP_TILES ; flags menu_coords 6, 4, 14, 13 dw NULL diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index eff1ab8f6..42dce7c65 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -1811,7 +1811,7 @@ CoinVendor_IntroScript: ; 0xbcde0 .loop ; 0xbcde4 special Special_DisplayMoneyAndCoinBalance - loadmenudata .MenuDataHeader + loadmenuheader .MenuHeader verticalmenu closewindow if_equal 1, .Buy50 @@ -1869,13 +1869,13 @@ CoinVendor_IntroScript: ; 0xbcde0 ; 0xbce54 -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 4, 15, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 3 ; items db " 50 : ¥1000@" diff --git a/engine/events/unown_walls.asm b/engine/events/unown_walls.asm index 4d59a2f7a..903b7bb2b 100644 --- a/engine/events/unown_walls.asm +++ b/engine/events/unown_walls.asm @@ -105,7 +105,7 @@ SpecialKabutoChamber: ; 8ae4e Special_DisplayUnownWords: ; 8ae68 ld a, [ScriptVar] - ld hl, MenuDataHeaders_UnownWalls + ld hl, MenuHeaders_UnownWalls and a jr z, .load @@ -117,7 +117,7 @@ Special_DisplayUnownWords: ; 8ae68 jr nz, .loop .load - call LoadMenuDataHeader + call LoadMenuHeader xor a ld [hBGMapMode], a call MenuBox diff --git a/engine/init_gender.asm b/engine/init_gender.asm index 76b1640d9..8837ebc72 100755 --- a/engine/init_gender.asm +++ b/engine/init_gender.asm @@ -30,8 +30,8 @@ InitGender: ; 48dcb (12:4dcb) call SetPalettes ld hl, TextJump_AreYouABoyOrAreYouAGirl call PrintText - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader call WaitBGMap2 call VerticalMenu call CloseWindow @@ -43,14 +43,14 @@ InitGender: ; 48dcb (12:4dcb) ret ; 48dfc (12:4dfc) -.MenuDataHeader: ; 0x48dfc +.MenuHeader: ; 0x48dfc db MENU_BACKUP_TILES ; flags menu_coords 6, 4, 12, 9 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x48e04 -.MenuData2: ; 0x48e04 +.MenuData: ; 0x48e04 db STATICMENU_CURSOR | STATICMENU_WRAP | STATICMENU_DISABLE_B ; flags db 2 ; items db "Boy@" diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index e8a3f221a..dc640c4dc 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -352,7 +352,7 @@ Continue: ; 5d65 farcall TryLoadSaveFile jr c, .FailToLoad farcall _LoadData - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call DisplaySaveInfoOnContinue ld a, $1 ld [hBGMapMode], a @@ -539,27 +539,27 @@ DisplayContinueDataWithRTCError: ; 5eaf Continue_LoadMenuHeader: ; 5ebf xor a ld [hBGMapMode], a - ld hl, .MenuDataHeader_Dex + ld hl, .MenuHeader_Dex ld a, [wStatusFlags] bit STATUSFLAGS_POKEDEX_F, a jr nz, .show_menu - ld hl, .MenuDataHeader_NoDex + ld hl, .MenuHeader_NoDex .show_menu - call _OffsetMenuDataHeader + call _OffsetMenuHeader call MenuBox call PlaceVerticalMenuItems ret ; 5ed9 -.MenuDataHeader_Dex: ; 5ed9 +.MenuHeader_Dex: ; 5ed9 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 15, 9 - dw .MenuData2_Dex + dw .MenuData_Dex db 1 ; default option ; 5ee1 -.MenuData2_Dex: ; 5ee1 +.MenuData_Dex: ; 5ee1 db 0 ; flags db 4 ; items db "PLAYER@" @@ -568,14 +568,14 @@ Continue_LoadMenuHeader: ; 5ebf db "TIME@" ; 5efb -.MenuDataHeader_NoDex: ; 5efb +.MenuHeader_NoDex: ; 5efb db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 15, 9 - dw .MenuData2_NoDex + dw .MenuData_NoDex db 1 ; default option ; 5f03 -.MenuData2_NoDex: ; 5f03 +.MenuData_NoDex: ; 5f03 db 0 ; flags db 4 ; items db "PLAYER @" @@ -826,7 +826,7 @@ NamePlayer: ; 0x6074 ; 60e9 Unreferenced_Function60e9: - call LoadMenuDataHeader + call LoadMenuHeader call VerticalMenu ld a, [wMenuCursorY] dec a diff --git a/engine/link.asm b/engine/link.asm index 86a593284..be9d68c9e 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -1670,7 +1670,7 @@ LinkTrade: ; 28b87 ld hl, UnknownText_0x28eb8 bccoord 1, 14 call PlaceHLTextAtBC - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader hlcoord 10, 7 ld b, 3 ld c, 7 diff --git a/engine/link_trade.asm b/engine/link_trade.asm index 504dc6d95..fdabb01a2 100755 --- a/engine/link_trade.asm +++ b/engine/link_trade.asm @@ -19,7 +19,7 @@ Function16d42e: ; 16d42e ; 16d43b Function16d43b: ; 16d43b - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call ClearBGPalettes call ClearTileMap call ClearSprites @@ -169,7 +169,7 @@ LinkTextbox: ; 16d6ca ; 16d6ce Function16d6ce: ; 16d6ce - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call Function16d6e1 farcall WaitLinkTransfer call Call_ExitMenu diff --git a/engine/mail.asm b/engine/mail.asm index d2649bdc5..b0da3580e 100755 --- a/engine/mail.asm +++ b/engine/mail.asm @@ -313,7 +313,7 @@ IsAnyMonHoldingMail: ; 44781 _PlayerMailBoxMenu: ; 0x447a0 call InitMail jr z, .nomail - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call MailboxPC jp CloseWindow @@ -388,8 +388,8 @@ MailboxPC: ; 0x44806 ld [wCurMessageIndex], a .loop call InitMail - ld hl, .TopMenuDataHeader - call CopyMenuDataHeader + ld hl, .TopMenuHeader + call CopyMenuHeader xor a ld [hBGMapMode], a call InitScrollingMenu @@ -417,8 +417,8 @@ MailboxPC: ; 0x44806 ; 0x4484a .Submenu: ; 0x4484a - ld hl, .SubMenuDataHeader - call LoadMenuDataHeader + ld hl, .SubMenuHeader + call LoadMenuHeader call VerticalMenu call ExitMenu jr c, .subexit @@ -557,13 +557,13 @@ MailboxPC: ; 0x44806 .Cancel: ret -.TopMenuDataHeader: ; 0x4494c +.TopMenuHeader: ; 0x4494c db MENU_BACKUP_TILES ; flags menu_coords 8, 1, SCREEN_WIDTH - 2, 10 - dw .TopMenuData2 + dw .TopMenuData db 1 ; default option -.TopMenuData2: +.TopMenuData: db SCROLLINGMENU_DISPLAY_ARROWS ; flags db 4, 0 ; rows/columns? db 1 ; horizontal spacing? @@ -572,13 +572,13 @@ MailboxPC: ; 0x44806 dba NULL dba NULL -.SubMenuDataHeader: ; 0x44964 +.SubMenuHeader: ; 0x44964 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 13, 9 - dw .SubMenuData2 + dw .SubMenuData db 1 ; default option -.SubMenuData2: +.SubMenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "READ MAIL@" diff --git a/engine/main_menu.asm b/engine/main_menu.asm index ff2d187d2..25235de8f 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -14,8 +14,8 @@ MainMenu: ; 49cdc call MainMenu_GetWhichMenu ld [wWhichIndexSet], a call MainMenu_PrintCurrentTimeAndDay - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader call MainMenuJoypadLoop call CloseWindow jr c, .quit @@ -29,14 +29,14 @@ MainMenu: ; 49cdc ret ; 49d14 -.MenuDataHeader: ; 49d14 +.MenuHeader: ; 49d14 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 16, 7 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 49d1c -.MenuData2: ; 49d1c +.MenuData: ; 49d1c db STATICMENU_CURSOR ; flags db 0 ; items dw MainMenuItems diff --git a/engine/mart.asm b/engine/mart.asm index 0306a3e49..8385cf0ad 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -36,7 +36,7 @@ MartDialog: ; 15a61 HerbShop: ; 15a6e call FarReadMart - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld hl, Text_HerbShop_Intro call MartTextBox call BuyMenu @@ -50,7 +50,7 @@ BargainShop: ; 15a84 ld de, BargainShopData call LoadMartPointer call ReadMart - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld hl, Text_BargainShop_Intro call MartTextBox call BuyMenu @@ -69,7 +69,7 @@ BargainShop: ; 15a84 Pharmacist: ; 15aae call FarReadMart - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld hl, Text_Pharmacist_Intro call MartTextBox call BuyMenu @@ -79,18 +79,18 @@ Pharmacist: ; 15aae ; 15ac4 RooftopSale: ; 15ac4 - ld b, BANK(RooftopSaleData1) - ld de, RooftopSaleData1 + ld b, BANK(RooftopSaleMart1) + ld de, RooftopSaleMart1 ld hl, wStatusFlags bit STATUSFLAGS_HALL_OF_FAME_F, [hl] jr z, .ok - ld b, BANK(RooftopSaleData2) - ld de, RooftopSaleData2 + ld b, BANK(RooftopSaleMart2) + ld de, RooftopSaleMart2 .ok call LoadMartPointer call ReadMart - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld hl, Text_Mart_HowMayIHelpYou call MartTextBox call BuyMenu @@ -158,7 +158,7 @@ StandardMart: ; 15b47 ; 15b62 .HowMayIHelpYou: ; 15b62 - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld hl, Text_Mart_HowMayIHelpYou call PrintText ld a, $1 ; top menu @@ -166,8 +166,8 @@ StandardMart: ; 15b47 ; 15b6e .TopMenu: ; 15b6e - ld hl, MenuDataHeader_BuySell - call CopyMenuDataHeader + ld hl, MenuHeader_BuySell + call CopyMenuHeader call VerticalMenu jr c, .quit ld a, [wMenuCursorY] @@ -211,7 +211,7 @@ StandardMart: ; 15b47 ; 15baf .AnythingElse: ; 15baf - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld hl, Text_Mart_AnythingElse call PrintText ld a, $1 ; top menu @@ -445,8 +445,8 @@ GetMartDialogGroup: ; 15ca3 BuyMenuLoop: ; 15cef farcall Special_PlaceMoneyTopRight call UpdateSprites - ld hl, MenuDataHeader_Buy - call CopyMenuDataHeader + ld hl, MenuHeader_Buy + call CopyMenuHeader ld a, [wMenuCursorBufferBackup] ld [wMenuCursorBuffer], a ld a, [wMenuScrollPositionBackup] @@ -616,14 +616,14 @@ Text_Mart_CostsThisMuch: ; 0x15e13 db "@" ; 0x15e18 -MenuDataHeader_Buy: ; 0x15e18 +MenuHeader_Buy: ; 0x15e18 db MENU_BACKUP_TILES ; flags menu_coords 1, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .menudata2 + dw .MenuData db 1 ; default option ; 0x15e20 -.menudata2 ; 0x15e20 +.MenuData ; 0x15e20 db SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_FUNCTION3 ; flags db 4, 8 ; rows, columns db 1 ; horizontal spacing @@ -900,14 +900,14 @@ Text_Mart_HowMayIHelpYou: ; 0x15f83 db "@" ; 0x15f88 -MenuDataHeader_BuySell: ; 0x15f88 +MenuHeader_BuySell: ; 0x15f88 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 7, 8 - dw .menudata2 + dw .MenuData db 1 ; default option ; 0x15f90 -.menudata2 ; 0x15f90 +.MenuData ; 0x15f90 db STATICMENU_CURSOR ; strings db 3 ; items db "BUY@" diff --git a/engine/menu.asm b/engine/menu.asm index 802bece08..a4515b414 100755 --- a/engine/menu.asm +++ b/engine/menu.asm @@ -1,6 +1,6 @@ _2DMenu_:: ; 2400e - ld hl, CopyMenuData2 - ld a, [wMenuData2_2DMenuItemStringsBank] + ld hl, CopyMenuData + ld a, [wMenuData_2DMenuItemStringsBank] rst FarCall call Draw2DMenu @@ -11,8 +11,8 @@ _2DMenu_:: ; 2400e ; 24022 _InterpretBattleMenu:: ; 24022 - ld hl, CopyMenuData2 - ld a, [wMenuData2_2DMenuItemStringsBank] + ld hl, CopyMenuData + ld a, [wMenuData_2DMenuItemStringsBank] rst FarCall call Draw2DMenu @@ -24,8 +24,8 @@ _InterpretBattleMenu:: ; 24022 ; 2403c _InterpretMobileMenu:: ; 2403c - ld hl, CopyMenuData2 - ld a, [wMenuData2_2DMenuItemStringsBank] + ld hl, CopyMenuData + ld a, [wMenuData_2DMenuItemStringsBank] rst FarCall call Draw2DMenu @@ -73,7 +73,7 @@ Get2DMenuSelection: ; 2408f call StaticMenuJoypad call MenuClickSound Mobile_GetMenuSelection: ; 24098 - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 1, a jr z, .skip call GetMenuJoypad @@ -81,7 +81,7 @@ Mobile_GetMenuSelection: ; 24098 jr nz, .quit1 .skip - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 0, a jr nz, .skip2 call GetMenuJoypad @@ -111,20 +111,20 @@ Mobile_GetMenuSelection: ; 24098 ; 240cd Get2DMenuNumberOfColumns: ; 240cd - ld a, [wMenuData2_2DMenuDimensions] + ld a, [wMenuData_2DMenuDimensions] and $f ret ; 240d3 Get2DMenuNumberOfRows: ; 240d3 - ld a, [wMenuData2_2DMenuDimensions] + ld a, [wMenuData_2DMenuDimensions] swap a and $f ret ; 240db Place2DMenuItemStrings: ; 240db - ld hl, wMenuData2_2DMenuItemStringsAddr + ld hl, wMenuData_2DMenuItemStringsAddr ld e, [hl] inc hl ld d, [hl] @@ -139,10 +139,10 @@ Place2DMenuItemStrings: ; 240db ld c, a .col push bc - ld a, [wMenuData2_2DMenuItemStringsBank] + ld a, [wMenuData_2DMenuItemStringsBank] call Place2DMenuItemName inc de - ld a, [wMenuData2_2DMenuSpacing] + ld a, [wMenuData_2DMenuSpacing] ld c, a ld b, 0 add hl, bc @@ -155,13 +155,13 @@ Place2DMenuItemStrings: ; 240db pop bc dec b jr nz, .row - ld hl, wMenuData2_2DMenuFunctionAddr + ld hl, wMenuData_2DMenuFunctionAddr ld a, [hli] ld h, [hl] ld l, a or h ret z - ld a, [wMenuData2_2DMenuFunctionBank] + ld a, [wMenuData_2DMenuFunctionBank] rst FarCall ret ; 2411a @@ -229,7 +229,7 @@ Init2DMenuCursorPosition: ; 2411a (9:411a) ld hl, w2DMenuFlags1 ld [hli], a ld [hld], a - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 5, a ret z set 5, [hl] @@ -238,14 +238,14 @@ Init2DMenuCursorPosition: ; 2411a (9:411a) ; 2418a .InitFlags_b: ; 2418a - ld a, [wMenuData2_2DMenuSpacing] + ld a, [wMenuData_2DMenuSpacing] or $20 ld [w2DMenuCursorOffsets], a ret ; 24193 .InitFlags_c: ; 24193 - ld hl, wMenuData2Flags + ld hl, wMenuDataFlags ld a, A_BUTTON bit 0, [hl] jr nz, .skip @@ -771,7 +771,7 @@ Error_Cant_ExitMenu: ; 2445d ; 2446d _InitVerticalMenuCursor:: ; 2446d - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] ld b, a ld hl, w2DMenuCursorInitY ld a, [wMenuBorderTopCoord] @@ -786,7 +786,7 @@ _InitVerticalMenuCursor:: ; 2446d inc a ld [hli], a ; w2DMenuNumRows - ld a, [wMenuData2Items] + ld a, [wMenuDataItems] ld [hli], a ; w2DMenuNumCols ld a, 1 @@ -821,7 +821,7 @@ _InitVerticalMenuCursor:: ; 2446d and a jr z, .load_at_the_top ld c, a - ld a, [wMenuData2Items] + ld a, [wMenuDataItems] cp c jr nc, .load_position .load_at_the_top diff --git a/engine/menu_2.asm b/engine/menu_2.asm index c8c4ebf5d..84cc9ca5f 100644 --- a/engine/menu_2.asm +++ b/engine/menu_2.asm @@ -28,21 +28,21 @@ PlaceMenuItemQuantity: ; 0x24ac3 ret Special_PlaceMoneyTopRight: ; 24ae8 - ld hl, MenuDataHeader_0x24b15 - call CopyMenuDataHeader - jr PlaceMoneyDataHeader + ld hl, MenuHeader_0x24b15 + call CopyMenuHeader + jr PlaceMoneyTextBox PlaceMoneyBottomLeft: ; 24af0 - ld hl, MenuDataHeader_0x24b1d - call CopyMenuDataHeader - jr PlaceMoneyDataHeader + ld hl, MenuHeader_0x24b1d + call CopyMenuHeader + jr PlaceMoneyTextBox PlaceMoneyAtTopLeftOfTextbox: ; 24af8 - ld hl, MenuDataHeader_0x24b15 + ld hl, MenuHeader_0x24b15 lb de, 0, 11 - call OffsetMenuDataHeader + call OffsetMenuHeader -PlaceMoneyDataHeader: ; 24b01 +PlaceMoneyTextBox: ; 24b01 call MenuBox call MenuBoxCoord2Tile ld de, SCREEN_WIDTH + 1 @@ -52,13 +52,13 @@ PlaceMoneyDataHeader: ; 24b01 call PrintNum ret -MenuDataHeader_0x24b15: ; 0x24b15 +MenuHeader_0x24b15: ; 0x24b15 db MENU_BACKUP_TILES ; flags menu_coords 11, 0, SCREEN_WIDTH - 1, 2 dw NULL db 1 ; default option -MenuDataHeader_0x24b1d: ; 0x24b1d +MenuHeader_0x24b1d: ; 0x24b1d db MENU_BACKUP_TILES ; flags menu_coords 0, 11, 8, 13 dw NULL diff --git a/engine/mon_menu.asm b/engine/mon_menu.asm index cb070e555..8749f0df6 100755 --- a/engine/mon_menu.asm +++ b/engine/mon_menu.asm @@ -5,8 +5,8 @@ MonSubmenu: ; 24d19 ld [hBGMapMode], a call GetMonSubmenuItems farcall FreezeMonIcons - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader call .GetTopCoord call PopulateMonMenu @@ -19,7 +19,7 @@ MonSubmenu: ; 24d19 ret ; 24d3f -.MenuDataHeader: ; 24d3f +.MenuHeader: ; 24d3f db MENU_BACKUP_TILES ; flags menu_coords 6, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw 0 @@ -43,9 +43,9 @@ MonSubmenu: ; 24d19 MonMenuLoop: ; 24d59 .loop ld a, MENU_UNUSED_3 | MENU_BACKUP_TILES_2 ; flags - ld [wMenuData2Flags], a + ld [wMenuDataFlags], a ld a, [Buffer1] ; items - ld [wMenuData2Items], a + ld [wMenuDataItems], a call InitVerticalMenuCursor ld hl, w2DMenuFlags1 set 6, [hl] @@ -256,16 +256,16 @@ AddMonMenuItem: ; 24e83 ; 24e99 BattleMonMenu: ; 24e99 - ld hl, MenuDataHeader_0x24ed4 - call CopyMenuDataHeader + ld hl, MenuHeader_0x24ed4 + call CopyMenuHeader xor a ld [hBGMapMode], a call MenuBox call UpdateSprites call PlaceVerticalMenuItems call WaitBGMap - call CopyMenuData2 - ld a, [wMenuData2Flags] + call CopyMenuData + ld a, [wMenuDataFlags] bit 7, a jr z, .set_carry call InitVerticalMenuCursor @@ -288,14 +288,14 @@ BattleMonMenu: ; 24e99 ret ; 24ed4 -MenuDataHeader_0x24ed4: ; 24ed4 +MenuHeader_0x24ed4: ; 24ed4 db 0 ; flags menu_coords 11, 11, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 - dw MenuData2_0x24edc + dw MenuData_0x24edc db 1 ; default option ; 24edc -MenuData2_0x24edc: ; 24edc +MenuData_0x24edc: ; 24edc db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 ; items db "SWITCH@" diff --git a/engine/move_mon.asm b/engine/move_mon.asm index 52894359e..8c1dddd59 100755 --- a/engine/move_mon.asm +++ b/engine/move_mon.asm @@ -1786,7 +1786,7 @@ TextJump_WasSentToBillsPC: ; 0xe3d9 InitNickname: ; e3de push de - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call DisableSpriteUpdates pop de push de diff --git a/engine/pack.asm b/engine/pack.asm index da75b71b1..2f369fb54 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -74,8 +74,8 @@ Pack: ; 10000 ret .ItemsPocketMenu: ; 10067 (4:4067) - ld hl, ItemsPocketMenuDataHeader - call CopyMenuDataHeader + ld hl, ItemsPocketMenuHeader + call CopyMenuHeader ld a, [wItemsPocketCursor] ld [wMenuCursorBuffer], a ld a, [wItemsPocketScrollPosition] @@ -102,8 +102,8 @@ Pack: ; 10000 ret .KeyItemsPocketMenu: ; 100a6 (4:40a6) - ld hl, KeyItemsPocketMenuDataHeader - call CopyMenuDataHeader + ld hl, KeyItemsPocketMenuHeader + call CopyMenuHeader ld a, [wKeyItemsPocketCursor] ld [wMenuCursorBuffer], a ld a, [wKeyItemsPocketScrollPosition] @@ -141,16 +141,16 @@ Pack: ; 10000 ld a, [wItemAttributeParamBuffer] and a jr nz, .use_quit - ld hl, .MenuDataHeader2 + ld hl, .MenuHeader2 ld de, .Jumptable2 jr .load_jump .use_quit - ld hl, .MenuDataHeader1 + ld hl, .MenuHeader1 ld de, .Jumptable1 .load_jump push de - call LoadMenuDataHeader + call LoadMenuHeader call VerticalMenu call ExitMenu pop hl @@ -161,14 +161,14 @@ Pack: ; 10000 jp hl ; 10124 (4:4124) -.MenuDataHeader1: ; 0x10124 +.MenuHeader1: ; 0x10124 db MENU_BACKUP_TILES ; flags menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2_1 + dw .MenuData_1 db 1 ; default option ; 0x1012c -.MenuData2_1: ; 0x1012c +.MenuData_1: ; 0x1012c db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 ; items db "USE@" @@ -181,14 +181,14 @@ Pack: ; 10000 ; 1013b -.MenuDataHeader2: ; 0x1013b +.MenuHeader2: ; 0x1013b db MENU_BACKUP_TILES ; flags menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2_2 + dw .MenuData_2 db 1 ; default option ; 0x10143 -.MenuData2_2: ; 0x10143 +.MenuData_2: ; 0x10143 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 ; items db "USE@" @@ -232,8 +232,8 @@ Pack: ; 10000 ret .BallsPocketMenu: ; 10198 (4:4198) - ld hl, BallsPocketMenuDataHeader - call CopyMenuDataHeader + ld hl, BallsPocketMenuHeader + call CopyMenuHeader ld a, [wBallsPocketCursor] ld [wMenuCursorBuffer], a ld a, [wBallsPocketScrollPosition] @@ -280,36 +280,36 @@ Pack: ; 10000 jr .tossable_unselectable .usable - ld hl, MenuDataHeader_UsableKeyItem + ld hl, MenuHeader_UsableKeyItem ld de, Jumptable_UseGiveTossRegisterQuit jr .build_menu .selectable_usable - ld hl, MenuDataHeader_UsableItem + ld hl, MenuHeader_UsableItem ld de, Jumptable_UseGiveTossQuit jr .build_menu .tossable_selectable - ld hl, MenuDataHeader_UnusableItem + ld hl, MenuHeader_UnusableItem ld de, Jumptable_UseQuit jr .build_menu .tossable_unselectable - ld hl, MenuDataHeader_UnusableKeyItem + ld hl, MenuHeader_UnusableKeyItem ld de, Jumptable_UseRegisterQuit jr .build_menu .unusable - ld hl, MenuDataHeader_HoldableKeyItem + ld hl, MenuHeader_HoldableKeyItem ld de, Jumptable_GiveTossRegisterQuit jr .build_menu .selectable_unusable - ld hl, MenuDataHeader_HoldableItem + ld hl, MenuHeader_HoldableItem ld de, Jumptable_GiveTossQuit .build_menu push de - call LoadMenuDataHeader + call LoadMenuHeader call VerticalMenu call ExitMenu pop hl @@ -320,14 +320,14 @@ Pack: ; 10000 jp hl ; 10249 (4:4249) -MenuDataHeader_UsableKeyItem: ; 0x10249 +MenuHeader_UsableKeyItem: ; 0x10249 db MENU_BACKUP_TILES ; flags menu_coords 13, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x10251 -.MenuData2: ; 0x10251 +.MenuData: ; 0x10251 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 5 ; items db "USE@" @@ -345,14 +345,14 @@ Jumptable_UseGiveTossRegisterQuit: ; 1026a dw QuitItemSubmenu ; 10274 -MenuDataHeader_UsableItem: ; 0x10274 +MenuHeader_UsableItem: ; 0x10274 db MENU_BACKUP_TILES ; flags menu_coords 13, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x1027c -.MenuData2: ; 0x1027c +.MenuData: ; 0x1027c db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 4 ; items db "USE@" @@ -368,14 +368,14 @@ Jumptable_UseGiveTossQuit: ; 10291 dw QuitItemSubmenu ; 10299 -MenuDataHeader_UnusableItem: ; 0x10299 +MenuHeader_UnusableItem: ; 0x10299 db MENU_BACKUP_TILES ; flags menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x102a1 -.MenuData2: ; 0x102a1 +.MenuData: ; 0x102a1 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 ; items db "USE@" @@ -387,14 +387,14 @@ Jumptable_UseQuit: ; 102ac dw QuitItemSubmenu ; 102b0 -MenuDataHeader_UnusableKeyItem: ; 0x102b0 +MenuHeader_UnusableKeyItem: ; 0x102b0 db MENU_BACKUP_TILES ; flags menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x102b8 -.MenuData2: ; 0x102b8 +.MenuData: ; 0x102b8 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 ; items db "USE@" @@ -408,14 +408,14 @@ Jumptable_UseRegisterQuit: ; 102c7 dw QuitItemSubmenu ; 102cd -MenuDataHeader_HoldableKeyItem: ; 0x102cd +MenuHeader_HoldableKeyItem: ; 0x102cd db MENU_BACKUP_TILES ; flags menu_coords 13, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x102d5 -.MenuData2: ; 0x102d5 +.MenuData: ; 0x102d5 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 4 ; items db "GIVE@" @@ -431,14 +431,14 @@ Jumptable_GiveTossRegisterQuit: ; 102ea dw QuitItemSubmenu ; 102f2 -MenuDataHeader_HoldableItem: ; 0x102f2 +MenuHeader_HoldableItem: ; 0x102f2 db MENU_BACKUP_TILES ; flags menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x102fa -.MenuData2: ; 0x102fa +.MenuData: ; 0x102fa db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 ; items db "GIVE@" @@ -724,8 +724,8 @@ BattlePack: ; 10493 ret .ItemsPocketMenu: ; 104fa (4:44fa) - ld hl, ItemsPocketMenuDataHeader - call CopyMenuDataHeader + ld hl, ItemsPocketMenuHeader + call CopyMenuHeader ld a, [wItemsPocketCursor] ld [wMenuCursorBuffer], a ld a, [wItemsPocketScrollPosition] @@ -752,8 +752,8 @@ BattlePack: ; 10493 ret .KeyItemsPocketMenu: ; 10539 (4:4539) - ld hl, KeyItemsPocketMenuDataHeader - call CopyMenuDataHeader + ld hl, KeyItemsPocketMenuHeader + call CopyMenuHeader ld a, [wKeyItemsPocketCursor] ld [wMenuCursorBuffer], a ld a, [wKeyItemsPocketScrollPosition] @@ -803,8 +803,8 @@ BattlePack: ; 10493 ret .BallsPocketMenu: ; 105a6 (4:45a6) - ld hl, BallsPocketMenuDataHeader - call CopyMenuDataHeader + ld hl, BallsPocketMenuHeader + call CopyMenuHeader ld a, [wBallsPocketCursor] ld [wMenuCursorBuffer], a ld a, [wBallsPocketScrollPosition] @@ -827,16 +827,16 @@ ItemSubmenu: ; 105d3 (4:45d3) TMHMSubmenu: ; 105dc (4:45dc) and a jr z, .NoUse - ld hl, .UsableMenuDataHeader + ld hl, .UsableMenuHeader ld de, .UsableJumptable jr .proceed .NoUse: - ld hl, .UnusableMenuDataHeader + ld hl, .UnusableMenuHeader ld de, .UnusableJumptable .proceed push de - call LoadMenuDataHeader + call LoadMenuHeader call VerticalMenu call ExitMenu pop hl @@ -847,14 +847,14 @@ TMHMSubmenu: ; 105dc (4:45dc) jp hl ; 10601 (4:4601) -.UsableMenuDataHeader: ; 0x10601 +.UsableMenuHeader: ; 0x10601 db MENU_BACKUP_TILES ; flags menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .UsableMenuData2 + dw .UsableMenuData db 1 ; default option ; 0x10609 -.UsableMenuData2: ; 0x10609 +.UsableMenuData: ; 0x10609 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 ; items db "USE@" @@ -866,14 +866,14 @@ TMHMSubmenu: ; 105dc (4:45dc) dw .Quit ; 10618 -.UnusableMenuDataHeader: ; 0x10618 +.UnusableMenuHeader: ; 0x10618 db MENU_BACKUP_TILES ; flags menu_coords 13, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .UnusableMenuData2 + dw .UnusableMenuData db 1 ; default option ; 0x10620 -.UnusableMenuData2: ; 0x10620 +.UnusableMenuData: ; 0x10620 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 1 ; items db "QUIT@" @@ -1006,8 +1006,8 @@ DepositSellPack: ; 106be .ItemsPocket: ; 106d9 (4:46d9) xor a ; ITEM_POCKET call InitPocket - ld hl, PC_Mart_ItemsPocketMenuDataHeader - call CopyMenuDataHeader + ld hl, PC_Mart_ItemsPocketMenuHeader + call CopyMenuHeader ld a, [wItemsPocketCursor] ld [wMenuCursorBuffer], a ld a, [wItemsPocketScrollPosition] @@ -1022,8 +1022,8 @@ DepositSellPack: ; 106be .KeyItemsPocket: ; 106ff (4:46ff) ld a, KEY_ITEM_POCKET call InitPocket - ld hl, PC_Mart_KeyItemsPocketMenuDataHeader - call CopyMenuDataHeader + ld hl, PC_Mart_KeyItemsPocketMenuHeader + call CopyMenuHeader ld a, [wKeyItemsPocketCursor] ld [wMenuCursorBuffer], a ld a, [wKeyItemsPocketScrollPosition] @@ -1047,8 +1047,8 @@ DepositSellPack: ; 106be .BallsPocket: ; 1073b (4:473b) ld a, BALL_POCKET call InitPocket - ld hl, PC_Mart_BallsPocketMenuDataHeader - call CopyMenuDataHeader + ld hl, PC_Mart_BallsPocketMenuHeader + call CopyMenuHeader ld a, [wBallsPocketCursor] ld [wMenuCursorBuffer], a ld a, [wBallsPocketScrollPosition] @@ -1153,18 +1153,18 @@ TutorialPack: ; 107bb .Items: ; 107e9 (4:47e9) xor a ; ITEM_POCKET - ld hl, .ItemsMenuDataHeader + ld hl, .ItemsMenuHeader jr .DisplayPocket ; 107ef (4:47ef) -.ItemsMenuDataHeader: ; 0x107ef +.ItemsMenuHeader: ; 0x107ef db MENU_BACKUP_TILES ; flags menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .ItemsMenuData2 + dw .ItemsMenuData db 1 ; default option ; 0x107f7 -.ItemsMenuData2: ; 0x107f7 +.ItemsMenuData: ; 0x107f7 db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags db 5, 8 ; rows, columns db 2 ; horizontal spacing @@ -1176,18 +1176,18 @@ TutorialPack: ; 107bb .KeyItems: ; 10807 (4:4807) ld a, KEY_ITEM_POCKET - ld hl, .KeyItemsMenuDataHeader + ld hl, .KeyItemsMenuHeader jr .DisplayPocket ; 1080e (4:480e) -.KeyItemsMenuDataHeader: ; 0x1080e +.KeyItemsMenuHeader: ; 0x1080e db MENU_BACKUP_TILES ; flags menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .KeyItemsMenuData2 + dw .KeyItemsMenuData db 1 ; default option ; 0x10816 -.KeyItemsMenuData2: ; 0x10816 +.KeyItemsMenuData: ; 0x10816 db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags db 5, 8 ; rows, columns db 1 ; horizontal spacing @@ -1208,18 +1208,18 @@ TutorialPack: ; 107bb .Balls: ; 1083b (4:483b) ld a, BALL_POCKET - ld hl, .BallsMenuDataHeader + ld hl, .BallsMenuHeader jr .DisplayPocket ; 10842 (4:4842) -.BallsMenuDataHeader: ; 0x10842 +.BallsMenuHeader: ; 0x10842 db MENU_BACKUP_TILES ; flags menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .BallsMenuData2 + dw .BallsMenuData db 1 ; default option ; 0x1084a -.BallsMenuData2: ; 0x1084a +.BallsMenuData: ; 0x1084a db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags db 5, 8 ; rows, columns db 2 ; horizontal spacing @@ -1233,7 +1233,7 @@ TutorialPack: ; 107bb push hl call InitPocket pop hl - call CopyMenuDataHeader + call CopyMenuHeader call ScrollingMenu ret @@ -1536,14 +1536,14 @@ Pack_InitColors: ; 10a40 ret ; 10a4f -ItemsPocketMenuDataHeader: ; 0x10a4f +ItemsPocketMenuHeader: ; 0x10a4f db MENU_BACKUP_TILES ; flags menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x10a57 -.MenuData2: ; 0x10a57 +.MenuData: ; 0x10a57 db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags db 5, 8 ; rows, columns db 2 ; horizontal spacing @@ -1553,14 +1553,14 @@ ItemsPocketMenuDataHeader: ; 0x10a4f dba UpdateItemDescription ; 10a67 -PC_Mart_ItemsPocketMenuDataHeader: ; 0x10a67 +PC_Mart_ItemsPocketMenuHeader: ; 0x10a67 db MENU_BACKUP_TILES ; flags menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x10a6f -.MenuData2: ; 0x10a6f +.MenuData: ; 0x10a6f db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ; flags db 5, 8 ; rows, columns db 2 ; horizontal spacing @@ -1570,14 +1570,14 @@ PC_Mart_ItemsPocketMenuDataHeader: ; 0x10a67 dba UpdateItemDescription ; 10a7f -KeyItemsPocketMenuDataHeader: ; 0x10a7f +KeyItemsPocketMenuHeader: ; 0x10a7f db MENU_BACKUP_TILES ; flags menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x10a87 -.MenuData2: ; 0x10a87 +.MenuData: ; 0x10a87 db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags db 5, 8 ; rows, columns db 1 ; horizontal spacing @@ -1587,14 +1587,14 @@ KeyItemsPocketMenuDataHeader: ; 0x10a7f dba UpdateItemDescription ; 10a97 -PC_Mart_KeyItemsPocketMenuDataHeader: ; 0x10a97 +PC_Mart_KeyItemsPocketMenuHeader: ; 0x10a97 db MENU_BACKUP_TILES ; flags menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x10a9f -.MenuData2: ; 0x10a9f +.MenuData: ; 0x10a9f db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ; flags db 5, 8 ; rows, columns db 1 ; horizontal spacing @@ -1604,14 +1604,14 @@ PC_Mart_KeyItemsPocketMenuDataHeader: ; 0x10a97 dba UpdateItemDescription ; 10aaf -BallsPocketMenuDataHeader: ; 0x10aaf +BallsPocketMenuHeader: ; 0x10aaf db MENU_BACKUP_TILES ; flags menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x10ab7 -.MenuData2: ; 0x10ab7 +.MenuData: ; 0x10ab7 db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags db 5, 8 ; rows, columns db 2 ; horizontal spacing @@ -1621,14 +1621,14 @@ BallsPocketMenuDataHeader: ; 0x10aaf dba UpdateItemDescription ; 10ac7 -PC_Mart_BallsPocketMenuDataHeader: ; 0x10ac7 +PC_Mart_BallsPocketMenuHeader: ; 0x10ac7 db MENU_BACKUP_TILES ; flags menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x10acf -.MenuData2: ; 0x10acf +.MenuData: ; 0x10acf db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ; flags db 5, 8 ; rows, columns db 2 ; horizontal spacing diff --git a/engine/player_gfx.asm b/engine/player_gfx.asm index 28441e700..109e28168 100644 --- a/engine/player_gfx.asm +++ b/engine/player_gfx.asm @@ -56,13 +56,13 @@ MovePlayerPic: ; 88266 jr .loop ShowPlayerNamingChoices: ; 88297 - ld hl, ChrisNameMenuDataHeader + ld hl, ChrisNameMenuHeader ld a, [wPlayerGender] bit PLAYERGENDER_FEMALE_F, a jr z, .GotGender - ld hl, KrisNameMenuDataHeader + ld hl, KrisNameMenuHeader .GotGender: - call LoadMenuDataHeader + call LoadMenuHeader call VerticalMenu ld a, [wMenuCursorY] dec a diff --git a/engine/save.asm b/engine/save.asm index 4291754e9..98be64ee6 100644 --- a/engine/save.asm +++ b/engine/save.asm @@ -1,5 +1,5 @@ SaveMenu: ; 14a1a - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall DisplaySaveInfoOnSave call SpeechTextBox call UpdateSprites diff --git a/engine/scripting.asm b/engine/scripting.asm index a3c906a83..8ffdb9fcd 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -144,7 +144,7 @@ ScriptCommandTable: dw Script_writetext ; 4c dw Script_repeattext ; 4d dw Script_yesorno ; 4e - dw Script_loadmenudata ; 4f + dw Script_loadmenuheader ; 4f dw Script_closewindow ; 50 dw Script_jumptextfaceplayer ; 51 if _CRYSTAL @@ -432,15 +432,15 @@ Script_yesorno: ld [ScriptVar], a ret -Script_loadmenudata: +Script_loadmenuheader: ; script command 0x4f -; parameters: data +; parameters: menu_header call GetScriptByte ld l, a call GetScriptByte ld h, a - ld de, LoadMenuDataHeader + ld de, LoadMenuHeader ld a, [ScriptBank] call Call_a_de call UpdateSprites diff --git a/engine/scrolling_menu.asm b/engine/scrolling_menu.asm index 32acf2def..6704942ec 100755 --- a/engine/scrolling_menu.asm +++ b/engine/scrolling_menu.asm @@ -118,7 +118,7 @@ ScrollingMenuJoyAction: ; 24609 ; 24673 .select ; 24673 - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 7, a jp z, xor_a_dec_a ld a, [wMenuCursorY] @@ -136,7 +136,7 @@ ScrollingMenuJoyAction: ; 24609 ; 24695 .start ; 24695 - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 6, a jp z, xor_a_dec_a ld a, START @@ -148,7 +148,7 @@ ScrollingMenuJoyAction: ; 24609 ld hl, w2DMenuFlags2 bit 7, [hl] jp z, xor_a_dec_a - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 3, a jp z, xor_a_dec_a ld a, D_LEFT @@ -160,7 +160,7 @@ ScrollingMenuJoyAction: ; 24609 ld hl, w2DMenuFlags2 bit 7, [hl] jp z, xor_a_dec_a - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 2, a jp z, xor_a_dec_a ld a, D_RIGHT @@ -188,7 +188,7 @@ ScrollingMenuJoyAction: ; 24609 bit 7, [hl] jp z, xor_a ld hl, wMenuScrollPosition - ld a, [wMenuData2_ScrollingMenuHeight] + ld a, [wMenuData_ScrollingMenuHeight] add [hl] ld b, a ld a, [wScrollingMenuListSize] @@ -215,7 +215,7 @@ ScrollingMenu_ClearLeftColumn: ; 24706 (9:4706) ld de, SCREEN_WIDTH add hl, de ld de, 2 * SCREEN_WIDTH - ld a, [wMenuData2_ScrollingMenuHeight] + ld a, [wMenuData_ScrollingMenuHeight] .loop ld [hl], " " add hl, de @@ -224,14 +224,14 @@ ScrollingMenu_ClearLeftColumn: ; 24706 (9:4706) ret InitScrollingMenuCursor: ; 2471a - ld hl, wMenuData2_ItemsPointerAddr + ld hl, wMenuData_ItemsPointerAddr ld a, [hli] ld h, [hl] ld l, a - ld a, [wMenuData2_ItemsPointerBank] + ld a, [wMenuData_ItemsPointerBank] call GetFarByte ld [wScrollingMenuListSize], a - ld a, [wMenuData2_ScrollingMenuHeight] + ld a, [wMenuData_ScrollingMenuHeight] ld c, a ld a, [wMenuScrollPosition] add c @@ -240,7 +240,7 @@ InitScrollingMenuCursor: ; 2471a inc a cp c jr nc, .skip - ld a, [wMenuData2_ScrollingMenuHeight] + ld a, [wMenuData_ScrollingMenuHeight] ld c, a ld a, [wScrollingMenuListSize] inc a @@ -274,7 +274,7 @@ InitScrollingMenuCursor: ; 2471a ; 24764 ScrollingMenu_InitFlags: ; 24764 - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] ld c, a ld a, [wScrollingMenuListSize] ld b, a @@ -284,7 +284,7 @@ ScrollingMenu_InitFlags: ; 24764 ld a, [wMenuBorderLeftCoord] add 0 ld [w2DMenuCursorInitX], a - ld a, [wMenuData2_ScrollingMenuHeight] + ld a, [wMenuData_ScrollingMenuHeight] cp b jr c, .no_extra_row jr z, .no_extra_row @@ -363,7 +363,7 @@ ScrollingMenu_ValidateSwitchItem: ; 247dd ScrollingMenu_UpdateDisplay: ; 247f0 call ClearWholeMenuBox - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 4, a ; place arrows jr z, .okay ld a, [wMenuScrollPosition] @@ -380,7 +380,7 @@ ScrollingMenu_UpdateDisplay: ; 247f0 call MenuBoxCoord2Tile ld bc, SCREEN_WIDTH + 1 add hl, bc - ld a, [wMenuData2_ScrollingMenuHeight] + ld a, [wMenuData_ScrollingMenuHeight] ld b, a ld c, $0 .loop @@ -403,7 +403,7 @@ ScrollingMenu_UpdateDisplay: ; 247f0 ld a, c cp b jr nz, .loop - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 4, a ; place arrows jr z, .done ld a, [wMenuBorderBottomCoord] @@ -417,7 +417,7 @@ ScrollingMenu_UpdateDisplay: ; 247f0 ret .cancel - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 0, a ; call function on cancel jr nz, .call_function ld de, .string_2485f @@ -430,7 +430,7 @@ ScrollingMenu_UpdateDisplay: ; 247f0 .call_function ld d, h ld e, l - ld hl, wMenuData2_ScrollingMenuFunction1 + ld hl, wMenuData_ScrollingMenuFunction1 jp CallPointerAt ; 2486e @@ -438,10 +438,10 @@ ScrollingMenu_CallFunctions1and2: ; 2486e push hl ld d, h ld e, l - ld hl, wMenuData2_ScrollingMenuFunction1 + ld hl, wMenuData_ScrollingMenuFunction1 call CallPointerAt pop hl - ld a, [wMenuData2_ScrollingMenuWidth] + ld a, [wMenuData_ScrollingMenuWidth] and a jr z, .done ld e, a @@ -449,7 +449,7 @@ ScrollingMenu_CallFunctions1and2: ; 2486e add hl, de ld d, h ld e, l - ld hl, wMenuData2_ScrollingMenuFunction2 + ld hl, wMenuData_ScrollingMenuFunction2 call CallPointerAt .done @@ -465,7 +465,7 @@ ScrollingMenu_PlaceCursor: ; 2488b cp b jr nc, .done ld c, a - ld a, [wMenuData2_ScrollingMenuHeight] + ld a, [wMenuData_ScrollingMenuHeight] add c cp b jr c, .done @@ -489,7 +489,7 @@ ScrollingMenu_PlaceCursor: ; 2488b ; 248b8 ScrollingMenu_CheckCallFunction3: ; 248b8 - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 5, a ; call function 3 ret z bit 1, a ; call function 3 if not switching items @@ -502,7 +502,7 @@ ScrollingMenu_CheckCallFunction3: ; 248b8 ld a, [wMenuCursorY] dec a call ScrollingMenu_GetListItemCoordAndFunctionArgs - ld hl, wMenuData2_ScrollingMenuFunction3 + ld hl, wMenuData_ScrollingMenuFunction3 call CallPointerAt ret ; 248d5 @@ -515,12 +515,12 @@ ScrollingMenu_GetListItemCoordAndFunctionArgs: ; 248d5 add e ld e, a ld d, $0 - ld hl, wMenuData2_ItemsPointerAddr + ld hl, wMenuData_ItemsPointerAddr ld a, [hli] ld h, [hl] ld l, a inc hl ; items - ld a, [wMenuData2_ScrollingMenuSpacing] + ld a, [wMenuData_ScrollingMenuSpacing] cp 1 jr z, .got_spacing cp 2 @@ -529,12 +529,12 @@ ScrollingMenu_GetListItemCoordAndFunctionArgs: ; 248d5 add hl, de .got_spacing add hl, de - ld a, [wMenuData2_ItemsPointerBank] + ld a, [wMenuData_ItemsPointerBank] call GetFarByte ld [MenuSelection], a ld [CurItem], a inc hl - ld a, [wMenuData2_ItemsPointerBank] + ld a, [wMenuData_ItemsPointerBank] call GetFarByte ld [MenuSelectionQuantity], a pop hl diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index cfec11091..68df631e4 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -1809,8 +1809,8 @@ Slots_AskBet: ; 9307c (24:707c) .loop ld hl, .Text_BetHowManyCoins call PrintText - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader call VerticalMenu call CloseWindow ret c @@ -1867,14 +1867,14 @@ Slots_AskBet: ; 9307c (24:707c) db "@" ; 0x930d6 -.MenuDataHeader: ; 0x930d6 +.MenuHeader: ; 0x930d6 db MENU_BACKUP_TILES ; flags menu_coords 14, 10, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x930de -.MenuData2: ; 0x930de +.MenuData: ; 0x930de db STATICMENU_CURSOR ; flags db 3 ; items db " 3@" diff --git a/engine/start_menu.asm b/engine/start_menu.asm index 8784c6bb6..23302e701 100755 --- a/engine/start_menu.asm +++ b/engine/start_menu.asm @@ -22,12 +22,12 @@ StartMenu:: ; 125cd ld hl, wStatusFlags2 bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl] - ld hl, .MenuDataHeader + ld hl, .MenuHeader jr z, .GotMenuData - ld hl, .ContestMenuDataHeader + ld hl, .ContestMenuHeader .GotMenuData: - call LoadMenuDataHeader + call LoadMenuHeader call .SetUpMenuItems ld a, [wBattleMenuCursorBuffer] ld [wMenuCursorBuffer], a @@ -164,13 +164,13 @@ StartMenu:: ; 125cd ; 126d3 -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 10, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw .MenuData db 1 ; default selection -.ContestMenuDataHeader: +.ContestMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 10, 2, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw .MenuData @@ -289,7 +289,7 @@ endr .GetMenuAccountTextPointer: ; 12819 ld e, a ld d, 0 - ld hl, wMenuData2PointerTableAddr + ld hl, wMenuDataPointerTableAddr ld a, [hli] ld h, [hl] ld l, a @@ -813,7 +813,7 @@ GiveTakePartyMonItem: ; 12b60 jr z, .cancel ld hl, GiveTakeItemMenuData - call LoadMenuDataHeader + call LoadMenuHeader call VerticalMenu call ExitMenu jr c, .cancel @@ -827,7 +827,7 @@ GiveTakePartyMonItem: ; 12b60 cp 1 jr nz, .take - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call ClearPalettes call .GiveItem call ClearPalettes @@ -1121,8 +1121,8 @@ MonMailAction: ; 12d45 jr z, .read ; Show the READ/TAKE/QUIT menu. - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader call VerticalMenu call ExitMenu @@ -1184,14 +1184,14 @@ MonMailAction: ; 12d45 ; 12dc9 -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 12, 10, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x12dd1 -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 3 ; items db "READ@" @@ -1238,7 +1238,7 @@ MonMailAction: ; 12d45 OpenPartyStats: ; 12e00 - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call ClearSprites ; PartyMon xor a diff --git a/engine/switch_items.asm b/engine/switch_items.asm index b699d4719..77b635246 100755 --- a/engine/switch_items.asm +++ b/engine/switch_items.asm @@ -145,7 +145,7 @@ Function249d1: ; 249d1 (9:49d1) inc hl pop af ld [hl], a - ld hl, wMenuData2_ItemsPointerAddr + ld hl, wMenuData_ItemsPointerAddr ld a, [hli] ld h, [hl] ld l, a @@ -199,7 +199,7 @@ Function24a4d: ; 24a4d (9:4a4d) ItemSwitch_GetNthItem: ; 24a5c (9:4a5c) push af call ItemSwitch_ConvertSpacingToDW - ld hl, wMenuData2_ItemsPointerAddr + ld hl, wMenuData_ItemsPointerAddr ld a, [hli] ld h, [hl] ld l, a @@ -227,7 +227,7 @@ Function24a6c: ; 24a6c (9:4a6c) ItemSwitch_ConvertSpacingToDW: ; 24a80 (9:4a80) ; This function is absolutely idiotic. push hl - ld a, [wMenuData2_ScrollingMenuSpacing] + ld a, [wMenuData_ScrollingMenuSpacing] ld c, a ld b, 0 ld hl, .spacing_dws diff --git a/engine/timeset.asm b/engine/timeset.asm index 67aa9973e..c2ba14ef4 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -426,7 +426,7 @@ Special_SetDayOfWeek: ; 90913 hlcoord 0, 12 lb bc, 4, 18 call TextBox - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld hl, .WhatDayIsItText call PrintText hlcoord 9, 3 diff --git a/home.asm b/home.asm index 35968744d..b375b8d5b 100644 --- a/home.asm +++ b/home.asm @@ -773,7 +773,7 @@ INCLUDE "home/pokedex_flags.asm" INCLUDE "home/names.asm" ScrollingMenu:: ; 350c - call CopyMenuData2 + call CopyMenuData ld a, [hROMBank] push af diff --git a/home/map.asm b/home/map.asm index 1ed0e5ca8..402b7f4ec 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1983,7 +1983,7 @@ CheckCurrentMapCoordEvents:: ; 2ad4 FadeToMenu:: ; 2b29 xor a ld [hBGMapMode], a - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall Special_FadeOutPalettes call ClearSprites call DisableSpriteUpdates diff --git a/home/menu.asm b/home/menu.asm index f8ade3f58..a43e05757 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -1,14 +1,14 @@ ; Functions used in displaying and handling menus. -LoadMenuDataHeader:: - call CopyMenuDataHeader +LoadMenuHeader:: + call CopyMenuHeader call PushWindow ret -CopyMenuDataHeader:: - ld de, wMenuDataHeader - ld bc, wMenuDataHeaderEnd - wMenuDataHeader +CopyMenuHeader:: + ld de, wMenuHeader + ld bc, wMenuHeaderEnd - wMenuHeader call CopyBytes ld a, [hROMBank] ld [wMenuDataBank], a @@ -33,12 +33,12 @@ MenuTextBox:: ; 1d4f ; 1d58 LoadMenuTextBox:: ; 1d58 - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader ret ; 1d5f -.MenuDataHeader: ; 1d5f +.MenuHeader: ; 1d5f db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw vTiles0 @@ -51,13 +51,13 @@ MenuTextBoxBackup:: ; 1d67 ret ; 1d6e -LoadStandardMenuDataHeader:: ; 1d6e - ld hl, .MenuDataHeader - call LoadMenuDataHeader +LoadStandardMenuHeader:: ; 1d6e + ld hl, .MenuHeader + call LoadMenuHeader ret ; 1d75 -.MenuDataHeader: ; 1d75 +.MenuHeader: ; 1d75 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw 0 @@ -76,8 +76,8 @@ VerticalMenu:: call UpdateSprites call PlaceVerticalMenuItems call ApplyTilemap - call CopyMenuData2 - ld a, [wMenuData2Flags] + call CopyMenuData + ld a, [wMenuDataFlags] bit 7, a jr z, .cancel call InitVerticalMenuCursor @@ -95,7 +95,7 @@ VerticalMenu:: ; 0x1dab GetMenu2:: ; 1dab - call LoadMenuDataHeader + call LoadMenuHeader call VerticalMenu call CloseWindow ld a, [wMenuCursorY] @@ -106,7 +106,7 @@ CopyNameFromMenu:: push hl push bc push af - ld hl, wMenuData2Pointer + ld hl, wMenuDataPointer ld a, [hli] ld h, [hl] ld l, a @@ -130,14 +130,14 @@ PlaceYesNoBox:: ; 1dd2 jr _YesNoBox PlaceGenericTwoOptionBox:: ; 1dd4 - call LoadMenuDataHeader + call LoadMenuHeader jr InterpretTwoOptionMenu _YesNoBox:: ; 1dd9 ; Return nc (yes) or c (no). push bc - ld hl, YesNoMenuDataHeader - call CopyMenuDataHeader + ld hl, YesNoMenuHeader + call CopyMenuHeader pop bc ; This seems to be an overflow prevention, but ; it was coded wrong. @@ -179,29 +179,29 @@ InterpretTwoOptionMenu:: ; 1dfe ret ; 1e1d -YesNoMenuDataHeader:: ; 1e1d +YesNoMenuHeader:: ; 1e1d db MENU_BACKUP_TILES ; flags menu_coords 10, 5, 15, 9 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 1e25 -.MenuData2: ; 1e25 +.MenuData: ; 1e25 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 db "YES@" db "NO@" ; 1e2e -OffsetMenuDataHeader:: ; 1e2e - call _OffsetMenuDataHeader +OffsetMenuHeader:: ; 1e2e + call _OffsetMenuHeader call PushWindow ret ; 1e35 -_OffsetMenuDataHeader:: ; 1e35 +_OffsetMenuHeader:: ; 1e35 push de - call CopyMenuDataHeader + call CopyMenuHeader pop de ld a, [wMenuBorderLeftCoord] ld h, a @@ -243,7 +243,7 @@ SetUpMenu:: ; 1e70 ret DrawVariableLengthMenuBox:: - call CopyMenuData2 + call CopyMenuData call GetMenuIndexSet call AutomaticGetMenuBottomCoord call MenuBox @@ -271,7 +271,7 @@ AutomaticGetMenuBottomCoord:: ; 1ea6 ld a, [wMenuBorderRightCoord] sub c ld c, a - ld a, [wMenuData2Items] + ld a, [wMenuDataItems] add a inc a ld b, a @@ -282,7 +282,7 @@ AutomaticGetMenuBottomCoord:: ; 1ea6 ; 1ebd GetMenuIndexSet:: ; 1ebd - ld hl, wMenuData2IndicesPointer + ld hl, wMenuDataIndicesPointer ld a, [hli] ld h, [hl] ld l, a @@ -302,7 +302,7 @@ GetMenuIndexSet:: ; 1ebd ld d, h ld e, l ld a, [hl] - ld [wMenuData2Items], a + ld [wMenuDataItems], a ret ; 1eda @@ -320,7 +320,7 @@ RunMenuItemPrintingFunction:: ; 1eda push hl ld d, h ld e, l - ld hl, wMenuData2DisplayFunctionPointer + ld hl, wMenuDataDisplayFunctionPointer call ._hl_ pop hl ld de, 2 * SCREEN_WIDTH @@ -339,13 +339,13 @@ RunMenuItemPrintingFunction:: ; 1eda InitMenuCursorAndButtonPermissions:: ; 1eff call InitVerticalMenuCursor ld hl, wMenuJoypadFilter - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 3, a jr z, .disallow_select set START_F, [hl] .disallow_select - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 2, a jr z, .disallow_left_right set D_LEFT_F, [hl] @@ -422,7 +422,7 @@ ContinueGettingMenuJoypad: PlaceMenuStrings:: ; 1f79 push de - ld hl, wMenuData2PointerTableAddr + ld hl, wMenuDataPointerTableAddr ld a, [hli] ld h, [hl] ld l, a @@ -471,7 +471,7 @@ MenuJumptable:: ; 1fa7 GetMenuDataPointerTableEntry:: ; 1fb1 ld e, a ld d, $0 - ld hl, wMenuData2PointerTableAddr + ld hl, wMenuDataPointerTableAddr ld a, [hli] ld h, [hl] ld l, a @@ -485,9 +485,9 @@ GetMenuDataPointerTableEntry:: ; 1fb1 ClearWindowData:: ; 1fbf ld hl, wWindowStackPointer call .bytefill - ld hl, wMenuDataHeader + ld hl, wMenuHeader call .bytefill - ld hl, wMenuData2Flags + ld hl, wMenuDataFlags call .bytefill ld hl, w2DMenuCursorInitY call .bytefill @@ -563,7 +563,7 @@ Place2DMenuItemName:: ; 201c _2DMenu:: ; 202a ld a, [hROMBank] - ld [wMenuData2_2DMenuItemStringsBank], a + ld [wMenuData_2DMenuItemStringsBank], a farcall _2DMenu_ ld a, [wMenuCursorBuffer] ret @@ -571,7 +571,7 @@ _2DMenu:: ; 202a InterpretBattleMenu:: ; 2039 ld a, [hROMBank] - ld [wMenuData2_2DMenuItemStringsBank], a + ld [wMenuData_2DMenuItemStringsBank], a farcall _InterpretBattleMenu ld a, [wMenuCursorBuffer] ret @@ -579,7 +579,7 @@ InterpretBattleMenu:: ; 2039 InterpretMobileMenu:: ; 2048 ld a, [hROMBank] - ld [wMenuData2_2DMenuItemStringsBank], a + ld [wMenuData_2DMenuItemStringsBank], a farcall _InterpretMobileMenu ld a, [wMenuCursorBuffer] ret diff --git a/home/tilemap.asm b/home/tilemap.asm index 9e15ed85b..2831558a8 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -79,17 +79,17 @@ GetMenuBoxDims:: ; 0x1c53 ret ; 0x1c66 -CopyMenuData2:: ; 1c66 +CopyMenuData:: ; 1c66 push hl push de push bc push af - ld hl, wMenuData2Pointer + ld hl, wMenuDataPointer ld a, [hli] ld h, [hl] ld l, a - ld de, wMenuData2Flags - ld bc, wMenuData2End - wMenuData2Flags + ld de, wMenuDataFlags + ld bc, wMenuDataEnd - wMenuDataFlags call CopyBytes pop af pop bc @@ -111,8 +111,8 @@ GetWindowStackTop:: ; 1c7e ; 1c89 PlaceVerticalMenuItems:: ; 1c89 - call CopyMenuData2 - ld hl, wMenuData2Pointer + call CopyMenuData + ld hl, wMenuDataPointer ld e, [hl] inc hl ld d, [hl] @@ -132,7 +132,7 @@ PlaceVerticalMenuItems:: ; 1c89 dec b jr nz, .loop - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 4, a ret z @@ -161,14 +161,14 @@ GetMenuTextStartCoord:: ; 1cc6 ld c, a inc c ; bit 6: if not set, leave extra room on top - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 6, a jr nz, .bit_6_set inc b .bit_6_set ; bit 7: if set, leave extra room on the left - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 7, a jr z, .bit_7_clear inc c diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 9bca1c004..6b17f5d94 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -520,10 +520,10 @@ yesorno: MACRO db yesorno_command ENDM - enum loadmenudata_command ; $4f -loadmenudata: MACRO - db loadmenudata_command - dw \1 ; data + enum loadmenuheader_command ; $4f +loadmenuheader: MACRO + db loadmenuheader_command + dw \1 ; menu_header ENDM enum closewindow_command ; $50 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 5a5e37afc..188f977bb 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -25,7 +25,7 @@ CeladonDeptStore6FVendingMachine: writetext CeladonVendingText .Start: special Special_PlaceMoneyTopRight - loadmenudata .MenuData + loadmenuheader .MenuHeader verticalmenu closewindow if_equal 1, .FreshWater @@ -79,13 +79,13 @@ CeladonDeptStore6FVendingMachine: waitbutton jump .Start -.MenuData: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "FRESH WATER ¥200@" diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 1caed4b19..b8d3ce032 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -25,7 +25,7 @@ CeladonGameCornerPrizeRoomTMVendor: writetext CeladonPrizeRoom_AskWhichPrizeText CeladonPrizeRoom_tmcounterloop: special Special_DisplayCoinCaseBalance - loadmenudata CeladonPrizeRoom_TMMenuDataHeader + loadmenuheader CeladonPrizeRoom_TMMenuHeader verticalmenu closewindow if_equal 1, .doubleteam @@ -102,13 +102,13 @@ CeladonPrizeRoom_NoCoinCase: closetext end -CeladonPrizeRoom_TMMenuDataHeader: +CeladonPrizeRoom_TMMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 15, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "TM32 1500@" @@ -126,7 +126,7 @@ CeladonGameCornerPrizeRoomPokemonVendor: .loop writetext CeladonPrizeRoom_AskWhichPrizeText special Special_DisplayCoinCaseBalance - loadmenudata .MenuDataHeader + loadmenuheader .MenuHeader verticalmenu closewindow if_equal 1, .pikachu @@ -188,13 +188,13 @@ CeladonGameCornerPrizeRoomPokemonVendor: takecoins 8888 jump .loop -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 17, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "PIKACHU 2222@" diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 8be52840d..54797c90f 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -30,7 +30,7 @@ DragonShrine_MapScripts: setevent EVENT_RECEIVED_BALLS_FROM_KURT writetext DragonShrineQuestion1Text buttonsound - loadmenudata DragonShrineQuestion1_MenuDataHeader + loadmenuheader DragonShrineQuestion1_MenuHeader verticalmenu closewindow if_equal 1, .RightAnswer @@ -42,7 +42,7 @@ DragonShrine_MapScripts: setevent EVENT_DRAGON_SHRINE_QUESTION_2 writetext DragonShrineQuestion2Text buttonsound - loadmenudata DragonShrineQuestion2_MenuDataHeader + loadmenuheader DragonShrineQuestion2_MenuHeader verticalmenu closewindow if_equal 1, .RightAnswer @@ -52,7 +52,7 @@ DragonShrine_MapScripts: setevent EVENT_DRAGON_SHRINE_QUESTION_3 writetext DragonShrineQuestion3Text buttonsound - loadmenudata DragonShrineQuestion3_MenuDataHeader + loadmenuheader DragonShrineQuestion3_MenuHeader verticalmenu closewindow if_equal 1, .WrongAnswer @@ -62,7 +62,7 @@ DragonShrine_MapScripts: setevent EVENT_DRAGON_SHRINE_QUESTION_4 writetext DragonShrineQuestion4Text buttonsound - loadmenudata DragonShrineQuestion4_MenuDataHeader + loadmenuheader DragonShrineQuestion4_MenuHeader verticalmenu closewindow if_equal 1, .RightAnswer @@ -72,7 +72,7 @@ DragonShrine_MapScripts: setevent EVENT_DRAGON_SHRINE_QUESTION_5 writetext DragonShrineQuestion5Text buttonsound - loadmenudata DragonShrineQuestion5_MenuDataHeader + loadmenuheader DragonShrineQuestion5_MenuHeader verticalmenu closewindow if_equal 1, .WrongAnswer @@ -265,65 +265,65 @@ DragonShrineElder3Script: closetext end -DragonShrineQuestion1_MenuDataHeader: +DragonShrineQuestion1_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Pal@" db "Underling@" db "Friend@" -DragonShrineQuestion2_MenuDataHeader: +DragonShrineQuestion2_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 9, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Strategy@" db "Raising@" db "Cheating@" -DragonShrineQuestion3_MenuDataHeader: +DragonShrineQuestion3_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 5, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Weak person@" db "Tough person@" db "Anybody@" -DragonShrineQuestion4_MenuDataHeader: +DragonShrineQuestion4_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Love@" db "Violence@" db "Knowledge@" -DragonShrineQuestion5_MenuDataHeader: +DragonShrineQuestion5_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 12, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Tough@" diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 1936858dd..9f2d40ad5 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -66,7 +66,7 @@ AcademyBlackboard: opentext writetext AcademyBlackboardText .Loop: - loadmenudata .BlackboardMenuData + loadmenuheader .BlackboardMenuHeader _2dmenu closewindow if_equal 1, .Poison @@ -102,13 +102,13 @@ AcademyBlackboard: waitbutton jump .Loop -.BlackboardMenuData: +.BlackboardMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 11, 8 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags dn 3, 2 ; rows, columns db 5 ; spacing diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 8b64a4435..f8be7e5ca 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -65,7 +65,7 @@ MoveTutor: checkcoins 4000 if_equal HAVE_LESS, .NotEnoughMoney writetext UnknownText_0x1990ce - loadmenudata .MoveMenuDataHeader + loadmenuheader .MoveMenuHeader verticalmenu closewindow if_equal MOVETUTOR_FLAMETHROWER, .Flamethrower @@ -94,13 +94,13 @@ MoveTutor: if_equal FALSE, .TeachMove jump .Incompatible -.MoveMenuDataHeader: +.MoveMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 15, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "FLAMETHROWER@" diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 73cb0f17e..49cd09ebd 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -14,7 +14,7 @@ GoldenrodVendingMachine: writetext GoldenrodVendingText .Start: special Special_PlaceMoneyTopRight - loadmenudata .MenuData + loadmenuheader .MenuHeader verticalmenu closewindow if_equal 1, .FreshWater @@ -68,13 +68,13 @@ GoldenrodVendingMachine: waitbutton jump .Start -.MenuData: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "FRESH WATER ¥200@" diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index d467e84c3..cc04df7fb 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -61,7 +61,7 @@ GoldenrodGmeCornerTMVendorScript: writetext GoldenrodGameCornerPrizeVendorWhichPrizeText GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36 special Special_DisplayCoinCaseBalance - loadmenudata GoldenrodGameCornerTMVendorMenuData + loadmenuheader GoldenrodGameCornerTMVendorMenuHeader verticalmenu closewindow if_equal 1, .Thunder @@ -138,13 +138,13 @@ GoldenrodGameCornerPrizeVendor_NoCoinCaseScript: closetext end -GoldenrodGameCornerTMVendorMenuData: +GoldenrodGameCornerTMVendorMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 15, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "TM25 5500@" @@ -162,7 +162,7 @@ GoldenrodGameCornerPrizeMonVendorScript: .loop writetext GoldenrodGameCornerPrizeVendorWhichPrizeText special Special_DisplayCoinCaseBalance - loadmenudata .MenuDataHeader + loadmenuheader .MenuHeader verticalmenu closewindow if_equal 1, .abra @@ -224,13 +224,13 @@ GoldenrodGameCornerPrizeMonVendorScript: takecoins 1500 jump .loop -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 17, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "ABRA 100@" diff --git a/maps/PokecomCenterAdminRoomMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm index 53a1043f8..063d4b2ac 100644 --- a/maps/PokecomCenterAdminRoomMobile.asm +++ b/maps/PokecomCenterAdminRoomMobile.asm @@ -25,7 +25,7 @@ PokecomCenterAdminRoomMobileSignpost0Script: waitbutton UnknownScript_0x625df: reloadmappart - loadmenudata MenuDataHeader_0x62602 + loadmenuheader MenuHeader_0x62602 verticalmenu closewindow if_equal 1, UnknownScript_0x625f0 @@ -48,13 +48,13 @@ UnknownScript_0x62600: closetext end -MenuDataHeader_0x62602: +MenuHeader_0x62602: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 15, 8 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 3 ; items db "#　つうしん　クラブ@" ; # COM CLUB @@ -67,7 +67,7 @@ PokecomCenterAdminRoomMobileSignpost1Script: waitbutton UnknownScript_0x62629: reloadmappart - loadmenudata MenuDataHeader_0x6264c + loadmenuheader MenuHeader_0x6264c verticalmenu closewindow if_equal 1, UnknownScript_0x6263a @@ -90,13 +90,13 @@ UnknownScript_0x6264a: closetext end -MenuDataHeader_0x6264c: +MenuHeader_0x6264c: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 15, 8 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 3 ; items db "でんわつかうとき@" ; Use phone diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index 9d08c9284..cfad0f8d4 100755 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -284,8 +284,8 @@ asm_4828d: ; 4828d (12:428d) hlcoord 1, 16 ld de, MobileDesc_Gender call PlaceString - ld hl, MenuDataHeader_0x484f1 - call LoadMenuDataHeader + ld hl, MenuHeader_0x484f1 + call LoadMenuHeader call Function4873c hlcoord 11, 2 ld b, $4 @@ -336,10 +336,10 @@ Function48304: ; 48304 (12:4304) hlcoord 1, 16 ld de, MobileDesc_Address call PlaceString - ld hl, MenuDataHeader_0x48504 - call LoadMenuDataHeader - ld hl, MenuDataHeader_0x48513 - call LoadMenuDataHeader + ld hl, MenuHeader_0x48504 + call LoadMenuHeader + ld hl, MenuHeader_0x48513 + call LoadMenuHeader hlcoord 10, 0 ld b, $c ld c, $8 @@ -562,14 +562,14 @@ MobileDesc_Address: db "Where do you live?@" MobileDesc_ZipCode: db "Your zip code?@" ; 484f1 -MenuDataHeader_0x484f1: ; 0x484f1 +MenuHeader_0x484f1: ; 0x484f1 db MENU_BACKUP_TILES ; flags menu_coords 11, 2, SCREEN_WIDTH - 1, 7 - dw MenuData2_0x484f9 + dw MenuData_0x484f9 db 1 ; default option ; 0x484f9 -MenuData2_0x484f9: ; 0x484f9 +MenuData_0x484f9: ; 0x484f9 db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 2 ; items Strings_484fb: @@ -577,26 +577,26 @@ String_484fb: db "Boy@" String_484ff: db "Girl@" ; 0x48504 -MenuDataHeader_0x48504: ; 0x48504 +MenuHeader_0x48504: ; 0x48504 db MENU_BACKUP_TILES ; flags menu_coords 10, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 -MenuDataHeader_0x48509: ; 0x48509 +MenuHeader_0x48509: ; 0x48509 db MENU_BACKUP_TILES ; flags menu_coords 10, 5, SCREEN_WIDTH - 1, 7 -MenuDataHeader_0x4850e: ; 0x4850e +MenuHeader_0x4850e: ; 0x4850e db MENU_BACKUP_TILES ; flags menu_coords 10, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 -MenuDataHeader_0x48513: ; 0x48513 +MenuHeader_0x48513: ; 0x48513 db MENU_BACKUP_TILES ; flags menu_coords 11, 1, 18, 12 - dw MenuData2_0x4851b + dw MenuData_0x4851b db 1 ; default option ; 0x4851b -MenuData2_0x4851b: ; 0x4851b +MenuData_0x4851b: ; 0x4851b db SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_LEFT | SCROLLINGMENU_CALL_FUNCTION1_CANCEL ; flags db 6 ; items @@ -825,8 +825,8 @@ Function4876f: ; 4876f (12:476f) hlcoord 1, 16 ld de, MobileDesc_Age call PlaceString - ld hl, MenuDataHeader_0x48509 - call LoadMenuDataHeader + ld hl, MenuHeader_0x48509 + call LoadMenuHeader ld a, [hInMenu] push af ld a, $1 @@ -1028,8 +1028,8 @@ Function488d3: ; 488d3 (12:48d3) call PlaceString call Function48a3a jp c, Function4840c - ld hl, MenuDataHeader_0x4850e - call LoadMenuDataHeader + ld hl, MenuHeader_0x4850e + call LoadMenuHeader ld a, [hInMenu] push af ld a, $1 @@ -1225,8 +1225,8 @@ String_48a38: ; 48a38 ; 48a3a Function48a3a: ; 48a3a (12:4a3a) - ld hl, MenuDataHeader_0x48a9c - call LoadMenuDataHeader + ld hl, MenuHeader_0x48a9c + call LoadMenuHeader call Function4873c ld a, $a ld [w2DMenuCursorInitY], a @@ -1271,7 +1271,7 @@ Function48a9a: ; 48a9a (12:4a9a) ret ; 48a9c (12:4a9c) -MenuDataHeader_0x48a9c: ; 0x48a9c +MenuHeader_0x48a9c: ; 0x48a9c db MENU_BACKUP_TILES ; flags menu_coords 10, 8, SCREEN_WIDTH - 1, 13 diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm index 5553d66fb..14d8c6e65 100755 --- a/mobile/mobile_12_2.asm +++ b/mobile/mobile_12_2.asm @@ -684,8 +684,8 @@ Function4ac58: ; 4ac58 hlcoord 1, 15 call ClearBox farcall FreezeMonIcons - ld hl, MenuDataHeader_0x4aca2 - call LoadMenuDataHeader + ld hl, MenuHeader_0x4aca2 + call LoadMenuHeader ld hl, wd019 bit 1, [hl] jr z, .asm_4ac89 @@ -714,7 +714,7 @@ Function4ac58: ; 4ac58 ret ; 4aca2 -MenuDataHeader_0x4aca2: ; 0x4aca2 +MenuHeader_0x4aca2: ; 0x4aca2 db MENU_BACKUP_TILES ; flags menu_coords 11, 9, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw NULL @@ -724,19 +724,19 @@ MenuDataHeader_0x4aca2: ; 0x4aca2 Function4acaa: ; 4acaa .asm_4acaa ld a, $a0 - ld [wMenuData2Flags], a + ld [wMenuDataFlags], a ld a, [wd019] bit 1, a jr z, .asm_4acc2 ld a, $2 - ld [wMenuData2Items], a + ld [wMenuDataItems], a ld a, $c ld [wMenuBorderTopCoord], a jr .asm_4accc .asm_4acc2 ld a, $4 - ld [wMenuData2Items], a + ld [wMenuDataItems], a ld a, $8 ld [wMenuBorderTopCoord], a diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index 779d8964b..a4e0a8fb6 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -238,8 +238,8 @@ Function8925e: ; 8925e Function89261: ; 89261 push af push bc - ld hl, MenuDataHeader_0x892a3 - call CopyMenuDataHeader + ld hl, MenuHeader_0x892a3 + call CopyMenuHeader pop bc ld hl, wMenuBorderTopCoord ld a, c @@ -276,14 +276,14 @@ Function89261: ; 89261 ret ; 892a3 -MenuDataHeader_0x892a3: ; 0x892a3 +MenuHeader_0x892a3: ; 0x892a3 db MENU_BACKUP_TILES ; flags menu_coords 10, 5, 15, 9 - dw MenuData2_0x892ab + dw MenuData_0x892ab db 1 ; default option ; 0x892ab -MenuData2_0x892ab: ; 0x892ab +MenuData_0x892ab: ; 0x892ab db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 ; items db "はい@" @@ -2203,7 +2203,7 @@ Function89d0d: ; 89d0d (22:5d0d) Function89d5e: ; 89d5e (22:5d5e) push af - call CopyMenuDataHeader + call CopyMenuHeader pop af ld [wMenuCursorBuffer], a call Mobile22_SetBGMapMode0 @@ -2786,8 +2786,8 @@ UnknownText_0x8a111: ; 0x8a111 Function8a116: ; 8a116 (22:6116) ld a, $1 ld [wd030], a - ld hl, MenuDataHeader_0x8a176 - call LoadMenuDataHeader + ld hl, MenuHeader_0x8a176 + call LoadMenuHeader .asm_8a121 call Mobile22_SetBGMapMode0 call Function8a17b @@ -2830,7 +2830,7 @@ Function8a116: ; 8a116 (22:6116) ret ; 8a176 (22:6176) -MenuDataHeader_0x8a176: ; 0x8a176 +MenuHeader_0x8a176: ; 0x8a176 db MENU_BACKUP_TILES ; flags menu_coords 14, 0, SCREEN_WIDTH - 1, 6 ; 8a17b @@ -2840,7 +2840,7 @@ Function8a17b: ; 8a17b (22:617b) ld b, $5 ld c, $4 call Function89b3b - ld hl, MenuDataHeader_0x8a19a + ld hl, MenuHeader_0x8a19a ld a, [wd030] call Function89d5e ld hl, Function8a1b0 @@ -2852,14 +2852,14 @@ Function8a17b: ; 8a17b (22:617b) ret ; 8a19a (22:619a) -MenuDataHeader_0x8a19a: ; 0x8a19a +MenuHeader_0x8a19a: ; 0x8a19a db MENU_BACKUP_TILES ; flags menu_coords 14, 0, SCREEN_WIDTH - 1, 6 - dw MenuData2_0x8a1a2 + dw MenuData_0x8a1a2 db 1 ; default option ; 0x8a1a2 -MenuData2_0x8a1a2: ; 0x8a1a2 +MenuData_0x8a1a2: ; 0x8a1a2 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags db 3 ; items db "ひらく@" @@ -2935,7 +2935,7 @@ UnknownText_0x8a23c: ; 0x8a23c ; 0x8a241 Function8a241: ; 8a241 (22:6241) - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call Function891fe call Function8a262 jr nc, .asm_8a254 @@ -2978,8 +2978,8 @@ Function8a262: ; 8a262 (22:6262) ret Function8a2aa: ; 8a2aa (22:62aa) - ld hl, MenuDataHeader_0x8a2ef - call LoadMenuDataHeader + ld hl, MenuHeader_0x8a2ef + call LoadMenuHeader ld hl, UnknownText_0x8a2f4 call PrintText ld a, $1 @@ -3011,7 +3011,7 @@ Function8a2aa: ; 8a2aa (22:62aa) ret ; 8a2ef (22:62ef) -MenuDataHeader_0x8a2ef: ; 0x8a2ef +MenuHeader_0x8a2ef: ; 0x8a2ef db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 ; 8a2f4 @@ -3131,16 +3131,16 @@ Function8a3b2: ; 8a3b2 (22:63b2) ld b, $6 ld c, $9 call Function89b3b - ld hl, MenuDataHeader_0x8a435 + ld hl, MenuHeader_0x8a435 jr .asm_8a3db .asm_8a3ce decoord 0, 2 ld b, $8 ld c, $9 call Function89b3b - ld hl, MenuDataHeader_0x8a40f + ld hl, MenuHeader_0x8a40f .asm_8a3db - call CopyMenuDataHeader + call CopyMenuHeader ret Function8a3df: ; 8a3df (22:63df) @@ -3172,14 +3172,14 @@ Function8a400: ; 8a400 (22:6400) Unknown_8a408: db 1, 2, -1 Unknown_8a40b: db 1, 2, 3, -1 -MenuDataHeader_0x8a40f: ; 0x8a40f +MenuHeader_0x8a40f: ; 0x8a40f db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 10, TEXTBOX_Y - 1 - dw MenuData2_0x8a417 + dw MenuData_0x8a417 db 1 ; default option ; 0x8a417 -MenuData2_0x8a417: ; 0x8a417 +MenuData_0x8a417: ; 0x8a417 db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 4 ; items db "めいしりスト@" @@ -3188,14 +3188,14 @@ MenuData2_0x8a417: ; 0x8a417 db "やめる@" ; 0x8a435 -MenuDataHeader_0x8a435: ; 0x8a435 +MenuHeader_0x8a435: ; 0x8a435 db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 10, 9 - dw MenuData2_0x8a43d + dw MenuData_0x8a43d db 1 ; default option ; 0x8a43d -MenuData2_0x8a43d: ; 0x8a43d +MenuData_0x8a43d: ; 0x8a43d db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 3 ; items db "めいしりスト@" @@ -3462,7 +3462,7 @@ Palette_8a624: ; 8a624 ; 8a62c Function8a62c: ; 8a62c (22:662c) - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call Function891fe xor a call Function8b94a @@ -3884,15 +3884,15 @@ Function8a930: ; 8a930 (22:6930) ret Function8a999: ; 8a999 (22:6999) - ld hl, MenuDataHeader_0x8a9c9 - call LoadMenuDataHeader + ld hl, MenuHeader_0x8a9c9 + call LoadMenuHeader ld c, $1 .asm_8a9a1 call Function8a9ce jr c, .asm_8a9bb push bc push de - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader pop de dec e ld a, e @@ -3913,7 +3913,7 @@ Jumptable_8a9c5: ; 8a9c5 (22:69c5) dw Function8ab3b ; 8a9c9 (22:69c9) -MenuDataHeader_0x8a9c9: ; 0x8a9c9 +MenuHeader_0x8a9c9: ; 0x8a9c9 db MENU_BACKUP_TILES ; flags menu_coords 11, 4, 18, TEXTBOX_Y - 1 ; 8a9ce @@ -3926,7 +3926,7 @@ Function8a9ce: ; 8a9ce (22:69ce) call Function89b3b pop bc ld a, c - ld hl, MenuDataHeader_0x8a9f2 + ld hl, MenuHeader_0x8a9f2 call Function89d5e ld hl, Function8aa09 call Function89d85 @@ -3942,14 +3942,14 @@ Function8a9ce: ; 8a9ce (22:69ce) ret ; 8a9f2 (22:69f2) -MenuDataHeader_0x8a9f2: ; 0x8a9f2 +MenuHeader_0x8a9f2: ; 0x8a9f2 db MENU_BACKUP_TILES ; flags menu_coords 11, 4, 18, TEXTBOX_Y - 1 - dw MenuData2_0x8a9fa + dw MenuData_0x8a9fa db 1 ; default option ; 0x8a9fa -MenuData2_0x8a9fa: ; 0x8a9fa +MenuData_0x8a9fa: ; 0x8a9fa db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 3 ; items db "へんしゅう@" @@ -4148,7 +4148,7 @@ Function8ab3b: ; 8ab3b (22:6b3b) Function8ab93: ; 8ab93 (22:6b93) call ClearBGPalettes - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall Function105688 call ClearSprites call Function891fe diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index 6354da146..059a0b405 100644 --- a/mobile/mobile_22_2.asm +++ b/mobile/mobile_22_2.asm @@ -808,8 +808,8 @@ Function8b79e: ; 8b79e Function8b7bd: ; 8b7bd call Function8b855 - ld hl, MenuDataHeader_0x8b867 - call CopyMenuDataHeader + ld hl, MenuHeader_0x8b867 + call CopyMenuHeader ld a, [wd030] ld [wMenuCursorBuffer], a ld a, [wd031] @@ -871,7 +871,7 @@ Function8b7bd: ; 8b7bd Function8b832: ; 8b832 ld a, [wMenuScrollPosition] - ld hl, wMenuData2Items + ld hl, wMenuDataItems sub [hl] jr nc, Function8b84b xor a @@ -880,7 +880,7 @@ Function8b832: ; 8b832 Function8b83e: ; 8b83e ld a, [wMenuScrollPosition] - ld hl, wMenuData2Items + ld hl, wMenuDataItems add [hl] cp $24 jr c, Function8b84b @@ -909,16 +909,16 @@ Function8b855: ; 8b855 ret ; 8b867 -MenuDataHeader_0x8b867: ; 0x8b867 +MenuHeader_0x8b867: ; 0x8b867 db MENU_BACKUP_TILES ; flags menu_coords 1, 3, 18, 13 - dw MenuData2_0x8b870 + dw MenuData_0x8b870 db 1 ; default option ; 0x8b86f db 0 -MenuData2_0x8b870: ; 0x8b870 +MenuData_0x8b870: ; 0x8b870 db SCROLLINGMENU_ENABLE_FUNCTION3 | SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_LEFT ; flags db 5 ; items db 3, 1 @@ -1035,22 +1035,22 @@ Function8b94a: ; 8b94a Function8b960: ; 8b960 (22:7960) - ld hl, MenuDataHeader_0x8b9ac - call LoadMenuDataHeader + ld hl, MenuHeader_0x8b9ac + call LoadMenuHeader call Function8b9e9 jr c, .asm_8b97a hlcoord 11, 0 ld b, $6 ld c, $7 call Function8b703 - ld hl, MenuDataHeader_0x8b9b1 + ld hl, MenuHeader_0x8b9b1 jr .asm_8b987 .asm_8b97a hlcoord 11, 0 ld b, $a ld c, $7 call Function8b703 - ld hl, MenuDataHeader_0x8b9ca + ld hl, MenuHeader_0x8b9ca .asm_8b987 ld a, $1 call Function89d5e @@ -1081,18 +1081,18 @@ Function8b9ab: ; 8b9ab ret ; 8b9ac -MenuDataHeader_0x8b9ac: ; 0x8b9ac +MenuHeader_0x8b9ac: ; 0x8b9ac db MENU_BACKUP_TILES ; flags menu_coords 11, 0, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 -MenuDataHeader_0x8b9b1: ; 0x8b9b1 +MenuHeader_0x8b9b1: ; 0x8b9b1 db MENU_BACKUP_TILES ; flags menu_coords 11, 0, SCREEN_WIDTH - 1, 7 - dw MenuData2_0x8b9b9 + dw MenuData_0x8b9b9 db 1 ; default option ; 0x8b9b9 -MenuData2_0x8b9b9: ; 0x8b9b9 +MenuData_0x8b9b9: ; 0x8b9b9 db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 3 ; items db "へんしゅう@" ; EDIT @@ -1100,14 +1100,14 @@ MenuData2_0x8b9b9: ; 0x8b9b9 db "やめる@" ; QUIT ; 0x8b9ca -MenuDataHeader_0x8b9ca: ; 0x8b9ca +MenuHeader_0x8b9ca: ; 0x8b9ca db MENU_BACKUP_TILES ; flags menu_coords 11, 0, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw MenuData2_0x8b9d2 + dw MenuData_0x8b9d2 db 1 ; default option ; 0x8b9d2 -MenuData2_0x8b9d2: ; 0x8b9d2 +MenuData_0x8b9d2: ; 0x8b9d2 db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 5 ; items db "みる@" ; VIEW diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 3dc3f2682..0ef0079e5 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -898,8 +898,8 @@ Jumptable_100581: ; 100581 ; 100585 Function100585: ; 100585 - ld hl, MenuDataHeader_1005b2 - call LoadMenuDataHeader + ld hl, MenuHeader_1005b2 + call LoadMenuHeader ld a, 0 ld [wcd28], a ld a, [wcd26] @@ -923,14 +923,14 @@ Function100597: ; 100597 ret ; 1005b2 -MenuDataHeader_1005b2: ; 1005b2 +MenuHeader_1005b2: ; 1005b2 db MENU_BACKUP_TILES ; flags db 6, 14 db 10, 19 - dw MenuData2_1005ba + dw MenuData_1005ba db 1 ; default option -MenuData2_1005ba: +MenuData_1005ba: db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 db "はい@" @@ -950,8 +950,8 @@ Jumptable_1005cb: ; 1005cb ; 1005cf Function1005cf: ; 1005cf - ld hl, MenuDataHeader_1005fc - call LoadMenuDataHeader + ld hl, MenuHeader_1005fc + call LoadMenuHeader ld a, 0 ld [wcd28], a ld a, [wcd26] @@ -974,14 +974,14 @@ Function1005e1: ; 1005e1 ret ; 1005fc -MenuDataHeader_1005fc: ; 1005fc +MenuHeader_1005fc: ; 1005fc db MENU_BACKUP_TILES ; flags db 6, 14 db 10, 19 - dw MenuData2_100604 + dw MenuData_100604 db 1 ; default option -MenuData2_100604: ; 100604 +MenuData_100604: ; 100604 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 db "かける@" @@ -1800,12 +1800,12 @@ SECTION "bank40_2", ROMX Function100b12: ; 100b12 call Function100dd8 ret c - ld hl, BattleMenuDataHeader - ld a, BANK(BattleMenuDataHeader) - ld de, LoadMenuDataHeader + ld hl, BattleMenuHeader + ld a, BANK(BattleMenuHeader) + ld de, LoadMenuHeader call FarCall_de - ld a, BANK(BattleMenuDataHeader) - ld [wMenuData2_2DMenuItemStringsBank], a + ld a, BANK(BattleMenuHeader) + ld [wMenuData_2DMenuItemStringsBank], a ld a, [wBattleMenuCursorBuffer] ld [wMenuCursorBuffer], a call Function100e72 @@ -1845,8 +1845,8 @@ Function100b45: ; 100b45 ; 100b7a Function100b7a: ; 100b7a - ld hl, CopyMenuData2 - ld a, [wMenuData2_2DMenuItemStringsBank] + ld hl, CopyMenuData + ld a, [wMenuData_2DMenuItemStringsBank] rst FarCall farcall Draw2DMenu farcall MobileTextBorder @@ -2103,28 +2103,28 @@ MobileBattleMonMenu: ; 100d22 ; 100d67 Function100d67: ; 100d67 - ld hl, .MenuDataHeader - call CopyMenuDataHeader + ld hl, .MenuHeader + call CopyMenuHeader xor a ld [hBGMapMode], a call MenuBox call UpdateSprites call PlaceVerticalMenuItems call WaitBGMap - call CopyMenuData2 + call CopyMenuData call InitVerticalMenuCursor ld hl, w2DMenuFlags1 set 6, [hl] ret ; 100d88 -.MenuDataHeader: ; 100d88 +.MenuHeader: ; 100d88 db 0 ; flags menu_coords 11, 11, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: ; 100d90 +.MenuData: ; 100d90 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 db "いれかえる@" ; TRADE @@ -4535,7 +4535,7 @@ Unknown_101d8d: ; 101d8d Function101d95: ; 101d95 call Function101ee2 - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld e, $0e call Function101ee4 ld hl, wcd29 @@ -6200,8 +6200,8 @@ Jumptable_10292f: ; 10292f ; 102933 Function102933: ; 102933 - ld hl, MenuDataHeader_1029bb - call LoadMenuDataHeader + ld hl, MenuHeader_1029bb + call LoadMenuHeader call Function102e07 ld a, $32 ld [TextDelayFrames], a @@ -6285,7 +6285,7 @@ Function1029af: ; 1029af ret ; 1029bb -MenuDataHeader_1029bb: ; 1029bb +MenuHeader_1029bb: ; 1029bb db MENU_BACKUP_TILES ; flags menu_coords 3, 10, 15, 12 dw NULL @@ -6305,7 +6305,7 @@ Jumptable_1029cb: ; 1029cb ; 1029cf Function1029cf: ; 1029cf - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader hlcoord 10, 7 ld b, 3 ld c, 8 @@ -7756,8 +7756,8 @@ Unknown_103608: ; 103608 ; 103612 Special_AskMobileOrCable: ; 103612 - ld hl, MenuDataHeader_103640 - call LoadMenuDataHeader + ld hl, MenuHeader_103640 + call LoadMenuHeader ld a, [wMobileOrCable_LastSelection] and $0f jr z, .skip_load @@ -7782,13 +7782,13 @@ Special_AskMobileOrCable: ; 103612 ret ; 103640 -MenuDataHeader_103640: ; 103640 +MenuHeader_103640: ; 103640 db MENU_BACKUP_TILES ; flags menu_coords 13, 6, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw MenuData2_103648 + dw MenuData_103648 db 1 ; default option -MenuData2_103648: ; 103648 +MenuData_103648: ; 103648 db STATICMENU_CURSOR ; flags db 2 db "モバイル@" @@ -7849,8 +7849,8 @@ Special_Mobile_SelectThreeMons: ; 10366e .asm_1036b5 call Function103700 jr c, .asm_1036f4 - ld hl, MenuDataHeader_103747 - call LoadMenuDataHeader + ld hl, MenuHeader_103747 + call LoadMenuHeader call VerticalMenu call ExitMenu jr c, .asm_1036f4 @@ -7936,13 +7936,13 @@ Function103700: ; 103700 ret ; 103747 -MenuDataHeader_103747: ; 103747 +MenuHeader_103747: ; 103747 db MENU_BACKUP_TILES ; flags menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw MenuData2_10374f + dw MenuData_10374f db 1 ; default option -MenuData2_10374f: ; 10374f +MenuData_10374f: ; 10374f db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 db "はい@" diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index af9bdb633..ac0292862 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -7168,12 +7168,12 @@ Function117764_a_button: ; 11784c (45:784c) jp Function117764_start Function1178aa: ; 1178aa (45:78aa) - ld hl, MenuDataHeader_1179b5 - call LoadMenuDataHeader + ld hl, MenuHeader_1179b5 + call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile - ld hl, MenuDataHeader_1179bd - call LoadMenuDataHeader + ld hl, MenuHeader_1179bd + call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile farcall ReloadMapPart @@ -7274,8 +7274,8 @@ asm_11797e: ; 11797e (45:797e) ret Function117984: ; 117984 (45:7984) - ld hl, MenuDataHeader_1179b5 - call LoadMenuDataHeader + ld hl, MenuHeader_1179b5 + call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile farcall ReloadMapPart @@ -7297,14 +7297,14 @@ Function1179a7: ; 1179a7 (45:79a7) ; 1179b5 (45:79b5) -MenuDataHeader_1179b5: ; 1179b5 +MenuHeader_1179b5: ; 1179b5 db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw NULL db 0 ; default option ; 1179bd -MenuDataHeader_1179bd: ; 1179bd +MenuHeader_1179bd: ; 1179bd db MENU_BACKUP_TILES ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw NULL @@ -7438,8 +7438,8 @@ Function117b14: ld hl, wcf64 dec [hl] ret nz - ld hl, MenuDataHeader_117cbc - call LoadMenuDataHeader + ld hl, MenuHeader_117cbc + call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile jp MobileStudium_JumptableIncrement @@ -7450,8 +7450,8 @@ Function117b28: jp MobileStudium_JumptableIncrement Function117b31: - ld hl, MenuDataHeader_117cc4 - call LoadMenuDataHeader + ld hl, MenuHeader_117cc4 + call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile hlcoord 16, 8 @@ -7595,8 +7595,8 @@ Function117bb6: jp MobileStudium_JumptableIncrement Function117c4a: - ld hl, MenuDataHeader_117cbc - call LoadMenuDataHeader + ld hl, MenuHeader_117cbc + call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile farcall ReloadMapPart @@ -7656,13 +7656,13 @@ Function117c89: call CloseSRAM ret -MenuDataHeader_117cbc: ; 0x117cbc +MenuHeader_117cbc: ; 0x117cbc db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw NULL db 0 ; default option -MenuDataHeader_117cc4: ; 0x117cc4 +MenuHeader_117cc4: ; 0x117cc4 db MENU_BACKUP_TILES ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw NULL diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm index 8f66da8cd..9a9df1309 100755 --- a/mobile/mobile_45_sprite_engine.asm +++ b/mobile/mobile_45_sprite_engine.asm @@ -506,7 +506,7 @@ Function1161d5: ; 1161d5 ; 11628c -MenuDataHeader_11628c: ; 11628c +MenuHeader_11628c: ; 11628c db MENU_BACKUP_TILES ; flags menu_coords 0, 6, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw NULL diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 51ae92703..01c505601 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -1184,8 +1184,8 @@ BattleTowerRoomMenu_PlacePickLevelMenu: ld a, [$c31a] and a ret nz - ld hl, MenuDataHeader_119cf7 - call LoadMenuDataHeader + ld hl, MenuHeader_119cf7 + call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile call ApplyTilemap @@ -3953,7 +3953,7 @@ BattleTowerRoomMenu_UpdateYesNoMenu: ret ; 119cf7 -MenuDataHeader_119cf7: ; 119cf7 +MenuHeader_119cf7: ; 119cf7 db MENU_BACKUP_TILES ; flags menu_coords 12, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw NULL @@ -4635,8 +4635,8 @@ Function11a1ff: ; 11a1ff ; 11a207 BattleTowerRoomMenu2_PlaceYesNoMenu: ; 11a207 - ld hl, MenuDataHeader_11a2de - call LoadMenuDataHeader + ld hl, MenuHeader_11a2de + call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile call ApplyTilemap @@ -4751,14 +4751,14 @@ String_11a2d3: ; 11a2d3 db "NO@" ; 11a2d6 -MenuDataHeader_11a2d6: ; 11a2d6 +MenuHeader_11a2d6: ; 11a2d6 db MENU_BACKUP_TILES ; flags menu_coords 14, 6, SCREEN_WIDTH - 1, 10 dw NULL db 0 ; default option ; 11a2de -MenuDataHeader_11a2de: ; 11a2de +MenuHeader_11a2de: ; 11a2de db MENU_BACKUP_TILES ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw NULL @@ -5321,7 +5321,7 @@ String_11a7f4: ; 11a7f4 db "　　　　　　　　　　　　　　　@" ; 11a804 -MenuDataHeader_11a804: ; 11a804 +MenuHeader_11a804: ; 11a804 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, SCREEN_WIDTH - 1, 5 dw NULL @@ -5900,8 +5900,8 @@ Function11ad8f: ; 11ad8f ; 11ad95 Function11ad95: ; 11ad95 - ld hl, MenuDataHeader_11ae38 - call LoadMenuDataHeader + ld hl, MenuHeader_11ae38 + call LoadMenuHeader call MenuBox hlcoord 12, 12 ld de, String_11ae40 @@ -5992,7 +5992,7 @@ Function11adc4: ret ; 11ae38 -MenuDataHeader_11ae38: ; 11ae38 +MenuHeader_11ae38: ; 11ae38 db MENU_BACKUP_TILES ; flags menu_coords 10, 10, 17, SCREEN_HEIGHT - 1 dw NULL @@ -6007,14 +6007,14 @@ String_11ae40: ; 11ae40 ; 11ae4e Function11ae4e: ; 11ae4e - ld hl, MenuDataHeader_11afe8 - call LoadMenuDataHeader + ld hl, MenuHeader_11afe8 + call LoadMenuHeader call MenuBox hlcoord 10, 14 ld de, String_11aff0 call PlaceString - ld hl, MenuDataHeader_11b013 - call LoadMenuDataHeader + ld hl, MenuHeader_11b013 + call LoadMenuHeader call MenuBox hlcoord 16, 8 ld de, String_11b01b @@ -6098,14 +6098,14 @@ Function11ae98: ; 11af04 Function11af04: ; 11af04 - ld hl, MenuDataHeader_11afe8 - call LoadMenuDataHeader + ld hl, MenuHeader_11afe8 + call LoadMenuHeader call MenuBox hlcoord 10, 14 ld de, String_11b003 call PlaceString - ld hl, MenuDataHeader_11b013 - call LoadMenuDataHeader + ld hl, MenuHeader_11b013 + call LoadMenuHeader call MenuBox hlcoord 16, 8 ld de, String_11b01b @@ -6238,7 +6238,7 @@ Function11afd6: ; 11afd6 ret ; 11afe8 -MenuDataHeader_11afe8: ; 11afe8 +MenuHeader_11afe8: ; 11afe8 db MENU_BACKUP_TILES ; flags menu_coords 9, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw NULL @@ -6255,7 +6255,7 @@ String_11b003: ; 11b003 next "ちゅうししますか？@" ; 11b013 -MenuDataHeader_11b013: ; 11b013 +MenuHeader_11b013: ; 11b013 db MENU_BACKUP_TILES ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw NULL diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index f973c2378..b0d2e00e3 100755 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -615,8 +615,8 @@ Function171beb: ; 171beb (5c:5beb) ld a, [wcd4a] ld [$aa4a], a call CloseSRAM - ld hl, MenuDataHeader_171c6b - call LoadMenuDataHeader + ld hl, MenuHeader_171c6b + call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile farcall ReloadMapPart @@ -671,7 +671,7 @@ Function171c66: ; 171c66 (5c:5c66) ; 171c6b (5c:5c6b) -MenuDataHeader_171c6b: ; 171c6b +MenuHeader_171c6b: ; 171c6b db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw NULL diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm index a736182cf..d4ad45fc0 100644 --- a/mobile/mobile_5e.asm +++ b/mobile/mobile_5e.asm @@ -424,7 +424,7 @@ Function17a91e: ; 17a91e (5e:691e) ret .asm_17a92c - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call Function17a99e ld hl, $d088 set 7, [hl] diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 2d9ccf847..9d9a674dd 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -441,16 +441,16 @@ Special_Menu_ChallengeExplanationCancel: ; 17d224 jr nz, .English ld a, $4 ld [ScriptVar], a - ld hl, MenuDataHeader_17d26a ; Japanese Menu, where you can choose 'News' as an option + ld hl, MenuHeader_17d26a ; Japanese Menu, where you can choose 'News' as an option jr .Load_Interpret .English: ld a, $4 ld [ScriptVar], a - ld hl, MenuDataHeader_ChallengeExplanationCancel ; English Menu + ld hl, MenuHeader_ChallengeExplanationCancel ; English Menu .Load_Interpret: - call LoadMenuDataHeader + call LoadMenuHeader call Function17d246 call CloseWindow ret @@ -482,13 +482,13 @@ Function17d246: ; 17d246 ret ; 17d26a -MenuDataHeader_17d26a: ; 17d26a +MenuHeader_17d26a: ; 17d26a db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 14, 9 - dw MenuData2_17d272 + dw MenuData_17d272 db 1 ; default option -MenuData2_17d272: ; 17d272 +MenuData_17d272: ; 17d272 db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 4 db "ニュース¯よみこむ@" @@ -497,13 +497,13 @@ MenuData2_17d272: ; 17d272 db "やめる@" ; 17d28f -MenuDataHeader_ChallengeExplanationCancel: ; 17d28f +MenuHeader_ChallengeExplanationCancel: ; 17d28f db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 14, 7 - dw MenuData2_ChallengeExplanationCancel + dw MenuData_ChallengeExplanationCancel db 1 ; default option -MenuData2_ChallengeExplanationCancel: ; 17d297 +MenuData_ChallengeExplanationCancel: ; 17d297 db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 3 db "Challenge@" @@ -1907,7 +1907,7 @@ Function17dc1f: ; 17dc1f ld a, $1 ld [$c70f], a ld hl, $c708 - call LoadMenuDataHeader + call LoadMenuHeader call VerticalMenu jr nc, .asm_17dc6e ld a, $2 @@ -1940,7 +1940,7 @@ Function17dc1f: ; 17dc1f ret ; 17dc96 -MenuData2_17dc96: +MenuData_17dc96: db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags db 2 db "はい@" diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index 8c5786eb0..4c7a20b3d 100755 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -171,7 +171,7 @@ Function4a098: ; 4a098 (12:6098) call MenuClickSound call PlaceHollowCursor call WaitBGMap - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall Function89de0 call Call_ExitMenu call MG_Mobile_Layout_LoadPals @@ -389,7 +389,7 @@ Function4a28a: ; 4a28a (12:628a) call Function4a6d8 call PlaceHollowCursor call WaitBGMap - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld a, $5 call GetSRAMBank ld a, [$aa4b] @@ -433,8 +433,8 @@ Function4a28a: ; 4a28a (12:628a) ld c, 4 call TextBox farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap - ld hl, DeletePassword_YesNo_MenuDataHeader - call LoadMenuDataHeader + ld hl, DeletePassword_YesNo_MenuHeader + call LoadMenuHeader call VerticalMenu bit B_BUTTON_F, a jr nz, .dont_delete_password @@ -460,7 +460,7 @@ Function4a28a: ; 4a28a (12:628a) ret ; 4a346 (12:6346) -MenuDataHeader_0x4a346: ; 0x4a346 +MenuHeader_0x4a346: ; 0x4a346 db MENU_BACKUP_TILES ; flags menu_coords 12, 0, SCREEN_WIDTH - 1, 6 @@ -482,14 +482,14 @@ UnknownText_0x4a35d: ; 0x4a35d db "@" ; 0x4a362 -DeletePassword_YesNo_MenuDataHeader: ; 0x4a362 +DeletePassword_YesNo_MenuHeader: ; 0x4a362 db MENU_BACKUP_TILES ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw MenuData2_0x4a36a + dw MenuData_0x4a36a db 2 ; default option ; 0x4a36a -MenuData2_0x4a36a: ; 0x4a36a +MenuData_0x4a36a: ; 0x4a36a db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags db 2 ; items db "はい@" diff --git a/wram.asm b/wram.asm index 37f951e5b..9d167ab28 100644 --- a/wram.asm +++ b/wram.asm @@ -1405,52 +1405,52 @@ wWindowStackSize:: db ; cf78 ds 8 -; menu data header -wMenuDataHeader:: ; cf81 +; menu header +wMenuHeader:: ; cf81 wMenuFlags:: db wMenuBorderTopCoord:: db wMenuBorderLeftCoord:: db wMenuBorderBottomCoord:: db wMenuBorderRightCoord:: db -wMenuData2Pointer:: dw +wMenuDataPointer:: dw wMenuCursorBuffer:: dw wMenuDataBank:: db ds 6 -wMenuDataHeaderEnd:: +wMenuHeaderEnd:: -wMenuData2:: -; MenuData2 +wMenuData:: +; MenuData -wMenuData2Flags:: db ; cf91 +wMenuDataFlags:: db ; cf91 UNION ; cf92 ; Vertical Menu/DoNthMenu/SetUpMenu -wMenuData2Items:: db ; cf92 -wMenuData2IndicesPointer:: dw ; cf94 -wMenuData2DisplayFunctionPointer:: dw ; cf96 -wMenuData2PointerTableAddr:: dw ; cf97 +wMenuDataItems:: db ; cf92 +wMenuDataIndicesPointer:: dw ; cf94 +wMenuDataDisplayFunctionPointer:: dw ; cf96 +wMenuDataPointerTableAddr:: dw ; cf97 NEXTU ; cf92 ; 2D Menu -wMenuData2_2DMenuDimensions:: db ; cf92 -wMenuData2_2DMenuSpacing:: db ; cf93 -wMenuData2_2DMenuItemStringsBank:: db ; cf94 -wMenuData2_2DMenuItemStringsAddr:: dw ; cf96 -wMenuData2_2DMenuFunctionBank:: db ; cf97 -wMenuData2_2DMenuFunctionAddr:: dw ; cf98 +wMenuData_2DMenuDimensions:: db ; cf92 +wMenuData_2DMenuSpacing:: db ; cf93 +wMenuData_2DMenuItemStringsBank:: db ; cf94 +wMenuData_2DMenuItemStringsAddr:: dw ; cf96 +wMenuData_2DMenuFunctionBank:: db ; cf97 +wMenuData_2DMenuFunctionAddr:: dw ; cf98 NEXTU ; cf92 ; Scrolling Menu -wMenuData2_ScrollingMenuHeight:: db ; cf92 -wMenuData2_ScrollingMenuWidth:: db ; cf93 -wMenuData2_ScrollingMenuSpacing:: db ; cf94 -wMenuData2_ItemsPointerBank:: db ; cf95 -wMenuData2_ItemsPointerAddr:: dw ; cf97 -wMenuData2_ScrollingMenuFunction1:: ds 3 ; cf98 -wMenuData2_ScrollingMenuFunction2:: ds 3 ; cf9b -wMenuData2_ScrollingMenuFunction3:: ds 3 ; cf9e +wMenuData_ScrollingMenuHeight:: db ; cf92 +wMenuData_ScrollingMenuWidth:: db ; cf93 +wMenuData_ScrollingMenuSpacing:: db ; cf94 +wMenuData_ItemsPointerBank:: db ; cf95 +wMenuData_ItemsPointerAddr:: dw ; cf97 +wMenuData_ScrollingMenuFunction1:: ds 3 ; cf98 +wMenuData_ScrollingMenuFunction2:: ds 3 ; cf9b +wMenuData_ScrollingMenuFunction3:: ds 3 ; cf9e ENDU ; cfa1 -wMenuData2End:: +wMenuDataEnd:: wMenuData3:: w2DMenuCursorInitY:: db ; cfa1 From 09ff04dbfc0e7afbb1e7adf77e0294ad5e91df57 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 16:38:52 -0500 Subject: [PATCH 034/135] =?UTF-8?q?wMenuData3=20=E2=86=92=20w2DMenuData?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine/learn.asm | 2 +- wram.asm | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/engine/learn.asm b/engine/learn.asm index 2f1038d7f..01367c836 100755 --- a/engine/learn.asm +++ b/engine/learn.asm @@ -145,7 +145,7 @@ ForgetMove: ; 65d3 ld a, SCREEN_WIDTH * 2 ld [Buffer1], a predef ListMoves - ; wMenuData3 + ; w2DMenuData ld a, $4 ld [w2DMenuCursorInitY], a ld a, $6 diff --git a/wram.asm b/wram.asm index 9d167ab28..c507c2495 100644 --- a/wram.asm +++ b/wram.asm @@ -1419,8 +1419,6 @@ wMenuDataBank:: db wMenuHeaderEnd:: wMenuData:: -; MenuData - wMenuDataFlags:: db ; cf91 UNION ; cf92 @@ -1452,7 +1450,7 @@ wMenuData_ScrollingMenuFunction3:: ds 3 ; cf9e ENDU ; cfa1 wMenuDataEnd:: -wMenuData3:: +w2DMenuData:: w2DMenuCursorInitY:: db ; cfa1 w2DMenuCursorInitX:: db ; cfa2 w2DMenuNumRows:: db ; cfa3 @@ -1470,7 +1468,7 @@ w2DMenuFlags1:: ; cfa5 w2DMenuFlags2:: db ; cfa6 w2DMenuCursorOffsets:: db ; cfa7 wMenuJoypadFilter:: db ; cfa8 -wMenuData3End:: +w2DMenuDataEnd:: wMenuCursorY:: db ; cfa9 wMenuCursorX:: db ; cfaa From 505a6595bc32dd687500f2e0561fcf4e9f8fca8c Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 24 Jan 2018 10:46:49 -0500 Subject: [PATCH 035/135] EVENT_TEMPORARY_UNTIL_MAP_RELOAD_[1-8] (close issue #481) --- constants/event_flags.asm | 16 +++++------ data/decorations/attributes.asm | 16 +++++------ engine/events/std_scripts.asm | 2 +- engine/phone/phone_scripts.asm | 2 +- maps/BillsHouse.asm | 10 +++---- maps/Colosseum.asm | 4 +-- maps/DragonShrine.asm | 44 +++++++++++++++---------------- maps/DragonsDenB1F.asm | 4 +-- maps/EcruteakTinTowerEntrance.asm | 4 +-- maps/GoldenrodUnderground.asm | 44 +++++++++++++++---------------- maps/KurtsHouse.asm | 20 +++++++------- maps/OlivinePort.asm | 14 +++++----- maps/PlayersHouse1F.asm | 10 +++---- maps/PlayersHouse2F.asm | 2 +- maps/Pokecenter2F.asm | 4 +-- maps/Route36NationalParkGate.asm | 20 +++++++------- maps/TimeCapsule.asm | 4 +-- maps/TradeCenter.asm | 4 +-- maps/VermilionPort.asm | 14 +++++----- 19 files changed, 119 insertions(+), 119 deletions(-) diff --git a/constants/event_flags.asm b/constants/event_flags.asm index dc1aaafde..7c9b67fa9 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -1,14 +1,14 @@ ; EventFlags bit flags const_def ; The first eight flags are reset upon reloading the map - const EVENT_GAVE_KURT_APRICORNS ; 000 - const EVENT_RECEIVED_BALLS_FROM_KURT - const EVENT_DRAGON_SHRINE_QUESTION_2 - const EVENT_DRAGON_SHRINE_QUESTION_3 - const EVENT_DRAGON_SHRINE_QUESTION_4 - const EVENT_DRAGON_SHRINE_QUESTION_5 - const EVENT_JUST_RECEIVED_DRATINI - const EVENT_IN_YOUR_ROOM + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 ; 000 + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4 + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5 + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6 + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7 + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8 ; Johto Gym Leader TM gifts const EVENT_GOT_TM31_MUD_SLAP const EVENT_GOT_TM49_FURY_CUTTER diff --git a/data/decorations/attributes.asm b/data/decorations/attributes.asm index 209662a6f..a60f441a6 100644 --- a/data/decorations/attributes.asm +++ b/data/decorations/attributes.asm @@ -7,36 +7,36 @@ ENDM DecorationAttributes: ; 26a4f ; entries correspond to deco constants - decoration DECO_PLANT, $00, $0, EVENT_GAVE_KURT_APRICORNS, $00 - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BED, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, $00, $0, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BED, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_BED, FEATHERY_BED, SET_UP_BED, EVENT_DECO_BED_1, $1b decoration DECO_BED, PINK_BED, SET_UP_BED, EVENT_DECO_BED_2, $1c decoration DECO_BED, POLKADOT_BED, SET_UP_BED, EVENT_DECO_BED_3, $1d decoration DECO_BED, PIKACHU_BED, SET_UP_BED, EVENT_DECO_BED_4, $1e - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CARPET, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CARPET, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_CARPET, RED_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_1, $08 decoration DECO_CARPET, BLUE_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_2, $0b decoration DECO_CARPET, YELLOW_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_3, $0e decoration DECO_CARPET, GREEN_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_4, $11 - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_PLANT, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_PLANT, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_PLANT, MAGNAPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_1, $20 decoration DECO_PLANT, TROPICPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_2, $21 decoration DECO_PLANT, JUMBOPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_3, $22 - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_POSTER, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_POSTER, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_PLANT, TOWN_MAP_D, SET_UP_POSTER, EVENT_DECO_PLANT_4, $1f decoration DECO_POSTER, PIKACHU, SET_UP_POSTER, EVENT_DECO_POSTER_1, $23 decoration DECO_POSTER, CLEFAIRY, SET_UP_POSTER, EVENT_DECO_POSTER_2, $24 decoration DECO_POSTER, JIGGLYPUFF, SET_UP_POSTER, EVENT_DECO_POSTER_3, $25 - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CONSOLE, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CONSOLE, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_PLANT, FAMICOM, SET_UP_CONSOLE, EVENT_DECO_FAMICOM, SPRITE_FAMICOM decoration DECO_PLANT, SUPER_NES, SET_UP_CONSOLE, EVENT_DECO_SNES, SPRITE_SNES decoration DECO_PLANT, NINTENDO_64, SET_UP_CONSOLE, EVENT_DECO_N64, SPRITE_N64 decoration DECO_PLANT, VIRTUAL_BOY, SET_UP_CONSOLE, EVENT_DECO_VIRTUAL_BOY, SPRITE_VIRTUAL_BOY - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BIG_DOLL, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BIG_DOLL, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_BIGDOLL, SNORLAX, SET_UP_BIG_DOLL, EVENT_DECO_BIG_SNORLAX_DOLL, SPRITE_BIG_SNORLAX decoration DECO_BIGDOLL, ONIX, SET_UP_BIG_DOLL, EVENT_DECO_BIG_ONIX_DOLL, SPRITE_BIG_ONIX decoration DECO_BIGDOLL, LAPRAS, SET_UP_BIG_DOLL, EVENT_DECO_BIG_LAPRAS_DOLL, SPRITE_BIG_LAPRAS - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_DOLL, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_DOLL, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_DOLL, PIKACHU, SET_UP_DOLL, EVENT_DECO_PIKACHU_DOLL, SPRITE_PIKACHU decoration DECO_PLANT, SURF_PIKA_DOLL, SET_UP_DOLL, EVENT_DECO_SURFING_PIKACHU_DOLL, SPRITE_SURFING_PIKACHU decoration DECO_DOLL, CLEFAIRY, SET_UP_DOLL, EVENT_DECO_CLEFAIRY_DOLL, SPRITE_CLEFAIRY diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 42dce7c65..cd4aa1497 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -384,7 +384,7 @@ BugContestResults_CleanUp ; 0xbc31e BugContestResults_FirstPlace ; 0xbc31e - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 itemtotext SUN_STONE, MEM_BUFFER_1 farwritetext ContestResults_PlayerWonAPrizeText waitbutton diff --git a/engine/phone/phone_scripts.asm b/engine/phone/phone_scripts.asm index d087a59f1..cc72cf189 100644 --- a/engine/phone/phone_scripts.asm +++ b/engine/phone/phone_scripts.asm @@ -16,7 +16,7 @@ MomPhoneScript: ; 0xbceaa jump MomPhoneNoPokemonScript .bcec5 ; 0xbcec5 - checkevent EVENT_IN_YOUR_ROOM + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8 iftrue MomPhoneHangUpScript farwritetext MomPhoneGreetingText buttonsound diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index a4f2e0c0e..9c64ff04b 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -11,7 +11,7 @@ BillsHouse_MapScripts: BillsGrandpa: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue .JustShowedSomething checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA iftrue .GotThunderstone @@ -123,7 +123,7 @@ BillsGrandpa: verbosegiveitem EVERSTONE iffalse .BagFull setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 closetext end @@ -134,7 +134,7 @@ BillsGrandpa: verbosegiveitem LEAF_STONE iffalse .BagFull setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 closetext end @@ -145,7 +145,7 @@ BillsGrandpa: verbosegiveitem WATER_STONE iffalse .BagFull setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 closetext end @@ -156,7 +156,7 @@ BillsGrandpa: verbosegiveitem FIRE_STONE iffalse .BagFull setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 closetext end diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 6f8538bac..024729400 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -81,5 +81,5 @@ Colosseum_MapEvents: .ObjectEvents: db 2 - object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS - object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT + object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 54797c90f..1a524cb3a 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -27,7 +27,7 @@ DragonShrine_MapScripts: writetext DragonShrineElderGreetingText buttonsound .Question1: - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 writetext DragonShrineQuestion1Text buttonsound loadmenuheader DragonShrineQuestion1_MenuHeader @@ -39,7 +39,7 @@ DragonShrine_MapScripts: end .Question2: - setevent EVENT_DRAGON_SHRINE_QUESTION_2 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 writetext DragonShrineQuestion2Text buttonsound loadmenuheader DragonShrineQuestion2_MenuHeader @@ -49,7 +49,7 @@ DragonShrine_MapScripts: if_equal 2, .RightAnswer if_equal 3, .WrongAnswer .Question3: - setevent EVENT_DRAGON_SHRINE_QUESTION_3 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4 writetext DragonShrineQuestion3Text buttonsound loadmenuheader DragonShrineQuestion3_MenuHeader @@ -59,7 +59,7 @@ DragonShrine_MapScripts: if_equal 2, .RightAnswer if_equal 3, .RightAnswer .Question4: - setevent EVENT_DRAGON_SHRINE_QUESTION_4 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5 writetext DragonShrineQuestion4Text buttonsound loadmenuheader DragonShrineQuestion4_MenuHeader @@ -69,7 +69,7 @@ DragonShrine_MapScripts: if_equal 2, .WrongAnswer if_equal 3, .RightAnswer .Question5: - setevent EVENT_DRAGON_SHRINE_QUESTION_5 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6 writetext DragonShrineQuestion5Text buttonsound loadmenuheader DragonShrineQuestion5_MenuHeader @@ -79,17 +79,17 @@ DragonShrine_MapScripts: if_equal 2, .RightAnswer if_equal 3, .WrongAnswer .RightAnswer: - checkevent EVENT_DRAGON_SHRINE_QUESTION_5 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6 iftrue .PassedTheTest writetext DragonShrineRightAnswerText buttonsound - checkevent EVENT_DRAGON_SHRINE_QUESTION_4 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5 iftrue .Question5 - checkevent EVENT_DRAGON_SHRINE_QUESTION_3 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4 iftrue .Question4 - checkevent EVENT_DRAGON_SHRINE_QUESTION_2 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 iftrue .Question3 - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue .Question2 .WrongAnswer: closetext @@ -105,15 +105,15 @@ DragonShrine_MapScripts: closetext setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG opentext - checkevent EVENT_DRAGON_SHRINE_QUESTION_5 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6 iftrue .Question5 - checkevent EVENT_DRAGON_SHRINE_QUESTION_4 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5 iftrue .Question4 - checkevent EVENT_DRAGON_SHRINE_QUESTION_3 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4 iftrue .Question3 - checkevent EVENT_DRAGON_SHRINE_QUESTION_2 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 iftrue .Question2 - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue .Question1 .PassedTheTest: writetext DragonShrinePassedTestText @@ -188,15 +188,15 @@ DragonShrine_MapScripts: playsound SFX_ENTER_DOOR disappear DRAGONSHRINE_CLAIR waitsfx - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 end DragonShrineElder1Script: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue .DontGiveDratiniYet - checkevent EVENT_JUST_RECEIVED_DRATINI + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7 iftrue .ReceivedDratini checkevent EVENT_GOT_DRATINI iffalse .GiveDratini @@ -219,7 +219,7 @@ DragonShrineElder1Script: checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG special Special_Dratini setevent EVENT_GOT_DRATINI - setevent EVENT_JUST_RECEIVED_DRATINI + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7 writetext DragonShrineSymbolicDragonText waitbutton closetext @@ -674,7 +674,7 @@ DragonShrine_MapEvents: .ObjectEvents: db 4 - object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder1Script, EVENT_GAVE_KURT_APRICORNS - object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder2Script, EVENT_GAVE_KURT_APRICORNS - object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder3Script, EVENT_GAVE_KURT_APRICORNS + object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder1Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder2Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder3Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 object_event 4, 8, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 1bab71a14..9572a706f 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -157,12 +157,12 @@ SilverScript_0x18c97e: playmusic MUSIC_RIVAL_ENCOUNTER faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue .SilverTalkAgain writetext SilverText_Training1 waitbutton closetext - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 special RestartMapMusic end diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm index f94e462e4..3d960dfee 100644 --- a/maps/EcruteakTinTowerEntrance.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -87,7 +87,7 @@ SageScript_0x98062: .CheckForClearBell: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue .AllowedThrough - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue .Event000 checkitem CLEAR_BELL iftrue .RingClearBell @@ -103,7 +103,7 @@ SageScript_0x98062: setscene 1 setevent EVENT_RANG_CLEAR_BELL_2 clearevent EVENT_RANG_CLEAR_BELL_1 - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 end .AllowedThrough: diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index e2e91dd1d..72ace6fa3 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -209,21 +209,21 @@ OlderHaircutBrotherScript: jump .else .two - setevent EVENT_GAVE_KURT_APRICORNS - clearevent EVENT_RECEIVED_BALLS_FROM_KURT - clearevent EVENT_DRAGON_SHRINE_QUESTION_2 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 jump .then .three - clearevent EVENT_GAVE_KURT_APRICORNS - setevent EVENT_RECEIVED_BALLS_FROM_KURT - clearevent EVENT_DRAGON_SHRINE_QUESTION_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 jump .then .else - clearevent EVENT_GAVE_KURT_APRICORNS - clearevent EVENT_RECEIVED_BALLS_FROM_KURT - setevent EVENT_DRAGON_SHRINE_QUESTION_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 jump .then .then @@ -240,9 +240,9 @@ OlderHaircutBrotherScript: opentext writetext UnknownText_0x7c6d8 waitbutton - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x7c2bb - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue UnknownScript_0x7c2c4 jump UnknownScript_0x7c2cd @@ -292,21 +292,21 @@ YoungerHaircutBrotherScript: jump .else .two - setevent EVENT_GAVE_KURT_APRICORNS - clearevent EVENT_RECEIVED_BALLS_FROM_KURT - clearevent EVENT_DRAGON_SHRINE_QUESTION_2 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 jump .then .three - clearevent EVENT_GAVE_KURT_APRICORNS - setevent EVENT_RECEIVED_BALLS_FROM_KURT - clearevent EVENT_DRAGON_SHRINE_QUESTION_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 jump .then .else - clearevent EVENT_GAVE_KURT_APRICORNS - clearevent EVENT_RECEIVED_BALLS_FROM_KURT - setevent EVENT_DRAGON_SHRINE_QUESTION_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 jump .then .then @@ -323,9 +323,9 @@ YoungerHaircutBrotherScript: opentext writetext UnknownText_0x7c82a waitbutton - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x7c2bb - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue UnknownScript_0x7c2c4 jump UnknownScript_0x7c2cd diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index eb2bbcb89..7e7399aa6 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -74,7 +74,7 @@ KurtScript_0x18e178: iffalse .NoRoomForBall setevent EVENT_KURT_GAVE_YOU_LURE_BALL .GotLureBall: - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue .WaitForApricorns checkevent EVENT_GAVE_KURT_RED_APRICORN iftrue .GiveLevelBall @@ -93,9 +93,9 @@ KurtScript_0x18e178: checkevent EVENT_CAN_GIVE_GS_BALL_TO_KURT iftrue .CanGiveGSBallToKurt .NoGSBall: - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue .CheckApricorns - checkevent EVENT_DRAGON_SHRINE_QUESTION_2 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 iftrue .CheckApricorns writetext UnknownText_0x18e6c9 waitbutton @@ -114,9 +114,9 @@ KurtScript_0x18e178: iftrue .AskApricorn checkitem PNK_APRICORN iftrue .AskApricorn - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue .ThatTurnedOutGreat - checkevent EVENT_DRAGON_SHRINE_QUESTION_2 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 iftrue .IMakeBallsFromApricorns closetext end @@ -130,7 +130,7 @@ KurtScript_0x18e178: .AskApricorn: writetext UnknownText_0x18e736 buttonsound - setevent EVENT_DRAGON_SHRINE_QUESTION_2 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 special Special_SelectApricornForKurt if_equal FALSE, .Cancel if_equal BLU_APRICORN, .Blu @@ -168,7 +168,7 @@ KurtScript_0x18e178: jump .GaveKurtApricorns .GaveKurtApricorns: - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 setflag ENGINE_KURT_MAKING_BALLS .WaitForApricorns: writetext UnknownText_0x18e779 @@ -183,7 +183,7 @@ KurtScript_0x18e178: end ._ThatTurnedOutGreat: - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 .ThatTurnedOutGreat: writetext UnknownText_0x18e82a waitbutton @@ -347,9 +347,9 @@ KurtScript_ImCheckingItNow: KurtsGranddaughter1: faceplayer - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue KurtsGranddaughter2Subscript - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue KurtsGranddaughterFunScript checkevent EVENT_FOREST_IS_RESTLESS iftrue .Lonely diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 6d78948fd..ababf8f71 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -27,14 +27,14 @@ OlivinePort_MapScripts: applymovement PLAYER, MovementData_0x74a32 appear OLIVINEPORT_SAILOR1 setscene 0 - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 blackoutmod OLIVINE_CITY end SailorScript_0x748c0: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x74919 writetext UnknownText_0x74a55 waitbutton @@ -76,9 +76,9 @@ UnknownScript_0x74919: UnknownScript_0x7491f: spriteface OLIVINEPORT_SAILOR3, RIGHT - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x7498b - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue UnknownScript_0x7498b spriteface PLAYER, LEFT opentext @@ -101,7 +101,7 @@ UnknownScript_0x7494e: writetext UnknownText_0x74b11 waitbutton closetext - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 applymovement PLAYER, MovementData_0x74a37 jump SailorScript_0x748c0 @@ -145,7 +145,7 @@ UnknownScript_0x74992: SailorScript_0x7499c: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x74919 checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x749c0 @@ -166,7 +166,7 @@ UnknownScript_0x749c0: writetext UnknownText_0x74b11 waitbutton closetext - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 checkcode VAR_FACING if_equal RIGHT, UnknownScript_0x749e5 applymovement PLAYER, MovementData_0x74a3f diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index 6c9411e32..a049ace56 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -21,13 +21,13 @@ PlayersHouse1F_MapScripts: end UnknownScript_0x7a4d8: - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 UnknownScript_0x7a4db: playmusic MUSIC_MOM showemote EMOTE_SHOCK, PLAYERSHOUSE1F_MOM1, 15 spriteface PLAYER, LEFT - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x7a4f2 applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fc jump UnknownScript_0x7a4f6 @@ -82,9 +82,9 @@ UnknownScript_0x7a549: writetext UnknownText_0x7a850 waitbutton closetext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x7a55d - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iffalse UnknownScript_0x7a564 jump UnknownScript_0x7a56b @@ -114,7 +114,7 @@ UnknownScript_0x7a57e: MomScript_0x7a582: faceplayer - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 checkscene iffalse UnknownScript_0x7a572 opentext diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index 4610fd644..e4984a47f 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -19,7 +19,7 @@ PlayersHouse2F_MapScripts: .InitializeRoom: special Special_ToggleDecorationsVisibility - setevent EVENT_IN_YOUR_ROOM + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8 checkevent EVENT_INITIALIZED_EVENTS iftrue .SkipInitialization jumpstd initializeevents diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 11a73de07..a9a71f8ca 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -21,7 +21,7 @@ Pokecenter2F_MapScripts: special Special_CheckMysteryGift if_equal $0, .Scene0Done clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue .Scene0Done priorityjump Pokecenter2F_AppearMysteryGiftDeliveryGuy @@ -50,7 +50,7 @@ Pokecenter2F_MapScripts: Pokecenter2F_AppearMysteryGiftDeliveryGuy: appear POKECENTER2F_OFFICER - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 end Script_TradeCenterClosed: diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index fa74c7ee5..537cdedd7 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -308,7 +308,7 @@ Route36ParkGate_DayToText: YoungsterScript_0x6ad06: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad14 writetext UnknownText_0x6b399 waitbutton @@ -324,7 +324,7 @@ UnknownScript_0x6ad14: YoungsterScript_0x6ad1a: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad28 writetext UnknownText_0x6b40f waitbutton @@ -340,7 +340,7 @@ UnknownScript_0x6ad28: RockerScript_0x6ad2e: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad3c writetext UnknownText_0x6b462 waitbutton @@ -356,7 +356,7 @@ UnknownScript_0x6ad3c: PokefanMScript_0x6ad42: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad50 writetext UnknownText_0x6b4da waitbutton @@ -372,7 +372,7 @@ UnknownScript_0x6ad50: YoungsterScript_0x6ad56: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad64 writetext UnknownText_0x6b54e waitbutton @@ -388,7 +388,7 @@ UnknownScript_0x6ad64: YoungsterScript_0x6ad6a: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad78 writetext UnknownText_0x6b5b0 waitbutton @@ -404,7 +404,7 @@ UnknownScript_0x6ad78: LassScript_0x6ad7e: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad8c writetext UnknownText_0x6b64b waitbutton @@ -420,7 +420,7 @@ UnknownScript_0x6ad8c: YoungsterScript_0x6ad92: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ada0 writetext UnknownText_0x6b6b8 waitbutton @@ -436,7 +436,7 @@ UnknownScript_0x6ada0: YoungsterScript_0x6ada6: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6adb4 writetext UnknownText_0x6b71b waitbutton @@ -452,7 +452,7 @@ UnknownScript_0x6adb4: YoungsterScript_0x6adba: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6adc8 writetext UnknownText_0x6b76f waitbutton diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index cb3d5f3a8..3b6a4971f 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -72,5 +72,5 @@ TimeCapsule_MapEvents: .ObjectEvents: db 2 - object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS - object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT + object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 62232df4f..3479bd180 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -72,5 +72,5 @@ TradeCenter_MapEvents: .ObjectEvents: db 2 - object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS - object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT + object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 793e841d1..fa5bb186a 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -33,14 +33,14 @@ VermilionPort_MapScripts: setevent EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP clearevent EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M setevent EVENT_FAST_SHIP_FIRST_TIME - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 blackoutmod VERMILION_CITY end SailorScript_0x74dc4: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x74e1a writetext UnknownText_0x74f06 waitbutton @@ -80,9 +80,9 @@ UnknownScript_0x74e1a: UnknownScript_0x74e20: spriteface VERMILIONPORT_SAILOR2, RIGHT - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x74e86 - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue UnknownScript_0x74e86 spriteface PLAYER, LEFT opentext @@ -102,7 +102,7 @@ UnknownScript_0x74e20: writetext UnknownText_0x74fc2 waitbutton closetext - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 applymovement PLAYER, MovementData_0x74ef8 jump SailorScript_0x74dc4 @@ -146,7 +146,7 @@ UnknownScript_0x74e8d: SailorScript_0x74e97: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x74e1a checkcode VAR_WEEKDAY if_equal MONDAY, UnknownScript_0x74eda @@ -164,7 +164,7 @@ SailorScript_0x74e97: writetext UnknownText_0x74fc2 waitbutton closetext - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 applymovement PLAYER, MovementData_0x74efe jump SailorScript_0x74dc4 From 132fe4692581891802c38420bdd4744d58bf78d5 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 24 Jan 2018 11:12:02 -0500 Subject: [PATCH 036/135] Rename some routines to avoid conflicts when removing "Special_" prefixes --- data/special_pointers.asm | 10 +++---- engine/battle/core.asm | 2 +- engine/decorations.asm | 2 +- engine/events/battle_tower/battle_tower.asm | 2 +- engine/events/battle_tower/rules.asm | 2 +- engine/events/name_rater.asm | 2 +- engine/events/odd_egg.asm | 2 +- engine/events/pokerus/check_pokerus.asm | 2 +- engine/events/print_unown.asm | 2 +- engine/events/std_scripts.asm | 2 +- engine/link.asm | 4 +-- engine/map_objects.asm | 2 +- engine/search2.asm | 8 +++--- engine/specials.asm | 32 ++++++++++----------- engine/time.asm | 2 +- engine/timeset.asm | 4 +-- engine/unown_puzzle.asm | 2 +- home/time.asm | 4 +-- maps/ElmsLab.asm | 8 +++--- maps/GoldenrodCity.asm | 4 +-- maps/LakeOfRageMagikarpHouse.asm | 2 +- maps/PlayersHouse2F.asm | 32 ++++++++++----------- maps/PlayersNeighborsHouse.asm | 18 ++++++------ mobile/mobile_45.asm | 2 +- 24 files changed, 76 insertions(+), 76 deletions(-) diff --git a/data/special_pointers.asm b/data/special_pointers.asm index 10ba7ddca..e8d1e9a54 100644 --- a/data/special_pointers.asm +++ b/data/special_pointers.asm @@ -49,7 +49,7 @@ SpecialsPointers:: ; c029 add_special Special_MagnetTrain add_special Special_NameRival add_special Special_SetDayOfWeek - add_special Special_TownMap + add_special Special_OverworldTownMap add_special Special_UnownPrinter add_special Special_MapRadio add_special Special_UnownPuzzle @@ -75,10 +75,10 @@ SpecialsPointers:: ; c029 add_special RestartMapMusic ; bank 0 add_special Special_HealMachineAnim add_special Special_SurfStartStep - add_special Special_FindGreaterThanThatLevel - add_special Special_FindAtLeastThatHappy - add_special Special_FindThatSpecies - add_special Special_FindThatSpeciesYourTrainerID + add_special Special_FindPartyMonGreaterThanThatLevel + add_special Special_FindPartyMonAtLeastThatHappy + add_special Special_FindPartyMonThatSpecies + add_special Special_FindPartyMonThatSpeciesYourTrainerID add_special UnusedSpecial_CheckUnusedTwoDayTimer add_special Special_DayCareMon1 add_special Special_DayCareMon2 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index cd2424769..f52cc3b97 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -8709,7 +8709,7 @@ IsMobileBattle2: ; 3f830 ret ; 3f836 -DisplayLinkRecord: ; 3f836 +_DisplayLinkRecord: ; 3f836 ld a, BANK(sLinkBattleStats) call GetSRAMBank diff --git a/engine/decorations.asm b/engine/decorations.asm index e004febc3..b3655f064 100755 --- a/engine/decorations.asm +++ b/engine/decorations.asm @@ -1102,7 +1102,7 @@ DecorationDesc_TownMapPoster: ; 0x26f91 opentext writetext .TownMapText waitbutton - special Special_TownMap + special Special_OverworldTownMap closetext end ; 0x26f9b diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index b1d12bc5f..8cf85b7cf 100755 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -1655,7 +1655,7 @@ DummySpecial_170bd2: ; 170bd2 ; 170bd3 Special_CheckForBattleTowerRules: ; 170bd3 - farcall CheckForBattleTowerRules + farcall _CheckForBattleTowerRules jr c, .asm_170bde xor a ; FALSE jr .asm_170be0 diff --git a/engine/events/battle_tower/rules.asm b/engine/events/battle_tower/rules.asm index 0e994c27e..250c652e5 100644 --- a/engine/events/battle_tower/rules.asm +++ b/engine/events/battle_tower/rules.asm @@ -29,7 +29,7 @@ CheckForMobileBattleRules: ; 8b1e1 db "@" ; 0x8b201 -CheckForBattleTowerRules: ; 8b201 +_CheckForBattleTowerRules: ; 8b201 ld hl, StringBuffer2 ld [hl], "3" inc hl diff --git a/engine/events/name_rater.asm b/engine/events/name_rater.asm index 796647f48..ff93c5bb1 100644 --- a/engine/events/name_rater.asm +++ b/engine/events/name_rater.asm @@ -1,4 +1,4 @@ -NameRater: ; fb6ed +_NameRater: ; fb6ed ; Introduce himself ld hl, NameRaterIntroText call PrintText diff --git a/engine/events/odd_egg.asm b/engine/events/odd_egg.asm index de3107804..da8d21d60 100644 --- a/engine/events/odd_egg.asm +++ b/engine/events/odd_egg.asm @@ -1,4 +1,4 @@ -GiveOddEgg: ; 1fb4b6 +_GiveOddEgg: ; 1fb4b6 ; Figure out which egg to give. ; Compare a random word to diff --git a/engine/events/pokerus/check_pokerus.asm b/engine/events/pokerus/check_pokerus.asm index 285024754..3bc294152 100644 --- a/engine/events/pokerus/check_pokerus.asm +++ b/engine/events/pokerus/check_pokerus.asm @@ -1,4 +1,4 @@ -CheckPokerus: ; 4d860 +_CheckPokerus: ; 4d860 ; Return carry if a monster in your party has Pokerus ; Get number of monsters to iterate over diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm index 771d3ea5a..b68104402 100644 --- a/engine/events/print_unown.asm +++ b/engine/events/print_unown.asm @@ -1,4 +1,4 @@ -UnownPrinter: ; 16be4 +_UnownPrinter: ; 16be4 ld a, [UnownDex] and a ret z diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index cd4aa1497..7da52fe2f 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -184,7 +184,7 @@ TownMapScript: opentext farwritetext TownMapText waitbutton - special Special_TownMap + special Special_OverworldTownMap closetext end diff --git a/engine/link.asm b/engine/link.asm index be9d68c9e..c95969116 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -35,7 +35,7 @@ LinkCommunications: ; 28000 cp LINK_TIMECAPSULE jp nz, Gen2ToGen2LinkComms -TimeCapsule: ; 2805d +Gen2ToGen1LinkComms: ; 2805d call ClearLinkData call Link_PrepPartyData_Gen1 call FixDataForLinkTransfer @@ -1970,7 +1970,7 @@ LinkTrade: ; 28b87 call DelayFrames ld a, [wLinkMode] cp LINK_TIMECAPSULE - jp z, TimeCapsule + jp z, Gen2ToGen1LinkComms jp Gen2ToGen2LinkComms ; 28ea3 diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 398a3ff59..cc6f08ea0 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -2572,7 +2572,7 @@ ContinueSpawnFacing: ; 57db ret ; 57e2 -SetPlayerPalette: ; 57e2 +_SetPlayerPalette: ; 57e2 ld a, d and %10000000 ret z diff --git a/engine/search2.asm b/engine/search2.asm index 9ef5491f0..512dec93a 100755 --- a/engine/search2.asm +++ b/engine/search2.asm @@ -1,18 +1,18 @@ -_FindGreaterThanThatLevel: ; 4dbd2 +_FindPartyMonGreaterThanThatLevel: ; 4dbd2 ld hl, PartyMon1Level call FindGreaterThanThatLevel ret -_FindAtLeastThatHappy: ; 4dbd9 +_FindPartyMonAtLeastThatHappy: ; 4dbd9 ld hl, PartyMon1Happiness call FindAtLeastThatHappy ret -_FindThatSpecies: ; 4dbe0 +_FindPartyMonThatSpecies: ; 4dbe0 ld hl, PartyMon1Species jp FindThatSpecies -_FindThatSpeciesYourTrainerID: ; 4dbe6 +_FindPartyMonThatSpeciesYourTrainerID: ; 4dbe6 ld hl, PartyMon1Species call FindThatSpecies ret z diff --git a/engine/specials.asm b/engine/specials.asm index 0cf0948e7..4824c4b4c 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -23,7 +23,7 @@ DummySpecial_c224: ; c224 Special_SetPlayerPalette: ; c225 ld a, [ScriptVar] ld d, a - farcall SetPlayerPalette + farcall _SetPlayerPalette ret ; c230 @@ -50,31 +50,31 @@ UnusedSpecial_SeenMon: ; c252 ret ; c25a -Special_FindGreaterThanThatLevel: ; c25a +Special_FindPartyMonGreaterThanThatLevel: ; c25a ld a, [ScriptVar] ld b, a - farcall _FindGreaterThanThatLevel + farcall _FindPartyMonGreaterThanThatLevel jr z, FoundNone jr FoundOne -Special_FindAtLeastThatHappy: ; c268 +Special_FindPartyMonAtLeastThatHappy: ; c268 ld a, [ScriptVar] ld b, a - farcall _FindAtLeastThatHappy + farcall _FindPartyMonAtLeastThatHappy jr z, FoundNone jr FoundOne -Special_FindThatSpecies: ; c276 +Special_FindPartyMonThatSpecies: ; c276 ld a, [ScriptVar] ld b, a - farcall _FindThatSpecies + farcall _FindPartyMonThatSpecies jr z, FoundNone jr FoundOne -Special_FindThatSpeciesYourTrainerID: ; c284 +Special_FindPartyMonThatSpeciesYourTrainerID: ; c284 ld a, [ScriptVar] ld b, a - farcall _FindThatSpeciesYourTrainerID + farcall _FindPartyMonThatSpeciesYourTrainerID jr z, FoundNone jr FoundOne @@ -104,11 +104,11 @@ DefaultRivalName: ; 0xc2b2 db "SILVER@" Special_NameRater: ; c2b9 - farcall NameRater + farcall _NameRater ret ; c2c0 -Special_TownMap: ; c2c0 +Special_OverworldTownMap: ; c2c0 call FadeToMenu farcall _TownMap call ExitAllMenus @@ -117,14 +117,14 @@ Special_TownMap: ; c2c0 Special_UnownPrinter: ; c2cd call FadeToMenu - farcall UnownPrinter + farcall _UnownPrinter call ExitAllMenus ret ; c2da Special_DisplayLinkRecord: ; c2da call FadeToMenu - farcall DisplayLinkRecord + farcall _DisplayLinkRecord call ExitAllMenus ret ; c2e7 @@ -203,7 +203,7 @@ Special_MapRadio: ; c355 Special_UnownPuzzle: ; c360 call FadeToMenu - farcall UnownPuzzle + farcall _UnownPuzzle ld a, [wSolvedUnownPuzzle] ld [ScriptVar], a call ExitAllMenus @@ -343,7 +343,7 @@ StoreSwarmMapIndices:: ; c403 Special_CheckPokerus: ; c419 ; Check if a monster in your party has Pokerus - farcall CheckPokerus + farcall _CheckPokerus jp ScriptReturnCarry ; c422 @@ -356,7 +356,7 @@ Special_ResetLuckyNumberShowFlag: ; c422 ; c434 Special_CheckLuckyNumberShowFlag: ; c434 - farcall CheckLuckyNumberShowFlag + farcall _CheckLuckyNumberShowFlag jp ScriptReturnCarry ; c43d diff --git a/engine/time.asm b/engine/time.asm index 9d1a249c5..1bfe0e9aa 100755 --- a/engine/time.asm +++ b/engine/time.asm @@ -261,7 +261,7 @@ RestartLuckyNumberCountdown: ; 1152b ret ; 11542 -CheckLuckyNumberShowFlag: ; 11542 +_CheckLuckyNumberShowFlag: ; 11542 ld hl, wLuckyNumberDayBuffer jp CheckDayDependentEventHL ; 11548 diff --git a/engine/timeset.asm b/engine/timeset.asm index c2ba14ef4..26b6aba60 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -112,7 +112,7 @@ InitClock: ; 90672 (24:4672) jr .HourIsSet .MinutesAreSet: - call SetTimeOfDay + call InitTimeOfDay ld hl, OakText_ResponseToSetTime call PrintText call WaitPressAorB_BlinkCursor @@ -454,7 +454,7 @@ Special_SetDayOfWeek: ; 90913 jr c, .loop ld a, [wTempDayOfWeek] ld [StringBuffer2], a - call SetDayOfWeek + call InitDayOfWeek call LoadStandardFont pop af ld [hInMenu], a diff --git a/engine/unown_puzzle.asm b/engine/unown_puzzle.asm index 36f6dacd2..66ee837fc 100755 --- a/engine/unown_puzzle.asm +++ b/engine/unown_puzzle.asm @@ -3,7 +3,7 @@ PUZZLE_VOID EQU $ef puzcoord EQUS "* 6 +" -UnownPuzzle: ; e1190 +_UnownPuzzle: ; e1190 ld a, [hInMenu] push af ld a, $1 diff --git a/home/time.asm b/home/time.asm index 9ed703686..a4d0f0125 100644 --- a/home/time.asm +++ b/home/time.asm @@ -187,14 +187,14 @@ FixTime:: ; 61d ret ; 658 -SetTimeOfDay:: ; 658 +InitTimeOfDay:: ; 658 xor a ld [StringBuffer2], a ld a, $0 ; useless ld [StringBuffer2 + 3], a jr InitTime -SetDayOfWeek:: ; 663 +InitDayOfWeek:: ; 663 call UpdateTime ld a, [hHours] ld [StringBuffer2 + 1], a diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 9322aefe8..7002bd707 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -108,10 +108,10 @@ ElmCheckEverstone: checkevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE iffalse ElmCheckTogepiEgg writebyte TOGEPI - special Special_FindThatSpeciesYourTrainerID + special Special_FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writebyte TOGETIC - special Special_FindThatSpeciesYourTrainerID + special Special_FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writetext UnknownText_0x79a40 waitbutton @@ -120,10 +120,10 @@ ElmCheckEverstone: ElmEggHatchedScript: writebyte TOGEPI - special Special_FindThatSpeciesYourTrainerID + special Special_FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writebyte TOGETIC - special Special_FindThatSpeciesYourTrainerID + special Special_FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript jump ElmCheckGotEggAgain diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index f8be7e5ca..85b4308f0 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -52,7 +52,7 @@ GoldenrodCity_MapScripts: .MoveTutorDone: return -MoveTutor: +MoveTutorScript: faceplayer opentext writetext UnknownText_0x199042 @@ -607,4 +607,4 @@ GoldenrodCity_MapEvents: object_event 29, 20, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket4Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 29, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 31, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket6Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 12, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR + object_event 12, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutorScript, EVENT_GOLDENROD_CITY_MOVE_TUTOR diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index c77d823c0..a197dd0e8 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -40,7 +40,7 @@ UnknownScript_0x19a6d7: UnknownScript_0x19a6e0: writebyte MAGIKARP - special Special_FindThatSpecies + special Special_FindPartyMonThatSpecies iffalse UnknownScript_0x19a6d7 writetext UnknownText_0x19a93e waitbutton diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index e4984a47f..72b2989b6 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -34,25 +34,25 @@ PlayersHouse2F_MapScripts: db 0, 0, 0 ; filler -Doll1: +Doll1Script: describedecoration DECODESC_LEFT_DOLL -Doll2: +Doll2Script: describedecoration DECODESC_RIGHT_DOLL -BigDoll: +BigDollScript: describedecoration DECODESC_BIG_DOLL -GameConsole: +GameConsoleScript: describedecoration DECODESC_CONSOLE -PlayersHousePoster: +PlayersHousePosterScript: conditional_event EVENT_PLAYERS_ROOM_POSTER, .Script .Script: describedecoration DECODESC_POSTER -PlayersHouseRadio: +PlayersHouseRadioScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue .NormalRadio checkevent EVENT_LISTENED_TO_INITIAL_RADIO @@ -82,10 +82,10 @@ PlayersHouseRadio: closetext end -PlayersHouseBookshelf: +PlayersHouseBookshelfScript: jumpstd picturebookshelf -PlayersHousePC: +PlayersHousePCScript: opentext special Special_PlayersHousePC iftrue .Warp @@ -128,14 +128,14 @@ PlayersHouse2F_MapEvents: .BGEvents: db 4 - bg_event 2, 1, BGEVENT_UP, PlayersHousePC - bg_event 3, 1, BGEVENT_READ, PlayersHouseRadio - bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelf - bg_event 6, 0, BGEVENT_IFSET, PlayersHousePoster + bg_event 2, 1, BGEVENT_UP, PlayersHousePCScript + bg_event 3, 1, BGEVENT_READ, PlayersHouseRadioScript + bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelfScript + bg_event 6, 0, BGEVENT_IFSET, PlayersHousePosterScript .ObjectEvents: db 4 - object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsole, EVENT_PLAYERS_HOUSE_2F_CONSOLE - object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1, EVENT_PLAYERS_HOUSE_2F_DOLL_1 - object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2, EVENT_PLAYERS_HOUSE_2F_DOLL_2 - object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDoll, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL + object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE + object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1 + object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2 + object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm index dffa89c9e..ff6c059c6 100644 --- a/maps/PlayersNeighborsHouse.asm +++ b/maps/PlayersNeighborsHouse.asm @@ -9,16 +9,16 @@ PlayersNeighborsHouse_MapScripts: .MapCallbacks: db 0 -PlayersNeighborsDaughter: +PlayersNeighborsDaughterScript: jumptextfaceplayer PlayersNeighborsDaughterText -PlayersNeighbor: +PlayersNeighborScript: jumptextfaceplayer PlayersNeighborText -PlayersNeighborsHouseBookshelf: +PlayersNeighborsHouseBookshelfScript: jumpstd magazinebookshelf -PlayersNeighborsHouseRadio: +PlayersNeighborsHouseRadioScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue .NormalRadio checkevent EVENT_LISTENED_TO_INITIAL_RADIO @@ -112,11 +112,11 @@ PlayersNeighborsHouse_MapEvents: .BGEvents: db 3 - bg_event 0, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelf - bg_event 1, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelf - bg_event 7, 1, BGEVENT_READ, PlayersNeighborsHouseRadio + bg_event 0, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript + bg_event 1, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript + bg_event 7, 1, BGEVENT_READ, PlayersNeighborsHouseRadioScript .ObjectEvents: db 2 - object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborsDaughter, -1 - object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighbor, EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR + object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborsDaughterScript, -1 + object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborScript, EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index ac0292862..882f86aa4 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -6838,7 +6838,7 @@ Unknown_117356: ; 117356 SECTION "Mobile Stadium", ROMX Special_GiveOddEgg: ; 117656 - farcall GiveOddEgg + farcall _GiveOddEgg ret ; 11765d From d719d318e8b2de51e818485423ac878d20dd295a Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 24 Jan 2018 11:17:05 -0500 Subject: [PATCH 037/135] Remove Special_ prefix from special routines (close #478) --- charmap.asm | 2 +- constants/script_constants.asm | 10 +- data/special_pointers.asm | 302 +++++++++--------- docs/bugs_and_glitches.md | 6 +- engine/breeding.asm | 4 +- engine/caught_data.asm | 2 +- engine/decorations.asm | 6 +- engine/events/battle_tower/battle_tower.asm | 16 +- engine/events/buena.asm | 4 +- engine/events/buena_menu.asm | 2 +- engine/events/bug_contest/contest.asm | 2 +- engine/events/bug_contest/contest_2.asm | 8 +- engine/events/bug_contest/judging.asm | 2 +- engine/events/celebi.asm | 4 +- engine/events/daycare.asm | 6 +- engine/events/dratini.asm | 2 +- engine/events/field_moves.asm | 4 +- engine/events/halloffame.asm | 4 +- engine/events/happiness_egg.asm | 4 +- engine/events/heal_machine_anim.asm | 4 +- engine/events/kurt.asm | 2 +- engine/events/lucky_number.asm | 4 +- engine/events/magikarp.asm | 4 +- engine/events/magnet_train.asm | 2 +- engine/events/misc_scripts.asm | 2 +- engine/events/mom.asm | 2 +- engine/events/move_deleter.asm | 2 +- engine/events/move_tutor.asm | 2 +- engine/events/overworld.asm | 8 +- engine/events/poke_seer.asm | 2 +- engine/events/pokecenter_pc.asm | 2 +- engine/events/print_photo.asm | 2 +- engine/events/prof_oaks_pc.asm | 4 +- engine/events/sacred_ash.asm | 12 +- engine/events/special.asm | 12 +- engine/events/std_scripts.asm | 28 +- engine/events/unown_walls.asm | 6 +- engine/events/whiteout.asm | 4 +- engine/events_2.asm | 2 +- engine/link.asm | 32 +- engine/map_setup.asm | 6 +- engine/mart.asm | 2 +- engine/menu_2.asm | 6 +- engine/mystery_gift.asm | 2 +- engine/overworld.asm | 10 +- engine/phone/generic_calls.asm | 2 +- engine/phone/phone_callers.asm | 10 +- engine/phone/phone_scripts.asm | 8 +- engine/player_object.asm | 2 +- engine/radio.asm | 4 +- engine/routines/playslowcry.asm | 2 +- engine/search.asm | 4 +- engine/specials.asm | 80 ++--- engine/time.asm | 4 +- engine/timeofdaypals.asm | 10 +- engine/timeset.asm | 6 +- engine/warp_connection.asm | 4 +- engine/wildmons.asm | 8 +- home/map.asm | 6 +- maps/AzaleaTown.asm | 4 +- maps/BattleTower1F.asm | 64 ++-- maps/BattleTowerBattleRoom.asm | 38 +-- maps/BattleTowerElevator.asm | 2 +- maps/BillsHouse.asm | 12 +- maps/BluesHouse.asm | 8 +- maps/BurnedTower1F.asm | 4 +- maps/BurnedTowerB1F.asm | 2 +- maps/CeladonDeptStore6F.asm | 2 +- maps/CeladonGameCorner.asm | 8 +- maps/CeladonGameCornerPrizeRoom.asm | 10 +- maps/CeladonMansion3F.asm | 4 +- maps/CeladonPokecenter1F.asm | 4 +- maps/CeruleanPokecenter1F.asm | 2 +- maps/CherrygroveCity.asm | 2 +- maps/CianwoodCity.asm | 2 +- maps/CianwoodPhotoStudio.asm | 2 +- maps/Colosseum.asm | 4 +- maps/CopycatsHouse2F.asm | 10 +- maps/DayCare.asm | 6 +- maps/DragonShrine.asm | 4 +- maps/DragonsDenB1F.asm | 2 +- maps/EcruteakGym.asm | 2 +- maps/EcruteakPokecenter1F.asm | 2 +- maps/ElmsLab.asm | 14 +- maps/FastShip1F.asm | 4 +- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 4 +- maps/FastShipCabins_SW_SSW_NW.asm | 8 +- maps/FuchsiaGym.asm | 10 +- maps/FuchsiaPokecenter1F.asm | 4 +- maps/GoldenrodCity.asm | 10 +- maps/GoldenrodDeptStore5F.asm | 6 +- maps/GoldenrodDeptStore6F.asm | 2 +- maps/GoldenrodGameCorner.asm | 16 +- maps/GoldenrodHappinessRater.asm | 2 +- maps/GoldenrodMagnetTrainStation.asm | 2 +- maps/GoldenrodNameRater.asm | 2 +- maps/GoldenrodPokecenter1F.asm | 4 +- maps/GoldenrodUnderground.asm | 26 +- ...oldenrodUndergroundSwitchRoomEntrances.asm | 4 +- maps/HallOfFame.asm | 2 +- maps/IlexForest.asm | 6 +- maps/IndigoPlateauPokecenter1F.asm | 6 +- maps/KurtsHouse.asm | 6 +- maps/LakeOfRage.asm | 2 +- maps/LakeOfRageMagikarpHouse.asm | 4 +- maps/LancesRoom.asm | 6 +- maps/LavenderNameRater.asm | 2 +- maps/MahoganyTown.asm | 4 +- maps/ManiasHouse.asm | 4 +- maps/MobileBattleRoom.asm | 18 +- maps/MobileTradeRoomMobile.asm | 4 +- maps/MountMoon.asm | 2 +- maps/MoveDeletersHouse.asm | 2 +- maps/MrPokemonsHouse.asm | 6 +- maps/OaksLab.asm | 2 +- maps/OlivineCity.asm | 8 +- maps/OlivineLighthouse6F.asm | 14 +- maps/OlivinePort.asm | 2 +- maps/PlayersHouse1F.asm | 8 +- maps/PlayersHouse2F.asm | 6 +- maps/PokeSeersHouse.asm | 2 +- maps/Pokecenter2F.asm | 104 +++--- maps/RadioTower1F.asm | 8 +- maps/RadioTower2F.asm | 12 +- maps/RadioTower5F.asm | 4 +- maps/Route24.asm | 6 +- maps/Route26HealHouse.asm | 6 +- maps/Route27SandstormHouse.asm | 2 +- maps/Route34.asm | 6 +- maps/Route35NationalParkGate.asm | 14 +- maps/Route36.asm | 4 +- maps/Route36NationalParkGate.asm | 18 +- maps/Route39Barn.asm | 2 +- maps/Route39Farmhouse.asm | 4 +- maps/Route40.asm | 2 +- maps/Route45.asm | 4 +- maps/RuinsOfAlphAerodactylChamber.asm | 6 +- maps/RuinsOfAlphHoOhChamber.asm | 8 +- maps/RuinsOfAlphKabutoChamber.asm | 6 +- maps/RuinsOfAlphOmanyteChamber.asm | 8 +- maps/RuinsOfAlphResearchCenter.asm | 2 +- maps/SaffronMagnetTrainStation.asm | 2 +- maps/SaffronPokecenter1F.asm | 2 +- maps/SilverCaveRoom3.asm | 8 +- maps/SlowpokeWellB1F.asm | 6 +- maps/SproutTower3F.asm | 6 +- maps/TeamRocketBaseB1F.asm | 12 +- maps/TeamRocketBaseB2F.asm | 10 +- maps/TeamRocketBaseB3F.asm | 2 +- maps/TimeCapsule.asm | 4 +- maps/TinTower1F.asm | 12 +- maps/TradeCenter.asm | 4 +- maps/TrainerHouseB1F.asm | 4 +- maps/VermilionCity.asm | 2 +- maps/VermilionPort.asm | 2 +- maps/VictoryRoad.asm | 4 +- mobile/fixed_words.asm | 2 +- mobile/mobile_40.asm | 34 +- mobile/mobile_41.asm | 6 +- mobile/mobile_45.asm | 2 +- mobile/mobile_46.asm | 18 +- mobile/mobile_5f.asm | 8 +- mobile/mobile_menu.asm | 2 +- 163 files changed, 758 insertions(+), 758 deletions(-) diff --git a/charmap.asm b/charmap.asm index 283508416..86a5596a4 100644 --- a/charmap.asm +++ b/charmap.asm @@ -86,7 +86,7 @@ charmap "▲", $61 ; gfx/font/up_arrow.png charmap "☎", $62 ; gfx/font/phone_icon.2bpp - ; needed for Special_MagikarpHouseSign (see engine/events/magikarp.asm) + ; needed for MagikarpHouseSign (see engine/events/magikarp.asm) charmap "′", $6e ; gfx/font/feet_inches.png charmap "″", $6f ; gfx/font/feet_inches.png diff --git a/constants/script_constants.asm b/constants/script_constants.asm index cfab61c87..9d2fd733e 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -217,7 +217,7 @@ NUM_FRUIT_TREES EQU const_value +- 1 const SWARM_YANMA ; 1 -; Special_ActivateFishingSwarm writebyte arguments +; ActivateFishingSwarm writebyte arguments const_def const FISHSWARM_NONE ; 0 const FISHSWARM_QWILFISH ; 1 @@ -229,7 +229,7 @@ NUM_FRUIT_TREES EQU const_value +- 1 const GBCHECK_SGB ; 1 const GBCHECK_CGB ; 2 -; Special_CheckMagikarpLength return values +; CheckMagikarpLength return values const_def const MAGIKARPLENGTH_NOT_MAGIKARP ; 0 const MAGIKARPLENGTH_REFUSED ; 1 @@ -257,7 +257,7 @@ NUM_FRUIT_TREES EQU const_value +- 1 const HEALMACHINE_ELMS_LAB ; 1 const HEALMACHINE_HALL_OF_FAME ; 2 -; Special_UnownPuzzle writebyte arguments +; UnownPuzzle writebyte arguments ; LoadUnownPuzzlePiecesGFX.LZPointers indexes (see engine/unown_puzzle.asm) const_def const UNOWNPUZZLE_KABUTO ; 0 @@ -266,7 +266,7 @@ NUM_FRUIT_TREES EQU const_value +- 1 const UNOWNPUZZLE_HO_OH ; 3 NUM_UNOWN_PUZZLES EQU const_value -; Special_DisplayUnownWords writebyte arguments +; DisplayUnownWords writebyte arguments ; UnownWalls and MenuHeaders_UnownWalls indexes (see data/unown_walls.asm) const_def const UNOWNWORDS_ESCAPE ; 0 @@ -274,7 +274,7 @@ NUM_UNOWN_PUZZLES EQU const_value const UNOWNWORDS_WATER ; 2 const UNOWNWORDS_HO_OH ; 3 -; Special_MoveTutor writebyte arguments +; MoveTutor writebyte arguments const_value set 1 const MOVETUTOR_FLAMETHROWER ; 1 const MOVETUTOR_THUNDERBOLT ; 2 diff --git a/data/special_pointers.asm b/data/special_pointers.asm index e8d1e9a54..575d9fa33 100644 --- a/data/special_pointers.asm +++ b/data/special_pointers.asm @@ -7,179 +7,179 @@ add_special: MACRO ENDM SpecialsPointers:: ; c029 - add_special Special_WarpToSpawnPoint + add_special WarpToSpawnPoint ; Communications - add_special Special_SetBitsForLinkTradeRequest - add_special Special_WaitForLinkedFriend - add_special Special_CheckLinkTimeout - add_special Special_TryQuickSave - add_special Special_CheckBothSelectedSameRoom - add_special Special_FailedLinkToPast - add_special Special_CloseLink - add_special Special_WaitForOtherPlayerToExit - add_special Special_SetBitsForBattleRequest - add_special Special_SetBitsForTimeCapsuleRequest - add_special Special_CheckTimeCapsuleCompatibility - add_special Special_EnterTimeCapsule - add_special Special_TradeCenter - add_special Special_Colosseum - add_special Special_TimeCapsule - add_special Special_CableClubCheckWhichChris - add_special Special_CheckMysteryGift - add_special Special_GetMysteryGiftItem - add_special Special_UnlockMysteryGift + 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 Special_BugContestJudging - add_special Special_CheckPartyFullAfterContest - add_special Special_ContestDropOffMons - add_special Special_ContestReturnMons - add_special Special_GiveParkBalls - add_special Special_CheckMagikarpLength - add_special Special_MagikarpHouseSign + 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 Special_PokemonCenterPC - add_special Special_PlayersHousePC - add_special Special_DayCareMan - add_special Special_DayCareLady - add_special Special_DayCareManOutside - add_special Special_MoveDeletion - add_special Special_BankOfMom - add_special Special_MagnetTrain - add_special Special_NameRival - add_special Special_SetDayOfWeek - add_special Special_OverworldTownMap - add_special Special_UnownPrinter - add_special Special_MapRadio - add_special Special_UnownPuzzle - add_special Special_SlotMachine - add_special Special_CardFlip - add_special Special_DummyNonfunctionalGameCornerGame - add_special Special_ClearBGPalettesBufferScreen - add_special Special_FadeOutPalettes - add_special Special_BattleTowerFade - add_special Special_FadeBlackQuickly - add_special Special_FadeInPalettes - add_special Special_FadeInQuickly + 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 BattleTowerFade + add_special FadeBlackQuickly + add_special FadeInPalettes + add_special FadeInQuickly add_special ReloadSpritesNoPalettes ; bank 0 add_special ClearBGPalettes ; bank 0 add_special UpdateTimePals ; bank 0 add_special ClearTileMap ; bank 0 add_special UpdateSprites ; bank 0 add_special ReplaceKrisSprite ; bank 0 - add_special Special_GameCornerPrizeMonCheckDex + add_special GameCornerPrizeMonCheckDex add_special UnusedSpecial_SeenMon add_special WaitSFX ; bank 0 add_special PlayMapMusic ; bank 0 add_special RestartMapMusic ; bank 0 - add_special Special_HealMachineAnim - add_special Special_SurfStartStep - add_special Special_FindPartyMonGreaterThanThatLevel - add_special Special_FindPartyMonAtLeastThatHappy - add_special Special_FindPartyMonThatSpecies - add_special Special_FindPartyMonThatSpeciesYourTrainerID + add_special HealMachineAnim + add_special SurfStartStep + add_special FindPartyMonGreaterThanThatLevel + add_special FindPartyMonAtLeastThatHappy + add_special FindPartyMonThatSpecies + add_special FindPartyMonThatSpeciesYourTrainerID add_special UnusedSpecial_CheckUnusedTwoDayTimer - add_special Special_DayCareMon1 - add_special Special_DayCareMon2 - add_special Special_SelectRandomBugContestContestants - add_special Special_ActivateFishingSwarm - add_special Special_ToggleMaptileDecorations - add_special Special_ToggleDecorationsVisibility - add_special Special_GiveShuckle - add_special Special_ReturnShuckle - add_special Special_BillsGrandfather - add_special Special_CheckPokerus - add_special Special_DisplayCoinCaseBalance - add_special Special_DisplayMoneyAndCoinBalance - add_special Special_PlaceMoneyTopRight - add_special Special_CheckForLuckyNumberWinners - add_special Special_CheckLuckyNumberShowFlag - add_special Special_ResetLuckyNumberShowFlag - add_special Special_PrintTodaysLuckyNumber - add_special Special_SelectApricornForKurt - add_special Special_NameRater - add_special Special_DisplayLinkRecord - add_special Special_GetFirstPokemonHappiness - add_special Special_CheckFirstMonIsEgg - add_special Special_RandomUnseenWildMon - add_special Special_RandomPhoneWildMon - add_special Special_RandomPhoneMon - add_special Special_LoadUsedSpritesGFX - add_special Special_PlaySlowCry - add_special Special_SnorlaxAwake - add_special Special_YoungerHaircutBrother - add_special Special_OlderHaircutBrother - add_special Special_DaisysGrooming - add_special Special_PlayCurMonCry - add_special Special_ProfOaksPCBoot - add_special Special_GameboyCheck - add_special Special_TrainerHouse - add_special Special_PhotoStudio - add_special Special_InitRoamMons - add_special Special_FadeOutMusic - add_special Special_Diploma - add_special Special_PrintDiploma + 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 YoungerHaircutBrother + add_special OlderHaircutBrother + 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 ; Crystal - add_special Special_Function11ac3e - add_special Special_Function11b444 - add_special Special_Function11b5e8 - add_special Special_Function11b7e5 - add_special Special_Function11b879 - add_special Special_Function11b920 - add_special Special_Function11b93b - add_special Special_BattleTowerRoomMenu - add_special Special_Function1700ba - add_special Special_Function170114 - add_special Special_BattleTowerBattle + add_special Function11ac3e + add_special Function11b444 + add_special Function11b5e8 + add_special Function11b7e5 + add_special Function11b879 + add_special Function11b920 + add_special Function11b93b + add_special BattleTowerRoomMenu + add_special Function1700ba + add_special Function170114 + add_special BattleTowerBattle add_special UnusedSpecial_Function1704e1 add_special DummySpecial_17021d - add_special Special_LoadOpponentTrainerAndPokemonWithOTSprite - add_special Special_Function11ba38 - add_special Special_CheckForBattleTowerRules - add_special Special_GiveOddEgg + add_special LoadOpponentTrainerAndPokemonWithOTSprite + add_special Function11ba38 + add_special CheckForBattleTowerRules + add_special GiveOddEgg add_special Reset ; bank 0 - add_special Special_Function1011f1 - add_special Special_Function101220 - add_special Special_Function101225 - add_special Special_Function101231 - add_special Special_MoveTutor - add_special Special_OmanyteChamber - add_special Special_Function11c1ab - add_special Special_BattleTowerAction - add_special Special_DisplayUnownWords - add_special Special_Menu_ChallengeExplanationCancel - add_special Special_Function17d2b6 - add_special Special_Function17d2ce - add_special Special_BattleTowerMobileError - add_special Special_AskMobileOrCable - add_special Special_HoOhChamber - add_special Special_Function102142 - add_special Special_CelebiShrineEvent - add_special Special_CheckCaughtCelebi - add_special Special_PokeSeer - add_special Special_BuenasPassword - add_special Special_BuenaPrize - add_special Special_Dratini - add_special Special_SampleKenjiBreakCountdown - add_special Special_BeastsCheck - add_special Special_MonCheck - add_special Special_SetPlayerPalette + add_special Function1011f1 + add_special Function101220 + add_special Function101225 + add_special Function101231 + add_special MoveTutor + add_special OmanyteChamber + add_special Function11c1ab + add_special BattleTowerAction + add_special DisplayUnownWords + add_special Menu_ChallengeExplanationCancel + add_special Function17d2b6 + add_special Function17d2ce + add_special BattleTowerMobileError + add_special AskMobileOrCable + add_special HoOhChamber + add_special Function102142 + add_special CelebiShrineEvent + add_special CheckCaughtCelebi + add_special PokeSeer + add_special BuenasPassword + add_special BuenaPrize + add_special Dratini + add_special SampleKenjiBreakCountdown + add_special BeastsCheck + add_special MonCheck + add_special SetPlayerPalette add_special DummySpecial_170bd2 - add_special Special_Mobile_SelectThreeMons - add_special Special_Function1037eb - add_special Special_Function10383c - add_special Special_StubbedTrainerRankings_Healings - add_special Special_RefreshSprites - add_special Special_Function1037c2 - add_special Special_Mobile_DummyReturnFalse - add_special Special_Function103780 - add_special Special_Function10387b - add_special Special_AskRememberPassword - add_special Special_LoadMapPalettes + add_special Mobile_SelectThreeMons + add_special Function1037eb + add_special Function10383c + add_special StubbedTrainerRankings_Healings + add_special RefreshSprites + add_special Function1037c2 + add_special Mobile_DummyReturnFalse + add_special Function103780 + add_special Function10387b + add_special AskRememberPassword + add_special LoadMapPalettes add_special UnusedSpecial_FindItemInPCOrBag - add_special Special_InitialSetDSTFlag - add_special Special_InitialClearDSTFlag + add_special InitialSetDSTFlag + add_special InitialClearDSTFlag add_special DummySpecial_c224 ; c224 diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 07c0deba3..31d642464 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -51,7 +51,7 @@ These are known bugs and glitches in the original Pokémon Crystal game: code th - [`LoadSpriteGFX` does not limit the capacity of `UsedSprites`](#loadspritegfx-does-not-limit-the-capacity-of-usedsprites) - [`ChooseWildEncounter` doesn't really validate the wild Pokémon species](#choosewildencounter-doesnt-really-validate-the-wild-pokémon-species) - [`TryObjectEvent` arbitrary code execution](#tryobjectevent-arbitrary-code-execution) -- [`Special_CheckBugContestContestantFlag` can read beyond its data table](#special_checkbugcontestcontestantflag-can-read-beyond-its-data-table) +- [`CheckBugContestContestantFlag` can read beyond its data table](#checkbugcontestcontestantflag-can-read-beyond-its-data-table) - [`ClearWRAM` only clears WRAM bank 1](#clearwram-only-clears-wram-bank-1) @@ -1417,12 +1417,12 @@ In [engine/events.asm](/engine/events.asm): **Fix:** Uncomment `pop bc`. -## `Special_CheckBugContestContestantFlag` can read beyond its data table +## `CheckBugContestContestantFlag` can read beyond its data table In [engine/events/bug_contest/contest_2.asm](/engine/events/bug_contest/contest_2.asm): ```asm -Special_CheckBugContestContestantFlag: ; 139ed +CheckBugContestContestantFlag: ; 139ed ; Checks the flag of the Bug Catching Contestant whose index is loaded in a. ; Bug: If a >= 10 when this is called, it will read beyond the table. diff --git a/engine/breeding.asm b/engine/breeding.asm index a03eda082..d66616061 100755 --- a/engine/breeding.asm +++ b/engine/breeding.asm @@ -887,7 +887,7 @@ Hatch_ShellFragmentLoop: ; 17418 (5:7418) jr nz, .loop ret -Special_DayCareMon1: ; 17421 +DayCareMon1: ; 17421 ld hl, DayCareMon1Text call PrintText ld a, [wBreedMon1Species] @@ -900,7 +900,7 @@ Special_DayCareMon1: ; 17421 call DayCareMonCompatibilityText jp PrintText -Special_DayCareMon2: ; 17440 +DayCareMon2: ; 17440 ld hl, DayCareMon2Text call PrintText ld a, [wBreedMon2Species] diff --git a/engine/caught_data.asm b/engine/caught_data.asm index f194ce1f0..9c7cfac79 100644 --- a/engine/caught_data.asm +++ b/engine/caught_data.asm @@ -1,4 +1,4 @@ -Special_CheckPartyFullAfterContest: ; 4d9e5 +CheckPartyFullAfterContest: ; 4d9e5 ld a, [wContestMon] and a jp z, .DidntCatchAnything diff --git a/engine/decorations.asm b/engine/decorations.asm index b3655f064..577d7399f 100755 --- a/engine/decorations.asm +++ b/engine/decorations.asm @@ -1102,7 +1102,7 @@ DecorationDesc_TownMapPoster: ; 0x26f91 opentext writetext .TownMapText waitbutton - special Special_OverworldTownMap + special OverworldTownMap closetext end ; 0x26f9b @@ -1194,7 +1194,7 @@ DecorationDesc_GiantOrnament: ; 26fdd db "@" ; 0x26feb -Special_ToggleMaptileDecorations: ; 26feb +ToggleMaptileDecorations: ; 26feb lb de, 0, 4 ld a, [Bed] call SetDecorationTile @@ -1248,7 +1248,7 @@ SetDecorationTile: ; 27037 ret ; 27043 -Special_ToggleDecorationsVisibility: ; 27043 +ToggleDecorationsVisibility: ; 27043 ld de, EVENT_PLAYERS_HOUSE_2F_CONSOLE ld hl, VariableSprites + SPRITE_CONSOLE - SPRITE_VARS ld a, [Console] diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index 8cf85b7cf..9cf6917b2 100755 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -1,11 +1,11 @@ -Special_BattleTowerRoomMenu: ; 1700b0 +BattleTowerRoomMenu: ; 1700b0 ; special call InitBattleTowerChallengeRAM farcall _BattleTowerRoomMenu ret ; 1700ba -Special_Function1700ba: ; 1700ba +Function1700ba: ; 1700ba call InitBattleTowerChallengeRAM farcall Function11811a ret @@ -53,7 +53,7 @@ Function1700c4: ; 1700c4 ret ; 170114 -Special_Function170114: ; 170114 +Function170114: ; 170114 call InitBattleTowerChallengeRAM call .Function170121 farcall Function11805f @@ -182,7 +182,7 @@ Function170139: ; 170139 ret ; 170215 -Special_BattleTowerBattle: ; 170215 +BattleTowerBattle: ; 170215 xor a ld [wBattleTowerBattleEnded], a call _BattleTowerBattle @@ -243,7 +243,7 @@ RunBattleTowerTrainer: ; 17024d xor a ld [wLinkMode], a - farcall Special_StubbedTrainerRankings_Healings + farcall StubbedTrainerRankings_Healings farcall HealParty call ReadBTTrainerParty call Clears5_a89a @@ -900,7 +900,7 @@ UnusedSpecial_Function1704e1: ; 1704e1 db "れきだいりーダーいちらん@" ; 170687 -Special_BattleTowerAction: ; 170687 +BattleTowerAction: ; 170687 ld a, [ScriptVar] ld e, a ld d, 0 @@ -1603,7 +1603,7 @@ BattleTowerAction_UbersCheck: ; 170b16 (5c:4b16) BattleTowerAction $19 ld [ScriptVar], a ret -Special_LoadOpponentTrainerAndPokemonWithOTSprite: ; 0x170b44 +LoadOpponentTrainerAndPokemonWithOTSprite: ; 0x170b44 farcall Function_LoadOpponentTrainerAndPokemons ld a, [rSVBK] push af @@ -1654,7 +1654,7 @@ DummySpecial_170bd2: ; 170bd2 ret ; 170bd3 -Special_CheckForBattleTowerRules: ; 170bd3 +CheckForBattleTowerRules: ; 170bd3 farcall _CheckForBattleTowerRules jr c, .asm_170bde xor a ; FALSE diff --git a/engine/events/buena.asm b/engine/events/buena.asm index 26043b534..d1ed7bd51 100644 --- a/engine/events/buena.asm +++ b/engine/events/buena.asm @@ -1,4 +1,4 @@ -Special_BuenasPassword: ; 8af6b +BuenasPassword: ; 8af6b xor a ld [wWhichIndexSet], a ld hl, .MenuHeader @@ -67,7 +67,7 @@ endr ret ; 8afd4 -Special_BuenaPrize: ; 8afd4 +BuenaPrize: ; 8afd4 xor a ld [wMenuScrollPosition], a ld a, $1 diff --git a/engine/events/buena_menu.asm b/engine/events/buena_menu.asm index 5436b590e..4380234ec 100644 --- a/engine/events/buena_menu.asm +++ b/engine/events/buena_menu.asm @@ -1,4 +1,4 @@ -Special_AskRememberPassword: ; 4ae12 +AskRememberPassword: ; 4ae12 call .DoMenu ld a, $0 jr c, .okay diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm index ba561abf2..c25da1658 100644 --- a/engine/events/bug_contest/contest.asm +++ b/engine/events/bug_contest/contest.asm @@ -1,4 +1,4 @@ -Special_GiveParkBalls: ; 135db +GiveParkBalls: ; 135db xor a ld [wContestMon], a ld a, 20 diff --git a/engine/events/bug_contest/contest_2.asm b/engine/events/bug_contest/contest_2.asm index 7ade44815..80f0bda97 100755 --- a/engine/events/bug_contest/contest_2.asm +++ b/engine/events/bug_contest/contest_2.asm @@ -1,4 +1,4 @@ -Special_SelectRandomBugContestContestants: ; 139a8 +SelectRandomBugContestContestants: ; 139a8 ; Select five random people to participate in the current contest. ; First we have to make sure that any old data is cleared away. @@ -56,7 +56,7 @@ Special_SelectRandomBugContestContestants: ; 139a8 ret ; 139ed -Special_CheckBugContestContestantFlag: ; 139ed +CheckBugContestContestantFlag: ; 139ed ; Checks the flag of the Bug Catching Contestant whose index is loaded in a. ; Bug: If a >= NUM_BUG_CONTESTANTS when this is called, it will read beyond the table. @@ -76,7 +76,7 @@ Special_CheckBugContestContestantFlag: ; 139ed INCLUDE "data/bug_contest_flags.asm" -Special_ContestDropOffMons: ; 13a12 +ContestDropOffMons: ; 13a12 ld hl, PartyMon1HP ld a, [hli] or [hl] @@ -101,7 +101,7 @@ Special_ContestDropOffMons: ; 13a12 ret ; 13a31 -Special_ContestReturnMons: ; 13a31 +ContestReturnMons: ; 13a31 ; Restore the species of the second mon. ld hl, PartySpecies + 1 ld a, [wBugContestSecondPartySpecies] diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index a8cb80efe..e9659707b 100755 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -244,7 +244,7 @@ ComputeAIContestantScores: ; 138b0 ld e, 0 .loop push de - call Special_CheckBugContestContestantFlag + call CheckBugContestContestantFlag pop de jr nz, .done ld a, e diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm index 81565c27e..4d60a7d99 100755 --- a/engine/events/celebi.asm +++ b/engine/events/celebi.asm @@ -1,6 +1,6 @@ SPECIALCELEBIEVENT_CELEBI EQU $84 -Special_CelebiShrineEvent: ; 4989a +CelebiShrineEvent: ; 4989a call DelayFrame ld a, [VramState] push af @@ -362,7 +362,7 @@ CelebiEvent_SetBattleType: ; 49bf3 ; 49bf9 -Special_CheckCaughtCelebi: ; 49bf9 +CheckCaughtCelebi: ; 49bf9 ld a, [wBattleResult] bit 6, a jr z, .false diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm index 3f9dbf84e..a201f14d9 100755 --- a/engine/events/daycare.asm +++ b/engine/events/daycare.asm @@ -21,7 +21,7 @@ const DAYCARETEXT_OH_FINE const DAYCARETEXT_COME_AGAIN -Special_DayCareMan: ; 166d6 +DayCareMan: ; 166d6 ld hl, wDayCareMan bit DAYCAREMAN_HAS_MON_F, [hl] jr nz, .AskWithdrawMon @@ -60,7 +60,7 @@ Special_DayCareMan: ; 166d6 ret ; 1672a -Special_DayCareLady: ; 1672a +DayCareLady: ; 1672a ld hl, wDayCareLady bit DAYCARELADY_HAS_MON_F, [hl] jr nz, .AskWithdrawMon @@ -427,7 +427,7 @@ PrintDayCareText: ; 1689b db "@" ; 0x16936 -Special_DayCareManOutside: ; 16936 +DayCareManOutside: ; 16936 ld hl, wDayCareMan bit DAYCAREMAN_HAS_EGG_F, [hl] jr nz, .AskGiveEgg diff --git a/engine/events/dratini.asm b/engine/events/dratini.asm index 83732bef2..620a5a707 100644 --- a/engine/events/dratini.asm +++ b/engine/events/dratini.asm @@ -1,4 +1,4 @@ -Special_Dratini: ; 0x8b170 +Dratini: ; 0x8b170 ; if ScriptVar is 0 or 1, change the moveset of the last Dratini in the party. ; 0: give it a special moveset with Extremespeed. ; 1: give it the normal moveset of a level 15 Dratini. diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index e6c0629de..6b840a25a 100755 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm @@ -7,7 +7,7 @@ PlayWhirlpoolSound: ; 8c7d4 ; 8c7e1 BlindingFlash: ; 8c7e1 - farcall Special_FadeOutPalettes + farcall FadeOutPalettes ld hl, wStatusFlags set STATUSFLAGS_FLASH_F, [hl] farcall ReplaceTimeOfDayPals @@ -15,7 +15,7 @@ BlindingFlash: ; 8c7e1 ld b, SCGB_MAPPALS call GetSGBLayout farcall LoadOW_BGPal7 - farcall Special_FadeInPalettes + farcall FadeInPalettes ret ; 8c80a diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index 3de91fa5c..fa7fbd791 100755 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -42,7 +42,7 @@ RedCredits:: ; 86455 ld [MusicFadeID + 1], a ld a, 10 ld [MusicFade], a - farcall Special_FadeOutPalettes + farcall FadeOutPalettes xor a ld [VramState], a ld [hMapAnims], a @@ -65,7 +65,7 @@ HallOfFame_FadeOutMusic: ; 8648e ld [MusicFadeID + 1], a ld a, 10 ld [MusicFade], a - farcall Special_FadeOutPalettes + farcall FadeOutPalettes xor a ld [VramState], a ld [hMapAnims], a diff --git a/engine/events/happiness_egg.asm b/engine/events/happiness_egg.asm index 8a5ade3c8..f5055f512 100755 --- a/engine/events/happiness_egg.asm +++ b/engine/events/happiness_egg.asm @@ -1,4 +1,4 @@ -Special_GetFirstPokemonHappiness: ; 718d +GetFirstPokemonHappiness: ; 718d ld hl, PartyMon1Happiness ld bc, PARTYMON_STRUCT_LENGTH ld de, PartySpecies @@ -17,7 +17,7 @@ Special_GetFirstPokemonHappiness: ; 718d call GetPokemonName jp CopyPokemonName_Buffer1_Buffer3 -Special_CheckFirstMonIsEgg: ; 71ac +CheckFirstMonIsEgg: ; 71ac ld a, [PartySpecies] ld [wd265], a cp EGG diff --git a/engine/events/heal_machine_anim.asm b/engine/events/heal_machine_anim.asm index 067b2f554..5573c7abd 100755 --- a/engine/events/heal_machine_anim.asm +++ b/engine/events/heal_machine_anim.asm @@ -1,4 +1,4 @@ -; Special_HealMachineAnim.Jumptable indexes +; HealMachineAnim.Jumptable indexes const_def const HEALMACHINESTATE_LOADGFX const HEALMACHINESTATE_PCLOADBALLS @@ -7,7 +7,7 @@ const HEALMACHINESTATE_HOFPLAYSFX const HEALMACHINESTATE_FINISH -Special_HealMachineAnim: ; 12324 +HealMachineAnim: ; 12324 ; If you have no Pokemon, don't change the buffer. This can lead to some glitchy effects if you have no Pokemon. ld a, [PartyCount] and a diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm index 6547a7f30..62b71f0f4 100644 --- a/engine/events/kurt.asm +++ b/engine/events/kurt.asm @@ -22,7 +22,7 @@ Kurt_PrintTextHowMany: ; 8800c db "@" ; 0x88018 -Special_SelectApricornForKurt: ; 88018 +SelectApricornForKurt: ; 88018 call LoadStandardMenuHeader ld c, $1 xor a diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index a172fc431..043c5c5ee 100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm @@ -1,4 +1,4 @@ -Special_CheckForLuckyNumberWinners: ; 4d87a +CheckForLuckyNumberWinners: ; 4d87a xor a ld [ScriptVar], a ld [wFoundMatchingIDInParty], a @@ -216,7 +216,7 @@ Special_CheckForLuckyNumberWinners: ; 4d87a text_jump UnknownText_0x1c12ae db "@" -Special_PrintTodaysLuckyNumber: ; 4d9d3 +PrintTodaysLuckyNumber: ; 4d9d3 ld hl, StringBuffer3 ld de, wLuckyIDNumber lb bc, PRINTNUM_LEADINGZEROS | 2, 5 diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index 6588295b8..bb86a98ab 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -1,4 +1,4 @@ -Special_CheckMagikarpLength: ; fbb32 +CheckMagikarpLength: ; fbb32 ; Returns 3 if you select a Magikarp that beats the previous record. ; Returns 2 if you select a Magikarp, but the current record is longer. ; Returns 1 if you press B in the Pokemon selection menu. @@ -331,7 +331,7 @@ CalcMagikarpLength: ; fbbfc -Special_MagikarpHouseSign: ; fbcd2 +MagikarpHouseSign: ; fbcd2 ld a, [wBestMagikarpLengthFeet] ld [wMagikarpLength], a ld a, [wBestMagikarpLengthInches] diff --git a/engine/events/magnet_train.asm b/engine/events/magnet_train.asm index be3faac28..6ca05c525 100755 --- a/engine/events/magnet_train.asm +++ b/engine/events/magnet_train.asm @@ -1,4 +1,4 @@ -Special_MagnetTrain: ; 8cc04 +MagnetTrain: ; 8cc04 ld a, [ScriptVar] and a jr nz, .ToGoldenrod diff --git a/engine/events/misc_scripts.asm b/engine/events/misc_scripts.asm index 73ed89143..97372a57a 100755 --- a/engine/events/misc_scripts.asm +++ b/engine/events/misc_scripts.asm @@ -2,7 +2,7 @@ Script_AbortBugContest: ; 0x122c1 checkflag ENGINE_BUG_CONTEST_TIMER iffalse .finish setflag ENGINE_DAILY_BUG_CONTEST - special Special_ContestReturnMons + special ContestReturnMons .finish end diff --git a/engine/events/mom.asm b/engine/events/mom.asm index d8719e58d..a94a7b273 100644 --- a/engine/events/mom.asm +++ b/engine/events/mom.asm @@ -1,4 +1,4 @@ -Special_BankOfMom: ; 16218 +BankOfMom: ; 16218 ld a, [hInMenu] push af ld a, $1 diff --git a/engine/events/move_deleter.asm b/engine/events/move_deleter.asm index d5e4c56bf..5a6f23dd1 100644 --- a/engine/events/move_deleter.asm +++ b/engine/events/move_deleter.asm @@ -1,4 +1,4 @@ -Special_MoveDeletion: +MoveDeletion: ld hl, .IntroText call PrintText call YesNoBox diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm index 31cb20bbb..29095cca2 100644 --- a/engine/events/move_tutor.asm +++ b/engine/events/move_tutor.asm @@ -1,4 +1,4 @@ -Special_MoveTutor: ; 4925b +MoveTutor: ; 4925b call FadeToMenu call ClearBGPalettes call ClearScreen diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 686f8560d..576c6eebf 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -422,7 +422,7 @@ UsedSurfScript: ; c986 special ReplaceKrisSprite special PlayMapMusic ; step into the water - special Special_SurfStartStep ; (slow_step_x, step_end) + special SurfStartStep ; (slow_step_x, step_end) applymovement PLAYER, MovementBuffer ; PLAYER, MovementBuffer end @@ -623,7 +623,7 @@ FlyFunction: ; ca3b special UpdateTimePals callasm FlyFromAnim farscall Script_AbortBugContest - special Special_WarpToSpawnPoint + special WarpToSpawnPoint callasm DelayLoadingNewSprites writecode VAR_MOVEMENT, PLAYER_NORMAL newloadmap MAPSETUP_FLY @@ -871,7 +871,7 @@ dig_incave playsound SFX_WARP_TO applymovement PLAYER, .DigOut farscall Script_AbortBugContest - special Special_WarpToSpawnPoint + special WarpToSpawnPoint writecode VAR_MOVEMENT, PLAYER_NORMAL newloadmap MAPSETUP_DOOR playsound SFX_WARP_FROM @@ -958,7 +958,7 @@ TeleportFunction: ; cc61 playsound SFX_WARP_TO applymovement PLAYER, .TeleportFrom farscall Script_AbortBugContest - special Special_WarpToSpawnPoint + special WarpToSpawnPoint writecode VAR_MOVEMENT, PLAYER_NORMAL newloadmap MAPSETUP_TELEPORT playsound SFX_WARP_FROM diff --git a/engine/events/poke_seer.asm b/engine/events/poke_seer.asm index fb9c6d9f9..09d24cf8f 100644 --- a/engine/events/poke_seer.asm +++ b/engine/events/poke_seer.asm @@ -15,7 +15,7 @@ const SEERACTION_CANT_TELL_2 const SEERACTION_LEVEL_ONLY -Special_PokeSeer: ; 4f0bc +PokeSeer: ; 4f0bc ld a, SEER_INTRO call PrintSeerText call JoyWaitAorB diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index ce50e80ac..7df787cf5 100755 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -1,4 +1,4 @@ -Special_PokemonCenterPC: ; 1559a +PokemonCenterPC: ; 1559a call PC_CheckPartyForPokemon ret c call PC_PlayBootSound diff --git a/engine/events/print_photo.asm b/engine/events/print_photo.asm index 54aa1892d..06b01bbcf 100755 --- a/engine/events/print_photo.asm +++ b/engine/events/print_photo.asm @@ -1,4 +1,4 @@ -Special_PhotoStudio: ; 16dc7 +PhotoStudio: ; 16dc7 ld hl, .Text_AskWhichMon call PrintText farcall SelectMonFromParty diff --git a/engine/events/prof_oaks_pc.asm b/engine/events/prof_oaks_pc.asm index ae84a43a5..69949940b 100755 --- a/engine/events/prof_oaks_pc.asm +++ b/engine/events/prof_oaks_pc.asm @@ -3,7 +3,7 @@ ProfOaksPC: ; 0x265d3 call MenuTextBox call YesNoBox jr c, .shutdown - call Special_ProfOaksPCBoot ; player chose "yes"? + call ProfOaksPCBoot ; player chose "yes"? .shutdown ld hl, OakPCText4 call PrintText @@ -11,7 +11,7 @@ ProfOaksPC: ; 0x265d3 call ExitMenu ret -Special_ProfOaksPCBoot ; 0x265ee +ProfOaksPCBoot ; 0x265ee ld hl, OakPCText2 call PrintText call Rate diff --git a/engine/events/sacred_ash.asm b/engine/events/sacred_ash.asm index 65ed83438..cc46eac9f 100755 --- a/engine/events/sacred_ash.asm +++ b/engine/events/sacred_ash.asm @@ -52,12 +52,12 @@ SacredAshScript: ; 0x50821 special HealParty reloadmappart playsound SFX_WARP_TO - special Special_FadeOutPalettes - special Special_FadeInPalettes - special Special_FadeOutPalettes - special Special_FadeInPalettes - special Special_FadeOutPalettes - special Special_FadeInPalettes + special FadeOutPalettes + special FadeInPalettes + special FadeOutPalettes + special FadeInPalettes + special FadeOutPalettes + special FadeInPalettes waitsfx writetext UnknownText_0x50845 playsound SFX_CAUGHT_MON diff --git a/engine/events/special.asm b/engine/events/special.asm index 7f87195e1..ecb75c8ea 100755 --- a/engine/events/special.asm +++ b/engine/events/special.asm @@ -1,6 +1,6 @@ MANIA_OT_ID EQU 00518 -Special_GiveShuckle: ; 7305 +GiveShuckle: ; 7305 ; Adding to the party. xor a @@ -71,7 +71,7 @@ SpecialShuckleOT: SpecialShuckleNick: db "SHUCKIE@" -Special_ReturnShuckle: ; 737e +ReturnShuckle: ; 737e farcall SelectMonFromParty jr c, .refused @@ -141,7 +141,7 @@ Special_ReturnShuckle: ; 737e ld [ScriptVar], a ret -Special_BillsGrandfather: ; 73f7 +BillsGrandfather: ; 73f7 farcall SelectMonFromParty jr c, .cancel ld a, [CurPartySpecies] @@ -155,15 +155,15 @@ Special_BillsGrandfather: ; 73f7 ld [ScriptVar], a ret -Special_YoungerHaircutBrother: ; 7413 +YoungerHaircutBrother: ; 7413 ld hl, Data_YoungerHaircutBrother jr HaircutOrGrooming -Special_OlderHaircutBrother: ; 7418 +OlderHaircutBrother: ; 7418 ld hl, Data_OlderHaircutBrother jr HaircutOrGrooming -Special_DaisysGrooming: ; 741d +DaisysGrooming: ; 741d ld hl, Data_DaisysGrooming ; fallthrough diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 7da52fe2f..47090c1c3 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -108,13 +108,13 @@ PokecenterNurseScript: farwritetext NurseTakePokemonText pause 20 - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings spriteface LAST_TALKED, LEFT pause 10 special HealParty playmusic MUSIC_NONE writebyte HEALMACHINE_POKECENTER - special Special_HealMachineAnim + special HealMachineAnim pause 30 special RestartMapMusic spriteface LAST_TALKED, DOWN @@ -124,7 +124,7 @@ PokecenterNurseScript: iftrue .no checkflag ENGINE_CAUGHT_POKERUS iftrue .no - special Special_CheckPokerus + special CheckPokerus iftrue .pokerus .no @@ -184,7 +184,7 @@ TownMapScript: opentext farwritetext TownMapText waitbutton - special Special_OverworldTownMap + special OverworldTownMap closetext end @@ -204,7 +204,7 @@ HomepageScript: Radio1Script: opentext writebyte MAPRADIO_POKEMON_CHANNEL - special Special_MapRadio + special MapRadio closetext end @@ -212,7 +212,7 @@ Radio2Script: ; Lucky Channel opentext writebyte MAPRADIO_LUCKY_CHANNEL - special Special_MapRadio + special MapRadio closetext end @@ -221,7 +221,7 @@ TrashCanScript: ; 0xbc1a5 PCScript: opentext - special Special_PokemonCenterPC + special PokemonCenterPC closetext end @@ -320,7 +320,7 @@ BugContestResultsScript: opentext farwritetext ContestResults_ReadyToJudgeText waitbutton - special Special_BugContestJudging + special BugContestJudging vartomem MEM_BUFFER_0 if_equal 1, BugContestResults_FirstPlace if_equal 2, BugContestResults_SecondPlace @@ -346,9 +346,9 @@ BugContestResults_FinishUp iffalse BugContestResults_DidNotLeaveMons farwritetext ContestResults_ReturnPartyText waitbutton - special Special_ContestReturnMons + special ContestReturnMons BugContestResults_DidNotLeaveMons - special Special_CheckPartyFullAfterContest + special CheckPartyFullAfterContest if_equal BUGCONTEST_CAUGHT_MON, BugContestResults_CleanUp if_equal BUGCONTEST_NO_CATCH, BugContestResults_CleanUp ; BUGCONTEST_BOXED_MON @@ -622,7 +622,7 @@ InitializeEventsScript: return AskNumber1MScript: - special Special_RandomPhoneMon + special RandomPhoneMon checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_SAILOR_HUEY, .Huey @@ -707,7 +707,7 @@ AskNumber1MScript: end AskNumber2MScript: - special Special_RandomPhoneMon + special RandomPhoneMon checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_SAILOR_HUEY, .Huey @@ -1810,7 +1810,7 @@ CoinVendor_IntroScript: ; 0xbcde0 farwritetext CoinVendor_IntroText .loop ; 0xbcde4 - special Special_DisplayMoneyAndCoinBalance + special DisplayMoneyAndCoinBalance loadmenuheader .MenuHeader verticalmenu closewindow @@ -1887,7 +1887,7 @@ CoinVendor_IntroScript: ; 0xbcde0 HappinessCheckScript: faceplayer opentext - special Special_GetFirstPokemonHappiness + special GetFirstPokemonHappiness if_less_than 50, .Unhappy if_less_than 150, .KindaHappy farwritetext HappinessText3 diff --git a/engine/events/unown_walls.asm b/engine/events/unown_walls.asm index 903b7bb2b..e09d18fe8 100644 --- a/engine/events/unown_walls.asm +++ b/engine/events/unown_walls.asm @@ -1,4 +1,4 @@ -Special_HoOhChamber: ; 0x8addb +HoOhChamber: ; 0x8addb ld hl, PartySpecies ld a, [hl] cp HO_OH ; is Ho-oh the first Pokémon in the party? @@ -11,7 +11,7 @@ Special_HoOhChamber: ; 0x8addb ret ; 0x8adef -Special_OmanyteChamber: ; 8adef +OmanyteChamber: ; 8adef call GetMapDataPointer ; pointless? ld de, EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER ld b, CHECK_FLAG @@ -103,7 +103,7 @@ SpecialKabutoChamber: ; 8ae4e ret ; 8ae68 -Special_DisplayUnownWords: ; 8ae68 +DisplayUnownWords: ; 8ae68 ld a, [ScriptVar] ld hl, MenuHeaders_UnownWalls and a diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index aa629682f..9175bbb73 100755 --- a/engine/events/whiteout.asm +++ b/engine/events/whiteout.asm @@ -10,7 +10,7 @@ Script_OverworldWhiteout:: ; 0x124c8 Script_Whiteout: ; 0x124ce writetext .WhitedOutText waitbutton - special Special_FadeOutPalettes + special FadeOutPalettes pause 40 special HealParty checkflag ENGINE_BUG_CONTEST_TIMER @@ -18,7 +18,7 @@ Script_Whiteout: ; 0x124ce callasm HalveMoney callasm GetWhiteoutSpawn farscall Script_AbortBugContest - special Special_WarpToSpawnPoint + special WarpToSpawnPoint newloadmap MAPSETUP_WARP end_all diff --git a/engine/events_2.asm b/engine/events_2.asm index 93044a23b..c27b4737f 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -1,7 +1,7 @@ ; More overworld event handling. -Special_WarpToSpawnPoint:: ; 97c28 +WarpToSpawnPoint:: ; 97c28 ld hl, wStatusFlags2 res STATUSFLAGS2_SAFARI_GAME_F, [hl] res STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl] diff --git a/engine/link.asm b/engine/link.asm index c95969116..c67572872 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -2031,7 +2031,7 @@ Unreferenced_Function28f09: ; 28f09 INCLUDE "engine/trade_animation.asm" -Special_CheckTimeCapsuleCompatibility: ; 29bfb +CheckTimeCapsuleCompatibility: ; 29bfb ; Checks to see if your Party is compatible with the generation 1 games. Returns the following in ScriptVar: ; 0: Party is okay ; 1: At least one Pokemon was introduced in GS @@ -2126,7 +2126,7 @@ Function29c67: ; 29c67 ret ; 29c7b -Special_EnterTimeCapsule: ; 29c7b +EnterTimeCapsule: ; 29c7b ld c, 10 call DelayFrames ld a, $4 @@ -2140,7 +2140,7 @@ Special_EnterTimeCapsule: ; 29c7b ret ; 29c92 -Special_WaitForOtherPlayerToExit: ; 29c92 +WaitForOtherPlayerToExit: ; 29c92 ld c, 3 call DelayFrames ld a, CONNECTION_NOT_ESTABLISHED @@ -2188,21 +2188,21 @@ Special_WaitForOtherPlayerToExit: ; 29c92 ret ; 29ce8 -Special_SetBitsForLinkTradeRequest: ; 29ce8 +SetBitsForLinkTradeRequest: ; 29ce8 ld a, LINK_TRADECENTER - 1 ld [wPlayerLinkAction], a ld [wd265], a ret ; 29cf1 -Special_SetBitsForBattleRequest: ; 29cf1 +SetBitsForBattleRequest: ; 29cf1 ld a, LINK_COLOSSEUM - 1 ld [wPlayerLinkAction], a ld [wd265], a ret ; 29cfa -Special_SetBitsForTimeCapsuleRequest: ; 29cfa +SetBitsForTimeCapsuleRequest: ; 29cfa ld a, $2 ld [rSB], a xor a @@ -2217,7 +2217,7 @@ Special_SetBitsForTimeCapsuleRequest: ; 29cfa ret ; 29d11 -Special_WaitForLinkedFriend: ; 29d11 +WaitForLinkedFriend: ; 29d11 ld a, [wPlayerLinkAction] and a jr z, .no_link_action @@ -2289,7 +2289,7 @@ Special_WaitForLinkedFriend: ; 29d11 ret ; 29d92 -Special_CheckLinkTimeout: ; 29d92 +CheckLinkTimeout: ; 29d92 ld a, $1 ld [wPlayerLinkAction], a ld hl, wLinkTimeoutFrames @@ -2427,7 +2427,7 @@ Link_CheckCommunicationError: ; 29e0c ret ; 29e66 -Special_TryQuickSave: ; 29e66 +TryQuickSave: ; 29e66 ld a, [wd265] push af farcall Link_SaveGame @@ -2443,7 +2443,7 @@ Special_TryQuickSave: ; 29e66 ret ; 29e82 -Special_CheckBothSelectedSameRoom: ; 29e82 +CheckBothSelectedSameRoom: ; 29e82 ld a, [wd265] call Link_EnsureSync push af @@ -2470,7 +2470,7 @@ Special_CheckBothSelectedSameRoom: ; 29e82 ret ; 29eaf -Special_TimeCapsule: ; 29eaf +TimeCapsule: ; 29eaf ld a, LINK_TIMECAPSULE ld [wLinkMode], a call DisableSpriteUpdates @@ -2481,7 +2481,7 @@ Special_TimeCapsule: ; 29eaf ret ; 29ec4 -Special_TradeCenter: ; 29ec4 +TradeCenter: ; 29ec4 ld a, LINK_TRADECENTER ld [wLinkMode], a call DisableSpriteUpdates @@ -2492,7 +2492,7 @@ Special_TradeCenter: ; 29ec4 ret ; 29ed9 -Special_Colosseum: ; 29ed9 +Colosseum: ; 29ed9 ld a, LINK_COLOSSEUM ld [wLinkMode], a call DisableSpriteUpdates @@ -2503,7 +2503,7 @@ Special_Colosseum: ; 29ed9 ret ; 29eee -Special_CloseLink: ; 29eee +CloseLink: ; 29eee xor a ld [wLinkMode], a ld c, 3 @@ -2511,7 +2511,7 @@ Special_CloseLink: ; 29eee jp Link_ResetSerialRegistersAfterLinkClosure ; 29efa -Special_FailedLinkToPast: ; 29efa +FailedLinkToPast: ; 29efa ld c, 40 call DelayFrames ld a, $e @@ -2560,7 +2560,7 @@ Link_EnsureSync: ; 29f17 ret ; 29f47 -Special_CableClubCheckWhichChris: ; 29f47 +CableClubCheckWhichChris: ; 29f47 ld a, [hSerialConnectionStatus] cp USING_EXTERNAL_CLOCK ld a, TRUE diff --git a/engine/map_setup.asm b/engine/map_setup.asm index d2140c569..bf103a629 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -79,7 +79,7 @@ MapSetupCommands: ; 15440 dba LoadGraphics ; 0e dba LoadTileset ; 0f dba LoadMapTimeOfDay ; 10 - dba Special_LoadMapPalettes ; 11 + dba LoadMapPalettes ; 11 dba LoadWildMonData ; 12 dba RefreshMapSprites ; 13 dba HandleNewMap ; 14 @@ -91,8 +91,8 @@ MapSetupCommands: ; 15440 dba LoadMapAttributes ; 1a dba LoadMapAttributes_SkipPeople ; 1b dba ClearBGPalettes ; 1c - dba Special_FadeOutPalettes ; 1d - dba Special_FadeInPalettes ; 1e + dba FadeOutPalettes ; 1d + dba FadeInPalettes ; 1e dba GetCoordOfUpperLeftCorner ; 1f dba RestoreFacingAfterWarp ; 20 dba SpawnInFacingDown ; 21 diff --git a/engine/mart.asm b/engine/mart.asm index 8385cf0ad..12f9b88df 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -443,7 +443,7 @@ GetMartDialogGroup: ; 15ca3 BuyMenuLoop: ; 15cef - farcall Special_PlaceMoneyTopRight + farcall PlaceMoneyTopRight call UpdateSprites ld hl, MenuHeader_Buy call CopyMenuHeader diff --git a/engine/menu_2.asm b/engine/menu_2.asm index 84cc9ca5f..5b1165275 100644 --- a/engine/menu_2.asm +++ b/engine/menu_2.asm @@ -27,7 +27,7 @@ PlaceMenuItemQuantity: ; 0x24ac3 .done ret -Special_PlaceMoneyTopRight: ; 24ae8 +PlaceMoneyTopRight: ; 24ae8 ld hl, MenuHeader_0x24b15 call CopyMenuHeader jr PlaceMoneyTextBox @@ -64,7 +64,7 @@ MenuHeader_0x24b1d: ; 0x24b1d dw NULL db 1 ; default option -Special_DisplayCoinCaseBalance: ; 24b25 +DisplayCoinCaseBalance: ; 24b25 ; Place a text box of size 1x7 at 11, 0. hlcoord 11, 0 ld b, 1 @@ -82,7 +82,7 @@ Special_DisplayCoinCaseBalance: ; 24b25 call PrintNum ret -Special_DisplayMoneyAndCoinBalance: ; 24b4e +DisplayMoneyAndCoinBalance: ; 24b4e hlcoord 5, 0 ld b, 3 ld c, 13 diff --git a/engine/mystery_gift.asm b/engine/mystery_gift.asm index 0fb73a56c..5edf3ed0e 100755 --- a/engine/mystery_gift.asm +++ b/engine/mystery_gift.asm @@ -1157,7 +1157,7 @@ MysteryGift_CopyReceivedDecosToPC: ; 105091 (41:5091) jr c, .loop jp CloseSRAM -Special_UnlockMysteryGift: ; 1050b9 +UnlockMysteryGift: ; 1050b9 call GetMysteryGiftBank ld hl, sMysteryGiftUnlocked ld a, [hl] diff --git a/engine/overworld.asm b/engine/overworld.asm index 2cac7df02..32ef356e5 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -23,7 +23,7 @@ Function14146: ; mobile push af res 7, [hl] set 6, [hl] - call Special_LoadUsedSpritesGFX + call LoadUsedSpritesGFX pop af ld [wSpriteFlags], a ret @@ -35,15 +35,15 @@ Function14157: ; mobile push af set 7, [hl] res 6, [hl] - call Special_LoadUsedSpritesGFX + call LoadUsedSpritesGFX pop af ld [wSpriteFlags], a ret ; 14168 -Special_RefreshSprites:: ; 14168 +RefreshSprites:: ; 14168 call .Refresh - call Special_LoadUsedSpritesGFX + call LoadUsedSpritesGFX ret ; 1416f @@ -164,7 +164,7 @@ AddOutdoorSprites: ; 141ee ; 14209 -Special_LoadUsedSpritesGFX: ; 14209 +LoadUsedSpritesGFX: ; 14209 ld a, MAPCALLBACK_SPRITES call RunMapCallback call GetUsedSprites diff --git a/engine/phone/generic_calls.asm b/engine/phone/generic_calls.asm index 937fc67c0..e1b53a950 100644 --- a/engine/phone/generic_calls.asm +++ b/engine/phone/generic_calls.asm @@ -1240,7 +1240,7 @@ PhoneScript_Generic_Female: end PhoneScript_MonFlavorText: - special Special_RandomPhoneMon + special RandomPhoneMon farscall PhoneScript_Random2 if_equal $0, .TooEnergetic farwritetext UnknownText_0x1b518b diff --git a/engine/phone/phone_callers.asm b/engine/phone/phone_callers.asm index cb333ae8d..c90448d33 100644 --- a/engine/phone/phone_callers.asm +++ b/engine/phone/phone_callers.asm @@ -1,5 +1,5 @@ Phone_GenericCall_Male: - special Special_RandomPhoneMon + special RandomPhoneMon farscall PhoneScript_Random2 if_equal 0, .Bragging farscall PhoneScript_Generic_Male @@ -9,7 +9,7 @@ Phone_GenericCall_Male: farjump Phone_BraggingCall_Male Phone_GenericCall_Female: - special Special_RandomPhoneMon + special RandomPhoneMon farscall PhoneScript_Random2 if_equal 0, .Bragging farscall PhoneScript_Generic_Female @@ -27,7 +27,7 @@ Phone_BraggingCall_Female: farjump Phone_FoundAMon_Female Phone_FoundAMon_Male: - special Special_RandomPhoneWildMon + special RandomPhoneWildMon farscall PhoneScript_Random2 if_equal 0, .GotAway farscall Phone_WhoDefeatedMon_Male @@ -37,7 +37,7 @@ Phone_FoundAMon_Male: farjump Phone_GotAwayCall_Male Phone_FoundAMon_Female: - special Special_RandomPhoneWildMon + special RandomPhoneWildMon farscall PhoneScript_Random2 if_equal 0, .GotAway farscall Phone_WhoDefeatedMon_Female @@ -851,7 +851,7 @@ Phone_CheckIfUnseenRare_Female: farjump PhoneScript_HangupText_Female PhoneScriptRareWildMon: - special Special_RandomUnseenWildMon + special RandomUnseenWildMon end PhoneScript_BugCatchingContest: diff --git a/engine/phone/phone_scripts.asm b/engine/phone/phone_scripts.asm index cc72cf189..3cbd60f51 100644 --- a/engine/phone/phone_scripts.asm +++ b/engine/phone/phone_scripts.asm @@ -392,7 +392,7 @@ HueyPhoneScript1: iftrue HueyWednesdayNight .NotWednesday: - special Special_RandomPhoneMon + special RandomPhoneMon farjump UnknownScript_0xa0908 .WantsBattle: @@ -629,7 +629,7 @@ JoeyPhoneScript1: iftrue JoeyMondayAfternoon .NotMonday: - special Special_RandomPhoneMon + special RandomPhoneMon farjump UnknownScript_0xa0930 .WantsBattle: @@ -830,7 +830,7 @@ Ralph_SetUpSwarm: pokenamemem QWILFISH, MEM_BUFFER_1 landmarktotext ROUTE_32, MEM_BUFFER_2 writebyte FISHSWARM_QWILFISH - special Special_ActivateFishingSwarm + special ActivateFishingSwarm farjump UnknownScript_0xa05d6 .Generic: @@ -851,7 +851,7 @@ LizPhoneScript1: iftrue LizThursdayAfternoon .NotThursday: - special Special_RandomPhoneMon + special RandomPhoneMon farjump UnknownScript_0xa0948 .WantsBattle: diff --git a/engine/player_object.asm b/engine/player_object.asm index f89a63fb1..a6e165221 100755 --- a/engine/player_object.asm +++ b/engine/player_object.asm @@ -577,7 +577,7 @@ TrainerWalkToPlayer: ; 831e call ComputePathToWalkToPlayer ret -Special_SurfStartStep: ; 8379 +SurfStartStep: ; 8379 call InitMovementBuffer call .GetMovementData call AppendToMovementBuffer diff --git a/engine/radio.asm b/engine/radio.asm index d2e36e572..d90a41dc2 100644 --- a/engine/radio.asm +++ b/engine/radio.asm @@ -972,9 +972,9 @@ BenFernText3B: LuckyNumberShow1: call StartRadioStation - callfar Special_CheckLuckyNumberShowFlag + callfar CheckLuckyNumberShowFlag jr nc, .dontreset - callfar Special_ResetLuckyNumberShowFlag + callfar ResetLuckyNumberShowFlag .dontreset ld hl, LC_Text1 ld a, LUCKY_NUMBER_SHOW_2 diff --git a/engine/routines/playslowcry.asm b/engine/routines/playslowcry.asm index 545629e51..6f28ea845 100644 --- a/engine/routines/playslowcry.asm +++ b/engine/routines/playslowcry.asm @@ -1,4 +1,4 @@ -Special_PlaySlowCry: ; fb841 +PlaySlowCry: ; fb841 ld a, [ScriptVar] call LoadCry jr c, .done diff --git a/engine/search.asm b/engine/search.asm index 495d4cc5e..0d4a8dc3c 100755 --- a/engine/search.asm +++ b/engine/search.asm @@ -1,4 +1,4 @@ -Special_BeastsCheck: ; 0x4a6e8 +BeastsCheck: ; 0x4a6e8 ; Check if the player owns all three legendary beasts. ; They must exist in either party or PC, and have the player's OT and ID. ; Return the result in ScriptVar. @@ -29,7 +29,7 @@ Special_BeastsCheck: ; 0x4a6e8 ret -Special_MonCheck: ; 0x4a711 +MonCheck: ; 0x4a711 ; Check if the player owns any monsters of the species in ScriptVar. ; Return the result in ScriptVar. diff --git a/engine/specials.asm b/engine/specials.asm index 4824c4b4c..2193106e7 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -20,14 +20,14 @@ DummySpecial_c224: ; c224 ret ; c225 -Special_SetPlayerPalette: ; c225 +SetPlayerPalette: ; c225 ld a, [ScriptVar] ld d, a farcall _SetPlayerPalette ret ; c230 -Special_GameCornerPrizeMonCheckDex: ; c230 +GameCornerPrizeMonCheckDex: ; c230 ld a, [ScriptVar] dec a call CheckCaughtMon @@ -50,28 +50,28 @@ UnusedSpecial_SeenMon: ; c252 ret ; c25a -Special_FindPartyMonGreaterThanThatLevel: ; c25a +FindPartyMonGreaterThanThatLevel: ; c25a ld a, [ScriptVar] ld b, a farcall _FindPartyMonGreaterThanThatLevel jr z, FoundNone jr FoundOne -Special_FindPartyMonAtLeastThatHappy: ; c268 +FindPartyMonAtLeastThatHappy: ; c268 ld a, [ScriptVar] ld b, a farcall _FindPartyMonAtLeastThatHappy jr z, FoundNone jr FoundOne -Special_FindPartyMonThatSpecies: ; c276 +FindPartyMonThatSpecies: ; c276 ld a, [ScriptVar] ld b, a farcall _FindPartyMonThatSpecies jr z, FoundNone jr FoundOne -Special_FindPartyMonThatSpeciesYourTrainerID: ; c284 +FindPartyMonThatSpeciesYourTrainerID: ; c284 ld a, [ScriptVar] ld b, a farcall _FindPartyMonThatSpeciesYourTrainerID @@ -89,7 +89,7 @@ FoundNone: ; c298 ret ; c29d -Special_NameRival: ; 0xc29d +NameRival: ; 0xc29d ld b, $2 ; rival ld de, RivalName farcall _NamingScreen @@ -103,33 +103,33 @@ Special_NameRival: ; 0xc29d DefaultRivalName: ; 0xc2b2 db "SILVER@" -Special_NameRater: ; c2b9 +NameRater: ; c2b9 farcall _NameRater ret ; c2c0 -Special_OverworldTownMap: ; c2c0 +OverworldTownMap: ; c2c0 call FadeToMenu farcall _TownMap call ExitAllMenus ret ; c2cd -Special_UnownPrinter: ; c2cd +UnownPrinter: ; c2cd call FadeToMenu farcall _UnownPrinter call ExitAllMenus ret ; c2da -Special_DisplayLinkRecord: ; c2da +DisplayLinkRecord: ; c2da call FadeToMenu farcall _DisplayLinkRecord call ExitAllMenus ret ; c2e7 -Special_PlayersHousePC: ; c2e7 +PlayersHousePC: ; c2e7 xor a ld [ScriptVar], a farcall _PlayersHousePC @@ -138,7 +138,7 @@ Special_PlayersHousePC: ; c2e7 ret ; c2f6 -Special_CheckMysteryGift: ; c2f6 +CheckMysteryGift: ; c2f6 ld a, BANK(sMysteryGiftItem) call GetSRAMBank ld a, [sMysteryGiftItem] @@ -152,7 +152,7 @@ Special_CheckMysteryGift: ; c2f6 ret ; c309 -Special_GetMysteryGiftItem: ; c309 +GetMysteryGiftItem: ; c309 ld a, BANK(sMysteryGiftItem) call GetSRAMBank ld a, [sMysteryGiftItem] @@ -187,21 +187,21 @@ Special_GetMysteryGiftItem: ; c309 db "@" ; 0xc34a -Special_BugContestJudging: ; c34a +BugContestJudging: ; c34a farcall _BugContestJudging ld a, b ld [ScriptVar], a ret ; c355 -Special_MapRadio: ; c355 +MapRadio: ; c355 ld a, [ScriptVar] ld e, a farcall PlayRadio ret ; c360 -Special_UnownPuzzle: ; c360 +UnownPuzzle: ; c360 call FadeToMenu farcall _UnownPuzzle ld a, [wSolvedUnownPuzzle] @@ -210,34 +210,34 @@ Special_UnownPuzzle: ; c360 ret ; c373 -Special_SlotMachine: ; c373 - call Special_CheckCoins +SlotMachine: ; c373 + call CheckCoinsAndCoinCase ret c ld a, BANK(_SlotMachine) ld hl, _SlotMachine - call Special_StartGameCornerGame + call StartGameCornerGame ret ; c380 -Special_CardFlip: ; c380 - call Special_CheckCoins +CardFlip: ; c380 + call CheckCoinsAndCoinCase ret c ld a, BANK(_CardFlip) ld hl, _CardFlip - call Special_StartGameCornerGame + call StartGameCornerGame ret ; c38d -Special_DummyNonfunctionalGameCornerGame: ; c38d - call Special_CheckCoins +DummyNonfunctionalGameCornerGame: ; c38d + call CheckCoinsAndCoinCase ret c ld a, BANK(_DummyGame) ld hl, _DummyGame - call Special_StartGameCornerGame + call StartGameCornerGame ret ; c39a -Special_StartGameCornerGame: ; c39a +StartGameCornerGame: ; c39a call FarQueueScript call FadeToMenu ld hl, wQueuedScriptBank @@ -252,7 +252,7 @@ Special_StartGameCornerGame: ; c39a ret ; c3ae -Special_CheckCoins: ; c3ae +CheckCoinsAndCoinCase: ; c3ae ld hl, Coins ld a, [hli] or [hl] @@ -290,7 +290,7 @@ Special_CheckCoins: ; c3ae db "@" ; 0xc3db -Special_ClearBGPalettesBufferScreen: ; c3db +ClearBGPalettesBufferScreen: ; c3db call ClearBGPalettes call BufferScreen ret @@ -314,7 +314,7 @@ UnusedSpecial_CheckUnusedTwoDayTimer: ; c3ef ret ; c3fc -Special_ActivateFishingSwarm: ; c3fc +ActivateFishingSwarm: ; c3fc ld a, [ScriptVar] ld [wFishingSwarmFlag], a ret @@ -341,13 +341,13 @@ StoreSwarmMapIndices:: ; c403 ; c419 -Special_CheckPokerus: ; c419 +CheckPokerus: ; c419 ; Check if a monster in your party has Pokerus farcall _CheckPokerus jp ScriptReturnCarry ; c422 -Special_ResetLuckyNumberShowFlag: ; c422 +ResetLuckyNumberShowFlag: ; c422 farcall RestartLuckyNumberCountdown ld hl, wLuckyNumberShowFlag res LUCKYNUMBERSHOW_GAME_OVER_F, [hl] @@ -355,12 +355,12 @@ Special_ResetLuckyNumberShowFlag: ; c422 ret ; c434 -Special_CheckLuckyNumberShowFlag: ; c434 +CheckLuckyNumberShowFlag: ; c434 farcall _CheckLuckyNumberShowFlag jp ScriptReturnCarry ; c43d -Special_SnorlaxAwake: ; 0xc43d +SnorlaxAwake: ; 0xc43d ; Check if the Poké Flute channel is playing, and if the player is standing ; next to Snorlax. @@ -411,13 +411,13 @@ Special_SnorlaxAwake: ; 0xc43d db -1 -Special_PlayCurMonCry: ; c472 +PlayCurMonCry: ; c472 ld a, [CurPartySpecies] jp PlayMonCry ; c478 -Special_GameboyCheck: ; c478 +GameboyCheck: ; c478 ld a, [hCGB] and a jr nz, .cgb @@ -439,7 +439,7 @@ Special_GameboyCheck: ; c478 ret -Special_FadeOutMusic: ; c48f +FadeOutMusic: ; c48f ld a, LOW(MUSIC_NONE) ld [MusicFadeID], a ld a, HIGH(MUSIC_NONE) @@ -449,21 +449,21 @@ Special_FadeOutMusic: ; c48f ret ; c49f -Special_Diploma: ; c49f +Diploma: ; c49f call FadeToMenu farcall _Diploma call ExitAllMenus ret ; c4ac -Special_PrintDiploma: ; c4ac +PrintDiploma: ; c4ac call FadeToMenu farcall _PrintDiploma call ExitAllMenus ret ; c4b9 -Special_TrainerHouse: ; 0xc4b9 +TrainerHouse: ; 0xc4b9 ld a, BANK(sMysteryGiftTrainerHouseFlag) call GetSRAMBank ld a, [sMysteryGiftTrainerHouseFlag] diff --git a/engine/time.asm b/engine/time.asm index 1bfe0e9aa..f3df62f71 100755 --- a/engine/time.asm +++ b/engine/time.asm @@ -125,12 +125,12 @@ endr dec [hl] jr nz, .DontRestartKenjiBreakCountdown .RestartKenjiBreakCountdown: - call Special_SampleKenjiBreakCountdown + call SampleKenjiBreakCountdown .DontRestartKenjiBreakCountdown: jr RestartDailyResetTimer ; 11485 -Special_SampleKenjiBreakCountdown: ; 11485 +SampleKenjiBreakCountdown: ; 11485 ; Generate a random number between 3 and 6 call Random and %11 diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index 2e4d4eec0..2f99bf609 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -119,7 +119,7 @@ _UpdateTimePals:: ; 8c070 ret ; 8c079 -Special_FadeInPalettes:: ; 8c079 +FadeInPalettes:: ; 8c079 ld c, $12 call GetTimePalFade ld b, $4 @@ -127,7 +127,7 @@ Special_FadeInPalettes:: ; 8c079 ret ; 8c084 -Special_FadeOutPalettes:: ; 8c084 +FadeOutPalettes:: ; 8c084 call FillWhiteBGColor ld c, $9 call GetTimePalFade @@ -136,7 +136,7 @@ Special_FadeOutPalettes:: ; 8c084 ret ; 8c092 -Special_BattleTowerFade: ; 8c092 +BattleTowerFade: ; 8c092 call FillWhiteBGColor ld c, $9 call GetTimePalFade @@ -153,7 +153,7 @@ Special_BattleTowerFade: ; 8c092 ret ; 8c0ab -Special_FadeInQuickly: ; 8c0ab +FadeInQuickly: ; 8c0ab ld c, $0 call GetTimePalFade ld b, $4 @@ -161,7 +161,7 @@ Special_FadeInQuickly: ; 8c0ab ret ; 8c0b6 -Special_FadeBlackQuickly: ; 8c0b6 +FadeBlackQuickly: ; 8c0b6 ld c, $9 call GetTimePalFade ld b, $4 diff --git a/engine/timeset.asm b/engine/timeset.asm index 26b6aba60..62e59a5ae 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -407,7 +407,7 @@ TimeSetDownArrowGFX: ; 9090b INCBIN "gfx/new_game/down_arrow.1bpp" ; 90913 -Special_SetDayOfWeek: ; 90913 +SetDayOfWeek: ; 90913 ld a, [hInMenu] push af ld a, $1 @@ -573,7 +573,7 @@ Special_SetDayOfWeek: ; 90913 db "@" ; 0x90a54 -Special_InitialSetDSTFlag: ; 90a54 +InitialSetDSTFlag: ; 90a54 ld a, [wDST] set 7, a ld [wDST], a @@ -604,7 +604,7 @@ Special_InitialSetDSTFlag: ; 90a54 db "@" ; 0x90a88 -Special_InitialClearDSTFlag: ; 90a88 +InitialClearDSTFlag: ; 90a88 ld a, [wDST] res 7, a ld [wDST], a diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm index a16a2885e..f2fb0ef31 100755 --- a/engine/warp_connection.asm +++ b/engine/warp_connection.asm @@ -305,12 +305,12 @@ LoadGraphics: ; 1047cf ld [hMapAnims], a xor a ld [hTileAnimFrame], a - farcall Special_RefreshSprites + farcall RefreshSprites call LoadFontsExtra farcall LoadOverworldFont ret -Special_LoadMapPalettes: ; 1047eb +LoadMapPalettes: ; 1047eb ld b, SCGB_MAPPALS jp GetSGBLayout ; 1047f0 diff --git a/engine/wildmons.asm b/engine/wildmons.asm index d2da42611..3b8d8619d 100755 --- a/engine/wildmons.asm +++ b/engine/wildmons.asm @@ -508,7 +508,7 @@ LookUpWildmonsForMapDE: ; 2a288 ; 2a2a0 -Special_InitRoamMons: ; 2a2a0 +InitRoamMons: ; 2a2a0 ; initialize wRoamMon structs ; species @@ -804,7 +804,7 @@ ValidateTempWildMonSpecies: ; 2a4a0 ; Finds a rare wild Pokemon in the route of the trainer calling, then checks if it's been Seen already. ; The trainer will then tell you about the Pokemon if you haven't seen it. -Special_RandomUnseenWildMon: ; 2a4ab +RandomUnseenWildMon: ; 2a4ab farcall GetCallerLocation ld d, b ld e, c @@ -877,7 +877,7 @@ Special_RandomUnseenWildMon: ; 2a4ab db "@" ; 0x2a51f -Special_RandomPhoneWildMon: ; 2a51f +RandomPhoneWildMon: ; 2a51f farcall GetCallerLocation ld d, b ld e, c @@ -917,7 +917,7 @@ Special_RandomPhoneWildMon: ; 2a51f jp CopyBytes ; 2a567 -Special_RandomPhoneMon: ; 2a567 +RandomPhoneMon: ; 2a567 ; Get a random monster owned by the trainer who's calling. farcall GetCallerLocation ld hl, TrainerGroups diff --git a/home/map.asm b/home/map.asm index 402b7f4ec..9c81d8034 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1984,7 +1984,7 @@ FadeToMenu:: ; 2b29 xor a ld [hBGMapMode], a call LoadStandardMenuHeader - farcall Special_FadeOutPalettes + farcall FadeOutPalettes call ClearSprites call DisableSpriteUpdates ret @@ -2010,7 +2010,7 @@ FinishExitMenu:: ; 2b5c call GetSGBLayout farcall LoadOW_BGPal7 call WaitBGMap2 - farcall Special_FadeInPalettes + farcall FadeInPalettes call EnableSpriteUpdates ret ; 2b74 @@ -2043,7 +2043,7 @@ ReturnToMapWithSpeechTextbox:: ; 0x2b74 ReloadTilesetAndPalettes:: ; 2bae call DisableLCD call ClearSprites - farcall Special_RefreshSprites + farcall RefreshSprites call LoadStandardFont call LoadFontsExtra ld a, [hROMBank] diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 83a29e7ad..b3a3fc61d 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -40,7 +40,7 @@ AzaleaTownRivalBattleScene1: moveobject AZALEATOWN_SILVER, 11, 11 spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 appear AZALEATOWN_SILVER applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement1 @@ -50,7 +50,7 @@ AzaleaTownRivalBattleScene1: AzaleaTownRivalBattleScene2: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 appear AZALEATOWN_SILVER applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement2 diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index b7113f347..79b75ee08 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -16,10 +16,10 @@ BattleTower1F_MapScripts: .Scene0: writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS - special Special_BattleTowerAction + special BattleTowerAction iffalse .SkipEverything writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState - special Special_BattleTowerAction + special BattleTowerAction if_equal $0, .SkipEverything if_equal $2, .priorityjump1 if_equal $3, .SkipEverything @@ -34,9 +34,9 @@ BattleTower1F_MapScripts: .priorityjump1 priorityjump BattleTower_LeftWithoutSaving writebyte BATTLETOWERACTION_CHALLENGECANCELED - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_06 - special Special_BattleTowerAction + special BattleTowerAction .SkipEverything: setscene 1 .Scene1: @@ -55,54 +55,54 @@ UnknownScript_0x9e3e0: ReceptionistScript_0x9e3e2: writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState - special Special_BattleTowerAction + special BattleTowerAction if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm opentext writetext Text_BattleTowerWelcomesYou buttonsound writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags] - special Special_BattleTowerAction + special BattleTowerAction if_not_equal $0, Script_Menu_ChallengeExplanationCancel jump Script_BattleTowerIntroductionYesNo Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc writetext Text_WantToGoIntoABattleRoom writebyte TRUE - special Special_Menu_ChallengeExplanationCancel + special Menu_ChallengeExplanationCancel if_equal 1, Script_ChooseChallenge if_equal 2, Script_BattleTowerExplanation jump Script_BattleTowerHopeToServeYouAgain Script_ChooseChallenge: ; 0x9e40f writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM - special Special_BattleTowerAction - special Special_CheckForBattleTowerRules + special BattleTowerAction + special CheckForBattleTowerRules if_not_equal FALSE, Script_WaitButton writetext Text_SaveBeforeEnteringBattleRoom yesorno iffalse Script_Menu_ChallengeExplanationCancel setscene 0 - special Special_TryQuickSave + special TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel setscene 1 writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags] - special Special_BattleTowerAction - special Special_BattleTowerRoomMenu + special BattleTowerAction + special BattleTowerRoomMenu if_equal $a, Script_Menu_ChallengeExplanationCancel if_not_equal $0, Script_MobileError writebyte BATTLETOWERACTION_11 - special Special_BattleTowerAction + special BattleTowerAction writetext Text_RightThisWayToYourBattleRoom waitbutton closetext writebyte BATTLETOWERACTION_CHOOSEREWARD - special Special_BattleTowerAction + special BattleTowerAction jump Script_WalkToBattleTowerElevator Script_ResumeBattleTowerChallenge: closetext writebyte BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group - special Special_BattleTowerAction + special BattleTowerAction Script_WalkToBattleTowerElevator: musicfadeout MUSIC_NONE, 8 setmapscene BATTLE_TOWER_BATTLE_ROOM, 0 @@ -111,7 +111,7 @@ Script_WalkToBattleTowerElevator: follow BATTLETOWER1F_RECEPTIONIST, PLAYER applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator writebyte BATTLETOWERACTION_0A - special Special_BattleTowerAction + special BattleTowerAction warpsound disappear BATTLETOWER1F_RECEPTIONIST stopfollow @@ -121,15 +121,15 @@ Script_WalkToBattleTowerElevator: Script_GivePlayerHisPrize: ; 0x9e47a writebyte BATTLETOWERACTION_1C - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_GIVEREWARD - special Special_BattleTowerAction + special BattleTowerAction if_equal POTION, Script_YourPackIsStuffedFull itemtotext USE_SCRIPT_VAR, MEM_BUFFER_1 giveitem ITEM_FROM_MEM, 5 writetext Text_PlayerGotFive writebyte BATTLETOWERACTION_1D - special Special_BattleTowerAction + special BattleTowerAction closetext end @@ -147,7 +147,7 @@ Script_BattleTowerExplanation: ; 0x9e4a5 writetext Text_BattleTowerIntroduction_2 Script_BattleTowerSkipExplanation: writebyte BATTLETOWERACTION_SET_EXPLANATION_READ - special Special_BattleTowerAction + special BattleTowerAction jump Script_Menu_ChallengeExplanationCancel Script_BattleTowerHopeToServeYouAgain: @@ -157,7 +157,7 @@ Script_BattleTowerHopeToServeYouAgain: end UnreferencedScript_0x9e4b6: - special Special_BattleTowerMobileError + special BattleTowerMobileError closetext end @@ -170,11 +170,11 @@ UnreferencedScript_0x9e4be: writetext Text_SaveBeforeEnteringBattleRoom yesorno iffalse Script_Menu_ChallengeExplanationCancel - special Special_TryQuickSave + special TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel writebyte BATTLETOWERACTION_SET_EXPLANATION_READ - special Special_BattleTowerAction - special Special_Function1700ba + special BattleTowerAction + special Function1700ba if_equal $a, Script_Menu_ChallengeExplanationCancel if_not_equal $0, Script_MobileError writetext Text_ReceivedAListOfLeadersOnTheHonorRoll @@ -187,15 +187,15 @@ UnreferencedScript_0x9e4be: UnreferencedScript_0x9e4ea: writebyte BATTLETOWERACTION_LEVEL_CHECK - special Special_BattleTowerAction + special BattleTowerAction if_not_equal $0, Script_APkmnLevelExceeds writebyte BATTLETOWERACTION_UBERS_CHECK - special Special_BattleTowerAction + special BattleTowerAction if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70 - special Special_CheckForBattleTowerRules + special CheckForBattleTowerRules if_not_equal FALSE, Script_WaitButton writebyte BATTLETOWERACTION_05 - special Special_BattleTowerAction + special BattleTowerAction if_equal $0, .zero writetext Text_CantBeRegistered_PreviousRecordDeleted jump continue @@ -209,13 +209,13 @@ continue: yesorno iffalse Script_Menu_ChallengeExplanationCancel setscene 0 - special Special_TryQuickSave + special TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel setscene 1 writebyte BATTLETOWERACTION_06 - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_12 - special Special_BattleTowerAction + special BattleTowerAction writetext Text_RightThisWayToYourBattleRoom waitbutton jump Script_ResumeBattleTowerChallenge @@ -236,7 +236,7 @@ Script_MayNotEnterABattleRoomUnderL70: ; 0x9e549 jump Script_Menu_ChallengeExplanationCancel Script_MobileError: - special Special_BattleTowerMobileError + special BattleTowerMobileError closetext end diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index dd8e08e0f..849eac967 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -23,7 +23,7 @@ Script_BattleRoom: ; 0x9f421 ; beat all 7 opponents in a row Script_BattleRoomLoop: ; 0x9f425 writebyte BATTLETOWERBATTLEROOM_YOUNGSTER - special Special_LoadOpponentTrainerAndPokemonWithOTSprite + special LoadOpponentTrainerAndPokemonWithOTSprite appear BATTLETOWERBATTLEROOM_YOUNGSTER warpsound waitsfx @@ -32,8 +32,8 @@ Script_BattleRoomLoop: ; 0x9f425 battletowertext BATTLETOWERTEXT_INTRO buttonsound closetext - special Special_BattleTowerBattle ; calls predef startbattle - special Special_FadeOutPalettes + special BattleTowerBattle ; calls predef startbattle + special FadeOutPalettes reloadmap if_not_equal $0, Script_FailedBattleTowerChallenge copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64 @@ -48,10 +48,10 @@ Script_BattleRoomLoop: ; 0x9f425 waitbutton closetext playmusic MUSIC_HEAL - special Special_FadeOutPalettes - special Special_LoadMapPalettes + special FadeOutPalettes + special LoadMapPalettes pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic opentext writetext Text_NextUpOpponentNo @@ -68,35 +68,35 @@ Script_DontBattleNextOpponent: ; 0x9f483 yesorno iffalse Script_DontSaveAndEndTheSession writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_SAVEOPTIONS ; choose reward - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_SAVE_AND_QUIT ; quicksave - special Special_BattleTowerAction + special BattleTowerAction playsound SFX_SAVE waitsfx - special Special_FadeOutPalettes + special FadeOutPalettes special Reset Script_DontSaveAndEndTheSession: ; 0x9f4a3 writetext Text_CancelYourBattleRoomChallenge yesorno iffalse Script_ContinueAndBattleNextOpponent writebyte BATTLETOWERACTION_CHALLENGECANCELED - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_06 - special Special_BattleTowerAction + special BattleTowerAction closetext - special Special_FadeOutPalettes + special FadeOutPalettes warpfacing UP, BATTLE_TOWER_1F, 7, 7 opentext jump Script_BattleTowerHopeToServeYouAgain Script_FailedBattleTowerChallenge: pause 60 - special Special_BattleTowerFade + special BattleTowerFade warpfacing UP, BATTLE_TOWER_1F, 7, 7 writebyte BATTLETOWERACTION_CHALLENGECANCELED - special Special_BattleTowerAction + special BattleTowerAction opentext writetext Text_ThanksForVisiting waitbutton @@ -105,7 +105,7 @@ Script_FailedBattleTowerChallenge: Script_BeatenAllTrainers: ; 0x9f4d9 pause 60 - special Special_BattleTowerFade + special BattleTowerFade warpfacing UP, BATTLE_TOWER_1F, 7, 7 Script_BeatenAllTrainers2: opentext @@ -114,7 +114,7 @@ Script_BeatenAllTrainers2: UnreferencedScript_0x9f4eb: writebyte BATTLETOWERACTION_CHALLENGECANCELED - special Special_BattleTowerAction + special BattleTowerAction opentext writetext Text_TooMuchTimeElapsedNoRegister waitbutton @@ -123,9 +123,9 @@ UnreferencedScript_0x9f4eb: UnreferencedScript_0x9f4f7: writebyte BATTLETOWERACTION_CHALLENGECANCELED - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_06 - special Special_BattleTowerAction + special BattleTowerAction opentext writetext Text_ThanksForVisiting writetext Text_WeHopeToServeYouAgain diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index f9f32dfae..a10ad1552 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -22,7 +22,7 @@ BattleTowerElevator_MapScripts: applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn writebyte BATTLETOWERACTION_0A - special Special_BattleTowerAction + special BattleTowerAction playsound SFX_ELEVATOR earthquake 60 waitsfx diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 9c64ff04b..a13156484 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -37,7 +37,7 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo if_not_equal LICKITUNG, .WrongPokemon scall .CorrectPokemon @@ -51,7 +51,7 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo if_not_equal ODDISH, .WrongPokemon scall .CorrectPokemon @@ -65,7 +65,7 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo if_not_equal STARYU, .WrongPokemon scall .CorrectPokemon @@ -81,7 +81,7 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo if_not_equal GROWLITHE, .WrongPokemon scall .CorrectPokemon @@ -95,7 +95,7 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo if_not_equal VULPIX, .WrongPokemon scall .CorrectPokemon @@ -109,7 +109,7 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo if_not_equal PICHU, .WrongPokemon scall .CorrectPokemon diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 33510e154..3c4889c0c 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -26,21 +26,21 @@ DaisyScript: iffalse .Refused writetext DaisyWhichMonText waitbutton - special Special_DaisysGrooming + special DaisysGrooming if_equal $0, .Refused if_equal $1, .CantGroomEgg setflag ENGINE_DAISYS_GROOMING writetext DaisyAlrightText waitbutton closetext - special Special_FadeOutPalettes + special FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic opentext writetext GroomedMonLooksContentText - special Special_PlayCurMonCry + special PlayCurMonCry buttonsound writetext DaisyAllDoneText waitbutton diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 71b3c1caa..25f517e00 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -51,7 +51,7 @@ BurnedTower1F_MapScripts: BurnedTowerRivalBattleScript: showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 spriteface BURNEDTOWER1F_SILVER, RIGHT pause 15 @@ -100,7 +100,7 @@ BurnedTowerRivalBattleScript: closetext setscene 2 setevent EVENT_RIVAL_BURNED_TOWER - special Special_FadeOutMusic + special FadeOutMusic pause 15 earthquake 50 showemote EMOTE_SHOCK, PLAYER, 15 diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 3ad1d60f4..484c6f1cd 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -83,7 +83,7 @@ ReleaseTheBeasts: special RestartMapMusic setscene 1 setevent EVENT_RELEASED_THE_BEASTS - special Special_InitRoamMons + special InitRoamMons setmapscene ECRUTEAK_GYM, 1 setmapscene CIANWOOD_CITY, 1 clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 188f977bb..87d380a6a 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -24,7 +24,7 @@ CeladonDeptStore6FVendingMachine: opentext writetext CeladonVendingText .Start: - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight loadmenuheader .MenuHeader verticalmenu closewindow diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 5d3382f53..090ce4571 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -115,20 +115,20 @@ CeladonGameCornerLuckySlotMachineScript: if_equal 0, CeladonGameCornerSlotMachineScript refreshscreen writebyte FALSE - special Special_SlotMachine + special SlotMachine closetext end CeladonGameCornerSlotMachineScript: refreshscreen writebyte TRUE - special Special_SlotMachine + special SlotMachine closetext end CeladonGameCornerCardFlipScript: refreshscreen - special Special_CardFlip + special CardFlip closetext end @@ -139,7 +139,7 @@ MapCeladonGameCornerSignpost9Script: opentext writetext UnknownText_0x72567 waitbutton - special Special_CardFlip + special CardFlip closetext end diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index b8d3ce032..a4f2d85ee 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -24,7 +24,7 @@ CeladonGameCornerPrizeRoomTMVendor: iffalse CeladonPrizeRoom_NoCoinCase writetext CeladonPrizeRoom_AskWhichPrizeText CeladonPrizeRoom_tmcounterloop: - special Special_DisplayCoinCaseBalance + special DisplayCoinCaseBalance loadmenuheader CeladonPrizeRoom_TMMenuHeader verticalmenu closewindow @@ -125,7 +125,7 @@ CeladonGameCornerPrizeRoomPokemonVendor: iffalse CeladonPrizeRoom_NoCoinCase .loop writetext CeladonPrizeRoom_AskWhichPrizeText - special Special_DisplayCoinCaseBalance + special DisplayCoinCaseBalance loadmenuheader .MenuHeader verticalmenu closewindow @@ -147,7 +147,7 @@ CeladonGameCornerPrizeRoomPokemonVendor: writetext CeladonPrizeRoom_HereYouGoText waitbutton writebyte PIKACHU - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke PIKACHU, 25 takecoins 2222 jump .loop @@ -165,7 +165,7 @@ CeladonGameCornerPrizeRoomPokemonVendor: writetext CeladonPrizeRoom_HereYouGoText waitbutton writebyte PORYGON - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke PORYGON, 15 takecoins 5555 jump .loop @@ -183,7 +183,7 @@ CeladonGameCornerPrizeRoomPokemonVendor: writetext CeladonPrizeRoom_HereYouGoText waitbutton writebyte LARVITAR - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke LARVITAR, 40 takecoins 8888 jump .loop diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index bb6bb2f3f..418948dc8 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -28,7 +28,7 @@ UnknownScript_0x7167e: waitsfx writetext UnknownText_0x71760 buttonsound - special Special_Diploma + special Diploma writetext UnknownText_0x71763 waitbutton closetext @@ -49,7 +49,7 @@ UnknownScript_0x716a4: writetext UnknownText_0x717d8 yesorno iffalse UnknownScript_0x716b0 - special Special_PrintDiploma + special PrintDiploma closetext end diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index cfe31f624..06bf79f64 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -30,9 +30,9 @@ CeladonEusine: writetext CeladonEusineText1 buttonsound writebyte SUICUNE - special Special_MonCheck + special MonCheck iffalse .NoSuicune - special Special_BeastsCheck + special BeastsCheck iftrue .HoOh writetext NoBeastsText waitbutton diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 2efd5f743..914db5053 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -14,7 +14,7 @@ NurseScript_0x18820f: jumpstd pokecenternurse SuperNerdScript_0x188212: - special Special_Mobile_DummyReturnFalse + special Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x188221 diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index ac3db17b6..eaa21864b 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -105,7 +105,7 @@ CherrygroveSilverSceneSouth: CherrygroveSilverSceneNorth: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 appear CHERRYGROVECITY_SILVER applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalWalksToYou diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 82be11a81..82e4e459d 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -76,7 +76,7 @@ CianwoodCitySuicuneAndEusine: applymovement CIANWOODCITY_EUSINE, MovementData_0x1a00ec disappear CIANWOODCITY_EUSINE pause 20 - special Special_FadeOutMusic + special FadeOutMusic playmapmusic pause 10 .Done: diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm index bbf2eb3d9..52645b5d8 100644 --- a/maps/CianwoodPhotoStudio.asm +++ b/maps/CianwoodPhotoStudio.asm @@ -16,7 +16,7 @@ FishingGuruScript_0x9e0e0: iffalse UnknownScript_0x9e0f3 writetext UnknownText_0x9e142 waitbutton - special Special_PhotoStudio + special PhotoStudio waitbutton closetext end diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 024729400..5c2450fc5 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -25,7 +25,7 @@ Colosseum_MapScripts: end .SetWhichChris: - special Special_CableClubCheckWhichChris + special CableClubCheckWhichChris iffalse .Chris2 disappear COLOSSEUM_CHRIS2 appear COLOSSEUM_CHRIS1 @@ -46,7 +46,7 @@ Colosseum_MapScripts: end MapColosseumSignpost1Script: - special Special_Colosseum + special Colosseum newloadmap MAPSETUP_LINKRETURN end diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 74f6af110..0fda95f11 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -46,7 +46,7 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .Default_Merge_1: - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX checkevent EVENT_RETURNED_MACHINE_PART iftrue .TalkAboutLostItem opentext @@ -70,7 +70,7 @@ Copycat: .Default_Merge_3a: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext CopycatText_QuickMimicking waitbutton @@ -99,7 +99,7 @@ Copycat: .Default_Merge_3b: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext CopycatText_Worried waitbutton @@ -142,7 +142,7 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .GotPass_Merge_1: - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext checkflag ENGINE_PLAYER_IS_FEMALE iftrue .GotPass_Female_2 @@ -164,7 +164,7 @@ Copycat: .GotPass_Merge_3: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext CopycatText_ItsAScream waitbutton diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 93461c3a8..c3499990b 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -32,7 +32,7 @@ DayCareManScript_Inside: closetext checkcode VAR_PARTYCOUNT if_equal PARTY_LENGTH, .PartyFull - special Special_GiveOddEgg + special GiveOddEgg opentext writetext DayCareText_GotOddEgg playsound SFX_KEY_ITEM @@ -51,7 +51,7 @@ DayCareManScript_Inside: end .AlreadyHaveOddEgg: - special Special_DayCareMan + special DayCareMan waitbutton closetext end @@ -61,7 +61,7 @@ DayCareLadyScript: opentext checkflag ENGINE_DAY_CARE_MAN_HAS_EGG iftrue .HusbandWasLookingForYou - special Special_DayCareLady + special DayCareLady waitbutton closetext end diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 1a524cb3a..90758584a 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -134,7 +134,7 @@ DragonShrine_MapScripts: writetext DragonShrineClairYouPassedText waitbutton closetext - special Special_FadeOutMusic + special FadeOutMusic applymovement DRAGONSHRINE_CLAIR, DragonShrineClairBigStepLeftMovement opentext writetext DragonShrineClairThatCantBeText @@ -217,7 +217,7 @@ DragonShrineElder1Script: waitsfx givepoke DRATINI, 15 checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG - special Special_Dratini + special Dratini setevent EVENT_GOT_DRATINI setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7 writetext DragonShrineSymbolicDragonText diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 9572a706f..c0c871c99 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -76,7 +76,7 @@ DragonsDenB1F_ClairScene: closetext .FinishClair: applymovement DRAGONSDENB1F_CLAIR, MovementDragonsDen_ClairWalksAway - special Special_FadeOutMusic + special FadeOutMusic pause 30 special RestartMapMusic disappear DRAGONSDENB1F_CLAIR diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 30a7f5f35..8304cc907 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -91,7 +91,7 @@ EcruteakGymClosed: follow PLAYER, ECRUTEAKGYM_GRAMPS applymovement PLAYER, MovementData_0x99e5f stopfollow - special Special_FadeOutPalettes + special FadeOutPalettes playsound SFX_ENTER_DOOR waitsfx warp ECRUTEAK_CITY, 6, 27 diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index 409181ddc..8fd1436dd 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -61,7 +61,7 @@ EcruteakPokecenter1FNurseScript: jumpstd pokecenternurse EcruteakPokecenter1FPokefanMScript: - special Special_Mobile_DummyReturnFalse + special Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer EcruteakPokecenter1FPokefanMText diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 7002bd707..a0ab0c442 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -108,10 +108,10 @@ ElmCheckEverstone: checkevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE iffalse ElmCheckTogepiEgg writebyte TOGEPI - special Special_FindPartyMonThatSpeciesYourTrainerID + special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writebyte TOGETIC - special Special_FindPartyMonThatSpeciesYourTrainerID + special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writetext UnknownText_0x79a40 waitbutton @@ -120,10 +120,10 @@ ElmCheckEverstone: ElmEggHatchedScript: writebyte TOGEPI - special Special_FindPartyMonThatSpeciesYourTrainerID + special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writebyte TOGETIC - special Special_FindPartyMonThatSpeciesYourTrainerID + special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript jump ElmCheckGotEggAgain @@ -308,11 +308,11 @@ ElmsLabHealingMachine: end ElmsLabHealingMachine_HealParty: - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings special HealParty playmusic MUSIC_NONE writebyte HEALMACHINE_ELMS_LAB - special Special_HealMachineAnim + special HealMachineAnim pause 30 special RestartMapMusic closetext @@ -556,7 +556,7 @@ CopScript: opentext writetext ElmsLabOfficerText1 buttonsound - special Special_NameRival + special NameRival writetext ElmsLabOfficerText2 waitbutton closetext diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 6dfb2350d..9da566ee7 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -68,7 +68,7 @@ SailorScript_0x75160: closetext scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY setmapscene VERMILION_PORT, 1 @@ -81,7 +81,7 @@ SailorScript_0x75160: closetext scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY setmapscene OLIVINE_PORT, 1 diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index c6997603c..d53c76d5c 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -48,7 +48,7 @@ SSAquaGranddaughterBefore: writetext SSAquaGranddaughterHasToFindGrandpaText waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2 applymovement PLAYER, MovementData_0x76004 @@ -56,7 +56,7 @@ SSAquaGranddaughterBefore: appear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1 spriteface PLAYER, UP spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP - special Special_FadeInQuickly + special FadeInQuickly spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN showemote EMOTE_SHOCK, FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, 15 applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, MovementData_0x7600c diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index c979ec074..76496baac 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -49,7 +49,7 @@ TrainerGuitaristClyde: .Script: end_if_just_battled - special Special_Mobile_DummyReturnFalse + special Mobile_DummyReturnFalse iftrue .mobile opentext writetext UnknownText_0x75d65 @@ -69,14 +69,14 @@ FastShipBed: writetext FastShipBedText1 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings special HealParty playmusic MUSIC_HEAL pause 60 special RestartMapMusic - special Special_FadeInQuickly + special FadeInQuickly opentext writetext FastShipBedText2 waitbutton diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index a691d1d50..90ffab8c8 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -35,7 +35,7 @@ FuchsiaGymJanineScript: variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext Text_ReceivedSoulBadge playsound SFX_GET_BADGE @@ -65,7 +65,7 @@ LassAliceScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_1, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX .AliceUnmasked: faceplayer opentext @@ -99,7 +99,7 @@ LassLindaScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_2, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX .LindaUnmasked: faceplayer opentext @@ -133,7 +133,7 @@ PicnickerCindyScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_3, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX .CindyUnmasked: faceplayer opentext @@ -167,7 +167,7 @@ CamperBarryScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_4, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX .BarryUnmasked: faceplayer opentext diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index 9bc8775a6..c74e93c52 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -33,7 +33,7 @@ JanineImpersonatorScript_0x196462: applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext UnknownText_0x19654e waitbutton @@ -41,7 +41,7 @@ JanineImpersonatorScript_0x196462: applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX end MovementData_0x196486: diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 85b4308f0..5eda492f3 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -58,7 +58,7 @@ MoveTutorScript: writetext UnknownText_0x199042 yesorno iffalse .Refused - special Special_DisplayCoinCaseBalance + special DisplayCoinCaseBalance writetext UnknownText_0x199090 yesorno iffalse .Refused2 @@ -76,21 +76,21 @@ MoveTutorScript: .Flamethrower: writebyte MOVETUTOR_FLAMETHROWER writetext UnknownText_0x1991cf - special Special_MoveTutor + special MoveTutor if_equal FALSE, .TeachMove jump .Incompatible .Thunderbolt: writebyte MOVETUTOR_THUNDERBOLT writetext UnknownText_0x1991cf - special Special_MoveTutor + special MoveTutor if_equal FALSE, .TeachMove jump .Incompatible .IceBeam: writebyte MOVETUTOR_ICE_BEAM writetext UnknownText_0x1991cf - special Special_MoveTutor + special MoveTutor if_equal FALSE, .TeachMove jump .Incompatible @@ -126,7 +126,7 @@ MoveTutorScript: takecoins 4000 waitsfx playsound SFX_TRANSACTION - special Special_DisplayCoinCaseBalance + special DisplayCoinCaseBalance writetext UnknownText_0x19918b waitbutton closetext diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index dbea8e55c..73fef5157 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -65,7 +65,7 @@ ReceptionistScript_0x560ce: if_not_equal SUNDAY, .EventIsOver checkflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN iftrue .EventIsOver - special Special_GetFirstPokemonHappiness + special GetFirstPokemonHappiness writetext UnknownText_0x56143 buttonsound if_greater_than 150 - 1, .VeryHappy @@ -106,12 +106,12 @@ ReceptionistScript_0x560ce: Carrie: faceplayer opentext - special Special_GameboyCheck + special GameboyCheck if_not_equal GBCHECK_CGB, .NotGBC ; This is a dummy check from Gold/Silver writetext UnknownText_0x56241 waitbutton closetext - special Special_UnlockMysteryGift + special UnlockMysteryGift end .NotGBC: diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 49cd09ebd..e9f9447ce 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -13,7 +13,7 @@ GoldenrodVendingMachine: opentext writetext GoldenrodVendingText .Start: - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight loadmenuheader .MenuHeader verticalmenu closewindow diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index cc04df7fb..30ba8c64a 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -60,7 +60,7 @@ GoldenrodGmeCornerTMVendorScript: iffalse GoldenrodGameCornerPrizeVendor_NoCoinCaseScript writetext GoldenrodGameCornerPrizeVendorWhichPrizeText GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36 - special Special_DisplayCoinCaseBalance + special DisplayCoinCaseBalance loadmenuheader GoldenrodGameCornerTMVendorMenuHeader verticalmenu closewindow @@ -161,7 +161,7 @@ GoldenrodGameCornerPrizeMonVendorScript: iffalse GoldenrodGameCornerPrizeVendor_NoCoinCaseScript .loop writetext GoldenrodGameCornerPrizeVendorWhichPrizeText - special Special_DisplayCoinCaseBalance + special DisplayCoinCaseBalance loadmenuheader .MenuHeader verticalmenu closewindow @@ -183,7 +183,7 @@ GoldenrodGameCornerPrizeMonVendorScript: writetext GoldenrodGameCornerPrizeVendorHereYouGoText waitbutton writebyte ABRA - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke ABRA, 5 takecoins 100 jump .loop @@ -201,7 +201,7 @@ GoldenrodGameCornerPrizeMonVendorScript: writetext GoldenrodGameCornerPrizeVendorHereYouGoText waitbutton writebyte CUBONE - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke CUBONE, 15 takecoins 800 jump .loop @@ -219,7 +219,7 @@ GoldenrodGameCornerPrizeMonVendorScript: writetext GoldenrodGameCornerPrizeVendorHereYouGoText waitbutton writebyte WOBBUFFET - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke WOBBUFFET, 15 takecoins 1500 jump .loop @@ -297,20 +297,20 @@ GoldenrodGameCornerSlotsMachineScript: if_equal 0, GoldenrodGameCornerLuckySlotsMachineScript refreshscreen writebyte FALSE - special Special_SlotMachine + special SlotMachine closetext end GoldenrodGameCornerLuckySlotsMachineScript: refreshscreen writebyte TRUE - special Special_SlotMachine + special SlotMachine closetext end GoldenrodGameCornerCardFlipMachineScript: refreshscreen - special Special_CardFlip + special CardFlip closetext end diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 4fa8506dc..da8d67668 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -13,7 +13,7 @@ GoldenrodHappinessRater_MapScripts: TeacherScript_0x54953: faceplayer opentext - special Special_GetFirstPokemonHappiness + special GetFirstPokemonHappiness writetext UnknownText_0x549a3 buttonsound if_greater_than 250 - 1, UnknownScript_0x54973 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index c0f749413..1fd37876a 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -35,7 +35,7 @@ OfficerScript_0x550ec: applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146 applymovement PLAYER, MovementData_0x5514f writebyte FALSE - special Special_MagnetTrain + special MagnetTrain warpcheck newloadmap MAPSETUP_TRAIN applymovement PLAYER, .MovementBoardTheTrain diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index d90aed911..ebee5d6a5 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -11,7 +11,7 @@ GoldenrodNameRater_MapScripts: GoldenrodNameRater: faceplayer opentext - special Special_NameRater + special NameRater waitbutton closetext end diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index 9402f8743..bb0a19be3 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -17,7 +17,7 @@ NurseScript_0x60f91: GoldenrodPokecenter1F_GSBallSceneLeft: writebyte BATTLETOWERACTION_CHECKMOBILEEVENT - special Special_BattleTowerAction + special BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball end @@ -49,7 +49,7 @@ GoldenrodPokecenter1F_GSBallSceneLeft: GoldenrodPokecenter1F_GSBallSceneRight: writebyte BATTLETOWERACTION_CHECKMOBILEEVENT - special Special_BattleTowerAction + special BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball end diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index 72ace6fa3..b856c61c4 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -192,7 +192,7 @@ OlderHaircutBrotherScript: .DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT iftrue .AlreadyGotHaircut - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight writetext UnknownText_0x7c5f9 yesorno iffalse .Refused @@ -200,7 +200,7 @@ OlderHaircutBrotherScript: if_equal HAVE_LESS, .NotEnoughMoney writetext UnknownText_0x7c69a buttonsound - special Special_YoungerHaircutBrother + special YoungerHaircutBrother if_equal $0, .Refused if_equal $1, .Refused setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT @@ -228,14 +228,14 @@ OlderHaircutBrotherScript: .then takemoney YOUR_MONEY, 500 - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight writetext UnknownText_0x7c6b8 waitbutton closetext - special Special_FadeOutPalettes + special FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic opentext writetext UnknownText_0x7c6d8 @@ -275,7 +275,7 @@ YoungerHaircutBrotherScript: .DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT iftrue .AlreadyGotHaircut - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight writetext UnknownText_0x7c75c yesorno iffalse .Refused @@ -283,7 +283,7 @@ YoungerHaircutBrotherScript: if_equal HAVE_LESS, .NotEnoughMoney writetext UnknownText_0x7c7f1 buttonsound - special Special_OlderHaircutBrother + special OlderHaircutBrother if_equal $0, .Refused if_equal $1, .Refused setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT @@ -311,14 +311,14 @@ YoungerHaircutBrotherScript: .then takemoney YOUR_MONEY, 300 - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight writetext UnknownText_0x7c80e waitbutton closetext - special Special_FadeOutPalettes + special FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic opentext writetext UnknownText_0x7c82a @@ -349,21 +349,21 @@ YoungerHaircutBrotherScript: UnknownScript_0x7c2bb: writetext HaircutBrosText_SlightlyHappier - special Special_PlayCurMonCry + special PlayCurMonCry waitbutton closetext end UnknownScript_0x7c2c4: writetext HaircutBrosText_Happier - special Special_PlayCurMonCry + special PlayCurMonCry waitbutton closetext end UnknownScript_0x7c2cd: writetext HaircutBrosText_MuchHappier - special Special_PlayCurMonCry + special PlayCurMonCry waitbutton closetext end diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index 561ee9df0..e5bbf74cb 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -121,7 +121,7 @@ TeacherScript_0x7ca7d: UndergroundSilverScene1: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 playsound SFX_EXIT_BUILDING appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER @@ -140,7 +140,7 @@ UndergroundSilverScene1: UndergroundSilverScene2: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 playsound SFX_EXIT_BUILDING appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 3f5f6ee10..2a7e034d5 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -31,7 +31,7 @@ HallOfFame_MapScripts: setscene 1 pause 15 writebyte HEALMACHINE_HALL_OF_FAME - special Special_HealMachineAnim + special HealMachineAnim setevent EVENT_BEAT_ELITE_FOUR setevent EVENT_TELEPORT_GUY setevent EVENT_RIVAL_SPROUT_TOWER diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index e5eff3a32..16fd0bbf0 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -459,18 +459,18 @@ MapIlexForestSignpost4Script: closetext pause 20 showemote EMOTE_SHOCK, PLAYER, 20 - special Special_FadeOutMusic + special FadeOutMusic applymovement PLAYER, MovementData_0x6ef58 pause 30 spriteface PLAYER, DOWN pause 20 clearflag ENGINE_FOREST_IS_RESTLESS - special Special_CelebiShrineEvent + special CelebiShrineEvent loadwildmon CELEBI, 30 startbattle reloadmapafterbattle pause 20 - special Special_CheckCaughtCelebi + special CheckCaughtCelebi iffalse .DidntCatchCelebi appear ILEXFOREST_KURT applymovement ILEXFOREST_KURT, MovementData_0x6ef4e diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 17a4d0663..feb517914 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -58,7 +58,7 @@ PlateauRivalBattle1: appear INDIGOPLATEAUPOKECENTER1F_SILVER spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement1 playmusic MUSIC_RIVAL_ENCOUNTER @@ -79,7 +79,7 @@ PlateauRivalBattle2: appear INDIGOPLATEAUPOKECENTER1F_SILVER spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement2 playmusic MUSIC_RIVAL_ENCOUNTER @@ -158,7 +158,7 @@ TeleportGuyScript: waitbutton closetext playsound SFX_WARP_TO - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx warp NEW_BARK_TOWN, 13, 6 end diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 7e7399aa6..c8894a715 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -44,7 +44,7 @@ KurtScript_0x18e178: writetext UnknownText_0x18e473 waitbutton closetext - special Special_FadeOutMusic + special FadeOutMusic setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET checkcode VAR_FACING if_equal UP, .RunAround @@ -131,7 +131,7 @@ KurtScript_0x18e178: writetext UnknownText_0x18e736 buttonsound setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 - special Special_SelectApricornForKurt + special SelectApricornForKurt if_equal FALSE, .Cancel if_equal BLU_APRICORN, .Blu if_equal YLW_APRICORN, .Ylw @@ -291,7 +291,7 @@ KurtScript_0x18e178: setevent EVENT_FOREST_IS_RESTLESS clearevent EVENT_CAN_GIVE_GS_BALL_TO_KURT clearevent EVENT_GAVE_GS_BALL_TO_KURT - special Special_FadeOutMusic + special FadeOutMusic pause 20 showemote EMOTE_SHOCK, KURTSHOUSE_KURT1, 30 checkcode VAR_FACING diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index f8e525971..9ffc9e05c 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -141,7 +141,7 @@ MapLakeOfRageSignpost1Script: UnknownScript_0x700b8: buttonsound - special Special_MagikarpHouseSign + special MagikarpHouseSign closetext end diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index a197dd0e8..b921d38b0 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -40,11 +40,11 @@ UnknownScript_0x19a6d7: UnknownScript_0x19a6e0: writebyte MAGIKARP - special Special_FindPartyMonThatSpecies + special FindPartyMonThatSpecies iffalse UnknownScript_0x19a6d7 writetext UnknownText_0x19a93e waitbutton - special Special_CheckMagikarpLength + special CheckMagikarpLength if_equal MAGIKARPLENGTH_NOT_MAGIKARP, UnknownScript_0x19a71c if_equal MAGIKARPLENGTH_REFUSED, UnknownScript_0x19a722 if_equal MAGIKARPLENGTH_TOO_SHORT, UnknownScript_0x19a716 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index a3336251b..a040b0b49 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -44,12 +44,12 @@ LancesRoom_MapScripts: end Script_ApproachLanceFromLeft: - special Special_FadeOutMusic + special FadeOutMusic applymovement PLAYER, MovementData_ApproachLanceFromLeft jump LanceScript_0x180e7b Script_ApproachLanceFromRight: - special Special_FadeOutMusic + special FadeOutMusic applymovement PLAYER, MovementData_ApproachLanceFromRight LanceScript_0x180e7b: spriteface LANCESROOM_LANCE, LEFT @@ -125,7 +125,7 @@ LanceScript_0x180e7b: pause 30 closetext applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRunsBackAndForth - special Special_FadeOutPalettes + special FadeOutPalettes pause 15 warpfacing UP, HALL_OF_FAME, 4, 13 end diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 544c51d5b..ecb4fb5c0 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -15,7 +15,7 @@ LavenderNameRater_MapScripts: LavenderNameRater: faceplayer opentext - special Special_NameRater + special NameRater waitbutton closetext end diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index d53aabce0..959f6970e 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -53,7 +53,7 @@ UnknownScript_0x190039: UnknownScript_0x190040: opentext writetext UnknownText_0x1900b0 - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight yesorno iffalse UnknownScript_0x190072 checkmoney YOUR_MONEY, 300 @@ -63,7 +63,7 @@ UnknownScript_0x190040: waitsfx playsound SFX_TRANSACTION takemoney YOUR_MONEY, 300 - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight writetext UnknownText_0x19014a waitbutton closetext diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index b3ec5a564..456b30446 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -18,7 +18,7 @@ ManiaScript: writetext ManiaText_AskLookAfterShuckle yesorno iffalse .refusetotakeshuckie - special Special_GiveShuckle + special GiveShuckle iffalse .partyfull writetext ManiaText_TakeCareOfShuckle buttonsound @@ -54,7 +54,7 @@ ManiaScript: writetext ManiaText_CanIHaveMyMonBack yesorno iffalse .refused - special Special_ReturnShuckle + special ReturnShuckle if_equal SHUCKIE_WRONG_MON, .wrong if_equal SHUCKIE_REFUSED, .refused if_equal SHUCKIE_HAPPY, .superhappy diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index d65ae1006..391d05bf4 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -21,9 +21,9 @@ MobileBattleRoom_MapScripts: MapMobileBattleRoomSignpost0Script: refreshscreen - special Special_Function1037c2 + special Function1037c2 if_equal $1, .one - special Special_Function1037eb + special Function1037eb iffalse .false if_equal $1, .one_ if_equal $2, .two_ @@ -33,24 +33,24 @@ MapMobileBattleRoomSignpost0Script: writetext MobileBattleRoom_HealText pause 20 closetext - special Special_FadeOutPalettes + special FadeOutPalettes playmusic MUSIC_HEAL - special Special_LoadMapPalettes + special LoadMapPalettes pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic refreshscreen .two_ - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings special HealParty - special Special_Function10383c + special Function10383c iftrue .false .one - special Special_Function10387b + special Function10387b writetext MobileBattleRoom_EstablishingCommsText waitbutton reloadmappart - special Special_Function101225 + special Function101225 .false closetext end diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 53713c9de..1cf28cb5c 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -21,11 +21,11 @@ MobileTradeRoomMobile_MapScripts: MapMobileTradeRoomMobileSignpost0Script: refreshscreen - special Special_Function1037c2 + special Function1037c2 writetext MobileTradeRoomMobile_EstablishingCommsText waitbutton reloadmappart - special Special_Function101231 + special Function101231 closetext end diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 38e5d436d..f9ac4492d 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -20,7 +20,7 @@ MountMoon_MapScripts: .RivalBattle: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 applymovement MOUNTMOON_SILVER, MountMoonSilverMovementBefore playmusic MUSIC_RIVAL_ENCOUNTER diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 0635be308..5baa81fd9 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -11,7 +11,7 @@ MoveDeletersHouse_MapScripts: MoveDeleter: faceplayer opentext - special Special_MoveDeletion + special MoveDeletion waitbutton closetext end diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index be806d610..4e73195b2 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -110,13 +110,13 @@ MrPokemonsHouse_OakScript: writetext MrPokemonsHouse_MrPokemonHealText waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes playmusic MUSIC_HEAL - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings special HealParty pause 60 - special Special_FadeInQuickly + special FadeInQuickly special RestartMapMusic opentext writetext MrPokemonText_ImDependingOnYou diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index d78641c28..cbfb0d1c1 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -33,7 +33,7 @@ Oak: .CheckPokedex: writetext OakLabDexCheckText waitbutton - special Special_ProfOaksPCBoot + special ProfOaksPCBoot writetext OakLabGoodbyeText waitbutton closetext diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index e2fd0c4c7..923ed4bb4 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -27,7 +27,7 @@ OlivineCity_MapScripts: UnknownScript_0x1a8833: spriteface PLAYER, LEFT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 playsound SFX_ENTER_DOOR appear OLIVINECITY_OLIVINE_RIVAL @@ -45,13 +45,13 @@ UnknownScript_0x1a8833: disappear OLIVINECITY_OLIVINE_RIVAL special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX end UnknownScript_0x1a886b: spriteface PLAYER, LEFT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 playsound SFX_ENTER_DOOR appear OLIVINECITY_OLIVINE_RIVAL @@ -69,7 +69,7 @@ UnknownScript_0x1a886b: setscene 1 special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX end OlivineCitySailor1Script: diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index d036dc56f..a54d22916 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -47,9 +47,9 @@ UnknownScript_0x60bab: closetext special RestartMapMusic cry AMPHAROS - special Special_FadeOutPalettes + special FadeOutPalettes pause 10 - special Special_FadeInPalettes + special FadeInPalettes opentext writetext UnknownText_0x60f3d waitbutton @@ -109,7 +109,7 @@ MonsterScript_0x60c3a: iftrue UnknownScript_0x60c51 writetext UnknownText_0x60f03 writebyte AMPHAROS - special Special_PlaySlowCry + special PlaySlowCry buttonsound writetext UnknownText_0x60f19 waitbutton @@ -121,10 +121,10 @@ UnknownScript_0x60c51: cry AMPHAROS waitbutton closetext - special Special_FadeOutPalettes - special Special_FadeInPalettes - special Special_FadeOutPalettes - special Special_FadeInPalettes + special FadeOutPalettes + special FadeInPalettes + special FadeOutPalettes + special FadeInPalettes end OlivineLighthouse6FSuperPotion: diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index ababf8f71..132a0dcc7 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -46,7 +46,7 @@ SailorScript_0x748c0: waitsfx applymovement PLAYER, MovementData_0x74a30 playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x7490a diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index a049ace56..0e5d9a73f 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -48,18 +48,18 @@ UnknownScript_0x7a4f6: clearevent EVENT_PLAYERS_HOUSE_MOM_2 writetext UnknownText_0x7a6bd buttonsound - special Special_SetDayOfWeek + special SetDayOfWeek UnknownScript_0x7a519: writetext UnknownText_0x7a742 yesorno iffalse UnknownScript_0x7a52a - special Special_InitialSetDSTFlag + special InitialSetDSTFlag yesorno iffalse UnknownScript_0x7a519 jump UnknownScript_0x7a531 UnknownScript_0x7a52a: - special Special_InitialClearDSTFlag + special InitialClearDSTFlag yesorno iffalse UnknownScript_0x7a519 UnknownScript_0x7a531: @@ -147,7 +147,7 @@ UnknownScript_0x7a5b5: setevent EVENT_FIRST_TIME_BANKING_WITH_MOM UnknownScript_0x7a5b8: setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST - special Special_BankOfMom + special BankOfMom waitbutton closetext end diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index 72b2989b6..109b541fc 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -18,7 +18,7 @@ PlayersHouse2F_MapScripts: end .InitializeRoom: - special Special_ToggleDecorationsVisibility + special ToggleDecorationsVisibility setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8 checkevent EVENT_INITIALIZED_EVENTS iftrue .SkipInitialization @@ -29,7 +29,7 @@ PlayersHouse2F_MapScripts: return .SetSpawn: - special Special_ToggleMaptileDecorations + special ToggleMaptileDecorations return db 0, 0, 0 ; filler @@ -87,7 +87,7 @@ PlayersHouseBookshelfScript: PlayersHousePCScript: opentext - special Special_PlayersHousePC + special PlayersHousePC iftrue .Warp closetext end diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 89dfe05ba..1aa5e643c 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -11,7 +11,7 @@ PokeSeersHouse_MapScripts: SeerScript: faceplayer opentext - special Special_PokeSeer + special PokeSeer waitbutton closetext end diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index a9a71f8ca..3eea56cc0 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -18,7 +18,7 @@ Pokecenter2F_MapScripts: db 0 .Scene0: - special Special_CheckMysteryGift + special CheckMysteryGift if_equal $0, .Scene0Done clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 @@ -76,28 +76,28 @@ LinkReceptionistScript_Trade: writetext Text_TradeReceptionistIntro yesorno iffalse .Cancel - special Special_Mobile_DummyReturnFalse ; always returns false + special Mobile_DummyReturnFalse ; always returns false iffalse .NoMobile writetext Text_TradeReceptionistMobile - special Special_AskMobileOrCable + special AskMobileOrCable iffalse .Cancel if_equal $1, .Mobile .NoMobile: - special Special_SetBitsForLinkTradeRequest + special SetBitsForLinkTradeRequest writetext Text_PleaseWait - special Special_WaitForLinkedFriend + special WaitForLinkedFriend iffalse .FriendNotReady writetext Text_MustSaveGame yesorno iffalse .DidNotSave - special Special_TryQuickSave + special TryQuickSave iffalse .DidNotSave writetext Text_PleaseWait - special Special_CheckLinkTimeout + special CheckLinkTimeout iffalse .LinkTimedOut copybytetovar wOtherPlayerLinkMode iffalse .LinkedToFirstGen - special Special_CheckBothSelectedSameRoom + special CheckBothSelectedSameRoom iffalse .IncompatibleRooms writetext Text_PleaseComeIn2 waitbutton @@ -107,21 +107,21 @@ LinkReceptionistScript_Trade: end .FriendNotReady: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end .LinkedToFirstGen: - special Special_FailedLinkToPast + special FailedLinkToPast writetext Text_CantLinkToThePast - special Special_CloseLink + special CloseLink closetext end .IncompatibleRooms: writetext Text_IncompatibleRooms - special Special_CloseLink + special CloseLink closetext end @@ -132,7 +132,7 @@ LinkReceptionistScript_Trade: .DidNotSave: writetext Text_PleaseComeAgain .AbortLink: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit .Cancel: closetext end @@ -151,9 +151,9 @@ LinkReceptionistScript_Trade: writetext Text_MustSaveGame yesorno iffalse .Mobile_DidNotSave - special Special_TryQuickSave + special TryQuickSave iffalse .Mobile_DidNotSave - special Special_Function1011f1 + special Function1011f1 writetext Text_PleaseComeIn2 waitbutton closetext @@ -178,28 +178,28 @@ LinkReceptionistScript_Battle: writetext Text_BattleReceptionistIntro yesorno iffalse .Cancel - special Special_Mobile_DummyReturnFalse ; always returns false + special Mobile_DummyReturnFalse ; always returns false iffalse .NoMobile writetext Text_BattleReceptionistMobile - special Special_AskMobileOrCable + special AskMobileOrCable iffalse .Cancel if_equal $1, .Mobile .NoMobile: - special Special_SetBitsForBattleRequest + special SetBitsForBattleRequest writetext Text_PleaseWait - special Special_WaitForLinkedFriend + special WaitForLinkedFriend iffalse .FriendNotReady writetext Text_MustSaveGame yesorno iffalse .DidNotSave - special Special_TryQuickSave + special TryQuickSave iffalse .DidNotSave writetext Text_PleaseWait - special Special_CheckLinkTimeout + special CheckLinkTimeout iffalse .LinkTimedOut copybytetovar wOtherPlayerLinkMode iffalse .LinkedToFirstGen - special Special_CheckBothSelectedSameRoom + special CheckBothSelectedSameRoom iffalse .IncompatibleRooms writetext Text_PleaseComeIn2 waitbutton @@ -209,21 +209,21 @@ LinkReceptionistScript_Battle: end .FriendNotReady: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end .LinkedToFirstGen: - special Special_FailedLinkToPast + special FailedLinkToPast writetext Text_CantLinkToThePast - special Special_CloseLink + special CloseLink closetext end .IncompatibleRooms: writetext Text_IncompatibleRooms - special Special_CloseLink + special CloseLink closetext end @@ -234,7 +234,7 @@ LinkReceptionistScript_Battle: .DidNotSave: writetext Text_PleaseComeAgain .AbortLink: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit .Cancel: closetext end @@ -255,9 +255,9 @@ LinkReceptionistScript_Battle: writetext Text_MustSaveGame yesorno iffalse .Mobile_DidNotSave - special Special_Function103780 + special Function103780 iffalse .Mobile_DidNotSave - special Special_Function1011f1 + special Function1011f1 writetext Text_PleaseComeIn2 waitbutton closetext @@ -271,7 +271,7 @@ LinkReceptionistScript_Battle: end .SelectThreeMons: - special Special_Mobile_SelectThreeMons + special Mobile_SelectThreeMons iffalse .Mobile_DidNotSelect if_equal $1, .Mobile_OK if_equal $2, .Mobile_OK @@ -303,37 +303,37 @@ LinkReceptionistScript_TimeCapsule: iftrue Script_TimeCapsuleClosed checkflag ENGINE_TIME_CAPSULE iftrue Script_TimeCapsuleClosed - special Special_SetBitsForTimeCapsuleRequest + special SetBitsForTimeCapsuleRequest faceplayer opentext writetext Text_TimeCapsuleReceptionistIntro yesorno iffalse .Cancel - special Special_CheckTimeCapsuleCompatibility + special CheckTimeCapsuleCompatibility if_equal $1, .MonTooNew if_equal $2, .MonMoveTooNew if_equal $3, .MonHasMail writetext Text_PleaseWait - special Special_WaitForLinkedFriend + special WaitForLinkedFriend iffalse .FriendNotReady writetext Text_MustSaveGame yesorno iffalse .DidNotSave - special Special_TryQuickSave + special TryQuickSave iffalse .DidNotSave writetext Text_PleaseWait - special Special_CheckLinkTimeout + special CheckLinkTimeout iffalse .LinkTimedOut copybytetovar wOtherPlayerLinkMode iffalse .OK - special Special_CheckBothSelectedSameRoom + special CheckBothSelectedSameRoom writetext Text_IncompatibleRooms - special Special_CloseLink + special CloseLink closetext end .OK: - special Special_EnterTimeCapsule + special EnterTimeCapsule writetext Text_PleaseComeIn2 waitbutton closetext @@ -342,7 +342,7 @@ LinkReceptionistScript_TimeCapsule: end .FriendNotReady: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end @@ -354,7 +354,7 @@ LinkReceptionistScript_TimeCapsule: .DidNotSave: writetext Text_PleaseComeAgain .Cancel: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit closetext end @@ -374,14 +374,14 @@ LinkReceptionistScript_TimeCapsule: end Script_LeftCableTradeCenter: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit scall Script_WalkOutOfLinkTradeRoom setscene 0 setmapscene TRADE_CENTER, 0 end Script_LeftMobileTradeRoom: - special Special_Function101220 + special Function101220 scall Script_WalkOutOfMobileTradeRoom setscene 0 setmapscene MOBILE_TRADE_ROOM_MOBILE, 0 @@ -394,14 +394,14 @@ Script_WalkOutOfMobileTradeRoom: end Script_LeftCableColosseum: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit scall Script_WalkOutOfLinkBattleRoom setscene 0 setmapscene COLOSSEUM, 0 end Script_LeftMobileBattleRoom: - special Special_Function101220 + special Function101220 scall Script_WalkOutOfMobileBattleRoom setscene 0 setmapscene MOBILE_BATTLE_ROOM, 0 @@ -436,7 +436,7 @@ Pokecenter2F_CheckGender: playsound SFX_TINGLE applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_RED << 4) - special Special_SetPlayerPalette + special SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft setflag ENGINE_KRIS_IN_CABLE_CLUB special ReplaceKrisSprite @@ -463,7 +463,7 @@ Script_WalkOutOfLinkTradeRoom: playsound SFX_TINGLE applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_BLUE << 4) - special Special_SetPlayerPalette + special SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2 @@ -485,7 +485,7 @@ Script_WalkOutOfLinkBattleRoom: playsound SFX_TINGLE applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_BLUE << 4) - special Special_SetPlayerPalette + special SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2 @@ -544,7 +544,7 @@ TimeCapsuleScript_CheckPlayerGender: playsound SFX_TINGLE applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_RED << 4) - special Special_SetPlayerPalette + special SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown faceobject PLAYER, POKECENTER2F_TIME_CAPSULE_RECEPTIONIST setflag ENGINE_KRIS_IN_CABLE_CLUB @@ -558,7 +558,7 @@ TimeCapsuleScript_CheckPlayerGender: end Script_LeftTimeCapsule: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit checkflag ENGINE_KRIS_IN_CABLE_CLUB iftrue .Female applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight @@ -573,7 +573,7 @@ Script_LeftTimeCapsule: playsound SFX_TINGLE applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_BLUE << 4) - special Special_SetPlayerPalette + special SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown @@ -585,7 +585,7 @@ Script_LeftTimeCapsule: MapPokecenter2FSignpost0Script: refreshscreen - special Special_DisplayLinkRecord + special DisplayLinkRecord closetext end @@ -600,7 +600,7 @@ OfficerScript_0x192c9a: writetext Text_MysteryGiftDeliveryGuy_HereYouGo buttonsound waitsfx - special Special_GetMysteryGiftItem + special GetMysteryGiftItem iffalse .BagIsFull itemnotify setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index eb1561801..64fba2b58 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -34,11 +34,11 @@ GentlemanScript_0x5cd3d: opentext writetext UnknownText_0x5ceba buttonsound - special Special_CheckLuckyNumberShowFlag + special CheckLuckyNumberShowFlag iffalse .skip - special Special_ResetLuckyNumberShowFlag + special ResetLuckyNumberShowFlag .skip - special Special_PrintTodaysLuckyNumber + special PrintTodaysLuckyNumber checkflag ENGINE_LUCKY_NUMBER_SHOW iftrue .GameOver writetext UnknownText_0x5cf3a @@ -53,7 +53,7 @@ GentlemanScript_0x5cd3d: playsound SFX_DEX_FANFARE_20_49 waitsfx buttonsound - special Special_CheckForLuckyNumberWinners + special CheckForLuckyNumberWinners closetext applymovement RADIOTOWER1F_GENTLEMAN, MovementData_0x5ce74 opentext diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 605b019aa..2c7c074c1 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -117,7 +117,7 @@ Buena: if_equal 30, UnknownScript_0x5d87f playmusic MUSIC_BUENAS_PASSWORD writetext UnknownText_0x5de35 - special Special_AskRememberPassword + special AskRememberPassword iffalse UnknownScript_0x5d81e writetext UnknownText_0x5de84 waitbutton @@ -134,7 +134,7 @@ UnknownScript_0x5d7be: closetext spriteface RADIOTOWER2F_BUENA, DOWN refreshscreen - special Special_BuenasPassword + special BuenasPassword closetext iffalse UnknownScript_0x5d845 opentext @@ -153,7 +153,7 @@ UnknownScript_0x5d7be: writetext UnknownText_0x5e054 waitbutton closetext - special Special_FadeOutMusic + special FadeOutMusic pause 20 special RestartMapMusic checkcode VAR_BLUECARDBALANCE @@ -182,7 +182,7 @@ UnknownScript_0x5d81e: waitbutton closetext spriteface RADIOTOWER2F_BUENA, RIGHT - special Special_FadeOutMusic + special FadeOutMusic pause 20 special RestartMapMusic end @@ -213,7 +213,7 @@ UnknownScript_0x5d845: waitbutton closetext spriteface RADIOTOWER2F_BUENA, RIGHT - special Special_FadeOutMusic + special FadeOutMusic pause 20 special RestartMapMusic end @@ -316,7 +316,7 @@ ReceptionistScript_0x5d8ff: iffalse UnknownScript_0x5d90f writetext UnknownText_0x5e392 buttonsound - special Special_BuenaPrize + special BuenaPrize closetext end diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 5d452c157..bbea39793 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -95,12 +95,12 @@ RadioTower5FRocketBossScene: writetext RadioTower5FRocketBossAfterText waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear RADIOTOWER5F_ROCKET disappear RADIOTOWER5F_ROCKET_GIRL pause 15 - special Special_FadeInQuickly + special FadeInQuickly setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1 setevent EVENT_CLEARED_RADIO_TOWER clearflag ENGINE_ROCKETS_IN_RADIO_TOWER diff --git a/maps/Route24.asm b/maps/Route24.asm index afb4a514e..de6c3821a 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -24,15 +24,15 @@ RocketScript_0x1adbfa: opentext writetext UnknownText_0x1addc0 buttonsound - special Special_FadeOutMusic + special FadeOutMusic writetext UnknownText_0x1adee1 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear ROUTE24_ROCKET pause 25 - special Special_FadeInQuickly + special FadeInQuickly playmapmusic end diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm index e24f7dcc3..83fe7c738 100644 --- a/maps/Route26HealHouse.asm +++ b/maps/Route26HealHouse.asm @@ -14,13 +14,13 @@ TeacherScript_0x7b125: writetext UnknownText_0x7b14d waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings playmusic MUSIC_HEAL special HealParty pause 60 - special Special_FadeInQuickly + special FadeInQuickly special RestartMapMusic opentext writetext UnknownText_0x7b18b diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 629af1536..c5d0615d1 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -13,7 +13,7 @@ SandstormHouseWoman: opentext checkevent EVENT_GOT_TM37_SANDSTORM iftrue .AlreadyGotItem - special Special_GetFirstPokemonHappiness + special GetFirstPokemonHappiness writetext SandstormHouseWomanText1 buttonsound if_greater_than 150 - 1, .Loyal diff --git a/maps/Route34.asm b/maps/Route34.asm index aeb532ae9..8fadf3c99 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -56,7 +56,7 @@ Route34_MapScripts: DayCareManScript_Outside: faceplayer opentext - special Special_DayCareManOutside + special DayCareManOutside waitbutton closetext if_equal TRUE, .end_fail @@ -77,13 +77,13 @@ DayCareManScript_Outside: DayCareMon1Script: opentext - special Special_DayCareMon1 + special DayCareMon1 closetext end DayCareMon2Script: opentext - special Special_DayCareMon2 + special DayCareMon2 closetext end diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 754591060..e5e590930 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -74,7 +74,7 @@ Route35NationalParkGate_MapScripts: closetext scall Route35NationalParkGate_EnterContest playsound SFX_ENTER_DOOR - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47 end @@ -95,7 +95,7 @@ OfficerScript_0x6a204: iffalse Route35NationalParkGate_DeclinedToParticipate checkcode VAR_PARTYCOUNT if_greater_than 1, Route35NationalParkGate_LeaveTheRestBehind - special Special_ContestDropOffMons + special ContestDropOffMons clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER Route35NationalParkGate_OkayToProceed: setflag ENGINE_BUG_CONTEST_TIMER @@ -108,12 +108,12 @@ Route35NationalParkGate_OkayToProceed: writetext UnknownText_0x6a3e2 waitbutton closetext - special Special_GiveParkBalls + special GiveParkBalls scall Route35NationalParkGate_EnterContest playsound SFX_ENTER_DOOR - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx - special Special_SelectRandomBugContestContestants + special SelectRandomBugContestContestants warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47 end @@ -134,12 +134,12 @@ Route35NationalParkGate_LeaveTheRestBehind: if_equal 0, Route35NationalParkGate_NoRoomInBox Route35NationalParkGate_LessThanFullParty: ; 6a27d - special Special_CheckFirstMonIsEgg + special CheckFirstMonIsEgg if_equal TRUE, Route35NationalParkGate_FirstMonIsEgg writetext UnknownText_0x6a4c6 yesorno iffalse Route35NationalParkGate_DeclinedToLeaveMonsBehind - special Special_ContestDropOffMons + special ContestDropOffMons iftrue Route35NationalParkGate_FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6a537 diff --git a/maps/Route36.asm b/maps/Route36.asm index cb3cedfed..e0a5d0558 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -94,8 +94,8 @@ DidntCatchSudowoodo: applymovement ROUTE36_WEIRD_TREE, WeirdTreeMovement_Flee disappear ROUTE36_WEIRD_TREE variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN - special Special_LoadUsedSpritesGFX - special Special_RefreshSprites + special LoadUsedSpritesGFX + special RefreshSprites end Route36FloriaScript: diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 537cdedd7..a9d3f72d7 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -75,14 +75,14 @@ Route36NationalParkGate_MapScripts: writetext UnknownText_0x6b2c5 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes scall .CopyContestants disappear ROUTE36NATIONALPARKGATE_OFFICER1 appear ROUTE36NATIONALPARKGATE_OFFICER2 applymovement PLAYER, MovementData_0x6add1 pause 15 - special Special_FadeInQuickly + special FadeInQuickly jumpstd bugcontestresults .GoBackToContest: @@ -91,7 +91,7 @@ Route36NationalParkGate_MapScripts: closetext spriteface PLAYER, LEFT playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18 end @@ -156,7 +156,7 @@ Route36OfficerScriptContest: iffalse .DecidedNotToJoinContest checkcode VAR_PARTYCOUNT if_greater_than 1, .LeaveMonsWithOfficer - special Special_ContestDropOffMons + special ContestDropOffMons clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER .ResumeStartingContest: setflag ENGINE_BUG_CONTEST_TIMER @@ -171,12 +171,12 @@ Route36OfficerScriptContest: waitbutton closetext setflag ENGINE_BUG_CONTEST_TIMER - special Special_GiveParkBalls + special GiveParkBalls spriteface PLAYER, LEFT playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx - special Special_SelectRandomBugContestContestants + special SelectRandomBugContestContestants warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18 end @@ -186,12 +186,12 @@ Route36OfficerScriptContest: checkcode VAR_BOXSPACE if_equal 0, .BoxFull .ContinueLeavingMons: - special Special_CheckFirstMonIsEgg + special CheckFirstMonIsEgg if_equal TRUE, .FirstMonIsEgg writetext UnknownText_0x6afb0 yesorno iffalse .RefusedToLeaveMons - special Special_ContestDropOffMons + special ContestDropOffMons iftrue .FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6b021 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 682b2dea1..a8e54a7ef 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -52,7 +52,7 @@ MooMoo: iftrue .HappyCow writetext Text_WeakMoo writebyte MILTANK - special Special_PlaySlowCry + special PlaySlowCry buttonsound writetext Text_ItsCryIsWeak checkevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 9f46263de..b7c3117cf 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -24,7 +24,7 @@ FarmerMScript_SellMilk: checkitem MOOMOO_MILK iftrue FarmerMScript_Milking writetext FarmerMText_BuyMilk - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight yesorno iffalse FarmerMScript_NoSale checkmoney YOUR_MONEY, 500 @@ -32,7 +32,7 @@ FarmerMScript_SellMilk: giveitem MOOMOO_MILK iffalse FarmerMScript_NoRoom takemoney YOUR_MONEY, 500 - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight waitsfx playsound SFX_TRANSACTION writetext FarmerMText_GotMilk diff --git a/maps/Route40.asm b/maps/Route40.asm index 6f1c2fef5..05b6f8f36 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -79,7 +79,7 @@ Route40Lass1Script: jumptextfaceplayer Route40Lass1Text PokefanMScript_0x1a61c7: - special Special_Mobile_DummyReturnFalse + special Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x1a646a diff --git a/maps/Route45.asm b/maps/Route45.asm index 728fcdb03..8c696973d 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -31,7 +31,7 @@ TrainerBlackbeltKenji: iftrue UnknownScript_0x19e0e4 checkevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19e0cd - special Special_SampleKenjiBreakCountdown + special SampleKenjiBreakCountdown writetext UnknownText_0x19e5e2 waitbutton setevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER @@ -61,7 +61,7 @@ UnknownScript_0x19e0e4: verbosegiveitem PP_UP iffalse UnknownScript_0x19e118 clearevent EVENT_KENJI_ON_BREAK - special Special_SampleKenjiBreakCountdown + special SampleKenjiBreakCountdown jump UnknownScript_0x19e127 UnknownScript_0x19e10c: diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 583dcc8ff..1e244cecc 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -50,7 +50,7 @@ RuinsOfAlphAerodactylChamber_MapScripts: MapRuinsOfAlphAerodactylChamberSignpost2Script: refreshscreen writebyte UNOWNPUZZLE_AERODACTYL - special Special_UnownPuzzle + special UnownPuzzle closetext iftrue UnknownScript_0x58df7 end @@ -84,7 +84,7 @@ MapRuinsOfAlphAerodactylChamberSignpost4Script: opentext writetext UnknownText_0x58e4f writebyte UNOWNWORDS_LIGHT - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -94,7 +94,7 @@ MapRuinsOfAlphAerodactylChamberSignpost5Script: opentext writetext UnknownText_0x58e81 writebyte UNOWNWORDS_LIGHT - special Special_DisplayUnownWords + special DisplayUnownWords closetext end diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index fd1f21ea0..46c340c9f 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -9,7 +9,7 @@ RuinsOfAlphHoOhChamber_MapScripts: callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: - special Special_HoOhChamber + special HoOhChamber checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER iftrue .OpenWall end @@ -51,7 +51,7 @@ RuinsOfAlphHoOhChamber_MapScripts: MapRuinsOfAlphHoOhChamberSignpost2Script: refreshscreen writebyte UNOWNPUZZLE_HO_OH - special Special_UnownPuzzle + special UnownPuzzle closetext iftrue UnknownScript_0x585ba end @@ -85,7 +85,7 @@ MapRuinsOfAlphHoOhChamberSignpost4Script: opentext writetext UnknownText_0x58612 writebyte UNOWNWORDS_HO_OH - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -95,7 +95,7 @@ MapRuinsOfAlphHoOhChamberSignpost5Script: opentext writetext UnknownText_0x58644 writebyte UNOWNWORDS_HO_OH - special Special_DisplayUnownWords + special DisplayUnownWords closetext end diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index 96f7af16e..66110d261 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -57,7 +57,7 @@ RuinsOfAlphKabutoChamberReceptionistScript: MapRuinsOfAlphKabutoChamberSignpost2Script: refreshscreen writebyte UNOWNPUZZLE_KABUTO - special Special_UnownPuzzle + special UnownPuzzle closetext iftrue UnknownScript_0x58778 end @@ -122,7 +122,7 @@ MapRuinsOfAlphKabutoChamberSignpost4Script: opentext writetext UnknownText_0x58aa7 writebyte UNOWNWORDS_ESCAPE - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -132,7 +132,7 @@ MapRuinsOfAlphKabutoChamberSignpost5Script: opentext writetext UnknownText_0x58ad9 writebyte UNOWNWORDS_ESCAPE - special Special_DisplayUnownWords + special DisplayUnownWords closetext end diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 6d1892f9e..b99ba1825 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -9,7 +9,7 @@ RuinsOfAlphOmanyteChamber_MapScripts: callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: - special Special_OmanyteChamber + special OmanyteChamber checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue .OpenWall end @@ -51,7 +51,7 @@ RuinsOfAlphOmanyteChamber_MapScripts: MapRuinsOfAlphOmanyteChamberSignpost2Script: refreshscreen writebyte UNOWNPUZZLE_OMANYTE - special Special_UnownPuzzle + special UnownPuzzle closetext iftrue UnknownScript_0x58c36 end @@ -85,7 +85,7 @@ MapRuinsOfAlphOmanyteChamberSignpost4Script: opentext writetext UnknownText_0x58c8e writebyte UNOWNWORDS_WATER - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -95,7 +95,7 @@ MapRuinsOfAlphOmanyteChamberSignpost5Script: opentext writetext UnknownText_0x58cc0 writebyte UNOWNWORDS_WATER - special Special_DisplayUnownWords + special DisplayUnownWords closetext end diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 1595ce59a..184e5349c 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -165,7 +165,7 @@ UnknownScript_0x5925a: UnknownScript_0x59260: writetext UnknownText_0x5982d waitbutton - special Special_UnownPrinter + special UnownPrinter closetext end diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index 0d69d2017..ad5b4a8bd 100644 --- a/maps/SaffronMagnetTrainStation.asm +++ b/maps/SaffronMagnetTrainStation.asm @@ -37,7 +37,7 @@ OfficerScript_0x18a81e: applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f applymovement PLAYER, MovementData_0x18a898 writebyte TRUE - special Special_MagnetTrain + special MagnetTrain warpcheck newloadmap MAPSETUP_TRAIN applymovement PLAYER, .MovementBoardTheTrain diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index d53fdb684..453ac6df5 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -15,7 +15,7 @@ NurseScript_0x18a47d: jumpstd pokecenternurse TeacherScript_0x18a480: - special Special_Mobile_DummyReturnFalse + special Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x18a4a3 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 705ca0cc1..7d8c5897f 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -9,7 +9,7 @@ SilverCaveRoom3_MapScripts: db 0 Red: - special Special_FadeOutMusic + special FadeOutMusic faceplayer opentext writetext .Text1 @@ -20,16 +20,16 @@ Red: startbattle dontrestartmapmusic reloadmapafterbattle - special Special_FadeOutMusic + special FadeOutMusic opentext writetext .Text3 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear SILVERCAVEROOM3_RED pause 15 - special Special_FadeInQuickly + special FadeInQuickly pause 30 special HealParty refreshscreen diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 7c2490b45..d2c32b671 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -38,14 +38,14 @@ TrainerGruntM1: writetext TrainerGruntM1WhenTalkText waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear SLOWPOKEWELLB1F_ROCKET1 disappear SLOWPOKEWELLB1F_ROCKET2 disappear SLOWPOKEWELLB1F_ROCKET3 disappear SLOWPOKEWELLB1F_ROCKET_GIRL pause 15 - special Special_FadeInQuickly + special FadeInQuickly disappear SLOWPOKEWELLB1F_KURT moveobject SLOWPOKEWELLB1F_KURT, 11, 6 appear SLOWPOKEWELLB1F_KURT @@ -67,7 +67,7 @@ TrainerGruntM1: clearevent EVENT_AZALEA_TOWN_SLOWPOKES clearevent EVENT_KURTS_HOUSE_SLOWPOKE clearevent EVENT_KURTS_HOUSE_KURT_1 - special Special_FadeOutPalettes + special FadeOutPalettes special HealParty pause 15 warp KURTS_HOUSE, 3, 3 diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index e160dd872..9e2896992 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -25,7 +25,7 @@ SproutTower3F_MapScripts: UnknownScript_0x184947: spriteface PLAYER, UP showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic playsound SFX_TACKLE playsound SFX_ELEVATOR earthquake 79 @@ -54,11 +54,11 @@ UnknownScript_0x184947: pause 15 closetext playsound SFX_WARP_TO - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear SPROUTTOWER3F_SILVER waitsfx - special Special_FadeInQuickly + special FadeInQuickly setscene 1 special RestartMapMusic end diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index f4705a131..67efc752c 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -448,9 +448,9 @@ ExplodingTrap22: end VoltorbExplodingTrap: - special Special_FadeOutPalettes + special FadeOutPalettes cry VOLTORB - special Special_FadeInPalettes + special FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon VOLTORB, 23 @@ -458,9 +458,9 @@ VoltorbExplodingTrap: end GeodudeExplodingTrap: - special Special_FadeOutPalettes + special FadeOutPalettes cry GEODUDE - special Special_FadeInPalettes + special FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon GEODUDE, 21 @@ -468,9 +468,9 @@ GeodudeExplodingTrap: end KoffingExplodingTrap: - special Special_FadeOutPalettes + special FadeOutPalettes cry KOFFING - special Special_FadeInPalettes + special FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon KOFFING, 21 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index f29337812..bf5a6248f 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -109,7 +109,7 @@ UnknownScript_0x6cfac: writetext UnknownText_0x6d4c6 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear TEAMROCKETBASEB2F_ROCKET1 disappear TEAMROCKETBASEB2F_ROCKET_GIRL @@ -117,7 +117,7 @@ UnknownScript_0x6cfac: disappear TEAMROCKETBASEB2F_ROCKET3 disappear TEAMROCKETBASEB2F_ROCKET4 pause 15 - special Special_FadeInQuickly + special FadeInQuickly setscene 2 clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE spriteface TEAMROCKETBASEB2F_LANCE, DOWN @@ -166,11 +166,11 @@ LanceHealsCommon: writetext LanceHealsText1 waitbutton closetext - special Special_FadeOutPalettes - special Special_StubbedTrainerRankings_Healings + special FadeOutPalettes + special StubbedTrainerRankings_Healings playsound SFX_FULL_HEAL special HealParty - special Special_FadeInPalettes + special FadeInPalettes opentext writetext LanceHealsText2 waitbutton diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 7b64414a6..80f4b30e4 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -66,7 +66,7 @@ LanceGetPasswordScript: RocketBaseRival: spriteface PLAYER, LEFT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic appear TEAMROCKETBASEB3F_SILVER applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalEnterMovement spriteface PLAYER, LEFT diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 3b6a4971f..c0366f94d 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -20,7 +20,7 @@ TimeCapsule_MapScripts: end .SetWhichChris: - special Special_CableClubCheckWhichChris + special CableClubCheckWhichChris iffalse .Chris2 disappear TIMECAPSULE_CHRIS2 appear TIMECAPSULE_CHRIS1 @@ -37,7 +37,7 @@ TimeCapsule_MapScripts: end MapTimeCapsuleSignpost1Script: - special Special_TimeCapsule + special TimeCapsule newloadmap MAPSETUP_LINKRETURN end diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index cd20d59b2..ac6ca8863 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -33,7 +33,7 @@ TinTower1F_MapScripts: iftrue .GotRainbowWing checkevent EVENT_BEAT_ELITE_FOUR iffalse .FaceBeasts - special Special_BeastsCheck + special BeastsCheck iffalse .FaceBeasts clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 @@ -49,7 +49,7 @@ TinTower1F_MapScripts: iftrue .FoughtSuicune appear TINTOWER1F_SUICUNE writebyte RAIKOU - special Special_MonCheck + special MonCheck iftrue .NoRaikou appear TINTOWER1F_RAIKOU jump .CheckEntei @@ -58,7 +58,7 @@ TinTower1F_MapScripts: disappear TINTOWER1F_RAIKOU .CheckEntei: writebyte ENTEI - special Special_MonCheck + special MonCheck iftrue .NoEntei appear TINTOWER1F_ENTEI jump .BeastsDone @@ -87,7 +87,7 @@ TinTower1F_MapScripts: applymovement PLAYER, TinTowerPlayerMovement1 pause 15 writebyte RAIKOU - special Special_MonCheck + special MonCheck iftrue .Next1 ; if player caught Raikou, he doesn't appear in Tin Tower applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement1 spriteface PLAYER, LEFT @@ -100,7 +100,7 @@ TinTower1F_MapScripts: waitsfx .Next1: writebyte ENTEI - special Special_MonCheck + special MonCheck iftrue .Next2 ; if player caught Entei, he doesn't appear in Tin Tower applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement1 spriteface PLAYER, RIGHT @@ -164,7 +164,7 @@ TinTower1F_MapScripts: playsound SFX_EXIT_BUILDING disappear TINTOWER1F_EUSINE waitsfx - special Special_FadeOutMusic + special FadeOutMusic pause 20 playmapmusic end diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 3479bd180..168abe1e7 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -20,7 +20,7 @@ TradeCenter_MapScripts: end .SetWhichChris: - special Special_CableClubCheckWhichChris + special CableClubCheckWhichChris iffalse .Chris2 disappear TRADECENTER_CHRIS2 appear TRADECENTER_CHRIS1 @@ -37,7 +37,7 @@ TradeCenter_MapScripts: end MapTradeCenterSignpost1Script: - special Special_TradeCenter + special TradeCenter newloadmap MAPSETUP_LINKRETURN end diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index bb6fd4316..3de28611b 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -20,7 +20,7 @@ TrainerHouseReceptionistScript: iftrue .FoughtTooManyTimes writetext TrainerHouseB1FIntroText buttonsound - special Special_TrainerHouse + special TrainerHouse iffalse .GetCal3Name trainertotext CAL, CAL2, MEM_BUFFER_0 jump .GotName @@ -42,7 +42,7 @@ TrainerHouseReceptionistScript: writetext TrainerHouseB1FCalBeforeText waitbutton closetext - special Special_TrainerHouse + special TrainerHouse iffalse .NoSpecialBattle winlosstext TrainerHouseB1FCalBeatenText, 0 setlasttalked TRAINERHOUSEB1F_CHRIS diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 978ac943d..92d0ca5e2 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -42,7 +42,7 @@ VermilionCitySuperNerdScript: VermilionSnorlax: opentext - special Special_SnorlaxAwake + special SnorlaxAwake iftrue UnknownScript_0x1aa9ab writetext UnknownText_0x1aab64 waitbutton diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index fa5bb186a..f7f956f43 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -52,7 +52,7 @@ SailorScript_0x74dc4: waitsfx applymovement PLAYER, MovementData_0x74ef1 playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 7bc86ec04..44250c783 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -25,7 +25,7 @@ UnknownScript_0x74492: moveobject VICTORYROAD_SILVER, 18, 11 spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 appear VICTORYROAD_SILVER applymovement VICTORYROAD_SILVER, MovementData_0x74539 @@ -39,7 +39,7 @@ UnknownScript_0x74492: UnknownScript_0x744b5: spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 appear VICTORYROAD_SILVER applymovement VICTORYROAD_SILVER, MovementData_0x74542 diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index 78c623f48..de6eaef8c 100755 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -274,7 +274,7 @@ CopyMobileEZChatToC608: ; 11c156 jr .copy_string ; 11c1ab -Special_Function11c1ab: ; 11c1ab +Function11c1ab: ; 11c1ab ld a, [hInMenu] push af ld a, $1 diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 0ef0079e5..2ad8fff7b 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -318,7 +318,7 @@ Function10016f: ; 10016f Function10020b: ; 10020b xor a ld [wc303], a - farcall Special_FadeOutPalettes + farcall FadeOutPalettes farcall Function106464 call HideSprites call DelayFrame @@ -2803,7 +2803,7 @@ LoadSelectedPartiesForColosseum: ; 1010f2 ret ; 1011f1 -Special_Function1011f1: ; 1011f1 +Function1011f1: ; 1011f1 ld a, $04 call GetSRAMBank ld a, [$a60c] @@ -2827,20 +2827,20 @@ Special_Function1011f1: ; 1011f1 ret ; 101220 -Special_Function101220: ; 101220 +Function101220: ; 101220 xor a ld [wLinkMode], a ret ; 101225 -Special_Function101225: ; 101225 +Function101225: ; 101225 ld d, 1 ld e, BANK(Jumptable_101297) ld bc, Jumptable_101297 call Function100000 jr Function10123d -Special_Function101231: ; 101231 +Function101231: ; 101231 ld d, 2 ld e, BANK(Jumptable_101297) ld bc, Jumptable_101297 @@ -2871,7 +2871,7 @@ Function101251: ; 101251 call Function1021e0 call Function1020ea ret c - call Special_Function102142 + call Function102142 ret ; 101265 @@ -5024,7 +5024,7 @@ Function102112: ; 102112 ret ; 102142 -Special_Function102142: ; 102142 +Function102142: ; 102142 call Function10218d call Function102180 ld hl, UnknownText_0x1021d1 @@ -7722,9 +7722,9 @@ Unknown_1035d7: ; 1035d7 dw Unknown_103608 dw Unknown_103608 dw Unknown_1035fe - dw Special_AskMobileOrCable - dw Special_AskMobileOrCable - dw Special_AskMobileOrCable + dw AskMobileOrCable + dw AskMobileOrCable + dw AskMobileOrCable Unknown_1035e7: ; 1035e7 dwcoord 0, 6 @@ -7755,7 +7755,7 @@ Unknown_103608: ; 103608 db 2, 2, 3 ; 103612 -Special_AskMobileOrCable: ; 103612 +AskMobileOrCable: ; 103612 ld hl, MenuHeader_103640 call LoadMenuHeader ld a, [wMobileOrCable_LastSelection] @@ -7811,7 +7811,7 @@ Function103654: ; 103654 ret ; 10366e -Special_Mobile_SelectThreeMons: ; 10366e +Mobile_SelectThreeMons: ; 10366e farcall Mobile_AlwaysReturnNotCarry bit 7, c jr z, .asm_10369b @@ -7979,7 +7979,7 @@ UnknownText_0x10377b: ; 0x10377b db "@" ; 0x103780 -Special_Function103780: ; 103780 +Function103780: ; 103780 ld a, [wd265] push af call Function10378c @@ -8021,7 +8021,7 @@ Function10378c: ; 10378c ret ; 1037c2 -Special_Function1037c2: ; 1037c2 +Function1037c2: ; 1037c2 call Function103823 jr c, .nope ld a, [wdc5f] @@ -8047,7 +8047,7 @@ UnknownText_0x1037e6: ; 0x1037e6 db "@" ; 0x1037eb -Special_Function1037eb: ; 1037eb +Function1037eb: ; 1037eb call Function103823 jr nc, .asm_103807 ld hl, UnknownText_0x103819 @@ -8102,7 +8102,7 @@ Function103823: ; 103823 ret ; 10383c -Special_Function10383c: ; 10383c +Function10383c: ; 10383c ld a, $01 ld [wdc60], a xor a @@ -8135,7 +8135,7 @@ UnknownText_0x103876: ; 0x103876 db "@" ; 0x10387b -Special_Function10387b: ; 10387b +Function10387b: ; 10387b farcall Mobile_AlwaysReturnNotCarry bit 7, c ret nz diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index e51ab3eea..57692d8a8 100755 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -324,7 +324,7 @@ StubbedTrainerRankings_FruitPicked: ; 10609b ld hl, sTrainerRankingFruitPicked jp StubbedTrainerRankings_Increment3Byte -Special_StubbedTrainerRankings_Healings: ; 1060a2 +StubbedTrainerRankings_Healings: ; 1060a2 ret ld hl, sTrainerRankingHealings jp StubbedTrainerRankings_Increment3Byte @@ -812,7 +812,7 @@ endr ; functions related to the cable club and various NPC scripts referencing communications -Special_Mobile_DummyReturnFalse: ; 10630f +Mobile_DummyReturnFalse: ; 10630f xor a ld [ScriptVar], a ret @@ -838,7 +838,7 @@ Mobile_AlwaysReturnNotCarry: ; 10632f or a ret -Function106331: ; 106331 - called by Special_Mobile_DummyReturnFalse in Crystal-J +Function106331: ; 106331 - called by Mobile_DummyReturnFalse in Crystal-J ; check ~[4:b000] == [7:a800] ld a, $4 call GetSRAMBank diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index 882f86aa4..b3b6fef12 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -6837,7 +6837,7 @@ Unknown_117356: ; 117356 SECTION "Mobile Stadium", ROMX -Special_GiveOddEgg: ; 117656 +GiveOddEgg: ; 117656 farcall _GiveOddEgg ret diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 01c505601..fae3f099f 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -1672,7 +1672,7 @@ Function118ded: ; 118ded push af ld a, $1 ld [rSVBK], a - farcall Special_Function11b93b + farcall Function11b93b pop af ld [rSVBK], a @@ -5722,7 +5722,7 @@ Text_ThisBattleRoomPleaseWait: ; 0x11ac1f done ; 0x11ac3e -Special_Function11ac3e: ; 11ac3e +Function11ac3e: ; 11ac3e call SpeechTextBox call FadeToMenu callfar ClearSpriteAnims2 @@ -7050,7 +7050,7 @@ Function11b3d9: ; 11b3d9 ret ; 11b444 -Special_Function11b444: ; 11b444 +Function11b444: ; 11b444 ; special call Mobile46_InitJumptable call Mobile46_RunJumptable @@ -7339,7 +7339,7 @@ Function11b5e7: ; 11b5e7 ret ; 11b5e8 -Special_Function11b5e8: ; 11b5e8 +Function11b5e8: ; 11b5e8 ld a, $0 call GetSRAMBank ld hl, wRTC @@ -7575,7 +7575,7 @@ Function11b6b4: ; 11b6b4 ret ; 11b7e5 -Special_Function11b7e5: ; 11b7e5 +Function11b7e5: ; 11b7e5 ld a, [$c60d] ; species ld [wOTTrademonSpecies], a ld [CurPartySpecies], a @@ -7634,7 +7634,7 @@ Special_Function11b7e5: ; 11b7e5 ret ; 11b879 -Special_Function11b879: ; 11b879 +Function11b879: ; 11b879 farcall BattleTower_CheckSaveFileExistsAndIsYours ld a, [ScriptVar] and a @@ -7727,7 +7727,7 @@ Special_Function11b879: ; 11b879 ret ; 11b920 -Special_Function11b920: ; 11b920 +Function11b920: ; 11b920 call Mobile46_InitJumptable ld a, $5 call GetSRAMBank @@ -7740,7 +7740,7 @@ Special_Function11b920: ; 11b920 ret ; 11b93b -Special_Function11b93b: ; 11b93b +Function11b93b: ; 11b93b ld a, $5 call GetSRAMBank xor a @@ -7884,7 +7884,7 @@ AddMobileMonToParty: ; 11b98f ret ; 11ba38 -Special_Function11ba38: ; 11ba38 +Function11ba38: ; 11ba38 farcall CheckCurPartyMonFainted ret c xor a diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 9d9a674dd..9588802f1 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -435,7 +435,7 @@ Function17d1f1: ; 17d1f1 ; if [ScriptVar] == TRUE ; Show BattleTower-Menu with 3 options in english language ; - Challenge - Explanation - Cancel -Special_Menu_ChallengeExplanationCancel: ; 17d224 +Menu_ChallengeExplanationCancel: ; 17d224 ld a, [ScriptVar] and a jr nz, .English @@ -511,7 +511,7 @@ MenuData_ChallengeExplanationCancel: ; 17d297 db "Cancel@" ; 17d2b6 -Special_Function17d2b6: ; 17d2b6 +Function17d2b6: ; 17d2b6 call Function17d2c0 farcall Function1181da ret @@ -526,7 +526,7 @@ Function17d2c0: ; 17d2c0 ret ; 17d2ce -Special_Function17d2ce: ; 17d2ce +Function17d2ce: ; 17d2ce ld a, $5 call GetSRAMBank ld a, [$aa72] @@ -4586,7 +4586,7 @@ Function17f524: ; 17f524 jr .asm_17f536 ; 17f53d -Special_BattleTowerMobileError: ; 17f53d +BattleTowerMobileError: ; 17f53d call FadeToMenu xor a ld [wc303], a diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index 4c7a20b3d..eb52eb981 100755 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -845,7 +845,7 @@ Function4a6ab: ; 4a6ab (12:66ab) call ClearBGPalettes ld b, SCGB_DIPLOMA call GetSGBLayout - farcall Special_Function11c1ab + farcall Function11c1ab pop bc call LoadFontsExtra jp Function4a4c4 From 95fd05744d0577c61deef4d51ed73b43845c9bcf Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 24 Jan 2018 11:20:41 -0500 Subject: [PATCH 038/135] Remove "UnusedSpecial_" prefixes too --- data/special_pointers.asm | 8 ++++---- engine/events/battle_tower/battle_tower.asm | 2 +- engine/specials.asm | 4 ++-- mobile/mobile_12_2.asm | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/data/special_pointers.asm b/data/special_pointers.asm index 575d9fa33..2c049c77f 100644 --- a/data/special_pointers.asm +++ b/data/special_pointers.asm @@ -69,7 +69,7 @@ SpecialsPointers:: ; c029 add_special UpdateSprites ; bank 0 add_special ReplaceKrisSprite ; bank 0 add_special GameCornerPrizeMonCheckDex - add_special UnusedSpecial_SeenMon + add_special UnusedSetSeenMon add_special WaitSFX ; bank 0 add_special PlayMapMusic ; bank 0 add_special RestartMapMusic ; bank 0 @@ -79,7 +79,7 @@ SpecialsPointers:: ; c029 add_special FindPartyMonAtLeastThatHappy add_special FindPartyMonThatSpecies add_special FindPartyMonThatSpeciesYourTrainerID - add_special UnusedSpecial_CheckUnusedTwoDayTimer + add_special UnusedCheckUnusedTwoDayTimer add_special DayCareMon1 add_special DayCareMon2 add_special SelectRandomBugContestContestants @@ -133,7 +133,7 @@ SpecialsPointers:: ; c029 add_special Function1700ba add_special Function170114 add_special BattleTowerBattle - add_special UnusedSpecial_Function1704e1 + add_special Function1704e1 add_special DummySpecial_17021d add_special LoadOpponentTrainerAndPokemonWithOTSprite add_special Function11ba38 @@ -178,7 +178,7 @@ SpecialsPointers:: ; c029 add_special Function10387b add_special AskRememberPassword add_special LoadMapPalettes - add_special UnusedSpecial_FindItemInPCOrBag + add_special UnusedFindItemInPCOrBag add_special InitialSetDSTFlag add_special InitialClearDSTFlag add_special DummySpecial_c224 diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index 9cf6917b2..887457e2c 100755 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -619,7 +619,7 @@ Unreferenced_Function1704ca: ; 1704ca ret ; 1704e1 -UnusedSpecial_Function1704e1: ; 1704e1 +Function1704e1: ; 1704e1 call SpeechTextBox call FadeToMenu call InitBattleTowerChallengeRAM diff --git a/engine/specials.asm b/engine/specials.asm index 2193106e7..dc4ce32c4 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -43,7 +43,7 @@ GameCornerPrizeMonCheckDex: ; c230 ret ; c252 -UnusedSpecial_SeenMon: ; c252 +UnusedSetSeenMon: ; c252 ld a, [ScriptVar] dec a call SetSeenMon @@ -307,7 +307,7 @@ ScriptReturnCarry: ; c3e2 ret ; c3ef -UnusedSpecial_CheckUnusedTwoDayTimer: ; c3ef +UnusedCheckUnusedTwoDayTimer: ; c3ef farcall CheckUnusedTwoDayTimer ld a, [wUnusedTwoDayTimer] ld [ScriptVar], a diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm index 14d8c6e65..3b1da1f93 100755 --- a/mobile/mobile_12_2.asm +++ b/mobile/mobile_12_2.asm @@ -159,7 +159,7 @@ MobileCheckOwnMonAnywhere: ; 4a843 ret ; 4a927 -UnusedSpecial_FindItemInPCOrBag: ; 4a927 +UnusedFindItemInPCOrBag: ; 4a927 ld a, [ScriptVar] ld [CurItem], a ld hl, PCItems From 8e83eb1b320b008593aed43f492c462245bd9ade Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 24 Jan 2018 11:26:54 -0500 Subject: [PATCH 039/135] Awkward wording --- FAQ.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FAQ.md b/FAQ.md index c6f0dd813..17f3f95c0 100644 --- a/FAQ.md +++ b/FAQ.md @@ -41,7 +41,7 @@ For `asm` scripts, read [docs/map_scripts.md](docs/map_scripts.md). For `blk` la ## How do I write new features? -There are a number of special-purpose scripting languages used for different purposes, as described in [docs](docs/). For more general features, you'll need to code directly in assembly language. See [docs/assembly_programming.md](docs/assembly_programming.md). +There are a number of special-purpose scripting languages, as described in [docs](docs/). For more general features, you'll need to code directly in assembly language. See [docs/assembly_programming.md](docs/assembly_programming.md). ## I need more help! From 518dd46ca16c79736511289069d2525635ed52e4 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 24 Jan 2018 21:27:23 -0500 Subject: [PATCH 040/135] data/text/X_text.asm is redundant --- Makefile | 2 +- data/text/{battle_text.asm => battle.asm} | 0 data/text/common.asm | 16 ++++++++++++++++ data/text/{common_text_1.asm => common_1.asm} | 0 data/text/{common_text_2.asm => common_2.asm} | 0 data/text/{common_text_3.asm => common_3.asm} | 0 data/text/common_text.asm | 16 ---------------- ...eet_honey_text.asm => unused_sweet_honey.asm} | 0 main.asm | 4 ++-- maps/GoldenrodNameRater.asm | 2 +- pokecrystal.link | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) rename data/text/{battle_text.asm => battle.asm} (100%) create mode 100644 data/text/common.asm rename data/text/{common_text_1.asm => common_1.asm} (100%) rename data/text/{common_text_2.asm => common_2.asm} (100%) rename data/text/{common_text_3.asm => common_3.asm} (100%) delete mode 100644 data/text/common_text.asm rename data/text/{unused_sweet_honey_text.asm => unused_sweet_honey.asm} (100%) diff --git a/Makefile b/Makefile index 203bd4aa7..6dadfcb44 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ audio.o \ home.o \ main.o \ wram.o \ -data/text/common_text.o \ +data/text/common.o \ data/maps/maps.o \ data/pokemon/dex_entries.o \ data/pokemon/egg_moves.o \ diff --git a/data/text/battle_text.asm b/data/text/battle.asm similarity index 100% rename from data/text/battle_text.asm rename to data/text/battle.asm diff --git a/data/text/common.asm b/data/text/common.asm new file mode 100644 index 000000000..d1fbb8b1a --- /dev/null +++ b/data/text/common.asm @@ -0,0 +1,16 @@ +INCLUDE "constants.asm" + + +SECTION "Text 1", ROMX + +INCLUDE "data/text/common_1.asm" + + +SECTION "Text 2", ROMX + +INCLUDE "data/text/common_2.asm" + + +SECTION "Text 3", ROMX + +INCLUDE "data/text/common_3.asm" diff --git a/data/text/common_text_1.asm b/data/text/common_1.asm similarity index 100% rename from data/text/common_text_1.asm rename to data/text/common_1.asm diff --git a/data/text/common_text_2.asm b/data/text/common_2.asm similarity index 100% rename from data/text/common_text_2.asm rename to data/text/common_2.asm diff --git a/data/text/common_text_3.asm b/data/text/common_3.asm similarity index 100% rename from data/text/common_text_3.asm rename to data/text/common_3.asm diff --git a/data/text/common_text.asm b/data/text/common_text.asm deleted file mode 100644 index 72ef91fea..000000000 --- a/data/text/common_text.asm +++ /dev/null @@ -1,16 +0,0 @@ -INCLUDE "constants.asm" - - -SECTION "Text 1", ROMX - -INCLUDE "data/text/common_text_1.asm" - - -SECTION "Text 2", ROMX - -INCLUDE "data/text/common_text_2.asm" - - -SECTION "Text 3", ROMX - -INCLUDE "data/text/common_text_3.asm" diff --git a/data/text/unused_sweet_honey_text.asm b/data/text/unused_sweet_honey.asm similarity index 100% rename from data/text/unused_sweet_honey_text.asm rename to data/text/unused_sweet_honey.asm diff --git a/main.asm b/main.asm index 8ce0db6ff..50b4c6f0b 100644 --- a/main.asm +++ b/main.asm @@ -279,7 +279,7 @@ SECTION "bank20", ROMX INCLUDE "engine/player_movement.asm" INCLUDE "engine/engine_flags.asm" INCLUDE "engine/variables.asm" -INCLUDE "data/text/battle_text.asm" +INCLUDE "data/text/battle.asm" INCLUDE "engine/debug.asm" @@ -539,7 +539,7 @@ SECTION "Mobile 5F", ROMX INCLUDE "mobile/mobile_5f.asm" -SECTION "Common Text 1", ROMX +SECTION "Phone Text 2", ROMX INCLUDE "data/text/std_text.asm" INCLUDE "data/phone/text/jack_overworld.asm" diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index ebee5d6a5..8e9f0612d 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -22,7 +22,7 @@ GoldenrodNameRaterBookshelf: GoldenrodNameRaterRadio: jumpstd radio2 -INCLUDE "data/text/unused_sweet_honey_text.asm" +INCLUDE "data/text/unused_sweet_honey.asm" GoldenrodNameRater_MapEvents: ; filler diff --git a/pokecrystal.link b/pokecrystal.link index 0cfb54a8b..fc8fbb38a 100644 --- a/pokecrystal.link +++ b/pokecrystal.link @@ -271,7 +271,7 @@ ROMX $6a ROMX $6b "Map Scripts 24" ROMX $6c - "Common Text 1" + "Phone Text 2" "Map Scripts 25" ROMX $6d "Special Phone Text" From 0380c2a493ccc85cd3a6ab3430fb6bed87cf49eb Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 25 Jan 2018 17:00:31 -0500 Subject: [PATCH 041/135] Move some more constants out of misc_constants.asm --- constants.asm | 70 ++++++++++++++-------------- constants/gfx_constants.asm | 5 ++ constants/misc_constants.asm | 48 +++++++------------ constants/pokemon_data_constants.asm | 9 ++++ 4 files changed, 67 insertions(+), 65 deletions(-) diff --git a/constants.asm b/constants.asm index 4931bdd5f..0cd14bfbe 100644 --- a/constants.asm +++ b/constants.asm @@ -5,48 +5,48 @@ INCLUDE "macros.asm" INCLUDE "hram.asm" INCLUDE "constants/hardware_constants.asm" +INCLUDE "constants/deco_constants.asm" INCLUDE "constants/wram_constants.asm" -INCLUDE "constants/pokemon_constants.asm" -INCLUDE "constants/type_constants.asm" -INCLUDE "constants/move_constants.asm" -INCLUDE "constants/move_effect_constants.asm" -INCLUDE "constants/battle_constants.asm" +INCLUDE "constants/misc_constants.asm" +INCLUDE "constants/input_constants.asm" +INCLUDE "constants/gfx_constants.asm" +INCLUDE "constants/text_constants.asm" +INCLUDE "constants/audio_constants.asm" INCLUDE "constants/battle_anim_constants.asm" +INCLUDE "constants/battle_constants.asm" +INCLUDE "constants/battle_tower_constants.asm" +INCLUDE "constants/collision_constants.asm" +INCLUDE "constants/credits_constants.asm" +INCLUDE "constants/cry_constants.asm" +INCLUDE "constants/engine_flags.asm" +INCLUDE "constants/event_flags.asm" +INCLUDE "constants/icon_constants.asm" +INCLUDE "constants/item_constants.asm" +INCLUDE "constants/item_data_constants.asm" +INCLUDE "constants/landmark_constants.asm" INCLUDE "constants/map_constants.asm" INCLUDE "constants/map_data_constants.asm" INCLUDE "constants/map_setup_constants.asm" -INCLUDE "constants/landmark_constants.asm" -INCLUDE "constants/item_constants.asm" -INCLUDE "constants/item_data_constants.asm" -INCLUDE "constants/trainer_constants.asm" -INCLUDE "constants/trainer_data_constants.asm" -INCLUDE "constants/script_constants.asm" -INCLUDE "constants/event_flags.asm" -INCLUDE "constants/engine_flags.asm" -INCLUDE "constants/music_constants.asm" -INCLUDE "constants/sfx_constants.asm" -INCLUDE "constants/phone_constants.asm" -INCLUDE "constants/credits_constants.asm" -INCLUDE "constants/gfx_constants.asm" -INCLUDE "constants/input_constants.asm" -INCLUDE "constants/pokemon_data_constants.asm" -INCLUDE "constants/icon_constants.asm" -INCLUDE "constants/serial_constants.asm" +INCLUDE "constants/menu_constants.asm" INCLUDE "constants/mobile_constants.asm" -INCLUDE "constants/text_constants.asm" -INCLUDE "constants/misc_constants.asm" -INCLUDE "constants/std_constants.asm" -INCLUDE "constants/deco_constants.asm" -INCLUDE "constants/radio_constants.asm" +INCLUDE "constants/move_constants.asm" +INCLUDE "constants/move_effect_constants.asm" +INCLUDE "constants/music_constants.asm" INCLUDE "constants/npctrade_constants.asm" +INCLUDE "constants/phone_constants.asm" +INCLUDE "constants/pokemon_constants.asm" +INCLUDE "constants/pokemon_data_constants.asm" +INCLUDE "constants/printer_constants.asm" +INCLUDE "constants/radio_constants.asm" +INCLUDE "constants/scgb_constants.asm" +INCLUDE "constants/script_constants.asm" +INCLUDE "constants/serial_constants.asm" +INCLUDE "constants/sfx_constants.asm" +INCLUDE "constants/sprite_anim_constants.asm" INCLUDE "constants/sprite_constants.asm" INCLUDE "constants/sprite_data_constants.asm" -INCLUDE "constants/sprite_anim_constants.asm" +INCLUDE "constants/std_constants.asm" INCLUDE "constants/tileset_constants.asm" -INCLUDE "constants/collision_constants.asm" -INCLUDE "constants/scgb_constants.asm" -INCLUDE "constants/battle_tower_constants.asm" -INCLUDE "constants/cry_constants.asm" -INCLUDE "constants/audio_constants.asm" -INCLUDE "constants/printer_constants.asm" -INCLUDE "constants/menu_constants.asm" +INCLUDE "constants/trainer_constants.asm" +INCLUDE "constants/trainer_data_constants.asm" +INCLUDE "constants/type_constants.asm" diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 1b287b236..a3d68da1a 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -25,6 +25,11 @@ EXP_BAR_LENGTH EQU 8 ; tiles HP_BAR_LENGTH_PX EQU HP_BAR_LENGTH * TILE_WIDTH ; pixels EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * TILE_WIDTH ; pixels +; GetHPPal return values (see home.asm) +HP_GREEN EQU 0 +HP_YELLOW EQU 1 +HP_RED EQU 2 + ; sprite_oam_struct members (see macros/wram.asm) const_def diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 9af003e5a..a6c0b0888 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -11,11 +11,6 @@ RESET_FLAG EQU 0 SET_FLAG EQU 1 CHECK_FLAG EQU 2 -; GetHPPal return values (see home.asm) -HP_GREEN EQU 0 -HP_YELLOW EQU 1 -HP_RED EQU 2 - ; G/S version ID: 0 = Gold, 1 = Silver (used by checkver) GS_VERSION EQU 0 @@ -27,6 +22,24 @@ SAVE_CHECK_VALUE_2 EQU 127 HMENURETURN_SCRIPT EQU %10000000 HMENURETURN_ASM EQU %11111111 +; time of day boundaries +MORN_HOUR EQU 4 ; 4 AM +DAY_HOUR EQU 10 ; 10 AM +NITE_HOUR EQU 18 ; 6 PM +NOON_HOUR EQU 12 ; 12 PM +MAX_HOUR EQU 24 ; 12 AM + +; significant money values +START_MONEY EQU 3000 +MOM_MONEY EQU 2300 +MAX_MONEY EQU 999999 +MAX_COINS EQU 9999 + +MAX_LINK_RECORD EQU 9999 + +MAX_DAY_CARE_EXP EQU $500000 + + ; DoPlayerMovement.DoStep arguments (see engine/player_movement.asm) const_def const STEP_SLOW ; 0 @@ -38,29 +51,6 @@ HMENURETURN_ASM EQU %11111111 const STEP_BACK_LEDGE ; 6 const STEP_WALK_IN_PLACE ; 7 -; time of day boundaries -MORN_HOUR EQU 4 ; 4 AM -DAY_HOUR EQU 10 ; 10 AM -NITE_HOUR EQU 18 ; 6 PM -NOON_HOUR EQU 12 ; 12 PM -MAX_HOUR EQU 24 ; 12 AM - -; boxes -MONS_PER_BOX EQU 20 -NUM_BOXES EQU 14 - -; hall of fame -HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH +- 1) ; species, id, dvs, level, nick -HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator -NUM_HOF_TEAMS = 30 - -MAX_LINK_RECORD EQU 9999 - -; significant money values -START_MONEY EQU 3000 -MOM_MONEY EQU 2300 -MAX_MONEY EQU 999999 -MAX_COINS EQU 9999 ; ChangeHappiness arguments (see data/happiness_changes.asm) const_value = 1 @@ -84,8 +74,6 @@ const_value = 1 const HAPPINESS_GROOMING ; 12 const HAPPINESS_GAINLEVELATHOME ; 13 -; day-care -MAX_DAY_CARE_EXP EQU $500000 ; bug-catching contest BUG_CONTEST_MINUTES EQU 20 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index b223f2e15..d07862390 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -120,6 +120,15 @@ CAUGHT_EGG_LEVEL EQU 1 ; maximum number of party pokemon PARTY_LENGTH EQU 6 +; boxes +MONS_PER_BOX EQU 20 +NUM_BOXES EQU 14 + +; hall of fame +HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH +- 1) ; species, id, dvs, level, nick +HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator +NUM_HOF_TEAMS = 30 + ; evolution types (used in data/pokemon/evos_attacks.asm) const_value set 1 From dcc0ca9b8396505455b5ca6c8ff36440bef8de7e Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 25 Jan 2018 17:30:13 -0500 Subject: [PATCH 042/135] Move some more constants out of misc_constants.asm --- constants/map_data_constants.asm | 11 ++++++++ constants/menu_constants.asm | 4 +++ constants/misc_constants.asm | 42 ++-------------------------- constants/pokemon_data_constants.asm | 22 +++++++++++++++ 4 files changed, 39 insertions(+), 40 deletions(-) diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 11063bec0..141899578 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -183,3 +183,14 @@ INVISIBLE EQU 0 FIXED_FACING EQU 2 SLIDING EQU 3 EMOTE_OBJECT EQU 7 + +; DoPlayerMovement.DoStep arguments (see engine/player_movement.asm) + const_def + const STEP_SLOW ; 0 + const STEP_WALK ; 1 + const STEP_BIKE ; 2 + const STEP_LEDGE ; 3 + const STEP_ICE ; 4 + const STEP_TURN ; 5 + const STEP_BACK_LEDGE ; 6 + const STEP_WALK_IN_PLACE ; 7 diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm index 390d3921c..8f1257593 100644 --- a/constants/menu_constants.asm +++ b/constants/menu_constants.asm @@ -65,3 +65,7 @@ MONMENU_FIELD_MOVE EQU 0 MONMENU_MENUOPTION EQU 1 NUM_MONMENU_ITEMS EQU 8 + +; start/select menu return values +HMENURETURN_SCRIPT EQU %10000000 +HMENURETURN_ASM EQU %11111111 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index a6c0b0888..d1423eae0 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -18,10 +18,6 @@ GS_VERSION EQU 0 SAVE_CHECK_VALUE_1 EQU 99 SAVE_CHECK_VALUE_2 EQU 127 -; hMenuReturn -HMENURETURN_SCRIPT EQU %10000000 -HMENURETURN_ASM EQU %11111111 - ; time of day boundaries MORN_HOUR EQU 4 ; 4 AM DAY_HOUR EQU 10 ; 10 AM @@ -35,46 +31,12 @@ MOM_MONEY EQU 2300 MAX_MONEY EQU 999999 MAX_COINS EQU 9999 +; link record MAX_LINK_RECORD EQU 9999 +; day-care MAX_DAY_CARE_EXP EQU $500000 - -; DoPlayerMovement.DoStep arguments (see engine/player_movement.asm) - const_def - const STEP_SLOW ; 0 - const STEP_WALK ; 1 - const STEP_BIKE ; 2 - const STEP_LEDGE ; 3 - const STEP_ICE ; 4 - const STEP_TURN ; 5 - const STEP_BACK_LEDGE ; 6 - const STEP_WALK_IN_PLACE ; 7 - - -; ChangeHappiness arguments (see data/happiness_changes.asm) -const_value = 1 - const HAPPINESS_GAINLEVEL ; 01 - const HAPPINESS_USEDITEM ; 02 - const HAPPINESS_USEDXITEM ; 03 - const HAPPINESS_GYMBATTLE ; 04 - const HAPPINESS_LEARNMOVE ; 05 - const HAPPINESS_FAINTED ; 06 - const HAPPINESS_POISONFAINT ; 07 - const HAPPINESS_BEATENBYSTRONGFOE ; 08 - const HAPPINESS_YOUNGCUT1 ; 09 - const HAPPINESS_YOUNGCUT2 ; 0a - const HAPPINESS_YOUNGCUT3 ; 0b - const HAPPINESS_OLDERCUT1 ; 0c - const HAPPINESS_OLDERCUT2 ; 0d - const HAPPINESS_OLDERCUT3 ; 0e - const HAPPINESS_BITTERPOWDER ; 0f - const HAPPINESS_ENERGYROOT ; 10 - const HAPPINESS_REVIVALHERB ; 11 - const HAPPINESS_GROOMING ; 12 - const HAPPINESS_GAINLEVELATHOME ; 13 - - ; bug-catching contest BUG_CONTEST_MINUTES EQU 20 BUG_CONTEST_SECONDS EQU 0 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index d07862390..09a5abfd1 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -182,6 +182,28 @@ NUM_TREEMON_SETS EQU const_value const TREEMON_SCORE_RARE ; 2 +; ChangeHappiness arguments (see data/happiness_changes.asm) +const_value = 1 + const HAPPINESS_GAINLEVEL ; 01 + const HAPPINESS_USEDITEM ; 02 + const HAPPINESS_USEDXITEM ; 03 + const HAPPINESS_GYMBATTLE ; 04 + const HAPPINESS_LEARNMOVE ; 05 + const HAPPINESS_FAINTED ; 06 + const HAPPINESS_POISONFAINT ; 07 + const HAPPINESS_BEATENBYSTRONGFOE ; 08 + const HAPPINESS_YOUNGCUT1 ; 09 + const HAPPINESS_YOUNGCUT2 ; 0a + const HAPPINESS_YOUNGCUT3 ; 0b + const HAPPINESS_OLDERCUT1 ; 0c + const HAPPINESS_OLDERCUT2 ; 0d + const HAPPINESS_OLDERCUT3 ; 0e + const HAPPINESS_BITTERPOWDER ; 0f + const HAPPINESS_ENERGYROOT ; 10 + const HAPPINESS_REVIVALHERB ; 11 + const HAPPINESS_GROOMING ; 12 + const HAPPINESS_GAINLEVELATHOME ; 13 + ; significant happiness values BASE_HAPPINESS EQU 70 FRIEND_BALL_HAPPINESS EQU 200 From 7d3ad2136aac8483fa89a4ad0ac7608cd45658a9 Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 25 Jan 2018 18:10:41 -0500 Subject: [PATCH 043/135] Separate home/battle_vars.asm for easy data editing, same as home/hm_moves.asm --- constants/battle_constants.asm | 4 +- home/battle.asm | 95 +-------------------------- home/battle_vars.asm | 113 +++++++++++++++++++++++++++++++++ home/map_objects.asm | 5 +- 4 files changed, 120 insertions(+), 97 deletions(-) create mode 100644 home/battle_vars.asm diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index 816625e60..6f4f48669 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -96,7 +96,7 @@ const_value set 1 const BATTLETYPE_CELEBI const BATTLETYPE_SUICUNE -; GetBattleVar and GetBattleVarAddr arguments (see home/battle.asm) +; BattleVarPairs indexes (see home/battle.asm) const_def const BATTLE_VARS_SUBSTATUS1 const BATTLE_VARS_SUBSTATUS2 @@ -120,7 +120,7 @@ const_value set 1 const BATTLE_VARS_LAST_MOVE const BATTLE_VARS_LAST_MOVE_OPP -; GetBattleVar and GetBattleVarAddr internal indexes (see home/battle.asm) +; BattleVarLocations indexes (see home/battle.asm) const_def const PLAYER_SUBSTATUS_1 const ENEMY_SUBSTATUS_1 diff --git a/home/battle.asm b/home/battle.asm index 30096fd4a..8cbf5fc0b 100644 --- a/home/battle.asm +++ b/home/battle.asm @@ -136,100 +136,7 @@ UpdateBattleHuds:: ; 39d4 ; 39e1 -GetBattleVar:: ; 39e1 -; Preserves hl. - push hl - call GetBattleVarAddr - pop hl - ret -; 39e7 - -GetBattleVarAddr:: ; 39e7 -; Get variable from pair a, depending on whose turn it is. -; There are 21 variable pairs. - - push bc - - ld hl, .battlevarpairs - ld c, a - ld b, 0 - add hl, bc - add hl, bc - - ld a, [hli] - ld h, [hl] - ld l, a - -; Enemy turn uses the second byte instead. -; This lets battle variable calls be side-neutral. - ld a, [hBattleTurn] - and a - jr z, .getvar - inc hl - -.getvar -; var id - ld a, [hl] - ld c, a - ld b, 0 - - ld hl, .vars - add hl, bc - add hl, bc - - ld a, [hli] - ld h, [hl] - ld l, a - - ld a, [hl] - - pop bc - ret - -.battlevarpairs - dw .substatus1, .substatus2, .substatus3, .substatus4, .substatus5 - dw .substatus1opp, .substatus2opp, .substatus3opp, .substatus4opp, .substatus5opp - dw .status, .statusopp, .animation, .effect, .power, .type - dw .curmove, .lastcounter, .lastcounteropp, .lastmove, .lastmoveopp - -; player enemy -.substatus1 db PLAYER_SUBSTATUS_1, ENEMY_SUBSTATUS_1 -.substatus1opp db ENEMY_SUBSTATUS_1, PLAYER_SUBSTATUS_1 -.substatus2 db PLAYER_SUBSTATUS_2, ENEMY_SUBSTATUS_2 -.substatus2opp db ENEMY_SUBSTATUS_2, PLAYER_SUBSTATUS_2 -.substatus3 db PLAYER_SUBSTATUS_3, ENEMY_SUBSTATUS_3 -.substatus3opp db ENEMY_SUBSTATUS_3, PLAYER_SUBSTATUS_3 -.substatus4 db PLAYER_SUBSTATUS_4, ENEMY_SUBSTATUS_4 -.substatus4opp db ENEMY_SUBSTATUS_4, PLAYER_SUBSTATUS_4 -.substatus5 db PLAYER_SUBSTATUS_5, ENEMY_SUBSTATUS_5 -.substatus5opp db ENEMY_SUBSTATUS_5, PLAYER_SUBSTATUS_5 -.status db PLAYER_STATUS, ENEMY_STATUS -.statusopp db ENEMY_STATUS, PLAYER_STATUS -.animation db PLAYER_MOVE_ANIMATION, ENEMY_MOVE_ANIMATION -.effect db PLAYER_MOVE_EFFECT, ENEMY_MOVE_EFFECT -.power db PLAYER_MOVE_POWER, ENEMY_MOVE_POWER -.type db PLAYER_MOVE_TYPE, ENEMY_MOVE_TYPE -.curmove db PLAYER_CUR_MOVE, ENEMY_CUR_MOVE -.lastcounter db PLAYER_COUNTER_MOVE, ENEMY_COUNTER_MOVE -.lastcounteropp db ENEMY_COUNTER_MOVE, PLAYER_COUNTER_MOVE -.lastmove db PLAYER_LAST_MOVE, ENEMY_LAST_MOVE -.lastmoveopp db ENEMY_LAST_MOVE, PLAYER_LAST_MOVE - -.vars - dw PlayerSubStatus1, EnemySubStatus1 - dw PlayerSubStatus2, EnemySubStatus2 - dw PlayerSubStatus3, EnemySubStatus3 - dw PlayerSubStatus4, EnemySubStatus4 - dw PlayerSubStatus5, EnemySubStatus5 - dw BattleMonStatus, EnemyMonStatus - dw wPlayerMoveStructAnimation, wEnemyMoveStructAnimation - dw wPlayerMoveStructEffect, wEnemyMoveStructEffect - dw wPlayerMoveStructPower, wEnemyMoveStructPower - dw wPlayerMoveStructType, wEnemyMoveStructType - dw CurPlayerMove, CurEnemyMove - dw LastPlayerCounterMove, LastEnemyCounterMove - dw LastPlayerMove, LastEnemyMove -; 3a90 +INCLUDE "home/battle_vars.asm" FarCopyRadioText:: ; 3a90 diff --git a/home/battle_vars.asm b/home/battle_vars.asm new file mode 100644 index 000000000..b66301e78 --- /dev/null +++ b/home/battle_vars.asm @@ -0,0 +1,113 @@ +GetBattleVar:: ; 39e1 +; Preserves hl. + push hl + call GetBattleVarAddr + pop hl + ret +; 39e7 + +GetBattleVarAddr:: ; 39e7 +; Get variable from pair a, depending on whose turn it is. +; There are 21 variable pairs. + + push bc + + ld hl, BattleVarPairs + ld c, a + ld b, 0 + add hl, bc + add hl, bc + + ld a, [hli] + ld h, [hl] + ld l, a + +; Enemy turn uses the second byte instead. +; This lets battle variable calls be side-neutral. + ld a, [hBattleTurn] + and a + jr z, .getvar + inc hl + +.getvar +; var id + ld a, [hl] + ld c, a + ld b, 0 + + ld hl, BattleVarLocations + add hl, bc + add hl, bc + + ld a, [hli] + ld h, [hl] + ld l, a + + ld a, [hl] + + pop bc + ret + +BattleVarPairs: +; entries correspond to BATTLE_VARS_* constants + dw .substatus1 + dw .substatus2 + dw .substatus3 + dw .substatus4 + dw .substatus5 + dw .substatus1opp + dw .substatus2opp + dw .substatus3opp + dw .substatus4opp + dw .substatus5opp + dw .status + dw .statusopp + dw .animation + dw .effect + dw .power + dw .type + dw .curmove + dw .lastcounter + dw .lastcounteropp + dw .lastmove + dw .lastmoveopp + +; player enemy +.substatus1: db PLAYER_SUBSTATUS_1, ENEMY_SUBSTATUS_1 +.substatus1opp: db ENEMY_SUBSTATUS_1, PLAYER_SUBSTATUS_1 +.substatus2: db PLAYER_SUBSTATUS_2, ENEMY_SUBSTATUS_2 +.substatus2opp: db ENEMY_SUBSTATUS_2, PLAYER_SUBSTATUS_2 +.substatus3: db PLAYER_SUBSTATUS_3, ENEMY_SUBSTATUS_3 +.substatus3opp: db ENEMY_SUBSTATUS_3, PLAYER_SUBSTATUS_3 +.substatus4: db PLAYER_SUBSTATUS_4, ENEMY_SUBSTATUS_4 +.substatus4opp: db ENEMY_SUBSTATUS_4, PLAYER_SUBSTATUS_4 +.substatus5: db PLAYER_SUBSTATUS_5, ENEMY_SUBSTATUS_5 +.substatus5opp: db ENEMY_SUBSTATUS_5, PLAYER_SUBSTATUS_5 +.status: db PLAYER_STATUS, ENEMY_STATUS +.statusopp: db ENEMY_STATUS, PLAYER_STATUS +.animation: db PLAYER_MOVE_ANIMATION, ENEMY_MOVE_ANIMATION +.effect: db PLAYER_MOVE_EFFECT, ENEMY_MOVE_EFFECT +.power: db PLAYER_MOVE_POWER, ENEMY_MOVE_POWER +.type: db PLAYER_MOVE_TYPE, ENEMY_MOVE_TYPE +.curmove: db PLAYER_CUR_MOVE, ENEMY_CUR_MOVE +.lastcounter: db PLAYER_COUNTER_MOVE, ENEMY_COUNTER_MOVE +.lastcounteropp: db ENEMY_COUNTER_MOVE, PLAYER_COUNTER_MOVE +.lastmove: db PLAYER_LAST_MOVE, ENEMY_LAST_MOVE +.lastmoveopp: db ENEMY_LAST_MOVE, PLAYER_LAST_MOVE + +BattleVarLocations: +; entries correspond to PLAYER_* and ENEMY_* constants + dw PlayerSubStatus1, EnemySubStatus1 + dw PlayerSubStatus2, EnemySubStatus2 + dw PlayerSubStatus3, EnemySubStatus3 + dw PlayerSubStatus4, EnemySubStatus4 + dw PlayerSubStatus5, EnemySubStatus5 + dw BattleMonStatus, EnemyMonStatus + dw wPlayerMoveStructAnimation, wEnemyMoveStructAnimation + dw wPlayerMoveStructEffect, wEnemyMoveStructEffect + dw wPlayerMoveStructPower, wEnemyMoveStructPower + dw wPlayerMoveStructType, wEnemyMoveStructType + dw CurPlayerMove, CurEnemyMove + dw LastPlayerCounterMove, LastEnemyCounterMove + dw LastPlayerMove, LastEnemyMove +; 3a90 diff --git a/home/map_objects.asm b/home/map_objects.asm index 1db2bb3ba..44182d422 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -276,7 +276,10 @@ CheckObjectTime:: ; 18f5 ret .TimeOfDayValues_191e: - db MORN, DAY, NITE +; entries correspond to TimeOfDay values + db MORN + db DAY + db NITE .check_hour ld hl, MAPOBJECT_HOUR From d504fb88529526f988985f7faaf70609263cb4a0 Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 25 Jan 2018 20:34:33 -0500 Subject: [PATCH 044/135] Move AI data tables into data/battle/ai (mirroring engine/battle/ai) so they're more discoverable. --- constants/trainer_data_constants.asm | 1 + data/battle/ai/constant_damage_effects.asm | 11 ++ data/battle/ai/encore_moves.asm | 35 ++++ data/battle/ai/rain_dance_moves.asm | 16 ++ data/battle/ai/reckless_moves.asm | 10 ++ data/battle/ai/residual_moves.asm | 17 ++ data/battle/ai/risky_effects.asm | 8 + data/battle/ai/stall_moves.asm | 38 +++++ data/battle/ai/status_only_effects.asm | 10 ++ data/battle/ai/sunny_day_moves.asm | 13 ++ data/battle/ai/useful_moves.asm | 24 +++ engine/battle/ai/move.asm | 1 + engine/battle/ai/scoring.asm | 181 ++------------------- 13 files changed, 201 insertions(+), 164 deletions(-) create mode 100644 data/battle/ai/constant_damage_effects.asm create mode 100644 data/battle/ai/encore_moves.asm create mode 100644 data/battle/ai/rain_dance_moves.asm create mode 100644 data/battle/ai/reckless_moves.asm create mode 100644 data/battle/ai/residual_moves.asm create mode 100644 data/battle/ai/risky_effects.asm create mode 100644 data/battle/ai/stall_moves.asm create mode 100644 data/battle/ai/status_only_effects.asm create mode 100644 data/battle/ai/sunny_day_moves.asm create mode 100644 data/battle/ai/useful_moves.asm diff --git a/constants/trainer_data_constants.asm b/constants/trainer_data_constants.asm index 2d87d8764..00c1c6c38 100644 --- a/constants/trainer_data_constants.asm +++ b/constants/trainer_data_constants.asm @@ -10,6 +10,7 @@ NUM_TRAINER_ATTRIBUTES EQU const_value ; TRNATTR_AI_MOVE_WEIGHTS bit flags (wEnemyTrainerAIFlags) +; AIScoringPointers indexes (see engine/battle/ai/move.asm) const_def const NO_AI const_value = 0 diff --git a/data/battle/ai/constant_damage_effects.asm b/data/battle/ai/constant_damage_effects.asm new file mode 100644 index 000000000..0ce67c191 --- /dev/null +++ b/data/battle/ai/constant_damage_effects.asm @@ -0,0 +1,11 @@ +; AIDamageCalc uses BattleCommand_ConstantDamage +; to calculate damage for these instead of +; BattleCommand_DamageCalc and BattleCommand_Stab. + +ConstantDamageEffects: ; 39413 + db EFFECT_SUPER_FANG + db EFFECT_STATIC_DAMAGE + db EFFECT_LEVEL_DAMAGE + db EFFECT_PSYWAVE + db -1 ; end +; 39418 diff --git a/data/battle/ai/encore_moves.asm b/data/battle/ai/encore_moves.asm new file mode 100644 index 000000000..b18f2419d --- /dev/null +++ b/data/battle/ai/encore_moves.asm @@ -0,0 +1,35 @@ +; AI_SMART encourages these moves with Encore. + +EncoreMoves: ; 38c85 + db SWORDS_DANCE + db WHIRLWIND + db LEER + db ROAR + db DISABLE + db MIST + db LEECH_SEED + db GROWTH + db POISONPOWDER + db STRING_SHOT + db MEDITATE + db AGILITY + db TELEPORT + db SCREECH + db HAZE + db FOCUS_ENERGY + db DREAM_EATER + db POISON_GAS + db SPLASH + db SHARPEN + db CONVERSION + db SUPER_FANG + db SUBSTITUTE + db TRIPLE_KICK + db SPIDER_WEB + db MIND_READER + db FLAME_WHEEL + db AEROBLAST + db COTTON_SPORE + db POWDER_SNOW + db -1 ; end +; 38ca4 diff --git a/data/battle/ai/rain_dance_moves.asm b/data/battle/ai/rain_dance_moves.asm new file mode 100644 index 000000000..05cf68670 --- /dev/null +++ b/data/battle/ai/rain_dance_moves.asm @@ -0,0 +1,16 @@ +; AI_SMART prefers these moves during rain. + +RainDanceMoves: ; 390e7 + db WATER_GUN + db HYDRO_PUMP + db SURF + db BUBBLEBEAM + db THUNDER + db WATERFALL + db CLAMP + db BUBBLE + db CRABHAMMER + db OCTAZOOKA + db WHIRLPOOL + db -1 ; end +; 390f3 diff --git a/data/battle/ai/reckless_moves.asm b/data/battle/ai/reckless_moves.asm new file mode 100644 index 000000000..40bc070d8 --- /dev/null +++ b/data/battle/ai/reckless_moves.asm @@ -0,0 +1,10 @@ +; AI_AGGRESSIVE does not discourage these moves +; even if a stronger one is available. + +RecklessMoves: ; 393e2 + db EFFECT_SELFDESTRUCT + db EFFECT_RAMPAGE + db EFFECT_MULTI_HIT + db EFFECT_DOUBLE_HIT + db -1 ; end +; 393e7 diff --git a/data/battle/ai/residual_moves.asm b/data/battle/ai/residual_moves.asm new file mode 100644 index 000000000..99407e238 --- /dev/null +++ b/data/battle/ai/residual_moves.asm @@ -0,0 +1,17 @@ +; AI_CAUTIOUS discourages these moves after the first turn. + +ResidualMoves: + db MIST + db LEECH_SEED + db POISONPOWDER + db STUN_SPORE + db THUNDER_WAVE + db FOCUS_ENERGY + db BIDE + db POISON_GAS + db TRANSFORM + db CONVERSION + db SUBSTITUTE + db SPIKES + db -1 ; end +; 39453 diff --git a/data/battle/ai/risky_effects.asm b/data/battle/ai/risky_effects.asm new file mode 100644 index 000000000..2ca0bc655 --- /dev/null +++ b/data/battle/ai/risky_effects.asm @@ -0,0 +1,8 @@ +; AI_RISKY will not use these effects at max HP +; even if they would KO the player. + +RiskyEffects: ; 394ff + db EFFECT_SELFDESTRUCT + db EFFECT_OHKO + db -1 ; end +; 39502 diff --git a/data/battle/ai/stall_moves.asm b/data/battle/ai/stall_moves.asm new file mode 100644 index 000000000..5a017dadf --- /dev/null +++ b/data/battle/ai/stall_moves.asm @@ -0,0 +1,38 @@ +; AI_OPPORTUNIST discourages these moves +; when the player's HP is low. + +StallMoves: ; 39348 + db SWORDS_DANCE + db TAIL_WHIP + db LEER + db GROWL + db DISABLE + db MIST + db COUNTER + db LEECH_SEED + db GROWTH + db STRING_SHOT + db MEDITATE + db AGILITY + db RAGE + db MIMIC + db SCREECH + db HARDEN + db WITHDRAW + db DEFENSE_CURL + db BARRIER + db LIGHT_SCREEN + db HAZE + db REFLECT + db FOCUS_ENERGY + db BIDE + db AMNESIA + db TRANSFORM + db SPLASH + db ACID_ARMOR + db SHARPEN + db CONVERSION + db SUBSTITUTE + db FLAME_WHEEL + db -1 ; end +; 39369 diff --git a/data/battle/ai/status_only_effects.asm b/data/battle/ai/status_only_effects.asm new file mode 100644 index 000000000..daeadb46c --- /dev/null +++ b/data/battle/ai/status_only_effects.asm @@ -0,0 +1,10 @@ +; AI_BASIC discourages these effects if the player +; already has a status condition. + +StatusOnlyEffects: ; 385db + db EFFECT_SLEEP + db EFFECT_TOXIC + db EFFECT_POISON + db EFFECT_PARALYZE + db -1 ; end +; 385e0 diff --git a/data/battle/ai/sunny_day_moves.asm b/data/battle/ai/sunny_day_moves.asm new file mode 100644 index 000000000..0ec59bc9e --- /dev/null +++ b/data/battle/ai/sunny_day_moves.asm @@ -0,0 +1,13 @@ +; AI_SMART prefers these moves during harsh sunlight. + +SunnyDayMoves: ; 39134 + db FIRE_PUNCH + db EMBER + db FLAMETHROWER + db FIRE_SPIN + db FIRE_BLAST + db SACRED_FIRE + db MORNING_SUN + db SYNTHESIS + db -1 ; end +; 3913d diff --git a/data/battle/ai/useful_moves.asm b/data/battle/ai/useful_moves.asm new file mode 100644 index 000000000..3bab9e598 --- /dev/null +++ b/data/battle/ai/useful_moves.asm @@ -0,0 +1,24 @@ +; AI_SMART knows these moves are usable all-around. + +UsefulMoves: ; 39301 + db DOUBLE_EDGE + db SING + db FLAMETHROWER + db HYDRO_PUMP + db SURF + db ICE_BEAM + db BLIZZARD + db HYPER_BEAM + db SLEEP_POWDER + db THUNDERBOLT + db THUNDER + db EARTHQUAKE + db TOXIC + db PSYCHIC_M + db HYPNOSIS + db RECOVER + db FIRE_BLAST + db SOFTBOILED + db SUPER_FANG + db -1 ; end +; 39315 diff --git a/engine/battle/ai/move.asm b/engine/battle/ai/move.asm index 7ccb20972..cee2037e3 100755 --- a/engine/battle/ai/move.asm +++ b/engine/battle/ai/move.asm @@ -202,6 +202,7 @@ AIChooseMove: ; 440ce AIScoringPointers: ; 441af +; entries correspond to AI_* constants dw AI_Basic dw AI_Setup dw AI_Types diff --git a/engine/battle/ai/scoring.asm b/engine/battle/ai/scoring.asm index 73284435a..902910b86 100644 --- a/engine/battle/ai/scoring.asm +++ b/engine/battle/ai/scoring.asm @@ -40,7 +40,7 @@ AI_Basic: ; 38591 push hl push de push bc - ld hl, .statusonlyeffects + ld hl, StatusOnlyEffects ld de, 1 call IsInArray @@ -63,13 +63,7 @@ AI_Basic: ; 38591 jr .checkmove ; 385db -.statusonlyeffects - db EFFECT_SLEEP - db EFFECT_TOXIC - db EFFECT_POISON - db EFFECT_PARALYZE - db -1 ; end -; 385e0 +INCLUDE "data/battle/ai/status_only_effects.asm" @@ -1502,7 +1496,7 @@ AI_Smart_Encore: ; 38c3b .asm_38c68 push hl ld a, [LastPlayerCounterMove] - ld hl, .EncoreMoves + ld hl, EncoreMoves ld de, 1 call IsInArray pop hl @@ -1522,39 +1516,7 @@ AI_Smart_Encore: ; 38c3b inc [hl] ret -.EncoreMoves: - db SWORDS_DANCE - db WHIRLWIND - db LEER - db ROAR - db DISABLE - db MIST - db LEECH_SEED - db GROWTH - db POISONPOWDER - db STRING_SHOT - db MEDITATE - db AGILITY - db TELEPORT - db SCREECH - db HAZE - db FOCUS_ENERGY - db DREAM_EATER - db POISON_GAS - db SPLASH - db SHARPEN - db CONVERSION - db SUPER_FANG - db SUBSTITUTE - db TRIPLE_KICK - db SPIDER_WEB - db MIND_READER - db FLAME_WHEEL - db AEROBLAST - db COTTON_SPORE - db POWDER_SNOW - db -1 ; end -; 38ca4 +INCLUDE "data/battle/ai/encore_moves.asm" AI_Smart_PainSplit: ; 38ca4 @@ -2521,20 +2483,7 @@ AI_Smart_RainDance: ; 390cb jr AI_Smart_WeatherMove ; 390e7 -RainDanceMoves: ; 390e7 - db WATER_GUN - db HYDRO_PUMP - db SURF - db BUBBLEBEAM - db THUNDER - db WATERFALL - db CLAMP - db BUBBLE - db CRABHAMMER - db OCTAZOOKA - db WHIRLPOOL - db -1 ; end -; 390f3 +INCLUDE "data/battle/ai/rain_dance_moves.asm" AI_Smart_SunnyDay: ; 390f3 @@ -2613,17 +2562,7 @@ AIGoodWeatherType: ; 39122 ; 39134 -SunnyDayMoves: ; 39134 - db FIRE_PUNCH - db EMBER - db FLAMETHROWER - db FIRE_SPIN - db FIRE_BLAST - db SACRED_FIRE - db MORNING_SUN - db SYNTHESIS - db -1 ; end -; 3913d +INCLUDE "data/battle/ai/sunny_day_moves.asm" AI_Smart_BellyDrum: ; 3913d @@ -3104,29 +3043,7 @@ AIHasMoveInArray: ; 392e6 ; 39301 -UsefulMoves: ; 39301 -; Moves that are usable all-around. - db DOUBLE_EDGE - db SING - db FLAMETHROWER - db HYDRO_PUMP - db SURF - db ICE_BEAM - db BLIZZARD - db HYPER_BEAM - db SLEEP_POWDER - db THUNDERBOLT - db THUNDER - db EARTHQUAKE - db TOXIC - db PSYCHIC_M - db HYPNOSIS - db RECOVER - db FIRE_BLAST - db SOFTBOILED - db SUPER_FANG - db -1 ; end -; 39315 +INCLUDE "data/battle/ai/useful_moves.asm" AI_Opportunist: ; 39315 @@ -3161,7 +3078,7 @@ AI_Opportunist: ; 39315 push hl push de push bc - ld hl, .stallmoves + ld hl, StallMoves ld de, 1 call IsInArray @@ -3176,41 +3093,7 @@ AI_Opportunist: ; 39315 .asm_39347 ret -.stallmoves - db SWORDS_DANCE - db TAIL_WHIP - db LEER - db GROWL - db DISABLE - db MIST - db COUNTER - db LEECH_SEED - db GROWTH - db STRING_SHOT - db MEDITATE - db AGILITY - db RAGE - db MIMIC - db SCREECH - db HARDEN - db WITHDRAW - db DEFENSE_CURL - db BARRIER - db LIGHT_SCREEN - db HAZE - db REFLECT - db FOCUS_ENERGY - db BIDE - db AMNESIA - db TRANSFORM - db SPLASH - db ACID_ARMOR - db SHARPEN - db CONVERSION - db SUBSTITUTE - db FLAME_WHEEL - db -1 ; end -; 39369 +INCLUDE "data/battle/ai/stall_moves.asm" @@ -3304,7 +3187,7 @@ AI_Aggressive: ; 39369 push de push bc ld a, [wEnemyMoveStruct + MOVE_EFFECT] - ld hl, .RecklessMoves + ld hl, RecklessMoves ld de, 1 call IsInArray pop bc @@ -3319,13 +3202,7 @@ AI_Aggressive: ; 39369 .done ret -.RecklessMoves: - db EFFECT_SELFDESTRUCT - db EFFECT_RAMPAGE - db EFFECT_MULTI_HIT - db EFFECT_DOUBLE_HIT - db -1 ; end -; 393e7 +INCLUDE "data/battle/ai/reckless_moves.asm" AIDamageCalc: ; 393e7 @@ -3333,7 +3210,7 @@ AIDamageCalc: ; 393e7 ld [hBattleTurn], a ld a, [wEnemyMoveStruct + MOVE_EFFECT] ld de, 1 - ld hl, .ConstantDamageEffects + ld hl, ConstantDamageEffects call IsInArray jr nc, .asm_39400 callfar BattleCommand_ConstantDamage @@ -3345,13 +3222,7 @@ AIDamageCalc: ; 393e7 callfar BattleCommand_Stab ret -.ConstantDamageEffects: - db EFFECT_SUPER_FANG - db EFFECT_STATIC_DAMAGE - db EFFECT_LEVEL_DAMAGE - db EFFECT_PSYWAVE - db -1 ; end -; 39418 +INCLUDE "data/battle/ai/constant_damage_effects.asm" AI_Cautious: ; 39418 @@ -3377,7 +3248,7 @@ AI_Cautious: ; 39418 push hl push de push bc - ld hl, .residualmoves + ld hl, ResidualMoves ld de, 1 call IsInArray @@ -3393,21 +3264,7 @@ AI_Cautious: ; 39418 inc [hl] jr .asm_39425 -.residualmoves - db MIST - db LEECH_SEED - db POISONPOWDER - db STUN_SPORE - db THUNDER_WAVE - db FOCUS_ENERGY - db BIDE - db POISON_GAS - db TRANSFORM - db CONVERSION - db SUBSTITUTE - db SPIKES - db -1 ; end -; 39453 +INCLUDE "data/battle/ai/residual_moves.asm" @@ -3504,7 +3361,7 @@ AI_Risky: ; 394a9 ; Don't use risky moves at max hp. ld a, [wEnemyMoveStruct + MOVE_EFFECT] ld de, 1 - ld hl, .RiskyMoves + ld hl, RiskyEffects call IsInArray jr nc, .checkko @@ -3541,11 +3398,7 @@ endr pop de jr .checkmove -.RiskyMoves: - db EFFECT_SELFDESTRUCT - db EFFECT_OHKO - db -1 ; end -; 39502 +INCLUDE "data/battle/ai/risky_effects.asm" From 87514598bedf66be222d85ebbc7565c14d79e0f4 Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 25 Jan 2018 21:34:42 -0500 Subject: [PATCH 045/135] More battle data in data/battle/ --- data/battle/accuracy_multipliers.asm | 2 +- data/battle/badge_type_boosts.asm | 21 ++++++++ data/battle/flail_reversal_power.asm | 8 +++ data/battle/held_consumables.asm | 26 +++++++++ data/battle/held_heal_status.asm | 11 ++++ data/battle/held_stat_up.asm | 10 ++++ data/battle/magnitude_power.asm | 9 ++++ data/battle/metronome_exception_moves.asm | 18 +++++++ data/battle/present_power.asm | 6 +++ data/battle/stat_multipliers.asm | 5 +- data/battle/stat_multipliers_2.asm | 20 +++++++ data/battle/weather_modifiers.asm | 10 ++++ data/battle/wobble_probabilities.asm | 27 ++++++++++ data/items/heal_status.asm | 2 + engine/battle/consumehelditem.asm | 29 ++--------- engine/battle/core.asm | 58 +++++---------------- engine/battle/effect_commands.asm | 29 +++-------- engine/battle/effect_commands/metronome.asm | 17 +----- engine/battle/effect_commands/present.asm | 11 ++-- engine/battle/misc.asm | 41 ++------------- engine/battle/read_trainer_party.asm | 3 +- engine/battle/used_move_text.asm | 1 + engine/battle_anims/functions.asm | 3 ++ engine/battle_anims/getpokeballwobble.asm | 30 +---------- 24 files changed, 213 insertions(+), 184 deletions(-) create mode 100644 data/battle/badge_type_boosts.asm create mode 100644 data/battle/flail_reversal_power.asm create mode 100644 data/battle/held_consumables.asm create mode 100644 data/battle/held_heal_status.asm create mode 100644 data/battle/held_stat_up.asm create mode 100644 data/battle/magnitude_power.asm create mode 100644 data/battle/metronome_exception_moves.asm create mode 100644 data/battle/present_power.asm create mode 100644 data/battle/stat_multipliers_2.asm create mode 100644 data/battle/weather_modifiers.asm create mode 100644 data/battle/wobble_probabilities.asm diff --git a/data/battle/accuracy_multipliers.asm b/data/battle/accuracy_multipliers.asm index a5a309bbd..4b52a0909 100644 --- a/data/battle/accuracy_multipliers.asm +++ b/data/battle/accuracy_multipliers.asm @@ -1,5 +1,5 @@ ; Multiplier ratios for accuracy from modifier -6 to +6 -; (for other stats, see data/battle/stat_multipliers.asm) +; (for other stats, see data/battle/stat_multipliers.asm). AccuracyLevelMultipliers: db 33, 100 ; -6 = 33% diff --git a/data/battle/badge_type_boosts.asm b/data/battle/badge_type_boosts.asm new file mode 100644 index 000000000..b212ef22e --- /dev/null +++ b/data/battle/badge_type_boosts.asm @@ -0,0 +1,21 @@ +BadgeTypeBoosts: +; entries correspond to wJohtoBadges constants + db FLYING ; ZEPHYRBADGE + db BUG ; HIVEBADGE + db NORMAL ; PLAINBADGE + db GHOST ; FOGBADGE + db STEEL ; MINERALBADGE + db FIGHTING ; STORMBADGE + db ICE ; GLACIERBADGE + db DRAGON ; RISINGBADGE + ; fallthrough +; entries correspond to wKantoBadges constants + db ROCK ; BOULDERBADGE + db WATER ; CASCADEBADGE + db ELECTRIC ; THUNDERBADGE + db GRASS ; RAINBOWBADGE + db POISON ; SOULBADGE + db PSYCHIC ; MARSHBADGE + db FIRE ; VOLCANOBADGE + db GROUND ; EARTHBADGE + db -1 ; end diff --git a/data/battle/flail_reversal_power.asm b/data/battle/flail_reversal_power.asm new file mode 100644 index 000000000..fb915905e --- /dev/null +++ b/data/battle/flail_reversal_power.asm @@ -0,0 +1,8 @@ +FlailReversalPower: + ; hp bar pixels, power + db HP_BAR_LENGTH_PX / 48, 200 + db HP_BAR_LENGTH_PX / 12, 150 + db HP_BAR_LENGTH_PX / 5, 100 + db HP_BAR_LENGTH_PX / 3, 80 + db HP_BAR_LENGTH_PX * 2 / 3, 40 + db HP_BAR_LENGTH_PX, 20 diff --git a/data/battle/held_consumables.asm b/data/battle/held_consumables.asm new file mode 100644 index 000000000..c1b28822c --- /dev/null +++ b/data/battle/held_consumables.asm @@ -0,0 +1,26 @@ +; Held item effects that are consumed on use + +ConsumableEffects: ; 271de + db HELD_BERRY + db HELD_2 + db HELD_5 + db HELD_HEAL_POISON + db HELD_HEAL_FREEZE + db HELD_HEAL_BURN + db HELD_HEAL_SLEEP + db HELD_HEAL_PARALYZE + db HELD_HEAL_STATUS + db HELD_30 + db HELD_ATTACK_UP + db HELD_DEFENSE_UP + db HELD_SPEED_UP + db HELD_SP_ATTACK_UP + db HELD_SP_DEFENSE_UP + db HELD_ACCURACY_UP + db HELD_EVASION_UP + db HELD_38 + db HELD_71 + db HELD_ESCAPE + db HELD_CRITICAL_UP + db -1 +; 271f4 diff --git a/data/battle/held_heal_status.asm b/data/battle/held_heal_status.asm new file mode 100644 index 000000000..b56335189 --- /dev/null +++ b/data/battle/held_heal_status.asm @@ -0,0 +1,11 @@ +; See also data/items/heal_status.asm + +HeldStatusHealingEffects: ; 3de44 + db HELD_HEAL_POISON, 1 << PSN + db HELD_HEAL_FREEZE, 1 << FRZ + db HELD_HEAL_BURN, 1 << BRN + db HELD_HEAL_SLEEP, SLP + db HELD_HEAL_PARALYZE, 1 << PAR + db HELD_HEAL_STATUS, ALL_STATUS + db -1 ; end +; 3de51 diff --git a/data/battle/held_stat_up.asm b/data/battle/held_stat_up.asm new file mode 100644 index 000000000..a08aa1844 --- /dev/null +++ b/data/battle/held_stat_up.asm @@ -0,0 +1,10 @@ +HeldStatUpItems: + dbw HELD_ATTACK_UP, BattleCommand_AttackUp + dbw HELD_DEFENSE_UP, BattleCommand_DefenseUp + dbw HELD_SPEED_UP, BattleCommand_SpeedUp + dbw HELD_SP_ATTACK_UP, BattleCommand_SpecialAttackUp + dbw HELD_SP_DEFENSE_UP, BattleCommand_SpecialDefenseUp + dbw HELD_ACCURACY_UP, BattleCommand_AccuracyUp + dbw HELD_EVASION_UP, BattleCommand_EvasionUp + db -1 ; end +; 3df12 diff --git a/data/battle/magnitude_power.asm b/data/battle/magnitude_power.asm new file mode 100644 index 000000000..7359bdb10 --- /dev/null +++ b/data/battle/magnitude_power.asm @@ -0,0 +1,9 @@ +MagnitudePower: + ; chance, power, magnitude # + db 13, 10, 4 + db 38, 30, 5 + db 89, 50, 6 + db 166, 70, 7 + db 217, 90, 8 + db 242, 110, 9 + db 255, 150, 10 diff --git a/data/battle/metronome_exception_moves.asm b/data/battle/metronome_exception_moves.asm new file mode 100644 index 000000000..e9cd7f860 --- /dev/null +++ b/data/battle/metronome_exception_moves.asm @@ -0,0 +1,18 @@ +; Metronome cannot turn into these moves. + +MetronomeExcepts: ; 37454 + db NO_MOVE + db METRONOME + db STRUGGLE + db SKETCH + db MIMIC + db COUNTER + db MIRROR_COAT + db PROTECT + db DETECT + db ENDURE + db DESTINY_BOND + db SLEEP_TALK + db THIEF + db -1 +; 37462 diff --git a/data/battle/present_power.asm b/data/battle/present_power.asm new file mode 100644 index 000000000..885e9c692 --- /dev/null +++ b/data/battle/present_power.asm @@ -0,0 +1,6 @@ +PresentPower: + ; chance, power + db 40 percent, 40 ; 40% + db 70 percent + 1, 80 ; 30% + db 80 percent, 120 ; 10% + db -1 ; 20% chance to heal instead diff --git a/data/battle/stat_multipliers.asm b/data/battle/stat_multipliers.asm index e7cf8e472..1b9b08588 100644 --- a/data/battle/stat_multipliers.asm +++ b/data/battle/stat_multipliers.asm @@ -1,5 +1,8 @@ ; Multiplier ratios for all stats from modifier -6 to +6 -; (except accuracy, see data/battle/accuracy_multipliers.asm) +; (except accuracy, see data/battle/accuracy_multipliers.asm). + +; This table is identical to data/battle/stat_multipliers_2.asm. +; This one is used by CalcStats. StatLevelMultipliers: db 25, 100 ; -6 = 25% diff --git a/data/battle/stat_multipliers_2.asm b/data/battle/stat_multipliers_2.asm new file mode 100644 index 000000000..3f3dc2348 --- /dev/null +++ b/data/battle/stat_multipliers_2.asm @@ -0,0 +1,20 @@ +; Multiplier ratios for all stats from modifier -6 to +6 +; (except accuracy, see data/battle/accuracy_multipliers.asm). + +; This table is identical to data/battle/stat_multipliers.asm. +; This one is used by ApplyStatLevelMultiplier. + +StatLevelMultipliers_Applied: + db 25, 100 ; -6 = 25% + db 28, 100 ; -5 = 28% + db 33, 100 ; -4 = 33% + db 40, 100 ; -3 = 40% + db 50, 100 ; -2 = 50% + db 66, 100 ; -1 = 66% + db 1, 1 ; 0 = 100% + db 15, 10 ; +1 = 150% + db 2, 1 ; +2 = 200% + db 25, 10 ; +3 = 250% + db 3, 1 ; +4 = 300% + db 35, 10 ; +5 = 350% + db 4, 1 ; +6 = 400% diff --git a/data/battle/weather_modifiers.asm b/data/battle/weather_modifiers.asm new file mode 100644 index 000000000..d0acdc25f --- /dev/null +++ b/data/battle/weather_modifiers.asm @@ -0,0 +1,10 @@ +WeatherTypeModifiers: + db WEATHER_RAIN, WATER, MORE_EFFECTIVE + db WEATHER_RAIN, FIRE, NOT_VERY_EFFECTIVE + db WEATHER_SUN, FIRE, MORE_EFFECTIVE + db WEATHER_SUN, WATER, NOT_VERY_EFFECTIVE + db -1 ; end + +WeatherMoveModifiers: + db WEATHER_RAIN, EFFECT_SOLARBEAM, NOT_VERY_EFFECTIVE + db -1 ; end diff --git a/data/battle/wobble_probabilities.asm b/data/battle/wobble_probabilities.asm new file mode 100644 index 000000000..38e9a12c6 --- /dev/null +++ b/data/battle/wobble_probabilities.asm @@ -0,0 +1,27 @@ +WobbleProbabilities: +; catch rate, chance of wobbling / 255 +; nLeft/255 = (nRight/255) ** 4 + db 1, 63 + db 2, 75 + db 3, 84 + db 4, 90 + db 5, 95 + db 7, 103 + db 10, 113 + db 15, 126 + db 20, 134 + db 30, 149 + db 40, 160 + db 50, 169 + db 60, 177 + db 80, 191 + db 100, 201 + db 120, 211 + db 140, 220 + db 160, 227 + db 180, 234 + db 200, 240 + db 220, 246 + db 240, 251 + db 254, 253 + db 255, 255 diff --git a/data/items/heal_status.asm b/data/items/heal_status.asm index f0b0148bb..29bb872e1 100644 --- a/data/items/heal_status.asm +++ b/data/items/heal_status.asm @@ -1,3 +1,5 @@ +; See also data/battle/held_heal_status.asm + StatusHealingActions: ; f071 ; item, party menu action text, status db ANTIDOTE, PARTYMENUTEXT_HEAL_PSN, 1 << PSN diff --git a/engine/battle/consumehelditem.asm b/engine/battle/consumehelditem.asm index a6f7766fb..58ded0922 100644 --- a/engine/battle/consumehelditem.asm +++ b/engine/battle/consumehelditem.asm @@ -18,7 +18,7 @@ ConsumeHeldItem: ; 27192 ld a, [de] ld b, a farcall GetItemHeldEffect - ld hl, .ConsumableEffects + ld hl, ConsumableEffects .loop ld a, [hli] cp b @@ -46,7 +46,7 @@ ConsumeHeldItem: ; 27192 jr z, .done .ourturn - ld [hl], $0 + ld [hl], NO_ITEM .done pop bc @@ -54,27 +54,4 @@ ConsumeHeldItem: ; 27192 pop hl ret -.ConsumableEffects: ; 271de -; Consumable items? - db HELD_BERRY - db HELD_2 - db HELD_5 - db HELD_HEAL_POISON - db HELD_HEAL_FREEZE - db HELD_HEAL_BURN - db HELD_HEAL_SLEEP - db HELD_HEAL_PARALYZE - db HELD_HEAL_STATUS - db HELD_30 - db HELD_ATTACK_UP - db HELD_DEFENSE_UP - db HELD_SPEED_UP - db HELD_SP_ATTACK_UP - db HELD_SP_DEFENSE_UP - db HELD_ACCURACY_UP - db HELD_EVASION_UP - db HELD_38 - db HELD_71 - db HELD_ESCAPE - db HELD_CRITICAL_UP - db -1 +INCLUDE "data/battle/held_consumables.asm" diff --git a/engine/battle/core.asm b/engine/battle/core.asm index f52cc3b97..4326c297b 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1807,10 +1807,13 @@ HandleWeather: ; 3cb9e ; 3cc2d .WeatherMessages: +; entries correspond to WEATHER_* constants dw BattleText_RainContinuesToFall dw BattleText_TheSunlightIsStrong dw BattleText_TheSandstormRages + .WeatherEndedMessages: +; entries correspond to WEATHER_* constants dw BattleText_TheRainStopped dw BattleText_TheSunlightFaded dw BattleText_TheSandstormSubsided @@ -2557,9 +2560,10 @@ WinTrainerBattle: ; 3cfa4 ; 3d0ab .SentToMomTexts: ; 3d0ab - dw SentSomeToMomText ; MOM_SAVING_SOME_MONEY_F - dw SentHalfToMomText ; MOM_SAVING_HALF_MONEY_F - dw SentAllToMomText ; MOM_SAVING_ALL_MONEY_F +; entries correspond to MOM_SAVING_* constants + dw SentSomeToMomText + dw SentHalfToMomText + dw SentAllToMomText ; 3d0b1 .CheckMaxedOutMomMoney: ; 3d0b1 @@ -4488,7 +4492,7 @@ ItemRecoveryAnim: ; 3ddc8 UseHeldStatusHealingItem: ; 3dde9 callfar GetOpponentItem - ld hl, .Statuses + ld hl, HeldStatusHealingEffects .loop ld a, [hli] cp $ff @@ -4541,15 +4545,7 @@ UseHeldStatusHealingItem: ; 3dde9 ret ; 3de44 -.Statuses: ; 3de44 - db HELD_HEAL_POISON, 1 << PSN - db HELD_HEAL_FREEZE, 1 << FRZ - db HELD_HEAL_BURN, 1 << BRN - db HELD_HEAL_SLEEP, SLP - db HELD_HEAL_PARALYZE, 1 << PAR - db HELD_HEAL_STATUS, ALL_STATUS - db -1 ; end -; 3de51 +INCLUDE "data/battle/held_heal_status.asm" UseConfusionHealingItem: ; 3de51 ld a, BATTLE_VARS_SUBSTATUS3_OPP @@ -4624,10 +4620,10 @@ HandleStatBoostingHeldItems: ; 3de97 ld a, [bc] ld b, a callfar GetItemHeldEffect - ld hl, .StatUpItems + ld hl, HeldStatUpItems .loop ld a, [hli] - cp $ff + cp -1 jr z, .finish inc hl inc hl @@ -4664,16 +4660,7 @@ HandleStatBoostingHeldItems: ; 3de97 ret ; 3defc -.StatUpItems: - dbw HELD_ATTACK_UP, BattleCommand_AttackUp - dbw HELD_DEFENSE_UP, BattleCommand_DefenseUp - dbw HELD_SPEED_UP, BattleCommand_SpeedUp - dbw HELD_SP_ATTACK_UP, BattleCommand_SpecialAttackUp - dbw HELD_SP_DEFENSE_UP, BattleCommand_SpecialDefenseUp - dbw HELD_ACCURACY_UP, BattleCommand_AccuracyUp - dbw HELD_EVASION_UP, BattleCommand_EvasionUp - db -1 ; end -; 3df12 +INCLUDE "data/battle/held_stat_up.asm" GetPartymonItem: ; 3df12 ld hl, PartyMon1Item @@ -6902,7 +6889,7 @@ ApplyStatLevelMultiplier: ; 3ecb7 .okay2 pop bc push hl - ld hl, .StatLevelMultipliers + ld hl, StatLevelMultipliers_Applied dec b sla b ld c, b @@ -6951,24 +6938,7 @@ ApplyStatLevelMultiplier: ; 3ecb7 ret ; 3ed2b -.StatLevelMultipliers: -; / - db 25, 100 ; 25% - db 28, 100 ; 28% - db 33, 100 ; 33% - db 40, 100 ; 40% - db 50, 100 ; 50% - db 66, 100 ; 66% - - db 1, 1 ; 100% - - db 15, 10 ; 150% - db 2, 1 ; 200% - db 25, 10 ; 250% - db 3, 1 ; 300% - db 35, 10 ; 350% - db 4, 1 ; 400% -; 3ed45 +INCLUDE "data/battle/stat_multipliers_2.asm" BadgeStatBoosts: ; 3ed45 ; Raise BattleMon stats depending on which badges have been obtained. diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 166904472..55d56734c 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -2713,7 +2713,7 @@ BattleCommand_RageDamage: ; 3527b dec a add hl, bc jr nc, .rage_loop - ld hl, -1 + ld hl, $ffff .done ld a, h ld [CurDamage], a @@ -3766,11 +3766,11 @@ BattleCommand_ConstantDamage: ; 35726 ld [hDividend + 2], a .skip_to_divide - ld b, $4 + ld b, 4 call Divide ld a, [hQuotient + 2] ld b, a - ld hl, .FlailPower + ld hl, FlailReversalPower .reversal_loop ld a, [hli] @@ -3803,15 +3803,7 @@ BattleCommand_ConstantDamage: ; 35726 ld [hl], 1 ret -.FlailPower: - ; px, bp - db 1, 200 - db 4, 150 - db 9, 100 - db 16, 80 - db 32, 40 - db 48, 20 -; 35813 +INCLUDE "data/battle/flail_reversal_power.asm" BattleCommand_Counter: ; 35813 @@ -8920,7 +8912,7 @@ BattleCommand_GetMagnitude: ; 37991 push bc call BattleRandom ld b, a - ld hl, .Magnitudes + ld hl, MagnitudePower .loop ld a, [hli] cp b @@ -8942,16 +8934,7 @@ BattleCommand_GetMagnitude: ; 37991 pop bc ret -.Magnitudes: - ; /255, BP, magnitude - db 13, 10, 4 - db 38, 30, 5 - db 89, 50, 6 - db 166, 70, 7 - db 217, 90, 8 - db 242, 110, 9 - db 255, 150, 10 -; 379c9 +INCLUDE "data/battle/magnitude_power.asm" BattleCommand_BatonPass: ; 379c9 diff --git a/engine/battle/effect_commands/metronome.asm b/engine/battle/effect_commands/metronome.asm index 1908df84d..6835ab569 100644 --- a/engine/battle/effect_commands/metronome.asm +++ b/engine/battle/effect_commands/metronome.asm @@ -43,19 +43,4 @@ BattleCommand_Metronome: ; 37418 ; 37454 -MetronomeExcepts: ; 37454 - db NO_MOVE - db METRONOME - db STRUGGLE - db SKETCH - db MIMIC - db COUNTER - db MIRROR_COAT - db PROTECT - db DETECT - db ENDURE - db DESTINY_BOND - db SLEEP_TALK - db THIEF - db -1 -; 37462 +INCLUDE "data/battle/metronome_exception_moves.asm" diff --git a/engine/battle/effect_commands/present.asm b/engine/battle/effect_commands/present.asm index 2b358e8b9..1af6b4b49 100755 --- a/engine/battle/effect_commands/present.asm +++ b/engine/battle/effect_commands/present.asm @@ -27,7 +27,7 @@ BattleCommand_Present: ; 37874 push bc call BattleRandom ld b, a - ld hl, .PresentPower + ld hl, PresentPower ld c, 0 .next ld a, [hli] @@ -49,7 +49,7 @@ BattleCommand_Present: ; 37874 .heal_effect pop bc - ld a, $3 + ld a, 3 ld [wPresentPower], a call AnimateCurrentMove call BattleCommand_SwitchTurn @@ -85,9 +85,4 @@ BattleCommand_Present: ; 37874 .do_animation jp EndMoveEffect -.PresentPower: - db 40 percent, 40 - db 70 percent + 1, 80 - db 80 percent, 120 - db -1 ; end -; 3790e +INCLUDE "data/battle/present_power.asm" diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm index a41d31d9a..ec616fa79 100644 --- a/engine/battle/misc.asm +++ b/engine/battle/misc.asm @@ -52,7 +52,7 @@ GetPlayerBackpicCoords: ; fbd9d (3e:7d9d) DoWeatherModifiers: ; fbda4 - ld de, .WeatherTypeModifiers + ld de, WeatherTypeModifiers ld a, [Weather] ld b, a ld a, [wd265] ; move type @@ -78,7 +78,7 @@ DoWeatherModifiers: ; fbda4 .done_weather_types - ld de, .WeatherMoveModifiers + ld de, WeatherMoveModifiers ld a, BATTLE_VARS_MOVE_EFFECT call GetBattleVar @@ -145,17 +145,7 @@ DoWeatherModifiers: ; fbda4 .done ret -.WeatherTypeModifiers: - db WEATHER_RAIN, WATER, MORE_EFFECTIVE - db WEATHER_RAIN, FIRE, NOT_VERY_EFFECTIVE - db WEATHER_SUN, FIRE, MORE_EFFECTIVE - db WEATHER_SUN, WATER, NOT_VERY_EFFECTIVE - db -1 ; end - -.WeatherMoveModifiers: - db WEATHER_RAIN, EFFECT_SOLARBEAM, NOT_VERY_EFFECTIVE - db -1 ; end -; fbe24 +INCLUDE "data/battle/weather_modifiers.asm" DoBadgeTypeBoosts: ; fbe24 @@ -174,7 +164,7 @@ DoBadgeTypeBoosts: ; fbe24 push de push bc - ld hl, .BadgeTypes + ld hl, BadgeTypeBoosts ld a, [wKantoBadges] ld b, a @@ -235,25 +225,4 @@ DoBadgeTypeBoosts: ; fbe24 pop de ret -.BadgeTypes: -; entries correspond to wJohtoBadges constants - db FLYING ; ZEPHYRBADGE - db BUG ; HIVEBADGE - db NORMAL ; PLAINBADGE - db GHOST ; FOGBADGE - db STEEL ; MINERALBADGE - db FIGHTING ; STORMBADGE - db ICE ; GLACIERBADGE - db DRAGON ; RISINGBADGE - ; fallthrough -; entries correspond to wKantoBadges constants - db ROCK ; BOULDERBADGE - db WATER ; CASCADEBADGE - db ELECTRIC ; THUNDERBADGE - db GRASS ; RAINBOWBADGE - db POISON ; SOULBADGE - db PSYCHIC ; MARSHBADGE - db FIRE ; VOLCANOBADGE - db GROUND ; EARTHBADGE - db -1 ; end -; fbe91 +INCLUDE "data/battle/badge_type_boosts.asm" diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm index a09c6dd08..e9d8c60a9 100755 --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm @@ -44,7 +44,7 @@ ReadTrainerParty: ; 39771 jr z, .got_trainer .loop ld a, [hli] - cp $ff + cp -1 jr nz, .loop jr .skip_trainer .got_trainer @@ -82,6 +82,7 @@ ReadTrainerParty: ; 39771 ; 397e3 TrainerTypes: ; 397e3 +; entries correspond to TRAINERTYPE_* constants dw TrainerType1 ; level, species dw TrainerType2 ; level, species, moves dw TrainerType3 ; level, species, item diff --git a/engine/battle/used_move_text.asm b/engine/battle/used_move_text.asm index 1b5aa564c..4ebcbe283 100755 --- a/engine/battle/used_move_text.asm +++ b/engine/battle/used_move_text.asm @@ -114,6 +114,7 @@ MoveNameText: ; 105e23 ; 105e39 .endusedmovetexts ; 105e39 +; entries correspond to MoveGrammar sets dw EndUsedMove1Text dw EndUsedMove2Text dw EndUsedMove3Text diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm index 5e85ffdb0..817df4967 100755 --- a/engine/battle_anims/functions.asm +++ b/engine/battle_anims/functions.asm @@ -1749,6 +1749,7 @@ Functioncd9f4: ; cd9f4 (33:59f4) Unknown_cda01: ; cda01 db 8, 6, 5, 4, 5, 6, 8, 12, 16 ; cda0a + BattleAnimFunction_1C: ; cda0a (33:5a0a) ld hl, BATTLEANIMSTRUCT_XCOORD add hl, bc @@ -2476,6 +2477,7 @@ Functioncde21: ; cde21 (33:5e21) Unknown_cde25: ; cde25 db $ec, $f8, $00 ; cde28 + BattleAnimFunction_25: ; cde28 (33:5e28) ld hl, BATTLEANIMSTRUCT_0F add hl, bc @@ -3279,6 +3281,7 @@ Unknown_ce2c4: ; ce2c4 Unknown_ce2c8: ; ce2c8 db $ff, $ff, $00, $00 ; ce2cc + BattleAnimFunction_33: ; ce2cc (33:62cc) ld hl, BATTLEANIMSTRUCT_0B add hl, bc diff --git a/engine/battle_anims/getpokeballwobble.asm b/engine/battle_anims/getpokeballwobble.asm index 2bc53d798..378bdb1f9 100755 --- a/engine/battle_anims/getpokeballwobble.asm +++ b/engine/battle_anims/getpokeballwobble.asm @@ -24,7 +24,7 @@ GetPokeBallWobble: ; f971 (3:7971) ld c, 0 ; next jr nz, .done - ld hl, .WobbleProbabilities + ld hl, WobbleProbabilities ld a, [Buffer1] ld b, a .loop @@ -59,30 +59,4 @@ GetPokeBallWobble: ; f971 (3:7971) pop de ret -.WobbleProbabilities: ; f9ba -; catch rate, chance of wobbling / 255 -; nLeft/255 = (nRight/255) ** 4 - db 1, 63 - db 2, 75 - db 3, 84 - db 4, 90 - db 5, 95 - db 7, 103 - db 10, 113 - db 15, 126 - db 20, 134 - db 30, 149 - db 40, 160 - db 50, 169 - db 60, 177 - db 80, 191 - db 100, 201 - db 120, 211 - db 140, 220 - db 160, 227 - db 180, 234 - db 200, 240 - db 220, 246 - db 240, 251 - db 254, 253 - db 255, 255 +INCLUDE "data/battle/wobble_probabilities.asm" From 6ebe45e41fa4d939f5a9f44e05eaf64512b59018 Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 25 Jan 2018 22:19:24 -0500 Subject: [PATCH 046/135] Move event data to data/events/ --- constants/item_data_constants.asm | 36 +++--------- constants/menu_constants.asm | 26 +++++++++ constants/pokemon_constants.asm | 7 +++ data/{ => events}/bug_contest_flags.asm | 0 data/{ => events}/bug_contest_winners.asm | 0 data/{ => events}/collision_stdscripts.asm | 0 data/{ => events}/elevator_floors.asm | 0 data/{ => events}/field_move_blocks.asm | 0 data/events/happiness_chances.asm | 12 ++++ data/{ => events}/happiness_changes.asm | 0 data/events/magikarp_lengths.asm | 21 +++++++ data/{ => events}/npc_trades.asm | 0 data/{ => events}/odd_eggs.asm | 0 data/events/pokedex_ratings.asm | 24 ++++++++ data/{ => events}/unown_walls.asm | 0 data/items/pocket_names.asm | 11 ++++ data/phone/non_trainer_names.asm | 16 ++++++ data/phone/special_calls.asm | 16 +++--- data/pokemon/unown_words.asm | 67 ++++++++++++++++++++++ data/sprites/player_sprites.asm | 13 +++++ data/unown_words.asm | 67 ---------------------- engine/events/bug_contest/contest_2.asm | 2 +- engine/events/bug_contest/judging.asm | 2 +- engine/events/elevator.asm | 2 +- engine/events/happiness_egg.asm | 2 +- engine/events/magikarp.asm | 23 +------- engine/events/odd_egg.asm | 2 +- engine/events/overworld.asm | 2 +- engine/events/prof_oaks_pc.asm | 22 +------ engine/events/special.asm | 19 ++---- engine/events/std_collision.asm | 2 +- engine/events/unown_walls.asm | 2 +- engine/items.asm | 7 ++- engine/npctrade.asm | 2 +- engine/overworld.asm | 19 +----- engine/party_menu.asm | 1 + engine/phone/phone.asm | 16 +----- engine/pokedex/unown_dex.asm | 2 +- engine/select_menu.asm | 2 + engine/variables.asm | 2 +- 40 files changed, 242 insertions(+), 205 deletions(-) rename data/{ => events}/bug_contest_flags.asm (100%) rename data/{ => events}/bug_contest_winners.asm (100%) rename data/{ => events}/collision_stdscripts.asm (100%) rename data/{ => events}/elevator_floors.asm (100%) rename data/{ => events}/field_move_blocks.asm (100%) create mode 100644 data/events/happiness_chances.asm rename data/{ => events}/happiness_changes.asm (100%) create mode 100644 data/events/magikarp_lengths.asm rename data/{ => events}/npc_trades.asm (100%) rename data/{ => events}/odd_eggs.asm (100%) create mode 100644 data/events/pokedex_ratings.asm rename data/{ => events}/unown_walls.asm (100%) create mode 100644 data/items/pocket_names.asm create mode 100644 data/phone/non_trainer_names.asm create mode 100644 data/pokemon/unown_words.asm create mode 100644 data/sprites/player_sprites.asm delete mode 100644 data/unown_words.asm diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm index b3a35d72b..495469e02 100644 --- a/constants/item_data_constants.asm +++ b/constants/item_data_constants.asm @@ -18,14 +18,18 @@ const_value set 1 ; item menu types ; UseItem.dw indexes (see engine/pack.asm) +; UseRegisteredItem.SwitchTo indexes (see engine/select_menu.asm) ITEMMENU_NOUSE EQU 0 ITEMMENU_CURRENT EQU 4 ITEMMENU_PARTY EQU 5 ITEMMENU_CLOSE EQU 6 ; item actions -CANT_SELECT EQU 1 << 6 -CANT_TOSS EQU 1 << 7 +CANT_SELECT_F EQU 6 +CANT_TOSS_F EQU 7 + +CANT_SELECT EQU 1 << CANT_SELECT_F +CANT_TOSS EQU 1 << CANT_TOSS_F ; pack pockets @@ -34,7 +38,7 @@ CANT_TOSS EQU 1 << 7 const BALL_POCKET ; 1 const KEY_ITEM_POCKET ; 2 const TM_HM_POCKET ; 3 -NUM_POCKETS EQU const_value +- 1 +NUM_POCKETS EQU const_value MAX_ITEMS EQU 20 MAX_BALLS EQU 12 @@ -170,29 +174,3 @@ const_value set 70 const MART_MT_MOON const MART_INDIGO_PLATEAU const MART_UNDERGROUND - - -; PartyMenuQualityPointers indexes (see data/party_menu_qualities.asm) - const_def - const PARTYMENUACTION_CHOOSE_POKEMON - const PARTYMENUACTION_HEALING_ITEM - const PARTYMENUACTION_SWITCH - const PARTYMENUACTION_TEACH_TMHM - const PARTYMENUACTION_MOVE - const PARTYMENUACTION_EVO_STONE - const PARTYMENUACTION_GIVE_MON - const PARTYMENUACTION_GIVE_MON_FEMALE ; unused - const PARTYMENUACTION_GIVE_ITEM - const PARTYMENUACTION_MOBILE ; mobile -; PrintPartyMenuActionText arguments (see engine/party_menu.asm) -const_value set $f0 - const PARTYMENUTEXT_HEAL_PSN - const PARTYMENUTEXT_HEAL_BRN - const PARTYMENUTEXT_HEAL_FRZ - const PARTYMENUTEXT_HEAL_SLP - const PARTYMENUTEXT_HEAL_PAR - const PARTYMENUTEXT_HEAL_HP - const PARTYMENUTEXT_HEAL_ALL - const PARTYMENUTEXT_REVIVE - const PARTYMENUTEXT_LEVEL_UP - const PARTYMENUTEXT_HEAL_CONFUSION diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm index 8f1257593..08f584ff1 100644 --- a/constants/menu_constants.asm +++ b/constants/menu_constants.asm @@ -69,3 +69,29 @@ NUM_MONMENU_ITEMS EQU 8 ; start/select menu return values HMENURETURN_SCRIPT EQU %10000000 HMENURETURN_ASM EQU %11111111 + + +; PartyMenuQualityPointers indexes (see data/party_menu_qualities.asm) + const_def + const PARTYMENUACTION_CHOOSE_POKEMON + const PARTYMENUACTION_HEALING_ITEM + const PARTYMENUACTION_SWITCH + const PARTYMENUACTION_TEACH_TMHM + const PARTYMENUACTION_MOVE + const PARTYMENUACTION_EVO_STONE + const PARTYMENUACTION_GIVE_MON + const PARTYMENUACTION_GIVE_MON_FEMALE ; unused + const PARTYMENUACTION_GIVE_ITEM + const PARTYMENUACTION_MOBILE ; mobile +; PrintPartyMenuActionText arguments (see engine/party_menu.asm) +const_value set $f0 + const PARTYMENUTEXT_HEAL_PSN + const PARTYMENUTEXT_HEAL_BRN + const PARTYMENUTEXT_HEAL_FRZ + const PARTYMENUTEXT_HEAL_SLP + const PARTYMENUTEXT_HEAL_PAR + const PARTYMENUTEXT_HEAL_HP + const PARTYMENUTEXT_HEAL_ALL + const PARTYMENUTEXT_REVIVE + const PARTYMENUTEXT_LEVEL_UP + const PARTYMENUTEXT_HEAL_CONFUSION diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index f3d03b3a0..8b3b45100 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -277,6 +277,13 @@ NUM_POKEMON EQU const_value +- 1 const MON_FE ; fe ; Unown forms +; indexes for: +; - UnownWords (see data/pokemon/unown_words.asm) +; - UnownPicPointers (see data/pokemon/unown_pic_pointers.asm) +; - UnownAnimationPointers (see gfx/pokemon/unown_anim_pointers.asm) +; - UnownAnimationIdlePointers (see gfx/pokemon/unown_idle_pointers.asm) +; - UnownBitmasksPointers (see gfx/pokemon/unown_bitmask_pointers.asm) +; - UnownFramesPointers (see gfx/pokemon/unown_frame_pointers.asm) const_value set 1 const UNOWN_A ; 1 const UNOWN_B ; 2 diff --git a/data/bug_contest_flags.asm b/data/events/bug_contest_flags.asm similarity index 100% rename from data/bug_contest_flags.asm rename to data/events/bug_contest_flags.asm diff --git a/data/bug_contest_winners.asm b/data/events/bug_contest_winners.asm similarity index 100% rename from data/bug_contest_winners.asm rename to data/events/bug_contest_winners.asm diff --git a/data/collision_stdscripts.asm b/data/events/collision_stdscripts.asm similarity index 100% rename from data/collision_stdscripts.asm rename to data/events/collision_stdscripts.asm diff --git a/data/elevator_floors.asm b/data/events/elevator_floors.asm similarity index 100% rename from data/elevator_floors.asm rename to data/events/elevator_floors.asm diff --git a/data/field_move_blocks.asm b/data/events/field_move_blocks.asm similarity index 100% rename from data/field_move_blocks.asm rename to data/events/field_move_blocks.asm diff --git a/data/events/happiness_chances.asm b/data/events/happiness_chances.asm new file mode 100644 index 000000000..22a7395d9 --- /dev/null +++ b/data/events/happiness_chances.asm @@ -0,0 +1,12 @@ +HappinessData_YoungerHaircutBrother: ; 7459 + db $4c, 2, HAPPINESS_YOUNGCUT1 ; 30% chance + db $80, 3, HAPPINESS_YOUNGCUT2 ; 20% chance + db $ff, 4, HAPPINESS_YOUNGCUT3 ; 50% chance + +HappinessData_OlderHaircutBrother: ; 7462 + db $9a, 2, HAPPINESS_OLDERCUT1 ; 60% chance + db $4c, 3, HAPPINESS_OLDERCUT2 ; 10% chance + db $ff, 4, HAPPINESS_OLDERCUT3 ; 30% chance + +HappinessData_DaisysGrooming: ; 746b + db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance diff --git a/data/happiness_changes.asm b/data/events/happiness_changes.asm similarity index 100% rename from data/happiness_changes.asm rename to data/events/happiness_changes.asm diff --git a/data/events/magikarp_lengths.asm b/data/events/magikarp_lengths.asm new file mode 100644 index 000000000..a631ef719 --- /dev/null +++ b/data/events/magikarp_lengths.asm @@ -0,0 +1,21 @@ +MagikarpLengths: ; fbca8 +; [wMagikarpLength] = z * 100 + (bc - x) / y +; First argument is the bc threshold as well as x. +; Second argument is y. +; In reality, due to the bug at .BCLessThanDE, +; the threshold is determined by only register b. + dwb 110, 1 ; not used unless the bug is fixed + dwb 310, 2 + dwb 710, 4 + dwb 2710, 20 + dwb 7710, 50 + dwb 17710, 100 + dwb 32710, 150 + dwb 47710, 150 + dwb 57710, 100 + dwb 62710, 50 + dwb 64710, 20 + dwb 65210, 5 + dwb 65410, 2 + dwb 65510, 1 ; not used +; fbcd2 diff --git a/data/npc_trades.asm b/data/events/npc_trades.asm similarity index 100% rename from data/npc_trades.asm rename to data/events/npc_trades.asm diff --git a/data/odd_eggs.asm b/data/events/odd_eggs.asm similarity index 100% rename from data/odd_eggs.asm rename to data/events/odd_eggs.asm diff --git a/data/events/pokedex_ratings.asm b/data/events/pokedex_ratings.asm new file mode 100644 index 000000000..be23c401f --- /dev/null +++ b/data/events/pokedex_ratings.asm @@ -0,0 +1,24 @@ +OakRatings: ; 0x2667f +; if you caught at most this many, play this sound, load this text +; (text is defined in engine/events/prof_oaks_pc.asm) + dbww 9, SFX_DEX_FANFARE_LESS_THAN_20, OakRating01 + dbww 19, SFX_DEX_FANFARE_LESS_THAN_20, OakRating02 + dbww 34, SFX_DEX_FANFARE_20_49, OakRating03 + dbww 49, SFX_DEX_FANFARE_20_49, OakRating04 + dbww 64, SFX_DEX_FANFARE_50_79, OakRating05 + dbww 79, SFX_DEX_FANFARE_50_79, OakRating06 + dbww 94, SFX_DEX_FANFARE_80_109, OakRating07 + dbww 109, SFX_DEX_FANFARE_80_109, OakRating08 + dbww 124, SFX_CAUGHT_MON, OakRating09 + dbww 139, SFX_CAUGHT_MON, OakRating10 + dbww 154, SFX_DEX_FANFARE_140_169, OakRating11 + dbww 169, SFX_DEX_FANFARE_140_169, OakRating12 + dbww 184, SFX_DEX_FANFARE_170_199, OakRating13 + dbww 199, SFX_DEX_FANFARE_170_199, OakRating14 + dbww 214, SFX_DEX_FANFARE_200_229, OakRating15 + dbww 229, SFX_DEX_FANFARE_200_229, OakRating16 + dbww 239, SFX_DEX_FANFARE_230_PLUS, OakRating17 + dbww 248, SFX_DEX_FANFARE_230_PLUS, OakRating18 + dbww 255, SFX_DEX_FANFARE_230_PLUS, OakRating19 + ; 0x266de + \ No newline at end of file diff --git a/data/unown_walls.asm b/data/events/unown_walls.asm similarity index 100% rename from data/unown_walls.asm rename to data/events/unown_walls.asm diff --git a/data/items/pocket_names.asm b/data/items/pocket_names.asm new file mode 100644 index 000000000..880e08fe3 --- /dev/null +++ b/data/items/pocket_names.asm @@ -0,0 +1,11 @@ +ItemPocketNames: +; entries correspond to item type constants + dw .Item + dw .Key + dw .Ball + dw .TM + +.Item: db "ITEM POCKET@" +.Key: db "KEY POCKET@" +.Ball: db "BALL POCKET@" +.TM: db "TM POCKET@" diff --git a/data/phone/non_trainer_names.asm b/data/phone/non_trainer_names.asm new file mode 100644 index 000000000..184a93113 --- /dev/null +++ b/data/phone/non_trainer_names.asm @@ -0,0 +1,16 @@ +NonTrainerCallerNames: ; 903d6 +; entries correspond to PHONECONTACT_* constants + dw .none + dw .mom + dw .bikeshop + dw .bill + dw .elm + dw .buena + +.none: db "----------@" +.mom: db "MOM:@" +.bill: db "BILL:@" +.elm: db "PROF.ELM:@" +.bikeshop: db "BIKE SHOP:@" +.buena: db "BUENA: DISC JOCKEY@" +; 90423 diff --git a/data/phone/special_calls.asm b/data/phone/special_calls.asm index 03c27743a..5dba36fc9 100644 --- a/data/phone/special_calls.asm +++ b/data/phone/special_calls.asm @@ -7,12 +7,12 @@ ENDM SpecialPhoneCallList: ; 90627 ; entries correspond to SPECIALCALL_* constants - specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 - specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 - specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 - specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 - specialcall SpecialCallWhereverYouAre, PHONE_ELM, ElmPhoneScript2 - specialcall SpecialCallWhereverYouAre, PHONE_OAK, BikeShopPhoneScript - specialcall SpecialCallWhereverYouAre, PHONE_MOM, MomPhoneLectureScript - specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallWhereverYouAre, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallWhereverYouAre, PHONECONTACT_BIKESHOP, BikeShopPhoneScript + specialcall SpecialCallWhereverYouAre, PHONECONTACT_MOM, MomPhoneLectureScript + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 ; 90657 diff --git a/data/pokemon/unown_words.asm b/data/pokemon/unown_words.asm new file mode 100644 index 000000000..4283d3708 --- /dev/null +++ b/data/pokemon/unown_words.asm @@ -0,0 +1,67 @@ +unownword: MACRO +x = 1 + rept STRLEN(\1) + db STRSUB(\1, x, 1) - $40 +x = x + 1 + endr + db -1 +ENDM + +UnownWords: ; fba5a +; entries correspond to UNOWN_* form constants + dw UnownWordA + dw UnownWordA + dw UnownWordB + dw UnownWordC + dw UnownWordD + dw UnownWordE + dw UnownWordF + dw UnownWordG + dw UnownWordH + dw UnownWordI + dw UnownWordJ + dw UnownWordK + dw UnownWordL + dw UnownWordM + dw UnownWordN + dw UnownWordO + dw UnownWordP + dw UnownWordQ + dw UnownWordR + dw UnownWordS + dw UnownWordT + dw UnownWordU + dw UnownWordV + dw UnownWordW + dw UnownWordX + dw UnownWordY + dw UnownWordZ +; fba90 + +UnownWordA: unownword "ANGRY" +UnownWordB: unownword "BEAR" +UnownWordC: unownword "CHASE" +UnownWordD: unownword "DIRECT" +UnownWordE: unownword "ENGAGE" +UnownWordF: unownword "FIND" +UnownWordG: unownword "GIVE" +UnownWordH: unownword "HELP" +UnownWordI: unownword "INCREASE" +UnownWordJ: unownword "JOIN" +UnownWordK: unownword "KEEP" +UnownWordL: unownword "LAUGH" +UnownWordM: unownword "MAKE" +UnownWordN: unownword "NUZZLE" +UnownWordO: unownword "OBSERVE" +UnownWordP: unownword "PERFORM" +UnownWordQ: unownword "QUICKEN" +UnownWordR: unownword "REASSURE" +UnownWordS: unownword "SEARCH" +UnownWordT: unownword "TELL" +UnownWordU: unownword "UNDO" +UnownWordV: unownword "VANISH" +UnownWordW: unownword "WANT" +UnownWordX: unownword "XXXXX" +UnownWordY: unownword "YIELD" +UnownWordZ: unownword "ZOOM" +; fbb32 diff --git a/data/sprites/player_sprites.asm b/data/sprites/player_sprites.asm new file mode 100644 index 000000000..89eb6e831 --- /dev/null +++ b/data/sprites/player_sprites.asm @@ -0,0 +1,13 @@ +ChrisStateSprites: + db PLAYER_NORMAL, SPRITE_CHRIS + db PLAYER_BIKE, SPRITE_CHRIS_BIKE + db PLAYER_SURF, SPRITE_SURF + db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU + db -1 ; end + +KrisStateSprites: + db PLAYER_NORMAL, SPRITE_KRIS + db PLAYER_BIKE, SPRITE_KRIS_BIKE + db PLAYER_SURF, SPRITE_SURF + db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU + db -1 ; end diff --git a/data/unown_words.asm b/data/unown_words.asm deleted file mode 100644 index ea8c4b2a8..000000000 --- a/data/unown_words.asm +++ /dev/null @@ -1,67 +0,0 @@ -unownword: MACRO -x = 1 - rept STRLEN(\1) - db STRSUB(\1, x, 1) - $40 -x = x + 1 - endr - db -1 -ENDM - -UnownWords: ; fba5a -; entries correspond to Unown forms - dw UnownWord1 - dw UnownWord1 - dw UnownWord2 - dw UnownWord3 - dw UnownWord4 - dw UnownWord5 - dw UnownWord6 - dw UnownWord7 - dw UnownWord8 - dw UnownWord9 - dw UnownWord10 - dw UnownWord11 - dw UnownWord12 - dw UnownWord13 - dw UnownWord14 - dw UnownWord15 - dw UnownWord16 - dw UnownWord17 - dw UnownWord18 - dw UnownWord19 - dw UnownWord20 - dw UnownWord21 - dw UnownWord22 - dw UnownWord23 - dw UnownWord24 - dw UnownWord25 - dw UnownWord26 -; fba90 - -UnownWord1: unownword "ANGRY" -UnownWord2: unownword "BEAR" -UnownWord3: unownword "CHASE" -UnownWord4: unownword "DIRECT" -UnownWord5: unownword "ENGAGE" -UnownWord6: unownword "FIND" -UnownWord7: unownword "GIVE" -UnownWord8: unownword "HELP" -UnownWord9: unownword "INCREASE" -UnownWord10: unownword "JOIN" -UnownWord11: unownword "KEEP" -UnownWord12: unownword "LAUGH" -UnownWord13: unownword "MAKE" -UnownWord14: unownword "NUZZLE" -UnownWord15: unownword "OBSERVE" -UnownWord16: unownword "PERFORM" -UnownWord17: unownword "QUICKEN" -UnownWord18: unownword "REASSURE" -UnownWord19: unownword "SEARCH" -UnownWord20: unownword "TELL" -UnownWord21: unownword "UNDO" -UnownWord22: unownword "VANISH" -UnownWord23: unownword "WANT" -UnownWord24: unownword "XXXXX" -UnownWord25: unownword "YIELD" -UnownWord26: unownword "ZOOM" -; fbb32 diff --git a/engine/events/bug_contest/contest_2.asm b/engine/events/bug_contest/contest_2.asm index 80f0bda97..56afefb72 100755 --- a/engine/events/bug_contest/contest_2.asm +++ b/engine/events/bug_contest/contest_2.asm @@ -74,7 +74,7 @@ CheckBugContestContestantFlag: ; 139ed ret ; 139fe -INCLUDE "data/bug_contest_flags.asm" +INCLUDE "data/events/bug_contest_flags.asm" ContestDropOffMons: ; 13a12 ld hl, PartyMon1HP diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index e9659707b..6c8d7e82d 100755 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -134,7 +134,7 @@ LoadContestantName: ; 13730 ; 13783 -INCLUDE "data/bug_contest_winners.asm" +INCLUDE "data/events/bug_contest_winners.asm" ; 13807 diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm index fba2cb0ef..6138ca6bd 100755 --- a/engine/events/elevator.asm +++ b/engine/events/elevator.asm @@ -229,4 +229,4 @@ FloorToString: ; 13575 ret ; 13583 -INCLUDE "data/elevator_floors.asm" +INCLUDE "data/events/elevator_floors.asm" diff --git a/engine/events/happiness_egg.asm b/engine/events/happiness_egg.asm index f5055f512..7300d0938 100755 --- a/engine/events/happiness_egg.asm +++ b/engine/events/happiness_egg.asm @@ -103,7 +103,7 @@ ChangeHappiness: ; 71c2 ret -INCLUDE "data/happiness_changes.asm" +INCLUDE "data/events/happiness_changes.asm" StepHappiness:: ; 725a diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index bb86a98ab..b0f327d07 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -189,7 +189,7 @@ CalcMagikarpLength: ; fbbfc .no - ld hl, .Lengths + ld hl, MagikarpLengths ld a, 2 ld [wd265], a @@ -308,26 +308,7 @@ CalcMagikarpLength: ; fbbfc ret ; fbca8 -.Lengths: ; fbca8 -; [wMagikarpLength] = z * 100 + (bc - x) / y -; First argument is the bc threshold as well as x. -; Second argument is y. -; In reality, due to the bug at .BCLessThanDE, the threshold is determined by only register b. - dwb 110, 1 ; not used unless the bug is fixed - dwb 310, 2 - dwb 710, 4 - dwb 2710, 20 - dwb 7710, 50 - dwb 17710, 100 - dwb 32710, 150 - dwb 47710, 150 - dwb 57710, 100 - dwb 62710, 50 - dwb 64710, 20 - dwb 65210, 5 - dwb 65410, 2 - dwb 65510, 1 ; not used -; fbcd2 +INCLUDE "data/events/magikarp_lengths.asm" diff --git a/engine/events/odd_egg.asm b/engine/events/odd_egg.asm index da8d21d60..004165289 100644 --- a/engine/events/odd_egg.asm +++ b/engine/events/odd_egg.asm @@ -93,4 +93,4 @@ _GiveOddEgg: ; 1fb4b6 .Odd: db "ODD@@@@@@@@@" -INCLUDE "data/odd_eggs.asm" +INCLUDE "data/events/odd_eggs.asm" diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 576c6eebf..713457b68 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -277,7 +277,7 @@ CheckOverworldTileArrays: ; c840 ret -INCLUDE "data/field_move_blocks.asm" +INCLUDE "data/events/field_move_blocks.asm" OWFlash: ; c8ac diff --git a/engine/events/prof_oaks_pc.asm b/engine/events/prof_oaks_pc.asm index 69949940b..4104279a2 100755 --- a/engine/events/prof_oaks_pc.asm +++ b/engine/events/prof_oaks_pc.asm @@ -98,27 +98,7 @@ endr ld l, a ret -OakRatings: ; 0x2667f -; if you caught at most this many, play this sound, load this text - dbww 9, SFX_DEX_FANFARE_LESS_THAN_20, OakRating01 - dbww 19, SFX_DEX_FANFARE_LESS_THAN_20, OakRating02 - dbww 34, SFX_DEX_FANFARE_20_49, OakRating03 - dbww 49, SFX_DEX_FANFARE_20_49, OakRating04 - dbww 64, SFX_DEX_FANFARE_50_79, OakRating05 - dbww 79, SFX_DEX_FANFARE_50_79, OakRating06 - dbww 94, SFX_DEX_FANFARE_80_109, OakRating07 - dbww 109, SFX_DEX_FANFARE_80_109, OakRating08 - dbww 124, SFX_CAUGHT_MON, OakRating09 - dbww 139, SFX_CAUGHT_MON, OakRating10 - dbww 154, SFX_DEX_FANFARE_140_169, OakRating11 - dbww 169, SFX_DEX_FANFARE_140_169, OakRating12 - dbww 184, SFX_DEX_FANFARE_170_199, OakRating13 - dbww 199, SFX_DEX_FANFARE_170_199, OakRating14 - dbww 214, SFX_DEX_FANFARE_200_229, OakRating15 - dbww 229, SFX_DEX_FANFARE_200_229, OakRating16 - dbww 239, SFX_DEX_FANFARE_230_PLUS, OakRating17 - dbww 248, SFX_DEX_FANFARE_230_PLUS, OakRating18 - dbww 255, SFX_DEX_FANFARE_230_PLUS, OakRating19 +INCLUDE "data/events/pokedex_ratings.asm" OakPCText1: ; 0x266de text_jump _OakPCText1 diff --git a/engine/events/special.asm b/engine/events/special.asm index ecb75c8ea..08231f9ac 100755 --- a/engine/events/special.asm +++ b/engine/events/special.asm @@ -156,15 +156,15 @@ BillsGrandfather: ; 73f7 ret YoungerHaircutBrother: ; 7413 - ld hl, Data_YoungerHaircutBrother + ld hl, HappinessData_YoungerHaircutBrother jr HaircutOrGrooming OlderHaircutBrother: ; 7418 - ld hl, Data_OlderHaircutBrother + ld hl, HappinessData_OlderHaircutBrother jr HaircutOrGrooming DaisysGrooming: ; 741d - ld hl, Data_DaisysGrooming + ld hl, HappinessData_DaisysGrooming ; fallthrough HaircutOrGrooming: ; 7420 @@ -213,18 +213,7 @@ HaircutOrGrooming: ; 7420 ld [ScriptVar], a ret -Data_YoungerHaircutBrother: ; 7459 - db $4c, 2, HAPPINESS_YOUNGCUT1 ; 30% chance - db $80, 3, HAPPINESS_YOUNGCUT2 ; 20% chance - db $ff, 4, HAPPINESS_YOUNGCUT3 ; 50% chance - -Data_OlderHaircutBrother: ; 7462 - db $9a, 2, HAPPINESS_OLDERCUT1 ; 60% chance - db $4c, 3, HAPPINESS_OLDERCUT2 ; 10% chance - db $ff, 4, HAPPINESS_OLDERCUT3 ; 30% chance - -Data_DaisysGrooming: ; 746b - db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance +INCLUDE "data/events/happiness_chances.asm" CopyPokemonName_Buffer1_Buffer3: ; 746e ld hl, StringBuffer1 diff --git a/engine/events/std_collision.asm b/engine/events/std_collision.asm index 79dbc71f1..775f7c10c 100644 --- a/engine/events/std_collision.asm +++ b/engine/events/std_collision.asm @@ -23,7 +23,7 @@ CheckFacingTileForStdScript:: ; 1365b xor a ret -INCLUDE "data/collision_stdscripts.asm" +INCLUDE "data/events/collision_stdscripts.asm" Script_JumpStdFromRAM: ; 0x1369a jump wJumpStdScriptBuffer diff --git a/engine/events/unown_walls.asm b/engine/events/unown_walls.asm index e09d18fe8..91b1d11f3 100644 --- a/engine/events/unown_walls.asm +++ b/engine/events/unown_walls.asm @@ -153,7 +153,7 @@ DisplayUnownWords: ; 8ae68 ret ; 8aebc -INCLUDE "data/unown_walls.asm" +INCLUDE "data/events/unown_walls.asm" _DisplayUnownWords_FillAttr: ; 8aee9 ld a, [de] diff --git a/engine/items.asm b/engine/items.asm index 503a76c6b..120756764 100755 --- a/engine/items.asm +++ b/engine/items.asm @@ -11,6 +11,7 @@ _ReceiveItem:: ; d1d5 ret .Pockets: ; d1e9 +; entries correspond to item types dw .Item dw .KeyItem dw .Ball @@ -51,6 +52,7 @@ _TossItem:: ; d20d ret .Pockets: +; entries correspond to item types dw .Item dw .KeyItem dw .Ball @@ -93,6 +95,7 @@ _CheckItem:: ; d244 ret .Pockets: +; entries correspond to item types dw .Item dw .KeyItem dw .Ball @@ -492,7 +495,7 @@ _CheckTossableItem:: ; d427 ; Return 1 in wItemAttributeParamBuffer and carry if CurItem can't be removed from the bag. ld a, ITEMATTR_PERMISSIONS call GetItemAttr - bit 7, a + bit CANT_TOSS_F, a jr nz, ItemAttr_ReturnCarry and a ret @@ -501,7 +504,7 @@ CheckSelectableItem: ; d432 ; Return 1 in wItemAttributeParamBuffer and carry if CurItem can't be selected. ld a, ITEMATTR_PERMISSIONS call GetItemAttr - bit 6, a + bit CANT_SELECT_F, a jr nz, ItemAttr_ReturnCarry and a ret diff --git a/engine/npctrade.asm b/engine/npctrade.asm index 40f6dd638..fa2792934 100755 --- a/engine/npctrade.asm +++ b/engine/npctrade.asm @@ -401,7 +401,7 @@ GetTradeMonNames: ; fce1b ; fce58 -INCLUDE "data/npc_trades.asm" +INCLUDE "data/events/npc_trades.asm" PrintTradeText: ; fcf38 diff --git a/engine/overworld.asm b/engine/overworld.asm index 32ef356e5..88356877c 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -60,14 +60,14 @@ RefreshSprites:: ; 14168 GetPlayerSprite: ; 14183 ; Get Chris or Kris's sprite. - ld hl, .Chris + ld hl, ChrisStateSprites ld a, [wPlayerSpriteSetupFlags] bit PLAYERSPRITESETUP_FEMALE_TO_MALE_F, a jr nz, .go ld a, [wPlayerGender] bit PLAYERGENDER_FEMALE_F, a jr z, .go - ld hl, .Kris + ld hl, KrisStateSprites .go ld a, [PlayerState] @@ -95,20 +95,7 @@ GetPlayerSprite: ; 14183 ld [PlayerObjectSprite], a ret -.Chris: - db PLAYER_NORMAL, SPRITE_CHRIS - db PLAYER_BIKE, SPRITE_CHRIS_BIKE - db PLAYER_SURF, SPRITE_SURF - db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU - db -1 ; end - -.Kris: - db PLAYER_NORMAL, SPRITE_KRIS - db PLAYER_BIKE, SPRITE_KRIS_BIKE - db PLAYER_SURF, SPRITE_SURF - db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU - db -1 ; end -; 141c9 +INCLUDE "data/sprites/player_sprites.asm" AddMapSprites: ; 141c9 diff --git a/engine/party_menu.asm b/engine/party_menu.asm index 5ef9b50de..a048eb5b7 100644 --- a/engine/party_menu.asm +++ b/engine/party_menu.asm @@ -839,6 +839,7 @@ PrintPartyMenuActionText: ; 50566 ; 5057b .MenuActionTexts: ; 5057b +; entries correspond to PARTYMENUTEXT_* constants dw .Text_CuredOfPoison dw .Text_BurnWasHealed dw .Text_Defrosted diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index f402e9102..54ec224d7 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -704,21 +704,7 @@ GetCallerName: ; 903a9 (24:43a9) ret ; 903d6 (24:43d6) -NonTrainerCallerNames: ; 903d6 - dw .none - dw .mom - dw .bikeshop - dw .bill - dw .elm - dw .buena - -.none db "----------@" -.mom db "MOM:@" -.bill db "BILL:@" -.elm db "PROF.ELM:@" -.bikeshop db "BIKE SHOP:@" -.buena db "BUENA: DISC JOCKEY@" -; 90423 +INCLUDE "data/phone/non_trainer_names.asm" Phone_GetTrainerName: ; 90423 (24:4423) push hl diff --git a/engine/pokedex/unown_dex.asm b/engine/pokedex/unown_dex.asm index dc6db9dc6..40138735d 100755 --- a/engine/pokedex/unown_dex.asm +++ b/engine/pokedex/unown_dex.asm @@ -49,4 +49,4 @@ PrintUnownWord: ; fba2e (3e:7a2e) ; fba5a (3e:7a5a) -INCLUDE "data/unown_words.asm" +INCLUDE "data/pokemon/unown_words.asm" diff --git a/engine/select_menu.asm b/engine/select_menu.asm index e92c3ee50..114c16e06 100755 --- a/engine/select_menu.asm +++ b/engine/select_menu.asm @@ -33,6 +33,7 @@ CheckRegisteredItem: ; 13345 ret .Pockets: +; entries correspond to *_POCKET constants dw .CheckItem dw .CheckBall dw .CheckKeyItem @@ -127,6 +128,7 @@ UseRegisteredItem: ; 133c3 ret .SwitchTo: +; entries correspond to ITEMMENU_* constants dw .CantUse dw .NoFunction dw .NoFunction diff --git a/engine/variables.asm b/engine/variables.asm index 56c49f085..2897cc986 100755 --- a/engine/variables.asm +++ b/engine/variables.asm @@ -54,7 +54,7 @@ _GetVarAction:: ; 80648 (20:4648) dwb MapGroup, RETVAR_STRBUF2 dwb MapNumber, RETVAR_STRBUF2 dwb .UnownCaught, RETVAR_EXECUTE - dwb wEnvironment, RETVAR_STRBUF2 + dwb wEnvironment, RETVAR_STRBUF2 dwb .BoxFreeSpace, RETVAR_EXECUTE dwb wBugContestMinsRemaining, RETVAR_STRBUF2 dwb XCoord, RETVAR_STRBUF2 From 662b3459f606ebe1018c21f4bde11bddb7eb1efd Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 25 Jan 2018 22:22:25 -0500 Subject: [PATCH 047/135] Correct comments --- constants/npctrade_constants.asm | 4 ++-- constants/script_constants.asm | 4 ++-- constants/std_constants.asm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/constants/npctrade_constants.asm b/constants/npctrade_constants.asm index 5464e4dbb..cb7508b11 100644 --- a/constants/npctrade_constants.asm +++ b/constants/npctrade_constants.asm @@ -1,4 +1,4 @@ -; npctrade struct members (see data/npc_trades.asm) +; npctrade struct members (see data/events/npc_trades.asm) TRADE_DIALOG EQU 0 TRADE_GIVEMON EQU 1 TRADE_GETMON EQU 2 @@ -10,7 +10,7 @@ TRADE_OT_NAME EQU 19 TRADE_GENDER EQU 30 TRADE_PADDING EQU 31 -; NPCTrades indexes (see data/npc_trades.asm) +; NPCTrades indexes (see data/events/npc_trades.asm) const_def const NPCTRADE_MIKE ; 0 const NPCTRADE_KYLE ; 1 diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 9d2fd733e..0cf3b058e 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -129,7 +129,7 @@ CMDQUEUE_STONETABLE EQU 2 ; elevfloor macro values -; ElevatorFloorNames indexes (see data/elevator_floors.asm) +; ElevatorFloorNames indexes (see data/events/elevator_floors.asm) const_def const FLOOR_B4F const FLOOR_B3F @@ -267,7 +267,7 @@ NUM_FRUIT_TREES EQU const_value +- 1 NUM_UNOWN_PUZZLES EQU const_value ; DisplayUnownWords writebyte arguments -; UnownWalls and MenuHeaders_UnownWalls indexes (see data/unown_walls.asm) +; UnownWalls and MenuHeaders_UnownWalls indexes (see data/events/unown_walls.asm) const_def const UNOWNWORDS_ESCAPE ; 0 const UNOWNWORDS_LIGHT ; 1 diff --git a/constants/std_constants.asm b/constants/std_constants.asm index 06b0b4f2d..18e64f450 100644 --- a/constants/std_constants.asm +++ b/constants/std_constants.asm @@ -1,5 +1,5 @@ ; StdScripts indexes (see engine/events/std_scripts.asm) -; also used in TileCollisionStdScripts (see data/collision_stdscripts.asm) +; also used in TileCollisionStdScripts (see data/events/collision_stdscripts.asm) enum_start enum pokecenternurse enum difficultbookshelf From a0cc4a33929f6aeb08a733c4a985c3bbb24ef55f Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 26 Jan 2018 11:01:15 -0500 Subject: [PATCH 048/135] Move power data belongs in data/moves/ --- data/{battle => moves}/flail_reversal_power.asm | 0 data/{battle => moves}/magnitude_power.asm | 0 data/{battle => moves}/present_power.asm | 0 engine/battle/effect_commands.asm | 4 ++-- engine/battle/effect_commands/present.asm | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename data/{battle => moves}/flail_reversal_power.asm (100%) rename data/{battle => moves}/magnitude_power.asm (100%) rename data/{battle => moves}/present_power.asm (100%) diff --git a/data/battle/flail_reversal_power.asm b/data/moves/flail_reversal_power.asm similarity index 100% rename from data/battle/flail_reversal_power.asm rename to data/moves/flail_reversal_power.asm diff --git a/data/battle/magnitude_power.asm b/data/moves/magnitude_power.asm similarity index 100% rename from data/battle/magnitude_power.asm rename to data/moves/magnitude_power.asm diff --git a/data/battle/present_power.asm b/data/moves/present_power.asm similarity index 100% rename from data/battle/present_power.asm rename to data/moves/present_power.asm diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 55d56734c..604d9f2d9 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -3803,7 +3803,7 @@ BattleCommand_ConstantDamage: ; 35726 ld [hl], 1 ret -INCLUDE "data/battle/flail_reversal_power.asm" +INCLUDE "data/moves/flail_reversal_power.asm" BattleCommand_Counter: ; 35813 @@ -8934,7 +8934,7 @@ BattleCommand_GetMagnitude: ; 37991 pop bc ret -INCLUDE "data/battle/magnitude_power.asm" +INCLUDE "data/moves/magnitude_power.asm" BattleCommand_BatonPass: ; 379c9 diff --git a/engine/battle/effect_commands/present.asm b/engine/battle/effect_commands/present.asm index 1af6b4b49..24db2a7fb 100755 --- a/engine/battle/effect_commands/present.asm +++ b/engine/battle/effect_commands/present.asm @@ -85,4 +85,4 @@ BattleCommand_Present: ; 37874 .do_animation jp EndMoveEffect -INCLUDE "data/battle/present_power.asm" +INCLUDE "data/moves/present_power.asm" From 0cf4eb68955952659b0e94fbeae0a75fe36255ae Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 26 Jan 2018 11:36:00 -0500 Subject: [PATCH 049/135] Move-unique effect commands consistently go in engine/battle/move_effects/ --- docs/bugs_and_glitches.md | 6 +- engine/battle/effect_commands.asm | 2641 +---------------- .../attract.asm | 2 +- engine/battle/move_effects/baton_pass.asm | 241 ++ engine/battle/move_effects/beat_up.asm | 219 ++ engine/battle/move_effects/belly_drum.asm | 36 + engine/battle/move_effects/bide.asm | 105 + engine/battle/move_effects/conversion.asm | 98 + engine/battle/move_effects/conversion2.asm | 66 + engine/battle/move_effects/counter.asm | 60 + .../curse.asm | 0 engine/battle/move_effects/destiny_bond.asm | 11 + engine/battle/move_effects/disable.asm | 74 + engine/battle/move_effects/encore.asm | 122 + .../endure.asm | 0 engine/battle/move_effects/false_swipe.asm | 44 + engine/battle/move_effects/focus_energy.asm | 17 + .../foresight.asm | 2 +- engine/battle/move_effects/frustration.asm | 29 + engine/battle/move_effects/fury_cutter.asm | 61 + engine/battle/move_effects/future_sight.asm | 85 + engine/battle/move_effects/heal_bell.asm | 36 + engine/battle/move_effects/hidden_power.asm | 10 + engine/battle/move_effects/leech_seed.asm | 42 + engine/battle/move_effects/lock_on.asm | 23 + engine/battle/move_effects/magnitude.asm | 29 + .../metronome.asm | 0 engine/battle/move_effects/mimic.asm | 52 + engine/battle/move_effects/mirror_coat.asm | 61 + .../mirror_move.asm | 0 engine/battle/move_effects/mist.asm | 17 + .../nightmare.asm | 0 engine/battle/move_effects/pain_split.asm | 97 + engine/battle/move_effects/pay_day.asm | 28 + .../perish_song.asm | 0 .../present.asm | 0 .../protect.asm | 0 engine/battle/move_effects/psych_up.asm | 51 + engine/battle/move_effects/pursuit.asm | 26 + engine/battle/move_effects/rage.asm | 8 + engine/battle/move_effects/rain_dance.asm | 11 + engine/battle/move_effects/rapid_spin.asm | 38 + engine/battle/move_effects/return.asm | 27 + .../rollout.asm | 0 engine/battle/move_effects/safeguard.asm | 25 + .../sandstorm.asm | 0 engine/battle/move_effects/selfdestruct.asm | 31 + engine/battle/move_effects/sketch.asm | 119 + engine/battle/move_effects/sleep_talk.asm | 145 + engine/battle/move_effects/snore.asm | 13 + .../spikes.asm | 2 +- engine/battle/move_effects/spite.asm | 88 + engine/battle/move_effects/splash.asm | 6 + engine/battle/move_effects/substitute.asm | 90 + engine/battle/move_effects/sunny_day.asm | 11 + engine/battle/move_effects/teleport.asm | 91 + .../thief.asm | 0 engine/battle/move_effects/thunder.asm | 20 + .../transform.asm | 0 engine/battle/move_effects/triple_kick.asm | 39 + 60 files changed, 2581 insertions(+), 2574 deletions(-) rename engine/battle/{effect_commands => move_effects}/attract.asm (98%) create mode 100644 engine/battle/move_effects/baton_pass.asm create mode 100644 engine/battle/move_effects/beat_up.asm create mode 100644 engine/battle/move_effects/belly_drum.asm create mode 100644 engine/battle/move_effects/bide.asm create mode 100644 engine/battle/move_effects/conversion.asm create mode 100644 engine/battle/move_effects/conversion2.asm create mode 100644 engine/battle/move_effects/counter.asm rename engine/battle/{effect_commands => move_effects}/curse.asm (100%) create mode 100644 engine/battle/move_effects/destiny_bond.asm create mode 100644 engine/battle/move_effects/disable.asm create mode 100644 engine/battle/move_effects/encore.asm rename engine/battle/{effect_commands => move_effects}/endure.asm (100%) create mode 100644 engine/battle/move_effects/false_swipe.asm create mode 100644 engine/battle/move_effects/focus_energy.asm rename engine/battle/{effect_commands => move_effects}/foresight.asm (95%) create mode 100644 engine/battle/move_effects/frustration.asm create mode 100644 engine/battle/move_effects/fury_cutter.asm create mode 100644 engine/battle/move_effects/future_sight.asm create mode 100644 engine/battle/move_effects/heal_bell.asm create mode 100644 engine/battle/move_effects/hidden_power.asm create mode 100644 engine/battle/move_effects/leech_seed.asm create mode 100644 engine/battle/move_effects/lock_on.asm create mode 100644 engine/battle/move_effects/magnitude.asm rename engine/battle/{effect_commands => move_effects}/metronome.asm (100%) create mode 100644 engine/battle/move_effects/mimic.asm create mode 100644 engine/battle/move_effects/mirror_coat.asm rename engine/battle/{effect_commands => move_effects}/mirror_move.asm (100%) create mode 100644 engine/battle/move_effects/mist.asm rename engine/battle/{effect_commands => move_effects}/nightmare.asm (100%) create mode 100644 engine/battle/move_effects/pain_split.asm create mode 100644 engine/battle/move_effects/pay_day.asm rename engine/battle/{effect_commands => move_effects}/perish_song.asm (100%) rename engine/battle/{effect_commands => move_effects}/present.asm (100%) rename engine/battle/{effect_commands => move_effects}/protect.asm (100%) create mode 100644 engine/battle/move_effects/psych_up.asm create mode 100644 engine/battle/move_effects/pursuit.asm create mode 100644 engine/battle/move_effects/rage.asm create mode 100644 engine/battle/move_effects/rain_dance.asm create mode 100644 engine/battle/move_effects/rapid_spin.asm create mode 100644 engine/battle/move_effects/return.asm rename engine/battle/{effect_commands => move_effects}/rollout.asm (100%) create mode 100644 engine/battle/move_effects/safeguard.asm rename engine/battle/{effect_commands => move_effects}/sandstorm.asm (100%) create mode 100644 engine/battle/move_effects/selfdestruct.asm create mode 100644 engine/battle/move_effects/sketch.asm create mode 100644 engine/battle/move_effects/sleep_talk.asm create mode 100644 engine/battle/move_effects/snore.asm rename engine/battle/{effect_commands => move_effects}/spikes.asm (96%) create mode 100644 engine/battle/move_effects/spite.asm create mode 100644 engine/battle/move_effects/splash.asm create mode 100644 engine/battle/move_effects/substitute.asm create mode 100644 engine/battle/move_effects/sunny_day.asm create mode 100644 engine/battle/move_effects/teleport.asm rename engine/battle/{effect_commands => move_effects}/thief.asm (100%) create mode 100644 engine/battle/move_effects/thunder.asm rename engine/battle/{effect_commands => move_effects}/transform.asm (100%) create mode 100644 engine/battle/move_effects/triple_kick.asm diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 31d642464..3755fa1a7 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -155,7 +155,7 @@ This is a bug with `DittoMetalPowder` in [engine/battle/effect_commands.asm](/en ([Video](https://www.youtube.com/watch?v=zuCLMikWo4Y)) -This is a bug with `BattleCommand_BellyDrum` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm): +This is a bug with `BattleCommand_BellyDrum` in [engine/battle/move_effects/belly_drum.asm](/engine/battle/move_effects/belly_drum.asm): ```asm BattleCommand_BellyDrum: ; 37c1a @@ -307,7 +307,7 @@ CheckHiddenOpponent: ; 37daa ([Video](https://www.youtube.com/watch?v=202-iAsrIa8)) -This is a bug with `BattleCommand_BeatUp` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm): +This is a bug with `BattleCommand_BeatUp` in [engine/battle/move_effects/beat_up.asm](/engine/battle/move_effects/beat_up.asm): ```asm .got_mon @@ -346,7 +346,7 @@ This is a bug with `BattleCommand_BeatUp` in [engine/battle/effect_commands.asm] This bug existed for all battles in Gold and Silver, and was only fixed for single-player battles in Crystal to preserve link compatibility. -This is a bug with `BattleCommand_Present` in [engine/battle/effect_commands/present.asm](/engine/battle/effect_commands/present.asm): +This is a bug with `BattleCommand_Present` in [engine/battle/move_effects/present.asm](/engine/battle/move_effects/present.asm): ```asm BattleCommand_Present: ; 37874 diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 604d9f2d9..53c8438e5 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -1306,45 +1306,7 @@ INCLUDE "data/battle/critical_hits.asm" ; 346b2 -BattleCommand_TripleKick: ; 346b2 -; triplekick - - ld a, [wKickCounter] - ld b, a - inc b - ld hl, CurDamage + 1 - ld a, [hld] - ld e, a - ld a, [hli] - ld d, a -.next_kick - dec b - ret z - ld a, [hl] - add e - ld [hld], a - ld a, [hl] - adc d - ld [hli], a - -; No overflow. - jr nc, .next_kick - ld a, $ff - ld [hld], a - ld [hl], a - ret - -; 346cd - - -BattleCommand_KickCounter: ; 346cd -; kickcounter - - ld hl, wKickCounter - inc [hl] - ret - -; 346d2 +INCLUDE "engine/battle/move_effects/triple_kick.asm" BattleCommand_Stab: ; 346d2 @@ -1637,10 +1599,12 @@ BattleCommand_ResetTypeMatchup: ; 34833 ; 3484e + INCLUDE "engine/battle/ai/switch.asm" INCLUDE "data/types/type_matchups.asm" + BattleCommand_DamageVariation: ; 34cfd ; damagevariation @@ -2144,20 +2108,19 @@ BattleCommand_HitTargetNoSub: ; 34f60 ld a, BATTLE_VARS_MOVE_EFFECT call GetBattleVar cp EFFECT_MULTI_HIT - jr z, .multihit + jr z, .alternate_anim cp EFFECT_CONVERSION - jr z, .conversion + jr z, .alternate_anim cp EFFECT_DOUBLE_HIT - jr z, .doublehit + jr z, .alternate_anim cp EFFECT_POISON_MULTI_HIT - jr z, .twineedle + jr z, .alternate_anim cp EFFECT_TRIPLE_KICK jr z, .triplekick xor a ld [wKickCounter], a .triplekick - ld a, BATTLE_VARS_MOVE_ANIM call GetBattleVar ld e, a @@ -2167,18 +2130,13 @@ BattleCommand_HitTargetNoSub: ; 34f60 ld a, BATTLE_VARS_MOVE_ANIM call GetBattleVar cp FLY - jr z, .fly_dig + jr z, .clear_sprite cp DIG ret nz - -.fly_dig -; clear sprite +.clear_sprite jp AppearUserLowerSub -.multihit -.conversion -.doublehit -.twineedle +.alternate_anim ld a, [wKickCounter] and 1 xor 1 @@ -3136,225 +3094,7 @@ EnemyAttackDamage: ; 353f6 ; 35461 -BattleCommand_BeatUp: ; 35461 -; beatup - - call ResetDamage - ld a, [hBattleTurn] - and a - jp nz, .enemy_beats_up - ld a, [PlayerSubStatus3] - bit SUBSTATUS_IN_LOOP, a - jr nz, .next_mon - ld c, 20 - call DelayFrames - xor a - ld [PlayerRolloutCount], a - ld [wd002], a - ld [wBeatUpHitAtLeastOnce], a - jr .got_mon - -.next_mon - ld a, [PlayerRolloutCount] - ld b, a - ld a, [PartyCount] - sub b - ld [wd002], a - -.got_mon - ld a, [wd002] - ld hl, PartyMonNicknames - call GetNick - ld a, MON_HP - call GetBeatupMonLocation - ld a, [hli] - or [hl] - jp z, .beatup_fail ; fainted - ld a, [wd002] - ld c, a - ld a, [CurBattleMon] - ; BUG: this can desynchronize link battles - ; Change "cp [hl]" to "cp c" to fix - cp [hl] - ld hl, BattleMonStatus - jr z, .active_mon - ld a, MON_STATUS - call GetBeatupMonLocation -.active_mon - ld a, [hl] - and a - jp nz, .beatup_fail - - ld a, $1 - ld [wBeatUpHitAtLeastOnce], a - ld hl, BeatUpAttackText - call StdBattleTextBox - ld a, [EnemyMonSpecies] - ld [CurSpecies], a - call GetBaseData - ld a, [BaseDefense] - ld c, a - push bc - ld a, MON_SPECIES - call GetBeatupMonLocation - ld a, [hl] - ld [CurSpecies], a - call GetBaseData - ld a, [BaseAttack] - pop bc - ld b, a - push bc - ld a, MON_LEVEL - call GetBeatupMonLocation - ld a, [hl] - ld e, a - pop bc - ld a, [wPlayerMoveStructPower] - ld d, a - ret - -.enemy_beats_up - ld a, [EnemySubStatus3] - bit SUBSTATUS_IN_LOOP, a - jr nz, .not_first_enemy_beatup - - xor a - ld [EnemyRolloutCount], a - ld [wd002], a - ld [wBeatUpHitAtLeastOnce], a - jr .enemy_continue - -.not_first_enemy_beatup - ld a, [EnemyRolloutCount] - ld b, a - ld a, [OTPartyCount] - sub b - ld [wd002], a -.enemy_continue - ld a, [wBattleMode] - dec a - jr z, .wild - - ld a, [wLinkMode] - and a - jr nz, .link_or_tower - - ld a, [InBattleTowerBattle] - and a - jr nz, .link_or_tower - - ld a, [wd002] - ld c, a - ld b, 0 - ld hl, OTPartySpecies - add hl, bc - ld a, [hl] - ld [wNamedObjectIndexBuffer], a - call GetPokemonName - jr .got_enemy_nick - -.link_or_tower - ld a, [wd002] - ld hl, OTPartyMonNicknames - ld bc, NAME_LENGTH - call AddNTimes - ld de, StringBuffer1 - call CopyBytes -.got_enemy_nick - ld a, MON_HP - call GetBeatupMonLocation - ld a, [hli] - or [hl] - jp z, .beatup_fail - ld a, [wd002] - ld b, a - ld a, [CurOTMon] - cp b - ld hl, EnemyMonStatus - jr z, .active_enemy - - ld a, MON_STATUS - call GetBeatupMonLocation -.active_enemy - ld a, [hl] - and a - jr nz, .beatup_fail - - ld a, $1 - ld [wBeatUpHitAtLeastOnce], a - jr .finish_beatup - -.wild - ld a, [EnemyMonSpecies] - ld [wNamedObjectIndexBuffer], a - call GetPokemonName - ld hl, BeatUpAttackText - call StdBattleTextBox - jp EnemyAttackDamage - -.finish_beatup - ld hl, BeatUpAttackText - call StdBattleTextBox - ld a, [BattleMonSpecies] - ld [CurSpecies], a - call GetBaseData - ld a, [BaseDefense] - ld c, a - push bc - ld a, MON_SPECIES - call GetBeatupMonLocation - ld a, [hl] - ld [CurSpecies], a - call GetBaseData - ld a, [BaseAttack] - pop bc - ld b, a - push bc - ld a, MON_LEVEL - call GetBeatupMonLocation - ld a, [hl] - ld e, a - pop bc - ld a, [wEnemyMoveStructPower] - ld d, a - ret - -; 355b0 - - -.beatup_fail ; 355b0 - ld b, buildopponentrage_command - jp SkipToBattleCommand - -; 355b5 - - -BattleCommanda8: ; 355b5 - ld a, [wBeatUpHitAtLeastOnce] - and a - ret nz - - jp PrintButItFailed - -; 355bd - - -GetBeatupMonLocation: ; 355bd - push bc - ld c, a - ld b, 0 - ld a, [hBattleTurn] - and a - ld hl, PartyMon1Species - jr z, .got_species - ld hl, OTPartyMon1Species - -.got_species - ld a, [wd002] - add hl, bc - call GetPartyLocation - pop bc - ret +INCLUDE "engine/battle/move_effects/beat_up.asm" BattleCommand_ClearMissDamage: ; 355d5 @@ -3691,7 +3431,7 @@ BattleCommand_ConstantDamage: ; 35726 cp b jr nc, .psywave_loop ld b, a - ld a, $0 + ld a, 0 jr .got_power .super_fang @@ -3712,9 +3452,9 @@ BattleCommand_ConstantDamage: ; 35726 and a jr nz, .got_power or b - ld a, $0 + ld a, 0 jr nz, .got_power - ld b, $1 + ld b, 1 jr .got_power .got_power @@ -3806,518 +3546,19 @@ BattleCommand_ConstantDamage: ; 35726 INCLUDE "data/moves/flail_reversal_power.asm" -BattleCommand_Counter: ; 35813 -; counter +INCLUDE "engine/battle/move_effects/counter.asm" - ld a, 1 - ld [AttackMissed], a - ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call GetBattleVar - and a - ret z +INCLUDE "engine/battle/move_effects/encore.asm" - ld b, a - callfar GetMoveEffect - ld a, b - cp EFFECT_COUNTER - ret z +INCLUDE "engine/battle/move_effects/pain_split.asm" - call BattleCommand_ResetTypeMatchup - ld a, [wTypeMatchup] - and a - ret z +INCLUDE "engine/battle/move_effects/snore.asm" - call CheckOpponentWentFirst - ret z +INCLUDE "engine/battle/move_effects/conversion2.asm" - ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call GetBattleVar - dec a - ld de, StringBuffer1 - call GetMoveData +INCLUDE "engine/battle/move_effects/lock_on.asm" - ld a, [StringBuffer1 + MOVE_POWER] - and a - ret z - - ld a, [StringBuffer1 + MOVE_TYPE] - cp SPECIAL - ret nc - - ld hl, CurDamage - ld a, [hli] - or [hl] - ret z - - ld a, [hl] - add a - ld [hld], a - ld a, [hl] - adc a - ld [hl], a - jr nc, .capped - ld a, $ff - ld [hli], a - ld [hl], a -.capped - - xor a - ld [AttackMissed], a - ret - -; 35864 - - -BattleCommand_Encore: ; 35864 -; encore - - ld hl, EnemyMonMoves - ld de, EnemyEncoreCount - ld a, [hBattleTurn] - and a - jr z, .ok - ld hl, BattleMonMoves - ld de, PlayerEncoreCount -.ok - ld a, BATTLE_VARS_LAST_MOVE_OPP - call GetBattleVar - and a - jp z, .failed - cp STRUGGLE - jp z, .failed - cp ENCORE - jp z, .failed - cp MIRROR_MOVE - jp z, .failed - ld b, a - -.got_move - ld a, [hli] - cp b - jr nz, .got_move - - ld bc, BattleMonPP - BattleMonMoves - 1 - add hl, bc - ld a, [hl] - and PP_MASK - jp z, .failed - ld a, [AttackMissed] - and a - jp nz, .failed - ld a, BATTLE_VARS_SUBSTATUS5_OPP - call GetBattleVarAddr - bit SUBSTATUS_ENCORED, [hl] - jp nz, .failed - set SUBSTATUS_ENCORED, [hl] - call BattleRandom - and $3 - inc a - inc a - inc a - ld [de], a - call CheckOpponentWentFirst - jr nz, .finish_move - ld a, [hBattleTurn] - and a - jr z, .force_last_enemy_move - - push hl - ld a, [LastPlayerMove] - ld b, a - ld c, 0 - ld hl, BattleMonMoves -.find_player_move - ld a, [hli] - cp b - jr z, .got_player_move - inc c - ld a, c - cp NUM_MOVES - jr c, .find_player_move - pop hl - res SUBSTATUS_ENCORED, [hl] - xor a - ld [de], a - jr .failed - -.got_player_move - pop hl - ld a, c - ld [CurMoveNum], a - ld a, b - ld [CurPlayerMove], a - dec a - ld de, wPlayerMoveStruct - call GetMoveData - jr .finish_move - -.force_last_enemy_move - push hl - ld a, [LastEnemyMove] - ld b, a - ld c, 0 - ld hl, EnemyMonMoves -.find_enemy_move - ld a, [hli] - cp b - jr z, .got_enemy_move - inc c - ld a, c - cp NUM_MOVES - jr c, .find_enemy_move - pop hl - res SUBSTATUS_ENCORED, [hl] - xor a - ld [de], a - jr .failed - -.got_enemy_move - pop hl - ld a, c - ld [CurEnemyMoveNum], a - ld a, b - ld [CurEnemyMove], a - dec a - ld de, wEnemyMoveStruct - call GetMoveData - -.finish_move - call AnimateCurrentMove - ld hl, GotAnEncoreText - jp StdBattleTextBox - -.failed - jp PrintDidntAffect2 - -; 35926 - - -BattleCommand_PainSplit: ; 35926 -; painsplit - - ld a, [AttackMissed] - and a - jp nz, .ButItFailed - call CheckSubstituteOpp - jp nz, .ButItFailed - call AnimateCurrentMove - ld hl, BattleMonMaxHP + 1 - ld de, EnemyMonMaxHP + 1 - call .PlayerShareHP - ld a, $1 - ld [wWhichHPBar], a - hlcoord 10, 9 - predef AnimateHPBar - ld hl, EnemyMonHP - ld a, [hli] - ld [Buffer4], a - ld a, [hli] - ld [Buffer3], a - ld a, [hli] - ld [Buffer2], a - ld a, [hl] - ld [Buffer1], a - call .EnemyShareHP - xor a - ld [wWhichHPBar], a - call ResetDamage - hlcoord 2, 2 - predef AnimateHPBar - farcall _UpdateBattleHUDs - - ld hl, SharedPainText - jp StdBattleTextBox - -.PlayerShareHP: - ld a, [hld] - ld [Buffer1], a - ld a, [hld] - ld [Buffer2], a - ld a, [hld] - ld b, a - ld [Buffer3], a - ld a, [hl] - ld [Buffer4], a - dec de - dec de - ld a, [de] - dec de - add b - ld [CurDamage + 1], a - ld b, [hl] - ld a, [de] - adc b - srl a - ld [CurDamage], a - ld a, [CurDamage + 1] - rr a - ld [CurDamage + 1], a - inc hl - inc hl - inc hl - inc de - inc de - inc de - -.EnemyShareHP: ; 359ac - ld c, [hl] - dec hl - ld a, [CurDamage + 1] - sub c - ld b, [hl] - dec hl - ld a, [CurDamage] - sbc b - jr nc, .skip - - ld a, [CurDamage] - ld b, a - ld a, [CurDamage + 1] - ld c, a -.skip - ld a, c - ld [hld], a - ld [Buffer5], a - ld a, b - ld [hli], a - ld [Buffer6], a - ret - -; 359cd - -.ButItFailed: - jp PrintDidntAffect2 - -; 359d0 - - -BattleCommand_Snore: ; 359d0 -; snore - ld a, BATTLE_VARS_STATUS - call GetBattleVar - and SLP - ret nz - call ResetDamage - ld a, $1 - ld [AttackMissed], a - call FailSnore - jp EndMoveEffect - -; 359e6 - - -BattleCommand_Conversion2: ; 359e6 -; conversion2 - - ld a, [AttackMissed] - and a - jr nz, .failed - ld hl, BattleMonType1 - ld a, [hBattleTurn] - and a - jr z, .got_type - ld hl, EnemyMonType1 -.got_type - ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call GetBattleVar - and a - jr z, .failed - push hl - dec a - ld hl, Moves + MOVE_TYPE - call GetMoveAttr - ld d, a - pop hl - cp CURSE_T - jr z, .failed - call AnimateCurrentMove - call BattleCommand_SwitchTurn - -.loop - call BattleRandom - and $1f - cp UNUSED_TYPES - jr c, .okay - cp UNUSED_TYPES_END - jr c, .loop - cp TYPES_END - jr nc, .loop -.okay - ld [hli], a - ld [hld], a - push hl - ld a, BATTLE_VARS_MOVE_TYPE - call GetBattleVarAddr - push af - push hl - ld a, d - ld [hl], a - call BattleCheckTypeMatchup - pop hl - pop af - ld [hl], a - pop hl - ld a, [wTypeMatchup] - cp 10 - jr nc, .loop - call BattleCommand_SwitchTurn - - ld a, [hl] - ld [wNamedObjectIndexBuffer], a - predef GetTypeName - ld hl, TransformedTypeText - jp StdBattleTextBox - -.failed - jp FailConversion2 - -; 35a53 - - -BattleCommand_LockOn: ; 35a53 -; lockon - - call CheckSubstituteOpp - jr nz, .fail - - ld a, [AttackMissed] - and a - jr nz, .fail - - ld a, BATTLE_VARS_SUBSTATUS5_OPP - call GetBattleVarAddr - set SUBSTATUS_LOCK_ON, [hl] - call AnimateCurrentMove - - ld hl, TookAimText - jp StdBattleTextBox - -.fail - call AnimateFailedMove - jp PrintDidntAffect - -; 35a74 - - -BattleCommand_Sketch: ; 35a74 -; sketch - - call ClearLastMove -; Don't sketch during a link battle - ld a, [wLinkMode] - and a - jr z, .not_linked - call AnimateFailedMove - jp PrintNothingHappened - -.not_linked -; If the opponent has a substitute up, fail. - call CheckSubstituteOpp - jp nz, .fail -; If the opponent is transformed, fail. - ld a, BATTLE_VARS_SUBSTATUS5_OPP - call GetBattleVarAddr - bit SUBSTATUS_TRANSFORMED, [hl] - jp nz, .fail -; Get the user's moveset in its party struct. -; This move replacement shall be permanent. -; Pointer will be in de. - ld a, MON_MOVES - call UserPartyAttr - ld d, h - ld e, l -; Get the battle move structs. - ld hl, BattleMonMoves - ld a, [hBattleTurn] - and a - jr z, .get_last_move - ld hl, EnemyMonMoves -.get_last_move - ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call GetBattleVar - ld [wTypeMatchup], a - ld b, a -; Fail if move is invalid or is Struggle. - and a - jr z, .fail - cp STRUGGLE - jr z, .fail -; Fail if user already knows that move - ld c, NUM_MOVES -.does_user_already_know_move - ld a, [hli] - cp b - jr z, .fail - dec c - jr nz, .does_user_already_know_move -; Find Sketch in the user's moveset. -; Pointer in hl, and index in c. - dec hl - ld c, NUM_MOVES -.find_sketch - dec c - ld a, [hld] - cp SKETCH - jr nz, .find_sketch - inc hl -; The Sketched move is loaded to that slot. - ld a, b - ld [hl], a -; Copy the base PP from that move. - push bc - push hl - dec a - ld hl, Moves + MOVE_PP - call GetMoveAttr - pop hl - ld bc, BattleMonPP - BattleMonMoves - add hl, bc - ld [hl], a - pop bc - - ld a, [hBattleTurn] - and a - jr z, .user_trainer - ld a, [wBattleMode] - dec a - jr nz, .user_trainer -; wildmon - ld a, [hl] - push bc - ld hl, wWildMonPP - ld b, 0 - add hl, bc - ld [hl], a - ld hl, wWildMonMoves - add hl, bc - pop bc - ld [hl], b - jr .done_copy - -.user_trainer - ld a, [hl] - push af - ld l, c - ld h, 0 - add hl, de - ld a, b - ld [hl], a - pop af - ld de, MON_PP - MON_MOVES - add hl, de - ld [hl], a -.done_copy - call GetMoveName - call AnimateCurrentMove - - ld hl, SketchedText - jp StdBattleTextBox - -.fail - call AnimateFailedMove - jp PrintDidntAffect - -; 35b16 +INCLUDE "engine/battle/move_effects/sketch.asm" BattleCommand_DefrostOpponent: ; 35b16 @@ -4349,338 +3590,15 @@ BattleCommand_DefrostOpponent: ; 35b16 ; 35b33 -BattleCommand_SleepTalk: ; 35b33 -; sleeptalk +INCLUDE "engine/battle/move_effects/sleep_talk.asm" - call ClearLastMove - ld a, [AttackMissed] - and a - jr nz, .fail - ld a, [hBattleTurn] - and a - ld hl, BattleMonMoves + 1 - ld a, [DisabledMove] - ld d, a - jr z, .got_moves - ld hl, EnemyMonMoves + 1 - ld a, [EnemyDisabledMove] - ld d, a -.got_moves - ld a, BATTLE_VARS_STATUS - call GetBattleVar - and SLP - jr z, .fail - ld a, [hl] - and a - jr z, .fail - call .safely_check_has_usable_move - jr c, .fail - dec hl -.sample_move - push hl - call BattleRandom - maskbits NUM_MOVES - ld c, a - ld b, 0 - add hl, bc - ld a, [hl] - pop hl - and a - jr z, .sample_move - ld e, a - ld a, BATTLE_VARS_MOVE_ANIM - call GetBattleVar - cp e - jr z, .sample_move - ld a, e - cp d - jr z, .sample_move - call .check_two_turn_move - jr z, .sample_move - ld a, BATTLE_VARS_MOVE - call GetBattleVarAddr - ld a, e - ld [hl], a - call CheckUserIsCharging - jr nz, .charging - ld a, [wKickCounter] - push af - call BattleCommand_LowerSub - pop af - ld [wKickCounter], a -.charging - call LoadMoveAnim - call UpdateMoveData - jp ResetTurn +INCLUDE "engine/battle/move_effects/destiny_bond.asm" -.fail - call AnimateFailedMove - jp TryPrintButItFailed +INCLUDE "engine/battle/move_effects/spite.asm" -.safely_check_has_usable_move - push hl - push de - push bc - call .check_has_usable_move - pop bc - pop de - pop hl - ret +INCLUDE "engine/battle/move_effects/false_swipe.asm" -.check_has_usable_move - ld a, [hBattleTurn] - and a - ld a, [DisabledMove] - jr z, .got_move_2 - - ld a, [EnemyDisabledMove] -.got_move_2 - ld b, a - ld a, BATTLE_VARS_MOVE - call GetBattleVar - ld c, a - dec hl - ld d, NUM_MOVES -.loop2 - ld a, [hl] - and a - jr z, .carry - - cp c - jr z, .nope - cp b - jr z, .nope - - call .check_two_turn_move - jr nz, .no_carry - -.nope - inc hl - dec d - jr nz, .loop2 - -.carry - scf - ret - -.no_carry - and a - ret - -.check_two_turn_move - push hl - push de - push bc - - ld b, a - callfar GetMoveEffect - ld a, b - - pop bc - pop de - pop hl - - cp EFFECT_SKULL_BASH - ret z - cp EFFECT_RAZOR_WIND - ret z - cp EFFECT_SKY_ATTACK - ret z - cp EFFECT_SOLARBEAM - ret z - cp EFFECT_FLY - ret z - cp EFFECT_BIDE - ret - -; 35bff - - -BattleCommand_DestinyBond: ; 35bff -; destinybond - - ld a, BATTLE_VARS_SUBSTATUS5 - call GetBattleVarAddr - set SUBSTATUS_DESTINY_BOND, [hl] - call AnimateCurrentMove - ld hl, DestinyBondEffectText - jp StdBattleTextBox - -; 35c0f - - -BattleCommand_Spite: ; 35c0f -; spite - - ld a, [AttackMissed] - and a - jp nz, .failed - ld bc, PARTYMON_STRUCT_LENGTH ; ???? - ld hl, EnemyMonMoves - ld a, [hBattleTurn] - and a - jr z, .got_moves - ld hl, BattleMonMoves -.got_moves - ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call GetBattleVar - and a - jr z, .failed - cp STRUGGLE - jr z, .failed - ld b, a - ld c, -1 -.loop - inc c - ld a, [hli] - cp b - jr nz, .loop - ld [wTypeMatchup], a - dec hl - ld b, 0 - push bc - ld c, BattleMonPP - BattleMonMoves - add hl, bc - pop bc - ld a, [hl] - and PP_MASK - jr z, .failed - push bc - call GetMoveName - ; lose 2-5 PP - call BattleRandom - and %11 - inc a - inc a - ld b, a - ld a, [hl] - and PP_MASK - cp b - jr nc, .deplete_pp - ld b, a -.deplete_pp - ld a, [hl] - sub b - ld [hl], a - push af - ld a, MON_PP - call OpponentPartyAttr - ld d, b - pop af - pop bc - add hl, bc - ld e, a - ld a, BATTLE_VARS_SUBSTATUS5_OPP - call GetBattleVar - bit SUBSTATUS_TRANSFORMED, a - jr nz, .transformed - ld a, [hBattleTurn] - and a - jr nz, .not_wildmon - ld a, [wBattleMode] - dec a - jr nz, .not_wildmon - ld hl, wWildMonPP - add hl, bc -.not_wildmon - ld [hl], e -.transformed - push de - call AnimateCurrentMove - pop de - ld a, d - ld [wTypeMatchup], a - ld hl, SpiteEffectText - jp StdBattleTextBox - -.failed - jp PrintDidntAffect2 - -; 35c94 - - -BattleCommand_FalseSwipe: ; 35c94 -; falseswipe - - ld hl, EnemyMonHP - ld a, [hBattleTurn] - and a - jr z, .got_hp - ld hl, BattleMonHP -.got_hp - ld de, CurDamage - ld c, 2 - push hl - push de - call StringCmp - pop de - pop hl - jr c, .done - ld a, [hli] - ld [de], a - inc de - ld a, [hl] - dec a - ld [de], a - inc a - jr nz, .okay - dec de - ld a, [de] - dec a - ld [de], a -.okay - ld a, [CriticalHit] - cp 2 - jr nz, .carry - xor a - ld [CriticalHit], a -.carry - scf - ret - -.done - and a - ret - -; 35cc9 - - -BattleCommand_HealBell: ; 35cc9 -; healbell - - ld a, BATTLE_VARS_SUBSTATUS1 - call GetBattleVarAddr - res SUBSTATUS_NIGHTMARE, [hl] - ld de, PartyMon1Status - ld a, [hBattleTurn] - and a - jr z, .got_status - ld de, OTPartyMon1Status -.got_status - ld a, BATTLE_VARS_STATUS - call GetBattleVarAddr - xor a - ld [hl], a - ld h, d - ld l, e - ld bc, PARTYMON_STRUCT_LENGTH - ld d, PARTY_LENGTH -.loop - ld [hl], a - add hl, bc - dec d - jr nz, .loop - call AnimateCurrentMove - - ld hl, BellChimedText - call StdBattleTextBox - - ld a, [hBattleTurn] - and a - jp z, CalcPlayerStats - jp CalcEnemyStats - -; 35d00 +INCLUDE "engine/battle/move_effects/heal_bell.asm" FarPlayBattleAnimation: ; 35d00 @@ -6377,111 +5295,7 @@ CalcStats: ; 3661d ; 36671 -BattleCommand_StoreEnergy: ; 36671 -; storeenergy - - ld a, BATTLE_VARS_SUBSTATUS3 - call GetBattleVar - bit SUBSTATUS_BIDE, a - ret z - - ld hl, PlayerRolloutCount - ld a, [hBattleTurn] - and a - jr z, .check_still_storing_energy - ld hl, EnemyRolloutCount -.check_still_storing_energy - dec [hl] - jr nz, .still_storing - - ld a, BATTLE_VARS_SUBSTATUS3 - call GetBattleVarAddr - res SUBSTATUS_BIDE, [hl] - - ld hl, UnleashedEnergyText - call StdBattleTextBox - - ld a, BATTLE_VARS_MOVE_POWER - call GetBattleVarAddr - ld a, 1 - ld [hl], a - ld hl, PlayerDamageTaken + 1 - ld de, wPlayerCharging ; player - ld a, [hBattleTurn] - and a - jr z, .player - ld hl, EnemyDamageTaken + 1 - ld de, wEnemyCharging ; enemy -.player - ld a, [hld] - add a - ld b, a - ld [CurDamage + 1], a - ld a, [hl] - rl a - ld [CurDamage], a - jr nc, .not_maxed - ld a, $ff - ld [CurDamage], a - ld [CurDamage + 1], a -.not_maxed - or b - jr nz, .built_up_something - ld a, 1 - ld [AttackMissed], a -.built_up_something - xor a - ld [hli], a - ld [hl], a - ld [de], a - - ld a, BATTLE_VARS_MOVE_ANIM - call GetBattleVarAddr - ld a, BIDE - ld [hl], a - - ld b, unleashenergy_command - jp SkipToBattleCommand - -.still_storing - ld hl, StoringEnergyText - call StdBattleTextBox - jp EndMoveEffect - -; 366e5 - - -BattleCommand_UnleashEnergy: ; 366e5 -; unleashenergy - - ld de, PlayerDamageTaken - ld bc, PlayerRolloutCount - ld a, [hBattleTurn] - and a - jr z, .got_damage - ld de, EnemyDamageTaken - ld bc, EnemyRolloutCount -.got_damage - ld a, BATTLE_VARS_SUBSTATUS3 - call GetBattleVarAddr - set SUBSTATUS_BIDE, [hl] - xor a - ld [de], a - inc de - ld [de], a - ld [wPlayerMoveStructEffect], a - ld [wEnemyMoveStructEffect], a - call BattleRandom - and 1 - inc a - inc a - ld [bc], a - ld a, 1 - ld [wKickCounter], a - call AnimateCurrentMove - jp EndMoveEffect - -; 3671a +INCLUDE "engine/battle/move_effects/bide.asm" BattleCommand_CheckRampage: ; 3671a @@ -6554,97 +5368,7 @@ BattleCommand_Rampage: ; 36751 ; 36778 -BattleCommand_Teleport: ; 36778 -; teleport - - ld a, [BattleType] - cp BATTLETYPE_SHINY - jr z, .failed - cp BATTLETYPE_TRAP - jr z, .failed - cp BATTLETYPE_CELEBI - jr z, .failed - cp BATTLETYPE_SUICUNE - jr z, .failed - - ld a, BATTLE_VARS_SUBSTATUS5_OPP - call GetBattleVar - bit SUBSTATUS_CANT_RUN, a - jr nz, .failed -; Only need to check these next things if it's your turn - ld a, [hBattleTurn] - and a - jr nz, .enemy_turn -; Can't teleport from a trainer battle - ld a, [wBattleMode] - dec a - jr nz, .failed -; If your level is greater than the opponent's, you run without fail. - ld a, [CurPartyLevel] - ld b, a - ld a, [BattleMonLevel] - cp b - jr nc, .run_away -; Generate a number between 0 and (YourLevel + TheirLevel). - add b - ld c, a - inc c -.loop_player - call BattleRandom - cp c - jr nc, .loop_player -; If that number is greater than 4 times your level, run away. - srl b - srl b - cp b - jr nc, .run_away - -.failed - call AnimateFailedMove - jp PrintButItFailed - -.enemy_turn - ld a, [wBattleMode] - dec a - jr nz, .failed - ld a, [BattleMonLevel] - ld b, a - ld a, [CurPartyLevel] - cp b - jr nc, .run_away - add b - ld c, a - inc c -.loop_enemy - call BattleRandom - cp c - jr nc, .loop_enemy - srl b - srl b - cp b - ; This does the wrong thing. What was - ; probably intended was jr c, .failed - ; The way this is made makes enemy use - ; of Teleport always succeed if able - jr nc, .run_away -.run_away - call UpdateBattleMonInParty - xor a - ld [wNumHits], a - inc a - ld [wForcedSwitch], a - ld [wKickCounter], a - call SetBattleDraw - call BattleCommand_LowerSub - call LoadMoveAnim - ld c, 20 - call DelayFrames - call SetBattleDraw - - ld hl, FledFromBattleText - jp StdBattleTextBox - -; 36804 +INCLUDE "engine/battle/move_effects/teleport.asm" SetBattleDraw: ; 36804 @@ -7420,42 +6144,9 @@ BattleCommand_TrapTarget: ; 36c2d ; 36c7e -BattleCommand_Mist: ; 36c7e -; mist +INCLUDE "engine/battle/move_effects/mist.asm" - ld a, BATTLE_VARS_SUBSTATUS4 - call GetBattleVarAddr - bit SUBSTATUS_MIST, [hl] - jr nz, .already_mist - set SUBSTATUS_MIST, [hl] - call AnimateCurrentMove - ld hl, MistText - jp StdBattleTextBox - -.already_mist - call AnimateFailedMove - jp PrintButItFailed - -; 36c98 - - -BattleCommand_FocusEnergy: ; 36c98 -; focusenergy - - ld a, BATTLE_VARS_SUBSTATUS4 - call GetBattleVarAddr - bit SUBSTATUS_FOCUS_ENERGY, [hl] - jr nz, .already_pumped - set SUBSTATUS_FOCUS_ENERGY, [hl] - call AnimateCurrentMove - ld hl, GettingPumpedText - jp StdBattleTextBox - -.already_pumped - call AnimateFailedMove - jp PrintButItFailed - -; 36cb2 +INCLUDE "engine/battle/move_effects/focus_energy.asm" BattleCommand_Recoil: ; 36cb2 @@ -7755,96 +6446,8 @@ CheckMoveTypeMatchesTarget: ; 36e5b ; 36e7c -BattleCommand_Substitute: ; 36e7c -; substitute +INCLUDE "engine/battle/move_effects/substitute.asm" - call BattleCommand_MoveDelay - ld hl, BattleMonMaxHP - ld de, PlayerSubstituteHP - ld a, [hBattleTurn] - and a - jr z, .got_hp - ld hl, EnemyMonMaxHP - ld de, EnemySubstituteHP -.got_hp - - ld a, BATTLE_VARS_SUBSTATUS4 - call GetBattleVar - bit SUBSTATUS_SUBSTITUTE, a - jr nz, .already_has_sub - - ld a, [hli] - ld b, [hl] - srl a - rr b - srl a - rr b - dec hl - dec hl - ld a, b - ld [de], a - ld a, [hld] - sub b - ld e, a - ld a, [hl] - sbc 0 - ld d, a - jr c, .too_weak_to_sub - ld a, d - or e - jr z, .too_weak_to_sub - ld [hl], d - inc hl - ld [hl], e - - ld a, BATTLE_VARS_SUBSTATUS4 - call GetBattleVarAddr - set SUBSTATUS_SUBSTITUTE, [hl] - - ld hl, wPlayerWrapCount - ld de, wPlayerTrappingMove - ld a, [hBattleTurn] - and a - jr z, .player - ld hl, wEnemyWrapCount - ld de, wEnemyTrappingMove -.player - - xor a - ld [hl], a - ld [de], a - call _CheckBattleScene - jr c, .no_anim - - xor a - ld [wNumHits], a - ld [FXAnimID + 1], a - ld [wKickCounter], a - ld a, SUBSTITUTE - call LoadAnim - jr .finish - -.no_anim - call BattleCommand_RaiseSubNoAnim -.finish - ld hl, MadeSubstituteText - call StdBattleTextBox - jp RefreshBattleHuds - -.already_has_sub - call CheckUserIsCharging - call nz, BattleCommand_RaiseSub - ld hl, HasSubstituteText - jr .jp_stdbattletextbox - -.too_weak_to_sub - call CheckUserIsCharging - call nz, BattleCommand_RaiseSub - ld hl, TooWeakSubText -.jp_stdbattletextbox - jp StdBattleTextBox - -; 36f0b BattleCommand_RechargeNextTurn: ; 36f0b ; rechargenextturn @@ -7867,14 +6470,7 @@ EndRechargeOpp: ; 36f13 ; 36f1d -BattleCommand_Rage: ; 36f1d -; rage - ld a, BATTLE_VARS_SUBSTATUS4 - call GetBattleVarAddr - set SUBSTATUS_RAGE, [hl] - ret - -; 36f25 +INCLUDE "engine/battle/move_effects/rage.asm" BattleCommand_DoubleFlyingDamage: ; 36f25 @@ -7915,316 +6511,17 @@ DoubleDamage: ; 36f37 ; 36f46 -BattleCommand_Mimic: ; 36f46 -; mimic +INCLUDE "engine/battle/move_effects/mimic.asm" - call ClearLastMove - call BattleCommand_MoveDelay - ld a, [AttackMissed] - and a - jr nz, .fail - ld hl, BattleMonMoves - ld a, [hBattleTurn] - and a - jr z, .player_turn - ld hl, EnemyMonMoves -.player_turn - call CheckHiddenOpponent - jr nz, .fail - ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call GetBattleVar - and a - jr z, .fail - cp STRUGGLE - jr z, .fail - ld b, a - ld c, NUM_MOVES -.check_already_knows_move - ld a, [hli] - cp b - jr z, .fail - dec c - jr nz, .check_already_knows_move - dec hl -.find_mimic - ld a, [hld] - cp MIMIC - jr nz, .find_mimic - inc hl - ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call GetBattleVar - ld [hl], a - ld [wNamedObjectIndexBuffer], a - ld bc, BattleMonPP - BattleMonMoves - add hl, bc - ld [hl], 5 - call GetMoveName - call AnimateCurrentMove - ld hl, LearnedMoveText - jp StdBattleTextBox +INCLUDE "engine/battle/move_effects/leech_seed.asm" -.fail - jp FailMimic +INCLUDE "engine/battle/move_effects/splash.asm" -; 36f9d +INCLUDE "engine/battle/move_effects/disable.asm" +INCLUDE "engine/battle/move_effects/pay_day.asm" -BattleCommand_LeechSeed: ; 36f9d -; leechseed - ld a, [AttackMissed] - and a - jr nz, .evaded - call CheckSubstituteOpp - jr nz, .evaded - - ld de, EnemyMonType1 - ld a, [hBattleTurn] - and a - jr z, .ok - ld de, BattleMonType1 -.ok - - ld a, [de] - cp GRASS - jr z, .grass - inc de - ld a, [de] - cp GRASS - jr z, .grass - - ld a, BATTLE_VARS_SUBSTATUS4_OPP - call GetBattleVarAddr - bit SUBSTATUS_LEECH_SEED, [hl] - jr nz, .evaded - set SUBSTATUS_LEECH_SEED, [hl] - call AnimateCurrentMove - ld hl, WasSeededText - jp StdBattleTextBox - -.grass - call AnimateFailedMove - jp PrintDoesntAffect - -.evaded - call AnimateFailedMove - ld hl, EvadedText - jp StdBattleTextBox - -; 36fe1 - - -BattleCommand_Splash: ; 36fe1 - call AnimateCurrentMove - farcall StubbedTrainerRankings_Splash - jp PrintNothingHappened - -; 36fed - - -BattleCommand_Disable: ; 36fed -; disable - - ld a, [AttackMissed] - and a - jr nz, .failed - - ld de, EnemyDisableCount - ld hl, EnemyMonMoves - ld a, [hBattleTurn] - and a - jr z, .got_moves - ld de, PlayerDisableCount - ld hl, BattleMonMoves -.got_moves - - ld a, [de] - and a - jr nz, .failed - - ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call GetBattleVar - and a - jr z, .failed - cp STRUGGLE - jr z, .failed - - ld b, a - ld c, $ff -.loop - inc c - ld a, [hli] - cp b - jr nz, .loop - - ld a, [hBattleTurn] - and a - ld hl, EnemyMonPP - jr z, .got_pp - ld hl, BattleMonPP -.got_pp - ld b, 0 - add hl, bc - ld a, [hl] - and a - jr z, .failed -.loop2 - call BattleRandom - and 7 - jr z, .loop2 - inc a - inc c - swap c - add c - ld [de], a - call AnimateCurrentMove - ld hl, DisabledMove - ld a, [hBattleTurn] - and a - jr nz, .got_disabled_move_pointer - inc hl -.got_disabled_move_pointer - ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call GetBattleVar - ld [hl], a - ld [wNamedObjectIndexBuffer], a - call GetMoveName - ld hl, WasDisabledText - jp StdBattleTextBox - -.failed - jp FailDisable - -; 3705c - - -BattleCommand_PayDay: ; 3705c -; payday - - xor a - ld hl, StringBuffer1 - ld [hli], a - - ld a, [hBattleTurn] - and a - ld a, [BattleMonLevel] - jr z, .ok - ld a, [EnemyMonLevel] -.ok - - add a - ld hl, wPayDayMoney + 2 - add [hl] - ld [hld], a - jr nc, .done - inc [hl] - dec hl - jr nz, .done - inc [hl] -.done - ld hl, CoinsScatteredText - jp StdBattleTextBox - -; 3707f - - -BattleCommand_Conversion: ; 3707f -; conversion - - ld hl, BattleMonMoves - ld de, BattleMonType1 - ld a, [hBattleTurn] - and a - jr z, .got_moves - ld hl, EnemyMonMoves - ld de, EnemyMonType1 -.got_moves - push de - ld c, 0 - ld de, StringBuffer1 -.loop - push hl - ld b, 0 - add hl, bc - ld a, [hl] - pop hl - and a - jr z, .okay - push hl - push bc - dec a - ld hl, Moves + MOVE_TYPE - call GetMoveAttr - ld [de], a - inc de - pop bc - pop hl - inc c - ld a, c - cp NUM_MOVES - jr c, .loop -.okay - ld a, $ff - ld [de], a - inc de - ld [de], a - inc de - ld [de], a - pop de - ld hl, StringBuffer1 -.loop2 - ld a, [hl] - cp -1 - jr z, .fail - cp CURSE_T - jr z, .next - ld a, [de] - cp [hl] - jr z, .next - inc de - ld a, [de] - dec de - cp [hl] - jr nz, .done -.next - inc hl - jr .loop2 - -.fail - call AnimateFailedMove - jp PrintButItFailed - -.done -.loop3 - call BattleRandom - maskbits NUM_MOVES - ld c, a - ld b, 0 - ld hl, StringBuffer1 - add hl, bc - ld a, [hl] - cp -1 - jr z, .loop3 - cp CURSE_T - jr z, .loop3 - ld a, [de] - cp [hl] - jr z, .loop3 - inc de - ld a, [de] - dec de - cp [hl] - jr z, .loop3 - ld a, [hl] - ld [de], a - inc de - ld [de], a - ld [wNamedObjectIndexBuffer], a - farcall GetTypeName - call AnimateCurrentMove - ld hl, TransformedTypeText - jp StdBattleTextBox - -; 3710e +INCLUDE "engine/battle/move_effects/conversion.asm" BattleCommand_ResetStats: ; 3710e @@ -8347,7 +6644,9 @@ BattleCommand_Heal: ; 3713e ; 371cd -INCLUDE "engine/battle/effect_commands/transform.asm" + +INCLUDE "engine/battle/move_effects/transform.asm" + BattleSideCopy: ; 372c6 ; Copy bc bytes from hl to de if it's the player's turn. @@ -8489,12 +6788,7 @@ PrintButItFailed: ; 3734e ; 37354 -FailSnore: -FailDisable: -FailConversion2: -FailAttract: -FailForesight: -FailSpikes: +FailMove: call AnimateFailedMove ; fallthrough ; 37357 @@ -8541,42 +6835,11 @@ CheckSubstituteOpp: ; 37378 ; 37380 -BattleCommand_Selfdestruct: ; 37380 - farcall StubbedTrainerRankings_Selfdestruct - ld a, BATTLEANIM_PLAYER_DAMAGE - ld [wNumHits], a - ld c, 3 - call DelayFrames - ld a, BATTLE_VARS_STATUS - call GetBattleVarAddr - xor a - ld [hli], a - inc hl - ld [hli], a - ld [hl], a - ld a, $1 - ld [wKickCounter], a - call BattleCommand_LowerSub - call LoadMoveAnim - ld a, BATTLE_VARS_SUBSTATUS4 - call GetBattleVarAddr - res SUBSTATUS_LEECH_SEED, [hl] - ld a, BATTLE_VARS_SUBSTATUS5_OPP - call GetBattleVarAddr - res SUBSTATUS_DESTINY_BOND, [hl] - call _CheckBattleScene - ret nc - farcall DrawPlayerHUD - farcall DrawEnemyHUD - call WaitBGMap - jp RefreshBattleHuds +INCLUDE "engine/battle/move_effects/selfdestruct.asm" -; 373c9 +INCLUDE "engine/battle/move_effects/mirror_move.asm" - -INCLUDE "engine/battle/effect_commands/mirror_move.asm" - -INCLUDE "engine/battle/effect_commands/metronome.asm" +INCLUDE "engine/battle/move_effects/metronome.asm" CheckUserMove: ; 37462 @@ -8623,7 +6886,7 @@ ResetTurn: ; 3747b ; 37492 -INCLUDE "engine/battle/effect_commands/thief.asm" +INCLUDE "engine/battle/move_effects/thief.asm" BattleCommand_ArenaTrap: ; 37517 @@ -8655,7 +6918,7 @@ BattleCommand_ArenaTrap: ; 37517 ; 37536 -INCLUDE "engine/battle/effect_commands/nightmare.asm" +INCLUDE "engine/battle/move_effects/nightmare.asm" BattleCommand_Defrost: ; 37563 @@ -8692,21 +6955,21 @@ BattleCommand_Defrost: ; 37563 ; 37588 -INCLUDE "engine/battle/effect_commands/curse.asm" +INCLUDE "engine/battle/move_effects/curse.asm" -INCLUDE "engine/battle/effect_commands/protect.asm" +INCLUDE "engine/battle/move_effects/protect.asm" -INCLUDE "engine/battle/effect_commands/endure.asm" +INCLUDE "engine/battle/move_effects/endure.asm" -INCLUDE "engine/battle/effect_commands/spikes.asm" +INCLUDE "engine/battle/move_effects/spikes.asm" -INCLUDE "engine/battle/effect_commands/foresight.asm" +INCLUDE "engine/battle/move_effects/foresight.asm" -INCLUDE "engine/battle/effect_commands/perish_song.asm" +INCLUDE "engine/battle/move_effects/perish_song.asm" -INCLUDE "engine/battle/effect_commands/sandstorm.asm" +INCLUDE "engine/battle/move_effects/sandstorm.asm" -INCLUDE "engine/battle/effect_commands/rollout.asm" +INCLUDE "engine/battle/move_effects/rollout.asm" BattleCommand5d: ; 37791 @@ -8716,158 +6979,17 @@ BattleCommand5d: ; 37791 ; 37792 -BattleCommand_FuryCutter: ; 37792 -; furycutter +INCLUDE "engine/battle/move_effects/fury_cutter.asm" - ld hl, PlayerFuryCutterCount - ld a, [hBattleTurn] - and a - jr z, .go - ld hl, EnemyFuryCutterCount +INCLUDE "engine/battle/move_effects/attract.asm" -.go - ld a, [AttackMissed] - and a - jp nz, ResetFuryCutterCount +INCLUDE "engine/battle/move_effects/return.asm" - inc [hl] +INCLUDE "engine/battle/move_effects/present.asm" -; Damage capped at 5 turns' worth (16x). - ld a, [hl] - ld b, a - cp 6 - jr c, .checkdouble - ld b, 5 +INCLUDE "engine/battle/move_effects/frustration.asm" -.checkdouble - dec b - ret z - -; Double the damage - ld hl, CurDamage + 1 - sla [hl] - dec hl - rl [hl] - jr nc, .checkdouble - -; No overflow - ld a, $ff - ld [hli], a - ld [hl], a - ret - -; 377be - - -ResetFuryCutterCount: ; 377be - - push hl - - ld hl, PlayerFuryCutterCount - ld a, [hBattleTurn] - and a - jr z, .reset - ld hl, EnemyFuryCutterCount - -.reset - xor a - ld [hl], a - - pop hl - ret - -; 377ce - - -INCLUDE "engine/battle/effect_commands/attract.asm" - -BattleCommand_HappinessPower: ; 3784b -; happinesspower - push bc - ld hl, BattleMonHappiness - ld a, [hBattleTurn] - and a - jr z, .ok - ld hl, EnemyMonHappiness -.ok - xor a - ld [hMultiplicand + 0], a - ld [hMultiplicand + 1], a - ld a, [hl] - ld [hMultiplicand + 2], a - ld a, 10 - ld [hMultiplier], a - call Multiply - ld a, 25 - ld [hDivisor], a - ld b, 4 - call Divide - ld a, [hQuotient + 2] - ld d, a - pop bc - ret - -; 37874 - - -INCLUDE "engine/battle/effect_commands/present.asm" - -BattleCommand_FrustrationPower: ; 3790e -; frustrationpower - - push bc - ld hl, BattleMonHappiness - ld a, [hBattleTurn] - and a - jr z, .got_happiness - ld hl, EnemyMonHappiness -.got_happiness - ld a, $ff - sub [hl] - ld [hMultiplicand + 2], a - xor a - ld [hMultiplicand + 0], a - ld [hMultiplicand + 1], a - ld a, 10 - ld [hMultiplier], a - call Multiply - ld a, 25 - ld [hDivisor], a - ld b, 4 - call Divide - ld a, [hQuotient + 2] - ld d, a - pop bc - ret - -; 37939 - - -BattleCommand_Safeguard: ; 37939 -; safeguard - - ld hl, PlayerScreens - ld de, PlayerSafeguardCount - ld a, [hBattleTurn] - and a - jr z, .ok - ld hl, EnemyScreens - ld de, EnemySafeguardCount -.ok - bit SCREENS_SAFEGUARD, [hl] - jr nz, .failed - set SCREENS_SAFEGUARD, [hl] - ld a, 5 - ld [de], a - call AnimateCurrentMove - ld hl, CoveredByVeilText - jp StdBattleTextBox - -.failed - call AnimateFailedMove - jp PrintButItFailed - -; 37962 +INCLUDE "engine/battle/move_effects/safeguard.asm" SafeCheckSafeguard: ; 37962 @@ -8906,346 +7028,13 @@ BattleCommand_CheckSafeguard: ; 37972 ; 37991 -BattleCommand_GetMagnitude: ; 37991 -; getmagnitude +INCLUDE "engine/battle/move_effects/magnitude.asm" - push bc - call BattleRandom - ld b, a - ld hl, MagnitudePower -.loop - ld a, [hli] - cp b - jr nc, .ok - inc hl - inc hl - jr .loop +INCLUDE "engine/battle/move_effects/baton_pass.asm" -.ok - ld d, [hl] - push de - inc hl - ld a, [hl] - ld [wTypeMatchup], a - call BattleCommand_MoveDelay - ld hl, MagnitudeText - call StdBattleTextBox - pop de - pop bc - ret +INCLUDE "engine/battle/move_effects/pursuit.asm" -INCLUDE "data/moves/magnitude_power.asm" - - -BattleCommand_BatonPass: ; 379c9 -; batonpass - - ld a, [hBattleTurn] - and a - jp nz, .Enemy - - -; Need something to switch to - call CheckAnyOtherAlivePartyMons - jp z, FailedBatonPass - - call UpdateBattleMonInParty - call AnimateCurrentMove - - ld c, 50 - call DelayFrames - -; Transition into switchmon menu - call LoadStandardMenuHeader - farcall SetUpBattlePartyMenu_NoLoop - - farcall ForcePickSwitchMonInBattle - -; Return to battle scene - call ClearPalettes - farcall _LoadBattleFontsHPBar - call CloseWindow - call ClearSprites - hlcoord 1, 0 - lb bc, 4, 10 - call ClearBox - ld b, SCGB_BATTLE_COLORS - call GetSGBLayout - call SetPalettes - call BatonPass_LinkPlayerSwitch - -; Mobile link battles handle entrances differently - farcall CheckMobileBattleError - jp c, EndMoveEffect - - ld hl, PassedBattleMonEntrance - call CallBattleCore - - call ResetBatonPassStatus - ret - - -.Enemy: - -; Wildmons don't have anything to switch to - ld a, [wBattleMode] - dec a ; WILDMON - jp z, FailedBatonPass - - call CheckAnyOtherAliveEnemyMons - jp z, FailedBatonPass - - call UpdateEnemyMonInParty - call AnimateCurrentMove - call BatonPass_LinkEnemySwitch - -; Mobile link battles handle entrances differently - farcall CheckMobileBattleError - jp c, EndMoveEffect - -; Passed enemy PartyMon entrance - xor a - ld [wEnemySwitchMonIndex], a - ld hl, EnemySwitch_SetMode - call CallBattleCore - ld hl, ResetBattleParticipants - call CallBattleCore - ld a, 1 - ld [wTypeMatchup], a - ld hl, ApplyStatLevelMultiplierOnAllStats - call CallBattleCore - - ld hl, SpikesDamage - call CallBattleCore - - jr ResetBatonPassStatus - -; 37a67 - - -BatonPass_LinkPlayerSwitch: ; 37a67 - ld a, [wLinkMode] - and a - ret z - - ld a, 1 - ld [wPlayerAction], a - - call LoadStandardMenuHeader - ld hl, LinkBattleSendReceiveAction - call CallBattleCore - call CloseWindow - - xor a - ld [wPlayerAction], a - ret - -; 37a82 - - -BatonPass_LinkEnemySwitch: ; 37a82 - ld a, [wLinkMode] - and a - ret z - - call LoadStandardMenuHeader - ld hl, LinkBattleSendReceiveAction - call CallBattleCore - - ld a, [OTPartyCount] - add BATTLEACTION_SWITCH1 - ld b, a - ld a, [wBattleAction] - cp BATTLEACTION_SWITCH1 - jr c, .baton_pass - cp b - jr c, .switch - -.baton_pass - ld a, [CurOTMon] - add BATTLEACTION_SWITCH1 - ld [wBattleAction], a -.switch - jp CloseWindow - -; 37aab - - -FailedBatonPass: ; 37aab - call AnimateFailedMove - jp PrintButItFailed - -; 37ab1 - - -ResetBatonPassStatus: ; 37ab1 -; Reset status changes that aren't passed by Baton Pass. - - ; Nightmare isn't passed. - ld a, BATTLE_VARS_STATUS - call GetBattleVar - and SLP - jr nz, .ok - - ld a, BATTLE_VARS_SUBSTATUS1 - call GetBattleVarAddr - res SUBSTATUS_NIGHTMARE, [hl] -.ok - - ; Disable isn't passed. - call ResetActorDisable - - ; Attraction isn't passed. - ld hl, PlayerSubStatus1 - res SUBSTATUS_IN_LOVE, [hl] - ld hl, EnemySubStatus1 - res SUBSTATUS_IN_LOVE, [hl] - ld hl, PlayerSubStatus5 - - ld a, BATTLE_VARS_SUBSTATUS5 - call GetBattleVarAddr - res SUBSTATUS_TRANSFORMED, [hl] - res SUBSTATUS_ENCORED, [hl] - - ; New mon hasn't used a move yet. - ld a, BATTLE_VARS_LAST_MOVE - call GetBattleVarAddr - ld [hl], 0 - - xor a - ld [wPlayerWrapCount], a - ld [wEnemyWrapCount], a - ret - -; 37ae9 - - -CheckAnyOtherAlivePartyMons: ; 37ae9 - ld hl, PartyMon1HP - ld a, [PartyCount] - ld d, a - ld a, [CurBattleMon] - ld e, a - jr CheckAnyOtherAliveMons - -; 37af6 - - -CheckAnyOtherAliveEnemyMons: ; 37af6 - ld hl, OTPartyMon1HP - ld a, [OTPartyCount] - ld d, a - ld a, [CurOTMon] - ld e, a - - ; fallthrough -; 37b01 - -CheckAnyOtherAliveMons: ; 37b01 -; Check for nonzero HP starting from partymon -; HP at hl for d partymons, besides current mon e. - -; Return nz if any are alive. - - xor a - ld b, a - ld c, a -.loop - ld a, c - cp d - jr z, .done - cp e - jr z, .next - - ld a, [hli] - or b - ld b, a - ld a, [hld] - or b - ld b, a - -.next - push bc - ld bc, PARTYMON_STRUCT_LENGTH - add hl, bc - pop bc - inc c - jr .loop - -.done - ld a, b - and a - ret - -; 37b1d - - -BattleCommand_Pursuit: ; 37b1d -; pursuit -; Double damage if the opponent is switching. - - ld hl, wEnemyIsSwitching - ld a, [hBattleTurn] - and a - jr z, .ok - ld hl, wPlayerIsSwitching -.ok - ld a, [hl] - and a - ret z - - ld hl, CurDamage + 1 - sla [hl] - dec hl - rl [hl] - ret nc - - ld a, $ff - ld [hli], a - ld [hl], a - ret - -; 37b39 - - -BattleCommand_ClearHazards: ; 37b39 -; clearhazards - - ld a, BATTLE_VARS_SUBSTATUS4 - call GetBattleVarAddr - bit SUBSTATUS_LEECH_SEED, [hl] - jr z, .not_leeched - res SUBSTATUS_LEECH_SEED, [hl] - ld hl, ShedLeechSeedText - call StdBattleTextBox -.not_leeched - - ld hl, PlayerScreens - ld de, wPlayerWrapCount - ld a, [hBattleTurn] - and a - jr z, .got_screens_wrap - ld hl, EnemyScreens - ld de, wEnemyWrapCount -.got_screens_wrap - bit SCREENS_SPIKES, [hl] - jr z, .no_spikes - res SCREENS_SPIKES, [hl] - ld hl, BlewSpikesText - push de - call StdBattleTextBox - pop de -.no_spikes - - ld a, [de] - and a - ret z - xor a - ld [de], a - ld hl, ReleasedByText - jp StdBattleTextBox - -; 37b74 +INCLUDE "engine/battle/move_effects/rapid_spin.asm" BattleCommand_HealMorn: ; 37b74 @@ -9352,196 +7141,17 @@ BattleCommand_TimeBasedHealContinue: ; 37b7e ; 37be8 -BattleCommand_HiddenPower: ; 37be8 -; hiddenpower +INCLUDE "engine/battle/move_effects/hidden_power.asm" - ld a, [AttackMissed] - and a - ret nz - farcall HiddenPowerDamage - ret +INCLUDE "engine/battle/move_effects/rain_dance.asm" -; 37bf4 +INCLUDE "engine/battle/move_effects/sunny_day.asm" +INCLUDE "engine/battle/move_effects/belly_drum.asm" -BattleCommand_StartRain: ; 37bf4 -; startrain - ld a, WEATHER_RAIN - ld [Weather], a - ld a, 5 - ld [WeatherCount], a - call AnimateCurrentMove - ld hl, DownpourText - jp StdBattleTextBox +INCLUDE "engine/battle/move_effects/psych_up.asm" -; 37c07 - - -BattleCommand_StartSun: ; 37c07 -; startsun - ld a, WEATHER_SUN - ld [Weather], a - ld a, 5 - ld [WeatherCount], a - call AnimateCurrentMove - ld hl, SunGotBrightText - jp StdBattleTextBox - -; 37c1a - - -BattleCommand_BellyDrum: ; 37c1a -; bellydrum -; This command is buggy because it raises the user's attack -; before checking that it has enough HP to use the move. -; Swap the order of these two blocks to fix. - call BattleCommand_AttackUp2 - ld a, [AttackMissed] - and a - jr nz, .failed - - callfar GetHalfMaxHP - callfar CheckUserHasEnoughHP - jr nc, .failed - - push bc - call AnimateCurrentMove - pop bc - callfar SubtractHPFromUser - call UpdateUserInParty - ld a, 5 - -.max_attack_loop - push af - call BattleCommand_AttackUp2 - pop af - dec a - jr nz, .max_attack_loop - - ld hl, BellyDrumText - jp StdBattleTextBox - -.failed - call AnimateFailedMove - jp PrintButItFailed - -; 37c55 - - -BattleCommand_PsychUp: ; 37c55 -; psychup - - ld hl, EnemyStatLevels - ld de, PlayerStatLevels - ld a, [hBattleTurn] - and a - jr z, .pointers_correct -; It's the enemy's turn, so swap the pointers. - push hl - ld h, d - ld l, e - pop de -.pointers_correct - push hl - ld b, NUM_LEVEL_STATS -; If any of the enemy's stats is modified from its base level, -; the move succeeds. Otherwise, it fails. -.loop - ld a, [hli] - cp BASE_STAT_LEVEL - jr nz, .break - dec b - jr nz, .loop - pop hl - call AnimateFailedMove - jp PrintButItFailed - -.break - pop hl - ld b, NUM_LEVEL_STATS -.loop2 - ld a, [hli] - ld [de], a - inc de - dec b - jr nz, .loop2 - ld a, [hBattleTurn] - and a - jr nz, .calc_enemy_stats - call CalcPlayerStats - jr .merge - -.calc_enemy_stats - call CalcEnemyStats -.merge - call AnimateCurrentMove - ld hl, CopiedStatsText - jp StdBattleTextBox - -; 37c95 - - -BattleCommand_MirrorCoat: ; 37c95 -; mirrorcoat - - ld a, 1 - ld [AttackMissed], a - - ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call GetBattleVar - and a - ret z - - ld b, a - callfar GetMoveEffect - ld a, b - cp EFFECT_MIRROR_COAT - ret z - - call BattleCommand_ResetTypeMatchup - ld a, [wTypeMatchup] - and a - ret z - - call CheckOpponentWentFirst - ret z - - ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call GetBattleVar - dec a - ld de, StringBuffer1 - call GetMoveData - - ld a, [StringBuffer1 + 2] - and a - ret z - - ld a, [StringBuffer1 + 3] - cp SPECIAL - ret c - - ld hl, CurDamage - ld a, [hli] - or [hl] - ret z - - ld a, [hl] - add a - ld [hld], a - ld a, [hl] - adc a - ld [hl], a - jr nc, .capped - ld a, $ff - ld [hli], a - ld [hl], a -.capped - - xor a - ld [AttackMissed], a - ret - -; 37ce6 +INCLUDE "engine/battle/move_effects/mirror_coat.asm" BattleCommand_DoubleMinimizeDamage: ; 37ce6 @@ -9580,113 +7190,9 @@ BattleCommand_SkipSunCharge: ; 37d02 ; 37d0d -BattleCommand_CheckFutureSight: ; 37d0d -; checkfuturesight +INCLUDE "engine/battle/move_effects/future_sight.asm" - ld hl, wPlayerFutureSightCount - ld de, wPlayerFutureSightDamage - ld a, [hBattleTurn] - and a - jr z, .ok - ld hl, wEnemyFutureSightCount - ld de, wEnemyFutureSightDamage -.ok - - ld a, [hl] - and a - ret z - cp 1 - ret nz - - ld [hl], 0 - ld a, [de] - inc de - ld [CurDamage], a - ld a, [de] - ld [CurDamage + 1], a - ld b, futuresight_command - jp SkipToBattleCommand - -; 37d34 - -BattleCommand_FutureSight: ; 37d34 -; futuresight - - call CheckUserIsCharging - jr nz, .AlreadyChargingFutureSight - ld a, BATTLE_VARS_MOVE_ANIM - call GetBattleVar - ld b, a - ld a, BATTLE_VARS_LAST_COUNTER_MOVE - call GetBattleVarAddr - ld [hl], b - ld a, BATTLE_VARS_LAST_MOVE - call GetBattleVarAddr - ld [hl], b -.AlreadyChargingFutureSight: - ld hl, wPlayerFutureSightCount - ld a, [hBattleTurn] - and a - jr z, .GotFutureSightCount - ld hl, wEnemyFutureSightCount -.GotFutureSightCount: - ld a, [hl] - and a - jr nz, .failed - ld a, 4 - ld [hl], a - call BattleCommand_LowerSub - call BattleCommand_MoveDelay - ld hl, ForesawAttackText - call StdBattleTextBox - call BattleCommand_RaiseSub - ld de, wPlayerFutureSightDamage - ld a, [hBattleTurn] - and a - jr z, .StoreDamage - ld de, wEnemyFutureSightDamage -.StoreDamage: - ld hl, CurDamage - ld a, [hl] - ld [de], a - ld [hl], 0 - inc hl - inc de - ld a, [hl] - ld [de], a - ld [hl], 0 - jp EndMoveEffect - -.failed - pop bc - call ResetDamage - call AnimateFailedMove - call PrintButItFailed - jp EndMoveEffect - -; 37d94 - - -BattleCommand_ThunderAccuracy: ; 37d94 -; thunderaccuracy - - ld a, BATTLE_VARS_MOVE_TYPE - call GetBattleVarAddr - inc hl - ld a, [Weather] - cp WEATHER_RAIN - jr z, .rain - cp WEATHER_SUN - ret nz - ld [hl], 50 percent + 1 - ret - -.rain - ; Redundant with CheckHit guranteeing hit - ld [hl], 100 percent - ret - -; 37daa +INCLUDE "engine/battle/move_effects/thunder.asm" CheckHiddenOpponent: ; 37daa @@ -9828,7 +7334,6 @@ LoadMoveAnim: ; 37e36 LoadAnim: ; 37e44 - ld [FXAnimID], a ; fallthrough diff --git a/engine/battle/effect_commands/attract.asm b/engine/battle/move_effects/attract.asm similarity index 98% rename from engine/battle/effect_commands/attract.asm rename to engine/battle/move_effects/attract.asm index 0a6d7c975..44cb7bec4 100755 --- a/engine/battle/effect_commands/attract.asm +++ b/engine/battle/move_effects/attract.asm @@ -20,7 +20,7 @@ BattleCommand_Attract: ; 377ce jp StdBattleTextBox .failed - jp FailAttract + jp FailMove ; 377f5 diff --git a/engine/battle/move_effects/baton_pass.asm b/engine/battle/move_effects/baton_pass.asm new file mode 100644 index 000000000..0561b6db9 --- /dev/null +++ b/engine/battle/move_effects/baton_pass.asm @@ -0,0 +1,241 @@ +BattleCommand_BatonPass: ; 379c9 +; batonpass + + ld a, [hBattleTurn] + and a + jp nz, .Enemy + + +; Need something to switch to + call CheckAnyOtherAlivePartyMons + jp z, FailedBatonPass + + call UpdateBattleMonInParty + call AnimateCurrentMove + + ld c, 50 + call DelayFrames + +; Transition into switchmon menu + call LoadStandardMenuHeader + farcall SetUpBattlePartyMenu_NoLoop + + farcall ForcePickSwitchMonInBattle + +; Return to battle scene + call ClearPalettes + farcall _LoadBattleFontsHPBar + call CloseWindow + call ClearSprites + hlcoord 1, 0 + lb bc, 4, 10 + call ClearBox + ld b, SCGB_BATTLE_COLORS + call GetSGBLayout + call SetPalettes + call BatonPass_LinkPlayerSwitch + +; Mobile link battles handle entrances differently + farcall CheckMobileBattleError + jp c, EndMoveEffect + + ld hl, PassedBattleMonEntrance + call CallBattleCore + + call ResetBatonPassStatus + ret + + +.Enemy: + +; Wildmons don't have anything to switch to + ld a, [wBattleMode] + dec a ; WILDMON + jp z, FailedBatonPass + + call CheckAnyOtherAliveEnemyMons + jp z, FailedBatonPass + + call UpdateEnemyMonInParty + call AnimateCurrentMove + call BatonPass_LinkEnemySwitch + +; Mobile link battles handle entrances differently + farcall CheckMobileBattleError + jp c, EndMoveEffect + +; Passed enemy PartyMon entrance + xor a + ld [wEnemySwitchMonIndex], a + ld hl, EnemySwitch_SetMode + call CallBattleCore + ld hl, ResetBattleParticipants + call CallBattleCore + ld a, 1 + ld [wTypeMatchup], a + ld hl, ApplyStatLevelMultiplierOnAllStats + call CallBattleCore + + ld hl, SpikesDamage + call CallBattleCore + + jr ResetBatonPassStatus + +; 37a67 + + +BatonPass_LinkPlayerSwitch: ; 37a67 + ld a, [wLinkMode] + and a + ret z + + ld a, 1 + ld [wPlayerAction], a + + call LoadStandardMenuHeader + ld hl, LinkBattleSendReceiveAction + call CallBattleCore + call CloseWindow + + xor a + ld [wPlayerAction], a + ret + +; 37a82 + + +BatonPass_LinkEnemySwitch: ; 37a82 + ld a, [wLinkMode] + and a + ret z + + call LoadStandardMenuHeader + ld hl, LinkBattleSendReceiveAction + call CallBattleCore + + ld a, [OTPartyCount] + add BATTLEACTION_SWITCH1 + ld b, a + ld a, [wBattleAction] + cp BATTLEACTION_SWITCH1 + jr c, .baton_pass + cp b + jr c, .switch + +.baton_pass + ld a, [CurOTMon] + add BATTLEACTION_SWITCH1 + ld [wBattleAction], a +.switch + jp CloseWindow + +; 37aab + + +FailedBatonPass: ; 37aab + call AnimateFailedMove + jp PrintButItFailed + +; 37ab1 + + +ResetBatonPassStatus: ; 37ab1 +; Reset status changes that aren't passed by Baton Pass. + + ; Nightmare isn't passed. + ld a, BATTLE_VARS_STATUS + call GetBattleVar + and SLP + jr nz, .ok + + ld a, BATTLE_VARS_SUBSTATUS1 + call GetBattleVarAddr + res SUBSTATUS_NIGHTMARE, [hl] +.ok + + ; Disable isn't passed. + call ResetActorDisable + + ; Attraction isn't passed. + ld hl, PlayerSubStatus1 + res SUBSTATUS_IN_LOVE, [hl] + ld hl, EnemySubStatus1 + res SUBSTATUS_IN_LOVE, [hl] + ld hl, PlayerSubStatus5 + + ld a, BATTLE_VARS_SUBSTATUS5 + call GetBattleVarAddr + res SUBSTATUS_TRANSFORMED, [hl] + res SUBSTATUS_ENCORED, [hl] + + ; New mon hasn't used a move yet. + ld a, BATTLE_VARS_LAST_MOVE + call GetBattleVarAddr + ld [hl], 0 + + xor a + ld [wPlayerWrapCount], a + ld [wEnemyWrapCount], a + ret + +; 37ae9 + + +CheckAnyOtherAlivePartyMons: ; 37ae9 + ld hl, PartyMon1HP + ld a, [PartyCount] + ld d, a + ld a, [CurBattleMon] + ld e, a + jr CheckAnyOtherAliveMons + +; 37af6 + + +CheckAnyOtherAliveEnemyMons: ; 37af6 + ld hl, OTPartyMon1HP + ld a, [OTPartyCount] + ld d, a + ld a, [CurOTMon] + ld e, a + + ; fallthrough +; 37b01 + +CheckAnyOtherAliveMons: ; 37b01 +; Check for nonzero HP starting from partymon +; HP at hl for d partymons, besides current mon e. + +; Return nz if any are alive. + + xor a + ld b, a + ld c, a +.loop + ld a, c + cp d + jr z, .done + cp e + jr z, .next + + ld a, [hli] + or b + ld b, a + ld a, [hld] + or b + ld b, a + +.next + push bc + ld bc, PARTYMON_STRUCT_LENGTH + add hl, bc + pop bc + inc c + jr .loop + +.done + ld a, b + and a + ret + +; 37b1d diff --git a/engine/battle/move_effects/beat_up.asm b/engine/battle/move_effects/beat_up.asm new file mode 100644 index 000000000..31b07726e --- /dev/null +++ b/engine/battle/move_effects/beat_up.asm @@ -0,0 +1,219 @@ +BattleCommand_BeatUp: ; 35461 +; beatup + + call ResetDamage + ld a, [hBattleTurn] + and a + jp nz, .enemy_beats_up + ld a, [PlayerSubStatus3] + bit SUBSTATUS_IN_LOOP, a + jr nz, .next_mon + ld c, 20 + call DelayFrames + xor a + ld [PlayerRolloutCount], a + ld [wd002], a + ld [wBeatUpHitAtLeastOnce], a + jr .got_mon + +.next_mon + ld a, [PlayerRolloutCount] + ld b, a + ld a, [PartyCount] + sub b + ld [wd002], a + +.got_mon + ld a, [wd002] + ld hl, PartyMonNicknames + call GetNick + ld a, MON_HP + call GetBeatupMonLocation + ld a, [hli] + or [hl] + jp z, .beatup_fail ; fainted + ld a, [wd002] + ld c, a + ld a, [CurBattleMon] + ; BUG: this can desynchronize link battles + ; Change "cp [hl]" to "cp c" to fix + cp [hl] + ld hl, BattleMonStatus + jr z, .active_mon + ld a, MON_STATUS + call GetBeatupMonLocation +.active_mon + ld a, [hl] + and a + jp nz, .beatup_fail + + ld a, $1 + ld [wBeatUpHitAtLeastOnce], a + ld hl, BeatUpAttackText + call StdBattleTextBox + ld a, [EnemyMonSpecies] + ld [CurSpecies], a + call GetBaseData + ld a, [BaseDefense] + ld c, a + push bc + ld a, MON_SPECIES + call GetBeatupMonLocation + ld a, [hl] + ld [CurSpecies], a + call GetBaseData + ld a, [BaseAttack] + pop bc + ld b, a + push bc + ld a, MON_LEVEL + call GetBeatupMonLocation + ld a, [hl] + ld e, a + pop bc + ld a, [wPlayerMoveStructPower] + ld d, a + ret + +.enemy_beats_up + ld a, [EnemySubStatus3] + bit SUBSTATUS_IN_LOOP, a + jr nz, .not_first_enemy_beatup + + xor a + ld [EnemyRolloutCount], a + ld [wd002], a + ld [wBeatUpHitAtLeastOnce], a + jr .enemy_continue + +.not_first_enemy_beatup + ld a, [EnemyRolloutCount] + ld b, a + ld a, [OTPartyCount] + sub b + ld [wd002], a +.enemy_continue + ld a, [wBattleMode] + dec a + jr z, .wild + + ld a, [wLinkMode] + and a + jr nz, .link_or_tower + + ld a, [InBattleTowerBattle] + and a + jr nz, .link_or_tower + + ld a, [wd002] + ld c, a + ld b, 0 + ld hl, OTPartySpecies + add hl, bc + ld a, [hl] + ld [wNamedObjectIndexBuffer], a + call GetPokemonName + jr .got_enemy_nick + +.link_or_tower + ld a, [wd002] + ld hl, OTPartyMonNicknames + ld bc, NAME_LENGTH + call AddNTimes + ld de, StringBuffer1 + call CopyBytes +.got_enemy_nick + ld a, MON_HP + call GetBeatupMonLocation + ld a, [hli] + or [hl] + jp z, .beatup_fail + ld a, [wd002] + ld b, a + ld a, [CurOTMon] + cp b + ld hl, EnemyMonStatus + jr z, .active_enemy + + ld a, MON_STATUS + call GetBeatupMonLocation +.active_enemy + ld a, [hl] + and a + jr nz, .beatup_fail + + ld a, $1 + ld [wBeatUpHitAtLeastOnce], a + jr .finish_beatup + +.wild + ld a, [EnemyMonSpecies] + ld [wNamedObjectIndexBuffer], a + call GetPokemonName + ld hl, BeatUpAttackText + call StdBattleTextBox + jp EnemyAttackDamage + +.finish_beatup + ld hl, BeatUpAttackText + call StdBattleTextBox + ld a, [BattleMonSpecies] + ld [CurSpecies], a + call GetBaseData + ld a, [BaseDefense] + ld c, a + push bc + ld a, MON_SPECIES + call GetBeatupMonLocation + ld a, [hl] + ld [CurSpecies], a + call GetBaseData + ld a, [BaseAttack] + pop bc + ld b, a + push bc + ld a, MON_LEVEL + call GetBeatupMonLocation + ld a, [hl] + ld e, a + pop bc + ld a, [wEnemyMoveStructPower] + ld d, a + ret + +; 355b0 + + +.beatup_fail ; 355b0 + ld b, buildopponentrage_command + jp SkipToBattleCommand + +; 355b5 + + +BattleCommanda8: ; 355b5 + ld a, [wBeatUpHitAtLeastOnce] + and a + ret nz + + jp PrintButItFailed + +; 355bd + + +GetBeatupMonLocation: ; 355bd + push bc + ld c, a + ld b, 0 + ld a, [hBattleTurn] + and a + ld hl, PartyMon1Species + jr z, .got_species + ld hl, OTPartyMon1Species + +.got_species + ld a, [wd002] + add hl, bc + call GetPartyLocation + pop bc + ret diff --git a/engine/battle/move_effects/belly_drum.asm b/engine/battle/move_effects/belly_drum.asm new file mode 100644 index 000000000..eea10ef8a --- /dev/null +++ b/engine/battle/move_effects/belly_drum.asm @@ -0,0 +1,36 @@ +BattleCommand_BellyDrum: ; 37c1a +; bellydrum +; This command is buggy because it raises the user's attack +; before checking that it has enough HP to use the move. +; Swap the order of these two blocks to fix. + call BattleCommand_AttackUp2 + ld a, [AttackMissed] + and a + jr nz, .failed + + callfar GetHalfMaxHP + callfar CheckUserHasEnoughHP + jr nc, .failed + + push bc + call AnimateCurrentMove + pop bc + callfar SubtractHPFromUser + call UpdateUserInParty + ld a, 5 + +.max_attack_loop + push af + call BattleCommand_AttackUp2 + pop af + dec a + jr nz, .max_attack_loop + + ld hl, BellyDrumText + jp StdBattleTextBox + +.failed + call AnimateFailedMove + jp PrintButItFailed + +; 37c55 diff --git a/engine/battle/move_effects/bide.asm b/engine/battle/move_effects/bide.asm new file mode 100644 index 000000000..608bcff37 --- /dev/null +++ b/engine/battle/move_effects/bide.asm @@ -0,0 +1,105 @@ +BattleCommand_StoreEnergy: ; 36671 +; storeenergy + + ld a, BATTLE_VARS_SUBSTATUS3 + call GetBattleVar + bit SUBSTATUS_BIDE, a + ret z + + ld hl, PlayerRolloutCount + ld a, [hBattleTurn] + and a + jr z, .check_still_storing_energy + ld hl, EnemyRolloutCount +.check_still_storing_energy + dec [hl] + jr nz, .still_storing + + ld a, BATTLE_VARS_SUBSTATUS3 + call GetBattleVarAddr + res SUBSTATUS_BIDE, [hl] + + ld hl, UnleashedEnergyText + call StdBattleTextBox + + ld a, BATTLE_VARS_MOVE_POWER + call GetBattleVarAddr + ld a, 1 + ld [hl], a + ld hl, PlayerDamageTaken + 1 + ld de, wPlayerCharging ; player + ld a, [hBattleTurn] + and a + jr z, .player + ld hl, EnemyDamageTaken + 1 + ld de, wEnemyCharging ; enemy +.player + ld a, [hld] + add a + ld b, a + ld [CurDamage + 1], a + ld a, [hl] + rl a + ld [CurDamage], a + jr nc, .not_maxed + ld a, $ff + ld [CurDamage], a + ld [CurDamage + 1], a +.not_maxed + or b + jr nz, .built_up_something + ld a, 1 + ld [AttackMissed], a +.built_up_something + xor a + ld [hli], a + ld [hl], a + ld [de], a + + ld a, BATTLE_VARS_MOVE_ANIM + call GetBattleVarAddr + ld a, BIDE + ld [hl], a + + ld b, unleashenergy_command + jp SkipToBattleCommand + +.still_storing + ld hl, StoringEnergyText + call StdBattleTextBox + jp EndMoveEffect + +; 366e5 + + +BattleCommand_UnleashEnergy: ; 366e5 +; unleashenergy + + ld de, PlayerDamageTaken + ld bc, PlayerRolloutCount + ld a, [hBattleTurn] + and a + jr z, .got_damage + ld de, EnemyDamageTaken + ld bc, EnemyRolloutCount +.got_damage + ld a, BATTLE_VARS_SUBSTATUS3 + call GetBattleVarAddr + set SUBSTATUS_BIDE, [hl] + xor a + ld [de], a + inc de + ld [de], a + ld [wPlayerMoveStructEffect], a + ld [wEnemyMoveStructEffect], a + call BattleRandom + and 1 + inc a + inc a + ld [bc], a + ld a, 1 + ld [wKickCounter], a + call AnimateCurrentMove + jp EndMoveEffect + +; 3671a diff --git a/engine/battle/move_effects/conversion.asm b/engine/battle/move_effects/conversion.asm new file mode 100644 index 000000000..cb20d6801 --- /dev/null +++ b/engine/battle/move_effects/conversion.asm @@ -0,0 +1,98 @@ +BattleCommand_Conversion: ; 3707f +; conversion + + ld hl, BattleMonMoves + ld de, BattleMonType1 + ld a, [hBattleTurn] + and a + jr z, .got_moves + ld hl, EnemyMonMoves + ld de, EnemyMonType1 +.got_moves + push de + ld c, 0 + ld de, StringBuffer1 +.loop + push hl + ld b, 0 + add hl, bc + ld a, [hl] + pop hl + and a + jr z, .okay + push hl + push bc + dec a + ld hl, Moves + MOVE_TYPE + call GetMoveAttr + ld [de], a + inc de + pop bc + pop hl + inc c + ld a, c + cp NUM_MOVES + jr c, .loop +.okay + ld a, $ff + ld [de], a + inc de + ld [de], a + inc de + ld [de], a + pop de + ld hl, StringBuffer1 +.loop2 + ld a, [hl] + cp -1 + jr z, .fail + cp CURSE_T + jr z, .next + ld a, [de] + cp [hl] + jr z, .next + inc de + ld a, [de] + dec de + cp [hl] + jr nz, .done +.next + inc hl + jr .loop2 + +.fail + call AnimateFailedMove + jp PrintButItFailed + +.done +.loop3 + call BattleRandom + maskbits NUM_MOVES + ld c, a + ld b, 0 + ld hl, StringBuffer1 + add hl, bc + ld a, [hl] + cp -1 + jr z, .loop3 + cp CURSE_T + jr z, .loop3 + ld a, [de] + cp [hl] + jr z, .loop3 + inc de + ld a, [de] + dec de + cp [hl] + jr z, .loop3 + ld a, [hl] + ld [de], a + inc de + ld [de], a + ld [wNamedObjectIndexBuffer], a + farcall GetTypeName + call AnimateCurrentMove + ld hl, TransformedTypeText + jp StdBattleTextBox + +; 3710e diff --git a/engine/battle/move_effects/conversion2.asm b/engine/battle/move_effects/conversion2.asm new file mode 100644 index 000000000..f4fbe768c --- /dev/null +++ b/engine/battle/move_effects/conversion2.asm @@ -0,0 +1,66 @@ +BattleCommand_Conversion2: ; 359e6 +; conversion2 + + ld a, [AttackMissed] + and a + jr nz, .failed + ld hl, BattleMonType1 + ld a, [hBattleTurn] + and a + jr z, .got_type + ld hl, EnemyMonType1 +.got_type + ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP + call GetBattleVar + and a + jr z, .failed + push hl + dec a + ld hl, Moves + MOVE_TYPE + call GetMoveAttr + ld d, a + pop hl + cp CURSE_T + jr z, .failed + call AnimateCurrentMove + call BattleCommand_SwitchTurn + +.loop + call BattleRandom + and $1f + cp UNUSED_TYPES + jr c, .okay + cp UNUSED_TYPES_END + jr c, .loop + cp TYPES_END + jr nc, .loop +.okay + ld [hli], a + ld [hld], a + push hl + ld a, BATTLE_VARS_MOVE_TYPE + call GetBattleVarAddr + push af + push hl + ld a, d + ld [hl], a + call BattleCheckTypeMatchup + pop hl + pop af + ld [hl], a + pop hl + ld a, [wTypeMatchup] + cp 10 + jr nc, .loop + call BattleCommand_SwitchTurn + + ld a, [hl] + ld [wNamedObjectIndexBuffer], a + predef GetTypeName + ld hl, TransformedTypeText + jp StdBattleTextBox + +.failed + jp FailMove + +; 35a53 diff --git a/engine/battle/move_effects/counter.asm b/engine/battle/move_effects/counter.asm new file mode 100644 index 000000000..c32a79c14 --- /dev/null +++ b/engine/battle/move_effects/counter.asm @@ -0,0 +1,60 @@ +BattleCommand_Counter: ; 35813 +; counter + + ld a, 1 + ld [AttackMissed], a + ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP + call GetBattleVar + and a + ret z + + ld b, a + callfar GetMoveEffect + ld a, b + cp EFFECT_COUNTER + ret z + + call BattleCommand_ResetTypeMatchup + ld a, [wTypeMatchup] + and a + ret z + + call CheckOpponentWentFirst + ret z + + ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP + call GetBattleVar + dec a + ld de, StringBuffer1 + call GetMoveData + + ld a, [StringBuffer1 + MOVE_POWER] + and a + ret z + + ld a, [StringBuffer1 + MOVE_TYPE] + cp SPECIAL + ret nc + + ld hl, CurDamage + ld a, [hli] + or [hl] + ret z + + ld a, [hl] + add a + ld [hld], a + ld a, [hl] + adc a + ld [hl], a + jr nc, .capped + ld a, $ff + ld [hli], a + ld [hl], a +.capped + + xor a + ld [AttackMissed], a + ret + +; 35864 diff --git a/engine/battle/effect_commands/curse.asm b/engine/battle/move_effects/curse.asm similarity index 100% rename from engine/battle/effect_commands/curse.asm rename to engine/battle/move_effects/curse.asm diff --git a/engine/battle/move_effects/destiny_bond.asm b/engine/battle/move_effects/destiny_bond.asm new file mode 100644 index 000000000..2dc125ddf --- /dev/null +++ b/engine/battle/move_effects/destiny_bond.asm @@ -0,0 +1,11 @@ +BattleCommand_DestinyBond: ; 35bff +; destinybond + + ld a, BATTLE_VARS_SUBSTATUS5 + call GetBattleVarAddr + set SUBSTATUS_DESTINY_BOND, [hl] + call AnimateCurrentMove + ld hl, DestinyBondEffectText + jp StdBattleTextBox + +; 35c0f diff --git a/engine/battle/move_effects/disable.asm b/engine/battle/move_effects/disable.asm new file mode 100644 index 000000000..370d6cc86 --- /dev/null +++ b/engine/battle/move_effects/disable.asm @@ -0,0 +1,74 @@ +BattleCommand_Disable: ; 36fed +; disable + + ld a, [AttackMissed] + and a + jr nz, .failed + + ld de, EnemyDisableCount + ld hl, EnemyMonMoves + ld a, [hBattleTurn] + and a + jr z, .got_moves + ld de, PlayerDisableCount + ld hl, BattleMonMoves +.got_moves + + ld a, [de] + and a + jr nz, .failed + + ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP + call GetBattleVar + and a + jr z, .failed + cp STRUGGLE + jr z, .failed + + ld b, a + ld c, $ff +.loop + inc c + ld a, [hli] + cp b + jr nz, .loop + + ld a, [hBattleTurn] + and a + ld hl, EnemyMonPP + jr z, .got_pp + ld hl, BattleMonPP +.got_pp + ld b, 0 + add hl, bc + ld a, [hl] + and a + jr z, .failed +.loop2 + call BattleRandom + and 7 + jr z, .loop2 + inc a + inc c + swap c + add c + ld [de], a + call AnimateCurrentMove + ld hl, DisabledMove + ld a, [hBattleTurn] + and a + jr nz, .got_disabled_move_pointer + inc hl +.got_disabled_move_pointer + ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP + call GetBattleVar + ld [hl], a + ld [wNamedObjectIndexBuffer], a + call GetMoveName + ld hl, WasDisabledText + jp StdBattleTextBox + +.failed + jp FailMove + +; 3705c diff --git a/engine/battle/move_effects/encore.asm b/engine/battle/move_effects/encore.asm new file mode 100644 index 000000000..316c53f2c --- /dev/null +++ b/engine/battle/move_effects/encore.asm @@ -0,0 +1,122 @@ +BattleCommand_Encore: ; 35864 +; encore + + ld hl, EnemyMonMoves + ld de, EnemyEncoreCount + ld a, [hBattleTurn] + and a + jr z, .ok + ld hl, BattleMonMoves + ld de, PlayerEncoreCount +.ok + ld a, BATTLE_VARS_LAST_MOVE_OPP + call GetBattleVar + and a + jp z, .failed + cp STRUGGLE + jp z, .failed + cp ENCORE + jp z, .failed + cp MIRROR_MOVE + jp z, .failed + ld b, a + +.got_move + ld a, [hli] + cp b + jr nz, .got_move + + ld bc, BattleMonPP - BattleMonMoves - 1 + add hl, bc + ld a, [hl] + and PP_MASK + jp z, .failed + ld a, [AttackMissed] + and a + jp nz, .failed + ld a, BATTLE_VARS_SUBSTATUS5_OPP + call GetBattleVarAddr + bit SUBSTATUS_ENCORED, [hl] + jp nz, .failed + set SUBSTATUS_ENCORED, [hl] + call BattleRandom + and $3 + inc a + inc a + inc a + ld [de], a + call CheckOpponentWentFirst + jr nz, .finish_move + ld a, [hBattleTurn] + and a + jr z, .force_last_enemy_move + + push hl + ld a, [LastPlayerMove] + ld b, a + ld c, 0 + ld hl, BattleMonMoves +.find_player_move + ld a, [hli] + cp b + jr z, .got_player_move + inc c + ld a, c + cp NUM_MOVES + jr c, .find_player_move + pop hl + res SUBSTATUS_ENCORED, [hl] + xor a + ld [de], a + jr .failed + +.got_player_move + pop hl + ld a, c + ld [CurMoveNum], a + ld a, b + ld [CurPlayerMove], a + dec a + ld de, wPlayerMoveStruct + call GetMoveData + jr .finish_move + +.force_last_enemy_move + push hl + ld a, [LastEnemyMove] + ld b, a + ld c, 0 + ld hl, EnemyMonMoves +.find_enemy_move + ld a, [hli] + cp b + jr z, .got_enemy_move + inc c + ld a, c + cp NUM_MOVES + jr c, .find_enemy_move + pop hl + res SUBSTATUS_ENCORED, [hl] + xor a + ld [de], a + jr .failed + +.got_enemy_move + pop hl + ld a, c + ld [CurEnemyMoveNum], a + ld a, b + ld [CurEnemyMove], a + dec a + ld de, wEnemyMoveStruct + call GetMoveData + +.finish_move + call AnimateCurrentMove + ld hl, GotAnEncoreText + jp StdBattleTextBox + +.failed + jp PrintDidntAffect2 + +; 35926 diff --git a/engine/battle/effect_commands/endure.asm b/engine/battle/move_effects/endure.asm similarity index 100% rename from engine/battle/effect_commands/endure.asm rename to engine/battle/move_effects/endure.asm diff --git a/engine/battle/move_effects/false_swipe.asm b/engine/battle/move_effects/false_swipe.asm new file mode 100644 index 000000000..ae8bcedb3 --- /dev/null +++ b/engine/battle/move_effects/false_swipe.asm @@ -0,0 +1,44 @@ +BattleCommand_FalseSwipe: ; 35c94 +; falseswipe + + ld hl, EnemyMonHP + ld a, [hBattleTurn] + and a + jr z, .got_hp + ld hl, BattleMonHP +.got_hp + ld de, CurDamage + ld c, 2 + push hl + push de + call StringCmp + pop de + pop hl + jr c, .done + ld a, [hli] + ld [de], a + inc de + ld a, [hl] + dec a + ld [de], a + inc a + jr nz, .okay + dec de + ld a, [de] + dec a + ld [de], a +.okay + ld a, [CriticalHit] + cp 2 + jr nz, .carry + xor a + ld [CriticalHit], a +.carry + scf + ret + +.done + and a + ret + +; 35cc9 diff --git a/engine/battle/move_effects/focus_energy.asm b/engine/battle/move_effects/focus_energy.asm new file mode 100644 index 000000000..2a3726c53 --- /dev/null +++ b/engine/battle/move_effects/focus_energy.asm @@ -0,0 +1,17 @@ +BattleCommand_FocusEnergy: ; 36c98 +; focusenergy + + ld a, BATTLE_VARS_SUBSTATUS4 + call GetBattleVarAddr + bit SUBSTATUS_FOCUS_ENERGY, [hl] + jr nz, .already_pumped + set SUBSTATUS_FOCUS_ENERGY, [hl] + call AnimateCurrentMove + ld hl, GettingPumpedText + jp StdBattleTextBox + +.already_pumped + call AnimateFailedMove + jp PrintButItFailed + +; 36cb2 diff --git a/engine/battle/effect_commands/foresight.asm b/engine/battle/move_effects/foresight.asm similarity index 95% rename from engine/battle/effect_commands/foresight.asm rename to engine/battle/move_effects/foresight.asm index 6f4f97cd2..0e6b1dd4e 100644 --- a/engine/battle/effect_commands/foresight.asm +++ b/engine/battle/move_effects/foresight.asm @@ -19,5 +19,5 @@ BattleCommand_Foresight: ; 376a0 jp StdBattleTextBox .failed - jp FailForesight + jp FailMove ; 376c2 diff --git a/engine/battle/move_effects/frustration.asm b/engine/battle/move_effects/frustration.asm new file mode 100644 index 000000000..ddf09afb1 --- /dev/null +++ b/engine/battle/move_effects/frustration.asm @@ -0,0 +1,29 @@ +BattleCommand_FrustrationPower: ; 3790e +; frustrationpower + + push bc + ld hl, BattleMonHappiness + ld a, [hBattleTurn] + and a + jr z, .got_happiness + ld hl, EnemyMonHappiness +.got_happiness + ld a, $ff + sub [hl] + ld [hMultiplicand + 2], a + xor a + ld [hMultiplicand + 0], a + ld [hMultiplicand + 1], a + ld a, 10 + ld [hMultiplier], a + call Multiply + ld a, 25 + ld [hDivisor], a + ld b, 4 + call Divide + ld a, [hQuotient + 2] + ld d, a + pop bc + ret + +; 37939 diff --git a/engine/battle/move_effects/fury_cutter.asm b/engine/battle/move_effects/fury_cutter.asm new file mode 100644 index 000000000..9a667552a --- /dev/null +++ b/engine/battle/move_effects/fury_cutter.asm @@ -0,0 +1,61 @@ +BattleCommand_FuryCutter: ; 37792 +; furycutter + + ld hl, PlayerFuryCutterCount + ld a, [hBattleTurn] + and a + jr z, .go + ld hl, EnemyFuryCutterCount + +.go + ld a, [AttackMissed] + and a + jp nz, ResetFuryCutterCount + + inc [hl] + +; Damage capped at 5 turns' worth (16x). + ld a, [hl] + ld b, a + cp 6 + jr c, .checkdouble + ld b, 5 + +.checkdouble + dec b + ret z + +; Double the damage + ld hl, CurDamage + 1 + sla [hl] + dec hl + rl [hl] + jr nc, .checkdouble + +; No overflow + ld a, $ff + ld [hli], a + ld [hl], a + ret + +; 377be + + +ResetFuryCutterCount: ; 377be + + push hl + + ld hl, PlayerFuryCutterCount + ld a, [hBattleTurn] + and a + jr z, .reset + ld hl, EnemyFuryCutterCount + +.reset + xor a + ld [hl], a + + pop hl + ret + +; 377ce diff --git a/engine/battle/move_effects/future_sight.asm b/engine/battle/move_effects/future_sight.asm new file mode 100644 index 000000000..cd01db838 --- /dev/null +++ b/engine/battle/move_effects/future_sight.asm @@ -0,0 +1,85 @@ +BattleCommand_CheckFutureSight: ; 37d0d +; checkfuturesight + + ld hl, wPlayerFutureSightCount + ld de, wPlayerFutureSightDamage + ld a, [hBattleTurn] + and a + jr z, .ok + ld hl, wEnemyFutureSightCount + ld de, wEnemyFutureSightDamage +.ok + + ld a, [hl] + and a + ret z + cp 1 + ret nz + + ld [hl], 0 + ld a, [de] + inc de + ld [CurDamage], a + ld a, [de] + ld [CurDamage + 1], a + ld b, futuresight_command + jp SkipToBattleCommand + +; 37d34 + +BattleCommand_FutureSight: ; 37d34 +; futuresight + + call CheckUserIsCharging + jr nz, .AlreadyChargingFutureSight + ld a, BATTLE_VARS_MOVE_ANIM + call GetBattleVar + ld b, a + ld a, BATTLE_VARS_LAST_COUNTER_MOVE + call GetBattleVarAddr + ld [hl], b + ld a, BATTLE_VARS_LAST_MOVE + call GetBattleVarAddr + ld [hl], b +.AlreadyChargingFutureSight: + ld hl, wPlayerFutureSightCount + ld a, [hBattleTurn] + and a + jr z, .GotFutureSightCount + ld hl, wEnemyFutureSightCount +.GotFutureSightCount: + ld a, [hl] + and a + jr nz, .failed + ld a, 4 + ld [hl], a + call BattleCommand_LowerSub + call BattleCommand_MoveDelay + ld hl, ForesawAttackText + call StdBattleTextBox + call BattleCommand_RaiseSub + ld de, wPlayerFutureSightDamage + ld a, [hBattleTurn] + and a + jr z, .StoreDamage + ld de, wEnemyFutureSightDamage +.StoreDamage: + ld hl, CurDamage + ld a, [hl] + ld [de], a + ld [hl], 0 + inc hl + inc de + ld a, [hl] + ld [de], a + ld [hl], 0 + jp EndMoveEffect + +.failed + pop bc + call ResetDamage + call AnimateFailedMove + call PrintButItFailed + jp EndMoveEffect + +; 37d94 diff --git a/engine/battle/move_effects/heal_bell.asm b/engine/battle/move_effects/heal_bell.asm new file mode 100644 index 000000000..b4f6ccecb --- /dev/null +++ b/engine/battle/move_effects/heal_bell.asm @@ -0,0 +1,36 @@ +BattleCommand_HealBell: ; 35cc9 +; healbell + + ld a, BATTLE_VARS_SUBSTATUS1 + call GetBattleVarAddr + res SUBSTATUS_NIGHTMARE, [hl] + ld de, PartyMon1Status + ld a, [hBattleTurn] + and a + jr z, .got_status + ld de, OTPartyMon1Status +.got_status + ld a, BATTLE_VARS_STATUS + call GetBattleVarAddr + xor a + ld [hl], a + ld h, d + ld l, e + ld bc, PARTYMON_STRUCT_LENGTH + ld d, PARTY_LENGTH +.loop + ld [hl], a + add hl, bc + dec d + jr nz, .loop + call AnimateCurrentMove + + ld hl, BellChimedText + call StdBattleTextBox + + ld a, [hBattleTurn] + and a + jp z, CalcPlayerStats + jp CalcEnemyStats + +; 35d00 diff --git a/engine/battle/move_effects/hidden_power.asm b/engine/battle/move_effects/hidden_power.asm new file mode 100644 index 000000000..8fbdba42d --- /dev/null +++ b/engine/battle/move_effects/hidden_power.asm @@ -0,0 +1,10 @@ +BattleCommand_HiddenPower: ; 37be8 +; hiddenpower + + ld a, [AttackMissed] + and a + ret nz + farcall HiddenPowerDamage + ret + +; 37bf4 diff --git a/engine/battle/move_effects/leech_seed.asm b/engine/battle/move_effects/leech_seed.asm new file mode 100644 index 000000000..25f7a9a18 --- /dev/null +++ b/engine/battle/move_effects/leech_seed.asm @@ -0,0 +1,42 @@ +BattleCommand_LeechSeed: ; 36f9d +; leechseed + ld a, [AttackMissed] + and a + jr nz, .evaded + call CheckSubstituteOpp + jr nz, .evaded + + ld de, EnemyMonType1 + ld a, [hBattleTurn] + and a + jr z, .ok + ld de, BattleMonType1 +.ok + + ld a, [de] + cp GRASS + jr z, .grass + inc de + ld a, [de] + cp GRASS + jr z, .grass + + ld a, BATTLE_VARS_SUBSTATUS4_OPP + call GetBattleVarAddr + bit SUBSTATUS_LEECH_SEED, [hl] + jr nz, .evaded + set SUBSTATUS_LEECH_SEED, [hl] + call AnimateCurrentMove + ld hl, WasSeededText + jp StdBattleTextBox + +.grass + call AnimateFailedMove + jp PrintDoesntAffect + +.evaded + call AnimateFailedMove + ld hl, EvadedText + jp StdBattleTextBox + +; 36fe1 diff --git a/engine/battle/move_effects/lock_on.asm b/engine/battle/move_effects/lock_on.asm new file mode 100644 index 000000000..de92e0751 --- /dev/null +++ b/engine/battle/move_effects/lock_on.asm @@ -0,0 +1,23 @@ +BattleCommand_LockOn: ; 35a53 +; lockon + + call CheckSubstituteOpp + jr nz, .fail + + ld a, [AttackMissed] + and a + jr nz, .fail + + ld a, BATTLE_VARS_SUBSTATUS5_OPP + call GetBattleVarAddr + set SUBSTATUS_LOCK_ON, [hl] + call AnimateCurrentMove + + ld hl, TookAimText + jp StdBattleTextBox + +.fail + call AnimateFailedMove + jp PrintDidntAffect + +; 35a74 diff --git a/engine/battle/move_effects/magnitude.asm b/engine/battle/move_effects/magnitude.asm new file mode 100644 index 000000000..f56ec5c1b --- /dev/null +++ b/engine/battle/move_effects/magnitude.asm @@ -0,0 +1,29 @@ +BattleCommand_GetMagnitude: ; 37991 +; getmagnitude + + push bc + call BattleRandom + ld b, a + ld hl, MagnitudePower +.loop + ld a, [hli] + cp b + jr nc, .ok + inc hl + inc hl + jr .loop + +.ok + ld d, [hl] + push de + inc hl + ld a, [hl] + ld [wTypeMatchup], a + call BattleCommand_MoveDelay + ld hl, MagnitudeText + call StdBattleTextBox + pop de + pop bc + ret + +INCLUDE "data/moves/magnitude_power.asm" diff --git a/engine/battle/effect_commands/metronome.asm b/engine/battle/move_effects/metronome.asm similarity index 100% rename from engine/battle/effect_commands/metronome.asm rename to engine/battle/move_effects/metronome.asm diff --git a/engine/battle/move_effects/mimic.asm b/engine/battle/move_effects/mimic.asm new file mode 100644 index 000000000..c1a3bc592 --- /dev/null +++ b/engine/battle/move_effects/mimic.asm @@ -0,0 +1,52 @@ +BattleCommand_Mimic: ; 36f46 +; mimic + + call ClearLastMove + call BattleCommand_MoveDelay + ld a, [AttackMissed] + and a + jr nz, .fail + ld hl, BattleMonMoves + ld a, [hBattleTurn] + and a + jr z, .player_turn + ld hl, EnemyMonMoves +.player_turn + call CheckHiddenOpponent + jr nz, .fail + ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP + call GetBattleVar + and a + jr z, .fail + cp STRUGGLE + jr z, .fail + ld b, a + ld c, NUM_MOVES +.check_already_knows_move + ld a, [hli] + cp b + jr z, .fail + dec c + jr nz, .check_already_knows_move + dec hl +.find_mimic + ld a, [hld] + cp MIMIC + jr nz, .find_mimic + inc hl + ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP + call GetBattleVar + ld [hl], a + ld [wNamedObjectIndexBuffer], a + ld bc, BattleMonPP - BattleMonMoves + add hl, bc + ld [hl], 5 + call GetMoveName + call AnimateCurrentMove + ld hl, LearnedMoveText + jp StdBattleTextBox + +.fail + jp FailMimic + +; 36f9d diff --git a/engine/battle/move_effects/mirror_coat.asm b/engine/battle/move_effects/mirror_coat.asm new file mode 100644 index 000000000..8e9c7c1b4 --- /dev/null +++ b/engine/battle/move_effects/mirror_coat.asm @@ -0,0 +1,61 @@ +BattleCommand_MirrorCoat: ; 37c95 +; mirrorcoat + + ld a, 1 + ld [AttackMissed], a + + ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP + call GetBattleVar + and a + ret z + + ld b, a + callfar GetMoveEffect + ld a, b + cp EFFECT_MIRROR_COAT + ret z + + call BattleCommand_ResetTypeMatchup + ld a, [wTypeMatchup] + and a + ret z + + call CheckOpponentWentFirst + ret z + + ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP + call GetBattleVar + dec a + ld de, StringBuffer1 + call GetMoveData + + ld a, [StringBuffer1 + 2] + and a + ret z + + ld a, [StringBuffer1 + 3] + cp SPECIAL + ret c + + ld hl, CurDamage + ld a, [hli] + or [hl] + ret z + + ld a, [hl] + add a + ld [hld], a + ld a, [hl] + adc a + ld [hl], a + jr nc, .capped + ld a, $ff + ld [hli], a + ld [hl], a +.capped + + xor a + ld [AttackMissed], a + ret + +; 37ce6 diff --git a/engine/battle/effect_commands/mirror_move.asm b/engine/battle/move_effects/mirror_move.asm similarity index 100% rename from engine/battle/effect_commands/mirror_move.asm rename to engine/battle/move_effects/mirror_move.asm diff --git a/engine/battle/move_effects/mist.asm b/engine/battle/move_effects/mist.asm new file mode 100644 index 000000000..9ffd86c8e --- /dev/null +++ b/engine/battle/move_effects/mist.asm @@ -0,0 +1,17 @@ +BattleCommand_Mist: ; 36c7e +; mist + + ld a, BATTLE_VARS_SUBSTATUS4 + call GetBattleVarAddr + bit SUBSTATUS_MIST, [hl] + jr nz, .already_mist + set SUBSTATUS_MIST, [hl] + call AnimateCurrentMove + ld hl, MistText + jp StdBattleTextBox + +.already_mist + call AnimateFailedMove + jp PrintButItFailed + +; 36c98 diff --git a/engine/battle/effect_commands/nightmare.asm b/engine/battle/move_effects/nightmare.asm similarity index 100% rename from engine/battle/effect_commands/nightmare.asm rename to engine/battle/move_effects/nightmare.asm diff --git a/engine/battle/move_effects/pain_split.asm b/engine/battle/move_effects/pain_split.asm new file mode 100644 index 000000000..5a6b72686 --- /dev/null +++ b/engine/battle/move_effects/pain_split.asm @@ -0,0 +1,97 @@ +BattleCommand_PainSplit: ; 35926 +; painsplit + + ld a, [AttackMissed] + and a + jp nz, .ButItFailed + call CheckSubstituteOpp + jp nz, .ButItFailed + call AnimateCurrentMove + ld hl, BattleMonMaxHP + 1 + ld de, EnemyMonMaxHP + 1 + call .PlayerShareHP + ld a, $1 + ld [wWhichHPBar], a + hlcoord 10, 9 + predef AnimateHPBar + ld hl, EnemyMonHP + ld a, [hli] + ld [Buffer4], a + ld a, [hli] + ld [Buffer3], a + ld a, [hli] + ld [Buffer2], a + ld a, [hl] + ld [Buffer1], a + call .EnemyShareHP + xor a + ld [wWhichHPBar], a + call ResetDamage + hlcoord 2, 2 + predef AnimateHPBar + farcall _UpdateBattleHUDs + + ld hl, SharedPainText + jp StdBattleTextBox + +.PlayerShareHP: + ld a, [hld] + ld [Buffer1], a + ld a, [hld] + ld [Buffer2], a + ld a, [hld] + ld b, a + ld [Buffer3], a + ld a, [hl] + ld [Buffer4], a + dec de + dec de + ld a, [de] + dec de + add b + ld [CurDamage + 1], a + ld b, [hl] + ld a, [de] + adc b + srl a + ld [CurDamage], a + ld a, [CurDamage + 1] + rr a + ld [CurDamage + 1], a + inc hl + inc hl + inc hl + inc de + inc de + inc de + +.EnemyShareHP: ; 359ac + ld c, [hl] + dec hl + ld a, [CurDamage + 1] + sub c + ld b, [hl] + dec hl + ld a, [CurDamage] + sbc b + jr nc, .skip + + ld a, [CurDamage] + ld b, a + ld a, [CurDamage + 1] + ld c, a +.skip + ld a, c + ld [hld], a + ld [Buffer5], a + ld a, b + ld [hli], a + ld [Buffer6], a + ret + +; 359cd + +.ButItFailed: + jp PrintDidntAffect2 + +; 359d0 diff --git a/engine/battle/move_effects/pay_day.asm b/engine/battle/move_effects/pay_day.asm new file mode 100644 index 000000000..05231fc1a --- /dev/null +++ b/engine/battle/move_effects/pay_day.asm @@ -0,0 +1,28 @@ +BattleCommand_PayDay: ; 3705c +; payday + + xor a + ld hl, StringBuffer1 + ld [hli], a + + ld a, [hBattleTurn] + and a + ld a, [BattleMonLevel] + jr z, .ok + ld a, [EnemyMonLevel] +.ok + + add a + ld hl, wPayDayMoney + 2 + add [hl] + ld [hld], a + jr nc, .done + inc [hl] + dec hl + jr nz, .done + inc [hl] +.done + ld hl, CoinsScatteredText + jp StdBattleTextBox + +; 3707f diff --git a/engine/battle/effect_commands/perish_song.asm b/engine/battle/move_effects/perish_song.asm similarity index 100% rename from engine/battle/effect_commands/perish_song.asm rename to engine/battle/move_effects/perish_song.asm diff --git a/engine/battle/effect_commands/present.asm b/engine/battle/move_effects/present.asm similarity index 100% rename from engine/battle/effect_commands/present.asm rename to engine/battle/move_effects/present.asm diff --git a/engine/battle/effect_commands/protect.asm b/engine/battle/move_effects/protect.asm similarity index 100% rename from engine/battle/effect_commands/protect.asm rename to engine/battle/move_effects/protect.asm diff --git a/engine/battle/move_effects/psych_up.asm b/engine/battle/move_effects/psych_up.asm new file mode 100644 index 000000000..c7e7e59b6 --- /dev/null +++ b/engine/battle/move_effects/psych_up.asm @@ -0,0 +1,51 @@ +BattleCommand_PsychUp: ; 37c55 +; psychup + + ld hl, EnemyStatLevels + ld de, PlayerStatLevels + ld a, [hBattleTurn] + and a + jr z, .pointers_correct +; It's the enemy's turn, so swap the pointers. + push hl + ld h, d + ld l, e + pop de +.pointers_correct + push hl + ld b, NUM_LEVEL_STATS +; If any of the enemy's stats is modified from its base level, +; the move succeeds. Otherwise, it fails. +.loop + ld a, [hli] + cp BASE_STAT_LEVEL + jr nz, .break + dec b + jr nz, .loop + pop hl + call AnimateFailedMove + jp PrintButItFailed + +.break + pop hl + ld b, NUM_LEVEL_STATS +.loop2 + ld a, [hli] + ld [de], a + inc de + dec b + jr nz, .loop2 + ld a, [hBattleTurn] + and a + jr nz, .calc_enemy_stats + call CalcPlayerStats + jr .merge + +.calc_enemy_stats + call CalcEnemyStats +.merge + call AnimateCurrentMove + ld hl, CopiedStatsText + jp StdBattleTextBox + +; 37c95 diff --git a/engine/battle/move_effects/pursuit.asm b/engine/battle/move_effects/pursuit.asm new file mode 100644 index 000000000..c75204fb3 --- /dev/null +++ b/engine/battle/move_effects/pursuit.asm @@ -0,0 +1,26 @@ +BattleCommand_Pursuit: ; 37b1d +; pursuit +; Double damage if the opponent is switching. + + ld hl, wEnemyIsSwitching + ld a, [hBattleTurn] + and a + jr z, .ok + ld hl, wPlayerIsSwitching +.ok + ld a, [hl] + and a + ret z + + ld hl, CurDamage + 1 + sla [hl] + dec hl + rl [hl] + ret nc + + ld a, $ff + ld [hli], a + ld [hl], a + ret + +; 37b39 diff --git a/engine/battle/move_effects/rage.asm b/engine/battle/move_effects/rage.asm new file mode 100644 index 000000000..ac01f8137 --- /dev/null +++ b/engine/battle/move_effects/rage.asm @@ -0,0 +1,8 @@ +BattleCommand_Rage: ; 36f1d +; rage + ld a, BATTLE_VARS_SUBSTATUS4 + call GetBattleVarAddr + set SUBSTATUS_RAGE, [hl] + ret + +; 36f25 diff --git a/engine/battle/move_effects/rain_dance.asm b/engine/battle/move_effects/rain_dance.asm new file mode 100644 index 000000000..8448ccb57 --- /dev/null +++ b/engine/battle/move_effects/rain_dance.asm @@ -0,0 +1,11 @@ +BattleCommand_StartRain: ; 37bf4 +; startrain + ld a, WEATHER_RAIN + ld [Weather], a + ld a, 5 + ld [WeatherCount], a + call AnimateCurrentMove + ld hl, DownpourText + jp StdBattleTextBox + +; 37c07 diff --git a/engine/battle/move_effects/rapid_spin.asm b/engine/battle/move_effects/rapid_spin.asm new file mode 100644 index 000000000..e429d9cb2 --- /dev/null +++ b/engine/battle/move_effects/rapid_spin.asm @@ -0,0 +1,38 @@ +BattleCommand_ClearHazards: ; 37b39 +; clearhazards + + ld a, BATTLE_VARS_SUBSTATUS4 + call GetBattleVarAddr + bit SUBSTATUS_LEECH_SEED, [hl] + jr z, .not_leeched + res SUBSTATUS_LEECH_SEED, [hl] + ld hl, ShedLeechSeedText + call StdBattleTextBox +.not_leeched + + ld hl, PlayerScreens + ld de, wPlayerWrapCount + ld a, [hBattleTurn] + and a + jr z, .got_screens_wrap + ld hl, EnemyScreens + ld de, wEnemyWrapCount +.got_screens_wrap + bit SCREENS_SPIKES, [hl] + jr z, .no_spikes + res SCREENS_SPIKES, [hl] + ld hl, BlewSpikesText + push de + call StdBattleTextBox + pop de +.no_spikes + + ld a, [de] + and a + ret z + xor a + ld [de], a + ld hl, ReleasedByText + jp StdBattleTextBox + +; 37b74 diff --git a/engine/battle/move_effects/return.asm b/engine/battle/move_effects/return.asm new file mode 100644 index 000000000..8d8046385 --- /dev/null +++ b/engine/battle/move_effects/return.asm @@ -0,0 +1,27 @@ +BattleCommand_HappinessPower: ; 3784b +; happinesspower + push bc + ld hl, BattleMonHappiness + ld a, [hBattleTurn] + and a + jr z, .ok + ld hl, EnemyMonHappiness +.ok + xor a + ld [hMultiplicand + 0], a + ld [hMultiplicand + 1], a + ld a, [hl] + ld [hMultiplicand + 2], a + ld a, 10 + ld [hMultiplier], a + call Multiply + ld a, 25 + ld [hDivisor], a + ld b, 4 + call Divide + ld a, [hQuotient + 2] + ld d, a + pop bc + ret + +; 37874 diff --git a/engine/battle/effect_commands/rollout.asm b/engine/battle/move_effects/rollout.asm similarity index 100% rename from engine/battle/effect_commands/rollout.asm rename to engine/battle/move_effects/rollout.asm diff --git a/engine/battle/move_effects/safeguard.asm b/engine/battle/move_effects/safeguard.asm new file mode 100644 index 000000000..cdf5bf7dc --- /dev/null +++ b/engine/battle/move_effects/safeguard.asm @@ -0,0 +1,25 @@ +BattleCommand_Safeguard: ; 37939 +; safeguard + + ld hl, PlayerScreens + ld de, PlayerSafeguardCount + ld a, [hBattleTurn] + and a + jr z, .ok + ld hl, EnemyScreens + ld de, EnemySafeguardCount +.ok + bit SCREENS_SAFEGUARD, [hl] + jr nz, .failed + set SCREENS_SAFEGUARD, [hl] + ld a, 5 + ld [de], a + call AnimateCurrentMove + ld hl, CoveredByVeilText + jp StdBattleTextBox + +.failed + call AnimateFailedMove + jp PrintButItFailed + +; 37962 diff --git a/engine/battle/effect_commands/sandstorm.asm b/engine/battle/move_effects/sandstorm.asm similarity index 100% rename from engine/battle/effect_commands/sandstorm.asm rename to engine/battle/move_effects/sandstorm.asm diff --git a/engine/battle/move_effects/selfdestruct.asm b/engine/battle/move_effects/selfdestruct.asm new file mode 100644 index 000000000..6f6b0966f --- /dev/null +++ b/engine/battle/move_effects/selfdestruct.asm @@ -0,0 +1,31 @@ +BattleCommand_Selfdestruct: ; 37380 + farcall StubbedTrainerRankings_Selfdestruct + ld a, BATTLEANIM_PLAYER_DAMAGE + ld [wNumHits], a + ld c, 3 + call DelayFrames + ld a, BATTLE_VARS_STATUS + call GetBattleVarAddr + xor a + ld [hli], a + inc hl + ld [hli], a + ld [hl], a + ld a, $1 + ld [wKickCounter], a + call BattleCommand_LowerSub + call LoadMoveAnim + ld a, BATTLE_VARS_SUBSTATUS4 + call GetBattleVarAddr + res SUBSTATUS_LEECH_SEED, [hl] + ld a, BATTLE_VARS_SUBSTATUS5_OPP + call GetBattleVarAddr + res SUBSTATUS_DESTINY_BOND, [hl] + call _CheckBattleScene + ret nc + farcall DrawPlayerHUD + farcall DrawEnemyHUD + call WaitBGMap + jp RefreshBattleHuds + +; 373c9 diff --git a/engine/battle/move_effects/sketch.asm b/engine/battle/move_effects/sketch.asm new file mode 100644 index 000000000..af6f8cc8c --- /dev/null +++ b/engine/battle/move_effects/sketch.asm @@ -0,0 +1,119 @@ +BattleCommand_Sketch: ; 35a74 +; sketch + + call ClearLastMove +; Don't sketch during a link battle + ld a, [wLinkMode] + and a + jr z, .not_linked + call AnimateFailedMove + jp PrintNothingHappened + +.not_linked +; If the opponent has a substitute up, fail. + call CheckSubstituteOpp + jp nz, .fail +; If the opponent is transformed, fail. + ld a, BATTLE_VARS_SUBSTATUS5_OPP + call GetBattleVarAddr + bit SUBSTATUS_TRANSFORMED, [hl] + jp nz, .fail +; Get the user's moveset in its party struct. +; This move replacement shall be permanent. +; Pointer will be in de. + ld a, MON_MOVES + call UserPartyAttr + ld d, h + ld e, l +; Get the battle move structs. + ld hl, BattleMonMoves + ld a, [hBattleTurn] + and a + jr z, .get_last_move + ld hl, EnemyMonMoves +.get_last_move + ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP + call GetBattleVar + ld [wTypeMatchup], a + ld b, a +; Fail if move is invalid or is Struggle. + and a + jr z, .fail + cp STRUGGLE + jr z, .fail +; Fail if user already knows that move + ld c, NUM_MOVES +.does_user_already_know_move + ld a, [hli] + cp b + jr z, .fail + dec c + jr nz, .does_user_already_know_move +; Find Sketch in the user's moveset. +; Pointer in hl, and index in c. + dec hl + ld c, NUM_MOVES +.find_sketch + dec c + ld a, [hld] + cp SKETCH + jr nz, .find_sketch + inc hl +; The Sketched move is loaded to that slot. + ld a, b + ld [hl], a +; Copy the base PP from that move. + push bc + push hl + dec a + ld hl, Moves + MOVE_PP + call GetMoveAttr + pop hl + ld bc, BattleMonPP - BattleMonMoves + add hl, bc + ld [hl], a + pop bc + + ld a, [hBattleTurn] + and a + jr z, .user_trainer + ld a, [wBattleMode] + dec a + jr nz, .user_trainer +; wildmon + ld a, [hl] + push bc + ld hl, wWildMonPP + ld b, 0 + add hl, bc + ld [hl], a + ld hl, wWildMonMoves + add hl, bc + pop bc + ld [hl], b + jr .done_copy + +.user_trainer + ld a, [hl] + push af + ld l, c + ld h, 0 + add hl, de + ld a, b + ld [hl], a + pop af + ld de, MON_PP - MON_MOVES + add hl, de + ld [hl], a +.done_copy + call GetMoveName + call AnimateCurrentMove + + ld hl, SketchedText + jp StdBattleTextBox + +.fail + call AnimateFailedMove + jp PrintDidntAffect + +; 35b16 diff --git a/engine/battle/move_effects/sleep_talk.asm b/engine/battle/move_effects/sleep_talk.asm new file mode 100644 index 000000000..254b13814 --- /dev/null +++ b/engine/battle/move_effects/sleep_talk.asm @@ -0,0 +1,145 @@ +BattleCommand_SleepTalk: ; 35b33 +; sleeptalk + + call ClearLastMove + ld a, [AttackMissed] + and a + jr nz, .fail + ld a, [hBattleTurn] + and a + ld hl, BattleMonMoves + 1 + ld a, [DisabledMove] + ld d, a + jr z, .got_moves + ld hl, EnemyMonMoves + 1 + ld a, [EnemyDisabledMove] + ld d, a +.got_moves + ld a, BATTLE_VARS_STATUS + call GetBattleVar + and SLP + jr z, .fail + ld a, [hl] + and a + jr z, .fail + call .safely_check_has_usable_move + jr c, .fail + dec hl +.sample_move + push hl + call BattleRandom + maskbits NUM_MOVES + ld c, a + ld b, 0 + add hl, bc + ld a, [hl] + pop hl + and a + jr z, .sample_move + ld e, a + ld a, BATTLE_VARS_MOVE_ANIM + call GetBattleVar + cp e + jr z, .sample_move + ld a, e + cp d + jr z, .sample_move + call .check_two_turn_move + jr z, .sample_move + ld a, BATTLE_VARS_MOVE + call GetBattleVarAddr + ld a, e + ld [hl], a + call CheckUserIsCharging + jr nz, .charging + ld a, [wKickCounter] + push af + call BattleCommand_LowerSub + pop af + ld [wKickCounter], a +.charging + call LoadMoveAnim + call UpdateMoveData + jp ResetTurn + +.fail + call AnimateFailedMove + jp TryPrintButItFailed + +.safely_check_has_usable_move + push hl + push de + push bc + call .check_has_usable_move + pop bc + pop de + pop hl + ret + +.check_has_usable_move + ld a, [hBattleTurn] + and a + ld a, [DisabledMove] + jr z, .got_move_2 + + ld a, [EnemyDisabledMove] +.got_move_2 + ld b, a + ld a, BATTLE_VARS_MOVE + call GetBattleVar + ld c, a + dec hl + ld d, NUM_MOVES +.loop2 + ld a, [hl] + and a + jr z, .carry + + cp c + jr z, .nope + cp b + jr z, .nope + + call .check_two_turn_move + jr nz, .no_carry + +.nope + inc hl + dec d + jr nz, .loop2 + +.carry + scf + ret + +.no_carry + and a + ret + +.check_two_turn_move + push hl + push de + push bc + + ld b, a + callfar GetMoveEffect + ld a, b + + pop bc + pop de + pop hl + + cp EFFECT_SKULL_BASH + ret z + cp EFFECT_RAZOR_WIND + ret z + cp EFFECT_SKY_ATTACK + ret z + cp EFFECT_SOLARBEAM + ret z + cp EFFECT_FLY + ret z + cp EFFECT_BIDE + ret + +; 35bff diff --git a/engine/battle/move_effects/snore.asm b/engine/battle/move_effects/snore.asm new file mode 100644 index 000000000..926ee462d --- /dev/null +++ b/engine/battle/move_effects/snore.asm @@ -0,0 +1,13 @@ +BattleCommand_Snore: ; 359d0 +; snore + ld a, BATTLE_VARS_STATUS + call GetBattleVar + and SLP + ret nz + call ResetDamage + ld a, $1 + ld [AttackMissed], a + call FailMove + jp EndMoveEffect + +; 359e6 diff --git a/engine/battle/effect_commands/spikes.asm b/engine/battle/move_effects/spikes.asm similarity index 96% rename from engine/battle/effect_commands/spikes.asm rename to engine/battle/move_effects/spikes.asm index 3d15e4cfd..bc23d6559 100644 --- a/engine/battle/effect_commands/spikes.asm +++ b/engine/battle/move_effects/spikes.asm @@ -23,5 +23,5 @@ BattleCommand_Spikes: ; 37683 jp StdBattleTextBox .failed - jp FailSpikes + jp FailMove ; 376a0 diff --git a/engine/battle/move_effects/spite.asm b/engine/battle/move_effects/spite.asm new file mode 100644 index 000000000..96058de60 --- /dev/null +++ b/engine/battle/move_effects/spite.asm @@ -0,0 +1,88 @@ +BattleCommand_Spite: ; 35c0f +; spite + + ld a, [AttackMissed] + and a + jp nz, .failed + ld bc, PARTYMON_STRUCT_LENGTH ; ???? + ld hl, EnemyMonMoves + ld a, [hBattleTurn] + and a + jr z, .got_moves + ld hl, BattleMonMoves +.got_moves + ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP + call GetBattleVar + and a + jr z, .failed + cp STRUGGLE + jr z, .failed + ld b, a + ld c, -1 +.loop + inc c + ld a, [hli] + cp b + jr nz, .loop + ld [wTypeMatchup], a + dec hl + ld b, 0 + push bc + ld c, BattleMonPP - BattleMonMoves + add hl, bc + pop bc + ld a, [hl] + and PP_MASK + jr z, .failed + push bc + call GetMoveName + ; lose 2-5 PP + call BattleRandom + and %11 + inc a + inc a + ld b, a + ld a, [hl] + and PP_MASK + cp b + jr nc, .deplete_pp + ld b, a +.deplete_pp + ld a, [hl] + sub b + ld [hl], a + push af + ld a, MON_PP + call OpponentPartyAttr + ld d, b + pop af + pop bc + add hl, bc + ld e, a + ld a, BATTLE_VARS_SUBSTATUS5_OPP + call GetBattleVar + bit SUBSTATUS_TRANSFORMED, a + jr nz, .transformed + ld a, [hBattleTurn] + and a + jr nz, .not_wildmon + ld a, [wBattleMode] + dec a + jr nz, .not_wildmon + ld hl, wWildMonPP + add hl, bc +.not_wildmon + ld [hl], e +.transformed + push de + call AnimateCurrentMove + pop de + ld a, d + ld [wTypeMatchup], a + ld hl, SpiteEffectText + jp StdBattleTextBox + +.failed + jp PrintDidntAffect2 + +; 35c94 diff --git a/engine/battle/move_effects/splash.asm b/engine/battle/move_effects/splash.asm new file mode 100644 index 000000000..5b5e504b8 --- /dev/null +++ b/engine/battle/move_effects/splash.asm @@ -0,0 +1,6 @@ +BattleCommand_Splash: ; 36fe1 + call AnimateCurrentMove + farcall StubbedTrainerRankings_Splash + jp PrintNothingHappened + +; 36fed diff --git a/engine/battle/move_effects/substitute.asm b/engine/battle/move_effects/substitute.asm new file mode 100644 index 000000000..c761f88e1 --- /dev/null +++ b/engine/battle/move_effects/substitute.asm @@ -0,0 +1,90 @@ +BattleCommand_Substitute: ; 36e7c +; substitute + + call BattleCommand_MoveDelay + ld hl, BattleMonMaxHP + ld de, PlayerSubstituteHP + ld a, [hBattleTurn] + and a + jr z, .got_hp + ld hl, EnemyMonMaxHP + ld de, EnemySubstituteHP +.got_hp + + ld a, BATTLE_VARS_SUBSTATUS4 + call GetBattleVar + bit SUBSTATUS_SUBSTITUTE, a + jr nz, .already_has_sub + + ld a, [hli] + ld b, [hl] + srl a + rr b + srl a + rr b + dec hl + dec hl + ld a, b + ld [de], a + ld a, [hld] + sub b + ld e, a + ld a, [hl] + sbc 0 + ld d, a + jr c, .too_weak_to_sub + ld a, d + or e + jr z, .too_weak_to_sub + ld [hl], d + inc hl + ld [hl], e + + ld a, BATTLE_VARS_SUBSTATUS4 + call GetBattleVarAddr + set SUBSTATUS_SUBSTITUTE, [hl] + + ld hl, wPlayerWrapCount + ld de, wPlayerTrappingMove + ld a, [hBattleTurn] + and a + jr z, .player + ld hl, wEnemyWrapCount + ld de, wEnemyTrappingMove +.player + + xor a + ld [hl], a + ld [de], a + call _CheckBattleScene + jr c, .no_anim + + xor a + ld [wNumHits], a + ld [FXAnimID + 1], a + ld [wKickCounter], a + ld a, SUBSTITUTE + call LoadAnim + jr .finish + +.no_anim + call BattleCommand_RaiseSubNoAnim +.finish + ld hl, MadeSubstituteText + call StdBattleTextBox + jp RefreshBattleHuds + +.already_has_sub + call CheckUserIsCharging + call nz, BattleCommand_RaiseSub + ld hl, HasSubstituteText + jr .jp_stdbattletextbox + +.too_weak_to_sub + call CheckUserIsCharging + call nz, BattleCommand_RaiseSub + ld hl, TooWeakSubText +.jp_stdbattletextbox + jp StdBattleTextBox + +; 36f0b diff --git a/engine/battle/move_effects/sunny_day.asm b/engine/battle/move_effects/sunny_day.asm new file mode 100644 index 000000000..7d8a9cef1 --- /dev/null +++ b/engine/battle/move_effects/sunny_day.asm @@ -0,0 +1,11 @@ +BattleCommand_StartSun: ; 37c07 +; startsun + ld a, WEATHER_SUN + ld [Weather], a + ld a, 5 + ld [WeatherCount], a + call AnimateCurrentMove + ld hl, SunGotBrightText + jp StdBattleTextBox + +; 37c1a diff --git a/engine/battle/move_effects/teleport.asm b/engine/battle/move_effects/teleport.asm new file mode 100644 index 000000000..e3a0535ca --- /dev/null +++ b/engine/battle/move_effects/teleport.asm @@ -0,0 +1,91 @@ +BattleCommand_Teleport: ; 36778 +; teleport + + ld a, [BattleType] + cp BATTLETYPE_SHINY + jr z, .failed + cp BATTLETYPE_TRAP + jr z, .failed + cp BATTLETYPE_CELEBI + jr z, .failed + cp BATTLETYPE_SUICUNE + jr z, .failed + + ld a, BATTLE_VARS_SUBSTATUS5_OPP + call GetBattleVar + bit SUBSTATUS_CANT_RUN, a + jr nz, .failed +; Only need to check these next things if it's your turn + ld a, [hBattleTurn] + and a + jr nz, .enemy_turn +; Can't teleport from a trainer battle + ld a, [wBattleMode] + dec a + jr nz, .failed +; If your level is greater than the opponent's, you run without fail. + ld a, [CurPartyLevel] + ld b, a + ld a, [BattleMonLevel] + cp b + jr nc, .run_away +; Generate a number between 0 and (YourLevel + TheirLevel). + add b + ld c, a + inc c +.loop_player + call BattleRandom + cp c + jr nc, .loop_player +; If that number is greater than 4 times your level, run away. + srl b + srl b + cp b + jr nc, .run_away + +.failed + call AnimateFailedMove + jp PrintButItFailed + +.enemy_turn + ld a, [wBattleMode] + dec a + jr nz, .failed + ld a, [BattleMonLevel] + ld b, a + ld a, [CurPartyLevel] + cp b + jr nc, .run_away + add b + ld c, a + inc c +.loop_enemy + call BattleRandom + cp c + jr nc, .loop_enemy + srl b + srl b + cp b + ; This does the wrong thing. What was + ; probably intended was jr c, .failed + ; The way this is made makes enemy use + ; of Teleport always succeed if able + jr nc, .run_away +.run_away + call UpdateBattleMonInParty + xor a + ld [wNumHits], a + inc a + ld [wForcedSwitch], a + ld [wKickCounter], a + call SetBattleDraw + call BattleCommand_LowerSub + call LoadMoveAnim + ld c, 20 + call DelayFrames + call SetBattleDraw + + ld hl, FledFromBattleText + jp StdBattleTextBox + +; 36804 diff --git a/engine/battle/effect_commands/thief.asm b/engine/battle/move_effects/thief.asm similarity index 100% rename from engine/battle/effect_commands/thief.asm rename to engine/battle/move_effects/thief.asm diff --git a/engine/battle/move_effects/thunder.asm b/engine/battle/move_effects/thunder.asm new file mode 100644 index 000000000..adfb4dd33 --- /dev/null +++ b/engine/battle/move_effects/thunder.asm @@ -0,0 +1,20 @@ +BattleCommand_ThunderAccuracy: ; 37d94 +; thunderaccuracy + + ld a, BATTLE_VARS_MOVE_TYPE + call GetBattleVarAddr + inc hl + ld a, [Weather] + cp WEATHER_RAIN + jr z, .rain + cp WEATHER_SUN + ret nz + ld [hl], 50 percent + 1 + ret + +.rain + ; Redundant with CheckHit guranteeing hit + ld [hl], 100 percent + ret + +; 37daa diff --git a/engine/battle/effect_commands/transform.asm b/engine/battle/move_effects/transform.asm similarity index 100% rename from engine/battle/effect_commands/transform.asm rename to engine/battle/move_effects/transform.asm diff --git a/engine/battle/move_effects/triple_kick.asm b/engine/battle/move_effects/triple_kick.asm new file mode 100644 index 000000000..e66e5a9a7 --- /dev/null +++ b/engine/battle/move_effects/triple_kick.asm @@ -0,0 +1,39 @@ +BattleCommand_TripleKick: ; 346b2 +; triplekick + + ld a, [wKickCounter] + ld b, a + inc b + ld hl, CurDamage + 1 + ld a, [hld] + ld e, a + ld a, [hli] + ld d, a +.next_kick + dec b + ret z + ld a, [hl] + add e + ld [hld], a + ld a, [hl] + adc d + ld [hli], a + +; No overflow. + jr nc, .next_kick + ld a, $ff + ld [hld], a + ld [hl], a + ret + +; 346cd + + +BattleCommand_KickCounter: ; 346cd +; kickcounter + + ld hl, wKickCounter + inc [hl] + ret + +; 346d2 From 47e704b93163f0ae69d46425490426ad085643c7 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 26 Jan 2018 11:39:35 -0500 Subject: [PATCH 050/135] Correction, wave patterns are quite interesting. --- audio/wave_samples.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/wave_samples.asm b/audio/wave_samples.asm index d48259888..493cce679 100644 --- a/audio/wave_samples.asm +++ b/audio/wave_samples.asm @@ -1,6 +1,6 @@ WaveSamples: ; e8db2 - ; these are streams of 32 4-bit values used as wavepatterns - ; nothing interesting here! + ; These are streams of 32 nybbles (4-bit values) used as wave patterns. + ; Plot them as a line chart to see the wave's shape. dn 0, 2, 4, 6, 8, 10, 12, 14, 15, 15, 15, 14, 14, 13, 13, 12, 12, 11, 10, 9, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 1, 1 dn 0, 2, 4, 6, 8, 10, 12, 14, 14, 15, 15, 15, 15, 14, 14, 14, 13, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 2, 1, 1 dn 1, 3, 6, 9, 11, 13, 14, 14, 14, 14, 15, 15, 15, 15, 14, 13, 13, 14, 15, 15, 15, 15, 14, 14, 14, 14, 13, 11, 9, 6, 3, 1 From f1366d615f2b5d9602fe94a2512a5b3804484f26 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 26 Jan 2018 12:06:33 -0500 Subject: [PATCH 051/135] Separate map object constants for easier editing --- constants.asm | 1 + constants/map_data_constants.asm | 87 ---------- constants/map_object_constants.asm | 243 ++++++++++++++++++++++++++++ constants/sprite_data_constants.asm | 157 ------------------ 4 files changed, 244 insertions(+), 244 deletions(-) create mode 100644 constants/map_object_constants.asm diff --git a/constants.asm b/constants.asm index 0cd14bfbe..0fafcb03f 100644 --- a/constants.asm +++ b/constants.asm @@ -26,6 +26,7 @@ INCLUDE "constants/item_data_constants.asm" INCLUDE "constants/landmark_constants.asm" INCLUDE "constants/map_constants.asm" INCLUDE "constants/map_data_constants.asm" +INCLUDE "constants/map_object_constants.asm" INCLUDE "constants/map_setup_constants.asm" INCLUDE "constants/menu_constants.asm" INCLUDE "constants/mobile_constants.asm" diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 141899578..a569aec21 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -107,90 +107,3 @@ NUM_SPAWNS EQU const_value ; outdoor sprite limits (see engine/overworld.asm) MAX_OUTDOOR_SPRITES EQU 23 SPRITE_GFX_LIST_CAPACITY EQU $20 - - -; map_object struct members (see macros/wram.asm) - const_def - const MAPOBJECT_OBJECT_STRUCT_ID ; 0 - const MAPOBJECT_SPRITE ; 1 - const MAPOBJECT_Y_COORD ; 2 - const MAPOBJECT_X_COORD ; 3 - const MAPOBJECT_MOVEMENT ; 4 - const MAPOBJECT_RADIUS ; 5 - const MAPOBJECT_HOUR ; 6 - const MAPOBJECT_TIMEOFDAY ; 7 - const MAPOBJECT_COLOR ; 8 - const MAPOBJECT_RANGE ; 9 - const MAPOBJECT_SCRIPT_POINTER ; a - const MAPOBJECT_POINTER_HI ; b - const MAPOBJECT_EVENT_FLAG ; c - const MAPOBJECT_FLAG_HI ; d - const MAPOBJECT_E ; unused - const MAPOBJECT_F ; unused -OBJECT_LENGTH EQU const_value - -MAPOBJECT_SCREEN_HEIGHT EQU 11 -MAPOBJECT_SCREEN_WIDTH EQU 12 - - -; object_struct members (see macros/wram.asm) - const_def - const OBJECT_SPRITE ; 00 - const OBJECT_MAP_OBJECT_INDEX ; 01 - const OBJECT_SPRITE_TILE ; 02 - const OBJECT_MOVEMENTTYPE ; 03 - const OBJECT_FLAGS1 ; 04 - const OBJECT_FLAGS2 ; 05 - const OBJECT_PALETTE ; 06 - const OBJECT_DIRECTION_WALKING ; 07 - const OBJECT_FACING ; 08 - const OBJECT_STEP_TYPE ; 09 - const OBJECT_STEP_DURATION ; 0a - const OBJECT_ACTION ; 0b - const OBJECT_STEP_FRAME ; 0c - const OBJECT_FACING_STEP ; 0d - const OBJECT_NEXT_TILE ; 0e - const OBJECT_STANDING_TILE ; 0f - const OBJECT_NEXT_MAP_X ; 10 - const OBJECT_NEXT_MAP_Y ; 11 - const OBJECT_MAP_X ; 12 - const OBJECT_MAP_Y ; 13 - const OBJECT_INIT_X ; 14 - const OBJECT_INIT_Y ; 15 - const OBJECT_RADIUS ; 16 - const OBJECT_SPRITE_X ; 17 - const OBJECT_SPRITE_Y ; 18 - const OBJECT_SPRITE_X_OFFSET ; 19 - const OBJECT_SPRITE_Y_OFFSET ; 1a - const OBJECT_MOVEMENT_BYTE_INDEX ; 1b - const OBJECT_1C ; 1c - const OBJECT_1D ; 1d - const OBJECT_1E ; 1e - const OBJECT_1F ; 1f - const OBJECT_RANGE ; 20 - ; 21-27 are not used -OBJECT_STRUCT_LENGTH EQU 40 -NUM_OBJECT_STRUCTS EQU 13 ; see ObjectStructs - -; object_struct OBJECT_FACING values -OW_DOWN EQU DOWN << 2 -OW_UP EQU UP << 2 -OW_LEFT EQU LEFT << 2 -OW_RIGHT EQU RIGHT << 2 - -; object_struct OBJECT_FLAGS1 bit flags -INVISIBLE EQU 0 -FIXED_FACING EQU 2 -SLIDING EQU 3 -EMOTE_OBJECT EQU 7 - -; DoPlayerMovement.DoStep arguments (see engine/player_movement.asm) - const_def - const STEP_SLOW ; 0 - const STEP_WALK ; 1 - const STEP_BIKE ; 2 - const STEP_LEDGE ; 3 - const STEP_ICE ; 4 - const STEP_TURN ; 5 - const STEP_BACK_LEDGE ; 6 - const STEP_WALK_IN_PLACE ; 7 diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm new file mode 100644 index 000000000..c84171941 --- /dev/null +++ b/constants/map_object_constants.asm @@ -0,0 +1,243 @@ +; object_struct members (see macros/wram.asm) + const_def + const OBJECT_SPRITE ; 00 + const OBJECT_MAP_OBJECT_INDEX ; 01 + const OBJECT_SPRITE_TILE ; 02 + const OBJECT_MOVEMENTTYPE ; 03 + const OBJECT_FLAGS1 ; 04 + const OBJECT_FLAGS2 ; 05 + const OBJECT_PALETTE ; 06 + const OBJECT_DIRECTION_WALKING ; 07 + const OBJECT_FACING ; 08 + const OBJECT_STEP_TYPE ; 09 + const OBJECT_STEP_DURATION ; 0a + const OBJECT_ACTION ; 0b + const OBJECT_STEP_FRAME ; 0c + const OBJECT_FACING_STEP ; 0d + const OBJECT_NEXT_TILE ; 0e + const OBJECT_STANDING_TILE ; 0f + const OBJECT_NEXT_MAP_X ; 10 + const OBJECT_NEXT_MAP_Y ; 11 + const OBJECT_MAP_X ; 12 + const OBJECT_MAP_Y ; 13 + const OBJECT_INIT_X ; 14 + const OBJECT_INIT_Y ; 15 + const OBJECT_RADIUS ; 16 + const OBJECT_SPRITE_X ; 17 + const OBJECT_SPRITE_Y ; 18 + const OBJECT_SPRITE_X_OFFSET ; 19 + const OBJECT_SPRITE_Y_OFFSET ; 1a + const OBJECT_MOVEMENT_BYTE_INDEX ; 1b + const OBJECT_1C ; 1c + const OBJECT_1D ; 1d + const OBJECT_1E ; 1e + const OBJECT_1F ; 1f + const OBJECT_RANGE ; 20 + ; 21-27 are not used +OBJECT_STRUCT_LENGTH EQU 40 +NUM_OBJECT_STRUCTS EQU 13 ; see ObjectStructs + +MAPOBJECT_SCREEN_HEIGHT EQU 11 +MAPOBJECT_SCREEN_WIDTH EQU 12 + +; object_struct OBJECT_FACING values +OW_DOWN EQU DOWN << 2 +OW_UP EQU UP << 2 +OW_LEFT EQU LEFT << 2 +OW_RIGHT EQU RIGHT << 2 + +; object_struct OBJECT_FLAGS1 bit flags +INVISIBLE EQU 0 +FIXED_FACING EQU 2 +SLIDING EQU 3 +EMOTE_OBJECT EQU 7 + + +; map_object struct members (see macros/wram.asm) + const_def + const MAPOBJECT_OBJECT_STRUCT_ID ; 0 + const MAPOBJECT_SPRITE ; 1 + const MAPOBJECT_Y_COORD ; 2 + const MAPOBJECT_X_COORD ; 3 + const MAPOBJECT_MOVEMENT ; 4 + const MAPOBJECT_RADIUS ; 5 + const MAPOBJECT_HOUR ; 6 + const MAPOBJECT_TIMEOFDAY ; 7 + const MAPOBJECT_COLOR ; 8 + const MAPOBJECT_RANGE ; 9 + const MAPOBJECT_SCRIPT_POINTER ; a + const MAPOBJECT_POINTER_HI ; b + const MAPOBJECT_EVENT_FLAG ; c + const MAPOBJECT_FLAG_HI ; d + const MAPOBJECT_E ; unused + const MAPOBJECT_F ; unused +OBJECT_LENGTH EQU const_value + +; SpriteMovementData indexes (see data/sprites/map_objects.asm) + const_def + const SPRITEMOVEDATA_00 ; 00 + const SPRITEMOVEDATA_ITEM_TREE ; 01 + const SPRITEMOVEDATA_WANDER ; 02 + const SPRITEMOVEDATA_SPINRANDOM_SLOW ; 03 + const SPRITEMOVEDATA_WALK_UP_DOWN ; 04 + const SPRITEMOVEDATA_WALK_LEFT_RIGHT ; 05 + const SPRITEMOVEDATA_STANDING_DOWN ; 06 + const SPRITEMOVEDATA_STANDING_UP ; 07 + const SPRITEMOVEDATA_STANDING_LEFT ; 08 + const SPRITEMOVEDATA_STANDING_RIGHT ; 09 + const SPRITEMOVEDATA_SPINRANDOM_FAST ; 0a + const SPRITEMOVEDATA_PLAYER ; 0b + const SPRITEMOVEDATA_0C ; 0c + const SPRITEMOVEDATA_0D ; 0d + const SPRITEMOVEDATA_0E ; 0e + const SPRITEMOVEDATA_0F ; 0f + const SPRITEMOVEDATA_10 ; 10 + const SPRITEMOVEDATA_11 ; 11 + const SPRITEMOVEDATA_12 ; 12 + const SPRITEMOVEDATA_FOLLOWING ; 13 + const SPRITEMOVEDATA_SCRIPTED ; 14 + const SPRITEMOVEDATA_SNORLAX ; 15 + const SPRITEMOVEDATA_POKEMON ; 16 + const SPRITEMOVEDATA_SUDOWOODO ; 17 + const SPRITEMOVEDATA_SMASHABLE_ROCK ; 18 + const SPRITEMOVEDATA_STRENGTH_BOULDER ; 19 + const SPRITEMOVEDATA_FOLLOWNOTEXACT ; 1a + const SPRITEMOVEDATA_SHADOW ; 1b + const SPRITEMOVEDATA_EMOTE ; 1c + const SPRITEMOVEDATA_SCREENSHAKE ; 1d + const SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE ; 1e + const SPRITEMOVEDATA_SPINCLOCKWISE ; 1f + const SPRITEMOVEDATA_20 ; 20 + const SPRITEMOVEDATA_BIGDOLL ; 21 + const SPRITEMOVEDATA_BOULDERDUST ; 22 + const SPRITEMOVEDATA_GRASS ; 23 + const SPRITEMOVEDATA_LAPRAS ; 24 +NUM_SPRITEMOVEDATA EQU const_value +SPRITEMOVEDATA_FIELDS EQU 6 + +; MapObjectMovementPattern.Pointers indexes (see engine/map_objects.asm) + const_def + const SPRITEMOVEFN_00 ; 00 + const SPRITEMOVEFN_RANDOM_WALK_Y ; 01 + const SPRITEMOVEFN_RANDOM_WALK_X ; 02 + const SPRITEMOVEFN_RANDOM_WALK_XY ; 03 + const SPRITEMOVEFN_SLOW_RANDOM_SPIN ; 04 + const SPRITEMOVEFN_FAST_RANDOM_SPIN ; 05 + const SPRITEMOVEFN_STANDING ; 06 + const SPRITEMOVEFN_OBEY_DPAD ; 07 + const SPRITEMOVEFN_08 ; 08 + const SPRITEMOVEFN_09 ; 09 + const SPRITEMOVEFN_0A ; 0a + const SPRITEMOVEFN_0B ; 0b + const SPRITEMOVEFN_0C ; 0c + const SPRITEMOVEFN_0D ; 0d + const SPRITEMOVEFN_0E ; 0e + const SPRITEMOVEFN_FOLLOW ; 0f + const SPRITEMOVEFN_SCRIPTED ; 10 + const SPRITEMOVEFN_STRENGTH ; 11 + const SPRITEMOVEFN_FOLLOWNOTEXACT ; 12 + const SPRITEMOVEFN_SHADOW ; 13 + const SPRITEMOVEFN_EMOTE ; 14 + const SPRITEMOVEFN_BIG_SNORLAX ; 15 + const SPRITEMOVEFN_BOUNCE ; 16 + const SPRITEMOVEFN_SCREENSHAKE ; 17 + const SPRITEMOVEFN_SPIN_CLOCKWISE ; 18 + const SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE ; 19 + const SPRITEMOVEFN_BOULDERDUST ; 1a + const SPRITEMOVEFN_GRASS ; 1b + +; StepTypesJumptable indexes (see engine/map_objects.asm) + const_def + const STEP_TYPE_00 ; 00 + const STEP_TYPE_SLEEP ; 01 + const STEP_TYPE_NPC_WALK ; 02 + const STEP_TYPE_03 ; 03 + const STEP_TYPE_04 ; 04 + const STEP_TYPE_05 ; 05 + const STEP_TYPE_PLAYER_WALK ; 06 + const STEP_TYPE_07 ; 07 + const STEP_TYPE_NPC_JUMP ; 08 + const STEP_TYPE_PLAYER_JUMP ; 09 + const STEP_TYPE_HALF_STEP ; 0a + const STEP_TYPE_BUMP ; 0b + const STEP_TYPE_TELEPORT_FROM ; 0c + const STEP_TYPE_TELEPORT_TO ; 0d + const STEP_TYPE_SKYFALL ; 0e + const STEP_TYPE_0F ; 0f + const STEP_TYPE_GOT_BITE ; 10 + const STEP_TYPE_ROCK_SMASH ; 11 + const STEP_TYPE_RETURN_DIG ; 12 + const STEP_TYPE_TRACKING_OBJECT ; 13 + const STEP_TYPE_14 ; 14 + const STEP_TYPE_15 ; 15 + const STEP_TYPE_16 ; 16 + const STEP_TYPE_17 ; 17 + const STEP_TYPE_18 ; 18 + const STEP_TYPE_SKYFALL_TOP ; 19 + +; ObjectActionPairPointers indexes (see engine/map_object_action.asm) + const_def + const OBJECT_ACTION_00 ; 00 + const OBJECT_ACTION_STAND ; 01 + const OBJECT_ACTION_STEP ; 02 + const OBJECT_ACTION_BUMP ; 03 + const OBJECT_ACTION_SPIN ; 04 + const OBJECT_ACTION_SPIN_FLICKER ; 05 + const OBJECT_ACTION_FISHING ; 06 + const OBJECT_ACTION_SHADOW ; 07 + const OBJECT_ACTION_EMOTE ; 08 + const OBJECT_ACTION_BIG_SNORLAX ; 09 + const OBJECT_ACTION_BOUNCE ; 0a + const OBJECT_ACTION_WEIRD_TREE ; 0b + const OBJECT_ACTION_BIG_LAPRAS ; 0c + const OBJECT_ACTION_BIG_DOLL ; 0d + const OBJECT_ACTION_BOULDER_DUST ; 0e + const OBJECT_ACTION_GRASS_SHAKE ; 0f + const OBJECT_ACTION_SKYFALL ; 10 + +; Facings indexes (see data/sprites/facings.asm) + const_def + const FACING_STEP_DOWN_0 ; 00 + const FACING_STEP_DOWN_1 ; 01 + const FACING_STEP_DOWN_2 ; 02 + const FACING_STEP_DOWN_3 ; 03 + const FACING_STEP_UP_0 ; 04 + const FACING_STEP_UP_1 ; 05 + const FACING_STEP_UP_2 ; 06 + const FACING_STEP_UP_3 ; 07 + const FACING_STEP_LEFT_0 ; 08 + const FACING_STEP_LEFT_1 ; 09 + const FACING_STEP_LEFT_2 ; 0a + const FACING_STEP_LEFT_3 ; 0b + const FACING_STEP_RIGHT_0 ; 0c + const FACING_STEP_RIGHT_1 ; 0d + const FACING_STEP_RIGHT_2 ; 0e + const FACING_STEP_RIGHT_3 ; 0f + const FACING_FISH_DOWN ; 10 + const FACING_FISH_UP ; 11 + const FACING_FISH_LEFT ; 12 + const FACING_FISH_RIGHT ; 13 + const FACING_EMOTE ; 14 + const FACING_SHADOW ; 15 + const FACING_BIG_DOLL_ASYM ; 16 + const FACING_BIG_DOLL_SYM ; 17 + const FACING_WEIRD_TREE_0 ; 18 + const FACING_WEIRD_TREE_1 ; 19 + const FACING_WEIRD_TREE_2 ; 1a + const FACING_WEIRD_TREE_3 ; 1b + const FACING_BOULDER_DUST_1 ; 1c + const FACING_BOULDER_DUST_2 ; 1d + const FACING_GRASS_1 ; 1e + const FACING_GRASS_2 ; 1f + + +; DoPlayerMovement.DoStep arguments (see engine/player_movement.asm) + const_def + const STEP_SLOW ; 0 + const STEP_WALK ; 1 + const STEP_BIKE ; 2 + const STEP_LEDGE ; 3 + const STEP_ICE ; 4 + const STEP_TURN ; 5 + const STEP_BACK_LEDGE ; 6 + const STEP_WALK_IN_PLACE ; 7 diff --git a/constants/sprite_data_constants.asm b/constants/sprite_data_constants.asm index db53c3ca1..0ab039efa 100644 --- a/constants/sprite_data_constants.asm +++ b/constants/sprite_data_constants.asm @@ -36,160 +36,3 @@ const_value set (1 << 3) const PAL_NPC_SILVER ; d const PAL_NPC_TREE ; e const PAL_NPC_ROCK ; f - -; SpriteMovementData indexes (see data/sprites/map_objects.asm) - const_def - const SPRITEMOVEDATA_00 ; 00 - const SPRITEMOVEDATA_ITEM_TREE ; 01 - const SPRITEMOVEDATA_WANDER ; 02 - const SPRITEMOVEDATA_SPINRANDOM_SLOW ; 03 - const SPRITEMOVEDATA_WALK_UP_DOWN ; 04 - const SPRITEMOVEDATA_WALK_LEFT_RIGHT ; 05 - const SPRITEMOVEDATA_STANDING_DOWN ; 06 - const SPRITEMOVEDATA_STANDING_UP ; 07 - const SPRITEMOVEDATA_STANDING_LEFT ; 08 - const SPRITEMOVEDATA_STANDING_RIGHT ; 09 - const SPRITEMOVEDATA_SPINRANDOM_FAST ; 0a - const SPRITEMOVEDATA_PLAYER ; 0b - const SPRITEMOVEDATA_0C ; 0c - const SPRITEMOVEDATA_0D ; 0d - const SPRITEMOVEDATA_0E ; 0e - const SPRITEMOVEDATA_0F ; 0f - const SPRITEMOVEDATA_10 ; 10 - const SPRITEMOVEDATA_11 ; 11 - const SPRITEMOVEDATA_12 ; 12 - const SPRITEMOVEDATA_FOLLOWING ; 13 - const SPRITEMOVEDATA_SCRIPTED ; 14 - const SPRITEMOVEDATA_SNORLAX ; 15 - const SPRITEMOVEDATA_POKEMON ; 16 - const SPRITEMOVEDATA_SUDOWOODO ; 17 - const SPRITEMOVEDATA_SMASHABLE_ROCK ; 18 - const SPRITEMOVEDATA_STRENGTH_BOULDER ; 19 - const SPRITEMOVEDATA_FOLLOWNOTEXACT ; 1a - const SPRITEMOVEDATA_SHADOW ; 1b - const SPRITEMOVEDATA_EMOTE ; 1c - const SPRITEMOVEDATA_SCREENSHAKE ; 1d - const SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE ; 1e - const SPRITEMOVEDATA_SPINCLOCKWISE ; 1f - const SPRITEMOVEDATA_20 ; 20 - const SPRITEMOVEDATA_BIGDOLL ; 21 - const SPRITEMOVEDATA_BOULDERDUST ; 22 - const SPRITEMOVEDATA_GRASS ; 23 - const SPRITEMOVEDATA_LAPRAS ; 24 -NUM_SPRITEMOVEDATA EQU const_value -SPRITEMOVEDATA_FIELDS EQU 6 - -; MapObjectMovementPattern.Pointers indexes (see engine/map_objects.asm) - const_def - const SPRITEMOVEFN_00 ; 00 - const SPRITEMOVEFN_RANDOM_WALK_Y ; 01 - const SPRITEMOVEFN_RANDOM_WALK_X ; 02 - const SPRITEMOVEFN_RANDOM_WALK_XY ; 03 - const SPRITEMOVEFN_SLOW_RANDOM_SPIN ; 04 - const SPRITEMOVEFN_FAST_RANDOM_SPIN ; 05 - const SPRITEMOVEFN_STANDING ; 06 - const SPRITEMOVEFN_OBEY_DPAD ; 07 - const SPRITEMOVEFN_08 ; 08 - const SPRITEMOVEFN_09 ; 09 - const SPRITEMOVEFN_0A ; 0a - const SPRITEMOVEFN_0B ; 0b - const SPRITEMOVEFN_0C ; 0c - const SPRITEMOVEFN_0D ; 0d - const SPRITEMOVEFN_0E ; 0e - const SPRITEMOVEFN_FOLLOW ; 0f - const SPRITEMOVEFN_SCRIPTED ; 10 - const SPRITEMOVEFN_STRENGTH ; 11 - const SPRITEMOVEFN_FOLLOWNOTEXACT ; 12 - const SPRITEMOVEFN_SHADOW ; 13 - const SPRITEMOVEFN_EMOTE ; 14 - const SPRITEMOVEFN_BIG_SNORLAX ; 15 - const SPRITEMOVEFN_BOUNCE ; 16 - const SPRITEMOVEFN_SCREENSHAKE ; 17 - const SPRITEMOVEFN_SPIN_CLOCKWISE ; 18 - const SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE ; 19 - const SPRITEMOVEFN_BOULDERDUST ; 1a - const SPRITEMOVEFN_GRASS ; 1b - -; StepTypesJumptable indexes (see engine/map_objects.asm) - const_def - const STEP_TYPE_00 ; 00 - const STEP_TYPE_SLEEP ; 01 - const STEP_TYPE_NPC_WALK ; 02 - const STEP_TYPE_03 ; 03 - const STEP_TYPE_04 ; 04 - const STEP_TYPE_05 ; 05 - const STEP_TYPE_PLAYER_WALK ; 06 - const STEP_TYPE_07 ; 07 - const STEP_TYPE_NPC_JUMP ; 08 - const STEP_TYPE_PLAYER_JUMP ; 09 - const STEP_TYPE_HALF_STEP ; 0a - const STEP_TYPE_BUMP ; 0b - const STEP_TYPE_TELEPORT_FROM ; 0c - const STEP_TYPE_TELEPORT_TO ; 0d - const STEP_TYPE_SKYFALL ; 0e - const STEP_TYPE_0F ; 0f - const STEP_TYPE_GOT_BITE ; 10 - const STEP_TYPE_ROCK_SMASH ; 11 - const STEP_TYPE_RETURN_DIG ; 12 - const STEP_TYPE_TRACKING_OBJECT ; 13 - const STEP_TYPE_14 ; 14 - const STEP_TYPE_15 ; 15 - const STEP_TYPE_16 ; 16 - const STEP_TYPE_17 ; 17 - const STEP_TYPE_18 ; 18 - const STEP_TYPE_SKYFALL_TOP ; 19 - -; ObjectActionPairPointers indexes (see engine/map_object_action.asm) - const_def - const OBJECT_ACTION_00 ; 00 - const OBJECT_ACTION_STAND ; 01 - const OBJECT_ACTION_STEP ; 02 - const OBJECT_ACTION_BUMP ; 03 - const OBJECT_ACTION_SPIN ; 04 - const OBJECT_ACTION_SPIN_FLICKER ; 05 - const OBJECT_ACTION_FISHING ; 06 - const OBJECT_ACTION_SHADOW ; 07 - const OBJECT_ACTION_EMOTE ; 08 - const OBJECT_ACTION_BIG_SNORLAX ; 09 - const OBJECT_ACTION_BOUNCE ; 0a - const OBJECT_ACTION_WEIRD_TREE ; 0b - const OBJECT_ACTION_BIG_LAPRAS ; 0c - const OBJECT_ACTION_BIG_DOLL ; 0d - const OBJECT_ACTION_BOULDER_DUST ; 0e - const OBJECT_ACTION_GRASS_SHAKE ; 0f - const OBJECT_ACTION_SKYFALL ; 10 - -; Facings indexes (see data/sprites/facings.asm) - const_def - const FACING_STEP_DOWN_0 ; 00 - const FACING_STEP_DOWN_1 ; 01 - const FACING_STEP_DOWN_2 ; 02 - const FACING_STEP_DOWN_3 ; 03 - const FACING_STEP_UP_0 ; 04 - const FACING_STEP_UP_1 ; 05 - const FACING_STEP_UP_2 ; 06 - const FACING_STEP_UP_3 ; 07 - const FACING_STEP_LEFT_0 ; 08 - const FACING_STEP_LEFT_1 ; 09 - const FACING_STEP_LEFT_2 ; 0a - const FACING_STEP_LEFT_3 ; 0b - const FACING_STEP_RIGHT_0 ; 0c - const FACING_STEP_RIGHT_1 ; 0d - const FACING_STEP_RIGHT_2 ; 0e - const FACING_STEP_RIGHT_3 ; 0f - const FACING_FISH_DOWN ; 10 - const FACING_FISH_UP ; 11 - const FACING_FISH_LEFT ; 12 - const FACING_FISH_RIGHT ; 13 - const FACING_EMOTE ; 14 - const FACING_SHADOW ; 15 - const FACING_BIG_DOLL_ASYM ; 16 - const FACING_BIG_DOLL_SYM ; 17 - const FACING_WEIRD_TREE_0 ; 18 - const FACING_WEIRD_TREE_1 ; 19 - const FACING_WEIRD_TREE_2 ; 1a - const FACING_WEIRD_TREE_3 ; 1b - const FACING_BOULDER_DUST_1 ; 1c - const FACING_BOULDER_DUST_2 ; 1d - const FACING_GRASS_1 ; 1e - const FACING_GRASS_2 ; 1f From 3332305bb4bce2534a0bd3de0e4c419a98738fc8 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 26 Jan 2018 12:27:02 -0500 Subject: [PATCH 052/135] Define more bit flag constants --- constants/map_object_constants.asm | 5 +++++ engine/map_objects.asm | 10 +++++----- engine/movement.asm | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm index c84171941..93532220e 100644 --- a/constants/map_object_constants.asm +++ b/constants/map_object_constants.asm @@ -52,6 +52,11 @@ FIXED_FACING EQU 2 SLIDING EQU 3 EMOTE_OBJECT EQU 7 +; object_struct OBJECT_FLAGS2 bit flags +LOW_PRIORITY EQU 0 +HIGH_PRIORITY EQU 1 +OVERHEAD EQU 3 + ; map_object struct members (see macros/wram.asm) const_def diff --git a/engine/map_objects.asm b/engine/map_objects.asm index cc6f08ea0..dc39b3f16 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -233,7 +233,7 @@ Function462a: ; 462a UpdateTallGrassFlags: ; 463f ld hl, OBJECT_FLAGS2 add hl, bc - bit 3, [hl] ; is current tile grass? + bit OVERHEAD, [hl] jr z, .ok ld hl, OBJECT_NEXT_TILE add hl, bc @@ -260,13 +260,13 @@ SetTallGrassFlags: ; 4661 .set ld hl, OBJECT_FLAGS2 add hl, bc - set 3, [hl] + set OVERHEAD, [hl] ret .reset ld hl, OBJECT_FLAGS2 add hl, bc - res 3, [hl] + res OVERHEAD, [hl] ret ; 4679 @@ -2918,10 +2918,10 @@ InitSprites: ; 5991 ld e, PRIORITY_LOW ld hl, OBJECT_FLAGS2 add hl, bc - bit 0, [hl] + bit LOW_PRIORITY, [hl] jr nz, .add ld e, PRIORITY_NORM - bit 1, [hl] + bit HIGH_PRIORITY, [hl] jr z, .add ld e, PRIORITY_HIGH jr .add diff --git a/engine/movement.asm b/engine/movement.asm index 3ba48d60d..69fd7bc5e 100644 --- a/engine/movement.asm +++ b/engine/movement.asm @@ -838,7 +838,7 @@ JumpStep: ; 548a ld hl, OBJECT_FLAGS2 add hl, bc - res 3, [hl] + res OVERHEAD, [hl] ld hl, OBJECT_ACTION add hl, bc From f5ba69f5e504a7601246243f4dbc287d700af2c5 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 26 Jan 2018 14:36:59 -0500 Subject: [PATCH 053/135] Sync documentation with code --- docs/bugs_and_glitches.md | 40 ++++++++++++------------- engine/events/bug_contest/contest_2.asm | 3 +- engine/party_menu.asm | 2 +- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 3755fa1a7..3c5728b78 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -740,8 +740,7 @@ This is a bug with `HaircutOrGrooming` in [engine/events/special.asm](/engine/ev ... -Data_DaisysGrooming: ; 746b - db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance +INCLUDE "data/events/happiness_chances.asm" CopyPokemonName_Buffer1_Buffer3: ; 746e ld hl, StringBuffer1 @@ -750,10 +749,17 @@ CopyPokemonName_Buffer1_Buffer3: ; 746e jp CopyBytes ``` +In [data/events/happiness_chances.asm](/data/events/happiness_chances.asm): + +```asm +HappinessData_DaisysGrooming: ; 746b + db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance +``` + **Fix:** ```asm -Data_DaisysGrooming: ; 746b +HappinessData_DaisysGrooming: ; 746b db $80, 2, HAPPINESS_GROOMING ; 50% chance db $ff, 2, HAPPINESS_GROOMING ; 50% chance ``` @@ -863,10 +869,10 @@ StartTrainerBattle_DetermineWhichAnimation: ; 8c365 (23:4365) jr nc, .okay set 0, e .okay - ld a, [wPermission] + ld a, [wEnvironment] cp CAVE jr z, .okay2 - cp PERM_5 + cp ENVIRONMENT_5 jr z, .okay2 cp DUNGEON jr z, .okay2 @@ -1268,11 +1274,11 @@ This is a bug with `PlacePartyMonEvoStoneCompatibility.DetermineCompatibility` i ld l, a ld de, StringBuffer1 ld a, BANK(EvosAttacks) - ld bc, $a + ld bc, 10 call FarCopyBytes ``` -**Fix:** Change `ld bc, $a` to `ld bc, $10` to support up to five Stone entries. +**Fix:** Change `ld bc, 10` to `ld bc, StringBuffer2 - StringBuffer1` to support up to six Stone entries. ## `ScriptCall` can overflow `wScriptStack` and crash @@ -1312,6 +1318,8 @@ ScriptCall: ret ``` +*To do:* Fix this bug. + ## `LoadSpriteGFX` does not limit the capacity of `UsedSprites` @@ -1425,7 +1433,8 @@ In [engine/events/bug_contest/contest_2.asm](/engine/events/bug_contest/contest_ CheckBugContestContestantFlag: ; 139ed ; Checks the flag of the Bug Catching Contestant whose index is loaded in a. -; Bug: If a >= 10 when this is called, it will read beyond the table. +; Bug: If a >= NUM_BUG_CONTESTANTS when this is called, +; it will read beyond the table. ld hl, BugCatchingContestantEventFlagTable ld e, a @@ -1440,20 +1449,11 @@ CheckBugContestContestantFlag: ; 139ed ret ; 139fe -BugCatchingContestantEventFlagTable: ; 139fe - dw EVENT_BUG_CATCHING_CONTESTANT_1A - dw EVENT_BUG_CATCHING_CONTESTANT_2A - dw EVENT_BUG_CATCHING_CONTESTANT_3A - dw EVENT_BUG_CATCHING_CONTESTANT_4A - dw EVENT_BUG_CATCHING_CONTESTANT_5A - dw EVENT_BUG_CATCHING_CONTESTANT_6A - dw EVENT_BUG_CATCHING_CONTESTANT_7A - dw EVENT_BUG_CATCHING_CONTESTANT_8A - dw EVENT_BUG_CATCHING_CONTESTANT_9A - dw EVENT_BUG_CATCHING_CONTESTANT_10A -; 13a12 +INCLUDE "data/events/bug_contest_flags.asm" ``` +However, `a < NUM_BUG_CONTESTANTS` should always be true, so in practice this is not a problem. + ## `ClearWRAM` only clears WRAM bank 1 diff --git a/engine/events/bug_contest/contest_2.asm b/engine/events/bug_contest/contest_2.asm index 56afefb72..fdc8e7586 100755 --- a/engine/events/bug_contest/contest_2.asm +++ b/engine/events/bug_contest/contest_2.asm @@ -59,7 +59,8 @@ SelectRandomBugContestContestants: ; 139a8 CheckBugContestContestantFlag: ; 139ed ; Checks the flag of the Bug Catching Contestant whose index is loaded in a. -; Bug: If a >= NUM_BUG_CONTESTANTS when this is called, it will read beyond the table. +; Bug: If a >= NUM_BUG_CONTESTANTS when this is called, +; it will read beyond the table. ld hl, BugCatchingContestantEventFlagTable ld e, a diff --git a/engine/party_menu.asm b/engine/party_menu.asm index a048eb5b7..a7b07debb 100644 --- a/engine/party_menu.asm +++ b/engine/party_menu.asm @@ -417,7 +417,7 @@ PlacePartyMonEvoStoneCompatibility: ; 5022f ld l, a ld de, StringBuffer1 ld a, BANK(EvosAttacks) - ld bc, $a + ld bc, 10 call FarCopyBytes ld hl, StringBuffer1 .loop2 From ee55ca8e72b49f9bc2aaaebc792e7ade46c754da Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 26 Jan 2018 14:53:00 -0500 Subject: [PATCH 054/135] G/S Scripting Compendium link --- docs/event_commands.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/event_commands.md b/docs/event_commands.md index 90e7864cb..8c6d96481 100644 --- a/docs/event_commands.md +++ b/docs/event_commands.md @@ -2,6 +2,8 @@ Defined in [macros/scripts/events.asm](/macros/scripts/events.asm) and [engine/scripting.asm:ScriptCommandTable](/engine/scripting.asm). +Until this document is filled out, the [G/S Scripting Compendium](https://hax.iimarckus.org/files/scriptingcodes_eng.htm) has descriptions for most of these commands. It was written for G/S binary hacking and not Crystal assembly hacking, so it's not 100% accurate for pokecrystal. + ## `$00`: scall script From ea480fa31e57dd2880de82f2bdc2116cbb4d205c Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 26 Jan 2018 20:57:55 -0500 Subject: [PATCH 055/135] Fix off-by-one error --- .../aerodactyl_word_room_collision.asm | 24 +- data/tilesets/battle_tower_collision.asm | 102 ++++----- .../battle_tower_outside_collision.asm | 78 +++---- data/tilesets/beta_word_room_collision.asm | 24 +- data/tilesets/cave_collision.asm | 108 ++++----- data/tilesets/champions_room_collision.asm | 112 +++++----- data/tilesets/dark_cave_collision.asm | 108 ++++----- data/tilesets/elite_four_room_collision.asm | 110 ++++----- data/tilesets/facility_collision.asm | 114 +++++----- data/tilesets/forest_collision.asm | 66 +++--- data/tilesets/game_corner_collision.asm | 76 +++---- data/tilesets/gate_collision.asm | 112 +++++----- data/tilesets/ho_oh_word_room_collision.asm | 24 +- data/tilesets/house_collision.asm | 94 ++++---- data/tilesets/ice_path_collision.asm | 124 +++++------ data/tilesets/johto_collision.asm | 202 ++++++++--------- data/tilesets/johto_modern_collision.asm | 190 ++++++++-------- data/tilesets/kabuto_word_room_collision.asm | 24 +- data/tilesets/kanto_collision.asm | 210 +++++++++--------- data/tilesets/lab_collision.asm | 72 +++--- data/tilesets/lighthouse_collision.asm | 104 ++++----- data/tilesets/mansion_collision.asm | 108 ++++----- data/tilesets/mart_collision.asm | 116 +++++----- data/tilesets/omanyte_word_room_collision.asm | 24 +- data/tilesets/park_collision.asm | 88 ++++---- data/tilesets/players_house_collision.asm | 78 +++---- data/tilesets/players_room_collision.asm | 46 ++-- data/tilesets/pokecenter_collision.asm | 110 ++++----- data/tilesets/pokecom_center_collision.asm | 78 +++---- data/tilesets/port_collision.asm | 108 ++++----- data/tilesets/radio_tower_collision.asm | 124 +++++------ data/tilesets/ruins_of_alph_collision.asm | 106 ++++----- data/tilesets/tower_collision.asm | 116 +++++----- data/tilesets/traditional_house_collision.asm | 114 +++++----- data/tilesets/train_station_collision.asm | 94 ++++---- data/tilesets/underground_collision.asm | 92 ++++---- data/tilesets/unused_dark_cave_collision.asm | 202 ++++++++--------- 37 files changed, 1841 insertions(+), 1841 deletions(-) diff --git a/data/tilesets/aerodactyl_word_room_collision.asm b/data/tilesets/aerodactyl_word_room_collision.asm index 138f07143..58bdacc53 100644 --- a/data/tilesets/aerodactyl_word_room_collision.asm +++ b/data/tilesets/aerodactyl_word_room_collision.asm @@ -1,4 +1,5 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 @@ -17,20 +18,20 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, WALL, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, WALL ; 1a - tilecoll WALL, FLOOR, WALL, FLOOR ; 1b - tilecoll FLOOR, WALL, FLOOR, WALL ; 1c - tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, WALL ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/battle_tower_collision.asm b/data/tilesets/battle_tower_collision.asm index 908fee326..97e09bf5d 100644 --- a/data/tilesets/battle_tower_collision.asm +++ b/data/tilesets/battle_tower_collision.asm @@ -1,64 +1,64 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll WALL, WALL, FLOOR, FLOOR ; 02 tilecoll WALL, WALL, FLOOR, FLOOR ; 03 - tilecoll WALL, WALL, FLOOR, FLOOR ; 04 - tilecoll WALL, DOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 07 - tilecoll WALL, WALL, FLOOR, FLOOR ; 08 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 09 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 0a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b - tilecoll WALL, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, DOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 06 + tilecoll WALL, WALL, FLOOR, FLOOR ; 07 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 08 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a + tilecoll WALL, WALL, FLOOR, FLOOR ; 0b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 - tilecoll DOOR, WALL, FLOOR, FLOOR ; 11 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 12 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, FLOOR, WALL, FLOOR ; 15 + tilecoll DOOR, WALL, FLOOR, FLOOR ; 10 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 11 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 12 + tilecoll WALL, WALL, WALL, WALL ; 13 + tilecoll WALL, FLOOR, WALL, FLOOR ; 14 + tilecoll FLOOR, WALL, FLOOR, WALL ; 15 tilecoll FLOOR, WALL, FLOOR, WALL ; 16 - tilecoll FLOOR, WALL, FLOOR, WALL ; 17 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 18 - tilecoll WALL, FLOOR, WALL, FLOOR ; 19 - tilecoll FLOOR, WALL, FLOOR, WALL ; 1a - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1b - tilecoll WALL, WALL, FLOOR, FLOOR ; 1c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 17 + tilecoll WALL, FLOOR, WALL, FLOOR ; 18 + tilecoll FLOOR, WALL, FLOOR, WALL ; 19 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1a + tilecoll WALL, WALL, FLOOR, FLOOR ; 1b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d tilecoll WALL, WALL, FLOOR, FLOOR ; 1e - tilecoll WALL, WALL, FLOOR, FLOOR ; 1f - tilecoll WALL, WALL, FLOOR, WALL ; 20 - tilecoll WALL, WALL, WALL, FLOOR ; 21 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 22 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 23 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 - tilecoll FLOOR, FLOOR, WALL, WALL ; 25 - tilecoll WALL, FLOOR, FLOOR, DOOR ; 26 + tilecoll WALL, WALL, FLOOR, WALL ; 1f + tilecoll WALL, WALL, WALL, FLOOR ; 20 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 21 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, WALL, WALL ; 24 + tilecoll WALL, FLOOR, FLOOR, DOOR ; 25 + tilecoll WALL, WALL, FLOOR, FLOOR ; 26 tilecoll WALL, WALL, FLOOR, FLOOR ; 27 - tilecoll WALL, WALL, FLOOR, FLOOR ; 28 - tilecoll WALL, PC, FLOOR, FLOOR ; 29 - tilecoll WALL, WALL, FLOOR, FLOOR ; 2a - tilecoll WALL, WALL, WALL, FLOOR ; 2b - tilecoll WALL, WALL, FLOOR, WALL ; 2c - tilecoll FLOOR, FLOOR, FLOOR, DOOR ; 2d - tilecoll FLOOR, FLOOR, DOOR, FLOOR ; 2e + tilecoll WALL, PC, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, FLOOR ; 29 + tilecoll WALL, WALL, WALL, FLOOR ; 2a + tilecoll WALL, WALL, FLOOR, WALL ; 2b + tilecoll FLOOR, FLOOR, FLOOR, DOOR ; 2c + tilecoll FLOOR, FLOOR, DOOR, FLOOR ; 2d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 35 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 - tilecoll WALL, WALL, FLOOR, WALL ; 37 - tilecoll WALL, WALL, WALL, FLOOR ; 38 - tilecoll WALL, WALL, FLOOR, WALL ; 39 - tilecoll WALL, WALL, WALL, WALL ; 3a - tilecoll WALL, WALL, WALL, FLOOR ; 3b - tilecoll WALL, WALL, WALL, WALL ; 3c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 + tilecoll WALL, WALL, FLOOR, WALL ; 36 + tilecoll WALL, WALL, WALL, FLOOR ; 37 + tilecoll WALL, WALL, FLOOR, WALL ; 38 + tilecoll WALL, WALL, WALL, WALL ; 39 + tilecoll WALL, WALL, WALL, FLOOR ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll WALL, WALL, FLOOR, WALL ; 3c tilecoll WALL, WALL, FLOOR, WALL ; 3d - tilecoll WALL, WALL, FLOOR, WALL ; 3e - tilecoll WALL, WALL, WALL, FLOOR ; 3f - tilecoll WALL, WALL, FLOOR, WALL ; 40 + tilecoll WALL, WALL, WALL, FLOOR ; 3e + tilecoll WALL, WALL, FLOOR, WALL ; 3f diff --git a/data/tilesets/battle_tower_outside_collision.asm b/data/tilesets/battle_tower_outside_collision.asm index 3aaa60113..03dec85bf 100644 --- a/data/tilesets/battle_tower_outside_collision.asm +++ b/data/tilesets/battle_tower_outside_collision.asm @@ -1,37 +1,38 @@ - tilecoll 01, 01, 01, 01 ; 01 + tilecoll 01, 01, 01, 01 ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, WALL, WALL ; 08 tilecoll WALL, WALL, WALL, WALL ; 09 tilecoll WALL, WALL, WALL, WALL ; 0a tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d - tilecoll FLOOR, WALL, WALL, WALL ; 0e + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c + tilecoll FLOOR, WALL, WALL, WALL ; 0d + tilecoll WALL, WALL, WALL, WALL ; 0e tilecoll WALL, WALL, WALL, WALL ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll WALL, WALL, FLOOR, FLOOR ; 11 - tilecoll WALL, WALL, FLOOR, WALL ; 12 - tilecoll WALL, WALL, DOOR, DOOR ; 13 - tilecoll WALL, WALL, WALL, FLOOR ; 14 - tilecoll WALL, WALL, FLOOR, FLOOR ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll WALL, WALL, DOOR, WALL ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 10 + tilecoll WALL, WALL, FLOOR, WALL ; 11 + tilecoll WALL, WALL, DOOR, DOOR ; 12 + tilecoll WALL, WALL, WALL, FLOOR ; 13 + tilecoll WALL, WALL, FLOOR, FLOOR ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, WALL, DOOR, WALL ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 tilecoll WALL, WALL, WALL, WALL ; 18 tilecoll WALL, WALL, WALL, WALL ; 19 tilecoll WALL, WALL, WALL, WALL ; 1a tilecoll WALL, WALL, WALL, WALL ; 1b - tilecoll WALL, WALL, WALL, WALL ; 1c - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 1d - tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 1e - tilecoll WALL, WALL, WALL, WALL ; 1f - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 20 - tilecoll FLOOR, FLOOR, WALL, WALL ; 21 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 22 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 1c + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 1f + tilecoll FLOOR, FLOOR, WALL, WALL ; 20 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 21 + tilecoll WALL, WALL, WALL, WALL ; 22 tilecoll WALL, WALL, WALL, WALL ; 23 tilecoll WALL, WALL, WALL, WALL ; 24 tilecoll WALL, WALL, WALL, WALL ; 25 @@ -42,18 +43,18 @@ tilecoll WALL, WALL, WALL, WALL ; 2a tilecoll WALL, WALL, WALL, WALL ; 2b tilecoll WALL, WALL, WALL, WALL ; 2c - tilecoll WALL, WALL, WALL, WALL ; 2d - tilecoll WALL, FLOOR, WALL, WALL ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll WALL, FLOOR, WALL, WALL ; 30 - tilecoll WALL, WALL, WALL, WALL ; 31 - tilecoll WALL, FLOOR, WALL, FLOOR ; 32 - tilecoll WALL, HEADBUTT_TREE, WALL, HEADBUTT_TREE ; 33 - tilecoll WALL, WALL, WALL, WALL ; 34 - tilecoll WHIRLPOOL, FLOOR, WHIRLPOOL, FLOOR ; 35 - tilecoll WHIRLPOOL, FLOOR, FLOOR, FLOOR ; 36 - tilecoll 5B, FLOOR, FLOOR, FLOOR ; 37 - tilecoll 5B, 01, FLOOR, FLOOR ; 38 + tilecoll WALL, FLOOR, WALL, WALL ; 2d + tilecoll WALL, WALL, WALL, WALL ; 2e + tilecoll WALL, FLOOR, WALL, WALL ; 2f + tilecoll WALL, WALL, WALL, WALL ; 30 + tilecoll WALL, FLOOR, WALL, FLOOR ; 31 + tilecoll WALL, HEADBUTT_TREE, WALL, HEADBUTT_TREE ; 32 + tilecoll WALL, WALL, WALL, WALL ; 33 + tilecoll WHIRLPOOL, FLOOR, WHIRLPOOL, FLOOR ; 34 + tilecoll WHIRLPOOL, FLOOR, FLOOR, FLOOR ; 35 + tilecoll 5B, FLOOR, FLOOR, FLOOR ; 36 + tilecoll 5B, 01, FLOOR, FLOOR ; 37 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b @@ -65,11 +66,11 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 41 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 42 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 43 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 44 + tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 44 tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 45 tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 46 tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 47 - tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 48 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 48 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 49 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4a tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4b @@ -125,4 +126,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 80 diff --git a/data/tilesets/beta_word_room_collision.asm b/data/tilesets/beta_word_room_collision.asm index 138f07143..58bdacc53 100644 --- a/data/tilesets/beta_word_room_collision.asm +++ b/data/tilesets/beta_word_room_collision.asm @@ -1,4 +1,5 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 @@ -17,20 +18,20 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, WALL, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, WALL ; 1a - tilecoll WALL, FLOOR, WALL, FLOOR ; 1b - tilecoll FLOOR, WALL, FLOOR, WALL ; 1c - tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, WALL ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/cave_collision.asm b/data/tilesets/cave_collision.asm index 3d5e0ae05..18f9b805a 100644 --- a/data/tilesets/cave_collision.asm +++ b/data/tilesets/cave_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 - tilecoll WALL, UP_WALL, WALL, FLOOR ; 05 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06 - tilecoll UP_WALL, WALL, FLOOR, WALL ; 07 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08 - tilecoll WALL, FLOOR, WALL, FLOOR ; 09 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a - tilecoll FLOOR, WALL, FLOOR, WALL ; 0b - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0c - tilecoll WALL, FLOOR, WALL, WALL ; 0d - tilecoll FLOOR, FLOOR, WALL, WALL ; 0e - tilecoll FLOOR, WALL, WALL, WALL ; 0f - tilecoll WATER, WATER, WATER, WATER ; 10 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 04 + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 05 + tilecoll UP_WALL, WALL, FLOOR, WALL ; 06 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 07 + tilecoll WALL, FLOOR, WALL, FLOOR ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll FLOOR, WALL, FLOOR, WALL ; 0a + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0b + tilecoll WALL, FLOOR, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, WALL, WALL, WALL ; 0e + tilecoll WATER, WATER, WATER, WATER ; 0f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 10 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 11 tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13 - tilecoll FLOOR, FLOOR, WALL, CAVE ; 14 + tilecoll FLOOR, FLOOR, WALL, CAVE ; 13 + tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 14 tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 15 - tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 16 - tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 17 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, WALL, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, FLOOR ; 1a - tilecoll WALL, WALL, FLOOR, WALL ; 1b - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1c - tilecoll WALL, FLOOR, WALL, FLOOR ; 1d - tilecoll WALL, WALL, WALL, WALL ; 1e - tilecoll FLOOR, WALL, FLOOR, WALL ; 1f - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 20 - tilecoll WALL, FLOOR, WALL, WALL ; 21 - tilecoll FLOOR, FLOOR, WALL, WALL ; 22 - tilecoll FLOOR, WALL, WALL, WALL ; 23 - tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 24 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25 + tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 16 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, WALL, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, FLOOR, WALL ; 1a + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d + tilecoll FLOOR, WALL, FLOOR, WALL ; 1e + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1f + tilecoll WALL, FLOOR, WALL, WALL ; 20 + tilecoll FLOOR, FLOOR, WALL, WALL ; 21 + tilecoll FLOOR, WALL, WALL, WALL ; 22 + tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 24 + tilecoll WATER, WATER, WATER, WATER ; 25 tilecoll WATER, WATER, WATER, WATER ; 26 tilecoll WATER, WATER, WATER, WATER ; 27 - tilecoll WATER, WATER, WATER, WATER ; 28 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2b - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c - tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 28 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 29 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2a + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2b + tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d tilecoll WALL, WALL, WALL, WALL ; 2e tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll WALL, WALL, WALL, WALL ; 30 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 31 - tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 30 + tilecoll WALL, WALL, WALL, WALL ; 31 + tilecoll WATER, WATER, WATER, WATER ; 32 tilecoll WATER, WATER, WATER, WATER ; 33 - tilecoll WATER, WATER, WATER, WATER ; 34 - tilecoll WALL, WALL, WALL, WALL ; 35 + tilecoll WALL, WALL, WALL, WALL ; 34 + tilecoll FLOOR, WALL, FLOOR, WALL ; 35 tilecoll FLOOR, WALL, FLOOR, WALL ; 36 - tilecoll FLOOR, WALL, FLOOR, WALL ; 37 - tilecoll WALL, WALL, WALL, CAVE ; 38 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 39 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 3a - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3b - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3c - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3d + tilecoll WALL, WALL, WALL, CAVE ; 37 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 38 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 39 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3a + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3b + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3c + tilecoll WATER, WATER, WATER, WATER ; 3d tilecoll WATER, WATER, WATER, WATER ; 3e - tilecoll WATER, WATER, WATER, WATER ; 3f - tilecoll FLOOR, FLOOR, PIT, FLOOR ; 40 + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 3f diff --git a/data/tilesets/champions_room_collision.asm b/data/tilesets/champions_room_collision.asm index 351f76f61..bb3201d0d 100644 --- a/data/tilesets/champions_room_collision.asm +++ b/data/tilesets/champions_room_collision.asm @@ -1,64 +1,64 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, FLOOR, WALL ; 02 - tilecoll WALL, WALL, WALL, FLOOR ; 03 - tilecoll FLOOR, FLOOR, WALL, WALL ; 04 - tilecoll WALL, WALL, WALL, WALL ; 05 - tilecoll WALL, WALL, COUNTER, FLOOR ; 06 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 07 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 08 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 09 - tilecoll WALL, FLOOR, FLOOR, WALL ; 0a - tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll WALL, WALL, LADDER, LADDER ; 0c - tilecoll WALL, WALL, FLOOR, FLOOR ; 0d - tilecoll WALL, WALL, WALL, WALL ; 0e - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 - tilecoll WALL, WALL, WALL, FLOOR ; 12 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll WALL, WALL, FLOOR, WALL ; 14 - tilecoll WALL, FLOOR, WALL, WALL ; 15 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16 - tilecoll FLOOR, FLOOR, WALL, WALL ; 17 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, FLOOR, WALL, FLOOR ; 19 - tilecoll FLOOR, WALL, FLOOR, WALL ; 1a - tilecoll WALL, FLOOR, WALL, FLOOR ; 1b - tilecoll FLOOR, WALL, FLOOR, WALL ; 1c - tilecoll WALL, UP_WALL, WALL, FLOOR ; 1d - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 1e - tilecoll UP_WALL, WALL, FLOOR, WALL ; 1f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20 - tilecoll WALL, FLOOR, WALL, WALL ; 21 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 - tilecoll FLOOR, WALL, WALL, WALL ; 23 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 24 - tilecoll WALL, FLOOR, WALL, FLOOR ; 25 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll WALL, WALL, FLOOR, WALL ; 01 + tilecoll WALL, WALL, WALL, FLOOR ; 02 + tilecoll FLOOR, FLOOR, WALL, WALL ; 03 + tilecoll WALL, WALL, WALL, WALL ; 04 + tilecoll WALL, WALL, COUNTER, FLOOR ; 05 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 06 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 07 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 08 + tilecoll WALL, FLOOR, FLOOR, WALL ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll WALL, WALL, LADDER, LADDER ; 0b + tilecoll WALL, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, WALL, WALL, WALL ; 0d + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 + tilecoll WALL, WALL, WALL, FLOOR ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 + tilecoll WALL, WALL, FLOOR, WALL ; 13 + tilecoll WALL, FLOOR, WALL, WALL ; 14 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15 + tilecoll FLOOR, FLOOR, WALL, WALL ; 16 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, FLOOR, WALL, FLOOR ; 18 + tilecoll FLOOR, WALL, FLOOR, WALL ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll WALL, UP_WALL, WALL, FLOOR ; 1c + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 1d + tilecoll UP_WALL, WALL, FLOOR, WALL ; 1e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f + tilecoll WALL, FLOOR, WALL, WALL ; 20 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 + tilecoll FLOOR, WALL, WALL, WALL ; 22 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 23 + tilecoll WALL, FLOOR, WALL, FLOOR ; 24 + tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 - tilecoll WALL, WALL, WALL, WALL ; 27 - tilecoll FLOOR, WALL, FLOOR, WALL ; 28 + tilecoll FLOOR, WALL, FLOOR, WALL ; 27 + tilecoll WALL, WALL, WALL, WALL ; 28 tilecoll WALL, WALL, WALL, WALL ; 29 tilecoll WALL, WALL, WALL, WALL ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, WALL, WALL ; 2c + tilecoll FLOOR, FLOOR, WALL, WALL ; 2b + tilecoll WALL, WALL, WALL, WALL ; 2c tilecoll WALL, WALL, WALL, WALL ; 2d tilecoll WALL, WALL, WALL, WALL ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll WALL, FLOOR, WALL, FLOOR ; 30 - tilecoll FLOOR, WALL, FLOOR, WALL ; 31 + tilecoll WALL, FLOOR, WALL, FLOOR ; 2f + tilecoll FLOOR, WALL, FLOOR, WALL ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 - tilecoll WALL, WALL, FLOOR, FLOOR ; 34 - tilecoll FLOOR, FLOOR, WALL, WALL ; 35 - tilecoll WALL, FLOOR, WALL, FLOOR ; 36 - tilecoll FLOOR, WALL, FLOOR, WALL ; 37 - tilecoll FLOOR, WALL, WALL, WALL ; 38 - tilecoll WALL, FLOOR, WALL, FLOOR ; 39 - tilecoll FLOOR, WALL, FLOOR, WALL ; 3a + tilecoll WALL, WALL, FLOOR, FLOOR ; 33 + tilecoll FLOOR, FLOOR, WALL, WALL ; 34 + tilecoll WALL, FLOOR, WALL, FLOOR ; 35 + tilecoll FLOOR, WALL, FLOOR, WALL ; 36 + tilecoll FLOOR, WALL, WALL, WALL ; 37 + tilecoll WALL, FLOOR, WALL, FLOOR ; 38 + tilecoll FLOOR, WALL, FLOOR, WALL ; 39 + tilecoll WALL, WALL, WALL, WALL ; 3a tilecoll WALL, WALL, WALL, WALL ; 3b - tilecoll WALL, WALL, WALL, WALL ; 3c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e - tilecoll WALL, FLOOR, WALL, WALL ; 3f - tilecoll FLOOR, WALL, WALL, WALL ; 40 + tilecoll WALL, FLOOR, WALL, WALL ; 3e + tilecoll FLOOR, WALL, WALL, WALL ; 3f diff --git a/data/tilesets/dark_cave_collision.asm b/data/tilesets/dark_cave_collision.asm index 3d5e0ae05..18f9b805a 100644 --- a/data/tilesets/dark_cave_collision.asm +++ b/data/tilesets/dark_cave_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 - tilecoll WALL, UP_WALL, WALL, FLOOR ; 05 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06 - tilecoll UP_WALL, WALL, FLOOR, WALL ; 07 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08 - tilecoll WALL, FLOOR, WALL, FLOOR ; 09 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a - tilecoll FLOOR, WALL, FLOOR, WALL ; 0b - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0c - tilecoll WALL, FLOOR, WALL, WALL ; 0d - tilecoll FLOOR, FLOOR, WALL, WALL ; 0e - tilecoll FLOOR, WALL, WALL, WALL ; 0f - tilecoll WATER, WATER, WATER, WATER ; 10 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 04 + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 05 + tilecoll UP_WALL, WALL, FLOOR, WALL ; 06 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 07 + tilecoll WALL, FLOOR, WALL, FLOOR ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll FLOOR, WALL, FLOOR, WALL ; 0a + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0b + tilecoll WALL, FLOOR, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, WALL, WALL, WALL ; 0e + tilecoll WATER, WATER, WATER, WATER ; 0f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 10 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 11 tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13 - tilecoll FLOOR, FLOOR, WALL, CAVE ; 14 + tilecoll FLOOR, FLOOR, WALL, CAVE ; 13 + tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 14 tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 15 - tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 16 - tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 17 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, WALL, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, FLOOR ; 1a - tilecoll WALL, WALL, FLOOR, WALL ; 1b - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1c - tilecoll WALL, FLOOR, WALL, FLOOR ; 1d - tilecoll WALL, WALL, WALL, WALL ; 1e - tilecoll FLOOR, WALL, FLOOR, WALL ; 1f - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 20 - tilecoll WALL, FLOOR, WALL, WALL ; 21 - tilecoll FLOOR, FLOOR, WALL, WALL ; 22 - tilecoll FLOOR, WALL, WALL, WALL ; 23 - tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 24 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25 + tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 16 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, WALL, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, FLOOR, WALL ; 1a + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d + tilecoll FLOOR, WALL, FLOOR, WALL ; 1e + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1f + tilecoll WALL, FLOOR, WALL, WALL ; 20 + tilecoll FLOOR, FLOOR, WALL, WALL ; 21 + tilecoll FLOOR, WALL, WALL, WALL ; 22 + tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 24 + tilecoll WATER, WATER, WATER, WATER ; 25 tilecoll WATER, WATER, WATER, WATER ; 26 tilecoll WATER, WATER, WATER, WATER ; 27 - tilecoll WATER, WATER, WATER, WATER ; 28 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2b - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c - tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 28 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 29 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2a + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2b + tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d tilecoll WALL, WALL, WALL, WALL ; 2e tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll WALL, WALL, WALL, WALL ; 30 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 31 - tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 30 + tilecoll WALL, WALL, WALL, WALL ; 31 + tilecoll WATER, WATER, WATER, WATER ; 32 tilecoll WATER, WATER, WATER, WATER ; 33 - tilecoll WATER, WATER, WATER, WATER ; 34 - tilecoll WALL, WALL, WALL, WALL ; 35 + tilecoll WALL, WALL, WALL, WALL ; 34 + tilecoll FLOOR, WALL, FLOOR, WALL ; 35 tilecoll FLOOR, WALL, FLOOR, WALL ; 36 - tilecoll FLOOR, WALL, FLOOR, WALL ; 37 - tilecoll WALL, WALL, WALL, CAVE ; 38 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 39 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 3a - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3b - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3c - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3d + tilecoll WALL, WALL, WALL, CAVE ; 37 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 38 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 39 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3a + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3b + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3c + tilecoll WATER, WATER, WATER, WATER ; 3d tilecoll WATER, WATER, WATER, WATER ; 3e - tilecoll WATER, WATER, WATER, WATER ; 3f - tilecoll FLOOR, FLOOR, PIT, FLOOR ; 40 + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 3f diff --git a/data/tilesets/elite_four_room_collision.asm b/data/tilesets/elite_four_room_collision.asm index cc0b705f3..59b5d223e 100644 --- a/data/tilesets/elite_four_room_collision.asm +++ b/data/tilesets/elite_four_room_collision.asm @@ -1,64 +1,64 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 04 - tilecoll WALL, WALL, WALL, FLOOR ; 05 - tilecoll WALL, WALL, FLOOR, FLOOR ; 06 - tilecoll WALL, WALL, FLOOR, WALL ; 07 - tilecoll WALL, WALL, WALL, WALL ; 08 - tilecoll WALL, FLOOR, WALL, FLOOR ; 09 - tilecoll FLOOR, FLOOR, PIT, FLOOR ; 0a - tilecoll FLOOR, WALL, FLOOR, WALL ; 0b - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0c - tilecoll WALL, FLOOR, WALL, WALL ; 0d - tilecoll FLOOR, FLOOR, WALL, WALL ; 0e - tilecoll FLOOR, WALL, WALL, WALL ; 0f - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10 - tilecoll WALL, FLOOR, WALL, FLOOR ; 11 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 12 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14 - tilecoll WALL, WALL, WALL, WALL ; 15 - tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll LADDER, LADDER, FLOOR, FLOOR ; 17 - tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 03 + tilecoll WALL, WALL, WALL, FLOOR ; 04 + tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll WALL, WALL, FLOOR, WALL ; 06 + tilecoll WALL, WALL, WALL, WALL ; 07 + tilecoll WALL, FLOOR, WALL, FLOOR ; 08 + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 09 + tilecoll FLOOR, WALL, FLOOR, WALL ; 0a + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0b + tilecoll WALL, FLOOR, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, WALL, WALL, WALL ; 0e + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0f + tilecoll WALL, FLOOR, WALL, FLOOR ; 10 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 13 + tilecoll WALL, WALL, WALL, WALL ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll LADDER, LADDER, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 + tilecoll FLOOR, FLOOR, WALL, WALL ; 18 tilecoll FLOOR, FLOOR, WALL, WALL ; 19 - tilecoll FLOOR, FLOOR, WALL, WALL ; 1a - tilecoll FLOOR, WALL, FLOOR, WALL ; 1b - tilecoll WALL, FLOOR, WALL, WALL ; 1c - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1d - tilecoll WALL, FLOOR, WALL, FLOOR ; 1e - tilecoll FLOOR, WALL, FLOOR, WALL ; 1f - tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, FLOOR, WALL, FLOOR ; 21 + tilecoll FLOOR, WALL, FLOOR, WALL ; 1a + tilecoll WALL, FLOOR, WALL, WALL ; 1b + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1c + tilecoll WALL, FLOOR, WALL, FLOOR ; 1d + tilecoll FLOOR, WALL, FLOOR, WALL ; 1e + tilecoll WALL, WALL, WALL, WALL ; 1f + tilecoll WALL, FLOOR, WALL, FLOOR ; 20 + tilecoll WALL, WALL, FLOOR, FLOOR ; 21 tilecoll WALL, WALL, FLOOR, FLOOR ; 22 tilecoll WALL, WALL, FLOOR, FLOOR ; 23 - tilecoll WALL, WALL, FLOOR, FLOOR ; 24 - tilecoll WALL, WALL, WALL, WALL ; 25 - tilecoll FLOOR, WALL, FLOOR, WALL ; 26 - tilecoll WALL, FLOOR, WALL, FLOOR ; 27 - tilecoll WALL, WALL, WALL, WALL ; 28 + tilecoll WALL, WALL, WALL, WALL ; 24 + tilecoll FLOOR, WALL, FLOOR, WALL ; 25 + tilecoll WALL, FLOOR, WALL, FLOOR ; 26 + tilecoll WALL, WALL, WALL, WALL ; 27 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 28 tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 29 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2a tilecoll WALL, WALL, WALL, WALL ; 2b tilecoll WALL, WALL, WALL, WALL ; 2c - tilecoll WALL, WALL, WALL, WALL ; 2d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e - tilecoll ICE, ICE, ICE, FLOOR ; 2f - tilecoll ICE, ICE, FLOOR, ICE ; 30 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 31 - tilecoll FLOOR, ICE, ICE, ICE ; 32 - tilecoll ICE, FLOOR, ICE, ICE ; 33 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d + tilecoll ICE, ICE, ICE, FLOOR ; 2e + tilecoll ICE, ICE, FLOOR, ICE ; 2f + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 30 + tilecoll FLOOR, ICE, ICE, ICE ; 31 + tilecoll ICE, FLOOR, ICE, ICE ; 32 + tilecoll WALL, WALL, FLOOR, FLOOR ; 33 tilecoll WALL, WALL, FLOOR, FLOOR ; 34 - tilecoll WALL, WALL, FLOOR, FLOOR ; 35 - tilecoll ICE, WALL, ICE, WALL ; 36 - tilecoll WALL, ICE, WALL, ICE ; 37 - tilecoll WALL, WALL, WALL, WALL ; 38 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 - tilecoll ICE, ICE, ICE, ICE ; 3a - tilecoll WALL, FLOOR, FLOOR, WALL ; 3b - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c - tilecoll DOOR, DOOR, FLOOR, FLOOR ; 3d - tilecoll WALL, FLOOR, WALL, FLOOR ; 3e + tilecoll ICE, WALL, ICE, WALL ; 35 + tilecoll WALL, ICE, WALL, ICE ; 36 + tilecoll WALL, WALL, WALL, WALL ; 37 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 + tilecoll ICE, ICE, ICE, ICE ; 39 + tilecoll WALL, FLOOR, FLOOR, WALL ; 3a + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3b + tilecoll DOOR, DOOR, FLOOR, FLOOR ; 3c + tilecoll WALL, FLOOR, WALL, FLOOR ; 3d + tilecoll WALL, WALL, WALL, WALL ; 3e tilecoll WALL, WALL, WALL, WALL ; 3f - tilecoll WALL, WALL, WALL, WALL ; 40 diff --git a/data/tilesets/facility_collision.asm b/data/tilesets/facility_collision.asm index eb5cd8f33..781618c25 100644 --- a/data/tilesets/facility_collision.asm +++ b/data/tilesets/facility_collision.asm @@ -1,64 +1,64 @@ - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll WALL, WALL, FLOOR, FLOOR ; 02 - tilecoll WALL, WALL, WALL, WALL ; 03 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 + tilecoll WALL, WALL, FLOOR, FLOOR ; 01 + tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 04 tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 05 - tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 06 - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 07 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 - tilecoll WALL, WALL, FLOOR, FLOOR ; 09 - tilecoll WALL, WALL, WALL, FLOOR ; 0a - tilecoll WALL, WALL, FLOOR, WALL ; 0b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d - tilecoll WALL, FLOOR, WALL, FLOOR ; 0e - tilecoll FLOOR, WALL, FLOOR, WALL ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11 - tilecoll FLOOR, FLOOR, WALL, WALL ; 12 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 06 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, WALL, FLOOR ; 09 + tilecoll WALL, WALL, FLOOR, WALL ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c + tilecoll WALL, FLOOR, WALL, FLOOR ; 0d + tilecoll FLOOR, WALL, FLOOR, WALL ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 10 + tilecoll FLOOR, FLOOR, WALL, WALL ; 11 + tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15 - tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, WALL, WALL ; 16 tilecoll WALL, WALL, WALL, WALL ; 17 - tilecoll WALL, WALL, WALL, WALL ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll WALL, WALL, WALL, FLOOR ; 1b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c - tilecoll WALL, FLOOR, WALL, FLOOR ; 1d - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 1e - tilecoll WALL, WALL, FLOOR, COUNTER ; 1f - tilecoll WALL, WALL, FLOOR, FLOOR ; 20 - tilecoll FLOOR, FLOOR, WALL, WALL ; 21 - tilecoll WALL, WALL, WALL, FLOOR ; 22 - tilecoll WALL, FLOOR, WALL, FLOOR ; 23 - tilecoll WALL, FLOOR, WALL, WALL ; 24 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 25 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 26 - tilecoll FLOOR, FLOOR, WALL, WALL ; 27 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, WALL, WALL ; 19 + tilecoll WALL, WALL, WALL, FLOOR ; 1a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1c + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 1d + tilecoll WALL, WALL, FLOOR, COUNTER ; 1e + tilecoll WALL, WALL, FLOOR, FLOOR ; 1f + tilecoll FLOOR, FLOOR, WALL, WALL ; 20 + tilecoll WALL, WALL, WALL, FLOOR ; 21 + tilecoll WALL, FLOOR, WALL, FLOOR ; 22 + tilecoll WALL, FLOOR, WALL, WALL ; 23 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 24 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 25 + tilecoll FLOOR, FLOOR, WALL, WALL ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 + tilecoll WALL, WALL, FLOOR, FLOOR ; 28 tilecoll WALL, WALL, FLOOR, FLOOR ; 29 - tilecoll WALL, WALL, FLOOR, FLOOR ; 2a - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2b - tilecoll WALL, FLOOR, WALL, FLOOR ; 2c - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2d - tilecoll WALL, WALL, FLOOR, FLOOR ; 2e + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a + tilecoll WALL, FLOOR, WALL, FLOOR ; 2b + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d + tilecoll WALL, FLOOR, WALL, FLOOR ; 2e tilecoll WALL, FLOOR, WALL, FLOOR ; 2f - tilecoll WALL, FLOOR, WALL, FLOOR ; 30 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 32 - tilecoll WALL, WALL, FLOOR, FLOOR ; 33 - tilecoll FLOOR, WALL, FLOOR, WALL ; 34 - tilecoll FLOOR, FLOOR, WALL, WALL ; 35 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 31 + tilecoll WALL, WALL, FLOOR, FLOOR ; 32 + tilecoll FLOOR, WALL, FLOOR, WALL ; 33 + tilecoll FLOOR, FLOOR, WALL, WALL ; 34 + tilecoll WALL, WALL, FLOOR, FLOOR ; 35 tilecoll WALL, WALL, FLOOR, FLOOR ; 36 - tilecoll WALL, WALL, FLOOR, FLOOR ; 37 + tilecoll FLOOR, WALL, FLOOR, WALL ; 37 tilecoll FLOOR, WALL, FLOOR, WALL ; 38 - tilecoll FLOOR, WALL, FLOOR, WALL ; 39 - tilecoll WALL, WALL, FLOOR, FLOOR ; 3a - tilecoll FLOOR, WALL, WALL, WALL ; 3b - tilecoll WALL, WALL, FLOOR, WALL ; 3c - tilecoll WALL, WALL, WALL, FLOOR ; 3d - tilecoll WALL, WALL, FLOOR, WALL ; 3e - tilecoll WALL, FLOOR, WALL, WALL ; 3f - tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 40 + tilecoll WALL, WALL, FLOOR, FLOOR ; 39 + tilecoll FLOOR, WALL, WALL, WALL ; 3a + tilecoll WALL, WALL, FLOOR, WALL ; 3b + tilecoll WALL, WALL, WALL, FLOOR ; 3c + tilecoll WALL, WALL, FLOOR, WALL ; 3d + tilecoll WALL, FLOOR, WALL, WALL ; 3e + tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 3f diff --git a/data/tilesets/forest_collision.asm b/data/tilesets/forest_collision.asm index 70cc72ff1..0b9aa78bb 100644 --- a/data/tilesets/forest_collision.asm +++ b/data/tilesets/forest_collision.asm @@ -1,43 +1,44 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll WATER, WATER, WATER, WATER ; 02 tilecoll WATER, WATER, WATER, WATER ; 03 - tilecoll WATER, WATER, WATER, WATER ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 07 - tilecoll WATER, WATER, WATER, WATER ; 08 - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 09 - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 06 + tilecoll WATER, WATER, WATER, WATER ; 07 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 08 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 09 + tilecoll WATER, WATER, WATER, WATER ; 0a tilecoll WATER, WATER, WATER, WATER ; 0b - tilecoll WATER, WATER, WATER, WATER ; 0c - tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 0d - tilecoll WATER, WATER, WATER, WATER ; 0e - tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 0f - tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 10 - tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 11 - tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 12 - tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 13 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14 - tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 15 - tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 16 - tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 17 - tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 18 - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 19 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 1a - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1b - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 1c - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 1d + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 0c + tilecoll WATER, WATER, WATER, WATER ; 0d + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 0e + tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 0f + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 10 + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 11 + tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 12 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 13 + tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 14 + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 15 + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 16 + tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 17 + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 18 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 19 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1a + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 1b + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f - tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 21 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 20 + tilecoll WALL, WALL, WALL, WALL ; 21 tilecoll WALL, WALL, WALL, WALL ; 22 tilecoll WALL, WALL, WALL, WALL ; 23 - tilecoll WALL, WALL, WALL, WALL ; 24 - tilecoll WALL, WALL, WALL, DOOR ; 25 + tilecoll WALL, WALL, WALL, DOOR ; 24 + tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 tilecoll WALL, WALL, WALL, WALL ; 27 - tilecoll WALL, WALL, WALL, WALL ; 28 + tilecoll WALL, FLOOR, WALL, FLOOR ; 28 tilecoll WALL, FLOOR, WALL, FLOOR ; 29 tilecoll WALL, FLOOR, WALL, FLOOR ; 2a tilecoll WALL, FLOOR, WALL, FLOOR ; 2b @@ -61,4 +62,3 @@ tilecoll WALL, FLOOR, WALL, FLOOR ; 3d tilecoll WALL, FLOOR, WALL, FLOOR ; 3e tilecoll WALL, FLOOR, WALL, FLOOR ; 3f - tilecoll WALL, FLOOR, WALL, FLOOR ; 40 diff --git a/data/tilesets/game_corner_collision.asm b/data/tilesets/game_corner_collision.asm index 65b99cf54..9bcc3feb4 100644 --- a/data/tilesets/game_corner_collision.asm +++ b/data/tilesets/game_corner_collision.asm @@ -1,52 +1,53 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll WALL, WALL, FLOOR, FLOOR ; 03 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll WALL, WALL, FLOOR, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll WALL, WALL, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 - tilecoll COUNTER, COUNTER, COUNTER, COUNTER ; 08 + tilecoll COUNTER, COUNTER, COUNTER, COUNTER ; 07 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 08 tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 09 tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0a - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d - tilecoll WALL, WALL, FLOOR, FLOOR ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c + tilecoll WALL, WALL, FLOOR, FLOOR ; 0d + tilecoll WALL, WALL, WALL, WALL ; 0e tilecoll WALL, WALL, WALL, WALL ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 + tilecoll WALL, WALL, COUNTER, COUNTER ; 10 tilecoll WALL, WALL, COUNTER, COUNTER ; 11 - tilecoll WALL, WALL, COUNTER, COUNTER ; 12 - tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, COUNTER, FLOOR ; 14 - tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 17 - tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 18 - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 19 + tilecoll WALL, WALL, WALL, WALL ; 12 + tilecoll WALL, WALL, COUNTER, FLOOR ; 13 + tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 16 + tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 17 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 18 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b - tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 1c - tilecoll WALL, WALL, FLOOR, COUNTER ; 1d - tilecoll FLOOR, WALL, FLOOR, WALL ; 1e - tilecoll WALL, FLOOR, WALL, FLOOR ; 1f - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 20 + tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 1b + tilecoll WALL, WALL, FLOOR, COUNTER ; 1c + tilecoll FLOOR, WALL, FLOOR, WALL ; 1d + tilecoll WALL, FLOOR, WALL, FLOOR ; 1e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1f + tilecoll WALL, WALL, WALL, WALL ; 20 tilecoll WALL, WALL, WALL, WALL ; 21 tilecoll WALL, WALL, WALL, WALL ; 22 tilecoll WALL, WALL, WALL, WALL ; 23 tilecoll WALL, WALL, WALL, WALL ; 24 tilecoll WALL, WALL, WALL, WALL ; 25 - tilecoll WALL, WALL, WALL, WALL ; 26 - tilecoll WALL, WALL, FLOOR, FLOOR ; 27 - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 28 - tilecoll WALL, WALL, FLOOR, FLOOR ; 29 - tilecoll WALL, WALL, FLOOR, WALL ; 2a - tilecoll WALL, FLOOR, WALL, FLOOR ; 2b - tilecoll WALL, WALL, FLOOR, WALL ; 2c - tilecoll FLOOR, FLOOR, WALL, WALL ; 2d + tilecoll WALL, WALL, FLOOR, FLOOR ; 26 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 27 + tilecoll WALL, WALL, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, WALL ; 29 + tilecoll WALL, FLOOR, WALL, FLOOR ; 2a + tilecoll WALL, WALL, FLOOR, WALL ; 2b + tilecoll FLOOR, FLOOR, WALL, WALL ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d tilecoll WALL, WALL, WALL, WALL ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll WALL, WALL, FLOOR, WALL ; 30 - tilecoll WALL, WALL, WALL, FLOOR ; 31 + tilecoll WALL, WALL, FLOOR, WALL ; 2f + tilecoll WALL, WALL, WALL, FLOOR ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/gate_collision.asm b/data/tilesets/gate_collision.asm index 54cd95d34..1a7501f4c 100644 --- a/data/tilesets/gate_collision.asm +++ b/data/tilesets/gate_collision.asm @@ -1,64 +1,64 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll WALL, WALL, FLOOR, FLOOR ; 03 - tilecoll WALL, WALL, WALL, WALL ; 04 - tilecoll DOOR, DOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll WALL, WALL, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, WALL, WALL ; 03 + tilecoll DOOR, DOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll WALL, WALL, FLOOR, FLOOR ; 06 tilecoll WALL, WALL, FLOOR, FLOOR ; 07 - tilecoll WALL, WALL, FLOOR, FLOOR ; 08 - tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 09 - tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 0a - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0c - tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 0d - tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 0e - tilecoll WALL, WALL, COUNTER, FLOOR ; 0f - tilecoll WALL, WALL, FLOOR, COUNTER ; 10 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 11 + tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 08 + tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 09 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0a + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0b + tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 0c + tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 0d + tilecoll WALL, WALL, COUNTER, FLOOR ; 0e + tilecoll WALL, WALL, FLOOR, COUNTER ; 0f + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 10 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 11 tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 12 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 13 - tilecoll WALL, WALL, FLOOR, COUNTER ; 14 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, COUNTER ; 13 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 - tilecoll FLOOR, FLOOR, WALL, WALL ; 1a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d - tilecoll WALL, WALL, FLOOR, FLOOR ; 1e + tilecoll FLOOR, FLOOR, WALL, WALL ; 19 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 22 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 24 - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 25 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 26 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 27 - tilecoll WALL, WALL, WALL, WALL ; 28 - tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 29 - tilecoll WALL, DOOR, FLOOR, FLOOR ; 2a - tilecoll DOOR, WALL, FLOOR, FLOOR ; 2b - tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2c - tilecoll WALL, WALL, FLOOR, PC ; 2d - tilecoll WALL, WALL, FLOOR, FLOOR ; 2e - tilecoll DOOR, WALL, FLOOR, FLOOR ; 2f - tilecoll WALL, WALL, FLOOR, FLOOR ; 30 - tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 31 - tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 32 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 33 - tilecoll COUNTER, FLOOR, FLOOR, WALL ; 34 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 35 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 23 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 24 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 26 + tilecoll WALL, WALL, WALL, WALL ; 27 + tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 28 + tilecoll WALL, DOOR, FLOOR, FLOOR ; 29 + tilecoll DOOR, WALL, FLOOR, FLOOR ; 2a + tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2b + tilecoll WALL, WALL, FLOOR, PC ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d + tilecoll DOOR, WALL, FLOOR, FLOOR ; 2e + tilecoll WALL, WALL, FLOOR, FLOOR ; 2f + tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 30 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 31 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 32 + tilecoll COUNTER, FLOOR, FLOOR, WALL ; 33 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 - tilecoll WALL, FLOOR, WALL, FLOOR ; 39 - tilecoll WALL, WALL, WALL, WALL ; 3a - tilecoll FLOOR, WALL, FLOOR, WALL ; 3b - tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 3c - tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 3d - tilecoll WALL, WALL, FLOOR, FLOOR ; 3e - tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 3f - tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 40 + tilecoll WALL, FLOOR, WALL, FLOOR ; 38 + tilecoll WALL, WALL, WALL, WALL ; 39 + tilecoll FLOOR, WALL, FLOOR, WALL ; 3a + tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 3b + tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 3c + tilecoll WALL, WALL, FLOOR, FLOOR ; 3d + tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 3e + tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 3f diff --git a/data/tilesets/ho_oh_word_room_collision.asm b/data/tilesets/ho_oh_word_room_collision.asm index 138f07143..58bdacc53 100644 --- a/data/tilesets/ho_oh_word_room_collision.asm +++ b/data/tilesets/ho_oh_word_room_collision.asm @@ -1,4 +1,5 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 @@ -17,20 +18,20 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, WALL, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, WALL ; 1a - tilecoll WALL, FLOOR, WALL, FLOOR ; 1b - tilecoll FLOOR, WALL, FLOOR, WALL ; 1c - tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, WALL ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/house_collision.asm b/data/tilesets/house_collision.asm index ae5580782..7c7f3fca5 100644 --- a/data/tilesets/house_collision.asm +++ b/data/tilesets/house_collision.asm @@ -1,54 +1,55 @@ - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 02 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 03 - tilecoll WALL, WALL, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 05 - tilecoll WALL, WINDOW, FLOOR, FLOOR ; 06 - tilecoll WALL, FLOOR, WALL, FLOOR ; 07 - tilecoll FLOOR, WALL, FLOOR, WALL ; 08 - tilecoll WALL, WINDOW, FLOOR, FLOOR ; 09 - tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 0a - tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e - tilecoll WALL, TOWN_MAP, FLOOR, FLOOR ; 0f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 - tilecoll WALL, WALL, PC, WALL ; 11 - tilecoll WALL, WALL, WALL, FLOOR ; 12 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 01 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 02 + tilecoll WALL, WALL, FLOOR, FLOOR ; 03 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 04 + tilecoll WALL, WINDOW, FLOOR, FLOOR ; 05 + tilecoll WALL, FLOOR, WALL, FLOOR ; 06 + tilecoll FLOOR, WALL, FLOOR, WALL ; 07 + tilecoll WALL, WINDOW, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d + tilecoll WALL, TOWN_MAP, FLOOR, FLOOR ; 0e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f + tilecoll WALL, WALL, PC, WALL ; 10 + tilecoll WALL, WALL, WALL, FLOOR ; 11 + tilecoll WALL, WALL, FLOOR, FLOOR ; 12 tilecoll WALL, WALL, FLOOR, FLOOR ; 13 - tilecoll WALL, WALL, FLOOR, FLOOR ; 14 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 15 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 16 - tilecoll WINDOW, WALL, FLOOR, FLOOR ; 17 - tilecoll FLOOR, FLOOR, WARP_CARPET_LEFT, FLOOR ; 18 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1a - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b - tilecoll WARP_CARPET_LEFT, FLOOR, FLOOR, FLOOR ; 1c - tilecoll WALL, WALL, FLOOR, PC ; 1d - tilecoll WALL, WALL, FLOOR, RADIO ; 1e - tilecoll WALL, TOWN_MAP, TV, FLOOR ; 1f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 15 + tilecoll WINDOW, WALL, FLOOR, FLOOR ; 16 + tilecoll FLOOR, FLOOR, WARP_CARPET_LEFT, FLOOR ; 17 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1a + tilecoll WARP_CARPET_LEFT, FLOOR, FLOOR, FLOOR ; 1b + tilecoll WALL, WALL, FLOOR, PC ; 1c + tilecoll WALL, WALL, FLOOR, RADIO ; 1d + tilecoll WALL, TOWN_MAP, TV, FLOOR ; 1e + tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 - tilecoll FLOOR, WALL, FLOOR, WALL ; 22 - tilecoll WALL, FLOOR, WALL, FLOOR ; 23 - tilecoll FLOOR, WALL, FLOOR, WALL ; 24 - tilecoll WALL, FLOOR, WALL, FLOOR ; 25 - tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 26 - tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 27 - tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 28 + tilecoll FLOOR, WALL, FLOOR, WALL ; 21 + tilecoll WALL, FLOOR, WALL, FLOOR ; 22 + tilecoll FLOOR, WALL, FLOOR, WALL ; 23 + tilecoll WALL, FLOOR, WALL, FLOOR ; 24 + tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 25 + tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 26 + tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 27 + tilecoll WALL, WALL, FLOOR, FLOOR ; 28 tilecoll WALL, WALL, FLOOR, FLOOR ; 29 tilecoll WALL, WALL, FLOOR, FLOOR ; 2a tilecoll WALL, WALL, FLOOR, FLOOR ; 2b - tilecoll WALL, WALL, FLOOR, FLOOR ; 2c - tilecoll WALL, WALL, WALL, WALL ; 2d - tilecoll WALL, WALL, FLOOR, FLOOR ; 2e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f - tilecoll WALL, WALL, FLOOR, WALL ; 30 - tilecoll WALL, FLOOR, WALL, FLOOR ; 31 - tilecoll FLOOR, WALL, FLOOR, WALL ; 32 - tilecoll WALL, WINDOW, WALL, WALL ; 33 + tilecoll WALL, WALL, WALL, WALL ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e + tilecoll WALL, WALL, FLOOR, WALL ; 2f + tilecoll WALL, FLOOR, WALL, FLOOR ; 30 + tilecoll FLOOR, WALL, FLOOR, WALL ; 31 + tilecoll WALL, WINDOW, WALL, WALL ; 32 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/ice_path_collision.asm b/data/tilesets/ice_path_collision.asm index 4fd9376ad..362126969 100644 --- a/data/tilesets/ice_path_collision.asm +++ b/data/tilesets/ice_path_collision.asm @@ -1,64 +1,64 @@ - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 04 - tilecoll WALL, UP_WALL, WALL, FLOOR ; 05 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06 - tilecoll UP_WALL, WALL, FLOOR, WALL ; 07 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08 - tilecoll WALL, FLOOR, WALL, FLOOR ; 09 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a - tilecoll FLOOR, WALL, FLOOR, WALL ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll WALL, FLOOR, WALL, WALL ; 0d - tilecoll FLOOR, FLOOR, WALL, WALL ; 0e - tilecoll FLOOR, WALL, WALL, WALL ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 03 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 04 + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 05 + tilecoll UP_WALL, WALL, FLOOR, WALL ; 06 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 07 + tilecoll WALL, FLOOR, WALL, FLOOR ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll FLOOR, WALL, FLOOR, WALL ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll WALL, FLOOR, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, WALL, WALL, WALL ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 10 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 11 tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13 - tilecoll FLOOR, FLOOR, WALL, CAVE ; 14 - tilecoll WALL, WALL, WALL, FLOOR ; 15 - tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, WALL ; 17 - tilecoll FLOOR, FLOOR, PIT, FLOOR ; 18 - tilecoll WALL, FLOOR, WALL, FLOOR ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll FLOOR, WALL, FLOOR, WALL ; 1b - tilecoll FLOOR, PIT, FLOOR, FLOOR ; 1c - tilecoll WALL, FLOOR, WALL, WALL ; 1d - tilecoll FLOOR, FLOOR, WALL, WALL ; 1e - tilecoll FLOOR, WALL, WALL, WALL ; 1f - tilecoll ICE, ICE, ICE, ICE ; 20 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 21 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 22 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 23 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 24 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 25 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 26 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 27 - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 28 - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 29 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c - tilecoll WALL, ICE, ICE, ICE ; 2d - tilecoll ICE, ICE, WALL, ICE ; 2e - tilecoll ICE, WALL, ICE, ICE ; 2f - tilecoll ICE, ICE, ICE, WALL ; 30 - tilecoll WALL, WALL, FLOOR, WALL ; 31 - tilecoll WALL, WALL, WALL, WALL ; 32 - tilecoll WALL, WALL, WALL, FLOOR ; 33 - tilecoll WALL, WALL, FLOOR, FLOOR ; 34 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 35 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37 + tilecoll FLOOR, FLOOR, WALL, CAVE ; 13 + tilecoll WALL, WALL, WALL, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, WALL ; 16 + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 17 + tilecoll WALL, FLOOR, WALL, FLOOR ; 18 + tilecoll WALL, WALL, WALL, WALL ; 19 + tilecoll FLOOR, WALL, FLOOR, WALL ; 1a + tilecoll FLOOR, PIT, FLOOR, FLOOR ; 1b + tilecoll WALL, FLOOR, WALL, WALL ; 1c + tilecoll FLOOR, FLOOR, WALL, WALL ; 1d + tilecoll FLOOR, WALL, WALL, WALL ; 1e + tilecoll ICE, ICE, ICE, ICE ; 1f + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 20 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 21 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 22 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 23 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 24 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 25 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 26 + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 27 + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 28 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 29 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll WALL, ICE, ICE, ICE ; 2c + tilecoll ICE, ICE, WALL, ICE ; 2d + tilecoll ICE, WALL, ICE, ICE ; 2e + tilecoll ICE, ICE, ICE, WALL ; 2f + tilecoll WALL, WALL, FLOOR, WALL ; 30 + tilecoll WALL, WALL, WALL, WALL ; 31 + tilecoll WALL, WALL, WALL, FLOOR ; 32 + tilecoll WALL, WALL, FLOOR, FLOOR ; 33 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 36 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 37 tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 38 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 39 - tilecoll WALL, FLOOR, WALL, FLOOR ; 3a - tilecoll FLOOR, WALL, FLOOR, WALL ; 3b - tilecoll WALL, WALL, WALL, WALL ; 3c - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3d - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 3e - tilecoll FLOOR, FLOOR, WALL, WALL ; 3f - tilecoll ICE, ICE, ICE, LADDER ; 40 + tilecoll WALL, FLOOR, WALL, FLOOR ; 39 + tilecoll FLOOR, WALL, FLOOR, WALL ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 3d + tilecoll FLOOR, FLOOR, WALL, WALL ; 3e + tilecoll ICE, ICE, ICE, LADDER ; 3f diff --git a/data/tilesets/johto_collision.asm b/data/tilesets/johto_collision.asm index 4d6d2c072..8da65db43 100644 --- a/data/tilesets/johto_collision.asm +++ b/data/tilesets/johto_collision.asm @@ -1,33 +1,34 @@ - tilecoll 01, 01, 01, 01 ; 01 + tilecoll 01, 01, 01, 01 ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 - tilecoll LADDER, LADDER, LADDER, LADDER ; 07 - tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 08 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll LADDER, LADDER, LADDER, LADDER ; 06 + tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 07 + tilecoll WALL, WALL, WALL, WALL ; 08 tilecoll WALL, WALL, WALL, WALL ; 09 tilecoll WALL, WALL, WALL, WALL ; 0a - tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c - tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0d - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0e - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b + tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0d + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f tilecoll WALL, WALL, WALL, WALL ; 10 tilecoll WALL, WALL, WALL, WALL ; 11 tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, WALL, WALL, DOOR ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll WALL, WALL, WALL, DOOR ; 17 + tilecoll WALL, WALL, WALL, DOOR ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, WALL, WALL, DOOR ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 tilecoll WALL, WALL, WALL, WALL ; 18 tilecoll WALL, WALL, WALL, WALL ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll WALL, WALL, WALL, DOOR ; 1b + tilecoll WALL, WALL, WALL, DOOR ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1b tilecoll WALL, WALL, WALL, WALL ; 1c - tilecoll WALL, WALL, WALL, WALL ; 1d - tilecoll WALL, WALL, DOOR, WALL ; 1e + tilecoll WALL, WALL, DOOR, WALL ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 tilecoll WALL, WALL, WALL, WALL ; 21 @@ -36,93 +37,92 @@ tilecoll WALL, WALL, WALL, WALL ; 24 tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 - tilecoll WALL, WALL, WALL, WALL ; 27 - tilecoll WALL, WALL, DOOR, WALL ; 28 - tilecoll WALL, WALL, WALL, DOOR ; 29 - tilecoll WALL, WALL, WALL, WALL ; 2a - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2b - tilecoll WALL, WALL, WALL, WALL ; 2c + tilecoll WALL, WALL, DOOR, WALL ; 27 + tilecoll WALL, WALL, WALL, DOOR ; 28 + tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2c tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2d - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2e - tilecoll WALL, WALL, WALL, DOOR ; 2f - tilecoll WALL, WALL, WALL, WALL ; 30 - tilecoll BUOY, BUOY, BUOY, WATER ; 31 - tilecoll BUOY, BUOY, WATER, WATER ; 32 - tilecoll BUOY, BUOY, WATER, BUOY ; 33 - tilecoll FLOOR, FLOOR, WALL, WALL ; 34 - tilecoll BUOY, WATER, BUOY, WATER ; 35 - tilecoll WATER, WATER, WATER, WATER ; 36 - tilecoll WATER, BUOY, WATER, BUOY ; 37 - tilecoll WALL, WALL, WALL, DOOR ; 38 - tilecoll BUOY, WATER, BUOY, BUOY ; 39 - tilecoll WATER, WATER, BUOY, BUOY ; 3a - tilecoll WATER, BUOY, BUOY, BUOY ; 3b - tilecoll WALL, WALL, WALL, WALL ; 3c - tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 3d - tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 3e - tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 40 - tilecoll WALL, WALL, WALL, FLOOR ; 41 - tilecoll WALL, WALL, FLOOR, FLOOR ; 42 - tilecoll WALL, WALL, FLOOR, WALL ; 43 - tilecoll WATER, WATER, WATER, WATER ; 44 - tilecoll WALL, FLOOR, WALL, FLOOR ; 45 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 46 - tilecoll FLOOR, WALL, FLOOR, WALL ; 47 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 48 - tilecoll WALL, FLOOR, WALL, WALL ; 49 - tilecoll FLOOR, FLOOR, WALL, WALL ; 4a - tilecoll FLOOR, WALL, WALL, WALL ; 4b - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54 + tilecoll WALL, WALL, WALL, DOOR ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll BUOY, BUOY, BUOY, WATER ; 30 + tilecoll BUOY, BUOY, WATER, WATER ; 31 + tilecoll BUOY, BUOY, WATER, BUOY ; 32 + tilecoll FLOOR, FLOOR, WALL, WALL ; 33 + tilecoll BUOY, WATER, BUOY, WATER ; 34 + tilecoll WATER, WATER, WATER, WATER ; 35 + tilecoll WATER, BUOY, WATER, BUOY ; 36 + tilecoll WALL, WALL, WALL, DOOR ; 37 + tilecoll BUOY, WATER, BUOY, BUOY ; 38 + tilecoll WATER, WATER, BUOY, BUOY ; 39 + tilecoll WATER, BUOY, BUOY, BUOY ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 3e + tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 3f + tilecoll WALL, WALL, WALL, FLOOR ; 40 + tilecoll WALL, WALL, FLOOR, FLOOR ; 41 + tilecoll WALL, WALL, FLOOR, WALL ; 42 + tilecoll WATER, WATER, WATER, WATER ; 43 + tilecoll WALL, FLOOR, WALL, FLOOR ; 44 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 45 + tilecoll FLOOR, WALL, FLOOR, WALL ; 46 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 47 + tilecoll WALL, FLOOR, WALL, WALL ; 48 + tilecoll FLOOR, FLOOR, WALL, WALL ; 49 + tilecoll FLOOR, WALL, WALL, WALL ; 4a + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53 + tilecoll WATER, WATER, WATER, WATER ; 54 tilecoll WATER, WATER, WATER, WATER ; 55 - tilecoll WATER, WATER, WATER, WATER ; 56 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56 tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58 + tilecoll WATER, WATER, WATER, WATER ; 58 tilecoll WATER, WATER, WATER, WATER ; 59 - tilecoll WATER, WATER, WATER, WATER ; 5a - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b - tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 5c - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 5d - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 5e - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 5f - tilecoll FLOOR, HEADBUTT_TREE, FLOOR, CUT_TREE ; 60 - tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 61 - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 62 - tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 63 - tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 64 - tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 65 - tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 66 - tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 67 - tilecoll CUT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 68 - tilecoll WALL, FLOOR, WALL, FLOOR ; 69 - tilecoll FLOOR, WALL, FLOOR, WALL ; 6a - tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b - tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c - tilecoll WALL, FLOOR, WALL, WALL ; 6d - tilecoll FLOOR, WALL, WALL, WALL ; 6e - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72 - tilecoll FLOOR, FLOOR, WALL, WALL ; 73 - tilecoll FLOOR, FLOOR, CAVE, WALL ; 74 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75 - tilecoll WALL, WALL, FLOOR, FLOOR ; 76 - tilecoll WATER, WATER, WATER, WATER ; 77 - tilecoll WALL, WALL, DOOR, WALL ; 78 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 79 + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a + tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 5b + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 5c + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 5d + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 5e + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, CUT_TREE ; 5f + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 60 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 61 + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 62 + tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 63 + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 64 + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 65 + tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 66 + tilecoll CUT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 67 + tilecoll WALL, FLOOR, WALL, FLOOR ; 68 + tilecoll FLOOR, WALL, FLOOR, WALL ; 69 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a + tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b + tilecoll WALL, FLOOR, WALL, WALL ; 6c + tilecoll FLOOR, WALL, WALL, WALL ; 6d + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71 + tilecoll FLOOR, FLOOR, WALL, WALL ; 72 + tilecoll FLOOR, FLOOR, CAVE, WALL ; 73 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74 + tilecoll WALL, WALL, FLOOR, FLOOR ; 75 + tilecoll WATER, WATER, WATER, WATER ; 76 + tilecoll WALL, WALL, DOOR, WALL ; 77 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 78 + tilecoll WATER, WATER, WATER, WATER ; 79 tilecoll WATER, WATER, WATER, WATER ; 7a - tilecoll WATER, WATER, WATER, WATER ; 7b + tilecoll WALL, WALL, WALL, WALL ; 7b tilecoll WALL, WALL, WALL, WALL ; 7c tilecoll WALL, WALL, WALL, WALL ; 7d tilecoll WALL, WALL, WALL, WALL ; 7e tilecoll WALL, WALL, WALL, WALL ; 7f - tilecoll WALL, WALL, WALL, WALL ; 80 diff --git a/data/tilesets/johto_modern_collision.asm b/data/tilesets/johto_modern_collision.asm index 40255d744..67ba03575 100644 --- a/data/tilesets/johto_modern_collision.asm +++ b/data/tilesets/johto_modern_collision.asm @@ -1,40 +1,41 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, WALL, WALL ; 08 tilecoll WALL, WALL, WALL, WALL ; 09 tilecoll WALL, WALL, WALL, WALL ; 0a - tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c - tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0d - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0e - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b + tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0d + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f tilecoll WALL, WALL, WALL, WALL ; 10 tilecoll WALL, WALL, WALL, WALL ; 11 tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, WALL, WALL, DOOR ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll WALL, WALL, WALL, DOOR ; 17 - tilecoll WALL, WALL, DOOR, WALL ; 18 + tilecoll WALL, WALL, WALL, DOOR ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, WALL, WALL, DOOR ; 16 + tilecoll WALL, WALL, DOOR, WALL ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 tilecoll WALL, WALL, WALL, WALL ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll WALL, WALL, WALL, DOOR ; 1b + tilecoll WALL, WALL, WALL, DOOR ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1b tilecoll WALL, WALL, WALL, WALL ; 1c - tilecoll WALL, WALL, WALL, WALL ; 1d - tilecoll WALL, WALL, DOOR, WALL ; 1e + tilecoll WALL, WALL, DOOR, WALL ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 tilecoll WALL, WALL, WALL, WALL ; 21 tilecoll WALL, WALL, WALL, WALL ; 22 tilecoll WALL, WALL, WALL, WALL ; 23 - tilecoll WALL, WALL, WALL, WALL ; 24 - tilecoll WALL, WALL, DOOR, WALL ; 25 + tilecoll WALL, WALL, DOOR, WALL ; 24 + tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 tilecoll WALL, WALL, WALL, WALL ; 27 tilecoll WALL, WALL, WALL, WALL ; 28 @@ -42,87 +43,86 @@ tilecoll WALL, WALL, WALL, WALL ; 2a tilecoll WALL, WALL, WALL, WALL ; 2b tilecoll WALL, WALL, WALL, WALL ; 2c - tilecoll WALL, WALL, WALL, WALL ; 2d - tilecoll WALL, WALL, WALL, DOOR ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 30 - tilecoll BUOY, BUOY, BUOY, WATER ; 31 - tilecoll BUOY, BUOY, WATER, WATER ; 32 - tilecoll BUOY, BUOY, WATER, BUOY ; 33 - tilecoll WALL, WALL, WALL, WALL ; 34 - tilecoll BUOY, WATER, BUOY, WATER ; 35 - tilecoll WATER, WATER, WATER, WATER ; 36 - tilecoll WATER, BUOY, WATER, BUOY ; 37 - tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 38 - tilecoll BUOY, WATER, BUOY, BUOY ; 39 - tilecoll WATER, WATER, BUOY, BUOY ; 3a - tilecoll WATER, BUOY, BUOY, BUOY ; 3b - tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 3c - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3d - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 3e - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3f - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 40 - tilecoll WALL, WALL, WALL, FLOOR ; 41 - tilecoll WALL, WALL, FLOOR, FLOOR ; 42 - tilecoll WALL, WALL, FLOOR, WALL ; 43 - tilecoll WATER, WATER, WATER, WATER ; 44 - tilecoll WALL, FLOOR, WALL, FLOOR ; 45 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 46 - tilecoll FLOOR, WALL, FLOOR, WALL ; 47 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 48 - tilecoll WALL, FLOOR, WALL, WALL ; 49 - tilecoll FLOOR, FLOOR, WALL, WALL ; 4a - tilecoll FLOOR, WALL, WALL, WALL ; 4b - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54 + tilecoll WALL, WALL, WALL, DOOR ; 2d + tilecoll WALL, WALL, WALL, WALL ; 2e + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 2f + tilecoll BUOY, BUOY, BUOY, WATER ; 30 + tilecoll BUOY, BUOY, WATER, WATER ; 31 + tilecoll BUOY, BUOY, WATER, BUOY ; 32 + tilecoll WALL, WALL, WALL, WALL ; 33 + tilecoll BUOY, WATER, BUOY, WATER ; 34 + tilecoll WATER, WATER, WATER, WATER ; 35 + tilecoll WATER, BUOY, WATER, BUOY ; 36 + tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 37 + tilecoll BUOY, WATER, BUOY, BUOY ; 38 + tilecoll WATER, WATER, BUOY, BUOY ; 39 + tilecoll WATER, BUOY, BUOY, BUOY ; 3a + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 3b + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3c + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 3d + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3e + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 3f + tilecoll WALL, WALL, WALL, FLOOR ; 40 + tilecoll WALL, WALL, FLOOR, FLOOR ; 41 + tilecoll WALL, WALL, FLOOR, WALL ; 42 + tilecoll WATER, WATER, WATER, WATER ; 43 + tilecoll WALL, FLOOR, WALL, FLOOR ; 44 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 45 + tilecoll FLOOR, WALL, FLOOR, WALL ; 46 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 47 + tilecoll WALL, FLOOR, WALL, WALL ; 48 + tilecoll FLOOR, FLOOR, WALL, WALL ; 49 + tilecoll FLOOR, WALL, WALL, WALL ; 4a + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53 + tilecoll WATER, WATER, WATER, WATER ; 54 tilecoll WATER, WATER, WATER, WATER ; 55 - tilecoll WATER, WATER, WATER, WATER ; 56 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56 tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58 + tilecoll WATER, WATER, WATER, WATER ; 58 tilecoll WATER, WATER, WATER, WATER ; 59 - tilecoll WATER, WATER, WATER, WATER ; 5a - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b - tilecoll WALL, WALL, WALL, CAVE ; 5c - tilecoll WALL, FLOOR, WALL, FLOOR ; 5d + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a + tilecoll WALL, WALL, WALL, CAVE ; 5b + tilecoll WALL, FLOOR, WALL, FLOOR ; 5c + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5d tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5e - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5f - tilecoll WALL, WALL, WALL, WALL ; 60 + tilecoll WALL, WALL, WALL, WALL ; 5f + tilecoll WATER, WATER, WALL, WALL ; 60 tilecoll WATER, WATER, WALL, WALL ; 61 tilecoll WATER, WATER, WALL, WALL ; 62 - tilecoll WATER, WATER, WALL, WALL ; 63 - tilecoll WATER, WATER, WATER, WATER ; 64 - tilecoll FLOOR, WALL, FLOOR, WALL ; 65 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 66 - tilecoll WALL, FLOOR, WALL, FLOOR ; 67 - tilecoll WALL, WALL, WALL, WALL ; 68 - tilecoll WALL, FLOOR, WALL, FLOOR ; 69 - tilecoll FLOOR, WALL, FLOOR, WALL ; 6a - tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b - tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c - tilecoll WALL, FLOOR, WALL, WALL ; 6d - tilecoll FLOOR, WALL, WALL, WALL ; 6e - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72 - tilecoll FLOOR, FLOOR, WALL, WALL ; 73 - tilecoll FLOOR, FLOOR, WALL, CAVE ; 74 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75 - tilecoll WALL, WALL, FLOOR, FLOOR ; 76 - tilecoll WATER, WATER, WATER, WATER ; 77 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 78 - tilecoll FLOOR, FLOOR, WALL, WALL ; 79 + tilecoll WATER, WATER, WATER, WATER ; 63 + tilecoll FLOOR, WALL, FLOOR, WALL ; 64 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 65 + tilecoll WALL, FLOOR, WALL, FLOOR ; 66 + tilecoll WALL, WALL, WALL, WALL ; 67 + tilecoll WALL, FLOOR, WALL, FLOOR ; 68 + tilecoll FLOOR, WALL, FLOOR, WALL ; 69 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a + tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b + tilecoll WALL, FLOOR, WALL, WALL ; 6c + tilecoll FLOOR, WALL, WALL, WALL ; 6d + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71 + tilecoll FLOOR, FLOOR, WALL, WALL ; 72 + tilecoll FLOOR, FLOOR, WALL, CAVE ; 73 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74 + tilecoll WALL, WALL, FLOOR, FLOOR ; 75 + tilecoll WATER, WATER, WATER, WATER ; 76 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 77 + tilecoll FLOOR, FLOOR, WALL, WALL ; 78 + tilecoll WATER, WATER, WATER, WATER ; 79 tilecoll WATER, WATER, WATER, WATER ; 7a - tilecoll WATER, WATER, WATER, WATER ; 7b + tilecoll WALL, WALL, WALL, WALL ; 7b tilecoll WALL, WALL, WALL, WALL ; 7c tilecoll WALL, WALL, WALL, WALL ; 7d tilecoll WALL, WALL, WALL, WALL ; 7e - tilecoll WALL, WALL, WALL, WALL ; 7f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 80 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7f diff --git a/data/tilesets/kabuto_word_room_collision.asm b/data/tilesets/kabuto_word_room_collision.asm index 138f07143..58bdacc53 100644 --- a/data/tilesets/kabuto_word_room_collision.asm +++ b/data/tilesets/kabuto_word_room_collision.asm @@ -1,4 +1,5 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 @@ -17,20 +18,20 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, WALL, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, WALL ; 1a - tilecoll WALL, FLOOR, WALL, FLOOR ; 1b - tilecoll FLOOR, WALL, FLOOR, WALL ; 1c - tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, WALL ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/kanto_collision.asm b/data/tilesets/kanto_collision.asm index 9b0f0c275..275c2b0b1 100644 --- a/data/tilesets/kanto_collision.asm +++ b/data/tilesets/kanto_collision.asm @@ -1,128 +1,128 @@ - tilecoll CUT_TREE, CUT_TREE, CUT_TREE, CUT_TREE ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll WALL, WALL, WALL, DOOR ; 03 - tilecoll WALL, WALL, WALL, WALL ; 04 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 05 - tilecoll LADDER, LADDER, LADDER, LADDER ; 06 - tilecoll FLOOR, FLOOR, CAVE, WALL ; 07 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 08 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 09 - tilecoll WALL, WALL, WALL, WALL ; 0a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 0c + tilecoll CUT_TREE, CUT_TREE, CUT_TREE, CUT_TREE ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll WALL, WALL, WALL, DOOR ; 02 + tilecoll WALL, WALL, WALL, WALL ; 03 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 04 + tilecoll LADDER, LADDER, LADDER, LADDER ; 05 + tilecoll FLOOR, FLOOR, CAVE, WALL ; 06 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 07 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 08 + tilecoll WALL, WALL, WALL, WALL ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 0b + tilecoll WALL, WALL, WALL, WALL ; 0c tilecoll WALL, WALL, WALL, WALL ; 0d tilecoll WALL, WALL, WALL, WALL ; 0e tilecoll WALL, WALL, WALL, WALL ; 0f tilecoll WALL, WALL, WALL, WALL ; 10 tilecoll WALL, WALL, WALL, WALL ; 11 - tilecoll WALL, WALL, WALL, WALL ; 12 - tilecoll WALL, WALL, DOOR, WALL ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, WATER, WALL, WALL ; 15 - tilecoll WATER, WALL, WALL, WALL ; 16 - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 17 - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 18 - tilecoll WALL, WATER, WALL, WATER ; 19 - tilecoll WATER, WALL, WATER, WALL ; 1a - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1b - tilecoll WALL, FLOOR, WALL, FLOOR ; 1c - tilecoll FLOOR, FLOOR, WALL, WALL ; 1d + tilecoll WALL, WALL, DOOR, WALL ; 12 + tilecoll WALL, WALL, WALL, WALL ; 13 + tilecoll WALL, WATER, WALL, WALL ; 14 + tilecoll WATER, WALL, WALL, WALL ; 15 + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 16 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 17 + tilecoll WALL, WATER, WALL, WATER ; 18 + tilecoll WATER, WALL, WATER, WALL ; 19 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1a + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b + tilecoll FLOOR, FLOOR, WALL, WALL ; 1c + tilecoll WATER, WATER, WATER, WATER ; 1d tilecoll WATER, WATER, WATER, WATER ; 1e tilecoll WATER, WATER, WATER, WATER ; 1f - tilecoll WATER, WATER, WATER, WATER ; 20 + tilecoll WALL, WALL, WALL, WALL ; 20 tilecoll WALL, WALL, WALL, WALL ; 21 - tilecoll WALL, WALL, WALL, WALL ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 - tilecoll WALL, FLOOR, WALL, WALL ; 25 - tilecoll FLOOR, WALL, WALL, WALL ; 26 + tilecoll WALL, FLOOR, WALL, WALL ; 24 + tilecoll FLOOR, WALL, WALL, WALL ; 25 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 - tilecoll WALL, FLOOR, WALL, FLOOR ; 29 - tilecoll FLOOR, WALL, FLOOR, WALL ; 2a - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2b - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d + tilecoll WALL, FLOOR, WALL, FLOOR ; 28 + tilecoll FLOOR, WALL, FLOOR, WALL ; 29 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll WATER, WATER, WATER, WATER ; 2d tilecoll WATER, WATER, WATER, WATER ; 2e - tilecoll WATER, WATER, WATER, WATER ; 2f - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 30 - tilecoll WALL, WALL, WALL, WALL ; 31 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 - tilecoll WALL, CUT_TREE, WALL, FLOOR ; 33 - tilecoll WALL, WALL, FLOOR, CUT_TREE ; 34 - tilecoll CUT_TREE, FLOOR, WALL, WALL ; 35 - tilecoll FLOOR, CUT_TREE, WALL, FLOOR ; 36 - tilecoll WALL, WALL, FLOOR, WALL ; 37 - tilecoll WALL, WALL, WALL, WALL ; 38 + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 2f + tilecoll WALL, WALL, WALL, WALL ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 + tilecoll WALL, CUT_TREE, WALL, FLOOR ; 32 + tilecoll WALL, WALL, FLOOR, CUT_TREE ; 33 + tilecoll CUT_TREE, FLOOR, WALL, WALL ; 34 + tilecoll FLOOR, CUT_TREE, WALL, FLOOR ; 35 + tilecoll WALL, WALL, FLOOR, WALL ; 36 + tilecoll WALL, WALL, WALL, WALL ; 37 + tilecoll FLOOR, FLOOR, WALL, WALL ; 38 tilecoll FLOOR, FLOOR, WALL, WALL ; 39 - tilecoll FLOOR, FLOOR, WALL, WALL ; 3a - tilecoll WALL, WALL, DOOR, WALL ; 3b - tilecoll UP_WALL, WALL, FLOOR, WALL ; 3c - tilecoll WALL, WALL, WALL, DOOR ; 3d - tilecoll WALL, WALL, WALL, WALL ; 3e - tilecoll WALL, UP_WALL, WALL, FLOOR ; 3f - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 40 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 41 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 42 - tilecoll HOP_DOWN, WALL, WALL, WALL ; 43 - tilecoll WATER, WATER, WATER, WATER ; 44 + tilecoll WALL, WALL, DOOR, WALL ; 3a + tilecoll UP_WALL, WALL, FLOOR, WALL ; 3b + tilecoll WALL, WALL, WALL, DOOR ; 3c + tilecoll WALL, WALL, WALL, WALL ; 3d + tilecoll WALL, UP_WALL, WALL, FLOOR ; 3e + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 3f + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 40 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 41 + tilecoll HOP_DOWN, WALL, WALL, WALL ; 42 + tilecoll WATER, WATER, WATER, WATER ; 43 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 44 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 45 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 46 - tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 47 - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 48 + tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 46 + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 47 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 48 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 49 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4a - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 4b - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 4c - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 4d - tilecoll FLOOR, WALL, FLOOR, WALL ; 4e - tilecoll WALL, FLOOR, WALL, FLOOR ; 4f - tilecoll FLOOR, WALL, WALL, WALL ; 50 - tilecoll WALL, FLOOR, WALL, WALL ; 51 - tilecoll WALL, WALL, FLOOR, FLOOR ; 52 - tilecoll FLOOR, FLOOR, WALL, WALL ; 53 - tilecoll WALL, WALL, WALL, DOOR ; 54 - tilecoll WALL, WALL, WALL, WALL ; 55 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 56 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 4a + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 4b + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 4c + tilecoll FLOOR, WALL, FLOOR, WALL ; 4d + tilecoll WALL, FLOOR, WALL, FLOOR ; 4e + tilecoll FLOOR, WALL, WALL, WALL ; 4f + tilecoll WALL, FLOOR, WALL, WALL ; 50 + tilecoll WALL, WALL, FLOOR, FLOOR ; 51 + tilecoll FLOOR, FLOOR, WALL, WALL ; 52 + tilecoll WALL, WALL, WALL, DOOR ; 53 + tilecoll WALL, WALL, WALL, WALL ; 54 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 55 + tilecoll FLOOR, FLOOR, WALL, WALL ; 56 tilecoll FLOOR, FLOOR, WALL, WALL ; 57 - tilecoll FLOOR, FLOOR, WALL, WALL ; 58 - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 59 - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 5a - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 5b - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 5c - tilecoll FLOOR, HOP_DOWN, FLOOR, WALL ; 5d + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 58 + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 59 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 5a + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 5b + tilecoll FLOOR, HOP_DOWN, FLOOR, WALL ; 5c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5f - tilecoll FLOOR, WALL, FLOOR, WALL ; 60 - tilecoll FLOOR, WALL, CUT_TREE, WALL ; 61 - tilecoll FLOOR, FLOOR, WALL, WALL ; 62 - tilecoll WALL, WALL, WALL, FLOOR ; 63 - tilecoll WALL, WALL, FLOOR, WALL ; 64 + tilecoll FLOOR, WALL, FLOOR, WALL ; 5f + tilecoll FLOOR, WALL, CUT_TREE, WALL ; 60 + tilecoll FLOOR, FLOOR, WALL, WALL ; 61 + tilecoll WALL, WALL, WALL, FLOOR ; 62 + tilecoll WALL, WALL, FLOOR, WALL ; 63 + tilecoll WATER, WATER, WATER, WATER ; 64 tilecoll WATER, WATER, WATER, WATER ; 65 - tilecoll WATER, WATER, WATER, WATER ; 66 - tilecoll WALL, WALL, WALL, WALL ; 67 - tilecoll WALL, WATER, WALL, WATER ; 68 + tilecoll WALL, WALL, WALL, WALL ; 66 + tilecoll WALL, WATER, WALL, WATER ; 67 + tilecoll WALL, WALL, WALL, WALL ; 68 tilecoll WALL, WALL, WALL, WALL ; 69 - tilecoll WALL, WALL, WALL, WALL ; 6a - tilecoll WATER, WALL, WATER, WALL ; 6b - tilecoll WATER, WATER, WALL, WALL ; 6c - tilecoll WALL, WALL, FLOOR, FLOOR ; 6d - tilecoll WALL, FLOOR, WALL, FLOOR ; 6e - tilecoll FLOOR, WALL, FLOOR, WALL ; 6f - tilecoll FLOOR, FLOOR, WALL, WALL ; 70 - tilecoll FLOOR, WALL, CAVE, WALL ; 71 + tilecoll WATER, WALL, WATER, WALL ; 6a + tilecoll WATER, WATER, WALL, WALL ; 6b + tilecoll WALL, WALL, FLOOR, FLOOR ; 6c + tilecoll WALL, FLOOR, WALL, FLOOR ; 6d + tilecoll FLOOR, WALL, FLOOR, WALL ; 6e + tilecoll FLOOR, FLOOR, WALL, WALL ; 6f + tilecoll FLOOR, WALL, CAVE, WALL ; 70 + tilecoll WALL, WALL, WALL, WALL ; 71 tilecoll WALL, WALL, WALL, WALL ; 72 tilecoll WALL, WALL, WALL, WALL ; 73 - tilecoll WALL, WALL, WALL, WALL ; 74 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 75 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 74 + tilecoll WALL, WALL, WALL, WALL ; 75 tilecoll WALL, WALL, WALL, WALL ; 76 - tilecoll WALL, WALL, WALL, WALL ; 77 - tilecoll FLOOR, FLOOR, WALL, WALL ; 78 - tilecoll WATER, WATER, WATER, WATER ; 79 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 7a - tilecoll WALL, WALL, WALL, WALL ; 7b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7c - tilecoll WALL, WALL, WALL, DOOR ; 7d + tilecoll FLOOR, FLOOR, WALL, WALL ; 77 + tilecoll WATER, WATER, WATER, WATER ; 78 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 79 + tilecoll WALL, WALL, WALL, WALL ; 7a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7b + tilecoll WALL, WALL, WALL, DOOR ; 7c + tilecoll WALL, WALL, WALL, WALL ; 7d tilecoll WALL, WALL, WALL, WALL ; 7e tilecoll WALL, WALL, WALL, WALL ; 7f - tilecoll WALL, WALL, WALL, WALL ; 80 diff --git a/data/tilesets/lab_collision.asm b/data/tilesets/lab_collision.asm index 436c8e0a7..b3aa6ef1b 100644 --- a/data/tilesets/lab_collision.asm +++ b/data/tilesets/lab_collision.asm @@ -1,50 +1,51 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 03 - tilecoll WALL, WALL, WALL, WALL ; 04 - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 05 - tilecoll WALL, WALL, FLOOR, FLOOR ; 06 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 02 + tilecoll WALL, WALL, WALL, WALL ; 03 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 04 + tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, WALL, WALL ; 06 tilecoll FLOOR, FLOOR, WALL, WALL ; 07 - tilecoll FLOOR, FLOOR, WALL, WALL ; 08 - tilecoll WALL, WALL, WALL, WALL ; 09 - tilecoll WINDOW, WALL, FLOOR, FLOOR ; 0a + tilecoll WALL, WALL, WALL, WALL ; 08 + tilecoll WINDOW, WALL, FLOOR, FLOOR ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d - tilecoll WALL, WALL, FLOOR, FLOOR ; 0e - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 0f - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 10 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 + tilecoll WALL, WALL, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 0e + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 0f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 + tilecoll WALL, WALL, FLOOR, FLOOR ; 11 tilecoll WALL, WALL, FLOOR, FLOOR ; 12 tilecoll WALL, WALL, FLOOR, FLOOR ; 13 - tilecoll WALL, WALL, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 15 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll WALL, WALL, WALL, WALL ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 1a - tilecoll FLOOR, WALL, FLOOR, WALL ; 1b - tilecoll WALL, FLOOR, WALL, FLOOR ; 1c - tilecoll WALL, WALL, FLOOR, FLOOR ; 1d - tilecoll WALL, FLOOR, WALL, FLOOR ; 1e - tilecoll FLOOR, WALL, FLOOR, WALL ; 1f - tilecoll FLOOR, FLOOR, WALL, WALL ; 20 - tilecoll WINDOW, WINDOW, FLOOR, FLOOR ; 21 - tilecoll FLOOR, FLOOR, WALL, WALL ; 22 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 14 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 19 + tilecoll FLOOR, WALL, FLOOR, WALL ; 1a + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b + tilecoll WALL, WALL, FLOOR, FLOOR ; 1c + tilecoll WALL, FLOOR, WALL, FLOOR ; 1d + tilecoll FLOOR, WALL, FLOOR, WALL ; 1e + tilecoll FLOOR, FLOOR, WALL, WALL ; 1f + tilecoll WINDOW, WINDOW, FLOOR, FLOOR ; 20 + tilecoll FLOOR, FLOOR, WALL, WALL ; 21 + tilecoll WALL, WALL, WALL, WALL ; 22 tilecoll WALL, WALL, WALL, WALL ; 23 tilecoll WALL, WALL, WALL, WALL ; 24 - tilecoll WALL, WALL, WALL, WALL ; 25 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25 + tilecoll WALL, WALL, WALL, WALL ; 26 tilecoll WALL, WALL, WALL, WALL ; 27 tilecoll WALL, WALL, WALL, WALL ; 28 - tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll WALL, WALL, FLOOR, FLOOR ; 29 tilecoll WALL, WALL, FLOOR, FLOOR ; 2a tilecoll WALL, WALL, FLOOR, FLOOR ; 2b - tilecoll WALL, WALL, FLOOR, FLOOR ; 2c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2f + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/lighthouse_collision.asm b/data/tilesets/lighthouse_collision.asm index 05b6cd614..81781fafa 100644 --- a/data/tilesets/lighthouse_collision.asm +++ b/data/tilesets/lighthouse_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 tilecoll WALL, WALL, WALL, WALL ; 02 tilecoll WALL, WALL, WALL, WALL ; 03 - tilecoll WALL, WALL, WALL, WALL ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 - tilecoll FLOOR, FLOOR, WALL, WALL ; 07 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll FLOOR, FLOOR, WALL, WALL ; 06 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 0a - tilecoll WALL, WALL, FLOOR, FLOOR ; 0b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 09 + tilecoll WALL, WALL, FLOOR, FLOOR ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b + tilecoll WALL, WALL, WALL, WALL ; 0c tilecoll WALL, WALL, WALL, WALL ; 0d tilecoll WALL, WALL, WALL, WALL ; 0e tilecoll WALL, WALL, WALL, WALL ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll 9C, FLOOR, COUNTER, FLOOR ; 11 + tilecoll 9C, FLOOR, COUNTER, FLOOR ; 10 + tilecoll WALL, WALL, WALL, WALL ; 11 tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, WARP_CARPET_DOWN, WALL, WALL ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll 9C, FLOOR, COUNTER, FLOOR ; 17 - tilecoll WALL, WALL, WALL, WALL ; 18 - tilecoll FLOOR, WALL, FLOOR, WALL ; 19 - tilecoll WALL, WALL, WALL, STAIRCASE ; 1a - tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 1b - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1c - tilecoll WALL, WALL, WALL, WALL ; 1d - tilecoll WALL, WALL, FLOOR, FLOOR ; 1e + tilecoll WALL, WARP_CARPET_DOWN, WALL, WALL ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll 9C, FLOOR, COUNTER, FLOOR ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 + tilecoll FLOOR, WALL, FLOOR, WALL ; 18 + tilecoll WALL, WALL, WALL, STAIRCASE ; 19 + tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 1a + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1b + tilecoll WALL, WALL, WALL, WALL ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f - tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, FLOOR, WALL, FLOOR ; 21 - tilecoll FLOOR, WALL, FLOOR, WALL ; 22 - tilecoll WALL, FLOOR, WALL, WALL ; 23 - tilecoll FLOOR, WALL, WALL, WALL ; 24 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25 - tilecoll FLOOR, FLOOR, WALL, WALL ; 26 - tilecoll WALL, WALL, WALL, WALL ; 27 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 - tilecoll FLOOR, FLOOR, PIT, PIT ; 29 - tilecoll WALL, WALL, WINDOW, WINDOW ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c - tilecoll WALL, WALL, FLOOR, FLOOR ; 2d - tilecoll WALL, WALL, WALL, WALL ; 2e - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2f - tilecoll WALL, WALL, WALL, BOOKSHELF ; 30 - tilecoll WALL, WALL, FLOOR, WALL ; 31 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 32 - tilecoll WALL, WALL, WALL, WALL ; 33 - tilecoll WALL, FLOOR, WALL, FLOOR ; 34 - tilecoll WALL, WALL, PC, FLOOR ; 35 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 36 - tilecoll FLOOR, WALL, FLOOR, WALL ; 37 - tilecoll WALL, WALL, WALL, WALL ; 38 - tilecoll WALL, WALL, FLOOR, WALL ; 39 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3a - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3b + tilecoll WALL, FLOOR, WALL, FLOOR ; 20 + tilecoll FLOOR, WALL, FLOOR, WALL ; 21 + tilecoll WALL, FLOOR, WALL, WALL ; 22 + tilecoll FLOOR, WALL, WALL, WALL ; 23 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 + tilecoll FLOOR, FLOOR, WALL, WALL ; 25 + tilecoll WALL, WALL, WALL, WALL ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 + tilecoll FLOOR, FLOOR, PIT, PIT ; 28 + tilecoll WALL, WALL, WINDOW, WINDOW ; 29 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll WALL, WALL, FLOOR, FLOOR ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e + tilecoll WALL, WALL, WALL, BOOKSHELF ; 2f + tilecoll WALL, WALL, FLOOR, WALL ; 30 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 31 + tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll WALL, FLOOR, WALL, FLOOR ; 33 + tilecoll WALL, WALL, PC, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 35 + tilecoll FLOOR, WALL, FLOOR, WALL ; 36 + tilecoll WALL, WALL, WALL, WALL ; 37 + tilecoll WALL, WALL, FLOOR, WALL ; 38 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b tilecoll WALL, WALL, WALL, WALL ; 3c - tilecoll WALL, WALL, WALL, WALL ; 3d - tilecoll WALL, WALL, WINDOW, WALL ; 3e + tilecoll WALL, WALL, WINDOW, WALL ; 3d + tilecoll WALL, WALL, WALL, WALL ; 3e tilecoll WALL, WALL, WALL, WALL ; 3f - tilecoll WALL, WALL, WALL, WALL ; 40 diff --git a/data/tilesets/mansion_collision.asm b/data/tilesets/mansion_collision.asm index 5db409be7..2c8edd747 100644 --- a/data/tilesets/mansion_collision.asm +++ b/data/tilesets/mansion_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, FLOOR, FLOOR ; 05 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 06 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, FLOOR ; 04 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 05 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 06 + tilecoll WALL, WALL, FLOOR, FLOOR ; 07 tilecoll WALL, WALL, FLOOR, FLOOR ; 08 tilecoll WALL, WALL, FLOOR, FLOOR ; 09 - tilecoll WALL, WALL, FLOOR, FLOOR ; 0a - tilecoll WALL, WALL, FLOOR, WALL ; 0b - tilecoll FLOOR, WALL, FLOOR, WALL ; 0c - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d - tilecoll WALL, WALL, FLOOR, WALL ; 0e - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0f - tilecoll WALL, WALL, BOOKSHELF, INCENSE_BURNER ; 10 - tilecoll WALL, WALL, WALL, WALL ; 11 - tilecoll WALL, WALL, BOOKSHELF, WALL ; 12 - tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, FLOOR, WALL, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, WALL ; 0a + tilecoll FLOOR, WALL, FLOOR, WALL ; 0b + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, WALL, FLOOR, WALL ; 0d + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0e + tilecoll WALL, WALL, BOOKSHELF, INCENSE_BURNER ; 0f + tilecoll WALL, WALL, WALL, WALL ; 10 + tilecoll WALL, WALL, BOOKSHELF, WALL ; 11 + tilecoll WALL, WALL, WALL, WALL ; 12 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 + tilecoll WALL, FLOOR, WALL, FLOOR ; 14 + tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 15 tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 16 - tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 17 - tilecoll WALL, DOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, BOOKSHELF, WALL ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll FLOOR, WALL, FLOOR, WALL ; 1b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c - tilecoll WALL, WALL, FLOOR, FLOOR ; 1d + tilecoll WALL, DOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, BOOKSHELF, WALL ; 18 + tilecoll WALL, WALL, WALL, WALL ; 19 + tilecoll FLOOR, WALL, FLOOR, WALL ; 1a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b + tilecoll WALL, WALL, FLOOR, FLOOR ; 1c + tilecoll FLOOR, FLOOR, WALL, WALL ; 1d tilecoll FLOOR, FLOOR, WALL, WALL ; 1e tilecoll FLOOR, FLOOR, WALL, WALL ; 1f - tilecoll FLOOR, FLOOR, WALL, WALL ; 20 - tilecoll FLOOR, WALL, FLOOR, WALL ; 21 - tilecoll RIGHT_WALL, LEFT_WALL, WALL, FLOOR ; 22 - tilecoll WALL, WALL, FLOOR, WALL ; 23 - tilecoll WALL, WALL, STAIRCASE, LEFT_WALL ; 24 - tilecoll WALL, WALL, WALL, STAIRCASE ; 25 - tilecoll WALL, WALL, LEFT_WALL, FLOOR ; 26 - tilecoll FLOOR, WALL, FLOOR, WALL ; 27 - tilecoll WALL, WALL, DOOR, WALL ; 28 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 29 + tilecoll FLOOR, WALL, FLOOR, WALL ; 20 + tilecoll RIGHT_WALL, LEFT_WALL, WALL, FLOOR ; 21 + tilecoll WALL, WALL, FLOOR, WALL ; 22 + tilecoll WALL, WALL, STAIRCASE, LEFT_WALL ; 23 + tilecoll WALL, WALL, WALL, STAIRCASE ; 24 + tilecoll WALL, WALL, LEFT_WALL, FLOOR ; 25 + tilecoll FLOOR, WALL, FLOOR, WALL ; 26 + tilecoll WALL, WALL, DOOR, WALL ; 27 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 28 + tilecoll FLOOR, FLOOR, WALL, WALL ; 29 tilecoll FLOOR, FLOOR, WALL, WALL ; 2a - tilecoll FLOOR, FLOOR, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c - tilecoll RIGHT_WALL, LEFT_WALL, RIGHT_WALL, LEFT_WALL ; 2d - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f - tilecoll WALL, WALL, WALL, FLOOR ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll RIGHT_WALL, LEFT_WALL, RIGHT_WALL, LEFT_WALL ; 2c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e + tilecoll WALL, WALL, WALL, FLOOR ; 2f + tilecoll WALL, WALL, FLOOR, WALL ; 30 tilecoll WALL, WALL, FLOOR, WALL ; 31 - tilecoll WALL, WALL, FLOOR, WALL ; 32 - tilecoll WALL, WALL, WALL, WALL ; 33 - tilecoll WALL, WALL, WALL, FLOOR ; 34 - tilecoll WALL, WALL, WALL, WALL ; 35 - tilecoll FLOOR, WALL, WALL, WALL ; 36 - tilecoll WALL, WALL, FLOOR, WALL ; 37 - tilecoll WALL, FLOOR, WALL, WALL ; 38 - tilecoll WALL, WALL, FLOOR, WALL ; 39 - tilecoll WALL, FLOOR, WALL, FLOOR ; 3a - tilecoll FLOOR, WALL, FLOOR, WALL ; 3b + tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll WALL, WALL, WALL, FLOOR ; 33 + tilecoll WALL, WALL, WALL, WALL ; 34 + tilecoll FLOOR, WALL, WALL, WALL ; 35 + tilecoll WALL, WALL, FLOOR, WALL ; 36 + tilecoll WALL, FLOOR, WALL, WALL ; 37 + tilecoll WALL, WALL, FLOOR, WALL ; 38 + tilecoll WALL, FLOOR, WALL, FLOOR ; 39 + tilecoll FLOOR, WALL, FLOOR, WALL ; 3a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d - tilecoll WALL, FLOOR, WALL, WALL ; 3e - tilecoll FLOOR, WALL, WALL, WALL ; 3f - tilecoll FLOOR, FLOOR, WALL, WALL ; 40 + tilecoll WALL, FLOOR, WALL, WALL ; 3d + tilecoll FLOOR, WALL, WALL, WALL ; 3e + tilecoll FLOOR, FLOOR, WALL, WALL ; 3f diff --git a/data/tilesets/mart_collision.asm b/data/tilesets/mart_collision.asm index 80076ac3f..ee4f1e4c1 100644 --- a/data/tilesets/mart_collision.asm +++ b/data/tilesets/mart_collision.asm @@ -1,64 +1,64 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 02 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03 - tilecoll WALL, WALL, FLOOR, FLOOR ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 07 - tilecoll WALL, FLOOR, WALL, FLOOR ; 08 - tilecoll WALL, WALL, FLOOR, COUNTER ; 09 - tilecoll WALL, WALL, FLOOR, FLOOR ; 0a - tilecoll WALL, WALL, COUNTER, FLOOR ; 0b - tilecoll WALL, FLOOR, WALL, FLOOR ; 0c - tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 0d - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 0e - tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 0f - tilecoll FLOOR, WALL, WALL, WALL ; 10 - tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 11 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 12 - tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 13 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 01 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, FLOOR, FLOOR ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 06 + tilecoll WALL, FLOOR, WALL, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, COUNTER ; 08 + tilecoll WALL, WALL, FLOOR, FLOOR ; 09 + tilecoll WALL, WALL, COUNTER, FLOOR ; 0a + tilecoll WALL, FLOOR, WALL, FLOOR ; 0b + tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 0c + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 0d + tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 0e + tilecoll FLOOR, WALL, WALL, WALL ; 0f + tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 10 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 11 + tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 12 + tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 13 tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 14 tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 15 - tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll WALL, WALL, FLOOR, COUNTER ; 18 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 1a - tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 1b - tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, FLOOR, COUNTER ; 17 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 19 + tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 1a + tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 1b + tilecoll WALL, WALL, WALL, WALL ; 1c tilecoll WALL, WALL, WALL, WALL ; 1d - tilecoll WALL, WALL, WALL, WALL ; 1e - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 1f - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 20 - tilecoll FLOOR, WALL, FLOOR, WALL ; 21 - tilecoll WALL, WALL, WALL, WALL ; 22 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 23 - tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 24 - tilecoll WALL, WALL, WALL, WALL ; 25 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 26 - tilecoll WALL, WALL, FLOOR, FLOOR ; 27 - tilecoll WALL, WALL, COUNTER, MART_SHELF ; 28 - tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 29 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2a - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c - tilecoll COUNTER, COUNTER, FLOOR, MART_SHELF ; 2d - tilecoll FLOOR, MART_SHELF, COUNTER, COUNTER ; 2e - tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 2f - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 30 - tilecoll WALL, WALL, WALL, WALL ; 31 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 - tilecoll WALL, WALL, WALL, WALL ; 33 - tilecoll WALL, FLOOR, WALL, WALL ; 34 - tilecoll FLOOR, FLOOR, WALL, WALL ; 35 - tilecoll FLOOR, WALL, WALL, WALL ; 36 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 1e + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 1f + tilecoll FLOOR, WALL, FLOOR, WALL ; 20 + tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 22 + tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 23 + tilecoll WALL, WALL, WALL, WALL ; 24 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 25 + tilecoll WALL, WALL, FLOOR, FLOOR ; 26 + tilecoll WALL, WALL, COUNTER, MART_SHELF ; 27 + tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 28 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll COUNTER, COUNTER, FLOOR, MART_SHELF ; 2c + tilecoll FLOOR, MART_SHELF, COUNTER, COUNTER ; 2d + tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 2e + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 2f + tilecoll WALL, WALL, WALL, WALL ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 + tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll WALL, FLOOR, WALL, WALL ; 33 + tilecoll FLOOR, FLOOR, WALL, WALL ; 34 + tilecoll FLOOR, WALL, WALL, WALL ; 35 + tilecoll FLOOR, WALL, FLOOR, WALL ; 36 tilecoll FLOOR, WALL, FLOOR, WALL ; 37 - tilecoll FLOOR, WALL, FLOOR, WALL ; 38 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 - tilecoll FLOOR, FLOOR, FLOOR, STAIRCASE ; 3a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 + tilecoll FLOOR, FLOOR, FLOOR, STAIRCASE ; 39 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b tilecoll WALL, WALL, WALL, WALL ; 3c tilecoll WALL, WALL, WALL, WALL ; 3d - tilecoll WALL, WALL, WALL, WALL ; 3e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll WALL, WALL, WALL, WALL ; 40 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e + tilecoll WALL, WALL, WALL, WALL ; 3f diff --git a/data/tilesets/omanyte_word_room_collision.asm b/data/tilesets/omanyte_word_room_collision.asm index 138f07143..58bdacc53 100644 --- a/data/tilesets/omanyte_word_room_collision.asm +++ b/data/tilesets/omanyte_word_room_collision.asm @@ -1,4 +1,5 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 @@ -17,20 +18,20 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, WALL, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, WALL ; 1a - tilecoll WALL, FLOOR, WALL, FLOOR ; 1b - tilecoll FLOOR, WALL, FLOOR, WALL ; 1c - tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, WALL ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/park_collision.asm b/data/tilesets/park_collision.asm index c5965e0c9..d24de1ec1 100644 --- a/data/tilesets/park_collision.asm +++ b/data/tilesets/park_collision.asm @@ -1,55 +1,56 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 - tilecoll WALL, WALL, WALL, WALL ; 07 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 08 + tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 07 + tilecoll WALL, WALL, WALL, WALL ; 08 tilecoll WALL, WALL, WALL, WALL ; 09 - tilecoll WALL, WALL, WALL, WALL ; 0a - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0a + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0b + tilecoll WALL, WALL, WALL, WALL ; 0c tilecoll WALL, WALL, WALL, WALL ; 0d - tilecoll WALL, WALL, WALL, WALL ; 0e - tilecoll WALL, WALL, FLOOR, FLOOR ; 0f - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10 - tilecoll WALL, WALL, WALL, FLOOR ; 11 - tilecoll WALL, WALL, FLOOR, FLOOR ; 12 - tilecoll WALL, WALL, FLOOR, WALL ; 13 - tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 14 - tilecoll WALL, FLOOR, WALL, FLOOR ; 15 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 16 - tilecoll FLOOR, WALL, FLOOR, WALL ; 17 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 18 - tilecoll WALL, FLOOR, WALL, WALL ; 19 - tilecoll FLOOR, FLOOR, WALL, WALL ; 1a - tilecoll FLOOR, WALL, WALL, WALL ; 1b - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1c - tilecoll WALL, WALL, WALL, FLOOR ; 1d - tilecoll WALL, WALL, FLOOR, FLOOR ; 1e - tilecoll WALL, WALL, FLOOR, WALL ; 1f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20 - tilecoll WALL, FLOOR, WALL, FLOOR ; 21 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 - tilecoll FLOOR, WALL, FLOOR, WALL ; 23 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 - tilecoll WALL, FLOOR, WALL, WALL ; 25 - tilecoll FLOOR, FLOOR, WALL, WALL ; 26 - tilecoll FLOOR, WALL, WALL, WALL ; 27 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, FLOOR ; 0e + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0f + tilecoll WALL, WALL, WALL, FLOOR ; 10 + tilecoll WALL, WALL, FLOOR, FLOOR ; 11 + tilecoll WALL, WALL, FLOOR, WALL ; 12 + tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 13 + tilecoll WALL, FLOOR, WALL, FLOOR ; 14 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 15 + tilecoll FLOOR, WALL, FLOOR, WALL ; 16 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 17 + tilecoll WALL, FLOOR, WALL, WALL ; 18 + tilecoll FLOOR, FLOOR, WALL, WALL ; 19 + tilecoll FLOOR, WALL, WALL, WALL ; 1a + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1b + tilecoll WALL, WALL, WALL, FLOOR ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d + tilecoll WALL, WALL, FLOOR, WALL ; 1e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f + tilecoll WALL, FLOOR, WALL, FLOOR ; 20 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 + tilecoll FLOOR, WALL, FLOOR, WALL ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll WALL, FLOOR, WALL, WALL ; 24 + tilecoll FLOOR, FLOOR, WALL, WALL ; 25 + tilecoll FLOOR, WALL, WALL, WALL ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 + tilecoll WALL, WALL, WALL, WALL ; 28 tilecoll WALL, WALL, WALL, WALL ; 29 tilecoll WALL, WALL, WALL, WALL ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll WALL, WALL, WALL, WALL ; 2c tilecoll WALL, WALL, WALL, WALL ; 2d tilecoll WALL, WALL, WALL, WALL ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 30 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2f + tilecoll WALL, WALL, WALL, WALL ; 30 tilecoll WALL, WALL, WALL, WALL ; 31 tilecoll WALL, WALL, WALL, WALL ; 32 - tilecoll WALL, WALL, WALL, WALL ; 33 - tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 34 + tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 33 + tilecoll WALL, WALL, WALL, WALL ; 34 tilecoll WALL, WALL, WALL, WALL ; 35 tilecoll WALL, WALL, WALL, WALL ; 36 tilecoll WALL, WALL, WALL, WALL ; 37 @@ -60,5 +61,4 @@ tilecoll WALL, WALL, WALL, WALL ; 3c tilecoll WALL, WALL, WALL, WALL ; 3d tilecoll WALL, WALL, WALL, WALL ; 3e - tilecoll WALL, WALL, WALL, WALL ; 3f - tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 40 + tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 3f diff --git a/data/tilesets/players_house_collision.asm b/data/tilesets/players_house_collision.asm index ed6b70a29..34c8c237b 100644 --- a/data/tilesets/players_house_collision.asm +++ b/data/tilesets/players_house_collision.asm @@ -1,43 +1,44 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WINDOW, WALL, FLOOR, FLOOR ; 02 - tilecoll WALL, WALL, FLOOR, TV ; 03 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, WALL, WALL ; 05 - tilecoll WALL, WALL, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 07 - tilecoll WALL, WALL, WALL, WALL ; 08 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 09 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0a + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll WINDOW, WALL, FLOOR, FLOOR ; 01 + tilecoll WALL, WALL, FLOOR, TV ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll WALL, WALL, WALL, WALL ; 04 + tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 06 + tilecoll WALL, WALL, WALL, WALL ; 07 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 08 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 09 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0a tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0b - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0c - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll WALL, WALL, PC, FLOOR ; 11 - tilecoll WALL, WALL, TV, WALL ; 12 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, TV, FLOOR, WALL ; 14 - tilecoll FLOOR, WALL, FLOOR, WALL ; 15 - tilecoll WALL, WALL, FLOOR, WALL ; 16 - tilecoll FLOOR, WALL, FLOOR, WALL ; 17 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, RADIO, PC ; 19 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a - tilecoll WALL, WALL, RADIO, FLOOR ; 1b - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1c - tilecoll WALL, FLOOR, WALL, FLOOR ; 1d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e - tilecoll WALL, WALL, VIRTUAL_BOY, FLOOR ; 1f - tilecoll WALL, WALL, PC, RADIO ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 - tilecoll WALL, WALL, TV, BOOKSHELF ; 22 - tilecoll WALL, FLOOR, WALL, FLOOR ; 23 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll WALL, WALL, PC, FLOOR ; 10 + tilecoll WALL, WALL, TV, WALL ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 + tilecoll FLOOR, TV, FLOOR, WALL ; 13 + tilecoll FLOOR, WALL, FLOOR, WALL ; 14 + tilecoll WALL, WALL, FLOOR, WALL ; 15 + tilecoll FLOOR, WALL, FLOOR, WALL ; 16 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, RADIO, PC ; 18 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, RADIO, FLOOR ; 1a + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d + tilecoll WALL, WALL, VIRTUAL_BOY, FLOOR ; 1e + tilecoll WALL, WALL, PC, RADIO ; 1f + tilecoll WALL, WALL, WALL, WALL ; 20 + tilecoll WALL, WALL, TV, BOOKSHELF ; 21 + tilecoll WALL, FLOOR, WALL, FLOOR ; 22 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 23 tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 24 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 25 - tilecoll FLOOR, FLOOR, WALL, WALL ; 26 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 - tilecoll WALL, WALL, FLOOR, FLOOR ; 28 + tilecoll FLOOR, FLOOR, WALL, WALL ; 25 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26 + tilecoll WALL, WALL, FLOOR, FLOOR ; 27 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/players_room_collision.asm b/data/tilesets/players_room_collision.asm index 464d80b83..713f06c9c 100644 --- a/data/tilesets/players_room_collision.asm +++ b/data/tilesets/players_room_collision.asm @@ -1,41 +1,42 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03 - tilecoll WALL, WALL, TV, BOOKSHELF ; 04 - tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, TV, BOOKSHELF ; 03 + tilecoll WALL, WALL, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, FLOOR ; 07 tilecoll WALL, WALL, FLOOR, FLOOR ; 08 - tilecoll WALL, WALL, FLOOR, FLOOR ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b - tilecoll WALL, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, WALL, FLOOR, FLOOR ; 0b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e - tilecoll WALL, WALL, FLOOR, FLOOR ; 0f + tilecoll WALL, WALL, FLOOR, FLOOR ; 0e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 - tilecoll WALL, WALL, FLOOR, FLOOR ; 12 + tilecoll WALL, WALL, FLOOR, FLOOR ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, FLOOR ; 14 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 - tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, FLOOR ; 17 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b tilecoll WALL, FLOOR, WALL, FLOOR ; 1c tilecoll WALL, FLOOR, WALL, FLOOR ; 1d tilecoll WALL, FLOOR, WALL, FLOOR ; 1e - tilecoll WALL, FLOOR, WALL, FLOOR ; 1f - tilecoll TOWN_MAP, STAIRCASE, FLOOR, FLOOR ; 20 + tilecoll TOWN_MAP, STAIRCASE, FLOOR, FLOOR ; 1f + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 20 tilecoll FLOOR, WALL, FLOOR, FLOOR ; 21 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 22 - tilecoll FLOOR, WALL, FLOOR, WALL ; 23 + tilecoll FLOOR, WALL, FLOOR, WALL ; 22 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 23 tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 24 tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 25 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 26 + tilecoll FF, FF, FF, FF ; 26 tilecoll FF, FF, FF, FF ; 27 tilecoll FF, FF, FF, FF ; 28 tilecoll FF, FF, FF, FF ; 29 @@ -61,4 +62,3 @@ tilecoll FF, FF, FF, FF ; 3d tilecoll FF, FF, FF, FF ; 3e tilecoll FF, FF, FF, FF ; 3f - tilecoll FF, FF, FF, FF ; 40 diff --git a/data/tilesets/pokecenter_collision.asm b/data/tilesets/pokecenter_collision.asm index 5b776330e..d76860917 100644 --- a/data/tilesets/pokecenter_collision.asm +++ b/data/tilesets/pokecenter_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 - tilecoll WALL, WALL, WALL, FLOOR ; 03 - tilecoll WALL, WALL, FLOOR, WALL ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 06 - tilecoll WALL, COUNTER, FLOOR, FLOOR ; 07 - tilecoll COUNTER, WALL, FLOOR, FLOOR ; 08 - tilecoll WALL, WALL, FLOOR, PC ; 09 - tilecoll WALL, WALL, FLOOR, WALL ; 0a - tilecoll WALL, DOOR, FLOOR, FLOOR ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d - tilecoll FLOOR, WALL, FLOOR, WALL ; 0e - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0f - tilecoll WALL, WALL, FLOOR, WALL ; 10 - tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 11 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 12 - tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 13 - tilecoll WALL, WALL, FLOOR, FLOOR ; 14 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 15 - tilecoll WALL, DOOR, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, WALL ; 17 + tilecoll WALL, WALL, WALL, FLOOR ; 02 + tilecoll WALL, WALL, FLOOR, WALL ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 05 + tilecoll WALL, COUNTER, FLOOR, FLOOR ; 06 + tilecoll COUNTER, WALL, FLOOR, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, PC ; 08 + tilecoll WALL, WALL, FLOOR, WALL ; 09 + tilecoll WALL, DOOR, FLOOR, FLOOR ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c + tilecoll FLOOR, WALL, FLOOR, WALL ; 0d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e + tilecoll WALL, WALL, FLOOR, WALL ; 0f + tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 10 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 11 + tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 12 + tilecoll WALL, WALL, FLOOR, FLOOR ; 13 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 14 + tilecoll WALL, DOOR, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, WALL ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 tilecoll WALL, WALL, WALL, WALL ; 18 tilecoll WALL, WALL, WALL, WALL ; 19 tilecoll WALL, WALL, WALL, WALL ; 1a tilecoll WALL, WALL, WALL, WALL ; 1b tilecoll WALL, WALL, WALL, WALL ; 1c - tilecoll WALL, WALL, WALL, WALL ; 1d + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d tilecoll WALL, WALL, FLOOR, FLOOR ; 1e tilecoll WALL, WALL, FLOOR, FLOOR ; 1f - tilecoll WALL, WALL, FLOOR, FLOOR ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 - tilecoll WALL, WALL, FLOOR, PC ; 22 - tilecoll WALL, WALL, WALL, FLOOR ; 23 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 25 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 26 - tilecoll WALL, WALL, FLOOR, FLOOR ; 27 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 28 - tilecoll WALL, WALL, FLOOR, WALL ; 29 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2a - tilecoll WALL, WALL, WALL, FLOOR ; 2b - tilecoll WALL, DOOR, FLOOR, FLOOR ; 2c - tilecoll WALL, WALL, WALL, WALL ; 2d - tilecoll WALL, WALL, FLOOR, FLOOR ; 2e - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2f - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 30 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 31 - tilecoll WALL, WALL, FLOOR, WALL ; 32 - tilecoll PC, WALL, FLOOR, WALL ; 33 - tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 34 - tilecoll DOOR, WALL, FLOOR, FLOOR ; 35 - tilecoll DOOR, WALL, FLOOR, WALL ; 36 - tilecoll DOOR, WALL, FLOOR, FLOOR ; 37 - tilecoll DOOR, WALL, FLOOR, WALL ; 38 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 39 - tilecoll WALL, WALL, FLOOR, WALL ; 3a - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3b - tilecoll WALL, WALL, FLOOR, WALL ; 3c + tilecoll WALL, WALL, WALL, WALL ; 20 + tilecoll WALL, WALL, FLOOR, PC ; 21 + tilecoll WALL, WALL, WALL, FLOOR ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 24 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 25 + tilecoll WALL, WALL, FLOOR, FLOOR ; 26 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 27 + tilecoll WALL, WALL, FLOOR, WALL ; 28 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29 + tilecoll WALL, WALL, WALL, FLOOR ; 2a + tilecoll WALL, DOOR, FLOOR, FLOOR ; 2b + tilecoll WALL, WALL, WALL, WALL ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2e + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2f + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 30 + tilecoll WALL, WALL, FLOOR, WALL ; 31 + tilecoll PC, WALL, FLOOR, WALL ; 32 + tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 33 + tilecoll DOOR, WALL, FLOOR, FLOOR ; 34 + tilecoll DOOR, WALL, FLOOR, WALL ; 35 + tilecoll DOOR, WALL, FLOOR, FLOOR ; 36 + tilecoll DOOR, WALL, FLOOR, WALL ; 37 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 38 + tilecoll WALL, WALL, FLOOR, WALL ; 39 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3a + tilecoll WALL, WALL, FLOOR, WALL ; 3b + tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3c tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3d - tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3e - tilecoll WARP_PANEL, WARP_PANEL, FLOOR, FLOOR ; 3f - tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 40 + tilecoll WARP_PANEL, WARP_PANEL, FLOOR, FLOOR ; 3e + tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 3f diff --git a/data/tilesets/pokecom_center_collision.asm b/data/tilesets/pokecom_center_collision.asm index 1ecef84de..2272acfd4 100644 --- a/data/tilesets/pokecom_center_collision.asm +++ b/data/tilesets/pokecom_center_collision.asm @@ -1,38 +1,39 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 03 - tilecoll WALL, WALL, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, WALL, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 - tilecoll WALL, WALL, WALL, FLOOR ; 07 - tilecoll WALL, WALL, FLOOR, PC ; 08 - tilecoll WALL, WALL, WALL, FLOOR ; 09 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, FLOOR, FLOOR ; 03 + tilecoll WALL, WALL, WALL, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll WALL, WALL, WALL, FLOOR ; 06 + tilecoll WALL, WALL, FLOOR, PC ; 07 + tilecoll WALL, WALL, WALL, FLOOR ; 08 + tilecoll WALL, COUNTER, FLOOR, FLOOR ; 09 tilecoll WALL, COUNTER, FLOOR, FLOOR ; 0a - tilecoll WALL, COUNTER, FLOOR, FLOOR ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll WALL, WALL, FLOOR, WALL ; 0d + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll WALL, WALL, FLOOR, WALL ; 0c + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0e - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0f - tilecoll WALL, WALL, FLOOR, WALL ; 10 - tilecoll WALL, WALL, FLOOR, FLOOR ; 11 - tilecoll WALL, WALL, WALL, FLOOR ; 12 + tilecoll WALL, WALL, FLOOR, WALL ; 0f + tilecoll WALL, WALL, FLOOR, FLOOR ; 10 + tilecoll WALL, WALL, WALL, FLOOR ; 11 + tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, WALL, WALL ; 13 tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, WALL, WALL, WALL ; 15 - tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, WALL, WALL ; 16 tilecoll WALL, WALL, WALL, WALL ; 17 tilecoll WALL, WALL, WALL, WALL ; 18 tilecoll WALL, WALL, WALL, WALL ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll WALL, WALL, FLOOR, WALL ; 1b + tilecoll WALL, WALL, FLOOR, WALL ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1b tilecoll WALL, WALL, WALL, WALL ; 1c tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f - tilecoll WALL, WALL, WALL, WALL ; 20 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll WALL, WALL, WALL, WALL ; 23 tilecoll WALL, WALL, WALL, WALL ; 24 tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 @@ -40,25 +41,24 @@ tilecoll WALL, WALL, WALL, WALL ; 28 tilecoll WALL, WALL, WALL, WALL ; 29 tilecoll WALL, WALL, WALL, WALL ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c - tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 2d - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e - tilecoll WALL, WALL, FLOOR, FLOOR ; 2f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 2c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2d + tilecoll WALL, WALL, FLOOR, FLOOR ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f tilecoll WALL, WALL, WALL, WALL ; 30 tilecoll WALL, WALL, WALL, WALL ; 31 tilecoll WALL, WALL, WALL, WALL ; 32 - tilecoll WALL, WALL, WALL, WALL ; 33 - tilecoll FLOOR, FLOOR, WALL, WALL ; 34 - tilecoll WALL, WALL, WALL, WALL ; 35 - tilecoll WALL, WALL, FLOOR, FLOOR ; 36 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37 - tilecoll WALL, WALL, FLOOR, FLOOR ; 38 + tilecoll FLOOR, FLOOR, WALL, WALL ; 33 + tilecoll WALL, WALL, WALL, WALL ; 34 + tilecoll WALL, WALL, FLOOR, FLOOR ; 35 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 36 + tilecoll WALL, WALL, FLOOR, FLOOR ; 37 + tilecoll WALL, WALL, WALL, WALL ; 38 tilecoll WALL, WALL, WALL, WALL ; 39 - tilecoll WALL, WALL, WALL, WALL ; 3a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b - tilecoll WALL, WALL, FLOOR, FLOOR ; 3c - tilecoll WALL, WALL, WALL, WALL ; 3d - tilecoll FLOOR, FLOOR, WALL, WALL ; 3e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a + tilecoll WALL, WALL, FLOOR, FLOOR ; 3b + tilecoll WALL, WALL, WALL, WALL ; 3c + tilecoll FLOOR, FLOOR, WALL, WALL ; 3d + tilecoll WALL, WALL, WALL, WALL ; 3e tilecoll WALL, WALL, WALL, WALL ; 3f - tilecoll WALL, WALL, WALL, WALL ; 40 diff --git a/data/tilesets/port_collision.asm b/data/tilesets/port_collision.asm index fb37ee11e..8abc712c9 100644 --- a/data/tilesets/port_collision.asm +++ b/data/tilesets/port_collision.asm @@ -1,64 +1,64 @@ - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 - tilecoll BUOY, WATER, BUOY, WATER ; 03 - tilecoll WATER, BUOY, WATER, BUOY ; 04 - tilecoll LADDER, LADDER, LADDER, LADDER ; 05 - tilecoll WALL, WALL, WALL, WATER ; 06 - tilecoll WALL, WALL, WATER, WATER ; 07 - tilecoll WALL, WALL, WATER, WALL ; 08 - tilecoll WATER, WATER, WATER, WATER ; 09 - tilecoll WALL, WATER, WALL, WATER ; 0a - tilecoll WATER, WATER, WATER, WATER ; 0b - tilecoll WATER, WALL, WATER, WALL ; 0c - tilecoll WATER, WATER, FLOOR, FLOOR ; 0d - tilecoll WALL, WATER, WALL, WALL ; 0e - tilecoll WATER, WATER, WALL, WALL ; 0f - tilecoll WATER, WALL, WALL, WALL ; 10 - tilecoll WATER, WATER, WATER, WATER ; 11 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 - tilecoll WATER, WATER, WATER, WATER ; 13 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll BUOY, WATER, BUOY, WATER ; 02 + tilecoll WATER, BUOY, WATER, BUOY ; 03 + tilecoll LADDER, LADDER, LADDER, LADDER ; 04 + tilecoll WALL, WALL, WALL, WATER ; 05 + tilecoll WALL, WALL, WATER, WATER ; 06 + tilecoll WALL, WALL, WATER, WALL ; 07 + tilecoll WATER, WATER, WATER, WATER ; 08 + tilecoll WALL, WATER, WALL, WATER ; 09 + tilecoll WATER, WATER, WATER, WATER ; 0a + tilecoll WATER, WALL, WATER, WALL ; 0b + tilecoll WATER, WATER, FLOOR, FLOOR ; 0c + tilecoll WALL, WATER, WALL, WALL ; 0d + tilecoll WATER, WATER, WALL, WALL ; 0e + tilecoll WATER, WALL, WALL, WALL ; 0f + tilecoll WATER, WATER, WATER, WATER ; 10 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 + tilecoll WATER, WATER, WATER, WATER ; 12 + tilecoll WATER, FLOOR, WATER, FLOOR ; 13 tilecoll WATER, FLOOR, WATER, FLOOR ; 14 - tilecoll WATER, FLOOR, WATER, FLOOR ; 15 + tilecoll WATER, WATER, WATER, WATER ; 15 tilecoll WATER, WATER, WATER, WATER ; 16 - tilecoll WATER, WATER, WATER, WATER ; 17 - tilecoll WATER, FLOOR, WALL, WARP_CARPET_DOWN ; 18 - tilecoll WATER, WATER, WALL, WALL ; 19 - tilecoll WATER, FLOOR, WALL, WALL ; 1a - tilecoll WALL, WALL, WALL, WALL ; 1b - tilecoll WALL, WATER, WALL, WALL ; 1c + tilecoll WATER, FLOOR, WALL, WARP_CARPET_DOWN ; 17 + tilecoll WATER, WATER, WALL, WALL ; 18 + tilecoll WATER, FLOOR, WALL, WALL ; 19 + tilecoll WALL, WALL, WALL, WALL ; 1a + tilecoll WALL, WATER, WALL, WALL ; 1b + tilecoll WATER_21, WATER_21, WALL, WALL ; 1c tilecoll WATER_21, WATER_21, WALL, WALL ; 1d tilecoll WATER_21, WATER_21, WALL, WALL ; 1e - tilecoll WATER_21, WATER_21, WALL, WALL ; 1f - tilecoll WALL, WALL, WALL, WATER ; 20 - tilecoll WALL, FLOOR, WATER, WARP_CARPET_DOWN ; 21 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 - tilecoll BUOY, BUOY, BUOY, WATER ; 23 - tilecoll BUOY, BUOY, WATER, BUOY ; 24 + tilecoll WALL, WALL, WALL, WATER ; 1f + tilecoll WALL, FLOOR, WATER, WARP_CARPET_DOWN ; 20 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 + tilecoll BUOY, BUOY, BUOY, WATER ; 22 + tilecoll BUOY, BUOY, WATER, BUOY ; 23 + tilecoll BUOY, BUOY, WATER, WATER ; 24 tilecoll BUOY, BUOY, WATER, WATER ; 25 - tilecoll BUOY, BUOY, WATER, WATER ; 26 - tilecoll LADDER, LADDER, LADDER, LADDER ; 27 - tilecoll FLOOR, FLOOR, WATER, WATER ; 28 - tilecoll FLOOR, FLOOR, FLOOR, WATER ; 29 - tilecoll FLOOR, FLOOR, WATER, FLOOR ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll WALL, WALL, FLOOR, FLOOR ; 2c - tilecoll FLOOR, WATER, FLOOR, FLOOR ; 2d - tilecoll WATER, FLOOR, FLOOR, FLOOR ; 2e - tilecoll FLOOR, WATER, FLOOR, WATER ; 2f - tilecoll WATER, FLOOR, WATER, FLOOR ; 30 - tilecoll FLOOR, FLOOR, WATER, WATER ; 31 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 - tilecoll WALL, FLOOR, WALL, FLOOR ; 33 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 34 - tilecoll FLOOR, WATER, FLOOR, WATER ; 35 - tilecoll WALL, WALL, FLOOR, LADDER ; 36 - tilecoll WATER, WATER, WATER, WATER ; 37 - tilecoll FLOOR, WATER, FLOOR, WATER ; 38 - tilecoll WATER, FLOOR, WATER, FLOOR ; 39 - tilecoll WATER, WATER, FLOOR, FLOOR ; 3a + tilecoll LADDER, LADDER, LADDER, LADDER ; 26 + tilecoll FLOOR, FLOOR, WATER, WATER ; 27 + tilecoll FLOOR, FLOOR, FLOOR, WATER ; 28 + tilecoll FLOOR, FLOOR, WATER, FLOOR ; 29 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll WALL, WALL, FLOOR, FLOOR ; 2b + tilecoll FLOOR, WATER, FLOOR, FLOOR ; 2c + tilecoll WATER, FLOOR, FLOOR, FLOOR ; 2d + tilecoll FLOOR, WATER, FLOOR, WATER ; 2e + tilecoll WATER, FLOOR, WATER, FLOOR ; 2f + tilecoll FLOOR, FLOOR, WATER, WATER ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 + tilecoll WALL, FLOOR, WALL, FLOOR ; 32 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 33 + tilecoll FLOOR, WATER, FLOOR, WATER ; 34 + tilecoll WALL, WALL, FLOOR, LADDER ; 35 + tilecoll WATER, WATER, WATER, WATER ; 36 + tilecoll FLOOR, WATER, FLOOR, WATER ; 37 + tilecoll WATER, FLOOR, WATER, FLOOR ; 38 + tilecoll WATER, WATER, FLOOR, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3a tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3b tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3c tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3d tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3e tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3f - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 40 diff --git a/data/tilesets/radio_tower_collision.asm b/data/tilesets/radio_tower_collision.asm index 1713eb438..2c2813047 100644 --- a/data/tilesets/radio_tower_collision.asm +++ b/data/tilesets/radio_tower_collision.asm @@ -1,64 +1,64 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll WALL, WALL, FLOOR, FLOOR ; 03 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, FLOOR, FLOOR ; 05 - tilecoll FLOOR, FLOOR, WALL, COUNTER ; 06 - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 07 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 08 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 09 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 0a - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 0d - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0e - tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 0f - tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 10 - tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 11 - tilecoll WALL, WALL, FLOOR, FLOOR ; 12 - tilecoll WALL, WALL, PC, FLOOR ; 13 + tilecoll WALL, WALL, FLOOR, FLOOR ; 02 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03 + tilecoll WALL, WALL, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, WALL, COUNTER ; 05 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 06 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 07 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 08 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 09 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 0e + tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 0f + tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 10 + tilecoll WALL, WALL, FLOOR, FLOOR ; 11 + tilecoll WALL, WALL, PC, FLOOR ; 12 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15 - tilecoll FLOOR, FLOOR, WALL, WALL ; 16 - tilecoll WALL, WALL, WALL, WALL ; 17 - tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 18 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, COUNTER ; 1a - tilecoll WALL, COUNTER, FLOOR, COUNTER ; 1b - tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 1c - tilecoll FLOOR, WALL, FLOOR, WALL ; 1d - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 1e - tilecoll WALL, WALL, FLOOR, FLOOR ; 1f - tilecoll WALL, FLOOR, WALL, FLOOR ; 20 - tilecoll FLOOR, WALL, FLOOR, WALL ; 21 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 22 - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 23 - tilecoll WALL, WALL, WALL, WALL ; 24 - tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 25 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 26 - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 27 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 - tilecoll WALL, WALL, FLOOR, WALL ; 29 - tilecoll FLOOR, WALL, FLOOR, WALL ; 2a - tilecoll WALL, WALL, FLOOR, FLOOR ; 2b - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d - tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2e - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2f - tilecoll WALL, WALL, WALL, WALL ; 30 - tilecoll WALL, FLOOR, WALL, FLOOR ; 31 - tilecoll WALL, WALL, FLOOR, WALL ; 32 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 33 - tilecoll WALL, WALL, WALL, FLOOR ; 34 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 35 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 - tilecoll WALL, WALL, FLOOR, FLOOR ; 37 - tilecoll FLOOR, WALL, FLOOR, WALL ; 38 - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 39 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b - tilecoll WALL, WALL, WALL, WALL ; 3c - tilecoll WALL, FLOOR, WALL, FLOOR ; 3d - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3e - tilecoll FLOOR, WALL, FLOOR, WALL ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 + tilecoll FLOOR, FLOOR, WALL, WALL ; 15 + tilecoll WALL, WALL, WALL, WALL ; 16 + tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 17 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, COUNTER ; 19 + tilecoll WALL, COUNTER, FLOOR, COUNTER ; 1a + tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 1b + tilecoll FLOOR, WALL, FLOOR, WALL ; 1c + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 1d + tilecoll WALL, WALL, FLOOR, FLOOR ; 1e + tilecoll WALL, FLOOR, WALL, FLOOR ; 1f + tilecoll FLOOR, WALL, FLOOR, WALL ; 20 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 21 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 22 + tilecoll WALL, WALL, WALL, WALL ; 23 + tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 24 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 25 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 + tilecoll WALL, WALL, FLOOR, WALL ; 28 + tilecoll FLOOR, WALL, FLOOR, WALL ; 29 + tilecoll WALL, WALL, FLOOR, FLOOR ; 2a + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2d + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll WALL, FLOOR, WALL, FLOOR ; 30 + tilecoll WALL, WALL, FLOOR, WALL ; 31 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 32 + tilecoll WALL, WALL, WALL, FLOOR ; 33 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 + tilecoll WALL, WALL, FLOOR, FLOOR ; 36 + tilecoll FLOOR, WALL, FLOOR, WALL ; 37 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 38 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll WALL, FLOOR, WALL, FLOOR ; 3c + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3d + tilecoll FLOOR, WALL, FLOOR, WALL ; 3e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f diff --git a/data/tilesets/ruins_of_alph_collision.asm b/data/tilesets/ruins_of_alph_collision.asm index 8c65340ab..fd7447583 100644 --- a/data/tilesets/ruins_of_alph_collision.asm +++ b/data/tilesets/ruins_of_alph_collision.asm @@ -1,64 +1,64 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, FLOOR ; 02 - tilecoll WALL, WALL, FLOOR, WALL ; 03 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll WALL, WALL, WALL, FLOOR ; 01 + tilecoll WALL, WALL, FLOOR, WALL ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, FLOOR ; 06 + tilecoll WALL, WALL, WALL, FLOOR ; 05 + tilecoll WALL, WALL, FLOOR, FLOOR ; 06 tilecoll WALL, WALL, FLOOR, FLOOR ; 07 - tilecoll WALL, WALL, FLOOR, FLOOR ; 08 - tilecoll WALL, WALL, FLOOR, WALL ; 09 - tilecoll WALL, FLOOR, WALL, WALL ; 0a + tilecoll WALL, WALL, FLOOR, WALL ; 08 + tilecoll WALL, FLOOR, WALL, WALL ; 09 + tilecoll FLOOR, FLOOR, WALL, WALL ; 0a tilecoll FLOOR, FLOOR, WALL, WALL ; 0b - tilecoll FLOOR, FLOOR, WALL, WALL ; 0c - tilecoll FLOOR, WALL, WALL, WALL ; 0d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e - tilecoll WALL, FLOOR, WALL, FLOOR ; 0f - tilecoll FLOOR, WALL, FLOOR, WALL ; 10 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 11 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 12 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14 - tilecoll WALL, FLOOR, WALL, WALL ; 15 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 16 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 17 - tilecoll FLOOR, WALL, WALL, WALL ; 18 - tilecoll WALL, WALL, WALL, PIT ; 19 - tilecoll WALL, WALL, PIT, WALL ; 1a - tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 1b - tilecoll WALL, FLOOR, WALL, FLOOR ; 1c - tilecoll FLOOR, WALL, FLOOR, WALL ; 1d - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1e - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1f - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 20 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 21 - tilecoll WALL, FLOOR, WALL, FLOOR ; 22 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 23 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 24 + tilecoll FLOOR, WALL, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll WALL, FLOOR, WALL, FLOOR ; 0e + tilecoll FLOOR, WALL, FLOOR, WALL ; 0f + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 11 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 13 + tilecoll WALL, FLOOR, WALL, WALL ; 14 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 15 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 16 + tilecoll FLOOR, WALL, WALL, WALL ; 17 + tilecoll WALL, WALL, WALL, PIT ; 18 + tilecoll WALL, WALL, PIT, WALL ; 19 + tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 1a + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b + tilecoll FLOOR, WALL, FLOOR, WALL ; 1c + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1d + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1e + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1f + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 20 + tilecoll WALL, FLOOR, WALL, FLOOR ; 21 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 22 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 23 + tilecoll WALL, WALL, WALL, WALL ; 24 tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 tilecoll WALL, WALL, WALL, WALL ; 27 tilecoll WALL, WALL, WALL, WALL ; 28 tilecoll WALL, WALL, WALL, WALL ; 29 tilecoll WALL, WALL, WALL, WALL ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 2c - tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 2d + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 2b + tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d tilecoll WALL, WALL, FLOOR, FLOOR ; 2e - tilecoll WALL, WALL, FLOOR, FLOOR ; 2f - tilecoll FLOOR, FLOOR, FLOOR, PIT ; 30 - tilecoll CAVE, WALL, FLOOR, FLOOR ; 31 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 32 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 33 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 - tilecoll WALL, WALL, WALL, PIT ; 35 - tilecoll WALL, WALL, PIT, WALL ; 36 + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 2f + tilecoll CAVE, WALL, FLOOR, FLOOR ; 30 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 31 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 32 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 + tilecoll WALL, WALL, WALL, PIT ; 34 + tilecoll WALL, WALL, PIT, WALL ; 35 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 - tilecoll FLOOR, FLOOR, GRASS_4A, FLOOR ; 39 - tilecoll FLOOR, FLOOR, GRASS_4B, FLOOR ; 3a - tilecoll FLOOR, FLOOR, CUT_28, FLOOR ; 3b - tilecoll FLOOR, FLOOR, WATER, FLOOR ; 3c - tilecoll 64, FLOOR, WATERFALL_UP, FLOOR ; 3d - tilecoll 65, FLOOR, WATERFALL, FLOOR ; 3e - tilecoll WATERFALL_UP, FLOOR, WARP_CARPET_DOWN, FLOOR ; 3f - tilecoll WATERFALL, FLOOR, DOOR, FLOOR ; 40 + tilecoll FLOOR, FLOOR, GRASS_4A, FLOOR ; 38 + tilecoll FLOOR, FLOOR, GRASS_4B, FLOOR ; 39 + tilecoll FLOOR, FLOOR, CUT_28, FLOOR ; 3a + tilecoll FLOOR, FLOOR, WATER, FLOOR ; 3b + tilecoll 64, FLOOR, WATERFALL_UP, FLOOR ; 3c + tilecoll 65, FLOOR, WATERFALL, FLOOR ; 3d + tilecoll WATERFALL_UP, FLOOR, WARP_CARPET_DOWN, FLOOR ; 3e + tilecoll WATERFALL, FLOOR, DOOR, FLOOR ; 3f diff --git a/data/tilesets/tower_collision.asm b/data/tilesets/tower_collision.asm index 9d02e9640..30e74a56f 100644 --- a/data/tilesets/tower_collision.asm +++ b/data/tilesets/tower_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 02 tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 03 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 04 - tilecoll WALL, WALL, WALL, FLOOR ; 05 - tilecoll WALL, WALL, FLOOR, FLOOR ; 06 - tilecoll WALL, WALL, FLOOR, WALL ; 07 - tilecoll WALL, WALL, WALL, WALL ; 08 - tilecoll WALL, FLOOR, WALL, FLOOR ; 09 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a - tilecoll FLOOR, WALL, FLOOR, WALL ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll WALL, FLOOR, WALL, WALL ; 0d - tilecoll FLOOR, FLOOR, WALL, WALL ; 0e - tilecoll FLOOR, WALL, WALL, WALL ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll FLOOR, WALL, FLOOR, WALL ; 11 + tilecoll WALL, WALL, WALL, FLOOR ; 04 + tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll WALL, WALL, FLOOR, WALL ; 06 + tilecoll WALL, WALL, WALL, WALL ; 07 + tilecoll WALL, FLOOR, WALL, FLOOR ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll FLOOR, WALL, FLOOR, WALL ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll WALL, FLOOR, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, WALL, WALL, WALL ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll FLOOR, WALL, FLOOR, WALL ; 10 + tilecoll WALL, FLOOR, WALL, FLOOR ; 11 tilecoll WALL, FLOOR, WALL, FLOOR ; 12 - tilecoll WALL, FLOOR, WALL, FLOOR ; 13 - tilecoll FLOOR, WALL, FLOOR, WALL ; 14 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 16 - tilecoll WALL, FLOOR, WALL, WALL ; 17 - tilecoll FLOOR, WALL, WALL, WALL ; 18 - tilecoll WALL, WALL, WALL, WALL ; 19 - tilecoll WALL, FLOOR, WALL, FLOOR ; 1a - tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, WALL, FLOOR, WALL ; 13 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 14 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 15 + tilecoll WALL, FLOOR, WALL, WALL ; 16 + tilecoll FLOOR, WALL, WALL, WALL ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll WALL, FLOOR, WALL, FLOOR ; 19 + tilecoll FLOOR, WALL, FLOOR, WALL ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1b tilecoll WALL, WALL, WALL, WALL ; 1c - tilecoll WALL, WALL, WALL, WALL ; 1d - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 1e - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 1f + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 1d + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 1e + tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 1f tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 20 - tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 21 - tilecoll WALL, WALL, WALL, FLOOR ; 22 - tilecoll WALL, WALL, FLOOR, WALL ; 23 - tilecoll WALL, WALL, WALL, WALL ; 24 - tilecoll FLOOR, FLOOR, WARP_PANEL, FLOOR ; 25 - tilecoll WALL, WALL, PIT, FLOOR ; 26 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 27 - tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, WALL, FLOOR ; 21 + tilecoll WALL, WALL, FLOOR, WALL ; 22 + tilecoll WALL, WALL, WALL, WALL ; 23 + tilecoll FLOOR, FLOOR, WARP_PANEL, FLOOR ; 24 + tilecoll WALL, WALL, PIT, FLOOR ; 25 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 26 + tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 27 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll WALL, HOP_LEFT, WALL, WALL ; 2c - tilecoll HOP_RIGHT, WALL, WALL, WALL ; 2d - tilecoll WALL, WALL, FLOOR, FLOOR ; 2e - tilecoll WALL, WALL, WALL, FLOOR ; 2f - tilecoll WALL, WALL, FLOOR, WALL ; 30 - tilecoll WALL, FLOOR, WALL, FLOOR ; 31 - tilecoll FLOOR, WALL, FLOOR, WALL ; 32 - tilecoll WALL, WALL, FLOOR, FLOOR ; 33 - tilecoll WALL, WALL, WALL, FLOOR ; 34 - tilecoll WALL, WALL, FLOOR, WALL ; 35 - tilecoll WALL, FLOOR, WALL, FLOOR ; 36 - tilecoll FLOOR, WALL, FLOOR, WALL ; 37 - tilecoll PIT, PIT, FLOOR, FLOOR ; 38 - tilecoll FLOOR, PIT, FLOOR, PIT ; 39 - tilecoll PIT, FLOOR, PIT, FLOOR ; 3a - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3b - tilecoll WALL, WALL, FLOOR, FLOOR ; 3c - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 3d - tilecoll WALL, HOP_DOWN, WALL, WALL ; 3e - tilecoll HOP_DOWN, WALL, WALL, WALL ; 3f - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 40 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll WALL, HOP_LEFT, WALL, WALL ; 2b + tilecoll HOP_RIGHT, WALL, WALL, WALL ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d + tilecoll WALL, WALL, WALL, FLOOR ; 2e + tilecoll WALL, WALL, FLOOR, WALL ; 2f + tilecoll WALL, FLOOR, WALL, FLOOR ; 30 + tilecoll FLOOR, WALL, FLOOR, WALL ; 31 + tilecoll WALL, WALL, FLOOR, FLOOR ; 32 + tilecoll WALL, WALL, WALL, FLOOR ; 33 + tilecoll WALL, WALL, FLOOR, WALL ; 34 + tilecoll WALL, FLOOR, WALL, FLOOR ; 35 + tilecoll FLOOR, WALL, FLOOR, WALL ; 36 + tilecoll PIT, PIT, FLOOR, FLOOR ; 37 + tilecoll FLOOR, PIT, FLOOR, PIT ; 38 + tilecoll PIT, FLOOR, PIT, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3a + tilecoll WALL, WALL, FLOOR, FLOOR ; 3b + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 3c + tilecoll WALL, HOP_DOWN, WALL, WALL ; 3d + tilecoll HOP_DOWN, WALL, WALL, WALL ; 3e + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3f diff --git a/data/tilesets/traditional_house_collision.asm b/data/tilesets/traditional_house_collision.asm index 95cb1c21d..72db9bd42 100644 --- a/data/tilesets/traditional_house_collision.asm +++ b/data/tilesets/traditional_house_collision.asm @@ -1,64 +1,64 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, RADIO, FLOOR ; 02 - tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 03 - tilecoll WALL, WALL, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll WALL, WALL, RADIO, FLOOR ; 01 + tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 02 + tilecoll WALL, WALL, FLOOR, FLOOR ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 07 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 08 - tilecoll WALL, WALL, FLOOR, FLOOR ; 09 - tilecoll WALL, WALL, WALL, WALL ; 0a - tilecoll FLOOR, WALL, FLOOR, WALL ; 0b - tilecoll WALL, FLOOR, WALL, FLOOR ; 0c - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 06 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, WALL, WALL ; 09 + tilecoll FLOOR, WALL, FLOOR, WALL ; 0a + tilecoll WALL, FLOOR, WALL, FLOOR ; 0b + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 12 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 13 - tilecoll WALL, WALL, INCENSE_BURNER, BOOKSHELF ; 14 - tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 11 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 12 + tilecoll WALL, WALL, INCENSE_BURNER, BOOKSHELF ; 13 + tilecoll WALL, WALL, FLOOR, FLOOR ; 14 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15 tilecoll FLOOR, WALL, FLOOR, FLOOR ; 16 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17 - tilecoll WALL, WALL, WALL, WALL ; 18 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1a - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1c - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1f + tilecoll WALL, WALL, WALL, WALL ; 17 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1a + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 22 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 23 - tilecoll WALL, WALL, RADIO, FLOOR ; 24 - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 25 - tilecoll WALL, WALL, FLOOR, FLOOR ; 26 - tilecoll FLOOR, FLOOR, WALL, WALL ; 27 - tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 28 - tilecoll WALL, WALL, FLOOR, FLOOR ; 29 - tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 21 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 22 + tilecoll WALL, WALL, RADIO, FLOOR ; 23 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 24 + tilecoll WALL, WALL, FLOOR, FLOOR ; 25 + tilecoll FLOOR, FLOOR, WALL, WALL ; 26 + tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 27 + tilecoll WALL, WALL, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c - tilecoll FLOOR, FLOOR, HOP_DOWN, HOP_DOWN ; 2d - tilecoll WALL, WALL, FLOOR, FLOOR ; 2e - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2f - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 30 - tilecoll WALL, WALL, FLOOR, FLOOR ; 31 + tilecoll FLOOR, FLOOR, HOP_DOWN, HOP_DOWN ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2e + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2f + tilecoll WALL, WALL, FLOOR, FLOOR ; 30 + tilecoll WALL, WALL, WALL, WALL ; 31 tilecoll WALL, WALL, WALL, WALL ; 32 - tilecoll WALL, WALL, WALL, WALL ; 33 + tilecoll WALL, WALL, WALL, FLOOR ; 33 tilecoll WALL, WALL, WALL, FLOOR ; 34 - tilecoll WALL, WALL, WALL, FLOOR ; 35 - tilecoll WALL, WALL, FLOOR, FLOOR ; 36 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37 - tilecoll WALL, WALL, FLOOR, WALL ; 38 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 39 - tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 3a - tilecoll 04, 03, 03, 03 ; 3b - tilecoll 03, 03, 03, 03 ; 3c - tilecoll 03, 03, 04, 04 ; 3d - tilecoll 04, 04, 04, 04 ; 3e - tilecoll 03, 03, 03, 03 ; 3f - tilecoll WARP_CARPET_DOWN, 04, 03, 03 ; 40 + tilecoll WALL, WALL, FLOOR, FLOOR ; 35 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 36 + tilecoll WALL, WALL, FLOOR, WALL ; 37 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 38 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 39 + tilecoll 04, 03, 03, 03 ; 3a + tilecoll 03, 03, 03, 03 ; 3b + tilecoll 03, 03, 04, 04 ; 3c + tilecoll 04, 04, 04, 04 ; 3d + tilecoll 03, 03, 03, 03 ; 3e + tilecoll WARP_CARPET_DOWN, 04, 03, 03 ; 3f diff --git a/data/tilesets/train_station_collision.asm b/data/tilesets/train_station_collision.asm index 55b147237..a6a4b1ace 100644 --- a/data/tilesets/train_station_collision.asm +++ b/data/tilesets/train_station_collision.asm @@ -1,64 +1,64 @@ - tilecoll FF, FF, FF, FF ; 01 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 02 - tilecoll UP_WALL, FLOOR, UP_WALL, FLOOR ; 03 + tilecoll FF, FF, FF, FF ; 00 + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 01 + tilecoll UP_WALL, FLOOR, UP_WALL, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, WALL, WALL ; 07 - tilecoll WALL, FLOOR, WALL, FLOOR ; 08 - tilecoll WALL, FLOOR, WALL, WALL ; 09 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0a - tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c - tilecoll WALL, FLOOR, WALL, FLOOR ; 0d - tilecoll WALL, WALL, WALL, WALL ; 0e - tilecoll FLOOR, WALL, FLOOR, WALL ; 0f + tilecoll FLOOR, FLOOR, WALL, WALL ; 06 + tilecoll WALL, FLOOR, WALL, FLOOR ; 07 + tilecoll WALL, FLOOR, WALL, WALL ; 08 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b + tilecoll WALL, FLOOR, WALL, FLOOR ; 0c + tilecoll WALL, WALL, WALL, WALL ; 0d + tilecoll FLOOR, WALL, FLOOR, WALL ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll WALL, WALL, WALL, WALL ; 11 - tilecoll WALL, WALL, DOOR, WALL ; 12 - tilecoll WALL, WALL, WALL, DOOR ; 13 + tilecoll WALL, WALL, DOOR, WALL ; 11 + tilecoll WALL, WALL, WALL, DOOR ; 12 + tilecoll WALL, WALL, WALL, WALL ; 13 tilecoll WALL, WALL, WALL, WALL ; 14 tilecoll WALL, WALL, WALL, WALL ; 15 tilecoll WALL, WALL, WALL, WALL ; 16 tilecoll WALL, WALL, WALL, WALL ; 17 - tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1a tilecoll WALL, WALL, WALL, WALL ; 1b - tilecoll WALL, WALL, WALL, WALL ; 1c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d - tilecoll WALL, FLOOR, WALL, FLOOR ; 1e - tilecoll FLOOR, WALL, FLOOR, WALL ; 1f - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 - tilecoll WALL, FLOOR, WALL, FLOOR ; 22 - tilecoll FLOOR, WALL, FLOOR, WALL ; 23 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c + tilecoll WALL, FLOOR, WALL, FLOOR ; 1d + tilecoll FLOOR, WALL, FLOOR, WALL ; 1e + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1f + tilecoll WALL, WALL, WALL, WALL ; 20 + tilecoll WALL, FLOOR, WALL, FLOOR ; 21 + tilecoll FLOOR, WALL, FLOOR, WALL ; 22 + tilecoll WALL, WALL, FLOOR, FLOOR ; 23 tilecoll WALL, WALL, FLOOR, FLOOR ; 24 tilecoll WALL, WALL, FLOOR, FLOOR ; 25 - tilecoll WALL, WALL, FLOOR, FLOOR ; 26 - tilecoll WALL, FLOOR, WALL, FLOOR ; 27 - tilecoll FLOOR, WALL, FLOOR, WALL ; 28 - tilecoll WALL, WALL, WALL, FLOOR ; 29 - tilecoll WALL, WALL, FLOOR, WALL ; 2a - tilecoll WALL, FLOOR, WALL, FLOOR ; 2b + tilecoll WALL, FLOOR, WALL, FLOOR ; 26 + tilecoll FLOOR, WALL, FLOOR, WALL ; 27 + tilecoll WALL, WALL, WALL, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, WALL ; 29 + tilecoll WALL, FLOOR, WALL, FLOOR ; 2a + tilecoll FLOOR, WALL, FLOOR, WALL ; 2b tilecoll FLOOR, WALL, FLOOR, WALL ; 2c tilecoll FLOOR, WALL, FLOOR, WALL ; 2d - tilecoll FLOOR, WALL, FLOOR, WALL ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll WALL, WALL, WALL, WALL ; 2e + tilecoll WALL, WALL, FLOOR, FLOOR ; 2f tilecoll WALL, WALL, FLOOR, FLOOR ; 30 - tilecoll WALL, WALL, FLOOR, FLOOR ; 31 - tilecoll WALL, FLOOR, WALL, FLOOR ; 32 - tilecoll FLOOR, WALL, FLOOR, WALL ; 33 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 34 - tilecoll WALL, FLOOR, WALL, FLOOR ; 35 - tilecoll FLOOR, WALL, FLOOR, WALL ; 36 - tilecoll WALL, WALL, WALL, FLOOR ; 37 - tilecoll WALL, WALL, FLOOR, FLOOR ; 38 - tilecoll WALL, WALL, FLOOR, WALL ; 39 - tilecoll WALL, FLOOR, WALL, WALL ; 3a - tilecoll WALL, WALL, WALL, WALL ; 3b - tilecoll FLOOR, WALL, WALL, WALL ; 3c + tilecoll WALL, FLOOR, WALL, FLOOR ; 31 + tilecoll FLOOR, WALL, FLOOR, WALL ; 32 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 33 + tilecoll WALL, FLOOR, WALL, FLOOR ; 34 + tilecoll FLOOR, WALL, FLOOR, WALL ; 35 + tilecoll WALL, WALL, WALL, FLOOR ; 36 + tilecoll WALL, WALL, FLOOR, FLOOR ; 37 + tilecoll WALL, WALL, FLOOR, WALL ; 38 + tilecoll WALL, FLOOR, WALL, WALL ; 39 + tilecoll WALL, WALL, WALL, WALL ; 3a + tilecoll FLOOR, WALL, WALL, WALL ; 3b + tilecoll WALL, WALL, WALL, WALL ; 3c tilecoll WALL, WALL, WALL, WALL ; 3d tilecoll WALL, WALL, WALL, WALL ; 3e tilecoll WALL, WALL, WALL, WALL ; 3f - tilecoll WALL, WALL, WALL, WALL ; 40 diff --git a/data/tilesets/underground_collision.asm b/data/tilesets/underground_collision.asm index 0c3120451..e4cee7495 100644 --- a/data/tilesets/underground_collision.asm +++ b/data/tilesets/underground_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 02 tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 03 - tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, WALL, FLOOR ; 05 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 - tilecoll WALL, FLOOR, WALL, FLOOR ; 07 - tilecoll FLOOR, FLOOR, PIT, PIT ; 08 - tilecoll WALL, WALL, WALL, FLOOR ; 09 - tilecoll WALL, WALL, FLOOR, FLOOR ; 0a - tilecoll WALL, WALL, FLOOR, WALL ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll WALL, FLOOR, WALL, FLOOR ; 0d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e - tilecoll FLOOR, WALL, FLOOR, WALL ; 0f - tilecoll FLOOR, FLOOR, FLOOR, WARP_PANEL ; 10 - tilecoll WALL, FLOOR, WALL, WALL ; 11 - tilecoll FLOOR, FLOOR, WALL, WALL ; 12 - tilecoll FLOOR, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, FLOOR, FLOOR ; 14 + tilecoll WALL, WALL, WALL, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll WALL, FLOOR, WALL, FLOOR ; 06 + tilecoll FLOOR, FLOOR, PIT, PIT ; 07 + tilecoll WALL, WALL, WALL, FLOOR ; 08 + tilecoll WALL, WALL, FLOOR, FLOOR ; 09 + tilecoll WALL, WALL, FLOOR, WALL ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll WALL, FLOOR, WALL, FLOOR ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, WALL, FLOOR, WALL ; 0e + tilecoll FLOOR, FLOOR, FLOOR, WARP_PANEL ; 0f + tilecoll WALL, FLOOR, WALL, WALL ; 10 + tilecoll FLOOR, FLOOR, WALL, WALL ; 11 + tilecoll FLOOR, WALL, WALL, WALL ; 12 + tilecoll WALL, WALL, FLOOR, FLOOR ; 13 + tilecoll FLOOR, FLOOR, WALL, WALL ; 14 tilecoll FLOOR, FLOOR, WALL, WALL ; 15 - tilecoll FLOOR, FLOOR, WALL, WALL ; 16 - tilecoll WALL, FLOOR, WALL, WALL ; 17 - tilecoll FLOOR, WALL, WALL, WALL ; 18 - tilecoll FLOOR, WALL, FLOOR, WALL ; 19 - tilecoll WALL, FLOOR, WALL, FLOOR ; 1a - tilecoll FLOOR, WALL, FLOOR, WALL ; 1b - tilecoll WALL, FLOOR, WALL, FLOOR ; 1c - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1d - tilecoll WALL, WALL, FLOOR, FLOOR ; 1e - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1f + tilecoll WALL, FLOOR, WALL, WALL ; 16 + tilecoll FLOOR, WALL, WALL, WALL ; 17 + tilecoll FLOOR, WALL, FLOOR, WALL ; 18 + tilecoll WALL, FLOOR, WALL, FLOOR ; 19 + tilecoll FLOOR, WALL, FLOOR, WALL ; 1a + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1e + tilecoll WALL, WALL, FLOOR, FLOOR ; 1f tilecoll WALL, WALL, FLOOR, FLOOR ; 20 - tilecoll WALL, WALL, FLOOR, FLOOR ; 21 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 22 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 21 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 22 tilecoll FLOOR, FLOOR, WALL, FLOOR ; 23 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 24 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 25 - tilecoll WALL, WARP_CARPET_UP, FLOOR, FLOOR ; 26 - tilecoll WARP_CARPET_UP, WALL, FLOOR, FLOOR ; 27 - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 28 - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 29 - tilecoll FLOOR, WALL, FLOOR, WALL ; 2a - tilecoll WALL, FLOOR, WALL, FLOOR ; 2b + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 24 + tilecoll WALL, WARP_CARPET_UP, FLOOR, FLOOR ; 25 + tilecoll WARP_CARPET_UP, WALL, FLOOR, FLOOR ; 26 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 27 + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 28 + tilecoll FLOOR, WALL, FLOOR, WALL ; 29 + tilecoll WALL, FLOOR, WALL, FLOOR ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b tilecoll WALL, WALL, WALL, WALL ; 2c tilecoll WALL, WALL, WALL, WALL ; 2d - tilecoll WALL, WALL, WALL, WALL ; 2e - tilecoll WARP_CARPET_DOWN, WARP_CARPET_DOWN, WALL, WALL ; 2f + tilecoll WARP_CARPET_DOWN, WARP_CARPET_DOWN, WALL, WALL ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f tilecoll WALL, WALL, WALL, WALL ; 30 tilecoll WALL, WALL, WALL, WALL ; 31 tilecoll WALL, WALL, WALL, WALL ; 32 tilecoll WALL, WALL, WALL, WALL ; 33 tilecoll WALL, WALL, WALL, WALL ; 34 tilecoll WALL, WALL, WALL, WALL ; 35 - tilecoll WALL, WALL, WALL, WALL ; 36 - tilecoll WALL, FLOOR, WALL, FLOOR ; 37 - tilecoll FLOOR, WALL, FLOOR, WALL ; 38 + tilecoll WALL, FLOOR, WALL, FLOOR ; 36 + tilecoll FLOOR, WALL, FLOOR, WALL ; 37 + tilecoll WALL, WALL, WALL, WALL ; 38 tilecoll WALL, WALL, WALL, WALL ; 39 tilecoll WALL, WALL, WALL, WALL ; 3a tilecoll WALL, WALL, WALL, WALL ; 3b tilecoll WALL, WALL, WALL, WALL ; 3c - tilecoll WALL, WALL, WALL, WALL ; 3d - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 3e + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 3d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/unused_dark_cave_collision.asm b/data/tilesets/unused_dark_cave_collision.asm index 0022d3881..8bbc11f2a 100644 --- a/data/tilesets/unused_dark_cave_collision.asm +++ b/data/tilesets/unused_dark_cave_collision.asm @@ -1,33 +1,34 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10 ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10 ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 - tilecoll WALL, WALL, WALL, WALL ; 09 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a - tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 0d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f + tilecoll WALL, WALL, WALL, WALL ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f tilecoll WALL, WALL, WALL, WALL ; 10 tilecoll WALL, WALL, WALL, WALL ; 11 tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, WALL, WALL, DOOR ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll WALL, WALL, WALL, DOOR ; 17 - tilecoll WALL, WALL, TOWN_MAP, WALL ; 18 + tilecoll WALL, WALL, WALL, DOOR ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, WALL, WALL, DOOR ; 16 + tilecoll WALL, WALL, TOWN_MAP, WALL ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 tilecoll WALL, WALL, WALL, WALL ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll WALL, WALL, WALL, DOOR ; 1b - tilecoll WALL, WALL, TOWN_MAP, WALL ; 1c - tilecoll WALL, WALL, WALL, WALL ; 1d - tilecoll WALL, WALL, DOOR, WALL ; 1e + tilecoll WALL, WALL, WALL, DOOR ; 1a + tilecoll WALL, WALL, TOWN_MAP, WALL ; 1b + tilecoll WALL, WALL, WALL, WALL ; 1c + tilecoll WALL, WALL, DOOR, WALL ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 tilecoll WALL, WALL, WALL, WALL ; 21 @@ -37,92 +38,91 @@ tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 tilecoll WALL, WALL, WALL, WALL ; 27 - tilecoll WALL, WALL, WALL, WALL ; 28 - tilecoll WALL, WALL, WALL, DOOR ; 29 - tilecoll WALL, WALL, WALL, WALL ; 2a - tilecoll WALL, WALL, WALL, DOOR ; 2b - tilecoll WALL, WALL, WALL, WALL ; 2c + tilecoll WALL, WALL, WALL, DOOR ; 28 + tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll WALL, WALL, WALL, DOOR ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b + tilecoll FLOOR, FLOOR, WALL, WALL ; 2c tilecoll FLOOR, FLOOR, WALL, WALL ; 2d - tilecoll FLOOR, FLOOR, WALL, WALL ; 2e - tilecoll WALL, WALL, WALL, DOOR ; 2f - tilecoll WALL, WALL, WALL, WALL ; 30 - tilecoll BUOY, BUOY, BUOY, WATER_21 ; 31 - tilecoll BUOY, BUOY, WATER_21, WATER_21 ; 32 - tilecoll BUOY, BUOY, WATER_21, BUOY ; 33 - tilecoll FLOOR, FLOOR, WALL, WALL ; 34 - tilecoll BUOY, WATER_21, BUOY, WATER_21 ; 35 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 36 - tilecoll WATER_21, BUOY, WATER_21, BUOY ; 37 - tilecoll WALL, WALL, WALL, WALL ; 38 - tilecoll BUOY, WATER_21, BUOY, BUOY ; 39 - tilecoll WATER_21, WATER_21, BUOY, BUOY ; 3a - tilecoll WATER_21, BUOY, BUOY, BUOY ; 3b - tilecoll WALL, WALL, WALL, WALL ; 3c - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3d - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3e - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 40 - tilecoll WALL, WALL, WALL, FLOOR ; 41 - tilecoll WALL, WALL, FLOOR, FLOOR ; 42 - tilecoll WALL, WALL, FLOOR, WALL ; 43 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 44 - tilecoll WALL, FLOOR, WALL, FLOOR ; 45 - tilecoll TOWN_MAP, FLOOR, FLOOR, FLOOR ; 46 - tilecoll FLOOR, WALL, FLOOR, WALL ; 47 - tilecoll FLOOR, FLOOR, FLOOR, TOWN_MAP ; 48 - tilecoll WALL, FLOOR, WALL, WALL ; 49 - tilecoll FLOOR, FLOOR, WALL, WALL ; 4a - tilecoll FLOOR, WALL, WALL, WALL ; 4b - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54 + tilecoll WALL, WALL, WALL, DOOR ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll BUOY, BUOY, BUOY, WATER_21 ; 30 + tilecoll BUOY, BUOY, WATER_21, WATER_21 ; 31 + tilecoll BUOY, BUOY, WATER_21, BUOY ; 32 + tilecoll FLOOR, FLOOR, WALL, WALL ; 33 + tilecoll BUOY, WATER_21, BUOY, WATER_21 ; 34 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 35 + tilecoll WATER_21, BUOY, WATER_21, BUOY ; 36 + tilecoll WALL, WALL, WALL, WALL ; 37 + tilecoll BUOY, WATER_21, BUOY, BUOY ; 38 + tilecoll WATER_21, WATER_21, BUOY, BUOY ; 39 + tilecoll WATER_21, BUOY, BUOY, BUOY ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3f + tilecoll WALL, WALL, WALL, FLOOR ; 40 + tilecoll WALL, WALL, FLOOR, FLOOR ; 41 + tilecoll WALL, WALL, FLOOR, WALL ; 42 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 43 + tilecoll WALL, FLOOR, WALL, FLOOR ; 44 + tilecoll TOWN_MAP, FLOOR, FLOOR, FLOOR ; 45 + tilecoll FLOOR, WALL, FLOOR, WALL ; 46 + tilecoll FLOOR, FLOOR, FLOOR, TOWN_MAP ; 47 + tilecoll WALL, FLOOR, WALL, WALL ; 48 + tilecoll FLOOR, FLOOR, WALL, WALL ; 49 + tilecoll FLOOR, WALL, WALL, WALL ; 4a + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 54 tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 55 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 56 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56 tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 58 tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 59 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 5a - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b - tilecoll WALL, CUT_TREE, FLOOR, FLOOR ; 5c - tilecoll WALL, WALL, WALL, FLOOR ; 5d - tilecoll WALL, WALL, FLOOR, FLOOR ; 5e - tilecoll WALL, WALL, FLOOR, WALL ; 5f - tilecoll FLOOR, WALL, FLOOR, CUT_TREE ; 60 - tilecoll WALL, FLOOR, WALL, FLOOR ; 61 - tilecoll WALL, WALL, WALL, WALL ; 62 - tilecoll FLOOR, WALL, FLOOR, WALL ; 63 - tilecoll FLOOR, FLOOR, CUT_TREE, WALL ; 64 - tilecoll WALL, FLOOR, WALL, WALL ; 65 - tilecoll FLOOR, FLOOR, WALL, WALL ; 66 - tilecoll FLOOR, WALL, WALL, WALL ; 67 - tilecoll CUT_TREE, FLOOR, WALL, FLOOR ; 68 - tilecoll WALL, FLOOR, WALL, FLOOR ; 69 - tilecoll FLOOR, WALL, FLOOR, WALL ; 6a - tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b - tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c - tilecoll WALL, FLOOR, WALL, WALL ; 6d - tilecoll FLOOR, WALL, WALL, WALL ; 6e - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72 - tilecoll FLOOR, FLOOR, WALL, WALL ; 73 - tilecoll FLOOR, FLOOR, DOOR, WALL ; 74 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75 - tilecoll WALL, WALL, FLOOR, FLOOR ; 76 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 77 + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a + tilecoll WALL, CUT_TREE, FLOOR, FLOOR ; 5b + tilecoll WALL, WALL, WALL, FLOOR ; 5c + tilecoll WALL, WALL, FLOOR, FLOOR ; 5d + tilecoll WALL, WALL, FLOOR, WALL ; 5e + tilecoll FLOOR, WALL, FLOOR, CUT_TREE ; 5f + tilecoll WALL, FLOOR, WALL, FLOOR ; 60 + tilecoll WALL, WALL, WALL, WALL ; 61 + tilecoll FLOOR, WALL, FLOOR, WALL ; 62 + tilecoll FLOOR, FLOOR, CUT_TREE, WALL ; 63 + tilecoll WALL, FLOOR, WALL, WALL ; 64 + tilecoll FLOOR, FLOOR, WALL, WALL ; 65 + tilecoll FLOOR, WALL, WALL, WALL ; 66 + tilecoll CUT_TREE, FLOOR, WALL, FLOOR ; 67 + tilecoll WALL, FLOOR, WALL, FLOOR ; 68 + tilecoll FLOOR, WALL, FLOOR, WALL ; 69 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a + tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b + tilecoll WALL, FLOOR, WALL, WALL ; 6c + tilecoll FLOOR, WALL, WALL, WALL ; 6d + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71 + tilecoll FLOOR, FLOOR, WALL, WALL ; 72 + tilecoll FLOOR, FLOOR, DOOR, WALL ; 73 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74 + tilecoll WALL, WALL, FLOOR, FLOOR ; 75 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 76 + tilecoll WALL, WALL, WALL, WALL ; 77 tilecoll WALL, WALL, WALL, WALL ; 78 - tilecoll WALL, WALL, WALL, WALL ; 79 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 79 tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 7a - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 7b + tilecoll WALL, WALL, WALL, WALL ; 7b tilecoll WALL, WALL, WALL, WALL ; 7c tilecoll WALL, WALL, WALL, WALL ; 7d tilecoll WALL, WALL, WALL, WALL ; 7e tilecoll WALL, WALL, WALL, WALL ; 7f - tilecoll WALL, WALL, WALL, WALL ; 80 From 4d93741a54172754aa7ac4d0162343bc0121849d Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 26 Jan 2018 21:25:49 -0500 Subject: [PATCH 056/135] use PAL_COLOR_SIZE --- engine/color.asm | 2 +- home/palettes.asm | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/engine/color.asm b/engine/color.asm index 35a17f868..962ea7540 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -497,7 +497,7 @@ LoadHLPaletteIntoDE: push af ld a, BANK(wOBPals1) ld [rSVBK], a - ld c, PALETTE_SIZE + ld c, 1 palettes .loop ld a, [hli] ld [de], a diff --git a/home/palettes.asm b/home/palettes.asm index 8dafb23e7..e8996c160 100644 --- a/home/palettes.asm +++ b/home/palettes.asm @@ -253,7 +253,7 @@ CopyPals:: ; d50 ; get pal color ld a, b - and %11 ; color + maskbits 1 << PAL_COLOR_SIZE ; 2 bytes per color add a ld l, a @@ -271,8 +271,9 @@ CopyPals:: ; d50 ld [hl], d inc hl ; next pal color +rept PAL_COLOR_SIZE srl b - srl b +endr ; source pop de ; done pal? From 3df4c5ffa81d8c31afceb8112e7c30716b0d0949 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 27 Jan 2018 00:17:25 -0500 Subject: [PATCH 057/135] Group related constants together --- constants/map_object_constants.asm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm index 93532220e..7649f3542 100644 --- a/constants/map_object_constants.asm +++ b/constants/map_object_constants.asm @@ -37,9 +37,6 @@ OBJECT_STRUCT_LENGTH EQU 40 NUM_OBJECT_STRUCTS EQU 13 ; see ObjectStructs -MAPOBJECT_SCREEN_HEIGHT EQU 11 -MAPOBJECT_SCREEN_WIDTH EQU 12 - ; object_struct OBJECT_FACING values OW_DOWN EQU DOWN << 2 OW_UP EQU UP << 2 @@ -78,6 +75,10 @@ OVERHEAD EQU 3 const MAPOBJECT_F ; unused OBJECT_LENGTH EQU const_value +MAPOBJECT_SCREEN_HEIGHT EQU 11 +MAPOBJECT_SCREEN_WIDTH EQU 12 + + ; SpriteMovementData indexes (see data/sprites/map_objects.asm) const_def const SPRITEMOVEDATA_00 ; 00 From ce44112914f64db69cd55d0830484a8cf5dfdec5 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 28 Jan 2018 00:53:52 -0500 Subject: [PATCH 058/135] Add wiki link to README; group disassembly links separately for easier scanning --- README.md | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 86b44b7ff..2e38717eb 100644 --- a/README.md +++ b/README.md @@ -2,27 +2,31 @@ This is a disassembly of Pokémon Crystal. -It builds the following roms: +It builds the following ROMs: -* Pokemon - Crystal Version (UE) (V1.0) [C][!].gbc `sha1: f4cd194bdee0d04ca4eac29e09b8e4e9d818c133` -* Pokemon - Crystal Version (UE) (V1.1) [C][!].gbc `sha1: f2f52230b536214ef7c9924f483392993e226cfb` +- Pokemon - Crystal Version (UE) (V1.0) [C][!].gbc `sha1: f4cd194bdee0d04ca4eac29e09b8e4e9d818c133` +- Pokemon - Crystal Version (UE) (V1.1) [C][!].gbc `sha1: f2f52230b536214ef7c9924f483392993e226cfb` To set up the repository, see [INSTALL.md](INSTALL.md). ## See also -* [FAQ](FAQ.md) -* [Documentation](docs/) -* Disassembly of [**Pokémon Red/Blue**][pokered] -* Disassembly of [**Pokémon Yellow**][pokeyellow] -* Disassembly of [**Pokémon Gold**][pokegold] -* Disassembly of [**Pokémon Pinball**][pokepinball] -* Disassembly of [**Pokémon TCG**][poketcg] -* Disassembly of [**Pokémon Ruby**][pokeruby] -* Disassembly of [**Pokémon Fire Red**][pokefirered] -* Disassembly of [**Pokémon Emerald**][pokeemerald] -* Discord: [**pret**][Discord] -* irc: [freenode#pret][irc] +- [**FAQ**](FAQ.md) +- [**Documentation**](docs/) +- [**Wiki**](wiki/) (includes [**tutorials**](wiki/Tutorials)) +- Discord: [**pret**][Discord] +- irc: [freenode#pret][irc] + +Other disassembly projects: + +- [**Pokémon Red/Blue**][pokered] +- [**Pokémon Yellow**][pokeyellow] +- [**Pokémon Gold**][pokegold] +- [**Pokémon Pinball**][pokepinball] +- [**Pokémon TCG**][poketcg] +- [**Pokémon Ruby**][pokeruby] +- [**Pokémon Fire Red**][pokefirered] +- [**Pokémon Emerald**][pokeemerald] [pokered]: https://github.com/pret/pokered [pokeyellow]: https://github.com/pret/pokeyellow From c3b766ca8b393553023c5af21c574c7f1cb171ec Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 28 Jan 2018 00:56:57 -0500 Subject: [PATCH 059/135] Fix link targets --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2e38717eb..e5036daae 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ To set up the repository, see [INSTALL.md](INSTALL.md). - [**FAQ**](FAQ.md) - [**Documentation**](docs/) -- [**Wiki**](wiki/) (includes [**tutorials**](wiki/Tutorials)) -- Discord: [**pret**][Discord] -- irc: [freenode#pret][irc] +- [**Wiki**][wiki] (includes [tutorials][tutorials]) +- **Discord:** [pret][discord] +- **IRC:** [freenode#pret][irc] Other disassembly projects: @@ -36,7 +36,9 @@ Other disassembly projects: [pokeruby]: https://github.com/pret/pokeruby [pokefirered]: https://github.com/pret/pokefirered [pokeemerald]: https://github.com/pret/pokeemerald -[Discord]: https://discord.gg/cJxDDVP +[wiki]: https://github.com/pret/pokecrystal/wiki +[tutorials]: https://github.com/pret/pokecrystal/wiki/Tutorials +[discord]: https://discord.gg/cJxDDVP [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret [travis]: https://travis-ci.org/pret/pokecrystal [travis-badge]: https://travis-ci.org/pret/pokecrystal.svg?branch=master From e22670438ee420a5d9095db85232104be9236f70 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 28 Jan 2018 01:17:32 -0500 Subject: [PATCH 060/135] Badge type boosts make sense in data/types/ --- data/{battle => types}/badge_type_boosts.asm | 0 engine/battle/misc.asm | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename data/{battle => types}/badge_type_boosts.asm (100%) diff --git a/data/battle/badge_type_boosts.asm b/data/types/badge_type_boosts.asm similarity index 100% rename from data/battle/badge_type_boosts.asm rename to data/types/badge_type_boosts.asm diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm index ec616fa79..40a307d61 100644 --- a/engine/battle/misc.asm +++ b/engine/battle/misc.asm @@ -225,4 +225,4 @@ DoBadgeTypeBoosts: ; fbe24 pop de ret -INCLUDE "data/battle/badge_type_boosts.asm" +INCLUDE "data/types/badge_type_boosts.asm" From 84c798e9f40c41832e1028563e2c169220eae65c Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 28 Jan 2018 01:20:49 -0500 Subject: [PATCH 061/135] Clarify TM/HM move/enum correspondence --- data/moves/tmhm_moves.asm | 1 + 1 file changed, 1 insertion(+) diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm index fea29780c..fd610d5fa 100644 --- a/data/moves/tmhm_moves.asm +++ b/data/moves/tmhm_moves.asm @@ -1,4 +1,5 @@ TMHMMoves: ; 1167a +; entries correspond to *_TMNUM enums (see constants/item_constants.asm) ; TMs db DYNAMICPUNCH db HEADBUTT From 477adc72af0e71b851dd6a7097998e87d9395315 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 28 Jan 2018 13:20:04 -0500 Subject: [PATCH 062/135] grep -rl warp_def . | xargs sed -i s/warp_def/warp_event/g --- docs/map_scripts.md | 2 +- macros/scripts/maps.asm | 2 +- maps/AzaleaGym.asm | 4 +- maps/AzaleaMart.asm | 4 +- maps/AzaleaPokecenter1F.asm | 6 +- maps/AzaleaTown.asm | 16 ++--- maps/BattleTower1F.asm | 6 +- maps/BattleTowerBattleRoom.asm | 4 +- maps/BattleTowerElevator.asm | 4 +- maps/BattleTowerHallway.asm | 12 ++-- maps/BattleTowerOutside.asm | 8 +-- maps/BillsBrothersHouse.asm | 4 +- maps/BillsFamilysHouse.asm | 4 +- maps/BillsHouse.asm | 4 +- maps/BlackthornCity.asm | 16 ++--- maps/BlackthornDragonSpeechHouse.asm | 4 +- maps/BlackthornEmysHouse.asm | 4 +- maps/BlackthornGym1F.asm | 14 ++-- maps/BlackthornGym2F.asm | 10 +-- maps/BlackthornMart.asm | 4 +- maps/BlackthornPokecenter1F.asm | 6 +- maps/BluesHouse.asm | 4 +- maps/BrunosRoom.asm | 8 +-- maps/BurnedTower1F.asm | 28 ++++---- maps/BurnedTowerB1F.asm | 12 ++-- maps/CeladonCafe.asm | 4 +- maps/CeladonCity.asm | 18 ++--- maps/CeladonDeptStore1F.asm | 8 +-- maps/CeladonDeptStore2F.asm | 6 +- maps/CeladonDeptStore3F.asm | 6 +- maps/CeladonDeptStore4F.asm | 6 +- maps/CeladonDeptStore5F.asm | 6 +- maps/CeladonDeptStore6F.asm | 4 +- maps/CeladonDeptStoreElevator.asm | 4 +- maps/CeladonGameCorner.asm | 4 +- maps/CeladonGameCornerPrizeRoom.asm | 4 +- maps/CeladonGym.asm | 4 +- maps/CeladonMansion1F.asm | 10 +-- maps/CeladonMansion2F.asm | 8 +-- maps/CeladonMansion3F.asm | 8 +-- maps/CeladonMansionRoof.asm | 6 +- maps/CeladonMansionRoofHouse.asm | 4 +- maps/CeladonPokecenter1F.asm | 6 +- maps/CeladonPokecenter2FBeta.asm | 2 +- maps/CeruleanCity.asm | 12 ++-- maps/CeruleanGym.asm | 4 +- maps/CeruleanGymBadgeSpeechHouse.asm | 4 +- maps/CeruleanMart.asm | 4 +- maps/CeruleanPokecenter1F.asm | 6 +- maps/CeruleanPokecenter2FBeta.asm | 2 +- maps/CeruleanPoliceStation.asm | 4 +- maps/CeruleanTradeSpeechHouse.asm | 4 +- maps/CharcoalKiln.asm | 4 +- maps/CherrygroveCity.asm | 10 +-- maps/CherrygroveEvolutionSpeechHouse.asm | 4 +- maps/CherrygroveGymSpeechHouse.asm | 4 +- maps/CherrygroveMart.asm | 4 +- maps/CherrygrovePokecenter1F.asm | 6 +- maps/CianwoodCity.asm | 14 ++-- maps/CianwoodGym.asm | 4 +- maps/CianwoodLugiaSpeechHouse.asm | 4 +- maps/CianwoodPharmacy.asm | 4 +- maps/CianwoodPhotoStudio.asm | 4 +- maps/CianwoodPokecenter1F.asm | 6 +- maps/CinnabarIsland.asm | 2 +- maps/CinnabarPokecenter1F.asm | 6 +- maps/CinnabarPokecenter2FBeta.asm | 2 +- maps/Colosseum.asm | 4 +- maps/CopycatsHouse1F.asm | 6 +- maps/CopycatsHouse2F.asm | 2 +- maps/DanceTheatre.asm | 4 +- maps/DarkCaveBlackthornEntrance.asm | 4 +- maps/DarkCaveVioletEntrance.asm | 6 +- maps/DayCare.asm | 8 +-- maps/DayOfWeekSiblingsHouse.asm | 4 +- maps/DiglettsCave.asm | 12 ++-- maps/DragonShrine.asm | 4 +- maps/DragonsDen1F.asm | 8 +-- maps/DragonsDenB1F.asm | 4 +- maps/EarlsPokemonAcademy.asm | 4 +- maps/EcruteakCity.asm | 30 ++++----- maps/EcruteakGym.asm | 66 +++++++++---------- maps/EcruteakItemfinderHouse.asm | 4 +- maps/EcruteakLugiaSpeechHouse.asm | 4 +- maps/EcruteakMart.asm | 4 +- maps/EcruteakPokecenter1F.asm | 6 +- maps/EcruteakTinTowerEntrance.asm | 10 +-- maps/ElmsHouse.asm | 4 +- maps/ElmsLab.asm | 4 +- maps/FastShip1F.asm | 24 +++---- maps/FastShipB1F.asm | 4 +- maps/FastShipCabins_NNW_NNE_NE.asm | 6 +- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 12 ++-- maps/FastShipCabins_SW_SSW_NW.asm | 10 +-- maps/FightingDojo.asm | 4 +- maps/FuchsiaCity.asm | 22 +++---- maps/FuchsiaGym.asm | 4 +- maps/FuchsiaMart.asm | 4 +- maps/FuchsiaPokecenter1F.asm | 6 +- maps/FuchsiaPokecenter2FBeta.asm | 2 +- maps/GoldenrodBikeShop.asm | 4 +- maps/GoldenrodCity.asm | 30 ++++----- maps/GoldenrodDeptStore1F.asm | 8 +-- maps/GoldenrodDeptStore2F.asm | 6 +- maps/GoldenrodDeptStore3F.asm | 6 +- maps/GoldenrodDeptStore4F.asm | 6 +- maps/GoldenrodDeptStore5F.asm | 6 +- maps/GoldenrodDeptStore6F.asm | 6 +- maps/GoldenrodDeptStoreB1F.asm | 6 +- maps/GoldenrodDeptStoreElevator.asm | 4 +- maps/GoldenrodDeptStoreRoof.asm | 2 +- maps/GoldenrodFlowerShop.asm | 4 +- maps/GoldenrodGameCorner.asm | 4 +- maps/GoldenrodGym.asm | 4 +- maps/GoldenrodHappinessRater.asm | 4 +- maps/GoldenrodMagnetTrainStation.asm | 8 +-- maps/GoldenrodNameRater.asm | 4 +- maps/GoldenrodPPSpeechHouse.asm | 4 +- maps/GoldenrodPokecenter1F.asm | 8 +-- maps/GoldenrodUnderground.asm | 12 ++-- ...oldenrodUndergroundSwitchRoomEntrances.asm | 18 ++--- maps/GoldenrodUndergroundWarehouse.asm | 6 +- maps/GuideGentsHouse.asm | 4 +- maps/HallOfFame.asm | 4 +- maps/IcePath1F.asm | 8 +-- maps/IcePathB1F.asm | 16 ++--- maps/IcePathB2FBlackthornSide.asm | 4 +- maps/IcePathB2FMahoganySide.asm | 12 ++-- maps/IcePathB3F.asm | 4 +- maps/IlexForest.asm | 6 +- maps/IlexForestAzaleaGate.asm | 8 +-- maps/IndigoPlateauPokecenter1F.asm | 8 +-- maps/KarensRoom.asm | 8 +-- maps/KogasRoom.asm | 8 +-- maps/KurtsHouse.asm | 4 +- maps/LakeOfRage.asm | 4 +- maps/LakeOfRageHiddenPowerHouse.asm | 4 +- maps/LakeOfRageMagikarpHouse.asm | 4 +- maps/LancesRoom.asm | 8 +-- maps/LavRadioTower1F.asm | 4 +- maps/LavenderMart.asm | 4 +- maps/LavenderNameRater.asm | 4 +- maps/LavenderPokecenter1F.asm | 6 +- maps/LavenderPokecenter2FBeta.asm | 2 +- maps/LavenderSpeechHouse.asm | 4 +- maps/LavenderTown.asm | 14 ++-- maps/MahoganyGym.asm | 4 +- maps/MahoganyMart1F.asm | 6 +- maps/MahoganyPokecenter1F.asm | 6 +- maps/MahoganyRedGyaradosSpeechHouse.asm | 4 +- maps/MahoganyTown.asm | 10 +-- maps/ManiasHouse.asm | 4 +- maps/MobileBattleRoom.asm | 4 +- maps/MobileTradeRoomMobile.asm | 4 +- maps/MountMoon.asm | 16 ++--- maps/MountMoonGiftShop.asm | 4 +- maps/MountMoonSquare.asm | 6 +- maps/MountMortar1FInside.asm | 12 ++-- maps/MountMortar1FOutside.asm | 18 ++--- maps/MountMortar2FInside.asm | 4 +- maps/MountMortarB1F.asm | 4 +- maps/MoveDeletersHouse.asm | 4 +- maps/MrFujisHouse.asm | 4 +- maps/MrPokemonsHouse.asm | 4 +- maps/MrPsychicsHouse.asm | 4 +- maps/NationalPark.asm | 8 +-- maps/NationalParkBugContest.asm | 8 +-- maps/NewBarkTown.asm | 8 +-- maps/OaksLab.asm | 4 +- maps/OlivineCafe.asm | 4 +- maps/OlivineCity.asm | 22 +++---- maps/OlivineGoodRodHouse.asm | 4 +- maps/OlivineGym.asm | 4 +- maps/OlivineHouseBeta.asm | 4 +- maps/OlivineLighthouse1F.asm | 10 +-- maps/OlivineLighthouse2F.asm | 12 ++-- maps/OlivineLighthouse3F.asm | 18 ++--- maps/OlivineLighthouse4F.asm | 20 +++--- maps/OlivineLighthouse5F.asm | 14 ++-- maps/OlivineLighthouse6F.asm | 6 +- maps/OlivineMart.asm | 4 +- maps/OlivinePokecenter1F.asm | 6 +- maps/OlivinePort.asm | 4 +- maps/OlivinePortPassage.asm | 10 +-- maps/OlivinePunishmentSpeechHouse.asm | 4 +- maps/OlivineTimsHouse.asm | 4 +- maps/PalletTown.asm | 6 +- maps/PewterCity.asm | 10 +-- maps/PewterGym.asm | 4 +- maps/PewterMart.asm | 4 +- maps/PewterNidoranSpeechHouse.asm | 4 +- maps/PewterPokecenter1F.asm | 6 +- maps/PewterPokecenter2FBeta.asm | 2 +- maps/PewterSnoozeSpeechHouse.asm | 4 +- maps/PlayersHouse1F.asm | 6 +- maps/PlayersHouse2F.asm | 2 +- maps/PlayersNeighborsHouse.asm | 4 +- maps/PokeSeersHouse.asm | 4 +- maps/Pokecenter2F.asm | 12 ++-- maps/PokecomCenterAdminRoomMobile.asm | 4 +- maps/PokemonFanClub.asm | 4 +- maps/PowerPlant.asm | 4 +- maps/RadioTower1F.asm | 6 +- maps/RadioTower2F.asm | 4 +- maps/RadioTower3F.asm | 6 +- maps/RadioTower4F.asm | 8 +-- maps/RadioTower5F.asm | 4 +- maps/RedsHouse1F.asm | 6 +- maps/RedsHouse2F.asm | 2 +- maps/RockTunnel1F.asm | 12 ++-- maps/RockTunnelB1F.asm | 8 +-- maps/Route10North.asm | 4 +- maps/Route10Pokecenter1F.asm | 6 +- maps/Route10Pokecenter2FBeta.asm | 2 +- maps/Route10South.asm | 2 +- maps/Route12.asm | 2 +- maps/Route12SuperRodHouse.asm | 4 +- maps/Route15.asm | 4 +- maps/Route15FuchsiaGate.asm | 8 +-- maps/Route16.asm | 10 +-- maps/Route16FuchsiaSpeechHouse.asm | 4 +- maps/Route16Gate.asm | 8 +-- maps/Route17.asm | 4 +- maps/Route17Route18Gate.asm | 8 +-- maps/Route18.asm | 4 +- maps/Route19.asm | 2 +- maps/Route19FuchsiaGate.asm | 8 +-- maps/Route2.asm | 10 +-- maps/Route20.asm | 2 +- maps/Route22.asm | 2 +- maps/Route23.asm | 8 +-- maps/Route25.asm | 2 +- maps/Route26.asm | 6 +- maps/Route26HealHouse.asm | 4 +- maps/Route27.asm | 6 +- maps/Route27SandstormHouse.asm | 4 +- maps/Route28.asm | 4 +- maps/Route28SteelWingHouse.asm | 4 +- maps/Route29.asm | 2 +- maps/Route29Route46Gate.asm | 8 +-- maps/Route2Gate.asm | 8 +-- maps/Route2NuggetHouse.asm | 4 +- maps/Route3.asm | 2 +- maps/Route30.asm | 4 +- maps/Route30BerryHouse.asm | 4 +- maps/Route31.asm | 6 +- maps/Route31VioletGate.asm | 8 +-- maps/Route32.asm | 8 +-- maps/Route32Pokecenter1F.asm | 6 +- maps/Route32RuinsOfAlphGate.asm | 8 +-- maps/Route33.asm | 2 +- maps/Route34.asm | 10 +-- maps/Route34IlexForestGate.asm | 8 +-- maps/Route35.asm | 6 +- maps/Route35GoldenrodGate.asm | 8 +-- maps/Route35NationalParkGate.asm | 8 +-- maps/Route36.asm | 8 +-- maps/Route36NationalParkGate.asm | 8 +-- maps/Route36RuinsOfAlphGate.asm | 8 +-- maps/Route38.asm | 4 +- maps/Route38EcruteakGate.asm | 8 +-- maps/Route39.asm | 4 +- maps/Route39Barn.asm | 4 +- maps/Route39Farmhouse.asm | 4 +- maps/Route4.asm | 2 +- maps/Route40.asm | 2 +- maps/Route40BattleTowerGate.asm | 8 +-- maps/Route41.asm | 8 +-- maps/Route42.asm | 10 +-- maps/Route42EcruteakGate.asm | 8 +-- maps/Route43.asm | 10 +-- maps/Route43Gate.asm | 8 +-- maps/Route43MahoganyGate.asm | 8 +-- maps/Route44.asm | 2 +- maps/Route45.asm | 2 +- maps/Route46.asm | 6 +- maps/Route5.asm | 8 +-- maps/Route5CleanseTagHouse.asm | 4 +- maps/Route5SaffronGate.asm | 8 +-- maps/Route5UndergroundPathEntrance.asm | 6 +- maps/Route6.asm | 4 +- maps/Route6SaffronGate.asm | 8 +-- maps/Route6UndergroundPathEntrance.asm | 6 +- maps/Route7.asm | 4 +- maps/Route7SaffronGate.asm | 8 +-- maps/Route8.asm | 4 +- maps/Route8SaffronGate.asm | 8 +-- maps/Route9.asm | 2 +- maps/RuinsOfAlphAerodactylChamber.asm | 10 +-- maps/RuinsOfAlphAerodactylItemRoom.asm | 8 +-- maps/RuinsOfAlphAerodactylWordRoom.asm | 6 +- maps/RuinsOfAlphHoOhChamber.asm | 10 +-- maps/RuinsOfAlphHoOhItemRoom.asm | 8 +-- maps/RuinsOfAlphHoOhWordRoom.asm | 6 +- maps/RuinsOfAlphInnerChamber.asm | 18 ++--- maps/RuinsOfAlphKabutoChamber.asm | 10 +-- maps/RuinsOfAlphKabutoItemRoom.asm | 8 +-- maps/RuinsOfAlphKabutoWordRoom.asm | 6 +- maps/RuinsOfAlphOmanyteChamber.asm | 10 +-- maps/RuinsOfAlphOmanyteItemRoom.asm | 8 +-- maps/RuinsOfAlphOmanyteWordRoom.asm | 6 +- maps/RuinsOfAlphOutside.asm | 22 +++---- maps/RuinsOfAlphResearchCenter.asm | 4 +- maps/SafariZoneBeta.asm | 4 +- maps/SafariZoneFuchsiaGateBeta.asm | 8 +-- maps/SafariZoneMainOffice.asm | 4 +- maps/SafariZoneWardensHome.asm | 4 +- maps/SaffronCity.asm | 30 ++++----- maps/SaffronGym.asm | 64 +++++++++--------- maps/SaffronMagnetTrainStation.asm | 8 +-- maps/SaffronMart.asm | 4 +- maps/SaffronPokecenter1F.asm | 6 +- maps/SaffronPokecenter2FBeta.asm | 2 +- maps/SeafoamGym.asm | 2 +- maps/SilphCo1F.asm | 4 +- maps/SilverCaveItemRooms.asm | 4 +- maps/SilverCaveOutside.asm | 4 +- maps/SilverCavePokecenter1F.asm | 6 +- maps/SilverCaveRoom1.asm | 4 +- maps/SilverCaveRoom2.asm | 8 +-- maps/SilverCaveRoom3.asm | 2 +- maps/SlowpokeWellB1F.asm | 4 +- maps/SlowpokeWellB2F.asm | 2 +- maps/SoulHouse.asm | 4 +- maps/SproutTower1F.asm | 10 +-- maps/SproutTower2F.asm | 8 +-- maps/SproutTower3F.asm | 2 +- maps/TeamRocketBaseB1F.asm | 8 +-- maps/TeamRocketBaseB2F.asm | 10 +-- maps/TeamRocketBaseB3F.asm | 8 +-- maps/TimeCapsule.asm | 4 +- maps/TinTower1F.asm | 6 +- maps/TinTower2F.asm | 4 +- maps/TinTower3F.asm | 4 +- maps/TinTower4F.asm | 8 +-- maps/TinTower5F.asm | 8 +-- maps/TinTower6F.asm | 4 +- maps/TinTower7F.asm | 10 +-- maps/TinTower8F.asm | 12 ++-- maps/TinTower9F.asm | 14 ++-- maps/TinTowerRoof.asm | 2 +- maps/TohjoFalls.asm | 4 +- maps/TradeCenter.asm | 4 +- maps/TrainerHouse1F.asm | 6 +- maps/TrainerHouseB1F.asm | 2 +- maps/UndergroundPath.asm | 4 +- maps/UnionCave1F.asm | 8 +-- maps/UnionCaveB1F.asm | 10 +-- maps/UnionCaveB2F.asm | 2 +- maps/VermilionCity.asm | 20 +++--- maps/VermilionDiglettsCaveSpeechHouse.asm | 4 +- maps/VermilionFishingSpeechHouse.asm | 4 +- maps/VermilionGym.asm | 4 +- maps/VermilionMagnetTrainSpeechHouse.asm | 4 +- maps/VermilionMart.asm | 4 +- maps/VermilionPokecenter1F.asm | 6 +- maps/VermilionPokecenter2FBeta.asm | 2 +- maps/VermilionPort.asm | 4 +- maps/VermilionPortPassage.asm | 10 +-- maps/VictoryRoad.asm | 20 +++--- maps/VictoryRoadGate.asm | 16 ++--- maps/VioletCity.asm | 18 ++--- maps/VioletGym.asm | 4 +- maps/VioletKylesHouse.asm | 4 +- maps/VioletMart.asm | 4 +- maps/VioletNicknameSpeechHouse.asm | 4 +- maps/VioletPokecenter1F.asm | 6 +- maps/ViridianCity.asm | 10 +-- maps/ViridianGym.asm | 4 +- maps/ViridianMart.asm | 4 +- maps/ViridianNicknameSpeechHouse.asm | 4 +- maps/ViridianPokecenter1F.asm | 6 +- maps/ViridianPokecenter2FBeta.asm | 2 +- maps/WhirlIslandB1F.asm | 18 ++--- maps/WhirlIslandB2F.asm | 8 +-- maps/WhirlIslandCave.asm | 4 +- maps/WhirlIslandLugiaChamber.asm | 2 +- maps/WhirlIslandNE.asm | 6 +- maps/WhirlIslandNW.asm | 8 +-- maps/WhirlIslandSE.asm | 4 +- maps/WhirlIslandSW.asm | 10 +-- maps/WillsRoom.asm | 6 +- maps/WiseTriosRoom.asm | 6 +- 383 files changed, 1314 insertions(+), 1314 deletions(-) diff --git a/docs/map_scripts.md b/docs/map_scripts.md index aa7ed6f32..0939f5bfa 100644 --- a/docs/map_scripts.md +++ b/docs/map_scripts.md @@ -78,7 +78,7 @@ Callback types: ### .Warps: db N 
-	warp_def x, y, warp_id, map
+	warp_event x, y, warp_id, map
diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 48c8f0104..77f29620b 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -15,7 +15,7 @@ callback: MACRO dbw \1, \2 ENDM -warp_def: MACRO +warp_event: MACRO ;\1: x: left to right, starts at 0 ;\2: y: top to bottom, starts at 0 ;\3: warp destination: starts at 1 diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 48f229cf7..e9e4a526c 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -367,8 +367,8 @@ AzaleaGym_MapEvents: .Warps: db 2 - warp_def 4, 15, 5, AZALEA_TOWN - warp_def 5, 15, 5, AZALEA_TOWN + warp_event 4, 15, 5, AZALEA_TOWN + warp_event 5, 15, 5, AZALEA_TOWN .CoordEvents: db 0 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index 8ecf94d92..13c68e7dd 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -51,8 +51,8 @@ AzaleaMart_MapEvents: .Warps: db 2 - warp_def 2, 7, 3, AZALEA_TOWN - warp_def 3, 7, 3, AZALEA_TOWN + warp_event 2, 7, 3, AZALEA_TOWN + warp_event 3, 7, 3, AZALEA_TOWN .CoordEvents: db 0 diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm index 6e65c2c01..8d7809d5b 100644 --- a/maps/AzaleaPokecenter1F.asm +++ b/maps/AzaleaPokecenter1F.asm @@ -82,9 +82,9 @@ AzaleaPokecenter1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 1, AZALEA_TOWN - warp_def 4, 7, 1, AZALEA_TOWN - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 1, AZALEA_TOWN + warp_event 4, 7, 1, AZALEA_TOWN + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index b3a3fc61d..f60b35efc 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -461,14 +461,14 @@ AzaleaTown_MapEvents: .Warps: db 8 - warp_def 15, 9, 1, AZALEA_POKECENTER_1F - warp_def 21, 13, 1, CHARCOAL_KILN - warp_def 21, 5, 2, AZALEA_MART - warp_def 9, 5, 1, KURTS_HOUSE - warp_def 10, 15, 1, AZALEA_GYM - warp_def 31, 7, 1, SLOWPOKE_WELL_B1F - warp_def 2, 10, 3, ILEX_FOREST_AZALEA_GATE - warp_def 2, 11, 4, ILEX_FOREST_AZALEA_GATE + warp_event 15, 9, 1, AZALEA_POKECENTER_1F + warp_event 21, 13, 1, CHARCOAL_KILN + warp_event 21, 5, 2, AZALEA_MART + warp_event 9, 5, 1, KURTS_HOUSE + warp_event 10, 15, 1, AZALEA_GYM + warp_event 31, 7, 1, SLOWPOKE_WELL_B1F + warp_event 2, 10, 3, ILEX_FOREST_AZALEA_GATE + warp_event 2, 11, 4, ILEX_FOREST_AZALEA_GATE .CoordEvents: db 3 diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 79b75ee08..1b81d1baf 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -799,9 +799,9 @@ BattleTower1F_MapEvents: .Warps: db 3 - warp_def 7, 9, 3, BATTLE_TOWER_OUTSIDE - warp_def 8, 9, 4, BATTLE_TOWER_OUTSIDE - warp_def 7, 0, 1, BATTLE_TOWER_ELEVATOR + warp_event 7, 9, 3, BATTLE_TOWER_OUTSIDE + warp_event 8, 9, 4, BATTLE_TOWER_OUTSIDE + warp_event 7, 0, 1, BATTLE_TOWER_ELEVATOR .CoordEvents: db 0 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 849eac967..58f3484b9 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -144,8 +144,8 @@ BattleTowerBattleRoom_MapEvents: .Warps: db 2 - warp_def 3, 7, 4, BATTLE_TOWER_HALLWAY - warp_def 4, 7, 4, BATTLE_TOWER_HALLWAY + warp_event 3, 7, 4, BATTLE_TOWER_HALLWAY + warp_event 4, 7, 4, BATTLE_TOWER_HALLWAY .CoordEvents: db 0 diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index a10ad1552..ff3781404 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -50,8 +50,8 @@ BattleTowerElevator_MapEvents: .Warps: db 2 - warp_def 1, 3, 1, BATTLE_TOWER_HALLWAY - warp_def 2, 3, 1, BATTLE_TOWER_HALLWAY + warp_event 1, 3, 1, BATTLE_TOWER_HALLWAY + warp_event 2, 3, 1, BATTLE_TOWER_HALLWAY .CoordEvents: db 0 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 6b50783f5..a12059c33 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -82,12 +82,12 @@ BattleTowerHallway_MapEvents: .Warps: db 6 - warp_def 11, 1, 1, BATTLE_TOWER_ELEVATOR - warp_def 5, 0, 1, BATTLE_TOWER_BATTLE_ROOM - warp_def 7, 0, 1, BATTLE_TOWER_BATTLE_ROOM - warp_def 9, 0, 1, BATTLE_TOWER_BATTLE_ROOM - warp_def 13, 0, 1, BATTLE_TOWER_BATTLE_ROOM - warp_def 15, 0, 1, BATTLE_TOWER_BATTLE_ROOM + warp_event 11, 1, 1, BATTLE_TOWER_ELEVATOR + warp_event 5, 0, 1, BATTLE_TOWER_BATTLE_ROOM + warp_event 7, 0, 1, BATTLE_TOWER_BATTLE_ROOM + warp_event 9, 0, 1, BATTLE_TOWER_BATTLE_ROOM + warp_event 13, 0, 1, BATTLE_TOWER_BATTLE_ROOM + warp_event 15, 0, 1, BATTLE_TOWER_BATTLE_ROOM .CoordEvents: db 0 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index a61717fd0..b7dc6f4db 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -132,10 +132,10 @@ BattleTowerOutside_MapEvents: .Warps: db 4 - warp_def 8, 21, 3, ROUTE_40_BATTLE_TOWER_GATE - warp_def 9, 21, 4, ROUTE_40_BATTLE_TOWER_GATE - warp_def 8, 9, 1, BATTLE_TOWER_1F - warp_def 9, 9, 2, BATTLE_TOWER_1F + warp_event 8, 21, 3, ROUTE_40_BATTLE_TOWER_GATE + warp_event 9, 21, 4, ROUTE_40_BATTLE_TOWER_GATE + warp_event 8, 9, 1, BATTLE_TOWER_1F + warp_event 9, 9, 2, BATTLE_TOWER_1F .CoordEvents: db 0 diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm index 4e56146fa..b0cc14a65 100644 --- a/maps/BillsBrothersHouse.asm +++ b/maps/BillsBrothersHouse.asm @@ -33,8 +33,8 @@ BillsBrothersHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 4, FUCHSIA_CITY - warp_def 3, 7, 4, FUCHSIA_CITY + warp_event 2, 7, 4, FUCHSIA_CITY + warp_event 3, 7, 4, FUCHSIA_CITY .CoordEvents: db 0 diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm index 6aa014301..16504edd1 100644 --- a/maps/BillsFamilysHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -248,8 +248,8 @@ BillsFamilysHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 4, GOLDENROD_CITY - warp_def 3, 7, 4, GOLDENROD_CITY + warp_event 2, 7, 4, GOLDENROD_CITY + warp_event 3, 7, 4, GOLDENROD_CITY .CoordEvents: db 0 diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index a13156484..ed3e8d460 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -359,8 +359,8 @@ BillsHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 1, ROUTE_25 - warp_def 3, 7, 1, ROUTE_25 + warp_event 2, 7, 1, ROUTE_25 + warp_event 3, 7, 1, ROUTE_25 .CoordEvents: db 0 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 396599703..2897346e7 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -318,14 +318,14 @@ BlackthornCity_MapEvents: .Warps: db 8 - warp_def 18, 11, 1, BLACKTHORN_GYM_1F - warp_def 13, 21, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE - warp_def 29, 23, 1, BLACKTHORN_EMYS_HOUSE - warp_def 15, 29, 2, BLACKTHORN_MART - warp_def 21, 29, 1, BLACKTHORN_POKECENTER_1F - warp_def 9, 31, 1, MOVE_DELETERS_HOUSE - warp_def 36, 9, 2, ICE_PATH_1F - warp_def 20, 1, 1, DRAGONS_DEN_1F + warp_event 18, 11, 1, BLACKTHORN_GYM_1F + warp_event 13, 21, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE + warp_event 29, 23, 1, BLACKTHORN_EMYS_HOUSE + warp_event 15, 29, 2, BLACKTHORN_MART + warp_event 21, 29, 1, BLACKTHORN_POKECENTER_1F + warp_event 9, 31, 1, MOVE_DELETERS_HOUSE + warp_event 36, 9, 2, ICE_PATH_1F + warp_event 20, 1, 1, DRAGONS_DEN_1F .CoordEvents: db 0 diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 74621532f..69110c5a7 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -53,8 +53,8 @@ BlackthornDragonSpeechHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 2, BLACKTHORN_CITY - warp_def 3, 7, 2, BLACKTHORN_CITY + warp_event 2, 7, 2, BLACKTHORN_CITY + warp_event 3, 7, 2, BLACKTHORN_CITY .CoordEvents: db 0 diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm index d8277c74f..63d12d8d9 100644 --- a/maps/BlackthornEmysHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -25,8 +25,8 @@ BlackthornEmysHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 3, BLACKTHORN_CITY - warp_def 3, 7, 3, BLACKTHORN_CITY + warp_event 2, 7, 3, BLACKTHORN_CITY + warp_event 3, 7, 3, BLACKTHORN_CITY .CoordEvents: db 0 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index f194fe1c6..937abca02 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -392,13 +392,13 @@ BlackthornGym1F_MapEvents: .Warps: db 7 - warp_def 4, 17, 1, BLACKTHORN_CITY - warp_def 5, 17, 1, BLACKTHORN_CITY - warp_def 1, 7, 1, BLACKTHORN_GYM_2F - warp_def 7, 9, 2, BLACKTHORN_GYM_2F - warp_def 2, 6, 3, BLACKTHORN_GYM_2F - warp_def 7, 7, 4, BLACKTHORN_GYM_2F - warp_def 7, 6, 5, BLACKTHORN_GYM_2F + warp_event 4, 17, 1, BLACKTHORN_CITY + warp_event 5, 17, 1, BLACKTHORN_CITY + warp_event 1, 7, 1, BLACKTHORN_GYM_2F + warp_event 7, 9, 2, BLACKTHORN_GYM_2F + warp_event 2, 6, 3, BLACKTHORN_GYM_2F + warp_event 7, 7, 4, BLACKTHORN_GYM_2F + warp_event 7, 6, 5, BLACKTHORN_GYM_2F .CoordEvents: db 0 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 239d9ed62..5e0eca4bc 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -131,11 +131,11 @@ BlackthornGym2F_MapEvents: .Warps: db 5 - warp_def 1, 7, 3, BLACKTHORN_GYM_1F - warp_def 7, 9, 4, BLACKTHORN_GYM_1F - warp_def 2, 5, 5, BLACKTHORN_GYM_1F ; hole - warp_def 8, 7, 6, BLACKTHORN_GYM_1F ; hole - warp_def 8, 3, 7, BLACKTHORN_GYM_1F ; hole + warp_event 1, 7, 3, BLACKTHORN_GYM_1F + warp_event 7, 9, 4, BLACKTHORN_GYM_1F + warp_event 2, 5, 5, BLACKTHORN_GYM_1F ; hole + warp_event 8, 7, 6, BLACKTHORN_GYM_1F ; hole + warp_event 8, 3, 7, BLACKTHORN_GYM_1F ; hole .CoordEvents: db 0 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index 4b4b74324..638a04425 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -52,8 +52,8 @@ BlackthornMart_MapEvents: .Warps: db 2 - warp_def 2, 7, 4, BLACKTHORN_CITY - warp_def 3, 7, 4, BLACKTHORN_CITY + warp_event 2, 7, 4, BLACKTHORN_CITY + warp_event 3, 7, 4, BLACKTHORN_CITY .CoordEvents: db 0 diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm index 45c925561..0a1774eb0 100644 --- a/maps/BlackthornPokecenter1F.asm +++ b/maps/BlackthornPokecenter1F.asm @@ -55,9 +55,9 @@ BlackthornPokecenter1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 5, BLACKTHORN_CITY - warp_def 4, 7, 5, BLACKTHORN_CITY - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 5, BLACKTHORN_CITY + warp_event 4, 7, 5, BLACKTHORN_CITY + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 3c4889c0c..5dfc15c79 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -150,8 +150,8 @@ BluesHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 2, PALLET_TOWN - warp_def 3, 7, 2, PALLET_TOWN + warp_event 2, 7, 2, PALLET_TOWN + warp_event 3, 7, 2, PALLET_TOWN .CoordEvents: db 0 diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 9ddbb5664..55ae4b3b2 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -130,10 +130,10 @@ BrunosRoom_MapEvents: .Warps: db 4 - warp_def 4, 17, 3, KOGAS_ROOM - warp_def 5, 17, 4, KOGAS_ROOM - warp_def 4, 2, 1, KARENS_ROOM - warp_def 5, 2, 2, KARENS_ROOM + warp_event 4, 17, 3, KOGAS_ROOM + warp_event 5, 17, 4, KOGAS_ROOM + warp_event 4, 2, 1, KARENS_ROOM + warp_event 5, 2, 2, KARENS_ROOM .CoordEvents: db 0 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 25f517e00..fdf02f76e 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -283,20 +283,20 @@ BurnedTower1F_MapEvents: .Warps: db 14 - warp_def 9, 15, 13, ECRUTEAK_CITY - warp_def 10, 15, 13, ECRUTEAK_CITY - warp_def 10, 9, 1, BURNED_TOWER_B1F - warp_def 5, 5, 1, BURNED_TOWER_B1F - warp_def 5, 6, 1, BURNED_TOWER_B1F - warp_def 4, 6, 1, BURNED_TOWER_B1F - warp_def 15, 4, 2, BURNED_TOWER_B1F - warp_def 15, 5, 2, BURNED_TOWER_B1F - warp_def 10, 7, 3, BURNED_TOWER_B1F - warp_def 5, 14, 4, BURNED_TOWER_B1F - warp_def 4, 14, 4, BURNED_TOWER_B1F - warp_def 14, 14, 5, BURNED_TOWER_B1F - warp_def 15, 14, 5, BURNED_TOWER_B1F - warp_def 7, 15, 6, BURNED_TOWER_B1F + warp_event 9, 15, 13, ECRUTEAK_CITY + warp_event 10, 15, 13, ECRUTEAK_CITY + warp_event 10, 9, 1, BURNED_TOWER_B1F + warp_event 5, 5, 1, BURNED_TOWER_B1F + warp_event 5, 6, 1, BURNED_TOWER_B1F + warp_event 4, 6, 1, BURNED_TOWER_B1F + warp_event 15, 4, 2, BURNED_TOWER_B1F + warp_event 15, 5, 2, BURNED_TOWER_B1F + warp_event 10, 7, 3, BURNED_TOWER_B1F + warp_event 5, 14, 4, BURNED_TOWER_B1F + warp_event 4, 14, 4, BURNED_TOWER_B1F + warp_event 14, 14, 5, BURNED_TOWER_B1F + warp_event 15, 14, 5, BURNED_TOWER_B1F + warp_event 7, 15, 6, BURNED_TOWER_B1F .CoordEvents: db 1 diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 484c6f1cd..1d8ef9635 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -241,12 +241,12 @@ BurnedTowerB1F_MapEvents: .Warps: db 6 - warp_def 10, 9, 3, BURNED_TOWER_1F - warp_def 17, 7, 7, BURNED_TOWER_1F - warp_def 10, 8, 9, BURNED_TOWER_1F - warp_def 3, 13, 10, BURNED_TOWER_1F - warp_def 17, 14, 12, BURNED_TOWER_1F - warp_def 7, 15, 14, BURNED_TOWER_1F + warp_event 10, 9, 3, BURNED_TOWER_1F + warp_event 17, 7, 7, BURNED_TOWER_1F + warp_event 10, 8, 9, BURNED_TOWER_1F + warp_event 3, 13, 10, BURNED_TOWER_1F + warp_event 17, 14, 12, BURNED_TOWER_1F + warp_event 7, 15, 14, BURNED_TOWER_1F .CoordEvents: db 1 diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index d30baf17d..6044f5a44 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -213,8 +213,8 @@ CeladonCafe_MapEvents: .Warps: db 2 - warp_def 6, 7, 9, CELADON_CITY - warp_def 7, 7, 9, CELADON_CITY + warp_event 6, 7, 9, CELADON_CITY + warp_event 7, 7, 9, CELADON_CITY .CoordEvents: db 0 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index d1a116a40..befcb1cd4 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -240,15 +240,15 @@ CeladonCity_MapEvents: .Warps: db 9 - warp_def 4, 9, 1, CELADON_DEPT_STORE_1F - warp_def 16, 9, 1, CELADON_MANSION_1F - warp_def 16, 3, 3, CELADON_MANSION_1F - warp_def 17, 3, 3, CELADON_MANSION_1F - warp_def 29, 9, 1, CELADON_POKECENTER_1F - warp_def 18, 19, 1, CELADON_GAME_CORNER - warp_def 23, 19, 1, CELADON_GAME_CORNER_PRIZE_ROOM - warp_def 10, 29, 1, CELADON_GYM - warp_def 25, 29, 1, CELADON_CAFE + warp_event 4, 9, 1, CELADON_DEPT_STORE_1F + warp_event 16, 9, 1, CELADON_MANSION_1F + warp_event 16, 3, 3, CELADON_MANSION_1F + warp_event 17, 3, 3, CELADON_MANSION_1F + warp_event 29, 9, 1, CELADON_POKECENTER_1F + warp_event 18, 19, 1, CELADON_GAME_CORNER + warp_event 23, 19, 1, CELADON_GAME_CORNER_PRIZE_ROOM + warp_event 10, 29, 1, CELADON_GYM + warp_event 25, 29, 1, CELADON_CAFE .CoordEvents: db 0 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 7f838179d..be1193715 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -79,10 +79,10 @@ CeladonDeptStore1F_MapEvents: .Warps: db 4 - warp_def 7, 7, 1, CELADON_CITY - warp_def 8, 7, 1, CELADON_CITY - warp_def 15, 0, 2, CELADON_DEPT_STORE_2F - warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR + warp_event 7, 7, 1, CELADON_CITY + warp_event 8, 7, 1, CELADON_CITY + warp_event 15, 0, 2, CELADON_DEPT_STORE_2F + warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR .CoordEvents: db 0 diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index eb9bb8dbc..f14c8822a 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -74,9 +74,9 @@ CeladonDeptStore2F_MapEvents: .Warps: db 3 - warp_def 12, 0, 1, CELADON_DEPT_STORE_3F - warp_def 15, 0, 3, CELADON_DEPT_STORE_1F - warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR + warp_event 12, 0, 1, CELADON_DEPT_STORE_3F + warp_event 15, 0, 3, CELADON_DEPT_STORE_1F + warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR .CoordEvents: db 0 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 01cd14f57..5ad0d1404 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -100,9 +100,9 @@ CeladonDeptStore3F_MapEvents: .Warps: db 3 - warp_def 12, 0, 1, CELADON_DEPT_STORE_2F - warp_def 15, 0, 2, CELADON_DEPT_STORE_4F - warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR + warp_event 12, 0, 1, CELADON_DEPT_STORE_2F + warp_event 15, 0, 2, CELADON_DEPT_STORE_4F + warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR .CoordEvents: db 0 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index e3869c990..1d5c109a3 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -56,9 +56,9 @@ CeladonDeptStore4F_MapEvents: .Warps: db 3 - warp_def 12, 0, 1, CELADON_DEPT_STORE_5F - warp_def 15, 0, 2, CELADON_DEPT_STORE_3F - warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR + warp_event 12, 0, 1, CELADON_DEPT_STORE_5F + warp_event 15, 0, 2, CELADON_DEPT_STORE_3F + warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR .CoordEvents: db 0 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index a14e8c7be..fe73776c1 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -77,9 +77,9 @@ CeladonDeptStore5F_MapEvents: .Warps: db 3 - warp_def 12, 0, 1, CELADON_DEPT_STORE_4F - warp_def 15, 0, 1, CELADON_DEPT_STORE_6F - warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR + warp_event 12, 0, 1, CELADON_DEPT_STORE_4F + warp_event 15, 0, 1, CELADON_DEPT_STORE_6F + warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR .CoordEvents: db 0 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 87d380a6a..624e564e7 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -151,8 +151,8 @@ CeladonDeptStore6F_MapEvents: .Warps: db 2 - warp_def 15, 0, 2, CELADON_DEPT_STORE_5F - warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR + warp_event 15, 0, 2, CELADON_DEPT_STORE_5F + warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR .CoordEvents: db 0 diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index b5045880b..1fef9a82c 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -33,8 +33,8 @@ CeladonDeptStoreElevator_MapEvents: .Warps: db 2 - warp_def 1, 3, -1, CELADON_DEPT_STORE_1F - warp_def 2, 3, -1, CELADON_DEPT_STORE_1F + warp_event 1, 3, -1, CELADON_DEPT_STORE_1F + warp_event 2, 3, -1, CELADON_DEPT_STORE_1F .CoordEvents: db 0 diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 090ce4571..060f9ae7c 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -287,8 +287,8 @@ CeladonGameCorner_MapEvents: .Warps: db 2 - warp_def 14, 13, 6, CELADON_CITY - warp_def 15, 13, 6, CELADON_CITY + warp_event 14, 13, 6, CELADON_CITY + warp_event 15, 13, 6, CELADON_CITY .CoordEvents: db 0 diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index a4f2d85ee..5c8653084 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -269,8 +269,8 @@ CeladonGameCornerPrizeRoom_MapEvents: .Warps: db 2 - warp_def 2, 5, 7, CELADON_CITY - warp_def 3, 5, 7, CELADON_CITY + warp_event 2, 5, 7, CELADON_CITY + warp_event 3, 5, 7, CELADON_CITY .CoordEvents: db 0 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 1a3a64894..4b2d037dc 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -273,8 +273,8 @@ CeladonGym_MapEvents: .Warps: db 2 - warp_def 4, 17, 8, CELADON_CITY - warp_def 5, 17, 8, CELADON_CITY + warp_event 4, 17, 8, CELADON_CITY + warp_event 5, 17, 8, CELADON_CITY .CoordEvents: db 0 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 4f6e0f94d..defbfa758 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -80,11 +80,11 @@ CeladonMansion1F_MapEvents: .Warps: db 5 - warp_def 6, 9, 2, CELADON_CITY - warp_def 7, 9, 2, CELADON_CITY - warp_def 3, 0, 3, CELADON_CITY - warp_def 0, 0, 1, CELADON_MANSION_2F - warp_def 7, 0, 4, CELADON_MANSION_2F + warp_event 6, 9, 2, CELADON_CITY + warp_event 7, 9, 2, CELADON_CITY + warp_event 3, 0, 3, CELADON_CITY + warp_event 0, 0, 1, CELADON_MANSION_2F + warp_event 7, 0, 4, CELADON_MANSION_2F .CoordEvents: db 0 diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index e463c5b07..55dea8af3 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -55,10 +55,10 @@ CeladonMansion2F_MapEvents: .Warps: db 4 - warp_def 0, 0, 4, CELADON_MANSION_1F - warp_def 1, 0, 2, CELADON_MANSION_3F - warp_def 6, 0, 3, CELADON_MANSION_3F - warp_def 7, 0, 5, CELADON_MANSION_1F + warp_event 0, 0, 4, CELADON_MANSION_1F + warp_event 1, 0, 2, CELADON_MANSION_3F + warp_event 6, 0, 3, CELADON_MANSION_3F + warp_event 7, 0, 5, CELADON_MANSION_1F .CoordEvents: db 0 diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 418948dc8..9372977b4 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -195,10 +195,10 @@ CeladonMansion3F_MapEvents: .Warps: db 4 - warp_def 0, 0, 1, CELADON_MANSION_ROOF - warp_def 1, 0, 2, CELADON_MANSION_2F - warp_def 6, 0, 3, CELADON_MANSION_2F - warp_def 7, 0, 2, CELADON_MANSION_ROOF + warp_event 0, 0, 1, CELADON_MANSION_ROOF + warp_event 1, 0, 2, CELADON_MANSION_2F + warp_event 6, 0, 3, CELADON_MANSION_2F + warp_event 7, 0, 2, CELADON_MANSION_ROOF .CoordEvents: db 0 diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index d3a3c7623..65178e283 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -39,9 +39,9 @@ CeladonMansionRoof_MapEvents: .Warps: db 3 - warp_def 1, 1, 1, CELADON_MANSION_3F - warp_def 6, 1, 4, CELADON_MANSION_3F - warp_def 2, 5, 1, CELADON_MANSION_ROOF_HOUSE + warp_event 1, 1, 1, CELADON_MANSION_3F + warp_event 6, 1, 4, CELADON_MANSION_3F + warp_event 2, 5, 1, CELADON_MANSION_ROOF_HOUSE .CoordEvents: db 0 diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index f49d12535..7db64f29a 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -122,8 +122,8 @@ CeladonMansionRoofHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 3, CELADON_MANSION_ROOF - warp_def 3, 7, 3, CELADON_MANSION_ROOF + warp_event 2, 7, 3, CELADON_MANSION_ROOF + warp_event 3, 7, 3, CELADON_MANSION_ROOF .CoordEvents: db 0 diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 06bf79f64..9971b8a06 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -151,9 +151,9 @@ CeladonPokecenter1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 5, CELADON_CITY - warp_def 4, 7, 5, CELADON_CITY - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 5, CELADON_CITY + warp_event 4, 7, 5, CELADON_CITY + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/CeladonPokecenter2FBeta.asm b/maps/CeladonPokecenter2FBeta.asm index 06212496b..bdfa7ad6d 100644 --- a/maps/CeladonPokecenter2FBeta.asm +++ b/maps/CeladonPokecenter2FBeta.asm @@ -11,7 +11,7 @@ CeladonPokecenter2FBeta_MapEvents: .Warps: db 1 - warp_def 0, 7, 3, CELADON_POKECENTER_1F + warp_event 0, 7, 3, CELADON_POKECENTER_1F .CoordEvents: db 0 diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index b30d1f310..0d29af242 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -281,12 +281,12 @@ CeruleanCity_MapEvents: .Warps: db 6 - warp_def 7, 15, 1, CERULEAN_GYM_BADGE_SPEECH_HOUSE - warp_def 28, 17, 1, CERULEAN_POLICE_STATION - warp_def 13, 19, 1, CERULEAN_TRADE_SPEECH_HOUSE - warp_def 19, 21, 1, CERULEAN_POKECENTER_1F - warp_def 30, 23, 1, CERULEAN_GYM - warp_def 25, 29, 2, CERULEAN_MART + warp_event 7, 15, 1, CERULEAN_GYM_BADGE_SPEECH_HOUSE + warp_event 28, 17, 1, CERULEAN_POLICE_STATION + warp_event 13, 19, 1, CERULEAN_TRADE_SPEECH_HOUSE + warp_event 19, 21, 1, CERULEAN_POKECENTER_1F + warp_event 30, 23, 1, CERULEAN_GYM + warp_event 25, 29, 2, CERULEAN_MART .CoordEvents: db 0 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 8546b5a60..3a78fe398 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -368,8 +368,8 @@ CeruleanGym_MapEvents: .Warps: db 2 - warp_def 4, 15, 5, CERULEAN_CITY - warp_def 5, 15, 5, CERULEAN_CITY + warp_event 4, 15, 5, CERULEAN_CITY + warp_event 5, 15, 5, CERULEAN_CITY .CoordEvents: db 0 diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index 82d9db826..f0afe7724 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -22,8 +22,8 @@ CeruleanGymBadgeSpeechHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 1, CERULEAN_CITY - warp_def 3, 7, 1, CERULEAN_CITY + warp_event 2, 7, 1, CERULEAN_CITY + warp_event 3, 7, 1, CERULEAN_CITY .CoordEvents: db 0 diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index c89621b6a..8327a3519 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -51,8 +51,8 @@ CeruleanMart_MapEvents: .Warps: db 2 - warp_def 2, 7, 6, CERULEAN_CITY - warp_def 3, 7, 6, CERULEAN_CITY + warp_event 2, 7, 6, CERULEAN_CITY + warp_event 3, 7, 6, CERULEAN_CITY .CoordEvents: db 0 diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 914db5053..146dab83d 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -68,9 +68,9 @@ CeruleanPokecenter1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 4, CERULEAN_CITY - warp_def 4, 7, 4, CERULEAN_CITY - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 4, CERULEAN_CITY + warp_event 4, 7, 4, CERULEAN_CITY + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/CeruleanPokecenter2FBeta.asm b/maps/CeruleanPokecenter2FBeta.asm index 467377caa..58a2299fd 100644 --- a/maps/CeruleanPokecenter2FBeta.asm +++ b/maps/CeruleanPokecenter2FBeta.asm @@ -11,7 +11,7 @@ CeruleanPokecenter2FBeta_MapEvents: .Warps: db 1 - warp_def 0, 7, 1, CERULEAN_POKECENTER_1F + warp_event 0, 7, 1, CERULEAN_POKECENTER_1F .CoordEvents: db 0 diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index ca77bf0cd..67fd4f763 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -49,8 +49,8 @@ CeruleanPoliceStation_MapEvents: .Warps: db 2 - warp_def 2, 7, 2, CERULEAN_CITY - warp_def 3, 7, 2, CERULEAN_CITY + warp_event 2, 7, 2, CERULEAN_CITY + warp_event 3, 7, 2, CERULEAN_CITY .CoordEvents: db 0 diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 8fdd470ae..373f6ce32 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -59,8 +59,8 @@ CeruleanTradeSpeechHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 3, CERULEAN_CITY - warp_def 3, 7, 3, CERULEAN_CITY + warp_event 2, 7, 3, CERULEAN_CITY + warp_event 3, 7, 3, CERULEAN_CITY .CoordEvents: db 0 diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 3eaa2464b..a768a0bef 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -154,8 +154,8 @@ CharcoalKiln_MapEvents: .Warps: db 2 - warp_def 2, 7, 2, AZALEA_TOWN - warp_def 3, 7, 2, AZALEA_TOWN + warp_event 2, 7, 2, AZALEA_TOWN + warp_event 3, 7, 2, AZALEA_TOWN .CoordEvents: db 0 diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index eaa21864b..bee085804 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -552,11 +552,11 @@ CherrygroveCity_MapEvents: .Warps: db 5 - warp_def 23, 3, 2, CHERRYGROVE_MART - warp_def 29, 3, 1, CHERRYGROVE_POKECENTER_1F - warp_def 17, 7, 1, CHERRYGROVE_GYM_SPEECH_HOUSE - warp_def 25, 9, 1, GUIDE_GENTS_HOUSE - warp_def 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE + warp_event 23, 3, 2, CHERRYGROVE_MART + warp_event 29, 3, 1, CHERRYGROVE_POKECENTER_1F + warp_event 17, 7, 1, CHERRYGROVE_GYM_SPEECH_HOUSE + warp_event 25, 9, 1, GUIDE_GENTS_HOUSE + warp_event 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE .CoordEvents: db 2 diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index c79941cb2..e634c3981 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -47,8 +47,8 @@ CherrygroveEvolutionSpeechHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 5, CHERRYGROVE_CITY - warp_def 3, 7, 5, CHERRYGROVE_CITY + warp_event 2, 7, 5, CHERRYGROVE_CITY + warp_event 3, 7, 5, CHERRYGROVE_CITY .CoordEvents: db 0 diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index 2709ed1c0..86bc4eaa4 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -50,8 +50,8 @@ CherrygroveGymSpeechHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 3, CHERRYGROVE_CITY - warp_def 3, 7, 3, CHERRYGROVE_CITY + warp_event 2, 7, 3, CHERRYGROVE_CITY + warp_event 3, 7, 3, CHERRYGROVE_CITY .CoordEvents: db 0 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 7a4b6dc0b..4684c9216 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -77,8 +77,8 @@ CherrygroveMart_MapEvents: .Warps: db 2 - warp_def 2, 7, 1, CHERRYGROVE_CITY - warp_def 3, 7, 1, CHERRYGROVE_CITY + warp_event 2, 7, 1, CHERRYGROVE_CITY + warp_event 3, 7, 1, CHERRYGROVE_CITY .CoordEvents: db 0 diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm index 202d87e50..364a8443c 100644 --- a/maps/CherrygrovePokecenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -74,9 +74,9 @@ CherrygrovePokecenter1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 2, CHERRYGROVE_CITY - warp_def 4, 7, 2, CHERRYGROVE_CITY - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 2, CHERRYGROVE_CITY + warp_event 4, 7, 2, CHERRYGROVE_CITY + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 82e4e459d..c6daa18c2 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -386,13 +386,13 @@ CianwoodCity_MapEvents: .Warps: db 7 - warp_def 17, 41, 1, MANIAS_HOUSE - warp_def 8, 43, 1, CIANWOOD_GYM - warp_def 23, 43, 1, CIANWOOD_POKECENTER_1F - warp_def 15, 47, 1, CIANWOOD_PHARMACY - warp_def 9, 31, 1, CIANWOOD_PHOTO_STUDIO - warp_def 15, 37, 1, CIANWOOD_LUGIA_SPEECH_HOUSE - warp_def 5, 17, 1, POKE_SEERS_HOUSE + warp_event 17, 41, 1, MANIAS_HOUSE + warp_event 8, 43, 1, CIANWOOD_GYM + warp_event 23, 43, 1, CIANWOOD_POKECENTER_1F + warp_event 15, 47, 1, CIANWOOD_PHARMACY + warp_event 9, 31, 1, CIANWOOD_PHOTO_STUDIO + warp_event 15, 37, 1, CIANWOOD_LUGIA_SPEECH_HOUSE + warp_event 5, 17, 1, POKE_SEERS_HOUSE .CoordEvents: db 1 diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index a9ac0bddd..e0bb019e1 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -311,8 +311,8 @@ CianwoodGym_MapEvents: .Warps: db 2 - warp_def 4, 17, 2, CIANWOOD_CITY - warp_def 5, 17, 2, CIANWOOD_CITY + warp_event 4, 17, 2, CIANWOOD_CITY + warp_event 5, 17, 2, CIANWOOD_CITY .CoordEvents: db 0 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 4b3099eec..b0b20210d 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -67,8 +67,8 @@ CianwoodLugiaSpeechHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 6, CIANWOOD_CITY - warp_def 3, 7, 6, CIANWOOD_CITY + warp_event 2, 7, 6, CIANWOOD_CITY + warp_event 3, 7, 6, CIANWOOD_CITY .CoordEvents: db 0 diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 696a16610..281583a8e 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -78,8 +78,8 @@ CianwoodPharmacy_MapEvents: .Warps: db 2 - warp_def 2, 7, 4, CIANWOOD_CITY - warp_def 3, 7, 4, CIANWOOD_CITY + warp_event 2, 7, 4, CIANWOOD_CITY + warp_event 3, 7, 4, CIANWOOD_CITY .CoordEvents: db 0 diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm index 52645b5d8..1c86fa150 100644 --- a/maps/CianwoodPhotoStudio.asm +++ b/maps/CianwoodPhotoStudio.asm @@ -54,8 +54,8 @@ CianwoodPhotoStudio_MapEvents: .Warps: db 2 - warp_def 2, 7, 5, CIANWOOD_CITY - warp_def 3, 7, 5, CIANWOOD_CITY + warp_event 2, 7, 5, CIANWOOD_CITY + warp_event 3, 7, 5, CIANWOOD_CITY .CoordEvents: db 0 diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm index 0f97e011b..848688257 100644 --- a/maps/CianwoodPokecenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -137,9 +137,9 @@ CianwoodPokecenter1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 3, CIANWOOD_CITY - warp_def 4, 7, 3, CIANWOOD_CITY - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 3, CIANWOOD_CITY + warp_event 4, 7, 3, CIANWOOD_CITY + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index c817510ab..70b1ab9c2 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -133,7 +133,7 @@ CinnabarIsland_MapEvents: .Warps: db 1 - warp_def 11, 11, 1, CINNABAR_POKECENTER_1F + warp_event 11, 11, 1, CINNABAR_POKECENTER_1F .CoordEvents: db 0 diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm index 17fe1b97c..b46f5023b 100644 --- a/maps/CinnabarPokecenter1F.asm +++ b/maps/CinnabarPokecenter1F.asm @@ -40,9 +40,9 @@ CinnabarPokecenter1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 1, CINNABAR_ISLAND - warp_def 4, 7, 1, CINNABAR_ISLAND - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 1, CINNABAR_ISLAND + warp_event 4, 7, 1, CINNABAR_ISLAND + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/CinnabarPokecenter2FBeta.asm b/maps/CinnabarPokecenter2FBeta.asm index f2621c43c..8cecb04c7 100644 --- a/maps/CinnabarPokecenter2FBeta.asm +++ b/maps/CinnabarPokecenter2FBeta.asm @@ -11,7 +11,7 @@ CinnabarPokecenter2FBeta_MapEvents: .Warps: db 1 - warp_def 0, 7, 3, CINNABAR_POKECENTER_1F + warp_event 0, 7, 3, CINNABAR_POKECENTER_1F .CoordEvents: db 0 diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 5c2450fc5..dcf4be92e 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -68,8 +68,8 @@ Colosseum_MapEvents: .Warps: db 2 - warp_def 4, 7, 3, POKECENTER_2F - warp_def 5, 7, 3, POKECENTER_2F + warp_event 4, 7, 3, POKECENTER_2F + warp_event 5, 7, 3, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 695329ded..97240f1fe 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -78,9 +78,9 @@ CopycatsHouse1F_MapEvents: .Warps: db 3 - warp_def 2, 7, 8, SAFFRON_CITY - warp_def 3, 7, 8, SAFFRON_CITY - warp_def 2, 0, 1, COPYCATS_HOUSE_2F + warp_event 2, 7, 8, SAFFRON_CITY + warp_event 3, 7, 8, SAFFRON_CITY + warp_event 2, 0, 1, COPYCATS_HOUSE_2F .CoordEvents: db 0 diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 0fda95f11..b13529aae 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -366,7 +366,7 @@ CopycatsHouse2F_MapEvents: .Warps: db 1 - warp_def 3, 0, 3, COPYCATS_HOUSE_1F + warp_event 3, 0, 3, COPYCATS_HOUSE_1F .CoordEvents: db 0 diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 99a01feac..fbc3c8a19 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -343,8 +343,8 @@ DanceTheatre_MapEvents: .Warps: db 2 - warp_def 5, 13, 8, ECRUTEAK_CITY - warp_def 6, 13, 8, ECRUTEAK_CITY + warp_event 5, 13, 8, ECRUTEAK_CITY + warp_event 6, 13, 8, ECRUTEAK_CITY .CoordEvents: db 0 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 63ea46aa3..75d67ac34 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -67,8 +67,8 @@ DarkCaveBlackthornEntrance_MapEvents: .Warps: db 2 - warp_def 23, 3, 1, ROUTE_45 - warp_def 3, 25, 2, DARK_CAVE_VIOLET_ENTRANCE + warp_event 23, 3, 1, ROUTE_45 + warp_event 3, 25, 2, DARK_CAVE_VIOLET_ENTRANCE .CoordEvents: db 0 diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index cea6b588b..fe24989d8 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -39,9 +39,9 @@ DarkCaveVioletEntrance_MapEvents: .Warps: db 3 - warp_def 3, 15, 3, ROUTE_31 - warp_def 17, 1, 2, DARK_CAVE_BLACKTHORN_ENTRANCE - warp_def 35, 33, 3, ROUTE_46 + warp_event 3, 15, 3, ROUTE_31 + warp_event 17, 1, 2, DARK_CAVE_BLACKTHORN_ENTRANCE + warp_event 35, 33, 3, ROUTE_46 .CoordEvents: db 0 diff --git a/maps/DayCare.asm b/maps/DayCare.asm index c3499990b..ec60bb764 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -161,10 +161,10 @@ DayCare_MapEvents: .Warps: db 4 - warp_def 0, 5, 3, ROUTE_34 - warp_def 0, 6, 4, ROUTE_34 - warp_def 2, 7, 5, ROUTE_34 - warp_def 3, 7, 5, ROUTE_34 + warp_event 0, 5, 3, ROUTE_34 + warp_event 0, 6, 4, ROUTE_34 + warp_event 2, 7, 5, ROUTE_34 + warp_event 3, 7, 5, ROUTE_34 .CoordEvents: db 0 diff --git a/maps/DayOfWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm index de1272660..aedc3e151 100644 --- a/maps/DayOfWeekSiblingsHouse.asm +++ b/maps/DayOfWeekSiblingsHouse.asm @@ -76,8 +76,8 @@ DayOfWeekSiblingsHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 3, ROUTE_26 - warp_def 3, 7, 3, ROUTE_26 + warp_event 2, 7, 3, ROUTE_26 + warp_event 3, 7, 3, ROUTE_26 .CoordEvents: db 0 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index c894b3aeb..1bee76da4 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -28,12 +28,12 @@ DiglettsCave_MapEvents: .Warps: db 6 - warp_def 3, 33, 10, VERMILION_CITY - warp_def 5, 31, 5, DIGLETTS_CAVE - warp_def 15, 5, 5, ROUTE_2 - warp_def 17, 3, 6, DIGLETTS_CAVE - warp_def 17, 33, 2, DIGLETTS_CAVE - warp_def 3, 3, 4, DIGLETTS_CAVE + warp_event 3, 33, 10, VERMILION_CITY + warp_event 5, 31, 5, DIGLETTS_CAVE + warp_event 15, 5, 5, ROUTE_2 + warp_event 17, 3, 6, DIGLETTS_CAVE + warp_event 17, 33, 2, DIGLETTS_CAVE + warp_event 3, 3, 4, DIGLETTS_CAVE .CoordEvents: db 0 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 90758584a..ad48875d1 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -663,8 +663,8 @@ DragonShrine_MapEvents: .Warps: db 2 - warp_def 4, 9, 2, DRAGONS_DEN_B1F - warp_def 5, 9, 2, DRAGONS_DEN_B1F + warp_event 4, 9, 2, DRAGONS_DEN_B1F + warp_event 5, 9, 2, DRAGONS_DEN_B1F .CoordEvents: db 0 diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm index 0ff616c59..d8866209b 100644 --- a/maps/DragonsDen1F.asm +++ b/maps/DragonsDen1F.asm @@ -11,10 +11,10 @@ DragonsDen1F_MapEvents: .Warps: db 4 - warp_def 3, 5, 8, BLACKTHORN_CITY - warp_def 3, 3, 4, DRAGONS_DEN_1F - warp_def 5, 15, 1, DRAGONS_DEN_B1F - warp_def 5, 13, 2, DRAGONS_DEN_1F + warp_event 3, 5, 8, BLACKTHORN_CITY + warp_event 3, 3, 4, DRAGONS_DEN_1F + warp_event 5, 15, 1, DRAGONS_DEN_B1F + warp_event 5, 13, 2, DRAGONS_DEN_1F .CoordEvents: db 0 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index c0c871c99..37f245ba7 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -412,8 +412,8 @@ DragonsDenB1F_MapEvents: .Warps: db 2 - warp_def 20, 3, 3, DRAGONS_DEN_1F - warp_def 19, 29, 1, DRAGON_SHRINE + warp_event 20, 3, 3, DRAGONS_DEN_1F + warp_event 19, 29, 1, DRAGON_SHRINE .CoordEvents: db 1 diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 9f2d40ad5..e3afb070b 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -417,8 +417,8 @@ EarlsPokemonAcademy_MapEvents: .Warps: db 2 - warp_def 3, 15, 3, VIOLET_CITY - warp_def 4, 15, 3, VIOLET_CITY + warp_event 3, 15, 3, VIOLET_CITY + warp_event 4, 15, 3, VIOLET_CITY .CoordEvents: db 0 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index f2d7ebba9..8b7c02087 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -265,21 +265,21 @@ EcruteakCity_MapEvents: .Warps: db 15 - warp_def 35, 26, 1, ROUTE_42_ECRUTEAK_GATE - warp_def 35, 27, 2, ROUTE_42_ECRUTEAK_GATE - warp_def 18, 11, 1, ECRUTEAK_TIN_TOWER_ENTRANCE - warp_def 20, 2, 1, WISE_TRIOS_ROOM - warp_def 20, 3, 2, WISE_TRIOS_ROOM - warp_def 23, 27, 1, ECRUTEAK_POKECENTER_1F - warp_def 5, 21, 1, ECRUTEAK_LUGIA_SPEECH_HOUSE - warp_def 23, 21, 1, DANCE_THEATRE - warp_def 29, 21, 2, ECRUTEAK_MART - warp_def 6, 27, 1, ECRUTEAK_GYM - warp_def 13, 27, 1, ECRUTEAK_ITEMFINDER_HOUSE - warp_def 37, 7, 1, TIN_TOWER_1F - warp_def 5, 5, 1, BURNED_TOWER_1F - warp_def 0, 18, 3, ROUTE_38_ECRUTEAK_GATE - warp_def 0, 19, 4, ROUTE_38_ECRUTEAK_GATE + warp_event 35, 26, 1, ROUTE_42_ECRUTEAK_GATE + warp_event 35, 27, 2, ROUTE_42_ECRUTEAK_GATE + warp_event 18, 11, 1, ECRUTEAK_TIN_TOWER_ENTRANCE + warp_event 20, 2, 1, WISE_TRIOS_ROOM + warp_event 20, 3, 2, WISE_TRIOS_ROOM + warp_event 23, 27, 1, ECRUTEAK_POKECENTER_1F + warp_event 5, 21, 1, ECRUTEAK_LUGIA_SPEECH_HOUSE + warp_event 23, 21, 1, DANCE_THEATRE + warp_event 29, 21, 2, ECRUTEAK_MART + warp_event 6, 27, 1, ECRUTEAK_GYM + warp_event 13, 27, 1, ECRUTEAK_ITEMFINDER_HOUSE + warp_event 37, 7, 1, TIN_TOWER_1F + warp_event 5, 5, 1, BURNED_TOWER_1F + warp_event 0, 18, 3, ROUTE_38_ECRUTEAK_GATE + warp_event 0, 19, 4, ROUTE_38_ECRUTEAK_GATE .CoordEvents: db 0 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 8304cc907..d892dc0ae 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -392,39 +392,39 @@ EcruteakGym_MapEvents: .Warps: db 33 - warp_def 4, 17, 10, ECRUTEAK_CITY - warp_def 5, 17, 10, ECRUTEAK_CITY - warp_def 4, 14, 4, ECRUTEAK_GYM - warp_def 2, 4, 3, ECRUTEAK_GYM - warp_def 3, 4, 3, ECRUTEAK_GYM - warp_def 4, 4, 3, ECRUTEAK_GYM - warp_def 4, 5, 3, ECRUTEAK_GYM - warp_def 6, 7, 3, ECRUTEAK_GYM - warp_def 7, 4, 3, ECRUTEAK_GYM - warp_def 2, 6, 3, ECRUTEAK_GYM - warp_def 3, 6, 3, ECRUTEAK_GYM - warp_def 4, 6, 3, ECRUTEAK_GYM - warp_def 5, 6, 3, ECRUTEAK_GYM - warp_def 7, 6, 3, ECRUTEAK_GYM - warp_def 7, 7, 3, ECRUTEAK_GYM - warp_def 4, 8, 3, ECRUTEAK_GYM - warp_def 5, 8, 3, ECRUTEAK_GYM - warp_def 6, 8, 3, ECRUTEAK_GYM - warp_def 7, 8, 3, ECRUTEAK_GYM - warp_def 2, 8, 3, ECRUTEAK_GYM - warp_def 2, 9, 3, ECRUTEAK_GYM - warp_def 2, 10, 3, ECRUTEAK_GYM - warp_def 2, 11, 3, ECRUTEAK_GYM - warp_def 4, 10, 3, ECRUTEAK_GYM - warp_def 5, 10, 3, ECRUTEAK_GYM - warp_def 2, 12, 3, ECRUTEAK_GYM - warp_def 3, 12, 3, ECRUTEAK_GYM - warp_def 4, 12, 3, ECRUTEAK_GYM - warp_def 5, 12, 3, ECRUTEAK_GYM - warp_def 7, 10, 3, ECRUTEAK_GYM - warp_def 7, 11, 3, ECRUTEAK_GYM - warp_def 7, 12, 3, ECRUTEAK_GYM - warp_def 7, 13, 3, ECRUTEAK_GYM + warp_event 4, 17, 10, ECRUTEAK_CITY + warp_event 5, 17, 10, ECRUTEAK_CITY + warp_event 4, 14, 4, ECRUTEAK_GYM + warp_event 2, 4, 3, ECRUTEAK_GYM + warp_event 3, 4, 3, ECRUTEAK_GYM + warp_event 4, 4, 3, ECRUTEAK_GYM + warp_event 4, 5, 3, ECRUTEAK_GYM + warp_event 6, 7, 3, ECRUTEAK_GYM + warp_event 7, 4, 3, ECRUTEAK_GYM + warp_event 2, 6, 3, ECRUTEAK_GYM + warp_event 3, 6, 3, ECRUTEAK_GYM + warp_event 4, 6, 3, ECRUTEAK_GYM + warp_event 5, 6, 3, ECRUTEAK_GYM + warp_event 7, 6, 3, ECRUTEAK_GYM + warp_event 7, 7, 3, ECRUTEAK_GYM + warp_event 4, 8, 3, ECRUTEAK_GYM + warp_event 5, 8, 3, ECRUTEAK_GYM + warp_event 6, 8, 3, ECRUTEAK_GYM + warp_event 7, 8, 3, ECRUTEAK_GYM + warp_event 2, 8, 3, ECRUTEAK_GYM + warp_event 2, 9, 3, ECRUTEAK_GYM + warp_event 2, 10, 3, ECRUTEAK_GYM + warp_event 2, 11, 3, ECRUTEAK_GYM + warp_event 4, 10, 3, ECRUTEAK_GYM + warp_event 5, 10, 3, ECRUTEAK_GYM + warp_event 2, 12, 3, ECRUTEAK_GYM + warp_event 3, 12, 3, ECRUTEAK_GYM + warp_event 4, 12, 3, ECRUTEAK_GYM + warp_event 5, 12, 3, ECRUTEAK_GYM + warp_event 7, 10, 3, ECRUTEAK_GYM + warp_event 7, 11, 3, ECRUTEAK_GYM + warp_event 7, 12, 3, ECRUTEAK_GYM + warp_event 7, 13, 3, ECRUTEAK_GYM .CoordEvents: db 0 diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 0d956a181..aa5528e7e 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -168,8 +168,8 @@ EcruteakItemfinderHouse_MapEvents: .Warps: db 2 - warp_def 3, 7, 11, ECRUTEAK_CITY - warp_def 4, 7, 11, ECRUTEAK_CITY + warp_event 3, 7, 11, ECRUTEAK_CITY + warp_event 4, 7, 11, ECRUTEAK_CITY .CoordEvents: db 0 diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index 4b39f93eb..cfe4c0fca 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -50,8 +50,8 @@ EcruteakLugiaSpeechHouse_MapEvents: .Warps: db 2 - warp_def 3, 7, 7, ECRUTEAK_CITY - warp_def 4, 7, 7, ECRUTEAK_CITY + warp_event 3, 7, 7, ECRUTEAK_CITY + warp_event 4, 7, 7, ECRUTEAK_CITY .CoordEvents: db 0 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index c69de9a7d..788edc9f7 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -51,8 +51,8 @@ EcruteakMart_MapEvents: .Warps: db 2 - warp_def 2, 7, 9, ECRUTEAK_CITY - warp_def 3, 7, 9, ECRUTEAK_CITY + warp_event 2, 7, 9, ECRUTEAK_CITY + warp_event 3, 7, 9, ECRUTEAK_CITY .CoordEvents: db 0 diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index 8fd1436dd..e34bcda5a 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -212,9 +212,9 @@ EcruteakPokecenter1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 6, ECRUTEAK_CITY - warp_def 4, 7, 6, ECRUTEAK_CITY - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 6, ECRUTEAK_CITY + warp_event 4, 7, 6, ECRUTEAK_CITY + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm index 3d960dfee..3ad1ea2a0 100644 --- a/maps/EcruteakTinTowerEntrance.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -283,11 +283,11 @@ EcruteakTinTowerEntrance_MapEvents: .Warps: db 5 - warp_def 4, 17, 3, ECRUTEAK_CITY - warp_def 5, 17, 3, ECRUTEAK_CITY - warp_def 5, 3, 4, ECRUTEAK_TIN_TOWER_ENTRANCE - warp_def 17, 15, 3, ECRUTEAK_TIN_TOWER_ENTRANCE - warp_def 17, 3, 3, WISE_TRIOS_ROOM + warp_event 4, 17, 3, ECRUTEAK_CITY + warp_event 5, 17, 3, ECRUTEAK_CITY + warp_event 5, 3, 4, ECRUTEAK_TIN_TOWER_ENTRANCE + warp_event 17, 15, 3, ECRUTEAK_TIN_TOWER_ENTRANCE + warp_event 17, 3, 3, WISE_TRIOS_ROOM .CoordEvents: db 2 diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 292562f85..25243892f 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -89,8 +89,8 @@ ElmsHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 4, NEW_BARK_TOWN - warp_def 3, 7, 4, NEW_BARK_TOWN + warp_event 2, 7, 4, NEW_BARK_TOWN + warp_event 3, 7, 4, NEW_BARK_TOWN .CoordEvents: db 0 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index a0ab0c442..157e86a16 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1376,8 +1376,8 @@ ElmsLab_MapEvents: .Warps: db 2 - warp_def 4, 11, 1, NEW_BARK_TOWN - warp_def 5, 11, 1, NEW_BARK_TOWN + warp_event 4, 11, 1, NEW_BARK_TOWN + warp_event 5, 11, 1, NEW_BARK_TOWN .CoordEvents: db 8 diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 9da566ee7..32fe441f1 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -291,18 +291,18 @@ FastShip1F_MapEvents: .Warps: db 12 - warp_def 25, 1, -1, FAST_SHIP_1F - warp_def 27, 8, 1, FAST_SHIP_CABINS_NNW_NNE_NE - warp_def 23, 8, 2, FAST_SHIP_CABINS_NNW_NNE_NE - warp_def 19, 8, 3, FAST_SHIP_CABINS_NNW_NNE_NE - warp_def 15, 8, 1, FAST_SHIP_CABINS_SW_SSW_NW - warp_def 15, 15, 2, FAST_SHIP_CABINS_SW_SSW_NW - warp_def 19, 15, 4, FAST_SHIP_CABINS_SW_SSW_NW - warp_def 23, 15, 1, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN - warp_def 27, 15, 3, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN - warp_def 3, 13, 5, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN - warp_def 6, 12, 1, FAST_SHIP_B1F - warp_def 30, 14, 2, FAST_SHIP_B1F + warp_event 25, 1, -1, FAST_SHIP_1F + warp_event 27, 8, 1, FAST_SHIP_CABINS_NNW_NNE_NE + warp_event 23, 8, 2, FAST_SHIP_CABINS_NNW_NNE_NE + warp_event 19, 8, 3, FAST_SHIP_CABINS_NNW_NNE_NE + warp_event 15, 8, 1, FAST_SHIP_CABINS_SW_SSW_NW + warp_event 15, 15, 2, FAST_SHIP_CABINS_SW_SSW_NW + warp_event 19, 15, 4, FAST_SHIP_CABINS_SW_SSW_NW + warp_event 23, 15, 1, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN + warp_event 27, 15, 3, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN + warp_event 3, 13, 5, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN + warp_event 6, 12, 1, FAST_SHIP_B1F + warp_event 30, 14, 2, FAST_SHIP_B1F .CoordEvents: db 2 diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index e5d935e66..eae217471 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -454,8 +454,8 @@ FastShipB1F_MapEvents: .Warps: db 2 - warp_def 5, 11, 11, FAST_SHIP_1F - warp_def 31, 13, 12, FAST_SHIP_1F + warp_event 5, 11, 11, FAST_SHIP_1F + warp_event 31, 13, 12, FAST_SHIP_1F .CoordEvents: db 2 diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 68fd528dd..50b1b719e 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -272,9 +272,9 @@ FastShipCabins_NNW_NNE_NE_MapEvents: .Warps: db 3 - warp_def 2, 0, 2, FAST_SHIP_1F - warp_def 2, 12, 3, FAST_SHIP_1F - warp_def 2, 24, 4, FAST_SHIP_1F + warp_event 2, 0, 2, FAST_SHIP_1F + warp_event 2, 12, 3, FAST_SHIP_1F + warp_event 2, 24, 4, FAST_SHIP_1F .CoordEvents: db 0 diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index d53c76d5c..7a41391d9 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -468,12 +468,12 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEvents: .Warps: db 6 - warp_def 2, 7, 8, FAST_SHIP_1F - warp_def 3, 7, 8, FAST_SHIP_1F - warp_def 2, 19, 9, FAST_SHIP_1F - warp_def 3, 19, 9, FAST_SHIP_1F - warp_def 2, 33, 10, FAST_SHIP_1F - warp_def 3, 33, 10, FAST_SHIP_1F + warp_event 2, 7, 8, FAST_SHIP_1F + warp_event 3, 7, 8, FAST_SHIP_1F + warp_event 2, 19, 9, FAST_SHIP_1F + warp_event 3, 19, 9, FAST_SHIP_1F + warp_event 2, 33, 10, FAST_SHIP_1F + warp_event 3, 33, 10, FAST_SHIP_1F .CoordEvents: db 0 diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 76496baac..ad46bd707 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -228,11 +228,11 @@ FastShipCabins_SW_SSW_NW_MapEvents: .Warps: db 5 - warp_def 2, 0, 5, FAST_SHIP_1F - warp_def 2, 19, 6, FAST_SHIP_1F - warp_def 3, 19, 6, FAST_SHIP_1F - warp_def 2, 31, 7, FAST_SHIP_1F - warp_def 3, 31, 7, FAST_SHIP_1F + warp_event 2, 0, 5, FAST_SHIP_1F + warp_event 2, 19, 6, FAST_SHIP_1F + warp_event 3, 19, 6, FAST_SHIP_1F + warp_event 2, 31, 7, FAST_SHIP_1F + warp_event 3, 31, 7, FAST_SHIP_1F .CoordEvents: db 0 diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 46cc7ddeb..c45572587 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -48,8 +48,8 @@ FightingDojo_MapEvents: .Warps: db 2 - warp_def 4, 11, 1, SAFFRON_CITY - warp_def 5, 11, 1, SAFFRON_CITY + warp_event 4, 11, 1, SAFFRON_CITY + warp_event 5, 11, 1, SAFFRON_CITY .CoordEvents: db 0 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 319dae2cd..0d0061ad0 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -130,17 +130,17 @@ FuchsiaCity_MapEvents: .Warps: db 11 - warp_def 5, 13, 2, FUCHSIA_MART - warp_def 22, 13, 1, SAFARI_ZONE_MAIN_OFFICE - warp_def 8, 27, 1, FUCHSIA_GYM - warp_def 11, 27, 1, BILLS_BROTHERS_HOUSE - warp_def 19, 27, 1, FUCHSIA_POKECENTER_1F - warp_def 27, 27, 1, SAFARI_ZONE_WARDENS_HOME - warp_def 18, 3, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA - warp_def 37, 22, 1, ROUTE_15_FUCHSIA_GATE - warp_def 37, 23, 2, ROUTE_15_FUCHSIA_GATE - warp_def 7, 35, 1, ROUTE_19_FUCHSIA_GATE - warp_def 8, 35, 2, ROUTE_19_FUCHSIA_GATE + warp_event 5, 13, 2, FUCHSIA_MART + warp_event 22, 13, 1, SAFARI_ZONE_MAIN_OFFICE + warp_event 8, 27, 1, FUCHSIA_GYM + warp_event 11, 27, 1, BILLS_BROTHERS_HOUSE + warp_event 19, 27, 1, FUCHSIA_POKECENTER_1F + warp_event 27, 27, 1, SAFARI_ZONE_WARDENS_HOME + warp_event 18, 3, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA + warp_event 37, 22, 1, ROUTE_15_FUCHSIA_GATE + warp_event 37, 23, 2, ROUTE_15_FUCHSIA_GATE + warp_event 7, 35, 1, ROUTE_19_FUCHSIA_GATE + warp_event 8, 35, 2, ROUTE_19_FUCHSIA_GATE .CoordEvents: db 0 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 90ffab8c8..f701f1246 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -386,8 +386,8 @@ FuchsiaGym_MapEvents: .Warps: db 2 - warp_def 4, 17, 3, FUCHSIA_CITY - warp_def 5, 17, 3, FUCHSIA_CITY + warp_event 4, 17, 3, FUCHSIA_CITY + warp_event 5, 17, 3, FUCHSIA_CITY .CoordEvents: db 0 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 4ab7932f3..a0a4d7345 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -43,8 +43,8 @@ FuchsiaMart_MapEvents: .Warps: db 2 - warp_def 2, 7, 1, FUCHSIA_CITY - warp_def 3, 7, 1, FUCHSIA_CITY + warp_event 2, 7, 1, FUCHSIA_CITY + warp_event 3, 7, 1, FUCHSIA_CITY .CoordEvents: db 0 diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index c74e93c52..12e7823c5 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -94,9 +94,9 @@ FuchsiaPokecenter1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 5, FUCHSIA_CITY - warp_def 4, 7, 5, FUCHSIA_CITY - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 5, FUCHSIA_CITY + warp_event 4, 7, 5, FUCHSIA_CITY + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/FuchsiaPokecenter2FBeta.asm b/maps/FuchsiaPokecenter2FBeta.asm index dc61c55ab..eae7a73c3 100644 --- a/maps/FuchsiaPokecenter2FBeta.asm +++ b/maps/FuchsiaPokecenter2FBeta.asm @@ -11,7 +11,7 @@ FuchsiaPokecenter2FBeta_MapEvents: .Warps: db 1 - warp_def 0, 7, 3, FUCHSIA_POKECENTER_1F + warp_event 0, 7, 3, FUCHSIA_POKECENTER_1F .CoordEvents: db 0 diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 48cc677ab..992f0af5c 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -108,8 +108,8 @@ GoldenrodBikeShop_MapEvents: .Warps: db 2 - warp_def 2, 7, 2, GOLDENROD_CITY - warp_def 3, 7, 2, GOLDENROD_CITY + warp_event 2, 7, 2, GOLDENROD_CITY + warp_event 3, 7, 2, GOLDENROD_CITY .CoordEvents: db 0 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 5eda492f3..021158697 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -557,21 +557,21 @@ GoldenrodCity_MapEvents: .Warps: db 15 - warp_def 24, 7, 1, GOLDENROD_GYM - warp_def 29, 29, 1, GOLDENROD_BIKE_SHOP - warp_def 31, 21, 1, GOLDENROD_HAPPINESS_RATER - warp_def 5, 25, 1, BILLS_FAMILYS_HOUSE - warp_def 9, 13, 2, GOLDENROD_MAGNET_TRAIN_STATION - warp_def 29, 5, 1, GOLDENROD_FLOWER_SHOP - warp_def 33, 9, 1, GOLDENROD_PP_SPEECH_HOUSE - warp_def 15, 7, 1, GOLDENROD_NAME_RATER - warp_def 24, 27, 1, GOLDENROD_DEPT_STORE_1F - warp_def 14, 21, 1, GOLDENROD_GAME_CORNER - warp_def 5, 15, 1, RADIO_TOWER_1F - warp_def 19, 1, 3, ROUTE_35_GOLDENROD_GATE - warp_def 9, 5, 8, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_def 11, 29, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_def 15, 27, 1, GOLDENROD_POKECENTER_1F + warp_event 24, 7, 1, GOLDENROD_GYM + warp_event 29, 29, 1, GOLDENROD_BIKE_SHOP + warp_event 31, 21, 1, GOLDENROD_HAPPINESS_RATER + warp_event 5, 25, 1, BILLS_FAMILYS_HOUSE + warp_event 9, 13, 2, GOLDENROD_MAGNET_TRAIN_STATION + warp_event 29, 5, 1, GOLDENROD_FLOWER_SHOP + warp_event 33, 9, 1, GOLDENROD_PP_SPEECH_HOUSE + warp_event 15, 7, 1, GOLDENROD_NAME_RATER + warp_event 24, 27, 1, GOLDENROD_DEPT_STORE_1F + warp_event 14, 21, 1, GOLDENROD_GAME_CORNER + warp_event 5, 15, 1, RADIO_TOWER_1F + warp_event 19, 1, 3, ROUTE_35_GOLDENROD_GATE + warp_event 9, 5, 8, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES + warp_event 11, 29, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES + warp_event 15, 27, 1, GOLDENROD_POKECENTER_1F .CoordEvents: db 0 diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 6f07b6ad4..d8a77c7c0 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -84,10 +84,10 @@ GoldenrodDeptStore1F_MapEvents: .Warps: db 4 - warp_def 7, 7, 9, GOLDENROD_CITY - warp_def 8, 7, 9, GOLDENROD_CITY - warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_2F - warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR + warp_event 7, 7, 9, GOLDENROD_CITY + warp_event 8, 7, 9, GOLDENROD_CITY + warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_2F + warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR .CoordEvents: db 0 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index bfe6a398f..1fbe2dce1 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -106,9 +106,9 @@ GoldenrodDeptStore2F_MapEvents: .Warps: db 3 - warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_3F - warp_def 15, 0, 3, GOLDENROD_DEPT_STORE_1F - warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR + warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_3F + warp_event 15, 0, 3, GOLDENROD_DEPT_STORE_1F + warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR .CoordEvents: db 0 diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index c495cb440..495434787 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -62,9 +62,9 @@ GoldenrodDeptStore3F_MapEvents: .Warps: db 3 - warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_2F - warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_4F - warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR + warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_2F + warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_4F + warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR .CoordEvents: db 0 diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 03882b8f2..f7e1cbc52 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -83,9 +83,9 @@ GoldenrodDeptStore4F_MapEvents: .Warps: db 3 - warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_5F - warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_3F - warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR + warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_5F + warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_3F + warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR .CoordEvents: db 0 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 73fef5157..910035c39 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -223,9 +223,9 @@ GoldenrodDeptStore5F_MapEvents: .Warps: db 3 - warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_4F - warp_def 15, 0, 1, GOLDENROD_DEPT_STORE_6F - warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR + warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_4F + warp_event 15, 0, 1, GOLDENROD_DEPT_STORE_6F + warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR .CoordEvents: db 0 diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index e9f9447ce..315428b9f 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -153,9 +153,9 @@ GoldenrodDeptStore6F_MapEvents: .Warps: db 3 - warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_5F - warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR - warp_def 13, 0, 1, GOLDENROD_DEPT_STORE_ROOF + warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_5F + warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR + warp_event 13, 0, 1, GOLDENROD_DEPT_STORE_ROOF .CoordEvents: db 0 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 4d0603d0f..86a603fd1 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -115,9 +115,9 @@ GoldenrodDeptStoreB1F_MapEvents: .Warps: db 3 - warp_def 17, 2, 3, GOLDENROD_UNDERGROUND_WAREHOUSE - warp_def 9, 4, 1, GOLDENROD_DEPT_STORE_ELEVATOR - warp_def 10, 4, 2, GOLDENROD_DEPT_STORE_ELEVATOR + warp_event 17, 2, 3, GOLDENROD_UNDERGROUND_WAREHOUSE + warp_event 9, 4, 1, GOLDENROD_DEPT_STORE_ELEVATOR + warp_event 10, 4, 2, GOLDENROD_DEPT_STORE_ELEVATOR .CoordEvents: db 0 diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 6ff041e9f..60ba72ff2 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -60,8 +60,8 @@ GoldenrodDeptStoreElevator_MapEvents: .Warps: db 2 - warp_def 1, 3, -1, GOLDENROD_DEPT_STORE_1F - warp_def 2, 3, -1, GOLDENROD_DEPT_STORE_1F + warp_event 1, 3, -1, GOLDENROD_DEPT_STORE_1F + warp_event 2, 3, -1, GOLDENROD_DEPT_STORE_1F .CoordEvents: db 0 diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 55f885e62..739598b15 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -217,7 +217,7 @@ GoldenrodDeptStoreRoof_MapEvents: .Warps: db 1 - warp_def 13, 1, 3, GOLDENROD_DEPT_STORE_6F + warp_event 13, 1, 3, GOLDENROD_DEPT_STORE_6F .CoordEvents: db 0 diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 38a8edc3f..e398a0138 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -165,8 +165,8 @@ GoldenrodFlowerShop_MapEvents: .Warps: db 2 - warp_def 2, 7, 6, GOLDENROD_CITY - warp_def 3, 7, 6, GOLDENROD_CITY + warp_event 2, 7, 6, GOLDENROD_CITY + warp_event 3, 7, 6, GOLDENROD_CITY .CoordEvents: db 0 diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 30ba8c64a..43af60d36 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -442,8 +442,8 @@ GoldenrodGameCorner_MapEvents: .Warps: db 2 - warp_def 2, 13, 10, GOLDENROD_CITY - warp_def 3, 13, 10, GOLDENROD_CITY + warp_event 2, 13, 10, GOLDENROD_CITY + warp_event 3, 13, 10, GOLDENROD_CITY .CoordEvents: db 0 diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 98ec66658..d61dd4ea0 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -385,8 +385,8 @@ GoldenrodGym_MapEvents: .Warps: db 2 - warp_def 2, 17, 1, GOLDENROD_CITY - warp_def 3, 17, 1, GOLDENROD_CITY + warp_event 2, 17, 1, GOLDENROD_CITY + warp_event 3, 17, 1, GOLDENROD_CITY .CoordEvents: db 1 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index da8d67668..9b9334f9e 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -142,8 +142,8 @@ GoldenrodHappinessRater_MapEvents: .Warps: db 2 - warp_def 2, 7, 3, GOLDENROD_CITY - warp_def 3, 7, 3, GOLDENROD_CITY + warp_event 2, 7, 3, GOLDENROD_CITY + warp_event 3, 7, 3, GOLDENROD_CITY .CoordEvents: db 0 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 1fd37876a..aec9dcd3c 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -170,10 +170,10 @@ GoldenrodMagnetTrainStation_MapEvents: .Warps: db 4 - warp_def 8, 17, 5, GOLDENROD_CITY - warp_def 9, 17, 5, GOLDENROD_CITY - warp_def 6, 5, 4, SAFFRON_MAGNET_TRAIN_STATION - warp_def 11, 5, 3, SAFFRON_MAGNET_TRAIN_STATION + warp_event 8, 17, 5, GOLDENROD_CITY + warp_event 9, 17, 5, GOLDENROD_CITY + warp_event 6, 5, 4, SAFFRON_MAGNET_TRAIN_STATION + warp_event 11, 5, 3, SAFFRON_MAGNET_TRAIN_STATION .CoordEvents: db 1 diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index 8e9f0612d..892c00984 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -30,8 +30,8 @@ GoldenrodNameRater_MapEvents: .Warps: db 2 - warp_def 2, 7, 8, GOLDENROD_CITY - warp_def 3, 7, 8, GOLDENROD_CITY + warp_event 2, 7, 8, GOLDENROD_CITY + warp_event 3, 7, 8, GOLDENROD_CITY .CoordEvents: db 0 diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 416ed37c7..b9d9fc949 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -57,8 +57,8 @@ GoldenrodPPSpeechHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 7, GOLDENROD_CITY - warp_def 3, 7, 7, GOLDENROD_CITY + warp_event 2, 7, 7, GOLDENROD_CITY + warp_event 3, 7, 7, GOLDENROD_CITY .CoordEvents: db 0 diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index bb0a19be3..cd4149c31 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -810,10 +810,10 @@ GoldenrodPokecenter1F_MapEvents: .Warps: db 4 - warp_def 3, 7, 15, GOLDENROD_CITY - warp_def 4, 7, 15, GOLDENROD_CITY - warp_def 0, 6, 1, POKECOM_CENTER_ADMIN_ROOM_MOBILE - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 15, GOLDENROD_CITY + warp_event 4, 7, 15, GOLDENROD_CITY + warp_event 0, 6, 1, POKECOM_CENTER_ADMIN_ROOM_MOBILE + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 2 diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index b856c61c4..cac603e87 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -652,12 +652,12 @@ GoldenrodUnderground_MapEvents: .Warps: db 6 - warp_def 3, 2, 7, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_def 3, 34, 4, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_def 18, 6, 4, GOLDENROD_UNDERGROUND - warp_def 21, 31, 3, GOLDENROD_UNDERGROUND - warp_def 22, 31, 3, GOLDENROD_UNDERGROUND - warp_def 22, 27, 1, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES + warp_event 3, 2, 7, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES + warp_event 3, 34, 4, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES + warp_event 18, 6, 4, GOLDENROD_UNDERGROUND + warp_event 21, 31, 3, GOLDENROD_UNDERGROUND + warp_event 22, 31, 3, GOLDENROD_UNDERGROUND + warp_event 22, 27, 1, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES .CoordEvents: db 0 diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index e5bbf74cb..3fab6e657 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -936,15 +936,15 @@ GoldenrodUndergroundSwitchRoomEntrances_MapEvents: .Warps: db 9 - warp_def 23, 3, 6, GOLDENROD_UNDERGROUND - warp_def 22, 10, 1, GOLDENROD_UNDERGROUND_WAREHOUSE - warp_def 23, 10, 2, GOLDENROD_UNDERGROUND_WAREHOUSE - warp_def 5, 25, 2, GOLDENROD_UNDERGROUND - warp_def 4, 29, 14, GOLDENROD_CITY - warp_def 5, 29, 14, GOLDENROD_CITY - warp_def 21, 25, 1, GOLDENROD_UNDERGROUND - warp_def 20, 29, 13, GOLDENROD_CITY - warp_def 21, 29, 13, GOLDENROD_CITY + warp_event 23, 3, 6, GOLDENROD_UNDERGROUND + warp_event 22, 10, 1, GOLDENROD_UNDERGROUND_WAREHOUSE + warp_event 23, 10, 2, GOLDENROD_UNDERGROUND_WAREHOUSE + warp_event 5, 25, 2, GOLDENROD_UNDERGROUND + warp_event 4, 29, 14, GOLDENROD_CITY + warp_event 5, 29, 14, GOLDENROD_CITY + warp_event 21, 25, 1, GOLDENROD_UNDERGROUND + warp_event 20, 29, 13, GOLDENROD_CITY + warp_event 21, 29, 13, GOLDENROD_CITY .CoordEvents: db 2 diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index e132b81b9..941a3e622 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -216,9 +216,9 @@ GoldenrodUndergroundWarehouse_MapEvents: .Warps: db 3 - warp_def 2, 12, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_def 3, 12, 3, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_def 17, 2, 1, GOLDENROD_DEPT_STORE_B1F + warp_event 2, 12, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES + warp_event 3, 12, 3, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES + warp_event 17, 2, 1, GOLDENROD_DEPT_STORE_B1F .CoordEvents: db 0 diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index 136d0da66..9b52fcbc6 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -33,8 +33,8 @@ GuideGentsHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 4, CHERRYGROVE_CITY - warp_def 3, 7, 4, CHERRYGROVE_CITY + warp_event 2, 7, 4, CHERRYGROVE_CITY + warp_event 3, 7, 4, CHERRYGROVE_CITY .CoordEvents: db 0 diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 2a7e034d5..537391ce5 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -116,8 +116,8 @@ HallOfFame_MapEvents: .Warps: db 2 - warp_def 4, 13, 3, LANCES_ROOM - warp_def 5, 13, 4, LANCES_ROOM + warp_event 4, 13, 3, LANCES_ROOM + warp_event 5, 13, 4, LANCES_ROOM .CoordEvents: db 0 diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index 84abeb680..d9c5a255b 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -25,10 +25,10 @@ IcePath1F_MapEvents: .Warps: db 4 - warp_def 4, 19, 1, ROUTE_44 - warp_def 36, 27, 7, BLACKTHORN_CITY - warp_def 37, 5, 1, ICE_PATH_B1F - warp_def 37, 13, 7, ICE_PATH_B1F + warp_event 4, 19, 1, ROUTE_44 + warp_event 36, 27, 7, BLACKTHORN_CITY + warp_event 37, 5, 1, ICE_PATH_B1F + warp_event 37, 13, 7, ICE_PATH_B1F .CoordEvents: db 0 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index b0cba6d34..aa98d905c 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -81,14 +81,14 @@ IcePathB1F_MapEvents: .Warps: db 8 - warp_def 3, 15, 3, ICE_PATH_1F - warp_def 17, 3, 1, ICE_PATH_B2F_MAHOGANY_SIDE - warp_def 11, 2, 3, ICE_PATH_B2F_MAHOGANY_SIDE ; hole - warp_def 4, 7, 4, ICE_PATH_B2F_MAHOGANY_SIDE ; hole - warp_def 5, 12, 5, ICE_PATH_B2F_MAHOGANY_SIDE ; hole - warp_def 12, 13, 6, ICE_PATH_B2F_MAHOGANY_SIDE ; hole - warp_def 5, 25, 4, ICE_PATH_1F - warp_def 11, 27, 1, ICE_PATH_B2F_BLACKTHORN_SIDE + warp_event 3, 15, 3, ICE_PATH_1F + warp_event 17, 3, 1, ICE_PATH_B2F_MAHOGANY_SIDE + warp_event 11, 2, 3, ICE_PATH_B2F_MAHOGANY_SIDE ; hole + warp_event 4, 7, 4, ICE_PATH_B2F_MAHOGANY_SIDE ; hole + warp_event 5, 12, 5, ICE_PATH_B2F_MAHOGANY_SIDE ; hole + warp_event 12, 13, 6, ICE_PATH_B2F_MAHOGANY_SIDE ; hole + warp_event 5, 25, 4, ICE_PATH_1F + warp_event 11, 27, 1, ICE_PATH_B2F_BLACKTHORN_SIDE .CoordEvents: db 0 diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 00caf4394..57aa9a061 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -20,8 +20,8 @@ IcePathB2FBlackthornSide_MapEvents: .Warps: db 2 - warp_def 3, 15, 8, ICE_PATH_B1F - warp_def 3, 3, 2, ICE_PATH_B3F + warp_event 3, 15, 8, ICE_PATH_B1F + warp_event 3, 3, 2, ICE_PATH_B3F .CoordEvents: db 0 diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 6ee9284fe..4c98193e9 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -36,12 +36,12 @@ IcePathB2FMahoganySide_MapEvents: .Warps: db 6 - warp_def 17, 1, 2, ICE_PATH_B1F - warp_def 9, 11, 1, ICE_PATH_B3F - warp_def 11, 4, 3, ICE_PATH_B1F - warp_def 4, 6, 4, ICE_PATH_B1F - warp_def 4, 12, 5, ICE_PATH_B1F - warp_def 12, 12, 6, ICE_PATH_B1F + warp_event 17, 1, 2, ICE_PATH_B1F + warp_event 9, 11, 1, ICE_PATH_B3F + warp_event 11, 4, 3, ICE_PATH_B1F + warp_event 4, 6, 4, ICE_PATH_B1F + warp_event 4, 12, 5, ICE_PATH_B1F + warp_event 12, 12, 6, ICE_PATH_B1F .CoordEvents: db 0 diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index 40809dbe3..0c0849493 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -21,8 +21,8 @@ IcePathB3F_MapEvents: .Warps: db 2 - warp_def 3, 5, 2, ICE_PATH_B2F_MAHOGANY_SIDE - warp_def 15, 5, 2, ICE_PATH_B2F_BLACKTHORN_SIDE + warp_event 3, 5, 2, ICE_PATH_B2F_MAHOGANY_SIDE + warp_event 15, 5, 2, ICE_PATH_B2F_BLACKTHORN_SIDE .CoordEvents: db 0 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 16fd0bbf0..54b350edf 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -943,9 +943,9 @@ IlexForest_MapEvents: .Warps: db 3 - warp_def 1, 5, 3, ROUTE_34_ILEX_FOREST_GATE - warp_def 3, 42, 1, ILEX_FOREST_AZALEA_GATE - warp_def 3, 43, 2, ILEX_FOREST_AZALEA_GATE + warp_event 1, 5, 3, ROUTE_34_ILEX_FOREST_GATE + warp_event 3, 42, 1, ILEX_FOREST_AZALEA_GATE + warp_event 3, 43, 2, ILEX_FOREST_AZALEA_GATE .CoordEvents: db 0 diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index c66483971..cc3df33af 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -36,10 +36,10 @@ IlexForestAzaleaGate_MapEvents: .Warps: db 4 - warp_def 0, 4, 2, ILEX_FOREST - warp_def 0, 5, 3, ILEX_FOREST - warp_def 9, 4, 7, AZALEA_TOWN - warp_def 9, 5, 8, AZALEA_TOWN + warp_event 0, 4, 2, ILEX_FOREST + warp_event 0, 5, 3, ILEX_FOREST + warp_event 9, 4, 7, AZALEA_TOWN + warp_event 9, 5, 8, AZALEA_TOWN .CoordEvents: db 0 diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index feb517914..15ff9354d 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -308,10 +308,10 @@ IndigoPlateauPokecenter1F_MapEvents: .Warps: db 4 - warp_def 5, 13, 1, ROUTE_23 - warp_def 6, 13, 2, ROUTE_23 - warp_def 0, 13, 1, POKECENTER_2F - warp_def 14, 3, 1, WILLS_ROOM + warp_event 5, 13, 1, ROUTE_23 + warp_event 6, 13, 2, ROUTE_23 + warp_event 0, 13, 1, POKECENTER_2F + warp_event 14, 3, 1, WILLS_ROOM .CoordEvents: db 2 diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index eef62321d..22dc3d3f7 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -138,10 +138,10 @@ KarensRoom_MapEvents: .Warps: db 4 - warp_def 4, 17, 3, BRUNOS_ROOM - warp_def 5, 17, 4, BRUNOS_ROOM - warp_def 4, 2, 1, LANCES_ROOM - warp_def 5, 2, 2, LANCES_ROOM + warp_event 4, 17, 3, BRUNOS_ROOM + warp_event 5, 17, 4, BRUNOS_ROOM + warp_event 4, 2, 1, LANCES_ROOM + warp_event 5, 2, 2, LANCES_ROOM .CoordEvents: db 0 diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index fe1badec4..60aeb4c31 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -135,10 +135,10 @@ KogasRoom_MapEvents: .Warps: db 4 - warp_def 4, 17, 2, WILLS_ROOM - warp_def 5, 17, 3, WILLS_ROOM - warp_def 4, 2, 1, BRUNOS_ROOM - warp_def 5, 2, 2, BRUNOS_ROOM + warp_event 4, 17, 2, WILLS_ROOM + warp_event 5, 17, 3, WILLS_ROOM + warp_event 4, 2, 1, BRUNOS_ROOM + warp_event 5, 2, 2, BRUNOS_ROOM .CoordEvents: db 0 diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index c8894a715..dc503d33d 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -682,8 +682,8 @@ KurtsHouse_MapEvents: .Warps: db 2 - warp_def 3, 7, 4, AZALEA_TOWN - warp_def 4, 7, 4, AZALEA_TOWN + warp_event 3, 7, 4, AZALEA_TOWN + warp_event 4, 7, 4, AZALEA_TOWN .CoordEvents: db 0 diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 9ffc9e05c..5f32609a0 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -499,8 +499,8 @@ LakeOfRage_MapEvents: .Warps: db 2 - warp_def 7, 3, 1, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE - warp_def 27, 31, 1, LAKE_OF_RAGE_MAGIKARP_HOUSE + warp_event 7, 3, 1, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE + warp_event 27, 31, 1, LAKE_OF_RAGE_MAGIKARP_HOUSE .CoordEvents: db 0 diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm index 9d346ab0a..0b928d0bd 100644 --- a/maps/LakeOfRageHiddenPowerHouse.asm +++ b/maps/LakeOfRageHiddenPowerHouse.asm @@ -73,8 +73,8 @@ LakeOfRageHiddenPowerHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 1, LAKE_OF_RAGE - warp_def 3, 7, 1, LAKE_OF_RAGE + warp_event 2, 7, 1, LAKE_OF_RAGE + warp_event 3, 7, 1, LAKE_OF_RAGE .CoordEvents: db 0 diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index b921d38b0..81844712e 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -212,8 +212,8 @@ LakeOfRageMagikarpHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 2, LAKE_OF_RAGE - warp_def 3, 7, 2, LAKE_OF_RAGE + warp_event 2, 7, 2, LAKE_OF_RAGE + warp_event 3, 7, 2, LAKE_OF_RAGE .CoordEvents: db 0 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index a040b0b49..2a6f94705 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -343,10 +343,10 @@ LancesRoom_MapEvents: .Warps: db 4 - warp_def 4, 23, 3, KARENS_ROOM - warp_def 5, 23, 4, KARENS_ROOM - warp_def 4, 1, 1, HALL_OF_FAME - warp_def 5, 1, 2, HALL_OF_FAME + warp_event 4, 23, 3, KARENS_ROOM + warp_event 5, 23, 4, KARENS_ROOM + warp_event 4, 1, 1, HALL_OF_FAME + warp_event 5, 1, 2, HALL_OF_FAME .CoordEvents: db 2 diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index d16bce5f1..bc6083ca5 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -227,8 +227,8 @@ LavRadioTower1F_MapEvents: .Warps: db 2 - warp_def 2, 7, 7, LAVENDER_TOWN - warp_def 3, 7, 7, LAVENDER_TOWN + warp_event 2, 7, 7, LAVENDER_TOWN + warp_event 3, 7, 7, LAVENDER_TOWN .CoordEvents: db 0 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index f55db399b..490183dfd 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -53,8 +53,8 @@ LavenderMart_MapEvents: .Warps: db 2 - warp_def 2, 7, 5, LAVENDER_TOWN - warp_def 3, 7, 5, LAVENDER_TOWN + warp_event 2, 7, 5, LAVENDER_TOWN + warp_event 3, 7, 5, LAVENDER_TOWN .CoordEvents: db 0 diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index ecb4fb5c0..1157ba5b1 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -29,8 +29,8 @@ LavenderNameRater_MapEvents: .Warps: db 2 - warp_def 2, 7, 4, LAVENDER_TOWN - warp_def 3, 7, 4, LAVENDER_TOWN + warp_event 2, 7, 4, LAVENDER_TOWN + warp_event 3, 7, 4, LAVENDER_TOWN .CoordEvents: db 0 diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm index 7436697ea..dbf084610 100644 --- a/maps/LavenderPokecenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -86,9 +86,9 @@ LavenderPokecenter1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 1, LAVENDER_TOWN - warp_def 4, 7, 1, LAVENDER_TOWN - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 1, LAVENDER_TOWN + warp_event 4, 7, 1, LAVENDER_TOWN + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/LavenderPokecenter2FBeta.asm b/maps/LavenderPokecenter2FBeta.asm index 537f10ea1..dc4dcd7b0 100644 --- a/maps/LavenderPokecenter2FBeta.asm +++ b/maps/LavenderPokecenter2FBeta.asm @@ -11,7 +11,7 @@ LavenderPokecenter2FBeta_MapEvents: .Warps: db 1 - warp_def 0, 7, 3, LAVENDER_POKECENTER_1F + warp_event 0, 7, 3, LAVENDER_POKECENTER_1F .CoordEvents: db 0 diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm index eacb6b4d6..c15be5b24 100644 --- a/maps/LavenderSpeechHouse.asm +++ b/maps/LavenderSpeechHouse.asm @@ -34,8 +34,8 @@ LavenderSpeechHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 3, LAVENDER_TOWN - warp_def 3, 7, 3, LAVENDER_TOWN + warp_event 2, 7, 3, LAVENDER_TOWN + warp_event 3, 7, 3, LAVENDER_TOWN .CoordEvents: db 0 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 655acb3b3..4a2b02ff1 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -111,13 +111,13 @@ LavenderTown_MapEvents: .Warps: db 7 - warp_def 5, 5, 1, LAVENDER_POKECENTER_1F - warp_def 5, 9, 1, MR_FUJIS_HOUSE - warp_def 3, 13, 1, LAVENDER_SPEECH_HOUSE - warp_def 7, 13, 1, LAVENDER_NAME_RATER - warp_def 1, 5, 2, LAVENDER_MART - warp_def 13, 11, 1, SOUL_HOUSE - warp_def 14, 5, 1, LAV_RADIO_TOWER_1F + warp_event 5, 5, 1, LAVENDER_POKECENTER_1F + warp_event 5, 9, 1, MR_FUJIS_HOUSE + warp_event 3, 13, 1, LAVENDER_SPEECH_HOUSE + warp_event 7, 13, 1, LAVENDER_NAME_RATER + warp_event 1, 5, 2, LAVENDER_MART + warp_event 13, 11, 1, SOUL_HOUSE + warp_event 14, 5, 1, LAV_RADIO_TOWER_1F .CoordEvents: db 0 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 3a872a26c..ff82357ee 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -378,8 +378,8 @@ MahoganyGym_MapEvents: .Warps: db 2 - warp_def 4, 17, 3, MAHOGANY_TOWN - warp_def 5, 17, 3, MAHOGANY_TOWN + warp_event 4, 17, 3, MAHOGANY_TOWN + warp_event 5, 17, 3, MAHOGANY_TOWN .CoordEvents: db 0 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 5b3cfd43c..44aa8dd39 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -226,9 +226,9 @@ MahoganyMart1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 1, MAHOGANY_TOWN - warp_def 4, 7, 1, MAHOGANY_TOWN - warp_def 7, 3, 1, TEAM_ROCKET_BASE_B1F + warp_event 3, 7, 1, MAHOGANY_TOWN + warp_event 4, 7, 1, MAHOGANY_TOWN + warp_event 7, 3, 1, TEAM_ROCKET_BASE_B1F .CoordEvents: db 0 diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm index 9a0cfdf24..3f1181ce3 100644 --- a/maps/MahoganyPokecenter1F.asm +++ b/maps/MahoganyPokecenter1F.asm @@ -59,9 +59,9 @@ MahoganyPokecenter1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 4, MAHOGANY_TOWN - warp_def 4, 7, 4, MAHOGANY_TOWN - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 4, MAHOGANY_TOWN + warp_event 4, 7, 4, MAHOGANY_TOWN + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index d6ed88a36..7da6b9a97 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -66,8 +66,8 @@ MahoganyRedGyaradosSpeechHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 2, MAHOGANY_TOWN - warp_def 3, 7, 2, MAHOGANY_TOWN + warp_event 2, 7, 2, MAHOGANY_TOWN + warp_event 3, 7, 2, MAHOGANY_TOWN .CoordEvents: db 0 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 959f6970e..88fd9b473 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -250,11 +250,11 @@ MahoganyTown_MapEvents: .Warps: db 5 - warp_def 11, 7, 1, MAHOGANY_MART_1F - warp_def 17, 7, 1, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE - warp_def 6, 13, 1, MAHOGANY_GYM - warp_def 15, 13, 1, MAHOGANY_POKECENTER_1F - warp_def 9, 1, 3, ROUTE_43_MAHOGANY_GATE + warp_event 11, 7, 1, MAHOGANY_MART_1F + warp_event 17, 7, 1, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE + warp_event 6, 13, 1, MAHOGANY_GYM + warp_event 15, 13, 1, MAHOGANY_POKECENTER_1F + warp_event 9, 1, 3, ROUTE_43_MAHOGANY_GATE .CoordEvents: db 2 diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 456b30446..36b5ace43 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -205,8 +205,8 @@ ManiasHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 1, CIANWOOD_CITY - warp_def 3, 7, 1, CIANWOOD_CITY + warp_event 2, 7, 1, CIANWOOD_CITY + warp_event 3, 7, 1, CIANWOOD_CITY .CoordEvents: db 0 diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 391d05bf4..499e443cd 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -72,8 +72,8 @@ MobileBattleRoom_MapEvents: .Warps: db 2 - warp_def 4, 7, 6, POKECENTER_2F - warp_def 5, 7, 6, POKECENTER_2F + warp_event 4, 7, 6, POKECENTER_2F + warp_event 5, 7, 6, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 1cf28cb5c..00765a70b 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -40,8 +40,8 @@ MobileTradeRoomMobile_MapEvents: .Warps: db 2 - warp_def 4, 7, 5, POKECENTER_2F - warp_def 5, 7, 5, POKECENTER_2F + warp_event 4, 7, 5, POKECENTER_2F + warp_event 5, 7, 5, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index f9ac4492d..c263a047f 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -166,14 +166,14 @@ MountMoon_MapEvents: .Warps: db 8 - warp_def 3, 3, 1, ROUTE_3 - warp_def 15, 15, 1, ROUTE_4 - warp_def 13, 3, 7, MOUNT_MOON - warp_def 15, 11, 8, MOUNT_MOON - warp_def 25, 5, 1, MOUNT_MOON_SQUARE - warp_def 25, 15, 2, MOUNT_MOON_SQUARE - warp_def 25, 3, 3, MOUNT_MOON - warp_def 25, 13, 4, MOUNT_MOON + warp_event 3, 3, 1, ROUTE_3 + warp_event 15, 15, 1, ROUTE_4 + warp_event 13, 3, 7, MOUNT_MOON + warp_event 15, 11, 8, MOUNT_MOON + warp_event 25, 5, 1, MOUNT_MOON_SQUARE + warp_event 25, 15, 2, MOUNT_MOON_SQUARE + warp_event 25, 3, 3, MOUNT_MOON + warp_event 25, 13, 4, MOUNT_MOON .CoordEvents: db 0 diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index b24a98e20..aac063dbf 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -33,8 +33,8 @@ MountMoonGiftShop_MapEvents: .Warps: db 2 - warp_def 3, 7, 3, MOUNT_MOON_SQUARE - warp_def 4, 7, 3, MOUNT_MOON_SQUARE + warp_event 3, 7, 3, MOUNT_MOON_SQUARE + warp_event 4, 7, 3, MOUNT_MOON_SQUARE .CoordEvents: db 0 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 685924675..e93cffe53 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -138,9 +138,9 @@ MountMoonSquare_MapEvents: .Warps: db 3 - warp_def 20, 5, 5, MOUNT_MOON - warp_def 22, 11, 6, MOUNT_MOON - warp_def 13, 7, 1, MOUNT_MOON_GIFT_SHOP + warp_event 20, 5, 5, MOUNT_MOON + warp_event 22, 11, 6, MOUNT_MOON + warp_event 13, 7, 1, MOUNT_MOON_GIFT_SHOP .CoordEvents: db 1 diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index d7f328688..756ee655c 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -122,12 +122,12 @@ MountMortar1FInside_MapEvents: .Warps: db 6 - warp_def 11, 47, 5, MOUNT_MORTAR_1F_OUTSIDE - warp_def 29, 47, 6, MOUNT_MORTAR_1F_OUTSIDE - warp_def 5, 39, 8, MOUNT_MORTAR_1F_OUTSIDE - warp_def 33, 41, 9, MOUNT_MORTAR_1F_OUTSIDE - warp_def 3, 19, 1, MOUNT_MORTAR_B1F - warp_def 9, 9, 2, MOUNT_MORTAR_2F_INSIDE + warp_event 11, 47, 5, MOUNT_MORTAR_1F_OUTSIDE + warp_event 29, 47, 6, MOUNT_MORTAR_1F_OUTSIDE + warp_event 5, 39, 8, MOUNT_MORTAR_1F_OUTSIDE + warp_event 33, 41, 9, MOUNT_MORTAR_1F_OUTSIDE + warp_event 3, 19, 1, MOUNT_MORTAR_B1F + warp_event 9, 9, 2, MOUNT_MORTAR_2F_INSIDE .CoordEvents: db 0 diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index fbb7f8898..b268e36e9 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -24,15 +24,15 @@ MountMortar1FOutside_MapEvents: .Warps: db 9 - warp_def 3, 33, 3, ROUTE_42 - warp_def 17, 33, 4, ROUTE_42 - warp_def 37, 33, 5, ROUTE_42 - warp_def 17, 5, 1, MOUNT_MORTAR_2F_INSIDE - warp_def 11, 21, 1, MOUNT_MORTAR_1F_INSIDE - warp_def 29, 21, 2, MOUNT_MORTAR_1F_INSIDE - warp_def 17, 29, 2, MOUNT_MORTAR_B1F - warp_def 7, 13, 3, MOUNT_MORTAR_1F_INSIDE - warp_def 33, 13, 4, MOUNT_MORTAR_1F_INSIDE + warp_event 3, 33, 3, ROUTE_42 + warp_event 17, 33, 4, ROUTE_42 + warp_event 37, 33, 5, ROUTE_42 + warp_event 17, 5, 1, MOUNT_MORTAR_2F_INSIDE + warp_event 11, 21, 1, MOUNT_MORTAR_1F_INSIDE + warp_event 29, 21, 2, MOUNT_MORTAR_1F_INSIDE + warp_event 17, 29, 2, MOUNT_MORTAR_B1F + warp_event 7, 13, 3, MOUNT_MORTAR_1F_INSIDE + warp_event 33, 13, 4, MOUNT_MORTAR_1F_INSIDE .CoordEvents: db 0 diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index bcc7b4205..27cf26fce 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -72,8 +72,8 @@ MountMortar2FInside_MapEvents: .Warps: db 2 - warp_def 17, 33, 4, MOUNT_MORTAR_1F_OUTSIDE - warp_def 3, 5, 6, MOUNT_MORTAR_1F_INSIDE + warp_event 17, 33, 4, MOUNT_MORTAR_1F_OUTSIDE + warp_event 3, 5, 6, MOUNT_MORTAR_1F_INSIDE .CoordEvents: db 0 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 44149c357..eeba830da 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -140,8 +140,8 @@ MountMortarB1F_MapEvents: .Warps: db 2 - warp_def 3, 3, 5, MOUNT_MORTAR_1F_INSIDE - warp_def 19, 29, 7, MOUNT_MORTAR_1F_OUTSIDE + warp_event 3, 3, 5, MOUNT_MORTAR_1F_INSIDE + warp_event 19, 29, 7, MOUNT_MORTAR_1F_OUTSIDE .CoordEvents: db 0 diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 5baa81fd9..f4ca702a2 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -25,8 +25,8 @@ MoveDeletersHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 6, BLACKTHORN_CITY - warp_def 3, 7, 6, BLACKTHORN_CITY + warp_event 2, 7, 6, BLACKTHORN_CITY + warp_event 3, 7, 6, BLACKTHORN_CITY .CoordEvents: db 0 diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 403134bae..42ea7c490 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -85,8 +85,8 @@ MrFujisHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 2, LAVENDER_TOWN - warp_def 3, 7, 2, LAVENDER_TOWN + warp_event 2, 7, 2, LAVENDER_TOWN + warp_event 3, 7, 2, LAVENDER_TOWN .CoordEvents: db 0 diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 4e73195b2..de537d8e2 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -378,8 +378,8 @@ MrPokemonsHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 2, ROUTE_30 - warp_def 3, 7, 2, ROUTE_30 + warp_event 2, 7, 2, ROUTE_30 + warp_event 3, 7, 2, ROUTE_30 .CoordEvents: db 0 diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 042b922d0..880df0727 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -53,8 +53,8 @@ MrPsychicsHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 5, SAFFRON_CITY - warp_def 3, 7, 5, SAFFRON_CITY + warp_event 2, 7, 5, SAFFRON_CITY + warp_event 3, 7, 5, SAFFRON_CITY .CoordEvents: db 0 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index b8485121a..4a1b81f8d 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -519,10 +519,10 @@ NationalPark_MapEvents: .Warps: db 4 - warp_def 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE - warp_def 33, 19, 2, ROUTE_36_NATIONAL_PARK_GATE - warp_def 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE - warp_def 11, 47, 2, ROUTE_35_NATIONAL_PARK_GATE + warp_event 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE + warp_event 33, 19, 2, ROUTE_36_NATIONAL_PARK_GATE + warp_event 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE + warp_event 11, 47, 2, ROUTE_35_NATIONAL_PARK_GATE .CoordEvents: db 0 diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index cc659bf43..cd7a3c18e 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -226,10 +226,10 @@ NationalParkBugContest_MapEvents: .Warps: db 4 - warp_def 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE - warp_def 33, 19, 1, ROUTE_36_NATIONAL_PARK_GATE - warp_def 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE - warp_def 11, 47, 1, ROUTE_35_NATIONAL_PARK_GATE + warp_event 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE + warp_event 33, 19, 1, ROUTE_36_NATIONAL_PARK_GATE + warp_event 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE + warp_event 11, 47, 1, ROUTE_35_NATIONAL_PARK_GATE .CoordEvents: db 0 diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 34b023038..97ff2baca 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -287,10 +287,10 @@ NewBarkTown_MapEvents: .Warps: db 4 - warp_def 6, 3, 1, ELMS_LAB - warp_def 13, 5, 1, PLAYERS_HOUSE_1F - warp_def 3, 11, 1, PLAYERS_NEIGHBORS_HOUSE - warp_def 11, 13, 1, ELMS_HOUSE + warp_event 6, 3, 1, ELMS_LAB + warp_event 13, 5, 1, PLAYERS_HOUSE_1F + warp_event 3, 11, 1, PLAYERS_NEIGHBORS_HOUSE + warp_event 11, 13, 1, ELMS_HOUSE .CoordEvents: db 2 diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index cbfb0d1c1..f0261031a 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -262,8 +262,8 @@ OaksLab_MapEvents: .Warps: db 2 - warp_def 4, 11, 3, PALLET_TOWN - warp_def 5, 11, 3, PALLET_TOWN + warp_event 4, 11, 3, PALLET_TOWN + warp_event 5, 11, 3, PALLET_TOWN .CoordEvents: db 0 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 269357d21..daebab041 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -84,8 +84,8 @@ OlivineCafe_MapEvents: .Warps: db 2 - warp_def 2, 7, 7, OLIVINE_CITY - warp_def 3, 7, 7, OLIVINE_CITY + warp_event 2, 7, 7, OLIVINE_CITY + warp_event 3, 7, 7, OLIVINE_CITY .CoordEvents: db 0 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 923ed4bb4..99b60897d 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -293,17 +293,17 @@ OlivineCity_MapEvents: .Warps: db 11 - warp_def 13, 21, 1, OLIVINE_POKECENTER_1F - warp_def 10, 11, 1, OLIVINE_GYM - warp_def 25, 11, 1, OLIVINE_TIMS_HOUSE - warp_def 0, 0, 1, OLIVINE_HOUSE_BETA - warp_def 29, 11, 1, OLIVINE_PUNISHMENT_SPEECH_HOUSE - warp_def 13, 15, 1, OLIVINE_GOOD_ROD_HOUSE - warp_def 7, 21, 1, OLIVINE_CAFE - warp_def 19, 17, 2, OLIVINE_MART - warp_def 29, 27, 1, OLIVINE_LIGHTHOUSE_1F - warp_def 19, 27, 1, OLIVINE_PORT_PASSAGE - warp_def 20, 27, 2, OLIVINE_PORT_PASSAGE + warp_event 13, 21, 1, OLIVINE_POKECENTER_1F + warp_event 10, 11, 1, OLIVINE_GYM + warp_event 25, 11, 1, OLIVINE_TIMS_HOUSE + warp_event 0, 0, 1, OLIVINE_HOUSE_BETA + warp_event 29, 11, 1, OLIVINE_PUNISHMENT_SPEECH_HOUSE + warp_event 13, 15, 1, OLIVINE_GOOD_ROD_HOUSE + warp_event 7, 21, 1, OLIVINE_CAFE + warp_event 19, 17, 2, OLIVINE_MART + warp_event 29, 27, 1, OLIVINE_LIGHTHOUSE_1F + warp_event 19, 27, 1, OLIVINE_PORT_PASSAGE + warp_event 20, 27, 2, OLIVINE_PORT_PASSAGE .CoordEvents: db 2 diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 3f7c3eced..c7c010535 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -88,8 +88,8 @@ OlivineGoodRodHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 6, OLIVINE_CITY - warp_def 3, 7, 6, OLIVINE_CITY + warp_event 2, 7, 6, OLIVINE_CITY + warp_event 3, 7, 6, OLIVINE_CITY .CoordEvents: db 0 diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 40e2bd711..e62bdb9c8 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -203,8 +203,8 @@ OlivineGym_MapEvents: .Warps: db 2 - warp_def 4, 15, 2, OLIVINE_CITY - warp_def 5, 15, 2, OLIVINE_CITY + warp_event 4, 15, 2, OLIVINE_CITY + warp_event 5, 15, 2, OLIVINE_CITY .CoordEvents: db 0 diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index 336469c21..256f03df4 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -45,8 +45,8 @@ OlivineHouseBeta_MapEvents: .Warps: db 2 - warp_def 2, 7, 4, OLIVINE_CITY - warp_def 3, 7, 4, OLIVINE_CITY + warp_event 2, 7, 4, OLIVINE_CITY + warp_event 3, 7, 4, OLIVINE_CITY .CoordEvents: db 0 diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 769bf13da..19cd4e4a3 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -42,11 +42,11 @@ OlivineLighthouse1F_MapEvents: .Warps: db 5 - warp_def 10, 17, 9, OLIVINE_CITY - warp_def 11, 17, 9, OLIVINE_CITY - warp_def 3, 11, 1, OLIVINE_LIGHTHOUSE_2F - warp_def 16, 13, 3, OLIVINE_LIGHTHOUSE_2F - warp_def 17, 13, 4, OLIVINE_LIGHTHOUSE_2F + warp_event 10, 17, 9, OLIVINE_CITY + warp_event 11, 17, 9, OLIVINE_CITY + warp_event 3, 11, 1, OLIVINE_LIGHTHOUSE_2F + warp_event 16, 13, 3, OLIVINE_LIGHTHOUSE_2F + warp_event 17, 13, 4, OLIVINE_LIGHTHOUSE_2F .CoordEvents: db 0 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index ac99289da..1d0d001d2 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -210,12 +210,12 @@ OlivineLighthouse2F_MapEvents: .Warps: db 6 - warp_def 3, 11, 3, OLIVINE_LIGHTHOUSE_1F - warp_def 5, 3, 2, OLIVINE_LIGHTHOUSE_3F - warp_def 16, 13, 4, OLIVINE_LIGHTHOUSE_1F - warp_def 17, 13, 5, OLIVINE_LIGHTHOUSE_1F - warp_def 16, 11, 4, OLIVINE_LIGHTHOUSE_3F - warp_def 17, 11, 5, OLIVINE_LIGHTHOUSE_3F + warp_event 3, 11, 3, OLIVINE_LIGHTHOUSE_1F + warp_event 5, 3, 2, OLIVINE_LIGHTHOUSE_3F + warp_event 16, 13, 4, OLIVINE_LIGHTHOUSE_1F + warp_event 17, 13, 5, OLIVINE_LIGHTHOUSE_1F + warp_event 16, 11, 4, OLIVINE_LIGHTHOUSE_3F + warp_event 17, 11, 5, OLIVINE_LIGHTHOUSE_3F .CoordEvents: db 0 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 7bcbf5aec..2b0108beb 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -118,15 +118,15 @@ OlivineLighthouse3F_MapEvents: .Warps: db 9 - warp_def 13, 3, 1, OLIVINE_LIGHTHOUSE_4F - warp_def 5, 3, 2, OLIVINE_LIGHTHOUSE_2F - warp_def 9, 5, 4, OLIVINE_LIGHTHOUSE_4F - warp_def 16, 11, 5, OLIVINE_LIGHTHOUSE_2F - warp_def 17, 11, 6, OLIVINE_LIGHTHOUSE_2F - warp_def 16, 9, 5, OLIVINE_LIGHTHOUSE_4F - warp_def 17, 9, 6, OLIVINE_LIGHTHOUSE_4F - warp_def 8, 3, 7, OLIVINE_LIGHTHOUSE_4F - warp_def 9, 3, 8, OLIVINE_LIGHTHOUSE_4F + warp_event 13, 3, 1, OLIVINE_LIGHTHOUSE_4F + warp_event 5, 3, 2, OLIVINE_LIGHTHOUSE_2F + warp_event 9, 5, 4, OLIVINE_LIGHTHOUSE_4F + warp_event 16, 11, 5, OLIVINE_LIGHTHOUSE_2F + warp_event 17, 11, 6, OLIVINE_LIGHTHOUSE_2F + warp_event 16, 9, 5, OLIVINE_LIGHTHOUSE_4F + warp_event 17, 9, 6, OLIVINE_LIGHTHOUSE_4F + warp_event 8, 3, 7, OLIVINE_LIGHTHOUSE_4F + warp_event 9, 3, 8, OLIVINE_LIGHTHOUSE_4F .CoordEvents: db 0 diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 69ca04afd..c16556cf9 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -87,16 +87,16 @@ OlivineLighthouse4F_MapEvents: .Warps: db 10 - warp_def 13, 3, 1, OLIVINE_LIGHTHOUSE_3F - warp_def 3, 5, 2, OLIVINE_LIGHTHOUSE_5F - warp_def 9, 7, 3, OLIVINE_LIGHTHOUSE_5F - warp_def 9, 5, 3, OLIVINE_LIGHTHOUSE_3F - warp_def 16, 9, 6, OLIVINE_LIGHTHOUSE_3F - warp_def 17, 9, 7, OLIVINE_LIGHTHOUSE_3F - warp_def 8, 3, 8, OLIVINE_LIGHTHOUSE_3F - warp_def 9, 3, 9, OLIVINE_LIGHTHOUSE_3F - warp_def 16, 7, 4, OLIVINE_LIGHTHOUSE_5F - warp_def 17, 7, 5, OLIVINE_LIGHTHOUSE_5F + warp_event 13, 3, 1, OLIVINE_LIGHTHOUSE_3F + warp_event 3, 5, 2, OLIVINE_LIGHTHOUSE_5F + warp_event 9, 7, 3, OLIVINE_LIGHTHOUSE_5F + warp_event 9, 5, 3, OLIVINE_LIGHTHOUSE_3F + warp_event 16, 9, 6, OLIVINE_LIGHTHOUSE_3F + warp_event 17, 9, 7, OLIVINE_LIGHTHOUSE_3F + warp_event 8, 3, 8, OLIVINE_LIGHTHOUSE_3F + warp_event 9, 3, 9, OLIVINE_LIGHTHOUSE_3F + warp_event 16, 7, 4, OLIVINE_LIGHTHOUSE_5F + warp_event 17, 7, 5, OLIVINE_LIGHTHOUSE_5F .CoordEvents: db 0 diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 677e75158..8da299e76 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -96,13 +96,13 @@ OlivineLighthouse5F_MapEvents: .Warps: db 7 - warp_def 9, 15, 1, OLIVINE_LIGHTHOUSE_6F - warp_def 3, 5, 2, OLIVINE_LIGHTHOUSE_4F - warp_def 9, 7, 3, OLIVINE_LIGHTHOUSE_4F - warp_def 16, 7, 9, OLIVINE_LIGHTHOUSE_4F - warp_def 17, 7, 10, OLIVINE_LIGHTHOUSE_4F - warp_def 16, 5, 2, OLIVINE_LIGHTHOUSE_6F - warp_def 17, 5, 3, OLIVINE_LIGHTHOUSE_6F + warp_event 9, 15, 1, OLIVINE_LIGHTHOUSE_6F + warp_event 3, 5, 2, OLIVINE_LIGHTHOUSE_4F + warp_event 9, 7, 3, OLIVINE_LIGHTHOUSE_4F + warp_event 16, 7, 9, OLIVINE_LIGHTHOUSE_4F + warp_event 17, 7, 10, OLIVINE_LIGHTHOUSE_4F + warp_event 16, 5, 2, OLIVINE_LIGHTHOUSE_6F + warp_event 17, 5, 3, OLIVINE_LIGHTHOUSE_6F .CoordEvents: db 0 diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index a54d22916..94151b2aa 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -263,9 +263,9 @@ OlivineLighthouse6F_MapEvents: .Warps: db 3 - warp_def 9, 15, 1, OLIVINE_LIGHTHOUSE_5F - warp_def 16, 5, 6, OLIVINE_LIGHTHOUSE_5F - warp_def 17, 5, 7, OLIVINE_LIGHTHOUSE_5F + warp_event 9, 15, 1, OLIVINE_LIGHTHOUSE_5F + warp_event 16, 5, 6, OLIVINE_LIGHTHOUSE_5F + warp_event 17, 5, 7, OLIVINE_LIGHTHOUSE_5F .CoordEvents: db 0 diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index ea980fe3c..b6f70cc67 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -51,8 +51,8 @@ OlivineMart_MapEvents: .Warps: db 2 - warp_def 2, 7, 8, OLIVINE_CITY - warp_def 3, 7, 8, OLIVINE_CITY + warp_event 2, 7, 8, OLIVINE_CITY + warp_event 3, 7, 8, OLIVINE_CITY .CoordEvents: db 0 diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm index 3345636ff..abada1bd0 100644 --- a/maps/OlivinePokecenter1F.asm +++ b/maps/OlivinePokecenter1F.asm @@ -53,9 +53,9 @@ OlivinePokecenter1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 1, OLIVINE_CITY - warp_def 4, 7, 1, OLIVINE_CITY - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 1, OLIVINE_CITY + warp_event 4, 7, 1, OLIVINE_CITY + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 132a0dcc7..de17f58b9 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -390,8 +390,8 @@ OlivinePort_MapEvents: .Warps: db 2 - warp_def 11, 7, 5, OLIVINE_PORT_PASSAGE - warp_def 7, 23, 1, FAST_SHIP_1F + warp_event 11, 7, 5, OLIVINE_PORT_PASSAGE + warp_event 7, 23, 1, FAST_SHIP_1F .CoordEvents: db 1 diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 5b9615a73..d78b2b32a 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -25,11 +25,11 @@ OlivinePortPassage_MapEvents: .Warps: db 5 - warp_def 15, 0, 10, OLIVINE_CITY - warp_def 16, 0, 11, OLIVINE_CITY - warp_def 15, 4, 4, OLIVINE_PORT_PASSAGE - warp_def 3, 2, 3, OLIVINE_PORT_PASSAGE - warp_def 3, 14, 1, OLIVINE_PORT + warp_event 15, 0, 10, OLIVINE_CITY + warp_event 16, 0, 11, OLIVINE_CITY + warp_event 15, 4, 4, OLIVINE_PORT_PASSAGE + warp_event 3, 2, 3, OLIVINE_PORT_PASSAGE + warp_event 3, 14, 1, OLIVINE_PORT .CoordEvents: db 0 diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index ed0e86e32..361ab4582 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -45,8 +45,8 @@ OlivinePunishmentSpeechHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 5, OLIVINE_CITY - warp_def 3, 7, 5, OLIVINE_CITY + warp_event 2, 7, 5, OLIVINE_CITY + warp_event 3, 7, 5, OLIVINE_CITY .CoordEvents: db 0 diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index 5d1b19263..0b56332d7 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -25,8 +25,8 @@ OlivineTimsHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 3, OLIVINE_CITY - warp_def 3, 7, 3, OLIVINE_CITY + warp_event 2, 7, 3, OLIVINE_CITY + warp_event 3, 7, 3, OLIVINE_CITY .CoordEvents: db 0 diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 8e18b6d08..e1a280c86 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -75,9 +75,9 @@ PalletTown_MapEvents: .Warps: db 3 - warp_def 5, 5, 1, REDS_HOUSE_1F - warp_def 13, 5, 1, BLUES_HOUSE - warp_def 12, 11, 1, OAKS_LAB + warp_event 5, 5, 1, REDS_HOUSE_1F + warp_event 13, 5, 1, BLUES_HOUSE + warp_event 12, 11, 1, OAKS_LAB .CoordEvents: db 0 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index a4467ec4a..af325e07f 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -158,11 +158,11 @@ PewterCity_MapEvents: .Warps: db 5 - warp_def 29, 13, 1, PEWTER_NIDORAN_SPEECH_HOUSE - warp_def 16, 17, 1, PEWTER_GYM - warp_def 23, 17, 2, PEWTER_MART - warp_def 13, 25, 1, PEWTER_POKECENTER_1F - warp_def 7, 29, 1, PEWTER_SNOOZE_SPEECH_HOUSE + warp_event 29, 13, 1, PEWTER_NIDORAN_SPEECH_HOUSE + warp_event 16, 17, 1, PEWTER_GYM + warp_event 23, 17, 2, PEWTER_MART + warp_event 13, 25, 1, PEWTER_POKECENTER_1F + warp_event 7, 29, 1, PEWTER_SNOOZE_SPEECH_HOUSE .CoordEvents: db 0 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index b9240fa8b..07d52ce03 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -214,8 +214,8 @@ PewterGym_MapEvents: .Warps: db 2 - warp_def 4, 13, 2, PEWTER_CITY - warp_def 5, 13, 2, PEWTER_CITY + warp_event 4, 13, 2, PEWTER_CITY + warp_event 5, 13, 2, PEWTER_CITY .CoordEvents: db 0 diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index cc5047d7c..b40cf8db0 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -51,8 +51,8 @@ PewterMart_MapEvents: .Warps: db 2 - warp_def 2, 7, 3, PEWTER_CITY - warp_def 3, 7, 3, PEWTER_CITY + warp_event 2, 7, 3, PEWTER_CITY + warp_event 3, 7, 3, PEWTER_CITY .CoordEvents: db 0 diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index b70294cef..84ded5256 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -34,8 +34,8 @@ PewterNidoranSpeechHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 1, PEWTER_CITY - warp_def 3, 7, 1, PEWTER_CITY + warp_event 2, 7, 1, PEWTER_CITY + warp_event 3, 7, 1, PEWTER_CITY .CoordEvents: db 0 diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index 25234385d..5bb9da7da 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -73,9 +73,9 @@ PewterPokecenter1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 4, PEWTER_CITY - warp_def 4, 7, 4, PEWTER_CITY - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 4, PEWTER_CITY + warp_event 4, 7, 4, PEWTER_CITY + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/PewterPokecenter2FBeta.asm b/maps/PewterPokecenter2FBeta.asm index 0e6e7b916..0a5b6f558 100644 --- a/maps/PewterPokecenter2FBeta.asm +++ b/maps/PewterPokecenter2FBeta.asm @@ -11,7 +11,7 @@ PewterPokecenter2FBeta_MapEvents: .Warps: db 1 - warp_def 0, 7, 3, PEWTER_POKECENTER_1F + warp_event 0, 7, 3, PEWTER_POKECENTER_1F .CoordEvents: db 0 diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 43e423cc4..f803411d7 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -26,8 +26,8 @@ PewterSnoozeSpeechHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 5, PEWTER_CITY - warp_def 3, 7, 5, PEWTER_CITY + warp_event 2, 7, 5, PEWTER_CITY + warp_event 3, 7, 5, PEWTER_CITY .CoordEvents: db 0 diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index 0e5d9a73f..fd0747b70 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -391,9 +391,9 @@ PlayersHouse1F_MapEvents: .Warps: db 3 - warp_def 6, 7, 2, NEW_BARK_TOWN - warp_def 7, 7, 2, NEW_BARK_TOWN - warp_def 9, 0, 1, PLAYERS_HOUSE_2F + warp_event 6, 7, 2, NEW_BARK_TOWN + warp_event 7, 7, 2, NEW_BARK_TOWN + warp_event 9, 0, 1, PLAYERS_HOUSE_2F .CoordEvents: db 2 diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index 109b541fc..6dd6e3c09 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -121,7 +121,7 @@ PlayersHouse2F_MapEvents: .Warps: db 1 - warp_def 7, 0, 3, PLAYERS_HOUSE_1F + warp_event 7, 0, 3, PLAYERS_HOUSE_1F .CoordEvents: db 0 diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm index ff6c059c6..0b0a64419 100644 --- a/maps/PlayersNeighborsHouse.asm +++ b/maps/PlayersNeighborsHouse.asm @@ -104,8 +104,8 @@ PlayersNeighborsHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 3, NEW_BARK_TOWN - warp_def 3, 7, 3, NEW_BARK_TOWN + warp_event 2, 7, 3, NEW_BARK_TOWN + warp_event 3, 7, 3, NEW_BARK_TOWN .CoordEvents: db 0 diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 1aa5e643c..f42b7516d 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -22,8 +22,8 @@ PokeSeersHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 7, CIANWOOD_CITY - warp_def 3, 7, 7, CIANWOOD_CITY + warp_event 2, 7, 7, CIANWOOD_CITY + warp_event 3, 7, 7, CIANWOOD_CITY .CoordEvents: db 0 diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 3eea56cc0..c5658403d 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -1028,12 +1028,12 @@ Pokecenter2F_MapEvents: .Warps: db 6 - warp_def 0, 7, -1, POKECENTER_2F - warp_def 5, 0, 1, TRADE_CENTER - warp_def 9, 0, 1, COLOSSEUM - warp_def 13, 2, 1, TIME_CAPSULE - warp_def 6, 0, 1, MOBILE_TRADE_ROOM_MOBILE - warp_def 10, 0, 1, MOBILE_BATTLE_ROOM + warp_event 0, 7, -1, POKECENTER_2F + warp_event 5, 0, 1, TRADE_CENTER + warp_event 9, 0, 1, COLOSSEUM + warp_event 13, 2, 1, TIME_CAPSULE + warp_event 6, 0, 1, MOBILE_TRADE_ROOM_MOBILE + warp_event 10, 0, 1, MOBILE_BATTLE_ROOM .CoordEvents: db 0 diff --git a/maps/PokecomCenterAdminRoomMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm index 063d4b2ac..c22d6a929 100644 --- a/maps/PokecomCenterAdminRoomMobile.asm +++ b/maps/PokecomCenterAdminRoomMobile.asm @@ -268,8 +268,8 @@ PokecomCenterAdminRoomMobile_MapEvents: .Warps: db 2 - warp_def 0, 31, 3, GOLDENROD_POKECENTER_1F - warp_def 1, 31, 3, GOLDENROD_POKECENTER_1F + warp_event 0, 31, 3, GOLDENROD_POKECENTER_1F + warp_event 1, 31, 3, GOLDENROD_POKECENTER_1F .CoordEvents: db 0 diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 0c8bb70ec..ef3440ac1 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -302,8 +302,8 @@ PokemonFanClub_MapEvents: .Warps: db 2 - warp_def 2, 7, 3, VERMILION_CITY - warp_def 3, 7, 3, VERMILION_CITY + warp_event 2, 7, 3, VERMILION_CITY + warp_event 3, 7, 3, VERMILION_CITY .CoordEvents: db 0 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index ef855e40e..ea7d2e646 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -394,8 +394,8 @@ PowerPlant_MapEvents: .Warps: db 2 - warp_def 2, 17, 2, ROUTE_10_NORTH - warp_def 3, 17, 2, ROUTE_10_NORTH + warp_event 2, 17, 2, ROUTE_10_NORTH + warp_event 3, 17, 2, ROUTE_10_NORTH .CoordEvents: db 1 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 64fba2b58..f41832430 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -478,9 +478,9 @@ RadioTower1F_MapEvents: .Warps: db 3 - warp_def 2, 7, 11, GOLDENROD_CITY - warp_def 3, 7, 11, GOLDENROD_CITY - warp_def 15, 0, 2, RADIO_TOWER_2F + warp_event 2, 7, 11, GOLDENROD_CITY + warp_event 3, 7, 11, GOLDENROD_CITY + warp_event 15, 0, 2, RADIO_TOWER_2F .CoordEvents: db 0 diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 2c7c074c1..82e8972fd 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -716,8 +716,8 @@ RadioTower2F_MapEvents: .Warps: db 2 - warp_def 0, 0, 1, RADIO_TOWER_3F - warp_def 15, 0, 3, RADIO_TOWER_1F + warp_event 0, 0, 1, RADIO_TOWER_3F + warp_event 15, 0, 3, RADIO_TOWER_1F .CoordEvents: db 0 diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 5156b1332..3b83eb1a9 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -334,9 +334,9 @@ RadioTower3F_MapEvents: .Warps: db 3 - warp_def 0, 0, 1, RADIO_TOWER_2F - warp_def 7, 0, 2, RADIO_TOWER_4F - warp_def 17, 0, 4, RADIO_TOWER_4F + warp_event 0, 0, 1, RADIO_TOWER_2F + warp_event 7, 0, 2, RADIO_TOWER_4F + warp_event 17, 0, 4, RADIO_TOWER_4F .CoordEvents: db 0 diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 89538265b..37e35f489 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -251,10 +251,10 @@ RadioTower4F_MapEvents: .Warps: db 4 - warp_def 0, 0, 1, RADIO_TOWER_5F - warp_def 9, 0, 2, RADIO_TOWER_3F - warp_def 12, 0, 2, RADIO_TOWER_5F - warp_def 17, 0, 3, RADIO_TOWER_3F + warp_event 0, 0, 1, RADIO_TOWER_5F + warp_event 9, 0, 2, RADIO_TOWER_3F + warp_event 12, 0, 2, RADIO_TOWER_5F + warp_event 17, 0, 3, RADIO_TOWER_3F .CoordEvents: db 0 diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index bbea39793..67e876f45 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -426,8 +426,8 @@ RadioTower5F_MapEvents: .Warps: db 2 - warp_def 0, 0, 1, RADIO_TOWER_4F - warp_def 12, 0, 3, RADIO_TOWER_4F + warp_event 0, 0, 1, RADIO_TOWER_4F + warp_event 12, 0, 3, RADIO_TOWER_4F .CoordEvents: db 2 diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 2f9d2828a..fb0adc06f 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -80,9 +80,9 @@ RedsHouse1F_MapEvents: .Warps: db 3 - warp_def 2, 7, 1, PALLET_TOWN - warp_def 3, 7, 1, PALLET_TOWN - warp_def 7, 0, 1, REDS_HOUSE_2F + warp_event 2, 7, 1, PALLET_TOWN + warp_event 3, 7, 1, PALLET_TOWN + warp_event 7, 0, 1, REDS_HOUSE_2F .CoordEvents: db 0 diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index b69790cdd..d26cb1642 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -31,7 +31,7 @@ RedsHouse2F_MapEvents: .Warps: db 1 - warp_def 7, 0, 3, REDS_HOUSE_1F + warp_event 7, 0, 3, REDS_HOUSE_1F .CoordEvents: db 0 diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index bd58c797f..d7ab692c6 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -27,12 +27,12 @@ RockTunnel1F_MapEvents: .Warps: db 6 - warp_def 15, 3, 1, ROUTE_9 - warp_def 11, 25, 1, ROUTE_10_SOUTH - warp_def 5, 3, 3, ROCK_TUNNEL_B1F - warp_def 15, 9, 2, ROCK_TUNNEL_B1F - warp_def 27, 3, 4, ROCK_TUNNEL_B1F - warp_def 27, 13, 1, ROCK_TUNNEL_B1F + warp_event 15, 3, 1, ROUTE_9 + warp_event 11, 25, 1, ROUTE_10_SOUTH + warp_event 5, 3, 3, ROCK_TUNNEL_B1F + warp_event 15, 9, 2, ROCK_TUNNEL_B1F + warp_event 27, 3, 4, ROCK_TUNNEL_B1F + warp_event 27, 13, 1, ROCK_TUNNEL_B1F .CoordEvents: db 0 diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 579c76532..5306d185b 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -28,10 +28,10 @@ RockTunnelB1F_MapEvents: .Warps: db 4 - warp_def 3, 3, 6, ROCK_TUNNEL_1F - warp_def 17, 9, 4, ROCK_TUNNEL_1F - warp_def 23, 3, 3, ROCK_TUNNEL_1F - warp_def 25, 23, 5, ROCK_TUNNEL_1F + warp_event 3, 3, 6, ROCK_TUNNEL_1F + warp_event 17, 9, 4, ROCK_TUNNEL_1F + warp_event 23, 3, 3, ROCK_TUNNEL_1F + warp_event 25, 23, 5, ROCK_TUNNEL_1F .CoordEvents: db 0 diff --git a/maps/Route10North.asm b/maps/Route10North.asm index feb7dd033..4fb0ad6f0 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -21,8 +21,8 @@ Route10North_MapEvents: .Warps: db 2 - warp_def 11, 1, 1, ROUTE_10_POKECENTER_1F - warp_def 3, 9, 1, POWER_PLANT + warp_event 11, 1, 1, ROUTE_10_POKECENTER_1F + warp_event 3, 9, 1, POWER_PLANT .CoordEvents: db 0 diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm index 4a75da2ec..696039184 100644 --- a/maps/Route10Pokecenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -86,9 +86,9 @@ Route10Pokecenter1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 1, ROUTE_10_NORTH - warp_def 4, 7, 1, ROUTE_10_NORTH - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 1, ROUTE_10_NORTH + warp_event 4, 7, 1, ROUTE_10_NORTH + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/Route10Pokecenter2FBeta.asm b/maps/Route10Pokecenter2FBeta.asm index c3b2d39cc..c455c5ae4 100644 --- a/maps/Route10Pokecenter2FBeta.asm +++ b/maps/Route10Pokecenter2FBeta.asm @@ -11,7 +11,7 @@ Route10Pokecenter2FBeta_MapEvents: .Warps: db 1 - warp_def 0, 7, 3, ROUTE_10_POKECENTER_1F + warp_event 0, 7, 3, ROUTE_10_POKECENTER_1F .CoordEvents: db 0 diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 1a4ec1960..e6fa2d684 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -81,7 +81,7 @@ Route10South_MapEvents: .Warps: db 1 - warp_def 6, 1, 2, ROCK_TUNNEL_1F + warp_event 6, 1, 2, ROCK_TUNNEL_1F .CoordEvents: db 0 diff --git a/maps/Route12.asm b/maps/Route12.asm index 0a5700f09..18ccb9c33 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -172,7 +172,7 @@ Route12_MapEvents: .Warps: db 1 - warp_def 11, 33, 1, ROUTE_12_SUPER_ROD_HOUSE + warp_event 11, 33, 1, ROUTE_12_SUPER_ROD_HOUSE .CoordEvents: db 0 diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index ca39effaf..5333d6e89 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -85,8 +85,8 @@ Route12SuperRodHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 1, ROUTE_12 - warp_def 3, 7, 1, ROUTE_12 + warp_event 2, 7, 1, ROUTE_12 + warp_event 3, 7, 1, ROUTE_12 .CoordEvents: db 0 diff --git a/maps/Route15.asm b/maps/Route15.asm index 8127f60a0..3d4344695 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -207,8 +207,8 @@ Route15_MapEvents: .Warps: db 2 - warp_def 2, 4, 3, ROUTE_15_FUCHSIA_GATE - warp_def 2, 5, 4, ROUTE_15_FUCHSIA_GATE + warp_event 2, 4, 3, ROUTE_15_FUCHSIA_GATE + warp_event 2, 5, 4, ROUTE_15_FUCHSIA_GATE .CoordEvents: db 0 diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 80966bd2b..ad2bcb433 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -25,10 +25,10 @@ Route15FuchsiaGate_MapEvents: .Warps: db 4 - warp_def 0, 4, 8, FUCHSIA_CITY - warp_def 0, 5, 9, FUCHSIA_CITY - warp_def 9, 4, 1, ROUTE_15 - warp_def 9, 5, 2, ROUTE_15 + warp_event 0, 4, 8, FUCHSIA_CITY + warp_event 0, 5, 9, FUCHSIA_CITY + warp_event 9, 4, 1, ROUTE_15 + warp_event 9, 5, 2, ROUTE_15 .CoordEvents: db 0 diff --git a/maps/Route16.asm b/maps/Route16.asm index 0e0fb2dc4..d049d5cbd 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -34,11 +34,11 @@ Route16_MapEvents: .Warps: db 5 - warp_def 3, 1, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE - warp_def 14, 6, 3, ROUTE_16_GATE - warp_def 14, 7, 4, ROUTE_16_GATE - warp_def 9, 6, 1, ROUTE_16_GATE - warp_def 9, 7, 2, ROUTE_16_GATE + warp_event 3, 1, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE + warp_event 14, 6, 3, ROUTE_16_GATE + warp_event 14, 7, 4, ROUTE_16_GATE + warp_event 9, 6, 1, ROUTE_16_GATE + warp_event 9, 7, 2, ROUTE_16_GATE .CoordEvents: db 0 diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 1d709e4ea..10a28ab4e 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -28,8 +28,8 @@ Route16FuchsiaSpeechHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 1, ROUTE_16 - warp_def 3, 7, 1, ROUTE_16 + warp_event 2, 7, 1, ROUTE_16 + warp_event 3, 7, 1, ROUTE_16 .CoordEvents: db 0 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index d59425640..558663a82 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -66,10 +66,10 @@ Route16Gate_MapEvents: .Warps: db 4 - warp_def 0, 4, 4, ROUTE_16 - warp_def 0, 5, 5, ROUTE_16 - warp_def 9, 4, 2, ROUTE_16 - warp_def 9, 5, 3, ROUTE_16 + warp_event 0, 4, 4, ROUTE_16 + warp_event 0, 5, 5, ROUTE_16 + warp_event 9, 4, 2, ROUTE_16 + warp_event 9, 5, 3, ROUTE_16 .CoordEvents: db 2 diff --git a/maps/Route17.asm b/maps/Route17.asm index ff012b40a..7fdd81737 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -138,8 +138,8 @@ Route17_MapEvents: .Warps: db 2 - warp_def 17, 82, 1, ROUTE_17_ROUTE_18_GATE - warp_def 17, 83, 2, ROUTE_17_ROUTE_18_GATE + warp_event 17, 82, 1, ROUTE_17_ROUTE_18_GATE + warp_event 17, 83, 2, ROUTE_17_ROUTE_18_GATE .CoordEvents: db 0 diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm index 367a2634b..7ccc3f992 100644 --- a/maps/Route17Route18Gate.asm +++ b/maps/Route17Route18Gate.asm @@ -57,10 +57,10 @@ Route17Route18Gate_MapEvents: .Warps: db 4 - warp_def 0, 4, 1, ROUTE_17 - warp_def 0, 5, 2, ROUTE_17 - warp_def 9, 4, 1, ROUTE_18 - warp_def 9, 5, 2, ROUTE_18 + warp_event 0, 4, 1, ROUTE_17 + warp_event 0, 5, 2, ROUTE_17 + warp_event 9, 4, 1, ROUTE_18 + warp_event 9, 5, 2, ROUTE_18 .CoordEvents: db 2 diff --git a/maps/Route18.asm b/maps/Route18.asm index 3980a7569..66e31a2e8 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -83,8 +83,8 @@ Route18_MapEvents: .Warps: db 2 - warp_def 2, 6, 3, ROUTE_17_ROUTE_18_GATE - warp_def 2, 7, 4, ROUTE_17_ROUTE_18_GATE + warp_event 2, 6, 3, ROUTE_17_ROUTE_18_GATE + warp_event 2, 7, 4, ROUTE_17_ROUTE_18_GATE .CoordEvents: db 0 diff --git a/maps/Route19.asm b/maps/Route19.asm index 1d1680575..0fb64bf70 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -240,7 +240,7 @@ Route19_MapEvents: .Warps: db 1 - warp_def 7, 3, 3, ROUTE_19_FUCHSIA_GATE + warp_event 7, 3, 3, ROUTE_19_FUCHSIA_GATE .CoordEvents: db 0 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index 4446de2e3..e4eae5fab 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -51,10 +51,10 @@ Route19FuchsiaGate_MapEvents: .Warps: db 4 - warp_def 4, 0, 10, FUCHSIA_CITY - warp_def 5, 0, 11, FUCHSIA_CITY - warp_def 4, 7, 1, ROUTE_19 - warp_def 5, 7, 1, ROUTE_19 + warp_event 4, 0, 10, FUCHSIA_CITY + warp_event 5, 0, 11, FUCHSIA_CITY + warp_event 4, 7, 1, ROUTE_19 + warp_event 5, 7, 1, ROUTE_19 .CoordEvents: db 0 diff --git a/maps/Route2.asm b/maps/Route2.asm index 28aa2373a..d60c39de4 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -152,11 +152,11 @@ Route2_MapEvents: .Warps: db 5 - warp_def 15, 15, 1, ROUTE_2_NUGGET_HOUSE - warp_def 15, 31, 3, ROUTE_2_GATE - warp_def 16, 27, 1, ROUTE_2_GATE - warp_def 17, 27, 2, ROUTE_2_GATE - warp_def 12, 7, 3, DIGLETTS_CAVE + warp_event 15, 15, 1, ROUTE_2_NUGGET_HOUSE + warp_event 15, 31, 3, ROUTE_2_GATE + warp_event 16, 27, 1, ROUTE_2_GATE + warp_event 17, 27, 2, ROUTE_2_GATE + warp_event 12, 7, 3, DIGLETTS_CAVE .CoordEvents: db 0 diff --git a/maps/Route20.asm b/maps/Route20.asm index 18ab5b200..0fd0485e2 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -118,7 +118,7 @@ Route20_MapEvents: .Warps: db 1 - warp_def 38, 7, 1, SEAFOAM_GYM + warp_event 38, 7, 1, SEAFOAM_GYM .CoordEvents: db 0 diff --git a/maps/Route22.asm b/maps/Route22.asm index c9d520cb1..7457f716f 100644 --- a/maps/Route22.asm +++ b/maps/Route22.asm @@ -21,7 +21,7 @@ Route22_MapEvents: .Warps: db 1 - warp_def 13, 5, 1, VICTORY_ROAD_GATE + warp_event 13, 5, 1, VICTORY_ROAD_GATE .CoordEvents: db 0 diff --git a/maps/Route23.asm b/maps/Route23.asm index 99c527303..69bb7d0c0 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -28,10 +28,10 @@ Route23_MapEvents: .Warps: db 4 - warp_def 9, 5, 1, INDIGO_PLATEAU_POKECENTER_1F - warp_def 10, 5, 2, INDIGO_PLATEAU_POKECENTER_1F - warp_def 9, 13, 10, VICTORY_ROAD - warp_def 10, 13, 10, VICTORY_ROAD + warp_event 9, 5, 1, INDIGO_PLATEAU_POKECENTER_1F + warp_event 10, 5, 2, INDIGO_PLATEAU_POKECENTER_1F + warp_event 9, 13, 10, VICTORY_ROAD + warp_event 10, 13, 10, VICTORY_ROAD .CoordEvents: db 0 diff --git a/maps/Route25.asm b/maps/Route25.asm index 7d412cdc4..a088f9845 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -435,7 +435,7 @@ Route25_MapEvents: .Warps: db 1 - warp_def 47, 5, 1, BILLS_HOUSE + warp_event 47, 5, 1, BILLS_HOUSE .CoordEvents: db 2 diff --git a/maps/Route26.asm b/maps/Route26.asm index 6e8d5e5de..9f5946774 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -418,9 +418,9 @@ Route26_MapEvents: .Warps: db 3 - warp_def 7, 5, 3, VICTORY_ROAD_GATE - warp_def 15, 57, 1, ROUTE_26_HEAL_HOUSE - warp_def 5, 71, 1, DAY_OF_WEEK_SIBLINGS_HOUSE + warp_event 7, 5, 3, VICTORY_ROAD_GATE + warp_event 15, 57, 1, ROUTE_26_HEAL_HOUSE + warp_event 5, 71, 1, DAY_OF_WEEK_SIBLINGS_HOUSE .CoordEvents: db 0 diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm index 83fe7c738..009bcc7a3 100644 --- a/maps/Route26HealHouse.asm +++ b/maps/Route26HealHouse.asm @@ -54,8 +54,8 @@ Route26HealHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 2, ROUTE_26 - warp_def 3, 7, 2, ROUTE_26 + warp_event 2, 7, 2, ROUTE_26 + warp_event 3, 7, 2, ROUTE_26 .CoordEvents: db 0 diff --git a/maps/Route27.asm b/maps/Route27.asm index 2c1388ffa..0a7998a53 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -473,9 +473,9 @@ Route27_MapEvents: .Warps: db 3 - warp_def 33, 7, 1, ROUTE_27_SANDSTORM_HOUSE - warp_def 26, 5, 1, TOHJO_FALLS - warp_def 36, 5, 2, TOHJO_FALLS + warp_event 33, 7, 1, ROUTE_27_SANDSTORM_HOUSE + warp_event 26, 5, 1, TOHJO_FALLS + warp_event 36, 5, 2, TOHJO_FALLS .CoordEvents: db 2 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index c5d0615d1..af0bcbba1 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -99,8 +99,8 @@ Route27SandstormHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 1, ROUTE_27 - warp_def 3, 7, 1, ROUTE_27 + warp_event 2, 7, 1, ROUTE_27 + warp_event 3, 7, 1, ROUTE_27 .CoordEvents: db 0 diff --git a/maps/Route28.asm b/maps/Route28.asm index 32a47f415..d42ef074c 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -21,8 +21,8 @@ Route28_MapEvents: .Warps: db 2 - warp_def 7, 3, 1, ROUTE_28_STEEL_WING_HOUSE - warp_def 33, 5, 7, VICTORY_ROAD_GATE + warp_event 7, 3, 1, ROUTE_28_STEEL_WING_HOUSE + warp_event 33, 5, 7, VICTORY_ROAD_GATE .CoordEvents: db 0 diff --git a/maps/Route28SteelWingHouse.asm b/maps/Route28SteelWingHouse.asm index 8f9e3b39d..5cff45ffe 100644 --- a/maps/Route28SteelWingHouse.asm +++ b/maps/Route28SteelWingHouse.asm @@ -76,8 +76,8 @@ Route28SteelWingHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 1, ROUTE_28 - warp_def 3, 7, 1, ROUTE_28 + warp_event 2, 7, 1, ROUTE_28 + warp_event 3, 7, 1, ROUTE_28 .CoordEvents: db 0 diff --git a/maps/Route29.asm b/maps/Route29.asm index 6c7239d92..2ca3d5ea2 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -421,7 +421,7 @@ Route29_MapEvents: .Warps: db 1 - warp_def 27, 1, 3, ROUTE_29_ROUTE_46_GATE + warp_event 27, 1, 3, ROUTE_29_ROUTE_46_GATE .CoordEvents: db 2 diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm index f0b69ab5d..813242e06 100644 --- a/maps/Route29Route46Gate.asm +++ b/maps/Route29Route46Gate.asm @@ -42,10 +42,10 @@ Route29Route46Gate_MapEvents: .Warps: db 4 - warp_def 4, 0, 1, ROUTE_46 - warp_def 5, 0, 2, ROUTE_46 - warp_def 4, 7, 1, ROUTE_29 - warp_def 5, 7, 1, ROUTE_29 + warp_event 4, 0, 1, ROUTE_46 + warp_event 5, 0, 2, ROUTE_46 + warp_event 4, 7, 1, ROUTE_29 + warp_event 5, 7, 1, ROUTE_29 .CoordEvents: db 0 diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index 60585b267..18f41b70a 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -31,10 +31,10 @@ Route2Gate_MapEvents: .Warps: db 4 - warp_def 4, 0, 3, ROUTE_2 - warp_def 5, 0, 4, ROUTE_2 - warp_def 4, 7, 2, ROUTE_2 - warp_def 5, 7, 2, ROUTE_2 + warp_event 4, 0, 3, ROUTE_2 + warp_event 5, 0, 4, ROUTE_2 + warp_event 4, 7, 2, ROUTE_2 + warp_event 5, 7, 2, ROUTE_2 .CoordEvents: db 0 diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm index d1fcedee6..be7895b4f 100644 --- a/maps/Route2NuggetHouse.asm +++ b/maps/Route2NuggetHouse.asm @@ -58,8 +58,8 @@ Route2NuggetHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 1, ROUTE_2 - warp_def 3, 7, 1, ROUTE_2 + warp_event 2, 7, 1, ROUTE_2 + warp_event 3, 7, 1, ROUTE_2 .CoordEvents: db 0 diff --git a/maps/Route3.asm b/maps/Route3.asm index aeb1e68df..82dc5fedf 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -138,7 +138,7 @@ Route3_MapEvents: .Warps: db 1 - warp_def 52, 1, 1, MOUNT_MOON + warp_event 52, 1, 1, MOUNT_MOON .CoordEvents: db 0 diff --git a/maps/Route30.asm b/maps/Route30.asm index f01aaa022..673282d53 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -412,8 +412,8 @@ Route30_MapEvents: .Warps: db 2 - warp_def 7, 39, 1, ROUTE_30_BERRY_HOUSE - warp_def 17, 5, 1, MR_POKEMONS_HOUSE + warp_event 7, 39, 1, ROUTE_30_BERRY_HOUSE + warp_event 17, 5, 1, MR_POKEMONS_HOUSE .CoordEvents: db 0 diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm index f304957ba..f220b9ef1 100644 --- a/maps/Route30BerryHouse.asm +++ b/maps/Route30BerryHouse.asm @@ -52,8 +52,8 @@ Route30BerryHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 1, ROUTE_30 - warp_def 3, 7, 1, ROUTE_30 + warp_event 2, 7, 1, ROUTE_30 + warp_event 3, 7, 1, ROUTE_30 .CoordEvents: db 0 diff --git a/maps/Route31.asm b/maps/Route31.asm index 60b594d32..eb7c0b24b 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -423,9 +423,9 @@ Route31_MapEvents: .Warps: db 3 - warp_def 4, 6, 3, ROUTE_31_VIOLET_GATE - warp_def 4, 7, 4, ROUTE_31_VIOLET_GATE - warp_def 34, 5, 1, DARK_CAVE_VIOLET_ENTRANCE + warp_event 4, 6, 3, ROUTE_31_VIOLET_GATE + warp_event 4, 7, 4, ROUTE_31_VIOLET_GATE + warp_event 34, 5, 1, DARK_CAVE_VIOLET_ENTRANCE .CoordEvents: db 0 diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index 6d62f9398..6b8a4fb8e 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -33,10 +33,10 @@ Route31VioletGate_MapEvents: .Warps: db 4 - warp_def 0, 4, 8, VIOLET_CITY - warp_def 0, 5, 9, VIOLET_CITY - warp_def 9, 4, 1, ROUTE_31 - warp_def 9, 5, 2, ROUTE_31 + warp_event 0, 4, 8, VIOLET_CITY + warp_event 0, 5, 9, VIOLET_CITY + warp_event 9, 4, 1, ROUTE_31 + warp_event 9, 5, 2, ROUTE_31 .CoordEvents: db 0 diff --git a/maps/Route32.asm b/maps/Route32.asm index 7e4b8a24f..c64d2c4ac 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -934,10 +934,10 @@ Route32_MapEvents: .Warps: db 4 - warp_def 11, 73, 1, ROUTE_32_POKECENTER_1F - warp_def 4, 2, 3, ROUTE_32_RUINS_OF_ALPH_GATE - warp_def 4, 3, 4, ROUTE_32_RUINS_OF_ALPH_GATE - warp_def 6, 79, 4, UNION_CAVE_1F + warp_event 11, 73, 1, ROUTE_32_POKECENTER_1F + warp_event 4, 2, 3, ROUTE_32_RUINS_OF_ALPH_GATE + warp_event 4, 3, 4, ROUTE_32_RUINS_OF_ALPH_GATE + warp_event 6, 79, 4, UNION_CAVE_1F .CoordEvents: db 2 diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index 5bedc7853..3643977df 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -100,9 +100,9 @@ Route32Pokecenter1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 1, ROUTE_32 - warp_def 4, 7, 1, ROUTE_32 - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 1, ROUTE_32 + warp_event 4, 7, 1, ROUTE_32 + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm index 345e46dd4..94062ba23 100644 --- a/maps/Route32RuinsOfAlphGate.asm +++ b/maps/Route32RuinsOfAlphGate.asm @@ -52,10 +52,10 @@ Route32RuinsOfAlphGate_MapEvents: .Warps: db 4 - warp_def 0, 4, 10, RUINS_OF_ALPH_OUTSIDE - warp_def 0, 5, 11, RUINS_OF_ALPH_OUTSIDE - warp_def 9, 4, 2, ROUTE_32 - warp_def 9, 5, 3, ROUTE_32 + warp_event 0, 4, 10, RUINS_OF_ALPH_OUTSIDE + warp_event 0, 5, 11, RUINS_OF_ALPH_OUTSIDE + warp_event 9, 4, 2, ROUTE_32 + warp_event 9, 5, 3, ROUTE_32 .CoordEvents: db 0 diff --git a/maps/Route33.asm b/maps/Route33.asm index c506b4988..89d4a7f96 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -200,7 +200,7 @@ Route33_MapEvents: .Warps: db 1 - warp_def 11, 9, 3, UNION_CAVE_1F + warp_event 11, 9, 3, UNION_CAVE_1F .CoordEvents: db 0 diff --git a/maps/Route34.asm b/maps/Route34.asm index 8fadf3c99..780160ce3 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -766,11 +766,11 @@ Route34_MapEvents: .Warps: db 5 - warp_def 13, 37, 1, ROUTE_34_ILEX_FOREST_GATE - warp_def 14, 37, 2, ROUTE_34_ILEX_FOREST_GATE - warp_def 11, 14, 1, DAY_CARE - warp_def 11, 15, 2, DAY_CARE - warp_def 13, 15, 3, DAY_CARE + warp_event 13, 37, 1, ROUTE_34_ILEX_FOREST_GATE + warp_event 14, 37, 2, ROUTE_34_ILEX_FOREST_GATE + warp_event 11, 14, 1, DAY_CARE + warp_event 11, 15, 2, DAY_CARE + warp_event 13, 15, 3, DAY_CARE .CoordEvents: db 0 diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 38dc04729..87565e381 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -141,10 +141,10 @@ Route34IlexForestGate_MapEvents: .Warps: db 4 - warp_def 4, 0, 1, ROUTE_34 - warp_def 5, 0, 2, ROUTE_34 - warp_def 4, 7, 1, ILEX_FOREST - warp_def 5, 7, 1, ILEX_FOREST + warp_event 4, 0, 1, ROUTE_34 + warp_event 5, 0, 2, ROUTE_34 + warp_event 4, 7, 1, ILEX_FOREST + warp_event 5, 7, 1, ILEX_FOREST .CoordEvents: db 1 diff --git a/maps/Route35.asm b/maps/Route35.asm index e19c7ff2d..2702f9b3a 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -468,9 +468,9 @@ Route35_MapEvents: .Warps: db 3 - warp_def 9, 33, 1, ROUTE_35_GOLDENROD_GATE - warp_def 10, 33, 2, ROUTE_35_GOLDENROD_GATE - warp_def 3, 5, 3, ROUTE_35_NATIONAL_PARK_GATE + warp_event 9, 33, 1, ROUTE_35_GOLDENROD_GATE + warp_event 10, 33, 2, ROUTE_35_GOLDENROD_GATE + warp_event 3, 5, 3, ROUTE_35_NATIONAL_PARK_GATE .CoordEvents: db 0 diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index a783781dd..b396f8c82 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -201,10 +201,10 @@ Route35GoldenrodGate_MapEvents: .Warps: db 4 - warp_def 4, 0, 1, ROUTE_35 - warp_def 5, 0, 2, ROUTE_35 - warp_def 4, 7, 12, GOLDENROD_CITY - warp_def 5, 7, 12, GOLDENROD_CITY + warp_event 4, 0, 1, ROUTE_35 + warp_event 5, 0, 2, ROUTE_35 + warp_event 4, 7, 12, GOLDENROD_CITY + warp_event 5, 7, 12, GOLDENROD_CITY .CoordEvents: db 0 diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index e5e590930..abd7f27d6 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -443,10 +443,10 @@ Route35NationalParkGate_MapEvents: .Warps: db 4 - warp_def 3, 0, 3, NATIONAL_PARK - warp_def 4, 0, 4, NATIONAL_PARK - warp_def 3, 7, 3, ROUTE_35 - warp_def 4, 7, 3, ROUTE_35 + warp_event 3, 0, 3, NATIONAL_PARK + warp_event 4, 0, 4, NATIONAL_PARK + warp_event 3, 7, 3, ROUTE_35 + warp_event 4, 7, 3, ROUTE_35 .CoordEvents: db 0 diff --git a/maps/Route36.asm b/maps/Route36.asm index e0a5d0558..7395aa05b 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -665,10 +665,10 @@ Route36_MapEvents: .Warps: db 4 - warp_def 18, 8, 3, ROUTE_36_NATIONAL_PARK_GATE - warp_def 18, 9, 4, ROUTE_36_NATIONAL_PARK_GATE - warp_def 47, 13, 1, ROUTE_36_RUINS_OF_ALPH_GATE - warp_def 48, 13, 2, ROUTE_36_RUINS_OF_ALPH_GATE + warp_event 18, 8, 3, ROUTE_36_NATIONAL_PARK_GATE + warp_event 18, 9, 4, ROUTE_36_NATIONAL_PARK_GATE + warp_event 47, 13, 1, ROUTE_36_RUINS_OF_ALPH_GATE + warp_event 48, 13, 2, ROUTE_36_RUINS_OF_ALPH_GATE .CoordEvents: db 2 diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index a9d3f72d7..61d9f917f 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -855,10 +855,10 @@ Route36NationalParkGate_MapEvents: .Warps: db 4 - warp_def 0, 4, 1, NATIONAL_PARK - warp_def 0, 5, 2, NATIONAL_PARK - warp_def 9, 4, 1, ROUTE_36 - warp_def 9, 5, 2, ROUTE_36 + warp_event 0, 4, 1, NATIONAL_PARK + warp_event 0, 5, 2, NATIONAL_PARK + warp_event 9, 4, 1, ROUTE_36 + warp_event 9, 5, 2, ROUTE_36 .CoordEvents: db 0 diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm index c7355dd04..3d6130cf6 100644 --- a/maps/Route36RuinsOfAlphGate.asm +++ b/maps/Route36RuinsOfAlphGate.asm @@ -40,10 +40,10 @@ Route36RuinsOfAlphGate_MapEvents: .Warps: db 4 - warp_def 4, 0, 3, ROUTE_36 - warp_def 5, 0, 4, ROUTE_36 - warp_def 4, 7, 9, RUINS_OF_ALPH_OUTSIDE - warp_def 5, 7, 9, RUINS_OF_ALPH_OUTSIDE + warp_event 4, 0, 3, ROUTE_36 + warp_event 5, 0, 4, ROUTE_36 + warp_event 4, 7, 9, RUINS_OF_ALPH_OUTSIDE + warp_event 5, 7, 9, RUINS_OF_ALPH_OUTSIDE .CoordEvents: db 0 diff --git a/maps/Route38.asm b/maps/Route38.asm index 6272d3a51..37c64b3b0 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -478,8 +478,8 @@ Route38_MapEvents: .Warps: db 2 - warp_def 35, 8, 1, ROUTE_38_ECRUTEAK_GATE - warp_def 35, 9, 2, ROUTE_38_ECRUTEAK_GATE + warp_event 35, 8, 1, ROUTE_38_ECRUTEAK_GATE + warp_event 35, 9, 2, ROUTE_38_ECRUTEAK_GATE .CoordEvents: db 0 diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index fa7280b57..ccea75224 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -30,10 +30,10 @@ Route38EcruteakGate_MapEvents: .Warps: db 4 - warp_def 0, 4, 1, ROUTE_38 - warp_def 0, 5, 2, ROUTE_38 - warp_def 9, 4, 14, ECRUTEAK_CITY - warp_def 9, 5, 15, ECRUTEAK_CITY + warp_event 0, 4, 1, ROUTE_38 + warp_event 0, 5, 2, ROUTE_38 + warp_event 9, 4, 14, ECRUTEAK_CITY + warp_event 9, 5, 15, ECRUTEAK_CITY .CoordEvents: db 0 diff --git a/maps/Route39.asm b/maps/Route39.asm index d48be62e2..aa1f961be 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -349,8 +349,8 @@ Route39_MapEvents: .Warps: db 2 - warp_def 1, 3, 1, ROUTE_39_BARN - warp_def 5, 3, 1, ROUTE_39_FARMHOUSE + warp_event 1, 3, 1, ROUTE_39_BARN + warp_event 5, 3, 1, ROUTE_39_FARMHOUSE .CoordEvents: db 0 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index a8e54a7ef..02a168a34 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -194,8 +194,8 @@ Route39Barn_MapEvents: .Warps: db 2 - warp_def 3, 7, 1, ROUTE_39 - warp_def 4, 7, 1, ROUTE_39 + warp_event 3, 7, 1, ROUTE_39 + warp_event 4, 7, 1, ROUTE_39 .CoordEvents: db 0 diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index b7c3117cf..ae54e507a 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -198,8 +198,8 @@ Route39Farmhouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 2, ROUTE_39 - warp_def 3, 7, 2, ROUTE_39 + warp_event 2, 7, 2, ROUTE_39 + warp_event 3, 7, 2, ROUTE_39 .CoordEvents: db 0 diff --git a/maps/Route4.asm b/maps/Route4.asm index 1615a9652..33ee0ef84 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -126,7 +126,7 @@ Route4_MapEvents: .Warps: db 1 - warp_def 2, 5, 2, MOUNT_MOON + warp_event 2, 5, 2, MOUNT_MOON .CoordEvents: db 0 diff --git a/maps/Route40.asm b/maps/Route40.asm index 05b6f8f36..b5766044a 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -343,7 +343,7 @@ Route40_MapEvents: .Warps: db 1 - warp_def 9, 5, 1, ROUTE_40_BATTLE_TOWER_GATE + warp_event 9, 5, 1, ROUTE_40_BATTLE_TOWER_GATE .CoordEvents: db 0 diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index edd8fb7ff..1a7bffc01 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -76,10 +76,10 @@ Route40BattleTowerGate_MapEvents: .Warps: db 4 - warp_def 4, 7, 1, ROUTE_40 - warp_def 5, 7, 1, ROUTE_40 - warp_def 4, 0, 1, BATTLE_TOWER_OUTSIDE - warp_def 5, 0, 2, BATTLE_TOWER_OUTSIDE + warp_event 4, 7, 1, ROUTE_40 + warp_event 5, 7, 1, ROUTE_40 + warp_event 4, 0, 1, BATTLE_TOWER_OUTSIDE + warp_event 5, 0, 2, BATTLE_TOWER_OUTSIDE .CoordEvents: db 0 diff --git a/maps/Route41.asm b/maps/Route41.asm index dbd625c32..606bfb25a 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -347,10 +347,10 @@ Route41_MapEvents: .Warps: db 4 - warp_def 12, 17, 1, WHIRL_ISLAND_NW - warp_def 36, 19, 1, WHIRL_ISLAND_NE - warp_def 12, 37, 1, WHIRL_ISLAND_SW - warp_def 36, 45, 1, WHIRL_ISLAND_SE + warp_event 12, 17, 1, WHIRL_ISLAND_NW + warp_event 36, 19, 1, WHIRL_ISLAND_NE + warp_event 12, 37, 1, WHIRL_ISLAND_SW + warp_event 36, 45, 1, WHIRL_ISLAND_SE .CoordEvents: db 0 diff --git a/maps/Route42.asm b/maps/Route42.asm index 04a4fa64d..c7e2f7396 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -324,11 +324,11 @@ Route42_MapEvents: .Warps: db 5 - warp_def 0, 8, 3, ROUTE_42_ECRUTEAK_GATE - warp_def 0, 9, 4, ROUTE_42_ECRUTEAK_GATE - warp_def 10, 5, 1, MOUNT_MORTAR_1F_OUTSIDE - warp_def 28, 9, 2, MOUNT_MORTAR_1F_OUTSIDE - warp_def 46, 7, 3, MOUNT_MORTAR_1F_OUTSIDE + warp_event 0, 8, 3, ROUTE_42_ECRUTEAK_GATE + warp_event 0, 9, 4, ROUTE_42_ECRUTEAK_GATE + warp_event 10, 5, 1, MOUNT_MORTAR_1F_OUTSIDE + warp_event 28, 9, 2, MOUNT_MORTAR_1F_OUTSIDE + warp_event 46, 7, 3, MOUNT_MORTAR_1F_OUTSIDE .CoordEvents: db 1 diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index f873e7fed..b42d9201b 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -25,10 +25,10 @@ Route42EcruteakGate_MapEvents: .Warps: db 4 - warp_def 0, 4, 1, ECRUTEAK_CITY - warp_def 0, 5, 2, ECRUTEAK_CITY - warp_def 9, 4, 1, ROUTE_42 - warp_def 9, 5, 2, ROUTE_42 + warp_event 0, 4, 1, ECRUTEAK_CITY + warp_event 0, 5, 2, ECRUTEAK_CITY + warp_event 9, 4, 1, ROUTE_42 + warp_event 9, 5, 2, ROUTE_42 .CoordEvents: db 0 diff --git a/maps/Route43.asm b/maps/Route43.asm index 404211f17..50401b72c 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -506,11 +506,11 @@ Route43_MapEvents: .Warps: db 5 - warp_def 9, 51, 1, ROUTE_43_MAHOGANY_GATE - warp_def 10, 51, 2, ROUTE_43_MAHOGANY_GATE - warp_def 17, 35, 3, ROUTE_43_GATE - warp_def 17, 31, 1, ROUTE_43_GATE - warp_def 18, 31, 2, ROUTE_43_GATE + warp_event 9, 51, 1, ROUTE_43_MAHOGANY_GATE + warp_event 10, 51, 2, ROUTE_43_MAHOGANY_GATE + warp_event 17, 35, 3, ROUTE_43_GATE + warp_event 17, 31, 1, ROUTE_43_GATE + warp_event 18, 31, 2, ROUTE_43_GATE .CoordEvents: db 0 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 51d095e3c..793c56a7f 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -253,10 +253,10 @@ Route43Gate_MapEvents: .Warps: db 4 - warp_def 4, 0, 4, ROUTE_43 - warp_def 5, 0, 5, ROUTE_43 - warp_def 4, 7, 3, ROUTE_43 - warp_def 5, 7, 3, ROUTE_43 + warp_event 4, 0, 4, ROUTE_43 + warp_event 5, 0, 5, ROUTE_43 + warp_event 4, 7, 3, ROUTE_43 + warp_event 5, 7, 3, ROUTE_43 .CoordEvents: db 0 diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index d3d2758ea..7a5e8901b 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -44,10 +44,10 @@ Route43MahoganyGate_MapEvents: .Warps: db 4 - warp_def 4, 0, 1, ROUTE_43 - warp_def 5, 0, 2, ROUTE_43 - warp_def 4, 7, 5, MAHOGANY_TOWN - warp_def 5, 7, 5, MAHOGANY_TOWN + warp_event 4, 0, 1, ROUTE_43 + warp_event 5, 0, 2, ROUTE_43 + warp_event 4, 7, 5, MAHOGANY_TOWN + warp_event 5, 7, 5, MAHOGANY_TOWN .CoordEvents: db 0 diff --git a/maps/Route44.asm b/maps/Route44.asm index 58bc46bbf..a4126a816 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -512,7 +512,7 @@ Route44_MapEvents: .Warps: db 1 - warp_def 56, 7, 1, ICE_PATH_1F + warp_event 56, 7, 1, ICE_PATH_1F .CoordEvents: db 0 diff --git a/maps/Route45.asm b/maps/Route45.asm index 8c696973d..b2f0cc35d 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -537,7 +537,7 @@ Route45_MapEvents: .Warps: db 1 - warp_def 2, 5, 1, DARK_CAVE_BLACKTHORN_ENTRANCE + warp_event 2, 5, 1, DARK_CAVE_BLACKTHORN_ENTRANCE .CoordEvents: db 0 diff --git a/maps/Route46.asm b/maps/Route46.asm index 88efec5a6..ad42fe712 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -256,9 +256,9 @@ Route46_MapEvents: .Warps: db 3 - warp_def 7, 33, 1, ROUTE_29_ROUTE_46_GATE - warp_def 8, 33, 2, ROUTE_29_ROUTE_46_GATE - warp_def 14, 5, 3, DARK_CAVE_VIOLET_ENTRANCE + warp_event 7, 33, 1, ROUTE_29_ROUTE_46_GATE + warp_event 8, 33, 2, ROUTE_29_ROUTE_46_GATE + warp_event 14, 5, 3, DARK_CAVE_VIOLET_ENTRANCE .CoordEvents: db 0 diff --git a/maps/Route5.asm b/maps/Route5.asm index 02fd4113c..f9dbb8224 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -45,10 +45,10 @@ Route5_MapEvents: .Warps: db 4 - warp_def 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE - warp_def 8, 17, 1, ROUTE_5_SAFFRON_GATE - warp_def 9, 17, 2, ROUTE_5_SAFFRON_GATE - warp_def 10, 11, 1, ROUTE_5_CLEANSE_TAG_HOUSE + warp_event 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE + warp_event 8, 17, 1, ROUTE_5_SAFFRON_GATE + warp_event 9, 17, 2, ROUTE_5_SAFFRON_GATE + warp_event 10, 11, 1, ROUTE_5_CLEANSE_TAG_HOUSE .CoordEvents: db 0 diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm index ec05c99fb..c5eae7d35 100644 --- a/maps/Route5CleanseTagHouse.asm +++ b/maps/Route5CleanseTagHouse.asm @@ -66,8 +66,8 @@ Route5CleanseTagHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 4, ROUTE_5 - warp_def 3, 7, 4, ROUTE_5 + warp_event 2, 7, 4, ROUTE_5 + warp_event 3, 7, 4, ROUTE_5 .CoordEvents: db 0 diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm index 1f8bb9b94..113ff7ceb 100644 --- a/maps/Route5SaffronGate.asm +++ b/maps/Route5SaffronGate.asm @@ -26,10 +26,10 @@ Route5SaffronGate_MapEvents: .Warps: db 4 - warp_def 4, 0, 2, ROUTE_5 - warp_def 5, 0, 3, ROUTE_5 - warp_def 4, 7, 9, SAFFRON_CITY - warp_def 5, 7, 9, SAFFRON_CITY + warp_event 4, 0, 2, ROUTE_5 + warp_event 5, 0, 3, ROUTE_5 + warp_event 4, 7, 9, SAFFRON_CITY + warp_event 5, 7, 9, SAFFRON_CITY .CoordEvents: db 0 diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm index 2bdb75ca0..dae482f5b 100644 --- a/maps/Route5UndergroundPathEntrance.asm +++ b/maps/Route5UndergroundPathEntrance.asm @@ -25,9 +25,9 @@ Route5UndergroundPathEntrance_MapEvents: .Warps: db 3 - warp_def 3, 7, 1, ROUTE_5 - warp_def 4, 7, 1, ROUTE_5 - warp_def 4, 3, 1, UNDERGROUND_PATH + warp_event 3, 7, 1, ROUTE_5 + warp_event 4, 7, 1, ROUTE_5 + warp_event 4, 3, 1, UNDERGROUND_PATH .CoordEvents: db 0 diff --git a/maps/Route6.asm b/maps/Route6.asm index 98f57147e..c383dc7f5 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -97,8 +97,8 @@ Route6_MapEvents: .Warps: db 2 - warp_def 17, 3, 1, ROUTE_6_UNDERGROUND_PATH_ENTRANCE - warp_def 6, 1, 3, ROUTE_6_SAFFRON_GATE + warp_event 17, 3, 1, ROUTE_6_UNDERGROUND_PATH_ENTRANCE + warp_event 6, 1, 3, ROUTE_6_SAFFRON_GATE .CoordEvents: db 0 diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index b2dbf0e6c..202c449dd 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -63,10 +63,10 @@ Route6SaffronGate_MapEvents: .Warps: db 4 - warp_def 4, 0, 12, SAFFRON_CITY - warp_def 5, 0, 13, SAFFRON_CITY - warp_def 4, 7, 2, ROUTE_6 - warp_def 5, 7, 2, ROUTE_6 + warp_event 4, 0, 12, SAFFRON_CITY + warp_event 5, 0, 13, SAFFRON_CITY + warp_event 4, 7, 2, ROUTE_6 + warp_event 5, 7, 2, ROUTE_6 .CoordEvents: db 0 diff --git a/maps/Route6UndergroundPathEntrance.asm b/maps/Route6UndergroundPathEntrance.asm index aad70ec88..25bc23f3c 100644 --- a/maps/Route6UndergroundPathEntrance.asm +++ b/maps/Route6UndergroundPathEntrance.asm @@ -11,9 +11,9 @@ Route6UndergroundPathEntrance_MapEvents: .Warps: db 3 - warp_def 3, 7, 1, ROUTE_6 - warp_def 4, 7, 1, ROUTE_6 - warp_def 4, 3, 2, UNDERGROUND_PATH + warp_event 3, 7, 1, ROUTE_6 + warp_event 4, 7, 1, ROUTE_6 + warp_event 4, 3, 2, UNDERGROUND_PATH .CoordEvents: db 0 diff --git a/maps/Route7.asm b/maps/Route7.asm index f10b33ccc..2c6defa05 100644 --- a/maps/Route7.asm +++ b/maps/Route7.asm @@ -40,8 +40,8 @@ Route7_MapEvents: .Warps: db 2 - warp_def 15, 6, 1, ROUTE_7_SAFFRON_GATE - warp_def 15, 7, 2, ROUTE_7_SAFFRON_GATE + warp_event 15, 6, 1, ROUTE_7_SAFFRON_GATE + warp_event 15, 7, 2, ROUTE_7_SAFFRON_GATE .CoordEvents: db 0 diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index bd0c2fced..d2f0e11ba 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -51,10 +51,10 @@ Route7SaffronGate_MapEvents: .Warps: db 4 - warp_def 0, 4, 1, ROUTE_7 - warp_def 0, 5, 2, ROUTE_7 - warp_def 9, 4, 10, SAFFRON_CITY - warp_def 9, 5, 11, SAFFRON_CITY + warp_event 0, 4, 1, ROUTE_7 + warp_event 0, 5, 2, ROUTE_7 + warp_event 9, 4, 10, SAFFRON_CITY + warp_event 9, 5, 11, SAFFRON_CITY .CoordEvents: db 0 diff --git a/maps/Route8.asm b/maps/Route8.asm index 47fb03c0f..4a3d1a225 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -178,8 +178,8 @@ Route8_MapEvents: .Warps: db 2 - warp_def 4, 4, 3, ROUTE_8_SAFFRON_GATE - warp_def 4, 5, 4, ROUTE_8_SAFFRON_GATE + warp_event 4, 4, 3, ROUTE_8_SAFFRON_GATE + warp_event 4, 5, 4, ROUTE_8_SAFFRON_GATE .CoordEvents: db 0 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index dc9968b1d..735d4cdc2 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -25,10 +25,10 @@ Route8SaffronGate_MapEvents: .Warps: db 4 - warp_def 0, 4, 14, SAFFRON_CITY - warp_def 0, 5, 15, SAFFRON_CITY - warp_def 9, 4, 1, ROUTE_8 - warp_def 9, 5, 2, ROUTE_8 + warp_event 0, 4, 14, SAFFRON_CITY + warp_event 0, 5, 15, SAFFRON_CITY + warp_event 9, 4, 1, ROUTE_8 + warp_event 9, 5, 2, ROUTE_8 .CoordEvents: db 0 diff --git a/maps/Route9.asm b/maps/Route9.asm index be000b4b4..ff4c51523 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -211,7 +211,7 @@ Route9_MapEvents: .Warps: db 1 - warp_def 48, 15, 1, ROCK_TUNNEL_1F + warp_event 48, 15, 1, ROCK_TUNNEL_1F .CoordEvents: db 0 diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 1e244cecc..5d2ecbbc0 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -149,11 +149,11 @@ RuinsOfAlphAerodactylChamber_MapEvents: .Warps: db 5 - warp_def 3, 9, 4, RUINS_OF_ALPH_OUTSIDE - warp_def 4, 9, 4, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 3, 8, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 3, 9, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 0, 1, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM + warp_event 3, 9, 4, RUINS_OF_ALPH_OUTSIDE + warp_event 4, 9, 4, RUINS_OF_ALPH_OUTSIDE + warp_event 3, 3, 8, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 4, 3, 9, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 4, 0, 1, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM .CoordEvents: db 0 diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm index 8be5e878b..5d5db380e 100644 --- a/maps/RuinsOfAlphAerodactylItemRoom.asm +++ b/maps/RuinsOfAlphAerodactylItemRoom.asm @@ -38,10 +38,10 @@ RuinsOfAlphAerodactylItemRoom_MapEvents: .Warps: db 4 - warp_def 3, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def 4, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def 3, 1, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM - warp_def 4, 1, 2, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM + warp_event 3, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER + warp_event 4, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER + warp_event 3, 1, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM + warp_event 4, 1, 2, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM .CoordEvents: db 0 diff --git a/maps/RuinsOfAlphAerodactylWordRoom.asm b/maps/RuinsOfAlphAerodactylWordRoom.asm index d991d80bc..e71b09e4a 100644 --- a/maps/RuinsOfAlphAerodactylWordRoom.asm +++ b/maps/RuinsOfAlphAerodactylWordRoom.asm @@ -11,9 +11,9 @@ RuinsOfAlphAerodactylWordRoom_MapEvents: .Warps: db 3 - warp_def 9, 5, 3, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM - warp_def 10, 5, 4, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM - warp_def 17, 11, 8, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 9, 5, 3, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM + warp_event 10, 5, 4, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM + warp_event 17, 11, 8, RUINS_OF_ALPH_INNER_CHAMBER .CoordEvents: db 0 diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 46c340c9f..1e1316c15 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -150,11 +150,11 @@ RuinsOfAlphHoOhChamber_MapEvents: .Warps: db 5 - warp_def 3, 9, 1, RUINS_OF_ALPH_OUTSIDE - warp_def 4, 9, 1, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 3, 2, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 3, 3, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 0, 1, RUINS_OF_ALPH_HO_OH_ITEM_ROOM + warp_event 3, 9, 1, RUINS_OF_ALPH_OUTSIDE + warp_event 4, 9, 1, RUINS_OF_ALPH_OUTSIDE + warp_event 3, 3, 2, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 4, 3, 3, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 4, 0, 1, RUINS_OF_ALPH_HO_OH_ITEM_ROOM .CoordEvents: db 0 diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm index e8ad02a27..917d93380 100644 --- a/maps/RuinsOfAlphHoOhItemRoom.asm +++ b/maps/RuinsOfAlphHoOhItemRoom.asm @@ -38,10 +38,10 @@ RuinsOfAlphHoOhItemRoom_MapEvents: .Warps: db 4 - warp_def 3, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def 4, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def 3, 1, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM - warp_def 4, 1, 2, RUINS_OF_ALPH_HO_OH_WORD_ROOM + warp_event 3, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_event 4, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_event 3, 1, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM + warp_event 4, 1, 2, RUINS_OF_ALPH_HO_OH_WORD_ROOM .CoordEvents: db 0 diff --git a/maps/RuinsOfAlphHoOhWordRoom.asm b/maps/RuinsOfAlphHoOhWordRoom.asm index a9b3be9cd..cfd70f7be 100644 --- a/maps/RuinsOfAlphHoOhWordRoom.asm +++ b/maps/RuinsOfAlphHoOhWordRoom.asm @@ -11,9 +11,9 @@ RuinsOfAlphHoOhWordRoom_MapEvents: .Warps: db 3 - warp_def 9, 9, 3, RUINS_OF_ALPH_HO_OH_ITEM_ROOM - warp_def 10, 9, 4, RUINS_OF_ALPH_HO_OH_ITEM_ROOM - warp_def 17, 21, 2, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 9, 9, 3, RUINS_OF_ALPH_HO_OH_ITEM_ROOM + warp_event 10, 9, 4, RUINS_OF_ALPH_HO_OH_ITEM_ROOM + warp_event 17, 21, 2, RUINS_OF_ALPH_INNER_CHAMBER .CoordEvents: db 0 diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index 27e696a85..6712533d9 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -82,15 +82,15 @@ RuinsOfAlphInnerChamber_MapEvents: .Warps: db 9 - warp_def 10, 13, 5, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 15, 3, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def 4, 15, 4, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def 15, 3, 3, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def 16, 3, 4, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def 3, 21, 3, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def 4, 21, 4, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def 15, 24, 3, RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def 16, 24, 4, RUINS_OF_ALPH_AERODACTYL_CHAMBER + warp_event 10, 13, 5, RUINS_OF_ALPH_OUTSIDE + warp_event 3, 15, 3, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_event 4, 15, 4, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_event 15, 3, 3, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_event 16, 3, 4, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_event 3, 21, 3, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_event 4, 21, 4, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_event 15, 24, 3, RUINS_OF_ALPH_AERODACTYL_CHAMBER + warp_event 16, 24, 4, RUINS_OF_ALPH_AERODACTYL_CHAMBER .CoordEvents: db 0 diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index 66110d261..1cbe7ee20 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -261,11 +261,11 @@ RuinsOfAlphKabutoChamber_MapEvents: .Warps: db 5 - warp_def 3, 9, 2, RUINS_OF_ALPH_OUTSIDE - warp_def 4, 9, 2, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 3, 4, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 3, 5, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 0, 1, RUINS_OF_ALPH_KABUTO_ITEM_ROOM + warp_event 3, 9, 2, RUINS_OF_ALPH_OUTSIDE + warp_event 4, 9, 2, RUINS_OF_ALPH_OUTSIDE + warp_event 3, 3, 4, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 4, 3, 5, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 4, 0, 1, RUINS_OF_ALPH_KABUTO_ITEM_ROOM .CoordEvents: db 0 diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm index 3e5d41515..a0b4662ea 100644 --- a/maps/RuinsOfAlphKabutoItemRoom.asm +++ b/maps/RuinsOfAlphKabutoItemRoom.asm @@ -38,10 +38,10 @@ RuinsOfAlphKabutoItemRoom_MapEvents: .Warps: db 4 - warp_def 3, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def 4, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def 3, 1, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM - warp_def 4, 1, 2, RUINS_OF_ALPH_KABUTO_WORD_ROOM + warp_event 3, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_event 4, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_event 3, 1, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM + warp_event 4, 1, 2, RUINS_OF_ALPH_KABUTO_WORD_ROOM .CoordEvents: db 0 diff --git a/maps/RuinsOfAlphKabutoWordRoom.asm b/maps/RuinsOfAlphKabutoWordRoom.asm index ad29b5760..e5678c98c 100644 --- a/maps/RuinsOfAlphKabutoWordRoom.asm +++ b/maps/RuinsOfAlphKabutoWordRoom.asm @@ -11,9 +11,9 @@ RuinsOfAlphKabutoWordRoom_MapEvents: .Warps: db 3 - warp_def 9, 5, 3, RUINS_OF_ALPH_KABUTO_ITEM_ROOM - warp_def 10, 5, 4, RUINS_OF_ALPH_KABUTO_ITEM_ROOM - warp_def 17, 11, 4, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 9, 5, 3, RUINS_OF_ALPH_KABUTO_ITEM_ROOM + warp_event 10, 5, 4, RUINS_OF_ALPH_KABUTO_ITEM_ROOM + warp_event 17, 11, 4, RUINS_OF_ALPH_INNER_CHAMBER .CoordEvents: db 0 diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index b99ba1825..1c4a8b4fa 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -150,11 +150,11 @@ RuinsOfAlphOmanyteChamber_MapEvents: .Warps: db 5 - warp_def 3, 9, 3, RUINS_OF_ALPH_OUTSIDE - warp_def 4, 9, 3, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 3, 6, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 3, 7, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 0, 1, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM + warp_event 3, 9, 3, RUINS_OF_ALPH_OUTSIDE + warp_event 4, 9, 3, RUINS_OF_ALPH_OUTSIDE + warp_event 3, 3, 6, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 4, 3, 7, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 4, 0, 1, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM .CoordEvents: db 0 diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm index 3f4570b2b..510d76f2b 100644 --- a/maps/RuinsOfAlphOmanyteItemRoom.asm +++ b/maps/RuinsOfAlphOmanyteItemRoom.asm @@ -38,10 +38,10 @@ RuinsOfAlphOmanyteItemRoom_MapEvents: .Warps: db 4 - warp_def 3, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def 4, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def 3, 1, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM - warp_def 4, 1, 2, RUINS_OF_ALPH_OMANYTE_WORD_ROOM + warp_event 3, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_event 4, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_event 3, 1, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM + warp_event 4, 1, 2, RUINS_OF_ALPH_OMANYTE_WORD_ROOM .CoordEvents: db 0 diff --git a/maps/RuinsOfAlphOmanyteWordRoom.asm b/maps/RuinsOfAlphOmanyteWordRoom.asm index b2f68e0a3..bc6d9ea99 100644 --- a/maps/RuinsOfAlphOmanyteWordRoom.asm +++ b/maps/RuinsOfAlphOmanyteWordRoom.asm @@ -11,9 +11,9 @@ RuinsOfAlphOmanyteWordRoom_MapEvents: .Warps: db 3 - warp_def 9, 7, 3, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM - warp_def 10, 7, 4, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM - warp_def 17, 13, 6, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 9, 7, 3, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM + warp_event 10, 7, 4, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM + warp_event 17, 13, 6, RUINS_OF_ALPH_INNER_CHAMBER .CoordEvents: db 0 diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index f386024c9..afe0b01e8 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -286,17 +286,17 @@ RuinsOfAlphOutside_MapEvents: .Warps: db 11 - warp_def 2, 17, 1, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def 14, 7, 1, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def 2, 29, 1, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def 16, 33, 1, RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def 10, 13, 1, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 17, 11, 1, RUINS_OF_ALPH_RESEARCH_CENTER - warp_def 6, 19, 1, UNION_CAVE_B1F - warp_def 6, 27, 2, UNION_CAVE_B1F - warp_def 7, 5, 3, ROUTE_36_RUINS_OF_ALPH_GATE - warp_def 13, 20, 1, ROUTE_32_RUINS_OF_ALPH_GATE - warp_def 13, 21, 2, ROUTE_32_RUINS_OF_ALPH_GATE + warp_event 2, 17, 1, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_event 14, 7, 1, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_event 2, 29, 1, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_event 16, 33, 1, RUINS_OF_ALPH_AERODACTYL_CHAMBER + warp_event 10, 13, 1, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 17, 11, 1, RUINS_OF_ALPH_RESEARCH_CENTER + warp_event 6, 19, 1, UNION_CAVE_B1F + warp_event 6, 27, 2, UNION_CAVE_B1F + warp_event 7, 5, 3, ROUTE_36_RUINS_OF_ALPH_GATE + warp_event 13, 20, 1, ROUTE_32_RUINS_OF_ALPH_GATE + warp_event 13, 21, 2, ROUTE_32_RUINS_OF_ALPH_GATE .CoordEvents: db 2 diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 184e5349c..9a6fbe79f 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -398,8 +398,8 @@ RuinsOfAlphResearchCenter_MapEvents: .Warps: db 2 - warp_def 2, 7, 6, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 7, 6, RUINS_OF_ALPH_OUTSIDE + warp_event 2, 7, 6, RUINS_OF_ALPH_OUTSIDE + warp_event 3, 7, 6, RUINS_OF_ALPH_OUTSIDE .CoordEvents: db 0 diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm index a96f55dea..fda3e6408 100644 --- a/maps/SafariZoneBeta.asm +++ b/maps/SafariZoneBeta.asm @@ -11,8 +11,8 @@ SafariZoneBeta_MapEvents: .Warps: db 2 - warp_def 9, 23, 1, SAFARI_ZONE_FUCHSIA_GATE_BETA - warp_def 10, 23, 2, SAFARI_ZONE_FUCHSIA_GATE_BETA + warp_event 9, 23, 1, SAFARI_ZONE_FUCHSIA_GATE_BETA + warp_event 10, 23, 2, SAFARI_ZONE_FUCHSIA_GATE_BETA .CoordEvents: db 0 diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index 562775013..cb618fd91 100644 --- a/maps/SafariZoneFuchsiaGateBeta.asm +++ b/maps/SafariZoneFuchsiaGateBeta.asm @@ -11,10 +11,10 @@ SafariZoneFuchsiaGateBeta_MapEvents: .Warps: db 4 - warp_def 4, 0, 1, SAFARI_ZONE_BETA - warp_def 5, 0, 2, SAFARI_ZONE_BETA - warp_def 4, 7, 7, FUCHSIA_CITY - warp_def 5, 7, 7, FUCHSIA_CITY + warp_event 4, 0, 1, SAFARI_ZONE_BETA + warp_event 5, 0, 2, SAFARI_ZONE_BETA + warp_event 4, 7, 7, FUCHSIA_CITY + warp_event 5, 7, 7, FUCHSIA_CITY .CoordEvents: db 0 diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm index 1ee13106f..2d0476d99 100644 --- a/maps/SafariZoneMainOffice.asm +++ b/maps/SafariZoneMainOffice.asm @@ -11,8 +11,8 @@ SafariZoneMainOffice_MapEvents: .Warps: db 2 - warp_def 2, 7, 2, FUCHSIA_CITY - warp_def 3, 7, 2, FUCHSIA_CITY + warp_event 2, 7, 2, FUCHSIA_CITY + warp_event 3, 7, 2, FUCHSIA_CITY .CoordEvents: db 0 diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index e7295d594..8ab657803 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -82,8 +82,8 @@ SafariZoneWardensHome_MapEvents: .Warps: db 2 - warp_def 2, 7, 6, FUCHSIA_CITY - warp_def 3, 7, 6, FUCHSIA_CITY + warp_event 2, 7, 6, FUCHSIA_CITY + warp_event 3, 7, 6, FUCHSIA_CITY .CoordEvents: db 0 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index d4c470571..30263840f 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -271,21 +271,21 @@ SaffronCity_MapEvents: .Warps: db 15 - warp_def 26, 3, 1, FIGHTING_DOJO - warp_def 34, 3, 1, SAFFRON_GYM - warp_def 25, 11, 2, SAFFRON_MART - warp_def 9, 29, 1, SAFFRON_POKECENTER_1F - warp_def 27, 29, 1, MR_PSYCHICS_HOUSE - warp_def 8, 3, 2, SAFFRON_MAGNET_TRAIN_STATION - warp_def 18, 21, 1, SILPH_CO_1F - warp_def 9, 11, 1, COPYCATS_HOUSE_1F - warp_def 18, 3, 3, ROUTE_5_SAFFRON_GATE - warp_def 0, 24, 3, ROUTE_7_SAFFRON_GATE - warp_def 0, 25, 4, ROUTE_7_SAFFRON_GATE - warp_def 16, 33, 1, ROUTE_6_SAFFRON_GATE - warp_def 17, 33, 2, ROUTE_6_SAFFRON_GATE - warp_def 39, 22, 1, ROUTE_8_SAFFRON_GATE - warp_def 39, 23, 2, ROUTE_8_SAFFRON_GATE + warp_event 26, 3, 1, FIGHTING_DOJO + warp_event 34, 3, 1, SAFFRON_GYM + warp_event 25, 11, 2, SAFFRON_MART + warp_event 9, 29, 1, SAFFRON_POKECENTER_1F + warp_event 27, 29, 1, MR_PSYCHICS_HOUSE + warp_event 8, 3, 2, SAFFRON_MAGNET_TRAIN_STATION + warp_event 18, 21, 1, SILPH_CO_1F + warp_event 9, 11, 1, COPYCATS_HOUSE_1F + warp_event 18, 3, 3, ROUTE_5_SAFFRON_GATE + warp_event 0, 24, 3, ROUTE_7_SAFFRON_GATE + warp_event 0, 25, 4, ROUTE_7_SAFFRON_GATE + warp_event 16, 33, 1, ROUTE_6_SAFFRON_GATE + warp_event 17, 33, 2, ROUTE_6_SAFFRON_GATE + warp_event 39, 22, 1, ROUTE_8_SAFFRON_GATE + warp_event 39, 23, 2, ROUTE_8_SAFFRON_GATE .CoordEvents: db 0 diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 730b0aa87..aacbda2af 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -296,38 +296,38 @@ SaffronGym_MapEvents: .Warps: db 32 - warp_def 8, 17, 2, SAFFRON_CITY - warp_def 9, 17, 2, SAFFRON_CITY - warp_def 11, 15, 18, SAFFRON_GYM - warp_def 19, 15, 19, SAFFRON_GYM - warp_def 19, 11, 20, SAFFRON_GYM - warp_def 1, 11, 21, SAFFRON_GYM - warp_def 5, 3, 22, SAFFRON_GYM - warp_def 11, 5, 23, SAFFRON_GYM - warp_def 1, 15, 24, SAFFRON_GYM - warp_def 19, 3, 25, SAFFRON_GYM - warp_def 15, 17, 26, SAFFRON_GYM - warp_def 5, 17, 27, SAFFRON_GYM - warp_def 5, 9, 28, SAFFRON_GYM - warp_def 9, 3, 29, SAFFRON_GYM - warp_def 15, 9, 30, SAFFRON_GYM - warp_def 15, 5, 31, SAFFRON_GYM - warp_def 1, 5, 32, SAFFRON_GYM - warp_def 19, 17, 3, SAFFRON_GYM - warp_def 19, 9, 4, SAFFRON_GYM - warp_def 1, 9, 5, SAFFRON_GYM - warp_def 5, 5, 6, SAFFRON_GYM - warp_def 11, 3, 7, SAFFRON_GYM - warp_def 1, 17, 8, SAFFRON_GYM - warp_def 19, 5, 9, SAFFRON_GYM - warp_def 15, 15, 10, SAFFRON_GYM - warp_def 5, 15, 11, SAFFRON_GYM - warp_def 5, 11, 12, SAFFRON_GYM - warp_def 9, 5, 13, SAFFRON_GYM - warp_def 15, 11, 14, SAFFRON_GYM - warp_def 15, 3, 15, SAFFRON_GYM - warp_def 1, 3, 16, SAFFRON_GYM - warp_def 11, 9, 17, SAFFRON_GYM + warp_event 8, 17, 2, SAFFRON_CITY + warp_event 9, 17, 2, SAFFRON_CITY + warp_event 11, 15, 18, SAFFRON_GYM + warp_event 19, 15, 19, SAFFRON_GYM + warp_event 19, 11, 20, SAFFRON_GYM + warp_event 1, 11, 21, SAFFRON_GYM + warp_event 5, 3, 22, SAFFRON_GYM + warp_event 11, 5, 23, SAFFRON_GYM + warp_event 1, 15, 24, SAFFRON_GYM + warp_event 19, 3, 25, SAFFRON_GYM + warp_event 15, 17, 26, SAFFRON_GYM + warp_event 5, 17, 27, SAFFRON_GYM + warp_event 5, 9, 28, SAFFRON_GYM + warp_event 9, 3, 29, SAFFRON_GYM + warp_event 15, 9, 30, SAFFRON_GYM + warp_event 15, 5, 31, SAFFRON_GYM + warp_event 1, 5, 32, SAFFRON_GYM + warp_event 19, 17, 3, SAFFRON_GYM + warp_event 19, 9, 4, SAFFRON_GYM + warp_event 1, 9, 5, SAFFRON_GYM + warp_event 5, 5, 6, SAFFRON_GYM + warp_event 11, 3, 7, SAFFRON_GYM + warp_event 1, 17, 8, SAFFRON_GYM + warp_event 19, 5, 9, SAFFRON_GYM + warp_event 15, 15, 10, SAFFRON_GYM + warp_event 5, 15, 11, SAFFRON_GYM + warp_event 5, 11, 12, SAFFRON_GYM + warp_event 9, 5, 13, SAFFRON_GYM + warp_event 15, 11, 14, SAFFRON_GYM + warp_event 15, 3, 15, SAFFRON_GYM + warp_event 1, 3, 16, SAFFRON_GYM + warp_event 11, 9, 17, SAFFRON_GYM .CoordEvents: db 0 diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index ad5b4a8bd..fa57423b1 100644 --- a/maps/SaffronMagnetTrainStation.asm +++ b/maps/SaffronMagnetTrainStation.asm @@ -221,10 +221,10 @@ SaffronMagnetTrainStation_MapEvents: .Warps: db 4 - warp_def 8, 17, 6, SAFFRON_CITY - warp_def 9, 17, 6, SAFFRON_CITY - warp_def 6, 5, 4, GOLDENROD_MAGNET_TRAIN_STATION - warp_def 11, 5, 3, GOLDENROD_MAGNET_TRAIN_STATION + warp_event 8, 17, 6, SAFFRON_CITY + warp_event 9, 17, 6, SAFFRON_CITY + warp_event 6, 5, 4, GOLDENROD_MAGNET_TRAIN_STATION + warp_event 11, 5, 3, GOLDENROD_MAGNET_TRAIN_STATION .CoordEvents: db 1 diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index d7619320c..17d791759 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -43,8 +43,8 @@ SaffronMart_MapEvents: .Warps: db 2 - warp_def 2, 7, 3, SAFFRON_CITY - warp_def 3, 7, 3, SAFFRON_CITY + warp_event 2, 7, 3, SAFFRON_CITY + warp_event 3, 7, 3, SAFFRON_CITY .CoordEvents: db 0 diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index 453ac6df5..93950a03b 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -117,9 +117,9 @@ SaffronPokecenter1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 4, SAFFRON_CITY - warp_def 4, 7, 4, SAFFRON_CITY - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 4, SAFFRON_CITY + warp_event 4, 7, 4, SAFFRON_CITY + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/SaffronPokecenter2FBeta.asm b/maps/SaffronPokecenter2FBeta.asm index ebc2bb6c8..daf92a5d3 100644 --- a/maps/SaffronPokecenter2FBeta.asm +++ b/maps/SaffronPokecenter2FBeta.asm @@ -11,7 +11,7 @@ SaffronPokecenter2FBeta_MapEvents: .Warps: db 1 - warp_def 0, 7, 3, SAFFRON_POKECENTER_1F + warp_event 0, 7, 3, SAFFRON_POKECENTER_1F .CoordEvents: db 0 diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 885d04c60..01d49532c 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -163,7 +163,7 @@ SeafoamGym_MapEvents: .Warps: db 1 - warp_def 5, 5, 1, ROUTE_20 + warp_event 5, 5, 1, ROUTE_20 .CoordEvents: db 0 diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index 83c75ef6c..f9e03456b 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -61,8 +61,8 @@ SilphCo1F_MapEvents: .Warps: db 2 - warp_def 2, 7, 7, SAFFRON_CITY - warp_def 3, 7, 7, SAFFRON_CITY + warp_event 2, 7, 7, SAFFRON_CITY + warp_event 3, 7, 7, SAFFRON_CITY .CoordEvents: db 0 diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index d218da44c..349c7797a 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -21,8 +21,8 @@ SilverCaveItemRooms_MapEvents: .Warps: db 2 - warp_def 13, 3, 3, SILVER_CAVE_ROOM_2 - warp_def 7, 15, 4, SILVER_CAVE_ROOM_2 + warp_event 13, 3, 3, SILVER_CAVE_ROOM_2 + warp_event 7, 15, 4, SILVER_CAVE_ROOM_2 .CoordEvents: db 0 diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 7613026a3..87fec1f72 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -29,8 +29,8 @@ SilverCaveOutside_MapEvents: .Warps: db 2 - warp_def 23, 19, 1, SILVER_CAVE_POKECENTER_1F - warp_def 18, 11, 1, SILVER_CAVE_ROOM_1 + warp_event 23, 19, 1, SILVER_CAVE_POKECENTER_1F + warp_event 18, 11, 1, SILVER_CAVE_ROOM_1 .CoordEvents: db 0 diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm index 76b1e744f..e8478e668 100644 --- a/maps/SilverCavePokecenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -35,9 +35,9 @@ SilverCavePokecenter1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 1, SILVER_CAVE_OUTSIDE - warp_def 4, 7, 1, SILVER_CAVE_OUTSIDE - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 1, SILVER_CAVE_OUTSIDE + warp_event 4, 7, 1, SILVER_CAVE_OUTSIDE + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 8ea6cf362..1a1bcb500 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -35,8 +35,8 @@ SilverCaveRoom1_MapEvents: .Warps: db 2 - warp_def 9, 33, 2, SILVER_CAVE_OUTSIDE - warp_def 15, 1, 1, SILVER_CAVE_ROOM_2 + warp_event 9, 33, 2, SILVER_CAVE_OUTSIDE + warp_event 15, 1, 1, SILVER_CAVE_ROOM_2 .CoordEvents: db 0 diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index daa1bf0a2..49eb7a2d3 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -28,10 +28,10 @@ SilverCaveRoom2_MapEvents: .Warps: db 4 - warp_def 17, 31, 2, SILVER_CAVE_ROOM_1 - warp_def 11, 5, 1, SILVER_CAVE_ROOM_3 - warp_def 13, 21, 1, SILVER_CAVE_ITEM_ROOMS - warp_def 23, 3, 2, SILVER_CAVE_ITEM_ROOMS + warp_event 17, 31, 2, SILVER_CAVE_ROOM_1 + warp_event 11, 5, 1, SILVER_CAVE_ROOM_3 + warp_event 13, 21, 1, SILVER_CAVE_ITEM_ROOMS + warp_event 23, 3, 2, SILVER_CAVE_ITEM_ROOMS .CoordEvents: db 0 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 7d8c5897f..f95b239df 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -56,7 +56,7 @@ SilverCaveRoom3_MapEvents: .Warps: db 1 - warp_def 9, 33, 2, SILVER_CAVE_ROOM_2 + warp_event 9, 33, 2, SILVER_CAVE_ROOM_2 .CoordEvents: db 0 diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index d2c32b671..1f835b018 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -326,8 +326,8 @@ SlowpokeWellB1F_MapEvents: .Warps: db 2 - warp_def 17, 15, 6, AZALEA_TOWN - warp_def 7, 11, 1, SLOWPOKE_WELL_B2F + warp_event 17, 15, 6, AZALEA_TOWN + warp_event 7, 11, 1, SLOWPOKE_WELL_B2F .CoordEvents: db 0 diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 70fef8c70..c4ab0d3ca 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -67,7 +67,7 @@ SlowpokeWellB2F_MapEvents: .Warps: db 1 - warp_def 9, 11, 2, SLOWPOKE_WELL_B1F + warp_event 9, 11, 2, SLOWPOKE_WELL_B1F .CoordEvents: db 0 diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 15ac8e2b3..f11412391 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -78,8 +78,8 @@ SoulHouse_MapEvents: .Warps: db 2 - warp_def 4, 7, 6, LAVENDER_TOWN - warp_def 5, 7, 6, LAVENDER_TOWN + warp_event 4, 7, 6, LAVENDER_TOWN + warp_event 5, 7, 6, LAVENDER_TOWN .CoordEvents: db 0 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 40ec6be64..a646bdb18 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -108,11 +108,11 @@ SproutTower1F_MapEvents: .Warps: db 5 - warp_def 9, 15, 7, VIOLET_CITY - warp_def 10, 15, 7, VIOLET_CITY - warp_def 6, 4, 1, SPROUT_TOWER_2F - warp_def 2, 6, 2, SPROUT_TOWER_2F - warp_def 17, 3, 3, SPROUT_TOWER_2F + warp_event 9, 15, 7, VIOLET_CITY + warp_event 10, 15, 7, VIOLET_CITY + warp_event 6, 4, 1, SPROUT_TOWER_2F + warp_event 2, 6, 2, SPROUT_TOWER_2F + warp_event 17, 3, 3, SPROUT_TOWER_2F .CoordEvents: db 0 diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index c399e404d..31fbaa2c0 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -90,10 +90,10 @@ SproutTower2F_MapEvents: .Warps: db 4 - warp_def 6, 4, 3, SPROUT_TOWER_1F - warp_def 2, 6, 4, SPROUT_TOWER_1F - warp_def 17, 3, 5, SPROUT_TOWER_1F - warp_def 10, 14, 1, SPROUT_TOWER_3F + warp_event 6, 4, 3, SPROUT_TOWER_1F + warp_event 2, 6, 4, SPROUT_TOWER_1F + warp_event 17, 3, 5, SPROUT_TOWER_1F + warp_event 10, 14, 1, SPROUT_TOWER_3F .CoordEvents: db 0 diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 9e2896992..e5c903f7e 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -335,7 +335,7 @@ SproutTower3F_MapEvents: .Warps: db 1 - warp_def 10, 14, 4, SPROUT_TOWER_2F + warp_event 10, 14, 4, SPROUT_TOWER_2F .CoordEvents: db 1 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 67efc752c..718612b9b 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -732,10 +732,10 @@ TeamRocketBaseB1F_MapEvents: .Warps: db 4 - warp_def 27, 2, 3, MAHOGANY_MART_1F - warp_def 3, 14, 1, TEAM_ROCKET_BASE_B2F - warp_def 5, 15, 4, TEAM_ROCKET_BASE_B1F - warp_def 25, 2, 3, TEAM_ROCKET_BASE_B1F + warp_event 27, 2, 3, MAHOGANY_MART_1F + warp_event 3, 14, 1, TEAM_ROCKET_BASE_B2F + warp_event 5, 15, 4, TEAM_ROCKET_BASE_B1F + warp_event 25, 2, 3, TEAM_ROCKET_BASE_B1F .CoordEvents: db 30 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index bf5a6248f..519742983 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -914,11 +914,11 @@ TeamRocketBaseB2F_MapEvents: .Warps: db 5 - warp_def 3, 14, 2, TEAM_ROCKET_BASE_B1F - warp_def 3, 2, 1, TEAM_ROCKET_BASE_B3F - warp_def 27, 2, 2, TEAM_ROCKET_BASE_B3F - warp_def 3, 6, 3, TEAM_ROCKET_BASE_B3F - warp_def 27, 14, 4, TEAM_ROCKET_BASE_B3F + warp_event 3, 14, 2, TEAM_ROCKET_BASE_B1F + warp_event 3, 2, 1, TEAM_ROCKET_BASE_B3F + warp_event 27, 2, 2, TEAM_ROCKET_BASE_B3F + warp_event 3, 6, 3, TEAM_ROCKET_BASE_B3F + warp_event 27, 14, 4, TEAM_ROCKET_BASE_B3F .CoordEvents: db 9 diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 80f4b30e4..d09274053 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -571,10 +571,10 @@ TeamRocketBaseB3F_MapEvents: .Warps: db 4 - warp_def 3, 2, 2, TEAM_ROCKET_BASE_B2F - warp_def 27, 2, 3, TEAM_ROCKET_BASE_B2F - warp_def 3, 6, 4, TEAM_ROCKET_BASE_B2F - warp_def 27, 14, 5, TEAM_ROCKET_BASE_B2F + warp_event 3, 2, 2, TEAM_ROCKET_BASE_B2F + warp_event 27, 2, 3, TEAM_ROCKET_BASE_B2F + warp_event 3, 6, 4, TEAM_ROCKET_BASE_B2F + warp_event 27, 14, 5, TEAM_ROCKET_BASE_B2F .CoordEvents: db 3 diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index c0366f94d..f10fd1a4b 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -59,8 +59,8 @@ TimeCapsule_MapEvents: .Warps: db 2 - warp_def 4, 7, 4, POKECENTER_2F - warp_def 5, 7, 4, POKECENTER_2F + warp_event 4, 7, 4, POKECENTER_2F + warp_event 5, 7, 4, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index ac6ca8863..b82497e7b 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -528,9 +528,9 @@ TinTower1F_MapEvents: .Warps: db 3 - warp_def 9, 15, 12, ECRUTEAK_CITY - warp_def 10, 15, 12, ECRUTEAK_CITY - warp_def 10, 2, 2, TIN_TOWER_2F + warp_event 9, 15, 12, ECRUTEAK_CITY + warp_event 10, 15, 12, ECRUTEAK_CITY + warp_event 10, 2, 2, TIN_TOWER_2F .CoordEvents: db 0 diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm index 02012d6f8..3127306b6 100644 --- a/maps/TinTower2F.asm +++ b/maps/TinTower2F.asm @@ -11,8 +11,8 @@ TinTower2F_MapEvents: .Warps: db 2 - warp_def 10, 14, 1, TIN_TOWER_3F - warp_def 10, 2, 3, TIN_TOWER_1F + warp_event 10, 14, 1, TIN_TOWER_3F + warp_event 10, 2, 3, TIN_TOWER_1F .CoordEvents: db 0 diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 505073594..f1d3a81b0 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -17,8 +17,8 @@ TinTower3F_MapEvents: .Warps: db 2 - warp_def 10, 14, 1, TIN_TOWER_2F - warp_def 16, 2, 2, TIN_TOWER_4F + warp_event 10, 14, 1, TIN_TOWER_2F + warp_event 16, 2, 2, TIN_TOWER_4F .CoordEvents: db 0 diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index f58971358..63793d5ba 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -28,10 +28,10 @@ TinTower4F_MapEvents: .Warps: db 4 - warp_def 2, 4, 2, TIN_TOWER_5F - warp_def 16, 2, 2, TIN_TOWER_3F - warp_def 2, 14, 3, TIN_TOWER_5F - warp_def 17, 15, 4, TIN_TOWER_5F + warp_event 2, 4, 2, TIN_TOWER_5F + warp_event 16, 2, 2, TIN_TOWER_3F + warp_event 2, 14, 3, TIN_TOWER_5F + warp_event 17, 15, 4, TIN_TOWER_5F .CoordEvents: db 0 diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index 5bad496ee..7f0b53a5c 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -23,10 +23,10 @@ TinTower5F_MapEvents: .Warps: db 4 - warp_def 11, 15, 2, TIN_TOWER_6F - warp_def 2, 4, 1, TIN_TOWER_4F - warp_def 2, 14, 3, TIN_TOWER_4F - warp_def 17, 15, 4, TIN_TOWER_4F + warp_event 11, 15, 2, TIN_TOWER_6F + warp_event 2, 4, 1, TIN_TOWER_4F + warp_event 2, 14, 3, TIN_TOWER_4F + warp_event 17, 15, 4, TIN_TOWER_4F .CoordEvents: db 0 diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index 5d587373d..fcfbfc37c 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -17,8 +17,8 @@ TinTower6F_MapEvents: .Warps: db 2 - warp_def 3, 9, 1, TIN_TOWER_7F - warp_def 11, 15, 1, TIN_TOWER_5F + warp_event 3, 9, 1, TIN_TOWER_7F + warp_event 11, 15, 1, TIN_TOWER_5F .CoordEvents: db 0 diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index ab10bf4c2..b34268f9a 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -17,11 +17,11 @@ TinTower7F_MapEvents: .Warps: db 5 - warp_def 3, 9, 1, TIN_TOWER_6F - warp_def 10, 15, 1, TIN_TOWER_8F - warp_def 12, 7, 4, TIN_TOWER_7F - warp_def 8, 3, 3, TIN_TOWER_7F - warp_def 6, 9, 5, TIN_TOWER_9F + warp_event 3, 9, 1, TIN_TOWER_6F + warp_event 10, 15, 1, TIN_TOWER_8F + warp_event 12, 7, 4, TIN_TOWER_7F + warp_event 8, 3, 3, TIN_TOWER_7F + warp_event 6, 9, 5, TIN_TOWER_9F .CoordEvents: db 0 diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index 4e10ac13f..aa9f8000a 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -25,12 +25,12 @@ TinTower8F_MapEvents: .Warps: db 6 - warp_def 2, 5, 2, TIN_TOWER_7F - warp_def 2, 11, 1, TIN_TOWER_9F - warp_def 16, 7, 2, TIN_TOWER_9F - warp_def 10, 3, 3, TIN_TOWER_9F - warp_def 14, 15, 6, TIN_TOWER_9F - warp_def 6, 9, 7, TIN_TOWER_9F + warp_event 2, 5, 2, TIN_TOWER_7F + warp_event 2, 11, 1, TIN_TOWER_9F + warp_event 16, 7, 2, TIN_TOWER_9F + warp_event 10, 3, 3, TIN_TOWER_9F + warp_event 14, 15, 6, TIN_TOWER_9F + warp_event 6, 9, 7, TIN_TOWER_9F .CoordEvents: db 0 diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index a540b891f..492425455 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -27,13 +27,13 @@ TinTower9F_MapEvents: .Warps: db 7 - warp_def 12, 3, 2, TIN_TOWER_8F - warp_def 2, 5, 3, TIN_TOWER_8F - warp_def 12, 7, 4, TIN_TOWER_8F - warp_def 7, 9, 1, TIN_TOWER_ROOF - warp_def 16, 7, 5, TIN_TOWER_7F - warp_def 6, 13, 5, TIN_TOWER_8F - warp_def 8, 13, 6, TIN_TOWER_8F + warp_event 12, 3, 2, TIN_TOWER_8F + warp_event 2, 5, 3, TIN_TOWER_8F + warp_event 12, 7, 4, TIN_TOWER_8F + warp_event 7, 9, 1, TIN_TOWER_ROOF + warp_event 16, 7, 5, TIN_TOWER_7F + warp_event 6, 13, 5, TIN_TOWER_8F + warp_event 8, 13, 6, TIN_TOWER_8F .CoordEvents: db 0 diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 3cfca7cf9..61e9cfae0 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -50,7 +50,7 @@ TinTowerRoof_MapEvents: .Warps: db 1 - warp_def 9, 13, 4, TIN_TOWER_9F + warp_event 9, 13, 4, TIN_TOWER_9F .CoordEvents: db 0 diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index c9982b094..949215e65 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -17,8 +17,8 @@ TohjoFalls_MapEvents: .Warps: db 2 - warp_def 13, 15, 2, ROUTE_27 - warp_def 25, 15, 3, ROUTE_27 + warp_event 13, 15, 2, ROUTE_27 + warp_event 25, 15, 3, ROUTE_27 .CoordEvents: db 0 diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 168abe1e7..db0b081d2 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -59,8 +59,8 @@ TradeCenter_MapEvents: .Warps: db 2 - warp_def 4, 7, 2, POKECENTER_2F - warp_def 5, 7, 2, POKECENTER_2F + warp_event 4, 7, 2, POKECENTER_2F + warp_event 5, 7, 2, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index d3fcfca04..05bdfa62d 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -143,9 +143,9 @@ TrainerHouse1F_MapEvents: .Warps: db 3 - warp_def 2, 13, 3, VIRIDIAN_CITY - warp_def 3, 13, 3, VIRIDIAN_CITY - warp_def 8, 2, 1, TRAINER_HOUSE_B1F + warp_event 2, 13, 3, VIRIDIAN_CITY + warp_event 3, 13, 3, VIRIDIAN_CITY + warp_event 8, 2, 1, TRAINER_HOUSE_B1F .CoordEvents: db 0 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 3de28611b..52ad25780 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -175,7 +175,7 @@ TrainerHouseB1F_MapEvents: .Warps: db 1 - warp_def 9, 4, 3, TRAINER_HOUSE_1F + warp_event 9, 4, 3, TRAINER_HOUSE_1F .CoordEvents: db 1 diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm index fd23de3d9..7b52c02b7 100644 --- a/maps/UndergroundPath.asm +++ b/maps/UndergroundPath.asm @@ -17,8 +17,8 @@ UndergroundPath_MapEvents: .Warps: db 2 - warp_def 3, 2, 3, ROUTE_5_UNDERGROUND_PATH_ENTRANCE - warp_def 3, 24, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE + warp_event 3, 2, 3, ROUTE_5_UNDERGROUND_PATH_ENTRANCE + warp_event 3, 24, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE .CoordEvents: db 0 diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 077c9fd7b..0c9cbc06c 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -205,10 +205,10 @@ UnionCave1F_MapEvents: .Warps: db 4 - warp_def 5, 19, 3, UNION_CAVE_B1F - warp_def 3, 33, 4, UNION_CAVE_B1F - warp_def 17, 31, 1, ROUTE_33 - warp_def 17, 3, 4, ROUTE_32 + warp_event 5, 19, 3, UNION_CAVE_B1F + warp_event 3, 33, 4, UNION_CAVE_B1F + warp_event 17, 31, 1, ROUTE_33 + warp_event 17, 3, 4, ROUTE_32 .CoordEvents: db 0 diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index b2aa2159d..6b0ed7389 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -158,11 +158,11 @@ UnionCaveB1F_MapEvents: .Warps: db 5 - warp_def 3, 3, 7, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 11, 8, RUINS_OF_ALPH_OUTSIDE - warp_def 7, 19, 1, UNION_CAVE_1F - warp_def 3, 33, 2, UNION_CAVE_1F - warp_def 17, 31, 1, UNION_CAVE_B2F + warp_event 3, 3, 7, RUINS_OF_ALPH_OUTSIDE + warp_event 3, 11, 8, RUINS_OF_ALPH_OUTSIDE + warp_event 7, 19, 1, UNION_CAVE_1F + warp_event 3, 33, 2, UNION_CAVE_1F + warp_event 17, 31, 1, UNION_CAVE_B2F .CoordEvents: db 0 diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index b39352227..02209442d 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -147,7 +147,7 @@ UnionCaveB2F_MapEvents: .Warps: db 1 - warp_def 5, 3, 5, UNION_CAVE_B1F + warp_event 5, 3, 5, UNION_CAVE_B1F .CoordEvents: db 0 diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 92d0ca5e2..9ee82253b 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -273,16 +273,16 @@ VermilionCity_MapEvents: .Warps: db 10 - warp_def 5, 5, 1, VERMILION_FISHING_SPEECH_HOUSE - warp_def 9, 5, 1, VERMILION_POKECENTER_1F - warp_def 7, 13, 1, POKEMON_FAN_CLUB - warp_def 13, 13, 1, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE - warp_def 21, 13, 2, VERMILION_MART - warp_def 21, 17, 1, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE - warp_def 10, 19, 1, VERMILION_GYM - warp_def 19, 31, 1, VERMILION_PORT_PASSAGE - warp_def 20, 31, 2, VERMILION_PORT_PASSAGE - warp_def 34, 7, 1, DIGLETTS_CAVE + warp_event 5, 5, 1, VERMILION_FISHING_SPEECH_HOUSE + warp_event 9, 5, 1, VERMILION_POKECENTER_1F + warp_event 7, 13, 1, POKEMON_FAN_CLUB + warp_event 13, 13, 1, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE + warp_event 21, 13, 2, VERMILION_MART + warp_event 21, 17, 1, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE + warp_event 10, 19, 1, VERMILION_GYM + warp_event 19, 31, 1, VERMILION_PORT_PASSAGE + warp_event 20, 31, 2, VERMILION_PORT_PASSAGE + warp_event 34, 7, 1, DIGLETTS_CAVE .CoordEvents: db 0 diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm index a0992d777..b2a4e5733 100644 --- a/maps/VermilionDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionDiglettsCaveSpeechHouse.asm @@ -26,8 +26,8 @@ VermilionDiglettsCaveSpeechHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 6, VERMILION_CITY - warp_def 3, 7, 6, VERMILION_CITY + warp_event 2, 7, 6, VERMILION_CITY + warp_event 3, 7, 6, VERMILION_CITY .CoordEvents: db 0 diff --git a/maps/VermilionFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm index 9ae7daaff..ff730d197 100644 --- a/maps/VermilionFishingSpeechHouse.asm +++ b/maps/VermilionFishingSpeechHouse.asm @@ -56,8 +56,8 @@ VermilionFishingSpeechHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 1, VERMILION_CITY - warp_def 3, 7, 1, VERMILION_CITY + warp_event 2, 7, 1, VERMILION_CITY + warp_event 3, 7, 1, VERMILION_CITY .CoordEvents: db 0 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 1f7e92d7c..eafaa6dde 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -266,8 +266,8 @@ VermilionGym_MapEvents: .Warps: db 2 - warp_def 4, 17, 7, VERMILION_CITY - warp_def 5, 17, 7, VERMILION_CITY + warp_event 4, 17, 7, VERMILION_CITY + warp_event 5, 17, 7, VERMILION_CITY .CoordEvents: db 0 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index e2ba0b77c..c080e3f26 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -39,8 +39,8 @@ VermilionMagnetTrainSpeechHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 4, VERMILION_CITY - warp_def 3, 7, 4, VERMILION_CITY + warp_event 2, 7, 4, VERMILION_CITY + warp_event 3, 7, 4, VERMILION_CITY .CoordEvents: db 0 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index b72ea6aec..de422c38a 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -42,8 +42,8 @@ VermilionMart_MapEvents: .Warps: db 2 - warp_def 2, 7, 5, VERMILION_CITY - warp_def 3, 7, 5, VERMILION_CITY + warp_event 2, 7, 5, VERMILION_CITY + warp_event 3, 7, 5, VERMILION_CITY .CoordEvents: db 0 diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm index 43821efdc..80b3e02ce 100644 --- a/maps/VermilionPokecenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -82,9 +82,9 @@ VermilionPokecenter1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 2, VERMILION_CITY - warp_def 4, 7, 2, VERMILION_CITY - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 2, VERMILION_CITY + warp_event 4, 7, 2, VERMILION_CITY + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/VermilionPokecenter2FBeta.asm b/maps/VermilionPokecenter2FBeta.asm index a82bd9e48..7ddb0050c 100644 --- a/maps/VermilionPokecenter2FBeta.asm +++ b/maps/VermilionPokecenter2FBeta.asm @@ -11,7 +11,7 @@ VermilionPokecenter2FBeta_MapEvents: .Warps: db 1 - warp_def 0, 7, 3, VERMILION_POKECENTER_1F + warp_event 0, 7, 3, VERMILION_POKECENTER_1F .CoordEvents: db 0 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index f7f956f43..e75d2e3d4 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -304,8 +304,8 @@ VermilionPort_MapEvents: .Warps: db 2 - warp_def 9, 5, 5, VERMILION_PORT_PASSAGE - warp_def 7, 17, 1, FAST_SHIP_1F + warp_event 9, 5, 5, VERMILION_PORT_PASSAGE + warp_event 7, 17, 1, FAST_SHIP_1F .CoordEvents: db 1 diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 1e078e525..1c2c56c7b 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -24,11 +24,11 @@ VermilionPortPassage_MapEvents: .Warps: db 5 - warp_def 15, 0, 8, VERMILION_CITY - warp_def 16, 0, 9, VERMILION_CITY - warp_def 15, 4, 4, VERMILION_PORT_PASSAGE - warp_def 3, 2, 3, VERMILION_PORT_PASSAGE - warp_def 3, 14, 1, VERMILION_PORT + warp_event 15, 0, 8, VERMILION_CITY + warp_event 16, 0, 9, VERMILION_CITY + warp_event 15, 4, 4, VERMILION_PORT_PASSAGE + warp_event 3, 2, 3, VERMILION_PORT_PASSAGE + warp_event 3, 14, 1, VERMILION_PORT .CoordEvents: db 0 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 44250c783..a8f8aa085 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -244,16 +244,16 @@ VictoryRoad_MapEvents: .Warps: db 10 - warp_def 9, 67, 5, VICTORY_ROAD_GATE - warp_def 1, 49, 3, VICTORY_ROAD - warp_def 1, 35, 2, VICTORY_ROAD - warp_def 13, 31, 5, VICTORY_ROAD - warp_def 13, 17, 4, VICTORY_ROAD - warp_def 17, 33, 7, VICTORY_ROAD - warp_def 17, 19, 6, VICTORY_ROAD - warp_def 0, 11, 9, VICTORY_ROAD - warp_def 0, 27, 8, VICTORY_ROAD - warp_def 13, 5, 3, ROUTE_23 + warp_event 9, 67, 5, VICTORY_ROAD_GATE + warp_event 1, 49, 3, VICTORY_ROAD + warp_event 1, 35, 2, VICTORY_ROAD + warp_event 13, 31, 5, VICTORY_ROAD + warp_event 13, 17, 4, VICTORY_ROAD + warp_event 17, 33, 7, VICTORY_ROAD + warp_event 17, 19, 6, VICTORY_ROAD + warp_event 0, 11, 9, VICTORY_ROAD + warp_event 0, 27, 8, VICTORY_ROAD + warp_event 13, 5, 3, ROUTE_23 .CoordEvents: db 2 diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index b466a32b6..3c027014a 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -103,14 +103,14 @@ VictoryRoadGate_MapEvents: .Warps: db 8 - warp_def 17, 7, 1, ROUTE_22 - warp_def 18, 7, 1, ROUTE_22 - warp_def 9, 17, 1, ROUTE_26 - warp_def 10, 17, 1, ROUTE_26 - warp_def 9, 0, 1, VICTORY_ROAD - warp_def 10, 0, 1, VICTORY_ROAD - warp_def 1, 7, 2, ROUTE_28 - warp_def 2, 7, 2, ROUTE_28 + warp_event 17, 7, 1, ROUTE_22 + warp_event 18, 7, 1, ROUTE_22 + warp_event 9, 17, 1, ROUTE_26 + warp_event 10, 17, 1, ROUTE_26 + warp_event 9, 0, 1, VICTORY_ROAD + warp_event 10, 0, 1, VICTORY_ROAD + warp_event 1, 7, 2, ROUTE_28 + warp_event 2, 7, 2, ROUTE_28 .CoordEvents: db 1 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 684deb7e2..6ce23b037 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -284,15 +284,15 @@ VioletCity_MapEvents: .Warps: db 9 - warp_def 9, 17, 2, VIOLET_MART - warp_def 18, 17, 1, VIOLET_GYM - warp_def 30, 17, 1, EARLS_POKEMON_ACADEMY - warp_def 3, 15, 1, VIOLET_NICKNAME_SPEECH_HOUSE - warp_def 31, 25, 1, VIOLET_POKECENTER_1F - warp_def 21, 29, 1, VIOLET_KYLES_HOUSE - warp_def 23, 5, 1, SPROUT_TOWER_1F - warp_def 39, 24, 1, ROUTE_31_VIOLET_GATE - warp_def 39, 25, 2, ROUTE_31_VIOLET_GATE + warp_event 9, 17, 2, VIOLET_MART + warp_event 18, 17, 1, VIOLET_GYM + warp_event 30, 17, 1, EARLS_POKEMON_ACADEMY + warp_event 3, 15, 1, VIOLET_NICKNAME_SPEECH_HOUSE + warp_event 31, 25, 1, VIOLET_POKECENTER_1F + warp_event 21, 29, 1, VIOLET_KYLES_HOUSE + warp_event 23, 5, 1, SPROUT_TOWER_1F + warp_event 39, 24, 1, ROUTE_31_VIOLET_GATE + warp_event 39, 25, 2, ROUTE_31_VIOLET_GATE .CoordEvents: db 0 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 48eca3995..2a7b97197 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -287,8 +287,8 @@ VioletGym_MapEvents: .Warps: db 2 - warp_def 4, 15, 2, VIOLET_CITY - warp_def 5, 15, 2, VIOLET_CITY + warp_event 4, 15, 2, VIOLET_CITY + warp_event 5, 15, 2, VIOLET_CITY .CoordEvents: db 0 diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm index 4d903cb70..3025dad5d 100644 --- a/maps/VioletKylesHouse.asm +++ b/maps/VioletKylesHouse.asm @@ -38,8 +38,8 @@ VioletKylesHouse_MapEvents: .Warps: db 2 - warp_def 3, 7, 6, VIOLET_CITY - warp_def 4, 7, 6, VIOLET_CITY + warp_event 3, 7, 6, VIOLET_CITY + warp_event 4, 7, 6, VIOLET_CITY .CoordEvents: db 0 diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index e1a86e0c7..bb01ab1a9 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -54,8 +54,8 @@ VioletMart_MapEvents: .Warps: db 2 - warp_def 2, 7, 1, VIOLET_CITY - warp_def 3, 7, 1, VIOLET_CITY + warp_event 2, 7, 1, VIOLET_CITY + warp_event 3, 7, 1, VIOLET_CITY .CoordEvents: db 0 diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 7ec074324..192ffcc58 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -50,8 +50,8 @@ VioletNicknameSpeechHouse_MapEvents: .Warps: db 2 - warp_def 3, 7, 4, VIOLET_CITY - warp_def 4, 7, 4, VIOLET_CITY + warp_event 3, 7, 4, VIOLET_CITY + warp_event 4, 7, 4, VIOLET_CITY .CoordEvents: db 0 diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index 9413849b8..3bf4f1166 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -221,9 +221,9 @@ VioletPokecenter1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 5, VIOLET_CITY - warp_def 4, 7, 5, VIOLET_CITY - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 5, VIOLET_CITY + warp_event 4, 7, 5, VIOLET_CITY + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 1825c1bc7..75a0d47ab 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -221,11 +221,11 @@ ViridianCity_MapEvents: .Warps: db 5 - warp_def 32, 7, 1, VIRIDIAN_GYM - warp_def 21, 9, 1, VIRIDIAN_NICKNAME_SPEECH_HOUSE - warp_def 23, 15, 1, TRAINER_HOUSE_1F - warp_def 29, 19, 2, VIRIDIAN_MART - warp_def 23, 25, 1, VIRIDIAN_POKECENTER_1F + warp_event 32, 7, 1, VIRIDIAN_GYM + warp_event 21, 9, 1, VIRIDIAN_NICKNAME_SPEECH_HOUSE + warp_event 23, 15, 1, TRAINER_HOUSE_1F + warp_event 29, 19, 2, VIRIDIAN_MART + warp_event 23, 25, 1, VIRIDIAN_POKECENTER_1F .CoordEvents: db 0 diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index ed47a099e..f77eee251 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -175,8 +175,8 @@ ViridianGym_MapEvents: .Warps: db 2 - warp_def 4, 17, 1, VIRIDIAN_CITY - warp_def 5, 17, 1, VIRIDIAN_CITY + warp_event 4, 17, 1, VIRIDIAN_CITY + warp_event 5, 17, 1, VIRIDIAN_CITY .CoordEvents: db 0 diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 275b57e2d..e42cc70e2 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -42,8 +42,8 @@ ViridianMart_MapEvents: .Warps: db 2 - warp_def 2, 7, 4, VIRIDIAN_CITY - warp_def 3, 7, 4, VIRIDIAN_CITY + warp_event 2, 7, 4, VIRIDIAN_CITY + warp_event 3, 7, 4, VIRIDIAN_CITY .CoordEvents: db 0 diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 10d2c52e5..703aaf253 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -67,8 +67,8 @@ ViridianNicknameSpeechHouse_MapEvents: .Warps: db 2 - warp_def 2, 7, 2, VIRIDIAN_CITY - warp_def 3, 7, 2, VIRIDIAN_CITY + warp_event 2, 7, 2, VIRIDIAN_CITY + warp_event 3, 7, 2, VIRIDIAN_CITY .CoordEvents: db 0 diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm index 86f767a5f..b795bc3de 100644 --- a/maps/ViridianPokecenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -77,9 +77,9 @@ ViridianPokecenter1F_MapEvents: .Warps: db 3 - warp_def 3, 7, 5, VIRIDIAN_CITY - warp_def 4, 7, 5, VIRIDIAN_CITY - warp_def 0, 7, 1, POKECENTER_2F + warp_event 3, 7, 5, VIRIDIAN_CITY + warp_event 4, 7, 5, VIRIDIAN_CITY + warp_event 0, 7, 1, POKECENTER_2F .CoordEvents: db 0 diff --git a/maps/ViridianPokecenter2FBeta.asm b/maps/ViridianPokecenter2FBeta.asm index 3a00d3be1..38fbd8a5a 100644 --- a/maps/ViridianPokecenter2FBeta.asm +++ b/maps/ViridianPokecenter2FBeta.asm @@ -11,7 +11,7 @@ ViridianPokecenter2FBeta_MapEvents: .Warps: db 1 - warp_def 0, 7, 3, VIRIDIAN_POKECENTER_1F + warp_event 0, 7, 3, VIRIDIAN_POKECENTER_1F .CoordEvents: db 0 diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 3d6a94aac..e19ae8551 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -46,15 +46,15 @@ WhirlIslandB1F_MapEvents: .Warps: db 9 - warp_def 5, 5, 2, WHIRL_ISLAND_NW - warp_def 35, 3, 2, WHIRL_ISLAND_NE - warp_def 29, 9, 3, WHIRL_ISLAND_NE - warp_def 9, 31, 3, WHIRL_ISLAND_SW - warp_def 23, 31, 2, WHIRL_ISLAND_SW - warp_def 31, 29, 2, WHIRL_ISLAND_SE - warp_def 25, 21, 1, WHIRL_ISLAND_B2F - warp_def 13, 27, 2, WHIRL_ISLAND_B2F - warp_def 17, 21, 1, WHIRL_ISLAND_CAVE + warp_event 5, 5, 2, WHIRL_ISLAND_NW + warp_event 35, 3, 2, WHIRL_ISLAND_NE + warp_event 29, 9, 3, WHIRL_ISLAND_NE + warp_event 9, 31, 3, WHIRL_ISLAND_SW + warp_event 23, 31, 2, WHIRL_ISLAND_SW + warp_event 31, 29, 2, WHIRL_ISLAND_SE + warp_event 25, 21, 1, WHIRL_ISLAND_B2F + warp_event 13, 27, 2, WHIRL_ISLAND_B2F + warp_event 17, 21, 1, WHIRL_ISLAND_CAVE .CoordEvents: db 0 diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index d589b7d05..d689744ca 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -25,10 +25,10 @@ WhirlIslandB2F_MapEvents: .Warps: db 4 - warp_def 11, 5, 7, WHIRL_ISLAND_B1F - warp_def 7, 11, 8, WHIRL_ISLAND_B1F - warp_def 7, 25, 1, WHIRL_ISLAND_LUGIA_CHAMBER - warp_def 13, 31, 5, WHIRL_ISLAND_SW + warp_event 11, 5, 7, WHIRL_ISLAND_B1F + warp_event 7, 11, 8, WHIRL_ISLAND_B1F + warp_event 7, 25, 1, WHIRL_ISLAND_LUGIA_CHAMBER + warp_event 13, 31, 5, WHIRL_ISLAND_SW .CoordEvents: db 0 diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm index 29c8500bb..4d67a37ab 100644 --- a/maps/WhirlIslandCave.asm +++ b/maps/WhirlIslandCave.asm @@ -11,8 +11,8 @@ WhirlIslandCave_MapEvents: .Warps: db 2 - warp_def 7, 5, 9, WHIRL_ISLAND_B1F - warp_def 3, 13, 4, WHIRL_ISLAND_NW + warp_event 7, 5, 9, WHIRL_ISLAND_B1F + warp_event 3, 13, 4, WHIRL_ISLAND_NW .CoordEvents: db 0 diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index aa0a15c1e..c5637b742 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -49,7 +49,7 @@ WhirlIslandLugiaChamber_MapEvents: .Warps: db 1 - warp_def 9, 13, 3, WHIRL_ISLAND_B2F + warp_event 9, 13, 3, WHIRL_ISLAND_B2F .CoordEvents: db 0 diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index b022a4c72..490892565 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -17,9 +17,9 @@ WhirlIslandNE_MapEvents: .Warps: db 3 - warp_def 3, 13, 2, ROUTE_41 - warp_def 17, 3, 2, WHIRL_ISLAND_B1F - warp_def 13, 11, 3, WHIRL_ISLAND_B1F + warp_event 3, 13, 2, ROUTE_41 + warp_event 17, 3, 2, WHIRL_ISLAND_B1F + warp_event 13, 11, 3, WHIRL_ISLAND_B1F .CoordEvents: db 0 diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm index e8475c19b..8939c9b15 100644 --- a/maps/WhirlIslandNW.asm +++ b/maps/WhirlIslandNW.asm @@ -11,10 +11,10 @@ WhirlIslandNW_MapEvents: .Warps: db 4 - warp_def 5, 7, 1, ROUTE_41 - warp_def 5, 3, 1, WHIRL_ISLAND_B1F - warp_def 3, 15, 4, WHIRL_ISLAND_SW - warp_def 7, 15, 2, WHIRL_ISLAND_CAVE + warp_event 5, 7, 1, ROUTE_41 + warp_event 5, 3, 1, WHIRL_ISLAND_B1F + warp_event 3, 15, 4, WHIRL_ISLAND_SW + warp_event 7, 15, 2, WHIRL_ISLAND_CAVE .CoordEvents: db 0 diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm index 3e7edc484..ca03ab199 100644 --- a/maps/WhirlIslandSE.asm +++ b/maps/WhirlIslandSE.asm @@ -11,8 +11,8 @@ WhirlIslandSE_MapEvents: .Warps: db 2 - warp_def 5, 13, 4, ROUTE_41 - warp_def 5, 3, 6, WHIRL_ISLAND_B1F + warp_event 5, 13, 4, ROUTE_41 + warp_event 5, 3, 6, WHIRL_ISLAND_B1F .CoordEvents: db 0 diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index b80b00b6a..6edd1490f 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -17,11 +17,11 @@ WhirlIslandSW_MapEvents: .Warps: db 5 - warp_def 5, 7, 3, ROUTE_41 - warp_def 17, 3, 5, WHIRL_ISLAND_B1F - warp_def 3, 3, 4, WHIRL_ISLAND_B1F - warp_def 3, 15, 3, WHIRL_ISLAND_NW - warp_def 17, 15, 4, WHIRL_ISLAND_B2F + warp_event 5, 7, 3, ROUTE_41 + warp_event 17, 3, 5, WHIRL_ISLAND_B1F + warp_event 3, 3, 4, WHIRL_ISLAND_B1F + warp_event 3, 15, 3, WHIRL_ISLAND_NW + warp_event 17, 15, 4, WHIRL_ISLAND_B2F .CoordEvents: db 0 diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 1b0522ce9..088364a83 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -134,9 +134,9 @@ WillsRoom_MapEvents: .Warps: db 3 - warp_def 5, 17, 4, INDIGO_PLATEAU_POKECENTER_1F - warp_def 4, 2, 1, KOGAS_ROOM - warp_def 5, 2, 2, KOGAS_ROOM + warp_event 5, 17, 4, INDIGO_PLATEAU_POKECENTER_1F + warp_event 4, 2, 1, KOGAS_ROOM + warp_event 5, 2, 2, KOGAS_ROOM .CoordEvents: db 0 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 776a21cef..a047eadbe 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -350,9 +350,9 @@ WiseTriosRoom_MapEvents: .Warps: db 3 - warp_def 7, 4, 4, ECRUTEAK_CITY - warp_def 7, 5, 5, ECRUTEAK_CITY - warp_def 1, 4, 5, ECRUTEAK_TIN_TOWER_ENTRANCE + warp_event 7, 4, 4, ECRUTEAK_CITY + warp_event 7, 5, 5, ECRUTEAK_CITY + warp_event 1, 4, 5, ECRUTEAK_TIN_TOWER_ENTRANCE .CoordEvents: db 1 From 4c4fca1028c2d0906dc101d89ca6e0be4664c342 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 29 Jan 2018 11:35:50 -0500 Subject: [PATCH 063/135] Clean up comments Base data: types uniquely lacked a comment; items on one line; distinguish unknowns Dex entries: don't imply that pointers don't exist --- data/pokemon/base_stats/abra.asm | 13 ++++++------- data/pokemon/base_stats/aerodactyl.asm | 13 ++++++------- data/pokemon/base_stats/aipom.asm | 13 ++++++------- data/pokemon/base_stats/alakazam.asm | 13 ++++++------- data/pokemon/base_stats/ampharos.asm | 13 ++++++------- data/pokemon/base_stats/arbok.asm | 13 ++++++------- data/pokemon/base_stats/arcanine.asm | 13 ++++++------- data/pokemon/base_stats/ariados.asm | 13 ++++++------- data/pokemon/base_stats/articuno.asm | 13 ++++++------- data/pokemon/base_stats/azumarill.asm | 13 ++++++------- data/pokemon/base_stats/bayleef.asm | 13 ++++++------- data/pokemon/base_stats/beedrill.asm | 13 ++++++------- data/pokemon/base_stats/bellossom.asm | 13 ++++++------- data/pokemon/base_stats/bellsprout.asm | 13 ++++++------- data/pokemon/base_stats/blastoise.asm | 13 ++++++------- data/pokemon/base_stats/blissey.asm | 13 ++++++------- data/pokemon/base_stats/bulbasaur.asm | 13 ++++++------- data/pokemon/base_stats/butterfree.asm | 13 ++++++------- data/pokemon/base_stats/caterpie.asm | 13 ++++++------- data/pokemon/base_stats/celebi.asm | 13 ++++++------- data/pokemon/base_stats/chansey.asm | 13 ++++++------- data/pokemon/base_stats/charizard.asm | 13 ++++++------- data/pokemon/base_stats/charmander.asm | 13 ++++++------- data/pokemon/base_stats/charmeleon.asm | 13 ++++++------- data/pokemon/base_stats/chikorita.asm | 13 ++++++------- data/pokemon/base_stats/chinchou.asm | 13 ++++++------- data/pokemon/base_stats/clefable.asm | 13 ++++++------- data/pokemon/base_stats/clefairy.asm | 13 ++++++------- data/pokemon/base_stats/cleffa.asm | 13 ++++++------- data/pokemon/base_stats/cloyster.asm | 13 ++++++------- data/pokemon/base_stats/corsola.asm | 13 ++++++------- data/pokemon/base_stats/crobat.asm | 13 ++++++------- data/pokemon/base_stats/croconaw.asm | 13 ++++++------- data/pokemon/base_stats/cubone.asm | 13 ++++++------- data/pokemon/base_stats/cyndaquil.asm | 13 ++++++------- data/pokemon/base_stats/delibird.asm | 13 ++++++------- data/pokemon/base_stats/dewgong.asm | 13 ++++++------- data/pokemon/base_stats/diglett.asm | 13 ++++++------- data/pokemon/base_stats/ditto.asm | 13 ++++++------- data/pokemon/base_stats/dodrio.asm | 13 ++++++------- data/pokemon/base_stats/doduo.asm | 13 ++++++------- data/pokemon/base_stats/donphan.asm | 13 ++++++------- data/pokemon/base_stats/dragonair.asm | 13 ++++++------- data/pokemon/base_stats/dragonite.asm | 13 ++++++------- data/pokemon/base_stats/dratini.asm | 13 ++++++------- data/pokemon/base_stats/drowzee.asm | 13 ++++++------- data/pokemon/base_stats/dugtrio.asm | 13 ++++++------- data/pokemon/base_stats/dunsparce.asm | 13 ++++++------- data/pokemon/base_stats/eevee.asm | 13 ++++++------- data/pokemon/base_stats/ekans.asm | 13 ++++++------- data/pokemon/base_stats/electabuzz.asm | 13 ++++++------- data/pokemon/base_stats/electrode.asm | 13 ++++++------- data/pokemon/base_stats/elekid.asm | 13 ++++++------- data/pokemon/base_stats/entei.asm | 13 ++++++------- data/pokemon/base_stats/espeon.asm | 13 ++++++------- data/pokemon/base_stats/exeggcute.asm | 13 ++++++------- data/pokemon/base_stats/exeggutor.asm | 13 ++++++------- data/pokemon/base_stats/farfetch_d.asm | 13 ++++++------- data/pokemon/base_stats/fearow.asm | 13 ++++++------- data/pokemon/base_stats/feraligatr.asm | 13 ++++++------- data/pokemon/base_stats/flaaffy.asm | 13 ++++++------- data/pokemon/base_stats/flareon.asm | 13 ++++++------- data/pokemon/base_stats/forretress.asm | 13 ++++++------- data/pokemon/base_stats/furret.asm | 13 ++++++------- data/pokemon/base_stats/gastly.asm | 13 ++++++------- data/pokemon/base_stats/gengar.asm | 13 ++++++------- data/pokemon/base_stats/geodude.asm | 13 ++++++------- data/pokemon/base_stats/girafarig.asm | 13 ++++++------- data/pokemon/base_stats/gligar.asm | 13 ++++++------- data/pokemon/base_stats/gloom.asm | 13 ++++++------- data/pokemon/base_stats/golbat.asm | 13 ++++++------- data/pokemon/base_stats/goldeen.asm | 13 ++++++------- data/pokemon/base_stats/golduck.asm | 13 ++++++------- data/pokemon/base_stats/golem.asm | 13 ++++++------- data/pokemon/base_stats/granbull.asm | 13 ++++++------- data/pokemon/base_stats/graveler.asm | 13 ++++++------- data/pokemon/base_stats/grimer.asm | 13 ++++++------- data/pokemon/base_stats/growlithe.asm | 13 ++++++------- data/pokemon/base_stats/gyarados.asm | 13 ++++++------- data/pokemon/base_stats/haunter.asm | 13 ++++++------- data/pokemon/base_stats/heracross.asm | 13 ++++++------- data/pokemon/base_stats/hitmonchan.asm | 13 ++++++------- data/pokemon/base_stats/hitmonlee.asm | 13 ++++++------- data/pokemon/base_stats/hitmontop.asm | 13 ++++++------- data/pokemon/base_stats/ho_oh.asm | 13 ++++++------- data/pokemon/base_stats/hoothoot.asm | 13 ++++++------- data/pokemon/base_stats/hoppip.asm | 13 ++++++------- data/pokemon/base_stats/horsea.asm | 13 ++++++------- data/pokemon/base_stats/houndoom.asm | 13 ++++++------- data/pokemon/base_stats/houndour.asm | 13 ++++++------- data/pokemon/base_stats/hypno.asm | 13 ++++++------- data/pokemon/base_stats/igglybuff.asm | 13 ++++++------- data/pokemon/base_stats/ivysaur.asm | 13 ++++++------- data/pokemon/base_stats/jigglypuff.asm | 13 ++++++------- data/pokemon/base_stats/jolteon.asm | 13 ++++++------- data/pokemon/base_stats/jumpluff.asm | 13 ++++++------- data/pokemon/base_stats/jynx.asm | 13 ++++++------- data/pokemon/base_stats/kabuto.asm | 13 ++++++------- data/pokemon/base_stats/kabutops.asm | 13 ++++++------- data/pokemon/base_stats/kadabra.asm | 13 ++++++------- data/pokemon/base_stats/kakuna.asm | 13 ++++++------- data/pokemon/base_stats/kangaskhan.asm | 13 ++++++------- data/pokemon/base_stats/kingdra.asm | 13 ++++++------- data/pokemon/base_stats/kingler.asm | 13 ++++++------- data/pokemon/base_stats/koffing.asm | 13 ++++++------- data/pokemon/base_stats/krabby.asm | 13 ++++++------- data/pokemon/base_stats/lanturn.asm | 13 ++++++------- data/pokemon/base_stats/lapras.asm | 13 ++++++------- data/pokemon/base_stats/larvitar.asm | 13 ++++++------- data/pokemon/base_stats/ledian.asm | 13 ++++++------- data/pokemon/base_stats/ledyba.asm | 13 ++++++------- data/pokemon/base_stats/lickitung.asm | 13 ++++++------- data/pokemon/base_stats/lugia.asm | 13 ++++++------- data/pokemon/base_stats/machamp.asm | 13 ++++++------- data/pokemon/base_stats/machoke.asm | 13 ++++++------- data/pokemon/base_stats/machop.asm | 13 ++++++------- data/pokemon/base_stats/magby.asm | 13 ++++++------- data/pokemon/base_stats/magcargo.asm | 13 ++++++------- data/pokemon/base_stats/magikarp.asm | 13 ++++++------- data/pokemon/base_stats/magmar.asm | 13 ++++++------- data/pokemon/base_stats/magnemite.asm | 13 ++++++------- data/pokemon/base_stats/magneton.asm | 13 ++++++------- data/pokemon/base_stats/mankey.asm | 13 ++++++------- data/pokemon/base_stats/mantine.asm | 13 ++++++------- data/pokemon/base_stats/mareep.asm | 13 ++++++------- data/pokemon/base_stats/marill.asm | 13 ++++++------- data/pokemon/base_stats/marowak.asm | 13 ++++++------- data/pokemon/base_stats/meganium.asm | 13 ++++++------- data/pokemon/base_stats/meowth.asm | 13 ++++++------- data/pokemon/base_stats/metapod.asm | 13 ++++++------- data/pokemon/base_stats/mew.asm | 13 ++++++------- data/pokemon/base_stats/mewtwo.asm | 13 ++++++------- data/pokemon/base_stats/miltank.asm | 13 ++++++------- data/pokemon/base_stats/misdreavus.asm | 13 ++++++------- data/pokemon/base_stats/moltres.asm | 13 ++++++------- data/pokemon/base_stats/mr__mime.asm | 13 ++++++------- data/pokemon/base_stats/muk.asm | 13 ++++++------- data/pokemon/base_stats/murkrow.asm | 13 ++++++------- data/pokemon/base_stats/natu.asm | 13 ++++++------- data/pokemon/base_stats/nidoking.asm | 13 ++++++------- data/pokemon/base_stats/nidoqueen.asm | 13 ++++++------- data/pokemon/base_stats/nidoran_f.asm | 13 ++++++------- data/pokemon/base_stats/nidoran_m.asm | 13 ++++++------- data/pokemon/base_stats/nidorina.asm | 13 ++++++------- data/pokemon/base_stats/nidorino.asm | 13 ++++++------- data/pokemon/base_stats/ninetales.asm | 13 ++++++------- data/pokemon/base_stats/noctowl.asm | 13 ++++++------- data/pokemon/base_stats/octillery.asm | 13 ++++++------- data/pokemon/base_stats/oddish.asm | 13 ++++++------- data/pokemon/base_stats/omanyte.asm | 13 ++++++------- data/pokemon/base_stats/omastar.asm | 13 ++++++------- data/pokemon/base_stats/onix.asm | 13 ++++++------- data/pokemon/base_stats/paras.asm | 13 ++++++------- data/pokemon/base_stats/parasect.asm | 13 ++++++------- data/pokemon/base_stats/persian.asm | 13 ++++++------- data/pokemon/base_stats/phanpy.asm | 13 ++++++------- data/pokemon/base_stats/pichu.asm | 13 ++++++------- data/pokemon/base_stats/pidgeot.asm | 13 ++++++------- data/pokemon/base_stats/pidgeotto.asm | 13 ++++++------- data/pokemon/base_stats/pidgey.asm | 13 ++++++------- data/pokemon/base_stats/pikachu.asm | 13 ++++++------- data/pokemon/base_stats/piloswine.asm | 13 ++++++------- data/pokemon/base_stats/pineco.asm | 13 ++++++------- data/pokemon/base_stats/pinsir.asm | 13 ++++++------- data/pokemon/base_stats/politoed.asm | 13 ++++++------- data/pokemon/base_stats/poliwag.asm | 13 ++++++------- data/pokemon/base_stats/poliwhirl.asm | 13 ++++++------- data/pokemon/base_stats/poliwrath.asm | 13 ++++++------- data/pokemon/base_stats/ponyta.asm | 13 ++++++------- data/pokemon/base_stats/porygon.asm | 13 ++++++------- data/pokemon/base_stats/porygon2.asm | 13 ++++++------- data/pokemon/base_stats/primeape.asm | 13 ++++++------- data/pokemon/base_stats/psyduck.asm | 13 ++++++------- data/pokemon/base_stats/pupitar.asm | 13 ++++++------- data/pokemon/base_stats/quagsire.asm | 13 ++++++------- data/pokemon/base_stats/quilava.asm | 13 ++++++------- data/pokemon/base_stats/qwilfish.asm | 13 ++++++------- data/pokemon/base_stats/raichu.asm | 13 ++++++------- data/pokemon/base_stats/raikou.asm | 13 ++++++------- data/pokemon/base_stats/rapidash.asm | 13 ++++++------- data/pokemon/base_stats/raticate.asm | 13 ++++++------- data/pokemon/base_stats/rattata.asm | 13 ++++++------- data/pokemon/base_stats/remoraid.asm | 13 ++++++------- data/pokemon/base_stats/rhydon.asm | 13 ++++++------- data/pokemon/base_stats/rhyhorn.asm | 13 ++++++------- data/pokemon/base_stats/sandshrew.asm | 13 ++++++------- data/pokemon/base_stats/sandslash.asm | 13 ++++++------- data/pokemon/base_stats/scizor.asm | 13 ++++++------- data/pokemon/base_stats/scyther.asm | 13 ++++++------- data/pokemon/base_stats/seadra.asm | 13 ++++++------- data/pokemon/base_stats/seaking.asm | 13 ++++++------- data/pokemon/base_stats/seel.asm | 13 ++++++------- data/pokemon/base_stats/sentret.asm | 13 ++++++------- data/pokemon/base_stats/shellder.asm | 13 ++++++------- data/pokemon/base_stats/shuckle.asm | 13 ++++++------- data/pokemon/base_stats/skarmory.asm | 13 ++++++------- data/pokemon/base_stats/skiploom.asm | 13 ++++++------- data/pokemon/base_stats/slowbro.asm | 13 ++++++------- data/pokemon/base_stats/slowking.asm | 13 ++++++------- data/pokemon/base_stats/slowpoke.asm | 13 ++++++------- data/pokemon/base_stats/slugma.asm | 13 ++++++------- data/pokemon/base_stats/smeargle.asm | 13 ++++++------- data/pokemon/base_stats/smoochum.asm | 13 ++++++------- data/pokemon/base_stats/sneasel.asm | 13 ++++++------- data/pokemon/base_stats/snorlax.asm | 13 ++++++------- data/pokemon/base_stats/snubbull.asm | 13 ++++++------- data/pokemon/base_stats/spearow.asm | 13 ++++++------- data/pokemon/base_stats/spinarak.asm | 13 ++++++------- data/pokemon/base_stats/squirtle.asm | 13 ++++++------- data/pokemon/base_stats/stantler.asm | 13 ++++++------- data/pokemon/base_stats/starmie.asm | 13 ++++++------- data/pokemon/base_stats/staryu.asm | 13 ++++++------- data/pokemon/base_stats/steelix.asm | 13 ++++++------- data/pokemon/base_stats/sudowoodo.asm | 13 ++++++------- data/pokemon/base_stats/suicune.asm | 13 ++++++------- data/pokemon/base_stats/sunflora.asm | 13 ++++++------- data/pokemon/base_stats/sunkern.asm | 13 ++++++------- data/pokemon/base_stats/swinub.asm | 13 ++++++------- data/pokemon/base_stats/tangela.asm | 13 ++++++------- data/pokemon/base_stats/tauros.asm | 13 ++++++------- data/pokemon/base_stats/teddiursa.asm | 13 ++++++------- data/pokemon/base_stats/tentacool.asm | 13 ++++++------- data/pokemon/base_stats/tentacruel.asm | 13 ++++++------- data/pokemon/base_stats/togepi.asm | 13 ++++++------- data/pokemon/base_stats/togetic.asm | 13 ++++++------- data/pokemon/base_stats/totodile.asm | 13 ++++++------- data/pokemon/base_stats/typhlosion.asm | 13 ++++++------- data/pokemon/base_stats/tyranitar.asm | 13 ++++++------- data/pokemon/base_stats/tyrogue.asm | 13 ++++++------- data/pokemon/base_stats/umbreon.asm | 13 ++++++------- data/pokemon/base_stats/unown.asm | 13 ++++++------- data/pokemon/base_stats/ursaring.asm | 13 ++++++------- data/pokemon/base_stats/vaporeon.asm | 13 ++++++------- data/pokemon/base_stats/venomoth.asm | 13 ++++++------- data/pokemon/base_stats/venonat.asm | 13 ++++++------- data/pokemon/base_stats/venusaur.asm | 13 ++++++------- data/pokemon/base_stats/victreebel.asm | 13 ++++++------- data/pokemon/base_stats/vileplume.asm | 13 ++++++------- data/pokemon/base_stats/voltorb.asm | 13 ++++++------- data/pokemon/base_stats/vulpix.asm | 13 ++++++------- data/pokemon/base_stats/wartortle.asm | 13 ++++++------- data/pokemon/base_stats/weedle.asm | 13 ++++++------- data/pokemon/base_stats/weepinbell.asm | 13 ++++++------- data/pokemon/base_stats/weezing.asm | 13 ++++++------- data/pokemon/base_stats/wigglytuff.asm | 13 ++++++------- data/pokemon/base_stats/wobbuffet.asm | 13 ++++++------- data/pokemon/base_stats/wooper.asm | 13 ++++++------- data/pokemon/base_stats/xatu.asm | 13 ++++++------- data/pokemon/base_stats/yanma.asm | 13 ++++++------- data/pokemon/base_stats/zapdos.asm | 13 ++++++------- data/pokemon/base_stats/zubat.asm | 13 ++++++------- data/pokemon/dex_entries/abra.asm | 2 +- data/pokemon/dex_entries/aerodactyl.asm | 2 +- data/pokemon/dex_entries/aipom.asm | 2 +- data/pokemon/dex_entries/alakazam.asm | 2 +- data/pokemon/dex_entries/ampharos.asm | 2 +- data/pokemon/dex_entries/arbok.asm | 2 +- data/pokemon/dex_entries/arcanine.asm | 2 +- data/pokemon/dex_entries/ariados.asm | 2 +- data/pokemon/dex_entries/articuno.asm | 2 +- data/pokemon/dex_entries/azumarill.asm | 2 +- data/pokemon/dex_entries/bayleef.asm | 2 +- data/pokemon/dex_entries/beedrill.asm | 2 +- data/pokemon/dex_entries/bellossom.asm | 2 +- data/pokemon/dex_entries/bellsprout.asm | 2 +- data/pokemon/dex_entries/blastoise.asm | 2 +- data/pokemon/dex_entries/blissey.asm | 2 +- data/pokemon/dex_entries/bulbasaur.asm | 2 +- data/pokemon/dex_entries/butterfree.asm | 2 +- data/pokemon/dex_entries/caterpie.asm | 2 +- data/pokemon/dex_entries/celebi.asm | 2 +- data/pokemon/dex_entries/chansey.asm | 2 +- data/pokemon/dex_entries/charizard.asm | 2 +- data/pokemon/dex_entries/charmander.asm | 2 +- data/pokemon/dex_entries/charmeleon.asm | 2 +- data/pokemon/dex_entries/chikorita.asm | 2 +- data/pokemon/dex_entries/chinchou.asm | 2 +- data/pokemon/dex_entries/clefable.asm | 2 +- data/pokemon/dex_entries/clefairy.asm | 2 +- data/pokemon/dex_entries/cleffa.asm | 2 +- data/pokemon/dex_entries/cloyster.asm | 2 +- data/pokemon/dex_entries/corsola.asm | 2 +- data/pokemon/dex_entries/crobat.asm | 2 +- data/pokemon/dex_entries/croconaw.asm | 2 +- data/pokemon/dex_entries/cubone.asm | 2 +- data/pokemon/dex_entries/cyndaquil.asm | 2 +- data/pokemon/dex_entries/delibird.asm | 2 +- data/pokemon/dex_entries/dewgong.asm | 2 +- data/pokemon/dex_entries/diglett.asm | 2 +- data/pokemon/dex_entries/ditto.asm | 2 +- data/pokemon/dex_entries/dodrio.asm | 2 +- data/pokemon/dex_entries/doduo.asm | 2 +- data/pokemon/dex_entries/donphan.asm | 2 +- data/pokemon/dex_entries/dragonair.asm | 2 +- data/pokemon/dex_entries/dragonite.asm | 2 +- data/pokemon/dex_entries/dratini.asm | 2 +- data/pokemon/dex_entries/drowzee.asm | 2 +- data/pokemon/dex_entries/dugtrio.asm | 2 +- data/pokemon/dex_entries/dunsparce.asm | 2 +- data/pokemon/dex_entries/eevee.asm | 2 +- data/pokemon/dex_entries/ekans.asm | 2 +- data/pokemon/dex_entries/electabuzz.asm | 2 +- data/pokemon/dex_entries/electrode.asm | 2 +- data/pokemon/dex_entries/elekid.asm | 2 +- data/pokemon/dex_entries/entei.asm | 2 +- data/pokemon/dex_entries/espeon.asm | 2 +- data/pokemon/dex_entries/exeggcute.asm | 2 +- data/pokemon/dex_entries/exeggutor.asm | 2 +- data/pokemon/dex_entries/farfetch_d.asm | 2 +- data/pokemon/dex_entries/fearow.asm | 2 +- data/pokemon/dex_entries/feraligatr.asm | 2 +- data/pokemon/dex_entries/flaaffy.asm | 2 +- data/pokemon/dex_entries/flareon.asm | 2 +- data/pokemon/dex_entries/forretress.asm | 2 +- data/pokemon/dex_entries/furret.asm | 2 +- data/pokemon/dex_entries/gastly.asm | 2 +- data/pokemon/dex_entries/gengar.asm | 2 +- data/pokemon/dex_entries/geodude.asm | 2 +- data/pokemon/dex_entries/girafarig.asm | 2 +- data/pokemon/dex_entries/gligar.asm | 2 +- data/pokemon/dex_entries/gloom.asm | 2 +- data/pokemon/dex_entries/golbat.asm | 2 +- data/pokemon/dex_entries/goldeen.asm | 2 +- data/pokemon/dex_entries/golduck.asm | 2 +- data/pokemon/dex_entries/golem.asm | 2 +- data/pokemon/dex_entries/granbull.asm | 2 +- data/pokemon/dex_entries/graveler.asm | 2 +- data/pokemon/dex_entries/grimer.asm | 2 +- data/pokemon/dex_entries/growlithe.asm | 2 +- data/pokemon/dex_entries/gyarados.asm | 2 +- data/pokemon/dex_entries/haunter.asm | 2 +- data/pokemon/dex_entries/heracross.asm | 2 +- data/pokemon/dex_entries/hitmonchan.asm | 2 +- data/pokemon/dex_entries/hitmonlee.asm | 2 +- data/pokemon/dex_entries/hitmontop.asm | 2 +- data/pokemon/dex_entries/ho_oh.asm | 2 +- data/pokemon/dex_entries/hoothoot.asm | 2 +- data/pokemon/dex_entries/hoppip.asm | 2 +- data/pokemon/dex_entries/horsea.asm | 2 +- data/pokemon/dex_entries/houndoom.asm | 2 +- data/pokemon/dex_entries/houndour.asm | 2 +- data/pokemon/dex_entries/hypno.asm | 2 +- data/pokemon/dex_entries/igglybuff.asm | 2 +- data/pokemon/dex_entries/ivysaur.asm | 2 +- data/pokemon/dex_entries/jigglypuff.asm | 2 +- data/pokemon/dex_entries/jolteon.asm | 2 +- data/pokemon/dex_entries/jumpluff.asm | 2 +- data/pokemon/dex_entries/jynx.asm | 2 +- data/pokemon/dex_entries/kabuto.asm | 2 +- data/pokemon/dex_entries/kabutops.asm | 2 +- data/pokemon/dex_entries/kadabra.asm | 2 +- data/pokemon/dex_entries/kakuna.asm | 2 +- data/pokemon/dex_entries/kangaskhan.asm | 2 +- data/pokemon/dex_entries/kingdra.asm | 2 +- data/pokemon/dex_entries/kingler.asm | 2 +- data/pokemon/dex_entries/koffing.asm | 2 +- data/pokemon/dex_entries/krabby.asm | 2 +- data/pokemon/dex_entries/lanturn.asm | 2 +- data/pokemon/dex_entries/lapras.asm | 2 +- data/pokemon/dex_entries/larvitar.asm | 2 +- data/pokemon/dex_entries/ledian.asm | 2 +- data/pokemon/dex_entries/ledyba.asm | 2 +- data/pokemon/dex_entries/lickitung.asm | 2 +- data/pokemon/dex_entries/lugia.asm | 2 +- data/pokemon/dex_entries/machamp.asm | 2 +- data/pokemon/dex_entries/machoke.asm | 2 +- data/pokemon/dex_entries/machop.asm | 2 +- data/pokemon/dex_entries/magby.asm | 2 +- data/pokemon/dex_entries/magcargo.asm | 2 +- data/pokemon/dex_entries/magikarp.asm | 2 +- data/pokemon/dex_entries/magmar.asm | 2 +- data/pokemon/dex_entries/magnemite.asm | 2 +- data/pokemon/dex_entries/magneton.asm | 2 +- data/pokemon/dex_entries/mankey.asm | 2 +- data/pokemon/dex_entries/mantine.asm | 2 +- data/pokemon/dex_entries/mareep.asm | 2 +- data/pokemon/dex_entries/marill.asm | 2 +- data/pokemon/dex_entries/marowak.asm | 2 +- data/pokemon/dex_entries/meganium.asm | 2 +- data/pokemon/dex_entries/meowth.asm | 2 +- data/pokemon/dex_entries/metapod.asm | 2 +- data/pokemon/dex_entries/mew.asm | 2 +- data/pokemon/dex_entries/mewtwo.asm | 2 +- data/pokemon/dex_entries/miltank.asm | 2 +- data/pokemon/dex_entries/misdreavus.asm | 2 +- data/pokemon/dex_entries/moltres.asm | 2 +- data/pokemon/dex_entries/mr__mime.asm | 2 +- data/pokemon/dex_entries/muk.asm | 2 +- data/pokemon/dex_entries/murkrow.asm | 2 +- data/pokemon/dex_entries/natu.asm | 2 +- data/pokemon/dex_entries/nidoking.asm | 2 +- data/pokemon/dex_entries/nidoqueen.asm | 2 +- data/pokemon/dex_entries/nidoran_f.asm | 2 +- data/pokemon/dex_entries/nidoran_m.asm | 2 +- data/pokemon/dex_entries/nidorina.asm | 2 +- data/pokemon/dex_entries/nidorino.asm | 2 +- data/pokemon/dex_entries/ninetales.asm | 2 +- data/pokemon/dex_entries/noctowl.asm | 2 +- data/pokemon/dex_entries/octillery.asm | 2 +- data/pokemon/dex_entries/oddish.asm | 2 +- data/pokemon/dex_entries/omanyte.asm | 2 +- data/pokemon/dex_entries/omastar.asm | 2 +- data/pokemon/dex_entries/onix.asm | 2 +- data/pokemon/dex_entries/paras.asm | 2 +- data/pokemon/dex_entries/parasect.asm | 2 +- data/pokemon/dex_entries/persian.asm | 2 +- data/pokemon/dex_entries/phanpy.asm | 2 +- data/pokemon/dex_entries/pichu.asm | 2 +- data/pokemon/dex_entries/pidgeot.asm | 2 +- data/pokemon/dex_entries/pidgeotto.asm | 2 +- data/pokemon/dex_entries/pidgey.asm | 2 +- data/pokemon/dex_entries/pikachu.asm | 2 +- data/pokemon/dex_entries/piloswine.asm | 2 +- data/pokemon/dex_entries/pineco.asm | 2 +- data/pokemon/dex_entries/pinsir.asm | 2 +- data/pokemon/dex_entries/politoed.asm | 2 +- data/pokemon/dex_entries/poliwag.asm | 2 +- data/pokemon/dex_entries/poliwhirl.asm | 2 +- data/pokemon/dex_entries/poliwrath.asm | 2 +- data/pokemon/dex_entries/ponyta.asm | 2 +- data/pokemon/dex_entries/porygon.asm | 2 +- data/pokemon/dex_entries/porygon2.asm | 2 +- data/pokemon/dex_entries/primeape.asm | 2 +- data/pokemon/dex_entries/psyduck.asm | 2 +- data/pokemon/dex_entries/pupitar.asm | 2 +- data/pokemon/dex_entries/quagsire.asm | 2 +- data/pokemon/dex_entries/quilava.asm | 2 +- data/pokemon/dex_entries/qwilfish.asm | 2 +- data/pokemon/dex_entries/raichu.asm | 2 +- data/pokemon/dex_entries/raikou.asm | 2 +- data/pokemon/dex_entries/rapidash.asm | 2 +- data/pokemon/dex_entries/raticate.asm | 2 +- data/pokemon/dex_entries/rattata.asm | 2 +- data/pokemon/dex_entries/remoraid.asm | 2 +- data/pokemon/dex_entries/rhydon.asm | 2 +- data/pokemon/dex_entries/rhyhorn.asm | 2 +- data/pokemon/dex_entries/sandshrew.asm | 2 +- data/pokemon/dex_entries/sandslash.asm | 2 +- data/pokemon/dex_entries/scizor.asm | 2 +- data/pokemon/dex_entries/scyther.asm | 2 +- data/pokemon/dex_entries/seadra.asm | 2 +- data/pokemon/dex_entries/seaking.asm | 2 +- data/pokemon/dex_entries/seel.asm | 2 +- data/pokemon/dex_entries/sentret.asm | 2 +- data/pokemon/dex_entries/shellder.asm | 2 +- data/pokemon/dex_entries/shuckle.asm | 2 +- data/pokemon/dex_entries/skarmory.asm | 2 +- data/pokemon/dex_entries/skiploom.asm | 2 +- data/pokemon/dex_entries/slowbro.asm | 2 +- data/pokemon/dex_entries/slowking.asm | 2 +- data/pokemon/dex_entries/slowpoke.asm | 2 +- data/pokemon/dex_entries/slugma.asm | 2 +- data/pokemon/dex_entries/smeargle.asm | 2 +- data/pokemon/dex_entries/smoochum.asm | 2 +- data/pokemon/dex_entries/sneasel.asm | 2 +- data/pokemon/dex_entries/snorlax.asm | 2 +- data/pokemon/dex_entries/snubbull.asm | 2 +- data/pokemon/dex_entries/spearow.asm | 2 +- data/pokemon/dex_entries/spinarak.asm | 2 +- data/pokemon/dex_entries/squirtle.asm | 2 +- data/pokemon/dex_entries/stantler.asm | 2 +- data/pokemon/dex_entries/starmie.asm | 2 +- data/pokemon/dex_entries/staryu.asm | 2 +- data/pokemon/dex_entries/steelix.asm | 2 +- data/pokemon/dex_entries/sudowoodo.asm | 2 +- data/pokemon/dex_entries/suicune.asm | 2 +- data/pokemon/dex_entries/sunflora.asm | 2 +- data/pokemon/dex_entries/sunkern.asm | 2 +- data/pokemon/dex_entries/swinub.asm | 2 +- data/pokemon/dex_entries/tangela.asm | 2 +- data/pokemon/dex_entries/tauros.asm | 2 +- data/pokemon/dex_entries/teddiursa.asm | 2 +- data/pokemon/dex_entries/tentacool.asm | 2 +- data/pokemon/dex_entries/tentacruel.asm | 2 +- data/pokemon/dex_entries/togepi.asm | 2 +- data/pokemon/dex_entries/togetic.asm | 2 +- data/pokemon/dex_entries/totodile.asm | 2 +- data/pokemon/dex_entries/typhlosion.asm | 2 +- data/pokemon/dex_entries/tyranitar.asm | 2 +- data/pokemon/dex_entries/tyrogue.asm | 2 +- data/pokemon/dex_entries/umbreon.asm | 2 +- data/pokemon/dex_entries/unown.asm | 2 +- data/pokemon/dex_entries/ursaring.asm | 2 +- data/pokemon/dex_entries/vaporeon.asm | 2 +- data/pokemon/dex_entries/venomoth.asm | 2 +- data/pokemon/dex_entries/venonat.asm | 2 +- data/pokemon/dex_entries/venusaur.asm | 2 +- data/pokemon/dex_entries/victreebel.asm | 2 +- data/pokemon/dex_entries/vileplume.asm | 2 +- data/pokemon/dex_entries/voltorb.asm | 2 +- data/pokemon/dex_entries/vulpix.asm | 2 +- data/pokemon/dex_entries/wartortle.asm | 2 +- data/pokemon/dex_entries/weedle.asm | 2 +- data/pokemon/dex_entries/weepinbell.asm | 2 +- data/pokemon/dex_entries/weezing.asm | 2 +- data/pokemon/dex_entries/wigglytuff.asm | 2 +- data/pokemon/dex_entries/wobbuffet.asm | 2 +- data/pokemon/dex_entries/wooper.asm | 2 +- data/pokemon/dex_entries/xatu.asm | 2 +- data/pokemon/dex_entries/yanma.asm | 2 +- data/pokemon/dex_entries/zapdos.asm | 2 +- data/pokemon/dex_entries/zubat.asm | 2 +- 502 files changed, 1757 insertions(+), 2008 deletions(-) diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm index d7824f196..687c3a872 100644 --- a/data/pokemon/base_stats/abra.asm +++ b/data/pokemon/base_stats/abra.asm @@ -3,20 +3,19 @@ db 25, 20, 15, 90, 105, 55 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 200 ; catch rate db 73 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/abra/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm index 26eac4ded..531c03803 100644 --- a/data/pokemon/base_stats/aerodactyl.asm +++ b/data/pokemon/base_stats/aerodactyl.asm @@ -3,20 +3,19 @@ db 80, 105, 65, 130, 60, 75 ; hp atk def spd sat sdf - db ROCK, FLYING + db ROCK, FLYING ; type db 45 ; catch rate db 202 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/aerodactyl/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, STEEL_WING, FLY, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/aipom.asm b/data/pokemon/base_stats/aipom.asm index 0bd6954f4..9da59d7ac 100644 --- a/data/pokemon/base_stats/aipom.asm +++ b/data/pokemon/base_stats/aipom.asm @@ -3,20 +3,19 @@ db 55, 70, 55, 85, 40, 55 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 94 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/aipom/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm index 35ebdf9af..affcd565b 100644 --- a/data/pokemon/base_stats/alakazam.asm +++ b/data/pokemon/base_stats/alakazam.asm @@ -3,20 +3,19 @@ db 55, 50, 45, 120, 135, 85 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 50 ; catch rate db 186 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/alakazam/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/ampharos.asm b/data/pokemon/base_stats/ampharos.asm index b391238d3..90086b7cd 100644 --- a/data/pokemon/base_stats/ampharos.asm +++ b/data/pokemon/base_stats/ampharos.asm @@ -3,20 +3,19 @@ db 90, 75, 75, 55, 115, 90 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 45 ; catch rate db 194 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ampharos/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm index 52341c37d..76302d5d5 100644 --- a/data/pokemon/base_stats/arbok.asm +++ b/data/pokemon/base_stats/arbok.asm @@ -3,20 +3,19 @@ db 60, 85, 69, 80, 65, 79 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 90 ; catch rate db 147 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/arbok/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, STRENGTH ; end diff --git a/data/pokemon/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm index 299086c9d..406199c2d 100644 --- a/data/pokemon/base_stats/arcanine.asm +++ b/data/pokemon/base_stats/arcanine.asm @@ -3,20 +3,19 @@ db 90, 110, 80, 95, 100, 80 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 75 ; catch rate db 213 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/arcanine/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/ariados.asm b/data/pokemon/base_stats/ariados.asm index 78697127c..431291ec3 100644 --- a/data/pokemon/base_stats/ariados.asm +++ b/data/pokemon/base_stats/ariados.asm @@ -3,20 +3,19 @@ db 70, 90, 70, 40, 60, 60 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 90 ; catch rate db 134 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ariados/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm index e637c47f4..bd8d1f59f 100644 --- a/data/pokemon/base_stats/articuno.asm +++ b/data/pokemon/base_stats/articuno.asm @@ -3,20 +3,19 @@ db 90, 85, 100, 85, 95, 125 ; hp atk def spd sat sdf - db ICE, FLYING + db ICE, FLYING ; type db 3 ; catch rate db 215 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/articuno/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, STEEL_WING, FLY, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/azumarill.asm b/data/pokemon/base_stats/azumarill.asm index 1681d3be2..870fbc0f2 100644 --- a/data/pokemon/base_stats/azumarill.asm +++ b/data/pokemon/base_stats/azumarill.asm @@ -3,20 +3,19 @@ db 100, 50, 80, 50, 50, 80 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 75 ; catch rate db 153 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/azumarill/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn AMPHIBIAN, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/bayleef.asm b/data/pokemon/base_stats/bayleef.asm index 50ee3044c..ef5b38ab0 100644 --- a/data/pokemon/base_stats/bayleef.asm +++ b/data/pokemon/base_stats/bayleef.asm @@ -3,20 +3,19 @@ db 60, 62, 80, 60, 63, 80 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 45 ; catch rate db 141 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/bayleef/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm index 3fa11d8eb..074dabd4b 100644 --- a/data/pokemon/base_stats/beedrill.asm +++ b/data/pokemon/base_stats/beedrill.asm @@ -3,20 +3,19 @@ db 65, 80, 40, 75, 45, 80 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 45 ; catch rate db 159 ; base exp - db NO_ITEM ; item 1 - db POISON_BARB ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, POISON_BARB; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/beedrill/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, FURY_CUTTER, CUT ; end diff --git a/data/pokemon/base_stats/bellossom.asm b/data/pokemon/base_stats/bellossom.asm index 3f3f06870..6c2986ba8 100644 --- a/data/pokemon/base_stats/bellossom.asm +++ b/data/pokemon/base_stats/bellossom.asm @@ -3,20 +3,19 @@ db 75, 80, 85, 50, 90, 100 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 45 ; catch rate db 184 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/bellossom/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm index 5e75e6e89..3b40c1783 100644 --- a/data/pokemon/base_stats/bellsprout.asm +++ b/data/pokemon/base_stats/bellsprout.asm @@ -3,20 +3,19 @@ db 50, 75, 35, 40, 70, 30 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 255 ; catch rate db 84 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/bellsprout/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm index 7e2f1697e..86706bfdd 100644 --- a/data/pokemon/base_stats/blastoise.asm +++ b/data/pokemon/base_stats/blastoise.asm @@ -3,20 +3,19 @@ db 79, 83, 100, 78, 85, 105 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 210 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/blastoise/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/blissey.asm b/data/pokemon/base_stats/blissey.asm index 789649a40..ef7db52de 100644 --- a/data/pokemon/base_stats/blissey.asm +++ b/data/pokemon/base_stats/blissey.asm @@ -3,20 +3,19 @@ db 255, 10, 10, 55, 75, 135 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 30 ; catch rate db 255 ; base exp - db NO_ITEM ; item 1 - db LUCKY_EGG ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, LUCKY_EGG; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/blissey/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FAIRY, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm index 2795d8035..6afca0c97 100644 --- a/data/pokemon/base_stats/bulbasaur.asm +++ b/data/pokemon/base_stats/bulbasaur.asm @@ -3,20 +3,19 @@ db 45, 49, 49, 45, 65, 65 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 45 ; catch rate db 64 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/bulbasaur/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm index 1feee4f58..f1037d971 100644 --- a/data/pokemon/base_stats/butterfree.asm +++ b/data/pokemon/base_stats/butterfree.asm @@ -3,20 +3,19 @@ db 60, 45, 50, 70, 80, 80 ; hp atk def spd sat sdf - db BUG, FLYING + db BUG, FLYING ; type db 45 ; catch rate db 160 ; base exp - db NO_ITEM ; item 1 - db SILVERPOWDER ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, SILVERPOWDER; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/butterfree/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm index a10790541..045123043 100644 --- a/data/pokemon/base_stats/caterpie.asm +++ b/data/pokemon/base_stats/caterpie.asm @@ -3,20 +3,19 @@ db 45, 30, 35, 45, 20, 20 ; hp atk def spd sat sdf - db BUG, BUG + db BUG, BUG ; type db 255 ; catch rate db 53 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/caterpie/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/celebi.asm b/data/pokemon/base_stats/celebi.asm index aabadba4f..757f7ec48 100644 --- a/data/pokemon/base_stats/celebi.asm +++ b/data/pokemon/base_stats/celebi.asm @@ -3,20 +3,19 @@ db 100, 100, 100, 100, 100, 100 ; hp atk def spd sat sdf - db PSYCHIC, GRASS + db PSYCHIC, GRASS ; type db 45 ; catch rate db 64 ; base exp - db NO_ITEM ; item 1 - db MIRACLEBERRY ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, MIRACLEBERRY; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 120 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/celebi/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm index d51f67d4f..53cd2caed 100644 --- a/data/pokemon/base_stats/chansey.asm +++ b/data/pokemon/base_stats/chansey.asm @@ -3,20 +3,19 @@ db 250, 05, 05, 50, 35, 105 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 30 ; catch rate db 255 ; base exp - db NO_ITEM ; item 1 - db LUCKY_EGG ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, LUCKY_EGG; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/chansey/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FAIRY, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm index d978c6ad5..cffacc93b 100644 --- a/data/pokemon/base_stats/charizard.asm +++ b/data/pokemon/base_stats/charizard.asm @@ -3,20 +3,19 @@ db 78, 84, 78, 100, 109, 85 ; hp atk def spd sat sdf - db FIRE, FLYING + db FIRE, FLYING ; type db 45 ; catch rate db 209 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/charizard/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, CUT, FLY, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm index 2fa9b9526..667211ee5 100644 --- a/data/pokemon/base_stats/charmander.asm +++ b/data/pokemon/base_stats/charmander.asm @@ -3,20 +3,19 @@ db 39, 52, 43, 65, 60, 50 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 65 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/charmander/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm index 5d86b975b..b3806de4c 100644 --- a/data/pokemon/base_stats/charmeleon.asm +++ b/data/pokemon/base_stats/charmeleon.asm @@ -3,20 +3,19 @@ db 58, 64, 58, 80, 80, 65 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 142 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/charmeleon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/chikorita.asm b/data/pokemon/base_stats/chikorita.asm index 0476ba558..2876a776f 100644 --- a/data/pokemon/base_stats/chikorita.asm +++ b/data/pokemon/base_stats/chikorita.asm @@ -3,20 +3,19 @@ db 45, 49, 65, 45, 49, 65 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 45 ; catch rate db 64 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/chikorita/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/chinchou.asm b/data/pokemon/base_stats/chinchou.asm index a5b3ded3a..508c104be 100644 --- a/data/pokemon/base_stats/chinchou.asm +++ b/data/pokemon/base_stats/chinchou.asm @@ -3,20 +3,19 @@ db 75, 38, 38, 67, 56, 56 ; hp atk def spd sat sdf - db WATER, ELECTRIC + db WATER, ELECTRIC ; type db 190 ; catch rate db 90 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/chinchou/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FISH, FISH ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm index 4da3c73df..7fcff1bb4 100644 --- a/data/pokemon/base_stats/clefable.asm +++ b/data/pokemon/base_stats/clefable.asm @@ -3,20 +3,19 @@ db 95, 70, 73, 60, 85, 90 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 25 ; catch rate db 129 ; base exp - db MYSTERYBERRY ; item 1 - db MOON_STONE ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db MYSTERYBERRY, MOON_STONE; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/clefable/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FAIRY, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm index 5e4def0ca..59d265359 100644 --- a/data/pokemon/base_stats/clefairy.asm +++ b/data/pokemon/base_stats/clefairy.asm @@ -3,20 +3,19 @@ db 70, 45, 48, 35, 60, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 150 ; catch rate db 68 ; base exp - db MYSTERYBERRY ; item 1 - db MOON_STONE ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db MYSTERYBERRY, MOON_STONE; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/clefairy/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FAIRY, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/cleffa.asm b/data/pokemon/base_stats/cleffa.asm index 89fa91a45..7a1a74402 100644 --- a/data/pokemon/base_stats/cleffa.asm +++ b/data/pokemon/base_stats/cleffa.asm @@ -3,20 +3,19 @@ db 50, 25, 28, 15, 45, 55 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 150 ; catch rate db 37 ; base exp - db MYSTERYBERRY ; item 1 - db MOON_STONE ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db MYSTERYBERRY, MOON_STONE; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/cleffa/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, FLASH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm index 3f3c13b6a..59544abe2 100644 --- a/data/pokemon/base_stats/cloyster.asm +++ b/data/pokemon/base_stats/cloyster.asm @@ -3,20 +3,19 @@ db 50, 95, 180, 70, 85, 45 ; hp atk def spd sat sdf - db WATER, ICE + db WATER, ICE ; type db 60 ; catch rate db 203 ; base exp - db PEARL ; item 1 - db BIG_PEARL ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db PEARL, BIG_PEARL; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/cloyster/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/corsola.asm b/data/pokemon/base_stats/corsola.asm index 8f1e836ff..e06f509cc 100644 --- a/data/pokemon/base_stats/corsola.asm +++ b/data/pokemon/base_stats/corsola.asm @@ -3,20 +3,19 @@ db 55, 55, 85, 35, 65, 85 ; hp atk def spd sat sdf - db WATER, ROCK + db WATER, ROCK ; type db 60 ; catch rate db 113 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/corsola/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn AMPHIBIAN, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/crobat.asm b/data/pokemon/base_stats/crobat.asm index 34d7d10c5..0e7bad390 100644 --- a/data/pokemon/base_stats/crobat.asm +++ b/data/pokemon/base_stats/crobat.asm @@ -3,20 +3,19 @@ db 85, 90, 80, 130, 70, 80 ; hp atk def spd sat sdf - db POISON, FLYING + db POISON, FLYING ; type db 90 ; catch rate db 204 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/crobat/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/croconaw.asm b/data/pokemon/base_stats/croconaw.asm index 6c76b19b1..0afdd1a14 100644 --- a/data/pokemon/base_stats/croconaw.asm +++ b/data/pokemon/base_stats/croconaw.asm @@ -3,20 +3,19 @@ db 65, 80, 80, 58, 59, 63 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 143 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/croconaw/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm index 451f52133..174dcb5a1 100644 --- a/data/pokemon/base_stats/cubone.asm +++ b/data/pokemon/base_stats/cubone.asm @@ -3,20 +3,19 @@ db 50, 50, 95, 35, 40, 50 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 190 ; catch rate db 87 ; base exp - db NO_ITEM ; item 1 - db THICK_CLUB ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, THICK_CLUB; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/cubone/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/cyndaquil.asm b/data/pokemon/base_stats/cyndaquil.asm index a1b07cb91..dfd052d5f 100644 --- a/data/pokemon/base_stats/cyndaquil.asm +++ b/data/pokemon/base_stats/cyndaquil.asm @@ -3,20 +3,19 @@ db 39, 52, 43, 65, 60, 50 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 65 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/cyndaquil/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, CUT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/delibird.asm b/data/pokemon/base_stats/delibird.asm index 0b38e8b97..3736e4e00 100644 --- a/data/pokemon/base_stats/delibird.asm +++ b/data/pokemon/base_stats/delibird.asm @@ -3,20 +3,19 @@ db 45, 55, 45, 75, 65, 45 ; hp atk def spd sat sdf - db ICE, FLYING + db ICE, FLYING ; type db 45 ; catch rate db 183 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/delibird/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, FLY, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm index ae6aa1941..332597ee8 100644 --- a/data/pokemon/base_stats/dewgong.asm +++ b/data/pokemon/base_stats/dewgong.asm @@ -3,20 +3,19 @@ db 90, 70, 80, 70, 70, 95 ; hp atk def spd sat sdf - db WATER, ICE + db WATER, ICE ; type db 75 ; catch rate db 176 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dewgong/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm index 1153cbcac..4079fe063 100644 --- a/data/pokemon/base_stats/diglett.asm +++ b/data/pokemon/base_stats/diglett.asm @@ -3,20 +3,19 @@ db 10, 55, 25, 95, 35, 45 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 255 ; catch rate db 81 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/diglett/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT ; end diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm index 89d92ab7a..cb449773d 100644 --- a/data/pokemon/base_stats/ditto.asm +++ b/data/pokemon/base_stats/ditto.asm @@ -3,20 +3,19 @@ db 48, 48, 48, 48, 48, 48 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 35 ; catch rate db 61 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ditto/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn LADIES_MAN, LADIES_MAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm index 9065dcbde..b26b4f631 100644 --- a/data/pokemon/base_stats/dodrio.asm +++ b/data/pokemon/base_stats/dodrio.asm @@ -3,20 +3,19 @@ db 60, 110, 70, 100, 60, 60 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 45 ; catch rate db 158 ; base exp - db NO_ITEM ; item 1 - db SHARP_BEAK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, SHARP_BEAK; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dodrio/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm index f844ccb07..6e649a9fe 100644 --- a/data/pokemon/base_stats/doduo.asm +++ b/data/pokemon/base_stats/doduo.asm @@ -3,20 +3,19 @@ db 35, 85, 45, 75, 35, 35 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 190 ; catch rate db 96 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/doduo/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/donphan.asm b/data/pokemon/base_stats/donphan.asm index a5995c3fb..8b68360bc 100644 --- a/data/pokemon/base_stats/donphan.asm +++ b/data/pokemon/base_stats/donphan.asm @@ -3,20 +3,19 @@ db 90, 120, 120, 50, 60, 60 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 60 ; catch rate db 189 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/donphan/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH ; end diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm index 0478bd6a1..f2ca387c7 100644 --- a/data/pokemon/base_stats/dragonair.asm +++ b/data/pokemon/base_stats/dragonair.asm @@ -3,20 +3,19 @@ db 61, 84, 65, 70, 70, 70 ; hp atk def spd sat sdf - db DRAGON, DRAGON + db DRAGON, DRAGON ; type db 45 ; catch rate db 144 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dragonair/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn AMPHIBIAN, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, SURF, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm index d8ae9add9..a004b0d31 100644 --- a/data/pokemon/base_stats/dragonite.asm +++ b/data/pokemon/base_stats/dragonite.asm @@ -3,20 +3,19 @@ db 91, 134, 95, 80, 100, 100 ; hp atk def spd sat sdf - db DRAGON, FLYING + db DRAGON, FLYING ; type db 45 ; catch rate db 218 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dragonite/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn AMPHIBIAN, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, FLY, SURF, STRENGTH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm index 0d5ccd5fd..eb1fc4f61 100644 --- a/data/pokemon/base_stats/dratini.asm +++ b/data/pokemon/base_stats/dratini.asm @@ -3,20 +3,19 @@ db 41, 64, 45, 50, 50, 50 ; hp atk def spd sat sdf - db DRAGON, DRAGON + db DRAGON, DRAGON ; type db 45 ; catch rate db 67 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dratini/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn AMPHIBIAN, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, SURF, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm index 7dd4855a3..d84a3cb41 100644 --- a/data/pokemon/base_stats/drowzee.asm +++ b/data/pokemon/base_stats/drowzee.asm @@ -3,20 +3,19 @@ db 60, 48, 45, 42, 43, 90 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 190 ; catch rate db 102 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/drowzee/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm index 9430a6669..07c0f1c1e 100644 --- a/data/pokemon/base_stats/dugtrio.asm +++ b/data/pokemon/base_stats/dugtrio.asm @@ -3,20 +3,19 @@ db 35, 80, 50, 120, 50, 70 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 50 ; catch rate db 153 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dugtrio/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT ; end diff --git a/data/pokemon/base_stats/dunsparce.asm b/data/pokemon/base_stats/dunsparce.asm index 8eef16241..407d81820 100644 --- a/data/pokemon/base_stats/dunsparce.asm +++ b/data/pokemon/base_stats/dunsparce.asm @@ -3,20 +3,19 @@ db 100, 70, 70, 45, 65, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 190 ; catch rate db 75 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dunsparce/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm index 95f67cf2b..69d4b4525 100644 --- a/data/pokemon/base_stats/eevee.asm +++ b/data/pokemon/base_stats/eevee.asm @@ -3,20 +3,19 @@ db 55, 55, 50, 55, 45, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 92 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/eevee/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT ; end diff --git a/data/pokemon/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm index feed64b34..0dbb46384 100644 --- a/data/pokemon/base_stats/ekans.asm +++ b/data/pokemon/base_stats/ekans.asm @@ -3,20 +3,19 @@ db 35, 60, 44, 55, 40, 54 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 255 ; catch rate db 62 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ekans/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, STRENGTH ; end diff --git a/data/pokemon/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm index 472e4487c..1a5e52508 100644 --- a/data/pokemon/base_stats/electabuzz.asm +++ b/data/pokemon/base_stats/electabuzz.asm @@ -3,20 +3,19 @@ db 65, 83, 57, 105, 95, 85 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 45 ; catch rate db 156 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/electabuzz/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm index 72bc666e9..48ae46276 100644 --- a/data/pokemon/base_stats/electrode.asm +++ b/data/pokemon/base_stats/electrode.asm @@ -3,20 +3,19 @@ db 60, 50, 70, 140, 80, 80 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 60 ; catch rate db 150 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/electrode/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/elekid.asm b/data/pokemon/base_stats/elekid.asm index e53dcc23c..e60b486de 100644 --- a/data/pokemon/base_stats/elekid.asm +++ b/data/pokemon/base_stats/elekid.asm @@ -3,20 +3,19 @@ db 45, 63, 37, 95, 65, 55 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 45 ; catch rate db 106 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/elekid/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/entei.asm b/data/pokemon/base_stats/entei.asm index 4e4b7b3f8..6e58a9daa 100644 --- a/data/pokemon/base_stats/entei.asm +++ b/data/pokemon/base_stats/entei.asm @@ -3,20 +3,19 @@ db 115, 115, 85, 100, 90, 75 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 3 ; catch rate db 217 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/entei/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, CUT, STRENGTH, FLASH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/espeon.asm b/data/pokemon/base_stats/espeon.asm index 0bc50fb6d..4e6b93282 100644 --- a/data/pokemon/base_stats/espeon.asm +++ b/data/pokemon/base_stats/espeon.asm @@ -3,20 +3,19 @@ db 65, 65, 60, 110, 130, 95 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 45 ; catch rate db 197 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/espeon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm index 0547333ad..f6b6c183f 100644 --- a/data/pokemon/base_stats/exeggcute.asm +++ b/data/pokemon/base_stats/exeggcute.asm @@ -3,20 +3,19 @@ db 60, 40, 80, 40, 60, 45 ; hp atk def spd sat sdf - db GRASS, PSYCHIC + db GRASS, PSYCHIC ; type db 90 ; catch rate db 98 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/exeggcute/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm index 409eb8a1d..6d406897b 100644 --- a/data/pokemon/base_stats/exeggutor.asm +++ b/data/pokemon/base_stats/exeggutor.asm @@ -3,20 +3,19 @@ db 95, 95, 85, 55, 125, 65 ; hp atk def spd sat sdf - db GRASS, PSYCHIC + db GRASS, PSYCHIC ; type db 45 ; catch rate db 212 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/exeggutor/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/farfetch_d.asm b/data/pokemon/base_stats/farfetch_d.asm index 35d76b0a9..bf5c05921 100644 --- a/data/pokemon/base_stats/farfetch_d.asm +++ b/data/pokemon/base_stats/farfetch_d.asm @@ -3,20 +3,19 @@ db 52, 65, 55, 60, 58, 62 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 45 ; catch rate db 94 ; base exp - db NO_ITEM ; item 1 - db STICK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, STICK; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/farfetch_d/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, CUT, FLY ; end diff --git a/data/pokemon/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm index 7ef9936d8..b337a282e 100644 --- a/data/pokemon/base_stats/fearow.asm +++ b/data/pokemon/base_stats/fearow.asm @@ -3,20 +3,19 @@ db 65, 90, 65, 100, 61, 61 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 90 ; catch rate db 162 ; base exp - db NO_ITEM ; item 1 - db SHARP_BEAK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, SHARP_BEAK; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/fearow/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/feraligatr.asm b/data/pokemon/base_stats/feraligatr.asm index 41efb2edd..cee2f4cfb 100644 --- a/data/pokemon/base_stats/feraligatr.asm +++ b/data/pokemon/base_stats/feraligatr.asm @@ -3,20 +3,19 @@ db 85, 105, 100, 78, 79, 83 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 210 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/feraligatr/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/flaaffy.asm b/data/pokemon/base_stats/flaaffy.asm index b20dc4774..737210352 100644 --- a/data/pokemon/base_stats/flaaffy.asm +++ b/data/pokemon/base_stats/flaaffy.asm @@ -3,20 +3,19 @@ db 70, 55, 55, 45, 80, 60 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 120 ; catch rate db 117 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/flaaffy/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm index f1d4c8a69..5b03e2ac9 100644 --- a/data/pokemon/base_stats/flareon.asm +++ b/data/pokemon/base_stats/flareon.asm @@ -3,20 +3,19 @@ db 65, 130, 60, 65, 95, 110 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 198 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/flareon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/forretress.asm b/data/pokemon/base_stats/forretress.asm index 9c5a885aa..4f486b292 100644 --- a/data/pokemon/base_stats/forretress.asm +++ b/data/pokemon/base_stats/forretress.asm @@ -3,20 +3,19 @@ db 75, 90, 140, 40, 60, 60 ; hp atk def spd sat sdf - db BUG, STEEL + db BUG, STEEL ; type db 75 ; catch rate db 118 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/forretress/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH ; end diff --git a/data/pokemon/base_stats/furret.asm b/data/pokemon/base_stats/furret.asm index b26a82e2e..8fdc6df96 100644 --- a/data/pokemon/base_stats/furret.asm +++ b/data/pokemon/base_stats/furret.asm @@ -3,20 +3,19 @@ db 85, 76, 64, 90, 45, 55 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 90 ; catch rate db 116 ; base exp - db BERRY ; item 1 - db GOLD_BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db BERRY, GOLD_BERRY; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/furret/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm index 7e46be055..97383ac89 100644 --- a/data/pokemon/base_stats/gastly.asm +++ b/data/pokemon/base_stats/gastly.asm @@ -3,20 +3,19 @@ db 30, 35, 30, 80, 100, 35 ; hp atk def spd sat sdf - db GHOST, POISON + db GHOST, POISON ; type db 190 ; catch rate db 95 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/gastly/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm index 4176aa330..98f3ebf1f 100644 --- a/data/pokemon/base_stats/gengar.asm +++ b/data/pokemon/base_stats/gengar.asm @@ -3,20 +3,19 @@ db 60, 65, 60, 110, 130, 75 ; hp atk def spd sat sdf - db GHOST, POISON + db GHOST, POISON ; type db 45 ; catch rate db 190 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/gengar/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm index 35e5d22a7..9664d4318 100644 --- a/data/pokemon/base_stats/geodude.asm +++ b/data/pokemon/base_stats/geodude.asm @@ -3,20 +3,19 @@ db 40, 80, 100, 20, 30, 30 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 255 ; catch rate db 86 ; base exp - db NO_ITEM ; item 1 - db EVERSTONE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, EVERSTONE; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/geodude/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/girafarig.asm b/data/pokemon/base_stats/girafarig.asm index 7e67b19a6..eb159919a 100644 --- a/data/pokemon/base_stats/girafarig.asm +++ b/data/pokemon/base_stats/girafarig.asm @@ -3,20 +3,19 @@ db 70, 80, 65, 85, 90, 65 ; hp atk def spd sat sdf - db NORMAL, PSYCHIC + db NORMAL, PSYCHIC ; type db 60 ; catch rate db 149 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/girafarig/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/gligar.asm b/data/pokemon/base_stats/gligar.asm index e16bf7043..8bd607656 100644 --- a/data/pokemon/base_stats/gligar.asm +++ b/data/pokemon/base_stats/gligar.asm @@ -3,20 +3,19 @@ db 65, 75, 105, 85, 35, 65 ; hp atk def spd sat sdf - db GROUND, FLYING + db GROUND, FLYING ; type db 60 ; catch rate db 108 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/gligar/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm index 128b1fe81..30f4cbe9c 100644 --- a/data/pokemon/base_stats/gloom.asm +++ b/data/pokemon/base_stats/gloom.asm @@ -3,20 +3,19 @@ db 60, 65, 70, 40, 85, 75 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 120 ; catch rate db 132 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/gloom/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm index 2de7278ca..a73d5651f 100644 --- a/data/pokemon/base_stats/golbat.asm +++ b/data/pokemon/base_stats/golbat.asm @@ -3,20 +3,19 @@ db 75, 80, 70, 90, 65, 75 ; hp atk def spd sat sdf - db POISON, FLYING + db POISON, FLYING ; type db 90 ; catch rate db 171 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/golbat/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING ; end diff --git a/data/pokemon/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm index bc165c7a5..3651e0948 100644 --- a/data/pokemon/base_stats/goldeen.asm +++ b/data/pokemon/base_stats/goldeen.asm @@ -3,20 +3,19 @@ db 45, 67, 60, 63, 35, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 225 ; catch rate db 111 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/goldeen/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FISH, FISH ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm index e3e5ea1aa..ea89e9436 100644 --- a/data/pokemon/base_stats/golduck.asm +++ b/data/pokemon/base_stats/golduck.asm @@ -3,20 +3,19 @@ db 80, 82, 78, 85, 95, 80 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 75 ; catch rate db 174 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/golduck/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, FURY_CUTTER, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm index bda102404..18c83b397 100644 --- a/data/pokemon/base_stats/golem.asm +++ b/data/pokemon/base_stats/golem.asm @@ -3,20 +3,19 @@ db 80, 110, 130, 45, 55, 65 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 45 ; catch rate db 177 ; base exp - db NO_ITEM ; item 1 - db EVERSTONE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, EVERSTONE; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/golem/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/granbull.asm b/data/pokemon/base_stats/granbull.asm index 9c572cf7b..f49bf530c 100644 --- a/data/pokemon/base_stats/granbull.asm +++ b/data/pokemon/base_stats/granbull.asm @@ -3,20 +3,19 @@ db 90, 120, 75, 45, 60, 60 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 75 ; catch rate db 178 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/granbull/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FIELD, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm index b6be8cb5c..0a19caf64 100644 --- a/data/pokemon/base_stats/graveler.asm +++ b/data/pokemon/base_stats/graveler.asm @@ -3,20 +3,19 @@ db 55, 95, 115, 35, 45, 45 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 120 ; catch rate db 134 ; base exp - db NO_ITEM ; item 1 - db EVERSTONE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, EVERSTONE; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/graveler/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm index b1536bb3c..2aa87d4e2 100644 --- a/data/pokemon/base_stats/grimer.asm +++ b/data/pokemon/base_stats/grimer.asm @@ -3,20 +3,19 @@ db 80, 80, 50, 25, 40, 50 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 190 ; catch rate db 90 ; base exp - db NO_ITEM ; item 1 - db NUGGET ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NUGGET; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/grimer/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm index e3cfa7faa..f61260b55 100644 --- a/data/pokemon/base_stats/growlithe.asm +++ b/data/pokemon/base_stats/growlithe.asm @@ -3,20 +3,19 @@ db 55, 70, 45, 60, 70, 50 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 190 ; catch rate db 91 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/growlithe/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm index eb4f51f08..894982327 100644 --- a/data/pokemon/base_stats/gyarados.asm +++ b/data/pokemon/base_stats/gyarados.asm @@ -3,20 +3,19 @@ db 95, 125, 79, 81, 60, 100 ; hp atk def spd sat sdf - db WATER, FLYING + db WATER, FLYING ; type db 45 ; catch rate db 214 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 5 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/gyarados/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FISH, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm index 5c31fd2a9..a5cf1e459 100644 --- a/data/pokemon/base_stats/haunter.asm +++ b/data/pokemon/base_stats/haunter.asm @@ -3,20 +3,19 @@ db 45, 50, 45, 95, 115, 55 ; hp atk def spd sat sdf - db GHOST, POISON + db GHOST, POISON ; type db 90 ; catch rate db 126 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/haunter/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/heracross.asm b/data/pokemon/base_stats/heracross.asm index f27efbe0d..762813ac4 100644 --- a/data/pokemon/base_stats/heracross.asm +++ b/data/pokemon/base_stats/heracross.asm @@ -3,20 +3,19 @@ db 80, 125, 75, 85, 40, 95 ; hp atk def spd sat sdf - db BUG, FIGHTING + db BUG, FIGHTING ; type db 45 ; catch rate db 200 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/heracross/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm index b8e7da73b..e1d3c7c58 100644 --- a/data/pokemon/base_stats/hitmonchan.asm +++ b/data/pokemon/base_stats/hitmonchan.asm @@ -3,20 +3,19 @@ db 50, 105, 79, 76, 35, 110 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 45 ; catch rate db 140 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hitmonchan/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH ; end diff --git a/data/pokemon/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm index a5759f92d..3296cbdd9 100644 --- a/data/pokemon/base_stats/hitmonlee.asm +++ b/data/pokemon/base_stats/hitmonlee.asm @@ -3,20 +3,19 @@ db 50, 120, 53, 87, 35, 110 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 45 ; catch rate db 139 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hitmonlee/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH ; end diff --git a/data/pokemon/base_stats/hitmontop.asm b/data/pokemon/base_stats/hitmontop.asm index a36b7fc58..c45aa51e6 100644 --- a/data/pokemon/base_stats/hitmontop.asm +++ b/data/pokemon/base_stats/hitmontop.asm @@ -3,20 +3,19 @@ db 50, 95, 95, 70, 35, 110 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 45 ; catch rate db 138 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hitmontop/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH ; end diff --git a/data/pokemon/base_stats/ho_oh.asm b/data/pokemon/base_stats/ho_oh.asm index 910ea5a9f..20d96bafe 100644 --- a/data/pokemon/base_stats/ho_oh.asm +++ b/data/pokemon/base_stats/ho_oh.asm @@ -3,20 +3,19 @@ db 106, 130, 90, 90, 110, 154 ; hp atk def spd sat sdf - db FIRE, FLYING + db FIRE, FLYING ; type db 3 ; catch rate db 220 ; base exp - db SACRED_ASH ; item 1 - db SACRED_ASH ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db SACRED_ASH, SACRED_ASH; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 120 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ho_oh/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, STEEL_WING, NIGHTMARE, FLY, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/hoothoot.asm b/data/pokemon/base_stats/hoothoot.asm index b52e929e9..50b2bdf9e 100644 --- a/data/pokemon/base_stats/hoothoot.asm +++ b/data/pokemon/base_stats/hoothoot.asm @@ -3,20 +3,19 @@ db 60, 30, 30, 50, 36, 56 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 255 ; catch rate db 58 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hoothoot/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY, FLASH ; end diff --git a/data/pokemon/base_stats/hoppip.asm b/data/pokemon/base_stats/hoppip.asm index c6e1a86dc..32c09f16c 100644 --- a/data/pokemon/base_stats/hoppip.asm +++ b/data/pokemon/base_stats/hoppip.asm @@ -3,20 +3,19 @@ db 35, 35, 40, 50, 35, 55 ; hp atk def spd sat sdf - db GRASS, FLYING + db GRASS, FLYING ; type db 255 ; catch rate db 74 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hoppip/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FAIRY, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH ; end diff --git a/data/pokemon/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm index c3d75a927..2321b4d66 100644 --- a/data/pokemon/base_stats/horsea.asm +++ b/data/pokemon/base_stats/horsea.asm @@ -3,20 +3,19 @@ db 30, 40, 70, 60, 70, 25 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 225 ; catch rate db 83 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/horsea/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/houndoom.asm b/data/pokemon/base_stats/houndoom.asm index 1f3b4f903..25d728edf 100644 --- a/data/pokemon/base_stats/houndoom.asm +++ b/data/pokemon/base_stats/houndoom.asm @@ -3,20 +3,19 @@ db 75, 90, 50, 95, 110, 80 ; hp atk def spd sat sdf - db DARK, FIRE + db DARK, FIRE ; type db 45 ; catch rate db 204 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/houndoom/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/houndour.asm b/data/pokemon/base_stats/houndour.asm index b064b3e0d..010b21928 100644 --- a/data/pokemon/base_stats/houndour.asm +++ b/data/pokemon/base_stats/houndour.asm @@ -3,20 +3,19 @@ db 45, 60, 30, 65, 80, 50 ; hp atk def spd sat sdf - db DARK, FIRE + db DARK, FIRE ; type db 120 ; catch rate db 114 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/houndour/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm index 83aab91c8..af03aa777 100644 --- a/data/pokemon/base_stats/hypno.asm +++ b/data/pokemon/base_stats/hypno.asm @@ -3,20 +3,19 @@ db 85, 73, 70, 67, 73, 115 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 75 ; catch rate db 165 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hypno/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/igglybuff.asm b/data/pokemon/base_stats/igglybuff.asm index 8745ecafb..b8a198d91 100644 --- a/data/pokemon/base_stats/igglybuff.asm +++ b/data/pokemon/base_stats/igglybuff.asm @@ -3,20 +3,19 @@ db 90, 30, 15, 15, 40, 20 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 170 ; catch rate db 39 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/igglybuff/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, FLASH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm index 8e7c7c9c4..f416b76e3 100644 --- a/data/pokemon/base_stats/ivysaur.asm +++ b/data/pokemon/base_stats/ivysaur.asm @@ -3,20 +3,19 @@ db 60, 62, 63, 60, 80, 80 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 45 ; catch rate db 141 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ivysaur/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm index f785f0228..222c05820 100644 --- a/data/pokemon/base_stats/jigglypuff.asm +++ b/data/pokemon/base_stats/jigglypuff.asm @@ -3,20 +3,19 @@ db 115, 45, 20, 20, 45, 25 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 170 ; catch rate db 76 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/jigglypuff/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FAIRY, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm index a6636ebba..311e07b9a 100644 --- a/data/pokemon/base_stats/jolteon.asm +++ b/data/pokemon/base_stats/jolteon.asm @@ -3,20 +3,19 @@ db 65, 65, 60, 130, 110, 95 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 45 ; catch rate db 197 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/jolteon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/jumpluff.asm b/data/pokemon/base_stats/jumpluff.asm index c40d2c559..e20b59e3d 100644 --- a/data/pokemon/base_stats/jumpluff.asm +++ b/data/pokemon/base_stats/jumpluff.asm @@ -3,20 +3,19 @@ db 75, 55, 70, 110, 55, 85 ; hp atk def spd sat sdf - db GRASS, FLYING + db GRASS, FLYING ; type db 45 ; catch rate db 176 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/jumpluff/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FAIRY, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH ; end diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm index 5696b83ee..ec8c47d9c 100644 --- a/data/pokemon/base_stats/jynx.asm +++ b/data/pokemon/base_stats/jynx.asm @@ -3,20 +3,19 @@ db 65, 50, 35, 95, 115, 95 ; hp atk def spd sat sdf - db ICE, PSYCHIC + db ICE, PSYCHIC ; type db 45 ; catch rate db 137 ; base exp - db ICE_BERRY ; item 1 - db ICE_BERRY ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db ICE_BERRY, ICE_BERRY; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/jynx/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm index 60022586f..984e66da7 100644 --- a/data/pokemon/base_stats/kabuto.asm +++ b/data/pokemon/base_stats/kabuto.asm @@ -3,20 +3,19 @@ db 30, 80, 90, 55, 55, 45 ; hp atk def spd sat sdf - db ROCK, WATER + db ROCK, WATER ; type db 45 ; catch rate db 119 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 30 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kabuto/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm index b56cb1db8..a7e2e521c 100644 --- a/data/pokemon/base_stats/kabutops.asm +++ b/data/pokemon/base_stats/kabutops.asm @@ -3,20 +3,19 @@ db 60, 115, 105, 80, 65, 70 ; hp atk def spd sat sdf - db ROCK, WATER + db ROCK, WATER ; type db 45 ; catch rate db 201 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 30 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kabutops/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm index e3ce05321..ece5f8a79 100644 --- a/data/pokemon/base_stats/kadabra.asm +++ b/data/pokemon/base_stats/kadabra.asm @@ -3,20 +3,19 @@ db 40, 35, 30, 105, 120, 70 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 100 ; catch rate db 145 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kadabra/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm index 4c8304dd2..a4f9dd363 100644 --- a/data/pokemon/base_stats/kakuna.asm +++ b/data/pokemon/base_stats/kakuna.asm @@ -3,20 +3,19 @@ db 45, 25, 50, 35, 25, 25 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 120 ; catch rate db 71 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kakuna/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm index 3724e29eb..b2a7d64b1 100644 --- a/data/pokemon/base_stats/kangaskhan.asm +++ b/data/pokemon/base_stats/kangaskhan.asm @@ -3,20 +3,19 @@ db 105, 95, 80, 90, 40, 80 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 175 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kangaskhan/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.asm index d217fa612..65993ea25 100644 --- a/data/pokemon/base_stats/kingdra.asm +++ b/data/pokemon/base_stats/kingdra.asm @@ -3,20 +3,19 @@ db 75, 95, 95, 85, 95, 95 ; hp atk def spd sat sdf - db WATER, DRAGON + db WATER, DRAGON ; type db 45 ; catch rate db 207 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kingdra/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm index 82549ca88..947526dd6 100644 --- a/data/pokemon/base_stats/kingler.asm +++ b/data/pokemon/base_stats/kingler.asm @@ -3,20 +3,19 @@ db 55, 130, 115, 75, 50, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 60 ; catch rate db 206 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kingler/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm index 8408f4ad8..1e55c5010 100644 --- a/data/pokemon/base_stats/koffing.asm +++ b/data/pokemon/base_stats/koffing.asm @@ -3,20 +3,19 @@ db 40, 65, 95, 35, 60, 45 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 190 ; catch rate db 114 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/koffing/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm index f4d78962a..d386988a5 100644 --- a/data/pokemon/base_stats/krabby.asm +++ b/data/pokemon/base_stats/krabby.asm @@ -3,20 +3,19 @@ db 30, 105, 90, 50, 25, 25 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 225 ; catch rate db 115 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/krabby/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/lanturn.asm b/data/pokemon/base_stats/lanturn.asm index ea97a9722..28fd3aed2 100644 --- a/data/pokemon/base_stats/lanturn.asm +++ b/data/pokemon/base_stats/lanturn.asm @@ -3,20 +3,19 @@ db 125, 58, 58, 67, 76, 76 ; hp atk def spd sat sdf - db WATER, ELECTRIC + db WATER, ELECTRIC ; type db 75 ; catch rate db 156 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/lanturn/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FISH, FISH ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm index 4ba001dfd..9a40f3447 100644 --- a/data/pokemon/base_stats/lapras.asm +++ b/data/pokemon/base_stats/lapras.asm @@ -3,20 +3,19 @@ db 130, 85, 80, 60, 85, 95 ; hp atk def spd sat sdf - db WATER, ICE + db WATER, ICE ; type db 45 ; catch rate db 219 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/lapras/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, STRENGTH, WHIRLPOOL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/larvitar.asm b/data/pokemon/base_stats/larvitar.asm index d9c18d1bc..acdfd290f 100644 --- a/data/pokemon/base_stats/larvitar.asm +++ b/data/pokemon/base_stats/larvitar.asm @@ -3,20 +3,19 @@ db 50, 64, 50, 41, 45, 50 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 45 ; catch rate db 67 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/larvitar/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DETECT, REST, ATTRACT ; end diff --git a/data/pokemon/base_stats/ledian.asm b/data/pokemon/base_stats/ledian.asm index 1f0cb4fd9..27a002dcd 100644 --- a/data/pokemon/base_stats/ledian.asm +++ b/data/pokemon/base_stats/ledian.asm @@ -3,20 +3,19 @@ db 55, 35, 50, 85, 55, 110 ; hp atk def spd sat sdf - db BUG, FLYING + db BUG, FLYING ; type db 90 ; catch rate db 134 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ledian/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/ledyba.asm b/data/pokemon/base_stats/ledyba.asm index e78d4efe4..e65614248 100644 --- a/data/pokemon/base_stats/ledyba.asm +++ b/data/pokemon/base_stats/ledyba.asm @@ -3,20 +3,19 @@ db 40, 20, 30, 55, 40, 80 ; hp atk def spd sat sdf - db BUG, FLYING + db BUG, FLYING ; type db 255 ; catch rate db 54 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ledyba/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm index 43d60ec6c..3c7c96e40 100644 --- a/data/pokemon/base_stats/lickitung.asm +++ b/data/pokemon/base_stats/lickitung.asm @@ -3,20 +3,19 @@ db 90, 55, 75, 30, 60, 75 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 127 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/lickitung/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, CUT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/lugia.asm b/data/pokemon/base_stats/lugia.asm index 7ad2f23a1..fe7391c04 100644 --- a/data/pokemon/base_stats/lugia.asm +++ b/data/pokemon/base_stats/lugia.asm @@ -3,20 +3,19 @@ db 106, 90, 130, 110, 90, 154 ; hp atk def spd sat sdf - db PSYCHIC, FLYING + db PSYCHIC, FLYING ; type db 3 ; catch rate db 220 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 120 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/lugia/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DREAM_EATER, DETECT, REST, STEEL_WING, NIGHTMARE, FLY, SURF, STRENGTH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm index 41b168234..1e7a07e5f 100644 --- a/data/pokemon/base_stats/machamp.asm +++ b/data/pokemon/base_stats/machamp.asm @@ -3,20 +3,19 @@ db 90, 130, 80, 55, 65, 85 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 45 ; catch rate db 193 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/machamp/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm index 8b98ea1de..87ceb4549 100644 --- a/data/pokemon/base_stats/machoke.asm +++ b/data/pokemon/base_stats/machoke.asm @@ -3,20 +3,19 @@ db 80, 100, 70, 45, 50, 60 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 90 ; catch rate db 146 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/machoke/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm index cb1b2f7c5..4969a8403 100644 --- a/data/pokemon/base_stats/machop.asm +++ b/data/pokemon/base_stats/machop.asm @@ -3,20 +3,19 @@ db 70, 80, 50, 35, 35, 35 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 180 ; catch rate db 88 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/machop/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/magby.asm b/data/pokemon/base_stats/magby.asm index 132387f32..37075404b 100644 --- a/data/pokemon/base_stats/magby.asm +++ b/data/pokemon/base_stats/magby.asm @@ -3,20 +3,19 @@ db 45, 75, 37, 83, 70, 55 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 117 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magby/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/magcargo.asm b/data/pokemon/base_stats/magcargo.asm index aa2008cd1..d91f72b27 100644 --- a/data/pokemon/base_stats/magcargo.asm +++ b/data/pokemon/base_stats/magcargo.asm @@ -3,20 +3,19 @@ db 50, 50, 120, 30, 80, 80 ; hp atk def spd sat sdf - db FIRE, ROCK + db FIRE, ROCK ; type db 75 ; catch rate db 154 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magcargo/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm index e5524543f..220f5ddd9 100644 --- a/data/pokemon/base_stats/magikarp.asm +++ b/data/pokemon/base_stats/magikarp.asm @@ -3,20 +3,19 @@ db 20, 10, 55, 80, 15, 20 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 255 ; catch rate db 20 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 5 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magikarp/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FISH, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm index 595df7ab7..8a11e538d 100644 --- a/data/pokemon/base_stats/magmar.asm +++ b/data/pokemon/base_stats/magmar.asm @@ -3,20 +3,19 @@ db 65, 95, 57, 93, 100, 85 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 167 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magmar/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm index 42bdc18a7..0a5620487 100644 --- a/data/pokemon/base_stats/magnemite.asm +++ b/data/pokemon/base_stats/magnemite.asm @@ -3,20 +3,19 @@ db 25, 35, 70, 45, 95, 55 ; hp atk def spd sat sdf - db ELECTRIC, STEEL + db ELECTRIC, STEEL ; type db 190 ; catch rate db 89 ; base exp - db NO_ITEM ; item 1 - db METAL_COAT ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, METAL_COAT; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magnemite/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm index 5cac867be..b5faa573a 100644 --- a/data/pokemon/base_stats/magneton.asm +++ b/data/pokemon/base_stats/magneton.asm @@ -3,20 +3,19 @@ db 50, 60, 95, 70, 120, 70 ; hp atk def spd sat sdf - db ELECTRIC, STEEL + db ELECTRIC, STEEL ; type db 60 ; catch rate db 161 ; base exp - db NO_ITEM ; item 1 - db METAL_COAT ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, METAL_COAT; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magneton/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm index 41aaac8a9..82c9456ff 100644 --- a/data/pokemon/base_stats/mankey.asm +++ b/data/pokemon/base_stats/mankey.asm @@ -3,20 +3,19 @@ db 40, 80, 35, 70, 35, 45 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 190 ; catch rate db 74 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mankey/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/mantine.asm b/data/pokemon/base_stats/mantine.asm index bec060cb6..80f5dde6b 100644 --- a/data/pokemon/base_stats/mantine.asm +++ b/data/pokemon/base_stats/mantine.asm @@ -3,20 +3,19 @@ db 65, 40, 70, 70, 80, 140 ; hp atk def spd sat sdf - db WATER, FLYING + db WATER, FLYING ; type db 25 ; catch rate db 168 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mantine/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn AMPHIBIAN, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/mareep.asm b/data/pokemon/base_stats/mareep.asm index 8388d7f8c..8a68d5cf2 100644 --- a/data/pokemon/base_stats/mareep.asm +++ b/data/pokemon/base_stats/mareep.asm @@ -3,20 +3,19 @@ db 55, 40, 40, 35, 65, 45 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 235 ; catch rate db 59 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mareep/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/marill.asm b/data/pokemon/base_stats/marill.asm index b6fcc62e5..e190e0d0c 100644 --- a/data/pokemon/base_stats/marill.asm +++ b/data/pokemon/base_stats/marill.asm @@ -3,20 +3,19 @@ db 70, 20, 50, 40, 20, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 58 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/marill/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn AMPHIBIAN, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm index cc03dc697..453bb9932 100644 --- a/data/pokemon/base_stats/marowak.asm +++ b/data/pokemon/base_stats/marowak.asm @@ -3,20 +3,19 @@ db 60, 80, 110, 45, 50, 80 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 75 ; catch rate db 124 ; base exp - db NO_ITEM ; item 1 - db THICK_CLUB ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, THICK_CLUB; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/marowak/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/meganium.asm b/data/pokemon/base_stats/meganium.asm index eaca626d4..3e02ced99 100644 --- a/data/pokemon/base_stats/meganium.asm +++ b/data/pokemon/base_stats/meganium.asm @@ -3,20 +3,19 @@ db 80, 82, 100, 80, 83, 100 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 45 ; catch rate db 208 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/meganium/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm index 114f76899..feb97df30 100644 --- a/data/pokemon/base_stats/meowth.asm +++ b/data/pokemon/base_stats/meowth.asm @@ -3,20 +3,19 @@ db 40, 45, 35, 90, 40, 40 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 255 ; catch rate db 69 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/meowth/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm index f2b33f831..8a4d27220 100644 --- a/data/pokemon/base_stats/metapod.asm +++ b/data/pokemon/base_stats/metapod.asm @@ -3,20 +3,19 @@ db 50, 20, 55, 30, 25, 25 ; hp atk def spd sat sdf - db BUG, BUG + db BUG, BUG ; type db 120 ; catch rate db 72 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/metapod/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm index 4d70413d0..f09d291a9 100644 --- a/data/pokemon/base_stats/mew.asm +++ b/data/pokemon/base_stats/mew.asm @@ -3,20 +3,19 @@ db 100, 100, 100, 100, 100, 100 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 45 ; catch rate db 64 ; base exp - db NO_ITEM ; item 1 - db MIRACLEBERRY ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, MIRACLEBERRY; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 120 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mew/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, FLY, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm index 0e9636223..98ee9e43a 100644 --- a/data/pokemon/base_stats/mewtwo.asm +++ b/data/pokemon/base_stats/mewtwo.asm @@ -3,20 +3,19 @@ db 106, 110, 90, 130, 154, 90 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 3 ; catch rate db 220 ; base exp - db NO_ITEM ; item 1 - db BERSERK_GENE ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, BERSERK_GENE; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 120 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mewtwo/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, THUNDERPUNCH, DREAM_EATER, DETECT, REST, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/miltank.asm b/data/pokemon/base_stats/miltank.asm index c751a2f9c..35642718b 100644 --- a/data/pokemon/base_stats/miltank.asm +++ b/data/pokemon/base_stats/miltank.asm @@ -3,20 +3,19 @@ db 95, 80, 105, 100, 40, 70 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 200 ; base exp - db MOOMOO_MILK ; item 1 - db MOOMOO_MILK ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db MOOMOO_MILK, MOOMOO_MILK; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/miltank/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, SURF, STRENGTH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/misdreavus.asm b/data/pokemon/base_stats/misdreavus.asm index d1824eaa2..ebb2a8160 100644 --- a/data/pokemon/base_stats/misdreavus.asm +++ b/data/pokemon/base_stats/misdreavus.asm @@ -3,20 +3,19 @@ db 60, 60, 60, 85, 85, 85 ; hp atk def spd sat sdf - db GHOST, GHOST + db GHOST, GHOST ; type db 45 ; catch rate db 147 ; base exp - db NO_ITEM ; item 1 - db SPELL_TAG ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, SPELL_TAG; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/misdreavus/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm index 22157c073..2b02ad1b9 100644 --- a/data/pokemon/base_stats/moltres.asm +++ b/data/pokemon/base_stats/moltres.asm @@ -3,20 +3,19 @@ db 90, 100, 90, 90, 125, 85 ; hp atk def spd sat sdf - db FIRE, FLYING + db FIRE, FLYING ; type db 3 ; catch rate db 217 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/moltres/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, STEEL_WING, FLY, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/mr__mime.asm b/data/pokemon/base_stats/mr__mime.asm index 1abc9995f..cf3707f0f 100644 --- a/data/pokemon/base_stats/mr__mime.asm +++ b/data/pokemon/base_stats/mr__mime.asm @@ -3,20 +3,19 @@ db 40, 45, 65, 90, 100, 120 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 45 ; catch rate db 136 ; base exp - db NO_ITEM ; item 1 - db MYSTERYBERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, MYSTERYBERRY; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mr__mime/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm index a25d85605..32e326cbe 100644 --- a/data/pokemon/base_stats/muk.asm +++ b/data/pokemon/base_stats/muk.asm @@ -3,20 +3,19 @@ db 105, 105, 75, 50, 65, 100 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 75 ; catch rate db 157 ; base exp - db NO_ITEM ; item 1 - db NUGGET ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NUGGET; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/muk/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/murkrow.asm b/data/pokemon/base_stats/murkrow.asm index 2fada2697..404a8d8ac 100644 --- a/data/pokemon/base_stats/murkrow.asm +++ b/data/pokemon/base_stats/murkrow.asm @@ -3,20 +3,19 @@ db 60, 85, 42, 91, 85, 42 ; hp atk def spd sat sdf - db DARK, FLYING + db DARK, FLYING ; type db 30 ; catch rate db 107 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/murkrow/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY ; end diff --git a/data/pokemon/base_stats/natu.asm b/data/pokemon/base_stats/natu.asm index b9bde658a..ae5c9839e 100644 --- a/data/pokemon/base_stats/natu.asm +++ b/data/pokemon/base_stats/natu.asm @@ -3,20 +3,19 @@ db 40, 50, 45, 70, 70, 45 ; hp atk def spd sat sdf - db PSYCHIC, FLYING + db PSYCHIC, FLYING ; type db 190 ; catch rate db 73 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/natu/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm index 3d7205af5..796d87a93 100644 --- a/data/pokemon/base_stats/nidoking.asm +++ b/data/pokemon/base_stats/nidoking.asm @@ -3,20 +3,19 @@ db 81, 92, 77, 85, 85, 75 ; hp atk def spd sat sdf - db POISON, GROUND + db POISON, GROUND ; type db 45 ; catch rate db 195 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoking/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm index 4c5ca110e..4637b486f 100644 --- a/data/pokemon/base_stats/nidoqueen.asm +++ b/data/pokemon/base_stats/nidoqueen.asm @@ -3,20 +3,19 @@ db 90, 82, 87, 76, 75, 85 ; hp atk def spd sat sdf - db POISON, GROUND + db POISON, GROUND ; type db 45 ; catch rate db 194 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoqueen/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/nidoran_f.asm b/data/pokemon/base_stats/nidoran_f.asm index 77925f1df..0fa3ea2ed 100644 --- a/data/pokemon/base_stats/nidoran_f.asm +++ b/data/pokemon/base_stats/nidoran_f.asm @@ -3,20 +3,19 @@ db 55, 47, 52, 41, 40, 40 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 235 ; catch rate db 59 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoran_f/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/nidoran_m.asm b/data/pokemon/base_stats/nidoran_m.asm index 0f25712dd..f23405a78 100644 --- a/data/pokemon/base_stats/nidoran_m.asm +++ b/data/pokemon/base_stats/nidoran_m.asm @@ -3,20 +3,19 @@ db 46, 57, 40, 50, 40, 40 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 235 ; catch rate db 60 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoran_m/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm index 2385f82ec..65dfd558e 100644 --- a/data/pokemon/base_stats/nidorina.asm +++ b/data/pokemon/base_stats/nidorina.asm @@ -3,20 +3,19 @@ db 70, 62, 67, 56, 55, 55 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 120 ; catch rate db 117 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidorina/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, STRENGTH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm index 9c94ea824..7ba686eff 100644 --- a/data/pokemon/base_stats/nidorino.asm +++ b/data/pokemon/base_stats/nidorino.asm @@ -3,20 +3,19 @@ db 61, 72, 57, 65, 55, 55 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 120 ; catch rate db 118 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidorino/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, STRENGTH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm index f23d2e384..892874071 100644 --- a/data/pokemon/base_stats/ninetales.asm +++ b/data/pokemon/base_stats/ninetales.asm @@ -3,20 +3,19 @@ db 73, 76, 75, 100, 81, 100 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 75 ; catch rate db 178 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ninetales/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/noctowl.asm b/data/pokemon/base_stats/noctowl.asm index 030dec08e..6adcdc976 100644 --- a/data/pokemon/base_stats/noctowl.asm +++ b/data/pokemon/base_stats/noctowl.asm @@ -3,20 +3,19 @@ db 100, 50, 50, 70, 76, 96 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 90 ; catch rate db 162 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/noctowl/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY, FLASH ; end diff --git a/data/pokemon/base_stats/octillery.asm b/data/pokemon/base_stats/octillery.asm index 6bc2f7d46..247b996ca 100644 --- a/data/pokemon/base_stats/octillery.asm +++ b/data/pokemon/base_stats/octillery.asm @@ -3,20 +3,19 @@ db 75, 105, 75, 45, 105, 75 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 75 ; catch rate db 164 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/octillery/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FISH ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm index 98f8c96f9..a4cba7085 100644 --- a/data/pokemon/base_stats/oddish.asm +++ b/data/pokemon/base_stats/oddish.asm @@ -3,20 +3,19 @@ db 45, 50, 55, 30, 75, 65 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 255 ; catch rate db 78 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/oddish/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm index 70b88df38..a7d9d346d 100644 --- a/data/pokemon/base_stats/omanyte.asm +++ b/data/pokemon/base_stats/omanyte.asm @@ -3,20 +3,19 @@ db 35, 40, 100, 35, 90, 55 ; hp atk def spd sat sdf - db ROCK, WATER + db ROCK, WATER ; type db 45 ; catch rate db 120 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 30 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/omanyte/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm index 659ecc825..a2d60abf3 100644 --- a/data/pokemon/base_stats/omastar.asm +++ b/data/pokemon/base_stats/omastar.asm @@ -3,20 +3,19 @@ db 70, 60, 125, 55, 115, 70 ; hp atk def spd sat sdf - db ROCK, WATER + db ROCK, WATER ; type db 45 ; catch rate db 199 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 30 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/omastar/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm index befd53abf..a28fe72d9 100644 --- a/data/pokemon/base_stats/onix.asm +++ b/data/pokemon/base_stats/onix.asm @@ -3,20 +3,19 @@ db 35, 45, 160, 70, 30, 45 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 45 ; catch rate db 108 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/onix/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, STRENGTH ; end diff --git a/data/pokemon/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm index 46687f928..8f99631ce 100644 --- a/data/pokemon/base_stats/paras.asm +++ b/data/pokemon/base_stats/paras.asm @@ -3,20 +3,19 @@ db 35, 70, 55, 25, 45, 55 ; hp atk def spd sat sdf - db BUG, GRASS + db BUG, GRASS ; type db 190 ; catch rate db 70 ; base exp - db TINYMUSHROOM ; item 1 - db BIG_MUSHROOM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db TINYMUSHROOM, BIG_MUSHROOM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/paras/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm index d40dd4fd9..32b823b83 100644 --- a/data/pokemon/base_stats/parasect.asm +++ b/data/pokemon/base_stats/parasect.asm @@ -3,20 +3,19 @@ db 60, 95, 80, 30, 60, 80 ; hp atk def spd sat sdf - db BUG, GRASS + db BUG, GRASS ; type db 75 ; catch rate db 128 ; base exp - db TINYMUSHROOM ; item 1 - db BIG_MUSHROOM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db TINYMUSHROOM, BIG_MUSHROOM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/parasect/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm index bbfd9beec..eace03a07 100644 --- a/data/pokemon/base_stats/persian.asm +++ b/data/pokemon/base_stats/persian.asm @@ -3,20 +3,19 @@ db 65, 70, 60, 115, 65, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 90 ; catch rate db 148 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/persian/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/phanpy.asm b/data/pokemon/base_stats/phanpy.asm index 27794e0b5..58d3a810d 100644 --- a/data/pokemon/base_stats/phanpy.asm +++ b/data/pokemon/base_stats/phanpy.asm @@ -3,20 +3,19 @@ db 90, 60, 60, 40, 40, 40 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 120 ; catch rate db 124 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/phanpy/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH ; end diff --git a/data/pokemon/base_stats/pichu.asm b/data/pokemon/base_stats/pichu.asm index 35d6a105a..08346c338 100644 --- a/data/pokemon/base_stats/pichu.asm +++ b/data/pokemon/base_stats/pichu.asm @@ -3,20 +3,19 @@ db 20, 40, 15, 60, 35, 35 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 190 ; catch rate db 42 ; base exp - db NO_ITEM ; item 1 - db BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, BERRY; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pichu/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm index 2d117b955..b8270e0b2 100644 --- a/data/pokemon/base_stats/pidgeot.asm +++ b/data/pokemon/base_stats/pidgeot.asm @@ -3,20 +3,19 @@ db 83, 80, 75, 91, 70, 70 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 45 ; catch rate db 172 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pidgeot/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm index 8e263c4b3..1951abc75 100644 --- a/data/pokemon/base_stats/pidgeotto.asm +++ b/data/pokemon/base_stats/pidgeotto.asm @@ -3,20 +3,19 @@ db 63, 60, 55, 71, 50, 50 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 120 ; catch rate db 113 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pidgeotto/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm index 123b95d7d..cd547de53 100644 --- a/data/pokemon/base_stats/pidgey.asm +++ b/data/pokemon/base_stats/pidgey.asm @@ -3,20 +3,19 @@ db 40, 45, 40, 56, 35, 35 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 255 ; catch rate db 55 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pidgey/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm index 78204ff78..2ac75e086 100644 --- a/data/pokemon/base_stats/pikachu.asm +++ b/data/pokemon/base_stats/pikachu.asm @@ -3,20 +3,19 @@ db 35, 55, 30, 90, 50, 40 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 190 ; catch rate db 82 ; base exp - db NO_ITEM ; item 1 - db BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, BERRY; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pikachu/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/piloswine.asm b/data/pokemon/base_stats/piloswine.asm index 3e48aa4c9..ee013c2e4 100644 --- a/data/pokemon/base_stats/piloswine.asm +++ b/data/pokemon/base_stats/piloswine.asm @@ -3,20 +3,19 @@ db 100, 100, 80, 50, 60, 60 ; hp atk def spd sat sdf - db ICE, GROUND + db ICE, GROUND ; type db 75 ; catch rate db 160 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/piloswine/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/pineco.asm b/data/pokemon/base_stats/pineco.asm index 5754c49a2..09eae2319 100644 --- a/data/pokemon/base_stats/pineco.asm +++ b/data/pokemon/base_stats/pineco.asm @@ -3,20 +3,19 @@ db 50, 65, 90, 15, 35, 35 ; hp atk def spd sat sdf - db BUG, BUG + db BUG, BUG ; type db 190 ; catch rate db 60 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pineco/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, STRENGTH ; end diff --git a/data/pokemon/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm index 55927c918..37c3dfced 100644 --- a/data/pokemon/base_stats/pinsir.asm +++ b/data/pokemon/base_stats/pinsir.asm @@ -3,20 +3,19 @@ db 65, 125, 100, 85, 55, 70 ; hp atk def spd sat sdf - db BUG, BUG + db BUG, BUG ; type db 45 ; catch rate db 200 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pinsir/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/politoed.asm b/data/pokemon/base_stats/politoed.asm index 6ad959406..ba152e9e2 100644 --- a/data/pokemon/base_stats/politoed.asm +++ b/data/pokemon/base_stats/politoed.asm @@ -3,20 +3,19 @@ db 90, 75, 75, 70, 90, 100 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 185 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/politoed/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMPHIBIAN, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm index 3a4d8c051..a8cddbdeb 100644 --- a/data/pokemon/base_stats/poliwag.asm +++ b/data/pokemon/base_stats/poliwag.asm @@ -3,20 +3,19 @@ db 40, 50, 40, 90, 40, 40 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 255 ; catch rate db 77 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/poliwag/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMPHIBIAN, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm index d28964ebd..e76dd5b4b 100644 --- a/data/pokemon/base_stats/poliwhirl.asm +++ b/data/pokemon/base_stats/poliwhirl.asm @@ -3,20 +3,19 @@ db 65, 65, 65, 90, 50, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 120 ; catch rate db 131 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/poliwhirl/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMPHIBIAN, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm index 3b142e061..95c8406e9 100644 --- a/data/pokemon/base_stats/poliwrath.asm +++ b/data/pokemon/base_stats/poliwrath.asm @@ -3,20 +3,19 @@ db 90, 85, 95, 70, 70, 90 ; hp atk def spd sat sdf - db WATER, FIGHTING + db WATER, FIGHTING ; type db 45 ; catch rate db 185 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/poliwrath/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMPHIBIAN, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm index 2c3c3f9cf..4a32f9010 100644 --- a/data/pokemon/base_stats/ponyta.asm +++ b/data/pokemon/base_stats/ponyta.asm @@ -3,20 +3,19 @@ db 50, 85, 55, 90, 65, 65 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 190 ; catch rate db 152 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ponyta/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm index c034acdfb..b9c6f7df7 100644 --- a/data/pokemon/base_stats/porygon.asm +++ b/data/pokemon/base_stats/porygon.asm @@ -3,20 +3,19 @@ db 65, 60, 70, 40, 85, 75 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 130 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/porygon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/porygon2.asm b/data/pokemon/base_stats/porygon2.asm index 1e9625509..50022cae8 100644 --- a/data/pokemon/base_stats/porygon2.asm +++ b/data/pokemon/base_stats/porygon2.asm @@ -3,20 +3,19 @@ db 85, 80, 90, 60, 105, 95 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 180 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/porygon2/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm index a7d1ee74a..276f8e39a 100644 --- a/data/pokemon/base_stats/primeape.asm +++ b/data/pokemon/base_stats/primeape.asm @@ -3,20 +3,19 @@ db 65, 105, 60, 95, 60, 70 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 75 ; catch rate db 149 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/primeape/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm index d2901750b..98bd99337 100644 --- a/data/pokemon/base_stats/psyduck.asm +++ b/data/pokemon/base_stats/psyduck.asm @@ -3,20 +3,19 @@ db 50, 52, 48, 55, 65, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 80 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/psyduck/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/pupitar.asm b/data/pokemon/base_stats/pupitar.asm index 7ff381195..80ba55692 100644 --- a/data/pokemon/base_stats/pupitar.asm +++ b/data/pokemon/base_stats/pupitar.asm @@ -3,20 +3,19 @@ db 70, 84, 70, 51, 65, 70 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 45 ; catch rate db 144 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pupitar/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DETECT, REST, ATTRACT ; end diff --git a/data/pokemon/base_stats/quagsire.asm b/data/pokemon/base_stats/quagsire.asm index 75a1d24be..3972a0763 100644 --- a/data/pokemon/base_stats/quagsire.asm +++ b/data/pokemon/base_stats/quagsire.asm @@ -3,20 +3,19 @@ db 95, 85, 85, 35, 65, 65 ; hp atk def spd sat sdf - db WATER, GROUND + db WATER, GROUND ; type db 90 ; catch rate db 137 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/quagsire/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, FLASH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/quilava.asm b/data/pokemon/base_stats/quilava.asm index 4cb388301..13789d3a6 100644 --- a/data/pokemon/base_stats/quilava.asm +++ b/data/pokemon/base_stats/quilava.asm @@ -3,20 +3,19 @@ db 58, 64, 58, 80, 80, 65 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 142 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/quilava/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/qwilfish.asm b/data/pokemon/base_stats/qwilfish.asm index 0cfe4e2d8..5dfc6f982 100644 --- a/data/pokemon/base_stats/qwilfish.asm +++ b/data/pokemon/base_stats/qwilfish.asm @@ -3,20 +3,19 @@ db 65, 95, 75, 85, 55, 55 ; hp atk def spd sat sdf - db WATER, POISON + db WATER, POISON ; type db 45 ; catch rate db 100 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/qwilfish/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FISH, FISH ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm index b6723ac0f..a691fecd3 100644 --- a/data/pokemon/base_stats/raichu.asm +++ b/data/pokemon/base_stats/raichu.asm @@ -3,20 +3,19 @@ db 60, 90, 55, 100, 90, 80 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 75 ; catch rate db 122 ; base exp - db NO_ITEM ; item 1 - db BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, BERRY; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/raichu/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/raikou.asm b/data/pokemon/base_stats/raikou.asm index 47f4f9da3..d8b2a98ed 100644 --- a/data/pokemon/base_stats/raikou.asm +++ b/data/pokemon/base_stats/raikou.asm @@ -3,20 +3,19 @@ db 90, 85, 75, 115, 115, 100 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 3 ; catch rate db 216 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/raikou/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, CUT, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm index 291b129f2..8da61a515 100644 --- a/data/pokemon/base_stats/rapidash.asm +++ b/data/pokemon/base_stats/rapidash.asm @@ -3,20 +3,19 @@ db 65, 100, 70, 105, 80, 80 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 60 ; catch rate db 192 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/rapidash/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm index 1424f3ffb..31440b27a 100644 --- a/data/pokemon/base_stats/raticate.asm +++ b/data/pokemon/base_stats/raticate.asm @@ -3,20 +3,19 @@ db 55, 81, 60, 97, 50, 70 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 90 ; catch rate db 116 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/raticate/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, CUT, STRENGTH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm index 71498aeac..761e6400b 100644 --- a/data/pokemon/base_stats/rattata.asm +++ b/data/pokemon/base_stats/rattata.asm @@ -3,20 +3,19 @@ db 30, 56, 35, 72, 25, 35 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 255 ; catch rate db 57 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/rattata/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF ; end diff --git a/data/pokemon/base_stats/remoraid.asm b/data/pokemon/base_stats/remoraid.asm index 8dabbb0a4..c201544ea 100644 --- a/data/pokemon/base_stats/remoraid.asm +++ b/data/pokemon/base_stats/remoraid.asm @@ -3,20 +3,19 @@ db 35, 65, 35, 65, 65, 35 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 78 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/remoraid/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FISH ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm index e885edd75..cd4498a8a 100644 --- a/data/pokemon/base_stats/rhydon.asm +++ b/data/pokemon/base_stats/rhydon.asm @@ -3,20 +3,19 @@ db 105, 130, 120, 40, 45, 45 ; hp atk def spd sat sdf - db GROUND, ROCK + db GROUND, ROCK ; type db 60 ; catch rate db 204 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/rhydon/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm index f15f73719..f9b0fb693 100644 --- a/data/pokemon/base_stats/rhyhorn.asm +++ b/data/pokemon/base_stats/rhyhorn.asm @@ -3,20 +3,19 @@ db 80, 85, 95, 25, 30, 30 ; hp atk def spd sat sdf - db GROUND, ROCK + db GROUND, ROCK ; type db 120 ; catch rate db 135 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/rhyhorn/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, REST, ATTRACT, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm index 7b172a120..daa6574a3 100644 --- a/data/pokemon/base_stats/sandshrew.asm +++ b/data/pokemon/base_stats/sandshrew.asm @@ -3,20 +3,19 @@ db 50, 75, 85, 40, 20, 30 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 255 ; catch rate db 93 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sandshrew/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm index d850c9697..8296cc27d 100644 --- a/data/pokemon/base_stats/sandslash.asm +++ b/data/pokemon/base_stats/sandslash.asm @@ -3,20 +3,19 @@ db 75, 100, 110, 65, 45, 55 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 90 ; catch rate db 163 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sandslash/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/scizor.asm b/data/pokemon/base_stats/scizor.asm index c841c6301..ced06ee44 100644 --- a/data/pokemon/base_stats/scizor.asm +++ b/data/pokemon/base_stats/scizor.asm @@ -3,20 +3,19 @@ db 70, 130, 100, 65, 55, 80 ; hp atk def spd sat sdf - db BUG, STEEL + db BUG, STEEL ; type db 25 ; catch rate db 200 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/scizor/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm index ea7c7cd33..fa1beee7f 100644 --- a/data/pokemon/base_stats/scyther.asm +++ b/data/pokemon/base_stats/scyther.asm @@ -3,20 +3,19 @@ db 70, 110, 80, 105, 55, 80 ; hp atk def spd sat sdf - db BUG, FLYING + db BUG, FLYING ; type db 45 ; catch rate db 187 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/scyther/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FURY_CUTTER, CUT ; end diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm index 3ba5687ce..2f1e38c01 100644 --- a/data/pokemon/base_stats/seadra.asm +++ b/data/pokemon/base_stats/seadra.asm @@ -3,20 +3,19 @@ db 55, 65, 95, 85, 95, 45 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 75 ; catch rate db 155 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/seadra/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm index 70bee646a..4f32ed710 100644 --- a/data/pokemon/base_stats/seaking.asm +++ b/data/pokemon/base_stats/seaking.asm @@ -3,20 +3,19 @@ db 80, 92, 65, 68, 65, 80 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 60 ; catch rate db 170 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/seaking/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FISH, FISH ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm index 13edf89bc..b3528b8eb 100644 --- a/data/pokemon/base_stats/seel.asm +++ b/data/pokemon/base_stats/seel.asm @@ -3,20 +3,19 @@ db 65, 45, 55, 45, 45, 70 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 100 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/seel/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/sentret.asm b/data/pokemon/base_stats/sentret.asm index c3802fa63..15cf518ce 100644 --- a/data/pokemon/base_stats/sentret.asm +++ b/data/pokemon/base_stats/sentret.asm @@ -3,20 +3,19 @@ db 35, 46, 34, 20, 35, 45 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 255 ; catch rate db 57 ; base exp - db NO_ITEM ; item 1 - db BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, BERRY; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sentret/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, SURF ; end diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm index 9ca88a03d..19e4d9e45 100644 --- a/data/pokemon/base_stats/shellder.asm +++ b/data/pokemon/base_stats/shellder.asm @@ -3,20 +3,19 @@ db 30, 65, 100, 40, 45, 25 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 97 ; base exp - db PEARL ; item 1 - db BIG_PEARL ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db PEARL, BIG_PEARL; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/shellder/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/shuckle.asm b/data/pokemon/base_stats/shuckle.asm index ec3a3b410..51d02d70c 100644 --- a/data/pokemon/base_stats/shuckle.asm +++ b/data/pokemon/base_stats/shuckle.asm @@ -3,20 +3,19 @@ db 20, 10, 230, 05, 10, 230 ; hp atk def spd sat sdf - db BUG, ROCK + db BUG, ROCK ; type db 190 ; catch rate db 80 ; base exp - db BERRY ; item 1 - db BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db BERRY, BERRY; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/shuckle/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/skarmory.asm b/data/pokemon/base_stats/skarmory.asm index 4d0b5f3de..aaeddade7 100644 --- a/data/pokemon/base_stats/skarmory.asm +++ b/data/pokemon/base_stats/skarmory.asm @@ -3,20 +3,19 @@ db 65, 80, 140, 70, 40, 70 ; hp atk def spd sat sdf - db STEEL, FLYING + db STEEL, FLYING ; type db 25 ; catch rate db 168 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/skarmory/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, CUT, FLY ; end diff --git a/data/pokemon/base_stats/skiploom.asm b/data/pokemon/base_stats/skiploom.asm index 29a7be748..c37c5da1f 100644 --- a/data/pokemon/base_stats/skiploom.asm +++ b/data/pokemon/base_stats/skiploom.asm @@ -3,20 +3,19 @@ db 55, 45, 50, 80, 45, 65 ; hp atk def spd sat sdf - db GRASS, FLYING + db GRASS, FLYING ; type db 120 ; catch rate db 136 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/skiploom/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FAIRY, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH ; end diff --git a/data/pokemon/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm index a9fc61e3a..5696c8c1e 100644 --- a/data/pokemon/base_stats/slowbro.asm +++ b/data/pokemon/base_stats/slowbro.asm @@ -3,20 +3,19 @@ db 95, 75, 110, 30, 100, 80 ; hp atk def spd sat sdf - db WATER, PSYCHIC + db WATER, PSYCHIC ; type db 75 ; catch rate db 164 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/slowbro/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, FURY_CUTTER, NIGHTMARE, SURF, STRENGTH, FLASH, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/slowking.asm b/data/pokemon/base_stats/slowking.asm index 59d6c83e4..d40beb2f9 100644 --- a/data/pokemon/base_stats/slowking.asm +++ b/data/pokemon/base_stats/slowking.asm @@ -3,20 +3,19 @@ db 95, 75, 80, 30, 100, 110 ; hp atk def spd sat sdf - db WATER, PSYCHIC + db WATER, PSYCHIC ; type db 70 ; catch rate db 164 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/slowking/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, FURY_CUTTER, NIGHTMARE, SURF, STRENGTH, FLASH, WHIRLPOOL, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm index cb9bc813b..95ab73a95 100644 --- a/data/pokemon/base_stats/slowpoke.asm +++ b/data/pokemon/base_stats/slowpoke.asm @@ -3,20 +3,19 @@ db 90, 65, 65, 15, 40, 40 ; hp atk def spd sat sdf - db WATER, PSYCHIC + db WATER, PSYCHIC ; type db 190 ; catch rate db 99 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/slowpoke/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, STRENGTH, FLASH, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/slugma.asm b/data/pokemon/base_stats/slugma.asm index 234e844b9..77bb71573 100644 --- a/data/pokemon/base_stats/slugma.asm +++ b/data/pokemon/base_stats/slugma.asm @@ -3,20 +3,19 @@ db 40, 40, 40, 20, 70, 40 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 190 ; catch rate db 78 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/slugma/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/smeargle.asm b/data/pokemon/base_stats/smeargle.asm index 2373cb0f0..6d7ebe8a7 100644 --- a/data/pokemon/base_stats/smeargle.asm +++ b/data/pokemon/base_stats/smeargle.asm @@ -3,20 +3,19 @@ db 55, 20, 35, 75, 20, 45 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 106 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/smeargle/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/smoochum.asm b/data/pokemon/base_stats/smoochum.asm index f8f5e22f6..4739e5269 100644 --- a/data/pokemon/base_stats/smoochum.asm +++ b/data/pokemon/base_stats/smoochum.asm @@ -3,20 +3,19 @@ db 45, 30, 15, 65, 85, 65 ; hp atk def spd sat sdf - db ICE, PSYCHIC + db ICE, PSYCHIC ; type db 45 ; catch rate db 87 ; base exp - db ICE_BERRY ; item 1 - db ICE_BERRY ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db ICE_BERRY, ICE_BERRY; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/smoochum/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SWEET_SCENT, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/sneasel.asm b/data/pokemon/base_stats/sneasel.asm index 4e24a8ada..a5fbeff57 100644 --- a/data/pokemon/base_stats/sneasel.asm +++ b/data/pokemon/base_stats/sneasel.asm @@ -3,20 +3,19 @@ db 55, 95, 55, 115, 35, 75 ; hp atk def spd sat sdf - db DARK, ICE + db DARK, ICE ; type db 60 ; catch rate db 132 ; base exp - db NO_ITEM ; item 1 - db QUICK_CLAW ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, QUICK_CLAW; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sneasel/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, NIGHTMARE, CUT, SURF, STRENGTH, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm index 9a9e426e9..a5bf72f69 100644 --- a/data/pokemon/base_stats/snorlax.asm +++ b/data/pokemon/base_stats/snorlax.asm @@ -3,20 +3,19 @@ db 160, 110, 65, 30, 65, 110 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 25 ; catch rate db 154 ; base exp - db LEFTOVERS ; item 1 - db LEFTOVERS ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db LEFTOVERS, LEFTOVERS; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/snorlax/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/snubbull.asm b/data/pokemon/base_stats/snubbull.asm index 6dbca375e..11d121ec2 100644 --- a/data/pokemon/base_stats/snubbull.asm +++ b/data/pokemon/base_stats/snubbull.asm @@ -3,20 +3,19 @@ db 60, 80, 50, 30, 40, 40 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 190 ; catch rate db 63 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/snubbull/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FIELD, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm index a55e8a17c..66e929f65 100644 --- a/data/pokemon/base_stats/spearow.asm +++ b/data/pokemon/base_stats/spearow.asm @@ -3,20 +3,19 @@ db 40, 60, 30, 70, 31, 31 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 255 ; catch rate db 58 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/spearow/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/spinarak.asm b/data/pokemon/base_stats/spinarak.asm index fb2fbb7f3..9c73af7c0 100644 --- a/data/pokemon/base_stats/spinarak.asm +++ b/data/pokemon/base_stats/spinarak.asm @@ -3,20 +3,19 @@ db 40, 60, 40, 30, 40, 40 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 255 ; catch rate db 54 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/spinarak/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm index 6582f88a8..6f6712431 100644 --- a/data/pokemon/base_stats/squirtle.asm +++ b/data/pokemon/base_stats/squirtle.asm @@ -3,20 +3,19 @@ db 44, 48, 65, 43, 50, 64 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 66 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/squirtle/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/stantler.asm b/data/pokemon/base_stats/stantler.asm index a8537a1e0..1a14001a2 100644 --- a/data/pokemon/base_stats/stantler.asm +++ b/data/pokemon/base_stats/stantler.asm @@ -3,20 +3,19 @@ db 73, 95, 62, 85, 85, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 165 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/stantler/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm index 55c5fcc99..bb6f66218 100644 --- a/data/pokemon/base_stats/starmie.asm +++ b/data/pokemon/base_stats/starmie.asm @@ -3,20 +3,19 @@ db 60, 75, 85, 115, 100, 85 ; hp atk def spd sat sdf - db WATER, PSYCHIC + db WATER, PSYCHIC ; type db 60 ; catch rate db 207 ; base exp - db STARDUST ; item 1 - db STAR_PIECE ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db STARDUST, STAR_PIECE; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/starmie/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm index d702faaf2..1b2fd1dc7 100644 --- a/data/pokemon/base_stats/staryu.asm +++ b/data/pokemon/base_stats/staryu.asm @@ -3,20 +3,19 @@ db 30, 45, 55, 85, 70, 55 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 225 ; catch rate db 106 ; base exp - db STARDUST ; item 1 - db STAR_PIECE ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db STARDUST, STAR_PIECE; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/staryu/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/steelix.asm b/data/pokemon/base_stats/steelix.asm index 6931418c8..d337a2d52 100644 --- a/data/pokemon/base_stats/steelix.asm +++ b/data/pokemon/base_stats/steelix.asm @@ -3,20 +3,19 @@ db 75, 85, 200, 30, 55, 65 ; hp atk def spd sat sdf - db STEEL, GROUND + db STEEL, GROUND ; type db 25 ; catch rate db 196 ; base exp - db NO_ITEM ; item 1 - db METAL_COAT ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, METAL_COAT; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/steelix/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/sudowoodo.asm b/data/pokemon/base_stats/sudowoodo.asm index 40726999d..ecd0b4be4 100644 --- a/data/pokemon/base_stats/sudowoodo.asm +++ b/data/pokemon/base_stats/sudowoodo.asm @@ -3,20 +3,19 @@ db 70, 100, 115, 30, 30, 65 ; hp atk def spd sat sdf - db ROCK, ROCK + db ROCK, ROCK ; type db 65 ; catch rate db 135 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sudowoodo/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH ; end diff --git a/data/pokemon/base_stats/suicune.asm b/data/pokemon/base_stats/suicune.asm index b199eddd7..68feb6003 100644 --- a/data/pokemon/base_stats/suicune.asm +++ b/data/pokemon/base_stats/suicune.asm @@ -3,20 +3,19 @@ db 100, 75, 115, 85, 90, 115 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 3 ; catch rate db 215 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/suicune/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, CUT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/sunflora.asm b/data/pokemon/base_stats/sunflora.asm index ec39d0932..04c0ed1d8 100644 --- a/data/pokemon/base_stats/sunflora.asm +++ b/data/pokemon/base_stats/sunflora.asm @@ -3,20 +3,19 @@ db 75, 75, 55, 30, 105, 85 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 120 ; catch rate db 146 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sunflora/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/sunkern.asm b/data/pokemon/base_stats/sunkern.asm index 7e502900c..2a5581ab2 100644 --- a/data/pokemon/base_stats/sunkern.asm +++ b/data/pokemon/base_stats/sunkern.asm @@ -3,20 +3,19 @@ db 30, 30, 30, 30, 30, 30 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 235 ; catch rate db 52 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sunkern/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/swinub.asm b/data/pokemon/base_stats/swinub.asm index ee6bd783a..800b32f49 100644 --- a/data/pokemon/base_stats/swinub.asm +++ b/data/pokemon/base_stats/swinub.asm @@ -3,20 +3,19 @@ db 50, 50, 40, 50, 30, 30 ; hp atk def spd sat sdf - db ICE, GROUND + db ICE, GROUND ; type db 225 ; catch rate db 78 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/swinub/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm index a2b5b06a0..9a41a16ab 100644 --- a/data/pokemon/base_stats/tangela.asm +++ b/data/pokemon/base_stats/tangela.asm @@ -3,20 +3,19 @@ db 65, 55, 115, 60, 100, 40 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 45 ; catch rate db 166 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tangela/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm index 936d60a4d..8d6d0ca93 100644 --- a/data/pokemon/base_stats/tauros.asm +++ b/data/pokemon/base_stats/tauros.asm @@ -3,20 +3,19 @@ db 75, 100, 95, 110, 40, 70 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 211 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tauros/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, REST, ATTRACT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/teddiursa.asm b/data/pokemon/base_stats/teddiursa.asm index 18c4ede7a..2283850ab 100644 --- a/data/pokemon/base_stats/teddiursa.asm +++ b/data/pokemon/base_stats/teddiursa.asm @@ -3,20 +3,19 @@ db 60, 80, 50, 40, 50, 50 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 120 ; catch rate db 124 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/teddiursa/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm index 94dcb42b0..d036f1401 100644 --- a/data/pokemon/base_stats/tentacool.asm +++ b/data/pokemon/base_stats/tentacool.asm @@ -3,20 +3,19 @@ db 40, 40, 35, 70, 50, 100 ; hp atk def spd sat sdf - db WATER, POISON + db WATER, POISON ; type db 190 ; catch rate db 105 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tentacool/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm index e922c5938..2e47041ff 100644 --- a/data/pokemon/base_stats/tentacruel.asm +++ b/data/pokemon/base_stats/tentacruel.asm @@ -3,20 +3,19 @@ db 80, 70, 65, 100, 80, 120 ; hp atk def spd sat sdf - db WATER, POISON + db WATER, POISON ; type db 60 ; catch rate db 205 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tentacruel/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/togepi.asm b/data/pokemon/base_stats/togepi.asm index 0f22863e5..14c5cb58b 100644 --- a/data/pokemon/base_stats/togepi.asm +++ b/data/pokemon/base_stats/togepi.asm @@ -3,20 +3,19 @@ db 35, 20, 65, 20, 40, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 190 ; catch rate db 74 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/togepi/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, FLASH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/togetic.asm b/data/pokemon/base_stats/togetic.asm index ef2f94305..2c4461836 100644 --- a/data/pokemon/base_stats/togetic.asm +++ b/data/pokemon/base_stats/togetic.asm @@ -3,20 +3,19 @@ db 55, 40, 85, 40, 80, 105 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 75 ; catch rate db 114 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/togetic/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn AVIAN, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, STEEL_WING, FLY, FLASH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/totodile.asm b/data/pokemon/base_stats/totodile.asm index 49c7603f6..4a81090a1 100644 --- a/data/pokemon/base_stats/totodile.asm +++ b/data/pokemon/base_stats/totodile.asm @@ -3,20 +3,19 @@ db 50, 65, 64, 43, 44, 48 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 66 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/totodile/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/typhlosion.asm b/data/pokemon/base_stats/typhlosion.asm index ed6fcf198..d52c06ddf 100644 --- a/data/pokemon/base_stats/typhlosion.asm +++ b/data/pokemon/base_stats/typhlosion.asm @@ -3,20 +3,19 @@ db 78, 84, 78, 100, 109, 85 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 209 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/typhlosion/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/tyranitar.asm b/data/pokemon/base_stats/tyranitar.asm index b6ed98dd7..e11e39a2a 100644 --- a/data/pokemon/base_stats/tyranitar.asm +++ b/data/pokemon/base_stats/tyranitar.asm @@ -3,20 +3,19 @@ db 100, 134, 110, 61, 95, 100 ; hp atk def spd sat sdf - db ROCK, DARK + db ROCK, DARK ; type db 45 ; catch rate db 218 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tyranitar/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DETECT, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/tyrogue.asm b/data/pokemon/base_stats/tyrogue.asm index 026aab404..38f5dc913 100644 --- a/data/pokemon/base_stats/tyrogue.asm +++ b/data/pokemon/base_stats/tyrogue.asm @@ -3,20 +3,19 @@ db 35, 35, 35, 35, 35, 35 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 75 ; catch rate db 91 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tyrogue/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH ; end diff --git a/data/pokemon/base_stats/umbreon.asm b/data/pokemon/base_stats/umbreon.asm index 0382e69e2..962cb7a84 100644 --- a/data/pokemon/base_stats/umbreon.asm +++ b/data/pokemon/base_stats/umbreon.asm @@ -3,20 +3,19 @@ db 95, 65, 110, 65, 60, 130 ; hp atk def spd sat sdf - db DARK, DARK + db DARK, DARK ; type db 45 ; catch rate db 197 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/umbreon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/unown.asm b/data/pokemon/base_stats/unown.asm index ef67b1ce1..992d51971 100644 --- a/data/pokemon/base_stats/unown.asm +++ b/data/pokemon/base_stats/unown.asm @@ -3,20 +3,19 @@ db 48, 72, 48, 48, 72, 48 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 225 ; catch rate db 61 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/unown_a/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/ursaring.asm b/data/pokemon/base_stats/ursaring.asm index 8f2031c77..aed338f70 100644 --- a/data/pokemon/base_stats/ursaring.asm +++ b/data/pokemon/base_stats/ursaring.asm @@ -3,20 +3,19 @@ db 90, 130, 75, 55, 75, 75 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 60 ; catch rate db 189 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ursaring/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm index 083a67499..245179e51 100644 --- a/data/pokemon/base_stats/vaporeon.asm +++ b/data/pokemon/base_stats/vaporeon.asm @@ -3,20 +3,19 @@ db 130, 65, 60, 65, 110, 95 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 196 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/vaporeon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm index c92c7fbff..76bcf584b 100644 --- a/data/pokemon/base_stats/venomoth.asm +++ b/data/pokemon/base_stats/venomoth.asm @@ -3,20 +3,19 @@ db 70, 65, 60, 90, 90, 75 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 75 ; catch rate db 138 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/venomoth/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm index 40a9639b8..b55518730 100644 --- a/data/pokemon/base_stats/venonat.asm +++ b/data/pokemon/base_stats/venonat.asm @@ -3,20 +3,19 @@ db 60, 55, 50, 45, 40, 55 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 190 ; catch rate db 75 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/venonat/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, THIEF ; end diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm index 465b3d0fc..7fd7895a1 100644 --- a/data/pokemon/base_stats/venusaur.asm +++ b/data/pokemon/base_stats/venusaur.asm @@ -3,20 +3,19 @@ db 80, 82, 83, 80, 100, 100 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 45 ; catch rate db 208 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/venusaur/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm index e4e1a24e5..3969e5f25 100644 --- a/data/pokemon/base_stats/victreebel.asm +++ b/data/pokemon/base_stats/victreebel.asm @@ -3,20 +3,19 @@ db 80, 105, 65, 70, 100, 60 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 45 ; catch rate db 191 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/victreebel/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm index 3f0d0b996..8cbce585a 100644 --- a/data/pokemon/base_stats/vileplume.asm +++ b/data/pokemon/base_stats/vileplume.asm @@ -3,20 +3,19 @@ db 75, 80, 85, 50, 100, 90 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 45 ; catch rate db 184 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/vileplume/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm index 2767568fa..34f4f6d90 100644 --- a/data/pokemon/base_stats/voltorb.asm +++ b/data/pokemon/base_stats/voltorb.asm @@ -3,20 +3,19 @@ db 40, 30, 50, 100, 55, 55 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 190 ; catch rate db 103 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/voltorb/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm index e012402a0..50f5406d1 100644 --- a/data/pokemon/base_stats/vulpix.asm +++ b/data/pokemon/base_stats/vulpix.asm @@ -3,20 +3,19 @@ db 38, 41, 40, 65, 50, 65 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 190 ; catch rate db 63 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/vulpix/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm index 7df729f3f..a032a60a6 100644 --- a/data/pokemon/base_stats/wartortle.asm +++ b/data/pokemon/base_stats/wartortle.asm @@ -3,20 +3,19 @@ db 59, 63, 80, 58, 65, 80 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 143 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/wartortle/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm index 520109245..5c8475b8f 100644 --- a/data/pokemon/base_stats/weedle.asm +++ b/data/pokemon/base_stats/weedle.asm @@ -3,20 +3,19 @@ db 40, 35, 30, 50, 20, 20 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 255 ; catch rate db 52 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/weedle/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm index 3dbd2595e..4c597e7d7 100644 --- a/data/pokemon/base_stats/weepinbell.asm +++ b/data/pokemon/base_stats/weepinbell.asm @@ -3,20 +3,19 @@ db 65, 90, 50, 55, 85, 45 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 120 ; catch rate db 151 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/weepinbell/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm index 41c1d4f5d..25e0e45e9 100644 --- a/data/pokemon/base_stats/weezing.asm +++ b/data/pokemon/base_stats/weezing.asm @@ -3,20 +3,19 @@ db 65, 90, 120, 60, 85, 70 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 60 ; catch rate db 173 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/weezing/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm index e2d3bd7e6..38f0f815d 100644 --- a/data/pokemon/base_stats/wigglytuff.asm +++ b/data/pokemon/base_stats/wigglytuff.asm @@ -3,20 +3,19 @@ db 140, 70, 45, 45, 75, 50 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 50 ; catch rate db 109 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/wigglytuff/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FAIRY, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/wobbuffet.asm b/data/pokemon/base_stats/wobbuffet.asm index 393655150..a94280a8c 100644 --- a/data/pokemon/base_stats/wobbuffet.asm +++ b/data/pokemon/base_stats/wobbuffet.asm @@ -3,20 +3,19 @@ db 190, 33, 58, 33, 33, 58 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 45 ; catch rate db 177 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/wobbuffet/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/wooper.asm b/data/pokemon/base_stats/wooper.asm index db3f7f90a..0d45b3c34 100644 --- a/data/pokemon/base_stats/wooper.asm +++ b/data/pokemon/base_stats/wooper.asm @@ -3,20 +3,19 @@ db 55, 45, 45, 15, 25, 25 ; hp atk def spd sat sdf - db WATER, GROUND + db WATER, GROUND ; type db 255 ; catch rate db 52 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/wooper/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/xatu.asm b/data/pokemon/base_stats/xatu.asm index a5941421e..cf3688b6f 100644 --- a/data/pokemon/base_stats/xatu.asm +++ b/data/pokemon/base_stats/xatu.asm @@ -3,20 +3,19 @@ db 65, 75, 70, 95, 95, 70 ; hp atk def spd sat sdf - db PSYCHIC, FLYING + db PSYCHIC, FLYING ; type db 75 ; catch rate db 171 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/xatu/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLY, FLASH ; end diff --git a/data/pokemon/base_stats/yanma.asm b/data/pokemon/base_stats/yanma.asm index 0bff5157a..78f412844 100644 --- a/data/pokemon/base_stats/yanma.asm +++ b/data/pokemon/base_stats/yanma.asm @@ -3,20 +3,19 @@ db 65, 65, 45, 95, 75, 45 ; hp atk def spd sat sdf - db BUG, FLYING + db BUG, FLYING ; type db 75 ; catch rate db 147 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/yanma/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm index 35b557404..e56172d77 100644 --- a/data/pokemon/base_stats/zapdos.asm +++ b/data/pokemon/base_stats/zapdos.asm @@ -3,20 +3,19 @@ db 90, 90, 85, 100, 125, 90 ; hp atk def spd sat sdf - db ELECTRIC, FLYING + db ELECTRIC, FLYING ; type db 3 ; catch rate db 216 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/zapdos/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, STEEL_WING, FLY, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm index 5da4ceeba..84673fef7 100644 --- a/data/pokemon/base_stats/zubat.asm +++ b/data/pokemon/base_stats/zubat.asm @@ -3,20 +3,19 @@ db 40, 45, 35, 55, 30, 40 ; hp atk def spd sat sdf - db POISON, FLYING + db POISON, FLYING ; type db 255 ; catch rate db 54 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/zubat/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING ; end diff --git a/data/pokemon/dex_entries/abra.asm b/data/pokemon/dex_entries/abra.asm index be3b263cd..91f55c23f 100644 --- a/data/pokemon/dex_entries/abra.asm +++ b/data/pokemon/dex_entries/abra.asm @@ -1,10 +1,10 @@ -; AbraPokedexEntry: ; 0x1830d5 db "PSI@" ; species name dw 211, 430 ; height, weight db "It hypnotizes" next "itself so that it" next "can teleport away" + page "when it senses" next "danger, even" next "if it is asleep.@" diff --git a/data/pokemon/dex_entries/aerodactyl.asm b/data/pokemon/dex_entries/aerodactyl.asm index d6189500b..48f943c99 100644 --- a/data/pokemon/dex_entries/aerodactyl.asm +++ b/data/pokemon/dex_entries/aerodactyl.asm @@ -1,10 +1,10 @@ -; AerodactylPokedexEntry: ; 0x1cc576 db "FOSSIL@" ; species name dw 511, 1300 ; height, weight db "In prehistoric" next "times, this" next "#MON flew" + page "freely and" next "fearlessly through" next "the skies.@" diff --git a/data/pokemon/dex_entries/aipom.asm b/data/pokemon/dex_entries/aipom.asm index 3fadb9169..4cb0f86ce 100644 --- a/data/pokemon/dex_entries/aipom.asm +++ b/data/pokemon/dex_entries/aipom.asm @@ -1,10 +1,10 @@ -; AipomPokedexEntry: ; 0x1cda11 db "LONG TAIL@" ; species name dw 207, 250 ; height, weight db "It uses its tail" next "to hang on to tree" next "branches. It uses" + page "its momentum to" next "swing from one" next "branch to another.@" diff --git a/data/pokemon/dex_entries/alakazam.asm b/data/pokemon/dex_entries/alakazam.asm index 1d34fa1f7..e13ef835f 100644 --- a/data/pokemon/dex_entries/alakazam.asm +++ b/data/pokemon/dex_entries/alakazam.asm @@ -1,10 +1,10 @@ -; AlakazamPokedexEntry: ; 0x1b8000 db "PSI@" ; species name dw 411, 1060 ; height, weight db "It has an IQ of" next "5000. It calcu-" next "lates many things" + page "in order to gain" next "the edge in every" next "battle.@" diff --git a/data/pokemon/dex_entries/ampharos.asm b/data/pokemon/dex_entries/ampharos.asm index 1f48fe322..dd5c18620 100644 --- a/data/pokemon/dex_entries/ampharos.asm +++ b/data/pokemon/dex_entries/ampharos.asm @@ -1,10 +1,10 @@ -; AmpharosPokedexEntry: ; 0x1cd626 db "LIGHT@" ; species name dw 407, 1360 ; height, weight db "When it gets dark," next "the light from its" next "bright, shiny tail" + page "can be seen from" next "far away on the" next "ocean's surface.@" diff --git a/data/pokemon/dex_entries/arbok.asm b/data/pokemon/dex_entries/arbok.asm index c5d5b7704..0ecab500c 100644 --- a/data/pokemon/dex_entries/arbok.asm +++ b/data/pokemon/dex_entries/arbok.asm @@ -1,10 +1,10 @@ -; ArbokPokedexEntry: ; 0x18203d db "COBRA@" ; species name dw 1106, 1430 ; height, weight db "To intimidate" next "foes, it spreads" next "its chest wide and" + page "makes eerie sounds" next "by expelling air" next "from its mouth.@" diff --git a/data/pokemon/dex_entries/arcanine.asm b/data/pokemon/dex_entries/arcanine.asm index e319bcb6a..2443a1be8 100644 --- a/data/pokemon/dex_entries/arcanine.asm +++ b/data/pokemon/dex_entries/arcanine.asm @@ -1,10 +1,10 @@ -; ArcaninePokedexEntry: ; 0x182f1c db "LEGENDARY@" ; species name dw 603, 3420 ; height, weight db "An ancient picture" next "scroll shows that" next "people were" + page "attracted to its" next "movement as it ran" next "through prairies.@" diff --git a/data/pokemon/dex_entries/ariados.asm b/data/pokemon/dex_entries/ariados.asm index a27d13fef..bdc335f2c 100644 --- a/data/pokemon/dex_entries/ariados.asm +++ b/data/pokemon/dex_entries/ariados.asm @@ -1,10 +1,10 @@ -; AriadosPokedexEntry: ; 0x1cd083 db "LONG LEG@" ; species name dw 307, 740 ; height, weight db "Rather than mak-" next "ing a nest in one" next "specific spot, it" + page "wanders in search" next "of food after" next "darkness falls.@" diff --git a/data/pokemon/dex_entries/articuno.asm b/data/pokemon/dex_entries/articuno.asm index 92b297d28..50439c59b 100644 --- a/data/pokemon/dex_entries/articuno.asm +++ b/data/pokemon/dex_entries/articuno.asm @@ -1,10 +1,10 @@ -; ArticunoPokedexEntry: ; 0x1cc632 db "FREEZE@" ; species name dw 507, 1220 ; height, weight db "Legendary bird" next "#MON. As it" next "flies through the" + page "sky, it cools the" next "air, causing snow" next "to fall.@" diff --git a/data/pokemon/dex_entries/azumarill.asm b/data/pokemon/dex_entries/azumarill.asm index bdbc83d1d..892ac77e3 100644 --- a/data/pokemon/dex_entries/azumarill.asm +++ b/data/pokemon/dex_entries/azumarill.asm @@ -1,10 +1,10 @@ -; AzumarillPokedexEntry: ; 0x1cd771 db "AQUARABBIT@" ; species name dw 207, 630 ; height, weight db "The bubble-like" next "pattern on its" next "stomach helps it" + page "camouflage itself" next "when it's in the" next "water.@" diff --git a/data/pokemon/dex_entries/bayleef.asm b/data/pokemon/dex_entries/bayleef.asm index ac66dccd5..534c4c972 100644 --- a/data/pokemon/dex_entries/bayleef.asm +++ b/data/pokemon/dex_entries/bayleef.asm @@ -1,10 +1,10 @@ -; BayleefPokedexEntry: ; 0x1cc9e9 db "LEAF@" ; species name dw 311, 350 ; height, weight db "The scent that" next "wafts from the" next "leaves on its neck" + page "causes anyone who" next "smells it to" next "become energetic.@" diff --git a/data/pokemon/dex_entries/beedrill.asm b/data/pokemon/dex_entries/beedrill.asm index 505396ca1..7dc8f6262 100644 --- a/data/pokemon/dex_entries/beedrill.asm +++ b/data/pokemon/dex_entries/beedrill.asm @@ -1,10 +1,10 @@ -; BeedrillPokedexEntry: ; 0x181c8a db "POISON BEE@" ; species name dw 303, 650 ; height, weight db "It uses sharp," next "poisonous stings" next "to defeat prey," + page "then takes the" next "victim back to its" next "nest for food.@" diff --git a/data/pokemon/dex_entries/bellossom.asm b/data/pokemon/dex_entries/bellossom.asm index 0d13ed65d..1e90f4b35 100644 --- a/data/pokemon/dex_entries/bellossom.asm +++ b/data/pokemon/dex_entries/bellossom.asm @@ -1,10 +1,10 @@ -; BellossomPokedexEntry: ; 0x1cd69a db "FLOWER@" ; species name dw 104, 130 ; height, weight db "When these dance" next "together, their" next "petals rub against" + page "each other," next "making pretty," next "relaxing sounds.@" diff --git a/data/pokemon/dex_entries/bellsprout.asm b/data/pokemon/dex_entries/bellsprout.asm index fcd42c125..f279bbefb 100644 --- a/data/pokemon/dex_entries/bellsprout.asm +++ b/data/pokemon/dex_entries/bellsprout.asm @@ -1,10 +1,10 @@ -; BellsproutPokedexEntry: ; 0x1b81a1 db "FLOWER@" ; species name dw 204, 90 ; height, weight db "If it notices" next "anything that" next "moves, it" + page "immediately flings" next "its vine at the" next "object.@" diff --git a/data/pokemon/dex_entries/blastoise.asm b/data/pokemon/dex_entries/blastoise.asm index ea2a18d05..eeb7cf202 100644 --- a/data/pokemon/dex_entries/blastoise.asm +++ b/data/pokemon/dex_entries/blastoise.asm @@ -1,10 +1,10 @@ -; BlastoisePokedexEntry: ; 0x1819f9 db "SHELLFISH@" ; species name dw 503, 1890 ; height, weight db "It firmly plants" next "its feet on the" next "ground before" + page "shooting water" next "from the jets on" next "its back.@" diff --git a/data/pokemon/dex_entries/blissey.asm b/data/pokemon/dex_entries/blissey.asm index 10151a398..2496478b5 100644 --- a/data/pokemon/dex_entries/blissey.asm +++ b/data/pokemon/dex_entries/blissey.asm @@ -1,10 +1,10 @@ -; BlisseyPokedexEntry: ; 0x1d14f7 db "HAPPINESS@" ; species name dw 411, 1030 ; height, weight db "Biting into one" next "of the delicious" next "eggs that BLISSEY" + page "provides will make" next "everyone around" next "smile with joy.@" diff --git a/data/pokemon/dex_entries/bulbasaur.asm b/data/pokemon/dex_entries/bulbasaur.asm index fdfe39c8c..88fca15ec 100644 --- a/data/pokemon/dex_entries/bulbasaur.asm +++ b/data/pokemon/dex_entries/bulbasaur.asm @@ -1,10 +1,10 @@ -; BulbasaurPokedexEntry: ; 0x181695 db "SEED@" ; species name dw 204, 150 ; height, weight db "While it is young," next "it uses the" next "nutrients that are" + page "stored in the" next "seeds on its back" next "in order to grow.@" diff --git a/data/pokemon/dex_entries/butterfree.asm b/data/pokemon/dex_entries/butterfree.asm index edf9e2599..9661cce68 100644 --- a/data/pokemon/dex_entries/butterfree.asm +++ b/data/pokemon/dex_entries/butterfree.asm @@ -1,10 +1,10 @@ -; ButterfreePokedexEntry: ; 0x181b45 db "BUTTERFLY@" ; species name dw 307, 710 ; height, weight db "It flits from" next "flower to flower," next "collecting honey." + page "It can even" next "identify distant" next "flowers in bloom.@" diff --git a/data/pokemon/dex_entries/caterpie.asm b/data/pokemon/dex_entries/caterpie.asm index 940aa014f..2c5d74c8d 100644 --- a/data/pokemon/dex_entries/caterpie.asm +++ b/data/pokemon/dex_entries/caterpie.asm @@ -1,10 +1,10 @@ -; CaterpiePokedexEntry: ; 0x181a60 db "WORM@" ; species name dw 100, 60 ; height, weight db "It crawls into" next "foliage where it" next "camouflages itself" + page "among leaves that" next "are the same color" next "as its body.@" diff --git a/data/pokemon/dex_entries/celebi.asm b/data/pokemon/dex_entries/celebi.asm index 3922d1749..ae0bc0fc0 100644 --- a/data/pokemon/dex_entries/celebi.asm +++ b/data/pokemon/dex_entries/celebi.asm @@ -1,10 +1,10 @@ -; CelebiPokedexEntry: ; 0x1d18cc db "TIMETRAVEL@" ; species name dw 200, 110 ; height, weight db "Revered as a" next "guardian of the" next "forest, CELEBI" + page "appears wherever" next "beautiful forests" next "exist.@" diff --git a/data/pokemon/dex_entries/chansey.asm b/data/pokemon/dex_entries/chansey.asm index fd45cf121..2cc0b278b 100644 --- a/data/pokemon/dex_entries/chansey.asm +++ b/data/pokemon/dex_entries/chansey.asm @@ -1,10 +1,10 @@ -; ChanseyPokedexEntry: ; 0x1b942e db "EGG@" ; species name dw 307, 760 ; height, weight db "People try to" next "catch it for its" next "extremely" + page "nutritious eggs," next "but it rarely can" next "be found.@" diff --git a/data/pokemon/dex_entries/charizard.asm b/data/pokemon/dex_entries/charizard.asm index 53a542fb5..2bd55febe 100644 --- a/data/pokemon/dex_entries/charizard.asm +++ b/data/pokemon/dex_entries/charizard.asm @@ -1,10 +1,10 @@ -; CharizardPokedexEntry: ; 0x1818b3 db "FLAME@" ; species name dw 507, 2000 ; height, weight db "It uses its wings" next "to fly high. The" next "temperature of its" + page "fire increases as" next "it gains exper-" next "ience in battle.@" diff --git a/data/pokemon/dex_entries/charmander.asm b/data/pokemon/dex_entries/charmander.asm index a89b138f8..19ed15cbc 100644 --- a/data/pokemon/dex_entries/charmander.asm +++ b/data/pokemon/dex_entries/charmander.asm @@ -1,10 +1,10 @@ -; CharmanderPokedexEntry: ; 0x1817db db "LIZARD@" ; species name dw 200, 190 ; height, weight db "If it's healthy," next "the flame on the" next "tip of its tail" + page "will burn vigor-" next "ously, even if it" next "gets a bit wet.@" diff --git a/data/pokemon/dex_entries/charmeleon.asm b/data/pokemon/dex_entries/charmeleon.asm index 2891764c3..17868516d 100644 --- a/data/pokemon/dex_entries/charmeleon.asm +++ b/data/pokemon/dex_entries/charmeleon.asm @@ -1,10 +1,10 @@ -; CharmeleonPokedexEntry: ; 0x18184a db "FLAME@" ; species name dw 307, 420 ; height, weight db "If it becomes" next "agitated during" next "battle, it spouts" + page "intense flames," next "incinerating its" next "surroundings.@" diff --git a/data/pokemon/dex_entries/chikorita.asm b/data/pokemon/dex_entries/chikorita.asm index 3ba17e1f8..ecf5f8520 100644 --- a/data/pokemon/dex_entries/chikorita.asm +++ b/data/pokemon/dex_entries/chikorita.asm @@ -1,10 +1,10 @@ -; ChikoritaPokedexEntry: ; 0x1cc988 db "LEAF@" ; species name dw 211, 140 ; height, weight db "It loves to bask" next "in the sunlight." next "It uses the leaf" + page "on its head to" next "seek out warm" next "places.@" diff --git a/data/pokemon/dex_entries/chinchou.asm b/data/pokemon/dex_entries/chinchou.asm index 22d887859..6074d4995 100644 --- a/data/pokemon/dex_entries/chinchou.asm +++ b/data/pokemon/dex_entries/chinchou.asm @@ -1,10 +1,10 @@ -; ChinchouPokedexEntry: ; 0x1cd165 db "ANGLER@" ; species name dw 108, 260 ; height, weight db "Its antennae, whi-" next "ch evolved from a" next "fin, have both po-" + page "sitive and neg-" next "ative charges flo-" next "wing through them.@" diff --git a/data/pokemon/dex_entries/clefable.asm b/data/pokemon/dex_entries/clefable.asm index 240d70eb5..3ea166487 100644 --- a/data/pokemon/dex_entries/clefable.asm +++ b/data/pokemon/dex_entries/clefable.asm @@ -1,10 +1,10 @@ -; ClefablePokedexEntry: ; 0x182530 db "FAIRY@" ; species name dw 403, 880 ; height, weight db "Said to live in" next "quiet, remote" next "mountains, this" + page "type of fairy has" next "a strong aversion" next "to being seen.@" diff --git a/data/pokemon/dex_entries/clefairy.asm b/data/pokemon/dex_entries/clefairy.asm index b5973b21a..ff26e3e4a 100644 --- a/data/pokemon/dex_entries/clefairy.asm +++ b/data/pokemon/dex_entries/clefairy.asm @@ -1,10 +1,10 @@ -; ClefairyPokedexEntry: ; 0x1824c8 db "FAIRY@" ; species name dw 200, 170 ; height, weight db "Though rarely" next "seen, it becomes" next "easier to spot," + page "for some reason," next "on the night of a " next "full moon.@" diff --git a/data/pokemon/dex_entries/cleffa.asm b/data/pokemon/dex_entries/cleffa.asm index 897bb2501..9095f990f 100644 --- a/data/pokemon/dex_entries/cleffa.asm +++ b/data/pokemon/dex_entries/cleffa.asm @@ -1,10 +1,10 @@ -; CleffaPokedexEntry: ; 0x1cd2bc db "STARSHAPE@" ; species name dw 100, 70 ; height, weight db "If the impact site" next "of a meteorite is" next "found, this" + page "#MON is certain" next "to be within the" next "immediate area.@" diff --git a/data/pokemon/dex_entries/cloyster.asm b/data/pokemon/dex_entries/cloyster.asm index b1eaf80b9..7a887838d 100644 --- a/data/pokemon/dex_entries/cloyster.asm +++ b/data/pokemon/dex_entries/cloyster.asm @@ -1,10 +1,10 @@ -; CloysterPokedexEntry: ; 0x1b8ad9 db "BIVALVE@" ; species name dw 411, 2920 ; height, weight db "Even a missile" next "can't break the" next "spikes it uses to" + page "stab opponents." next "They're even hard-" next "er than its shell.@" diff --git a/data/pokemon/dex_entries/corsola.asm b/data/pokemon/dex_entries/corsola.asm index 52fbd0c44..fa073f0d0 100644 --- a/data/pokemon/dex_entries/corsola.asm +++ b/data/pokemon/dex_entries/corsola.asm @@ -1,10 +1,10 @@ -; CorsolaPokedexEntry: ; 0x1d0c68 db "CORAL@" ; species name dw 200, 110 ; height, weight db "The points on its" next "head absorb" next "nutrients from" + page "clean water. They" next "cannot survive in" next "polluted water.@" diff --git a/data/pokemon/dex_entries/crobat.asm b/data/pokemon/dex_entries/crobat.asm index 107683110..2b7e28f76 100644 --- a/data/pokemon/dex_entries/crobat.asm +++ b/data/pokemon/dex_entries/crobat.asm @@ -1,10 +1,10 @@ -; CrobatPokedexEntry: ; 0x1cd0f5 db "BAT@" ; species name dw 511, 1650 ; height, weight db "As a result of its" next "pursuit of faster," next "yet more silent" + page "flight, a new set" next "of wings grew on" next "its hind legs.@" diff --git a/data/pokemon/dex_entries/croconaw.asm b/data/pokemon/dex_entries/croconaw.asm index 0edcf80cc..0cde70653 100644 --- a/data/pokemon/dex_entries/croconaw.asm +++ b/data/pokemon/dex_entries/croconaw.asm @@ -1,10 +1,10 @@ -; CroconawPokedexEntry: ; 0x1ccc84 db "BIG JAW@" ; species name dw 307, 550 ; height, weight db "The tips of its" next "fangs are slanted" next "backward. Once" + page "those fangs clamp" next "down, the prey has" next "no hope of escape.@" diff --git a/data/pokemon/dex_entries/cubone.asm b/data/pokemon/dex_entries/cubone.asm index 911377864..6c8bed214 100644 --- a/data/pokemon/dex_entries/cubone.asm +++ b/data/pokemon/dex_entries/cubone.asm @@ -1,10 +1,10 @@ -; CubonePokedexEntry: ; 0x1b9068 db "LONELY@" ; species name dw 104, 140 ; height, weight db "It lost its mother" next "after its birth." next "It wears its" + page "mother's skull," next "never revealing" next "its true face.@" diff --git a/data/pokemon/dex_entries/cyndaquil.asm b/data/pokemon/dex_entries/cyndaquil.asm index 47329d37f..2604f4879 100644 --- a/data/pokemon/dex_entries/cyndaquil.asm +++ b/data/pokemon/dex_entries/cyndaquil.asm @@ -1,10 +1,10 @@ -; CyndaquilPokedexEntry: ; 0x1ccabd db "FIRE MOUSE@" ; species name dw 108, 170 ; height, weight db "The fire that" next "spouts from its" next "back burns hottest" + page "when it is angry." next "The flaring flames" next "intimidate foes.@" diff --git a/data/pokemon/dex_entries/delibird.asm b/data/pokemon/dex_entries/delibird.asm index 2c998d8be..47f8e2c90 100644 --- a/data/pokemon/dex_entries/delibird.asm +++ b/data/pokemon/dex_entries/delibird.asm @@ -1,10 +1,10 @@ -; DelibirdPokedexEntry: ; 0x1d0db1 db "DELIVERY@" ; species name dw 211, 350 ; height, weight db "It always carries" next "its food with it," next "wherever it goes." + page "If attacked, it" next "throws its food at" next "the opponent.@" diff --git a/data/pokemon/dex_entries/dewgong.asm b/data/pokemon/dex_entries/dewgong.asm index a3ff9b6f5..a7a0bf13e 100644 --- a/data/pokemon/dex_entries/dewgong.asm +++ b/data/pokemon/dex_entries/dewgong.asm @@ -1,10 +1,10 @@ -; DewgongPokedexEntry: ; 0x1b8934 db "SEA LION@" ; species name dw 507, 2650 ; height, weight db "It sleeps under" next "shallow ocean" next "waters during the" + page "day, then looks" next "for food at night" next "when it's cold.@" diff --git a/data/pokemon/dex_entries/diglett.asm b/data/pokemon/dex_entries/diglett.asm index 469d9311d..c2b6c4671 100644 --- a/data/pokemon/dex_entries/diglett.asm +++ b/data/pokemon/dex_entries/diglett.asm @@ -1,10 +1,10 @@ -; DiglettPokedexEntry: ; 0x182b30 db "MOLE@" ; species name dw 8, 20 ; height, weight db "It digs under-" next "ground and chews" next "on tree roots," + page "sticking its head" next "out only when the" next "sun isn't bright.@" diff --git a/data/pokemon/dex_entries/ditto.asm b/data/pokemon/dex_entries/ditto.asm index 5a838b5b8..ffe394a1b 100644 --- a/data/pokemon/dex_entries/ditto.asm +++ b/data/pokemon/dex_entries/ditto.asm @@ -1,10 +1,10 @@ -; DittoPokedexEntry: ; 0x1cc13c db "TRANSFORM@" ; species name dw 100, 90 ; height, weight db "When it encount-" next "ers another DITTO," next "it will move" + page "faster than normal" next "to duplicate that" next "opponent exactly.@" diff --git a/data/pokemon/dex_entries/dodrio.asm b/data/pokemon/dex_entries/dodrio.asm index ef495b99b..767fd9abe 100644 --- a/data/pokemon/dex_entries/dodrio.asm +++ b/data/pokemon/dex_entries/dodrio.asm @@ -1,10 +1,10 @@ -; DodrioPokedexEntry: ; 0x1b884a db "TRIPLEBIRD@" ; species name dw 511, 1880 ; height, weight db "An enemy that" next "takes its eyes off" next "any of the three" + page "heads--even for a" next "second--will get" next "pecked severely.@" diff --git a/data/pokemon/dex_entries/doduo.asm b/data/pokemon/dex_entries/doduo.asm index 124469457..eba65000d 100644 --- a/data/pokemon/dex_entries/doduo.asm +++ b/data/pokemon/dex_entries/doduo.asm @@ -1,10 +1,10 @@ -; DoduoPokedexEntry: ; 0x1b87d7 db "TWIN BIRD@" ; species name dw 407, 860 ; height, weight db "It lives on a" next "grassy plain where" next "it can see a long" + page "way. If it sees an" next "enemy, it runs" next "away at 60 mph.@" diff --git a/data/pokemon/dex_entries/donphan.asm b/data/pokemon/dex_entries/donphan.asm index 4dc489938..eac9c5467 100644 --- a/data/pokemon/dex_entries/donphan.asm +++ b/data/pokemon/dex_entries/donphan.asm @@ -1,10 +1,10 @@ -; DonphanPokedexEntry: ; 0x1d10ac db "ARMOR@" ; species name dw 307, 2650 ; height, weight db "Because this" next "#MON's skin is" next "so tough, a normal" + page "attack won't even" next "leave a scratch on" next "it.@" diff --git a/data/pokemon/dex_entries/dragonair.asm b/data/pokemon/dex_entries/dragonair.asm index cef4f8f29..915db2c21 100644 --- a/data/pokemon/dex_entries/dragonair.asm +++ b/data/pokemon/dex_entries/dragonair.asm @@ -1,10 +1,10 @@ -; DragonairPokedexEntry: ; 0x1cc7dc db "DRAGON@" ; species name dw 1301, 360 ; height, weight db "It is called the" next "divine #MON." next "When its entire" + page "body brightens" next "slightly, the" next "weather changes.@" diff --git a/data/pokemon/dex_entries/dragonite.asm b/data/pokemon/dex_entries/dragonite.asm index bbbc6cff0..9db1bf54b 100644 --- a/data/pokemon/dex_entries/dragonite.asm +++ b/data/pokemon/dex_entries/dragonite.asm @@ -1,10 +1,10 @@ -; DragonitePokedexEntry: ; 0x1cc843 db "DRAGON@" ; species name dw 703, 4630 ; height, weight db "It is said that" next "somewhere in the" next "ocean lies an" + page "island where these" next "gather. Only they" next "live there.@" diff --git a/data/pokemon/dex_entries/dratini.asm b/data/pokemon/dex_entries/dratini.asm index ef16aa20c..baa12940e 100644 --- a/data/pokemon/dex_entries/dratini.asm +++ b/data/pokemon/dex_entries/dratini.asm @@ -1,10 +1,10 @@ -; DratiniPokedexEntry: ; 0x1cc761 db "DRAGON@" ; species name dw 511, 70 ; height, weight db "It sheds many lay-" next "ers of skin as it" next "grows larger. Dur-" + page "ing this process," next "it is protected by" next "a rapid waterfall.@" diff --git a/data/pokemon/dex_entries/drowzee.asm b/data/pokemon/dex_entries/drowzee.asm index 34ae54435..fe6f14ba7 100644 --- a/data/pokemon/dex_entries/drowzee.asm +++ b/data/pokemon/dex_entries/drowzee.asm @@ -1,10 +1,10 @@ -; DrowzeePokedexEntry: ; 0x1b8d0a db "HYPNOSIS@" ; species name dw 303, 710 ; height, weight db "When it twitches" next "its nose, it can" next "tell where someone" + page "is sleeping and" next "what that person" next "is dreaming about.@" diff --git a/data/pokemon/dex_entries/dugtrio.asm b/data/pokemon/dex_entries/dugtrio.asm index 829e2aa09..a12c2984d 100644 --- a/data/pokemon/dex_entries/dugtrio.asm +++ b/data/pokemon/dex_entries/dugtrio.asm @@ -1,10 +1,10 @@ -; DugtrioPokedexEntry: ; 0x182b9d db "MOLE@" ; species name dw 204, 730 ; height, weight db "These DIGLETT" next "triplets dig over" next "60 miles below sea" + page "level. No one" next "knows what it's" next "like underground.@" diff --git a/data/pokemon/dex_entries/dunsparce.asm b/data/pokemon/dex_entries/dunsparce.asm index 7a9d812f3..5391438c1 100644 --- a/data/pokemon/dex_entries/dunsparce.asm +++ b/data/pokemon/dex_entries/dunsparce.asm @@ -1,10 +1,10 @@ -; DunsparcePokedexEntry: ; 0x1d0593 db "LAND SNAKE@" ; species name dw 411, 310 ; height, weight db "It hides deep" next "inside caves where" next "no light ever" + page "reaches it and" next "remains virtually" next "motionless there.@" diff --git a/data/pokemon/dex_entries/eevee.asm b/data/pokemon/dex_entries/eevee.asm index 3081a5829..91a3d70bc 100644 --- a/data/pokemon/dex_entries/eevee.asm +++ b/data/pokemon/dex_entries/eevee.asm @@ -1,10 +1,10 @@ -; EeveePokedexEntry: ; 0x1cc1b2 db "EVOLUTION@" ; species name dw 100, 140 ; height, weight db "Its ability to" next "evolve into many" next "forms allows it to" + page "adapt smoothly" next "and perfectly to" next "any environment.@" diff --git a/data/pokemon/dex_entries/ekans.asm b/data/pokemon/dex_entries/ekans.asm index 23faa4854..bb2fe9594 100644 --- a/data/pokemon/dex_entries/ekans.asm +++ b/data/pokemon/dex_entries/ekans.asm @@ -1,10 +1,10 @@ -; EkansPokedexEntry: ; 0x181fd4 db "SNAKE@" ; species name dw 607, 150 ; height, weight db "It flutters the" next "tip of its tongue" next "to seek out the" + page "scent of prey," next "then swallows the" next "prey whole.@" diff --git a/data/pokemon/dex_entries/electabuzz.asm b/data/pokemon/dex_entries/electabuzz.asm index e6bf15587..0eddf3416 100644 --- a/data/pokemon/dex_entries/electabuzz.asm +++ b/data/pokemon/dex_entries/electabuzz.asm @@ -1,10 +1,10 @@ -; ElectabuzzPokedexEntry: ; 0x1b992a db "ELECTRIC@" ; species name dw 307, 660 ; height, weight db "When two" next "ELECTABUZZ touch," next "they control the" + page "electric currents" next "to communicate" next "their feelings.@" diff --git a/data/pokemon/dex_entries/electrode.asm b/data/pokemon/dex_entries/electrode.asm index 48d523c69..2e6378d41 100644 --- a/data/pokemon/dex_entries/electrode.asm +++ b/data/pokemon/dex_entries/electrode.asm @@ -1,10 +1,10 @@ -; ElectrodePokedexEntry: ; 0x1b8f19 db "BALL@" ; species name dw 311, 1470 ; height, weight db "The more energy it" next "charges up, the" next "faster it gets." + page "But this also" next "makes it more" next "likely to explode.@" diff --git a/data/pokemon/dex_entries/elekid.asm b/data/pokemon/dex_entries/elekid.asm index 6a046bda4..a84d24dc0 100644 --- a/data/pokemon/dex_entries/elekid.asm +++ b/data/pokemon/dex_entries/elekid.asm @@ -1,10 +1,10 @@ -; ElekidPokedexEntry: ; 0x1d1398 db "ELECTRIC@" ; species name dw 200, 520 ; height, weight db "It loves violent" next "thunder. The space" next "between its horns" + page "flickers bluish-" next "white when it is" next "charging energy.@" diff --git a/data/pokemon/dex_entries/entei.asm b/data/pokemon/dex_entries/entei.asm index 3784a898c..355bd4ae6 100644 --- a/data/pokemon/dex_entries/entei.asm +++ b/data/pokemon/dex_entries/entei.asm @@ -1,10 +1,10 @@ -; EnteiPokedexEntry: ; 0x1d15dd db "VOLCANO@" ; species name dw 607, 4370 ; height, weight db "This brawny" next "#MON courses" next "around the earth," + page "spouting flames" next "hotter than a" next "volcano's magma.@" diff --git a/data/pokemon/dex_entries/espeon.asm b/data/pokemon/dex_entries/espeon.asm index 059b01fbe..93bde0d8c 100644 --- a/data/pokemon/dex_entries/espeon.asm +++ b/data/pokemon/dex_entries/espeon.asm @@ -1,10 +1,10 @@ -; EspeonPokedexEntry: ; 0x1d0155 db "SUN@" ; species name dw 211, 580 ; height, weight db "The tip of its" next "forked tail" next "quivers when it is" + page "predicting its" next "opponent's next" next "move.@" diff --git a/data/pokemon/dex_entries/exeggcute.asm b/data/pokemon/dex_entries/exeggcute.asm index 01453955e..27360dc05 100644 --- a/data/pokemon/dex_entries/exeggcute.asm +++ b/data/pokemon/dex_entries/exeggcute.asm @@ -1,10 +1,10 @@ -; ExeggcutePokedexEntry: ; 0x1b8f84 db "EGG@" ; species name dw 104, 60 ; height, weight db "If even one is" next "separated from the" next "group, the energy" + page "bond between the" next "six will make them" next "rejoin instantly.@" diff --git a/data/pokemon/dex_entries/exeggutor.asm b/data/pokemon/dex_entries/exeggutor.asm index abefffd69..31ba01ae4 100644 --- a/data/pokemon/dex_entries/exeggutor.asm +++ b/data/pokemon/dex_entries/exeggutor.asm @@ -1,10 +1,10 @@ -; ExeggutorPokedexEntry: ; 0x1b8ff6 db "COCONUT@" ; species name dw 607, 2650 ; height, weight db "Living in a good" next "environment makes" next "it grow lots of" + page "heads. A head that" next "drops off becomes" next "an EXEGGCUTE.@" diff --git a/data/pokemon/dex_entries/farfetch_d.asm b/data/pokemon/dex_entries/farfetch_d.asm index c9e756a6a..b5bd3bc98 100644 --- a/data/pokemon/dex_entries/farfetch_d.asm +++ b/data/pokemon/dex_entries/farfetch_d.asm @@ -1,10 +1,10 @@ -; FarfetchDPokedexEntry: ; 0x1b876c db "WILD DUCK@" ; species name dw 207, 330 ; height, weight db "In order to pre-" next "vent their" next "extinction, more" + page "people have made" next "an effort to breed" next "these #MON.@" diff --git a/data/pokemon/dex_entries/fearow.asm b/data/pokemon/dex_entries/fearow.asm index 90de6a612..b91c66ed1 100644 --- a/data/pokemon/dex_entries/fearow.asm +++ b/data/pokemon/dex_entries/fearow.asm @@ -1,10 +1,10 @@ -; FearowPokedexEntry: ; 0x181f64 db "BEAK@" ; species name dw 311, 840 ; height, weight db "It uses its long" next "beak to attack. It" next "has a surprisingly" + page "long reach, so it" next "must be treated" next "with caution.@" diff --git a/data/pokemon/dex_entries/feraligatr.asm b/data/pokemon/dex_entries/feraligatr.asm index cb3672c92..3c411fe48 100644 --- a/data/pokemon/dex_entries/feraligatr.asm +++ b/data/pokemon/dex_entries/feraligatr.asm @@ -1,10 +1,10 @@ -; FeraligatrPokedexEntry: ; 0x1cccf9 db "BIG JAW@" ; species name dw 707, 1960 ; height, weight db "Although it has a" next "massive body, its" next "powerful hind legs" + page "enable it to move" next "quickly, even on" next "the ground.@" diff --git a/data/pokemon/dex_entries/flaaffy.asm b/data/pokemon/dex_entries/flaaffy.asm index 04bcc0668..d408a4706 100644 --- a/data/pokemon/dex_entries/flaaffy.asm +++ b/data/pokemon/dex_entries/flaaffy.asm @@ -1,10 +1,10 @@ -; FlaaffyPokedexEntry: ; 0x1cd5b8 db "WOOL@" ; species name dw 207, 290 ; height, weight db "Because of its" next "rubbery, electric-" next "ity-resistant" + page "skin, it can store" next "lots of electric-" next "ity in its fur.@" diff --git a/data/pokemon/dex_entries/flareon.asm b/data/pokemon/dex_entries/flareon.asm index ba3e0399d..fbab999c4 100644 --- a/data/pokemon/dex_entries/flareon.asm +++ b/data/pokemon/dex_entries/flareon.asm @@ -1,10 +1,10 @@ -; FlareonPokedexEntry: ; 0x1cc2ec db "FLAME@" ; species name dw 211, 550 ; height, weight db "Once it has stored" next "up enough heat," next "this #MON's" + page "body temperature" next "can reach up to" next "1700 degrees.@" diff --git a/data/pokemon/dex_entries/forretress.asm b/data/pokemon/dex_entries/forretress.asm index 8644b4b39..6815f6d31 100644 --- a/data/pokemon/dex_entries/forretress.asm +++ b/data/pokemon/dex_entries/forretress.asm @@ -1,10 +1,10 @@ -; ForretressPokedexEntry: ; 0x1d0524 db "BAGWORM@" ; species name dw 311, 2770 ; height, weight db "Usually found" next "hanging on to a" next "fat tree trunk. It" + page "shoots out bits of" next "its shell when it" next "sees action.@" diff --git a/data/pokemon/dex_entries/furret.asm b/data/pokemon/dex_entries/furret.asm index 653a3dead..b9ec74d2d 100644 --- a/data/pokemon/dex_entries/furret.asm +++ b/data/pokemon/dex_entries/furret.asm @@ -1,10 +1,10 @@ -; FurretPokedexEntry: ; 0x1ccddd db "LONG BODY@" ; species name dw 511, 720 ; height, weight db "It lives in narrow" next "burrows that fit" next "its slim body. The" + page "deeper the nests" next "go, the more maze-" next "like they become.@" diff --git a/data/pokemon/dex_entries/gastly.asm b/data/pokemon/dex_entries/gastly.asm index db7f6d57d..5f5420e02 100644 --- a/data/pokemon/dex_entries/gastly.asm +++ b/data/pokemon/dex_entries/gastly.asm @@ -1,10 +1,10 @@ -; GastlyPokedexEntry: ; 0x1b8b4a db "GAS@" ; species name dw 403, 2 ; height, weight db "It wraps its op-" next "ponent in its gas-" next "like body, slowly" + page "weakening its prey" next "by poisoning it" next "through the skin.@" diff --git a/data/pokemon/dex_entries/gengar.asm b/data/pokemon/dex_entries/gengar.asm index e9650fb39..ac85e88f4 100644 --- a/data/pokemon/dex_entries/gengar.asm +++ b/data/pokemon/dex_entries/gengar.asm @@ -1,10 +1,10 @@ -; GengarPokedexEntry: ; 0x1b8c25 db "SHADOW@" ; species name dw 411, 890 ; height, weight db "Hiding in people's" next "shadows at night," next "it absorbs their" + page "heat. The chill it" next "causes makes the" next "victims shake.@" diff --git a/data/pokemon/dex_entries/geodude.asm b/data/pokemon/dex_entries/geodude.asm index 389ce042a..ea3c8b79e 100644 --- a/data/pokemon/dex_entries/geodude.asm +++ b/data/pokemon/dex_entries/geodude.asm @@ -1,10 +1,10 @@ -; GeodudePokedexEntry: ; 0x1b83a1 db "ROCK@" ; species name dw 104, 440 ; height, weight db "Proud of their" next "sturdy bodies," next "they bash against" + page "each other in a" next "contest to prove" next "whose is harder.@" diff --git a/data/pokemon/dex_entries/girafarig.asm b/data/pokemon/dex_entries/girafarig.asm index 527aa9807..caeb13dd7 100644 --- a/data/pokemon/dex_entries/girafarig.asm +++ b/data/pokemon/dex_entries/girafarig.asm @@ -1,10 +1,10 @@ -; GirafarigPokedexEntry: ; 0x1d0446 db "LONG NECK@" ; species name dw 411, 910 ; height, weight db "When it is in" next "danger, its tail" next "uses some sort of" + page "mysterious powers" next "to drive away the" next "enemy.@" diff --git a/data/pokemon/dex_entries/gligar.asm b/data/pokemon/dex_entries/gligar.asm index 43c4c95ce..32ac0a5f5 100644 --- a/data/pokemon/dex_entries/gligar.asm +++ b/data/pokemon/dex_entries/gligar.asm @@ -1,10 +1,10 @@ -; GligarPokedexEntry: ; 0x1d0604 db "FLYSCORPIO@" ; species name dw 307, 1430 ; height, weight db "It builds its nest" next "on a steep cliff." next "When it is done" + page "gliding, it hops" next "along the ground" next "back to its nest.@" diff --git a/data/pokemon/dex_entries/gloom.asm b/data/pokemon/dex_entries/gloom.asm index 0552a8d0c..6b2e4e534 100644 --- a/data/pokemon/dex_entries/gloom.asm +++ b/data/pokemon/dex_entries/gloom.asm @@ -1,10 +1,10 @@ -; GloomPokedexEntry: ; 0x1828a6 db "WEED@" ; species name dw 207, 190 ; height, weight db "The smell from its" next "drool-like syrup" next "and the pollen on" + page "its petals is so" next "bad, it may make" next "opponents faint.@" diff --git a/data/pokemon/dex_entries/golbat.asm b/data/pokemon/dex_entries/golbat.asm index 434108bf4..d59b9408c 100644 --- a/data/pokemon/dex_entries/golbat.asm +++ b/data/pokemon/dex_entries/golbat.asm @@ -1,10 +1,10 @@ -; GolbatPokedexEntry: ; 0x1827c4 db "BAT@" ; species name dw 503, 1210 ; height, weight db "When it plunges" next "its fangs into its" next "prey, it instantly" + page "draws and gulps" next "down more than ten" next "ounces of blood.@" diff --git a/data/pokemon/dex_entries/goldeen.asm b/data/pokemon/dex_entries/goldeen.asm index 101edf434..075a9b5a2 100644 --- a/data/pokemon/dex_entries/goldeen.asm +++ b/data/pokemon/dex_entries/goldeen.asm @@ -1,10 +1,10 @@ -; GoldeenPokedexEntry: ; 0x1b9626 db "GOLDFISH@" ; species name dw 200, 330 ; height, weight db "During spawning" next "season, they swim" next "gracefully in the" + page "water, searching" next "for their perfect" next "mate.@" diff --git a/data/pokemon/dex_entries/golduck.asm b/data/pokemon/dex_entries/golduck.asm index b38cfd2dc..921e4ddb0 100644 --- a/data/pokemon/dex_entries/golduck.asm +++ b/data/pokemon/dex_entries/golduck.asm @@ -1,10 +1,10 @@ -; GolduckPokedexEntry: ; 0x182d55 db "DUCK@" ; species name dw 507, 1690 ; height, weight db "It swims grace-" next "fully along on the" next "quiet, slow-moving" + page "rivers and lakes" next "of which it is so" next "fond.@" diff --git a/data/pokemon/dex_entries/golem.asm b/data/pokemon/dex_entries/golem.asm index dbb5a8e3d..7d5e9af49 100644 --- a/data/pokemon/dex_entries/golem.asm +++ b/data/pokemon/dex_entries/golem.asm @@ -1,10 +1,10 @@ -; GolemPokedexEntry: ; 0x1b8481 db "MEGATON@" ; species name dw 407, 6620 ; height, weight db "Its rock-like body" next "is so durable," next "even high-powered" + page "dynamite blasts" next "fail to scratch" next "its rugged hide.@" diff --git a/data/pokemon/dex_entries/granbull.asm b/data/pokemon/dex_entries/granbull.asm index 15f3e194c..de6460d8d 100644 --- a/data/pokemon/dex_entries/granbull.asm +++ b/data/pokemon/dex_entries/granbull.asm @@ -1,10 +1,10 @@ -; GranbullPokedexEntry: ; 0x1d074a db "FAIRY@" ; species name dw 407, 1070 ; height, weight db "It can make most" next "any #MON run" next "away simply by" + page "opening its mouth" next "wide to reveal its" next "big fangs.@" diff --git a/data/pokemon/dex_entries/graveler.asm b/data/pokemon/dex_entries/graveler.asm index 3bf04148c..26b9db795 100644 --- a/data/pokemon/dex_entries/graveler.asm +++ b/data/pokemon/dex_entries/graveler.asm @@ -1,10 +1,10 @@ -; GravelerPokedexEntry: ; 0x1b840c db "ROCK@" ; species name dw 303, 2320 ; height, weight db "It travels by rol-" next "ling on mountain" next "paths. If it gains" + page "too much speed, it" next "stops by running" next "into huge rocks.@" diff --git a/data/pokemon/dex_entries/grimer.asm b/data/pokemon/dex_entries/grimer.asm index bda09cf94..ed76b6249 100644 --- a/data/pokemon/dex_entries/grimer.asm +++ b/data/pokemon/dex_entries/grimer.asm @@ -1,10 +1,10 @@ -; GrimerPokedexEntry: ; 0x1b89a2 db "SLUDGE@" ; species name dw 211, 660 ; height, weight db "When two of these" next "#MON's bodies" next "are combined" + page "together, new" next "poisons are" next "created.@" diff --git a/data/pokemon/dex_entries/growlithe.asm b/data/pokemon/dex_entries/growlithe.asm index cd261d886..af5610cda 100644 --- a/data/pokemon/dex_entries/growlithe.asm +++ b/data/pokemon/dex_entries/growlithe.asm @@ -1,10 +1,10 @@ -; GrowlithePokedexEntry: ; 0x182eaa db "PUPPY@" ; species name dw 204, 420 ; height, weight db "It controls a big" next "territory. If it" next "detects an unknown" + page "smell, it roars" next "loudly to force" next "out the intruder.@" diff --git a/data/pokemon/dex_entries/gyarados.asm b/data/pokemon/dex_entries/gyarados.asm index 767380680..3f3235679 100644 --- a/data/pokemon/dex_entries/gyarados.asm +++ b/data/pokemon/dex_entries/gyarados.asm @@ -1,10 +1,10 @@ -; GyaradosPokedexEntry: ; 0x1cc065 db "ATROCIOUS@" ; species name dw 2104, 5180 ; height, weight db "It appears when-" next "ever there is" next "world conflict," + page "burning down any" next "place it travels" next "through.@" diff --git a/data/pokemon/dex_entries/haunter.asm b/data/pokemon/dex_entries/haunter.asm index 6efe4b15c..b03c0996f 100644 --- a/data/pokemon/dex_entries/haunter.asm +++ b/data/pokemon/dex_entries/haunter.asm @@ -1,10 +1,10 @@ -; HaunterPokedexEntry: ; 0x1b8bbd db "GAS@" ; species name dw 503, 2 ; height, weight db "It hides in the" next "dark, planning to" next "take the life of" + page "the next living" next "thing that wanders" next "close by.@" diff --git a/data/pokemon/dex_entries/heracross.asm b/data/pokemon/dex_entries/heracross.asm index ed709b526..25d1e28a6 100644 --- a/data/pokemon/dex_entries/heracross.asm +++ b/data/pokemon/dex_entries/heracross.asm @@ -1,10 +1,10 @@ -; HeracrossPokedexEntry: ; 0x1d0907 db "SINGLEHORN@" ; species name dw 411, 1190 ; height, weight db "With its Herculean" next "powers, it can" next "easily throw arou-" + page "nd an object that" next "is 100 times its" next "own weight.@" diff --git a/data/pokemon/dex_entries/hitmonchan.asm b/data/pokemon/dex_entries/hitmonchan.asm index e5686b1a5..8b2f97823 100644 --- a/data/pokemon/dex_entries/hitmonchan.asm +++ b/data/pokemon/dex_entries/hitmonchan.asm @@ -1,10 +1,10 @@ -; HitmonchanPokedexEntry: ; 0x1b91a4 db "PUNCHING@" ; species name dw 407, 1110 ; height, weight db "To increase the" next "strength of all" next "its punch moves," + page "it spins its arms" next "just before making" next "contact.@" diff --git a/data/pokemon/dex_entries/hitmonlee.asm b/data/pokemon/dex_entries/hitmonlee.asm index 0215d3bdc..0df1bf2a9 100644 --- a/data/pokemon/dex_entries/hitmonlee.asm +++ b/data/pokemon/dex_entries/hitmonlee.asm @@ -1,10 +1,10 @@ -; HitmonleePokedexEntry: ; 0x1b913f db "KICKING@" ; species name dw 411, 1100 ; height, weight db "It is also called" next "the Kick Master." next "It uses its" + page "elastic legs to" next "execute every" next "known kick.@" diff --git a/data/pokemon/dex_entries/hitmontop.asm b/data/pokemon/dex_entries/hitmontop.asm index 14175ec8a..609ccb48a 100644 --- a/data/pokemon/dex_entries/hitmontop.asm +++ b/data/pokemon/dex_entries/hitmontop.asm @@ -1,10 +1,10 @@ -; HitmontopPokedexEntry: ; 0x1d12c0 db "HANDSTAND@" ; species name dw 407, 1060 ; height, weight db "After doing a" next "handstand to" next "throw off the" + page "opponent's timing," next "it presents its" next "fancy kick moves.@" diff --git a/data/pokemon/dex_entries/ho_oh.asm b/data/pokemon/dex_entries/ho_oh.asm index 1d74cd058..2bc0abcf0 100644 --- a/data/pokemon/dex_entries/ho_oh.asm +++ b/data/pokemon/dex_entries/ho_oh.asm @@ -1,10 +1,10 @@ -; HoOhPokedexEntry: ; 0x1d185d db "RAINBOW@" ; species name dw 1206, 4390 ; height, weight db "It will reveal" next "itself before a" next "pure-hearted" + page "trainer by shining" next "its bright rain-" next "bow-colored wings.@" diff --git a/data/pokemon/dex_entries/hoothoot.asm b/data/pokemon/dex_entries/hoothoot.asm index 88039eea8..1df540fe6 100644 --- a/data/pokemon/dex_entries/hoothoot.asm +++ b/data/pokemon/dex_entries/hoothoot.asm @@ -1,10 +1,10 @@ -; HoothootPokedexEntry: ; 0x1cce58 db "OWL@" ; species name dw 204, 470 ; height, weight db "It begins to hoot" next "at the same time" next "every day. Some" + page "trainers use them" next "in place of" next "clocks.@" diff --git a/data/pokemon/dex_entries/hoppip.asm b/data/pokemon/dex_entries/hoppip.asm index 734ddc766..3e97be0e2 100644 --- a/data/pokemon/dex_entries/hoppip.asm +++ b/data/pokemon/dex_entries/hoppip.asm @@ -1,10 +1,10 @@ -; HoppipPokedexEntry: ; 0x1cd8b5 db "COTTONWEED@" ; species name dw 104, 10 ; height, weight db "It can be carried" next "away on even the" next "gentlest breeze." + page "It may even float" next "all the way to the" next "next town.@" diff --git a/data/pokemon/dex_entries/horsea.asm b/data/pokemon/dex_entries/horsea.asm index dd50057e7..53f6ec71d 100644 --- a/data/pokemon/dex_entries/horsea.asm +++ b/data/pokemon/dex_entries/horsea.asm @@ -1,10 +1,10 @@ -; HorseaPokedexEntry: ; 0x1b9553 db "DRAGON@" ; species name dw 104, 180 ; height, weight db "When they're in a" next "safe location," next "they can be seen" + page "playfully tangling" next "their tails" next "together.@" diff --git a/data/pokemon/dex_entries/houndoom.asm b/data/pokemon/dex_entries/houndoom.asm index 6a21602f3..a3b8f9cb8 100644 --- a/data/pokemon/dex_entries/houndoom.asm +++ b/data/pokemon/dex_entries/houndoom.asm @@ -1,10 +1,10 @@ -; HoundoomPokedexEntry: ; 0x1d0f66 db "DARK@" ; species name dw 407, 770 ; height, weight db "The pungent-" next "smelling flame" next "that shoots from" + page "its mouth results" next "from toxins burn-" next "ing in its body.@" diff --git a/data/pokemon/dex_entries/houndour.asm b/data/pokemon/dex_entries/houndour.asm index 5fa89fe85..ba89b90d2 100644 --- a/data/pokemon/dex_entries/houndour.asm +++ b/data/pokemon/dex_entries/houndour.asm @@ -1,10 +1,10 @@ -; HoundourPokedexEntry: ; 0x1d0eff db "DARK@" ; species name dw 200, 240 ; height, weight db "Around dawn, its" next "ominous howl" next "echoes through the" + page "area to announce" next "that this is its" next "territory.@" diff --git a/data/pokemon/dex_entries/hypno.asm b/data/pokemon/dex_entries/hypno.asm index 2309a6bfa..cfdd29896 100644 --- a/data/pokemon/dex_entries/hypno.asm +++ b/data/pokemon/dex_entries/hypno.asm @@ -1,10 +1,10 @@ -; HypnoPokedexEntry: ; 0x1b8d80 db "HYPNOSIS@" ; species name dw 503, 1670 ; height, weight db "The longer it" next "swings its" next "pendulum, the" + page "longer the effects" next "of its hypnosis" next "last.@" diff --git a/data/pokemon/dex_entries/igglybuff.asm b/data/pokemon/dex_entries/igglybuff.asm index aa1c1cabf..27d5a8040 100644 --- a/data/pokemon/dex_entries/igglybuff.asm +++ b/data/pokemon/dex_entries/igglybuff.asm @@ -1,10 +1,10 @@ -; IgglybuffPokedexEntry: ; 0x1cd32c db "BALLOON@" ; species name dw 100, 20 ; height, weight db "Instead of walking" next "with its short" next "legs, it moves" + page "around by bouncing" next "on its soft," next "tender body.@" diff --git a/data/pokemon/dex_entries/ivysaur.asm b/data/pokemon/dex_entries/ivysaur.asm index 66d16d323..91a672c9e 100644 --- a/data/pokemon/dex_entries/ivysaur.asm +++ b/data/pokemon/dex_entries/ivysaur.asm @@ -1,10 +1,10 @@ -; IvysaurPokedexEntry: ; 0x181702 db "SEED@" ; species name dw 303, 290 ; height, weight db "The bulb on its" next "back grows as it" next "absorbs nutrients." + page "The bulb gives off" next "a pleasant aroma" next "when it blooms.@" diff --git a/data/pokemon/dex_entries/jigglypuff.asm b/data/pokemon/dex_entries/jigglypuff.asm index 01a3b4480..b90ba7316 100644 --- a/data/pokemon/dex_entries/jigglypuff.asm +++ b/data/pokemon/dex_entries/jigglypuff.asm @@ -1,10 +1,10 @@ -; JigglypuffPokedexEntry: ; 0x182673 db "BALLOON@" ; species name dw 108, 120 ; height, weight db "It rolls its cute" next "eyes as it sings a" next "soothing lullaby." + page "Its gentle song" next "puts anyone who" next "hears it to sleep.@" diff --git a/data/pokemon/dex_entries/jolteon.asm b/data/pokemon/dex_entries/jolteon.asm index 9b9149d9a..4d6be5d57 100644 --- a/data/pokemon/dex_entries/jolteon.asm +++ b/data/pokemon/dex_entries/jolteon.asm @@ -1,10 +1,10 @@ -; JolteonPokedexEntry: ; 0x1cc28b db "LIGHTNING@" ; species name dw 207, 540 ; height, weight db "The negatively" next "charged ions" next "generated in its" + page "fur create a" next "constant sparking" next "noise.@" diff --git a/data/pokemon/dex_entries/jumpluff.asm b/data/pokemon/dex_entries/jumpluff.asm index 0aade0b75..8dacd4dff 100644 --- a/data/pokemon/dex_entries/jumpluff.asm +++ b/data/pokemon/dex_entries/jumpluff.asm @@ -1,10 +1,10 @@ -; JumpluffPokedexEntry: ; 0x1cd998 db "COTTONWEED@" ; species name dw 207, 70 ; height, weight db "Even in the fierc-" next "est wind, it can" next "control its fluff" + page "to make its way to" next "any place in the" next "world it wants.@" diff --git a/data/pokemon/dex_entries/jynx.asm b/data/pokemon/dex_entries/jynx.asm index b4b9eac8c..6f6486776 100644 --- a/data/pokemon/dex_entries/jynx.asm +++ b/data/pokemon/dex_entries/jynx.asm @@ -1,10 +1,10 @@ -; JynxPokedexEntry: ; 0x1b98c5 db "HUMANSHAPE@" ; species name dw 407, 900 ; height, weight db "It has several" next "different cry pat-" next "terns, each of" + page "which seems to" next "have its own" next "meaning.@" diff --git a/data/pokemon/dex_entries/kabuto.asm b/data/pokemon/dex_entries/kabuto.asm index 9231fb9be..8a65e4cb6 100644 --- a/data/pokemon/dex_entries/kabuto.asm +++ b/data/pokemon/dex_entries/kabuto.asm @@ -1,10 +1,10 @@ -; KabutoPokedexEntry: ; 0x1cc497 db "SHELLFISH@" ; species name dw 108, 250 ; height, weight db "Three hundred" next "million years ago," next "it hid on the sea" + page "floor. It also has" next "eyes on its back" next "that glow.@" diff --git a/data/pokemon/dex_entries/kabutops.asm b/data/pokemon/dex_entries/kabutops.asm index 8f5e1348b..bca687d39 100644 --- a/data/pokemon/dex_entries/kabutops.asm +++ b/data/pokemon/dex_entries/kabutops.asm @@ -1,10 +1,10 @@ -; KabutopsPokedexEntry: ; 0x1cc507 db "SHELLFISH@" ; species name dw 403, 890 ; height, weight db "It was able to" next "swim quickly thro-" next "ugh the water by" + page "compactly folding" next "up its razor-sharp" next "sickles.@" diff --git a/data/pokemon/dex_entries/kadabra.asm b/data/pokemon/dex_entries/kadabra.asm index 26226724f..01fd96098 100644 --- a/data/pokemon/dex_entries/kadabra.asm +++ b/data/pokemon/dex_entries/kadabra.asm @@ -1,10 +1,10 @@ -; KadabraPokedexEntry: ; 0x18313c db "PSI@" ; species name dw 403, 1250 ; height, weight db "When it closes its" next "eyes, twice as" next "many alpha parti-" + page "cles come out of" next "the surface of its" next "body.@" diff --git a/data/pokemon/dex_entries/kakuna.asm b/data/pokemon/dex_entries/kakuna.asm index 469e14bf6..3f4a1326d 100644 --- a/data/pokemon/dex_entries/kakuna.asm +++ b/data/pokemon/dex_entries/kakuna.asm @@ -1,10 +1,10 @@ -; KakunaPokedexEntry: ; 0x181c23 db "COCOON@" ; species name dw 200, 220 ; height, weight db "Nearly incapable" next "of movement, it" next "leans against" + page "stout trees while" next "waiting for its" next "evolution.@" diff --git a/data/pokemon/dex_entries/kangaskhan.asm b/data/pokemon/dex_entries/kangaskhan.asm index ec2050845..c1c9d8db5 100644 --- a/data/pokemon/dex_entries/kangaskhan.asm +++ b/data/pokemon/dex_entries/kangaskhan.asm @@ -1,10 +1,10 @@ -; KangaskhanPokedexEntry: ; 0x1b94f6 db "PARENT@" ; species name dw 703, 1760 ; height, weight db "To avoid" next "crushing the" next "baby it carries in" + page "its pouch, it" next "always sleeps" next "standing up.@" diff --git a/data/pokemon/dex_entries/kingdra.asm b/data/pokemon/dex_entries/kingdra.asm index 555601b51..05e79a86a 100644 --- a/data/pokemon/dex_entries/kingdra.asm +++ b/data/pokemon/dex_entries/kingdra.asm @@ -1,10 +1,10 @@ -; KingdraPokedexEntry: ; 0x1d0fd1 db "DRAGON@" ; species name dw 511, 3350 ; height, weight db "It stores energy" next "by sleeping at" next "underwater depths" + page "at which no other" next "life forms can" next "survive.@" diff --git a/data/pokemon/dex_entries/kingler.asm b/data/pokemon/dex_entries/kingler.asm index 25685d517..2c4b17a15 100644 --- a/data/pokemon/dex_entries/kingler.asm +++ b/data/pokemon/dex_entries/kingler.asm @@ -1,10 +1,10 @@ -; KinglerPokedexEntry: ; 0x1b8e45 db "PINCER@" ; species name dw 403, 1320 ; height, weight db "Its oversized claw" next "is very powerful," next "but when it's not" + page "in battle, the" next "claw just gets in" next "the way.@" diff --git a/data/pokemon/dex_entries/koffing.asm b/data/pokemon/dex_entries/koffing.asm index 20bde8671..a3fc0da9f 100644 --- a/data/pokemon/dex_entries/koffing.asm +++ b/data/pokemon/dex_entries/koffing.asm @@ -1,10 +1,10 @@ -; KoffingPokedexEntry: ; 0x1b9276 db "POISON GAS@" ; species name dw 200, 20 ; height, weight db "If one gets close" next "enough to it when" next "it expels poison-" + page "ous gas, the gas" next "swirling inside it" next "can be seen.@" diff --git a/data/pokemon/dex_entries/krabby.asm b/data/pokemon/dex_entries/krabby.asm index 2435cd64d..0e0081ae6 100644 --- a/data/pokemon/dex_entries/krabby.asm +++ b/data/pokemon/dex_entries/krabby.asm @@ -1,10 +1,10 @@ -; KrabbyPokedexEntry: ; 0x1b8ddd db "RIVER CRAB@" ; species name dw 104, 140 ; height, weight db "If it is unable" next "to find food, it" next "will absorb" + page "nutrients by" next "swallowing a" next "mouthful of sand.@" diff --git a/data/pokemon/dex_entries/lanturn.asm b/data/pokemon/dex_entries/lanturn.asm index 3aa2b5523..46ea41e89 100644 --- a/data/pokemon/dex_entries/lanturn.asm +++ b/data/pokemon/dex_entries/lanturn.asm @@ -1,10 +1,10 @@ -; LanturnPokedexEntry: ; 0x1cd1de db "LIGHT@" ; species name dw 311, 500 ; height, weight db "This #MON uses" next "the bright part of" next "its body, which" + page "changed from a" next "dorsal fin, to" next "lure prey.@" diff --git a/data/pokemon/dex_entries/lapras.asm b/data/pokemon/dex_entries/lapras.asm index 550d6e12c..e074cfe02 100644 --- a/data/pokemon/dex_entries/lapras.asm +++ b/data/pokemon/dex_entries/lapras.asm @@ -1,10 +1,10 @@ -; LaprasPokedexEntry: ; 0x1cc0cd db "TRANSPORT@" ; species name dw 802, 4850 ; height, weight db "This gentle" next "#MON loves to" next "give people rides" + page "and provides a ve-" next "ry comfortable way" next "to get around.@" diff --git a/data/pokemon/dex_entries/larvitar.asm b/data/pokemon/dex_entries/larvitar.asm index 14ec08c7b..fa8145626 100644 --- a/data/pokemon/dex_entries/larvitar.asm +++ b/data/pokemon/dex_entries/larvitar.asm @@ -1,10 +1,10 @@ -; LarvitarPokedexEntry: ; 0x1d169c db "ROCK SKIN@" ; species name dw 200, 1590 ; height, weight db "Born deep under-" next "ground, this" next "#MON becomes a" + page "pupa after eating" next "enough dirt to" next "make a mountain.@" diff --git a/data/pokemon/dex_entries/ledian.asm b/data/pokemon/dex_entries/ledian.asm index a112aa722..90a21d427 100644 --- a/data/pokemon/dex_entries/ledian.asm +++ b/data/pokemon/dex_entries/ledian.asm @@ -1,10 +1,10 @@ -; LedianPokedexEntry: ; 0x1ccfa0 db "FIVE STAR@" ; species name dw 407, 780 ; height, weight db "In the daytime" next "when it gets warm," next "it curls up inside" + page "a big leaf and" next "drifts off into" next "a deep slumber.@" diff --git a/data/pokemon/dex_entries/ledyba.asm b/data/pokemon/dex_entries/ledyba.asm index 1e62ab4b1..71ed42a8d 100644 --- a/data/pokemon/dex_entries/ledyba.asm +++ b/data/pokemon/dex_entries/ledyba.asm @@ -1,10 +1,10 @@ -; LedybaPokedexEntry: ; 0x1ccf2c db "FIVE STAR@" ; species name dw 303, 240 ; height, weight db "It is timid and" next "clusters together" next "with others. The" + page "fluid secreted by" next "its feet indicates" next "its location.@" diff --git a/data/pokemon/dex_entries/lickitung.asm b/data/pokemon/dex_entries/lickitung.asm index 0003f14dc..b5aa73af5 100644 --- a/data/pokemon/dex_entries/lickitung.asm +++ b/data/pokemon/dex_entries/lickitung.asm @@ -1,10 +1,10 @@ -; LickitungPokedexEntry: ; 0x1b9210 db "LICKING@" ; species name dw 311, 1440 ; height, weight db "It has a tongue" next "that is over 6'6''" next "long. It uses this" + page "long tongue to" next "lick its body" next "clean.@" diff --git a/data/pokemon/dex_entries/lugia.asm b/data/pokemon/dex_entries/lugia.asm index c15345300..8fa0dcf1f 100644 --- a/data/pokemon/dex_entries/lugia.asm +++ b/data/pokemon/dex_entries/lugia.asm @@ -1,10 +1,10 @@ -; LugiaPokedexEntry: ; 0x1d17e9 db "DIVING@" ; species name dw 1701, 4760 ; height, weight db "It has an incred-" next "ible ability to" next "calm raging sto-" + page "rms. It is said" next "that LUGIA appears" next "when storms start.@" diff --git a/data/pokemon/dex_entries/machamp.asm b/data/pokemon/dex_entries/machamp.asm index 0ff42bf5f..2a84a6815 100644 --- a/data/pokemon/dex_entries/machamp.asm +++ b/data/pokemon/dex_entries/machamp.asm @@ -1,10 +1,10 @@ -; MachampPokedexEntry: ; 0x1b8133 db "SUPERPOWER@" ; species name dw 503, 2870 ; height, weight db "With four arms" next "that react more" next "quickly than it" + page "can think, it can" next "execute many" next "punches at once.@" diff --git a/data/pokemon/dex_entries/machoke.asm b/data/pokemon/dex_entries/machoke.asm index 53523a832..fa7642ee7 100644 --- a/data/pokemon/dex_entries/machoke.asm +++ b/data/pokemon/dex_entries/machoke.asm @@ -1,10 +1,10 @@ -; MachokePokedexEntry: ; 0x1b80cb db "SUPERPOWER@" ; species name dw 411, 1550 ; height, weight db "This tough #MON" next "always stays in" next "the zone. Its" + page "muscles become" next "thicker after" next "every battle.@" diff --git a/data/pokemon/dex_entries/machop.asm b/data/pokemon/dex_entries/machop.asm index aba71bc04..d50eb0aa7 100644 --- a/data/pokemon/dex_entries/machop.asm +++ b/data/pokemon/dex_entries/machop.asm @@ -1,10 +1,10 @@ -; MachopPokedexEntry: ; 0x1b8065 db "SUPERPOWER@" ; species name dw 207, 430 ; height, weight db "It trains by" next "lifting rocks in" next "the mountains. It" + page "can even pick up a" next "GRAVELER with" next "ease.@" diff --git a/data/pokemon/dex_entries/magby.asm b/data/pokemon/dex_entries/magby.asm index 53f9e1129..013d96670 100644 --- a/data/pokemon/dex_entries/magby.asm +++ b/data/pokemon/dex_entries/magby.asm @@ -1,10 +1,10 @@ -; MagbyPokedexEntry: ; 0x1d140e db "LIVE COAL@" ; species name dw 204, 470 ; height, weight db "It naturally spits" next "an 1100-degree" next "flame. It is said" + page "when many appear," next "it heralds a" next "volcanic eruption.@" diff --git a/data/pokemon/dex_entries/magcargo.asm b/data/pokemon/dex_entries/magcargo.asm index 5f1122906..8bbb84593 100644 --- a/data/pokemon/dex_entries/magcargo.asm +++ b/data/pokemon/dex_entries/magcargo.asm @@ -1,10 +1,10 @@ -; MagcargoPokedexEntry: ; 0x1d0b21 db "LAVA@" ; species name dw 207, 1210 ; height, weight db "Its body is as hot" next "as lava and is" next "always billowing." + page "Flames will" next "occasionally burst" next "from its shell.@" diff --git a/data/pokemon/dex_entries/magikarp.asm b/data/pokemon/dex_entries/magikarp.asm index 765840899..2be156fcc 100644 --- a/data/pokemon/dex_entries/magikarp.asm +++ b/data/pokemon/dex_entries/magikarp.asm @@ -1,10 +1,10 @@ -; MagikarpPokedexEntry: ; 0x1cc000 db "FISH@" ; species name dw 211, 220 ; height, weight db "This weak and" next "pathetic #MON" next "gets easily pushed" + page "along rivers when" next "there are strong" next "currents.@" diff --git a/data/pokemon/dex_entries/magmar.asm b/data/pokemon/dex_entries/magmar.asm index 1bfa961f9..f62544b50 100644 --- a/data/pokemon/dex_entries/magmar.asm +++ b/data/pokemon/dex_entries/magmar.asm @@ -1,10 +1,10 @@ -; MagmarPokedexEntry: ; 0x1b9994 db "SPITFIRE@" ; species name dw 403, 980 ; height, weight db "It moves more" next "frequently in hot" next "areas. It can heal" + page "itself by dipping" next "its wound into" next "lava.@" diff --git a/data/pokemon/dex_entries/magnemite.asm b/data/pokemon/dex_entries/magnemite.asm index e7703e050..646bd80f4 100644 --- a/data/pokemon/dex_entries/magnemite.asm +++ b/data/pokemon/dex_entries/magnemite.asm @@ -1,10 +1,10 @@ -; MagnemitePokedexEntry: ; 0x1b869d db "MAGNET@" ; species name dw 100, 130 ; height, weight db "The electricity" next "emitted by the" next "units on each side" + page "of its body cause" next "it to become a" next "strong magnet.@" diff --git a/data/pokemon/dex_entries/magneton.asm b/data/pokemon/dex_entries/magneton.asm index 115506ad6..fff66dec7 100644 --- a/data/pokemon/dex_entries/magneton.asm +++ b/data/pokemon/dex_entries/magneton.asm @@ -1,10 +1,10 @@ -; MagnetonPokedexEntry: ; 0x1b870a db "MAGNET@" ; species name dw 303, 1320 ; height, weight db "When many" next "MAGNETON gather" next "together, the" + page "resulting magnetic" next "storm disrupts" next "radio waves.@" diff --git a/data/pokemon/dex_entries/mankey.asm b/data/pokemon/dex_entries/mankey.asm index 59dfc4919..344e6ca0f 100644 --- a/data/pokemon/dex_entries/mankey.asm +++ b/data/pokemon/dex_entries/mankey.asm @@ -1,10 +1,10 @@ -; MankeyPokedexEntry: ; 0x182dbd db "PIG MONKEY@" ; species name dw 108, 620 ; height, weight db "It lives in groups" next "in the treetops." next "If it loses sight" + page "of its group, it" next "becomes infuriated" next "by its loneliness.@" diff --git a/data/pokemon/dex_entries/mantine.asm b/data/pokemon/dex_entries/mantine.asm index 880c4f179..02d4c445a 100644 --- a/data/pokemon/dex_entries/mantine.asm +++ b/data/pokemon/dex_entries/mantine.asm @@ -1,10 +1,10 @@ -; MantinePokedexEntry: ; 0x1d0e25 db "KITE@" ; species name dw 611, 4850 ; height, weight db "It swims along" next "freely, eating" next "things that swim" + page "into its mouth." next "Its whole body is" next "very coarse.@" diff --git a/data/pokemon/dex_entries/mareep.asm b/data/pokemon/dex_entries/mareep.asm index 94f78ee31..3f0492ade 100644 --- a/data/pokemon/dex_entries/mareep.asm +++ b/data/pokemon/dex_entries/mareep.asm @@ -1,10 +1,10 @@ -; MareepPokedexEntry: ; 0x1cd551 db "WOOL@" ; species name dw 200, 170 ; height, weight db "It stores lots of" next "air in its soft" next "fur, allowing it" + page "to stay cool in" next "summer and warm" next "in winter.@" diff --git a/data/pokemon/dex_entries/marill.asm b/data/pokemon/dex_entries/marill.asm index 6afbc2902..1b87ba23c 100644 --- a/data/pokemon/dex_entries/marill.asm +++ b/data/pokemon/dex_entries/marill.asm @@ -1,10 +1,10 @@ -; MarillPokedexEntry: ; 0x1cd705 db "AQUAMOUSE@" ; species name dw 104, 190 ; height, weight db "The fur on its" next "body naturally" next "repels water. It" + page "can stay dry, even" next "when it plays in" next "the water.@" diff --git a/data/pokemon/dex_entries/marowak.asm b/data/pokemon/dex_entries/marowak.asm index 01baf04e3..18b3f2e5d 100644 --- a/data/pokemon/dex_entries/marowak.asm +++ b/data/pokemon/dex_entries/marowak.asm @@ -1,10 +1,10 @@ -; MarowakPokedexEntry: ; 0x1b90d2 db "BONEKEEPER@" ; species name dw 303, 990 ; height, weight db "Somewhere in the" next "world is a ceme-" next "tery just for" + page "MAROWAK. It gets" next "its bones from" next "those graves.@" diff --git a/data/pokemon/dex_entries/meganium.asm b/data/pokemon/dex_entries/meganium.asm index dead64ff5..711c12b57 100644 --- a/data/pokemon/dex_entries/meganium.asm +++ b/data/pokemon/dex_entries/meganium.asm @@ -1,10 +1,10 @@ -; MeganiumPokedexEntry: ; 0x1cca54 db "HERB@" ; species name dw 511, 2220 ; height, weight db "Anyone who stands" next "beside it becomes" next "refreshed, just as" + page "if they were" next "relaxing in a" next "sunny forest.@" diff --git a/data/pokemon/dex_entries/meowth.asm b/data/pokemon/dex_entries/meowth.asm index 9fe66977b..9897a3b60 100644 --- a/data/pokemon/dex_entries/meowth.asm +++ b/data/pokemon/dex_entries/meowth.asm @@ -1,10 +1,10 @@ -; MeowthPokedexEntry: ; 0x182c08 db "SCRATCHCAT@" ; species name dw 104, 90 ; height, weight db "It loves things" next "that sparkle. When" next "it sees a shiny" + page "object, the gold" next "coin on its head" next "shines too.@" diff --git a/data/pokemon/dex_entries/metapod.asm b/data/pokemon/dex_entries/metapod.asm index b2c6b78b7..9ee9b8a71 100644 --- a/data/pokemon/dex_entries/metapod.asm +++ b/data/pokemon/dex_entries/metapod.asm @@ -1,10 +1,10 @@ -; MetapodPokedexEntry: ; 0x181ace db "COCOON@" ; species name dw 204, 220 ; height, weight db "This is its pre-" next "evolved form. At" next "this stage, it can" + page "only harden, so it" next "remains motionless" next "to avoid attack.@" diff --git a/data/pokemon/dex_entries/mew.asm b/data/pokemon/dex_entries/mew.asm index 9da7f6a17..66682b14c 100644 --- a/data/pokemon/dex_entries/mew.asm +++ b/data/pokemon/dex_entries/mew.asm @@ -1,10 +1,10 @@ -; MewPokedexEntry: ; 0x1cc915 db "NEW SPECIE@" ; species name dw 104, 90 ; height, weight db "Because it can" next "learn any move," next "some people began" + page "research to see if" next "it is the ancestor" next "of all #MON.@" diff --git a/data/pokemon/dex_entries/mewtwo.asm b/data/pokemon/dex_entries/mewtwo.asm index eb41ebb90..c49e553d5 100644 --- a/data/pokemon/dex_entries/mewtwo.asm +++ b/data/pokemon/dex_entries/mewtwo.asm @@ -1,10 +1,10 @@ -; MewtwoPokedexEntry: ; 0x1cc8ae db "GENETIC@" ; species name dw 607, 2690 ; height, weight db "Said to rest qui-" next "etly in an" next "undiscovered cave," + page "this #MON was" next "created solely for" next "battling.@" diff --git a/data/pokemon/dex_entries/miltank.asm b/data/pokemon/dex_entries/miltank.asm index 1f85ef668..660f652bc 100644 --- a/data/pokemon/dex_entries/miltank.asm +++ b/data/pokemon/dex_entries/miltank.asm @@ -1,10 +1,10 @@ -; MiltankPokedexEntry: ; 0x1d1482 db "MILK COW@" ; species name dw 311, 1660 ; height, weight db "In order to milk a" next "MILTANK, one must" next "have a knack for" + page "rhythmically pull-" next "ing up and down" next "on its udders.@" diff --git a/data/pokemon/dex_entries/misdreavus.asm b/data/pokemon/dex_entries/misdreavus.asm index c3f1b002a..6e7e510a7 100644 --- a/data/pokemon/dex_entries/misdreavus.asm +++ b/data/pokemon/dex_entries/misdreavus.asm @@ -1,10 +1,10 @@ -; MisdreavusPokedexEntry: ; 0x1d0301 db "SCREECH@" ; species name dw 204, 20 ; height, weight db "It loves to watch" next "people it's scar-" next "ed. It frightens" + page "them by screaming" next "loudly or appear-" next "ing suddenly.@" diff --git a/data/pokemon/dex_entries/moltres.asm b/data/pokemon/dex_entries/moltres.asm index f459d622e..d4ec793d5 100644 --- a/data/pokemon/dex_entries/moltres.asm +++ b/data/pokemon/dex_entries/moltres.asm @@ -1,10 +1,10 @@ -; MoltresPokedexEntry: ; 0x1cc706 db "FLAME@" ; species name dw 607, 1320 ; height, weight db "Legendary bird" next "#MON. It is" next "said to migrate" + page "from the south" next "along with the" next "spring.@" diff --git a/data/pokemon/dex_entries/mr__mime.asm b/data/pokemon/dex_entries/mr__mime.asm index dce25be67..d96b9b37b 100644 --- a/data/pokemon/dex_entries/mr__mime.asm +++ b/data/pokemon/dex_entries/mr__mime.asm @@ -1,10 +1,10 @@ -; MrMimePokedexEntry: ; 0x1b97ea db "BARRIER@" ; species name dw 403, 1200 ; height, weight db "It uses the" next "mysterious" next "power it has in" + page "its fingers to" next "solidify air into" next "an invisible wall.@" diff --git a/data/pokemon/dex_entries/muk.asm b/data/pokemon/dex_entries/muk.asm index 49512c99f..6db1f1867 100644 --- a/data/pokemon/dex_entries/muk.asm +++ b/data/pokemon/dex_entries/muk.asm @@ -1,10 +1,10 @@ -; MukPokedexEntry: ; 0x1b89fc db "SLUDGE@" ; species name dw 311, 660 ; height, weight db "As it moves, a" next "very strong poison" next "leaks from it," + page "making the ground" next "there barren for" next "three years.@" diff --git a/data/pokemon/dex_entries/murkrow.asm b/data/pokemon/dex_entries/murkrow.asm index 6a0f42145..90d90bfbf 100644 --- a/data/pokemon/dex_entries/murkrow.asm +++ b/data/pokemon/dex_entries/murkrow.asm @@ -1,10 +1,10 @@ -; MurkrowPokedexEntry: ; 0x1d021e db "DARKNESS@" ; species name dw 108, 50 ; height, weight db "It hides any shiny" next "object it finds in" next "a secret location." + page "MURKROW and" next "MEOWTH loot one" next "another's stashes.@" diff --git a/data/pokemon/dex_entries/natu.asm b/data/pokemon/dex_entries/natu.asm index 20958dbff..04c47970c 100644 --- a/data/pokemon/dex_entries/natu.asm +++ b/data/pokemon/dex_entries/natu.asm @@ -1,10 +1,10 @@ -; NatuPokedexEntry: ; 0x1cd47d db "LITTLE BIRD@" ; species name dw 8, 40 ; height, weight db "It is extremely" next "good at climbing" next "tree trunks and" + page "likes to eat the" next "new sprouts on" next "the trees.@" diff --git a/data/pokemon/dex_entries/nidoking.asm b/data/pokemon/dex_entries/nidoking.asm index 97c203064..a260ceadb 100644 --- a/data/pokemon/dex_entries/nidoking.asm +++ b/data/pokemon/dex_entries/nidoking.asm @@ -1,10 +1,10 @@ -; NidokingPokedexEntry: ; 0x182463 db "DRILL@" ; species name dw 407, 1370 ; height, weight db "It uses its thick" next "arms, legs and" next "tail to attack" + page "forcefully. Melee" next "combat is its" next "specialty.@" diff --git a/data/pokemon/dex_entries/nidoqueen.asm b/data/pokemon/dex_entries/nidoqueen.asm index c0f711eb4..534546721 100644 --- a/data/pokemon/dex_entries/nidoqueen.asm +++ b/data/pokemon/dex_entries/nidoqueen.asm @@ -1,10 +1,10 @@ -; NidoqueenPokedexEntry: ; 0x18232e db "DRILL@" ; species name dw 403, 1320 ; height, weight db "The hard scales" next "that cover its" next "strong body serve" + page "as excellent" next "protection from" next "any attack.@" diff --git a/data/pokemon/dex_entries/nidoran_f.asm b/data/pokemon/dex_entries/nidoran_f.asm index 4e7299b0d..9181edc20 100644 --- a/data/pokemon/dex_entries/nidoran_f.asm +++ b/data/pokemon/dex_entries/nidoran_f.asm @@ -1,10 +1,10 @@ -; NidoranFPokedexEntry: ; 0x18224b db "POISON PIN@" ; species name dw 104, 150 ; height, weight db "Small and very" next "docile, it pro-" next "tects itself with" + page "its small, poison-" next "ous horn when" next "attacked.@" diff --git a/data/pokemon/dex_entries/nidoran_m.asm b/data/pokemon/dex_entries/nidoran_m.asm index 8970afc36..51ec0a530 100644 --- a/data/pokemon/dex_entries/nidoran_m.asm +++ b/data/pokemon/dex_entries/nidoran_m.asm @@ -1,10 +1,10 @@ -; NidoranMPokedexEntry: ; 0x182392 db "POISON PIN@" ; species name dw 108, 200 ; height, weight db "It constantly" next "moves its large" next "ears in many" + page "directions in" next "order to detect" next "danger right away.@" diff --git a/data/pokemon/dex_entries/nidorina.asm b/data/pokemon/dex_entries/nidorina.asm index 93c1e164d..e1670a187 100644 --- a/data/pokemon/dex_entries/nidorina.asm +++ b/data/pokemon/dex_entries/nidorina.asm @@ -1,10 +1,10 @@ -; NidorinaPokedexEntry: ; 0x1822b6 db "POISON PIN@" ; species name dw 207, 440 ; height, weight db "It has a docile" next "nature. If it is" next "threatened with" + page "attack, it raises" next "the barbs that are" next "all over its body.@" diff --git a/data/pokemon/dex_entries/nidorino.asm b/data/pokemon/dex_entries/nidorino.asm index 6b1403ad2..3f00ac0a5 100644 --- a/data/pokemon/dex_entries/nidorino.asm +++ b/data/pokemon/dex_entries/nidorino.asm @@ -1,10 +1,10 @@ -; NidorinoPokedexEntry: ; 0x1823fd db "POISON PIN@" ; species name dw 211, 430 ; height, weight db "It is easily" next "agitated and uses" next "its horn for" + page "offense as soon as" next "it notices an" next "attacker.@" diff --git a/data/pokemon/dex_entries/ninetales.asm b/data/pokemon/dex_entries/ninetales.asm index fd3a66ffb..c0295e0f7 100644 --- a/data/pokemon/dex_entries/ninetales.asm +++ b/data/pokemon/dex_entries/ninetales.asm @@ -1,10 +1,10 @@ -; NinetalesPokedexEntry: ; 0x18260c db "FOX@" ; species name dw 307, 440 ; height, weight db "It is said to live" next "a thousand years," next "and each of its" + page "tails is loaded" next "with supernatural" next "powers.@" diff --git a/data/pokemon/dex_entries/noctowl.asm b/data/pokemon/dex_entries/noctowl.asm index b939cfe05..ed04cb200 100644 --- a/data/pokemon/dex_entries/noctowl.asm +++ b/data/pokemon/dex_entries/noctowl.asm @@ -1,10 +1,10 @@ -; NoctowlPokedexEntry: ; 0x1cceb9 db "OWL@" ; species name dw 503, 900 ; height, weight db "Its extremely soft" next "feathers make no" next "sound in flight." + page "It silently sneaks" next "up on prey without" next "being detected.@" diff --git a/data/pokemon/dex_entries/octillery.asm b/data/pokemon/dex_entries/octillery.asm index 902c1bf9a..66c539155 100644 --- a/data/pokemon/dex_entries/octillery.asm +++ b/data/pokemon/dex_entries/octillery.asm @@ -1,10 +1,10 @@ -; OctilleryPokedexEntry: ; 0x1d0d42 db "JET@" ; species name dw 211, 630 ; height, weight db "Its instinct is to" next "bury itself in" next "holes. It often" + page "steals the nesting" next "holes of others to" next "sleep in them.@" diff --git a/data/pokemon/dex_entries/oddish.asm b/data/pokemon/dex_entries/oddish.asm index 84560c113..e8a63d81f 100644 --- a/data/pokemon/dex_entries/oddish.asm +++ b/data/pokemon/dex_entries/oddish.asm @@ -1,10 +1,10 @@ -; OddishPokedexEntry: ; 0x182836 db "WEED@" ; species name dw 108, 120 ; height, weight db "During the day, it" next "stays in the cold" next "underground to" + page "avoid the sun." next "It grows by bath-" next "ing in moonlight.@" diff --git a/data/pokemon/dex_entries/omanyte.asm b/data/pokemon/dex_entries/omanyte.asm index 9f7948fe0..70c556910 100644 --- a/data/pokemon/dex_entries/omanyte.asm +++ b/data/pokemon/dex_entries/omanyte.asm @@ -1,10 +1,10 @@ -; OmanytePokedexEntry: ; 0x1cc3c1 db "SPIRAL@" ; species name dw 104, 170 ; height, weight db "In prehistoric" next "times, it swam on" next "the sea floor," + page "eating plankton." next "Its fossils are" next "sometimes found.@" diff --git a/data/pokemon/dex_entries/omastar.asm b/data/pokemon/dex_entries/omastar.asm index 65ba92356..f2cc0caba 100644 --- a/data/pokemon/dex_entries/omastar.asm +++ b/data/pokemon/dex_entries/omastar.asm @@ -1,10 +1,10 @@ -; OmastarPokedexEntry: ; 0x1cc42e db "SPIRAL@" ; species name dw 303, 770 ; height, weight db "Its heavy shell" next "allowed it to" next "reach only nearby" + page "food. This could" next "be the reason it" next "is extinct.@" diff --git a/data/pokemon/dex_entries/onix.asm b/data/pokemon/dex_entries/onix.asm index f0f88fcff..12164c5fb 100644 --- a/data/pokemon/dex_entries/onix.asm +++ b/data/pokemon/dex_entries/onix.asm @@ -1,10 +1,10 @@ -; OnixPokedexEntry: ; 0x1b8c98 db "ROCK SNAKE@" ; species name dw 2810, 4630 ; height, weight db "As it digs through" next "the ground, it" next "absorbs many hard" + page "objects. This is" next "what makes its" next "body so solid.@" diff --git a/data/pokemon/dex_entries/paras.asm b/data/pokemon/dex_entries/paras.asm index 152e1fcc0..62d473c53 100644 --- a/data/pokemon/dex_entries/paras.asm +++ b/data/pokemon/dex_entries/paras.asm @@ -1,10 +1,10 @@ -; ParasPokedexEntry: ; 0x18297f db "MUSHROOM@" ; species name dw 100, 120 ; height, weight db "The tochukaso" next "growing on this" next "#MON's back" + page "orders it to" next "extract juice from" next "tree trunks.@" diff --git a/data/pokemon/dex_entries/parasect.asm b/data/pokemon/dex_entries/parasect.asm index bd912212e..6fbf4f7f9 100644 --- a/data/pokemon/dex_entries/parasect.asm +++ b/data/pokemon/dex_entries/parasect.asm @@ -1,10 +1,10 @@ -; ParasectPokedexEntry: ; 0x1829e2 db "MUSHROOM@" ; species name dw 303, 650 ; height, weight db "When nothing's" next "left to extract" next "from the bug, the" + page "mushrooms on its" next "back leave spores" next "on the bug's egg.@" diff --git a/data/pokemon/dex_entries/persian.asm b/data/pokemon/dex_entries/persian.asm index 7ce74f6f8..9264eeca2 100644 --- a/data/pokemon/dex_entries/persian.asm +++ b/data/pokemon/dex_entries/persian.asm @@ -1,10 +1,10 @@ -; PersianPokedexEntry: ; 0x182c78 db "CLASSY CAT@" ; species name dw 303, 710 ; height, weight db "Behind its lithe," next "elegant appearance" next "lies a barbaric" + page "side. It will tear" next "apart its prey on" next "a mere whim.@" diff --git a/data/pokemon/dex_entries/phanpy.asm b/data/pokemon/dex_entries/phanpy.asm index a7393e546..c32a6889e 100644 --- a/data/pokemon/dex_entries/phanpy.asm +++ b/data/pokemon/dex_entries/phanpy.asm @@ -1,10 +1,10 @@ -; PhanpyPokedexEntry: ; 0x1d1038 db "LONG NOSE@" ; species name dw 108, 740 ; height, weight db "During the desert-" next "ed morning hours," next "it comes ashore" + page "where it deftly" next "uses its trunk to" next "take a shower.@" diff --git a/data/pokemon/dex_entries/pichu.asm b/data/pokemon/dex_entries/pichu.asm index b31976aaf..2d82c6fb1 100644 --- a/data/pokemon/dex_entries/pichu.asm +++ b/data/pokemon/dex_entries/pichu.asm @@ -1,10 +1,10 @@ -; PichuPokedexEntry: ; 0x1cd243 db "TINY MOUSE@" ; species name dw 100, 40 ; height, weight db "It is unskilled at" next "storing electric" next "power. Any kind of" + page "shock causes it to" next "discharge energy" next "spontaneously.@" diff --git a/data/pokemon/dex_entries/pidgeot.asm b/data/pokemon/dex_entries/pidgeot.asm index 16a877427..07df086f2 100644 --- a/data/pokemon/dex_entries/pidgeot.asm +++ b/data/pokemon/dex_entries/pidgeot.asm @@ -1,10 +1,10 @@ -; PidgeotPokedexEntry: ; 0x181dd7 db "BIRD@" ; species name dw 411, 870 ; height, weight db "Its outstanding" next "vision allows it" next "to spot splashing" + page "MAGIKARP, even" next "while flying at" next "3300 feet.@" diff --git a/data/pokemon/dex_entries/pidgeotto.asm b/data/pokemon/dex_entries/pidgeotto.asm index 1ab6fde5c..30a1ccebd 100644 --- a/data/pokemon/dex_entries/pidgeotto.asm +++ b/data/pokemon/dex_entries/pidgeotto.asm @@ -1,10 +1,10 @@ -; PidgeottoPokedexEntry: ; 0x181d75 db "BIRD@" ; species name dw 307, 660 ; height, weight db "It slowly flies in" next "a circular pat-" next "tern, all the" + page "while keeping a" next "sharp lookout for" next "prey.@" diff --git a/data/pokemon/dex_entries/pidgey.asm b/data/pokemon/dex_entries/pidgey.asm index 491dfb9b9..cde05eb61 100644 --- a/data/pokemon/dex_entries/pidgey.asm +++ b/data/pokemon/dex_entries/pidgey.asm @@ -1,10 +1,10 @@ -; PidgeyPokedexEntry: ; 0x181cfa db "TINY BIRD@" ; species name dw 100, 40 ; height, weight db "It rapidly flaps" next "its wings in the" next "grass, stirring up" + page "a dust cloud that" next "drives insect prey" next "out into the open.@" diff --git a/data/pokemon/dex_entries/pikachu.asm b/data/pokemon/dex_entries/pikachu.asm index 680e24673..699900f18 100644 --- a/data/pokemon/dex_entries/pikachu.asm +++ b/data/pokemon/dex_entries/pikachu.asm @@ -1,10 +1,10 @@ -; PikachuPokedexEntry: ; 0x1820ad db "MOUSE@" ; species name dw 104, 130 ; height, weight db "When it is anger-" next "ed, it immediately" next "discharges the" + page "energy stored in" next "the pouches in its" next "cheeks.@" diff --git a/data/pokemon/dex_entries/piloswine.asm b/data/pokemon/dex_entries/piloswine.asm index 326ea4503..1c5aa36c0 100644 --- a/data/pokemon/dex_entries/piloswine.asm +++ b/data/pokemon/dex_entries/piloswine.asm @@ -1,10 +1,10 @@ -; PiloswinePokedexEntry: ; 0x1d0c01 db "SWINE@" ; species name dw 307, 1230 ; height, weight db "Although its legs" next "are short, its" next "rugged hooves" + page "prevent it from" next "slipping, even on" next "icy ground.@" diff --git a/data/pokemon/dex_entries/pineco.asm b/data/pokemon/dex_entries/pineco.asm index 9781b094e..7d8d990b9 100644 --- a/data/pokemon/dex_entries/pineco.asm +++ b/data/pokemon/dex_entries/pineco.asm @@ -1,10 +1,10 @@ -; PinecoPokedexEntry: ; 0x1d04b0 db "BAGWORM@" ; species name dw 200, 160 ; height, weight db "It spits out a" next "fluid that it uses" next "to glue tree bark" + page "to its body. The" next "fluid hardens when" next "it touches air.@" diff --git a/data/pokemon/dex_entries/pinsir.asm b/data/pokemon/dex_entries/pinsir.asm index c236b3594..331a8d4f5 100644 --- a/data/pokemon/dex_entries/pinsir.asm +++ b/data/pokemon/dex_entries/pinsir.asm @@ -1,10 +1,10 @@ -; PinsirPokedexEntry: ; 0x1b99fb db "STAGBEETLE@" ; species name dw 411, 1210 ; height, weight db "When the tempera-" next "ture drops at" next "night, it sleeps" + page "on treetops or" next "among roots where" next "it is well hidden.@" diff --git a/data/pokemon/dex_entries/politoed.asm b/data/pokemon/dex_entries/politoed.asm index 0dea3d572..a085ad58a 100644 --- a/data/pokemon/dex_entries/politoed.asm +++ b/data/pokemon/dex_entries/politoed.asm @@ -1,10 +1,10 @@ -; PolitoedPokedexEntry: ; 0x1cd84b db "FROG@" ; species name dw 307, 750 ; height, weight db "When it expands" next "its throat to" next "croak out a tune," + page "nearby POLIWAG and" next "POLIWHIRL gather" next "immediately.@" diff --git a/data/pokemon/dex_entries/poliwag.asm b/data/pokemon/dex_entries/poliwag.asm index d21677cc4..9183a15da 100644 --- a/data/pokemon/dex_entries/poliwag.asm +++ b/data/pokemon/dex_entries/poliwag.asm @@ -1,10 +1,10 @@ -; PoliwagPokedexEntry: ; 0x182f91 db "TADPOLE@" ; species name dw 200, 270 ; height, weight db "The swirl on its" next "belly is its" next "insides showing" + page "through the skin." next "It looks clearer" next "after it eats.@" diff --git a/data/pokemon/dex_entries/poliwhirl.asm b/data/pokemon/dex_entries/poliwhirl.asm index 69a6ee206..df4e0e6fd 100644 --- a/data/pokemon/dex_entries/poliwhirl.asm +++ b/data/pokemon/dex_entries/poliwhirl.asm @@ -1,10 +1,10 @@ -; PoliwhirlPokedexEntry: ; 0x182ffd db "TADPOLE@" ; species name dw 303, 440 ; height, weight db "Though it is" next "skilled at walk-" next "ing, it prefers to" + page "live underwater" next "where there is" next "less danger.@" diff --git a/data/pokemon/dex_entries/poliwrath.asm b/data/pokemon/dex_entries/poliwrath.asm index bb3e7dda5..4b4f23389 100644 --- a/data/pokemon/dex_entries/poliwrath.asm +++ b/data/pokemon/dex_entries/poliwrath.asm @@ -1,10 +1,10 @@ -; PoliwrathPokedexEntry: ; 0x183066 db "TADPOLE@" ; species name dw 403, 1190 ; height, weight db "It can use its" next "well-developed" next "arms and legs to" + page "run on the surface" next "of the water for a" next "split second.@" diff --git a/data/pokemon/dex_entries/ponyta.asm b/data/pokemon/dex_entries/ponyta.asm index fa123cde1..0d82b7702 100644 --- a/data/pokemon/dex_entries/ponyta.asm +++ b/data/pokemon/dex_entries/ponyta.asm @@ -1,10 +1,10 @@ -; PonytaPokedexEntry: ; 0x1b84f2 db "FIRE HORSE@" ; species name dw 303, 660 ; height, weight db "Training by" next "jumping over grass" next "that grows longer" + page "every day has made" next "it a world-class" next "jumper.@" diff --git a/data/pokemon/dex_entries/porygon.asm b/data/pokemon/dex_entries/porygon.asm index 9a73c9623..098a96d25 100644 --- a/data/pokemon/dex_entries/porygon.asm +++ b/data/pokemon/dex_entries/porygon.asm @@ -1,10 +1,10 @@ -; PorygonPokedexEntry: ; 0x1cc353 db "VIRTUAL@" ; species name dw 207, 800 ; height, weight db "An artificial" next "#MON created" next "due to extensive" + page "research, it can" next "perform only what" next "is in its program.@" diff --git a/data/pokemon/dex_entries/porygon2.asm b/data/pokemon/dex_entries/porygon2.asm index 8591e0039..e4f5a2358 100644 --- a/data/pokemon/dex_entries/porygon2.asm +++ b/data/pokemon/dex_entries/porygon2.asm @@ -1,10 +1,10 @@ -; Porygon2PokedexEntry: ; 0x1d110c db "VIRTUAL@" ; species name dw 200, 720 ; height, weight db "This manmade" next "#MON evolved" next "from the latest" + page "technology. It" next "may have unprog-" next "rammed reactions.@" diff --git a/data/pokemon/dex_entries/primeape.asm b/data/pokemon/dex_entries/primeape.asm index 7d7f211cc..3a96c936c 100644 --- a/data/pokemon/dex_entries/primeape.asm +++ b/data/pokemon/dex_entries/primeape.asm @@ -1,10 +1,10 @@ -; PrimeapePokedexEntry: ; 0x182e39 db "PIG MONKEY@" ; species name dw 303, 710 ; height, weight db "It will beat up" next "anyone who makes" next "it mad, even if it" + page "has to chase them" next "until the end of" next "the world.@" diff --git a/data/pokemon/dex_entries/psyduck.asm b/data/pokemon/dex_entries/psyduck.asm index 088b4ff76..6a58bc9f8 100644 --- a/data/pokemon/dex_entries/psyduck.asm +++ b/data/pokemon/dex_entries/psyduck.asm @@ -1,10 +1,10 @@ -; PsyduckPokedexEntry: ; 0x182cee db "DUCK@" ; species name dw 207, 430 ; height, weight db "The only time it" next "can use its psy-" next "chic power is when" + page "its sleeping brain" next "cells happen to" next "wake.@" diff --git a/data/pokemon/dex_entries/pupitar.asm b/data/pokemon/dex_entries/pupitar.asm index d35e457ad..ae8b5b3a4 100644 --- a/data/pokemon/dex_entries/pupitar.asm +++ b/data/pokemon/dex_entries/pupitar.asm @@ -1,10 +1,10 @@ -; PupitarPokedexEntry: ; 0x1d1709 db "HARD SHELL@" ; species name dw 311, 3350 ; height, weight db "It will not stay" next "still, even while" next "it's a pupa. It" + page "already has arms" next "and legs under its" next "solid shell.@" diff --git a/data/pokemon/dex_entries/quagsire.asm b/data/pokemon/dex_entries/quagsire.asm index 053058d54..25bb2ab66 100644 --- a/data/pokemon/dex_entries/quagsire.asm +++ b/data/pokemon/dex_entries/quagsire.asm @@ -1,10 +1,10 @@ -; QuagsirePokedexEntry: ; 0x1d00dd db "WATER FISH@" ; species name dw 407, 1650 ; height, weight db "Its body is always" next "slimy. It often" next "bangs its head on" + page "the river bottom" next "as it swims but" next "seems not to care.@" diff --git a/data/pokemon/dex_entries/quilava.asm b/data/pokemon/dex_entries/quilava.asm index aaf8069af..97363c158 100644 --- a/data/pokemon/dex_entries/quilava.asm +++ b/data/pokemon/dex_entries/quilava.asm @@ -1,10 +1,10 @@ -; QuilavaPokedexEntry: ; 0x1ccb33 db "VOLCANO@" ; species name dw 211, 420 ; height, weight db "Before battle, it" next "turns its back on" next "its opponent to" + page "demonstrate how" next "ferociously its" next "fire blazes.@" diff --git a/data/pokemon/dex_entries/qwilfish.asm b/data/pokemon/dex_entries/qwilfish.asm index d9529146f..c7405b980 100644 --- a/data/pokemon/dex_entries/qwilfish.asm +++ b/data/pokemon/dex_entries/qwilfish.asm @@ -1,10 +1,10 @@ -; QwilfishPokedexEntry: ; 0x1d07b1 db "BALLOON@" ; species name dw 108, 90 ; height, weight db "When faced with a" next "larger opponent," next "it swallows as" + page "much water as it" next "can to match the" next "opponent's size.@" diff --git a/data/pokemon/dex_entries/raichu.asm b/data/pokemon/dex_entries/raichu.asm index 886aef283..a17a5e9c2 100644 --- a/data/pokemon/dex_entries/raichu.asm +++ b/data/pokemon/dex_entries/raichu.asm @@ -1,10 +1,10 @@ -; RaichuPokedexEntry: ; 0x182117 db "MOUSE@" ; species name dw 207, 660 ; height, weight db "If its electric" next "pouches run empty," next "it raises its tail" + page "to gather electri-" next "city from the" next "atmosphere.@" diff --git a/data/pokemon/dex_entries/raikou.asm b/data/pokemon/dex_entries/raikou.asm index 315eb84ae..4f300635f 100644 --- a/data/pokemon/dex_entries/raikou.asm +++ b/data/pokemon/dex_entries/raikou.asm @@ -1,10 +1,10 @@ -; RaikouPokedexEntry: ; 0x1d156b db "THUNDER@" ; species name dw 603, 3920 ; height, weight db "This rough #MON" next "stores energy" next "inside its body," + page "then sweeps across" next "the land, shooting" next "off electricity.@" diff --git a/data/pokemon/dex_entries/rapidash.asm b/data/pokemon/dex_entries/rapidash.asm index ae98e2cb8..051e557ef 100644 --- a/data/pokemon/dex_entries/rapidash.asm +++ b/data/pokemon/dex_entries/rapidash.asm @@ -1,10 +1,10 @@ -; RapidashPokedexEntry: ; 0x1b855e db "FIRE HORSE@" ; species name dw 507, 2090 ; height, weight db "It just loves to" next "gallop. The faster" next "it goes, the long-" + page "er the swaying" next "flames of its mane" next "will become.@" diff --git a/data/pokemon/dex_entries/raticate.asm b/data/pokemon/dex_entries/raticate.asm index f009c29aa..50898dda3 100644 --- a/data/pokemon/dex_entries/raticate.asm +++ b/data/pokemon/dex_entries/raticate.asm @@ -1,10 +1,10 @@ -; RaticatePokedexEntry: ; 0x181ea3 db "RAT@" ; species name dw 204, 410 ; height, weight db "The webs on its" next "hind legs enable" next "it to cross" + page "rivers. It search-" next "es wide areas for" next "food.@" diff --git a/data/pokemon/dex_entries/rattata.asm b/data/pokemon/dex_entries/rattata.asm index 0a066eb74..f9e801b52 100644 --- a/data/pokemon/dex_entries/rattata.asm +++ b/data/pokemon/dex_entries/rattata.asm @@ -1,10 +1,10 @@ -; RattataPokedexEntry: ; 0x181e3d db "RAT@" ; species name dw 100, 80 ; height, weight db "This #MON's" next "impressive vital-" next "ity allows it to" + page "live anywhere. It" next "also multiplies" next "very quickly.@" diff --git a/data/pokemon/dex_entries/remoraid.asm b/data/pokemon/dex_entries/remoraid.asm index aaa6f1a49..1b9b0e562 100644 --- a/data/pokemon/dex_entries/remoraid.asm +++ b/data/pokemon/dex_entries/remoraid.asm @@ -1,10 +1,10 @@ -; RemoraidPokedexEntry: ; 0x1d0cd3 db "JET@" ; species name dw 200, 260 ; height, weight db "To escape from an" next "attacker, it may" next "shoot water out of" + page "its mouth, then" next "use that force to" next "swim backward.@" diff --git a/data/pokemon/dex_entries/rhydon.asm b/data/pokemon/dex_entries/rhydon.asm index c820666b3..c81141343 100644 --- a/data/pokemon/dex_entries/rhydon.asm +++ b/data/pokemon/dex_entries/rhydon.asm @@ -1,10 +1,10 @@ -; RhydonPokedexEntry: ; 0x1b93c5 db "DRILL@" ; species name dw 603, 2650 ; height, weight db "By lightly spin-" next "ning its drill-" next "like horn, it can" + page "easily shatter" next "even a diamond in" next "the rough.@" diff --git a/data/pokemon/dex_entries/rhyhorn.asm b/data/pokemon/dex_entries/rhyhorn.asm index b2f26e204..d7dd8d7e1 100644 --- a/data/pokemon/dex_entries/rhyhorn.asm +++ b/data/pokemon/dex_entries/rhyhorn.asm @@ -1,10 +1,10 @@ -; RhyhornPokedexEntry: ; 0x1b935d db "SPIKES@" ; species name dw 303, 2540 ; height, weight db "It can remember" next "only one thing at" next "a time. Once it" + page "starts rushing, it" next "forgets why it" next "started.@" diff --git a/data/pokemon/dex_entries/sandshrew.asm b/data/pokemon/dex_entries/sandshrew.asm index 2ef83f9c3..570907b31 100644 --- a/data/pokemon/dex_entries/sandshrew.asm +++ b/data/pokemon/dex_entries/sandshrew.asm @@ -1,10 +1,10 @@ -; SandshrewPokedexEntry: ; 0x182184 db "MOUSE@" ; species name dw 200, 260 ; height, weight db "It prefers dry," next "sandy places" next "because it uses" + page "the sand to" next "protect itself" next "when threatened.@" diff --git a/data/pokemon/dex_entries/sandslash.asm b/data/pokemon/dex_entries/sandslash.asm index fd2492f91..9e7fc454b 100644 --- a/data/pokemon/dex_entries/sandslash.asm +++ b/data/pokemon/dex_entries/sandslash.asm @@ -1,10 +1,10 @@ -; SandslashPokedexEntry: ; 0x1821e7 db "MOUSE@" ; species name dw 303, 650 ; height, weight db "Adept at climbing" next "trees, it rolls" next "into a spiny ball," + page "then attacks its" next "enemies from" next "above.@" diff --git a/data/pokemon/dex_entries/scizor.asm b/data/pokemon/dex_entries/scizor.asm index a000a6586..fa184c6ca 100644 --- a/data/pokemon/dex_entries/scizor.asm +++ b/data/pokemon/dex_entries/scizor.asm @@ -1,10 +1,10 @@ -; ScizorPokedexEntry: ; 0x1d0821 db "SCISSORS@" ; species name dw 511, 2600 ; height, weight db "This #MON's" next "pincers, which" next "contain steel, can" + page "crush any hard" next "object it gets a" next "hold of into bits.@" diff --git a/data/pokemon/dex_entries/scyther.asm b/data/pokemon/dex_entries/scyther.asm index ca47c46b6..f2231dd6d 100644 --- a/data/pokemon/dex_entries/scyther.asm +++ b/data/pokemon/dex_entries/scyther.asm @@ -1,10 +1,10 @@ -; ScytherPokedexEntry: ; 0x1b9851 db "MANTIS@" ; species name dw 411, 1230 ; height, weight db "It's very proud of" next "its speed. It" next "moves so fast that" + page "its opponent does" next "not even know what" next "knocked it down.@" diff --git a/data/pokemon/dex_entries/seadra.asm b/data/pokemon/dex_entries/seadra.asm index 91731c64a..482302ad6 100644 --- a/data/pokemon/dex_entries/seadra.asm +++ b/data/pokemon/dex_entries/seadra.asm @@ -1,10 +1,10 @@ -; SeadraPokedexEntry: ; 0x1b95b8 db "DRAGON@" ; species name dw 311, 550 ; height, weight db "The male raises" next "the young. If it" next "is approached, it" + page "uses its toxic" next "spikes to fend off" next "the intruder.@" diff --git a/data/pokemon/dex_entries/seaking.asm b/data/pokemon/dex_entries/seaking.asm index 0d7d1fe48..1225d0bf8 100644 --- a/data/pokemon/dex_entries/seaking.asm +++ b/data/pokemon/dex_entries/seaking.asm @@ -1,10 +1,10 @@ -; SeakingPokedexEntry: ; 0x1b9690 db "GOLDFISH@" ; species name dw 403, 860 ; height, weight db "When autumn comes," next "the males patrol" next "the area around" + page "their nests in" next "order to protect" next "their offspring.@" diff --git a/data/pokemon/dex_entries/seel.asm b/data/pokemon/dex_entries/seel.asm index 53d179097..ac5bdbc8a 100644 --- a/data/pokemon/dex_entries/seel.asm +++ b/data/pokemon/dex_entries/seel.asm @@ -1,10 +1,10 @@ -; SeelPokedexEntry: ; 0x1b88bf db "SEA LION@" ; species name dw 307, 1980 ; height, weight db "The light blue fur" next "that covers it" next "keeps it protected" + page "against the cold." next "It loves iceberg-" next "filled oceans.@" diff --git a/data/pokemon/dex_entries/sentret.asm b/data/pokemon/dex_entries/sentret.asm index 9e70418c8..70f1af39e 100644 --- a/data/pokemon/dex_entries/sentret.asm +++ b/data/pokemon/dex_entries/sentret.asm @@ -1,10 +1,10 @@ -; SentretPokedexEntry: ; 0x1ccd6b db "SCOUT@" ; species name dw 207, 130 ; height, weight db "When acting as a" next "lookout, it warns" next "others of danger" + page "by screeching and" next "hitting the ground" next "with its tail.@" diff --git a/data/pokemon/dex_entries/shellder.asm b/data/pokemon/dex_entries/shellder.asm index 0c7553c43..43d3c05a8 100644 --- a/data/pokemon/dex_entries/shellder.asm +++ b/data/pokemon/dex_entries/shellder.asm @@ -1,10 +1,10 @@ -; ShellderPokedexEntry: ; 0x1b8a68 db "BIVALVE@" ; species name dw 100, 90 ; height, weight db "Clamping on to an" next "opponent reveals" next "its vulnerable" + page "parts, so it uses" next "this move only as" next "a last resort.@" diff --git a/data/pokemon/dex_entries/shuckle.asm b/data/pokemon/dex_entries/shuckle.asm index 3795942e3..4eaa349eb 100644 --- a/data/pokemon/dex_entries/shuckle.asm +++ b/data/pokemon/dex_entries/shuckle.asm @@ -1,10 +1,10 @@ -; ShucklePokedexEntry: ; 0x1d088e db "MOLD@" ; species name dw 200, 450 ; height, weight db "The fluid secreted" next "by its toes carves" next "holes in rocks for" + page "nesting and can be" next "mixed with BERRIES" next "to make a drink.@" diff --git a/data/pokemon/dex_entries/skarmory.asm b/data/pokemon/dex_entries/skarmory.asm index 2558065af..46f0a12fc 100644 --- a/data/pokemon/dex_entries/skarmory.asm +++ b/data/pokemon/dex_entries/skarmory.asm @@ -1,10 +1,10 @@ -; SkarmoryPokedexEntry: ; 0x1d0e8c db "ARMOR BIRD@" ; species name dw 507, 1110 ; height, weight db "The feathers that" next "it sheds are very" next "sharp. It is said" + page "that people once" next "used the feathers" next "as swords.@" diff --git a/data/pokemon/dex_entries/skiploom.asm b/data/pokemon/dex_entries/skiploom.asm index f6e62266c..2980679e8 100644 --- a/data/pokemon/dex_entries/skiploom.asm +++ b/data/pokemon/dex_entries/skiploom.asm @@ -1,10 +1,10 @@ -; SkiploomPokedexEntry: ; 0x1cd928 db "COTTONWEED@" ; species name dw 200, 20 ; height, weight db "As soon as it" next "rains, it closes" next "its flower and" + page "hides in the shade" next "of a tree to avoid" next "getting wet.@" diff --git a/data/pokemon/dex_entries/slowbro.asm b/data/pokemon/dex_entries/slowbro.asm index fdfb36e98..f48be6761 100644 --- a/data/pokemon/dex_entries/slowbro.asm +++ b/data/pokemon/dex_entries/slowbro.asm @@ -1,10 +1,10 @@ -; SlowbroPokedexEntry: ; 0x1b8635 db "HERMITCRAB@" ; species name dw 503, 1730 ; height, weight db "An attached" next "SHELLDER won't let" next "go because of the" + page "tasty flavor that" next "oozes out of its" next "tail.@" diff --git a/data/pokemon/dex_entries/slowking.asm b/data/pokemon/dex_entries/slowking.asm index f52bdb1b7..07a5c4a15 100644 --- a/data/pokemon/dex_entries/slowking.asm +++ b/data/pokemon/dex_entries/slowking.asm @@ -1,10 +1,10 @@ -; SlowkingPokedexEntry: ; 0x1d0292 db "ROYAL@" ; species name dw 607, 1750 ; height, weight db "Every time it ya-" next "wns, SHELLDER" next "injects more poi-" + page "son into it. The" next "poison makes it" next "more intelligent.@" diff --git a/data/pokemon/dex_entries/slowpoke.asm b/data/pokemon/dex_entries/slowpoke.asm index 2341758f8..0c35e438f 100644 --- a/data/pokemon/dex_entries/slowpoke.asm +++ b/data/pokemon/dex_entries/slowpoke.asm @@ -1,10 +1,10 @@ -; SlowpokePokedexEntry: ; 0x1b85d3 db "DOPEY@" ; species name dw 311, 790 ; height, weight db "It is always so" next "absent-minded that" next "it won't react," + page "even if its" next "flavorful tail is" next "bitten.@" diff --git a/data/pokemon/dex_entries/slugma.asm b/data/pokemon/dex_entries/slugma.asm index ea1fc01f2..d56958540 100644 --- a/data/pokemon/dex_entries/slugma.asm +++ b/data/pokemon/dex_entries/slugma.asm @@ -1,10 +1,10 @@ -; SlugmaPokedexEntry: ; 0x1d0ab8 db "LAVA@" ; species name dw 204, 770 ; height, weight db "These group to-" next "gether in areas" next "that are hotter" + page "than normal. If it" next "cools off, its" next "skin hardens.@" diff --git a/data/pokemon/dex_entries/smeargle.asm b/data/pokemon/dex_entries/smeargle.asm index 8b265c1ea..98b9f69f3 100644 --- a/data/pokemon/dex_entries/smeargle.asm +++ b/data/pokemon/dex_entries/smeargle.asm @@ -1,10 +1,10 @@ -; SmearglePokedexEntry: ; 0x1d11e0 db "PAINTER@" ; species name dw 311, 1280 ; height, weight db "The color of the" next "mysterious fluid" next "secreted from its" + page "tail is predeter-" next "mined for each" next "SMEARGLE.@" diff --git a/data/pokemon/dex_entries/smoochum.asm b/data/pokemon/dex_entries/smoochum.asm index b619b1720..74dbc77b8 100644 --- a/data/pokemon/dex_entries/smoochum.asm +++ b/data/pokemon/dex_entries/smoochum.asm @@ -1,10 +1,10 @@ -; SmoochumPokedexEntry: ; 0x1d132b db "KISS@" ; species name dw 104, 130 ; height, weight db "The sensitivity of" next "its lips develops" next "most quickly." + page "It uses them to" next "try to identify" next "unknown objects.@" diff --git a/data/pokemon/dex_entries/sneasel.asm b/data/pokemon/dex_entries/sneasel.asm index 5c1e70f09..b2cba47fa 100644 --- a/data/pokemon/dex_entries/sneasel.asm +++ b/data/pokemon/dex_entries/sneasel.asm @@ -1,10 +1,10 @@ -; SneaselPokedexEntry: ; 0x1d097a db "SHARP CLAW@" ; species name dw 211, 620 ; height, weight db "This cunning" next "#MON hides" next "under the cover" + page "of darkness," next "waiting to attack" next "its prey.@" diff --git a/data/pokemon/dex_entries/snorlax.asm b/data/pokemon/dex_entries/snorlax.asm index e56651fb8..b006777dd 100644 --- a/data/pokemon/dex_entries/snorlax.asm +++ b/data/pokemon/dex_entries/snorlax.asm @@ -1,10 +1,10 @@ -; SnorlaxPokedexEntry: ; 0x1cc5cf db "SLEEPING@" ; species name dw 611, 10140 ; height, weight db "This #MON's" next "stomach is so" next "strong, even" + page "eating moldy or" next "rotten food will" next "not affect it.@" diff --git a/data/pokemon/dex_entries/snubbull.asm b/data/pokemon/dex_entries/snubbull.asm index 97b27ed8f..ca8b9bb2d 100644 --- a/data/pokemon/dex_entries/snubbull.asm +++ b/data/pokemon/dex_entries/snubbull.asm @@ -1,10 +1,10 @@ -; SnubbullPokedexEntry: ; 0x1d06e0 db "FAIRY@" ; species name dw 200, 170 ; height, weight db "In truth, it is a" next "cowardly #MON." next "It growls eagerly" + page "in order to hide" next "its fear from its" next "opponent.@" diff --git a/data/pokemon/dex_entries/spearow.asm b/data/pokemon/dex_entries/spearow.asm index 16b89d22f..290e721b1 100644 --- a/data/pokemon/dex_entries/spearow.asm +++ b/data/pokemon/dex_entries/spearow.asm @@ -1,10 +1,10 @@ -; SpearowPokedexEntry: ; 0x181f03 db "TINY BIRD@" ; species name dw 100, 40 ; height, weight db "To protect its" next "territory, it" next "flies around" + page "ceaselessly," next "making high-" next "pitched cries.@" diff --git a/data/pokemon/dex_entries/spinarak.asm b/data/pokemon/dex_entries/spinarak.asm index e6e4c7203..8adbd74ef 100644 --- a/data/pokemon/dex_entries/spinarak.asm +++ b/data/pokemon/dex_entries/spinarak.asm @@ -1,10 +1,10 @@ -; SpinarakPokedexEntry: ; 0x1cd012 db "STRINGSPIT@" ; species name dw 108, 190 ; height, weight db "If prey becomes" next "ensnared in its" next "nest of spun" + page "string, it waits" next "motionlessly until" next "it becomes dark.@" diff --git a/data/pokemon/dex_entries/squirtle.asm b/data/pokemon/dex_entries/squirtle.asm index 6fd442a13..e82e6bd6b 100644 --- a/data/pokemon/dex_entries/squirtle.asm +++ b/data/pokemon/dex_entries/squirtle.asm @@ -1,10 +1,10 @@ -; SquirtlePokedexEntry: ; 0x181926 db "TINYTURTLE@" ; species name dw 108, 200 ; height, weight db "When it feels" next "threatened, it" next "draws its legs" + page "inside its shell" next "and sprays water" next "from its mouth.@" diff --git a/data/pokemon/dex_entries/stantler.asm b/data/pokemon/dex_entries/stantler.asm index 0fce8f2b5..cabe544ff 100644 --- a/data/pokemon/dex_entries/stantler.asm +++ b/data/pokemon/dex_entries/stantler.asm @@ -1,10 +1,10 @@ -; StantlerPokedexEntry: ; 0x1d1174 db "BIG HORN@" ; species name dw 407, 1570 ; height, weight db "The round balls" next "found on the" next "fallen antlers can" + page "be ground into a" next "powder that aids" next "in sleeping.@" diff --git a/data/pokemon/dex_entries/starmie.asm b/data/pokemon/dex_entries/starmie.asm index 83393b9c2..c7aa7838a 100644 --- a/data/pokemon/dex_entries/starmie.asm +++ b/data/pokemon/dex_entries/starmie.asm @@ -1,10 +1,10 @@ -; StarmiePokedexEntry: ; 0x1b9776 db "MYSTERIOUS@" ; species name dw 307, 1760 ; height, weight db "It is said that it" next "uses the seven-" next "colored core of" + page "its body to send" next "electric waves" next "into outer space.@" diff --git a/data/pokemon/dex_entries/staryu.asm b/data/pokemon/dex_entries/staryu.asm index 9f1fadc9c..f18678d98 100644 --- a/data/pokemon/dex_entries/staryu.asm +++ b/data/pokemon/dex_entries/staryu.asm @@ -1,10 +1,10 @@ -; StaryuPokedexEntry: ; 0x1b9702 db "STARSHAPE@" ; species name dw 207, 760 ; height, weight db "When the stars" next "twinkle at night," next "it floats up from" + page "the sea floor, and" next "its body's center" next "core flickers.@" diff --git a/data/pokemon/dex_entries/steelix.asm b/data/pokemon/dex_entries/steelix.asm index 6bbfe6c28..7d9fcc219 100644 --- a/data/pokemon/dex_entries/steelix.asm +++ b/data/pokemon/dex_entries/steelix.asm @@ -1,10 +1,10 @@ -; SteelixPokedexEntry: ; 0x1d067c db "IRON SNAKE@" ; species name dw 3002, 8820 ; height, weight db "The many small" next "metal particles" next "that cover this" + page "#MON's body" next "reflect bright" next "light well.@" diff --git a/data/pokemon/dex_entries/sudowoodo.asm b/data/pokemon/dex_entries/sudowoodo.asm index 060db1d8d..f8250f5f0 100644 --- a/data/pokemon/dex_entries/sudowoodo.asm +++ b/data/pokemon/dex_entries/sudowoodo.asm @@ -1,10 +1,10 @@ -; SudowoodoPokedexEntry: ; 0x1cd7d9 db "IMITATION@" ; species name dw 311, 840 ; height, weight db "If a tree branch" next "shakes when there" next "is no wind, it's a" + page "SUDOWOODO, not a" next "tree. It hides" next "from the rain.@" diff --git a/data/pokemon/dex_entries/suicune.asm b/data/pokemon/dex_entries/suicune.asm index c60c002f7..5b4aa9e27 100644 --- a/data/pokemon/dex_entries/suicune.asm +++ b/data/pokemon/dex_entries/suicune.asm @@ -1,10 +1,10 @@ -; SuicunePokedexEntry: ; 0x1d1642 db "AURORA@" ; species name dw 607, 4120 ; height, weight db "This divine" next "#MON blows" next "around the world," + page "always in search" next "of a pure" next "reservoir.@" diff --git a/data/pokemon/dex_entries/sunflora.asm b/data/pokemon/dex_entries/sunflora.asm index 2d0e78111..2b162a526 100644 --- a/data/pokemon/dex_entries/sunflora.asm +++ b/data/pokemon/dex_entries/sunflora.asm @@ -1,10 +1,10 @@ -; SunfloraPokedexEntry: ; 0x1cdaef db "SUN@" ; species name dw 207, 190 ; height, weight db "As the hot season" next "approaches, the" next "petals on this" + page "#MON's face" next "become more vivid" next "and lively.@" diff --git a/data/pokemon/dex_entries/sunkern.asm b/data/pokemon/dex_entries/sunkern.asm index 680e1799e..8264891e4 100644 --- a/data/pokemon/dex_entries/sunkern.asm +++ b/data/pokemon/dex_entries/sunkern.asm @@ -1,10 +1,10 @@ -; SunkernPokedexEntry: ; 0x1cda87 db "SEED@" ; species name dw 100, 40 ; height, weight db "It is very weak." next "Its only means of" next "defense is to" + page "shake its leaves" next "desperately at its" next "attacker.@" diff --git a/data/pokemon/dex_entries/swinub.asm b/data/pokemon/dex_entries/swinub.asm index 3e6d61dc8..44f78aaaa 100644 --- a/data/pokemon/dex_entries/swinub.asm +++ b/data/pokemon/dex_entries/swinub.asm @@ -1,10 +1,10 @@ -; SwinubPokedexEntry: ; 0x1d0b8d db "PIG@" ; species name dw 104, 140 ; height, weight db "It uses the tip of" next "its nose to dig" next "for food. Its nose" + page "is so tough that" next "even frozen ground" next "poses no problem.@" diff --git a/data/pokemon/dex_entries/tangela.asm b/data/pokemon/dex_entries/tangela.asm index 4e011b082..6c84cbfd1 100644 --- a/data/pokemon/dex_entries/tangela.asm +++ b/data/pokemon/dex_entries/tangela.asm @@ -1,10 +1,10 @@ -; TangelaPokedexEntry: ; 0x1b948c db "VINE@" ; species name dw 303, 770 ; height, weight db "During battle, it" next "constantly moves" next "the vines that" + page "cover its body in" next "order to annoy its" next "opponent.@" diff --git a/data/pokemon/dex_entries/tauros.asm b/data/pokemon/dex_entries/tauros.asm index bd7851165..04a4b5ce1 100644 --- a/data/pokemon/dex_entries/tauros.asm +++ b/data/pokemon/dex_entries/tauros.asm @@ -1,10 +1,10 @@ -; TaurosPokedexEntry: ; 0x1b9a6f db "WILD BULL@" ; species name dw 407, 1950 ; height, weight db "These violent" next "#MON fight" next "with other mem-" + page "bers of their herd" next "in order to prove" next "their strength.@" diff --git a/data/pokemon/dex_entries/teddiursa.asm b/data/pokemon/dex_entries/teddiursa.asm index 35b32c322..1d75c8299 100644 --- a/data/pokemon/dex_entries/teddiursa.asm +++ b/data/pokemon/dex_entries/teddiursa.asm @@ -1,10 +1,10 @@ -; TeddiursaPokedexEntry: ; 0x1d09da db "LITTLE BEAR@" ; species name dw 200, 190 ; height, weight db "It always licks" next "honey. Its palm" next "tastes sweet" + page "because of all the" next "honey it has" next "absorbed.@" diff --git a/data/pokemon/dex_entries/tentacool.asm b/data/pokemon/dex_entries/tentacool.asm index 5ed4b4fa0..f16523c9d 100644 --- a/data/pokemon/dex_entries/tentacool.asm +++ b/data/pokemon/dex_entries/tentacool.asm @@ -1,10 +1,10 @@ -; TentacoolPokedexEntry: ; 0x1b82d1 db "JELLYFISH@" ; species name dw 211, 1000 ; height, weight db "As it floats along" next "on the waves, it" next "uses its toxic" + page "feelers to stab" next "anything it" next "touches.@" diff --git a/data/pokemon/dex_entries/tentacruel.asm b/data/pokemon/dex_entries/tentacruel.asm index 27dad758f..c09f892e4 100644 --- a/data/pokemon/dex_entries/tentacruel.asm +++ b/data/pokemon/dex_entries/tentacruel.asm @@ -1,10 +1,10 @@ -; TentacruelPokedexEntry: ; 0x1b8337 db "JELLYFISH@" ; species name dw 503, 1210 ; height, weight db "When its 80 feel-" next "ers absorb water," next "it stretches to" + page "become like a net" next "to entangle its" next "prey.@" diff --git a/data/pokemon/dex_entries/togepi.asm b/data/pokemon/dex_entries/togepi.asm index eb185b1f1..a295acf54 100644 --- a/data/pokemon/dex_entries/togepi.asm +++ b/data/pokemon/dex_entries/togepi.asm @@ -1,10 +1,10 @@ -; TogepiPokedexEntry: ; 0x1cd396 db "SPIKE BALL@" ; species name dw 100, 30 ; height, weight db "It is considered" next "to be a symbol of" next "good luck. Its" + page "shell is said to" next "be filled with" next "happiness.@" diff --git a/data/pokemon/dex_entries/togetic.asm b/data/pokemon/dex_entries/togetic.asm index 7d1519d73..b638aceb3 100644 --- a/data/pokemon/dex_entries/togetic.asm +++ b/data/pokemon/dex_entries/togetic.asm @@ -1,10 +1,10 @@ -; TogeticPokedexEntry: ; 0x1cd402 db "HAPPINESS@" ; species name dw 200, 70 ; height, weight db "Although it does" next "not flap its wings" next "very much, it can" + page "stay up in the air" next "as it tags along" next "after its trainer.@" diff --git a/data/pokemon/dex_entries/totodile.asm b/data/pokemon/dex_entries/totodile.asm index 78a1b761e..8be3ad28c 100644 --- a/data/pokemon/dex_entries/totodile.asm +++ b/data/pokemon/dex_entries/totodile.asm @@ -1,10 +1,10 @@ -; TotodilePokedexEntry: ; 0x1ccc14 db "BIG JAW@" ; species name dw 200, 210 ; height, weight db "This rough critter" next "chomps at any" next "moving object it" + page "sees. Turning your" next "back on it is not" next "recommended.@" diff --git a/data/pokemon/dex_entries/typhlosion.asm b/data/pokemon/dex_entries/typhlosion.asm index e11823cf5..52961be46 100644 --- a/data/pokemon/dex_entries/typhlosion.asm +++ b/data/pokemon/dex_entries/typhlosion.asm @@ -1,10 +1,10 @@ -; TyphlosionPokedexEntry: ; 0x1ccba0 db "VOLCANO@" ; species name dw 507, 1750 ; height, weight db "When heat from its" next "body causes the" next "air around it to" + page "shimmer, this is a" next "sign that it is" next "ready to battle.@" diff --git a/data/pokemon/dex_entries/tyranitar.asm b/data/pokemon/dex_entries/tyranitar.asm index 9786a6430..4d5a16672 100644 --- a/data/pokemon/dex_entries/tyranitar.asm +++ b/data/pokemon/dex_entries/tyranitar.asm @@ -1,10 +1,10 @@ -; TyranitarPokedexEntry: ; 0x1d177b db "ARMOR@" ; species name dw 607, 4450 ; height, weight db "In just one of its" next "mighty hands, it" next "has the power to" + page "make the ground" next "shake and moun-" next "tains crumble.@" diff --git a/data/pokemon/dex_entries/tyrogue.asm b/data/pokemon/dex_entries/tyrogue.asm index d8900c160..6571e9f62 100644 --- a/data/pokemon/dex_entries/tyrogue.asm +++ b/data/pokemon/dex_entries/tyrogue.asm @@ -1,10 +1,10 @@ -; TyroguePokedexEntry: ; 0x1d124b db "SCUFFLE@" ; species name dw 204, 460 ; height, weight db "To brush up on its" next "fighting skills," next "it will challenge" + page "anyone. It has a" next "very strong com-" next "petitive spirit.@" diff --git a/data/pokemon/dex_entries/umbreon.asm b/data/pokemon/dex_entries/umbreon.asm index 483322f18..206ea4070 100644 --- a/data/pokemon/dex_entries/umbreon.asm +++ b/data/pokemon/dex_entries/umbreon.asm @@ -1,10 +1,10 @@ -; UmbreonPokedexEntry: ; 0x1d01af db "MOONLIGHT@" ; species name dw 303, 600 ; height, weight db "On the night of a" next "full moon, or when" next "it gets excited," + page "the ring patterns" next "on its body glow" next "yellow.@" diff --git a/data/pokemon/dex_entries/unown.asm b/data/pokemon/dex_entries/unown.asm index 5be078b8a..60ee3b3de 100644 --- a/data/pokemon/dex_entries/unown.asm +++ b/data/pokemon/dex_entries/unown.asm @@ -1,10 +1,10 @@ -; UnownPokedexEntry: ; 0x1d0373 db "SYMBOL@" ; species name dw 108, 110 ; height, weight db "Because different" next "types of UNOWN" next "exist, it is said" + page "that they must" next "have a variety of" next "abilities.@" diff --git a/data/pokemon/dex_entries/ursaring.asm b/data/pokemon/dex_entries/ursaring.asm index acf7626f9..c2f070603 100644 --- a/data/pokemon/dex_entries/ursaring.asm +++ b/data/pokemon/dex_entries/ursaring.asm @@ -1,10 +1,10 @@ -; UrsaringPokedexEntry: ; 0x1d0a41 db "HIBERNANT@" ; species name dw 511, 2770 ; height, weight db "Although it has a" next "large body, it is" next "quite skilled at" + page "climbing trees. It" next "eats and sleeps in" next "the treetops.@" diff --git a/data/pokemon/dex_entries/vaporeon.asm b/data/pokemon/dex_entries/vaporeon.asm index 36617899f..dbbce1177 100644 --- a/data/pokemon/dex_entries/vaporeon.asm +++ b/data/pokemon/dex_entries/vaporeon.asm @@ -1,10 +1,10 @@ -; VaporeonPokedexEntry: ; 0x1cc224 db "BUBBLE JET@" ; species name dw 303, 640 ; height, weight db "As it uses the" next "fins on the tip" next "of its tail to" + page "swim, it blends" next "with the water" next "perfectly.@" diff --git a/data/pokemon/dex_entries/venomoth.asm b/data/pokemon/dex_entries/venomoth.asm index 4ff583940..338f0ed8e 100644 --- a/data/pokemon/dex_entries/venomoth.asm +++ b/data/pokemon/dex_entries/venomoth.asm @@ -1,10 +1,10 @@ -; VenomothPokedexEntry: ; 0x182abf db "POISONMOTH@" ; species name dw 411, 280 ; height, weight db "The scales it" next "scatters will" next "paralyze anyone" + page "who touches them," next "making that person" next "unable to stand.@" diff --git a/data/pokemon/dex_entries/venonat.asm b/data/pokemon/dex_entries/venonat.asm index 8e52b4c82..01e4df353 100644 --- a/data/pokemon/dex_entries/venonat.asm +++ b/data/pokemon/dex_entries/venonat.asm @@ -1,10 +1,10 @@ -; VenonatPokedexEntry: ; 0x182a53 db "INSECT@" ; species name dw 303, 660 ; height, weight db "The small bugs it" next "eats appear only" next "at night, so it" + page "sleeps in a hole" next "in a tree until" next "night falls.@" diff --git a/data/pokemon/dex_entries/venusaur.asm b/data/pokemon/dex_entries/venusaur.asm index 1b9cc6e43..b5c843c15 100644 --- a/data/pokemon/dex_entries/venusaur.asm +++ b/data/pokemon/dex_entries/venusaur.asm @@ -1,10 +1,10 @@ -; VenusaurPokedexEntry: ; 0x181773 db "SEED@" ; species name dw 607, 2210 ; height, weight db "As it warms it-" next "self and absorbs" next "the sunlight, its" + page "flower petals" next "release a pleasant" next "fragrance.@" diff --git a/data/pokemon/dex_entries/victreebel.asm b/data/pokemon/dex_entries/victreebel.asm index 552051572..b960cf81c 100644 --- a/data/pokemon/dex_entries/victreebel.asm +++ b/data/pokemon/dex_entries/victreebel.asm @@ -1,10 +1,10 @@ -; VictreebelPokedexEntry: ; 0x1b826e db "FLYCATCHER@" ; species name dw 507, 340 ; height, weight db "Once ingested into" next "this #MON's" next "body, even the" + page "hardest object" next "will melt into" next "nothing.@" diff --git a/data/pokemon/dex_entries/vileplume.asm b/data/pokemon/dex_entries/vileplume.asm index cf2ea191d..541fd4da5 100644 --- a/data/pokemon/dex_entries/vileplume.asm +++ b/data/pokemon/dex_entries/vileplume.asm @@ -1,10 +1,10 @@ -; VileplumePokedexEntry: ; 0x182918 db "FLOWER@" ; species name dw 311, 410 ; height, weight db "By shaking its big" next "petals, it scat-" next "ters toxic pollen" + page "into the air," next "turning the air" next "yellow.@" diff --git a/data/pokemon/dex_entries/voltorb.asm b/data/pokemon/dex_entries/voltorb.asm index 5a532e2d0..ddc0ffa29 100644 --- a/data/pokemon/dex_entries/voltorb.asm +++ b/data/pokemon/dex_entries/voltorb.asm @@ -1,10 +1,10 @@ -; VoltorbPokedexEntry: ; 0x1b8eb0 db "BALL@" ; species name dw 108, 230 ; height, weight db "During the study" next "of this #MON," next "it was discovered" + page "that its compo-" next "nents are not" next "found in nature.@" diff --git a/data/pokemon/dex_entries/vulpix.asm b/data/pokemon/dex_entries/vulpix.asm index f5bbd03a1..0409bb91e 100644 --- a/data/pokemon/dex_entries/vulpix.asm +++ b/data/pokemon/dex_entries/vulpix.asm @@ -1,10 +1,10 @@ -; VulpixPokedexEntry: ; 0x18259b db "FOX@" ; species name dw 200, 220 ; height, weight db "As its body grows" next "larger, its six" next "warm tails become" + page "more beautiful," next "with a more luxur-" next "ious coat of fur.@" diff --git a/data/pokemon/dex_entries/wartortle.asm b/data/pokemon/dex_entries/wartortle.asm index 927af5fd2..f96c6e40d 100644 --- a/data/pokemon/dex_entries/wartortle.asm +++ b/data/pokemon/dex_entries/wartortle.asm @@ -1,10 +1,10 @@ -; WartortlePokedexEntry: ; 0x181993 db "TURTLE@" ; species name dw 303, 500 ; height, weight db "Its long, furry" next "tail is a symbol" next "of longevity," + page "making it quite" next "popular among" next "older people.@" diff --git a/data/pokemon/dex_entries/weedle.asm b/data/pokemon/dex_entries/weedle.asm index 9b81fa11d..c7e9deb00 100644 --- a/data/pokemon/dex_entries/weedle.asm +++ b/data/pokemon/dex_entries/weedle.asm @@ -1,10 +1,10 @@ -; WeedlePokedexEntry: ; 0x181bb4 db "HAIRY BUG@" ; species name dw 100, 70 ; height, weight db "The barb on top of" next "its head secretes" next "a strong poison." + page "It uses this toxic" next "barb to protect" next "itself.@" diff --git a/data/pokemon/dex_entries/weepinbell.asm b/data/pokemon/dex_entries/weepinbell.asm index 81eb7c215..d53be6604 100644 --- a/data/pokemon/dex_entries/weepinbell.asm +++ b/data/pokemon/dex_entries/weepinbell.asm @@ -1,10 +1,10 @@ -; WeepinbellPokedexEntry: ; 0x1b81fd db "FLYCATCHER@" ; species name dw 303, 140 ; height, weight db "When it's hungry," next "it swings its" next "razor-sharp" + page "leaves, slicing up" next "any unlucky object" next "nearby for food.@" diff --git a/data/pokemon/dex_entries/weezing.asm b/data/pokemon/dex_entries/weezing.asm index 1a7b268fd..8e02970d0 100644 --- a/data/pokemon/dex_entries/weezing.asm +++ b/data/pokemon/dex_entries/weezing.asm @@ -1,10 +1,10 @@ -; WeezingPokedexEntry: ; 0x1b92ec db "POISON GAS@" ; species name dw 311, 210 ; height, weight db "When it inhales" next "poisonous gases" next "from garbage, its" + page "body expands, and" next "its insides smell" next "much worse.@" diff --git a/data/pokemon/dex_entries/wigglytuff.asm b/data/pokemon/dex_entries/wigglytuff.asm index 8ba563cce..65e9f49bb 100644 --- a/data/pokemon/dex_entries/wigglytuff.asm +++ b/data/pokemon/dex_entries/wigglytuff.asm @@ -1,10 +1,10 @@ -; WigglytuffPokedexEntry: ; 0x1826e9 db "BALLOON@" ; species name dw 303, 260 ; height, weight db "The rich, fluffy" next "fur that covers" next "its body feels so" + page "good that anyone" next "who feels it can't" next "stop touching it.@" diff --git a/data/pokemon/dex_entries/wobbuffet.asm b/data/pokemon/dex_entries/wobbuffet.asm index 95aae69ab..6dcde2df9 100644 --- a/data/pokemon/dex_entries/wobbuffet.asm +++ b/data/pokemon/dex_entries/wobbuffet.asm @@ -1,10 +1,10 @@ -; WobbuffetPokedexEntry: ; 0x1d03dd db "PATIENT@" ; species name dw 403, 630 ; height, weight db "In order to con-" next "ceal its black" next "tail, it lives in" + page "a dark cave and" next "only moves about" next "at night.@" diff --git a/data/pokemon/dex_entries/wooper.asm b/data/pokemon/dex_entries/wooper.asm index d612f2070..00f97d0d7 100644 --- a/data/pokemon/dex_entries/wooper.asm +++ b/data/pokemon/dex_entries/wooper.asm @@ -1,10 +1,10 @@ -; WooperPokedexEntry: ; 0x1d0078 db "WATER FISH@" ; species name dw 104, 190 ; height, weight db "A mucous" next "membrane covers" next "its body. Touching" + page "it barehanded will" next "cause a shooting" next "pain.@" diff --git a/data/pokemon/dex_entries/xatu.asm b/data/pokemon/dex_entries/xatu.asm index 21a53d8fc..c285b8cb3 100644 --- a/data/pokemon/dex_entries/xatu.asm +++ b/data/pokemon/dex_entries/xatu.asm @@ -1,10 +1,10 @@ -; XatuPokedexEntry: ; 0x1cd4e9 db "MYSTIC@" ; species name dw 411, 330 ; height, weight db "Once it begins to" next "meditate at sun-" next "rise, the entire" + page "day will pass" next "before it will" next "move again.@" diff --git a/data/pokemon/dex_entries/yanma.asm b/data/pokemon/dex_entries/yanma.asm index 9843ad289..4acf0e290 100644 --- a/data/pokemon/dex_entries/yanma.asm +++ b/data/pokemon/dex_entries/yanma.asm @@ -1,10 +1,10 @@ -; YanmaPokedexEntry: ; 0x1d0000 db "CLEAR WING@" ; species name dw 311, 840 ; height, weight db "It can see in all" next "directions without" next "moving its big" + page "eyes, helping it" next "spot attackers and" next "food right away.@" diff --git a/data/pokemon/dex_entries/zapdos.asm b/data/pokemon/dex_entries/zapdos.asm index ea61198a0..3dfa33530 100644 --- a/data/pokemon/dex_entries/zapdos.asm +++ b/data/pokemon/dex_entries/zapdos.asm @@ -1,10 +1,10 @@ -; ZapdosPokedexEntry: ; 0x1cc697 db "ELECTRIC@" ; species name dw 503, 1160 ; height, weight db "Legendary bird" next "#MON. They say" next "lightning caused" + page "by the flapping of" next "its wings causes" next "summer storms.@" diff --git a/data/pokemon/dex_entries/zubat.asm b/data/pokemon/dex_entries/zubat.asm index 8232f8bd6..0f54d51b1 100644 --- a/data/pokemon/dex_entries/zubat.asm +++ b/data/pokemon/dex_entries/zubat.asm @@ -1,10 +1,10 @@ -; ZubatPokedexEntry: ; 0x18275d db "BAT@" ; species name dw 207, 170 ; height, weight db "During the day, it" next "gathers with" next "others and hangs" + page "from the ceilings" next "of old buildings" next "and caves.@" From 65480605e9f2ca576e3086907ee7163413117b78 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 30 Jan 2018 14:15:47 -0500 Subject: [PATCH 064/135] Remove unreferenced map script heading labels --- docs/map_scripts.md | 15 +++++++------ maps/AzaleaGym.asm | 21 +++++++------------ maps/AzaleaMart.asm | 21 +++++++------------ maps/AzaleaPokecenter1F.asm | 21 +++++++------------ maps/AzaleaTown.asm | 21 +++++++------------ maps/BattleTower1F.asm | 21 +++++++------------ maps/BattleTowerBattleRoom.asm | 21 +++++++------------ maps/BattleTowerElevator.asm | 21 +++++++------------ maps/BattleTowerHallway.asm | 21 +++++++------------ maps/BattleTowerOutside.asm | 21 +++++++------------ maps/BillsBrothersHouse.asm | 21 +++++++------------ maps/BillsFamilysHouse.asm | 21 +++++++------------ maps/BillsHouse.asm | 21 +++++++------------ maps/BlackthornCity.asm | 21 +++++++------------ maps/BlackthornDragonSpeechHouse.asm | 21 +++++++------------ maps/BlackthornEmysHouse.asm | 21 +++++++------------ maps/BlackthornGym1F.asm | 21 +++++++------------ maps/BlackthornGym2F.asm | 21 +++++++------------ maps/BlackthornMart.asm | 21 +++++++------------ maps/BlackthornPokecenter1F.asm | 21 +++++++------------ maps/BluesHouse.asm | 21 +++++++------------ maps/BrunosRoom.asm | 21 +++++++------------ maps/BurnedTower1F.asm | 21 +++++++------------ maps/BurnedTowerB1F.asm | 21 +++++++------------ maps/CeladonCafe.asm | 21 +++++++------------ maps/CeladonCity.asm | 21 +++++++------------ maps/CeladonDeptStore1F.asm | 21 +++++++------------ maps/CeladonDeptStore2F.asm | 21 +++++++------------ maps/CeladonDeptStore3F.asm | 21 +++++++------------ maps/CeladonDeptStore4F.asm | 21 +++++++------------ maps/CeladonDeptStore5F.asm | 21 +++++++------------ maps/CeladonDeptStore6F.asm | 21 +++++++------------ maps/CeladonDeptStoreElevator.asm | 21 +++++++------------ maps/CeladonGameCorner.asm | 21 +++++++------------ maps/CeladonGameCornerPrizeRoom.asm | 21 +++++++------------ maps/CeladonGym.asm | 21 +++++++------------ maps/CeladonMansion1F.asm | 21 +++++++------------ maps/CeladonMansion2F.asm | 21 +++++++------------ maps/CeladonMansion3F.asm | 21 +++++++------------ maps/CeladonMansionRoof.asm | 21 +++++++------------ maps/CeladonMansionRoofHouse.asm | 21 +++++++------------ maps/CeladonPokecenter1F.asm | 21 +++++++------------ maps/CeladonPokecenter2FBeta.asm | 21 +++++++------------ maps/CeruleanCity.asm | 21 +++++++------------ maps/CeruleanGym.asm | 21 +++++++------------ maps/CeruleanGymBadgeSpeechHouse.asm | 21 +++++++------------ maps/CeruleanMart.asm | 21 +++++++------------ maps/CeruleanPokecenter1F.asm | 21 +++++++------------ maps/CeruleanPokecenter2FBeta.asm | 21 +++++++------------ maps/CeruleanPoliceStation.asm | 21 +++++++------------ maps/CeruleanTradeSpeechHouse.asm | 21 +++++++------------ maps/CharcoalKiln.asm | 21 +++++++------------ maps/CherrygroveCity.asm | 21 +++++++------------ maps/CherrygroveEvolutionSpeechHouse.asm | 21 +++++++------------ maps/CherrygroveGymSpeechHouse.asm | 21 +++++++------------ maps/CherrygroveMart.asm | 21 +++++++------------ maps/CherrygrovePokecenter1F.asm | 21 +++++++------------ maps/CianwoodCity.asm | 21 +++++++------------ maps/CianwoodGym.asm | 21 +++++++------------ maps/CianwoodLugiaSpeechHouse.asm | 21 +++++++------------ maps/CianwoodPharmacy.asm | 21 +++++++------------ maps/CianwoodPhotoStudio.asm | 21 +++++++------------ maps/CianwoodPokecenter1F.asm | 21 +++++++------------ maps/CinnabarIsland.asm | 21 +++++++------------ maps/CinnabarPokecenter1F.asm | 21 +++++++------------ maps/CinnabarPokecenter2FBeta.asm | 21 +++++++------------ maps/Colosseum.asm | 21 +++++++------------ maps/CopycatsHouse1F.asm | 21 +++++++------------ maps/CopycatsHouse2F.asm | 21 +++++++------------ maps/DanceTheatre.asm | 21 +++++++------------ maps/DarkCaveBlackthornEntrance.asm | 21 +++++++------------ maps/DarkCaveVioletEntrance.asm | 21 +++++++------------ maps/DayCare.asm | 21 +++++++------------ maps/DayOfWeekSiblingsHouse.asm | 21 +++++++------------ maps/DiglettsCave.asm | 21 +++++++------------ maps/DragonShrine.asm | 21 +++++++------------ maps/DragonsDen1F.asm | 21 +++++++------------ maps/DragonsDenB1F.asm | 21 +++++++------------ maps/EarlsPokemonAcademy.asm | 21 +++++++------------ maps/EcruteakCity.asm | 21 +++++++------------ maps/EcruteakGym.asm | 21 +++++++------------ maps/EcruteakItemfinderHouse.asm | 21 +++++++------------ maps/EcruteakLugiaSpeechHouse.asm | 21 +++++++------------ maps/EcruteakMart.asm | 21 +++++++------------ maps/EcruteakPokecenter1F.asm | 21 +++++++------------ maps/EcruteakTinTowerEntrance.asm | 21 +++++++------------ maps/ElmsHouse.asm | 21 +++++++------------ maps/ElmsLab.asm | 21 +++++++------------ maps/FastShip1F.asm | 21 +++++++------------ maps/FastShipB1F.asm | 21 +++++++------------ maps/FastShipCabins_NNW_NNE_NE.asm | 21 +++++++------------ maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 21 +++++++------------ maps/FastShipCabins_SW_SSW_NW.asm | 21 +++++++------------ maps/FightingDojo.asm | 21 +++++++------------ maps/FuchsiaCity.asm | 21 +++++++------------ maps/FuchsiaGym.asm | 21 +++++++------------ maps/FuchsiaMart.asm | 21 +++++++------------ maps/FuchsiaPokecenter1F.asm | 21 +++++++------------ maps/FuchsiaPokecenter2FBeta.asm | 21 +++++++------------ maps/GoldenrodBikeShop.asm | 21 +++++++------------ maps/GoldenrodCity.asm | 21 +++++++------------ maps/GoldenrodDeptStore1F.asm | 21 +++++++------------ maps/GoldenrodDeptStore2F.asm | 21 +++++++------------ maps/GoldenrodDeptStore3F.asm | 21 +++++++------------ maps/GoldenrodDeptStore4F.asm | 21 +++++++------------ maps/GoldenrodDeptStore5F.asm | 21 +++++++------------ maps/GoldenrodDeptStore6F.asm | 21 +++++++------------ maps/GoldenrodDeptStoreB1F.asm | 21 +++++++------------ maps/GoldenrodDeptStoreElevator.asm | 21 +++++++------------ maps/GoldenrodDeptStoreRoof.asm | 21 +++++++------------ maps/GoldenrodFlowerShop.asm | 21 +++++++------------ maps/GoldenrodGameCorner.asm | 21 +++++++------------ maps/GoldenrodGym.asm | 21 +++++++------------ maps/GoldenrodHappinessRater.asm | 21 +++++++------------ maps/GoldenrodMagnetTrainStation.asm | 21 +++++++------------ maps/GoldenrodNameRater.asm | 21 +++++++------------ maps/GoldenrodPPSpeechHouse.asm | 21 +++++++------------ maps/GoldenrodPokecenter1F.asm | 21 +++++++------------ maps/GoldenrodUnderground.asm | 21 +++++++------------ ...oldenrodUndergroundSwitchRoomEntrances.asm | 21 +++++++------------ maps/GoldenrodUndergroundWarehouse.asm | 21 +++++++------------ maps/GuideGentsHouse.asm | 21 +++++++------------ maps/HallOfFame.asm | 21 +++++++------------ maps/IcePath1F.asm | 21 +++++++------------ maps/IcePathB1F.asm | 21 +++++++------------ maps/IcePathB2FBlackthornSide.asm | 21 +++++++------------ maps/IcePathB2FMahoganySide.asm | 21 +++++++------------ maps/IcePathB3F.asm | 21 +++++++------------ maps/IlexForest.asm | 21 +++++++------------ maps/IlexForestAzaleaGate.asm | 21 +++++++------------ maps/IndigoPlateauPokecenter1F.asm | 21 +++++++------------ maps/KarensRoom.asm | 21 +++++++------------ maps/KogasRoom.asm | 21 +++++++------------ maps/KurtsHouse.asm | 21 +++++++------------ maps/LakeOfRage.asm | 21 +++++++------------ maps/LakeOfRageHiddenPowerHouse.asm | 21 +++++++------------ maps/LakeOfRageMagikarpHouse.asm | 21 +++++++------------ maps/LancesRoom.asm | 21 +++++++------------ maps/LavRadioTower1F.asm | 21 +++++++------------ maps/LavenderMart.asm | 21 +++++++------------ maps/LavenderNameRater.asm | 21 +++++++------------ maps/LavenderPokecenter1F.asm | 21 +++++++------------ maps/LavenderPokecenter2FBeta.asm | 21 +++++++------------ maps/LavenderSpeechHouse.asm | 21 +++++++------------ maps/LavenderTown.asm | 21 +++++++------------ maps/MahoganyGym.asm | 21 +++++++------------ maps/MahoganyMart1F.asm | 21 +++++++------------ maps/MahoganyPokecenter1F.asm | 21 +++++++------------ maps/MahoganyRedGyaradosSpeechHouse.asm | 21 +++++++------------ maps/MahoganyTown.asm | 21 +++++++------------ maps/ManiasHouse.asm | 21 +++++++------------ maps/MobileBattleRoom.asm | 21 +++++++------------ maps/MobileTradeRoomMobile.asm | 21 +++++++------------ maps/MountMoon.asm | 21 +++++++------------ maps/MountMoonGiftShop.asm | 21 +++++++------------ maps/MountMoonSquare.asm | 21 +++++++------------ maps/MountMortar1FInside.asm | 21 +++++++------------ maps/MountMortar1FOutside.asm | 21 +++++++------------ maps/MountMortar2FInside.asm | 21 +++++++------------ maps/MountMortarB1F.asm | 21 +++++++------------ maps/MoveDeletersHouse.asm | 21 +++++++------------ maps/MrFujisHouse.asm | 21 +++++++------------ maps/MrPokemonsHouse.asm | 21 +++++++------------ maps/MrPsychicsHouse.asm | 21 +++++++------------ maps/NationalPark.asm | 21 +++++++------------ maps/NationalParkBugContest.asm | 21 +++++++------------ maps/NewBarkTown.asm | 21 +++++++------------ maps/OaksLab.asm | 21 +++++++------------ maps/OlivineCafe.asm | 21 +++++++------------ maps/OlivineCity.asm | 21 +++++++------------ maps/OlivineGoodRodHouse.asm | 21 +++++++------------ maps/OlivineGym.asm | 21 +++++++------------ maps/OlivineHouseBeta.asm | 21 +++++++------------ maps/OlivineLighthouse1F.asm | 21 +++++++------------ maps/OlivineLighthouse2F.asm | 21 +++++++------------ maps/OlivineLighthouse3F.asm | 21 +++++++------------ maps/OlivineLighthouse4F.asm | 21 +++++++------------ maps/OlivineLighthouse5F.asm | 21 +++++++------------ maps/OlivineLighthouse6F.asm | 21 +++++++------------ maps/OlivineMart.asm | 21 +++++++------------ maps/OlivinePokecenter1F.asm | 21 +++++++------------ maps/OlivinePort.asm | 21 +++++++------------ maps/OlivinePortPassage.asm | 21 +++++++------------ maps/OlivinePunishmentSpeechHouse.asm | 21 +++++++------------ maps/OlivineTimsHouse.asm | 21 +++++++------------ maps/PalletTown.asm | 21 +++++++------------ maps/PewterCity.asm | 21 +++++++------------ maps/PewterGym.asm | 21 +++++++------------ maps/PewterMart.asm | 21 +++++++------------ maps/PewterNidoranSpeechHouse.asm | 21 +++++++------------ maps/PewterPokecenter1F.asm | 21 +++++++------------ maps/PewterPokecenter2FBeta.asm | 21 +++++++------------ maps/PewterSnoozeSpeechHouse.asm | 21 +++++++------------ maps/PlayersHouse1F.asm | 21 +++++++------------ maps/PlayersHouse2F.asm | 21 +++++++------------ maps/PlayersNeighborsHouse.asm | 21 +++++++------------ maps/PokeSeersHouse.asm | 21 +++++++------------ maps/Pokecenter2F.asm | 21 +++++++------------ maps/PokecomCenterAdminRoomMobile.asm | 21 +++++++------------ maps/PokemonFanClub.asm | 21 +++++++------------ maps/PowerPlant.asm | 21 +++++++------------ maps/RadioTower1F.asm | 21 +++++++------------ maps/RadioTower2F.asm | 21 +++++++------------ maps/RadioTower3F.asm | 21 +++++++------------ maps/RadioTower4F.asm | 21 +++++++------------ maps/RadioTower5F.asm | 21 +++++++------------ maps/RedsHouse1F.asm | 21 +++++++------------ maps/RedsHouse2F.asm | 21 +++++++------------ maps/RockTunnel1F.asm | 21 +++++++------------ maps/RockTunnelB1F.asm | 21 +++++++------------ maps/Route1.asm | 21 +++++++------------ maps/Route10North.asm | 21 +++++++------------ maps/Route10Pokecenter1F.asm | 21 +++++++------------ maps/Route10Pokecenter2FBeta.asm | 21 +++++++------------ maps/Route10South.asm | 21 +++++++------------ maps/Route11.asm | 21 +++++++------------ maps/Route12.asm | 21 +++++++------------ maps/Route12SuperRodHouse.asm | 21 +++++++------------ maps/Route13.asm | 21 +++++++------------ maps/Route14.asm | 21 +++++++------------ maps/Route15.asm | 21 +++++++------------ maps/Route15FuchsiaGate.asm | 21 +++++++------------ maps/Route16.asm | 21 +++++++------------ maps/Route16FuchsiaSpeechHouse.asm | 21 +++++++------------ maps/Route16Gate.asm | 21 +++++++------------ maps/Route17.asm | 21 +++++++------------ maps/Route17Route18Gate.asm | 21 +++++++------------ maps/Route18.asm | 21 +++++++------------ maps/Route19.asm | 21 +++++++------------ maps/Route19FuchsiaGate.asm | 21 +++++++------------ maps/Route2.asm | 21 +++++++------------ maps/Route20.asm | 21 +++++++------------ maps/Route21.asm | 21 +++++++------------ maps/Route22.asm | 21 +++++++------------ maps/Route23.asm | 21 +++++++------------ maps/Route24.asm | 21 +++++++------------ maps/Route25.asm | 21 +++++++------------ maps/Route26.asm | 21 +++++++------------ maps/Route26HealHouse.asm | 21 +++++++------------ maps/Route27.asm | 21 +++++++------------ maps/Route27SandstormHouse.asm | 21 +++++++------------ maps/Route28.asm | 21 +++++++------------ maps/Route28SteelWingHouse.asm | 21 +++++++------------ maps/Route29.asm | 21 +++++++------------ maps/Route29Route46Gate.asm | 21 +++++++------------ maps/Route2Gate.asm | 21 +++++++------------ maps/Route2NuggetHouse.asm | 21 +++++++------------ maps/Route3.asm | 21 +++++++------------ maps/Route30.asm | 21 +++++++------------ maps/Route30BerryHouse.asm | 21 +++++++------------ maps/Route31.asm | 21 +++++++------------ maps/Route31VioletGate.asm | 21 +++++++------------ maps/Route32.asm | 21 +++++++------------ maps/Route32Pokecenter1F.asm | 21 +++++++------------ maps/Route32RuinsOfAlphGate.asm | 21 +++++++------------ maps/Route33.asm | 21 +++++++------------ maps/Route34.asm | 21 +++++++------------ maps/Route34IlexForestGate.asm | 21 +++++++------------ maps/Route35.asm | 21 +++++++------------ maps/Route35GoldenrodGate.asm | 21 +++++++------------ maps/Route35NationalParkGate.asm | 21 +++++++------------ maps/Route36.asm | 21 +++++++------------ maps/Route36NationalParkGate.asm | 21 +++++++------------ maps/Route36RuinsOfAlphGate.asm | 21 +++++++------------ maps/Route37.asm | 21 +++++++------------ maps/Route38.asm | 21 +++++++------------ maps/Route38EcruteakGate.asm | 21 +++++++------------ maps/Route39.asm | 21 +++++++------------ maps/Route39Barn.asm | 21 +++++++------------ maps/Route39Farmhouse.asm | 21 +++++++------------ maps/Route4.asm | 21 +++++++------------ maps/Route40.asm | 21 +++++++------------ maps/Route40BattleTowerGate.asm | 21 +++++++------------ maps/Route41.asm | 21 +++++++------------ maps/Route42.asm | 21 +++++++------------ maps/Route42EcruteakGate.asm | 21 +++++++------------ maps/Route43.asm | 21 +++++++------------ maps/Route43Gate.asm | 21 +++++++------------ maps/Route43MahoganyGate.asm | 21 +++++++------------ maps/Route44.asm | 21 +++++++------------ maps/Route45.asm | 21 +++++++------------ maps/Route46.asm | 21 +++++++------------ maps/Route5.asm | 21 +++++++------------ maps/Route5CleanseTagHouse.asm | 21 +++++++------------ maps/Route5SaffronGate.asm | 21 +++++++------------ maps/Route5UndergroundPathEntrance.asm | 21 +++++++------------ maps/Route6.asm | 21 +++++++------------ maps/Route6SaffronGate.asm | 21 +++++++------------ maps/Route6UndergroundPathEntrance.asm | 21 +++++++------------ maps/Route7.asm | 21 +++++++------------ maps/Route7SaffronGate.asm | 21 +++++++------------ maps/Route8.asm | 21 +++++++------------ maps/Route8SaffronGate.asm | 21 +++++++------------ maps/Route9.asm | 21 +++++++------------ maps/RuinsOfAlphAerodactylChamber.asm | 21 +++++++------------ maps/RuinsOfAlphAerodactylItemRoom.asm | 21 +++++++------------ maps/RuinsOfAlphAerodactylWordRoom.asm | 21 +++++++------------ maps/RuinsOfAlphHoOhChamber.asm | 21 +++++++------------ maps/RuinsOfAlphHoOhItemRoom.asm | 21 +++++++------------ maps/RuinsOfAlphHoOhWordRoom.asm | 21 +++++++------------ maps/RuinsOfAlphInnerChamber.asm | 21 +++++++------------ maps/RuinsOfAlphKabutoChamber.asm | 21 +++++++------------ maps/RuinsOfAlphKabutoItemRoom.asm | 21 +++++++------------ maps/RuinsOfAlphKabutoWordRoom.asm | 21 +++++++------------ maps/RuinsOfAlphOmanyteChamber.asm | 21 +++++++------------ maps/RuinsOfAlphOmanyteItemRoom.asm | 21 +++++++------------ maps/RuinsOfAlphOmanyteWordRoom.asm | 21 +++++++------------ maps/RuinsOfAlphOutside.asm | 21 +++++++------------ maps/RuinsOfAlphResearchCenter.asm | 21 +++++++------------ maps/SafariZoneBeta.asm | 21 +++++++------------ maps/SafariZoneFuchsiaGateBeta.asm | 21 +++++++------------ maps/SafariZoneMainOffice.asm | 21 +++++++------------ maps/SafariZoneWardensHome.asm | 21 +++++++------------ maps/SaffronCity.asm | 21 +++++++------------ maps/SaffronGym.asm | 21 +++++++------------ maps/SaffronMagnetTrainStation.asm | 21 +++++++------------ maps/SaffronMart.asm | 21 +++++++------------ maps/SaffronPokecenter1F.asm | 21 +++++++------------ maps/SaffronPokecenter2FBeta.asm | 21 +++++++------------ maps/SeafoamGym.asm | 21 +++++++------------ maps/SilphCo1F.asm | 21 +++++++------------ maps/SilverCaveItemRooms.asm | 21 +++++++------------ maps/SilverCaveOutside.asm | 21 +++++++------------ maps/SilverCavePokecenter1F.asm | 21 +++++++------------ maps/SilverCaveRoom1.asm | 21 +++++++------------ maps/SilverCaveRoom2.asm | 21 +++++++------------ maps/SilverCaveRoom3.asm | 21 +++++++------------ maps/SlowpokeWellB1F.asm | 21 +++++++------------ maps/SlowpokeWellB2F.asm | 21 +++++++------------ maps/SoulHouse.asm | 21 +++++++------------ maps/SproutTower1F.asm | 21 +++++++------------ maps/SproutTower2F.asm | 21 +++++++------------ maps/SproutTower3F.asm | 21 +++++++------------ maps/TeamRocketBaseB1F.asm | 21 +++++++------------ maps/TeamRocketBaseB2F.asm | 21 +++++++------------ maps/TeamRocketBaseB3F.asm | 21 +++++++------------ maps/TimeCapsule.asm | 21 +++++++------------ maps/TinTower1F.asm | 21 +++++++------------ maps/TinTower2F.asm | 21 +++++++------------ maps/TinTower3F.asm | 21 +++++++------------ maps/TinTower4F.asm | 21 +++++++------------ maps/TinTower5F.asm | 21 +++++++------------ maps/TinTower6F.asm | 21 +++++++------------ maps/TinTower7F.asm | 21 +++++++------------ maps/TinTower8F.asm | 21 +++++++------------ maps/TinTower9F.asm | 21 +++++++------------ maps/TinTowerRoof.asm | 21 +++++++------------ maps/TohjoFalls.asm | 21 +++++++------------ maps/TradeCenter.asm | 21 +++++++------------ maps/TrainerHouse1F.asm | 21 +++++++------------ maps/TrainerHouseB1F.asm | 21 +++++++------------ maps/UndergroundPath.asm | 21 +++++++------------ maps/UnionCave1F.asm | 21 +++++++------------ maps/UnionCaveB1F.asm | 21 +++++++------------ maps/UnionCaveB2F.asm | 21 +++++++------------ maps/VermilionCity.asm | 21 +++++++------------ maps/VermilionDiglettsCaveSpeechHouse.asm | 21 +++++++------------ maps/VermilionFishingSpeechHouse.asm | 21 +++++++------------ maps/VermilionGym.asm | 21 +++++++------------ maps/VermilionMagnetTrainSpeechHouse.asm | 21 +++++++------------ maps/VermilionMart.asm | 21 +++++++------------ maps/VermilionPokecenter1F.asm | 21 +++++++------------ maps/VermilionPokecenter2FBeta.asm | 21 +++++++------------ maps/VermilionPort.asm | 21 +++++++------------ maps/VermilionPortPassage.asm | 21 +++++++------------ maps/VictoryRoad.asm | 21 +++++++------------ maps/VictoryRoadGate.asm | 21 +++++++------------ maps/VioletCity.asm | 21 +++++++------------ maps/VioletGym.asm | 21 +++++++------------ maps/VioletKylesHouse.asm | 21 +++++++------------ maps/VioletMart.asm | 21 +++++++------------ maps/VioletNicknameSpeechHouse.asm | 21 +++++++------------ maps/VioletPokecenter1F.asm | 21 +++++++------------ maps/ViridianCity.asm | 21 +++++++------------ maps/ViridianGym.asm | 21 +++++++------------ maps/ViridianMart.asm | 21 +++++++------------ maps/ViridianNicknameSpeechHouse.asm | 21 +++++++------------ maps/ViridianPokecenter1F.asm | 21 +++++++------------ maps/ViridianPokecenter2FBeta.asm | 21 +++++++------------ maps/WhirlIslandB1F.asm | 21 +++++++------------ maps/WhirlIslandB2F.asm | 21 +++++++------------ maps/WhirlIslandCave.asm | 21 +++++++------------ maps/WhirlIslandLugiaChamber.asm | 21 +++++++------------ maps/WhirlIslandNE.asm | 21 +++++++------------ maps/WhirlIslandNW.asm | 21 +++++++------------ maps/WhirlIslandSE.asm | 21 +++++++------------ maps/WhirlIslandSW.asm | 21 +++++++------------ maps/WillsRoom.asm | 21 +++++++------------ maps/WiseTriosRoom.asm | 21 +++++++------------ 389 files changed, 2723 insertions(+), 5440 deletions(-) diff --git a/docs/map_scripts.md b/docs/map_scripts.md index 0939f5bfa..fa864ac37 100644 --- a/docs/map_scripts.md +++ b/docs/map_scripts.md @@ -11,14 +11,14 @@ ## MapName_MapScripts: -### .SceneScripts: db N +### db N ; scene scripts 
 	scene_script script
-### .MapCallbacks: db N +### db N ; callbacks 
 	callback type, script
@@ -70,26 +70,25 @@ Callback types:
 ## MapName_MapEvents:
 
 ```asm
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 ```
 
 
-### .Warps: db N
+### db N ; warp events
 
 
 	warp_event x, y, warp_id, map
 

 
 
-### .CoordEvents: db N
+### db N ; coord events
 
 
 	coord_event x, y, scene_id, script
 

 
 
-### .BGEvents: db N
+### db N ; bg events
 
 
 	bg_event x, y, type, script
@@ -115,7 +114,7 @@ BG event types:
 
 - `BGEVENT_COPY`
 
-### .ObjectEvents: db N
+### db N ; object events
 
 
 	object_event x, y, sprite, movement, rx, ry, h1, h2, palette, type, range, script, event_flag
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
index e9e4a526c..b23523a47 100644
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -8,11 +8,9 @@ const_value set 2
 	const AZALEAGYM_GYM_GUY
 
 AzaleaGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 AzaleaGymBugsyScript:
 	faceplayer
@@ -362,24 +360,19 @@ AzaleaGymGuyWinText:
 	done
 
 AzaleaGym_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 15, 5, AZALEA_TOWN
 	warp_event 5, 15, 5, AZALEA_TOWN
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 3, 13, BGEVENT_READ, AzaleaGymStatue
 	bg_event 6, 13, BGEVENT_READ, AzaleaGymStatue
 
-.ObjectEvents:
-	db 7
+	db 7 ; object events
 	object_event 5, 7, SPRITE_BUGSY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1
 	object_event 5, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherBenny, -1
 	object_event 8, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1
diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm
index 13c68e7dd..4d8b4997a 100644
--- a/maps/AzaleaMart.asm
+++ b/maps/AzaleaMart.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const AZALEAMART_BUG_CATCHER
 
 AzaleaMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 AzaleaMartClerkScript:
 	opentext
@@ -46,22 +44,17 @@ AzaleaMartBugCatcherText:
 	done
 
 AzaleaMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 3, AZALEA_TOWN
 	warp_event 3, 7, 3, AZALEA_TOWN
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1
 	object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1
 	object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1
diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm
index 8d7809d5b..e644e99f1 100644
--- a/maps/AzaleaPokecenter1F.asm
+++ b/maps/AzaleaPokecenter1F.asm
@@ -5,12 +5,10 @@ const_value set 2
 	const AZALEAPOKECENTER1F_POKEFAN_F
 
 AzaleaPokecenter1F_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -77,23 +75,18 @@ AzaleaPokecenter1FPokefanFText:
 	done
 
 AzaleaPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 1, AZALEA_TOWN
 	warp_event 4, 7, 1, AZALEA_TOWN
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1
 	object_event 9, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1
 	object_event 6, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index f60b35efc..e7940c638 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -13,14 +13,12 @@ const_value set 2
 	const AZALEATOWN_KURT_OUTSIDE
 
 AzaleaTown_MapScripts:
-.SceneScripts:
-	db 3
+	db 3 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 	scene_script .DummyScene2
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .Flypoint
 
 .DummyScene0:
@@ -456,11 +454,9 @@ AzaleaTownIlexForestSignText:
 	done
 
 AzaleaTown_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 8
+	db 8 ; warp events
 	warp_event 15, 9, 1, AZALEA_POKECENTER_1F
 	warp_event 21, 13, 1, CHARCOAL_KILN
 	warp_event 21, 5, 2, AZALEA_MART
@@ -470,14 +466,12 @@ AzaleaTown_MapEvents:
 	warp_event 2, 10, 3, ILEX_FOREST_AZALEA_GATE
 	warp_event 2, 11, 4, ILEX_FOREST_AZALEA_GATE
 
-.CoordEvents:
-	db 3
+	db 3 ; coord events
 	coord_event 5, 10, 1, AzaleaTownRivalBattleScene1
 	coord_event 5, 11, 1, AzaleaTownRivalBattleScene2
 	coord_event 9, 6, 2, AzaleaTownCelebiScene
 
-.BGEvents:
-	db 9
+	db 9 ; bg events
 	bg_event 19, 9, BGEVENT_READ, AzaleaTownSign
 	bg_event 10, 9, BGEVENT_READ, KurtsHouseSign
 	bg_event 14, 15, BGEVENT_READ, AzaleaGymSign
@@ -488,8 +482,7 @@ AzaleaTown_MapEvents:
 	bg_event 3, 9, BGEVENT_READ, AzaleaTownIlextForestSign
 	bg_event 31, 6, BGEVENT_ITEM, AzaleaTownHiddenFullHeal
 
-.ObjectEvents:
-	db 12
+	db 12 ; object events
 	object_event 31, 9, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
 	object_event 21, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1
 	object_event 15, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index 1b81d1baf..42242bd8c 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -6,13 +6,11 @@ const_value set 2
 	const BATTLETOWER1F_GRANNY
 
 BattleTower1F_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .Scene0
 	scene_script .Scene1
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .Scene0:
 	writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS
@@ -794,24 +792,19 @@ Text_BattleTowerBugCatcher: ; 0x9f35b
 	done
 
 BattleTower1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 7, 9, 3, BATTLE_TOWER_OUTSIDE
 	warp_event 8, 9, 4, BATTLE_TOWER_OUTSIDE
 	warp_event 7, 0, 1, BATTLE_TOWER_ELEVATOR
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 6, 6, BGEVENT_READ, MapBattleTower1FSignpost0Script
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 7, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1
 	object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1
 	object_event 4, 9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index 58f3484b9..24011c144 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -3,13 +3,11 @@ const_value set 2
 	const BATTLETOWERBATTLEROOM_RECEPTIONIST
 
 BattleTowerBattleRoom_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .EnterBattleRoom
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .EnterBattleRoom: ; 0x9f419
 	disappear BATTLETOWERBATTLEROOM_YOUNGSTER
@@ -139,21 +137,16 @@ Text_ReturnedAfterSave_Mobile:
 	done
 
 BattleTowerBattleRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 3, 7, 4, BATTLE_TOWER_HALLWAY
 	warp_event 4, 7, 4, BATTLE_TOWER_HALLWAY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 4, 0, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
 	object_event 1, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
index ff3781404..1704c3601 100644
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -2,13 +2,11 @@ const_value set 2
 	const BATTLETOWERELEVATOR_RECEPTIONIST
 
 BattleTowerElevator_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .Scene0
 	scene_script .Scene1
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .Scene0:
 	priorityjump .RideElevator
@@ -45,20 +43,15 @@ MovementData_BattleTowerElevatorPlayerWalksIn:
 	step_end
 
 BattleTowerElevator_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 1, 3, 1, BATTLE_TOWER_HALLWAY
 	warp_event 2, 3, 1, BATTLE_TOWER_HALLWAY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 1, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
index a12059c33..3cfc923e0 100644
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -2,13 +2,11 @@ const_value set 2
 	const BATTLETOWERHALLWAY_RECEPTIONIST
 
 BattleTowerHallway_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .Scene0
 	scene_script .Scene1
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .Scene0:
 	priorityjump .ChooseBattleRoom
@@ -77,11 +75,9 @@ BattleTowerHallway_MapScripts:
 	end
 
 BattleTowerHallway_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 6
+	db 6 ; warp events
 	warp_event 11, 1, 1, BATTLE_TOWER_ELEVATOR
 	warp_event 5, 0, 1, BATTLE_TOWER_BATTLE_ROOM
 	warp_event 7, 0, 1, BATTLE_TOWER_BATTLE_ROOM
@@ -89,12 +85,9 @@ BattleTowerHallway_MapEvents:
 	warp_event 13, 0, 1, BATTLE_TOWER_BATTLE_ROOM
 	warp_event 15, 0, 1, BATTLE_TOWER_BATTLE_ROOM
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEvents, -1
diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm
index b7dc6f4db..f9b58af82 100644
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const BATTLETOWEROUTSIDE_LASS
 
 BattleTowerOutside_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 2
+	db 2 ; callbacks
 	callback MAPCALLBACK_TILES, .Callback1
 	callback MAPCALLBACK_OBJECTS, .Callback2
 
@@ -127,25 +125,20 @@ BattleTowerOutsideText_DoorsOpen:
 	done
 
 BattleTowerOutside_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 8, 21, 3, ROUTE_40_BATTLE_TOWER_GATE
 	warp_event 9, 21, 4, ROUTE_40_BATTLE_TOWER_GATE
 	warp_event 8, 9, 1, BATTLE_TOWER_1F
 	warp_event 9, 9, 2, BATTLE_TOWER_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 10, 10, BGEVENT_READ, MapBattleTowerOutsideSignpost0Script
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1
 	object_event 13, 11, SPRITE_BUENA, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1
 	object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm
index b0cc14a65..ff951b05c 100644
--- a/maps/BillsBrothersHouse.asm
+++ b/maps/BillsBrothersHouse.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const BILLSBROTHERSHOUSE_YOUNGSTER
 
 BillsBrothersHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 BillsBrotherScript:
 	jumptextfaceplayer BillsBrotherText
@@ -28,21 +26,16 @@ BillsBrothersHouseYoungsterText:
 	done
 
 BillsBrothersHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 4, FUCHSIA_CITY
 	warp_event 3, 7, 4, FUCHSIA_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BillsBrotherScript, -1
 	object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsBrothersHouseYoungsterScript, -1
diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm
index 16504edd1..05c757e71 100644
--- a/maps/BillsFamilysHouse.asm
+++ b/maps/BillsFamilysHouse.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const BILLSFAMILYSHOUSE_TWIN
 
 BillsFamilysHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 BillScript:
 	faceplayer
@@ -243,25 +241,20 @@ UnknownText_0x55069:
 	done
 
 BillsFamilysHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 4, GOLDENROD_CITY
 	warp_event 3, 7, 4, GOLDENROD_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 0, 1, BGEVENT_READ, BillsHouseBookshelf2
 	bg_event 1, 1, BGEVENT_READ, BillsHouseBookshelf1
 	bg_event 7, 1, BGEVENT_READ, BillsHouseRadio
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillScript, EVENT_MET_BILL
 	object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMomScript, -1
 	object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSisterScript, -1
diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
index ed3e8d460..f27b4a5a3 100644
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const BILLSHOUSE_GRAMPS
 
 BillsHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 BillsGrandpa:
 	faceplayer
@@ -354,20 +352,15 @@ BillsGrandpaPichuText:
 	done
 
 BillsHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 1, ROUTE_25
 	warp_event 3, 7, 1, ROUTE_25
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BillsGrandpa, -1
diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm
index 2897346e7..edc4e2f66 100644
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -10,11 +10,9 @@ const_value set 2
 	const BLACKTHORNCITY_COOLTRAINER_F2
 
 BlackthornCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 2
+	db 2 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 	callback MAPCALLBACK_OBJECTS, .Santos
 
@@ -313,11 +311,9 @@ BlackthornCityTrainerTipsText:
 	done
 
 BlackthornCity_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 8
+	db 8 ; warp events
 	warp_event 18, 11, 1, BLACKTHORN_GYM_1F
 	warp_event 13, 21, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE
 	warp_event 29, 23, 1, BLACKTHORN_EMYS_HOUSE
@@ -327,11 +323,9 @@ BlackthornCity_MapEvents:
 	warp_event 36, 9, 2, ICE_PATH_1F
 	warp_event 20, 1, 1, DRAGONS_DEN_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 7
+	db 7 ; bg events
 	bg_event 34, 24, BGEVENT_READ, BlackthornCitySign
 	bg_event 17, 13, BGEVENT_READ, BlackthornGymSign
 	bg_event 7, 31, BGEVENT_READ, MoveDeletersHouseSign
@@ -340,8 +334,7 @@ BlackthornCity_MapEvents:
 	bg_event 16, 29, BGEVENT_READ, BlackthornCityMartSign
 	bg_event 22, 29, BGEVENT_READ, BlackthornCityPokecenterSign
 
-.ObjectEvents:
-	db 9
+	db 9 ; object events
 	object_event 18, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
 	object_event 19, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
 	object_event 20, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm
index 69110c5a7..3ee16fefc 100644
--- a/maps/BlackthornDragonSpeechHouse.asm
+++ b/maps/BlackthornDragonSpeechHouse.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const BLACKTHORNDRAGONSPEECHHOUSE_EKANS
 
 BlackthornDragonSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 BlackthornDragonSpeechHouseGrannyScript:
 	jumptextfaceplayer BlackthornDragonSpeechHouseGrannyText
@@ -48,21 +46,16 @@ BlackthornDragonSpeechHouseDratiniText:
 	done
 
 BlackthornDragonSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 2, BLACKTHORN_CITY
 	warp_event 3, 7, 2, BLACKTHORN_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1
 	object_event 5, 5, SPRITE_EKANS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1
diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm
index 63d12d8d9..21599704c 100644
--- a/maps/BlackthornEmysHouse.asm
+++ b/maps/BlackthornEmysHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const BLACKTHORNEMYSHOUSE_EMY
 
 BlackthornEmysHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Emy:
 	faceplayer
@@ -20,22 +18,17 @@ EmysHouseBookshelf:
 	jumpstd magazinebookshelf
 
 BlackthornEmysHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 3, BLACKTHORN_CITY
 	warp_event 3, 7, 3, BLACKTHORN_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, EmysHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, EmysHouseBookshelf
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Emy, -1
diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm
index 937abca02..2f3f22971 100644
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -6,11 +6,9 @@ const_value set 2
 	const BLACKTHORNGYM1F_GYM_GUY
 
 BlackthornGym1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .Boulders
 
 .Boulders:
@@ -387,11 +385,9 @@ BlackthornGymGuyWinText:
 	done
 
 BlackthornGym1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 7
+	db 7 ; warp events
 	warp_event 4, 17, 1, BLACKTHORN_CITY
 	warp_event 5, 17, 1, BLACKTHORN_CITY
 	warp_event 1, 7, 1, BLACKTHORN_GYM_2F
@@ -400,16 +396,13 @@ BlackthornGym1F_MapEvents:
 	warp_event 7, 7, 4, BLACKTHORN_GYM_2F
 	warp_event 7, 6, 5, BLACKTHORN_GYM_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 3, 15, BGEVENT_READ, BlackthornGymStatue
 	bg_event 6, 15, BGEVENT_READ, BlackthornGymStatue
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 5, 3, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornGymClairScript, -1
 	object_event 6, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermMike, -1
 	object_event 1, 14, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1
diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm
index 5e0eca4bc..2417a14b1 100644
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -9,11 +9,9 @@ const_value set 2
 	const BLACKTHORNGYM2F_BOULDER6
 
 BlackthornGym2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable
 
 .SetUpStoneTable:
@@ -126,25 +124,20 @@ BlackthornGym2FBoulderFellText:
 	done
 
 BlackthornGym2F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 1, 7, 3, BLACKTHORN_GYM_1F
 	warp_event 7, 9, 4, BLACKTHORN_GYM_1F
 	warp_event 2, 5, 5, BLACKTHORN_GYM_1F ; hole
 	warp_event 8, 7, 6, BLACKTHORN_GYM_1F ; hole
 	warp_event 8, 3, 7, BLACKTHORN_GYM_1F ; hole
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 8
+	db 8 ; object events
 	object_event 4, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermCody, -1
 	object_event 4, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1
 	object_event 8, 2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm
index 638a04425..0272436fd 100644
--- a/maps/BlackthornMart.asm
+++ b/maps/BlackthornMart.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const BLACKTHORNMART_BLACK_BELT
 
 BlackthornMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 BlackthornMartClerkScript:
 	opentext
@@ -47,22 +45,17 @@ BlackthornMartBlackBeltText:
 	done
 
 BlackthornMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 4, BLACKTHORN_CITY
 	warp_event 3, 7, 4, BLACKTHORN_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1
 	object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1
 	object_event 5, 2, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1
diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm
index 0a1774eb0..e7baf90d9 100644
--- a/maps/BlackthornPokecenter1F.asm
+++ b/maps/BlackthornPokecenter1F.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const BLACKTHORNPOKECENTER1F_COOLTRAINER_M
 
 BlackthornPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 BlackthornPokecenter1FNurseScript:
 	jumpstd pokecenternurse
@@ -50,23 +48,18 @@ BlackthornPokecenter1FTwinText:
 	done
 
 BlackthornPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 5, BLACKTHORN_CITY
 	warp_event 4, 7, 5, BLACKTHORN_CITY
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1
 	object_event 5, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1
 	object_event 1, 4, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
index 5dfc15c79..e6283bd40 100644
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const BLUESHOUSE_DAISY
 
 BluesHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 DaisyScript:
 	faceplayer
@@ -145,20 +143,15 @@ DaisyCantGroomEggText:
 	done
 
 BluesHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 2, PALLET_TOWN
 	warp_event 3, 7, 2, PALLET_TOWN
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 3, SPRITE_DAISY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
index 55ae4b3b2..ef1557c03 100644
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -2,13 +2,11 @@ const_value set 2
 	const BRUNOSROOM_BRUNO
 
 BrunosRoom_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .LockDoor
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .BrunosRoomDoors
 
 .LockDoor:
@@ -125,22 +123,17 @@ BrunoScript_BrunoDefeatText:
 	done
 
 BrunosRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 4, 17, 3, KOGAS_ROOM
 	warp_event 5, 17, 4, KOGAS_ROOM
 	warp_event 4, 2, 1, KARENS_ROOM
 	warp_event 5, 2, 2, KARENS_ROOM
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 5, 7, SPRITE_BRUNO, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index fdf02f76e..8d276a634 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -6,14 +6,12 @@ const_value set 2
 	const BURNEDTOWER1F_POKE_BALL
 
 BurnedTower1F_MapScripts:
-.SceneScripts:
-	db 3
+	db 3 ; scene scripts
 	scene_script .EusineScene
 	scene_script .DummyScene1
 	scene_script .DummyScene2
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HoleAndLadder
 
 .EusineScene:
@@ -278,11 +276,9 @@ BurnedTower1FMortyText:
 	done
 
 BurnedTower1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 14
+	db 14 ; warp events
 	warp_event 9, 15, 13, ECRUTEAK_CITY
 	warp_event 10, 15, 13, ECRUTEAK_CITY
 	warp_event 10, 9,  1, BURNED_TOWER_B1F
@@ -298,17 +294,14 @@ BurnedTower1F_MapEvents:
 	warp_event 15, 14,  5, BURNED_TOWER_B1F
 	warp_event 7, 15,  6, BURNED_TOWER_B1F
 
-.CoordEvents:
-	db 1
+	db 1 ; coord events
 	coord_event 11, 9, 1, BurnedTowerRivalBattleScript
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther
 	bg_event 13, 11, BGEVENT_ITEM, BurnedTower1FHiddenUltraBall
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 15, 4, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1
 	object_event 12, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE
 	object_event 8, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index 1d8ef9635..7c0b4d7f3 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -10,13 +10,11 @@ const_value set 2
 	const BURNEDTOWERB1F_EUSINE
 
 BurnedTowerB1F_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .LadderCallback
 
 .DummyScene0:
@@ -236,11 +234,9 @@ BurnedTowerB1FEusineText:
 	done
 
 BurnedTowerB1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 6
+	db 6 ; warp events
 	warp_event 10, 9, 3, BURNED_TOWER_1F
 	warp_event 17, 7, 7, BURNED_TOWER_1F
 	warp_event 10, 8, 9, BURNED_TOWER_1F
@@ -248,15 +244,12 @@ BurnedTowerB1F_MapEvents:
 	warp_event 17, 14, 12, BURNED_TOWER_1F
 	warp_event 7, 15, 14, BURNED_TOWER_1F
 
-.CoordEvents:
-	db 1
+	db 1 ; coord events
 	coord_event 10, 6, 0, ReleaseTheBeasts
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 9
+	db 9 ; object events
 	object_event 17, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1
 	object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
 	object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm
index 6044f5a44..8d2d04824 100644
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -6,11 +6,9 @@ const_value set 2
 	const CELADONCAFE_TEACHER
 
 CeladonCafe_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeladonCafeChef:
 	faceplayer
@@ -208,24 +206,19 @@ NoRoomForLeftoversText:
 	done
 
 CeladonCafe_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 6, 7, 9, CELADON_CITY
 	warp_event 7, 7, 9, CELADON_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 5, 0, BGEVENT_READ, EatathonContestPoster
 	bg_event 7, 1, BGEVENT_READ, CeladonCafeTrashcan
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 9, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCafeChef, -1
 	object_event 4, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher1, -1
 	object_event 1, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher2, -1
diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm
index befcb1cd4..e7e62ac4e 100644
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -10,11 +10,9 @@ const_value set 2
 	const CELADONCITY_LASS
 
 CeladonCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -235,11 +233,9 @@ CeladonCityTrainerTipsText:
 	done
 
 CeladonCity_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 9
+	db 9 ; warp events
 	warp_event 4, 9, 1, CELADON_DEPT_STORE_1F
 	warp_event 16, 9, 1, CELADON_MANSION_1F
 	warp_event 16, 3, 3, CELADON_MANSION_1F
@@ -250,11 +246,9 @@ CeladonCity_MapEvents:
 	warp_event 10, 29, 1, CELADON_GYM
 	warp_event 25, 29, 1, CELADON_CAFE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 8
+	db 8 ; bg events
 	bg_event 23, 21, BGEVENT_READ, CeladonCitySign
 	bg_event 11, 31, BGEVENT_READ, CeladonGymSign
 	bg_event 6, 9, BGEVENT_READ, CeladonCityDeptStoreSign
@@ -264,8 +258,7 @@ CeladonCity_MapEvents:
 	bg_event 30, 9, BGEVENT_READ, CeladonCityPokecenterSign
 	bg_event 37, 21, BGEVENT_ITEM, CeladonCityHiddenPpUp
 
-.ObjectEvents:
-	db 9
+	db 9 ; object events
 	object_event 26, 11, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityFisherScript, -1
 	object_event 27, 11, SPRITE_POLIWAG, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1
 	object_event 20, 24, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher1Script, -1
diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm
index be1193715..5eede6743 100644
--- a/maps/CeladonDeptStore1F.asm
+++ b/maps/CeladonDeptStore1F.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const CELADONDEPTSTORE1F_TEACHER
 
 CeladonDeptStore1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeladonDeptStore1FReceptionistScript:
 	jumptextfaceplayer CeladonDeptStore1FReceptionistText
@@ -74,26 +72,21 @@ CeladonDeptStore1FDirectoryText:
 	done
 
 CeladonDeptStore1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 7, 7, 1, CELADON_CITY
 	warp_event 8, 7, 1, CELADON_CITY
 	warp_event 15, 0, 2, CELADON_DEPT_STORE_2F
 	warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore1FDirectory
 	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1
 	object_event 11, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1
 	object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1
diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm
index f14c8822a..4ec78cb6f 100644
--- a/maps/CeladonDeptStore2F.asm
+++ b/maps/CeladonDeptStore2F.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const CELADONDEPTSTORE2F_YOUNGSTER
 
 CeladonDeptStore2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ClerkScript_0x70bad:
 	faceplayer
@@ -69,25 +67,20 @@ CeladonDeptStore2FDirectoryText:
 	done
 
 CeladonDeptStore2F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 12, 0, 1, CELADON_DEPT_STORE_3F
 	warp_event 15, 0, 3, CELADON_DEPT_STORE_1F
 	warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore2FDirectory
 	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore2FElevatorButton
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1
 	object_event 14, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1
 	object_event 5, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1
diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm
index 5ad0d1404..4950dee28 100644
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -6,11 +6,9 @@ const_value set 2
 	const CELADONDEPTSTORE3F_SUPER_NERD
 
 CeladonDeptStore3F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ClerkScript_0x70d29:
 	faceplayer
@@ -95,25 +93,20 @@ CeladonDeptStore3FDirectoryText:
 	done
 
 CeladonDeptStore3F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 12, 0, 1, CELADON_DEPT_STORE_2F
 	warp_event 15, 0, 2, CELADON_DEPT_STORE_4F
 	warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore3FDirectory
 	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore3FElevatorButton
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 7, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1
 	object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1
 	object_event 9, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1
diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm
index 1d5c109a3..1d8e8e7fc 100644
--- a/maps/CeladonDeptStore4F.asm
+++ b/maps/CeladonDeptStore4F.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const CELADONDEPTSTORE4F_YOUNGSTER
 
 CeladonDeptStore4F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ClerkScript_0x70f0d:
 	faceplayer
@@ -51,25 +49,20 @@ CeladonDeptStore4FDirectoryText:
 	done
 
 CeladonDeptStore4F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 12, 0, 1, CELADON_DEPT_STORE_5F
 	warp_event 15, 0, 2, CELADON_DEPT_STORE_3F
 	warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore4FDirectory
 	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore4FElevatorButton
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1
 	object_event 7, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1
 	object_event 8, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1
diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm
index fe73776c1..63c65acab 100644
--- a/maps/CeladonDeptStore5F.asm
+++ b/maps/CeladonDeptStore5F.asm
@@ -6,11 +6,9 @@ const_value set 2
 	const CELADONDEPTSTORE5F_TEACHER
 
 CeladonDeptStore5F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ClerkScript_0x71004:
 	faceplayer
@@ -72,25 +70,20 @@ CeladonDeptStore5FDirectoryText:
 	done
 
 CeladonDeptStore5F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 12, 0, 1, CELADON_DEPT_STORE_4F
 	warp_event 15, 0, 1, CELADON_DEPT_STORE_6F
 	warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore5FDirectory
 	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore5FElevatorButton
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 7, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x71004, -1
 	object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1
 	object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index 624e564e7..f70a7d725 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const CELADONDEPTSTORE6F_YOUNGSTER
 
 CeladonDeptStore6F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HideRooftopStairs
 
 .HideRooftopStairs:
@@ -146,19 +144,15 @@ CeladonDeptStore6FDirectoryText:
 	done
 
 CeladonDeptStore6F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 15, 0, 2, CELADON_DEPT_STORE_5F
 	warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 6
+	db 6 ; bg events
 	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore6FDirectory
 	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton
 	bg_event 8, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
@@ -166,7 +160,6 @@ CeladonDeptStore6F_MapEvents:
 	bg_event 10, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
 	bg_event 11, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 9, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1
 	object_event 12, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1
diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm
index 1fef9a82c..cbf8f1efa 100644
--- a/maps/CeladonDeptStoreElevator.asm
+++ b/maps/CeladonDeptStoreElevator.asm
@@ -1,9 +1,7 @@
 CeladonDeptStoreElevator_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeladonDeptStoreElevatorScript:
 	opentext
@@ -28,20 +26,15 @@ CeladonDeptStoreElevatorData:
 	db -1 ; end
 
 CeladonDeptStoreElevator_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 1, 3, -1, CELADON_DEPT_STORE_1F
 	warp_event 2, 3, -1, CELADON_DEPT_STORE_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 3, 0, BGEVENT_READ, CeladonDeptStoreElevatorScript
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm
index 060f9ae7c..1c213bacf 100644
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -10,11 +10,9 @@ const_value set 2
 	const CELADONGAMECORNER_GRAMPS
 
 CeladonGameCorner_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeladonGameCornerClerkScript:
 	jumpstd gamecornercoinvendor
@@ -282,19 +280,15 @@ UnknownText_0x72567:
 	done
 
 CeladonGameCorner_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 14, 13, 6, CELADON_CITY
 	warp_event 15, 13, 6, CELADON_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 38
+	db 38 ; bg events
 	bg_event 1, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript
 	bg_event 1, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript
 	bg_event 1, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript
@@ -334,8 +328,7 @@ CeladonGameCorner_MapEvents:
 	bg_event 15, 0, BGEVENT_READ, CeladonGameCornerPoster1Script
 	bg_event 9, 0, BGEVENT_READ, CeladonGameCornerPoster2Script
 
-.ObjectEvents:
-	db 9
+	db 9 ; object events
 	object_event 5, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1
 	object_event 3, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1
 	object_event 14, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPokefanMScript, -1
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index 5c8653084..cc64e736e 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const CELADONGAMECORNERPRIZEROOM_PHARMACIST
 
 CeladonGameCornerPrizeRoom_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeladonGameCornerPrizeRoomGentlemanScript:
 	jumptextfaceplayer CeladonGameCornerPrizeRoomGentlemanText
@@ -264,23 +262,18 @@ CeladonPrizeRoom_NoCoinCaseText:
 	done
 
 CeladonGameCornerPrizeRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 5, 7, CELADON_CITY
 	warp_event 3, 5, 7, CELADON_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 2, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomTMVendor
 	bg_event 4, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomPokemonVendor
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 0, 2, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1
 	object_event 4, 4, SPRITE_PHARMACIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1
diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm
index 4b2d037dc..1c6e1169c 100644
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -7,11 +7,9 @@ const_value set 2
 	const CELADONGYM_TWIN2
 
 CeladonGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ErikaScript_0x72a6a:
 	faceplayer
@@ -268,24 +266,19 @@ TwinsJoandzoe2AfterBattleText:
 	done
 
 CeladonGym_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 17, 8, CELADON_CITY
 	warp_event 5, 17, 8, CELADON_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 3, 15, BGEVENT_READ, CeladonGymStatue
 	bg_event 6, 15, BGEVENT_READ, CeladonGymStatue
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 5, 3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1
 	object_event 7, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1
 	object_event 2, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1
diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm
index defbfa758..5d14663a9 100644
--- a/maps/CeladonMansion1F.asm
+++ b/maps/CeladonMansion1F.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const CELADONMANSION1F_GROWLITHE2
 
 CeladonMansion1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeladonMansionManager:
 	jumptextfaceplayer CeladonMansionManagerText
@@ -75,28 +73,23 @@ CeladonMansionManagersSuiteSignText:
 	done
 
 CeladonMansion1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 6, 9, 2, CELADON_CITY
 	warp_event 7, 9, 2, CELADON_CITY
 	warp_event 3, 0, 3, CELADON_CITY
 	warp_event 0, 0, 1, CELADON_MANSION_2F
 	warp_event 7, 0, 4, CELADON_MANSION_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 5, 8, BGEVENT_UP, CeladonMansionManagersSuiteSign
 	bg_event 0, 3, BGEVENT_READ, CeladonMansion1fBookshelf
 	bg_event 2, 3, BGEVENT_READ, CeladonMansion1fBookshelf
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1
 	object_event 2, 6, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1
 	object_event 3, 4, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1
diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm
index 55dea8af3..231e824c8 100644
--- a/maps/CeladonMansion2F.asm
+++ b/maps/CeladonMansion2F.asm
@@ -1,9 +1,7 @@
 CeladonMansion2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeladonMansion2FComputer:
 	jumptext CeladonMansion2FComputerText
@@ -50,24 +48,19 @@ CeladonMansion2FSignText:
 	done
 
 CeladonMansion2F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 0, 0, 4, CELADON_MANSION_1F
 	warp_event 1, 0, 2, CELADON_MANSION_3F
 	warp_event 6, 0, 3, CELADON_MANSION_3F
 	warp_event 7, 0, 5, CELADON_MANSION_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 0, 3, BGEVENT_READ, CeladonMansion2FComputer
 	bg_event 5, 8, BGEVENT_UP, CeladonMansion2FSign
 	bg_event 2, 3, BGEVENT_READ, CeladonMansion2FBookshelf
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm
index 9372977b4..39ac12d7a 100644
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const CELADONMANSION3F_FISHER
 
 CeladonMansion3F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CooltrainerMScript_0x71670:
 	faceplayer
@@ -190,28 +188,23 @@ UnknownText_0x71996:
 	done
 
 CeladonMansion3F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 0, 0, 1, CELADON_MANSION_ROOF
 	warp_event 1, 0, 2, CELADON_MANSION_2F
 	warp_event 6, 0, 3, CELADON_MANSION_2F
 	warp_event 7, 0, 2, CELADON_MANSION_ROOF
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 4
+	db 4 ; bg events
 	bg_event 5, 8, BGEVENT_UP, MapCeladonMansion3FSignpost0Script
 	bg_event 4, 3, BGEVENT_UP, MapCeladonMansion3FSignpost1Script
 	bg_event 1, 6, BGEVENT_UP, MapCeladonMansion3FSignpost2Script
 	bg_event 1, 3, BGEVENT_UP, MapCeladonMansion3FSignpost3Script
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 3, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1
 	object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1
 	object_event 0, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1
diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm
index 65178e283..254000bd1 100644
--- a/maps/CeladonMansionRoof.asm
+++ b/maps/CeladonMansionRoof.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const CELADONMANSIONROOF_FISHER
 
 CeladonMansionRoof_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeladonMansionRoofFisherScript:
 	jumptextfaceplayer CeladonMansionRoofFisherText
@@ -34,22 +32,17 @@ UnknownText_0x71aa1:
 	done
 
 CeladonMansionRoof_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 1, 1, 1, CELADON_MANSION_3F
 	warp_event 6, 1, 4, CELADON_MANSION_3F
 	warp_event 2, 5, 1, CELADON_MANSION_ROOF_HOUSE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 6, 1, BGEVENT_LEFT, MapCeladonMansionRoofSignpost0Script
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 7, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1
diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm
index 7db64f29a..b82709b6c 100644
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const CELADONMANSIONROOFHOUSE_PHARMACIST
 
 CeladonMansionRoofHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 PharmacistScript_0x71afd:
 	faceplayer
@@ -117,20 +115,15 @@ UnknownText_0x71db3:
 	done
 
 CeladonMansionRoofHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 3, CELADON_MANSION_ROOF
 	warp_event 3, 7, 3, CELADON_MANSION_ROOF
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 3, 2, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1
diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm
index 9971b8a06..0590da32d 100644
--- a/maps/CeladonPokecenter1F.asm
+++ b/maps/CeladonPokecenter1F.asm
@@ -6,11 +6,9 @@ const_value set 2
 	const CELADONPOKECENTER1F_EUSINE
 
 CeladonPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 NurseScript_0x71e22:
 	jumpstd pokecenternurse
@@ -146,23 +144,18 @@ NoBeastsText:
 	done
 
 CeladonPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 5, CELADON_CITY
 	warp_event 4, 7, 5, CELADON_CITY
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x71e22, -1
 	object_event 1, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1
 	object_event 0, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1
diff --git a/maps/CeladonPokecenter2FBeta.asm b/maps/CeladonPokecenter2FBeta.asm
index bdfa7ad6d..836369e9a 100644
--- a/maps/CeladonPokecenter2FBeta.asm
+++ b/maps/CeladonPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
 CeladonPokecenter2FBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeladonPokecenter2FBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 0, 7, 3, CELADON_POKECENTER_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm
index 0d29af242..0e649cba0 100644
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -7,11 +7,9 @@ const_value set 2
 	const CERULEANCITY_YOUNGSTER
 
 CeruleanCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -276,11 +274,9 @@ CeruleanLockedDoorText:
 	done
 
 CeruleanCity_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 6
+	db 6 ; warp events
 	warp_event 7, 15, 1, CERULEAN_GYM_BADGE_SPEECH_HOUSE
 	warp_event 28, 17, 1, CERULEAN_POLICE_STATION
 	warp_event 13, 19, 1, CERULEAN_TRADE_SPEECH_HOUSE
@@ -288,11 +284,9 @@ CeruleanCity_MapEvents:
 	warp_event 30, 23, 1, CERULEAN_GYM
 	warp_event 25, 29, 2, CERULEAN_MART
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 9
+	db 9 ; bg events
 	bg_event 23, 23, BGEVENT_READ, CeruleanCitySign
 	bg_event 27, 25, BGEVENT_READ, CeruleanGymSign
 	bg_event 11, 29, BGEVENT_READ, CeruleanBikeShopSign
@@ -303,8 +297,7 @@ CeruleanCity_MapEvents:
 	bg_event 26, 29, BGEVENT_READ, CeruleanCityMartSign
 	bg_event 2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 15, 23, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1
 	object_event 23, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCitySuperNerdScript, -1
 	object_event 20, 24, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index 3a78fe398..f43cf4d12 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -7,13 +7,11 @@ const_value set 2
 	const CERULEANGYM_GYM_GUY
 
 CeruleanGym_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .GruntRunsOut
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -363,25 +361,20 @@ CeruleanGymGuyWinText:
 	done
 
 CeruleanGym_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 15, 5, CERULEAN_CITY
 	warp_event 5, 15, 5, CERULEAN_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 3, 8, BGEVENT_ITEM, CeruleanGymHiddenMachinePart
 	bg_event 2, 13, BGEVENT_READ, CeruleanGymStatue1
 	bg_event 6, 13, BGEVENT_READ, CeruleanGymStatue2
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 4, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
 	object_event 5, 3, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM
 	object_event 4, 6, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM
diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm
index f0afe7724..19b60dfdb 100644
--- a/maps/CeruleanGymBadgeSpeechHouse.asm
+++ b/maps/CeruleanGymBadgeSpeechHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M
 
 CeruleanGymBadgeSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeruleanGymBadgeSpeechHousePokefanMScript:
 	jumptextfaceplayer CeruleanGymBadgeSpeechHousePokefanMText
@@ -17,20 +15,15 @@ CeruleanGymBadgeSpeechHousePokefanMText:
 	done
 
 CeruleanGymBadgeSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 1, CERULEAN_CITY
 	warp_event 3, 7, 1, CERULEAN_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1
diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm
index 8327a3519..d66986a89 100644
--- a/maps/CeruleanMart.asm
+++ b/maps/CeruleanMart.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const CERULEANMART_COOLTRAINER_F
 
 CeruleanMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeruleanMart_Clerk:
 	opentext
@@ -46,22 +44,17 @@ CeruleanMart_CooltrainerFText:
 	done
 
 CeruleanMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 6, CERULEAN_CITY
 	warp_event 3, 7, 6, CERULEAN_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1
 	object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1
 	object_event 7, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1
diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm
index 146dab83d..7988f7154 100644
--- a/maps/CeruleanPokecenter1F.asm
+++ b/maps/CeruleanPokecenter1F.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const CERULEANPOKECENTER1F_GYM_GUY
 
 CeruleanPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 NurseScript_0x18820f:
 	jumpstd pokecenternurse
@@ -63,23 +61,18 @@ CeruleanPokecenter1FGymGuyText:
 	done
 
 CeruleanPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 4, CERULEAN_CITY
 	warp_event 4, 7, 4, CERULEAN_CITY
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18820f, -1
 	object_event 8, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1
 	object_event 1, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1
diff --git a/maps/CeruleanPokecenter2FBeta.asm b/maps/CeruleanPokecenter2FBeta.asm
index 58a2299fd..cbfabf4bf 100644
--- a/maps/CeruleanPokecenter2FBeta.asm
+++ b/maps/CeruleanPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
 CeruleanPokecenter2FBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeruleanPokecenter2FBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 0, 7, 1, CERULEAN_POKECENTER_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm
index 67fd4f763..7adaba556 100644
--- a/maps/CeruleanPoliceStation.asm
+++ b/maps/CeruleanPoliceStation.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const CERULEANPOLICESTATION_DIGLETT
 
 CeruleanPoliceStation_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeruleanPoliceStationFishingGuruScript:
 	jumptextfaceplayer CeruleanPoliceStationFishingGuruText
@@ -44,22 +42,17 @@ CeruleanDiglettText:
 	done
 
 CeruleanPoliceStation_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 2, CERULEAN_CITY
 	warp_event 3, 7, 2, CERULEAN_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 5, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1
 	object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1
 	object_event 3, 5, SPRITE_DIGLETT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanDiglett, -1
diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm
index 373f6ce32..785b43cc9 100644
--- a/maps/CeruleanTradeSpeechHouse.asm
+++ b/maps/CeruleanTradeSpeechHouse.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const CERULEANTRADESPEECHHOUSE_ZUBAT
 
 CeruleanTradeSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeruleanTradeSpeechHouseGrannyScript:
 	jumptextfaceplayer CeruleanTradeSpeechHouseGrannyText
@@ -54,22 +52,17 @@ UnknownText_0x1881b5:
 	done
 
 CeruleanTradeSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 3, CERULEAN_CITY
 	warp_event 3, 7, 3, CERULEAN_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1
 	object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1
 	object_event 5, 2, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x188139, -1
diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm
index a768a0bef..91ee79e25 100644
--- a/maps/CharcoalKiln.asm
+++ b/maps/CharcoalKiln.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const CHARCOALKILN_MOLTRES
 
 CharcoalKiln_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CharcoalKilnBoss:
 	faceplayer
@@ -149,25 +147,20 @@ FarfetchdText:
 	done
 
 CharcoalKiln_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 2, AZALEA_TOWN
 	warp_event 3, 7, 2, AZALEA_TOWN
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 0, 1, BGEVENT_READ, CharcoalKilnBookshelf
 	bg_event 1, 1, BGEVENT_READ, CharcoalKilnBookshelf
 	bg_event 7, 1, BGEVENT_READ, CharcoalKilnRadio
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS
 	object_event 5, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE
 	object_event 5, 6, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index bee085804..4df1fd299 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -6,13 +6,11 @@ const_value set 2
 	const CHERRYGROVECITY_FISHER
 
 CherrygroveCity_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .DummyScene0:
@@ -547,31 +545,26 @@ GuideGentsHouseSignText:
 	done
 
 CherrygroveCity_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 23, 3, 2, CHERRYGROVE_MART
 	warp_event 29, 3, 1, CHERRYGROVE_POKECENTER_1F
 	warp_event 17, 7, 1, CHERRYGROVE_GYM_SPEECH_HOUSE
 	warp_event 25, 9, 1, GUIDE_GENTS_HOUSE
 	warp_event 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 33, 6, 1, CherrygroveSilverSceneNorth
 	coord_event 33, 7, 1, CherrygroveSilverSceneSouth
 
-.BGEvents:
-	db 4
+	db 4 ; bg events
 	bg_event 30, 8, BGEVENT_READ, CherrygroveCitySign
 	bg_event 23, 9, BGEVENT_READ, GuideGentsHouseSign
 	bg_event 24, 3, BGEVENT_READ, CherrygroveCityMartSign
 	bg_event 30, 3, BGEVENT_READ, CherrygroveCityPokecenterSign
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 32, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
 	object_event 39, 6, SPRITE_SILVER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
 	object_event 27, 12, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1
diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm
index e634c3981..8ecad6337 100644
--- a/maps/CherrygroveEvolutionSpeechHouse.asm
+++ b/maps/CherrygroveEvolutionSpeechHouse.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER
 
 CherrygroveEvolutionSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 YoungsterScript_0x196cb2:
 	opentext
@@ -42,23 +40,18 @@ UnknownText_0x196cfc:
 	done
 
 CherrygroveEvolutionSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 5, CHERRYGROVE_CITY
 	warp_event 3, 7, 5, CHERRYGROVE_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 3, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LassScript_0x196cb9, -1
 	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1
diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm
index 86bc4eaa4..df5c588c6 100644
--- a/maps/CherrygroveGymSpeechHouse.asm
+++ b/maps/CherrygroveGymSpeechHouse.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER
 
 CherrygroveGymSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CherrygroveGymSpeechHousePokefanMScript:
 	jumptextfaceplayer CherrygroveGymSpeechHousePokefanMText
@@ -45,23 +43,18 @@ CherrygroveGymSpeechHouseBugCatcherText:
 	done
 
 CherrygroveGymSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 3, CHERRYGROVE_CITY
 	warp_event 3, 7, 3, CHERRYGROVE_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1
 	object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1
diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm
index 4684c9216..7ccc16f59 100644
--- a/maps/CherrygroveMart.asm
+++ b/maps/CherrygroveMart.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const CHERRYGROVEMART_YOUNGSTER
 
 CherrygroveMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ClerkScript_0x19680a:
 	opentext
@@ -72,22 +70,17 @@ CherrygroveMartYoungsterText:
 	done
 
 CherrygroveMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 1, CHERRYGROVE_CITY
 	warp_event 3, 7, 1, CHERRYGROVE_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1
 	object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1
 	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1
diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm
index 364a8443c..abc16919f 100644
--- a/maps/CherrygrovePokecenter1F.asm
+++ b/maps/CherrygrovePokecenter1F.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const CHERRYGROVEPOKECENTER1F_TEACHER
 
 CherrygrovePokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 NurseScript_0x19696d:
 	jumpstd pokecenternurse
@@ -69,23 +67,18 @@ UnknownText_0x196a46:
 	done
 
 CherrygrovePokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 2, CHERRYGROVE_CITY
 	warp_event 4, 7, 2, CHERRYGROVE_CITY
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19696d, -1
 	object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1
 	object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index c6daa18c2..11fbaf9a2 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -13,13 +13,11 @@ const_value set 2
 	const CIANWOODCITY_SUICUNE
 
 CianwoodCity_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune
 
 .DummyScene0:
@@ -381,11 +379,9 @@ CianwoodPokeSeerSignText:
 	done
 
 CianwoodCity_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 7
+	db 7 ; warp events
 	warp_event 17, 41, 1, MANIAS_HOUSE
 	warp_event 8, 43, 1, CIANWOOD_GYM
 	warp_event 23, 43, 1, CIANWOOD_POKECENTER_1F
@@ -394,12 +390,10 @@ CianwoodCity_MapEvents:
 	warp_event 15, 37, 1, CIANWOOD_LUGIA_SPEECH_HOUSE
 	warp_event 5, 17, 1, POKE_SEERS_HOUSE
 
-.CoordEvents:
-	db 1
+	db 1 ; coord events
 	coord_event 11, 16, 1, CianwoodCitySuicuneAndEusine
 
-.BGEvents:
-	db 8
+	db 8 ; bg events
 	bg_event 20, 34, BGEVENT_READ, CianwoodCitySign
 	bg_event 7, 45, BGEVENT_READ, CianwoodGymSign
 	bg_event 24, 43, BGEVENT_READ, CianwoodPokecenterSign
@@ -409,8 +403,7 @@ CianwoodCity_MapEvents:
 	bg_event 4, 19, BGEVENT_ITEM, CianwoodCityHiddenRevive
 	bg_event 5, 29, BGEVENT_ITEM, CianwoodCityHiddenMaxEther
 
-.ObjectEvents:
-	db 12
+	db 12 ; object events
 	object_event 21, 37, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodCityYoungster, -1
 	object_event 17, 33, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityPokefanM, -1
 	object_event 14, 42, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityLass, -1
diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm
index e0bb019e1..fd4109957 100644
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -10,11 +10,9 @@ const_value set 2
 	const CIANWOODGYM_BOULDER4
 
 CianwoodGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ChuckScript_0x9d60f:
 	faceplayer
@@ -306,24 +304,19 @@ BlackbeltLungAfterText:
 	done
 
 CianwoodGym_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 17, 2, CIANWOOD_CITY
 	warp_event 5, 17, 2, CIANWOOD_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 3, 15, BGEVENT_READ, CianwoodGymStatue
 	bg_event 6, 15, BGEVENT_READ, CianwoodGymStatue
 
-.ObjectEvents:
-	db 9
+	db 9 ; object events
 	object_event 4, 1, SPRITE_CHUCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1
 	object_event 2, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1
 	object_event 7, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltLao, -1
diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm
index b0b20210d..1049d5280 100644
--- a/maps/CianwoodLugiaSpeechHouse.asm
+++ b/maps/CianwoodLugiaSpeechHouse.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const CIANWOODLUGIASPEECHHOUSE_TWIN
 
 CianwoodLugiaSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CianwoodLugiaSpeechHouseTeacherScript:
 	jumptextfaceplayer CianwoodLugiaSpeechHouseTeacherText
@@ -62,24 +60,19 @@ CianwoodLugiaSpeechHouseTwinText:
 	done
 
 CianwoodLugiaSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 6, CIANWOOD_CITY
 	warp_event 3, 7, 6, CIANWOOD_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1
 	object_event 6, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1
 	object_event 0, 2, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1
diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm
index 281583a8e..8bb278e3d 100644
--- a/maps/CianwoodPharmacy.asm
+++ b/maps/CianwoodPharmacy.asm
@@ -2,12 +2,10 @@ const_value set 2
 	const CIANWOODPHARMACY_PHARMACIST
 
 CianwoodPharmacy_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -73,22 +71,17 @@ PharmacistDescribeSecretpotionText:
 	done
 
 CianwoodPharmacy_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 4, CIANWOOD_CITY
 	warp_event 3, 7, 4, CIANWOOD_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, CianwoodPharmacyBookshelf
 	bg_event 1, 1, BGEVENT_READ, CianwoodPharmacyBookshelf
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPharmacist, -1
diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm
index 1c86fa150..956d64948 100644
--- a/maps/CianwoodPhotoStudio.asm
+++ b/maps/CianwoodPhotoStudio.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const CIANWOODPHOTOSTUDIO_FISHING_GURU
 
 CianwoodPhotoStudio_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 FishingGuruScript_0x9e0e0:
 	faceplayer
@@ -49,20 +47,15 @@ UnknownText_0x9e156:
 	done
 
 CianwoodPhotoStudio_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 5, CIANWOOD_CITY
 	warp_event 3, 7, 5, CIANWOOD_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1
diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm
index 848688257..3b7e41f17 100644
--- a/maps/CianwoodPokecenter1F.asm
+++ b/maps/CianwoodPokecenter1F.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const CIANWOODPOKECENTER1F_SUPER_NERD
 
 CianwoodPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 NurseScript_0x9dbcf:
 	jumpstd pokecenternurse
@@ -132,23 +130,18 @@ CianwoodPokecenter1FSuperNerdText:
 	done
 
 CianwoodPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 3, CIANWOOD_CITY
 	warp_event 4, 7, 3, CIANWOOD_CITY
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1
 	object_event 1, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1
 	object_event 5, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1
diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm
index 70b1ab9c2..021da6387 100644
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const CINNABARISLAND_BLUE
 
 CinnabarIsland_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -128,23 +126,18 @@ CinnabarIslandSignText:
 	done
 
 CinnabarIsland_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 11, 11, 1, CINNABAR_POKECENTER_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 4
+	db 4 ; bg events
 	bg_event 12, 11, BGEVENT_READ, CinnabarIslandPokecenterSign
 	bg_event 9, 11, BGEVENT_READ, CinnabarIslandGymSign
 	bg_event 7, 7, BGEVENT_READ, CinnabarIslandSign
 	bg_event 9, 1, BGEVENT_ITEM, CinnabarIslandHiddenRareCandy
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 9, 6, SPRITE_BLUE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR
diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm
index b46f5023b..c5f5956e9 100644
--- a/maps/CinnabarPokecenter1F.asm
+++ b/maps/CinnabarPokecenter1F.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const CINNABARPOKECENTER1F_FISHER
 
 CinnabarPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 NurseScript_0x1ab32c:
 	jumpstd pokecenternurse
@@ -35,23 +33,18 @@ CinnabarPokecenter1FFisherText:
 	done
 
 CinnabarPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 1, CINNABAR_ISLAND
 	warp_event 4, 7, 1, CINNABAR_ISLAND
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1
 	object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1
 	object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1
diff --git a/maps/CinnabarPokecenter2FBeta.asm b/maps/CinnabarPokecenter2FBeta.asm
index 8cecb04c7..559a1425f 100644
--- a/maps/CinnabarPokecenter2FBeta.asm
+++ b/maps/CinnabarPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
 CinnabarPokecenter2FBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CinnabarPokecenter2FBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 0, 7, 3, CINNABAR_POKECENTER_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index dcf4be92e..7dd4083a9 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -3,14 +3,12 @@ const_value set 2
 	const COLOSSEUM_CHRIS2
 
 Colosseum_MapScripts:
-.SceneScripts:
-	db 3
+	db 3 ; scene scripts
 	scene_script .InitializeColosseum
 	scene_script .DummyScene1
 	scene_script .DummyScene2
 
-.MapCallbacks:
-	db 2
+	db 2 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
 	callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F
 
@@ -63,23 +61,18 @@ ChrisScript_0x193499:
 	done
 
 Colosseum_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 7, 3, POKECENTER_2F
 	warp_event 5, 7, 3, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 4, 4, BGEVENT_RIGHT, MapColosseumSignpost1Script
 	bg_event 5, 4, BGEVENT_LEFT, MapColosseumSignpost1Script
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm
index 97240f1fe..96249fe8d 100644
--- a/maps/CopycatsHouse1F.asm
+++ b/maps/CopycatsHouse1F.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const COPYCATSHOUSE1F_CLEFAIRY
 
 CopycatsHouse1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CopycatsHouse1FPokefanMScript:
 	jumptextfaceplayer CopycatsHouse1FPokefanMText
@@ -73,23 +71,18 @@ UnknownText_0x18ae4b:
 	done
 
 CopycatsHouse1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 2, 7, 8, SAFFRON_CITY
 	warp_event 3, 7, 8, SAFFRON_CITY
 	warp_event 2, 0, 1, COPYCATS_HOUSE_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1
 	object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1
 	object_event 6, 6, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1
diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm
index b13529aae..722b39dcc 100644
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -7,11 +7,9 @@ const_value set 2
 	const COPYCATSHOUSE2F_COPYCAT2 ; if player is female
 
 CopycatsHouse2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .Callback
 
 .Callback:
@@ -361,23 +359,18 @@ CopycatsHouse2FDollText:
 	done
 
 CopycatsHouse2F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 3, 0, 3, COPYCATS_HOUSE_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, CopycatsHouse2FBookshelf
 	bg_event 1, 1, BGEVENT_READ, CopycatsHouse2FBookshelf
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 4, 3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1
 	object_event 6, 4, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CopycatsDodrio, -1
 	object_event 6, 1, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL
diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm
index fbc3c8a19..fa3c4abca 100644
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -10,11 +10,9 @@ const_value set 2
 	const DANCETHEATRE_GRANNY
 
 DanceTheatre_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerKimonoGirlNaoko2:
 	trainer KIMONO_GIRL, NAOKO2, EVENT_BEAT_KIMONO_GIRL_NAOKO, KimonoGirlNaoko2SeenText, KimonoGirlNaoko2BeatenText, 0, .Script
@@ -338,24 +336,19 @@ FancyPanelText:
 	done
 
 DanceTheatre_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 5, 13, 8, ECRUTEAK_CITY
 	warp_event 6, 13, 8, ECRUTEAK_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 5, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script
 	bg_event 6, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script
 
-.ObjectEvents:
-	db 9
+	db 9 ; object events
 	object_event 0, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko2, -1
 	object_event 2, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlSayo, -1
 	object_event 6, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlZuki, -1
diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm
index 75d67ac34..9806a905e 100644
--- a/maps/DarkCaveBlackthornEntrance.asm
+++ b/maps/DarkCaveBlackthornEntrance.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2
 
 DarkCaveBlackthornEntrance_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 DarkCaveBlackthornEntrancePharmacistScript:
 	faceplayer
@@ -62,22 +60,17 @@ DarkCaveBlackthornEntrancePharmacistText2:
 	done
 
 DarkCaveBlackthornEntrance_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 23, 3, 1, ROUTE_45
 	warp_event 3, 25, 2, DARK_CAVE_VIOLET_ENTRANCE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 7, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1
 	object_event 21, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE
 	object_event 7, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE
diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm
index fe24989d8..c188057e8 100644
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -9,11 +9,9 @@ const_value set 2
 	const DARKCAVEVIOLETENTRANCE_POKE_BALL4
 
 DarkCaveVioletEntrance_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 DarkCaveVioletEntrancePotion:
 	itemball POTION
@@ -34,24 +32,19 @@ DarkCaveVioletEntranceHiddenElixer:
 	hiddenitem ELIXER, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER
 
 DarkCaveVioletEntrance_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 15, 3, ROUTE_31
 	warp_event 17, 1, 2, DARK_CAVE_BLACKTHORN_ENTRANCE
 	warp_event 35, 33, 3, ROUTE_46
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 26, 3, BGEVENT_ITEM, DarkCaveVioletEntranceHiddenElixer
 
-.ObjectEvents:
-	db 8
+	db 8 ; object events
 	object_event 6, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION
 	object_event 16, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
 	object_event 27, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
diff --git a/maps/DayCare.asm b/maps/DayCare.asm
index ec60bb764..e6b3ea986 100644
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const DAYCARE_GRANNY
 
 DayCare_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .EggCheckCallback
 
 .EggCheckCallback:
@@ -156,25 +154,20 @@ DayCareText_PartyFull:
 	done
 
 DayCare_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 0, 5, 3, ROUTE_34
 	warp_event 0, 6, 4, ROUTE_34
 	warp_event 2, 7, 5, ROUTE_34
 	warp_event 3, 7, 5, ROUTE_34
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, DayCareBookshelf
 	bg_event 1, 1, BGEVENT_READ, DayCareBookshelf
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE
 	object_event 5, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DayCareLadyScript, -1
diff --git a/maps/DayOfWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm
index aedc3e151..a4bfcf211 100644
--- a/maps/DayOfWeekSiblingsHouse.asm
+++ b/maps/DayOfWeekSiblingsHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const DAYOFWEEKSIBLINGSHOUSE_POKEDEX
 
 DayOfWeekSiblingsHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 PokedexScript_0x7b1e4:
 	opentext
@@ -71,20 +69,15 @@ UnknownText_0x7b2b9:
 	done
 
 DayOfWeekSiblingsHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 3, ROUTE_26
 	warp_event 3, 7, 3, ROUTE_26
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1
diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm
index 1bee76da4..74ed60bc9 100644
--- a/maps/DiglettsCave.asm
+++ b/maps/DiglettsCave.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const DIGLETTSCAVE_POKEFAN_M
 
 DiglettsCave_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 DiglettsCavePokefanMScript:
 	jumptextfaceplayer DiglettsCavePokefanMText
@@ -23,11 +21,9 @@ DiglettsCavePokefanMText:
 	done
 
 DiglettsCave_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 6
+	db 6 ; warp events
 	warp_event 3, 33, 10, VERMILION_CITY
 	warp_event 5, 31, 5, DIGLETTS_CAVE
 	warp_event 15, 5, 5, ROUTE_2
@@ -35,13 +31,10 @@ DiglettsCave_MapEvents:
 	warp_event 17, 33, 2, DIGLETTS_CAVE
 	warp_event 3, 3, 4, DIGLETTS_CAVE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 6, 11, BGEVENT_ITEM, DiglettsCaveHiddenMaxRevive
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 3, 31, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DiglettsCavePokefanMScript, -1
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index ad48875d1..7211df60a 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -5,13 +5,11 @@ const_value set 2
 	const DRAGONSHRINE_CLAIR
 
 DragonShrine_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DragonShrineTest
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DragonShrineTest:
 	priorityjump .DragonShrineTestScript
@@ -658,22 +656,17 @@ DragonShrineSpeechlessText:
 	done
 
 DragonShrine_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 9, 2, DRAGONS_DEN_B1F
 	warp_event 5, 9, 2, DRAGONS_DEN_B1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder1Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder2Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder3Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm
index d8866209b..5d6b27646 100644
--- a/maps/DragonsDen1F.asm
+++ b/maps/DragonsDen1F.asm
@@ -1,26 +1,19 @@
 DragonsDen1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 DragonsDen1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 3, 5, 8, BLACKTHORN_CITY
 	warp_event 3, 3, 4, DRAGONS_DEN_1F
 	warp_event 5, 15, 1, DRAGONS_DEN_B1F
 	warp_event 5, 13, 2, DRAGONS_DEN_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 37f245ba7..0ce532235 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -10,13 +10,11 @@ const_value set 2
 	const DRAGONSDENB1F_POKE_BALL3
 
 DragonsDenB1F_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckSilver
 
 .DummyScene0:
@@ -407,27 +405,22 @@ Text_NoRoomForDragonFang:
 	done
 
 DragonsDenB1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 20, 3, 3, DRAGONS_DEN_1F
 	warp_event 19, 29, 1, DRAGON_SHRINE
 
-.CoordEvents:
-	db 1
+	db 1 ; coord events
 	coord_event 19, 30, 1, DragonsDenB1F_ClairScene
 
-.BGEvents:
-	db 4
+	db 4 ; bg events
 	bg_event 18, 24, BGEVENT_READ, MapDragonsDenB1FSignpost0Script
 	bg_event 33, 29, BGEVENT_ITEM, DragonsDenB1FHiddenRevive
 	bg_event 21, 17, BGEVENT_ITEM, DragonsDenB1FHiddenMaxPotion
 	bg_event 31, 15, BGEVENT_ITEM, DragonsDenB1FHiddenMaxElixer
 
-.ObjectEvents:
-	db 9
+	db 9 ; object events
 	object_event 35, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG
 	object_event 14, 30, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR
 	object_event 20, 23, SPRITE_SILVER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN
diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm
index e3afb070b..8bbef9261 100644
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -7,11 +7,9 @@ const_value set 2
 	const EARLSPOKEMONACADEMY_POKEDEX
 
 EarlsPokemonAcademy_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 AcademyEarl:
 	applymovement EARLSPOKEMONACADEMY_EARL, MovementData_0x68b2d
@@ -412,26 +410,21 @@ AcademyStickerMachineText:
 	done
 
 EarlsPokemonAcademy_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 3, 15, 3, VIOLET_CITY
 	warp_event 4, 15, 3, VIOLET_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 4
+	db 4 ; bg events
 	bg_event 0, 1, BGEVENT_READ, AcademyBookshelf
 	bg_event 1, 1, BGEVENT_READ, AcademyBookshelf
 	bg_event 3, 0, BGEVENT_READ, AcademyBlackboard
 	bg_event 4, 0, BGEVENT_READ, AcademyBlackboard
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 4, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL
 	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1
 	object_event 3, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1
diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm
index 8b7c02087..c23c36c0e 100644
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -8,11 +8,9 @@ const_value set 2
 	const ECRUTEAKCITY_GRAMPS3
 
 EcruteakCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -260,11 +258,9 @@ BurnedTowerSignText:
 	done
 
 EcruteakCity_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 15
+	db 15 ; warp events
 	warp_event 35, 26, 1, ROUTE_42_ECRUTEAK_GATE
 	warp_event 35, 27, 2, ROUTE_42_ECRUTEAK_GATE
 	warp_event 18, 11, 1, ECRUTEAK_TIN_TOWER_ENTRANCE
@@ -281,11 +277,9 @@ EcruteakCity_MapEvents:
 	warp_event 0, 18, 3, ROUTE_38_ECRUTEAK_GATE
 	warp_event 0, 19, 4, ROUTE_38_ECRUTEAK_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 8
+	db 8 ; bg events
 	bg_event 15, 21, BGEVENT_READ, EcruteakCitySign
 	bg_event 38, 10, BGEVENT_READ, TinTowerSign
 	bg_event 8, 28, BGEVENT_READ, EcruteakGymSign
@@ -295,8 +289,7 @@ EcruteakCity_MapEvents:
 	bg_event 30, 21, BGEVENT_READ, EcruteakCityMartSign
 	bg_event 23, 14, BGEVENT_ITEM, EcruteakCityHiddenHyperPotion
 
-.ObjectEvents:
-	db 7
+	db 7 ; object events
 	object_event 18, 15, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps1Script, -1
 	object_event 20, 21, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps2Script, -1
 	object_event 21, 29, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, EcruteakCityLassScript, -1
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index d892dc0ae..176d6a370 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -8,13 +8,11 @@ const_value set 2
 	const ECRUTEAKGYM_GRAMPS
 
 EcruteakGym_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .ForcedToLeave
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .ForcedToLeave:
 	priorityjump EcruteakGymClosed
@@ -387,11 +385,9 @@ UnknownText_0x9a49c:
 	done
 
 EcruteakGym_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 33
+	db 33 ; warp events
 	warp_event 4, 17, 10, ECRUTEAK_CITY
 	warp_event 5, 17, 10, ECRUTEAK_CITY
 	warp_event 4, 14, 4, ECRUTEAK_GYM
@@ -426,16 +422,13 @@ EcruteakGym_MapEvents:
 	warp_event 7, 12, 3, ECRUTEAK_GYM
 	warp_event 7, 13, 3, ECRUTEAK_GYM
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 3, 15, BGEVENT_READ, EcruteakGymStatue
 	bg_event 6, 15, BGEVENT_READ, EcruteakGymStatue
 
-.ObjectEvents:
-	db 7
+	db 7 ; object events
 	object_event 5, 1, SPRITE_MORTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MortyScript_0x99d58, -1
 	object_event 2, 7, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1
 	object_event 3, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1
diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm
index aa5528e7e..c19aebb38 100644
--- a/maps/EcruteakItemfinderHouse.asm
+++ b/maps/EcruteakItemfinderHouse.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const ECRUTEAKITEMFINDERHOUSE_POKEDEX
 
 EcruteakItemfinderHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 EcruteakItemfinderGuy:
 	faceplayer
@@ -163,22 +161,17 @@ EcruteakThreeMonText:
 	done
 
 EcruteakItemfinderHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 3, 7, 11, ECRUTEAK_CITY
 	warp_event 4, 7, 11, ECRUTEAK_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 2, 1, BGEVENT_READ, ItemFinderHouseRadio
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 2, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakItemfinderGuy, -1
 	object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHistoryBook, -1
diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm
index cfe4c0fca..9149d06bc 100644
--- a/maps/EcruteakLugiaSpeechHouse.asm
+++ b/maps/EcruteakLugiaSpeechHouse.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER
 
 EcruteakLugiaSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 EcruteakLugiaSpeechHouseGrampsScript:
 	jumptextfaceplayer EcruteakLugiaSpeechHouseGrampsText
@@ -45,22 +43,17 @@ EcruteakLugiaSpeechHouseYoungsterText:
 	done
 
 EcruteakLugiaSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 3, 7, 7, ECRUTEAK_CITY
 	warp_event 4, 7, 7, ECRUTEAK_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 2, 1, BGEVENT_READ, LugiaSpeechHouseRadio
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseGrampsScript, -1
 	object_event 5, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseYoungsterScript, -1
diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm
index 788edc9f7..f8d4f10bd 100644
--- a/maps/EcruteakMart.asm
+++ b/maps/EcruteakMart.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const ECRUTEAKMART_GRANNY
 
 EcruteakMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ClerkScript_0x99c3b:
 	opentext
@@ -46,22 +44,17 @@ EcruteakMartGrannyText:
 	done
 
 EcruteakMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 9, ECRUTEAK_CITY
 	warp_event 3, 7, 9, ECRUTEAK_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1
 	object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1
 	object_event 6, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1
diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm
index e34bcda5a..fc56b0b0d 100644
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -6,13 +6,11 @@ const_value set 2
 	const ECRUTEAKPOKECENTER1F_BILL
 
 EcruteakPokecenter1F_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .MeetBill
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .MeetBill:
 	priorityjump .BillActivatesTimeCapsule
@@ -207,23 +205,18 @@ EcruteakPokecenter1FGymGuyText:
 	done
 
 EcruteakPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 6, ECRUTEAK_CITY
 	warp_event 4, 7, 6, ECRUTEAK_CITY
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FNurseScript, -1
 	object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FPokefanMScript, -1
 	object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FCooltrainerFScript, -1
diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm
index 3ad1ea2a0..17ffc7b08 100644
--- a/maps/EcruteakTinTowerEntrance.asm
+++ b/maps/EcruteakTinTowerEntrance.asm
@@ -5,13 +5,11 @@ const_value set 2
 	const ECRUTEAKTINTOWERENTRANCE_GRAMPS
 
 EcruteakTinTowerEntrance_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .InitializeSages
 
 .DummyScene0:
@@ -278,27 +276,22 @@ EcruteakTinTowerEntranceGrampsText:
 	done
 
 EcruteakTinTowerEntrance_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 4, 17, 3, ECRUTEAK_CITY
 	warp_event 5, 17, 3, ECRUTEAK_CITY
 	warp_event 5, 3, 4, ECRUTEAK_TIN_TOWER_ENTRANCE
 	warp_event 17, 15, 3, ECRUTEAK_TIN_TOWER_ENTRANCE
 	warp_event 17, 3, 3, WISE_TRIOS_ROOM
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 4, 7, 0, EcruteakTinTowerEntrance_CoordEvent1
 	coord_event 5, 7, 0, EcruteakTinTowerEntrance_CoordEvent2
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1
 	object_event 5, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2
 	object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm
index 25243892f..28cba0a3f 100644
--- a/maps/ElmsHouse.asm
+++ b/maps/ElmsHouse.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const ELMSHOUSE_ELMS_SON
 
 ElmsHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ElmsWife:
 	jumptextfaceplayer ElmsWifeText
@@ -84,24 +82,19 @@ ElmsHousePCText:
 	done
 
 ElmsHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 4, NEW_BARK_TOWN
 	warp_event 3, 7, 4, NEW_BARK_TOWN
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 0, 1, BGEVENT_READ, ElmsHousePC
 	bg_event 6, 1, BGEVENT_READ, ElmsHouseBookshelf
 	bg_event 7, 1, BGEVENT_READ, ElmsHouseBookshelf
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 1, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1
 	object_event 5, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 157e86a16..2f9a46217 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -7,8 +7,7 @@ const_value set 2
 	const ELMSLAB_OFFICER
 
 ElmsLab_MapScripts:
-.SceneScripts:
-	db 6
+	db 6 ; scene scripts
 	scene_script .MeetElm
 	scene_script .DummyScene1
 	scene_script .DummyScene2
@@ -16,8 +15,7 @@ ElmsLab_MapScripts:
 	scene_script .DummyScene4
 	scene_script .DummyScene5
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .MoveElmCallback
 
 .MeetElm:
@@ -1371,16 +1369,13 @@ ElmsLabPCText:
 	done
 
 ElmsLab_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 11, 1, NEW_BARK_TOWN
 	warp_event 5, 11, 1, NEW_BARK_TOWN
 
-.CoordEvents:
-	db 8
+	db 8 ; coord events
 	coord_event 4, 6, 1, LabTryToLeaveScript
 	coord_event 5, 6, 1, LabTryToLeaveScript
 	coord_event 4, 5, 3, MeetCopScript
@@ -1390,8 +1385,7 @@ ElmsLab_MapEvents:
 	coord_event 4, 8, 6, AideScript_WalkBalls1
 	coord_event 5, 8, 6, AideScript_WalkBalls2
 
-.BGEvents:
-	db 16
+	db 16 ; bg events
 	bg_event 2, 1, BGEVENT_READ, ElmsLabHealingMachine
 	bg_event 6, 1, BGEVENT_READ, ElmsLabBookshelf
 	bg_event 7, 1, BGEVENT_READ, ElmsLabBookshelf
@@ -1409,8 +1403,7 @@ ElmsLab_MapEvents:
 	bg_event 5, 0, BGEVENT_READ, ElmsLabWindow
 	bg_event 3, 5, BGEVENT_DOWN, ElmsLabPC
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 5, 2, SPRITE_ELM, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfElmScript, -1
 	object_event 2, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB
 	object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index 32fe441f1..19bb91a37 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -5,14 +5,12 @@ const_value set 2
 	const FASTSHIP1F_GENTLEMAN
 
 FastShip1F_MapScripts:
-.SceneScripts:
-	db 3
+	db 3 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .EnterFastShip
 	scene_script .DummyScene2
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -286,11 +284,9 @@ UnknownText_0x754be:
 	done
 
 FastShip1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 12
+	db 12 ; warp events
 	warp_event 25, 1, -1, FAST_SHIP_1F
 	warp_event 27, 8, 1, FAST_SHIP_CABINS_NNW_NNE_NE
 	warp_event 23, 8, 2, FAST_SHIP_CABINS_NNW_NNE_NE
@@ -304,16 +300,13 @@ FastShip1F_MapEvents:
 	warp_event 6, 12, 1, FAST_SHIP_B1F
 	warp_event 30, 14, 2, FAST_SHIP_B1F
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 24, 6, 2, WorriedGrandpaSceneLeft
 	coord_event 25, 6, 2, WorriedGrandpaSceneRight
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 25, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x75160, -1
 	object_event 14, 7, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x751d0, -1
 	object_event 22, 17, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailorScript, -1
diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm
index eae217471..252511f93 100644
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -13,13 +13,11 @@ const_value set 2
 	const FASTSHIPB1F_YOUNGSTER2
 
 FastShipB1F_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -449,25 +447,20 @@ SchoolboyRickyAfterBattleText:
 	done
 
 FastShipB1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 5, 11, 11, FAST_SHIP_1F
 	warp_event 31, 13, 12, FAST_SHIP_1F
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 30, 7, 0, UnknownScript_0x7673c
 	coord_event 31, 7, 0, UnknownScript_0x76751
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan
 
-.ObjectEvents:
-	db 12
+	db 12 ; object events
 	object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT
 	object_event 31, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
 	object_event 9, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm
index 50b1b719e..1314070d4 100644
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -8,11 +8,9 @@ const_value set 2
 	const FASTSHIPCABINS_NNW_NNE_NE_PHARMACIST
 
 FastShipCabins_NNW_NNE_NE_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerCooltrainermSean:
 	trainer COOLTRAINERM, SEAN, EVENT_BEAT_COOLTRAINERM_SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, .Script
@@ -267,26 +265,21 @@ BurglarCoreyAfterBattleText:
 	done
 
 FastShipCabins_NNW_NNE_NE_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 2, 0, 2, FAST_SHIP_1F
 	warp_event 2, 12, 3, FAST_SHIP_1F
 	warp_event 2, 24, 4, FAST_SHIP_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 6, 13, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
 	bg_event 7, 19, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
 	bg_event 7, 31, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
 
-.ObjectEvents:
-	db 7
+	db 7 ; object events
 	object_event 4, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
 	object_event 1, 5, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
 	object_event 1, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index 7a41391d9..fdb1e9a37 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -12,11 +12,9 @@ const_value set 2
 	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD2
 
 FastShipCabins_SE_SSE_CaptainsCabin_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Unreferenced_0x75ea6:
 	end
@@ -463,11 +461,9 @@ SSAquaHasArrivedVermilionText:
 	done
 
 FastShipCabins_SE_SSE_CaptainsCabin_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 6
+	db 6 ; warp events
 	warp_event 2, 7, 8, FAST_SHIP_1F
 	warp_event 3, 7, 8, FAST_SHIP_1F
 	warp_event 2, 19, 9, FAST_SHIP_1F
@@ -475,15 +471,12 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEvents:
 	warp_event 2, 33, 10, FAST_SHIP_1F
 	warp_event 3, 33, 10, FAST_SHIP_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 4, 25, BGEVENT_READ, FastShipCaptainsCabinTrashcan
 
-.ObjectEvents:
-	db 11
+	db 11 ; object events
 	object_event 3, 25, SPRITE_CAPTAIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaCaptain, -1
 	object_event 2, 17, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaGrandpa, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
 	object_event 3, 17, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterAfter, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm
index ad46bd707..ecdf5e412 100644
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const FASTSHIPCABINS_SW_SSW_NW_ROCKER
 
 FastShipCabins_SW_SSW_NW_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerFirebreatherLyle:
 	trainer FIREBREATHER, LYLE, EVENT_BEAT_FIREBREATHER_LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, .Script
@@ -223,28 +221,23 @@ FastShipArrivedVermilionText:
 	done
 
 FastShipCabins_SW_SSW_NW_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 2, 0, 5, FAST_SHIP_1F
 	warp_event 2, 19, 6, FAST_SHIP_1F
 	warp_event 3, 19, 6, FAST_SHIP_1F
 	warp_event 2, 31, 7, FAST_SHIP_1F
 	warp_event 3, 31, 7, FAST_SHIP_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 7, 1, BGEVENT_READ, FastShipBed
 	bg_event 7, 2, BGEVENT_READ, FastShipBed
 	bg_event 7, 7, BGEVENT_READ, FastShipCabinsNorthwestCabinTrashcan
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 1, 15, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
 	object_event 6, 15, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
 	object_event 1, 26, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm
index c45572587..ad90b5fd6 100644
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const FIGHTINGDOJO_POKE_BALL
 
 FightingDojo_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 FightingDojoBlackBelt:
 	jumptextfaceplayer FightingDojoBlackBeltText
@@ -43,23 +41,18 @@ FightingDojoSign1Text:
 	done
 
 FightingDojo_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 11, 1, SAFFRON_CITY
 	warp_event 5, 11, 1, SAFFRON_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 4, 0, BGEVENT_READ, MapFightingDojoSignpost0Script
 	bg_event 5, 0, BGEVENT_READ, MapFightingDojoSignpost1Script
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 4, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1
 	object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND
diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm
index 0d0061ad0..c1277cadf 100644
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const FUCHSIACITY_FRUIT_TREE
 
 FuchsiaCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -125,11 +123,9 @@ NoLitteringSignText:
 	done
 
 FuchsiaCity_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 11
+	db 11 ; warp events
 	warp_event 5, 13, 2, FUCHSIA_MART
 	warp_event 22, 13, 1, SAFARI_ZONE_MAIN_OFFICE
 	warp_event 8, 27, 1, FUCHSIA_GYM
@@ -142,11 +138,9 @@ FuchsiaCity_MapEvents:
 	warp_event 7, 35, 1, ROUTE_19_FUCHSIA_GATE
 	warp_event 8, 35, 2, ROUTE_19_FUCHSIA_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 8
+	db 8 ; bg events
 	bg_event 21, 15, BGEVENT_READ, FuchsiaCitySign
 	bg_event 5, 29, BGEVENT_READ, FuchsiaGymSign
 	bg_event 25, 15, BGEVENT_READ, SafariZoneOfficeSign
@@ -156,8 +150,7 @@ FuchsiaCity_MapEvents:
 	bg_event 20, 27, BGEVENT_READ, FuchsiaCityPokecenterSign
 	bg_event 6, 13, BGEVENT_READ, FuchsiaCityMartSign
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 23, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1
 	object_event 13, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1
 	object_event 16, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1
diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm
index f701f1246..4a1d1ffe8 100644
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -7,11 +7,9 @@ const_value set 2
 	const FUCHSIAGYM_GYM_GUY
 
 FuchsiaGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 FuchsiaGymJanineScript:
 	checkflag ENGINE_SOULBADGE
@@ -381,24 +379,19 @@ FuchsiaGymGuyWinText:
 	done
 
 FuchsiaGym_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 17, 3, FUCHSIA_CITY
 	warp_event 5, 17, 3, FUCHSIA_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 3, 15, BGEVENT_READ, FuchsiaGymStatue
 	bg_event 6, 15, BGEVENT_READ, FuchsiaGymStatue
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 1, 10, SPRITE_JANINE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1
 	object_event 5, 7, SPRITE_FUCHSIA_GYM_1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassAliceScript, -1
 	object_event 5, 11, SPRITE_FUCHSIA_GYM_2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassLindaScript, -1
diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm
index a0a4d7345..cfc7eb659 100644
--- a/maps/FuchsiaMart.asm
+++ b/maps/FuchsiaMart.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const FUCHSIAMART_COOLTRAINER_F
 
 FuchsiaMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ClerkScript_0x195ce8:
 	opentext
@@ -38,22 +36,17 @@ FuchsiaMartCooltrainerFText:
 	done
 
 FuchsiaMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 1, FUCHSIA_CITY
 	warp_event 3, 7, 1, FUCHSIA_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1
 	object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1
 	object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1
diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm
index 12e7823c5..829fab00d 100644
--- a/maps/FuchsiaPokecenter1F.asm
+++ b/maps/FuchsiaPokecenter1F.asm
@@ -5,12 +5,10 @@ const_value set 2
 	const FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR
 
 FuchsiaPokecenter1F_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -89,23 +87,18 @@ UnknownText_0x19654e:
 	done
 
 FuchsiaPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 5, FUCHSIA_CITY
 	warp_event 4, 7, 5, FUCHSIA_CITY
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NurseScript_0x196459, -1
 	object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1
 	object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1
diff --git a/maps/FuchsiaPokecenter2FBeta.asm b/maps/FuchsiaPokecenter2FBeta.asm
index eae7a73c3..f37dd7e0a 100644
--- a/maps/FuchsiaPokecenter2FBeta.asm
+++ b/maps/FuchsiaPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
 FuchsiaPokecenter2FBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 FuchsiaPokecenter2FBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 0, 7, 3, FUCHSIA_POKECENTER_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm
index 992f0af5c..0c681f60b 100644
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const GOLDENRODBIKESHOP_CLERK
 
 GoldenrodBikeShop_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 UnknownScript_0x5474f:
 	end
@@ -103,19 +101,15 @@ UnknownText_0x548ed:
 	done
 
 GoldenrodBikeShop_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 2, GOLDENROD_CITY
 	warp_event 3, 7, 2, GOLDENROD_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 9
+	db 9 ; bg events
 	bg_event 1, 2, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
 	bg_event 0, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
 	bg_event 1, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
@@ -126,6 +120,5 @@ GoldenrodBikeShop_MapEvents:
 	bg_event 6, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
 	bg_event 7, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 7, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x54750, -1
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 021158697..045dd05bc 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -16,11 +16,9 @@ const_value set 2
 	const GOLDENRODCITY_POKEFAN_M2
 
 GoldenrodCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 2
+	db 2 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPointAndFloria
 	callback MAPCALLBACK_OBJECTS, .MoveTutor
 
@@ -552,11 +550,9 @@ UnknownText_0x1991cf:
 	done
 
 GoldenrodCity_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 15
+	db 15 ; warp events
 	warp_event 24, 7, 1, GOLDENROD_GYM
 	warp_event 29, 29, 1, GOLDENROD_BIKE_SHOP
 	warp_event 31, 21, 1, GOLDENROD_HAPPINESS_RATER
@@ -573,11 +569,9 @@ GoldenrodCity_MapEvents:
 	warp_event 11, 29, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
 	warp_event 15, 27, 1, GOLDENROD_POKECENTER_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 12
+	db 12 ; bg events
 	bg_event 10, 14, BGEVENT_READ, GoldenrodCityStationSign
 	bg_event 4, 17, BGEVENT_READ, GoldenrodCityRadioTowerSign
 	bg_event 26, 27, BGEVENT_READ, GoldenrodDeptStoreSign
@@ -591,8 +585,7 @@ GoldenrodCity_MapEvents:
 	bg_event 16, 27, BGEVENT_UP, GoldenrodCityPokecenterSign
 	bg_event 30, 6, BGEVENT_READ, GoldenrodCityFlowerShopSign
 
-.ObjectEvents:
-	db 15
+	db 15 ; object events
 	object_event 7, 18, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS
 	object_event 30, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster1Script, EVENT_GOLDENROD_CITY_CIVILIANS
 	object_event 12, 16, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS
diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm
index d8a77c7c0..88aebfdd1 100644
--- a/maps/GoldenrodDeptStore1F.asm
+++ b/maps/GoldenrodDeptStore1F.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const GOLDENRODDEPTSTORE1F_GENTLEMAN
 
 GoldenrodDeptStore1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 GoldenrodDeptStore1FReceptionistScript:
 	jumptextfaceplayer GoldenrodDeptStore1FReceptionistText
@@ -79,26 +77,21 @@ GoldenrodDeptStore1FDirectoryText:
 	done
 
 GoldenrodDeptStore1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 7, 7, 9, GOLDENROD_CITY
 	warp_event 8, 7, 9, GOLDENROD_CITY
 	warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_2F
 	warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore1FDirectory
 	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore1FElevatorButton
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1
 	object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1
 	object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1
diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm
index 1fbe2dce1..bb2090eb9 100644
--- a/maps/GoldenrodDeptStore2F.asm
+++ b/maps/GoldenrodDeptStore2F.asm
@@ -6,11 +6,9 @@ const_value set 2
 	const GOLDENRODDEPTSTORE2F_GENTLEMAN
 
 GoldenrodDeptStore2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ClerkScript_0x55b5d:
 	faceplayer
@@ -101,25 +99,20 @@ GoldenrodDeptStore2FDirectoryText:
 	done
 
 GoldenrodDeptStore2F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_3F
 	warp_event 15, 0, 3, GOLDENROD_DEPT_STORE_1F
 	warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore2FDirectory
 	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore2FElevatorButton
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1
 	object_event 13, 6, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1
 	object_event 9, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1
diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm
index 495434787..5ddfe04c7 100644
--- a/maps/GoldenrodDeptStore3F.asm
+++ b/maps/GoldenrodDeptStore3F.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const GOLDENRODDEPTSTORE3F_ROCKER
 
 GoldenrodDeptStore3F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ClerkScript_0x55db8:
 	faceplayer
@@ -57,25 +55,20 @@ GoldenrodDeptStore3FDirectoryText:
 	done
 
 GoldenrodDeptStore3F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_2F
 	warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_4F
 	warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore3FDirectory
 	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore3FElevatorButton
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 6, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1
 	object_event 12, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1
 	object_event 2, 5, SPRITE_ROCKER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1
diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm
index f7e1cbc52..426996978 100644
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const GOLDENRODDEPTSTORE4F_GAMEBOY_KID
 
 GoldenrodDeptStore4F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ClerkScript_0x55ee9:
 	faceplayer
@@ -78,25 +76,20 @@ GoldenrodDeptStore4FDirectoryText:
 	done
 
 GoldenrodDeptStore4F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_5F
 	warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_3F
 	warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore4FDirectory
 	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore4FElevatorButton
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1
 	object_event 11, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1
 	object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1
diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm
index 910035c39..6f2577f15 100644
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -7,11 +7,9 @@ const_value set 2
 	const GOLDENRODDEPTSTORE5F_RECEPTIONIST
 
 GoldenrodDeptStore5F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .CheckIfSunday
 
 .CheckIfSunday:
@@ -218,25 +216,20 @@ GoldenrodDeptStore5FDirectoryText:
 	done
 
 GoldenrodDeptStore5F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_4F
 	warp_event 15, 0, 1, GOLDENROD_DEPT_STORE_6F
 	warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore5FDirectory
 	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore5FElevatorButton
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1
 	object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1
 	object_event 6, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Mike, -1
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index 315428b9f..295f5b6ea 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const GOLDENRODDEPTSTORE6F_SUPER_NERD
 
 GoldenrodDeptStore6F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 GoldenrodVendingMachine:
 	opentext
@@ -148,20 +146,16 @@ GoldenrodDeptStore6FDirectoryText:
 	done
 
 GoldenrodDeptStore6F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_5F
 	warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
 	warp_event 13, 0, 1, GOLDENROD_DEPT_STORE_ROOF
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 6
+	db 6 ; bg events
 	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore6FDirectory
 	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore6FElevatorButton
 	bg_event 8, 1, BGEVENT_UP, GoldenrodVendingMachine
@@ -169,7 +163,6 @@ GoldenrodDeptStore6F_MapEvents:
 	bg_event 10, 1, BGEVENT_UP, GoldenrodVendingMachine
 	bg_event 11, 1, BGEVENT_UP, GoldenrodVendingMachine
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 10, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FLassScript, -1
 	object_event 8, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FSuperNerdScript, -1
diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm
index 86a603fd1..098aad19b 100644
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -9,11 +9,9 @@ const_value set 2
 	const GOLDENRODDEPTSTOREB1F_MACHOP
 
 GoldenrodDeptStoreB1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 2
+	db 2 ; callbacks
 	callback MAPCALLBACK_TILES, UnknownScript_0x7d781
 	callback MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac
 
@@ -110,23 +108,18 @@ UnknownText_0x7d8bb:
 	done
 
 GoldenrodDeptStoreB1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 17, 2, 3, GOLDENROD_UNDERGROUND_WAREHOUSE
 	warp_event 9, 4, 1, GOLDENROD_DEPT_STORE_ELEVATOR
 	warp_event 10, 4, 2, GOLDENROD_DEPT_STORE_ELEVATOR
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 8
+	db 8 ; object events
 	object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER
 	object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN
 	object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL
diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm
index 60ba72ff2..f76c43b62 100644
--- a/maps/GoldenrodDeptStoreElevator.asm
+++ b/maps/GoldenrodDeptStoreElevator.asm
@@ -1,9 +1,7 @@
 GoldenrodDeptStoreElevator_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 MapGoldenrodDeptStoreElevatorSignpost0Script:
 	opentext
@@ -55,20 +53,15 @@ Elevator_0x566e0:
 	db -1 ; end
 
 GoldenrodDeptStoreElevator_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 1, 3, -1, GOLDENROD_DEPT_STORE_1F
 	warp_event 2, 3, -1, GOLDENROD_DEPT_STORE_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 3, 0, BGEVENT_READ, MapGoldenrodDeptStoreElevatorSignpost0Script
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm
index 739598b15..d83f760cb 100644
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -9,11 +9,9 @@ const_value set 2
 	const GOLDENRODDEPTSTOREROOF_BUG_CATCHER
 
 GoldenrodDeptStoreRoof_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 2
+	db 2 ; callbacks
 	callback MAPCALLBACK_TILES, .CheckSaleChangeBlock
 	callback MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk
 
@@ -212,25 +210,20 @@ PokeDollVendingMachineText:
 	done
 
 GoldenrodDeptStoreRoof_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 13, 1, 3, GOLDENROD_DEPT_STORE_6F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 4
+	db 4 ; bg events
 	bg_event 15, 3, BGEVENT_RIGHT, Binoculars1
 	bg_event 15, 5, BGEVENT_RIGHT, Binoculars2
 	bg_event 15, 6, BGEVENT_RIGHT, Binoculars3
 	bg_event 3, 0, BGEVENT_UP, PokeDollVendingMachine
 
-.ObjectEvents:
-	db 8
+	db 8 ; object events
 	object_event 1, 4, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF
 	object_event 10, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1
 	object_event 2, 1, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x56749, -1
diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm
index e398a0138..c80183bb0 100644
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const GOLDENRODFLOWERSHOP_FLORIA
 
 GoldenrodFlowerShop_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 FlowerShopTeacherScript:
 	checkevent EVENT_FOUGHT_SUDOWOODO
@@ -160,21 +158,16 @@ UnknownText_0x55604:
 	done
 
 GoldenrodFlowerShop_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 6, GOLDENROD_CITY
 	warp_event 3, 7, 6, GOLDENROD_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FlowerShopTeacherScript, -1
 	object_event 5, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index 43af60d36..a83ce3e96 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -13,11 +13,9 @@ const_value set 2
 	const GOLDENRODGAMECORNER_POKEFAN_M3
 
 GoldenrodGameCorner_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .Callback
 
 .Callback:
@@ -437,19 +435,15 @@ GoldenrodGameCornerLeftTheirDrinkText:
 	done
 
 GoldenrodGameCorner_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 13, 10, GOLDENROD_CITY
 	warp_event 3, 13, 10, GOLDENROD_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 31
+	db 31 ; bg events
 	bg_event 6, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
 	bg_event 6, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
 	bg_event 6, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
@@ -482,8 +476,7 @@ GoldenrodGameCorner_MapEvents:
 	bg_event 18, 11, BGEVENT_RIGHT, GoldenrodGameCornerCardFlipMachineScript
 	bg_event 12, 1, BGEVENT_LEFT, GoldenrodGameCornerLeftTheirDrinkScript
 
-.ObjectEvents:
-	db 12
+	db 12 ; object events
 	object_event 3, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1
 	object_event 16, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1
 	object_event 18, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
index d61dd4ea0..ccfac2120 100644
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -7,13 +7,11 @@ const_value set 2
 	const GOLDENRODGYM_GYM_GUY
 
 GoldenrodGym_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -380,25 +378,20 @@ GoldenrodGymGuyWinText:
 	done
 
 GoldenrodGym_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 17, 1, GOLDENROD_CITY
 	warp_event 3, 17, 1, GOLDENROD_CITY
 
-.CoordEvents:
-	db 1
+	db 1 ; coord events
 	coord_event 8, 5, 1, WhitneyCriesScript
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 1, 15, BGEVENT_READ, GoldenrodGymStatue
 	bg_event 4, 15, BGEVENT_READ, GoldenrodGymStatue
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 8, 3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1
 	object_event 9, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1
 	object_event 9, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1
diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm
index 9b9334f9e..aa8bbd9f4 100644
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const GOLDENRODHAPPINESSRATER_TWIN
 
 GoldenrodHappinessRater_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TeacherScript_0x54953:
 	faceplayer
@@ -137,25 +135,20 @@ GoldenrodHappinessRaterTwinText:
 	done
 
 GoldenrodHappinessRater_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 3, GOLDENROD_CITY
 	warp_event 3, 7, 3, GOLDENROD_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 0, 1, BGEVENT_READ, HappinessRatersHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, HappinessRatersHouseBookshelf
 	bg_event 7, 1, BGEVENT_READ, HappinessRatersHouseRadio
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x54953, -1
 	object_event 5, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1
 	object_event 5, 6, SPRITE_TWIN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1
diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm
index aec9dcd3c..a3117a355 100644
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -3,12 +3,10 @@ const_value set 2
 	const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN
 
 GoldenrodMagnetTrainStation_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -165,24 +163,19 @@ GoldenrodMagnetTrainStationGentlemanText:
 	done
 
 GoldenrodMagnetTrainStation_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 8, 17, 5, GOLDENROD_CITY
 	warp_event 9, 17, 5, GOLDENROD_CITY
 	warp_event 6, 5, 4, SAFFRON_MAGNET_TRAIN_STATION
 	warp_event 11, 5, 3, SAFFRON_MAGNET_TRAIN_STATION
 
-.CoordEvents:
-	db 1
+	db 1 ; coord events
 	coord_event 11, 6, 0, Script_ArriveFromSaffron
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x550ec, -1
 	object_event 11, 14, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationGentlemanScript, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm
index 892c00984..d807b7e3e 100644
--- a/maps/GoldenrodNameRater.asm
+++ b/maps/GoldenrodNameRater.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const GOLDENRODNAMERATER_NAME_RATER
 
 GoldenrodNameRater_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 GoldenrodNameRater:
 	faceplayer
@@ -25,23 +23,18 @@ GoldenrodNameRaterRadio:
 INCLUDE "data/text/unused_sweet_honey.asm"
 
 GoldenrodNameRater_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 8, GOLDENROD_CITY
 	warp_event 3, 7, 8, GOLDENROD_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 0, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf
 	bg_event 1, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf
 	bg_event 7, 1, BGEVENT_READ, GoldenrodNameRaterRadio
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodNameRater, -1
diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm
index b9d9fc949..da2965def 100644
--- a/maps/GoldenrodPPSpeechHouse.asm
+++ b/maps/GoldenrodPPSpeechHouse.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const GOLDENRODPPSPEECHHOUSE_LASS
 
 GoldenrodPPSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 GoldenrodPPSpeechHouseFisherScript:
 	jumptextfaceplayer GoldenrodPPSpeechHouseFisherText
@@ -52,24 +50,19 @@ GoldenrodPPSpeechHouseLassText:
 	done
 
 GoldenrodPPSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 7, GOLDENROD_CITY
 	warp_event 3, 7, 7, GOLDENROD_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 0, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf1
 	bg_event 1, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf2
 	bg_event 7, 1, BGEVENT_READ, GoldenrodPPSpeechHouseRadio
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1
 	object_event 5, 3, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1
diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm
index cd4149c31..3765181b2 100644
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -6,11 +6,9 @@ const_value set 2
 	const GOLDENRODPOKECENTER1F_POKEFAN_F
 
 GoldenrodPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 NurseScript_0x60f91:
 	jumpstd pokecenternurse
@@ -805,26 +803,21 @@ UnknownText_0x62549:
 	done
 
 GoldenrodPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 3, 7, 15, GOLDENROD_CITY
 	warp_event 4, 7, 15, GOLDENROD_CITY
 	warp_event 0, 6, 1, POKECOM_CENTER_ADMIN_ROOM_MOBILE
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 3, 7, 0, GoldenrodPokecenter1F_GSBallSceneLeft
 	coord_event 4, 7, 0, GoldenrodPokecenter1F_GSBallSceneRight
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x60f91, -1
 	object_event 16, 8, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
 	object_event 6, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1
diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm
index cac603e87..c55463286 100644
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -10,11 +10,9 @@ const_value set 2
 	const GOLDENRODUNDERGROUND_GRANNY
 
 GoldenrodUnderground_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 3
+	db 3 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .ResetSwitches
 	callback MAPCALLBACK_TILES, .CheckBasementKey
 	callback MAPCALLBACK_OBJECTS, .CheckDayOfWeek
@@ -647,11 +645,9 @@ UnknownText_0x7c91a:
 	done
 
 GoldenrodUnderground_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 6
+	db 6 ; warp events
 	warp_event 3, 2, 7, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
 	warp_event 3, 34, 4, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
 	warp_event 18, 6, 4, GOLDENROD_UNDERGROUND
@@ -659,19 +655,16 @@ GoldenrodUnderground_MapEvents:
 	warp_event 22, 31, 3, GOLDENROD_UNDERGROUND
 	warp_event 22, 27, 1, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 5
+	db 5 ; bg events
 	bg_event 18, 6, BGEVENT_READ, BasementDoorScript
 	bg_event 19, 6, BGEVENT_READ, MapGoldenrodUndergroundSignpost1Script
 	bg_event 6, 13, BGEVENT_ITEM, GoldenrodUndergroundHiddenParlyzHeal
 	bg_event 4, 18, BGEVENT_ITEM, GoldenrodUndergroundHiddenSuperPotion
 	bg_event 17, 8, BGEVENT_ITEM, GoldenrodUndergroundHiddenAntidote
 
-.ObjectEvents:
-	db 9
+	db 9 ; object events
 	object_event 5, 31, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdEric, -1
 	object_event 6, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1
 	object_event 3, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index 3fab6e657..6e66d3ef0 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -45,13 +45,11 @@ const_value set 2
 	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
 
 GoldenrodUndergroundSwitchRoomEntrances_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .UpdateDoorPositions
 
 .DummyScene0:
@@ -931,11 +929,9 @@ SwitchRoomText_Emergency:
 	done
 
 GoldenrodUndergroundSwitchRoomEntrances_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 9
+	db 9 ; warp events
 	warp_event 23, 3, 6, GOLDENROD_UNDERGROUND
 	warp_event 22, 10, 1, GOLDENROD_UNDERGROUND_WAREHOUSE
 	warp_event 23, 10, 2, GOLDENROD_UNDERGROUND_WAREHOUSE
@@ -946,13 +942,11 @@ GoldenrodUndergroundSwitchRoomEntrances_MapEvents:
 	warp_event 20, 29, 13, GOLDENROD_CITY
 	warp_event 21, 29, 13, GOLDENROD_CITY
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 19, 4, 0, UndergroundSilverScene1
 	coord_event 19, 5, 0, UndergroundSilverScene2
 
-.BGEvents:
-	db 6
+	db 6 ; bg events
 	bg_event 16, 1, BGEVENT_READ, Switch1Script
 	bg_event 10, 1, BGEVENT_READ, Switch2Script
 	bg_event 2, 1, BGEVENT_READ, Switch3Script
@@ -960,8 +954,7 @@ GoldenrodUndergroundSwitchRoomEntrances_MapEvents:
 	bg_event 8, 9, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion
 	bg_event 1, 8, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive
 
-.ObjectEvents:
-	db 11
+	db 11 ; object events
 	object_event 9, 12, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event 4, 8, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event 17, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm
index 941a3e622..f64085b73 100644
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -8,11 +8,9 @@ const_value set 2
 	const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL3
 
 GoldenrodUndergroundWarehouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .ResetSwitches
 
 .ResetSwitches:
@@ -211,23 +209,18 @@ UnknownText_0x7dc8d:
 	done
 
 GoldenrodUndergroundWarehouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 2, 12, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
 	warp_event 3, 12, 3, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
 	warp_event 17, 2, 1, GOLDENROD_DEPT_STORE_B1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 7
+	db 7 ; object events
 	object_event 9, 8, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event 14, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm
index 9b52fcbc6..42382ec94 100644
--- a/maps/GuideGentsHouse.asm
+++ b/maps/GuideGentsHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const GUIDEGENTSHOUSE_GRAMPS
 
 GuideGentsHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 GuideGentsHouseGuideGent:
 	jumptextfaceplayer GuideGentsHouseGuideGentText
@@ -28,22 +26,17 @@ GuideGentsHouseGuideGentText:
 	done
 
 GuideGentsHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 4, CHERRYGROVE_CITY
 	warp_event 3, 7, 4, CHERRYGROVE_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, GuideGentsHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, GuideGentsHouseBookshelf
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index 537391ce5..571a5a964 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -2,13 +2,11 @@ const_value set 2
 	const HALLOFFAME_LANCE
 
 HallOfFame_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .EnterHallOfFame
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .EnterHallOfFame:
 	priorityjump .EnterHallOfFameScript
@@ -111,20 +109,15 @@ HallOfFame_LanceText:
 	done
 
 HallOfFame_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 13, 3, LANCES_ROOM
 	warp_event 5, 13, 4, LANCES_ROOM
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 4, 12, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm
index d9c5a255b..5f109a654 100644
--- a/maps/IcePath1F.asm
+++ b/maps/IcePath1F.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const ICEPATH1F_POKE_BALL3
 
 IcePath1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 IcePath1FHMWaterfall:
 	itemball HM_WATERFALL
@@ -20,24 +18,19 @@ IcePath1FProtein:
 	itemball PROTEIN
 
 IcePath1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 4, 19, 1, ROUTE_44
 	warp_event 36, 27, 7, BLACKTHORN_CITY
 	warp_event 37, 5, 1, ICE_PATH_B1F
 	warp_event 37, 13, 7, ICE_PATH_B1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 31, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL
 	object_event 32, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP
 	object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN
diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm
index aa98d905c..417e71a7f 100644
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -6,11 +6,9 @@ const_value set 2
 	const ICEPATHB1F_POKE_BALL
 
 IcePathB1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable
 
 .SetUpStoneTable:
@@ -76,11 +74,9 @@ IcePathBoulderFellThroughText:
 	done
 
 IcePathB1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 8
+	db 8 ; warp events
 	warp_event 3, 15, 3, ICE_PATH_1F
 	warp_event 17, 3, 1, ICE_PATH_B2F_MAHOGANY_SIDE
 	warp_event 11, 2, 3, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
@@ -90,15 +86,12 @@ IcePathB1F_MapEvents:
 	warp_event 5, 25, 4, ICE_PATH_1F
 	warp_event 11, 27, 1, ICE_PATH_B2F_BLACKTHORN_SIDE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 17, 30, BGEVENT_ITEM, IcePathB1FHiddenMaxPotion
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 11, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1
 	object_event 7, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2
 	object_event 8, 9, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3
diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm
index 57aa9a061..286348a55 100644
--- a/maps/IcePathB2FBlackthornSide.asm
+++ b/maps/IcePathB2FBlackthornSide.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL
 
 IcePathB2FBlackthornSide_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 IcePathB2FBlackthornSideTMRest:
 	itemball TM_REST
@@ -15,21 +13,16 @@ IcePathB2FBlackthornSideHiddenIceHeal:
 	hiddenitem ICE_HEAL, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL
 
 IcePathB2FBlackthornSide_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 3, 15, 8, ICE_PATH_B1F
 	warp_event 3, 3, 2, ICE_PATH_B3F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 2, 10, BGEVENT_ITEM, IcePathB2FBlackthornSideHiddenIceHeal
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST
diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm
index 4c98193e9..f4cc310fa 100644
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -7,11 +7,9 @@ const_value set 2
 	const ICEPATHB2FMAHOGANYSIDE_POKE_BALL2
 
 IcePathB2FMahoganySide_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 IcePathB2FMahoganySideBoulder:
 	jumptext IcePathB2FMahoganySideBoulderText
@@ -31,11 +29,9 @@ IcePathB2FMahoganySideBoulderText:
 	done
 
 IcePathB2FMahoganySide_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 6
+	db 6 ; warp events
 	warp_event 17, 1, 2, ICE_PATH_B1F
 	warp_event 9, 11, 1, ICE_PATH_B3F
 	warp_event 11, 4, 3, ICE_PATH_B1F
@@ -43,15 +39,12 @@ IcePathB2FMahoganySide_MapEvents:
 	warp_event 4, 12, 5, ICE_PATH_B1F
 	warp_event 12, 12, 6, ICE_PATH_B1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 0, 17, BGEVENT_ITEM, IcePathB2FMahoganySideHiddenCarbos
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_1A
 	object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_2A
 	object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_3A
diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm
index 0c0849493..99e96fba6 100644
--- a/maps/IcePathB3F.asm
+++ b/maps/IcePathB3F.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const ICEPATHB3F_ROCK
 
 IcePathB3F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 IcePathB3FNevermeltice:
 	itemball NEVERMELTICE
@@ -16,21 +14,16 @@ IcePathB3FRock:
 	jumpstd smashrock
 
 IcePathB3F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 3, 5, 2, ICE_PATH_B2F_MAHOGANY_SIDE
 	warp_event 15, 5, 2, ICE_PATH_B2F_BLACKTHORN_SIDE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 5, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE
 	object_event 6, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index 54b350edf..37460e549 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -12,11 +12,9 @@ const_value set 2
 	const ILEXFOREST_POKE_BALL4
 
 IlexForest_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .FarfetchdCallback
 
 .FarfetchdCallback:
@@ -938,28 +936,23 @@ BugCatcherWayneAfterBattleText:
 	done
 
 IlexForest_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 1, 5, 3, ROUTE_34_ILEX_FOREST_GATE
 	warp_event 3, 42, 1, ILEX_FOREST_AZALEA_GATE
 	warp_event 3, 43, 2, ILEX_FOREST_AZALEA_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 5
+	db 5 ; bg events
 	bg_event 3, 17, BGEVENT_READ, MapIlexForestSignpost0Script
 	bg_event 11, 7, BGEVENT_ITEM, IlexForestHiddenEther
 	bg_event 22, 14, BGEVENT_ITEM, IlexForestHiddenSuperPotion
 	bg_event 1, 17, BGEVENT_ITEM, IlexForestHiddenFullHeal
 	bg_event 8, 22, BGEVENT_UP, MapIlexForestSignpost4Script
 
-.ObjectEvents:
-	db 11
+	db 11 ; object events
 	object_event 14, 31, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestFarfetchdScript, EVENT_ILEX_FOREST_FARFETCHD
 	object_event 7, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE
 	object_event 5, 28, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER
diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm
index cc3df33af..8f64f2794 100644
--- a/maps/IlexForestAzaleaGate.asm
+++ b/maps/IlexForestAzaleaGate.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const ILEXFORESTAZALEAGATE_GRANNY
 
 IlexForestAzaleaGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 IlexForestAzaleaGateOfficerScript:
 	jumptextfaceplayer IlexForestAzaleaGateOfficerText
@@ -31,23 +29,18 @@ IlexForestAzaleaGateGrannyText:
 	done
 
 IlexForestAzaleaGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 0, 4, 2, ILEX_FOREST
 	warp_event 0, 5, 3, ILEX_FOREST
 	warp_event 9, 4, 7, AZALEA_TOWN
 	warp_event 9, 5, 8, AZALEA_TOWN
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1
 	object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1
diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm
index 15ff9354d..702f9692b 100644
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -7,12 +7,10 @@ const_value set 2
 	const INDIGOPLATEAUPOKECENTER1F_ABRA
 
 IndigoPlateauPokecenter1F_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .PrepareElite4
 
 .DummyScene:
@@ -303,26 +301,21 @@ AbraText:
 	done
 
 IndigoPlateauPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 5, 13, 1, ROUTE_23
 	warp_event 6, 13, 2, ROUTE_23
 	warp_event 0, 13, 1, POKECENTER_2F
 	warp_event 14, 3, 1, WILLS_ROOM
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 16, 4, 0, PlateauRivalBattle1
 	coord_event 17, 4, 0, PlateauRivalBattle2
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 3, 7, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18012c, -1
 	object_event 11, 7, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1
 	object_event 11, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FCooltrainerMScript, -1
diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
index 22dc3d3f7..3b9ff0d3a 100644
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -2,13 +2,11 @@ const_value set 2
 	const KARENSROOM_KAREN
 
 KarensRoom_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .LockDoor
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .KarensRoomDoors
 
 .LockDoor:
@@ -133,22 +131,17 @@ KarenScript_KarenDefeatText:
 	done
 
 KarensRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 4, 17, 3, BRUNOS_ROOM
 	warp_event 5, 17, 4, BRUNOS_ROOM
 	warp_event 4, 2, 1, LANCES_ROOM
 	warp_event 5, 2, 2, LANCES_ROOM
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 5, 7, SPRITE_KAREN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KarenScript_Battle, -1
diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
index 60aeb4c31..9c88d1a2c 100644
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -2,13 +2,11 @@ const_value set 2
 	const KOGASROOM_KOGA
 
 KogasRoom_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .LockDoor
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .KogasRoomDoors
 
 .LockDoor:
@@ -130,22 +128,17 @@ KogaScript_KogaDefeatText:
 	done
 
 KogasRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 4, 17, 2, WILLS_ROOM
 	warp_event 5, 17, 3, WILLS_ROOM
 	warp_event 4, 2, 1, BRUNOS_ROOM
 	warp_event 5, 2, 2, BRUNOS_ROOM
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 5, 7, SPRITE_KOGA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, KogaScript_Battle, -1
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index dc503d33d..edb1ebe55 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -6,11 +6,9 @@ const_value set 2
 	const KURTSHOUSE_TWIN2
 
 KurtsHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .KurtCallback
 
 .KurtCallback:
@@ -677,19 +675,15 @@ KurtsHouseCelebiStatueText:
 	done
 
 KurtsHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 3, 7, 4, AZALEA_TOWN
 	warp_event 4, 7, 4, AZALEA_TOWN
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 7
+	db 7 ; bg events
 	bg_event 6, 1, BGEVENT_READ, KurtsHouseRadio
 	bg_event 8, 0, BGEVENT_READ, KurtsHouseOakPhoto
 	bg_event 9, 0, BGEVENT_READ, KurtsHouseOakPhoto
@@ -698,8 +692,7 @@ KurtsHouse_MapEvents:
 	bg_event 3, 1, BGEVENT_READ, KurtsHouseBookshelf
 	bg_event 4, 1, BGEVENT_READ, KurtsHouseCelebiStatue
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 3, 2, SPRITE_KURT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1
 	object_event 5, 3, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1
 	object_event 6, 3, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm
index 5f32609a0..ecfe02e59 100644
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -13,13 +13,11 @@ const_value set 2
 	const LAKEOFRAGE_POKE_BALL2
 
 LakeOfRage_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 2
+	db 2 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 	callback MAPCALLBACK_OBJECTS, .Wesley
 
@@ -494,27 +492,22 @@ UnknownText_0x70903:
 	done
 
 LakeOfRage_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 7, 3, 1, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE
 	warp_event 27, 31, 1, LAKE_OF_RAGE_MAGIKARP_HOUSE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 5
+	db 5 ; bg events
 	bg_event 21, 27, BGEVENT_READ, MapLakeOfRageSignpost0Script
 	bg_event 25, 31, BGEVENT_READ, MapLakeOfRageSignpost1Script
 	bg_event 11, 28, BGEVENT_ITEM, LakeOfRageHiddenFullRestore
 	bg_event 4, 4, BGEVENT_ITEM, LakeOfRageHiddenRareCandy
 	bg_event 35, 5, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion
 
-.ObjectEvents:
-	db 12
+	db 12 ; object events
 	object_event 21, 28, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE
 	object_event 20, 26, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7008e, -1
 	object_event 36, 13, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageSuperNerdScript, -1
diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm
index 0b928d0bd..4fa55dd54 100644
--- a/maps/LakeOfRageHiddenPowerHouse.asm
+++ b/maps/LakeOfRageHiddenPowerHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER
 
 LakeOfRageHiddenPowerHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 HiddenPowerGuy:
 	faceplayer
@@ -68,22 +66,17 @@ HiddenPowerGuyText3:
 	done
 
 LakeOfRageHiddenPowerHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 1, LAKE_OF_RAGE
 	warp_event 3, 7, 1, LAKE_OF_RAGE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, HiddenPowerHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, HiddenPowerHouseBookshelf
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, HiddenPowerGuy, -1
diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm
index 81844712e..c5e05a423 100644
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU
 
 LakeOfRageMagikarpHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 FishingGuruScript_0x19a6ae:
 	faceplayer
@@ -207,22 +205,17 @@ UnknownText_0x19aabc:
 	db "@@"
 
 LakeOfRageMagikarpHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 2, LAKE_OF_RAGE
 	warp_event 3, 7, 2, LAKE_OF_RAGE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, MagikarpHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, MagikarpHouseBookshelf
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x19a6ae, -1
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index 2a6f94705..657a45942 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -4,13 +4,11 @@ const_value set 2
 	const LANCESROOM_OAK
 
 LancesRoom_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .LockDoor
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .LancesRoomDoors
 
 .LockDoor:
@@ -338,26 +336,21 @@ UnknownText_0x1813c5:
 	done
 
 LancesRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 4, 23, 3, KARENS_ROOM
 	warp_event 5, 23, 4, KARENS_ROOM
 	warp_event 4, 1, 1, HALL_OF_FAME
 	warp_event 5, 1, 2, HALL_OF_FAME
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 4, 5, 1, Script_ApproachLanceFromLeft
 	coord_event 5, 5, 1, Script_ApproachLanceFromRight
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 5, 3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x180e7b, -1
 	object_event 4, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
 	object_event 4, 7, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm
index bc6083ca5..1b2a302e7 100644
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -6,11 +6,9 @@ const_value set 2
 	const LAVRADIOTOWER1F_SUPER_NERD2
 
 LavRadioTower1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 LavRadioTower1FReceptionistScript:
 	jumptextfaceplayer LavRadioTower1FReceptionistText
@@ -222,24 +220,19 @@ UnknownText_0x7f36b:
 	done
 
 LavRadioTower1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 7, LAVENDER_TOWN
 	warp_event 3, 7, 7, LAVENDER_TOWN
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 11, 0, BGEVENT_READ, MapLavRadioTower1FSignpost0Script
 	bg_event 5, 0, BGEVENT_READ, MapLavRadioTower1FSignpost1Script
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 6, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1
 	object_event 15, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1
 	object_event 1, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1
diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm
index 490183dfd..cdbb7e8cb 100644
--- a/maps/LavenderMart.asm
+++ b/maps/LavenderMart.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const LAVENDERMART_ROCKER
 
 LavenderMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ClerkScript_0x7eb1c:
 	opentext
@@ -48,22 +46,17 @@ LavenderMartRockerText:
 	done
 
 LavenderMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 5, LAVENDER_TOWN
 	warp_event 3, 7, 5, LAVENDER_TOWN
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1
 	object_event 6, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1
 	object_event 9, 2, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1
diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm
index 1157ba5b1..d0fe4aff5 100644
--- a/maps/LavenderNameRater.asm
+++ b/maps/LavenderNameRater.asm
@@ -2,12 +2,10 @@ const_value set 2
 	const LAVENDERNAMERATER_NAME_RATER
 
 LavenderNameRater_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -24,20 +22,15 @@ LavenderNameRaterUnusedBookshelf:
 	jumpstd difficultbookshelf
 
 LavenderNameRater_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 4, LAVENDER_TOWN
 	warp_event 3, 7, 4, LAVENDER_TOWN
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderNameRater, -1
diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm
index dbf084610..250d6e98f 100644
--- a/maps/LavenderPokecenter1F.asm
+++ b/maps/LavenderPokecenter1F.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const LAVENDERPOKECENTER1F_YOUNGSTER
 
 LavenderPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 NurseScript_0x7e6a0:
 	jumpstd pokecenternurse
@@ -81,23 +79,18 @@ UnknownText_0x7e7ed:
 	done
 
 LavenderPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 1, LAVENDER_TOWN
 	warp_event 4, 7, 1, LAVENDER_TOWN
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x7e6a0, -1
 	object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1
 	object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1
diff --git a/maps/LavenderPokecenter2FBeta.asm b/maps/LavenderPokecenter2FBeta.asm
index dc4dcd7b0..7f822b3f8 100644
--- a/maps/LavenderPokecenter2FBeta.asm
+++ b/maps/LavenderPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
 LavenderPokecenter2FBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 LavenderPokecenter2FBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 0, 7, 3, LAVENDER_POKECENTER_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm
index c15be5b24..d020861ac 100644
--- a/maps/LavenderSpeechHouse.asm
+++ b/maps/LavenderSpeechHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const LAVENDERSPEECHHOUSE_POKEFAN_F
 
 LavenderSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 LavenderSpeechHousePokefanFScript:
 	jumptextfaceplayer LavenderSpeechHousePokefanFText
@@ -29,22 +27,17 @@ LavenderSpeechHousePokefanFText:
 	done
 
 LavenderSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 3, LAVENDER_TOWN
 	warp_event 3, 7, 3, LAVENDER_TOWN
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderSpeechHousePokefanFScript, -1
diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm
index 4a2b02ff1..94075b2c2 100644
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const LAVENDERTOWN_YOUNGSTER
 
 LavenderTown_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -106,11 +104,9 @@ SoulHouseSignText:
 	done
 
 LavenderTown_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 7
+	db 7 ; warp events
 	warp_event 5, 5, 1, LAVENDER_POKECENTER_1F
 	warp_event 5, 9, 1, MR_FUJIS_HOUSE
 	warp_event 3, 13, 1, LAVENDER_SPEECH_HOUSE
@@ -119,11 +115,9 @@ LavenderTown_MapEvents:
 	warp_event 13, 11, 1, SOUL_HOUSE
 	warp_event 14, 5, 1, LAV_RADIO_TOWER_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 6
+	db 6 ; bg events
 	bg_event 11, 3, BGEVENT_READ, LavenderTownSign
 	bg_event 15, 7, BGEVENT_READ, KantoRadioStationSign
 	bg_event 3, 9, BGEVENT_READ, VolunteerPokemonHouseSign
@@ -131,8 +125,7 @@ LavenderTown_MapEvents:
 	bg_event 6, 5, BGEVENT_READ, LavenderPokecenterSignText
 	bg_event 2, 5, BGEVENT_READ, LavenderMartSignText
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 12, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1
 	object_event 2, 15, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1
 	object_event 14, 12, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderTownGrampsScript, -1
diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm
index ff82357ee..860e54c1c 100644
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -8,11 +8,9 @@ const_value set 2
 	const MAHOGANYGYM_GYM_GUY
 
 MahoganyGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 PryceScript_0x199a9e:
 	faceplayer
@@ -373,24 +371,19 @@ MahoganyGymGuyWinText:
 	done
 
 MahoganyGym_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 17, 3, MAHOGANY_TOWN
 	warp_event 5, 17, 3, MAHOGANY_TOWN
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 3, 15, BGEVENT_READ, MahoganyGymStatue
 	bg_event 6, 15, BGEVENT_READ, MahoganyGymStatue
 
-.ObjectEvents:
-	db 7
+	db 7 ; object events
 	object_event 5, 3, SPRITE_PRYCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PryceScript_0x199a9e, -1
 	object_event 4, 6, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1
 	object_event 0, 17, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index 44aa8dd39..09748c48e 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -6,13 +6,11 @@ const_value set 2
 	const MAHOGANYMART1F_GRANNY
 
 MahoganyMart1F_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .LanceUncoversStaircase
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .MahoganyMart1FStaircase
 
 .DummyScene0:
@@ -221,23 +219,18 @@ UnknownText_0x6c5ba:
 	done
 
 MahoganyMart1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 1, MAHOGANY_TOWN
 	warp_event 4, 7, 1, MAHOGANY_TOWN
 	warp_event 7, 3, 1, TEAM_ROCKET_BASE_B1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION
 	object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION
 	object_event 4, 6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm
index 3f1181ce3..4a2a32f26 100644
--- a/maps/MahoganyPokecenter1F.asm
+++ b/maps/MahoganyPokecenter1F.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const MAHOGANYPOKECENTER1F_COOLTRAINER_F
 
 MahoganyPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 NurseScript_0x19a356:
 	jumpstd pokecenternurse
@@ -54,23 +52,18 @@ MahoganyPokecenter1FCooltrainerFText:
 	done
 
 MahoganyPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 4, MAHOGANY_TOWN
 	warp_event 4, 7, 4, MAHOGANY_TOWN
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19a356, -1
 	object_event 7, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1
 	object_event 1, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1
diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm
index 7da6b9a97..fd4734de7 100644
--- a/maps/MahoganyRedGyaradosSpeechHouse.asm
+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER
 
 MahoganyRedGyaradosSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 MahoganyRedGyaradosSpeechHouseBlackBeltScript:
 	jumptextfaceplayer MahoganyRedGyaradosSpeechHouseBlackBeltText
@@ -61,21 +59,16 @@ UnknownText_0x199a3d:
 	done
 
 MahoganyRedGyaradosSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 2, MAHOGANY_TOWN
 	warp_event 3, 7, 2, MAHOGANY_TOWN
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1
 	object_event 6, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x199982, -1
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index 88fd9b473..c33ec64ba 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -5,13 +5,11 @@ const_value set 2
 	const MAHOGANYTOWN_LASS
 
 MahoganyTown_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .DummyScene0:
@@ -245,31 +243,26 @@ MahoganyGymSignText:
 	done
 
 MahoganyTown_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 11, 7, 1, MAHOGANY_MART_1F
 	warp_event 17, 7, 1, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE
 	warp_event 6, 13, 1, MAHOGANY_GYM
 	warp_event 15, 13, 1, MAHOGANY_POKECENTER_1F
 	warp_event 9, 1, 3, ROUTE_43_MAHOGANY_GATE
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 19, 8, 0, UnknownScript_0x190013
 	coord_event 19, 9, 0, UnknownScript_0x190013
 
-.BGEvents:
-	db 4
+	db 4 ; bg events
 	bg_event 1, 5, BGEVENT_READ, MahoganyTownSign
 	bg_event 9, 7, BGEVENT_READ, MahoganyTownRagecandybarSign
 	bg_event 3, 13, BGEVENT_READ, MahoganyGymSign
 	bg_event 16, 13, BGEVENT_READ, MahoganyTownPokecenterSign
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 19, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
 	object_event 6, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1
 	object_event 6, 14, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm
index 36b5ace43..502aad783 100644
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const MANIASHOUSE_ROCKER
 
 ManiasHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ManiaScript:
 	faceplayer
@@ -200,20 +198,15 @@ ManiaText_ShuckleIsYourLastMon:
 	done
 
 ManiasHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 1, CIANWOOD_CITY
 	warp_event 3, 7, 1, CIANWOOD_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ManiaScript, -1
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index 499e443cd..65bf3a6ad 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -1,11 +1,9 @@
 MobileBattleRoom_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .InitializeMobileBattleRoom
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .InitializeMobileBattleRoom:
 	priorityjump .InitializeAndPreparePokecenter2F
@@ -67,20 +65,15 @@ MobileBattleRoom_HealText:
 	done
 
 MobileBattleRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 7, 6, POKECENTER_2F
 	warp_event 5, 7, 6, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 4, 2, BGEVENT_UP, MapMobileBattleRoomSignpost0Script
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm
index 00765a70b..31fd04201 100644
--- a/maps/MobileTradeRoomMobile.asm
+++ b/maps/MobileTradeRoomMobile.asm
@@ -1,11 +1,9 @@
 MobileTradeRoomMobile_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .InitializeMobileTradeRoomMobile
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .InitializeMobileTradeRoomMobile:
 	priorityjump .InitializeAndPreparePokecenter2F
@@ -35,20 +33,15 @@ MobileTradeRoomMobile_EstablishingCommsText:
 	done
 
 MobileTradeRoomMobile_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 7, 5, POKECENTER_2F
 	warp_event 5, 7, 5, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 4, 2, BGEVENT_UP, MapMobileTradeRoomMobileSignpost0Script
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index c263a047f..5b978bc0e 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -2,13 +2,11 @@ const_value set 2
 	const MOUNTMOON_SILVER
 
 MountMoon_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .RivalEncounter
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .RivalEncounter:
 	priorityjump .RivalBattle
@@ -161,11 +159,9 @@ MountMoonSilverTextLoss:
 	done
 
 MountMoon_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 8
+	db 8 ; warp events
 	warp_event 3, 3, 1, ROUTE_3
 	warp_event 15, 15, 1, ROUTE_4
 	warp_event 13, 3, 7, MOUNT_MOON
@@ -175,12 +171,9 @@ MountMoon_MapEvents:
 	warp_event 25, 3, 3, MOUNT_MOON
 	warp_event 25, 13, 4, MOUNT_MOON
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 7, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL
diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm
index aac063dbf..7188a7c00 100644
--- a/maps/MountMoonGiftShop.asm
+++ b/maps/MountMoonGiftShop.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const MOUNTMOONGIFTSHOP_LASS2 ; day only
 
 MountMoonGiftShop_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 MountMoonGiftShopClerkScript:
 	faceplayer
@@ -28,22 +26,17 @@ MountMoonGiftShopLassText:
 	done
 
 MountMoonGiftShop_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 3, 7, 3, MOUNT_MOON_SQUARE
 	warp_event 4, 7, 3, MOUNT_MOON_SQUARE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 4, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1
 	object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1
 	object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index e93cffe53..b12e7b391 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -4,12 +4,10 @@ const_value set 2
 	const MOUNTMOONSQUARE_ROCK
 
 MountMoonSquare_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 2
+	db 2 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .DisappearMoonStone
 	callback MAPCALLBACK_OBJECTS, .DisappearRock
 
@@ -133,26 +131,21 @@ DontLitterSignText:
 	done
 
 MountMoonSquare_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 20, 5, 5, MOUNT_MOON
 	warp_event 22, 11, 6, MOUNT_MOON
 	warp_event 13, 7, 1, MOUNT_MOON_GIFT_SHOP
 
-.CoordEvents:
-	db 1
+	db 1 ; coord events
 	coord_event 7, 11, 0, ClefairyDance
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone
 	bg_event 17, 7, BGEVENT_READ, DontLitterSign
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 6, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
 	object_event 7, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
 	object_event 7, 7, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK
diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm
index 756ee655c..fad3d4098 100644
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -11,11 +11,9 @@ const_value set 2
 	const MOUNTMORTAR1FINSIDE_POKE_BALL7
 
 MountMortar1FInside_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerPokemaniacMiller:
 	trainer POKEMANIAC, MILLER, EVENT_BEAT_POKEMANIAC_MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, .Script
@@ -117,11 +115,9 @@ SupernerdMarkusAfterBattleText:
 	done
 
 MountMortar1FInside_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 6
+	db 6 ; warp events
 	warp_event 11, 47, 5, MOUNT_MORTAR_1F_OUTSIDE
 	warp_event 29, 47, 6, MOUNT_MORTAR_1F_OUTSIDE
 	warp_event 5, 39, 8, MOUNT_MORTAR_1F_OUTSIDE
@@ -129,15 +125,12 @@ MountMortar1FInside_MapEvents:
 	warp_event 3, 19, 1, MOUNT_MORTAR_B1F
 	warp_event 9, 9, 2, MOUNT_MORTAR_2F_INSIDE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 30, 11, BGEVENT_ITEM, MountMortar1FInsideHiddenMaxRepel
 
-.ObjectEvents:
-	db 10
+	db 10 ; object events
 	object_event 21, 43, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortar1FBoulder, -1
 	object_event 35, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideEscapeRope, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE
 	object_event 16, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxRevive, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE
diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm
index b268e36e9..1656a7f41 100644
--- a/maps/MountMortar1FOutside.asm
+++ b/maps/MountMortar1FOutside.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const MOUNTMORTAR1FOUTSIDE_POKE_BALL2
 
 MountMortar1FOutside_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 MountMortar1FOutsideEther:
 	itemball ETHER
@@ -19,11 +17,9 @@ MountMortar1FOutsideHiddenHyperPotion:
 	hiddenitem HYPER_POTION, EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION
 
 MountMortar1FOutside_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 9
+	db 9 ; warp events
 	warp_event 3, 33, 3, ROUTE_42
 	warp_event 17, 33, 4, ROUTE_42
 	warp_event 37, 33, 5, ROUTE_42
@@ -34,14 +30,11 @@ MountMortar1FOutside_MapEvents:
 	warp_event 7, 13, 3, MOUNT_MORTAR_1F_INSIDE
 	warp_event 33, 13, 4, MOUNT_MORTAR_1F_INSIDE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 25, 22, BGEVENT_ITEM, MountMortar1FOutsideHiddenHyperPotion
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 13, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideEther, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER
 	object_event 31, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE
diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm
index 27cf26fce..2496eaa2c 100644
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -8,11 +8,9 @@ const_value set 2
 	const MOUNTMORTAR2FINSIDE_SUPER_NERD
 
 MountMortar2FInside_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerSupernerdHugh:
 	trainer SUPER_NERD, HUGH, EVENT_BEAT_SUPER_NERD_HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, .Script
@@ -67,23 +65,18 @@ SupernerdHughAfterBattleText:
 	done
 
 MountMortar2FInside_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 17, 33, 4, MOUNT_MORTAR_1F_OUTSIDE
 	warp_event 3, 5, 6, MOUNT_MORTAR_1F_INSIDE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 24, 8, BGEVENT_ITEM, MountMortar2FInsideHiddenFullRestore
 
-.ObjectEvents:
-	db 7
+	db 7 ; object events
 	object_event 28, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION
 	object_event 2, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY
 	object_event 19, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL
diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm
index eeba830da..47cea6826 100644
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -8,11 +8,9 @@ const_value set 2
 	const MOUNTMORTARB1F_POKE_BALL5
 
 MountMortarB1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 BlackBeltScript_0x7e1f6:
 	faceplayer
@@ -135,23 +133,18 @@ UnknownText_0x7e3df:
 	done
 
 MountMortarB1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 3, 3, 5, MOUNT_MORTAR_1F_INSIDE
 	warp_event 19, 29, 7, MOUNT_MORTAR_1F_OUTSIDE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 4, 6, BGEVENT_ITEM, MountMortarB1FHiddenMaxRevive
 
-.ObjectEvents:
-	db 7
+	db 7 ; object events
 	object_event 29, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
 	object_event 4, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS
 	object_event 9, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1
diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm
index f4ca702a2..743acf816 100644
--- a/maps/MoveDeletersHouse.asm
+++ b/maps/MoveDeletersHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const MOVEDELETERSHOUSE_SUPER_NERD
 
 MoveDeletersHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 MoveDeleter:
 	faceplayer
@@ -20,22 +18,17 @@ MoveDeletersHouseBookshelf:
 	jumpstd difficultbookshelf
 
 MoveDeletersHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 6, BLACKTHORN_CITY
 	warp_event 3, 7, 6, BLACKTHORN_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, MoveDeletersHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, MoveDeletersHouseBookshelf
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MoveDeleter, -1
diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm
index 42ea7c490..881487ff6 100644
--- a/maps/MrFujisHouse.asm
+++ b/maps/MrFujisHouse.asm
@@ -6,11 +6,9 @@ const_value set 2
 	const MRFUJISHOUSE_PIDGEY
 
 MrFujisHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 MrFujisHouseSuperNerdScript:
 	jumptextfaceplayer MrFujisHouseSuperNerdText
@@ -80,24 +78,19 @@ MrFujisPidgeyText:
 	done
 
 MrFujisHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 2, LAVENDER_TOWN
 	warp_event 3, 7, 2, LAVENDER_TOWN
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, MrFujisHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, MrFujisHouseBookshelf
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 4, 1, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrFujisHouseSuperNerdScript, -1
 	object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisHouseLassScript, -1
 	object_event 7, 4, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisPsyduck, -1
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index de537d8e2..4a4249cc5 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -3,13 +3,11 @@ const_value set 2
 	const MRPOKEMONSHOUSE_OAK
 
 MrPokemonsHouse_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .MeetMrPokemon
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .MeetMrPokemon:
 	priorityjump .MrPokemonEvent
@@ -373,26 +371,21 @@ MrPokemonsHouse_StrangeCoinsText:
 	done
 
 MrPokemonsHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 2, ROUTE_30
 	warp_event 3, 7, 2, ROUTE_30
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 5
+	db 5 ; bg events
 	bg_event 0, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script
 	bg_event 1, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script
 	bg_event 6, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script
 	bg_event 7, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script
 	bg_event 6, 4, BGEVENT_READ, MapMrPokemonsHouseSignpost4Script
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 3, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1
 	object_event 6, 5, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK
diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm
index 880df0727..b79c08b6e 100644
--- a/maps/MrPsychicsHouse.asm
+++ b/maps/MrPsychicsHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const MRPSYCHICSHOUSE_FISHING_GURU
 
 MrPsychicsHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 MrPsychic:
 	faceplayer
@@ -48,22 +46,17 @@ MrPsychicText2:
 	done
 
 MrPsychicsHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 5, SAFFRON_CITY
 	warp_event 3, 7, 5, SAFFRON_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, MrPsychicsHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, MrPsychicsHouseBookshelf
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrPsychic, -1
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index 4a1b81f8d..7ec334903 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -15,11 +15,9 @@ const_value set 2
 	const NATIONALPARK_POKE_BALL2
 
 NationalPark_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 NationalParkLassScript:
 	jumptextfaceplayer NationalParkLassText
@@ -514,28 +512,23 @@ UnknownText_0x5c7c6:
 	done
 
 NationalPark_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE
 	warp_event 33, 19, 2, ROUTE_36_NATIONAL_PARK_GATE
 	warp_event 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE
 	warp_event 11, 47, 2, ROUTE_35_NATIONAL_PARK_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 4
+	db 4 ; bg events
 	bg_event 14, 44, BGEVENT_READ, MapNationalParkSignpost0Script
 	bg_event 27, 31, BGEVENT_READ, MapNationalParkSignpost1Script
 	bg_event 6, 47, BGEVENT_ITEM, NationalParkHiddenFullHeal
 	bg_event 12, 4, BGEVENT_READ, MapNationalParkSignpost3Script
 
-.ObjectEvents:
-	db 14
+	db 14 ; object events
 	object_event 15, 24, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NationalParkLassScript, -1
 	object_event 14, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1
 	object_event 27, 40, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5c008, -1
diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm
index cd7a3c18e..d9a431590 100644
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -13,11 +13,9 @@ const_value set 2
 	const NATIONALPARKBUGCONTEST_POKE_BALL2
 
 NationalParkBugContest_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 YoungsterScript_0x5c8ec:
 	faceplayer
@@ -221,28 +219,23 @@ UnknownText_0x5cc1d:
 	done
 
 NationalParkBugContest_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE
 	warp_event 33, 19, 1, ROUTE_36_NATIONAL_PARK_GATE
 	warp_event 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE
 	warp_event 11, 47, 1, ROUTE_35_NATIONAL_PARK_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 4
+	db 4 ; bg events
 	bg_event 14, 44, BGEVENT_READ, MapNationalParkBugContestSignpost0Script
 	bg_event 27, 31, BGEVENT_READ, MapNationalParkBugContestSignpost1Script
 	bg_event 6, 47, BGEVENT_ITEM, NationalParkBugContestHiddenFullHeal
 	bg_event 12, 4, BGEVENT_READ, MapNationalParkBugContestSignpost3Script
 
-.ObjectEvents:
-	db 12
+	db 12 ; object events
 	object_event 19, 29, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A
 	object_event 28, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A
 	object_event 9, 18, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index 97ff2baca..985f7e4cf 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -4,13 +4,11 @@ const_value set 2
 	const NEWBARKTOWN_SILVER
 
 NewBarkTown_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .DummyScene0:
@@ -282,30 +280,25 @@ ElmsHouseSignText:
 	done
 
 NewBarkTown_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 6, 3, 1, ELMS_LAB
 	warp_event 13, 5, 1, PLAYERS_HOUSE_1F
 	warp_event 3, 11, 1, PLAYERS_NEIGHBORS_HOUSE
 	warp_event 11, 13, 1, ELMS_HOUSE
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 1, 8, 0, NewBarkTown_TeacherStopsYouScene1
 	coord_event 1, 9, 0, NewBarkTown_TeacherStopsYouScene2
 
-.BGEvents:
-	db 4
+	db 4 ; bg events
 	bg_event 8, 8, BGEVENT_READ, NewBarkTownSign
 	bg_event 11, 5, BGEVENT_READ, MapNewBarkTownSignpost1Script
 	bg_event 3, 3, BGEVENT_READ, MapNewBarkTownSignpost2Script
 	bg_event 9, 13, BGEVENT_READ, MapNewBarkTownSignpost3Script
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 6, 8, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1
 	object_event 12, 9, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1
 	object_event 3, 2, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN
diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm
index f0261031a..bf505711e 100644
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const OAKSLAB_SCIENTIST3
 
 OaksLab_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -257,19 +255,15 @@ OaksLabPCText:
 	done
 
 OaksLab_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 11, 3, PALLET_TOWN
 	warp_event 5, 11, 3, PALLET_TOWN
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 16
+	db 16 ; bg events
 	bg_event 6, 1, BGEVENT_READ, OaksLabBookshelf
 	bg_event 7, 1, BGEVENT_READ, OaksLabBookshelf
 	bg_event 8, 1, BGEVENT_READ, OaksLabBookshelf
@@ -287,8 +281,7 @@ OaksLab_MapEvents:
 	bg_event 9, 3, BGEVENT_READ, OaksLabTrashcan
 	bg_event 0, 1, BGEVENT_READ, OaksLabPC
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 4, 2, SPRITE_OAK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Oak, -1
 	object_event 1, 8, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant1Script, -1
 	object_event 8, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant2Script, -1
diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm
index daebab041..f651f0e97 100644
--- a/maps/OlivineCafe.asm
+++ b/maps/OlivineCafe.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const OLIVINECAFE_SAILOR2
 
 OlivineCafe_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SailorScript_0x9c8c1:
 	faceplayer
@@ -79,22 +77,17 @@ OlivineCafeSailorText:
 	done
 
 OlivineCafe_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 7, OLIVINE_CITY
 	warp_event 3, 7, 7, OLIVINE_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 4, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1
 	object_event 7, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1
 	object_event 6, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index 99b60897d..8c418d99d 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -5,13 +5,11 @@ const_value set 2
 	const OLIVINECITY_OLIVINE_RIVAL
 
 OlivineCity_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .DummyScene0:
@@ -288,11 +286,9 @@ UnknownText_0x1a8cba:
 	done
 
 OlivineCity_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 11
+	db 11 ; warp events
 	warp_event 13, 21, 1, OLIVINE_POKECENTER_1F
 	warp_event 10, 11, 1, OLIVINE_GYM
 	warp_event 25, 11, 1, OLIVINE_TIMS_HOUSE
@@ -305,13 +301,11 @@ OlivineCity_MapEvents:
 	warp_event 19, 27, 1, OLIVINE_PORT_PASSAGE
 	warp_event 20, 27, 2, OLIVINE_PORT_PASSAGE
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 13, 12, 0, UnknownScript_0x1a8833
 	coord_event 13, 13, 0, UnknownScript_0x1a886b
 
-.BGEvents:
-	db 7
+	db 7 ; bg events
 	bg_event 17, 11, BGEVENT_READ, OlivineCitySign
 	bg_event 20, 24, BGEVENT_READ, OlivineCityPortSign
 	bg_event 7, 11, BGEVENT_READ, OlivineGymSign
@@ -320,8 +314,7 @@ OlivineCity_MapEvents:
 	bg_event 14, 21, BGEVENT_READ, OlivineCityPokecenterSign
 	bg_event 20, 17, BGEVENT_READ, OlivineCityMartSign
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 26, 27, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor1Script, -1
 	object_event 20, 13, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a88a6, -1
 	object_event 17, 21, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor2Script, -1
diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm
index c7c010535..8bee6f363 100644
--- a/maps/OlivineGoodRodHouse.asm
+++ b/maps/OlivineGoodRodHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const OLIVINEGOODRODHOUSE_FISHING_GURU
 
 OlivineGoodRodHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 GoodRodGuru:
 	faceplayer
@@ -83,20 +81,15 @@ HaveGoodRodText:
 	done
 
 OlivineGoodRodHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 6, OLIVINE_CITY
 	warp_event 3, 7, 6, OLIVINE_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoodRodGuru, -1
diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm
index e62bdb9c8..e8ab40213 100644
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const OLIVINEGYM_GYM_GUY
 
 OlivineGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 JasmineScript_0x9c12f:
 	faceplayer
@@ -198,23 +196,18 @@ OlivineGymGuyPreText:
 	done
 
 OlivineGym_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 15, 2, OLIVINE_CITY
 	warp_event 5, 15, 2, OLIVINE_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 3, 13, BGEVENT_READ, OlivineGymStatue
 	bg_event 6, 13, BGEVENT_READ, OlivineGymStatue
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 5, 3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE
 	object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuyScript, -1
diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm
index 256f03df4..3297736e6 100644
--- a/maps/OlivineHouseBeta.asm
+++ b/maps/OlivineHouseBeta.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const OLIVINEHOUSEBETA_RHYDON
 
 OlivineHouseBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 OlivineHouseBetaTeacherScript:
 	jumptextfaceplayer OlivineHouseBetaTeacherText
@@ -40,23 +38,18 @@ UnknownText_0x9c5f0:
 	done
 
 OlivineHouseBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 4, OLIVINE_CITY
 	warp_event 3, 7, 4, OLIVINE_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, OlivineHouseBetaBookshelf1
 	bg_event 1, 1, BGEVENT_READ, OlivineHouseBetaBookshelf2
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1
 	object_event 6, 4, SPRITE_RHYDON, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x9c592, -1
diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm
index 19cd4e4a3..bc09e9ef4 100644
--- a/maps/OlivineLighthouse1F.asm
+++ b/maps/OlivineLighthouse1F.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const OLIVINELIGHTHOUSE1F_POKEFAN_F
 
 OlivineLighthouse1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 OlivineLighthouse1FSailorScript:
 	jumptextfaceplayer OlivineLighthouse1FSailorText
@@ -37,24 +35,19 @@ OlivineLighthouse1FPokefanFText:
 	done
 
 OlivineLighthouse1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 10, 17, 9, OLIVINE_CITY
 	warp_event 11, 17, 9, OLIVINE_CITY
 	warp_event 3, 11, 1, OLIVINE_LIGHTHOUSE_2F
 	warp_event 16, 13, 3, OLIVINE_LIGHTHOUSE_2F
 	warp_event 17, 13, 4, OLIVINE_LIGHTHOUSE_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 8, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FSailorScript, -1
 	object_event 16, 9, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FPokefanFScript, -1
diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm
index 1d0d001d2..2bc489c57 100644
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const OLIVINELIGHTHOUSE2F_GENTLEMAN
 
 OlivineLighthouse2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerGentlemanAlfred:
 	trainer GENTLEMAN, ALFRED, EVENT_BEAT_GENTLEMAN_ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, .Script
@@ -205,11 +203,9 @@ UnknownText_0x5b1b6:
 	done
 
 OlivineLighthouse2F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 6
+	db 6 ; warp events
 	warp_event 3, 11, 3, OLIVINE_LIGHTHOUSE_1F
 	warp_event 5, 3, 2, OLIVINE_LIGHTHOUSE_3F
 	warp_event 16, 13, 4, OLIVINE_LIGHTHOUSE_1F
@@ -217,13 +213,10 @@ OlivineLighthouse2F_MapEvents:
 	warp_event 16, 11, 4, OLIVINE_LIGHTHOUSE_3F
 	warp_event 17, 11, 5, OLIVINE_LIGHTHOUSE_3F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 9, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorHuey1, -1
 	object_event 17, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1
diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm
index 2b0108beb..84311e40e 100644
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const OLIVINELIGHTHOUSE3F_POKE_BALL
 
 OlivineLighthouse3F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerBirdKeeperTheo:
 	trainer BIRD_KEEPER, THEO, EVENT_BEAT_BIRD_KEEPER_THEO, BirdKeeperTheoSeenText, BirdKeeperTheoBeatenText, 0, .Script
@@ -113,11 +111,9 @@ GentlemanPrestonAfterBattleText:
 	done
 
 OlivineLighthouse3F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 9
+	db 9 ; warp events
 	warp_event 13, 3, 1, OLIVINE_LIGHTHOUSE_4F
 	warp_event 5, 3, 2, OLIVINE_LIGHTHOUSE_2F
 	warp_event 9, 5, 4, OLIVINE_LIGHTHOUSE_4F
@@ -128,14 +124,11 @@ OlivineLighthouse3F_MapEvents:
 	warp_event 8, 3, 7, OLIVINE_LIGHTHOUSE_4F
 	warp_event 9, 3, 8, OLIVINE_LIGHTHOUSE_4F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 9, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1
 	object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1
 	object_event 3, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperTheo, -1
diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm
index c16556cf9..21f59b17a 100644
--- a/maps/OlivineLighthouse4F.asm
+++ b/maps/OlivineLighthouse4F.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const OLIVINELIGHTHOUSE4F_LASS
 
 OlivineLighthouse4F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerLassConnie:
 	trainer LASS, CONNIE1, EVENT_BEAT_LASS_CONNIE, LassConnie1SeenText, LassConnie1BeatenText, 0, .Script
@@ -82,11 +80,9 @@ LassConnie1AfterBattleText:
 	done
 
 OlivineLighthouse4F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 10
+	db 10 ; warp events
 	warp_event 13, 3, 1, OLIVINE_LIGHTHOUSE_3F
 	warp_event 3, 5, 2, OLIVINE_LIGHTHOUSE_5F
 	warp_event 9, 7, 3, OLIVINE_LIGHTHOUSE_5F
@@ -98,13 +94,10 @@ OlivineLighthouse4F_MapEvents:
 	warp_event 16, 7, 4, OLIVINE_LIGHTHOUSE_5F
 	warp_event 17, 7, 5, OLIVINE_LIGHTHOUSE_5F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 7, 14, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorKent, -1
 	object_event 11, 2, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassConnie, -1
diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm
index 8da299e76..62767ab5d 100644
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -6,11 +6,9 @@ const_value set 2
 	const OLIVINELIGHTHOUSE5F_POKE_BALL3
 
 OlivineLighthouse5F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerBirdKeeperDenis:
 	trainer BIRD_KEEPER, DENIS, EVENT_BEAT_BIRD_KEEPER_DENIS, BirdKeeperDenisSeenText, BirdKeeperDenisBeatenText, 0, .Script
@@ -91,11 +89,9 @@ BirdKeeperDenisAfterBattleText:
 	done
 
 OlivineLighthouse5F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 7
+	db 7 ; warp events
 	warp_event 9, 15, 1, OLIVINE_LIGHTHOUSE_6F
 	warp_event 3, 5, 2, OLIVINE_LIGHTHOUSE_4F
 	warp_event 9, 7, 3, OLIVINE_LIGHTHOUSE_4F
@@ -104,15 +100,12 @@ OlivineLighthouse5F_MapEvents:
 	warp_event 16, 5, 2, OLIVINE_LIGHTHOUSE_6F
 	warp_event 17, 5, 3, OLIVINE_LIGHTHOUSE_6F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 3, 13, BGEVENT_ITEM, OlivineLighthouse5FHiddenHyperPotion
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 8, 11, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1
 	object_event 8, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBirdKeeperDenis, -1
 	object_event 15, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index 94151b2aa..109c84cca 100644
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const OLIVINELIGHTHOUSE6F_POKE_BALL
 
 OlivineLighthouse6F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 JasmineScript_0x60b91:
 	faceplayer
@@ -258,23 +256,18 @@ UnknownText_0x60f3d:
 	done
 
 OlivineLighthouse6F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 9, 15, 1, OLIVINE_LIGHTHOUSE_5F
 	warp_event 16, 5, 6, OLIVINE_LIGHTHOUSE_5F
 	warp_event 17, 5, 7, OLIVINE_LIGHTHOUSE_5F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 8, 8, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE
 	object_event 9, 8, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1
 	object_event 3, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION
diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm
index b6f70cc67..ff4ed669a 100644
--- a/maps/OlivineMart.asm
+++ b/maps/OlivineMart.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const OLIVINEMART_LASS
 
 OlivineMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ClerkScript_0x9cac7:
 	opentext
@@ -46,22 +44,17 @@ OlivineMartLassText:
 	done
 
 OlivineMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 8, OLIVINE_CITY
 	warp_event 3, 7, 8, OLIVINE_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1
 	object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1
 	object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartLassScript, -1
diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm
index abada1bd0..16a774912 100644
--- a/maps/OlivinePokecenter1F.asm
+++ b/maps/OlivinePokecenter1F.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const OLIVINEPOKECENTER1F_TEACHER
 
 OlivinePokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 NurseScript_0x9c002:
 	jumpstd pokecenternurse
@@ -48,23 +46,18 @@ OlivinePokecenter1FTeacherText:
 	done
 
 OlivinePokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 1, OLIVINE_CITY
 	warp_event 4, 7, 1, OLIVINE_CITY
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9c002, -1
 	object_event 8, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1
 	object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index de17f58b9..ce949a4ba 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -8,13 +8,11 @@ const_value set 2
 	const OLIVINEPORT_COOLTRAINER_F
 
 OlivinePort_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .LeaveFastShip
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -385,24 +383,19 @@ OlivinePortSailorText:
 	done
 
 OlivinePort_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 11, 7, 5, OLIVINE_PORT_PASSAGE
 	warp_event 7, 23, 1, FAST_SHIP_1F
 
-.CoordEvents:
-	db 1
+	db 1 ; coord events
 	coord_event 7, 15, 0, UnknownScript_0x7491f
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein
 
-.ObjectEvents:
-	db 7
+	db 7 ; object events
 	object_event 7, 23, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
 	object_event 7, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
 	object_event 6, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm
index d78b2b32a..2d8cf9e55 100644
--- a/maps/OlivinePortPassage.asm
+++ b/maps/OlivinePortPassage.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const OLIVINEPORTPASSAGE_POKEFAN_M
 
 OlivinePortPassage_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 OlivinePortPassagePokefanMScript:
 	jumptextfaceplayer OlivinePortPassagePokefanMText
@@ -20,23 +18,18 @@ OlivinePortPassagePokefanMText:
 	done
 
 OlivinePortPassage_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 15, 0, 10, OLIVINE_CITY
 	warp_event 16, 0, 11, OLIVINE_CITY
 	warp_event 15, 4, 4, OLIVINE_PORT_PASSAGE
 	warp_event 3, 2, 3, OLIVINE_PORT_PASSAGE
 	warp_event 3, 14, 1, OLIVINE_PORT
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 17, 1, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortPassagePokefanMScript, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M
diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm
index 361ab4582..6133c8f53 100644
--- a/maps/OlivinePunishmentSpeechHouse.asm
+++ b/maps/OlivinePunishmentSpeechHouse.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const OLIVINEPUNISHMENTSPEECHHOUSE_LASS
 
 OlivinePunishmentSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 OlivinePunishmentSpeechHouseDad:
 	jumptextfaceplayer OlivinePunishmentSpeechHouseDadText
@@ -40,23 +38,18 @@ OlivinePunishmentSpeechHouseDaughterText:
 	done
 
 OlivinePunishmentSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 5, OLIVINE_CITY
 	warp_event 3, 7, 5, OLIVINE_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf1
 	bg_event 1, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf2
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 1, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDad, -1
 	object_event 5, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDaughter, -1
diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm
index 0b56332d7..0038bf6b9 100644
--- a/maps/OlivineTimsHouse.asm
+++ b/maps/OlivineTimsHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const OLIVINETIMSHOUSE_TIM
 
 OlivineTimsHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Tim:
 	faceplayer
@@ -20,22 +18,17 @@ TimsHouseBookshelf:
 	jumpstd magazinebookshelf
 
 OlivineTimsHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 3, OLIVINE_CITY
 	warp_event 3, 7, 3, OLIVINE_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, TimsHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, TimsHouseBookshelf
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Tim, -1
diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm
index e1a280c86..80601f222 100644
--- a/maps/PalletTown.asm
+++ b/maps/PalletTown.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const PALLETTOWN_FISHER
 
 PalletTown_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -70,26 +68,21 @@ BluesHouseSignText:
 	done
 
 PalletTown_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 5, 5, 1, REDS_HOUSE_1F
 	warp_event 13, 5, 1, BLUES_HOUSE
 	warp_event 12, 11, 1, OAKS_LAB
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 4
+	db 4 ; bg events
 	bg_event 7, 9, BGEVENT_READ, PalletTownSign
 	bg_event 3, 5, BGEVENT_READ, RedsHouseSign
 	bg_event 13, 13, BGEVENT_READ, OaksLabSign
 	bg_event 11, 5, BGEVENT_READ, BluesHouseSign
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 3, 8, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PalletTownTeacherScript, -1
 	object_event 12, 14, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PalletTownFisherScript, -1
diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm
index af325e07f..ab10bcdee 100644
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -6,11 +6,9 @@ const_value set 2
 	const PEWTERCITY_FRUIT_TREE2
 
 PewterCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -153,22 +151,18 @@ PewterCityWelcomeSignText:
 	done
 
 PewterCity_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 29, 13, 1, PEWTER_NIDORAN_SPEECH_HOUSE
 	warp_event 16, 17, 1, PEWTER_GYM
 	warp_event 23, 17, 2, PEWTER_MART
 	warp_event 13, 25, 1, PEWTER_POKECENTER_1F
 	warp_event 7, 29, 1, PEWTER_SNOOZE_SPEECH_HOUSE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 7
+	db 7 ; bg events
 	bg_event 25, 23, BGEVENT_READ, PewterCitySign
 	bg_event 11, 17, BGEVENT_READ, PewterGymSign
 	bg_event 15, 9, BGEVENT_READ, PewterMuseumSign
@@ -177,8 +171,7 @@ PewterCity_MapEvents:
 	bg_event 14, 25, BGEVENT_READ, PewterCityPokecenterSign
 	bg_event 24, 17, BGEVENT_READ, PewterCityMartSign
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 19, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1
 	object_event 14, 29, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1
 	object_event 29, 17, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1
diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm
index 07d52ce03..0fa0bcc13 100644
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const PEWTERGYM_GYM_GUY
 
 PewterGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 BrockScript_0x1a2864:
 	faceplayer
@@ -209,24 +207,19 @@ PewterGymGuyWinText:
 	done
 
 PewterGym_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 13, 2, PEWTER_CITY
 	warp_event 5, 13, 2, PEWTER_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 2, 11, BGEVENT_READ, PewterGymStatue
 	bg_event 7, 11, BGEVENT_READ, PewterGymStatue
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 5, 1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1
 	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1
 	object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1
diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm
index b40cf8db0..f4aa7614e 100644
--- a/maps/PewterMart.asm
+++ b/maps/PewterMart.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const PEWTERMART_SUPER_NERD
 
 PewterMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ClerkScript_0x1a2dcb:
 	opentext
@@ -46,22 +44,17 @@ PewterMartSuperNerdText:
 	done
 
 PewterMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 3, PEWTER_CITY
 	warp_event 3, 7, 3, PEWTER_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1
 	object_event 9, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1
 	object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1
diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm
index 84ded5256..4f4424e9e 100644
--- a/maps/PewterNidoranSpeechHouse.asm
+++ b/maps/PewterNidoranSpeechHouse.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const PEWTERNIDORANSPEECHHOUSE_NIDORAN_M
 
 PewterNidoranSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 PewterNidoranSpeechHouseSuperNerdScript:
 	jumptextfaceplayer PewterNidoranSpeechHouseSuperNerdText
@@ -29,21 +27,16 @@ PewterNidoranText:
 	done
 
 PewterNidoranSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 1, PEWTER_CITY
 	warp_event 3, 7, 1, PEWTER_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 3, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterNidoranSpeechHouseSuperNerdScript, -1
 	object_event 4, 5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterNidoran, -1
diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm
index 5bb9da7da..1948928b6 100644
--- a/maps/PewterPokecenter1F.asm
+++ b/maps/PewterPokecenter1F.asm
@@ -6,11 +6,9 @@ const_value set 2
 	const PEWTERPOKECENTER1F_CHRIS
 
 PewterPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 NurseScript_0x1a2ee7:
 	jumpstd pokecenternurse
@@ -68,23 +66,18 @@ PewterPokecenter1FBugCatcherText:
 	done
 
 PewterPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 4, PEWTER_CITY
 	warp_event 4, 7, 4, PEWTER_CITY
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1
 	object_event 8, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1
 	object_event 1, 3, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterJigglypuff, -1
diff --git a/maps/PewterPokecenter2FBeta.asm b/maps/PewterPokecenter2FBeta.asm
index 0a5b6f558..f01010f7a 100644
--- a/maps/PewterPokecenter2FBeta.asm
+++ b/maps/PewterPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
 PewterPokecenter2FBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 PewterPokecenter2FBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 0, 7, 3, PEWTER_POKECENTER_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm
index f803411d7..4e76da519 100644
--- a/maps/PewterSnoozeSpeechHouse.asm
+++ b/maps/PewterSnoozeSpeechHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const PEWTERSNOOZESPEECHHOUSE_GRAMPS
 
 PewterSnoozeSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 PewterSnoozeSpeechHouseGrampsScript:
 	jumptextfaceplayer PewterSnoozeSpeechHouseGrampsText
@@ -21,22 +19,17 @@ PewterSnoozeSpeechHouseGrampsText:
 	done
 
 PewterSnoozeSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 5, PEWTER_CITY
 	warp_event 3, 7, 5, PEWTER_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 5, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterSnoozeSpeechHouseGrampsScript, -1
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index fd0747b70..5ac942d53 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -6,13 +6,11 @@ const_value set 2
 	const PLAYERSHOUSE1F_POKEFAN_F
 
 PlayersHouse1F_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -386,29 +384,24 @@ TVText:
 	done
 
 PlayersHouse1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 6, 7, 2, NEW_BARK_TOWN
 	warp_event 7, 7, 2, NEW_BARK_TOWN
 	warp_event 9, 0, 1, PLAYERS_HOUSE_2F
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 8, 4, 0, UnknownScript_0x7a4d8
 	coord_event 9, 4, 0, UnknownScript_0x7a4db
 
-.BGEvents:
-	db 4
+	db 4 ; bg events
 	bg_event 0, 1, BGEVENT_READ, StoveScript
 	bg_event 1, 1, BGEVENT_READ, SinkScript
 	bg_event 2, 1, BGEVENT_READ, FridgeScript
 	bg_event 4, 1, BGEVENT_READ, TVScript
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_1
 	object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
 	object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm
index 6dd6e3c09..210c4af79 100644
--- a/maps/PlayersHouse2F.asm
+++ b/maps/PlayersHouse2F.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const PLAYERSHOUSE2F_BIG_DOLL
 
 PlayersHouse2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 2
+	db 2 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .InitializeRoom
 	callback MAPCALLBACK_TILES, .SetSpawn
 
@@ -116,25 +114,20 @@ PlayersRadioText4:
 	done
 
 PlayersHouse2F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 7, 0, 3, PLAYERS_HOUSE_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 4
+	db 4 ; bg events
 	bg_event 2, 1, BGEVENT_UP, PlayersHousePCScript
 	bg_event 3, 1, BGEVENT_READ, PlayersHouseRadioScript
 	bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelfScript
 	bg_event 6, 0, BGEVENT_IFSET, PlayersHousePosterScript
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE
 	object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1
 	object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2
diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm
index 0b0a64419..514802636 100644
--- a/maps/PlayersNeighborsHouse.asm
+++ b/maps/PlayersNeighborsHouse.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const PLAYERSNEIGHBORSHOUSE_POKEFAN_F
 
 PlayersNeighborsHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 PlayersNeighborsDaughterScript:
 	jumptextfaceplayer PlayersNeighborsDaughterText
@@ -99,24 +97,19 @@ PlayerNeighborRadioText4:
 	done
 
 PlayersNeighborsHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 3, NEW_BARK_TOWN
 	warp_event 3, 7, 3, NEW_BARK_TOWN
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 0, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript
 	bg_event 1, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript
 	bg_event 7, 1, BGEVENT_READ, PlayersNeighborsHouseRadioScript
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborsDaughterScript, -1
 	object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborScript, EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm
index f42b7516d..bef008511 100644
--- a/maps/PokeSeersHouse.asm
+++ b/maps/PokeSeersHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const POKESEERSHOUSE_GRANNY
 
 PokeSeersHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SeerScript:
 	faceplayer
@@ -17,20 +15,15 @@ SeerScript:
 	end
 
 PokeSeersHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 7, CIANWOOD_CITY
 	warp_event 3, 7, 7, CIANWOOD_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SeerScript, -1
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index c5658403d..05b3ca63a 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -5,8 +5,7 @@ const_value set 2
 	const POKECENTER2F_OFFICER
 
 Pokecenter2F_MapScripts:
-.SceneScripts:
-	db 6
+	db 6 ; scene scripts
 	scene_script .Scene0
 	scene_script .Scene1
 	scene_script .Scene2
@@ -14,8 +13,7 @@ Pokecenter2F_MapScripts:
 	scene_script .Scene4
 	scene_script .Scene5
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .Scene0:
 	special CheckMysteryGift
@@ -1023,11 +1021,9 @@ Text_BrokeStadiumRules:
 	done
 
 Pokecenter2F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 6
+	db 6 ; warp events
 	warp_event 0, 7, -1, POKECENTER_2F
 	warp_event 5, 0, 1, TRADE_CENTER
 	warp_event 9, 0, 1, COLOSSEUM
@@ -1035,15 +1031,12 @@ Pokecenter2F_MapEvents:
 	warp_event 6, 0, 1, MOBILE_TRADE_ROOM_MOBILE
 	warp_event 10, 0, 1, MOBILE_BATTLE_ROOM
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 7, 3, BGEVENT_READ, MapPokecenter2FSignpost0Script
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1
 	object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1
 	object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1
diff --git a/maps/PokecomCenterAdminRoomMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm
index c22d6a929..5af6eed77 100644
--- a/maps/PokecomCenterAdminRoomMobile.asm
+++ b/maps/PokecomCenterAdminRoomMobile.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const POKECOMCENTERADMINROOMMOBILE_SCIENTIST3
 
 PokecomCenterAdminRoomMobile_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 PokecomCenterAdminRoomMobileScientist1Script:
 	jumptextfaceplayer PokecomCenterAdminRoomMobileScientist1Text
@@ -263,25 +261,20 @@ UnknownText_0x62b26:
 	done
 
 PokecomCenterAdminRoomMobile_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 0, 31, 3, GOLDENROD_POKECENTER_1F
 	warp_event 1, 31, 3, GOLDENROD_POKECENTER_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost0Script
 	bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost1Script
 	bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost2Script
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist1Script, -1
 	object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist2Script, -1
 	object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist3Script, -1
diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm
index ef3440ac1..78bd8607a 100644
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -7,11 +7,9 @@ const_value set 2
 	const POKEMONFANCLUB_ODDISH
 
 PokemonFanClub_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 GentlemanScript_0x1917e9:
 	faceplayer
@@ -297,24 +295,19 @@ UnknownText_0x191e29:
 	done
 
 PokemonFanClub_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 3, VERMILION_CITY
 	warp_event 3, 7, 3, VERMILION_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 7, 0, BGEVENT_READ, MapPokemonFanClubSignpost0Script
 	bg_event 9, 0, BGEVENT_READ, MapPokemonFanClubSignpost1Script
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1
 	object_event 4, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1
 	object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FisherScript_0x191824, -1
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index ea7d2e646..fdc17e2a4 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -8,13 +8,11 @@ const_value set 2
 	const POWERPLANT_FOREST
 
 PowerPlant_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -389,25 +387,20 @@ UnknownText_0x189475:
 	done
 
 PowerPlant_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 17, 2, ROUTE_10_NORTH
 	warp_event 3, 17, 2, ROUTE_10_NORTH
 
-.CoordEvents:
-	db 1
+	db 1 ; coord events
 	coord_event 5, 12, 1, PowerPlantGuardPhoneScript
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, PowerPlantBookshelf
 	bg_event 1, 1, BGEVENT_READ, PowerPlantBookshelf
 
-.ObjectEvents:
-	db 7
+	db 7 ; object events
 	object_event 4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188df5, -1
 	object_event 2, 9, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e15, -1
 	object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e29, -1
diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm
index f41832430..73fee4d01 100644
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -7,11 +7,9 @@ const_value set 2
 	const RADIOTOWER1F_COOLTRAINER_F
 
 RadioTower1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ReceptionistScript_0x5cd29:
 	faceplayer
@@ -473,25 +471,20 @@ UnknownText_0x5d631:
 	done
 
 RadioTower1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 2, 7, 11, GOLDENROD_CITY
 	warp_event 3, 7, 11, GOLDENROD_CITY
 	warp_event 15, 0, 2, RADIO_TOWER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 3, 0, BGEVENT_READ, MapRadioTower1FSignpost0Script
 	bg_event 13, 0, BGEVENT_READ, MapRadioTower1FSignpost1Script
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 5, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1
 	object_event 16, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS
 	object_event 15, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
index 82e8972fd..aefb31799 100644
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -12,11 +12,9 @@ const_value set 2
 	const RADIOTOWER2F_RECEPTIONIST
 
 RadioTower2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 UnknownScript_0x5d6fd:
 	end
@@ -711,19 +709,15 @@ UnknownText_0x5e463:
 	done
 
 RadioTower2F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 0, 0, 1, RADIO_TOWER_3F
 	warp_event 15, 0, 3, RADIO_TOWER_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 6
+	db 6 ; bg events
 	bg_event 3, 0, BGEVENT_READ, MapRadioTower2FSignpost0Script
 	bg_event 5, 0, BGEVENT_READ, MapRadioTower2FSignpost1Script
 	bg_event 9, 1, BGEVENT_READ, RadioTower2FBookshelf
@@ -731,8 +725,7 @@ RadioTower2F_MapEvents:
 	bg_event 11, 1, BGEVENT_READ, RadioTower2FBookshelf
 	bg_event 13, 0, BGEVENT_READ, MapRadioTower2FSignpost5Script
 
-.ObjectEvents:
-	db 11
+	db 11 ; object events
 	object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS
 	object_event 17, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1
 	object_event 1, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm
index 3b83eb1a9..64d5a7ec5 100644
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -8,11 +8,9 @@ const_value set 2
 	const RADIOTOWER3F_SCIENTIST
 
 RadioTower3F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .CardKeyShutterCallback
 
 .CardKeyShutterCallback:
@@ -329,26 +327,21 @@ UnknownText_0x5eae4:
 	done
 
 RadioTower3F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 0, 0, 1, RADIO_TOWER_2F
 	warp_event 7, 0, 2, RADIO_TOWER_4F
 	warp_event 17, 0, 4, RADIO_TOWER_4F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 3, 0, BGEVENT_READ, MapRadioTower3FSignpost0Script
 	bg_event 9, 0, BGEVENT_READ, MapRadioTower3FSignpost1Script
 	bg_event 14, 2, BGEVENT_UP, MapRadioTower3FSignpost2Script
 
-.ObjectEvents:
-	db 7
+	db 7 ; object events
 	object_event 7, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER
 	object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1
 	object_event 11, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1
diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm
index 37e35f489..3167b3c7b 100644
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -8,11 +8,9 @@ const_value set 2
 	const RADIOTOWER4F_SCIENTIST
 
 RadioTower4F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RadioTower4FFisherScript:
 	jumptextfaceplayer RadioTower4FFisherText
@@ -246,26 +244,21 @@ UnknownText_0x5f00d:
 	done
 
 RadioTower4F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 0, 0, 1, RADIO_TOWER_5F
 	warp_event 9, 0, 2, RADIO_TOWER_3F
 	warp_event 12, 0, 2, RADIO_TOWER_5F
 	warp_event 17, 0, 3, RADIO_TOWER_3F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 7, 0, BGEVENT_READ, MapRadioTower4FSignpost0Script
 	bg_event 15, 0, BGEVENT_READ, MapRadioTower4FSignpost1Script
 
-.ObjectEvents:
-	db 7
+	db 7 ; object events
 	object_event 6, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER
 	object_event 14, 6, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1
 	object_event 12, 7, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTowerMeowth, -1
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index 67e876f45..7fe87eeb5 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -6,14 +6,12 @@ const_value set 2
 	const RADIOTOWER5F_POKE_BALL
 
 RadioTower5F_MapScripts:
-.SceneScripts:
-	db 3
+	db 3 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 	scene_script .DummyScene2
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -421,29 +419,24 @@ SignpostRadioTower5FStudio:
 	done
 
 RadioTower5F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 0, 0, 1, RADIO_TOWER_4F
 	warp_event 12, 0, 3, RADIO_TOWER_4F
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 0, 3, 0, FakeDirectorScript
 	coord_event 16, 5, 1, RadioTower5FRocketBossScene
 
-.BGEvents:
-	db 5
+	db 5 ; bg events
 	bg_event 3, 0, BGEVENT_READ, MapRadioTower5FSignpost0Script
 	bg_event 11, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script
 	bg_event 15, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script
 	bg_event 16, 1, BGEVENT_READ, RadioTower5FBookshelf
 	bg_event 17, 1, BGEVENT_READ, RadioTower5FBookshelf
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 3, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Director, -1
 	object_event 13, 5, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event 17, 2, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm
index fb0adc06f..4c7f1addf 100644
--- a/maps/RedsHouse1F.asm
+++ b/maps/RedsHouse1F.asm
@@ -2,12 +2,10 @@ const_value set 2
 	const REDSHOUSE1F_REDS_MOM
 
 RedsHouse1F_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -75,24 +73,19 @@ RedsHouse1FTVText:
 	done
 
 RedsHouse1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 2, 7, 1, PALLET_TOWN
 	warp_event 3, 7, 1, PALLET_TOWN
 	warp_event 7, 0, 1, REDS_HOUSE_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 0, 1, BGEVENT_READ, RedsHouse1FBookshelf
 	bg_event 1, 1, BGEVENT_READ, RedsHouse1FBookshelf
 	bg_event 2, 1, BGEVENT_READ, RedsHouse1FTV
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 5, 3, SPRITE_REDS_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RedsMom, -1
diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm
index d26cb1642..74445fc3f 100644
--- a/maps/RedsHouse2F.asm
+++ b/maps/RedsHouse2F.asm
@@ -1,9 +1,7 @@
 RedsHouse2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RedsHouse2FN64Script:
 	jumptext RedsHouse2FN64Text
@@ -26,20 +24,15 @@ RedsHouse2FPCText:
 	done
 
 RedsHouse2F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 7, 0, 3, REDS_HOUSE_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 3, 5, BGEVENT_READ, RedsHouse2FN64Script
 	bg_event 0, 1, BGEVENT_READ, RedsHouse2FPCScript
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm
index d7ab692c6..f0073181c 100644
--- a/maps/RockTunnel1F.asm
+++ b/maps/RockTunnel1F.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const ROCKTUNNEL1F_POKE_BALL2
 
 RockTunnel1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RockTunnel1FElixer:
 	itemball ELIXER
@@ -22,11 +20,9 @@ RockTunnel1FHiddenXDefend:
 	hiddenitem X_DEFEND, EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND
 
 RockTunnel1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 6
+	db 6 ; warp events
 	warp_event 15, 3, 1, ROUTE_9
 	warp_event 11, 25, 1, ROUTE_10_SOUTH
 	warp_event 5, 3, 3, ROCK_TUNNEL_B1F
@@ -34,15 +30,12 @@ RockTunnel1F_MapEvents:
 	warp_event 27, 3, 4, ROCK_TUNNEL_B1F
 	warp_event 27, 13, 1, ROCK_TUNNEL_B1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 24, 4, BGEVENT_ITEM, RockTunnel1FHiddenXAccuracy
 	bg_event 21, 15, BGEVENT_ITEM, RockTunnel1FHiddenXDefend
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 4, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER
 	object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING
diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm
index 5306d185b..d1b676c00 100644
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const ROCKTUNNELB1F_POKE_BALL3
 
 RockTunnelB1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RockTunnelB1FIron:
 	itemball IRON
@@ -23,25 +21,20 @@ RockTunnelB1FHiddenMaxPotion:
 	hiddenitem MAX_POTION, EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION
 
 RockTunnelB1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 3, 3, 6, ROCK_TUNNEL_1F
 	warp_event 17, 9, 4, ROCK_TUNNEL_1F
 	warp_event 23, 3, 3, ROCK_TUNNEL_1F
 	warp_event 25, 23, 5, ROCK_TUNNEL_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 4, 14, BGEVENT_ITEM, RockTunnelB1FHiddenMaxPotion
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON
 	object_event 6, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP
 	object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE
diff --git a/maps/Route1.asm b/maps/Route1.asm
index 09c9cc395..eb2d407a5 100644
--- a/maps/Route1.asm
+++ b/maps/Route1.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const ROUTE1_FRUIT_TREE
 
 Route1_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerSchoolboyDanny:
 	trainer SCHOOLBOY, DANNY, EVENT_BEAT_SCHOOLBOY_DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, .Script
@@ -81,21 +79,16 @@ Route1SignText:
 	done
 
 Route1_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 0
+	db 0 ; warp events
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 7, 27, BGEVENT_READ, Route1Sign
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 4, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1
 	object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1
 	object_event 3, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1
diff --git a/maps/Route10North.asm b/maps/Route10North.asm
index 4fb0ad6f0..9e16ad2eb 100644
--- a/maps/Route10North.asm
+++ b/maps/Route10North.asm
@@ -1,9 +1,7 @@
 Route10North_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 PowerPlantSign:
 	jumptext PowerPlantSignText
@@ -16,21 +14,16 @@ PowerPlantSignText:
 	done
 
 Route10North_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 11, 1, 1, ROUTE_10_POKECENTER_1F
 	warp_event 3, 9, 1, POWER_PLANT
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 5, 11, BGEVENT_READ, PowerPlantSign
 	bg_event 12, 1, BGEVENT_READ, Route10PokecenterSign
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm
index 696039184..6e33641a9 100644
--- a/maps/Route10Pokecenter1F.asm
+++ b/maps/Route10Pokecenter1F.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const ROUTE10POKECENTER1F_COOLTRAINER_F
 
 Route10Pokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 NurseScript_0x188bd4:
 	jumpstd pokecenternurse
@@ -81,23 +79,18 @@ Route10Pokecenter1FCooltrainerFText:
 	done
 
 Route10Pokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 1, ROUTE_10_NORTH
 	warp_event 4, 7, 1, ROUTE_10_NORTH
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1
 	object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1
 	object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1
diff --git a/maps/Route10Pokecenter2FBeta.asm b/maps/Route10Pokecenter2FBeta.asm
index c455c5ae4..7b528ba13 100644
--- a/maps/Route10Pokecenter2FBeta.asm
+++ b/maps/Route10Pokecenter2FBeta.asm
@@ -1,23 +1,16 @@
 Route10Pokecenter2FBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route10Pokecenter2FBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 0, 7, 3, ROUTE_10_POKECENTER_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/Route10South.asm b/maps/Route10South.asm
index e6fa2d684..f5946ea74 100644
--- a/maps/Route10South.asm
+++ b/maps/Route10South.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const ROUTE10SOUTH_POKEFAN_M2
 
 Route10South_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerHikerJim:
 	trainer HIKER, JIM, EVENT_BEAT_HIKER_JIM, HikerJimSeenText, HikerJimBeatenText, 0, .Script
@@ -76,21 +74,16 @@ Route10SignText:
 	done
 
 Route10South_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 6, 1, 2, ROCK_TUNNEL_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 5, 3, BGEVENT_READ, Route10Sign
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 17, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerJim, -1
 	object_event 8, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmRobert, -1
diff --git a/maps/Route11.asm b/maps/Route11.asm
index 7febe3423..8934549fc 100644
--- a/maps/Route11.asm
+++ b/maps/Route11.asm
@@ -6,11 +6,9 @@ const_value set 2
 	const ROUTE11_FRUIT_TREE
 
 Route11_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerYoungsterOwen:
 	trainer YOUNGSTER, OWEN, EVENT_BEAT_YOUNGSTER_OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, .Script
@@ -146,22 +144,17 @@ Route11SignText:
 	done
 
 Route11_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 0
+	db 0 ; warp events
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 3, 7, BGEVENT_READ, Route11Sign
 	bg_event 32, 5, BGEVENT_ITEM, Route11HiddenRevive
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 22, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterOwen, -1
 	object_event 20, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1
 	object_event 28, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1
diff --git a/maps/Route12.asm b/maps/Route12.asm
index 18ccb9c33..a4f56cf01 100644
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -7,11 +7,9 @@ const_value set 2
 	const ROUTE12_POKE_BALL2
 
 Route12_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerFisherKyle:
 	trainer FISHER, KYLE, EVENT_BEAT_FISHER_KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, .Script
@@ -167,24 +165,19 @@ FishingSpotSignText:
 	done
 
 Route12_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 11, 33, 1, ROUTE_12_SUPER_ROD_HOUSE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 11, 27, BGEVENT_READ, Route12Sign
 	bg_event 13, 9, BGEVENT_READ, FishingSpotSign
 	bg_event 14, 13, BGEVENT_ITEM, Route12HiddenElixer
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 5, 13, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherMartin, -1
 	object_event 14, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherStephen, -1
 	object_event 10, 38, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerFisherBarney, -1
diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm
index 5333d6e89..0c41049e5 100644
--- a/maps/Route12SuperRodHouse.asm
+++ b/maps/Route12SuperRodHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const ROUTE12SUPERRODHOUSE_FISHING_GURU
 
 Route12SuperRodHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 FishingGuruScript_0x7f484:
 	faceplayer
@@ -80,20 +78,15 @@ UnknownText_0x7f5ec:
 	done
 
 Route12SuperRodHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 1, ROUTE_12
 	warp_event 3, 7, 1, ROUTE_12
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x7f484, -1
diff --git a/maps/Route13.asm b/maps/Route13.asm
index c10063908..c97a54830 100644
--- a/maps/Route13.asm
+++ b/maps/Route13.asm
@@ -6,11 +6,9 @@ const_value set 2
 	const ROUTE13_POKEFAN_M3
 
 Route13_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerPokefanmAlex:
 	trainer POKEFANM, ALEX, EVENT_BEAT_POKEFANM_ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, .Script
@@ -192,24 +190,19 @@ Route13DirectionsSignText:
 	done
 
 Route13_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 0
+	db 0 ; warp events
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 4
+	db 4 ; bg events
 	bg_event 29, 13, BGEVENT_READ, Route13TrainerTips
 	bg_event 41, 11, BGEVENT_READ, Route13Sign
 	bg_event 17, 13, BGEVENT_READ, Route13DirectionsSign
 	bg_event 30, 13, BGEVENT_ITEM, Route13HiddenCalcium
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 42, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperPerry, -1
 	object_event 43, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperBret, -1
 	object_event 32, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1
diff --git a/maps/Route14.asm b/maps/Route14.asm
index 4dc203a4a..aa388dfb9 100644
--- a/maps/Route14.asm
+++ b/maps/Route14.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const ROUTE14_KIM
 
 Route14_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Kim:
 	faceplayer
@@ -116,20 +114,15 @@ PokefanmTrevorAfterBattleText:
 	done
 
 Route14_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 0
+	db 0 ; warp events
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 11, 15, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmCarter, -1
 	object_event 11, 27, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRoy, -1
 	object_event 6, 11, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1
diff --git a/maps/Route15.asm b/maps/Route15.asm
index 3d4344695..a3c0521b8 100644
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -8,11 +8,9 @@ const_value set 2
 	const ROUTE15_POKE_BALL
 
 Route15_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerTeacherColette:
 	trainer TEACHER, COLETTE, EVENT_BEAT_TEACHER_COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, .Script
@@ -202,23 +200,18 @@ Route15SignText:
 	done
 
 Route15_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 4, 3, ROUTE_15_FUCHSIA_GATE
 	warp_event 2, 5, 4, ROUTE_15_FUCHSIA_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 19, 9, BGEVENT_READ, Route15Sign
 
-.ObjectEvents:
-	db 7
+	db 7 ; object events
 	object_event 10, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyKipp, -1
 	object_event 15, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyTommy, -1
 	object_event 33, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJohnny, -1
diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm
index ad2bcb433..3d31256f7 100644
--- a/maps/Route15FuchsiaGate.asm
+++ b/maps/Route15FuchsiaGate.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const ROUTE15FUCHSIAGATE_OFFICER
 
 Route15FuchsiaGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route15FuchsiaGateOfficerScript:
 	jumptextfaceplayer Route15FuchsiaGateOfficerText
@@ -20,22 +18,17 @@ Route15FuchsiaGateOfficerText:
 	done
 
 Route15FuchsiaGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 0, 4, 8, FUCHSIA_CITY
 	warp_event 0, 5, 9, FUCHSIA_CITY
 	warp_event 9, 4, 1, ROUTE_15
 	warp_event 9, 5, 2, ROUTE_15
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1
diff --git a/maps/Route16.asm b/maps/Route16.asm
index d049d5cbd..a799803fd 100644
--- a/maps/Route16.asm
+++ b/maps/Route16.asm
@@ -1,9 +1,7 @@
 Route16_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .AlwaysOnBike
 
 .AlwaysOnBike:
@@ -29,23 +27,18 @@ CyclingRoadSignText:
 	done
 
 Route16_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 3, 1, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE
 	warp_event 14, 6, 3, ROUTE_16_GATE
 	warp_event 14, 7, 4, ROUTE_16_GATE
 	warp_event 9, 6, 1, ROUTE_16_GATE
 	warp_event 9, 7, 2, ROUTE_16_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 5, 5, BGEVENT_READ, CyclingRoadSign
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm
index 10a28ab4e..ffac53705 100644
--- a/maps/Route16FuchsiaSpeechHouse.asm
+++ b/maps/Route16FuchsiaSpeechHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD
 
 Route16FuchsiaSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route16FuchsiaSpeechHouseSuperNerdScript:
 	jumptextfaceplayer Route16FuchsiaSpeechHouseSuperNerdText
@@ -23,22 +21,17 @@ Route16FuchsiaSpeechHouseSuperNerdText:
 	done
 
 Route16FuchsiaSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 1, ROUTE_16
 	warp_event 3, 7, 1, ROUTE_16
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1
diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm
index 558663a82..9bfbce366 100644
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -2,12 +2,10 @@ const_value set 2
 	const ROUTE16GATE_OFFICER
 
 Route16Gate_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -61,24 +59,19 @@ UnknownText_0x73496:
 	done
 
 Route16Gate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 0, 4, 4, ROUTE_16
 	warp_event 0, 5, 5, ROUTE_16
 	warp_event 9, 4, 2, ROUTE_16
 	warp_event 9, 5, 3, ROUTE_16
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 5, 4, 0, UnknownScript_0x733ed
 	coord_event 5, 5, 0, UnknownScript_0x733ed
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route16GateOfficerScript, -1
diff --git a/maps/Route17.asm b/maps/Route17.asm
index 7fdd81737..5fe83bd41 100644
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const ROUTE17_BIKER4
 
 Route17_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .AlwaysOnBike
 
 .AlwaysOnBike:
@@ -133,24 +131,19 @@ BikerCharlesAfterBattleText:
 	done
 
 Route17_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 17, 82, 1, ROUTE_17_ROUTE_18_GATE
 	warp_event 17, 83, 2, ROUTE_17_ROUTE_18_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 9, 54, BGEVENT_ITEM, Route17HiddenMaxEther
 	bg_event 8, 77, BGEVENT_ITEM, Route17HiddenMaxElixer
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 4, 17, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerRiley, -1
 	object_event 9, 68, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBikerJoel, -1
 	object_event 3, 53, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBikerGlenn, -1
diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm
index 7ccc3f992..5b863d524 100644
--- a/maps/Route17Route18Gate.asm
+++ b/maps/Route17Route18Gate.asm
@@ -2,12 +2,10 @@ const_value set 2
 	const ROUTE17ROUTE18GATE_OFFICER
 
 Route17Route18Gate_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -52,24 +50,19 @@ UnknownText_0x7364d:
 	done
 
 Route17Route18Gate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 0, 4, 1, ROUTE_17
 	warp_event 0, 5, 2, ROUTE_17
 	warp_event 9, 4, 1, ROUTE_18
 	warp_event 9, 5, 2, ROUTE_18
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 5, 4, 0, UnknownScript_0x73611
 	coord_event 5, 5, 0, UnknownScript_0x73611
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route17Route18GateOfficerScript, -1
diff --git a/maps/Route18.asm b/maps/Route18.asm
index 66e31a2e8..51dee07e9 100644
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const ROUTE18_YOUNGSTER2
 
 Route18_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerBirdKeeperBoris:
 	trainer BIRD_KEEPER, BORIS, EVENT_BEAT_BIRD_KEEPER_BORIS, BirdKeeperBorisSeenText, BirdKeeperBorisBeatenText, 0, .Script
@@ -78,22 +76,17 @@ Route18SignText:
 	done
 
 Route18_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 6, 3, ROUTE_17_ROUTE_18_GATE
 	warp_event 2, 7, 4, ROUTE_17_ROUTE_18_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 9, 5, BGEVENT_READ, Route18Sign
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 9, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1
 	object_event 13, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1
diff --git a/maps/Route19.asm b/maps/Route19.asm
index 0fb64bf70..123da8374 100644
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -7,11 +7,9 @@ const_value set 2
 	const ROUTE19_FISHER2
 
 Route19_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .ClearRocks
 
 .ClearRocks:
@@ -235,23 +233,18 @@ CarefulSwimmingSignText:
 	done
 
 Route19_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 7, 3, 3, ROUTE_19_FUCHSIA_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 11, 13, BGEVENT_READ, Route19Sign
 	bg_event 11, 1, BGEVENT_READ, CarefulSwimmingSign
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 9, 23, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1
 	object_event 13, 28, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermHarold, -1
 	object_event 11, 17, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermJerome, -1
diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm
index e4eae5fab..ea0a5fa04 100644
--- a/maps/Route19FuchsiaGate.asm
+++ b/maps/Route19FuchsiaGate.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const ROUTE19FUCHSIAGATE_OFFICER
 
 Route19FuchsiaGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 OfficerScript_0x1ab3f6:
 	faceplayer
@@ -46,22 +44,17 @@ UnknownText_0x1ab48a:
 	done
 
 Route19FuchsiaGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 4, 0, 10, FUCHSIA_CITY
 	warp_event 5, 0, 11, FUCHSIA_CITY
 	warp_event 4, 7, 1, ROUTE_19
 	warp_event 5, 7, 1, ROUTE_19
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1ab3f6, -1
diff --git a/maps/Route2.asm b/maps/Route2.asm
index d60c39de4..27f3e0c8b 100644
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -9,11 +9,9 @@ const_value set 2
 	const ROUTE2_FRUIT_TREE
 
 Route2_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerBugCatcherRob:
 	trainer BUG_CATCHER, ROB, EVENT_BEAT_BUG_CATCHER_ROB, BugCatcherRobSeenText, BugCatcherRobBeatenText, 0, .Script
@@ -147,22 +145,18 @@ UnknownText_0x1ac49f:
 	done
 
 Route2_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 15, 15, 1, ROUTE_2_NUGGET_HOUSE
 	warp_event 15, 31, 3, ROUTE_2_GATE
 	warp_event 16, 27, 1, ROUTE_2_GATE
 	warp_event 17, 27, 2, ROUTE_2_GATE
 	warp_event 12, 7, 3, DIGLETTS_CAVE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 6
+	db 6 ; bg events
 	bg_event 7, 51, BGEVENT_READ, Route2Sign
 	bg_event 11, 9, BGEVENT_READ, MapRoute2Signpost1Script
 	bg_event 7, 23, BGEVENT_ITEM, Route2HiddenMaxEther
@@ -170,8 +164,7 @@ Route2_MapEvents:
 	bg_event 4, 27, BGEVENT_ITEM, Route2HiddenFullRestore
 	bg_event 11, 30, BGEVENT_ITEM, Route2HiddenRevive
 
-.ObjectEvents:
-	db 8
+	db 8 ; object events
 	object_event 10, 45, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherRob, -1
 	object_event 6, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1
 	object_event 0, 40, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1
diff --git a/maps/Route20.asm b/maps/Route20.asm
index 0fd0485e2..da7900400 100644
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const ROUTE20_SWIMMER_GUY
 
 Route20_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .ClearRocks
 
 .ClearRocks:
@@ -113,22 +111,17 @@ CinnabarGymSignText:
 	done
 
 Route20_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 38, 7, 1, SEAFOAM_GYM
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 37, 11, BGEVENT_READ, CinnabarGymSign
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 52, 8, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1
 	object_event 45, 13, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfLori, -1
 	object_event 12, 13, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCameron, -1
diff --git a/maps/Route21.asm b/maps/Route21.asm
index e44d47b96..e7bee259d 100644
--- a/maps/Route21.asm
+++ b/maps/Route21.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const ROUTE21_FISHER
 
 Route21_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerSwimmermSeth:
 	trainer SWIMMERM, SETH, EVENT_BEAT_SWIMMERM_SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, .Script
@@ -90,20 +88,15 @@ FisherArnoldAfterBattleText:
 	done
 
 Route21_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 0
+	db 0 ; warp events
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 11, 16, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNikki, -1
 	object_event 2, 30, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSeth, -1
 	object_event 14, 22, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherArnold, -1
diff --git a/maps/Route22.asm b/maps/Route22.asm
index 7457f716f..b34daae20 100644
--- a/maps/Route22.asm
+++ b/maps/Route22.asm
@@ -1,9 +1,7 @@
 Route22_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 VictoryRoadEntranceSign:
 	jumptext VictoryRoadEntranceSignText
@@ -16,19 +14,14 @@ VictoryRoadEntranceSignText:
 	done
 
 Route22_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 13, 5, 1, VICTORY_ROAD_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 15, 7, BGEVENT_READ, VictoryRoadEntranceSign
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/Route23.asm b/maps/Route23.asm
index 69bb7d0c0..a2149e6b9 100644
--- a/maps/Route23.asm
+++ b/maps/Route23.asm
@@ -1,9 +1,7 @@
 Route23_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -23,22 +21,17 @@ IndigoPlateauSignText:
 	done
 
 Route23_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 9, 5, 1, INDIGO_PLATEAU_POKECENTER_1F
 	warp_event 10, 5, 2, INDIGO_PLATEAU_POKECENTER_1F
 	warp_event 9, 13, 10, VICTORY_ROAD
 	warp_event 10, 13, 10, VICTORY_ROAD
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 11, 7, BGEVENT_READ, IndigoPlateauSign
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/Route24.asm b/maps/Route24.asm
index de6c3821a..ada8cdab1 100644
--- a/maps/Route24.asm
+++ b/maps/Route24.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const ROUTE24_ROCKET
 
 Route24_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RocketScript_0x1adbfa:
 	faceplayer
@@ -119,18 +117,13 @@ UnknownText_0x1adee1:
 	done
 
 Route24_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 0
+	db 0 ; warp events
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 8, 7, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET
diff --git a/maps/Route25.asm b/maps/Route25.asm
index a088f9845..9983a2bb4 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -12,13 +12,11 @@ const_value set 2
 	const ROUTE25_POKE_BALL
 
 Route25_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -430,25 +428,20 @@ BillsHouseSignText:
 	done
 
 Route25_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 47, 5, 1, BILLS_HOUSE
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 42, 6, 1, UnknownScript_0x19eea0
 	coord_event 42, 7, 1, UnknownScript_0x19eee0
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 45, 5, BGEVENT_READ, BillsHouseSign
 	bg_event 4, 5, BGEVENT_ITEM, Route25HiddenPotion
 
-.ObjectEvents:
-	db 11
+	db 11 ; object events
 	object_event 46, 9, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
 	object_event 46, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
 	object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1
diff --git a/maps/Route26.asm b/maps/Route26.asm
index 9f5946774..096107e2e 100644
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -9,11 +9,9 @@ const_value set 2
 	const ROUTE26_POKE_BALL
 
 Route26_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerCooltrainermJake:
 	trainer COOLTRAINERM, JAKE, EVENT_BEAT_COOLTRAINERM_JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, .Script
@@ -413,24 +411,19 @@ Route26SignText:
 	done
 
 Route26_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 7, 5, 3, VICTORY_ROAD_GATE
 	warp_event 15, 57, 1, ROUTE_26_HEAL_HOUSE
 	warp_event 5, 71, 1, DAY_OF_WEEK_SIBLINGS_HOUSE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 8, 6, BGEVENT_READ, Route26Sign
 
-.ObjectEvents:
-	db 8
+	db 8 ; object events
 	object_event 14, 24, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermJake, -1
 	object_event 9, 38, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1
 	object_event 10, 56, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJoyce, -1
diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm
index 009bcc7a3..453ec4693 100644
--- a/maps/Route26HealHouse.asm
+++ b/maps/Route26HealHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const ROUTE26HEALHOUSE_TEACHER
 
 Route26HealHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TeacherScript_0x7b125:
 	faceplayer
@@ -49,22 +47,17 @@ UnknownText_0x7b18b:
 	done
 
 Route26HealHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 2, ROUTE_26
 	warp_event 3, 7, 2, ROUTE_26
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, Route26HealHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, Route26HealHouseBookshelf
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1
diff --git a/maps/Route27.asm b/maps/Route27.asm
index 0a7998a53..59fa811ee 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -10,13 +10,11 @@ const_value set 2
 	const ROUTE27_FISHER
 
 Route27_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -468,26 +466,21 @@ TohjoFallsSignText:
 	done
 
 Route27_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 33, 7, 1, ROUTE_27_SANDSTORM_HOUSE
 	warp_event 26, 5, 1, TOHJO_FALLS
 	warp_event 36, 5, 2, TOHJO_FALLS
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 18, 10, 0, UnknownScript_0x1a0873
 	coord_event 19, 10, 0, UnknownScript_0x1a0881
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 25, 7, BGEVENT_READ, TohjoFallsSign
 
-.ObjectEvents:
-	db 9
+	db 9 ; object events
 	object_event 48, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1
 	object_event 58, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermBrian, -1
 	object_event 72, 10, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfReena, -1
diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm
index af0bcbba1..cd78cb62c 100644
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const ROUTE27SANDSTORMHOUSE_GRANNY
 
 Route27SandstormHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SandstormHouseWoman:
 	faceplayer
@@ -94,22 +92,17 @@ SandstormHouseWomanDisloyalText:
 	done
 
 Route27SandstormHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 1, ROUTE_27
 	warp_event 3, 7, 1, ROUTE_27
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, SandstormHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, SandstormHouseBookshelf
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SandstormHouseWoman, -1
diff --git a/maps/Route28.asm b/maps/Route28.asm
index d42ef074c..ad729079d 100644
--- a/maps/Route28.asm
+++ b/maps/Route28.asm
@@ -1,9 +1,7 @@
 Route28_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route28Sign:
 	jumptext Route28SignText
@@ -16,21 +14,16 @@ Route28SignText:
 	done
 
 Route28_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 7, 3, 1, ROUTE_28_STEEL_WING_HOUSE
 	warp_event 33, 5, 7, VICTORY_ROAD_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 31, 5, BGEVENT_READ, Route28Sign
 	bg_event 25, 2, BGEVENT_ITEM, Route28HiddenRareCandy
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/Route28SteelWingHouse.asm b/maps/Route28SteelWingHouse.asm
index 5cff45ffe..b3c7856bb 100644
--- a/maps/Route28SteelWingHouse.asm
+++ b/maps/Route28SteelWingHouse.asm
@@ -3,12 +3,10 @@ const_value set 2
 	const ROUTE28STEELWINGHOUSE_FEAROW
 
 Route28SteelWingHouse_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -71,23 +69,18 @@ CelebritysFearowText:
 	done
 
 Route28SteelWingHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 1, ROUTE_28
 	warp_event 3, 7, 1, ROUTE_28
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, CelebrityHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, CelebrityHouseBookshelf
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Celebrity, -1
 	object_event 6, 5, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CelebritysFearow, -1
diff --git a/maps/Route29.asm b/maps/Route29.asm
index 2ca3d5ea2..0f018ac82 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -9,13 +9,11 @@ const_value set 2
 	const ROUTE29_POKE_BALL
 
 Route29_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .Tuscany
 
 .DummyScene0:
@@ -416,25 +414,20 @@ Route29Sign2Text:
 	done
 
 Route29_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 27, 1, 3, ROUTE_29_ROUTE_46_GATE
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 53, 8, 1, Route29Tutorial1
 	coord_event 53, 9, 1, Route29Tutorial2
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 51, 7, BGEVENT_READ, Route29Sign1
 	bg_event 3, 5, BGEVENT_READ, Route29Sign2
 
-.ObjectEvents:
-	db 8
+	db 8 ; object events
 	object_event 50, 12, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CatchingTutorialDudeScript, -1
 	object_event 27, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29YoungsterScript, -1
 	object_event 15, 11, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29TeacherScript, -1
diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm
index 813242e06..ec28965b8 100644
--- a/maps/Route29Route46Gate.asm
+++ b/maps/Route29Route46Gate.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const ROUTE29ROUTE46GATE_YOUNGSTER
 
 Route29Route46Gate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route29Route46GateOfficerScript:
 	jumptextfaceplayer Route29Route46GateOfficerText
@@ -37,23 +35,18 @@ Route29Route46GateYoungsterText:
 	done
 
 Route29Route46Gate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 4, 0, 1, ROUTE_46
 	warp_event 5, 0, 2, ROUTE_46
 	warp_event 4, 7, 1, ROUTE_29
 	warp_event 5, 7, 1, ROUTE_29
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route29Route46GateOfficerScript, -1
 	object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29Route46GateYoungsterScript, -1
diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm
index 18f41b70a..d3626f169 100644
--- a/maps/Route2Gate.asm
+++ b/maps/Route2Gate.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const ROUTE2GATE_SCIENTIST
 
 Route2Gate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route2GateScientistScript:
 	jumptextfaceplayer Route2GateScientistText
@@ -26,22 +24,17 @@ Route2GateScientistText:
 	done
 
 Route2Gate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 4, 0, 3, ROUTE_2
 	warp_event 5, 0, 4, ROUTE_2
 	warp_event 4, 7, 2, ROUTE_2
 	warp_event 5, 7, 2, ROUTE_2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 6, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2GateScientistScript, -1
diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm
index be7895b4f..451d9d177 100644
--- a/maps/Route2NuggetHouse.asm
+++ b/maps/Route2NuggetHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const ROUTE2NUGGETHOUSE_FISHER
 
 Route2NuggetHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 FisherScript_0x9b847:
 	faceplayer
@@ -53,20 +51,15 @@ UnknownText_0x9b8e5:
 	done
 
 Route2NuggetHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 1, ROUTE_2
 	warp_event 3, 7, 1, ROUTE_2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x9b847, -1
diff --git a/maps/Route3.asm b/maps/Route3.asm
index 82dc5fedf..65c8a35d2 100644
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const ROUTE3_FISHER2
 
 Route3_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerFirebreatherOtis:
 	trainer FIREBREATHER, OTIS, EVENT_BEAT_FIREBREATHER_OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, .Script
@@ -133,22 +131,17 @@ UnknownText_0x1ae163:
 	done
 
 Route3_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 52, 1, 1, MOUNT_MOON
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 49, 13, BGEVENT_READ, MapRoute3Signpost0Script
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 26, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1
 	object_event 10, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterWarren, -1
 	object_event 16, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1
diff --git a/maps/Route30.asm b/maps/Route30.asm
index 673282d53..744846670 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -12,11 +12,9 @@ const_value set 2
 	const ROUTE30_POKE_BALL
 
 Route30_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 YoungsterJoey_ImportantBattleScript:
 	waitsfx
@@ -407,27 +405,22 @@ YoungsterJoeyText_GiveHPUpAfterBattle:
 	done
 
 Route30_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 7, 39, 1, ROUTE_30_BERRY_HOUSE
 	warp_event 17, 5, 1, MR_POKEMONS_HOUSE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 5
+	db 5 ; bg events
 	bg_event 9, 43, BGEVENT_READ, Route30Sign
 	bg_event 13, 29, BGEVENT_READ, MrPokemonsHouseDirectionsSign
 	bg_event 15, 5, BGEVENT_READ, MrPokemonsHouseSign
 	bg_event 3, 21, BGEVENT_READ, Route30TrainerTips
 	bg_event 14, 9, BGEVENT_ITEM, Route30HiddenPotion
 
-.ObjectEvents:
-	db 11
+	db 11 ; object events
 	object_event 5, 26, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE
 	object_event 2, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY
 	object_event 5, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1
diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm
index f220b9ef1..a6586ce6a 100644
--- a/maps/Route30BerryHouse.asm
+++ b/maps/Route30BerryHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const ROUTE30BERRYHOUSE_POKEFAN_M
 
 Route30BerryHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 PokefanMScript_0x196d64:
 	faceplayer
@@ -47,22 +45,17 @@ UnknownText_0x196dec:
 	done
 
 Route30BerryHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 1, ROUTE_30
 	warp_event 3, 7, 1, ROUTE_30
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, Route30BerryHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, Route30BerryHouseBookshelf
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1
diff --git a/maps/Route31.asm b/maps/Route31.asm
index eb7c0b24b..3bb7f6871 100644
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -8,11 +8,9 @@ const_value set 2
 	const ROUTE31_POKE_BALL2
 
 Route31_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckMomCall
 
 .CheckMomCall:
@@ -418,25 +416,20 @@ DarkCaveSignText:
 	done
 
 Route31_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 4, 6, 3, ROUTE_31_VIOLET_GATE
 	warp_event 4, 7, 4, ROUTE_31_VIOLET_GATE
 	warp_event 34, 5, 1, DARK_CAVE_VIOLET_ENTRANCE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 7, 5, BGEVENT_READ, Route31Sign
 	bg_event 31, 5, BGEVENT_READ, DarkCaveSign
 
-.ObjectEvents:
-	db 7
+	db 7 ; object events
 	object_event 17, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31MailRecipientScript, -1
 	object_event 9, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31YoungsterScript, -1
 	object_event 21, 13, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherWade1, -1
diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm
index 6b8a4fb8e..a85a0bc44 100644
--- a/maps/Route31VioletGate.asm
+++ b/maps/Route31VioletGate.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const ROUTE31VIOLETGATE_COOLTRAINER_F
 
 Route31VioletGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route31VioletGateOfficerScript:
 	jumptextfaceplayer Route31VioletGateOfficerText
@@ -28,23 +26,18 @@ Route31VioletGateCooltrainerFText:
 	done
 
 Route31VioletGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 0, 4, 8, VIOLET_CITY
 	warp_event 0, 5, 9, VIOLET_CITY
 	warp_event 9, 4, 1, ROUTE_31
 	warp_event 9, 5, 2, ROUTE_31
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1
 	object_event 1, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1
diff --git a/maps/Route32.asm b/maps/Route32.asm
index c64d2c4ac..7035fe541 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -15,14 +15,12 @@ const_value set 2
 	const ROUTE32_POKE_BALL2
 
 Route32_MapScripts:
-.SceneScripts:
-	db 3
+	db 3 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 	scene_script .DummyScene2
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .Frieda
 
 .DummyScene0:
@@ -929,23 +927,19 @@ Route32UnionCaveSignText:
 	done
 
 Route32_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 11, 73, 1, ROUTE_32_POKECENTER_1F
 	warp_event 4, 2, 3, ROUTE_32_RUINS_OF_ALPH_GATE
 	warp_event 4, 3, 4, ROUTE_32_RUINS_OF_ALPH_GATE
 	warp_event 6, 79, 4, UNION_CAVE_1F
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 18, 8, 0, Route32CooltrainerMStopsYouScene
 	coord_event 7, 71, 1, Route32WannaBuyASlowpokeTailScript
 
-.BGEvents:
-	db 6
+	db 6 ; bg events
 	bg_event 13, 5, BGEVENT_READ, Route32Sign
 	bg_event 9, 1, BGEVENT_READ, Route32RuinsSign
 	bg_event 10, 84, BGEVENT_READ, Route32UnionCaveSign
@@ -953,8 +947,7 @@ Route32_MapEvents:
 	bg_event 12, 67, BGEVENT_ITEM, Route32HiddenGreatBall
 	bg_event 11, 40, BGEVENT_ITEM, Route32HiddenSuperPotion
 
-.ObjectEvents:
-	db 14
+	db 14 ; object events
 	object_event 8, 49, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherJustin, -1
 	object_event 12, 56, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherRalph1, -1
 	object_event 6, 48, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherHenry, -1
diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm
index 3643977df..3c852bff5 100644
--- a/maps/Route32Pokecenter1F.asm
+++ b/maps/Route32Pokecenter1F.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const ROUTE32POKECENTER1F_COOLTRAINER_F
 
 Route32Pokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 NurseScript_0x69b52:
 	jumpstd pokecenternurse
@@ -95,23 +93,18 @@ Route32Pokecenter1FCooltrainerFText:
 	done
 
 Route32Pokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 1, ROUTE_32
 	warp_event 4, 7, 1, ROUTE_32
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x69b52, -1
 	object_event 1, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1
 	object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1
diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm
index 94062ba23..b2b6af2d0 100644
--- a/maps/Route32RuinsOfAlphGate.asm
+++ b/maps/Route32RuinsOfAlphGate.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const ROUTE32RUINSOFALPHGATE_YOUNGSTER
 
 Route32RuinsOfAlphGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route32RuinsOfAlphGateOfficerScript:
 	jumptextfaceplayer Route32RuinsOfAlphGateOfficerText
@@ -47,24 +45,19 @@ Route32RuinsOfAlphGateYoungsterText:
 	done
 
 Route32RuinsOfAlphGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 0, 4, 10, RUINS_OF_ALPH_OUTSIDE
 	warp_event 0, 5, 11, RUINS_OF_ALPH_OUTSIDE
 	warp_event 9, 4, 2, ROUTE_32
 	warp_event 9, 5, 3, ROUTE_32
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1
 	object_event 8, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1
 	object_event 1, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1
diff --git a/maps/Route33.asm b/maps/Route33.asm
index 89d4a7f96..c728f6496 100644
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const ROUTE33_FRUIT_TREE
 
 Route33_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route33LassScript:
 	jumptextfaceplayer Route33LassText
@@ -195,22 +193,17 @@ Route33SignText:
 	done
 
 Route33_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 11, 9, 3, UNION_CAVE_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 11, 11, BGEVENT_READ, Route33Sign
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 6, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1
 	object_event 13, 16, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route33LassScript, -1
 	object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTreeScript, -1
diff --git a/maps/Route34.asm b/maps/Route34.asm
index 780160ce3..bd94515e3 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -14,11 +14,9 @@ const_value set 2
 	const ROUTE34_POKE_BALL
 
 Route34_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .EggCheckCallback
 
 .EggCheckCallback:
@@ -761,30 +759,25 @@ DayCareSignText:
 	done
 
 Route34_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 13, 37, 1, ROUTE_34_ILEX_FOREST_GATE
 	warp_event 14, 37, 2, ROUTE_34_ILEX_FOREST_GATE
 	warp_event 11, 14, 1, DAY_CARE
 	warp_event 11, 15, 2, DAY_CARE
 	warp_event 13, 15, 3, DAY_CARE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 5
+	db 5 ; bg events
 	bg_event 12, 6, BGEVENT_READ, Route34Sign
 	bg_event 13, 33, BGEVENT_READ, Route34TrainerTips
 	bg_event 10, 13, BGEVENT_READ, DayCareSign
 	bg_event 8, 32, BGEVENT_ITEM, Route34HiddenRareCandy
 	bg_event 17, 19, BGEVENT_ITEM, Route34HiddenSuperPotion
 
-.ObjectEvents:
-	db 13
+	db 13 ; object events
 	object_event 13, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperTodd1, -1
 	object_event 15, 32, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterSamuel, -1
 	object_event 11, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterIan, -1
diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
index 87565e381..f73e488bc 100644
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const ROUTE34ILEXFORESTGATE_TEACHER2
 
 Route34IlexForestGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .IsForestRestless
 
 .IsForestRestless:
@@ -136,25 +134,20 @@ Route34IlexForestGateLassText:
 	done
 
 Route34IlexForestGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 4, 0, 1, ROUTE_34
 	warp_event 5, 0, 2, ROUTE_34
 	warp_event 4, 7, 1, ILEX_FOREST
 	warp_event 5, 7, 1, ILEX_FOREST
 
-.CoordEvents:
-	db 1
+	db 1 ; coord events
 	coord_event 4, 7, 0, UnknownScript_0x62d3d
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 9, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER
 	object_event 9, 4, SPRITE_BUTTERFREE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexGateButterfree, -1
 	object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
diff --git a/maps/Route35.asm b/maps/Route35.asm
index 2702f9b3a..3af423d8e 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -12,11 +12,9 @@ const_value set 2
 	const ROUTE35_POKE_BALL
 
 Route35_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerBirdKeeperBryan:
 	trainer BIRD_KEEPER, BRYAN, EVENT_BEAT_BIRD_KEEPER_BRYAN, BirdKeeperBryanSeenText, BirdKeeperBryanBeatenText, 0, .Script
@@ -463,25 +461,20 @@ Route35SignText:
 	done
 
 Route35_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 9, 33, 1, ROUTE_35_GOLDENROD_GATE
 	warp_event 10, 33, 2, ROUTE_35_GOLDENROD_GATE
 	warp_event 3, 5, 3, ROUTE_35_NATIONAL_PARK_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 1, 7, BGEVENT_READ, Route35Sign
 	bg_event 11, 31, BGEVENT_READ, Route35Sign
 
-.ObjectEvents:
-	db 11
+	db 11 ; object events
 	object_event 4, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperIvan, -1
 	object_event 8, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperElliot, -1
 	object_event 7, 20, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1
diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm
index b396f8c82..386ac66fe 100644
--- a/maps/Route35GoldenrodGate.asm
+++ b/maps/Route35GoldenrodGate.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const ROUTE35GOLDENRODGATE_FISHER
 
 Route35GoldenrodGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 OfficerScript_0x69d37:
 	faceplayer
@@ -196,24 +194,19 @@ Route35GoldenrodGateFisherText:
 	done
 
 Route35GoldenrodGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 4, 0, 1, ROUTE_35
 	warp_event 5, 0, 2, ROUTE_35
 	warp_event 4, 7, 12, GOLDENROD_CITY
 	warp_event 5, 7, 12, GOLDENROD_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1
 	object_event 6, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1
 	object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index abd7f27d6..8be5b768a 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -4,14 +4,12 @@ const_value set 2
 	const ROUTE35NATIONALPARKGATE_OFFICER2
 
 Route35NationalParkGate_MapScripts:
-.SceneScripts:
-	db 3
+	db 3 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 	scene_script .LeaveContestEarly
 
-.MapCallbacks:
-	db 2
+	db 2 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning
 	callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable
 
@@ -438,25 +436,20 @@ UnknownText_0x6a90e:
 	done
 
 Route35NationalParkGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 3, 0, 3, NATIONAL_PARK
 	warp_event 4, 0, 4, NATIONAL_PARK
 	warp_event 3, 7, 3, ROUTE_35
 	warp_event 4, 7, 3, ROUTE_35
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 5, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 2, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
 	object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER
 	object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
diff --git a/maps/Route36.asm b/maps/Route36.asm
index 7395aa05b..cad07e31a 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -10,13 +10,11 @@ const_value set 2
 	const ROUTE36_SUICUNE
 
 Route36_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .ArthurCallback
 
 .DummyScene0:
@@ -660,30 +658,25 @@ Route36TrainerTips2Text:
 	done
 
 Route36_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 18, 8, 3, ROUTE_36_NATIONAL_PARK_GATE
 	warp_event 18, 9, 4, ROUTE_36_NATIONAL_PARK_GATE
 	warp_event 47, 13, 1, ROUTE_36_RUINS_OF_ALPH_GATE
 	warp_event 48, 13, 2, ROUTE_36_RUINS_OF_ALPH_GATE
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 20, 7, 1, Route36SuicuneScript
 	coord_event 22, 7, 1, Route36SuicuneScript
 
-.BGEvents:
-	db 4
+	db 4 ; bg events
 	bg_event 29, 1, BGEVENT_READ, Route36TrainerTips2
 	bg_event 45, 11, BGEVENT_READ, RuinsOfAlphNorthSign
 	bg_event 55, 7, BGEVENT_READ, Route36Sign
 	bg_event 21, 7, BGEVENT_READ, Route36TrainerTips1
 
-.ObjectEvents:
-	db 9
+	db 9 ; object events
 	object_event 20, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicMark, -1
 	object_event 31, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1
 	object_event 35, 9, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index 61d9f917f..a635fd8a7 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -13,14 +13,12 @@ const_value set 2
 	const ROUTE36NATIONALPARKGATE_OFFICER2
 
 Route36NationalParkGate_MapScripts:
-.SceneScripts:
-	db 3
+	db 3 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 	scene_script .LeaveContestEarly
 
-.MapCallbacks:
-	db 2
+	db 2 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning
 	callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable
 
@@ -850,25 +848,20 @@ UnknownText_0x6b97f:
 	done
 
 Route36NationalParkGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 0, 4, 1, NATIONAL_PARK
 	warp_event 0, 5, 2, NATIONAL_PARK
 	warp_event 9, 4, 1, ROUTE_36
 	warp_event 9, 5, 2, ROUTE_36
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 6, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script
 
-.ObjectEvents:
-	db 12
+	db 12 ; object events
 	object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
 	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B
 	object_event 4, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B
diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm
index 3d6130cf6..acea3628c 100644
--- a/maps/Route36RuinsOfAlphGate.asm
+++ b/maps/Route36RuinsOfAlphGate.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const ROUTE36RUINSOFALPHGATE_GRAMPS
 
 Route36RuinsOfAlphGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route36RuinsOfAlphGateOfficerScript:
 	jumptextfaceplayer Route36RuinsOfAlphGateOfficerText
@@ -35,23 +33,18 @@ Route36RuinsOfAlphGateGrampsText:
 	done
 
 Route36RuinsOfAlphGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 4, 0, 3, ROUTE_36
 	warp_event 5, 0, 4, ROUTE_36
 	warp_event 4, 7, 9, RUINS_OF_ALPH_OUTSIDE
 	warp_event 5, 7, 9, RUINS_OF_ALPH_OUTSIDE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateOfficerScript, -1
 	object_event 7, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateGrampsScript, -1
diff --git a/maps/Route37.asm b/maps/Route37.asm
index 09af64530..a57549911 100644
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -8,11 +8,9 @@ const_value set 2
 	const ROUTE37_FRUIT_TREE3
 
 Route37_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .Sunny
 
 .Sunny:
@@ -238,22 +236,17 @@ Route37SignText:
 	done
 
 Route37_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 0
+	db 0 ; warp events
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 5, 3, BGEVENT_READ, Route37Sign
 	bg_event 4, 2, BGEVENT_ITEM, Route37HiddenEther
 
-.ObjectEvents:
-	db 7
+	db 7 ; object events
 	object_event 6, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1
 	object_event 7, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1
 	object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicGreg, -1
diff --git a/maps/Route38.asm b/maps/Route38.asm
index 37c64b3b0..7a3c038c1 100644
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -8,11 +8,9 @@ const_value set 2
 	const ROUTE38_BUENA2
 
 Route38_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerBirdKeeperToby:
 	trainer BIRD_KEEPER, TOBY, EVENT_BEAT_BIRD_KEEPER_TOBY, BirdKeeperTobySeenText, BirdKeeperTobyBeatenText, 0, .Script
@@ -473,24 +471,19 @@ Route38TrainerTipsText:
 	done
 
 Route38_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 35, 8, 1, ROUTE_38_ECRUTEAK_GATE
 	warp_event 35, 9, 2, ROUTE_38_ECRUTEAK_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 33, 7, BGEVENT_READ, Route38Sign
 	bg_event 5, 13, BGEVENT_READ, Route38TrainerTips
 
-.ObjectEvents:
-	db 7
+	db 7 ; object events
 	object_event 4, 1, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1
 	object_event 15, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1
 	object_event 12, 15, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBirdKeeperToby, -1
diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm
index ccea75224..adf5419d3 100644
--- a/maps/Route38EcruteakGate.asm
+++ b/maps/Route38EcruteakGate.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const ROUTE38ECRUTEAKGATE_OFFICER
 
 Route38EcruteakGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route38EcruteakGateOfficerScript:
 	jumptextfaceplayer Route38EcruteakGateOfficerText
@@ -25,22 +23,17 @@ Route38EcruteakGateOfficerText:
 	done
 
 Route38EcruteakGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 0, 4, 1, ROUTE_38
 	warp_event 0, 5, 2, ROUTE_38
 	warp_event 9, 4, 14, ECRUTEAK_CITY
 	warp_event 9, 5, 15, ECRUTEAK_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route38EcruteakGateOfficerScript, -1
diff --git a/maps/Route39.asm b/maps/Route39.asm
index aa1f961be..b70995e26 100644
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -11,11 +11,9 @@ const_value set 2
 	const ROUTE39_POKEFAN_F2
 
 Route39_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route39Miltank:
 	opentext
@@ -344,26 +342,21 @@ Route39TrainerTipsText:
 	done
 
 Route39_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 1, 3, 1, ROUTE_39_BARN
 	warp_event 5, 3, 1, ROUTE_39_FARMHOUSE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 4
+	db 4 ; bg events
 	bg_event 5, 31, BGEVENT_READ, Route39TrainerTips
 	bg_event 9, 5, BGEVENT_READ, MoomooFarmSign
 	bg_event 15, 7, BGEVENT_READ, Route39Sign
 	bg_event 5, 13, BGEVENT_ITEM, Route39HiddenNugget
 
-.ObjectEvents:
-	db 10
+	db 10 ; object events
 	object_event 13, 29, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSailorEugene, -1
 	object_event 10, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmDerek1, -1
 	object_event 11, 19, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanfRuth, -1
diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm
index 02a168a34..103d924e6 100644
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const ROUTE39BARN_MOOMOO
 
 Route39Barn_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TwinScript_0x9cc76:
 	faceplayer
@@ -189,22 +187,17 @@ Text_RefusedToGiveBerry:
 	done
 
 Route39Barn_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 3, 7, 1, ROUTE_39
 	warp_event 4, 7, 1, ROUTE_39
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 2, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc76, -1
 	object_event 4, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1
 	object_event 3, 3, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MooMoo, -1
diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm
index ae54e507a..96a19b608 100644
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const ROUTE39FARMHOUSE_POKEFAN_F
 
 Route39Farmhouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 PokefanM_DairyFarmer:
 	faceplayer
@@ -193,23 +191,18 @@ FarmerFText_SnoreSpeech:
 	done
 
 Route39Farmhouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 2, ROUTE_39
 	warp_event 3, 7, 2, ROUTE_39
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, FarmhouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, FarmhouseBookshelf
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 3, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1
 	object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1
diff --git a/maps/Route4.asm b/maps/Route4.asm
index 33ee0ef84..724a57dec 100644
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const ROUTE4_POKE_BALL
 
 Route4_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerBirdKeeperHank:
 	trainer BIRD_KEEPER, HANK, EVENT_BEAT_BIRD_KEEPER_HANK, BirdKeeperHankSeenText, BirdKeeperHankBeatenText, 0, .Script
@@ -121,23 +119,18 @@ MtMoonSquareSignText:
 	done
 
 Route4_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 2, 5, 2, MOUNT_MOON
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 3, 7, BGEVENT_READ, MtMoonSquareSign
 	bg_event 10, 3, BGEVENT_ITEM, Route4HiddenUltraBall
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 17, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1
 	object_event 9, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1
 	object_event 21, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1
diff --git a/maps/Route40.asm b/maps/Route40.asm
index b5766044a..ef6614926 100644
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -13,11 +13,9 @@ const_value set 2
 	const ROUTE40_STANDING_YOUNGSTER
 
 Route40_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .MonicaCallback
 
 .MonicaCallback:
@@ -338,23 +336,18 @@ Route40SignText:
 	done
 
 Route40_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 9, 5, 1, ROUTE_40_BATTLE_TOWER_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 14, 10, BGEVENT_READ, Route40Sign
 	bg_event 7, 8, BGEVENT_ITEM, Route40HiddenHyperPotion
 
-.ObjectEvents:
-	db 12
+	db 12 ; object events
 	object_event 14, 15, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSimon, -1
 	object_event 18, 30, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerSwimmermRandall, -1
 	object_event 3, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1
diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm
index 1a7bffc01..d30401714 100644
--- a/maps/Route40BattleTowerGate.asm
+++ b/maps/Route40BattleTowerGate.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const ROUTE40BATTLETOWERGATE_TWIN
 
 Route40BattleTowerGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .ShowSailor
 
 .ShowSailor:
@@ -71,23 +69,18 @@ Route40BattleTowerGateTwinText:
 	done
 
 Route40BattleTowerGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 4, 7, 1, ROUTE_40
 	warp_event 5, 7, 1, ROUTE_40
 	warp_event 4, 0, 1, BATTLE_TOWER_OUTSIDE
 	warp_event 5, 0, 2, BATTLE_TOWER_OUTSIDE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 3, 3, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
 	object_event 7, 5, SPRITE_TWIN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateTwinScript, -1
diff --git a/maps/Route41.asm b/maps/Route41.asm
index 606bfb25a..4307ff3b4 100644
--- a/maps/Route41.asm
+++ b/maps/Route41.asm
@@ -11,11 +11,9 @@ const_value set 2
 	const ROUTE41_SWIMMER_GIRL5
 
 Route41_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerSwimmerfKaylee:
 	trainer SWIMMERF, KAYLEE, EVENT_BEAT_SWIMMERF_KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, .Script
@@ -342,25 +340,20 @@ SwimmerfWendyAfterBattleText:
 	done
 
 Route41_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 12, 17, 1, WHIRL_ISLAND_NW
 	warp_event 36, 19, 1, WHIRL_ISLAND_NE
 	warp_event 12, 37, 1, WHIRL_ISLAND_SW
 	warp_event 36, 45, 1, WHIRL_ISLAND_SE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 9, 35, BGEVENT_ITEM, Route41HiddenMaxEther
 
-.ObjectEvents:
-	db 10
+	db 10 ; object events
 	object_event 32, 6, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1
 	object_event 46, 8, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1
 	object_event 20, 26, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermBerke, -1
diff --git a/maps/Route42.asm b/maps/Route42.asm
index c7e2f7396..075b35dff 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -10,13 +10,11 @@ const_value set 2
 	const ROUTE42_SUICUNE
 
 Route42_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -319,31 +317,26 @@ Route42Sign2Text:
 	done
 
 Route42_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 0, 8, 3, ROUTE_42_ECRUTEAK_GATE
 	warp_event 0, 9, 4, ROUTE_42_ECRUTEAK_GATE
 	warp_event 10, 5, 1, MOUNT_MORTAR_1F_OUTSIDE
 	warp_event 28, 9, 2, MOUNT_MORTAR_1F_OUTSIDE
 	warp_event 46, 7, 3, MOUNT_MORTAR_1F_OUTSIDE
 
-.CoordEvents:
-	db 1
+	db 1 ; coord events
 	coord_event 24, 14, 1, Route42SuicuneScript
 
-.BGEvents:
-	db 5
+	db 5 ; bg events
 	bg_event 4, 10, BGEVENT_READ, Route42Sign1
 	bg_event 7, 5, BGEVENT_READ, MtMortarSign1
 	bg_event 45, 9, BGEVENT_READ, MtMortarSign2
 	bg_event 54, 8, BGEVENT_READ, Route42Sign2
 	bg_event 16, 11, BGEVENT_ITEM, Route42HiddenMaxPotion
 
-.ObjectEvents:
-	db 9
+	db 9 ; object events
 	object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully1, -1
 	object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1
 	object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1
diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm
index b42d9201b..2417cd0d8 100644
--- a/maps/Route42EcruteakGate.asm
+++ b/maps/Route42EcruteakGate.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const ROUTE42ECRUTEAKGATE_OFFICER
 
 Route42EcruteakGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route42EcruteakGateOfficerScript:
 	jumptextfaceplayer Route42EcruteakGateOfficerText
@@ -20,22 +18,17 @@ Route42EcruteakGateOfficerText:
 	done
 
 Route42EcruteakGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 0, 4, 1, ECRUTEAK_CITY
 	warp_event 0, 5, 2, ECRUTEAK_CITY
 	warp_event 9, 4, 1, ROUTE_42
 	warp_event 9, 5, 2, ROUTE_42
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route42EcruteakGateOfficerScript, -1
diff --git a/maps/Route43.asm b/maps/Route43.asm
index 50401b72c..b19560edd 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -9,11 +9,9 @@ const_value set 2
 	const ROUTE43_POKE_BALL
 
 Route43_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckIfRockets
 
 .CheckIfRockets:
@@ -501,28 +499,23 @@ Route43TrainerTipsText:
 	done
 
 Route43_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 9, 51, 1, ROUTE_43_MAHOGANY_GATE
 	warp_event 10, 51, 2, ROUTE_43_MAHOGANY_GATE
 	warp_event 17, 35, 3, ROUTE_43_GATE
 	warp_event 17, 31, 1, ROUTE_43_GATE
 	warp_event 18, 31, 2, ROUTE_43_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 13, 3, BGEVENT_READ, Route43Sign1
 	bg_event 11, 49, BGEVENT_READ, Route43Sign2
 	bg_event 16, 38, BGEVENT_READ, Route43TrainerTips
 
-.ObjectEvents:
-	db 8
+	db 8 ; object events
 	object_event 13, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacBen, -1
 	object_event 13, 20, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacBrent1, -1
 	object_event 14, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacRon, -1
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index 793c56a7f..886768431 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -6,13 +6,11 @@ const_value set 2
 	const ROUTE43GATE_ROCKET2
 
 Route43Gate_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .RocketShakedown
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckIfRockets
 
 .RocketShakedown:
@@ -248,24 +246,19 @@ OfficerText_AvoidGrass:
 	done
 
 Route43Gate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 4, 0, 4, ROUTE_43
 	warp_event 5, 0, 5, ROUTE_43
 	warp_event 4, 7, 3, ROUTE_43
 	warp_event 5, 7, 3, ROUTE_43
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS
 	object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS
 	object_event 7, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS
diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm
index 7a5e8901b..6e9431b2b 100644
--- a/maps/Route43MahoganyGate.asm
+++ b/maps/Route43MahoganyGate.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const ROUTE43MAHOGANYGATE_OFFICER
 
 Route43MahoganyGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 OfficerScript_0x19ab0b:
 	faceplayer
@@ -39,22 +37,17 @@ UnknownText_0x19ab65:
 	done
 
 Route43MahoganyGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 4, 0, 1, ROUTE_43
 	warp_event 5, 0, 2, ROUTE_43
 	warp_event 4, 7, 5, MAHOGANY_TOWN
 	warp_event 5, 7, 5, MAHOGANY_TOWN
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x19ab0b, -1
diff --git a/maps/Route44.asm b/maps/Route44.asm
index a4126a816..faaa0c49f 100644
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -12,11 +12,9 @@ const_value set 2
 	const ROUTE44_POKE_BALL3
 
 Route44_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerBirdKeeperVance1:
 	trainer BIRD_KEEPER, VANCE1, EVENT_BEAT_BIRD_KEEPER_VANCE, BirdKeeperVance1SeenText, BirdKeeperVance1BeatenText, 0, .Script
@@ -507,24 +505,19 @@ Route44Sign2Text:
 	done
 
 Route44_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 56, 7, 1, ICE_PATH_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 53, 7, BGEVENT_READ, Route44Sign1
 	bg_event 6, 10, BGEVENT_READ, Route44Sign2
 	bg_event 32, 9, BGEVENT_ITEM, Route44HiddenElixer
 
-.ObjectEvents:
-	db 11
+	db 11 ; object events
 	object_event 35, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherWilton1, -1
 	object_event 19, 13, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherEdgar, -1
 	object_event 10, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicPhil, -1
diff --git a/maps/Route45.asm b/maps/Route45.asm
index b2f0cc35d..6a28d3d27 100644
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -14,11 +14,9 @@ const_value set 2
 	const ROUTE45_YOUNGSTER
 
 Route45_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerBlackbeltKenji:
 	trainer BLACKBELT_T, KENJI3, EVENT_BEAT_BLACKBELT_KENJI, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, .Script
@@ -532,23 +530,18 @@ Route45SignText:
 	done
 
 Route45_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 2, 5, 1, DARK_CAVE_BLACKTHORN_ENTRANCE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 10, 4, BGEVENT_READ, Route45Sign
 	bg_event 13, 80, BGEVENT_ITEM, Route45HiddenPpUp
 
-.ObjectEvents:
-	db 13
+	db 13 ; object events
 	object_event 10, 16, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerErik, -1
 	object_event 15, 65, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerMichael, -1
 	object_event 5, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerParry, -1
diff --git a/maps/Route46.asm b/maps/Route46.asm
index ad42fe712..0a80bec05 100644
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -7,11 +7,9 @@ const_value set 2
 	const ROUTE46_POKE_BALL
 
 Route46_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerCamperTed:
 	trainer CAMPER, TED, EVENT_BEAT_CAMPER_TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script
@@ -251,24 +249,19 @@ Route46SignText:
 	done
 
 Route46_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 7, 33, 1, ROUTE_29_ROUTE_46_GATE
 	warp_event 8, 33, 2, ROUTE_29_ROUTE_46_GATE
 	warp_event 14, 5, 3, DARK_CAVE_VIOLET_ENTRANCE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 9, 27, BGEVENT_READ, Route46Sign
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 12, 19, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerBailey, -1
 	object_event 4, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1
 	object_event 2, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1
diff --git a/maps/Route5.asm b/maps/Route5.asm
index f9dbb8224..a53bb0f3c 100644
--- a/maps/Route5.asm
+++ b/maps/Route5.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const ROUTE5_POKEFAN_M
 
 Route5_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route5PokefanMScript:
 	jumptextfaceplayer Route5PokefanMText
@@ -40,24 +38,19 @@ HouseForSaleSignText:
 	done
 
 Route5_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
 	warp_event 8, 17, 1, ROUTE_5_SAFFRON_GATE
 	warp_event 9, 17, 2, ROUTE_5_SAFFRON_GATE
 	warp_event 10, 11, 1, ROUTE_5_CLEANSE_TAG_HOUSE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 17, 17, BGEVENT_READ, Route5UndergroundPathSign
 	bg_event 10, 11, BGEVENT_READ, HouseForSaleSign
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 17, 16, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm
index c5eae7d35..53e12f430 100644
--- a/maps/Route5CleanseTagHouse.asm
+++ b/maps/Route5CleanseTagHouse.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const ROUTE5CLEANSETAGHOUSE_TEACHER
 
 Route5CleanseTagHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 GrannyScript_0x18b634:
 	faceplayer
@@ -61,23 +59,18 @@ Route5CleanseTagHouseTeacherText:
 	done
 
 Route5CleanseTagHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 4, ROUTE_5
 	warp_event 3, 7, 4, ROUTE_5
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, HouseForSaleBookshelf
 	bg_event 1, 1, BGEVENT_READ, HouseForSaleBookshelf
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 2, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x18b634, -1
 	object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseTeacherScript, -1
diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm
index 113ff7ceb..c10a35d75 100644
--- a/maps/Route5SaffronGate.asm
+++ b/maps/Route5SaffronGate.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const ROUTE5SAFFRONGATE_OFFICER
 
 Route5SaffronGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route5SaffronGateOfficerScript:
 	jumptextfaceplayer Route5SaffronGateOfficerText
@@ -21,22 +19,17 @@ Route5SaffronGateOfficerText:
 	done
 
 Route5SaffronGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 4, 0, 2, ROUTE_5
 	warp_event 5, 0, 3, ROUTE_5
 	warp_event 4, 7, 9, SAFFRON_CITY
 	warp_event 5, 7, 9, SAFFRON_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronGateOfficerScript, -1
diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm
index dae482f5b..39013b51d 100644
--- a/maps/Route5UndergroundPathEntrance.asm
+++ b/maps/Route5UndergroundPathEntrance.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const ROUTE5UNDERGROUNDPATHENTRANCE_TEACHER
 
 Route5UndergroundPathEntrance_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route5UndergroundPathEntranceTeacherScript:
 	jumptextfaceplayer Route5UndergroundPathEntranceTeacherText
@@ -20,21 +18,16 @@ Route5UndergroundPathEntranceTeacherText:
 	done
 
 Route5UndergroundPathEntrance_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 1, ROUTE_5
 	warp_event 4, 7, 1, ROUTE_5
 	warp_event 4, 3, 1, UNDERGROUND_PATH
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route5UndergroundPathEntranceTeacherScript, -1
diff --git a/maps/Route6.asm b/maps/Route6.asm
index c383dc7f5..fb00e641e 100644
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const ROUTE6_POKEFAN_M3
 
 Route6_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerPokefanmRex:
 	trainer POKEFANM, REX, EVENT_BEAT_POKEFANM_REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, .Script
@@ -92,23 +90,18 @@ PokefanmAllanAfterBattleText:
 	done
 
 Route6_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 17, 3, 1, ROUTE_6_UNDERGROUND_PATH_ENTRANCE
 	warp_event 6, 1, 3, ROUTE_6_SAFFRON_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 19, 5, BGEVENT_READ, Route6UndergroundPathSign
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 17, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
 	object_event 9, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmRex, -1
 	object_event 10, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmAllan, -1
diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm
index 202c449dd..ca5548ca0 100644
--- a/maps/Route6SaffronGate.asm
+++ b/maps/Route6SaffronGate.asm
@@ -2,12 +2,10 @@ const_value set 2
 	const ROUTE6SAFFRONGATE_OFFICER
 
 Route6SaffronGate_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -58,22 +56,17 @@ UnknownText_0x1927cb:
 	done
 
 Route6SaffronGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 4, 0, 12, SAFFRON_CITY
 	warp_event 5, 0, 13, SAFFRON_CITY
 	warp_event 4, 7, 2, ROUTE_6
 	warp_event 5, 7, 2, ROUTE_6
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1926ea, -1
diff --git a/maps/Route6UndergroundPathEntrance.asm b/maps/Route6UndergroundPathEntrance.asm
index 25bc23f3c..a17861c2b 100644
--- a/maps/Route6UndergroundPathEntrance.asm
+++ b/maps/Route6UndergroundPathEntrance.asm
@@ -1,25 +1,18 @@
 Route6UndergroundPathEntrance_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route6UndergroundPathEntrance_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 1, ROUTE_6
 	warp_event 4, 7, 1, ROUTE_6
 	warp_event 4, 3, 2, UNDERGROUND_PATH
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/Route7.asm b/maps/Route7.asm
index 2c6defa05..cea61fd24 100644
--- a/maps/Route7.asm
+++ b/maps/Route7.asm
@@ -1,9 +1,7 @@
 Route7_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route7UndergroundPathSign:
 	jumptext Route7UndergroundPathSignText
@@ -35,21 +33,16 @@ Route7LockedDoorText:
 	done
 
 Route7_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 15, 6, 1, ROUTE_7_SAFFRON_GATE
 	warp_event 15, 7, 2, ROUTE_7_SAFFRON_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 5, 11, BGEVENT_READ, Route7UndergroundPathSign
 	bg_event 6, 9, BGEVENT_READ, Route7LockedDoor
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm
index d2f0e11ba..9e7b785c1 100644
--- a/maps/Route7SaffronGate.asm
+++ b/maps/Route7SaffronGate.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const ROUTE7SAFFRONGATE_OFFICER
 
 Route7SaffronGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 OfficerScript_0x73518:
 	faceplayer
@@ -46,22 +44,17 @@ UnknownText_0x73592:
 	done
 
 Route7SaffronGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 0, 4, 1, ROUTE_7
 	warp_event 0, 5, 2, ROUTE_7
 	warp_event 9, 4, 10, SAFFRON_CITY
 	warp_event 9, 5, 11, SAFFRON_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x73518, -1
diff --git a/maps/Route8.asm b/maps/Route8.asm
index 4a3d1a225..a7ab2783b 100644
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -7,11 +7,9 @@ const_value set 2
 	const ROUTE8_FRUIT_TREE
 
 Route8_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerBikerDwayne:
 	trainer BIKER, DWAYNE, EVENT_BEAT_BIKER_DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, .Script
@@ -173,24 +171,19 @@ Route8UndergroundPathSignText:
 	done
 
 Route8_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 4, 3, ROUTE_8_SAFFRON_GATE
 	warp_event 4, 5, 4, ROUTE_8_SAFFRON_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 11, 7, BGEVENT_READ, Route8UndergroundPathSign
 	bg_event 10, 5, BGEVENT_READ, Route8LockedDoor
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 10, 8, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerBikerDwayne, -1
 	object_event 10, 9, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerBikerHarris, -1
 	object_event 10, 10, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerBikerZeke, -1
diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm
index 735d4cdc2..beb0da6a5 100644
--- a/maps/Route8SaffronGate.asm
+++ b/maps/Route8SaffronGate.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const ROUTE8SAFFRONGATE_OFFICER
 
 Route8SaffronGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route8SaffronGateOfficerScript:
 	jumptextfaceplayer Route8SaffronGateOfficerText
@@ -20,22 +18,17 @@ Route8SaffronGateOfficerText:
 	done
 
 Route8SaffronGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 0, 4, 14, SAFFRON_CITY
 	warp_event 0, 5, 15, SAFFRON_CITY
 	warp_event 9, 4, 1, ROUTE_8
 	warp_event 9, 5, 2, ROUTE_8
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route8SaffronGateOfficerScript, -1
diff --git a/maps/Route9.asm b/maps/Route9.asm
index ff4c51523..d25430d27 100644
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -7,11 +7,9 @@ const_value set 2
 	const ROUTE9_POKEFAN_M2
 
 Route9_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerCamperDean:
 	trainer CAMPER, DEAN, EVENT_BEAT_CAMPER_DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, .Script
@@ -206,23 +204,18 @@ Route9SignText:
 	done
 
 Route9_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 48, 15, 1, ROCK_TUNNEL_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 15, 7, BGEVENT_READ, Route9Sign
 	bg_event 41, 15, BGEVENT_ITEM, Route9HiddenEther
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 23, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperDean, -1
 	object_event 39, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1
 	object_event 11, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperSid, -1
diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm
index 5d2ecbbc0..e1d30e461 100644
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -1,11 +1,9 @@
 RuinsOfAlphAerodactylChamber_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .CheckWall
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
 
 .CheckWall:
@@ -144,22 +142,18 @@ UnknownText_0x58ee7:
 	done
 
 RuinsOfAlphAerodactylChamber_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 3, 9, 4, RUINS_OF_ALPH_OUTSIDE
 	warp_event 4, 9, 4, RUINS_OF_ALPH_OUTSIDE
 	warp_event 3, 3, 8, RUINS_OF_ALPH_INNER_CHAMBER
 	warp_event 4, 3, 9, RUINS_OF_ALPH_INNER_CHAMBER
 	warp_event 4, 0, 1, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 6
+	db 6 ; bg events
 	bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script
 	bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script
 	bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost2Script
@@ -167,5 +161,4 @@ RuinsOfAlphAerodactylChamber_MapEvents:
 	bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost4Script
 	bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost5Script
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm
index 5d5db380e..be87d0302 100644
--- a/maps/RuinsOfAlphAerodactylItemRoom.asm
+++ b/maps/RuinsOfAlphAerodactylItemRoom.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL4
 
 RuinsOfAlphAerodactylItemRoom_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RuinsOfAlphAerodactylItemRoomGoldBerry:
 	itemball GOLD_BERRY
@@ -33,26 +31,21 @@ UnknownText_0x59ac1:
 	done
 
 RuinsOfAlphAerodactylItemRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 3, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER
 	warp_event 4, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER
 	warp_event 3, 1, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM
 	warp_event 4, 1, 2, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script
 	bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM
 	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM
 	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM
diff --git a/maps/RuinsOfAlphAerodactylWordRoom.asm b/maps/RuinsOfAlphAerodactylWordRoom.asm
index e71b09e4a..2da613f1c 100644
--- a/maps/RuinsOfAlphAerodactylWordRoom.asm
+++ b/maps/RuinsOfAlphAerodactylWordRoom.asm
@@ -1,25 +1,18 @@
 RuinsOfAlphAerodactylWordRoom_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RuinsOfAlphAerodactylWordRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 9, 5, 3, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
 	warp_event 10, 5, 4, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
 	warp_event 17, 11, 8, RUINS_OF_ALPH_INNER_CHAMBER
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm
index 1e1316c15..81282300b 100644
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -1,11 +1,9 @@
 RuinsOfAlphHoOhChamber_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .CheckWall
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
 
 .CheckWall:
@@ -145,22 +143,18 @@ UnknownText_0x586aa:
 	done
 
 RuinsOfAlphHoOhChamber_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 3, 9, 1, RUINS_OF_ALPH_OUTSIDE
 	warp_event 4, 9, 1, RUINS_OF_ALPH_OUTSIDE
 	warp_event 3, 3, 2, RUINS_OF_ALPH_INNER_CHAMBER
 	warp_event 4, 3, 3, RUINS_OF_ALPH_INNER_CHAMBER
 	warp_event 4, 0, 1, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 6
+	db 6 ; bg events
 	bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script
 	bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script
 	bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost2Script
@@ -168,5 +162,4 @@ RuinsOfAlphHoOhChamber_MapEvents:
 	bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost4Script
 	bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost5Script
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm
index 917d93380..70916792b 100644
--- a/maps/RuinsOfAlphHoOhItemRoom.asm
+++ b/maps/RuinsOfAlphHoOhItemRoom.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const RUINSOFALPHHOOHITEMROOM_POKE_BALL4
 
 RuinsOfAlphHoOhItemRoom_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RuinsOfAlphHoOhItemRoomGoldBerry:
 	itemball GOLD_BERRY
@@ -33,26 +31,21 @@ UnknownText_0x59923:
 	done
 
 RuinsOfAlphHoOhItemRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 3, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER
 	warp_event 4, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER
 	warp_event 3, 1, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM
 	warp_event 4, 1, 2, RUINS_OF_ALPH_HO_OH_WORD_ROOM
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
 	bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
 	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
 	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM
diff --git a/maps/RuinsOfAlphHoOhWordRoom.asm b/maps/RuinsOfAlphHoOhWordRoom.asm
index cfd70f7be..8f66f2f7b 100644
--- a/maps/RuinsOfAlphHoOhWordRoom.asm
+++ b/maps/RuinsOfAlphHoOhWordRoom.asm
@@ -1,25 +1,18 @@
 RuinsOfAlphHoOhWordRoom_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RuinsOfAlphHoOhWordRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 9, 9, 3, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
 	warp_event 10, 9, 4, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
 	warp_event 17, 21, 2, RUINS_OF_ALPH_INNER_CHAMBER
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm
index 6712533d9..ff9130613 100644
--- a/maps/RuinsOfAlphInnerChamber.asm
+++ b/maps/RuinsOfAlphInnerChamber.asm
@@ -4,13 +4,11 @@ const_value set 2
 	const RUINSOFALPHINNERCHAMBER_GRAMPS
 
 RuinsOfAlphInnerChamber_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .UnownAppear
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -77,11 +75,9 @@ RuinsOfAlphInnerChamberStatueText:
 	done
 
 RuinsOfAlphInnerChamber_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 9
+	db 9 ; warp events
 	warp_event 10, 13, 5, RUINS_OF_ALPH_OUTSIDE
 	warp_event 3, 15, 3, RUINS_OF_ALPH_HO_OH_CHAMBER
 	warp_event 4, 15, 4, RUINS_OF_ALPH_HO_OH_CHAMBER
@@ -92,11 +88,9 @@ RuinsOfAlphInnerChamber_MapEvents:
 	warp_event 15, 24, 3, RUINS_OF_ALPH_AERODACTYL_CHAMBER
 	warp_event 16, 24, 4, RUINS_OF_ALPH_AERODACTYL_CHAMBER
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 26
+	db 26 ; bg events
 	bg_event 2, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 	bg_event 5, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 	bg_event 8, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
@@ -124,8 +118,7 @@ RuinsOfAlphInnerChamber_MapEvents:
 	bg_event 14, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 	bg_event 17, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 3, 7, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
 	object_event 14, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberTeacherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
 	object_event 11, 19, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberGrampsScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index 1cbe7ee20..449fdaaaf 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -3,13 +3,11 @@ const_value set 2
 	const RUINSOFALPHKABUTOCHAMBER_SCIENTIST
 
 RuinsOfAlphKabutoChamber_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .CheckWall
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
 
 .CheckWall:
@@ -256,22 +254,18 @@ UnknownText_0x58b3f:
 	done
 
 RuinsOfAlphKabutoChamber_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 3, 9, 2, RUINS_OF_ALPH_OUTSIDE
 	warp_event 4, 9, 2, RUINS_OF_ALPH_OUTSIDE
 	warp_event 3, 3, 4, RUINS_OF_ALPH_INNER_CHAMBER
 	warp_event 4, 3, 5, RUINS_OF_ALPH_INNER_CHAMBER
 	warp_event 4, 0, 1, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 6
+	db 6 ; bg events
 	bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script
 	bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script
 	bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost2Script
@@ -279,7 +273,6 @@ RuinsOfAlphKabutoChamber_MapEvents:
 	bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost4Script
 	bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost5Script
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 5, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
 	object_event 3, 1, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1
diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm
index a0b4662ea..98e471cbf 100644
--- a/maps/RuinsOfAlphKabutoItemRoom.asm
+++ b/maps/RuinsOfAlphKabutoItemRoom.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const RUINSOFALPHKABUTOITEMROOM_POKE_BALL4
 
 RuinsOfAlphKabutoItemRoom_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RuinsOfAlphKabutoItemRoomBerry:
 	itemball BERRY
@@ -33,26 +31,21 @@ UnknownText_0x599ad:
 	done
 
 RuinsOfAlphKabutoItemRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 3, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER
 	warp_event 4, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER
 	warp_event 3, 1, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM
 	warp_event 4, 1, 2, RUINS_OF_ALPH_KABUTO_WORD_ROOM
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script
 	bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM
 	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM
 	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM
diff --git a/maps/RuinsOfAlphKabutoWordRoom.asm b/maps/RuinsOfAlphKabutoWordRoom.asm
index e5678c98c..79f8c98b6 100644
--- a/maps/RuinsOfAlphKabutoWordRoom.asm
+++ b/maps/RuinsOfAlphKabutoWordRoom.asm
@@ -1,25 +1,18 @@
 RuinsOfAlphKabutoWordRoom_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RuinsOfAlphKabutoWordRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 9, 5, 3, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
 	warp_event 10, 5, 4, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
 	warp_event 17, 11, 4, RUINS_OF_ALPH_INNER_CHAMBER
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm
index 1c4a8b4fa..490215ea3 100644
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -1,11 +1,9 @@
 RuinsOfAlphOmanyteChamber_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .CheckWall
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
 
 .CheckWall:
@@ -145,22 +143,18 @@ UnknownText_0x58d26:
 	done
 
 RuinsOfAlphOmanyteChamber_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 3, 9, 3, RUINS_OF_ALPH_OUTSIDE
 	warp_event 4, 9, 3, RUINS_OF_ALPH_OUTSIDE
 	warp_event 3, 3, 6, RUINS_OF_ALPH_INNER_CHAMBER
 	warp_event 4, 3, 7, RUINS_OF_ALPH_INNER_CHAMBER
 	warp_event 4, 0, 1, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 6
+	db 6 ; bg events
 	bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script
 	bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script
 	bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost2Script
@@ -168,5 +162,4 @@ RuinsOfAlphOmanyteChamber_MapEvents:
 	bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost4Script
 	bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost5Script
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm
index 510d76f2b..4ad567450 100644
--- a/maps/RuinsOfAlphOmanyteItemRoom.asm
+++ b/maps/RuinsOfAlphOmanyteItemRoom.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL4
 
 RuinsOfAlphOmanyteItemRoom_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RuinsOfAlphOmanyteItemRoomMysteryberry:
 	itemball MYSTERYBERRY
@@ -33,26 +31,21 @@ UnknownText_0x59a37:
 	done
 
 RuinsOfAlphOmanyteItemRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 3, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER
 	warp_event 4, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER
 	warp_event 3, 1, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM
 	warp_event 4, 1, 2, RUINS_OF_ALPH_OMANYTE_WORD_ROOM
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script
 	bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM
 	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM
 	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM
diff --git a/maps/RuinsOfAlphOmanyteWordRoom.asm b/maps/RuinsOfAlphOmanyteWordRoom.asm
index bc6d9ea99..c0bc8c777 100644
--- a/maps/RuinsOfAlphOmanyteWordRoom.asm
+++ b/maps/RuinsOfAlphOmanyteWordRoom.asm
@@ -1,25 +1,18 @@
 RuinsOfAlphOmanyteWordRoom_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RuinsOfAlphOmanyteWordRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 9, 7, 3, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
 	warp_event 10, 7, 4, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
 	warp_event 17, 13, 6, RUINS_OF_ALPH_INNER_CHAMBER
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index afe0b01e8..068a60a51 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -6,13 +6,11 @@ const_value set 2
 	const RUINSOFALPHOUTSIDE_YOUNGSTER3
 
 RuinsOfAlphOutside_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .ScientistCallback
 
 .DummyScene0:
@@ -281,11 +279,9 @@ UnknownText_0x5848e:
 	done
 
 RuinsOfAlphOutside_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 11
+	db 11 ; warp events
 	warp_event 2, 17, 1, RUINS_OF_ALPH_HO_OH_CHAMBER
 	warp_event 14, 7, 1, RUINS_OF_ALPH_KABUTO_CHAMBER
 	warp_event 2, 29, 1, RUINS_OF_ALPH_OMANYTE_CHAMBER
@@ -298,19 +294,16 @@ RuinsOfAlphOutside_MapEvents:
 	warp_event 13, 20, 1, ROUTE_32_RUINS_OF_ALPH_GATE
 	warp_event 13, 21, 2, ROUTE_32_RUINS_OF_ALPH_GATE
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 11, 14, 1, RuinsOfAlphOutsideScientistScene1
 	coord_event 10, 15, 1, RuinsOfAlphOutsideScientistScene2
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 16, 8, BGEVENT_READ, RuinsOfAlphOutsideSignpost0Script
 	bg_event 12, 16, BGEVENT_READ, RuinsOfAlphOutsideSignpost1Script
 	bg_event 18, 12, BGEVENT_READ, RuinsOfAlphOutsideSignpost2Script
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 4, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPsychicNathan, -1
 	object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST
 	object_event 13, 17, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index 9a6fbe79f..325f9dd9e 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -4,13 +4,11 @@ const_value set 2
 	const RUINSOFALPHRESEARCHCENTER_SCIENTIST3
 
 RuinsOfAlphResearchCenter_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .GetUnownDex
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .ScientistCallback
 
 .DummyScene0:
@@ -393,25 +391,20 @@ UnknownText_0x59886:
 	done
 
 RuinsOfAlphResearchCenter_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 6, RUINS_OF_ALPH_OUTSIDE
 	warp_event 3, 7, 6, RUINS_OF_ALPH_OUTSIDE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 6, 5, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost0Script
 	bg_event 3, 4, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost1Script
 	bg_event 7, 1, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost2Script
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 4, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1
 	object_event 5, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x59214, -1
 	object_event 2, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm
index fda3e6408..93c28b0e0 100644
--- a/maps/SafariZoneBeta.asm
+++ b/maps/SafariZoneBeta.asm
@@ -1,24 +1,17 @@
 SafariZoneBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SafariZoneBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 9, 23, 1, SAFARI_ZONE_FUCHSIA_GATE_BETA
 	warp_event 10, 23, 2, SAFARI_ZONE_FUCHSIA_GATE_BETA
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm
index cb618fd91..f0d39e723 100644
--- a/maps/SafariZoneFuchsiaGateBeta.asm
+++ b/maps/SafariZoneFuchsiaGateBeta.asm
@@ -1,26 +1,19 @@
 SafariZoneFuchsiaGateBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SafariZoneFuchsiaGateBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 4, 0, 1, SAFARI_ZONE_BETA
 	warp_event 5, 0, 2, SAFARI_ZONE_BETA
 	warp_event 4, 7, 7, FUCHSIA_CITY
 	warp_event 5, 7, 7, FUCHSIA_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm
index 2d0476d99..0c2deae10 100644
--- a/maps/SafariZoneMainOffice.asm
+++ b/maps/SafariZoneMainOffice.asm
@@ -1,24 +1,17 @@
 SafariZoneMainOffice_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SafariZoneMainOffice_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 2, FUCHSIA_CITY
 	warp_event 3, 7, 2, FUCHSIA_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm
index 8ab657803..2717a0c8d 100644
--- a/maps/SafariZoneWardensHome.asm
+++ b/maps/SafariZoneWardensHome.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const SAFARIZONEWARDENSHOME_LASS
 
 SafariZoneWardensHome_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 WardensGranddaughter:
 	faceplayer
@@ -77,24 +75,19 @@ SafariZonePhotoText:
 	done
 
 SafariZoneWardensHome_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 6, FUCHSIA_CITY
 	warp_event 3, 7, 6, FUCHSIA_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 4
+	db 4 ; bg events
 	bg_event 0, 1, BGEVENT_READ, WardensHomeBookshelf
 	bg_event 1, 1, BGEVENT_READ, WardensHomeBookshelf
 	bg_event 7, 0, BGEVENT_READ, WardenPhoto
 	bg_event 9, 0, BGEVENT_READ, SafariZonePhoto
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, WardensGranddaughter, -1
diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm
index 30263840f..bca1d0dde 100644
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -9,11 +9,9 @@ const_value set 2
 	const SAFFRONCITY_LASS2
 
 SaffronCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -266,11 +264,9 @@ SaffronCityMagnetTrainStationSignText:
 	done
 
 SaffronCity_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 15
+	db 15 ; warp events
 	warp_event 26, 3, 1, FIGHTING_DOJO
 	warp_event 34, 3, 1, SAFFRON_GYM
 	warp_event 25, 11, 2, SAFFRON_MART
@@ -287,11 +283,9 @@ SaffronCity_MapEvents:
 	warp_event 39, 22, 1, ROUTE_8_SAFFRON_GATE
 	warp_event 39, 23, 2, ROUTE_8_SAFFRON_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 8
+	db 8 ; bg events
 	bg_event 21, 5, BGEVENT_READ, SaffronCitySign
 	bg_event 33, 5, BGEVENT_READ, SaffronGymSign
 	bg_event 25, 5, BGEVENT_READ, FightingDojoSign
@@ -301,8 +295,7 @@ SaffronCity_MapEvents:
 	bg_event 10, 29, BGEVENT_READ, SaffronCityPokecenterSign
 	bg_event 26, 11, BGEVENT_READ, SaffronCityMartSign
 
-.ObjectEvents:
-	db 8
+	db 8 ; object events
 	object_event 7, 14, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LassScript_0x19932a, -1
 	object_event 19, 30, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19933e, -1
 	object_event 32, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1
diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm
index aacbda2af..9cceafe44 100644
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -7,11 +7,9 @@ const_value set 2
 	const SAFFRONGYM_GYM_GUY
 
 SaffronGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SabrinaScript_0x189c2e:
 	faceplayer
@@ -291,11 +289,9 @@ SaffronGymGuyWinText:
 	done
 
 SaffronGym_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 32
+	db 32 ; warp events
 	warp_event 8, 17, 2, SAFFRON_CITY
 	warp_event 9, 17, 2, SAFFRON_CITY
 	warp_event 11, 15, 18, SAFFRON_GYM
@@ -329,15 +325,12 @@ SaffronGym_MapEvents:
 	warp_event 1, 3, 16, SAFFRON_GYM
 	warp_event 11, 9, 17, SAFFRON_GYM
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 8, 15, BGEVENT_READ, SaffronGymStatue
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 9, 8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1
 	object_event 17, 16, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerMediumRebecca, -1
 	object_event 3, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1
diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm
index fa57423b1..69a7a3559 100644
--- a/maps/SaffronMagnetTrainStation.asm
+++ b/maps/SaffronMagnetTrainStation.asm
@@ -5,12 +5,10 @@ const_value set 2
 	const SAFFRONMAGNETTRAINSTATION_LASS
 
 SaffronMagnetTrainStation_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -216,25 +214,20 @@ SaffronMagnetTrainStationLassText:
 	done
 
 SaffronMagnetTrainStation_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 8, 17, 6, SAFFRON_CITY
 	warp_event 9, 17, 6, SAFFRON_CITY
 	warp_event 6, 5, 4, GOLDENROD_MAGNET_TRAIN_STATION
 	warp_event 11, 5, 3, GOLDENROD_MAGNET_TRAIN_STATION
 
-.CoordEvents:
-	db 1
+	db 1 ; coord events
 	coord_event 11, 6, 0, Script_ArriveFromGoldenrod
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1
 	object_event 10, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1
 	object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm
index 17d791759..65fbf100e 100644
--- a/maps/SaffronMart.asm
+++ b/maps/SaffronMart.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const SAFFRONMART_COOLTRAINER_F
 
 SaffronMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ClerkScript_0x18a3bf:
 	opentext
@@ -38,22 +36,17 @@ SaffronMartCooltrainerFText:
 	done
 
 SaffronMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 3, SAFFRON_CITY
 	warp_event 3, 7, 3, SAFFRON_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1
 	object_event 7, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1
 	object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1
diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm
index 93950a03b..b72315b15 100644
--- a/maps/SaffronPokecenter1F.asm
+++ b/maps/SaffronPokecenter1F.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const SAFFRONPOKECENTER1F_YOUNGSTER
 
 SaffronPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 NurseScript_0x18a47d:
 	jumpstd pokecenternurse
@@ -112,23 +110,18 @@ SaffronPokecenter1FYoungsterText:
 	done
 
 SaffronPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 4, SAFFRON_CITY
 	warp_event 4, 7, 4, SAFFRON_CITY
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1
 	object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1
 	object_event 8, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1
diff --git a/maps/SaffronPokecenter2FBeta.asm b/maps/SaffronPokecenter2FBeta.asm
index daf92a5d3..11d07cc3f 100644
--- a/maps/SaffronPokecenter2FBeta.asm
+++ b/maps/SaffronPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
 SaffronPokecenter2FBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SaffronPokecenter2FBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 0, 7, 3, SAFFRON_POKECENTER_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm
index 01d49532c..8931fdf8a 100644
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -3,12 +3,10 @@ const_value set 2
 	const SEAFOAMGYM_GYM_GUY
 
 SeafoamGym_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -158,20 +156,15 @@ SeafoamGymGuyWinText2:
 	done
 
 SeafoamGym_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 5, 5, 1, ROUTE_20
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 5, 2, SPRITE_BLAINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlaineScript_0x1ab4fb, -1
 	object_event 6, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY
diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm
index f9e03456b..eefb4d50e 100644
--- a/maps/SilphCo1F.asm
+++ b/maps/SilphCo1F.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const SILPHCO1F_OFFICER
 
 SilphCo1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SilphCoReceptionist:
 	jumptextfaceplayer SilphCoReceptionistText
@@ -56,21 +54,16 @@ UnknownText_0x18aca8:
 	done
 
 SilphCo1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 7, SAFFRON_CITY
 	warp_event 3, 7, 7, SAFFRON_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 4, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionist, -1
 	object_event 13, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1
diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm
index 349c7797a..e506fc8f4 100644
--- a/maps/SilverCaveItemRooms.asm
+++ b/maps/SilverCaveItemRooms.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const SILVERCAVEITEMROOMS_POKE_BALL2
 
 SilverCaveItemRooms_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SilverCaveItemRoomsMaxRevive:
 	itemball MAX_REVIVE
@@ -16,21 +14,16 @@ SilverCaveItemRoomsFullRestore:
 	itemball FULL_RESTORE
 
 SilverCaveItemRooms_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 13, 3, 3, SILVER_CAVE_ROOM_2
 	warp_event 7, 15, 4, SILVER_CAVE_ROOM_2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE
 	object_event 15, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE
diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm
index 87fec1f72..6f1487619 100644
--- a/maps/SilverCaveOutside.asm
+++ b/maps/SilverCaveOutside.asm
@@ -1,9 +1,7 @@
 SilverCaveOutside_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -24,22 +22,17 @@ MtSilverSignText:
 	done
 
 SilverCaveOutside_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 23, 19, 1, SILVER_CAVE_POKECENTER_1F
 	warp_event 18, 11, 1, SILVER_CAVE_ROOM_1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 24, 19, BGEVENT_READ, MtSilverPokecenterSign
 	bg_event 17, 13, BGEVENT_READ, MtSilverSign
 	bg_event 9, 25, BGEVENT_ITEM, SilverCaveOutsideHiddenFullRestore
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm
index e8478e668..5ee974367 100644
--- a/maps/SilverCavePokecenter1F.asm
+++ b/maps/SilverCavePokecenter1F.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const SILVERCAVEPOKECENTER1F_GRANNY
 
 SilverCavePokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 NurseScript_0x1ae59a:
 	jumpstd pokecenternurse
@@ -30,22 +28,17 @@ SilverCavePokecenter1FGrannyText:
 	done
 
 SilverCavePokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 1, SILVER_CAVE_OUTSIDE
 	warp_event 4, 7, 1, SILVER_CAVE_OUTSIDE
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ae59a, -1
 	object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1
diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm
index 1a1bcb500..e2ff6115b 100644
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const SILVERCAVEROOM1_POKE_BALL4
 
 SilverCaveRoom1_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SilverCaveRoom1MaxElixer:
 	itemball MAX_ELIXER
@@ -30,24 +28,19 @@ SilverCaveRoom1HiddenUltraBall:
 	hiddenitem ULTRA_BALL, EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL
 
 SilverCaveRoom1_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 9, 33, 2, SILVER_CAVE_OUTSIDE
 	warp_event 15, 1, 1, SILVER_CAVE_ROOM_2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 16, 23, BGEVENT_ITEM, SilverCaveRoom1HiddenDireHit
 	bg_event 17, 12, BGEVENT_ITEM, SilverCaveRoom1HiddenUltraBall
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 4, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER
 	object_event 15, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN
 	object_event 5, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE
diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm
index 49eb7a2d3..0fd5ceae1 100644
--- a/maps/SilverCaveRoom2.asm
+++ b/maps/SilverCaveRoom2.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const SILVERCAVEROOM2_POKE_BALL3
 
 SilverCaveRoom2_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SilverCaveRoom2Calcium:
 	itemball CALCIUM
@@ -23,25 +21,20 @@ SilverCaveRoom2HiddenMaxPotion:
 	hiddenitem MAX_POTION, EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION
 
 SilverCaveRoom2_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 17, 31, 2, SILVER_CAVE_ROOM_1
 	warp_event 11, 5, 1, SILVER_CAVE_ROOM_3
 	warp_event 13, 21, 1, SILVER_CAVE_ITEM_ROOMS
 	warp_event 23, 3, 2, SILVER_CAVE_ITEM_ROOMS
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 14, 31, BGEVENT_ITEM, SilverCaveRoom2HiddenMaxPotion
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 24, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM
 	object_event 22, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL
 	object_event 4, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP
diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm
index f95b239df..12f5eeb87 100644
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const SILVERCAVEROOM3_RED
 
 SilverCaveRoom3_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Red:
 	special FadeOutMusic
@@ -51,19 +49,14 @@ Red:
 	done
 
 SilverCaveRoom3_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 9, 33, 2, SILVER_CAVE_ROOM_2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 9, 10, SPRITE_RED, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER
diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm
index 1f835b018..b64976027 100644
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -10,11 +10,9 @@ const_value set 2
 	const SLOWPOKEWELLB1F_POKE_BALL
 
 SlowpokeWellB1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SlowpokeWellB1FKurtScript:
 	jumptextfaceplayer SlowpokeWellB1FKurtText
@@ -321,22 +319,17 @@ SlowpokeWellB1FTaillessSlowpokeText:
 	done
 
 SlowpokeWellB1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 17, 15, 6, AZALEA_TOWN
 	warp_event 7, 11, 1, SLOWPOKE_WELL_B2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 9
+	db 9 ; object events
 	object_event 15, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS
 	object_event 5, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS
 	object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS
diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm
index c4ab0d3ca..db66973de 100644
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const SLOWPOKEWELLB2F_POKE_BALL
 
 SlowpokeWellB2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 GymGuyScript_0x5ad0b:
 	faceplayer
@@ -62,20 +60,15 @@ UnknownText_0x5adf2:
 	done
 
 SlowpokeWellB2F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 9, 11, 2, SLOWPOKE_WELL_B1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 5, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1
 	object_event 15, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE
diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm
index f11412391..ee4d394e2 100644
--- a/maps/SoulHouse.asm
+++ b/maps/SoulHouse.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const SOULHOUSE_GRANNY
 
 SoulHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 MrFuji:
 	jumptextfaceplayer MrFujiText
@@ -73,22 +71,17 @@ SoulHouseGrannyText:
 	done
 
 SoulHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 7, 6, LAVENDER_TOWN
 	warp_event 5, 7, 6, LAVENDER_TOWN
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 4, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFuji, -1
 	object_event 7, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1
 	object_event 2, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseLassScript, -1
diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm
index a646bdb18..93ac9bec8 100644
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -7,11 +7,9 @@ const_value set 2
 	const SPROUTTOWER1F_POKE_BALL
 
 SproutTower1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SproutTower1FSage1Script:
 	jumptextfaceplayer SproutTower1FSage1Text
@@ -103,27 +101,22 @@ UnknownText_0x1846d6:
 	done
 
 SproutTower1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 9, 15, 7, VIOLET_CITY
 	warp_event 10, 15, 7, VIOLET_CITY
 	warp_event 6, 4, 1, SPROUT_TOWER_2F
 	warp_event 2, 6, 2, SPROUT_TOWER_2F
 	warp_event 17, 3, 3, SPROUT_TOWER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 7, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script
 	bg_event 12, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 7, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1
 	object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1
 	object_event 11, 12, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FGrannyScript, -1
diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm
index 31fbaa2c0..63b7d6d3b 100644
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const SPROUTTOWER2F_POKE_BALL
 
 SproutTower2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerSageNico:
 	trainer SAGE, NICO, EVENT_BEAT_SAGE_NICO, SageNicoSeenText, SageNicoBeatenText, 0, .Script
@@ -85,25 +83,20 @@ UnknownText_0x1848c8:
 	done
 
 SproutTower2F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 6, 4, 3, SPROUT_TOWER_1F
 	warp_event 2, 6, 4, SPROUT_TOWER_1F
 	warp_event 17, 3, 5, SPROUT_TOWER_1F
 	warp_event 10, 14, 1, SPROUT_TOWER_3F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 12, 15, BGEVENT_READ, MapSproutTower2FSignpost0Script
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 12, 3, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1
 	object_event 9, 14, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSageEdmond, -1
 	object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index e5c903f7e..6f62df3c6 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -8,13 +8,11 @@ const_value set 2
 	const SPROUTTOWER3F_SILVER
 
 SproutTower3F_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -330,19 +328,15 @@ UnknownText_0x184f61:
 	done
 
 SproutTower3F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 10, 14, 4, SPROUT_TOWER_2F
 
-.CoordEvents:
-	db 1
+	db 1 ; coord events
 	coord_event 11, 9, 0, UnknownScript_0x184947
 
-.BGEvents:
-	db 6
+	db 6 ; bg events
 	bg_event 8, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script
 	bg_event 11, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script
 	bg_event 9, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script
@@ -350,8 +344,7 @@ SproutTower3F_MapEvents:
 	bg_event 5, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script
 	bg_event 14, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script
 
-.ObjectEvents:
-	db 7
+	db 7 ; object events
 	object_event 8, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1
 	object_event 8, 8, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1
 	object_event 10, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index 718612b9b..725d8738b 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -7,12 +7,10 @@ const_value set 2
 	const TEAMROCKETBASEB1F_POKE_BALL3
 
 TeamRocketBaseB1F_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .HideSecurityGrunt
 
 .DummyScene:
@@ -727,18 +725,15 @@ UnknownText_0x6cdd0:
 	done
 
 TeamRocketBaseB1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 27, 2, 3, MAHOGANY_MART_1F
 	warp_event 3, 14, 1, TEAM_ROCKET_BASE_B2F
 	warp_event 5, 15, 4, TEAM_ROCKET_BASE_B1F
 	warp_event 25, 2, 3, TEAM_ROCKET_BASE_B1F
 
-.CoordEvents:
-	db 30
+	db 30 ; coord events
 	; There are five security cameras in the base.
 	; Walking in front of one triggers two Rocket Grunts.
 	coord_event 24, 2, 0, SecurityCamera1a
@@ -774,8 +769,7 @@ TeamRocketBaseB1F_MapEvents:
 	coord_event 4, 13, 0, ExplodingTrap21
 	coord_event 5, 13, 0, ExplodingTrap22
 
-.BGEvents:
-	db 9
+	db 9 ; bg events
 	bg_event 19, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost0Script
 	bg_event 24, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
 	bg_event 6, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
@@ -786,8 +780,7 @@ TeamRocketBaseB1F_MapEvents:
 	bg_event 21, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script
 	bg_event 3, 11, BGEVENT_ITEM, TeamRocketBaseB1FHiddenRevive
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 0, 0, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS
 	object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION
 	object_event 18, 12, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 519742983..77f96024d 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -15,15 +15,13 @@ const_value set 2
 	const TEAMROCKETBASEB2F_POKE_BALL
 
 TeamRocketBaseB2F_MapScripts:
-.SceneScripts:
-	db 4
+	db 4 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 	scene_script .DummyScene2
 	scene_script .DummyScene3
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .TransmitterDoorCallback
 
 .DummyScene0:
@@ -909,19 +907,16 @@ UnknownText_0x6de03:
 	done
 
 TeamRocketBaseB2F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 3, 14, 2, TEAM_ROCKET_BASE_B1F
 	warp_event 3, 2, 1, TEAM_ROCKET_BASE_B3F
 	warp_event 27, 2, 2, TEAM_ROCKET_BASE_B3F
 	warp_event 3, 6, 3, TEAM_ROCKET_BASE_B3F
 	warp_event 27, 14, 4, TEAM_ROCKET_BASE_B3F
 
-.CoordEvents:
-	db 9
+	db 9 ; coord events
 	coord_event 5, 14, 0, LanceHealsScript1
 	coord_event 4, 13, 0, LanceHealsScript2
 	coord_event 14, 11, 1, UnknownScript_0x6cf95
@@ -932,8 +927,7 @@ TeamRocketBaseB2F_MapEvents:
 	coord_event 12, 10, 2, UnknownScript_0x6d07a
 	coord_event 12, 11, 2, UnknownScript_0x6d07a
 
-.BGEvents:
-	db 23
+	db 23 ; bg events
 	bg_event 14, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
 	bg_event 15, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
 	bg_event 17, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
@@ -958,8 +952,7 @@ TeamRocketBaseB2F_MapEvents:
 	bg_event 17, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
 	bg_event 26, 7, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal
 
-.ObjectEvents:
-	db 14
+	db 14 ; object events
 	object_event 20, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE
 	object_event 20, 16, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE
 	object_event 5, 13, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index d09274053..42cc78777 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -15,15 +15,13 @@ const_value set 2
 	const TEAMROCKETBASEB3F_POKE_BALL5
 
 TeamRocketBaseB3F_MapScripts:
-.SceneScripts:
-	db 4
+	db 4 ; scene scripts
 	scene_script .LanceGetsPassword
 	scene_script .DummyScene1
 	scene_script .DummyScene2
 	scene_script .DummyScene3
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .CheckGiovanniDoor
 
 .LanceGetsPassword:
@@ -566,24 +564,20 @@ UnknownText_0x6e9a3:
 	done
 
 TeamRocketBaseB3F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 3, 2, 2, TEAM_ROCKET_BASE_B2F
 	warp_event 27, 2, 3, TEAM_ROCKET_BASE_B2F
 	warp_event 3, 6, 4, TEAM_ROCKET_BASE_B2F
 	warp_event 27, 14, 5, TEAM_ROCKET_BASE_B2F
 
-.CoordEvents:
-	db 3
+	db 3 ; coord events
 	coord_event 10, 8, 2, UnknownScript_0x6e04b
 	coord_event 11, 8, 2, UnknownScript_0x6e052
 	coord_event 8, 10, 1, RocketBaseRival
 
-.BGEvents:
-	db 10
+	db 10 ; bg events
 	bg_event 10, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor
 	bg_event 11, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor
 	bg_event 10, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript
@@ -595,8 +589,7 @@ TeamRocketBaseB3F_MapEvents:
 	bg_event 6, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
 	bg_event 7, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
 
-.ObjectEvents:
-	db 14
+	db 14 ; object events
 	object_event 25, 14, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceGetPasswordScript, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS
 	object_event 8, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE
 	object_event 7, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index f10fd1a4b..1f34782f9 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -3,13 +3,11 @@ const_value set 2
 	const TIMECAPSULE_CHRIS2
 
 TimeCapsule_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .InitializeTimeCapsule
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
 
 .InitializeTimeCapsule:
@@ -54,23 +52,18 @@ UnknownText_0x193521:
 	done
 
 TimeCapsule_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 7, 4, POKECENTER_2F
 	warp_event 5, 7, 4, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 4, 4, BGEVENT_RIGHT, MapTimeCapsuleSignpost1Script
 	bg_event 5, 4, BGEVENT_LEFT, MapTimeCapsuleSignpost1Script
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index b82497e7b..8689abb0b 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -11,13 +11,11 @@ const_value set 2
 	const TINTOWER1F_SAGE6
 
 TinTower1F_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .FaceSuicune
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 2
+	db 2 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .NPCsCallback
 	callback MAPCALLBACK_TILES, .StairsCallback
 
@@ -523,23 +521,18 @@ TinTower1FSage6Text2:
 	done
 
 TinTower1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 9, 15, 12, ECRUTEAK_CITY
 	warp_event 10, 15, 12, ECRUTEAK_CITY
 	warp_event 10, 2, 2, TIN_TOWER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 10
+	db 10 ; object events
 	object_event 9, 9, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE
 	object_event 7, 9, SPRITE_RAIKOU, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU
 	object_event 12, 9, SPRITE_ENTEI, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI
diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm
index 3127306b6..a3a9447af 100644
--- a/maps/TinTower2F.asm
+++ b/maps/TinTower2F.asm
@@ -1,24 +1,17 @@
 TinTower2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TinTower2F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 10, 14, 1, TIN_TOWER_3F
 	warp_event 10, 2, 3, TIN_TOWER_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm
index f1d3a81b0..20ec2c389 100644
--- a/maps/TinTower3F.asm
+++ b/maps/TinTower3F.asm
@@ -2,30 +2,23 @@ const_value set 2
 	const TINTOWER3F_POKE_BALL
 
 TinTower3F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TinTower3FFullHeal:
 	itemball FULL_HEAL
 
 TinTower3F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 10, 14, 1, TIN_TOWER_2F
 	warp_event 16, 2, 2, TIN_TOWER_4F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 3, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL
diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm
index 63793d5ba..9881b6f6c 100644
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const TINTOWER4F_POKE_BALL3
 
 TinTower4F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TinTower4FUltraBall:
 	itemball ULTRA_BALL
@@ -23,25 +21,20 @@ TinTower4FHiddenMaxPotion:
 	hiddenitem MAX_POTION, EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION
 
 TinTower4F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 2, 4, 2, TIN_TOWER_5F
 	warp_event 16, 2, 2, TIN_TOWER_3F
 	warp_event 2, 14, 3, TIN_TOWER_5F
 	warp_event 17, 15, 4, TIN_TOWER_5F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 11, 6, BGEVENT_ITEM, TinTower4FHiddenMaxPotion
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL
 	object_event 17, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP
 	object_event 2, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE
diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm
index 7f0b53a5c..0ffbf5c34 100644
--- a/maps/TinTower5F.asm
+++ b/maps/TinTower5F.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const TINTOWER5F_POKE_BALL
 
 TinTower5F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TinTower5FRareCandy:
 	itemball RARE_CANDY
@@ -18,24 +16,19 @@ TinTower5FHiddenCarbos:
 	hiddenitem CARBOS, EVENT_TIN_TOWER_5F_HIDDEN_CARBOS
 
 TinTower5F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 11, 15, 2, TIN_TOWER_6F
 	warp_event 2, 4, 1, TIN_TOWER_4F
 	warp_event 2, 14, 3, TIN_TOWER_4F
 	warp_event 17, 15, 4, TIN_TOWER_4F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 16, 14, BGEVENT_ITEM, TinTower5FHiddenFullRestore
 	bg_event 3, 15, BGEVENT_ITEM, TinTower5FHiddenCarbos
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 9, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY
diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm
index fcfbfc37c..162a0313e 100644
--- a/maps/TinTower6F.asm
+++ b/maps/TinTower6F.asm
@@ -2,30 +2,23 @@ const_value set 2
 	const TINTOWER6F_POKE_BALL
 
 TinTower6F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TinTower6FMaxPotion:
 	itemball MAX_POTION
 
 TinTower6F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 3, 9, 1, TIN_TOWER_7F
 	warp_event 11, 15, 1, TIN_TOWER_5F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 8, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION
diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm
index b34268f9a..1f984e14b 100644
--- a/maps/TinTower7F.asm
+++ b/maps/TinTower7F.asm
@@ -2,33 +2,26 @@ const_value set 2
 	const TINTOWER7F_POKE_BALL
 
 TinTower7F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TinTower7FMaxRevive:
 	itemball MAX_REVIVE
 
 TinTower7F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 3, 9, 1, TIN_TOWER_6F
 	warp_event 10, 15, 1, TIN_TOWER_8F
 	warp_event 12, 7, 4, TIN_TOWER_7F
 	warp_event 8, 3, 3, TIN_TOWER_7F
 	warp_event 6, 9, 5, TIN_TOWER_9F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 16, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE
diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm
index aa9f8000a..c95d4b471 100644
--- a/maps/TinTower8F.asm
+++ b/maps/TinTower8F.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const TINTOWER8F_POKE_BALL3
 
 TinTower8F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TinTower8FNugget:
 	itemball NUGGET
@@ -20,11 +18,9 @@ TinTower8FFullRestore:
 	itemball FULL_RESTORE
 
 TinTower8F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 6
+	db 6 ; warp events
 	warp_event 2, 5, 2, TIN_TOWER_7F
 	warp_event 2, 11, 1, TIN_TOWER_9F
 	warp_event 16, 7, 2, TIN_TOWER_9F
@@ -32,14 +28,11 @@ TinTower8F_MapEvents:
 	warp_event 14, 15, 6, TIN_TOWER_9F
 	warp_event 6, 9, 7, TIN_TOWER_9F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET
 	object_event 11, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER
 	object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE
diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm
index 492425455..b794dea52 100644
--- a/maps/TinTower9F.asm
+++ b/maps/TinTower9F.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const TINTOWER9F_POKE_BALL
 
 TinTower9F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TinTower9FHPUp:
 	itemball HP_UP
@@ -22,11 +20,9 @@ TinTower9FUnusedLugiaText:
 	done
 
 TinTower9F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 7
+	db 7 ; warp events
 	warp_event 12, 3, 2, TIN_TOWER_8F
 	warp_event 2, 5, 3, TIN_TOWER_8F
 	warp_event 12, 7, 4, TIN_TOWER_8F
@@ -35,12 +31,9 @@ TinTower9F_MapEvents:
 	warp_event 6, 13, 5, TIN_TOWER_8F
 	warp_event 8, 13, 6, TIN_TOWER_8F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 9, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP
diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm
index 61e9cfae0..92dde683d 100644
--- a/maps/TinTowerRoof.asm
+++ b/maps/TinTowerRoof.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const TINTOWERROOF_HO_OH
 
 TinTowerRoof_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .HoOh
 
 .HoOh:
@@ -45,19 +43,14 @@ HoOhText:
 	done
 
 TinTowerRoof_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 9, 13, 4, TIN_TOWER_9F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 9, 5, SPRITE_HO_OH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH
diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm
index 949215e65..561e7e1e2 100644
--- a/maps/TohjoFalls.asm
+++ b/maps/TohjoFalls.asm
@@ -2,30 +2,23 @@ const_value set 2
 	const TOHJOFALLS_POKE_BALL
 
 TohjoFalls_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TohjoFallsMoonStone:
 	itemball MOON_STONE
 
 TohjoFalls_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 13, 15, 2, ROUTE_27
 	warp_event 25, 15, 3, ROUTE_27
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index db0b081d2..8bf282bbf 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -3,13 +3,11 @@ const_value set 2
 	const TRADECENTER_CHRIS2
 
 TradeCenter_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .InitializeTradeCenter
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
 
 .InitializeTradeCenter:
@@ -54,23 +52,18 @@ ChrisScript_0x19340b:
 	done
 
 TradeCenter_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 7, 2, POKECENTER_2F
 	warp_event 5, 7, 2, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 4, 4, BGEVENT_RIGHT, MapTradeCenterSignpost1Script
 	bg_event 5, 4, BGEVENT_LEFT, MapTradeCenterSignpost1Script
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm
index 05bdfa62d..8714c17f7 100644
--- a/maps/TrainerHouse1F.asm
+++ b/maps/TrainerHouse1F.asm
@@ -6,11 +6,9 @@ const_value set 2
 	const TRAINERHOUSE1F_GENTLEMAN
 
 TrainerHouse1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerHouse1FReceptionistScript:
 	jumptextfaceplayer TrainerHouse1FReceptionistText
@@ -138,26 +136,21 @@ UnknownText_0x9b2c1:
 	done
 
 TrainerHouse1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 2, 13, 3, VIRIDIAN_CITY
 	warp_event 3, 13, 3, VIRIDIAN_CITY
 	warp_event 8, 2, 1, TRAINER_HOUSE_B1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 5, 0, BGEVENT_READ, MapTrainerHouse1FSignpost0Script
 	bg_event 7, 0, BGEVENT_READ, MapTrainerHouse1FSignpost1Script
 	bg_event 7, 10, BGEVENT_READ, MapTrainerHouse1FSignpost2Script
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 0, 11, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1
 	object_event 7, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1
 	object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index 52ad25780..3fc986b3a 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -3,12 +3,10 @@ const_value set 2
 	const TRAINERHOUSEB1F_CHRIS
 
 TrainerHouseB1F_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -170,21 +168,16 @@ TrainerHouseB1FCalBeforeText:
 	done
 
 TrainerHouseB1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 9, 4, 3, TRAINER_HOUSE_1F
 
-.CoordEvents:
-	db 1
+	db 1 ; coord events
 	coord_event 7, 3, 0, TrainerHouseReceptionistScript
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 7, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
 	object_event 6, 11, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm
index 7b52c02b7..7ed7f76f4 100644
--- a/maps/UndergroundPath.asm
+++ b/maps/UndergroundPath.asm
@@ -1,9 +1,7 @@
 UndergroundPath_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 UndergroundPathHiddenFullRestore:
 	hiddenitem FULL_RESTORE, EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE
@@ -12,21 +10,16 @@ UndergroundPathHiddenXSpecial:
 	hiddenitem X_SPECIAL, EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL
 
 UndergroundPath_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 3, 2, 3, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
 	warp_event 3, 24, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 3, 9, BGEVENT_ITEM, UndergroundPathHiddenFullRestore
 	bg_event 1, 19, BGEVENT_ITEM, UndergroundPathHiddenXSpecial
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm
index 0c9cbc06c..8aaa3bf3a 100644
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -10,11 +10,9 @@ const_value set 2
 	const UNIONCAVE1F_POKE_BALL4
 
 UnionCave1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerPokemaniacLarry:
 	trainer POKEMANIAC, LARRY, EVENT_BEAT_POKEMANIAC_LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, .Script
@@ -200,24 +198,19 @@ UnknownText_0x59f29:
 	done
 
 UnionCave1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 5, 19, 3, UNION_CAVE_B1F
 	warp_event 3, 33, 4, UNION_CAVE_B1F
 	warp_event 17, 31, 1, ROUTE_33
 	warp_event 17, 3, 4, ROUTE_32
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 9
+	db 9 ; object events
 	object_event 3, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerDaniel, -1
 	object_event 4, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacLarry, -1
 	object_event 11, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerRussell, -1
diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm
index 6b0ed7389..339572a07 100644
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -8,11 +8,9 @@ const_value set 2
 	const UNIONCAVEB1F_POKE_BALL2
 
 UnionCaveB1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerPokemaniacAndrew:
 	trainer POKEMANIAC, ANDREW, EVENT_BEAT_POKEMANIAC_ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, .Script
@@ -153,25 +151,20 @@ PokemaniacCalvinAfterBattleText:
 	done
 
 UnionCaveB1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 3, 3, 7, RUINS_OF_ALPH_OUTSIDE
 	warp_event 3, 11, 8, RUINS_OF_ALPH_OUTSIDE
 	warp_event 7, 19, 1, UNION_CAVE_1F
 	warp_event 3, 33, 2, UNION_CAVE_1F
 	warp_event 17, 31, 1, UNION_CAVE_B2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 7
+	db 7 ; object events
 	object_event 9, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerPhillip, -1
 	object_event 16, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerLeonard, -1
 	object_event 5, 32, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1
diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm
index 02209442d..791b6cb8c 100644
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -7,11 +7,9 @@ const_value set 2
 	const UNIONCAVEB2F_LAPRAS
 
 UnionCaveB2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .Lapras
 
 .Lapras:
@@ -142,21 +140,16 @@ CooltrainerfEmmaAfterBattleText:
 	done
 
 UnionCaveB2F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 5, 3, 5, UNION_CAVE_B1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 15, 19, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermNick, -1
 	object_event 5, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1
 	object_event 3, 30, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1
diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm
index 9ee82253b..abdca0cba 100644
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -7,11 +7,9 @@ const_value set 2
 	const VERMILIONCITY_POKEFAN_M
 
 VermilionCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -268,11 +266,9 @@ VermilionCityPortSignText:
 	done
 
 VermilionCity_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 10
+	db 10 ; warp events
 	warp_event 5, 5, 1, VERMILION_FISHING_SPEECH_HOUSE
 	warp_event 9, 5, 1, VERMILION_POKECENTER_1F
 	warp_event 7, 13, 1, POKEMON_FAN_CLUB
@@ -284,11 +280,9 @@ VermilionCity_MapEvents:
 	warp_event 20, 31, 2, VERMILION_PORT_PASSAGE
 	warp_event 34, 7, 1, DIGLETTS_CAVE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 8
+	db 8 ; bg events
 	bg_event 25, 3, BGEVENT_READ, VermilionCitySign
 	bg_event 5, 19, BGEVENT_READ, VermilionGymSign
 	bg_event 5, 13, BGEVENT_READ, PokemonFanClubSign
@@ -298,8 +292,7 @@ VermilionCity_MapEvents:
 	bg_event 22, 13, BGEVENT_READ, VermilionCityMartSign
 	bg_event 12, 19, BGEVENT_ITEM, VermilionCityHiddenFullHeal
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 18, 9, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1
 	object_event 23, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1
 	object_event 26, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1
diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm
index b2a4e5733..efcc6fde3 100644
--- a/maps/VermilionDiglettsCaveSpeechHouse.asm
+++ b/maps/VermilionDiglettsCaveSpeechHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const VERMILIONDIGLETTSCAVESPEECHHOUSE_GENTLEMAN
 
 VermilionDiglettsCaveSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 VermilionDiglettsCaveSpeechHouseGentlemanScript:
 	jumptextfaceplayer VermilionDiglettsCaveSpeechHouseGentlemanText
@@ -21,20 +19,15 @@ VermilionDiglettsCaveSpeechHouseGentlemanText:
 	done
 
 VermilionDiglettsCaveSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 6, VERMILION_CITY
 	warp_event 3, 7, 6, VERMILION_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 1, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionDiglettsCaveSpeechHouseGentlemanScript, -1
diff --git a/maps/VermilionFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm
index ff730d197..b55b2ca11 100644
--- a/maps/VermilionFishingSpeechHouse.asm
+++ b/maps/VermilionFishingSpeechHouse.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const VERMILIONFISHINGSPEECHHOUSE_FISHING_GURU
 
 VermilionFishingSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 FishingDude:
 	jumptextfaceplayer FishingDudeText
@@ -51,21 +49,16 @@ FishingDudesHousePhotoText:
 	done
 
 VermilionFishingSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 1, VERMILION_CITY
 	warp_event 3, 7, 1, VERMILION_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 3, 0, BGEVENT_READ, FishingDudesHousePhoto
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 2, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingDude, -1
diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm
index eafaa6dde..0432ca163 100644
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -6,11 +6,9 @@ const_value set 2
 	const VERMILIONGYM_GYM_GUY
 
 VermilionGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SurgeScript_0x1920a5:
 	faceplayer
@@ -261,19 +259,15 @@ UnknownText_0x19261e:
 	done
 
 VermilionGym_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 17, 7, VERMILION_CITY
 	warp_event 5, 17, 7, VERMILION_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 17
+	db 17 ; bg events
 	bg_event 1, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
 	bg_event 3, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
 	bg_event 5, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
@@ -292,8 +286,7 @@ VermilionGym_MapEvents:
 	bg_event 3, 15, BGEVENT_READ, VermilionGymStatue
 	bg_event 6, 15, BGEVENT_READ, VermilionGymStatue
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 5, 2, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1
 	object_event 8, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1
 	object_event 4, 7, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 3, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1
diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm
index c080e3f26..596b8407f 100644
--- a/maps/VermilionMagnetTrainSpeechHouse.asm
+++ b/maps/VermilionMagnetTrainSpeechHouse.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER
 
 VermilionMagnetTrainSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 VermilionMagnetTrainSpeechHousePokefanFScript:
 	jumptextfaceplayer VermilionMagnetTrainSpeechHousePokefanFText
@@ -34,23 +32,18 @@ VermilionMagnetTrainSpeechHouseYoungsterText:
 	done
 
 VermilionMagnetTrainSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 4, VERMILION_CITY
 	warp_event 3, 7, 4, VERMILION_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHousePokefanFScript, -1
 	object_event 0, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHouseYoungsterScript, -1
diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm
index de422c38a..0de709e44 100644
--- a/maps/VermilionMart.asm
+++ b/maps/VermilionMart.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const VERMILIONMART_BUENA
 
 VermilionMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ClerkScript_0x191f7e:
 	opentext
@@ -37,22 +35,17 @@ VermilionMartBuenaText:
 	done
 
 VermilionMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 5, VERMILION_CITY
 	warp_event 3, 7, 5, VERMILION_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1
 	object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1
 	object_event 8, 6, SPRITE_BUENA, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1
diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm
index 80b3e02ce..0c3712b3a 100644
--- a/maps/VermilionPokecenter1F.asm
+++ b/maps/VermilionPokecenter1F.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const VERMILIONPOKECENTER1F_BUG_CATCHER
 
 VermilionPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 NurseScript_0x191603:
 	jumpstd pokecenternurse
@@ -77,23 +75,18 @@ VermilionPokecenter1FBugCatcherText:
 	done
 
 VermilionPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 2, VERMILION_CITY
 	warp_event 4, 7, 2, VERMILION_CITY
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x191603, -1
 	object_event 7, 2, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1
 	object_event 6, 5, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1
diff --git a/maps/VermilionPokecenter2FBeta.asm b/maps/VermilionPokecenter2FBeta.asm
index 7ddb0050c..e8ed5dbd1 100644
--- a/maps/VermilionPokecenter2FBeta.asm
+++ b/maps/VermilionPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
 VermilionPokecenter2FBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 VermilionPokecenter2FBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 0, 7, 3, VERMILION_POKECENTER_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index e75d2e3d4..a6ffc9ba8 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -4,13 +4,11 @@ const_value set 2
 	const VERMILIONPORT_SUPER_NERD
 
 VermilionPort_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .LeaveFastShip
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .DummyScene0:
@@ -299,24 +297,19 @@ UnknownText_0x750a6:
 	done
 
 VermilionPort_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 9, 5, 5, VERMILION_PORT_PASSAGE
 	warp_event 7, 17, 1, FAST_SHIP_1F
 
-.CoordEvents:
-	db 1
+	db 1 ; coord events
 	coord_event 7, 11, 0, UnknownScript_0x74e20
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
 	object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1
 	object_event 11, 11, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x74ee6, -1
diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm
index 1c2c56c7b..1364202a4 100644
--- a/maps/VermilionPortPassage.asm
+++ b/maps/VermilionPortPassage.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const VERMILIONPORTPASSAGE_TEACHER
 
 VermilionPortPassage_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 VermilionPortPassageTeacherScript:
 	jumptextfaceplayer VermilionPortPassageTeacherText
@@ -19,23 +17,18 @@ VermilionPortPassageTeacherText:
 	done
 
 VermilionPortPassage_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 15, 0, 8, VERMILION_CITY
 	warp_event 16, 0, 9, VERMILION_CITY
 	warp_event 15, 4, 4, VERMILION_PORT_PASSAGE
 	warp_event 3, 2, 3, VERMILION_PORT_PASSAGE
 	warp_event 3, 14, 1, VERMILION_PORT
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 17, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index a8f8aa085..34aa49a5a 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -7,13 +7,11 @@ const_value set 2
 	const VICTORYROAD_POKE_BALL5
 
 VictoryRoad_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -239,11 +237,9 @@ UnknownText_0x747aa:
 	done
 
 VictoryRoad_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 10
+	db 10 ; warp events
 	warp_event 9, 67, 5, VICTORY_ROAD_GATE
 	warp_event 1, 49, 3, VICTORY_ROAD
 	warp_event 1, 35, 2, VICTORY_ROAD
@@ -255,18 +251,15 @@ VictoryRoad_MapEvents:
 	warp_event 0, 27, 8, VICTORY_ROAD
 	warp_event 13, 5, 3, ROUTE_23
 
-.CoordEvents:
-	db 2
+	db 2 ; coord events
 	coord_event 12, 8, 0, UnknownScript_0x74492
 	coord_event 13, 8, 0, UnknownScript_0x744b5
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion
 	bg_event 3, 65, BGEVENT_ITEM, VictoryRoadHiddenFullHeal
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 18, 13, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD
 	object_event 3, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE
 	object_event 12, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE
diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm
index 3c027014a..3f5054dd5 100644
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -4,13 +4,11 @@ const_value set 2
 	const VICTORYROADGATE_BLACK_BELT2
 
 VictoryRoadGate_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -98,11 +96,9 @@ VictoryRoadGateRightBlackBeltText:
 	done
 
 VictoryRoadGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 8
+	db 8 ; warp events
 	warp_event 17, 7, 1, ROUTE_22
 	warp_event 18, 7, 1, ROUTE_22
 	warp_event 9, 17, 1, ROUTE_26
@@ -112,15 +108,12 @@ VictoryRoadGate_MapEvents:
 	warp_event 1, 7, 2, ROUTE_28
 	warp_event 2, 7, 2, ROUTE_28
 
-.CoordEvents:
-	db 1
+	db 1 ; coord events
 	coord_event 10, 11, 0, VictoryRoadGateBadgeCheckScene
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 8, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1
 	object_event 7, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER
 	object_event 12, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
index 6ce23b037..cc4eba2b5 100644
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -9,11 +9,9 @@ const_value set 2
 	const VIOLETCITY_POKE_BALL2
 
 VioletCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -279,11 +277,9 @@ EarlsPokemonAcademySignText:
 	done
 
 VioletCity_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 9
+	db 9 ; warp events
 	warp_event 9, 17, 2, VIOLET_MART
 	warp_event 18, 17, 1, VIOLET_GYM
 	warp_event 30, 17, 1, EARLS_POKEMON_ACADEMY
@@ -294,11 +290,9 @@ VioletCity_MapEvents:
 	warp_event 39, 24, 1, ROUTE_31_VIOLET_GATE
 	warp_event 39, 25, 2, ROUTE_31_VIOLET_GATE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 7
+	db 7 ; bg events
 	bg_event 24, 20, BGEVENT_READ, VioletCitySign
 	bg_event 15, 17, BGEVENT_READ, VioletGymSign
 	bg_event 24, 8, BGEVENT_READ, SproutTowerSign
@@ -307,8 +301,7 @@ VioletCity_MapEvents:
 	bg_event 10, 17, BGEVENT_READ, VioletCityMartSign
 	bg_event 37, 14, BGEVENT_ITEM, VioletCityHiddenHyperPotion
 
-.ObjectEvents:
-	db 8
+	db 8 ; object events
 	object_event 13, 16, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityEarlScript, EVENT_VIOLET_CITY_EARL
 	object_event 28, 28, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityLassScript, -1
 	object_event 24, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
index 2a7b97197..1b8b3414a 100644
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const VIOLETGYM_GYM_GUY
 
 VioletGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 FalknerScript_0x683c2:
 	faceplayer
@@ -282,24 +280,19 @@ VioletGymGuyWinText:
 	done
 
 VioletGym_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 15, 2, VIOLET_CITY
 	warp_event 5, 15, 2, VIOLET_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 3, 13, BGEVENT_READ, VioletGymStatue
 	bg_event 6, 13, BGEVENT_READ, VioletGymStatue
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 5, 1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1
 	object_event 7, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1
 	object_event 2, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1
diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm
index 3025dad5d..be3ae329b 100644
--- a/maps/VioletKylesHouse.asm
+++ b/maps/VioletKylesHouse.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const VIOLETKYLESHOUSE_KYLE
 
 VioletKylesHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 VioletKylesHousePokefanMScript:
 	jumptextfaceplayer VioletKylesHousePokefanMText
@@ -33,21 +31,16 @@ VioletKylesHousePokefanMText:
 	done
 
 VioletKylesHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 3, 7, 6, VIOLET_CITY
 	warp_event 4, 7, 6, VIOLET_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1
 	object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Kyle, -1
diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm
index bb01ab1a9..006a28208 100644
--- a/maps/VioletMart.asm
+++ b/maps/VioletMart.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const VIOLETMART_COOLTRAINER_M
 
 VioletMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ClerkScript_0x68295:
 	opentext
@@ -49,22 +47,17 @@ VioletMartCooltrainerMText:
 	done
 
 VioletMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 1, VIOLET_CITY
 	warp_event 3, 7, 1, VIOLET_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x68295, -1
 	object_event 7, 6, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartGrannyScript, -1
 	object_event 5, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1
diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm
index 192ffcc58..90d137801 100644
--- a/maps/VioletNicknameSpeechHouse.asm
+++ b/maps/VioletNicknameSpeechHouse.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const VIOLETNICKNAMESPEECHHOUSE_BIRD
 
 VioletNicknameSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 VioletNicknameSpeechHouseTeacherScript:
 	jumptextfaceplayer VioletNicknameSpeechHouseTeacherText
@@ -45,22 +43,17 @@ UnknownText_0x6947c:
 	done
 
 VioletNicknameSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 3, 7, 4, VIOLET_CITY
 	warp_event 4, 7, 4, VIOLET_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1
 	object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1
 	object_event 5, 2, SPRITE_BIRD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BirdScript_0x693ef, -1
diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm
index 3bf4f1166..39171fa21 100644
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -6,11 +6,9 @@ const_value set 2
 	const VIOLETPOKECENTER1F_SCIENTIST
 
 VioletPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 VioletPokecenterNurse:
 	jumpstd pokecenternurse
@@ -216,23 +214,18 @@ VioletPokecenter1FYoungsterText:
 	done
 
 VioletPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 5, VIOLET_CITY
 	warp_event 4, 7, 5, VIOLET_CITY
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenterNurse, -1
 	object_event 7, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1
 	object_event 1, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1
diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm
index 75a0d47ab..1ce305b21 100644
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const VIRIDIANCITY_YOUNGSTER
 
 ViridianCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -216,22 +214,18 @@ TrainerHouseSignText:
 	done
 
 ViridianCity_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 32, 7, 1, VIRIDIAN_GYM
 	warp_event 21, 9, 1, VIRIDIAN_NICKNAME_SPEECH_HOUSE
 	warp_event 23, 15, 1, TRAINER_HOUSE_1F
 	warp_event 29, 19, 2, VIRIDIAN_MART
 	warp_event 23, 25, 1, VIRIDIAN_POKECENTER_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 6
+	db 6 ; bg events
 	bg_event 17, 17, BGEVENT_READ, ViridianCitySign
 	bg_event 27, 7, BGEVENT_READ, ViridianGymSign
 	bg_event 19, 1, BGEVENT_READ, ViridianCityWelcomeSign
@@ -239,8 +233,7 @@ ViridianCity_MapEvents:
 	bg_event 24, 25, BGEVENT_READ, ViridianCityPokecenterSign
 	bg_event 30, 19, BGEVENT_READ, ViridianCityMartSign
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 18, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x1a9a4c, -1
 	object_event 30, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x1a9a61, -1
 	object_event 6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a9a75, -1
diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm
index f77eee251..f194f434c 100644
--- a/maps/ViridianGym.asm
+++ b/maps/ViridianGym.asm
@@ -3,11 +3,9 @@ const_value set 2
 	const VIRIDIANGYM_GYM_GUY
 
 ViridianGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ViridianGymBlueScript:
 	faceplayer
@@ -170,23 +168,18 @@ ViridianGymGuyWinText:
 	done
 
 ViridianGym_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 4, 17, 1, VIRIDIAN_CITY
 	warp_event 5, 17, 1, VIRIDIAN_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 3, 13, BGEVENT_READ, ViridianGymStatue
 	bg_event 6, 13, BGEVENT_READ, ViridianGymStatue
 
-.ObjectEvents:
-	db 2
+	db 2 ; object events
 	object_event 5, 3, SPRITE_BLUE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE
 	object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE
diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm
index e42cc70e2..be8e454b9 100644
--- a/maps/ViridianMart.asm
+++ b/maps/ViridianMart.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const VIRIDIANMART_COOLTRAINER_M
 
 ViridianMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ClerkScript_0x9b5e7:
 	opentext
@@ -37,22 +35,17 @@ ViridianMartCooltrainerMText:
 	done
 
 ViridianMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 4, VIRIDIAN_CITY
 	warp_event 3, 7, 4, VIRIDIAN_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1
 	object_event 7, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1
 	object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1
diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm
index 703aaf253..c7115761d 100644
--- a/maps/ViridianNicknameSpeechHouse.asm
+++ b/maps/ViridianNicknameSpeechHouse.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const VIRIDIANNICKNAMESPEECHHOUSE_RATTEY
 
 ViridianNicknameSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ViridianNicknameSpeechHousePokefanMScript:
 	jumptextfaceplayer ViridianNicknameSpeechHousePokefanMText
@@ -62,22 +60,17 @@ RatteyText:
 	done
 
 ViridianNicknameSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 2, 7, 2, VIRIDIAN_CITY
 	warp_event 3, 7, 2, VIRIDIAN_CITY
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 2, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1
 	object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1
 	object_event 5, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Speary, -1
diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm
index b795bc3de..296fee253 100644
--- a/maps/ViridianPokecenter1F.asm
+++ b/maps/ViridianPokecenter1F.asm
@@ -5,11 +5,9 @@ const_value set 2
 	const VIRIDIANPOKECENTER1F_BUG_CATCHER
 
 ViridianPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 NurseScript_0x9b690:
 	jumpstd pokecenternurse
@@ -72,23 +70,18 @@ ViridianPokecenter1FBugCatcherText:
 	done
 
 ViridianPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 7, 5, VIRIDIAN_CITY
 	warp_event 4, 7, 5, VIRIDIAN_CITY
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9b690, -1
 	object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1
 	object_event 5, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1
diff --git a/maps/ViridianPokecenter2FBeta.asm b/maps/ViridianPokecenter2FBeta.asm
index 38fbd8a5a..ea714aa9e 100644
--- a/maps/ViridianPokecenter2FBeta.asm
+++ b/maps/ViridianPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
 ViridianPokecenter2FBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ViridianPokecenter2FBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 0, 7, 3, VIRIDIAN_POKECENTER_1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm
index e19ae8551..f5b474fc4 100644
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -7,11 +7,9 @@ const_value set 2
 	const WHIRLISLANDB1F_BOULDER
 
 WhirlIslandB1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 WhirlIslandB1FFullRestore:
 	itemball FULL_RESTORE
@@ -41,11 +39,9 @@ WhirlIslandB1FHiddenFullRestore:
 	hiddenitem FULL_RESTORE, EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE
 
 WhirlIslandB1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 9
+	db 9 ; warp events
 	warp_event 5, 5, 2, WHIRL_ISLAND_NW
 	warp_event 35, 3, 2, WHIRL_ISLAND_NE
 	warp_event 29, 9, 3, WHIRL_ISLAND_NE
@@ -56,17 +52,14 @@ WhirlIslandB1F_MapEvents:
 	warp_event 13, 27, 2, WHIRL_ISLAND_B2F
 	warp_event 17, 21, 1, WHIRL_ISLAND_CAVE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 30, 4, BGEVENT_ITEM, WhirlIslandB1FHiddenRareCandy
 	bg_event 36, 18, BGEVENT_ITEM, WhirlIslandB1FHiddenUltraBall
 	bg_event 2, 23, BGEVENT_ITEM, WhirlIslandB1FHiddenFullRestore
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE
 	object_event 2, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS
 	object_event 33, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM
diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm
index d689744ca..2e5071631 100644
--- a/maps/WhirlIslandB2F.asm
+++ b/maps/WhirlIslandB2F.asm
@@ -4,11 +4,9 @@ const_value set 2
 	const WHIRLISLANDB2F_POKE_BALL3
 
 WhirlIslandB2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 WhirlIslandB2FFullRestore:
 	itemball FULL_RESTORE
@@ -20,24 +18,19 @@ WhirlIslandB2FMaxElixer:
 	itemball MAX_ELIXER
 
 WhirlIslandB2F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 11, 5, 7, WHIRL_ISLAND_B1F
 	warp_event 7, 11, 8, WHIRL_ISLAND_B1F
 	warp_event 7, 25, 1, WHIRL_ISLAND_LUGIA_CHAMBER
 	warp_event 13, 31, 5, WHIRL_ISLAND_SW
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 10, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE
 	object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE
 	object_event 5, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER
diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm
index 4d67a37ab..98312ad5a 100644
--- a/maps/WhirlIslandCave.asm
+++ b/maps/WhirlIslandCave.asm
@@ -1,24 +1,17 @@
 WhirlIslandCave_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 WhirlIslandCave_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 7, 5, 9, WHIRL_ISLAND_B1F
 	warp_event 3, 13, 4, WHIRL_ISLAND_NW
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm
index c5637b742..162cdc88f 100644
--- a/maps/WhirlIslandLugiaChamber.asm
+++ b/maps/WhirlIslandLugiaChamber.asm
@@ -2,11 +2,9 @@ const_value set 2
 	const WHIRLISLANDLUGIACHAMBER_LUGIA
 
 WhirlIslandLugiaChamber_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .Lugia
 
 .Lugia:
@@ -44,19 +42,14 @@ LugiaText:
 	done
 
 WhirlIslandLugiaChamber_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
+	db 1 ; warp events
 	warp_event 9, 13, 3, WHIRL_ISLAND_B2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 9, 5, SPRITE_LUGIA, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA
diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm
index 490892565..9fc721d77 100644
--- a/maps/WhirlIslandNE.asm
+++ b/maps/WhirlIslandNE.asm
@@ -2,31 +2,24 @@ const_value set 2
 	const WHIRLISLANDNE_POKE_BALL
 
 WhirlIslandNE_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 WhirlIslandNEUltraBall:
 	itemball ULTRA_BALL
 
 WhirlIslandNE_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 3, 13, 2, ROUTE_41
 	warp_event 17, 3, 2, WHIRL_ISLAND_B1F
 	warp_event 13, 11, 3, WHIRL_ISLAND_B1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 11, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandNEUltraBall, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL
diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm
index 8939c9b15..38a413e96 100644
--- a/maps/WhirlIslandNW.asm
+++ b/maps/WhirlIslandNW.asm
@@ -1,26 +1,19 @@
 WhirlIslandNW_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 WhirlIslandNW_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
+	db 4 ; warp events
 	warp_event 5, 7, 1, ROUTE_41
 	warp_event 5, 3, 1, WHIRL_ISLAND_B1F
 	warp_event 3, 15, 4, WHIRL_ISLAND_SW
 	warp_event 7, 15, 2, WHIRL_ISLAND_CAVE
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm
index ca03ab199..51b21821a 100644
--- a/maps/WhirlIslandSE.asm
+++ b/maps/WhirlIslandSE.asm
@@ -1,24 +1,17 @@
 WhirlIslandSE_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 WhirlIslandSE_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
+	db 2 ; warp events
 	warp_event 5, 13, 4, ROUTE_41
 	warp_event 5, 3, 6, WHIRL_ISLAND_B1F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm
index 6edd1490f..58878cb34 100644
--- a/maps/WhirlIslandSW.asm
+++ b/maps/WhirlIslandSW.asm
@@ -2,33 +2,26 @@ const_value set 2
 	const WHIRLISLANDSW_POKE_BALL
 
 WhirlIslandSW_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 WhirlIslandSWUltraBall:
 	itemball ULTRA_BALL
 
 WhirlIslandSW_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 5
+	db 5 ; warp events
 	warp_event 5, 7, 3, ROUTE_41
 	warp_event 17, 3, 5, WHIRL_ISLAND_B1F
 	warp_event 3, 3, 4, WHIRL_ISLAND_B1F
 	warp_event 3, 15, 3, WHIRL_ISLAND_NW
 	warp_event 17, 15, 4, WHIRL_ISLAND_B2F
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm
index 088364a83..e56a5777f 100644
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -2,13 +2,11 @@ const_value set 2
 	const WILLSROOM_WILL
 
 WillsRoom_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .LockDoor
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .WillsRoomDoors
 
 .LockDoor:
@@ -129,21 +127,16 @@ WillScript_WillDefeatText:
 	done
 
 WillsRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 5, 17, 4, INDIGO_PLATEAU_POKECENTER_1F
 	warp_event 4, 2, 1, KOGAS_ROOM
 	warp_event 5, 2, 2, KOGAS_ROOM
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 5, 7, SPRITE_WILL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WillScript_Battle, -1
diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm
index a047eadbe..d92e48c4a 100644
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -7,13 +7,11 @@ const_value set 2
 	const WISETRIOSROOM_SAGE6
 
 WiseTriosRoom_MapScripts:
-.SceneScripts:
-	db 2
+	db 2 ; scene scripts
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .WiseTrioCallback
 
 .DummyScene0:
@@ -345,24 +343,19 @@ UnknownText_0x98db5:
 	done
 
 WiseTriosRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
+	db 3 ; warp events
 	warp_event 7, 4, 4, ECRUTEAK_CITY
 	warp_event 7, 5, 5, ECRUTEAK_CITY
 	warp_event 1, 4, 5, ECRUTEAK_TIN_TOWER_ENTRANCE
 
-.CoordEvents:
-	db 1
+	db 1 ; coord events
 	coord_event 7, 4, 0, UnknownScript_0x985a3
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 6, 2, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
 	object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
 	object_event 7, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1

From 5b678b336c26d0dd149a8889c0dd13017416e9e3 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Tue, 30 Jan 2018 14:32:57 -0500
Subject: [PATCH 065/135] Simpler map connection macro

---
 data/maps/data.asm | 374 +++++++++++++++++++++------------------------
 1 file changed, 176 insertions(+), 198 deletions(-)

diff --git a/data/maps/data.asm b/data/maps/data.asm
index ef8c4996c..2bd2fc553 100644
--- a/data/maps/data.asm
+++ b/data/maps/data.asm
@@ -3,365 +3,343 @@ map_data: MACRO
 ;\2: map id
 ;\3: border block
 ;\4: connections: combo of NORTH, SOUTH, WEST, and/or EAST, or 0 for none
+CURRENT_MAP_WIDTH = \2_WIDTH
+CURRENT_MAP_HEIGHT = \2_HEIGHT
 \1_MapData::
 	db \3
-	db \2_HEIGHT, \2_WIDTH
+	db CURRENT_MAP_HEIGHT, CURRENT_MAP_WIDTH
 	db BANK(\1_Blocks)
 	dw \1_Blocks
-	db BANK(\1_MapScripts)
+	db BANK(\1_MapScripts) ; BANK(\1_MapEvents)
 	dw \1_MapScripts
 	dw \1_MapEvents
 	db \4
 ENDM
 
 connection: MACRO
-if "\1" == "north"
-;\2: map id
-;\3: map name (eventually will be rolled into map id)
-;\4: x
-;\5: offset?
+;\1: direction
+;\2: map name
+;\3: map id
+;\4: x offset for east/west, y offset for north/south
+;\5: distance offset?
 ;\6: strip length
-;\7: this map id
-	map \2
-	dw \3_Blocks + \2_WIDTH * (\2_HEIGHT - 3) + \5
+if "\1" == "north"
+	map \3
+	dw \2_Blocks + \3_WIDTH * (\3_HEIGHT - 3) + \5
 	dw OverworldMap + \4 + 3
 	db \6
-	db \2_WIDTH
-	db \2_HEIGHT * 2 - 1
+	db \3_WIDTH
+	db \3_HEIGHT * 2 - 1
 	db (\4 - \5) * -2
-	dw OverworldMap + \2_HEIGHT * (\2_WIDTH + 6) + 1
-endc
-
-if "\1" == "south"
-;\2: map id
-;\3: map name (eventually will be rolled into map id)
-;\4: x
-;\5: offset?
-;\6: strip length
-;\7: this map id
-	map \2
-	dw \3_Blocks + \5
-	dw OverworldMap + (\7_HEIGHT + 3) * (\7_WIDTH + 6) + \4 + 3
+	dw OverworldMap + \3_HEIGHT * (\3_WIDTH + 6) + 1
+elif "\1" == "south"
+	map \3
+	dw \2_Blocks + \5
+	dw OverworldMap + (CURRENT_MAP_HEIGHT + 3) * (CURRENT_MAP_WIDTH + 6) + \4 + 3
 	db \6
-	db \2_WIDTH
+	db \3_WIDTH
 	db 0
 	db (\4 - \5) * -2
-	dw OverworldMap + \2_WIDTH + 7
-endc
-
-if "\1" == "west"
-;\2: map id
-;\3: map name (eventually will be rolled into map id)
-;\4: y
-;\5: offset?
-;\6: strip length
-;\7: this map id
-	map \2
-	dw \3_Blocks + (\2_WIDTH * \5) + \2_WIDTH - 3
-	dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3)
+	dw OverworldMap + \3_WIDTH + 7
+elif "\1" == "west"
+	map \3
+	dw \2_Blocks + (\3_WIDTH * \5) + \3_WIDTH - 3
+	dw OverworldMap + (CURRENT_MAP_WIDTH + 6) * (\4 + 3)
 	db \6
-	db \2_WIDTH
+	db \3_WIDTH
 	db (\4 - \5) * -2
-	db \2_WIDTH * 2 - 1
-	dw OverworldMap + \2_WIDTH * 2 + 6
-endc
-
-if "\1" == "east"
-;\2: map id
-;\3: map name (eventually will be rolled into map id)
-;\4: y
-;\5: offset?
-;\6: strip length
-;\7: this map id
-	map \2
-	dw \3_Blocks + (\2_WIDTH * \5)
-	dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3 + 1) - 3
+	db \3_WIDTH * 2 - 1
+	dw OverworldMap + \3_WIDTH * 2 + 6
+elif "\1" == "east"
+	map \3
+	dw \2_Blocks + (\3_WIDTH * \5)
+	dw OverworldMap + (CURRENT_MAP_WIDTH + 6) * (\4 + 3 + 1) - 3
 	db \6
-	db \2_WIDTH
+	db \3_WIDTH
 	db (\4 - \5) * -2
 	db 0
-	dw OverworldMap + \2_WIDTH + 7
+	dw OverworldMap + \3_WIDTH + 7
 endc
 ENDM
 
 
 	map_data NewBarkTown, NEW_BARK_TOWN, $05, WEST | EAST
-	connection west, ROUTE_29, Route29, 0, 0, 9, NEW_BARK_TOWN
-	connection east, ROUTE_27, Route27, 0, 0, 9, NEW_BARK_TOWN
+	connection west, Route29, ROUTE_29, 0, 0, 9
+	connection east, Route27, ROUTE_27, 0, 0, 9
 
 	map_data CherrygroveCity, CHERRYGROVE_CITY, $35, NORTH | EAST
-	connection north, ROUTE_30, Route30, 5, 0, 10, CHERRYGROVE_CITY
-	connection east, ROUTE_29, Route29, 0, 0, 9, CHERRYGROVE_CITY
+	connection north, Route30, ROUTE_30, 5, 0, 10
+	connection east, Route29, ROUTE_29, 0, 0, 9
 
 	map_data VioletCity, VIOLET_CITY, $05, SOUTH | WEST | EAST
-	connection south, ROUTE_32, Route32, 0, 0, 10, VIOLET_CITY
-	connection west, ROUTE_36, Route36, 0, 0, 9, VIOLET_CITY
-	connection east, ROUTE_31, Route31, 9, 0, 9, VIOLET_CITY
+	connection south, Route32, ROUTE_32, 0, 0, 10
+	connection west, Route36, ROUTE_36, 0, 0, 9
+	connection east, Route31, ROUTE_31, 9, 0, 9
 
 	map_data AzaleaTown, AZALEA_TOWN, $05, WEST | EAST
-	connection west, ROUTE_34, Route34, -3, 15, 12, AZALEA_TOWN
-	connection east, ROUTE_33, Route33, 0, 0, 9, AZALEA_TOWN
+	connection west, Route34, ROUTE_34, -3, 15, 12
+	connection east, Route33, ROUTE_33, 0, 0, 9
 
 	map_data CianwoodCity, CIANWOOD_CITY, $35, EAST
-	connection east, ROUTE_41, Route41, 0, 0, 27, CIANWOOD_CITY
+	connection east, Route41, ROUTE_41, 0, 0, 27
 
 	map_data GoldenrodCity, GOLDENROD_CITY, $35, NORTH | SOUTH
-	connection north, ROUTE_35, Route35, 5, 0, 10, GOLDENROD_CITY
-	connection south, ROUTE_34, Route34, 5, 0, 10, GOLDENROD_CITY
+	connection north, Route35, ROUTE_35, 5, 0, 10
+	connection south, Route34, ROUTE_34, 5, 0, 10
 
 	map_data OlivineCity, OLIVINE_CITY, $35, NORTH | WEST
-	connection north, ROUTE_39, Route39, 5, 0, 10, OLIVINE_CITY
-	connection west, ROUTE_40, Route40, 9, 0, 12, OLIVINE_CITY
+	connection north, Route39, ROUTE_39, 5, 0, 10
+	connection west, Route40, ROUTE_40, 9, 0, 12
 
 	map_data EcruteakCity, ECRUTEAK_CITY, $05, SOUTH | WEST | EAST
-	connection south, ROUTE_37, Route37, 5, 0, 10, ECRUTEAK_CITY
-	connection west, ROUTE_38, Route38, 5, 0, 9, ECRUTEAK_CITY
-	connection east, ROUTE_42, Route42, 9, 0, 9, ECRUTEAK_CITY
+	connection south, Route37, ROUTE_37, 5, 0, 10
+	connection west, Route38, ROUTE_38, 5, 0, 9
+	connection east, Route42, ROUTE_42, 9, 0, 9
 
 	map_data MahoganyTown, MAHOGANY_TOWN, $71, NORTH | WEST | EAST
-	connection north, ROUTE_43, Route43, 0, 0, 10, MAHOGANY_TOWN
-	connection west, ROUTE_42, Route42, 0, 0, 9, MAHOGANY_TOWN
-	connection east, ROUTE_44, Route44, 0, 0, 9, MAHOGANY_TOWN
+	connection north, Route43, ROUTE_43, 0, 0, 10
+	connection west, Route42, ROUTE_42, 0, 0, 9
+	connection east, Route44, ROUTE_44, 0, 0, 9
 
 	map_data LakeOfRage, LAKE_OF_RAGE, $05, SOUTH
-	connection south, ROUTE_43, Route43, 5, 0, 10, LAKE_OF_RAGE
+	connection south, Route43, ROUTE_43, 5, 0, 10
 
 	map_data BlackthornCity, BLACKTHORN_CITY, $71, SOUTH | WEST
-	connection south, ROUTE_45, Route45, 0, 0, 10, BLACKTHORN_CITY
-	connection west, ROUTE_44, Route44, 9, 0, 9, BLACKTHORN_CITY
+	connection south, Route45, ROUTE_45, 0, 0, 10
+	connection west, Route44, ROUTE_44, 9, 0, 9
 
 	map_data SilverCaveOutside, SILVER_CAVE_OUTSIDE, $2c, EAST
-	connection east, ROUTE_28, Route28, 9, 0, 9, SILVER_CAVE_OUTSIDE
+	connection east, Route28, ROUTE_28, 9, 0, 9
 
 	map_data Route26, ROUTE_26, $05, WEST
-	connection west, ROUTE_27, Route27, 45, 0, 9, ROUTE_26
+	connection west, Route27, ROUTE_27, 45, 0, 9
 
 	map_data Route27, ROUTE_27, $35, WEST | EAST
-	connection west, NEW_BARK_TOWN, NewBarkTown, 0, 0, 9, ROUTE_27
-	connection east, ROUTE_26, Route26, -3, 42, 12, ROUTE_27
+	connection west, NewBarkTown, NEW_BARK_TOWN, 0, 0, 9
+	connection east, Route26, ROUTE_26, -3, 42, 12
 
 	map_data Route28, ROUTE_28, $2c, WEST
-	connection west, SILVER_CAVE_OUTSIDE, SilverCaveOutside, -3, 6, 12, ROUTE_28
+	connection west, SilverCaveOutside, SILVER_CAVE_OUTSIDE, -3, 6, 12
 
 	map_data Route29, ROUTE_29, $05, NORTH | WEST | EAST
-	connection north, ROUTE_46, Route46, 10, 0, 10, ROUTE_29
-	connection west, CHERRYGROVE_CITY, CherrygroveCity, 0, 0, 9, ROUTE_29
-	connection east, NEW_BARK_TOWN, NewBarkTown, 0, 0, 9, ROUTE_29
+	connection north, Route46, ROUTE_46, 10, 0, 10
+	connection west, CherrygroveCity, CHERRYGROVE_CITY, 0, 0, 9
+	connection east, NewBarkTown, NEW_BARK_TOWN, 0, 0, 9
 
 	map_data Route30, ROUTE_30, $05, NORTH | SOUTH
-	connection north, ROUTE_31, Route31, -3, 7, 13, ROUTE_30
-	connection south, CHERRYGROVE_CITY, CherrygroveCity, -3, 2, 16, ROUTE_30
+	connection north, Route31, ROUTE_31, -3, 7, 13
+	connection south, CherrygroveCity, CHERRYGROVE_CITY, -3, 2, 16
 
 	map_data Route31, ROUTE_31, $05, SOUTH | WEST
-	connection south, ROUTE_30, Route30, 10, 0, 10, ROUTE_31
-	connection west, VIOLET_CITY, VioletCity, -3, 6, 12, ROUTE_31
+	connection south, Route30, ROUTE_30, 10, 0, 10
+	connection west, VioletCity, VIOLET_CITY, -3, 6, 12
 
 	map_data Route32, ROUTE_32, $05, NORTH | SOUTH
-	connection north, VIOLET_CITY, VioletCity, 0, 0, 13, ROUTE_32
-	connection south, ROUTE_33, Route33, 0, 0, 10, ROUTE_32
+	connection north, VioletCity, VIOLET_CITY, 0, 0, 13
+	connection south, Route33, ROUTE_33, 0, 0, 10
 
 	map_data Route33, ROUTE_33, $05, NORTH | WEST
-	connection north, ROUTE_32, Route32, 0, 0, 10, ROUTE_33
-	connection west, AZALEA_TOWN, AzaleaTown, 0, 0, 9, ROUTE_33
+	connection north, Route32, ROUTE_32, 0, 0, 10
+	connection west, AzaleaTown, AZALEA_TOWN, 0, 0, 9
 
 	map_data Route34, ROUTE_34, $05, NORTH | EAST
-	connection north, GOLDENROD_CITY, GoldenrodCity, -3, 2, 16, ROUTE_34
-	connection east, AZALEA_TOWN, AzaleaTown, 18, 0, 9, ROUTE_34
+	connection north, GoldenrodCity, GOLDENROD_CITY, -3, 2, 16
+	connection east, AzaleaTown, AZALEA_TOWN, 18, 0, 9
 
 	map_data Route35, ROUTE_35, $05, NORTH | SOUTH
-	connection north, ROUTE_36, Route36, 0, 0, 13, ROUTE_35
-	connection south, GOLDENROD_CITY, GoldenrodCity, -3, 2, 16, ROUTE_35
+	connection north, Route36, ROUTE_36, 0, 0, 13
+	connection south, GoldenrodCity, GOLDENROD_CITY, -3, 2, 16
 
 	map_data Route36, ROUTE_36, $05, NORTH | SOUTH | EAST
-	connection north, ROUTE_37, Route37, 10, 0, 10, ROUTE_36
-	connection south, ROUTE_35, Route35, 0, 0, 10, ROUTE_36
-	connection east, VIOLET_CITY, VioletCity, 0, 0, 12, ROUTE_36
+	connection north, Route37, ROUTE_37, 10, 0, 10
+	connection south, Route35, ROUTE_35, 0, 0, 10
+	connection east, VioletCity, VIOLET_CITY, 0, 0, 12
 
 	map_data Route37, ROUTE_37, $05, NORTH | SOUTH
-	connection north, ECRUTEAK_CITY, EcruteakCity, -3, 2, 16, ROUTE_37
-	connection south, ROUTE_36, Route36, -3, 7, 16, ROUTE_37
+	connection north, EcruteakCity, ECRUTEAK_CITY, -3, 2, 16
+	connection south, Route36, ROUTE_36, -3, 7, 16
 
 	map_data Route38, ROUTE_38, $05, WEST | EAST
-	connection west, ROUTE_39, Route39, 0, 0, 12, ROUTE_38
-	connection east, ECRUTEAK_CITY, EcruteakCity, -3, 2, 15, ROUTE_38
+	connection west, Route39, ROUTE_39, 0, 0, 12
+	connection east, EcruteakCity, ECRUTEAK_CITY, -3, 2, 15
 
 	map_data Route39, ROUTE_39, $05, SOUTH | EAST
-	connection south, OLIVINE_CITY, OlivineCity, -3, 2, 16, ROUTE_39
-	connection east, ROUTE_38, Route38, 0, 0, 9, ROUTE_39
+	connection south, OlivineCity, OLIVINE_CITY, -3, 2, 16
+	connection east, Route38, ROUTE_38, 0, 0, 9
 
 	map_data Route40, ROUTE_40, $35, SOUTH | EAST
-	connection south, ROUTE_41, Route41, -3, 12, 13, ROUTE_40
-	connection east, OLIVINE_CITY, OlivineCity, -3, 6, 12, ROUTE_40
+	connection south, Route41, ROUTE_41, -3, 12, 13
+	connection east, OlivineCity, OLIVINE_CITY, -3, 6, 12
 
 	map_data Route41, ROUTE_41, $35, NORTH | WEST
-	connection north, ROUTE_40, Route40, 15, 0, 10, ROUTE_41
-	connection west, CIANWOOD_CITY, CianwoodCity, 0, 0, 27, ROUTE_41
+	connection north, Route40, ROUTE_40, 15, 0, 10
+	connection west, CianwoodCity, CIANWOOD_CITY, 0, 0, 27
 
 	map_data Route42, ROUTE_42, $05, WEST | EAST
-	connection west, ECRUTEAK_CITY, EcruteakCity, -3, 6, 12, ROUTE_42
-	connection east, MAHOGANY_TOWN, MahoganyTown, 0, 0, 9, ROUTE_42
+	connection west, EcruteakCity, ECRUTEAK_CITY, -3, 6, 12
+	connection east, MahoganyTown, MAHOGANY_TOWN, 0, 0, 9
 
 	map_data Route43, ROUTE_43, $05, NORTH | SOUTH
-	connection north, LAKE_OF_RAGE, LakeOfRage, -3, 2, 16, ROUTE_43
-	connection south, MAHOGANY_TOWN, MahoganyTown, 0, 0, 10, ROUTE_43
+	connection north, LakeOfRage, LAKE_OF_RAGE, -3, 2, 16
+	connection south, MahoganyTown, MAHOGANY_TOWN, 0, 0, 10
 
 	map_data Route44, ROUTE_44, $71, WEST | EAST
-	connection west, MAHOGANY_TOWN, MahoganyTown, 0, 0, 9, ROUTE_44
-	connection east, BLACKTHORN_CITY, BlackthornCity, -3, 6, 12, ROUTE_44
+	connection west, MahoganyTown, MAHOGANY_TOWN, 0, 0, 9
+	connection east, BlackthornCity, BLACKTHORN_CITY, -3, 6, 12
 
 	map_data Route45, ROUTE_45, $71, NORTH | WEST
-	connection north, BLACKTHORN_CITY, BlackthornCity, 0, 0, 13, ROUTE_45
-	connection west, ROUTE_46, Route46, 36, 0, 12, ROUTE_45
+	connection north, BlackthornCity, BLACKTHORN_CITY, 0, 0, 13
+	connection west, Route46, ROUTE_46, 36, 0, 12
 
 	map_data Route46, ROUTE_46, $05, SOUTH | EAST
-	connection south, ROUTE_29, Route29, -3, 7, 16, ROUTE_46
-	connection east, ROUTE_45, Route45, -3, 33, 12, ROUTE_46
+	connection south, Route29, ROUTE_29, -3, 7, 16
+	connection east, Route45, ROUTE_45, -3, 33, 12
 
 	map_data PewterCity, PEWTER_CITY, $0f, SOUTH | EAST
-	connection south, ROUTE_2, Route2, 5, 0, 10, PEWTER_CITY
-	connection east, ROUTE_3, Route3, 5, 0, 9, PEWTER_CITY
+	connection south, Route2, ROUTE_2, 5, 0, 10
+	connection east, Route3, ROUTE_3, 5, 0, 9
 
 	map_data Route2, ROUTE_2, $0f, NORTH | SOUTH
-	connection north, PEWTER_CITY, PewterCity, -3, 2, 16, ROUTE_2
-	connection south, VIRIDIAN_CITY, ViridianCity, -3, 2, 16, ROUTE_2
+	connection north, PewterCity, PEWTER_CITY, -3, 2, 16
+	connection south, ViridianCity, VIRIDIAN_CITY, -3, 2, 16
 
 	map_data ViridianCity, VIRIDIAN_CITY, $0f, NORTH | SOUTH | WEST
-	connection north, ROUTE_2, Route2, 5, 0, 10, VIRIDIAN_CITY
-	connection south, ROUTE_1, Route1, 10, 0, 10, VIRIDIAN_CITY
-	connection west, ROUTE_22, Route22, 4, 0, 9, VIRIDIAN_CITY
+	connection north, Route2, ROUTE_2, 5, 0, 10
+	connection south, Route1, ROUTE_1, 10, 0, 10
+	connection west, Route22, ROUTE_22, 4, 0, 9
 
 	map_data Route22, ROUTE_22, $2c, EAST
-	connection east, VIRIDIAN_CITY, ViridianCity, -3, 1, 15, ROUTE_22
+	connection east, ViridianCity, VIRIDIAN_CITY, -3, 1, 15
 
 	map_data Route1, ROUTE_1, $0f, NORTH | SOUTH
-	connection north, VIRIDIAN_CITY, ViridianCity, -3, 7, 13, ROUTE_1
-	connection south, PALLET_TOWN, PalletTown, 0, 0, 10, ROUTE_1
+	connection north, ViridianCity, VIRIDIAN_CITY, -3, 7, 13
+	connection south, PalletTown, PALLET_TOWN, 0, 0, 10
 
 	map_data PalletTown, PALLET_TOWN, $0f, NORTH | SOUTH
-	connection north, ROUTE_1, Route1, 0, 0, 10, PALLET_TOWN
-	connection south, ROUTE_21, Route21, 0, 0, 10, PALLET_TOWN
+	connection north, Route1, ROUTE_1, 0, 0, 10
+	connection south, Route21, ROUTE_21, 0, 0, 10
 
 	map_data Route21, ROUTE_21, $43, NORTH | SOUTH
-	connection north, PALLET_TOWN, PalletTown, 0, 0, 10, ROUTE_21
-	connection south, CINNABAR_ISLAND, CinnabarIsland, 0, 0, 10, ROUTE_21
+	connection north, PalletTown, PALLET_TOWN, 0, 0, 10
+	connection south, CinnabarIsland, CINNABAR_ISLAND, 0, 0, 10
 
 	map_data CinnabarIsland, CINNABAR_ISLAND, $43, NORTH | EAST
-	connection north, ROUTE_21, Route21, 0, 0, 10, CINNABAR_ISLAND
-	connection east, ROUTE_20, Route20, 0, 0, 9, CINNABAR_ISLAND
+	connection north, Route21, ROUTE_21, 0, 0, 10
+	connection east, Route20, ROUTE_20, 0, 0, 9
 
 	map_data Route20, ROUTE_20, $43, WEST | EAST
-	connection west, CINNABAR_ISLAND, CinnabarIsland, 0, 0, 9, ROUTE_20
-	connection east, ROUTE_19, Route19, -3, 6, 12, ROUTE_20
+	connection west, CinnabarIsland, CINNABAR_ISLAND, 0, 0, 9
+	connection east, Route19, ROUTE_19, -3, 6, 12
 
 	map_data Route19, ROUTE_19, $43, NORTH | WEST
-	connection north, FUCHSIA_CITY, FuchsiaCity, 0, 0, 13, ROUTE_19
-	connection west, ROUTE_20, Route20, 9, 0, 9, ROUTE_19
+	connection north, FuchsiaCity, FUCHSIA_CITY, 0, 0, 13
+	connection west, Route20, ROUTE_20, 9, 0, 9
 
 	map_data FuchsiaCity, FUCHSIA_CITY, $0f, SOUTH | WEST | EAST
-	connection south, ROUTE_19, Route19, 0, 0, 10, FUCHSIA_CITY
-	connection west, ROUTE_18, Route18, 7, 0, 9, FUCHSIA_CITY
-	connection east, ROUTE_15, Route15, 9, 0, 9, FUCHSIA_CITY
+	connection south, Route19, ROUTE_19, 0, 0, 10
+	connection west, Route18, ROUTE_18, 7, 0, 9
+	connection east, Route15, ROUTE_15, 9, 0, 9
 
 	map_data Route18, ROUTE_18, $43, WEST | EAST
-	connection west, ROUTE_17, Route17, -3, 35, 10, ROUTE_18
-	connection east, FUCHSIA_CITY, FuchsiaCity, -3, 4, 14, ROUTE_18
+	connection west, Route17, ROUTE_17, -3, 35, 10
+	connection east, FuchsiaCity, FUCHSIA_CITY, -3, 4, 14
 
 	map_data Route17, ROUTE_17, $43, NORTH | EAST
-	connection north, ROUTE_16, Route16, 0, 0, 10, ROUTE_17
-	connection east, ROUTE_18, Route18, 38, 0, 9, ROUTE_17
+	connection north, Route16, ROUTE_16, 0, 0, 10
+	connection east, Route18, ROUTE_18, 38, 0, 9
 
 	map_data Route16, ROUTE_16, $0f, SOUTH | EAST
-	connection south, ROUTE_17, Route17, 0, 0, 10, ROUTE_16
-	connection east, CELADON_CITY, CeladonCity, -3, 6, 12, ROUTE_16
+	connection south, Route17, ROUTE_17, 0, 0, 10
+	connection east, CeladonCity, CELADON_CITY, -3, 6, 12
 
 	map_data CeladonCity, CELADON_CITY, $0f, WEST | EAST
-	connection west, ROUTE_16, Route16, 9, 0, 9, CELADON_CITY
-	connection east, ROUTE_7, Route7, 5, 0, 9, CELADON_CITY
+	connection west, Route16, ROUTE_16, 9, 0, 9
+	connection east, Route7, ROUTE_7, 5, 0, 9
 
 	map_data Route7, ROUTE_7, $0f, WEST | EAST
-	connection west, CELADON_CITY, CeladonCity, -3, 2, 15, ROUTE_7
-	connection east, SAFFRON_CITY, SaffronCity, -3, 6, 12, ROUTE_7
+	connection west, CeladonCity, CELADON_CITY, -3, 2, 15
+	connection east, SaffronCity, SAFFRON_CITY, -3, 6, 12
 
 	map_data Route15, ROUTE_15, $0f, WEST | EAST
-	connection west, FUCHSIA_CITY, FuchsiaCity, -3, 6, 12, ROUTE_15
-	connection east, ROUTE_14, Route14, -3, 6, 12, ROUTE_15
+	connection west, FuchsiaCity, FUCHSIA_CITY, -3, 6, 12
+	connection east, Route14, ROUTE_14, -3, 6, 12
 
 	map_data Route14, ROUTE_14, $43, NORTH | WEST
-	connection north, ROUTE_13, Route13, 0, 0, 13, ROUTE_14
-	connection west, ROUTE_15, Route15, 9, 0, 9, ROUTE_14
+	connection north, Route13, ROUTE_13, 0, 0, 13
+	connection west, Route15, ROUTE_15, 9, 0, 9
 
 	map_data Route13, ROUTE_13, $43, NORTH | SOUTH
-	connection north, ROUTE_12, Route12, 20, 0, 10, ROUTE_13
-	connection south, ROUTE_14, Route14, 0, 0, 10, ROUTE_13
+	connection north, Route12, ROUTE_12, 20, 0, 10
+	connection south, Route14, ROUTE_14, 0, 0, 10
 
 	map_data Route12, ROUTE_12, $43, NORTH | SOUTH | WEST
-	connection north, LAVENDER_TOWN, LavenderTown, 0, 0, 10, ROUTE_12
-	connection south, ROUTE_13, Route13, -3, 17, 13, ROUTE_12
-	connection west, ROUTE_11, Route11, 9, 0, 9, ROUTE_12
+	connection north, LavenderTown, LAVENDER_TOWN, 0, 0, 10
+	connection south, Route13, ROUTE_13, -3, 17, 13
+	connection west, Route11, ROUTE_11, 9, 0, 9
 
 	map_data Route11, ROUTE_11, $0f, WEST | EAST
-	connection west, VERMILION_CITY, VermilionCity, 0, 0, 12, ROUTE_11
-	connection east, ROUTE_12, Route12, -3, 6, 15, ROUTE_11
+	connection west, VermilionCity, VERMILION_CITY, 0, 0, 12
+	connection east, Route12, ROUTE_12, -3, 6, 15
 
 	map_data LavenderTown, LAVENDER_TOWN, $2c, NORTH | SOUTH | WEST
-	connection north, ROUTE_10_SOUTH, Route10South, 0, 0, 10, LAVENDER_TOWN
-	connection south, ROUTE_12, Route12, 0, 0, 10, LAVENDER_TOWN
-	connection west, ROUTE_8, Route8, 0, 0, 9, LAVENDER_TOWN
+	connection north, Route10South, ROUTE_10_SOUTH, 0, 0, 10
+	connection south, Route12, ROUTE_12, 0, 0, 10
+	connection west, Route8, ROUTE_8, 0, 0, 9
 
 	map_data VermilionCity, VERMILION_CITY, $43, NORTH | EAST
-	connection north, ROUTE_6, Route6, 5, 0, 10, VERMILION_CITY
-	connection east, ROUTE_11, Route11, 0, 0, 9, VERMILION_CITY
+	connection north, Route6, ROUTE_6, 5, 0, 10
+	connection east, Route11, ROUTE_11, 0, 0, 9
 
 	map_data Route6, ROUTE_6, $0f, NORTH | SOUTH
-	connection north, SAFFRON_CITY, SaffronCity, -3, 2, 16, ROUTE_6
-	connection south, VERMILION_CITY, VermilionCity, -3, 2, 16, ROUTE_6
+	connection north, SaffronCity, SAFFRON_CITY, -3, 2, 16
+	connection south, VermilionCity, VERMILION_CITY, -3, 2, 16
 
 	map_data SaffronCity, SAFFRON_CITY, $0f, NORTH | SOUTH | WEST | EAST
-	connection north, ROUTE_5, Route5, 5, 0, 10, SAFFRON_CITY
-	connection south, ROUTE_6, Route6, 5, 0, 10, SAFFRON_CITY
-	connection west, ROUTE_7, Route7, 9, 0, 9, SAFFRON_CITY
-	connection east, ROUTE_8, Route8, 9, 0, 9, SAFFRON_CITY
+	connection north, Route5, ROUTE_5, 5, 0, 10
+	connection south, Route6, ROUTE_6, 5, 0, 10
+	connection west, Route7, ROUTE_7, 9, 0, 9
+	connection east, Route8, ROUTE_8, 9, 0, 9
 
 	map_data Route5, ROUTE_5, $0f, NORTH | SOUTH
-	connection north, CERULEAN_CITY, CeruleanCity, -3, 2, 16, ROUTE_5
-	connection south, SAFFRON_CITY, SaffronCity, -3, 2, 16, ROUTE_5
+	connection north, CeruleanCity, CERULEAN_CITY, -3, 2, 16
+	connection south, SaffronCity, SAFFRON_CITY, -3, 2, 16
 
 	map_data CeruleanCity, CERULEAN_CITY, $0f, NORTH | SOUTH | WEST | EAST
-	connection north, ROUTE_24, Route24, 6, 0, 10, CERULEAN_CITY
-	connection south, ROUTE_5, Route5, 5, 0, 10, CERULEAN_CITY
-	connection west, ROUTE_4, Route4, 5, 0, 9, CERULEAN_CITY
-	connection east, ROUTE_9, Route9, 9, 0, 9, CERULEAN_CITY
+	connection north, Route24, ROUTE_24, 6, 0, 10
+	connection south, Route5, ROUTE_5, 5, 0, 10
+	connection west, Route4, ROUTE_4, 5, 0, 9
+	connection east, Route9, ROUTE_9, 9, 0, 9
 
 	map_data Route9, ROUTE_9, $2c, SOUTH | WEST
-	connection south, ROUTE_10_NORTH, Route10North, 20, 0, 10, ROUTE_9
-	connection west, CERULEAN_CITY, CeruleanCity, -3, 6, 12, ROUTE_9
+	connection south, Route10North, ROUTE_10_NORTH, 20, 0, 10
+	connection west, CeruleanCity, CERULEAN_CITY, -3, 6, 12
 
 	map_data Route24, ROUTE_24, $2c, NORTH | SOUTH
-	connection north, ROUTE_25, Route25, 0, 0, 13, ROUTE_24
-	connection south, CERULEAN_CITY, CeruleanCity, -3, 3, 16, ROUTE_24
+	connection north, Route25, ROUTE_25, 0, 0, 13
+	connection south, CeruleanCity, CERULEAN_CITY, -3, 3, 16
 
 	map_data Route25, ROUTE_25, $2c, SOUTH
-	connection south, ROUTE_24, Route24, 0, 0, 10, ROUTE_25
+	connection south, Route24, ROUTE_24, 0, 0, 10
 
 	map_data Route3, ROUTE_3, $2c, WEST | EAST
-	connection west, PEWTER_CITY, PewterCity, -3, 2, 15, ROUTE_3
-	connection east, ROUTE_4, Route4, 0, 0, 9, ROUTE_3
+	connection west, PewterCity, PEWTER_CITY, -3, 2, 15
+	connection east, Route4, ROUTE_4, 0, 0, 9
 
 	map_data Route4, ROUTE_4, $2c, WEST | EAST
-	connection west, ROUTE_3, Route3, 0, 0, 9, ROUTE_4
-	connection east, CERULEAN_CITY, CeruleanCity, -3, 2, 15, ROUTE_4
+	connection west, Route3, ROUTE_3, 0, 0, 9
+	connection east, CeruleanCity, CERULEAN_CITY, -3, 2, 15
 
 	map_data Route8, ROUTE_8, $2c, WEST | EAST
-	connection west, SAFFRON_CITY, SaffronCity, -3, 6, 12, ROUTE_8
-	connection east, LAVENDER_TOWN, LavenderTown, 0, 0, 9, ROUTE_8
+	connection west, SaffronCity, SAFFRON_CITY, -3, 6, 12
+	connection east, LavenderTown, LAVENDER_TOWN, 0, 0, 9
 
 	map_data Route10North, ROUTE_10_NORTH, $2c, NORTH | SOUTH
-	connection north, ROUTE_9, Route9, -3, 17, 13, ROUTE_10_NORTH
-	connection south, ROUTE_10_SOUTH, Route10South, 0, 0, 10, ROUTE_10_NORTH
+	connection north, Route9, ROUTE_9, -3, 17, 13
+	connection south, Route10South, ROUTE_10_SOUTH, 0, 0, 10
 
 	map_data Route10South, ROUTE_10_SOUTH, $2c, NORTH | SOUTH
-	connection north, ROUTE_10_NORTH, Route10North, 0, 0, 10, ROUTE_10_SOUTH
-	connection south, LAVENDER_TOWN, LavenderTown, 0, 0, 10, ROUTE_10_SOUTH
+	connection north, Route10North, ROUTE_10_NORTH, 0, 0, 10
+	connection south, LavenderTown, LAVENDER_TOWN, 0, 0, 10
 
 	map_data Route23, ROUTE_23, $0f, 0
 	map_data SproutTower1F, SPROUT_TOWER_1F, $00, 0

From 6e00101b895b8f1fe304c116fa861e83997a1dc7 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Tue, 30 Jan 2018 14:55:27 -0500
Subject: [PATCH 066/135] Comment values of special pointers, same as predefs

---
 data/special_pointers.asm | 50 +++++++++++++++++++--------------------
 engine/events/dratini.asm |  2 +-
 maps/DragonShrine.asm     |  4 ++--
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/data/special_pointers.asm b/data/special_pointers.asm
index 2c049c77f..f16dcdf30 100644
--- a/data/special_pointers.asm
+++ b/data/special_pointers.asm
@@ -7,7 +7,7 @@ add_special: MACRO
 ENDM
 
 SpecialsPointers:: ; c029
-	add_special WarpToSpawnPoint
+	add_special WarpToSpawnPoint ; $0
 
 ; Communications
 	add_special SetBitsForLinkTradeRequest
@@ -17,7 +17,7 @@ SpecialsPointers:: ; c029
 	add_special CheckBothSelectedSameRoom
 	add_special FailedLinkToPast
 	add_special CloseLink
-	add_special WaitForOtherPlayerToExit
+	add_special WaitForOtherPlayerToExit ; $8
 	add_special SetBitsForBattleRequest
 	add_special SetBitsForTimeCapsuleRequest
 	add_special CheckTimeCapsuleCompatibility
@@ -25,17 +25,17 @@ SpecialsPointers:: ; c029
 	add_special TradeCenter
 	add_special Colosseum
 	add_special TimeCapsule
-	add_special CableClubCheckWhichChris
+	add_special CableClubCheckWhichChris ; $10
 	add_special CheckMysteryGift
 	add_special GetMysteryGiftItem
 	add_special UnlockMysteryGift
 
-; Map Events
+; Map events
 	add_special BugContestJudging
 	add_special CheckPartyFullAfterContest
 	add_special ContestDropOffMons
 	add_special ContestReturnMons
-	add_special GiveParkBalls
+	add_special GiveParkBalls ; $18
 	add_special CheckMagikarpLength
 	add_special MagikarpHouseSign
 	add_special HealParty ; this is both a special and a predef
@@ -43,7 +43,7 @@ SpecialsPointers:: ; c029
 	add_special PlayersHousePC
 	add_special DayCareMan
 	add_special DayCareLady
-	add_special DayCareManOutside
+	add_special DayCareManOutside ; $20
 	add_special MoveDeletion
 	add_special BankOfMom
 	add_special MagnetTrain
@@ -51,7 +51,7 @@ SpecialsPointers:: ; c029
 	add_special SetDayOfWeek
 	add_special OverworldTownMap
 	add_special UnownPrinter
-	add_special MapRadio
+	add_special MapRadio ; $28
 	add_special UnownPuzzle
 	add_special SlotMachine
 	add_special CardFlip
@@ -59,7 +59,7 @@ SpecialsPointers:: ; c029
 	add_special ClearBGPalettesBufferScreen
 	add_special FadeOutPalettes
 	add_special BattleTowerFade
-	add_special FadeBlackQuickly
+	add_special FadeBlackQuickly ; $30
 	add_special FadeInPalettes
 	add_special FadeInQuickly
 	add_special ReloadSpritesNoPalettes ; bank 0
@@ -67,7 +67,7 @@ SpecialsPointers:: ; c029
 	add_special UpdateTimePals ; bank 0
 	add_special ClearTileMap ; bank 0
 	add_special UpdateSprites ; bank 0
-	add_special ReplaceKrisSprite ; bank 0
+	add_special ReplaceKrisSprite ; $38 ; bank 0
 	add_special GameCornerPrizeMonCheckDex
 	add_special UnusedSetSeenMon
 	add_special WaitSFX ; bank 0
@@ -75,7 +75,7 @@ SpecialsPointers:: ; c029
 	add_special RestartMapMusic ; bank 0
 	add_special HealMachineAnim
 	add_special SurfStartStep
-	add_special FindPartyMonGreaterThanThatLevel
+	add_special FindPartyMonGreaterThanThatLevel ; $40
 	add_special FindPartyMonAtLeastThatHappy
 	add_special FindPartyMonThatSpecies
 	add_special FindPartyMonThatSpeciesYourTrainerID
@@ -83,7 +83,7 @@ SpecialsPointers:: ; c029
 	add_special DayCareMon1
 	add_special DayCareMon2
 	add_special SelectRandomBugContestContestants
-	add_special ActivateFishingSwarm
+	add_special ActivateFishingSwarm ; $48
 	add_special ToggleMaptileDecorations
 	add_special ToggleDecorationsVisibility
 	add_special GiveShuckle
@@ -91,7 +91,7 @@ SpecialsPointers:: ; c029
 	add_special BillsGrandfather
 	add_special CheckPokerus
 	add_special DisplayCoinCaseBalance
-	add_special DisplayMoneyAndCoinBalance
+	add_special DisplayMoneyAndCoinBalance ; $50
 	add_special PlaceMoneyTopRight
 	add_special CheckForLuckyNumberWinners
 	add_special CheckLuckyNumberShowFlag
@@ -99,7 +99,7 @@ SpecialsPointers:: ; c029
 	add_special PrintTodaysLuckyNumber
 	add_special SelectApricornForKurt
 	add_special NameRater
-	add_special DisplayLinkRecord
+	add_special DisplayLinkRecord ; $58
 	add_special GetFirstPokemonHappiness
 	add_special CheckFirstMonIsEgg
 	add_special RandomUnseenWildMon
@@ -107,7 +107,7 @@ SpecialsPointers:: ; c029
 	add_special RandomPhoneMon
 	add_special LoadUsedSpritesGFX
 	add_special PlaySlowCry
-	add_special SnorlaxAwake
+	add_special SnorlaxAwake ; $60
 	add_special YoungerHaircutBrother
 	add_special OlderHaircutBrother
 	add_special DaisysGrooming
@@ -115,17 +115,17 @@ SpecialsPointers:: ; c029
 	add_special ProfOaksPCBoot
 	add_special GameboyCheck
 	add_special TrainerHouse
-	add_special PhotoStudio
+	add_special PhotoStudio ; $68
 	add_special InitRoamMons
 	add_special FadeOutMusic
 	add_special Diploma
 	add_special PrintDiploma
 
-	; Crystal
+; Crystal only
 	add_special Function11ac3e
 	add_special Function11b444
 	add_special Function11b5e8
-	add_special Function11b7e5
+	add_special Function11b7e5 ; $70
 	add_special Function11b879
 	add_special Function11b920
 	add_special Function11b93b
@@ -133,7 +133,7 @@ SpecialsPointers:: ; c029
 	add_special Function1700ba
 	add_special Function170114
 	add_special BattleTowerBattle
-	add_special Function1704e1
+	add_special Function1704e1 ; $78
 	add_special DummySpecial_17021d
 	add_special LoadOpponentTrainerAndPokemonWithOTSprite
 	add_special Function11ba38
@@ -141,7 +141,7 @@ SpecialsPointers:: ; c029
 	add_special GiveOddEgg
 	add_special Reset ; bank 0
 	add_special Function1011f1
-	add_special Function101220
+	add_special Function101220 ; $80
 	add_special Function101225
 	add_special Function101231
 	add_special MoveTutor
@@ -149,7 +149,7 @@ SpecialsPointers:: ; c029
 	add_special Function11c1ab
 	add_special BattleTowerAction
 	add_special DisplayUnownWords
-	add_special Menu_ChallengeExplanationCancel
+	add_special Menu_ChallengeExplanationCancel ; $88
 	add_special Function17d2b6
 	add_special Function17d2ce
 	add_special BattleTowerMobileError
@@ -157,15 +157,15 @@ SpecialsPointers:: ; c029
 	add_special HoOhChamber
 	add_special Function102142
 	add_special CelebiShrineEvent
-	add_special CheckCaughtCelebi
+	add_special CheckCaughtCelebi ; $90
 	add_special PokeSeer
 	add_special BuenasPassword
 	add_special BuenaPrize
-	add_special Dratini
+	add_special GiveDratini
 	add_special SampleKenjiBreakCountdown
 	add_special BeastsCheck
 	add_special MonCheck
-	add_special SetPlayerPalette
+	add_special SetPlayerPalette ; $98
 	add_special DummySpecial_170bd2
 	add_special Mobile_SelectThreeMons
 	add_special Function1037eb
@@ -173,7 +173,7 @@ SpecialsPointers:: ; c029
 	add_special StubbedTrainerRankings_Healings
 	add_special RefreshSprites
 	add_special Function1037c2
-	add_special Mobile_DummyReturnFalse
+	add_special Mobile_DummyReturnFalse ; $a0
 	add_special Function103780
 	add_special Function10387b
 	add_special AskRememberPassword
@@ -181,5 +181,5 @@ SpecialsPointers:: ; c029
 	add_special UnusedFindItemInPCOrBag
 	add_special InitialSetDSTFlag
 	add_special InitialClearDSTFlag
-	add_special DummySpecial_c224
+	add_special DummySpecial_c224 ; $a8
 ; c224
diff --git a/engine/events/dratini.asm b/engine/events/dratini.asm
index 620a5a707..70179bc09 100644
--- a/engine/events/dratini.asm
+++ b/engine/events/dratini.asm
@@ -1,4 +1,4 @@
-Dratini: ; 0x8b170
+GiveDratini: ; 0x8b170
 ; if ScriptVar is 0 or 1, change the moveset of the last Dratini in the party.
 ;  0: give it a special moveset with Extremespeed.
 ;  1: give it the normal moveset of a level 15 Dratini.
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index 7211df60a..eb8485e5e 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -209,13 +209,13 @@ DragonShrineElder1Script:
 	writetext DragonShrineTakeThisDratiniText
 	waitbutton
 	checkcode VAR_PARTYCOUNT
-	if_equal 6, .PartyFull
+	if_equal PARTY_LENGTH, .PartyFull
 	writetext DragonShrinePlayerReceivedDratiniText
 	playsound SFX_CAUGHT_MON
 	waitsfx
 	givepoke DRATINI, 15
 	checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG
-	special Dratini
+	special GiveDratini
 	setevent EVENT_GOT_DRATINI
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7
 	writetext DragonShrineSymbolicDragonText

From cb733954c6ab399d5bd6a2d2039575a470ba1725 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Tue, 30 Jan 2018 22:12:53 -0500
Subject: [PATCH 067/135] =?UTF-8?q?SPRITEMOVEDATA=5FITEM=5FTREE=20?=
 =?UTF-8?q?=E2=86=92=20SPRITEMOVEDATA=5FSTILL=20(it's=20used=20for=20other?=
 =?UTF-8?q?=20things=20like=20Azalea's=20Slowpokes,=20not=20just=20items?=
 =?UTF-8?q?=20and=20trees)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 constants/map_object_constants.asm               |  2 +-
 data/sprites/map_objects.asm                     |  2 +-
 docs/map_scripts.md                              |  2 +-
 maps/AzaleaTown.asm                              | 10 +++++-----
 maps/BurnedTower1F.asm                           |  2 +-
 maps/BurnedTowerB1F.asm                          |  2 +-
 maps/CeruleanCity.asm                            |  2 +-
 maps/CianwoodCity.asm                            |  2 +-
 maps/DarkCaveBlackthornEntrance.asm              |  4 ++--
 maps/DarkCaveVioletEntrance.asm                  |  8 ++++----
 maps/DayOfWeekSiblingsHouse.asm                  |  2 +-
 maps/DragonsDenB1F.asm                           |  6 +++---
 maps/EarlsPokemonAcademy.asm                     |  2 +-
 maps/EcruteakItemfinderHouse.asm                 |  2 +-
 maps/ElmsLab.asm                                 |  6 +++---
 maps/FightingDojo.asm                            |  2 +-
 maps/FuchsiaCity.asm                             |  2 +-
 maps/GoldenrodDeptStoreB1F.asm                   |  8 ++++----
 maps/GoldenrodUnderground.asm                    |  2 +-
 maps/GoldenrodUndergroundSwitchRoomEntrances.asm |  4 ++--
 maps/GoldenrodUndergroundWarehouse.asm           |  6 +++---
 maps/IcePath1F.asm                               |  6 +++---
 maps/IcePathB1F.asm                              |  2 +-
 maps/IcePathB2FBlackthornSide.asm                |  2 +-
 maps/IcePathB2FMahoganySide.asm                  | 12 ++++++------
 maps/IcePathB3F.asm                              |  2 +-
 maps/IlexForest.asm                              |  8 ++++----
 maps/KurtsHouse.asm                              |  2 +-
 maps/LakeOfRage.asm                              |  4 ++--
 maps/MountMortar1FInside.asm                     | 14 +++++++-------
 maps/MountMortar1FOutside.asm                    |  4 ++--
 maps/MountMortar2FInside.asm                     | 12 ++++++------
 maps/MountMortarB1F.asm                          | 10 +++++-----
 maps/NationalPark.asm                            |  4 ++--
 maps/NationalParkBugContest.asm                  |  4 ++--
 maps/OlivineLighthouse3F.asm                     |  2 +-
 maps/OlivineLighthouse5F.asm                     |  6 +++---
 maps/OlivineLighthouse6F.asm                     |  2 +-
 maps/PewterCity.asm                              |  4 ++--
 maps/PlayersHouse2F.asm                          |  6 +++---
 maps/RadioTower5F.asm                            |  2 +-
 maps/RockTunnel1F.asm                            |  4 ++--
 maps/RockTunnelB1F.asm                           |  6 +++---
 maps/Route1.asm                                  |  2 +-
 maps/Route11.asm                                 |  2 +-
 maps/Route12.asm                                 |  4 ++--
 maps/Route15.asm                                 |  2 +-
 maps/Route2.asm                                  | 10 +++++-----
 maps/Route25.asm                                 |  2 +-
 maps/Route26.asm                                 |  4 ++--
 maps/Route27.asm                                 |  4 ++--
 maps/Route29.asm                                 |  4 ++--
 maps/Route30.asm                                 |  6 +++---
 maps/Route31.asm                                 |  6 +++---
 maps/Route32.asm                                 |  4 ++--
 maps/Route33.asm                                 |  2 +-
 maps/Route34.asm                                 |  2 +-
 maps/Route35.asm                                 |  4 ++--
 maps/Route36.asm                                 |  4 ++--
 maps/Route37.asm                                 |  6 +++---
 maps/Route38.asm                                 |  2 +-
 maps/Route39.asm                                 |  2 +-
 maps/Route4.asm                                  |  2 +-
 maps/Route42.asm                                 | 12 ++++++------
 maps/Route43.asm                                 |  4 ++--
 maps/Route44.asm                                 |  8 ++++----
 maps/Route45.asm                                 | 10 +++++-----
 maps/Route46.asm                                 |  6 +++---
 maps/Route8.asm                                  |  2 +-
 maps/RuinsOfAlphAerodactylItemRoom.asm           |  8 ++++----
 maps/RuinsOfAlphHoOhItemRoom.asm                 |  8 ++++----
 maps/RuinsOfAlphKabutoItemRoom.asm               |  8 ++++----
 maps/RuinsOfAlphOmanyteItemRoom.asm              |  8 ++++----
 maps/SilverCaveItemRooms.asm                     |  4 ++--
 maps/SilverCaveRoom1.asm                         |  8 ++++----
 maps/SilverCaveRoom2.asm                         |  6 +++---
 maps/SlowpokeWellB1F.asm                         |  6 +++---
 maps/SlowpokeWellB2F.asm                         |  2 +-
 maps/SproutTower1F.asm                           |  2 +-
 maps/SproutTower2F.asm                           |  2 +-
 maps/SproutTower3F.asm                           |  4 ++--
 maps/TeamRocketBaseB1F.asm                       |  6 +++---
 maps/TeamRocketBaseB2F.asm                       |  2 +-
 maps/TeamRocketBaseB3F.asm                       | 10 +++++-----
 maps/TinTower1F.asm                              |  6 +++---
 maps/TinTower3F.asm                              |  2 +-
 maps/TinTower4F.asm                              |  6 +++---
 maps/TinTower5F.asm                              |  2 +-
 maps/TinTower6F.asm                              |  2 +-
 maps/TinTower7F.asm                              |  2 +-
 maps/TinTower8F.asm                              |  6 +++---
 maps/TinTower9F.asm                              |  2 +-
 maps/TohjoFalls.asm                              |  2 +-
 maps/UnionCave1F.asm                             |  8 ++++----
 maps/UnionCaveB1F.asm                            |  4 ++--
 maps/UnionCaveB2F.asm                            |  4 ++--
 maps/VictoryRoad.asm                             | 10 +++++-----
 maps/VioletCity.asm                              |  6 +++---
 maps/WhirlIslandB1F.asm                          | 10 +++++-----
 maps/WhirlIslandB2F.asm                          |  6 +++---
 maps/WhirlIslandNE.asm                           |  2 +-
 maps/WhirlIslandSW.asm                           |  2 +-
 102 files changed, 239 insertions(+), 239 deletions(-)

diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm
index 7649f3542..95da4bebb 100644
--- a/constants/map_object_constants.asm
+++ b/constants/map_object_constants.asm
@@ -82,7 +82,7 @@ MAPOBJECT_SCREEN_WIDTH EQU 12
 ; SpriteMovementData indexes (see data/sprites/map_objects.asm)
 	const_def
 	const SPRITEMOVEDATA_00                   ; 00
-	const SPRITEMOVEDATA_ITEM_TREE            ; 01
+	const SPRITEMOVEDATA_STILL                ; 01
 	const SPRITEMOVEDATA_WANDER               ; 02
 	const SPRITEMOVEDATA_SPINRANDOM_SLOW      ; 03
 	const SPRITEMOVEDATA_WALK_UP_DOWN         ; 04
diff --git a/data/sprites/map_objects.asm b/data/sprites/map_objects.asm
index 19a7c8d27..ece2f607b 100755
--- a/data/sprites/map_objects.asm
+++ b/data/sprites/map_objects.asm
@@ -7,7 +7,7 @@ SpriteMovementData:: ; 4273
 ; entries correspond to SPRITEMOVEDATA_* constants
 	; function,                                              facing, action,                  flags1, flags2, palette flags
 	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; SPRITEMOVEDATA_00
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $0c,    $00,    %0000 ; SPRITEMOVEDATA_ITEM_TREE
+	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $0c,    $00,    %0000 ; SPRITEMOVEDATA_STILL
 	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_WANDER
 	sprite_movement_data SPRITEMOVEFN_SLOW_RANDOM_SPIN,      DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINRANDOM_SLOW
 	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_Y,         DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_WALK_UP_DOWN
diff --git a/docs/map_scripts.md b/docs/map_scripts.md
index fa864ac37..c024c0244 100644
--- a/docs/map_scripts.md
+++ b/docs/map_scripts.md
@@ -122,7 +122,7 @@ BG event types:
 
 Movement types:
 
-- `SPRITEMOVEDATA_ITEM_TREE`
+- `SPRITEMOVEDATA_STILL`
 
 - `SPRITEMOVEDATA_WANDER`
 
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index e7940c638..e9026e05e 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -487,11 +487,11 @@ AzaleaTown_MapEvents:
 	object_event 21, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1
 	object_event 15, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1
 	object_event 7, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1
-	object_event 8, 17, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
-	object_event 18, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
-	object_event 29, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
-	object_event 15, 15, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
-	object_event 8, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhiteApricornTree, -1
+	object_event 8, 17, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
+	object_event 18, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
+	object_event 29, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
+	object_event 15, 15, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
+	object_event 8, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhiteApricornTree, -1
 	object_event 11, 10, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
 	object_event 10, 16, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket2Script, EVENT_SLOWPOKE_WELL_ROCKETS
 	object_event 6, 5, SPRITE_KURT_OUTSIDE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index 8d276a634..fb7b950f5 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -306,4 +306,4 @@ BurnedTower1F_MapEvents:
 	object_event 12, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE
 	object_event 8, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
 	object_event 14, 14, SPRITE_MORTY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BurnedTower1FMortyScript, EVENT_BURNED_TOWER_MORTY
-	object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP
+	object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index 7c0b4d7f3..0f1059349 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -257,5 +257,5 @@ BurnedTowerB1F_MapEvents:
 	object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
 	object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
 	object_event 10, 4, SPRITE_SUICUNE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
-	object_event 16, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE
+	object_event 16, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE
 	object_event 10, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FEusine, EVENT_EUSINE_IN_BURNED_TOWER
diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm
index 0e649cba0..6fa79be19 100644
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -300,7 +300,7 @@ CeruleanCity_MapEvents:
 	db 6 ; object events
 	object_event 15, 23, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1
 	object_event 23, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCitySuperNerdScript, -1
-	object_event 20, 24, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1
+	object_event 20, 24, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1
 	object_event 21, 24, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerFScript, -1
 	object_event 30, 26, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityFisherScript, -1
 	object_event 6, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityYoungsterScript, -1
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index 11fbaf9a2..c7fa3e8b0 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -415,4 +415,4 @@ CianwoodCity_MapEvents:
 	object_event 4, 19, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
 	object_event 10, 46, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityChucksWife, -1
 	object_event 11, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE
-	object_event 10, 14, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
+	object_event 10, 14, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm
index 9806a905e..cbc858e70 100644
--- a/maps/DarkCaveBlackthornEntrance.asm
+++ b/maps/DarkCaveBlackthornEntrance.asm
@@ -72,5 +72,5 @@ DarkCaveBlackthornEntrance_MapEvents:
 
 	db 3 ; object events
 	object_event 7, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1
-	object_event 21, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE
-	object_event 7, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE
+	object_event 21, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE
+	object_event 7, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE
diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm
index c188057e8..733f260f0 100644
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -45,11 +45,11 @@ DarkCaveVioletEntrance_MapEvents:
 	bg_event 26, 3, BGEVENT_ITEM, DarkCaveVioletEntranceHiddenElixer
 
 	db 8 ; object events
-	object_event 6, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION
+	object_event 6, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION
 	object_event 16, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
 	object_event 27, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
 	object_event 7, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
 	object_event 36, 31, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
-	object_event 36, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceFullHeal, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL
-	object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceHyperPotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION
-	object_event 30, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceDireHit, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT
+	object_event 36, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceFullHeal, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL
+	object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceHyperPotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION
+	object_event 30, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceDireHit, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT
diff --git a/maps/DayOfWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm
index a4bfcf211..b88641ef0 100644
--- a/maps/DayOfWeekSiblingsHouse.asm
+++ b/maps/DayOfWeekSiblingsHouse.asm
@@ -80,4 +80,4 @@ DayOfWeekSiblingsHouse_MapEvents:
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1
+	object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 0ce532235..4f2545a5a 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -421,12 +421,12 @@ DragonsDenB1F_MapEvents:
 	bg_event 31, 15, BGEVENT_ITEM, DragonsDenB1FHiddenMaxElixer
 
 	db 9 ; object events
-	object_event 35, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG
+	object_event 35, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG
 	object_event 14, 30, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR
 	object_event 20, 23, SPRITE_SILVER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN
 	object_event 20, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermDarin, -1
 	object_event 8, 8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1
 	object_event 4, 17, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1
 	object_event 4, 18, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia2, -1
-	object_event 30, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FCalcium, EVENT_DRAGONS_DEN_B1F_CALCIUM
-	object_event 5, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FMaxElixer, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER
+	object_event 30, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FCalcium, EVENT_DRAGONS_DEN_B1F_CALCIUM
+	object_event 5, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FMaxElixer, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER
diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm
index 8bbef9261..e650fa409 100644
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -430,4 +430,4 @@ EarlsPokemonAcademy_MapEvents:
 	object_event 3, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1
 	object_event 4, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid2Script, -1
 	object_event 4, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster2Script, -1
-	object_event 2, 4, SPRITE_POKEDEX, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AcademyNotebook, -1
+	object_event 2, 4, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AcademyNotebook, -1
diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm
index c19aebb38..a5e7ad29b 100644
--- a/maps/EcruteakItemfinderHouse.asm
+++ b/maps/EcruteakItemfinderHouse.asm
@@ -174,4 +174,4 @@ EcruteakItemfinderHouse_MapEvents:
 
 	db 2 ; object events
 	object_event 2, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakItemfinderGuy, -1
-	object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHistoryBook, -1
+	object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHistoryBook, -1
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 2f9a46217..2dff90e41 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -1406,7 +1406,7 @@ ElmsLab_MapEvents:
 	db 6 ; object events
 	object_event 5, 2, SPRITE_ELM, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfElmScript, -1
 	object_event 2, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB
-	object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
-	object_event 7, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB
-	object_event 8, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB
+	object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
+	object_event 7, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB
+	object_event 8, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB
 	object_event 5, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB
diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm
index ad90b5fd6..20e81db02 100644
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -55,4 +55,4 @@ FightingDojo_MapEvents:
 
 	db 2 ; object events
 	object_event 4, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1
-	object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND
+	object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND
diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm
index c1277cadf..076587ca0 100644
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -154,4 +154,4 @@ FuchsiaCity_MapEvents:
 	object_event 23, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1
 	object_event 13, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1
 	object_event 16, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1
-	object_event 8, 1, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1
+	object_event 8, 1, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1
diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm
index 098aad19b..83849fe60 100644
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -120,10 +120,10 @@ GoldenrodDeptStoreB1F_MapEvents:
 	db 0 ; bg events
 
 	db 8 ; object events
-	object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER
-	object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN
-	object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL
-	object_event 15, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FUltraBall, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL
+	object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER
+	object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN
+	object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL
+	object_event 15, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FUltraBall, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL
 	object_event 9, 10, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt1Script, -1
 	object_event 4, 8, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt2Script, -1
 	object_event 6, 13, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt3Script, -1
diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm
index c55463286..765b48427 100644
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -669,7 +669,7 @@ GoldenrodUnderground_MapEvents:
 	object_event 6, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1
 	object_event 3, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1
 	object_event 2, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1
-	object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundCoinCase, EVENT_GOLDENROD_UNDERGROUND_COIN_CASE
+	object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundCoinCase, EVENT_GOLDENROD_UNDERGROUND_COIN_CASE
 	object_event 7, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_GOLDENROD_UNDERGROUND_GRAMPS
 	object_event 7, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_OLDER_HAIRCUT_BROTHER
 	object_event 7, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_YOUNGER_HAIRCUT_BROTHER
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index 6e66d3ef0..27c77e1ba 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -963,6 +963,6 @@ GoldenrodUndergroundSwitchRoomEntrances_MapEvents:
 	object_event 19, 12, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event 3, 27, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1
 	object_event 19, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7ca7a, -1
-	object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesSmokeBall, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
-	object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesFullHeal, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL
+	object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesSmokeBall, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
+	object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesFullHeal, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL
 	object_event 23, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_GOLDENROD_UNDERGROUND
diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm
index f64085b73..a4d283739 100644
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -225,6 +225,6 @@ GoldenrodUndergroundWarehouse_MapEvents:
 	object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event 14, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event 12, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 18, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseMaxEther, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_MAX_ETHER
-	object_event 13, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseTMSleepTalk, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
-	object_event 2, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseUltraBall, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL
+	object_event 18, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseMaxEther, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_MAX_ETHER
+	object_event 13, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseTMSleepTalk, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
+	object_event 2, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseUltraBall, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL
diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm
index 5f109a654..fbb3a9198 100644
--- a/maps/IcePath1F.asm
+++ b/maps/IcePath1F.asm
@@ -31,6 +31,6 @@ IcePath1F_MapEvents:
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 31, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL
-	object_event 32, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP
-	object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN
+	object_event 31, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL
+	object_event 32, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP
+	object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN
diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm
index 417e71a7f..b40bea795 100644
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -96,4 +96,4 @@ IcePathB1F_MapEvents:
 	object_event 7, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2
 	object_event 8, 9, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3
 	object_event 17, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4
-	object_event 5, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB1FIron, EVENT_ICE_PATH_B1F_IRON
+	object_event 5, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB1FIron, EVENT_ICE_PATH_B1F_IRON
diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm
index 286348a55..2170bacd6 100644
--- a/maps/IcePathB2FBlackthornSide.asm
+++ b/maps/IcePathB2FBlackthornSide.asm
@@ -25,4 +25,4 @@ IcePathB2FBlackthornSide_MapEvents:
 	bg_event 2, 10, BGEVENT_ITEM, IcePathB2FBlackthornSideHiddenIceHeal
 
 	db 1 ; object events
-	object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST
+	object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST
diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm
index f4cc310fa..05f9ee3ec 100644
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -45,9 +45,9 @@ IcePathB2FMahoganySide_MapEvents:
 	bg_event 0, 17, BGEVENT_ITEM, IcePathB2FMahoganySideHiddenCarbos
 
 	db 6 ; object events
-	object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_1A
-	object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_2A
-	object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_3A
-	object_event 12, 13, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_4A
-	object_event 8, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL
-	object_event 0, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION
+	object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_1A
+	object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_2A
+	object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_3A
+	object_event 12, 13, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_4A
+	object_event 8, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL
+	object_event 0, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION
diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm
index 99e96fba6..8e93a991c 100644
--- a/maps/IcePathB3F.asm
+++ b/maps/IcePathB3F.asm
@@ -25,5 +25,5 @@ IcePathB3F_MapEvents:
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 5, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE
+	object_event 5, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE
 	object_event 6, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index 37460e549..17190a96c 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -957,10 +957,10 @@ IlexForest_MapEvents:
 	object_event 7, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE
 	object_event 5, 28, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER
 	object_event 15, 14, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestHeadbuttGuyScript, -1
-	object_event 20, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestRevive, EVENT_ILEX_FOREST_REVIVE
+	object_event 20, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestRevive, EVENT_ILEX_FOREST_REVIVE
 	object_event 8, 29, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT
 	object_event 3, 24, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS
 	object_event 12, 1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerBugCatcherWayne, -1
-	object_event 9, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK
-	object_event 17, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE
-	object_event 27, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER
+	object_event 9, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK
+	object_event 17, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE
+	object_event 27, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index edb1ebe55..fe04823d8 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -695,6 +695,6 @@ KurtsHouse_MapEvents:
 	db 5 ; object events
 	object_event 3, 2, SPRITE_KURT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1
 	object_event 5, 3, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1
-	object_event 6, 3, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE
+	object_event 6, 3, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE
 	object_event 14, 3, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2
 	object_event 11, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm
index ecfe02e59..2630738b9 100644
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -518,5 +518,5 @@ LakeOfRage_MapEvents:
 	object_event 36, 7, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS
 	object_event 18, 22, SPRITE_GYARADOS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS
 	object_event 4, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY
-	object_event 7, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER
-	object_event 35, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT
+	object_event 7, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER
+	object_event 35, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT
diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm
index fad3d4098..30b59906a 100644
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -132,12 +132,12 @@ MountMortar1FInside_MapEvents:
 
 	db 10 ; object events
 	object_event 21, 43, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortar1FBoulder, -1
-	object_event 35, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideEscapeRope, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE
-	object_event 16, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxRevive, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE
-	object_event 10, 27, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideHyperPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION
-	object_event 22, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION
-	object_event 35, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideNugget, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET
+	object_event 35, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideEscapeRope, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE
+	object_event 16, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxRevive, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE
+	object_event 10, 27, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideHyperPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION
+	object_event 22, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION
+	object_event 35, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideNugget, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET
 	object_event 33, 43, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacMiller, -1
 	object_event 24, 28, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdMarkus, -1
-	object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideIron, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON
-	object_event 17, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideUltraBall, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL
+	object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideIron, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON
+	object_event 17, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideUltraBall, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL
diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm
index 1656a7f41..cb9518c3a 100644
--- a/maps/MountMortar1FOutside.asm
+++ b/maps/MountMortar1FOutside.asm
@@ -36,5 +36,5 @@ MountMortar1FOutside_MapEvents:
 	bg_event 25, 22, BGEVENT_ITEM, MountMortar1FOutsideHiddenHyperPotion
 
 	db 2 ; object events
-	object_event 13, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideEther, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER
-	object_event 31, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE
+	object_event 13, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideEther, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER
+	object_event 31, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE
diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm
index 2496eaa2c..c0bf05700 100644
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -77,10 +77,10 @@ MountMortar2FInside_MapEvents:
 	bg_event 24, 8, BGEVENT_ITEM, MountMortar2FInsideHiddenFullRestore
 
 	db 7 ; object events
-	object_event 28, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION
-	object_event 2, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY
-	object_event 19, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL
-	object_event 16, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideDragonScale, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE
-	object_event 9, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideElixer, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER
-	object_event 28, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideEscapeRope, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE
+	object_event 28, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION
+	object_event 2, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY
+	object_event 19, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL
+	object_event 16, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideDragonScale, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE
+	object_event 9, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideElixer, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER
+	object_event 28, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideEscapeRope, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE
 	object_event 13, 26, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdHugh, -1
diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm
index 47cea6826..1aa27592e 100644
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -145,10 +145,10 @@ MountMortarB1F_MapEvents:
 	bg_event 4, 6, BGEVENT_ITEM, MountMortarB1FHiddenMaxRevive
 
 	db 7 ; object events
-	object_event 29, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
-	object_event 4, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS
+	object_event 29, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
+	object_event 4, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS
 	object_event 9, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1
 	object_event 16, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1
-	object_event 34, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FFullRestore, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE
-	object_event 32, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER
-	object_event 21, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP
+	object_event 34, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FFullRestore, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE
+	object_event 32, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER
+	object_event 21, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index 7ec334903..095324ea5 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -540,6 +540,6 @@ NationalPark_MapEvents:
 	object_event 18, 29, SPRITE_POKEFAN_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1
 	object_event 16, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1
 	object_event 8, 14, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassKrise, -1
-	object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
+	object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
 	object_event 26, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1
-	object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG
+	object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG
diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm
index d9a431590..e52e0c71a 100644
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -246,5 +246,5 @@ NationalParkBugContest_MapEvents:
 	object_event 11, 27, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A
 	object_event 16, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A
 	object_event 17, 34, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A
-	object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
-	object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG
+	object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
+	object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG
diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm
index 84311e40e..1a02febe8 100644
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -132,4 +132,4 @@ OlivineLighthouse3F_MapEvents:
 	object_event 9, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1
 	object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1
 	object_event 3, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperTheo, -1
-	object_event 8, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER
+	object_event 8, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER
diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm
index 62767ab5d..792f77132 100644
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -108,6 +108,6 @@ OlivineLighthouse5F_MapEvents:
 	db 5 ; object events
 	object_event 8, 11, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1
 	object_event 8, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBirdKeeperDenis, -1
-	object_event 15, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY
-	object_event 6, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL
-	object_event 2, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER
+	object_event 15, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY
+	object_event 6, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL
+	object_event 2, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index 109c84cca..9c2620eb5 100644
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -270,4 +270,4 @@ OlivineLighthouse6F_MapEvents:
 	db 3 ; object events
 	object_event 8, 8, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE
 	object_event 9, 8, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1
-	object_event 3, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION
+	object_event 3, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION
diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm
index ab10bcdee..1008bf2fa 100644
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -175,5 +175,5 @@ PewterCity_MapEvents:
 	object_event 19, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1
 	object_event 14, 29, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1
 	object_event 29, 17, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1
-	object_event 32, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1
-	object_event 30, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1
+	object_event 32, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1
+	object_event 30, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1
diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm
index 210c4af79..011fbbd0c 100644
--- a/maps/PlayersHouse2F.asm
+++ b/maps/PlayersHouse2F.asm
@@ -128,7 +128,7 @@ PlayersHouse2F_MapEvents:
 	bg_event 6, 0, BGEVENT_IFSET, PlayersHousePosterScript
 
 	db 4 ; object events
-	object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE
-	object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1
-	object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2
+	object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE
+	object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1
+	object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2
 	object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index 7fe87eeb5..efc0e3cef 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -441,4 +441,4 @@ RadioTower5F_MapEvents:
 	object_event 13, 5, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event 17, 2, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event 13, 5, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER
-	object_event 8, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RadioTower5FUltraBall, EVENT_RADIO_TOWER_5F_ULTRA_BALL
+	object_event 8, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RadioTower5FUltraBall, EVENT_RADIO_TOWER_5F_ULTRA_BALL
diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm
index f0073181c..6b8a8fe35 100644
--- a/maps/RockTunnel1F.asm
+++ b/maps/RockTunnel1F.asm
@@ -37,5 +37,5 @@ RockTunnel1F_MapEvents:
 	bg_event 21, 15, BGEVENT_ITEM, RockTunnel1FHiddenXDefend
 
 	db 2 ; object events
-	object_event 4, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER
-	object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING
+	object_event 4, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER
+	object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING
diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm
index d1b676c00..799e31fc8 100644
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -35,6 +35,6 @@ RockTunnelB1F_MapEvents:
 	bg_event 4, 14, BGEVENT_ITEM, RockTunnelB1FHiddenMaxPotion
 
 	db 3 ; object events
-	object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON
-	object_event 6, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP
-	object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE
+	object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON
+	object_event 6, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP
+	object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE
diff --git a/maps/Route1.asm b/maps/Route1.asm
index eb2d407a5..834605d8a 100644
--- a/maps/Route1.asm
+++ b/maps/Route1.asm
@@ -91,4 +91,4 @@ Route1_MapEvents:
 	db 3 ; object events
 	object_event 4, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1
 	object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1
-	object_event 3, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1
+	object_event 3, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1
diff --git a/maps/Route11.asm b/maps/Route11.asm
index 8934549fc..1e7f9d7c7 100644
--- a/maps/Route11.asm
+++ b/maps/Route11.asm
@@ -159,4 +159,4 @@ Route11_MapEvents:
 	object_event 20, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1
 	object_event 28, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1
 	object_event 8, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFidel, -1
-	object_event 32, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1
+	object_event 32, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1
diff --git a/maps/Route12.asm b/maps/Route12.asm
index a4f56cf01..78671620c 100644
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -182,5 +182,5 @@ Route12_MapEvents:
 	object_event 14, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherStephen, -1
 	object_event 10, 38, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerFisherBarney, -1
 	object_event 6, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherKyle, -1
-	object_event 5, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Calcium, EVENT_ROUTE_12_CALCIUM
-	object_event 5, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET
+	object_event 5, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Calcium, EVENT_ROUTE_12_CALCIUM
+	object_event 5, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET
diff --git a/maps/Route15.asm b/maps/Route15.asm
index a3c0521b8..39737342e 100644
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -218,4 +218,4 @@ Route15_MapEvents:
 	object_event 27, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyBilly, -1
 	object_event 30, 12, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerTeacherColette, -1
 	object_event 20, 10, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherHillary, -1
-	object_event 12, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP
+	object_event 12, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP
diff --git a/maps/Route2.asm b/maps/Route2.asm
index 27f3e0c8b..04e11f88b 100644
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -168,8 +168,8 @@ Route2_MapEvents:
 	object_event 10, 45, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherRob, -1
 	object_event 6, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1
 	object_event 0, 40, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1
-	object_event 0, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT
-	object_event 2, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION
-	object_event 19, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS
-	object_event 14, 50, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER
-	object_event 10, 14, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1
+	object_event 0, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT
+	object_event 2, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION
+	object_event 19, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS
+	object_event 14, 50, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER
+	object_event 10, 14, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1
diff --git a/maps/Route25.asm b/maps/Route25.asm
index ad9342144..b27472063 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -452,4 +452,4 @@ Route25_MapEvents:
 	object_event 28, 11, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassShannon, -1
 	object_event 31, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerSupernerdPat, -1
 	object_event 37, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerCooltrainermKevin, -1
-	object_event 32, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN
+	object_event 32, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN
diff --git a/maps/Route26.asm b/maps/Route26.asm
index 9c118d700..332e361b3 100644
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -430,5 +430,5 @@ Route26_MapEvents:
 	object_event 5, 8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfBeth1, -1
 	object_event 13, 79, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicRichard, -1
 	object_event 10, 92, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherScott, -1
-	object_event 14, 54, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a4ec2, -1
-	object_event 9, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER
+	object_event 14, 54, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a4ec2, -1
+	object_event 9, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER
diff --git a/maps/Route27.asm b/maps/Route27.asm
index 2190b9520..d7c02cb3b 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -487,6 +487,6 @@ Route27_MapEvents:
 	object_event 37, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1
 	object_event 65, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicGilbert, -1
 	object_event 58, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperJose2, -1
-	object_event 60, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM
-	object_event 53, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY
+	object_event 60, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM
+	object_event 53, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY
 	object_event 21, 10, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 3, Route27FisherScript, -1
diff --git a/maps/Route29.asm b/maps/Route29.asm
index 0f018ac82..66b761e2a 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -431,8 +431,8 @@ Route29_MapEvents:
 	object_event 50, 12, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CatchingTutorialDudeScript, -1
 	object_event 27, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29YoungsterScript, -1
 	object_event 15, 11, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29TeacherScript, -1
-	object_event 12, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route29FruitTree, -1
+	object_event 12, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route29FruitTree, -1
 	object_event 25, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route29FisherScript, -1
 	object_event 13, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1
 	object_event 29, 12, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY
-	object_event 48, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION
+	object_event 48, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION
diff --git a/maps/Route30.asm b/maps/Route30.asm
index 744846670..78d41fac8 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -428,7 +428,7 @@ Route30_MapEvents:
 	object_event 7, 30, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route30YoungsterScript, -1
 	object_event 5, 24, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
 	object_event 5, 25, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
-	object_event 5, 39, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree1, -1
-	object_event 11, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree2, -1
+	object_event 5, 39, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree1, -1
+	object_event 11, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree2, -1
 	object_event 2, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30CooltrainerFScript, -1
-	object_event 8, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE
+	object_event 8, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE
diff --git a/maps/Route31.asm b/maps/Route31.asm
index 3bb7f6871..0d774ebdb 100644
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -434,6 +434,6 @@ Route31_MapEvents:
 	object_event 9, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31YoungsterScript, -1
 	object_event 21, 13, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherWade1, -1
 	object_event 33, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31CooltrainerMScript, -1
-	object_event 16, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31FruitTree, -1
-	object_event 29, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION
-	object_event 19, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31PokeBall, EVENT_ROUTE_31_POKE_BALL
+	object_event 16, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31FruitTree, -1
+	object_event 29, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION
+	object_event 19, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31PokeBall, EVENT_ROUTE_31_POKE_BALL
diff --git a/maps/Route32.asm b/maps/Route32.asm
index 7035fe541..00d1bc473 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -958,7 +958,7 @@ Route32_MapEvents:
 	object_event 19, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1
 	object_event 11, 82, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperPeter, -1
 	object_event 7, 70, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS
-	object_event 6, 53, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL
+	object_event 6, 53, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL
 	object_event 15, 13, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32RoarTMGuyScript, -1
 	object_event 12, 67, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY
-	object_event 3, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL
+	object_event 3, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL
diff --git a/maps/Route33.asm b/maps/Route33.asm
index c728f6496..5993e361a 100644
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -206,4 +206,4 @@ Route33_MapEvents:
 	db 3 ; object events
 	object_event 6, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1
 	object_event 13, 16, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route33LassScript, -1
-	object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTreeScript, -1
+	object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTreeScript, -1
diff --git a/maps/Route34.asm b/maps/Route34.asm
index bd94515e3..178694c68 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -790,4 +790,4 @@ Route34_MapEvents:
 	object_event 11, 48, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfIrene, -1
 	object_event 3, 48, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1
 	object_event 6, 51, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1
-	object_event 7, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET
+	object_event 7, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET
diff --git a/maps/Route35.asm b/maps/Route35.asm
index 3a4b59f34..6bfeff6da 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -484,5 +484,5 @@ Route35_MapEvents:
 	object_event 16, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherArnie, -1
 	object_event 5, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerJugglerIrwin, -1
 	object_event 5, 6, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TrainerOfficerDirk, -1
-	object_event 2, 25, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1
-	object_event 13, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT
+	object_event 2, 25, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1
+	object_event 13, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT
diff --git a/maps/Route36.asm b/maps/Route36.asm
index cad07e31a..d62e7ebd1 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -682,7 +682,7 @@ Route36_MapEvents:
 	object_event 35, 9, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO
 	object_event 51, 8, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1940e0, -1
 	object_event 44, 9, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1
-	object_event 21, 4, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36FruitTree, -1
+	object_event 21, 4, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36FruitTree, -1
 	object_event 46, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY
 	object_event 33, 12, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route36FloriaScript, EVENT_FLORIA_AT_SUDOWOODO
-	object_event 21, 6, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36
+	object_event 21, 6, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36
diff --git a/maps/Route37.asm b/maps/Route37.asm
index a57549911..0a875ecec 100644
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -250,7 +250,7 @@ Route37_MapEvents:
 	object_event 6, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1
 	object_event 7, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1
 	object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicGreg, -1
-	object_event 13, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e09, -1
+	object_event 13, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e09, -1
 	object_event 16, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY
-	object_event 16, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0b, -1
-	object_event 15, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0d, -1
+	object_event 16, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0b, -1
+	object_event 15, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0d, -1
diff --git a/maps/Route38.asm b/maps/Route38.asm
index 7a3c038c1..e1102333a 100644
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -489,5 +489,5 @@ Route38_MapEvents:
 	object_event 12, 15, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBirdKeeperToby, -1
 	object_event 19, 9, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1
 	object_event 24, 5, SPRITE_SAILOR, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorHarry, -1
-	object_event 12, 10, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a1f33, -1
+	object_event 12, 10, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a1f33, -1
 	object_event 5, 8, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyOlivia, -1
diff --git a/maps/Route39.asm b/maps/Route39.asm
index c93d4a863..4e3b35067 100644
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -365,5 +365,5 @@ Route39_MapEvents:
 	object_event 4, 15, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
 	object_event 8, 13, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
 	object_event 13, 7, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicNorman, -1
-	object_event 9, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1
+	object_event 9, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1
 	object_event 4, 22, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerPokefanfJaime, -1
diff --git a/maps/Route4.asm b/maps/Route4.asm
index 724a57dec..5662ec516 100644
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -134,4 +134,4 @@ Route4_MapEvents:
 	object_event 17, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1
 	object_event 9, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1
 	object_event 21, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1
-	object_event 26, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP
+	object_event 26, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP
diff --git a/maps/Route42.asm b/maps/Route42.asm
index 8b1f1d4d1..92f28fc22 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -340,9 +340,9 @@ Route42_MapEvents:
 	object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully, -1
 	object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1
 	object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1
-	object_event 27, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1
-	object_event 28, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1
-	object_event 29, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1
-	object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL
-	object_event 33, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION
-	object_event 26, 16, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42
+	object_event 27, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1
+	object_event 28, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1
+	object_event 29, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1
+	object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL
+	object_event 33, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION
+	object_event 26, 16, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42
diff --git a/maps/Route43.asm b/maps/Route43.asm
index e1d72d36a..0958475db 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -522,5 +522,5 @@ Route43_MapEvents:
 	object_event 4, 16, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerFisherMarvin, -1
 	object_event 9, 25, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTiffany, -1
 	object_event 13, 40, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperSpencer, -1
-	object_event 1, 26, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1
-	object_event 12, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER
+	object_event 1, 26, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1
+	object_event 12, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER
diff --git a/maps/Route44.asm b/maps/Route44.asm
index 6589956f7..4b3a188cc 100644
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -525,7 +525,7 @@ Route44_MapEvents:
 	object_event 51, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperVance1, -1
 	object_event 41, 15, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainermAllen, -1
 	object_event 31, 14, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfCybil, -1
-	object_event 9, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1
-	object_event 30, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE
-	object_event 45, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL
-	object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRepel, EVENT_ROUTE_44_MAX_REPEL
+	object_event 9, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1
+	object_event 30, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE
+	object_event 45, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL
+	object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRepel, EVENT_ROUTE_44_MAX_REPEL
diff --git a/maps/Route45.asm b/maps/Route45.asm
index 339eed39c..f5d1c9e9b 100644
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -549,9 +549,9 @@ Route45_MapEvents:
 	object_event 11, 50, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltKenji, -1
 	object_event 17, 18, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermRyan, -1
 	object_event 5, 36, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1
-	object_event 16, 82, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19e294, -1
-	object_event 6, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET
-	object_event 5, 66, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE
-	object_event 6, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER
-	object_event 7, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION
+	object_event 16, 82, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19e294, -1
+	object_event 6, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET
+	object_event 5, 66, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE
+	object_event 6, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER
+	object_event 7, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION
 	object_event 4, 70, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerCamperQuentin, -1
diff --git a/maps/Route46.asm b/maps/Route46.asm
index bb0bfd9b3..9e4b04f08 100644
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -265,6 +265,6 @@ Route46_MapEvents:
 	object_event 12, 19, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerBailey, -1
 	object_event 4, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1
 	object_event 2, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1
-	object_event 7, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1
-	object_event 8, 6, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1
-	object_event 1, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED
+	object_event 7, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1
+	object_event 8, 6, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1
+	object_event 1, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED
diff --git a/maps/Route8.asm b/maps/Route8.asm
index a7ab2783b..e66a06a83 100644
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -189,4 +189,4 @@ Route8_MapEvents:
 	object_event 10, 10, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerBikerZeke, -1
 	object_event 23, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdSam, -1
 	object_event 31, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSupernerdTom, -1
-	object_event 33, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x6c06c, -1
+	object_event 33, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x6c06c, -1
diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm
index be87d0302..b5a43250d 100644
--- a/maps/RuinsOfAlphAerodactylItemRoom.asm
+++ b/maps/RuinsOfAlphAerodactylItemRoom.asm
@@ -46,7 +46,7 @@ RuinsOfAlphAerodactylItemRoom_MapEvents:
 	bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script
 
 	db 4 ; object events
-	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM
-	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM
-	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM
-	object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM
+	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM
+	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM
+	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM
+	object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM
diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm
index 70916792b..94ae48fd7 100644
--- a/maps/RuinsOfAlphHoOhItemRoom.asm
+++ b/maps/RuinsOfAlphHoOhItemRoom.asm
@@ -46,7 +46,7 @@ RuinsOfAlphHoOhItemRoom_MapEvents:
 	bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
 
 	db 4 ; object events
-	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
-	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
-	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM
-	object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM
+	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
+	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
+	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM
+	object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM
diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm
index 98e471cbf..efd2766db 100644
--- a/maps/RuinsOfAlphKabutoItemRoom.asm
+++ b/maps/RuinsOfAlphKabutoItemRoom.asm
@@ -46,7 +46,7 @@ RuinsOfAlphKabutoItemRoom_MapEvents:
 	bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script
 
 	db 4 ; object events
-	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM
-	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM
-	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM
-	object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM
+	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM
+	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM
+	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM
+	object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM
diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm
index 4ad567450..376531c07 100644
--- a/maps/RuinsOfAlphOmanyteItemRoom.asm
+++ b/maps/RuinsOfAlphOmanyteItemRoom.asm
@@ -46,7 +46,7 @@ RuinsOfAlphOmanyteItemRoom_MapEvents:
 	bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script
 
 	db 4 ; object events
-	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM
-	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM
-	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM
-	object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM
+	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM
+	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM
+	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM
+	object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM
diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm
index e506fc8f4..04574f3c5 100644
--- a/maps/SilverCaveItemRooms.asm
+++ b/maps/SilverCaveItemRooms.asm
@@ -25,5 +25,5 @@ SilverCaveItemRooms_MapEvents:
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE
-	object_event 15, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE
+	object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE
+	object_event 15, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE
diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm
index e2ff6115b..ada015512 100644
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -41,7 +41,7 @@ SilverCaveRoom1_MapEvents:
 	bg_event 17, 12, BGEVENT_ITEM, SilverCaveRoom1HiddenUltraBall
 
 	db 4 ; object events
-	object_event 4, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER
-	object_event 15, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN
-	object_event 5, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE
-	object_event 7, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1UltraBall, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL
+	object_event 4, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER
+	object_event 15, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN
+	object_event 5, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE
+	object_event 7, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1UltraBall, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL
diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm
index 0fd5ceae1..0b06f893f 100644
--- a/maps/SilverCaveRoom2.asm
+++ b/maps/SilverCaveRoom2.asm
@@ -35,6 +35,6 @@ SilverCaveRoom2_MapEvents:
 	bg_event 14, 31, BGEVENT_ITEM, SilverCaveRoom2HiddenMaxPotion
 
 	db 3 ; object events
-	object_event 24, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM
-	object_event 22, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL
-	object_event 4, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP
+	object_event 24, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM
+	object_event 22, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL
+	object_event 4, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP
diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm
index b64976027..53531527d 100644
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -334,8 +334,8 @@ SlowpokeWellB1F_MapEvents:
 	object_event 5, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS
 	object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS
 	object_event 10, 4, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS
-	object_event 7, 4, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FSlowpokeWithMailScript, EVENT_SLOWPOKE_WELL_SLOWPOKES
-	object_event 6, 2, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FTaillessSlowpokeScript, EVENT_SLOWPOKE_WELL_SLOWPOKES
+	object_event 7, 4, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FSlowpokeWithMailScript, EVENT_SLOWPOKE_WELL_SLOWPOKES
+	object_event 6, 2, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FTaillessSlowpokeScript, EVENT_SLOWPOKE_WELL_SLOWPOKES
 	object_event 16, 14, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FKurtScript, EVENT_SLOWPOKE_WELL_KURT
 	object_event 3, 2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1
-	object_event 10, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION
+	object_event 10, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION
diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm
index 73bea004b..6f3ca2f54 100644
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -71,4 +71,4 @@ SlowpokeWellB2F_MapEvents:
 
 	db 2 ; object events
 	object_event 5, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1
-	object_event 15, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE
+	object_event 15, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE
diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm
index 93ac9bec8..7dd9288a9 100644
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -122,4 +122,4 @@ SproutTower1F_MapEvents:
 	object_event 11, 12, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FGrannyScript, -1
 	object_event 9, 9, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FTeacherScript, -1
 	object_event 3, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageChow, -1
-	object_event 16, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL
+	object_event 16, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL
diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm
index 63b7d6d3b..f945086a4 100644
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -99,4 +99,4 @@ SproutTower2F_MapEvents:
 	db 3 ; object events
 	object_event 12, 3, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1
 	object_event 9, 14, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSageEdmond, -1
-	object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY
+	object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index 6f62df3c6..4917ad5ad 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -349,6 +349,6 @@ SproutTower3F_MapEvents:
 	object_event 8, 8, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1
 	object_event 10, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1
 	object_event 11, 11, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageNeal, -1
-	object_event 6, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION
-	object_event 14, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE
+	object_event 6, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION
+	object_event 14, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE
 	object_event 10, 4, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index 725d8738b..0e02a0008 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -784,6 +784,6 @@ TeamRocketBaseB1F_MapEvents:
 	object_event 0, 0, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS
 	object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION
 	object_event 18, 12, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event 27, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FHyperPotion, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION
-	object_event 14, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FNugget, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET
-	object_event 21, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FGuardSpec, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC
+	object_event 27, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FHyperPotion, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION
+	object_event 14, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FNugget, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET
+	object_event 21, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FGuardSpec, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index de8707b70..3e8d0688e 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -966,4 +966,4 @@ TeamRocketBaseB2F_MapEvents:
 	object_event 25, 13, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION
 	object_event 4, 1, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION
 	object_event 21, 14, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event 3, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB2FTMThief, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF
+	object_event 3, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB2FTMThief, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index 42cc78777..cabae5bd1 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -599,8 +599,8 @@ TeamRocketBaseB3F_MapEvents:
 	object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION
 	object_event 24, 14, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeamRocketBaseB3FRocketScript, EVENT_TEAM_ROCKET_BASE_POPULATION
 	object_event 4, 5, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE
-	object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN
-	object_event 3, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL
-	object_event 28, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FFullHeal, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL
-	object_event 17, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FIceHeal, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL
-	object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FUltraBall, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL
+	object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN
+	object_event 3, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL
+	object_event 28, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FFullHeal, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL
+	object_event 17, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FIceHeal, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL
+	object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FUltraBall, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index 8689abb0b..9956fb9e7 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -533,9 +533,9 @@ TinTower1F_MapEvents:
 	db 0 ; bg events
 
 	db 10 ; object events
-	object_event 9, 9, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE
-	object_event 7, 9, SPRITE_RAIKOU, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU
-	object_event 12, 9, SPRITE_ENTEI, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI
+	object_event 9, 9, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE
+	object_event 7, 9, SPRITE_RAIKOU, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU
+	object_event 12, 9, SPRITE_ENTEI, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI
 	object_event 8, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE
 	object_event 5, 9, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage1Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
 	object_event 11, 11, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage2Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm
index 20ec2c389..f3f8f230b 100644
--- a/maps/TinTower3F.asm
+++ b/maps/TinTower3F.asm
@@ -21,4 +21,4 @@ TinTower3F_MapEvents:
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 3, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL
+	object_event 3, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL
diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm
index 9881b6f6c..453e985a0 100644
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -35,6 +35,6 @@ TinTower4F_MapEvents:
 	bg_event 11, 6, BGEVENT_ITEM, TinTower4FHiddenMaxPotion
 
 	db 3 ; object events
-	object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL
-	object_event 17, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP
-	object_event 2, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE
+	object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL
+	object_event 17, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP
+	object_event 2, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE
diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm
index 0ffbf5c34..1fb058b10 100644
--- a/maps/TinTower5F.asm
+++ b/maps/TinTower5F.asm
@@ -31,4 +31,4 @@ TinTower5F_MapEvents:
 	bg_event 3, 15, BGEVENT_ITEM, TinTower5FHiddenCarbos
 
 	db 1 ; object events
-	object_event 9, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY
+	object_event 9, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY
diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm
index 162a0313e..5a4ee770b 100644
--- a/maps/TinTower6F.asm
+++ b/maps/TinTower6F.asm
@@ -21,4 +21,4 @@ TinTower6F_MapEvents:
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 8, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION
+	object_event 8, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION
diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm
index 1f984e14b..429657d1b 100644
--- a/maps/TinTower7F.asm
+++ b/maps/TinTower7F.asm
@@ -24,4 +24,4 @@ TinTower7F_MapEvents:
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 16, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE
+	object_event 16, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE
diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm
index c95d4b471..403f8e4b1 100644
--- a/maps/TinTower8F.asm
+++ b/maps/TinTower8F.asm
@@ -33,6 +33,6 @@ TinTower8F_MapEvents:
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET
-	object_event 11, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER
-	object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE
+	object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET
+	object_event 11, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER
+	object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE
diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm
index b794dea52..9096927c8 100644
--- a/maps/TinTower9F.asm
+++ b/maps/TinTower9F.asm
@@ -36,4 +36,4 @@ TinTower9F_MapEvents:
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 9, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP
+	object_event 9, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP
diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm
index 561e7e1e2..f0e2cb36b 100644
--- a/maps/TohjoFalls.asm
+++ b/maps/TohjoFalls.asm
@@ -21,4 +21,4 @@ TohjoFalls_MapEvents:
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE
+	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE
diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm
index 8aaa3bf3a..077869795 100644
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -216,7 +216,7 @@ UnionCave1F_MapEvents:
 	object_event 11, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerRussell, -1
 	object_event 15, 27, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerFirebreatherRay, -1
 	object_event 14, 19, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerFirebreatherBill, -1
-	object_event 17, 21, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FGreatBall, EVENT_UNION_CAVE_1F_GREAT_BALL
-	object_event 4, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK
-	object_event 4, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION
-	object_event 12, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FAwakening, EVENT_UNION_CAVE_1F_AWAKENING
+	object_event 17, 21, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FGreatBall, EVENT_UNION_CAVE_1F_GREAT_BALL
+	object_event 4, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK
+	object_event 4, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION
+	object_event 12, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FAwakening, EVENT_UNION_CAVE_1F_AWAKENING
diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm
index 339572a07..5d5719a41 100644
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -169,6 +169,6 @@ UnionCaveB1F_MapEvents:
 	object_event 16, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerLeonard, -1
 	object_event 5, 32, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1
 	object_event 17, 30, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacCalvin, -1
-	object_event 2, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FTMSwift, EVENT_UNION_CAVE_B1F_TM_SWIFT
+	object_event 2, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FTMSwift, EVENT_UNION_CAVE_B1F_TM_SWIFT
 	object_event 7, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, UnionCaveB1FBoulder, -1
-	object_event 17, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FXDefend, EVENT_UNION_CAVE_B1F_X_DEFEND
+	object_event 17, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FXDefend, EVENT_UNION_CAVE_B1F_X_DEFEND
diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm
index 791b6cb8c..1ebce4081 100644
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -153,6 +153,6 @@ UnionCaveB2F_MapEvents:
 	object_event 15, 19, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermNick, -1
 	object_event 5, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1
 	object_event 3, 30, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1
-	object_event 16, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER
-	object_event 12, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION
+	object_event 16, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER
+	object_event 12, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION
 	object_event 11, 31, SPRITE_SURF, SPRITEMOVEDATA_LAPRAS, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index 34aa49a5a..062371647 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -261,8 +261,8 @@ VictoryRoad_MapEvents:
 
 	db 6 ; object events
 	object_event 18, 13, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD
-	object_event 3, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE
-	object_event 12, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE
-	object_event 18, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullRestore, EVENT_VICTORY_ROAD_FULL_RESTORE
-	object_event 15, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullHeal, EVENT_VICTORY_ROAD_FULL_HEAL
-	object_event 7, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP
+	object_event 3, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE
+	object_event 12, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE
+	object_event 18, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullRestore, EVENT_VICTORY_ROAD_FULL_RESTORE
+	object_event 15, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullHeal, EVENT_VICTORY_ROAD_FULL_HEAL
+	object_event 7, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
index cc4eba2b5..93ca00b36 100644
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -307,6 +307,6 @@ VioletCity_MapEvents:
 	object_event 24, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1
 	object_event 17, 20, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityGrampsScript, -1
 	object_event 5, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1
-	object_event 14, 29, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityFruitTreeScript, -1
-	object_event 4, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP
-	object_event 35, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY
+	object_event 14, 29, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityFruitTreeScript, -1
+	object_event 4, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP
+	object_event 35, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY
diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm
index f5b474fc4..b6e3c7fad 100644
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -60,9 +60,9 @@ WhirlIslandB1F_MapEvents:
 	bg_event 2, 23, BGEVENT_ITEM, WhirlIslandB1FHiddenFullRestore
 
 	db 6 ; object events
-	object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE
-	object_event 2, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS
-	object_event 33, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM
-	object_event 17, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET
-	object_event 19, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FEscapeRope, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE
+	object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE
+	object_event 2, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS
+	object_event 33, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM
+	object_event 17, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET
+	object_event 19, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FEscapeRope, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE
 	object_event 23, 26, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhirlIslandB1FBoulder, -1
diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm
index 2e5071631..97df1a598 100644
--- a/maps/WhirlIslandB2F.asm
+++ b/maps/WhirlIslandB2F.asm
@@ -31,6 +31,6 @@ WhirlIslandB2F_MapEvents:
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 10, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE
-	object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE
-	object_event 5, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER
+	object_event 10, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE
+	object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE
+	object_event 5, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER
diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm
index 9fc721d77..c38d94baa 100644
--- a/maps/WhirlIslandNE.asm
+++ b/maps/WhirlIslandNE.asm
@@ -22,4 +22,4 @@ WhirlIslandNE_MapEvents:
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 11, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandNEUltraBall, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL
+	object_event 11, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandNEUltraBall, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL
diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm
index 58878cb34..75e8cc3ff 100644
--- a/maps/WhirlIslandSW.asm
+++ b/maps/WhirlIslandSW.asm
@@ -24,4 +24,4 @@ WhirlIslandSW_MapEvents:
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL
+	object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL

From 006d9f644168a09ba147643e29a599bc668bf094 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Tue, 30 Jan 2018 22:34:05 -0500
Subject: [PATCH 068/135] Clarify big doll-related constants (Snorlax and
 Lapras are symmetrical, Onix is not)

---
 constants/map_object_constants.asm | 38 +++++++--------
 data/sprites/map_objects.asm       | 78 +++++++++++++++---------------
 docs/map_scripts.md                |  4 +-
 engine/map_objects.asm             | 20 ++++----
 engine/npc_movement.asm            |  2 +-
 maps/VermilionCity.asm             |  2 +-
 6 files changed, 73 insertions(+), 71 deletions(-)

diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm
index 95da4bebb..8df3b03f0 100644
--- a/constants/map_object_constants.asm
+++ b/constants/map_object_constants.asm
@@ -102,7 +102,7 @@ MAPOBJECT_SCREEN_WIDTH EQU 12
 	const SPRITEMOVEDATA_12                   ; 12
 	const SPRITEMOVEDATA_FOLLOWING            ; 13
 	const SPRITEMOVEDATA_SCRIPTED             ; 14
-	const SPRITEMOVEDATA_SNORLAX              ; 15
+	const SPRITEMOVEDATA_BIGDOLLSYM           ; 15
 	const SPRITEMOVEDATA_POKEMON              ; 16
 	const SPRITEMOVEDATA_SUDOWOODO            ; 17
 	const SPRITEMOVEDATA_SMASHABLE_ROCK       ; 18
@@ -113,7 +113,7 @@ MAPOBJECT_SCREEN_WIDTH EQU 12
 	const SPRITEMOVEDATA_SCREENSHAKE          ; 1d
 	const SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE ; 1e
 	const SPRITEMOVEDATA_SPINCLOCKWISE        ; 1f
-	const SPRITEMOVEDATA_20                   ; 20
+	const SPRITEMOVEDATA_BIGDOLLASYM          ; 20
 	const SPRITEMOVEDATA_BIGDOLL              ; 21
 	const SPRITEMOVEDATA_BOULDERDUST          ; 22
 	const SPRITEMOVEDATA_GRASS                ; 23
@@ -183,23 +183,23 @@ SPRITEMOVEDATA_FIELDS EQU 6
 
 ; ObjectActionPairPointers indexes (see engine/map_object_action.asm)
 	const_def
-	const OBJECT_ACTION_00           ; 00
-	const OBJECT_ACTION_STAND        ; 01
-	const OBJECT_ACTION_STEP         ; 02
-	const OBJECT_ACTION_BUMP         ; 03
-	const OBJECT_ACTION_SPIN         ; 04
-	const OBJECT_ACTION_SPIN_FLICKER ; 05
-	const OBJECT_ACTION_FISHING      ; 06
-	const OBJECT_ACTION_SHADOW       ; 07
-	const OBJECT_ACTION_EMOTE        ; 08
-	const OBJECT_ACTION_BIG_SNORLAX  ; 09
-	const OBJECT_ACTION_BOUNCE       ; 0a
-	const OBJECT_ACTION_WEIRD_TREE   ; 0b
-	const OBJECT_ACTION_BIG_LAPRAS   ; 0c
-	const OBJECT_ACTION_BIG_DOLL     ; 0d
-	const OBJECT_ACTION_BOULDER_DUST ; 0e
-	const OBJECT_ACTION_GRASS_SHAKE  ; 0f
-	const OBJECT_ACTION_SKYFALL      ; 10
+	const OBJECT_ACTION_00            ; 00
+	const OBJECT_ACTION_STAND         ; 01
+	const OBJECT_ACTION_STEP          ; 02
+	const OBJECT_ACTION_BUMP          ; 03
+	const OBJECT_ACTION_SPIN          ; 04
+	const OBJECT_ACTION_SPIN_FLICKER  ; 05
+	const OBJECT_ACTION_FISHING       ; 06
+	const OBJECT_ACTION_SHADOW        ; 07
+	const OBJECT_ACTION_EMOTE         ; 08
+	const OBJECT_ACTION_BIG_DOLL_SYM  ; 09
+	const OBJECT_ACTION_BOUNCE        ; 0a
+	const OBJECT_ACTION_WEIRD_TREE    ; 0b
+	const OBJECT_ACTION_BIG_DOLL_ASYM ; 0c
+	const OBJECT_ACTION_BIG_DOLL      ; 0d
+	const OBJECT_ACTION_BOULDER_DUST  ; 0e
+	const OBJECT_ACTION_GRASS_SHAKE   ; 0f
+	const OBJECT_ACTION_SKYFALL       ; 10
 
 ; Facings indexes (see data/sprites/facings.asm)
 	const_def
diff --git a/data/sprites/map_objects.asm b/data/sprites/map_objects.asm
index ece2f607b..0197ad945 100755
--- a/data/sprites/map_objects.asm
+++ b/data/sprites/map_objects.asm
@@ -5,43 +5,43 @@ ENDM
 
 SpriteMovementData:: ; 4273
 ; entries correspond to SPRITEMOVEDATA_* constants
-	; function,                                              facing, action,                  flags1, flags2, palette flags
-	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; SPRITEMOVEDATA_00
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $0c,    $00,    %0000 ; SPRITEMOVEDATA_STILL
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_WANDER
-	sprite_movement_data SPRITEMOVEFN_SLOW_RANDOM_SPIN,      DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINRANDOM_SLOW
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_Y,         DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_WALK_UP_DOWN
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_X,         DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_WALK_LEFT_RIGHT
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_STANDING_DOWN
-	sprite_movement_data SPRITEMOVEFN_STANDING,              UP,     OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_STANDING_UP
-	sprite_movement_data SPRITEMOVEFN_STANDING,              LEFT,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_STANDING_LEFT
-	sprite_movement_data SPRITEMOVEFN_STANDING,              RIGHT,  OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_STANDING_RIGHT
-	sprite_movement_data SPRITEMOVEFN_FAST_RANDOM_SPIN,      DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINRANDOM_FAST
-	sprite_movement_data SPRITEMOVEFN_OBEY_DPAD,             DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; SPRITEMOVEDATA_PLAYER
-	sprite_movement_data SPRITEMOVEFN_08,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_0C
-	sprite_movement_data SPRITEMOVEFN_09,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_0D
-	sprite_movement_data SPRITEMOVEFN_0A,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_0E
-	sprite_movement_data SPRITEMOVEFN_0B,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_0F
-	sprite_movement_data SPRITEMOVEFN_0C,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_10
-	sprite_movement_data SPRITEMOVEFN_0D,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_11
-	sprite_movement_data SPRITEMOVEFN_0E,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_12
-	sprite_movement_data SPRITEMOVEFN_FOLLOW,                DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; SPRITEMOVEDATA_FOLLOWING
-	sprite_movement_data SPRITEMOVEFN_SCRIPTED,              DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; SPRITEMOVEDATA_SCRIPTED
-	sprite_movement_data SPRITEMOVEFN_BIG_SNORLAX,           DOWN,   OBJECT_ACTION_BIG_SNORLAX,  $2e,    $01,    %1100 ; SPRITEMOVEDATA_SNORLAX
-	sprite_movement_data SPRITEMOVEFN_BOUNCE,                DOWN,   OBJECT_ACTION_BOUNCE,       $2e,    $00,    %0000 ; SPRITEMOVEDATA_POKEMON
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $0c,    $00,    %0000 ; SPRITEMOVEDATA_SUDOWOODO
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $2e,    $10,    %0000 ; SPRITEMOVEDATA_SMASHABLE_ROCK
-	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_STAND,        $2e,    $00,    %0100 ; SPRITEMOVEDATA_STRENGTH_BOULDER
-	sprite_movement_data SPRITEMOVEFN_FOLLOWNOTEXACT,        DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; SPRITEMOVEDATA_FOLLOWNOTEXACT
-	sprite_movement_data SPRITEMOVEFN_SHADOW,                DOWN,   OBJECT_ACTION_00,           $8e,    $01,    %0000 ; SPRITEMOVEDATA_SHADOW
-	sprite_movement_data SPRITEMOVEFN_EMOTE,                 DOWN,   OBJECT_ACTION_EMOTE,        $8e,    $02,    %0000 ; SPRITEMOVEDATA_EMOTE
-	sprite_movement_data SPRITEMOVEFN_SCREENSHAKE,           DOWN,   OBJECT_ACTION_00,           $82,    $00,    %0000 ; SPRITEMOVEDATA_SCREENSHAKE
-	sprite_movement_data SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE, LEFT,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE
-	sprite_movement_data SPRITEMOVEFN_SPIN_CLOCKWISE,        RIGHT,  OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINCLOCKWISE
-	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_BIG_LAPRAS,   $2e,    $01,    %1100 ; SPRITEMOVEDATA_20
-	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_BIG_DOLL,     $2e,    $01,    %1100 ; SPRITEMOVEDATA_BIGDOLL
-	sprite_movement_data SPRITEMOVEFN_BOULDERDUST,           DOWN,   OBJECT_ACTION_BOULDER_DUST, $8e,    $01,    %0000 ; SPRITEMOVEDATA_BOULDERDUST
-	sprite_movement_data SPRITEMOVEFN_GRASS,                 DOWN,   OBJECT_ACTION_GRASS_SHAKE,  $8e,    $02,    %0000 ; SPRITEMOVEDATA_GRASS
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0010 ; SPRITEMOVEDATA_LAPRAS
-	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 25
+	; function,                                              facing, action,                      flags1, flags2, palette flags
+	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   OBJECT_ACTION_STAND,         $02,    $00,    %0000 ; SPRITEMOVEDATA_00
+	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,         $0c,    $00,    %0000 ; SPRITEMOVEDATA_STILL
+	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_WANDER
+	sprite_movement_data SPRITEMOVEFN_SLOW_RANDOM_SPIN,      DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINRANDOM_SLOW
+	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_Y,         DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_WALK_UP_DOWN
+	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_X,         DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_WALK_LEFT_RIGHT
+	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_STANDING_DOWN
+	sprite_movement_data SPRITEMOVEFN_STANDING,              UP,     OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_STANDING_UP
+	sprite_movement_data SPRITEMOVEFN_STANDING,              LEFT,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_STANDING_LEFT
+	sprite_movement_data SPRITEMOVEFN_STANDING,              RIGHT,  OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_STANDING_RIGHT
+	sprite_movement_data SPRITEMOVEFN_FAST_RANDOM_SPIN,      DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINRANDOM_FAST
+	sprite_movement_data SPRITEMOVEFN_OBEY_DPAD,             DOWN,   OBJECT_ACTION_STAND,         $02,    $00,    %0000 ; SPRITEMOVEDATA_PLAYER
+	sprite_movement_data SPRITEMOVEFN_08,                    DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_0C
+	sprite_movement_data SPRITEMOVEFN_09,                    DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_0D
+	sprite_movement_data SPRITEMOVEFN_0A,                    DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_0E
+	sprite_movement_data SPRITEMOVEFN_0B,                    DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_0F
+	sprite_movement_data SPRITEMOVEFN_0C,                    DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_10
+	sprite_movement_data SPRITEMOVEFN_0D,                    DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_11
+	sprite_movement_data SPRITEMOVEFN_0E,                    DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_12
+	sprite_movement_data SPRITEMOVEFN_FOLLOW,                DOWN,   OBJECT_ACTION_STAND,         $02,    $00,    %0000 ; SPRITEMOVEDATA_FOLLOWING
+	sprite_movement_data SPRITEMOVEFN_SCRIPTED,              DOWN,   OBJECT_ACTION_STAND,         $02,    $00,    %0000 ; SPRITEMOVEDATA_SCRIPTED
+	sprite_movement_data SPRITEMOVEFN_BIG_SNORLAX,           DOWN,   OBJECT_ACTION_BIG_DOLL_SYM,  $2e,    $01,    %1100 ; SPRITEMOVEDATA_BIGDOLLSYM
+	sprite_movement_data SPRITEMOVEFN_BOUNCE,                DOWN,   OBJECT_ACTION_BOUNCE,        $2e,    $00,    %0000 ; SPRITEMOVEDATA_POKEMON
+	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,         $0c,    $00,    %0000 ; SPRITEMOVEDATA_SUDOWOODO
+	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,         $2e,    $10,    %0000 ; SPRITEMOVEDATA_SMASHABLE_ROCK
+	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_STAND,         $2e,    $00,    %0100 ; SPRITEMOVEDATA_STRENGTH_BOULDER
+	sprite_movement_data SPRITEMOVEFN_FOLLOWNOTEXACT,        DOWN,   OBJECT_ACTION_STAND,         $02,    $00,    %0000 ; SPRITEMOVEDATA_FOLLOWNOTEXACT
+	sprite_movement_data SPRITEMOVEFN_SHADOW,                DOWN,   OBJECT_ACTION_00,            $8e,    $01,    %0000 ; SPRITEMOVEDATA_SHADOW
+	sprite_movement_data SPRITEMOVEFN_EMOTE,                 DOWN,   OBJECT_ACTION_EMOTE,         $8e,    $02,    %0000 ; SPRITEMOVEDATA_EMOTE
+	sprite_movement_data SPRITEMOVEFN_SCREENSHAKE,           DOWN,   OBJECT_ACTION_00,            $82,    $00,    %0000 ; SPRITEMOVEDATA_SCREENSHAKE
+	sprite_movement_data SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE, LEFT,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE
+	sprite_movement_data SPRITEMOVEFN_SPIN_CLOCKWISE,        RIGHT,  OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINCLOCKWISE
+	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_BIG_DOLL_ASYM, $2e,    $01,    %1100 ; SPRITEMOVEDATA_BIGDOLLASYM
+	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_BIG_DOLL,      $2e,    $01,    %1100 ; SPRITEMOVEDATA_BIGDOLL
+	sprite_movement_data SPRITEMOVEFN_BOULDERDUST,           DOWN,   OBJECT_ACTION_BOULDER_DUST,  $8e,    $01,    %0000 ; SPRITEMOVEDATA_BOULDERDUST
+	sprite_movement_data SPRITEMOVEFN_GRASS,                 DOWN,   OBJECT_ACTION_GRASS_SHAKE,   $8e,    $02,    %0000 ; SPRITEMOVEDATA_GRASS
+	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0010 ; SPRITEMOVEDATA_LAPRAS
+	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; 25
 ; 4357
diff --git a/docs/map_scripts.md b/docs/map_scripts.md
index c024c0244..9c82f8b60 100644
--- a/docs/map_scripts.md
+++ b/docs/map_scripts.md
@@ -136,7 +136,7 @@ Movement types:
 
 - `SPRITEMOVEDATA_SPINRANDOM_FAST`
 
-- `SPRITEMOVEDATA_SNORLAX`
+- `SPRITEMOVEDATA_BIGDOLLSYM`
 
 - `SPRITEMOVEDATA_POKEMON`
 
@@ -150,6 +150,8 @@ Movement types:
 
 - `SPRITEMOVEDATA_SPINCLOCKWISE`
 
+- `SPRITEMOVEDATA_BIGDOLLASYM`
+
 - `SPRITEMOVEDATA_BIGDOLL`
 
 - `SPRITEMOVEDATA_LAPRAS`
diff --git a/engine/map_objects.asm b/engine/map_objects.asm
index dc39b3f16..d9716b3bb 100644
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -792,7 +792,7 @@ MapObjectMovementPattern: ; 47dd
 	ld [hl], STANDING
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], OBJECT_ACTION_BIG_SNORLAX
+	ld [hl], OBJECT_ACTION_BIG_DOLL_SYM
 	ld hl, OBJECT_STEP_TYPE
 	add hl, bc
 	ld [hl], STEP_TYPE_04
@@ -1103,20 +1103,20 @@ SetRandomStepDuration: ; 4b2d
 StepTypesJumptable: ; 4b45
 ; entries correspond to STEP_TYPE_* constants
 	dw ObjectMovementReset ; 00
-	dw MapObjectMovementPattern ; unused
-	dw NPCStep ; 02 npc walk
+	dw MapObjectMovementPattern ; 01
+	dw NPCStep ; 02
 	dw StepType03 ; 03
 	dw StepType04 ; 04
 	dw StepType05 ; 05
-	dw PlayerStep ; 06 player walk
+	dw PlayerStep ; 06
 	dw StepType07 ; 07
-	dw NPCJump ; 08 npc jump step
-	dw PlayerJump ; 09 player jump step
-	dw PlayerOrNPCTurnStep ; 0a half step
+	dw NPCJump ; 08
+	dw PlayerJump ; 09
+	dw PlayerOrNPCTurnStep ; 0a
 	dw StepTypeBump ; 0b
-	dw TeleportFrom ; 0c teleport from
-	dw TeleportTo ; 0d teleport to
-	dw Skyfall ; 0e skyfall
+	dw TeleportFrom ; 0c
+	dw TeleportTo ; 0d
+	dw Skyfall ; 0e
 	dw StepType0f ; 0f
 	dw GotBiteStep ; 10
 	dw RockSmashStep ; 11
diff --git a/engine/npc_movement.asm b/engine/npc_movement.asm
index e8b353fa6..2144ae61e 100755
--- a/engine/npc_movement.asm
+++ b/engine/npc_movement.asm
@@ -496,7 +496,7 @@ Unreferenced_Function7113:
 	ld hl, OBJECT_MOVEMENTTYPE
 	add hl, bc
 	ld a, [hl]
-	cp SPRITEMOVEDATA_SNORLAX
+	cp SPRITEMOVEDATA_BIGDOLLSYM
 	jr nz, .not_snorlax
 	call Function7171
 	jr c, .yes
diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm
index abdca0cba..fb07c28e8 100644
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -297,5 +297,5 @@ VermilionCity_MapEvents:
 	object_event 23, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1
 	object_event 26, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1
 	object_event 14, 16, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionCitySuperNerdScript, -1
-	object_event 34, 8, SPRITE_BIG_SNORLAX, SPRITEMOVEDATA_SNORLAX, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX
+	object_event 34, 8, SPRITE_BIG_SNORLAX, SPRITEMOVEDATA_BIGDOLLSYM, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX
 	object_event 31, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionGymBadgeGuy, -1

From ecf10c83a7cb984f81abacfd4d7cefd356a5e6c2 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Tue, 30 Jan 2018 22:38:00 -0500
Subject: [PATCH 069/135] Better headings

---
 docs/map_scripts.md | 46 ++++++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/docs/map_scripts.md b/docs/map_scripts.md
index 9c82f8b60..9ac926c5b 100644
--- a/docs/map_scripts.md
+++ b/docs/map_scripts.md
@@ -1,26 +1,33 @@
 # Map Scripts
 
 
-## const_value set 2
+## Person constants
 
 
+const_value set 2
 	const MAPNAME_OBJECTNAME
 

 
 
-## MapName_MapScripts:
-
-
-### db N ; scene scripts
+## Map scripts
 
 
+MapName_MapScripts:
+

+
+
+### Scene scripts
+
+
+	db N ; scene scripts
 	scene_script script
 

 
 
-### db N ; callbacks
+### Callbacks
 
 
+	db N ; callbacks
 	callback type, script
 

 
@@ -67,30 +74,34 @@ Callback types:
 [Movement commands](movement_commands.md)
 
 
-## MapName_MapEvents:
-
-```asm
-	db 0, 0 ; filler
-```
-
-
-### db N ; warp events
+## Map events
 
 
+MapName_MapEvents:
+	db 0, 0 ; filler
+

+
+
+### Warp events
+
+
+	db N ; warp events
 	warp_event x, y, warp_id, map
 

 
 
-### db N ; coord events
+### Coord events
 
 
+	db N ; coord events
 	coord_event x, y, scene_id, script
 

 
 
-### db N ; bg events
+### BG events
 
 
+	db N ; bg events
 	bg_event x, y, type, script
 

 
@@ -114,9 +125,10 @@ BG event types:
 
 - `BGEVENT_COPY`
 
-### db N ; object events
+### Object events
 
 
+	db N ; object events
 	object_event x, y, sprite, movement, rx, ry, h1, h2, palette, type, range, script, event_flag
 

 

From 1282405d4a672d82f67832dad17da454495b7e97 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Tue, 30 Jan 2018 22:42:41 -0500
Subject: [PATCH 070/135] =?UTF-8?q?SPRITEMOVEDATA=5FLAPRAS=20=E2=86=92=20S?=
 =?UTF-8?q?PRITEMOVEDATA=5FSWIM=5FWANDER=20(more=20precise,=20and=20encour?=
 =?UTF-8?q?ages=20hacks=20to=20add=20more=20SWIM=20movements)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 constants/map_object_constants.asm | 2 +-
 data/sprites/map_objects.asm       | 2 +-
 docs/bugs_and_glitches.md          | 2 +-
 docs/map_scripts.md                | 2 +-
 maps/UnionCaveB2F.asm              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm
index 8df3b03f0..18e40437e 100644
--- a/constants/map_object_constants.asm
+++ b/constants/map_object_constants.asm
@@ -117,7 +117,7 @@ MAPOBJECT_SCREEN_WIDTH EQU 12
 	const SPRITEMOVEDATA_BIGDOLL              ; 21
 	const SPRITEMOVEDATA_BOULDERDUST          ; 22
 	const SPRITEMOVEDATA_GRASS                ; 23
-	const SPRITEMOVEDATA_LAPRAS               ; 24
+	const SPRITEMOVEDATA_SWIM_WANDER          ; 24
 NUM_SPRITEMOVEDATA EQU const_value
 SPRITEMOVEDATA_FIELDS EQU 6
 
diff --git a/data/sprites/map_objects.asm b/data/sprites/map_objects.asm
index 0197ad945..dedd4c5ab 100755
--- a/data/sprites/map_objects.asm
+++ b/data/sprites/map_objects.asm
@@ -42,6 +42,6 @@ SpriteMovementData:: ; 4273
 	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_BIG_DOLL,      $2e,    $01,    %1100 ; SPRITEMOVEDATA_BIGDOLL
 	sprite_movement_data SPRITEMOVEFN_BOULDERDUST,           DOWN,   OBJECT_ACTION_BOULDER_DUST,  $8e,    $01,    %0000 ; SPRITEMOVEDATA_BOULDERDUST
 	sprite_movement_data SPRITEMOVEFN_GRASS,                 DOWN,   OBJECT_ACTION_GRASS_SHAKE,   $8e,    $02,    %0000 ; SPRITEMOVEDATA_GRASS
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0010 ; SPRITEMOVEDATA_LAPRAS
+	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0010 ; SPRITEMOVEDATA_SWIM_WANDER
 	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; 25
 ; 4357
diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index 3c5728b78..abd5bf3bf 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -1081,7 +1081,7 @@ In [home/map.asm](/home/map.asm):
 
 ## `Function6ec1` does not correctly limit object movement
 
-This bug is why the Lapras in Union Cave, which uses `SPRITEMOVEDATA_LAPRAS`, is not restricted by its `1, 1` movement radius.
+This bug is why the Lapras in Union Cave, which uses `SPRITEMOVEDATA_SWIM_WANDER`, is not restricted by its `1, 1` movement radius.
 
 In [engine/npc_movement.asm](/engine/npc_movement.asm):
 
diff --git a/docs/map_scripts.md b/docs/map_scripts.md
index 9ac926c5b..2a5abe13c 100644
--- a/docs/map_scripts.md
+++ b/docs/map_scripts.md
@@ -166,7 +166,7 @@ Movement types:
 
 - `SPRITEMOVEDATA_BIGDOLL`
 
-- `SPRITEMOVEDATA_LAPRAS`
+- `SPRITEMOVEDATA_SWIM_WANDER`
 
 Object types:
 
diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm
index 1ebce4081..c53636179 100644
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -155,4 +155,4 @@ UnionCaveB2F_MapEvents:
 	object_event 3, 30, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1
 	object_event 16, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER
 	object_event 12, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION
-	object_event 11, 31, SPRITE_SURF, SPRITEMOVEDATA_LAPRAS, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS
+	object_event 11, 31, SPRITE_SURF, SPRITEMOVEDATA_SWIM_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS

From 2fb854d80beff1be8d9fc50583d644e146431868 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Tue, 30 Jan 2018 22:44:44 -0500
Subject: [PATCH 071/135] Don't repeat a subheading

---
 FAQ.md                                        | 2 +-
 docs/{map_scripts.md => map_event_scripts.md} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename docs/{map_scripts.md => map_event_scripts.md} (99%)

diff --git a/FAQ.md b/FAQ.md
index 17f3f95c0..b1f8a5767 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -36,7 +36,7 @@ If you added or changed any code, it has to fit in the **memory banks**. The 2MB
 
 ## How do I edit maps?
 
-For `asm` scripts, read [docs/map_scripts.md](docs/map_scripts.md). For `blk` layouts, try [crowdmap][crowdmap] or [Polished Map][polished-map].
+For `asm` scripts, read [docs/map_event_scripts.md](docs/map_event_scripts.md). For `blk` layouts, try [crowdmap][crowdmap] or [Polished Map][polished-map].
 
 
 ## How do I write new features?
diff --git a/docs/map_scripts.md b/docs/map_event_scripts.md
similarity index 99%
rename from docs/map_scripts.md
rename to docs/map_event_scripts.md
index 2a5abe13c..33f51eb37 100644
--- a/docs/map_scripts.md
+++ b/docs/map_event_scripts.md
@@ -1,4 +1,4 @@
-# Map Scripts
+# Map Event Scripts
 
 
 ## Person constants

From d260b5f185276cd789611d946f0be6198a7a368d Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Wed, 31 Jan 2018 00:07:11 -0500
Subject: [PATCH 072/135] Compact trainer data

---
 data/trainers/parties.asm | 2450 ++++++-------------------------------
 1 file changed, 367 insertions(+), 2083 deletions(-)

diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index 1bf5cb859..c4a2f4a8c 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -8,7 +8,6 @@ Trainers:
 		; TRAINERTYPE_MOVES:      level, species, moves
 		; TRAINERTYPE_ITEM:       level, species, item
 		; TRAINERTYPE_ITEM_MOVES: level, species, item, moves
-	; Party
 		; Up to six monsters following the data type
 	; $ff
 
@@ -21,19 +20,11 @@ FalknerGroup:
 	db "FALKNER@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 7, PIDGEY
-		db TACKLE
-		db MUD_SLAP
-		db 0
-		db 0
+	db TACKLE, MUD_SLAP, NO_MOVE, NO_MOVE
 
 	db 9, PIDGEOTTO
-		db TACKLE
-		db MUD_SLAP
-		db GUST
-		db 0
+	db TACKLE, MUD_SLAP, GUST, NO_MOVE
 
 	db -1 ; end
 
@@ -49,19 +40,11 @@ WhitneyGroup:
 	db "WHITNEY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 18, CLEFAIRY
-		db DOUBLESLAP
-		db MIMIC
-		db ENCORE
-		db METRONOME
+	db DOUBLESLAP, MIMIC, ENCORE, METRONOME
 
 	db 20, MILTANK
-		db ROLLOUT
-		db ATTRACT
-		db STOMP
-		db MILK_DRINK
+	db ROLLOUT, ATTRACT, STOMP, MILK_DRINK
 
 	db -1 ; end
 
@@ -77,25 +60,14 @@ BugsyGroup:
 	db "BUGSY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 14, METAPOD
-		db TACKLE
-		db STRING_SHOT
-		db HARDEN
-		db 0
+	db TACKLE, STRING_SHOT, HARDEN, NO_MOVE
 
 	db 14, KAKUNA
-		db POISON_STING
-		db STRING_SHOT
-		db HARDEN
-		db 0
+	db POISON_STING, STRING_SHOT, HARDEN, NO_MOVE
 
 	db 16, SCYTHER
-		db QUICK_ATTACK
-		db LEER
-		db FURY_CUTTER
-		db 0
+	db QUICK_ATTACK, LEER, FURY_CUTTER, NO_MOVE
 
 	db -1 ; end
 
@@ -111,31 +83,17 @@ MortyGroup:
 	db "MORTY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 21, GASTLY
-		db LICK
-		db SPITE
-		db MEAN_LOOK
-		db CURSE
+	db LICK, SPITE, MEAN_LOOK, CURSE
 
 	db 21, HAUNTER
-		db HYPNOSIS
-		db MIMIC
-		db CURSE
-		db NIGHT_SHADE
+	db HYPNOSIS, MIMIC, CURSE, NIGHT_SHADE
 
 	db 25, GENGAR
-		db HYPNOSIS
-		db SHADOW_BALL
-		db MEAN_LOOK
-		db DREAM_EATER
+	db HYPNOSIS, SHADOW_BALL, MEAN_LOOK, DREAM_EATER
 
 	db 23, HAUNTER
-		db SPITE
-		db MEAN_LOOK
-		db MIMIC
-		db NIGHT_SHADE
+	db SPITE, MEAN_LOOK, MIMIC, NIGHT_SHADE
 
 	db -1 ; end
 
@@ -151,25 +109,14 @@ PryceGroup:
 	db "PRYCE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 27, SEEL
-		db HEADBUTT
-		db ICY_WIND
-		db AURORA_BEAM
-		db REST
+	db HEADBUTT, ICY_WIND, AURORA_BEAM, REST
 
 	db 29, DEWGONG
-		db HEADBUTT
-		db ICY_WIND
-		db AURORA_BEAM
-		db REST
+	db HEADBUTT, ICY_WIND, AURORA_BEAM, REST
 
 	db 31, PILOSWINE
-		db ICY_WIND
-		db FURY_ATTACK
-		db MIST
-		db BLIZZARD
+	db ICY_WIND, FURY_ATTACK, MIST, BLIZZARD
 
 	db -1 ; end
 
@@ -185,25 +132,14 @@ JasmineGroup:
 	db "JASMINE@"
 	db TRAINERTYPE_MOVES
 
-	; party
+	db 30, MAGNEMITE
+	db THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE
 
 	db 30, MAGNEMITE
-		db THUNDERBOLT
-		db SUPERSONIC
-		db SONICBOOM
-		db THUNDER_WAVE
-
-	db 30, MAGNEMITE
-		db THUNDERBOLT
-		db SUPERSONIC
-		db SONICBOOM
-		db THUNDER_WAVE
+	db THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE
 
 	db 35, STEELIX
-		db SCREECH
-		db SUNNY_DAY
-		db ROCK_THROW
-		db IRON_TAIL
+	db SCREECH, SUNNY_DAY, ROCK_THROW, IRON_TAIL
 
 	db -1 ; end
 
@@ -219,19 +155,11 @@ ChuckGroup:
 	db "CHUCK@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 27, PRIMEAPE
-		db LEER
-		db RAGE
-		db KARATE_CHOP
-		db FURY_SWIPES
+	db LEER, RAGE, KARATE_CHOP, FURY_SWIPES
 
 	db 30, POLIWRATH
-		db HYPNOSIS
-		db MIND_READER
-		db SURF
-		db DYNAMICPUNCH
+	db HYPNOSIS, MIND_READER, SURF, DYNAMICPUNCH
 
 	db -1 ; end
 
@@ -247,31 +175,17 @@ ClairGroup:
 	db "CLAIR@"
 	db TRAINERTYPE_MOVES
 
-	; party
+	db 37, DRAGONAIR
+	db THUNDER_WAVE, SURF, SLAM, DRAGONBREATH
 
 	db 37, DRAGONAIR
-		db THUNDER_WAVE
-		db SURF
-		db SLAM
-		db DRAGONBREATH
+	db THUNDER_WAVE, THUNDERBOLT, SLAM, DRAGONBREATH
 
 	db 37, DRAGONAIR
-		db THUNDER_WAVE
-		db THUNDERBOLT
-		db SLAM
-		db DRAGONBREATH
-
-	db 37, DRAGONAIR
-		db THUNDER_WAVE
-		db ICE_BEAM
-		db SLAM
-		db DRAGONBREATH
+	db THUNDER_WAVE, ICE_BEAM, SLAM, DRAGONBREATH
 
 	db 40, KINGDRA
-		db SMOKESCREEN
-		db SURF
-		db HYPER_BEAM
-		db DRAGONBREATH
+	db SMOKESCREEN, SURF, HYPER_BEAM, DRAGONBREATH
 
 	db -1 ; end
 
@@ -287,7 +201,6 @@ Rival1Group:
 	db "?@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 5, CHIKORITA
 
 	db -1 ; end
@@ -298,7 +211,6 @@ Rival1Group:
 	db "?@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 5, CYNDAQUIL
 
 	db -1 ; end
@@ -309,7 +221,6 @@ Rival1Group:
 	db "?@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 5, TOTODILE
 
 	db -1 ; end
@@ -320,7 +231,6 @@ Rival1Group:
 	db "?@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 12, GASTLY
 	db 14, ZUBAT
 	db 16, BAYLEEF
@@ -333,7 +243,6 @@ Rival1Group:
 	db "?@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 12, GASTLY
 	db 14, ZUBAT
 	db 16, QUILAVA
@@ -346,7 +255,6 @@ Rival1Group:
 	db "?@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 12, GASTLY
 	db 14, ZUBAT
 	db 16, CROCONAW
@@ -359,31 +267,17 @@ Rival1Group:
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 20, HAUNTER
-		db LICK
-		db SPITE
-		db MEAN_LOOK
-		db CURSE
+	db LICK, SPITE, MEAN_LOOK, CURSE
 
 	db 18, MAGNEMITE
-		db TACKLE
-		db THUNDERSHOCK
-		db SUPERSONIC
-		db SONICBOOM
+	db TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
 
 	db 20, ZUBAT
-		db LEECH_LIFE
-		db SUPERSONIC
-		db BITE
-		db CONFUSE_RAY
+	db LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
 
 	db 22, BAYLEEF
-		db GROWL
-		db REFLECT
-		db RAZOR_LEAF
-		db POISONPOWDER
+	db GROWL, REFLECT, RAZOR_LEAF, POISONPOWDER
 
 	db -1 ; end
 
@@ -393,31 +287,17 @@ Rival1Group:
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 20, HAUNTER
-		db LICK
-		db SPITE
-		db MEAN_LOOK
-		db CURSE
+	db LICK, SPITE, MEAN_LOOK, CURSE
 
 	db 18, MAGNEMITE
-		db TACKLE
-		db THUNDERSHOCK
-		db SUPERSONIC
-		db SONICBOOM
+	db TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
 
 	db 20, ZUBAT
-		db LEECH_LIFE
-		db SUPERSONIC
-		db BITE
-		db CONFUSE_RAY
+	db LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
 
 	db 22, QUILAVA
-		db LEER
-		db SMOKESCREEN
-		db EMBER
-		db QUICK_ATTACK
+	db LEER, SMOKESCREEN, EMBER, QUICK_ATTACK
 
 	db -1 ; end
 
@@ -427,31 +307,17 @@ Rival1Group:
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 20, HAUNTER
-		db LICK
-		db SPITE
-		db MEAN_LOOK
-		db CURSE
+	db LICK, SPITE, MEAN_LOOK, CURSE
 
 	db 18, MAGNEMITE
-		db TACKLE
-		db THUNDERSHOCK
-		db SUPERSONIC
-		db SONICBOOM
+	db TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
 
 	db 20, ZUBAT
-		db LEECH_LIFE
-		db SUPERSONIC
-		db BITE
-		db CONFUSE_RAY
+	db LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
 
 	db 22, CROCONAW
-		db LEER
-		db RAGE
-		db WATER_GUN
-		db BITE
+	db LEER, RAGE, WATER_GUN, BITE
 
 	db -1 ; end
 
@@ -461,37 +327,20 @@ Rival1Group:
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 30, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 28, MAGNEMITE
-		db TACKLE
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
+	db TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
 
 	db 30, HAUNTER
-		db LICK
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
+	db LICK, MEAN_LOOK, CURSE, SHADOW_BALL
 
 	db 32, SNEASEL
-		db LEER
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
+	db LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
 
 	db 32, MEGANIUM
-		db REFLECT
-		db RAZOR_LEAF
-		db POISONPOWDER
-		db BODY_SLAM
+	db REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM
 
 	db -1 ; end
 
@@ -501,37 +350,20 @@ Rival1Group:
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 30, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 28, MAGNEMITE
-		db TACKLE
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
+	db TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
 
 	db 30, HAUNTER
-		db LICK
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
+	db LICK, MEAN_LOOK, CURSE, SHADOW_BALL
 
 	db 32, SNEASEL
-		db LEER
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
+	db LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
 
 	db 32, QUILAVA
-		db SMOKESCREEN
-		db EMBER
-		db QUICK_ATTACK
-		db FLAME_WHEEL
+	db SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL
 
 	db -1 ; end
 
@@ -541,37 +373,20 @@ Rival1Group:
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 30, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 28, MAGNEMITE
-		db TACKLE
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
+	db TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
 
 	db 30, HAUNTER
-		db LICK
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
+	db LICK, MEAN_LOOK, CURSE, SHADOW_BALL
 
 	db 32, SNEASEL
-		db LEER
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
+	db LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
 
 	db 32, FERALIGATR
-		db RAGE
-		db WATER_GUN
-		db BITE
-		db SCARY_FACE
+	db RAGE, WATER_GUN, BITE, SCARY_FACE
 
 	db -1 ; end
 
@@ -581,43 +396,23 @@ Rival1Group:
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 34, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
+	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
 
 	db 36, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 35, MAGNETON
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
+	db THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
 
 	db 35, HAUNTER
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
+	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
 
 	db 35, KADABRA
-		db DISABLE
-		db PSYBEAM
-		db RECOVER
-		db FUTURE_SIGHT
+	db DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
 
 	db 38, MEGANIUM
-		db REFLECT
-		db RAZOR_LEAF
-		db POISONPOWDER
-		db BODY_SLAM
+	db REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM
 
 	db -1 ; end
 
@@ -627,43 +422,23 @@ Rival1Group:
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 34, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
+	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
 
 	db 36, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 35, MAGNETON
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
+	db THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
 
 	db 35, HAUNTER
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
+	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
 
 	db 35, KADABRA
-		db DISABLE
-		db PSYBEAM
-		db RECOVER
-		db FUTURE_SIGHT
+	db DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
 
 	db 38, TYPHLOSION
-		db SMOKESCREEN
-		db EMBER
-		db QUICK_ATTACK
-		db FLAME_WHEEL
+	db SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL
 
 	db -1 ; end
 
@@ -673,43 +448,23 @@ Rival1Group:
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 34, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
+	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
 
 	db 36, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 34, MAGNETON
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
+	db THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
 
 	db 35, HAUNTER
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
+	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
 
 	db 35, KADABRA
-		db DISABLE
-		db PSYBEAM
-		db RECOVER
-		db FUTURE_SIGHT
+	db DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
 
 	db 38, FERALIGATR
-		db RAGE
-		db WATER_GUN
-		db SCARY_FACE
-		db SLASH
+	db RAGE, WATER_GUN, SCARY_FACE, SLASH
 
 	db -1 ; end
 
@@ -731,37 +486,20 @@ WillGroup:
 	db "WILL@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 40, XATU
-		db QUICK_ATTACK
-		db FUTURE_SIGHT
-		db CONFUSE_RAY
-		db PSYCHIC_M
+	db QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
 
 	db 41, JYNX
-		db DOUBLESLAP
-		db LOVELY_KISS
-		db ICE_PUNCH
-		db PSYCHIC_M
+	db DOUBLESLAP, LOVELY_KISS, ICE_PUNCH, PSYCHIC_M
 
 	db 41, EXEGGUTOR
-		db REFLECT
-		db LEECH_SEED
-		db EGG_BOMB
-		db PSYCHIC_M
+	db REFLECT, LEECH_SEED, EGG_BOMB, PSYCHIC_M
 
 	db 41, SLOWBRO
-		db CURSE
-		db AMNESIA
-		db BODY_SLAM
-		db PSYCHIC_M
+	db CURSE, AMNESIA, BODY_SLAM, PSYCHIC_M
 
 	db 42, XATU
-		db QUICK_ATTACK
-		db FUTURE_SIGHT
-		db CONFUSE_RAY
-		db PSYCHIC_M
+	db QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
 
 	db -1 ; end
 
@@ -777,7 +515,6 @@ PKMNTrainerGroup:
 	db "CAL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, CHIKORITA
 	db 10, CYNDAQUIL
 	db 10, TOTODILE
@@ -790,7 +527,6 @@ PKMNTrainerGroup:
 	db "CAL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, BAYLEEF
 	db 30, QUILAVA
 	db 30, CROCONAW
@@ -803,7 +539,6 @@ PKMNTrainerGroup:
 	db "CAL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 50, MEGANIUM
 	db 50, TYPHLOSION
 	db 50, FERALIGATR
@@ -822,37 +557,20 @@ BrunoGroup:
 	db "BRUNO@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 42, HITMONTOP
-		db PURSUIT
-		db QUICK_ATTACK
-		db DIG
-		db DETECT
+	db PURSUIT, QUICK_ATTACK, DIG, DETECT
 
 	db 42, HITMONLEE
-		db SWAGGER
-		db DOUBLE_KICK
-		db HI_JUMP_KICK
-		db FORESIGHT
+	db SWAGGER, DOUBLE_KICK, HI_JUMP_KICK, FORESIGHT
 
 	db 42, HITMONCHAN
-		db THUNDERPUNCH
-		db ICE_PUNCH
-		db FIRE_PUNCH
-		db MACH_PUNCH
+	db THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH, MACH_PUNCH
 
 	db 43, ONIX
-		db BIND
-		db EARTHQUAKE
-		db SANDSTORM
-		db ROCK_SLIDE
+	db BIND, EARTHQUAKE, SANDSTORM, ROCK_SLIDE
 
 	db 46, MACHAMP
-		db ROCK_SLIDE
-		db FORESIGHT
-		db VITAL_THROW
-		db CROSS_CHOP
+	db ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP
 
 	db -1 ; end
 
@@ -868,37 +586,20 @@ KarenGroup:
 	db "KAREN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 42, UMBREON
-		db SAND_ATTACK
-		db CONFUSE_RAY
-		db FAINT_ATTACK
-		db MEAN_LOOK
+	db SAND_ATTACK, CONFUSE_RAY, FAINT_ATTACK, MEAN_LOOK
 
 	db 42, VILEPLUME
-		db STUN_SPORE
-		db ACID
-		db MOONLIGHT
-		db PETAL_DANCE
+	db STUN_SPORE, ACID, MOONLIGHT, PETAL_DANCE
 
 	db 45, GENGAR
-		db LICK
-		db SPITE
-		db CURSE
-		db DESTINY_BOND
+	db LICK, SPITE, CURSE, DESTINY_BOND
 
 	db 44, MURKROW
-		db QUICK_ATTACK
-		db WHIRLWIND
-		db PURSUIT
-		db FAINT_ATTACK
+	db QUICK_ATTACK, WHIRLWIND, PURSUIT, FAINT_ATTACK
 
 	db 47, HOUNDOOM
-		db ROAR
-		db PURSUIT
-		db FLAMETHROWER
-		db CRUNCH
+	db ROAR, PURSUIT, FLAMETHROWER, CRUNCH
 
 	db -1 ; end
 
@@ -914,37 +615,20 @@ KogaGroup:
 	db "KOGA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 40, ARIADOS
-		db DOUBLE_TEAM
-		db SPIDER_WEB
-		db BATON_PASS
-		db GIGA_DRAIN
+	db DOUBLE_TEAM, SPIDER_WEB, BATON_PASS, GIGA_DRAIN
 
 	db 41, VENOMOTH
-		db SUPERSONIC
-		db GUST
-		db PSYCHIC_M
-		db TOXIC
+	db SUPERSONIC, GUST, PSYCHIC_M, TOXIC
 
 	db 43, FORRETRESS
-		db PROTECT
-		db SWIFT
-		db EXPLOSION
-		db SPIKES
+	db PROTECT, SWIFT, EXPLOSION, SPIKES
 
 	db 42, MUK
-		db MINIMIZE
-		db ACID_ARMOR
-		db SLUDGE_BOMB
-		db TOXIC
+	db MINIMIZE, ACID_ARMOR, SLUDGE_BOMB, TOXIC
 
 	db 44, CROBAT
-		db DOUBLE_TEAM
-		db QUICK_ATTACK
-		db WING_ATTACK
-		db TOXIC
+	db DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC
 
 	db -1 ; end
 
@@ -960,43 +644,23 @@ ChampionGroup:
 	db "LANCE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 44, GYARADOS
-		db FLAIL
-		db RAIN_DANCE
-		db SURF
-		db HYPER_BEAM
+	db FLAIL, RAIN_DANCE, SURF, HYPER_BEAM
 
 	db 47, DRAGONITE
-		db THUNDER_WAVE
-		db TWISTER
-		db THUNDER
-		db HYPER_BEAM
+	db THUNDER_WAVE, TWISTER, THUNDER, HYPER_BEAM
 
 	db 47, DRAGONITE
-		db THUNDER_WAVE
-		db TWISTER
-		db BLIZZARD
-		db HYPER_BEAM
+	db THUNDER_WAVE, TWISTER, BLIZZARD, HYPER_BEAM
 
 	db 46, AERODACTYL
-		db WING_ATTACK
-		db ANCIENTPOWER
-		db ROCK_SLIDE
-		db HYPER_BEAM
+	db WING_ATTACK, ANCIENTPOWER, ROCK_SLIDE, HYPER_BEAM
 
 	db 46, CHARIZARD
-		db FLAMETHROWER
-		db WING_ATTACK
-		db SLASH
-		db HYPER_BEAM
+	db FLAMETHROWER, WING_ATTACK, SLASH, HYPER_BEAM
 
 	db 50, DRAGONITE
-		db FIRE_BLAST
-		db SAFEGUARD
-		db OUTRAGE
-		db HYPER_BEAM
+	db FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM
 
 	db -1 ; end
 
@@ -1012,37 +676,20 @@ BrockGroup:
 	db "BROCK@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 41, GRAVELER
-		db DEFENSE_CURL
-		db ROCK_SLIDE
-		db ROLLOUT
-		db EARTHQUAKE
+	db DEFENSE_CURL, ROCK_SLIDE, ROLLOUT, EARTHQUAKE
 
 	db 41, RHYHORN
-		db FURY_ATTACK
-		db SCARY_FACE
-		db EARTHQUAKE
-		db HORN_DRILL
+	db FURY_ATTACK, SCARY_FACE, EARTHQUAKE, HORN_DRILL
 
 	db 42, OMASTAR
-		db BITE
-		db SURF
-		db PROTECT
-		db SPIKE_CANNON
+	db BITE, SURF, PROTECT, SPIKE_CANNON
 
 	db 44, ONIX
-		db BIND
-		db ROCK_SLIDE
-		db BIDE
-		db SANDSTORM
+	db BIND, ROCK_SLIDE, BIDE, SANDSTORM
 
 	db 42, KABUTOPS
-		db SLASH
-		db SURF
-		db ENDURE
-		db GIGA_DRAIN
+	db SLASH, SURF, ENDURE, GIGA_DRAIN
 
 	db -1 ; end
 
@@ -1058,31 +705,17 @@ MistyGroup:
 	db "MISTY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 42, GOLDUCK
-		db SURF
-		db DISABLE
-		db PSYCH_UP
-		db PSYCHIC_M
+	db SURF, DISABLE, PSYCH_UP, PSYCHIC_M
 
 	db 42, QUAGSIRE
-		db SURF
-		db AMNESIA
-		db EARTHQUAKE
-		db RAIN_DANCE
+	db SURF, AMNESIA, EARTHQUAKE, RAIN_DANCE
 
 	db 44, LAPRAS
-		db SURF
-		db PERISH_SONG
-		db BLIZZARD
-		db RAIN_DANCE
+	db SURF, PERISH_SONG, BLIZZARD, RAIN_DANCE
 
 	db 47, STARMIE
-		db SURF
-		db CONFUSE_RAY
-		db RECOVER
-		db ICE_BEAM
+	db SURF, CONFUSE_RAY, RECOVER, ICE_BEAM
 
 	db -1 ; end
 
@@ -1098,37 +731,20 @@ LtSurgeGroup:
 	db "LT.SURGE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 44, RAICHU
-		db THUNDER_WAVE
-		db QUICK_ATTACK
-		db THUNDERBOLT
-		db THUNDER
+	db THUNDER_WAVE, QUICK_ATTACK, THUNDERBOLT, THUNDER
 
 	db 40, ELECTRODE
-		db SCREECH
-		db DOUBLE_TEAM
-		db SWIFT
-		db EXPLOSION
+	db SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION
 
 	db 40, MAGNETON
-		db LOCK_ON
-		db DOUBLE_TEAM
-		db SWIFT
-		db ZAP_CANNON
+	db LOCK_ON, DOUBLE_TEAM, SWIFT, ZAP_CANNON
 
 	db 40, ELECTRODE
-		db SCREECH
-		db DOUBLE_TEAM
-		db SWIFT
-		db EXPLOSION
+	db SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION
 
 	db 46, ELECTABUZZ
-		db QUICK_ATTACK
-		db THUNDERPUNCH
-		db LIGHT_SCREEN
-		db THUNDER
+	db QUICK_ATTACK, THUNDERPUNCH, LIGHT_SCREEN, THUNDER
 
 	db -1 ; end
 
@@ -1144,7 +760,6 @@ ScientistGroup:
 	db "ROSS@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 22, KOFFING
 	db 22, KOFFING
 
@@ -1156,7 +771,6 @@ ScientistGroup:
 	db "MITCH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, DITTO
 
 	db -1 ; end
@@ -1167,7 +781,6 @@ ScientistGroup:
 	db "JED@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, MAGNEMITE
 	db 20, MAGNEMITE
 	db 20, MAGNEMITE
@@ -1180,7 +793,6 @@ ScientistGroup:
 	db "MARC@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, MAGNEMITE
 	db 27, MAGNEMITE
 	db 27, MAGNEMITE
@@ -1193,13 +805,8 @@ ScientistGroup:
 	db "RICH@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 30, PORYGON
-		db CONVERSION
-		db CONVERSION2
-		db RECOVER
-		db TRI_ATTACK
+	db CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK
 
 	db -1 ; end
 
@@ -1215,31 +822,17 @@ ErikaGroup:
 	db "ERIKA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 42, TANGELA
-		db VINE_WHIP
-		db BIND
-		db GIGA_DRAIN
-		db SLEEP_POWDER
+	db VINE_WHIP, BIND, GIGA_DRAIN, SLEEP_POWDER
 
 	db 41, JUMPLUFF
-		db MEGA_DRAIN
-		db LEECH_SEED
-		db COTTON_SPORE
-		db GIGA_DRAIN
+	db MEGA_DRAIN, LEECH_SEED, COTTON_SPORE, GIGA_DRAIN
 
 	db 46, VICTREEBEL
-		db SUNNY_DAY
-		db SYNTHESIS
-		db ACID
-		db RAZOR_LEAF
+	db SUNNY_DAY, SYNTHESIS, ACID, RAZOR_LEAF
 
 	db 46, BELLOSSOM
-		db SUNNY_DAY
-		db SYNTHESIS
-		db PETAL_DANCE
-		db SOLARBEAM
+	db SUNNY_DAY, SYNTHESIS, PETAL_DANCE, SOLARBEAM
 
 	db -1 ; end
 
@@ -1255,7 +848,6 @@ YoungsterGroup:
 	db "JOEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 4, RATTATA
 
 	db -1 ; end
@@ -1266,7 +858,6 @@ YoungsterGroup:
 	db "MIKEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 2, PIDGEY
 	db 4, RATTATA
 
@@ -1278,7 +869,6 @@ YoungsterGroup:
 	db "ALBERT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 6, RATTATA
 	db 8, ZUBAT
 
@@ -1290,7 +880,6 @@ YoungsterGroup:
 	db "GORDON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, WOOPER
 
 	db -1 ; end
@@ -1301,7 +890,6 @@ YoungsterGroup:
 	db "SAMUEL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 7, RATTATA
 	db 10, SANDSHREW
 	db 8, SPEAROW
@@ -1315,7 +903,6 @@ YoungsterGroup:
 	db "IAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, MANKEY
 	db 12, DIGLETT
 
@@ -1327,7 +914,6 @@ YoungsterGroup:
 	db "JOEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, RATTATA
 
 	db -1 ; end
@@ -1338,13 +924,8 @@ YoungsterGroup:
 	db "JOEY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 21, RATICATE
-		db TAIL_WHIP
-		db QUICK_ATTACK
-		db HYPER_FANG
-		db SCARY_FACE
+	db TAIL_WHIP, QUICK_ATTACK, HYPER_FANG, SCARY_FACE
 
 	db -1 ; end
 
@@ -1354,7 +935,6 @@ YoungsterGroup:
 	db "WARREN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, FEAROW
 
 	db -1 ; end
@@ -1365,7 +945,6 @@ YoungsterGroup:
 	db "JIMMY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, RATICATE
 	db 33, ARBOK
 
@@ -1377,7 +956,6 @@ YoungsterGroup:
 	db "OWEN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, GROWLITHE
 
 	db -1 ; end
@@ -1388,7 +966,6 @@ YoungsterGroup:
 	db "JASON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, SANDSLASH
 	db 33, CROBAT
 
@@ -1400,13 +977,8 @@ YoungsterGroup:
 	db "JOEY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 30, RATICATE
-		db TAIL_WHIP
-		db QUICK_ATTACK
-		db HYPER_FANG
-		db PURSUIT
+	db TAIL_WHIP, QUICK_ATTACK, HYPER_FANG, PURSUIT
 
 	db -1 ; end
 
@@ -1416,13 +988,8 @@ YoungsterGroup:
 	db "JOEY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 37, RATICATE
-		db HYPER_BEAM
-		db QUICK_ATTACK
-		db HYPER_FANG
-		db PURSUIT
+	db HYPER_BEAM, QUICK_ATTACK, HYPER_FANG, PURSUIT
 
 	db -1 ; end
 
@@ -1438,7 +1005,6 @@ SchoolboyGroup:
 	db "JACK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 12, ODDISH
 	db 15, VOLTORB
 
@@ -1450,7 +1016,6 @@ SchoolboyGroup:
 	db "KIPP@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, VOLTORB
 	db 27, MAGNEMITE
 	db 31, VOLTORB
@@ -1464,7 +1029,6 @@ SchoolboyGroup:
 	db "ALAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 16, TANGELA
 
 	db -1 ; end
@@ -1475,7 +1039,6 @@ SchoolboyGroup:
 	db "JOHNNY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 29, BELLSPROUT
 	db 31, WEEPINBELL
 	db 33, VICTREEBEL
@@ -1488,7 +1051,6 @@ SchoolboyGroup:
 	db "DANNY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 31, JYNX
 	db 31, ELECTABUZZ
 	db 31, MAGMAR
@@ -1501,7 +1063,6 @@ SchoolboyGroup:
 	db "TOMMY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, XATU
 	db 34, ALAKAZAM
 
@@ -1513,7 +1074,6 @@ SchoolboyGroup:
 	db "DUDLEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, ODDISH
 
 	db -1 ; end
@@ -1524,7 +1084,6 @@ SchoolboyGroup:
 	db "JOE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, TANGELA
 	db 33, VAPOREON
 
@@ -1536,7 +1095,6 @@ SchoolboyGroup:
 	db "BILLY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, PARAS
 	db 27, PARAS
 	db 27, POLIWHIRL
@@ -1550,7 +1108,6 @@ SchoolboyGroup:
 	db "CHAD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, MR__MIME
 
 	db -1 ; end
@@ -1561,7 +1118,6 @@ SchoolboyGroup:
 	db "NATE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, LEDIAN
 	db 32, EXEGGUTOR
 
@@ -1573,7 +1129,6 @@ SchoolboyGroup:
 	db "RICKY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, AIPOM
 	db 32, DITTO
 
@@ -1585,7 +1140,6 @@ SchoolboyGroup:
 	db "JACK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 14, ODDISH
 	db 17, VOLTORB
 
@@ -1597,7 +1151,6 @@ SchoolboyGroup:
 	db "JACK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, GLOOM
 	db 31, ELECTRODE
 
@@ -1609,7 +1162,6 @@ SchoolboyGroup:
 	db "ALAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, TANGELA
 	db 17, YANMA
 
@@ -1621,7 +1173,6 @@ SchoolboyGroup:
 	db "ALAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, NATU
 	db 22, TANGELA
 	db 20, QUAGSIRE
@@ -1635,7 +1186,6 @@ SchoolboyGroup:
 	db "CHAD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, MR__MIME
 	db 19, MAGNEMITE
 
@@ -1647,7 +1197,6 @@ SchoolboyGroup:
 	db "CHAD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, MR__MIME
 	db 31, MAGNETON
 
@@ -1659,7 +1208,6 @@ SchoolboyGroup:
 	db "JACK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, GLOOM
 	db 33, GROWLITHE
 	db 33, ELECTRODE
@@ -1672,25 +1220,14 @@ SchoolboyGroup:
 	db "JACK@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 35, ELECTRODE
-		db SCREECH
-		db SONICBOOM
-		db ROLLOUT
-		db LIGHT_SCREEN
+	db SCREECH, SONICBOOM, ROLLOUT, LIGHT_SCREEN
 
 	db 35, GROWLITHE
-		db SUNNY_DAY
-		db LEER
-		db TAKE_DOWN
-		db FLAME_WHEEL
+	db SUNNY_DAY, LEER, TAKE_DOWN, FLAME_WHEEL
 
 	db 37, VILEPLUME
-		db SOLARBEAM
-		db SLEEP_POWDER
-		db ACID
-		db MOONLIGHT
+	db SOLARBEAM, SLEEP_POWDER, ACID, MOONLIGHT
 
 	db -1 ; end
 
@@ -1700,7 +1237,6 @@ SchoolboyGroup:
 	db "ALAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, NATU
 	db 27, TANGELA
 	db 30, QUAGSIRE
@@ -1714,31 +1250,17 @@ SchoolboyGroup:
 	db "ALAN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 35, XATU
-		db PECK
-		db NIGHT_SHADE
-		db SWIFT
-		db FUTURE_SIGHT
+	db PECK, NIGHT_SHADE, SWIFT, FUTURE_SIGHT
 
 	db 32, TANGELA
-		db POISONPOWDER
-		db VINE_WHIP
-		db BIND
-		db MEGA_DRAIN
+	db POISONPOWDER, VINE_WHIP, BIND, MEGA_DRAIN
 
 	db 32, YANMA
-		db QUICK_ATTACK
-		db DOUBLE_TEAM
-		db SONICBOOM
-		db SUPERSONIC
+	db QUICK_ATTACK, DOUBLE_TEAM, SONICBOOM, SUPERSONIC
 
 	db 35, QUAGSIRE
-		db TAIL_WHIP
-		db SLAM
-		db AMNESIA
-		db EARTHQUAKE
+	db TAIL_WHIP, SLAM, AMNESIA, EARTHQUAKE
 
 	db -1 ; end
 
@@ -1748,7 +1270,6 @@ SchoolboyGroup:
 	db "CHAD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, MR__MIME
 	db 34, MAGNETON
 
@@ -1760,19 +1281,11 @@ SchoolboyGroup:
 	db "CHAD@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 34, MR__MIME
-		db PSYCHIC_M
-		db LIGHT_SCREEN
-		db REFLECT
-		db ENCORE
+	db PSYCHIC_M, LIGHT_SCREEN, REFLECT, ENCORE
 
 	db 38, MAGNETON
-		db ZAP_CANNON
-		db THUNDER_WAVE
-		db LOCK_ON
-		db SWIFT
+	db ZAP_CANNON, THUNDER_WAVE, LOCK_ON, SWIFT
 
 	db -1 ; end
 
@@ -1788,7 +1301,6 @@ BirdKeeperGroup:
 	db "ROD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 7, PIDGEY
 	db 7, PIDGEY
 
@@ -1800,7 +1312,6 @@ BirdKeeperGroup:
 	db "ABE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 9, SPEAROW
 
 	db -1 ; end
@@ -1811,7 +1322,6 @@ BirdKeeperGroup:
 	db "BRYAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 12, PIDGEY
 	db 14, PIDGEOTTO
 
@@ -1823,7 +1333,6 @@ BirdKeeperGroup:
 	db "THEO@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, PIDGEY
 	db 15, PIDGEY
 	db 19, PIDGEY
@@ -1838,7 +1347,6 @@ BirdKeeperGroup:
 	db "TOBY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, DODUO
 	db 16, DODUO
 	db 17, DODUO
@@ -1851,7 +1359,6 @@ BirdKeeperGroup:
 	db "DENIS@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, SPEAROW
 	db 20, FEAROW
 	db 18, SPEAROW
@@ -1864,7 +1371,6 @@ BirdKeeperGroup:
 	db "VANCE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, PIDGEOTTO
 	db 25, PIDGEOTTO
 
@@ -1876,7 +1382,6 @@ BirdKeeperGroup:
 	db "HANK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 12, PIDGEY
 	db 34, PIDGEOT
 
@@ -1888,7 +1393,6 @@ BirdKeeperGroup:
 	db "ROY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 29, FEAROW
 	db 35, FEAROW
 
@@ -1900,7 +1404,6 @@ BirdKeeperGroup:
 	db "BORIS@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, DODUO
 	db 28, DODUO
 	db 32, DODRIO
@@ -1913,7 +1416,6 @@ BirdKeeperGroup:
 	db "BOB@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, NOCTOWL
 
 	db -1 ; end
@@ -1924,7 +1426,6 @@ BirdKeeperGroup:
 	db "JOSE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 36, FARFETCH_D
 
 	db -1 ; end
@@ -1935,7 +1436,6 @@ BirdKeeperGroup:
 	db "PETER@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 6, PIDGEY
 	db 6, PIDGEY
 	db 8, SPEAROW
@@ -1948,7 +1448,6 @@ BirdKeeperGroup:
 	db "JOSE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, FARFETCH_D
 
 	db -1 ; end
@@ -1959,7 +1458,6 @@ BirdKeeperGroup:
 	db "PERRY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, FARFETCH_D
 
 	db -1 ; end
@@ -1970,7 +1468,6 @@ BirdKeeperGroup:
 	db "BRET@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, PIDGEOTTO
 	db 32, FEAROW
 
@@ -1982,13 +1479,8 @@ BirdKeeperGroup:
 	db "JOSE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 40, FARFETCH_D
-		db FURY_ATTACK
-		db DETECT
-		db FLY
-		db SLASH
+	db FURY_ATTACK, DETECT, FLY, SLASH
 
 	db -1 ; end
 
@@ -1998,7 +1490,6 @@ BirdKeeperGroup:
 	db "VANCE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, PIDGEOTTO
 	db 32, PIDGEOTTO
 
@@ -2010,19 +1501,11 @@ BirdKeeperGroup:
 	db "VANCE@"
 	db TRAINERTYPE_MOVES
 
-	; party
+	db 38, PIDGEOT
+	db TOXIC, QUICK_ATTACK, WHIRLWIND, FLY
 
 	db 38, PIDGEOT
-		db TOXIC
-		db QUICK_ATTACK
-		db WHIRLWIND
-		db FLY
-
-	db 38, PIDGEOT
-		db SWIFT
-		db DETECT
-		db STEEL_WING
-		db FLY
+	db SWIFT, DETECT, STEEL_WING, FLY
 
 	db -1 ; end
 
@@ -2038,13 +1521,8 @@ LassGroup:
 	db "CARRIE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 18, SNUBBULL
-		db SCARY_FACE
-		db CHARM
-		db BITE
-		db LICK
+	db SCARY_FACE, CHARM, BITE, LICK
 
 	db -1 ; end
 
@@ -2054,7 +1532,6 @@ LassGroup:
 	db "BRIDGET@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, JIGGLYPUFF
 	db 15, JIGGLYPUFF
 	db 15, JIGGLYPUFF
@@ -2067,7 +1544,6 @@ LassGroup:
 	db "ALICE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, GLOOM
 	db 34, ARBOK
 	db 30, GLOOM
@@ -2080,7 +1556,6 @@ LassGroup:
 	db "KRISE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 12, ODDISH
 	db 15, CUBONE
 
@@ -2092,7 +1567,6 @@ LassGroup:
 	db "CONNIE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 21, MARILL
 
 	db -1 ; end
@@ -2103,7 +1577,6 @@ LassGroup:
 	db "LINDA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, BULBASAUR
 	db 32, IVYSAUR
 	db 34, VENUSAUR
@@ -2116,7 +1589,6 @@ LassGroup:
 	db "LAURA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, GLOOM
 	db 31, PIDGEOTTO
 	db 31, BELLOSSOM
@@ -2129,7 +1601,6 @@ LassGroup:
 	db "SHANNON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 29, PARAS
 	db 29, PARAS
 	db 32, PARASECT
@@ -2142,7 +1613,6 @@ LassGroup:
 	db "MICHELLE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, SKIPLOOM
 	db 33, HOPPIP
 	db 34, JUMPLUFF
@@ -2155,19 +1625,11 @@ LassGroup:
 	db "DANA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 18, FLAAFFY
-		db TACKLE
-		db GROWL
-		db THUNDERSHOCK
-		db THUNDER_WAVE
+	db TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE
 
 	db 18, PSYDUCK
-		db SCRATCH
-		db TAIL_WHIP
-		db DISABLE
-		db CONFUSION
+	db SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
 
 	db -1 ; end
 
@@ -2177,7 +1639,6 @@ LassGroup:
 	db "ELLEN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, WIGGLYTUFF
 	db 34, GRANBULL
 
@@ -2189,7 +1650,6 @@ LassGroup:
 	db "CONNIE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 21, MARILL
 
 	db -1 ; end
@@ -2200,7 +1660,6 @@ LassGroup:
 	db "CONNIE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 21, MARILL
 
 	db -1 ; end
@@ -2211,19 +1670,11 @@ LassGroup:
 	db "DANA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 21, FLAAFFY
-		db TACKLE
-		db GROWL
-		db THUNDERSHOCK
-		db THUNDER_WAVE
+	db TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE
 
 	db 21, PSYDUCK
-		db SCRATCH
-		db TAIL_WHIP
-		db DISABLE
-		db CONFUSION
+	db SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
 
 	db -1 ; end
 
@@ -2233,19 +1684,11 @@ LassGroup:
 	db "DANA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 29, PSYDUCK
-		db SCRATCH
-		db DISABLE
-		db CONFUSION
-		db SCREECH
+	db SCRATCH, DISABLE, CONFUSION, SCREECH
 
 	db 29, AMPHAROS
-		db TACKLE
-		db THUNDERSHOCK
-		db THUNDER_WAVE
-		db COTTON_SPORE
+	db TACKLE, THUNDERSHOCK, THUNDER_WAVE, COTTON_SPORE
 
 	db -1 ; end
 
@@ -2255,19 +1698,11 @@ LassGroup:
 	db "DANA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 32, PSYDUCK
-		db SCRATCH
-		db DISABLE
-		db CONFUSION
-		db SCREECH
+	db SCRATCH, DISABLE, CONFUSION, SCREECH
 
 	db 32, AMPHAROS
-		db TACKLE
-		db THUNDERPUNCH
-		db THUNDER_WAVE
-		db COTTON_SPORE
+	db TACKLE, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE
 
 	db -1 ; end
 
@@ -2277,19 +1712,11 @@ LassGroup:
 	db "DANA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 36, AMPHAROS
-		db SWIFT
-		db THUNDERPUNCH
-		db THUNDER_WAVE
-		db COTTON_SPORE
+	db SWIFT, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE
 
 	db 36, GOLDUCK
-		db DISABLE
-		db SURF
-		db PSYCHIC_M
-		db SCREECH
+	db DISABLE, SURF, PSYCHIC_M, SCREECH
 
 	db -1 ; end
 
@@ -2305,37 +1732,20 @@ JanineGroup:
 	db "JANINE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 36, CROBAT
-		db SCREECH
-		db SUPERSONIC
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db SCREECH, SUPERSONIC, CONFUSE_RAY, WING_ATTACK
 
 	db 36, WEEZING
-		db SMOG
-		db SLUDGE_BOMB
-		db TOXIC
-		db EXPLOSION
+	db SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION
 
 	db 36, WEEZING
-		db SMOG
-		db SLUDGE_BOMB
-		db TOXIC
-		db EXPLOSION
+	db SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION
 
 	db 33, ARIADOS
-		db SCARY_FACE
-		db GIGA_DRAIN
-		db STRING_SHOT
-		db NIGHT_SHADE
+	db SCARY_FACE, GIGA_DRAIN, STRING_SHOT, NIGHT_SHADE
 
 	db 39, VENOMOTH
-		db FORESIGHT
-		db DOUBLE_TEAM
-		db GUST
-		db PSYCHIC_M
+	db FORESIGHT, DOUBLE_TEAM, GUST, PSYCHIC_M
 
 	db -1 ; end
 
@@ -2351,25 +1761,14 @@ CooltrainerMGroup:
 	db "NICK@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 26, CHARMANDER
-		db EMBER
-		db SMOKESCREEN
-		db RAGE
-		db SCARY_FACE
+	db EMBER, SMOKESCREEN, RAGE, SCARY_FACE
 
 	db 26, SQUIRTLE
-		db WITHDRAW
-		db WATER_GUN
-		db BITE
-		db CURSE
+	db WITHDRAW, WATER_GUN, BITE, CURSE
 
 	db 26, BULBASAUR
-		db LEECH_SEED
-		db POISONPOWDER
-		db SLEEP_POWDER
-		db RAZOR_LEAF
+	db LEECH_SEED, POISONPOWDER, SLEEP_POWDER, RAZOR_LEAF
 
 	db -1 ; end
 
@@ -2379,7 +1778,6 @@ CooltrainerMGroup:
 	db "AARON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, IVYSAUR
 	db 24, CHARMELEON
 	db 24, WARTORTLE
@@ -2392,7 +1790,6 @@ CooltrainerMGroup:
 	db "PAUL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, DRATINI
 	db 34, DRATINI
 	db 34, DRATINI
@@ -2405,7 +1802,6 @@ CooltrainerMGroup:
 	db "CODY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, HORSEA
 	db 36, SEADRA
 
@@ -2417,7 +1813,6 @@ CooltrainerMGroup:
 	db "MIKE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 37, DRAGONAIR
 
 	db -1 ; end
@@ -2428,25 +1823,14 @@ CooltrainerMGroup:
 	db "GAVEN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 35, VICTREEBEL
-		db WRAP
-		db TOXIC
-		db ACID
-		db RAZOR_LEAF
+	db WRAP, TOXIC, ACID, RAZOR_LEAF
 
 	db 35, KINGLER
-		db BUBBLEBEAM
-		db STOMP
-		db GUILLOTINE
-		db PROTECT
+	db BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT
 
 	db 35, FLAREON
-		db SAND_ATTACK
-		db QUICK_ATTACK
-		db BITE
-		db FIRE_SPIN
+	db SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN
 
 	db -1 ; end
 
@@ -2456,25 +1840,14 @@ CooltrainerMGroup:
 	db "GAVEN@"
 	db TRAINERTYPE_ITEM_MOVES
 
-	; party
-
 	db 39, VICTREEBEL, NO_ITEM
-		db GIGA_DRAIN
-		db TOXIC
-		db SLUDGE_BOMB
-		db RAZOR_LEAF
+	db GIGA_DRAIN, TOXIC, SLUDGE_BOMB, RAZOR_LEAF
 
 	db 39, KINGLER, KINGS_ROCK
-		db SURF
-		db STOMP
-		db GUILLOTINE
-		db BLIZZARD
+	db SURF, STOMP, GUILLOTINE, BLIZZARD
 
 	db 39, FLAREON, NO_ITEM
-		db FLAMETHROWER
-		db QUICK_ATTACK
-		db BITE
-		db FIRE_SPIN
+	db FLAMETHROWER, QUICK_ATTACK, BITE, FIRE_SPIN
 
 	db -1 ; end
 
@@ -2484,19 +1857,11 @@ CooltrainerMGroup:
 	db "RYAN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 25, PIDGEOT
-		db SAND_ATTACK
-		db QUICK_ATTACK
-		db WHIRLWIND
-		db WING_ATTACK
+	db SAND_ATTACK, QUICK_ATTACK, WHIRLWIND, WING_ATTACK
 
 	db 27, ELECTABUZZ
-		db THUNDERPUNCH
-		db LIGHT_SCREEN
-		db SWIFT
-		db SCREECH
+	db THUNDERPUNCH, LIGHT_SCREEN, SWIFT, SCREECH
 
 	db -1 ; end
 
@@ -2506,19 +1871,11 @@ CooltrainerMGroup:
 	db "JAKE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 33, PARASECT
-		db LEECH_LIFE
-		db SPORE
-		db SLASH
-		db SWORDS_DANCE
+	db LEECH_LIFE, SPORE, SLASH, SWORDS_DANCE
 
 	db 35, GOLDUCK
-		db CONFUSION
-		db SCREECH
-		db PSYCH_UP
-		db FURY_SWIPES
+	db CONFUSION, SCREECH, PSYCH_UP, FURY_SWIPES
 
 	db -1 ; end
 
@@ -2528,25 +1885,14 @@ CooltrainerMGroup:
 	db "GAVEN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 32, VICTREEBEL
-		db WRAP
-		db TOXIC
-		db ACID
-		db RAZOR_LEAF
+	db WRAP, TOXIC, ACID, RAZOR_LEAF
 
 	db 32, KINGLER
-		db BUBBLEBEAM
-		db STOMP
-		db GUILLOTINE
-		db PROTECT
+	db BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT
 
 	db 32, FLAREON
-		db SAND_ATTACK
-		db QUICK_ATTACK
-		db BITE
-		db FIRE_SPIN
+	db SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN
 
 	db -1 ; end
 
@@ -2556,25 +1902,14 @@ CooltrainerMGroup:
 	db "BLAKE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 33, MAGNETON
-		db THUNDERBOLT
-		db SUPERSONIC
-		db SWIFT
-		db SCREECH
+	db THUNDERBOLT, SUPERSONIC, SWIFT, SCREECH
 
 	db 31, QUAGSIRE
-		db WATER_GUN
-		db SLAM
-		db AMNESIA
-		db EARTHQUAKE
+	db WATER_GUN, SLAM, AMNESIA, EARTHQUAKE
 
 	db 31, EXEGGCUTE
-		db LEECH_SEED
-		db CONFUSION
-		db SLEEP_POWDER
-		db SOLARBEAM
+	db LEECH_SEED, CONFUSION, SLEEP_POWDER, SOLARBEAM
 
 	db -1 ; end
 
@@ -2584,13 +1919,8 @@ CooltrainerMGroup:
 	db "BRIAN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 35, SANDSLASH
-		db SAND_ATTACK
-		db POISON_STING
-		db SLASH
-		db SWIFT
+	db SAND_ATTACK, POISON_STING, SLASH, SWIFT
 
 	db -1 ; end
 
@@ -2600,7 +1930,6 @@ CooltrainerMGroup:
 	db "ERICK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, BULBASAUR
 	db 10, CHARMANDER
 	db 10, SQUIRTLE
@@ -2613,7 +1942,6 @@ CooltrainerMGroup:
 	db "ANDY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, BULBASAUR
 	db 10, CHARMANDER
 	db 10, SQUIRTLE
@@ -2626,7 +1954,6 @@ CooltrainerMGroup:
 	db "TYLER@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, BULBASAUR
 	db 10, CHARMANDER
 	db 10, SQUIRTLE
@@ -2639,7 +1966,6 @@ CooltrainerMGroup:
 	db "SEAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, FLAREON
 	db 35, TANGELA
 	db 35, TAUROS
@@ -2652,7 +1978,6 @@ CooltrainerMGroup:
 	db "KEVIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 38, RHYHORN
 	db 35, CHARMELEON
 	db 35, WARTORTLE
@@ -2665,7 +1990,6 @@ CooltrainerMGroup:
 	db "STEVE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 14, BULBASAUR
 	db 14, CHARMANDER
 	db 14, SQUIRTLE
@@ -2678,13 +2002,8 @@ CooltrainerMGroup:
 	db "ALLEN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 27, CHARMELEON
-		db EMBER
-		db SMOKESCREEN
-		db RAGE
-		db SCARY_FACE
+	db EMBER, SMOKESCREEN, RAGE, SCARY_FACE
 
 	db -1 ; end
 
@@ -2694,13 +2013,8 @@ CooltrainerMGroup:
 	db "DARIN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 37, DRAGONAIR
-		db WRAP
-		db SURF
-		db DRAGON_RAGE
-		db SLAM
+	db WRAP, SURF, DRAGON_RAGE, SLAM
 
 	db -1 ; end
 
@@ -2716,7 +2030,6 @@ CooltrainerFGroup:
 	db "GWEN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, EEVEE
 	db 22, FLAREON
 	db 22, VAPOREON
@@ -2730,19 +2043,11 @@ CooltrainerFGroup:
 	db "LOIS@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 25, SKIPLOOM
-		db SYNTHESIS
-		db POISONPOWDER
-		db MEGA_DRAIN
-		db LEECH_SEED
+	db SYNTHESIS, POISONPOWDER, MEGA_DRAIN, LEECH_SEED
 
 	db 25, NINETALES
-		db EMBER
-		db QUICK_ATTACK
-		db CONFUSE_RAY
-		db SAFEGUARD
+	db EMBER, QUICK_ATTACK, CONFUSE_RAY, SAFEGUARD
 
 	db -1 ; end
 
@@ -2752,7 +2057,6 @@ CooltrainerFGroup:
 	db "FRAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 37, SEADRA
 
 	db -1 ; end
@@ -2763,7 +2067,6 @@ CooltrainerFGroup:
 	db "LOLA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, DRATINI
 	db 36, DRAGONAIR
 
@@ -2775,7 +2078,6 @@ CooltrainerFGroup:
 	db "KATE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, SHELLDER
 	db 28, CLOYSTER
 
@@ -2787,7 +2089,6 @@ CooltrainerFGroup:
 	db "IRENE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 22, GOLDEEN
 	db 24, SEAKING
 
@@ -2799,7 +2100,6 @@ CooltrainerFGroup:
 	db "KELLY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, MARILL
 	db 24, WARTORTLE
 	db 24, WARTORTLE
@@ -2812,19 +2112,11 @@ CooltrainerFGroup:
 	db "JOYCE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 36, PIKACHU
-		db QUICK_ATTACK
-		db DOUBLE_TEAM
-		db THUNDERBOLT
-		db THUNDER
+	db QUICK_ATTACK, DOUBLE_TEAM, THUNDERBOLT, THUNDER
 
 	db 32, BLASTOISE
-		db BITE
-		db CURSE
-		db SURF
-		db RAIN_DANCE
+	db BITE, CURSE, SURF, RAIN_DANCE
 
 	db -1 ; end
 
@@ -2834,13 +2126,8 @@ CooltrainerFGroup:
 	db "BETH@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 36, RAPIDASH
-		db STOMP
-		db FIRE_SPIN
-		db FURY_ATTACK
-		db AGILITY
+	db STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY
 
 	db -1 ; end
 
@@ -2850,7 +2137,6 @@ CooltrainerFGroup:
 	db "REENA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 31, STARMIE
 	db 33, NIDOQUEEN
 	db 31, STARMIE
@@ -2863,25 +2149,14 @@ CooltrainerFGroup:
 	db "MEGAN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 32, BULBASAUR
-		db GROWL
-		db LEECH_SEED
-		db POISONPOWDER
-		db RAZOR_LEAF
+	db GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF
 
 	db 32, IVYSAUR
-		db GROWL
-		db LEECH_SEED
-		db POISONPOWDER
-		db RAZOR_LEAF
+	db GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF
 
 	db 32, VENUSAUR
-		db BODY_SLAM
-		db SLEEP_POWDER
-		db RAZOR_LEAF
-		db SWEET_SCENT
+	db BODY_SLAM, SLEEP_POWDER, RAZOR_LEAF, SWEET_SCENT
 
 	db -1 ; end
 
@@ -2891,13 +2166,8 @@ CooltrainerFGroup:
 	db "BETH@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 39, RAPIDASH
-		db STOMP
-		db FIRE_SPIN
-		db FURY_ATTACK
-		db AGILITY
+	db STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY
 
 	db -1 ; end
 
@@ -2907,7 +2177,6 @@ CooltrainerFGroup:
 	db "CAROL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, ELECTRODE
 	db 35, STARMIE
 	db 35, NINETALES
@@ -2920,7 +2189,6 @@ CooltrainerFGroup:
 	db "QUINN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 38, IVYSAUR
 	db 38, STARMIE
 
@@ -2932,7 +2200,6 @@ CooltrainerFGroup:
 	db "EMMA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, POLIWHIRL
 
 	db -1 ; end
@@ -2943,19 +2210,11 @@ CooltrainerFGroup:
 	db "CYBIL@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 25, BUTTERFREE
-		db CONFUSION
-		db SLEEP_POWDER
-		db WHIRLWIND
-		db GUST
+	db CONFUSION, SLEEP_POWDER, WHIRLWIND, GUST
 
 	db 25, BELLOSSOM
-		db ABSORB
-		db STUN_SPORE
-		db ACID
-		db SOLARBEAM
+	db ABSORB, STUN_SPORE, ACID, SOLARBEAM
 
 	db -1 ; end
 
@@ -2965,7 +2224,6 @@ CooltrainerFGroup:
 	db "JENN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, STARYU
 	db 26, STARMIE
 
@@ -2977,13 +2235,8 @@ CooltrainerFGroup:
 	db "BETH@"
 	db TRAINERTYPE_ITEM_MOVES
 
-	; party
-
 	db 43, RAPIDASH, FOCUS_BAND
-		db STOMP
-		db FIRE_SPIN
-		db FURY_ATTACK
-		db FIRE_BLAST
+	db STOMP, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST
 
 	db -1 ; end
 
@@ -2993,7 +2246,6 @@ CooltrainerFGroup:
 	db "REENA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, STARMIE
 	db 36, NIDOQUEEN
 	db 34, STARMIE
@@ -3006,25 +2258,14 @@ CooltrainerFGroup:
 	db "REENA@"
 	db TRAINERTYPE_ITEM_MOVES
 
-	; party
-
 	db 38, STARMIE, NO_ITEM
-		db DOUBLE_TEAM
-		db PSYCHIC_M
-		db WATERFALL
-		db CONFUSE_RAY
+	db DOUBLE_TEAM, PSYCHIC_M, WATERFALL, CONFUSE_RAY
 
 	db 40, NIDOQUEEN, PINK_BOW
-		db EARTHQUAKE
-		db DOUBLE_KICK
-		db TOXIC
-		db BODY_SLAM
+	db EARTHQUAKE, DOUBLE_KICK, TOXIC, BODY_SLAM
 
 	db 38, STARMIE, NO_ITEM
-		db BLIZZARD
-		db PSYCHIC_M
-		db WATERFALL
-		db RECOVER
+	db BLIZZARD, PSYCHIC_M, WATERFALL, RECOVER
 
 	db -1 ; end
 
@@ -3034,25 +2275,14 @@ CooltrainerFGroup:
 	db "CARA@"
 	db TRAINERTYPE_MOVES
 
-	; party
+	db 33, HORSEA
+	db SMOKESCREEN, LEER, WHIRLPOOL, TWISTER
 
 	db 33, HORSEA
-		db SMOKESCREEN
-		db LEER
-		db WHIRLPOOL
-		db TWISTER
-
-	db 33, HORSEA
-		db SMOKESCREEN
-		db LEER
-		db WHIRLPOOL
-		db TWISTER
+	db SMOKESCREEN, LEER, WHIRLPOOL, TWISTER
 
 	db 35, SEADRA
-		db SWIFT
-		db LEER
-		db WATERFALL
-		db TWISTER
+	db SWIFT, LEER, WATERFALL, TWISTER
 
 	db -1 ; end
 
@@ -3068,7 +2298,6 @@ BeautyGroup:
 	db "VICTORIA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 9, SENTRET
 	db 13, SENTRET
 	db 17, SENTRET
@@ -3081,19 +2310,11 @@ BeautyGroup:
 	db "SAMANTHA@"
 	db TRAINERTYPE_MOVES
 
-	; party
+	db 16, MEOWTH
+	db SCRATCH, GROWL, BITE, PAY_DAY
 
 	db 16, MEOWTH
-		db SCRATCH
-		db GROWL
-		db BITE
-		db PAY_DAY
-
-	db 16, MEOWTH
-		db SCRATCH
-		db GROWL
-		db BITE
-		db SLASH
+	db SCRATCH, GROWL, BITE, SLASH
 
 	db -1 ; end
 
@@ -3103,7 +2324,6 @@ BeautyGroup:
 	db "JULIE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, SENTRET
 
 	db -1 ; end
@@ -3114,7 +2334,6 @@ BeautyGroup:
 	db "JACLYN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, SENTRET
 
 	db -1 ; end
@@ -3125,7 +2344,6 @@ BeautyGroup:
 	db "BRENDA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 16, FURRET
 
 	db -1 ; end
@@ -3136,7 +2354,6 @@ BeautyGroup:
 	db "CASSIE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, VILEPLUME
 	db 34, BUTTERFREE
 
@@ -3148,7 +2365,6 @@ BeautyGroup:
 	db "CAROLINE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, MARILL
 	db 32, SEEL
 	db 30, MARILL
@@ -3161,7 +2377,6 @@ BeautyGroup:
 	db "CARLENE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, SENTRET
 
 	db -1 ; end
@@ -3172,7 +2387,6 @@ BeautyGroup:
 	db "JESSICA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, SENTRET
 
 	db -1 ; end
@@ -3183,7 +2397,6 @@ BeautyGroup:
 	db "RACHAEL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, SENTRET
 
 	db -1 ; end
@@ -3194,7 +2407,6 @@ BeautyGroup:
 	db "ANGELICA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, SENTRET
 
 	db -1 ; end
@@ -3205,7 +2417,6 @@ BeautyGroup:
 	db "KENDRA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, SENTRET
 
 	db -1 ; end
@@ -3216,7 +2427,6 @@ BeautyGroup:
 	db "VERONICA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, SENTRET
 
 	db -1 ; end
@@ -3227,7 +2437,6 @@ BeautyGroup:
 	db "JULIA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, PARAS
 	db 32, EXEGGCUTE
 	db 35, PARASECT
@@ -3240,7 +2449,6 @@ BeautyGroup:
 	db "THERESA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, SENTRET
 
 	db -1 ; end
@@ -3251,19 +2459,11 @@ BeautyGroup:
 	db "VALERIE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 17, HOPPIP
-		db SYNTHESIS
-		db TAIL_WHIP
-		db TACKLE
-		db POISONPOWDER
+	db SYNTHESIS, TAIL_WHIP, TACKLE, POISONPOWDER
 
 	db 17, SKIPLOOM
-		db SYNTHESIS
-		db TAIL_WHIP
-		db TACKLE
-		db STUN_SPORE
+	db SYNTHESIS, TAIL_WHIP, TACKLE, STUN_SPORE
 
 	db -1 ; end
 
@@ -3273,7 +2473,6 @@ BeautyGroup:
 	db "OLIVIA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, CORSOLA
 
 	db -1 ; end
@@ -3290,7 +2489,6 @@ PokemaniacGroup:
 	db "LARRY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, SLOWPOKE
 
 	db -1 ; end
@@ -3301,7 +2499,6 @@ PokemaniacGroup:
 	db "ANDREW@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, MAROWAK
 	db 24, MAROWAK
 
@@ -3313,7 +2510,6 @@ PokemaniacGroup:
 	db "CALVIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, KANGASKHAN
 
 	db -1 ; end
@@ -3324,7 +2520,6 @@ PokemaniacGroup:
 	db "SHANE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 16, NIDORINA
 	db 16, NIDORINO
 
@@ -3336,7 +2531,6 @@ PokemaniacGroup:
 	db "BEN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, SLOWBRO
 
 	db -1 ; end
@@ -3347,7 +2541,6 @@ PokemaniacGroup:
 	db "BRENT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, LICKITUNG
 
 	db -1 ; end
@@ -3358,7 +2551,6 @@ PokemaniacGroup:
 	db "RON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, NIDOKING
 
 	db -1 ; end
@@ -3369,7 +2561,6 @@ PokemaniacGroup:
 	db "ETHAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 31, RHYHORN
 	db 31, RHYDON
 
@@ -3381,7 +2572,6 @@ PokemaniacGroup:
 	db "BRENT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, KANGASKHAN
 
 	db -1 ; end
@@ -3392,13 +2582,8 @@ PokemaniacGroup:
 	db "BRENT@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 36, PORYGON
-		db RECOVER
-		db PSYCHIC_M
-		db CONVERSION2
-		db TRI_ATTACK
+	db RECOVER, PSYCHIC_M, CONVERSION2, TRI_ATTACK
 
 	db -1 ; end
 
@@ -3408,13 +2593,8 @@ PokemaniacGroup:
 	db "ISSAC@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 12, LICKITUNG
-		db LICK
-		db SUPERSONIC
-		db CUT
-		db 0
+	db LICK, SUPERSONIC, CUT, NO_MOVE
 
 	db -1 ; end
 
@@ -3424,7 +2604,6 @@ PokemaniacGroup:
 	db "DONALD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, SLOWPOKE
 	db 10, SLOWPOKE
 
@@ -3436,7 +2615,6 @@ PokemaniacGroup:
 	db "ZACH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, RHYHORN
 
 	db -1 ; end
@@ -3447,13 +2625,8 @@ PokemaniacGroup:
 	db "BRENT@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 41, CHANSEY
-		db ROLLOUT
-		db ATTRACT
-		db EGG_BOMB
-		db SOFTBOILED
+	db ROLLOUT, ATTRACT, EGG_BOMB, SOFTBOILED
 
 	db -1 ; end
 
@@ -3463,7 +2636,6 @@ PokemaniacGroup:
 	db "MILLER@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, NIDOKING
 	db 17, NIDOQUEEN
 
@@ -3481,7 +2653,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 14, KOFFING
 
 	db -1 ; end
@@ -3492,7 +2663,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 7, RATTATA
 	db 9, ZUBAT
 	db 9, ZUBAT
@@ -3505,7 +2675,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, RATICATE
 	db 24, RATICATE
 
@@ -3517,7 +2686,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, GRIMER
 	db 23, GRIMER
 	db 25, MUK
@@ -3530,7 +2698,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 21, RATTATA
 	db 21, RATTATA
 	db 23, RATTATA
@@ -3545,7 +2712,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, ZUBAT
 	db 26, ZUBAT
 
@@ -3557,7 +2723,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, KOFFING
 	db 23, GRIMER
 	db 23, ZUBAT
@@ -3571,7 +2736,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, WEEZING
 
 	db -1 ; end
@@ -3582,7 +2746,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, RATICATE
 	db 26, KOFFING
 
@@ -3594,7 +2757,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 22, ZUBAT
 	db 24, GOLBAT
 	db 22, GRIMER
@@ -3607,7 +2769,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, MUK
 	db 23, KOFFING
 	db 25, RATTATA
@@ -3620,7 +2781,6 @@ GruntMGroup:
 	db "EXECUTIVE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, HOUNDOUR
 
 	db -1 ; end
@@ -3631,7 +2791,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, RATTATA
 
 	db -1 ; end
@@ -3642,7 +2801,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, RATICATE
 	db 24, GOLBAT
 
@@ -3654,7 +2812,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, GRIMER
 	db 23, WEEZING
 
@@ -3666,7 +2823,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 16, RATTATA
 	db 16, RATTATA
 	db 16, RATTATA
@@ -3680,7 +2836,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, GOLBAT
 
 	db -1 ; end
@@ -3691,7 +2846,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, RATTATA
 	db 17, ZUBAT
 	db 17, RATTATA
@@ -3704,7 +2858,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, VENONAT
 	db 18, VENONAT
 
@@ -3716,7 +2869,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, DROWZEE
 	db 19, ZUBAT
 
@@ -3728,7 +2880,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 16, ZUBAT
 	db 17, GRIMER
 	db 18, RATTATA
@@ -3741,7 +2892,6 @@ GruntMGroup:
 	db "EXECUTIVE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 36, GOLBAT
 
 	db -1 ; end
@@ -3752,7 +2902,6 @@ GruntMGroup:
 	db "EXECUTIVE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, KOFFING
 
 	db -1 ; end
@@ -3763,7 +2912,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, KOFFING
 	db 25, KOFFING
 
@@ -3775,7 +2923,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, KOFFING
 	db 24, MUK
 
@@ -3787,7 +2934,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, RATTATA
 	db 15, RATTATA
 
@@ -3799,7 +2945,6 @@ GruntMGroup:
 	db "EXECUTIVE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 22, ZUBAT
 
 	db -1 ; end
@@ -3810,7 +2955,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, RATICATE
 
 	db -1 ; end
@@ -3821,7 +2965,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 9, RATTATA
 	db 9, RATTATA
 
@@ -3833,7 +2976,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, GOLBAT
 	db 25, GOLBAT
 	db 30, ARBOK
@@ -3846,7 +2988,6 @@ GruntMGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, GOLBAT
 
 	db -1 ; end
@@ -3863,7 +3004,6 @@ GentlemanGroup:
 	db "PRESTON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, GROWLITHE
 	db 18, GROWLITHE
 
@@ -3875,7 +3015,6 @@ GentlemanGroup:
 	db "EDWARD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, PERSIAN
 
 	db -1 ; end
@@ -3886,7 +3025,6 @@ GentlemanGroup:
 	db "GREGORY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 37, PIKACHU
 	db 33, FLAAFFY
 
@@ -3898,7 +3036,6 @@ GentlemanGroup:
 	db "VIRGIL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, PONYTA
 
 	db -1 ; end
@@ -3909,7 +3046,6 @@ GentlemanGroup:
 	db "ALFRED@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, NOCTOWL
 
 	db -1 ; end
@@ -3926,7 +3062,6 @@ SkierGroup:
 	db "ROXANNE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, JYNX
 
 	db -1 ; end
@@ -3937,7 +3072,6 @@ SkierGroup:
 	db "CLARISSA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, DEWGONG
 
 	db -1 ; end
@@ -3954,7 +3088,6 @@ TeacherGroup:
 	db "COLETTE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 36, CLEFAIRY
 
 	db -1 ; end
@@ -3965,7 +3098,6 @@ TeacherGroup:
 	db "HILLARY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, AIPOM
 	db 36, CUBONE
 
@@ -3977,7 +3109,6 @@ TeacherGroup:
 	db "SHIRLEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, JIGGLYPUFF
 
 	db -1 ; end
@@ -3994,25 +3125,14 @@ SabrinaGroup:
 	db "SABRINA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 46, ESPEON
-		db SAND_ATTACK
-		db QUICK_ATTACK
-		db SWIFT
-		db PSYCHIC_M
+	db SAND_ATTACK, QUICK_ATTACK, SWIFT, PSYCHIC_M
 
 	db 46, MR__MIME
-		db BARRIER
-		db REFLECT
-		db BATON_PASS
-		db PSYCHIC_M
+	db BARRIER, REFLECT, BATON_PASS, PSYCHIC_M
 
 	db 48, ALAKAZAM
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
-		db REFLECT
+	db RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
 
 	db -1 ; end
 
@@ -4028,7 +3148,6 @@ BugCatcherGroup:
 	db "DON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 3, CATERPIE
 	db 3, CATERPIE
 
@@ -4040,7 +3159,6 @@ BugCatcherGroup:
 	db "ROB@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, BEEDRILL
 	db 32, BUTTERFREE
 
@@ -4052,7 +3170,6 @@ BugCatcherGroup:
 	db "ED@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, BEEDRILL
 	db 30, BEEDRILL
 	db 30, BEEDRILL
@@ -4065,7 +3182,6 @@ BugCatcherGroup:
 	db "WADE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 2, CATERPIE
 	db 2, CATERPIE
 	db 3, WEEDLE
@@ -4079,7 +3195,6 @@ BugCatcherGroup:
 	db "BENNY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 7, WEEDLE
 	db 9, KAKUNA
 	db 12, BEEDRILL
@@ -4092,7 +3207,6 @@ BugCatcherGroup:
 	db "AL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 12, CATERPIE
 	db 12, WEEDLE
 
@@ -4104,7 +3218,6 @@ BugCatcherGroup:
 	db "JOSH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 13, PARAS
 
 	db -1 ; end
@@ -4115,7 +3228,6 @@ BugCatcherGroup:
 	db "ARNIE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, VENONAT
 
 	db -1 ; end
@@ -4126,7 +3238,6 @@ BugCatcherGroup:
 	db "KEN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, ARIADOS
 	db 32, PINSIR
 
@@ -4138,7 +3249,6 @@ BugCatcherGroup:
 	db "WADE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 9, METAPOD
 	db 9, METAPOD
 	db 10, KAKUNA
@@ -4152,7 +3262,6 @@ BugCatcherGroup:
 	db "WADE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 14, BUTTERFREE
 	db 14, BUTTERFREE
 	db 15, BEEDRILL
@@ -4166,7 +3275,6 @@ BugCatcherGroup:
 	db "DOUG@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, ARIADOS
 
 	db -1 ; end
@@ -4177,7 +3285,6 @@ BugCatcherGroup:
 	db "ARNIE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, VENONAT
 
 	db -1 ; end
@@ -4188,13 +3295,8 @@ BugCatcherGroup:
 	db "ARNIE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 28, VENOMOTH
-		db DISABLE
-		db SUPERSONIC
-		db CONFUSION
-		db LEECH_LIFE
+	db DISABLE, SUPERSONIC, CONFUSION, LEECH_LIFE
 
 	db -1 ; end
 
@@ -4204,31 +3306,17 @@ BugCatcherGroup:
 	db "WADE@"
 	db TRAINERTYPE_MOVES
 
-	; party
+	db 24, BUTTERFREE
+	db CONFUSION, POISONPOWDER, SUPERSONIC, WHIRLWIND
 
 	db 24, BUTTERFREE
-		db CONFUSION
-		db POISONPOWDER
-		db SUPERSONIC
-		db WHIRLWIND
-
-	db 24, BUTTERFREE
-		db CONFUSION
-		db STUN_SPORE
-		db SUPERSONIC
-		db WHIRLWIND
+	db CONFUSION, STUN_SPORE, SUPERSONIC, WHIRLWIND
 
 	db 25, BEEDRILL
-		db FURY_ATTACK
-		db FOCUS_ENERGY
-		db TWINEEDLE
-		db RAGE
+	db FURY_ATTACK, FOCUS_ENERGY, TWINEEDLE, RAGE
 
 	db 24, BUTTERFREE
-		db CONFUSION
-		db SLEEP_POWDER
-		db SUPERSONIC
-		db WHIRLWIND
+	db CONFUSION, SLEEP_POWDER, SUPERSONIC, WHIRLWIND
 
 	db -1 ; end
 
@@ -4238,31 +3326,17 @@ BugCatcherGroup:
 	db "WADE@"
 	db TRAINERTYPE_MOVES
 
-	; party
+	db 30, BUTTERFREE
+	db CONFUSION, POISONPOWDER, SUPERSONIC, GUST
 
 	db 30, BUTTERFREE
-		db CONFUSION
-		db POISONPOWDER
-		db SUPERSONIC
-		db GUST
-
-	db 30, BUTTERFREE
-		db CONFUSION
-		db STUN_SPORE
-		db SUPERSONIC
-		db GUST
+	db CONFUSION, STUN_SPORE, SUPERSONIC, GUST
 
 	db 32, BEEDRILL
-		db FURY_ATTACK
-		db PURSUIT
-		db TWINEEDLE
-		db DOUBLE_TEAM
+	db FURY_ATTACK, PURSUIT, TWINEEDLE, DOUBLE_TEAM
 
 	db 34, BUTTERFREE
-		db PSYBEAM
-		db SLEEP_POWDER
-		db GUST
-		db WHIRLWIND
+	db PSYBEAM, SLEEP_POWDER, GUST, WHIRLWIND
 
 	db -1 ; end
 
@@ -4272,13 +3346,8 @@ BugCatcherGroup:
 	db "ARNIE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 36, VENOMOTH
-		db GUST
-		db SUPERSONIC
-		db PSYBEAM
-		db LEECH_LIFE
+	db GUST, SUPERSONIC, PSYBEAM, LEECH_LIFE
 
 	db -1 ; end
 
@@ -4288,13 +3357,8 @@ BugCatcherGroup:
 	db "ARNIE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 40, VENOMOTH
-		db GUST
-		db SUPERSONIC
-		db PSYCHIC_M
-		db TOXIC
+	db GUST, SUPERSONIC, PSYCHIC_M, TOXIC
 
 	db -1 ; end
 
@@ -4304,7 +3368,6 @@ BugCatcherGroup:
 	db "WAYNE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 8, LEDYBA
 	db 10, PARAS
 
@@ -4322,7 +3385,6 @@ FisherGroup:
 	db "JUSTIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 5, MAGIKARP
 	db 5, MAGIKARP
 	db 15, MAGIKARP
@@ -4336,7 +3398,6 @@ FisherGroup:
 	db "RALPH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, GOLDEEN
 
 	db -1 ; end
@@ -4347,7 +3408,6 @@ FisherGroup:
 	db "ARNOLD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, TENTACRUEL
 
 	db -1 ; end
@@ -4358,7 +3418,6 @@ FisherGroup:
 	db "KYLE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, SEAKING
 	db 31, POLIWHIRL
 	db 31, SEAKING
@@ -4371,7 +3430,6 @@ FisherGroup:
 	db "HENRY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 8, POLIWAG
 	db 8, POLIWAG
 
@@ -4383,7 +3441,6 @@ FisherGroup:
 	db "MARVIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, MAGIKARP
 	db 10, GYARADOS
 	db 15, MAGIKARP
@@ -4397,7 +3454,6 @@ FisherGroup:
 	db "TULLY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, QWILFISH
 
 	db -1 ; end
@@ -4408,7 +3464,6 @@ FisherGroup:
 	db "ANDRE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, GYARADOS
 
 	db -1 ; end
@@ -4419,7 +3474,6 @@ FisherGroup:
 	db "RAYMOND@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 22, MAGIKARP
 	db 22, MAGIKARP
 	db 22, MAGIKARP
@@ -4433,7 +3487,6 @@ FisherGroup:
 	db "WILTON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, GOLDEEN
 	db 23, GOLDEEN
 	db 25, SEAKING
@@ -4446,19 +3499,11 @@ FisherGroup:
 	db "EDGAR@"
 	db TRAINERTYPE_MOVES
 
-	; party
+	db 25, REMORAID
+	db LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM
 
 	db 25, REMORAID
-		db LOCK_ON
-		db PSYBEAM
-		db AURORA_BEAM
-		db BUBBLEBEAM
-
-	db 25, REMORAID
-		db LOCK_ON
-		db PSYBEAM
-		db AURORA_BEAM
-		db BUBBLEBEAM
+	db LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM
 
 	db -1 ; end
 
@@ -4468,7 +3513,6 @@ FisherGroup:
 	db "JONAH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, SHELLDER
 	db 29, OCTILLERY
 	db 25, REMORAID
@@ -4482,7 +3526,6 @@ FisherGroup:
 	db "MARTIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, REMORAID
 	db 32, REMORAID
 
@@ -4494,7 +3537,6 @@ FisherGroup:
 	db "STEPHEN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, MAGIKARP
 	db 25, MAGIKARP
 	db 31, QWILFISH
@@ -4508,7 +3550,6 @@ FisherGroup:
 	db "BARNEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, GYARADOS
 	db 30, GYARADOS
 	db 30, GYARADOS
@@ -4521,7 +3562,6 @@ FisherGroup:
 	db "RALPH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, GOLDEEN
 
 	db -1 ; end
@@ -4532,7 +3572,6 @@ FisherGroup:
 	db "RALPH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, QWILFISH
 	db 19, GOLDEEN
 
@@ -4544,7 +3583,6 @@ FisherGroup:
 	db "TULLY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, QWILFISH
 
 	db -1 ; end
@@ -4555,7 +3593,6 @@ FisherGroup:
 	db "TULLY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, GOLDEEN
 	db 32, GOLDEEN
 	db 32, QWILFISH
@@ -4568,7 +3605,6 @@ FisherGroup:
 	db "WILTON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 29, GOLDEEN
 	db 29, GOLDEEN
 	db 32, SEAKING
@@ -4581,7 +3617,6 @@ FisherGroup:
 	db "SCOTT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, QWILFISH
 	db 30, QWILFISH
 	db 34, SEAKING
@@ -4594,25 +3629,14 @@ FisherGroup:
 	db "WILTON@"
 	db TRAINERTYPE_MOVES
 
-	; party
+	db 34, SEAKING
+	db SUPERSONIC, WATERFALL, FLAIL, FURY_ATTACK
 
 	db 34, SEAKING
-		db SUPERSONIC
-		db WATERFALL
-		db FLAIL
-		db FURY_ATTACK
-
-	db 34, SEAKING
-		db SUPERSONIC
-		db WATERFALL
-		db FLAIL
-		db FURY_ATTACK
+	db SUPERSONIC, WATERFALL, FLAIL, FURY_ATTACK
 
 	db 38, REMORAID
-		db PSYBEAM
-		db AURORA_BEAM
-		db BUBBLEBEAM
-		db HYPER_BEAM
+	db PSYBEAM, AURORA_BEAM, BUBBLEBEAM, HYPER_BEAM
 
 	db -1 ; end
 
@@ -4622,7 +3646,6 @@ FisherGroup:
 	db "RALPH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, QWILFISH
 	db 32, GOLDEEN
 
@@ -4634,19 +3657,11 @@ FisherGroup:
 	db "RALPH@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 35, QWILFISH
-		db TOXIC
-		db MINIMIZE
-		db SURF
-		db PIN_MISSILE
+	db TOXIC, MINIMIZE, SURF, PIN_MISSILE
 
 	db 39, SEAKING
-		db ENDURE
-		db FLAIL
-		db FURY_ATTACK
-		db WATERFALL
+	db ENDURE, FLAIL, FURY_ATTACK, WATERFALL
 
 	db -1 ; end
 
@@ -4656,25 +3671,14 @@ FisherGroup:
 	db "TULLY@"
 	db TRAINERTYPE_MOVES
 
-	; party
+	db 34, SEAKING
+	db SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK
 
 	db 34, SEAKING
-		db SUPERSONIC
-		db RAIN_DANCE
-		db WATERFALL
-		db FURY_ATTACK
-
-	db 34, SEAKING
-		db SUPERSONIC
-		db RAIN_DANCE
-		db WATERFALL
-		db FURY_ATTACK
+	db SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK
 
 	db 37, QWILFISH
-		db ROLLOUT
-		db SURF
-		db PIN_MISSILE
-		db TAKE_DOWN
+	db ROLLOUT, SURF, PIN_MISSILE, TAKE_DOWN
 
 	db -1 ; end
 
@@ -4690,7 +3694,6 @@ SwimmerMGroup:
 	db "HAROLD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, REMORAID
 	db 30, SEADRA
 
@@ -4702,7 +3705,6 @@ SwimmerMGroup:
 	db "SIMON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, TENTACOOL
 	db 20, TENTACOOL
 
@@ -4714,7 +3716,6 @@ SwimmerMGroup:
 	db "RANDALL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, SHELLDER
 	db 20, WARTORTLE
 	db 18, SHELLDER
@@ -4727,7 +3728,6 @@ SwimmerMGroup:
 	db "CHARLIE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 21, SHELLDER
 	db 19, TENTACOOL
 	db 19, TENTACRUEL
@@ -4740,7 +3740,6 @@ SwimmerMGroup:
 	db "GEORGE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 16, TENTACOOL
 	db 17, TENTACOOL
 	db 16, TENTACOOL
@@ -4756,7 +3755,6 @@ SwimmerMGroup:
 	db "BERKE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, QWILFISH
 
 	db -1 ; end
@@ -4767,7 +3765,6 @@ SwimmerMGroup:
 	db "KIRK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, GYARADOS
 	db 20, GYARADOS
 
@@ -4779,7 +3776,6 @@ SwimmerMGroup:
 	db "MATHEW@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, KRABBY
 
 	db -1 ; end
@@ -4790,7 +3786,6 @@ SwimmerMGroup:
 	db "HAL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, SEEL
 	db 25, DEWGONG
 	db 24, SEEL
@@ -4803,7 +3798,6 @@ SwimmerMGroup:
 	db "PATON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, PILOSWINE
 	db 26, PILOSWINE
 
@@ -4815,7 +3809,6 @@ SwimmerMGroup:
 	db "DARYL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, SHELLDER
 	db 25, CLOYSTER
 	db 24, SHELLDER
@@ -4828,7 +3821,6 @@ SwimmerMGroup:
 	db "WALTER@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, HORSEA
 	db 15, HORSEA
 	db 20, SEADRA
@@ -4841,7 +3833,6 @@ SwimmerMGroup:
 	db "TONY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 13, STARYU
 	db 18, STARMIE
 	db 16, HORSEA
@@ -4854,7 +3845,6 @@ SwimmerMGroup:
 	db "JEROME@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, SEADRA
 	db 28, TENTACOOL
 	db 30, TENTACRUEL
@@ -4868,7 +3858,6 @@ SwimmerMGroup:
 	db "TUCKER@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, SHELLDER
 	db 34, CLOYSTER
 
@@ -4880,7 +3869,6 @@ SwimmerMGroup:
 	db "RICK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 13, STARYU
 	db 18, STARMIE
 	db 16, HORSEA
@@ -4893,7 +3881,6 @@ SwimmerMGroup:
 	db "CAMERON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, MARILL
 
 	db -1 ; end
@@ -4904,7 +3891,6 @@ SwimmerMGroup:
 	db "SETH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 29, QUAGSIRE
 	db 29, OCTILLERY
 	db 32, QUAGSIRE
@@ -4917,7 +3903,6 @@ SwimmerMGroup:
 	db "JAMES@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 13, STARYU
 	db 18, STARMIE
 	db 16, HORSEA
@@ -4930,7 +3915,6 @@ SwimmerMGroup:
 	db "LEWIS@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 13, STARYU
 	db 18, STARMIE
 	db 16, HORSEA
@@ -4943,7 +3927,6 @@ SwimmerMGroup:
 	db "PARKER@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, HORSEA
 	db 32, HORSEA
 	db 35, SEADRA
@@ -4962,7 +3945,6 @@ SwimmerFGroup:
 	db "ELAINE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 21, STARYU
 
 	db -1 ; end
@@ -4973,7 +3955,6 @@ SwimmerFGroup:
 	db "PAULA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, STARYU
 	db 19, SHELLDER
 
@@ -4985,7 +3966,6 @@ SwimmerFGroup:
 	db "KAYLEE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, GOLDEEN
 	db 20, GOLDEEN
 	db 20, SEAKING
@@ -4998,19 +3978,11 @@ SwimmerFGroup:
 	db "SUSIE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 20, PSYDUCK
-		db SCRATCH
-		db TAIL_WHIP
-		db DISABLE
-		db CONFUSION
+	db SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
 
 	db 22, GOLDEEN
-		db PECK
-		db TAIL_WHIP
-		db SUPERSONIC
-		db HORN_ATTACK
+	db PECK, TAIL_WHIP, SUPERSONIC, HORN_ATTACK
 
 	db -1 ; end
 
@@ -5020,7 +3992,6 @@ SwimmerFGroup:
 	db "DENISE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 22, SEEL
 
 	db -1 ; end
@@ -5031,7 +4002,6 @@ SwimmerFGroup:
 	db "KARA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, STARYU
 	db 20, STARMIE
 
@@ -5043,19 +4013,11 @@ SwimmerFGroup:
 	db "WENDY@"
 	db TRAINERTYPE_MOVES
 
-	; party
+	db 21, HORSEA
+	db BUBBLE, SMOKESCREEN, LEER, WATER_GUN
 
 	db 21, HORSEA
-		db BUBBLE
-		db SMOKESCREEN
-		db LEER
-		db WATER_GUN
-
-	db 21, HORSEA
-		db DRAGON_RAGE
-		db SMOKESCREEN
-		db LEER
-		db WATER_GUN
+	db DRAGON_RAGE, SMOKESCREEN, LEER, WATER_GUN
 
 	db -1 ; end
 
@@ -5065,7 +4027,6 @@ SwimmerFGroup:
 	db "LISA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, JYNX
 
 	db -1 ; end
@@ -5076,7 +4037,6 @@ SwimmerFGroup:
 	db "JILL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, DEWGONG
 
 	db -1 ; end
@@ -5087,7 +4047,6 @@ SwimmerFGroup:
 	db "MARY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, SEAKING
 
 	db -1 ; end
@@ -5098,7 +4057,6 @@ SwimmerFGroup:
 	db "KATIE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, DEWGONG
 
 	db -1 ; end
@@ -5109,7 +4067,6 @@ SwimmerFGroup:
 	db "DAWN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, SEAKING
 
 	db -1 ; end
@@ -5120,7 +4077,6 @@ SwimmerFGroup:
 	db "TARA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, SEAKING
 
 	db -1 ; end
@@ -5131,7 +4087,6 @@ SwimmerFGroup:
 	db "NICOLE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 29, MARILL
 	db 29, MARILL
 	db 32, LAPRAS
@@ -5144,7 +4099,6 @@ SwimmerFGroup:
 	db "LORI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, STARMIE
 	db 32, STARMIE
 
@@ -5156,7 +4110,6 @@ SwimmerFGroup:
 	db "JODY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, SEAKING
 
 	db -1 ; end
@@ -5167,7 +4120,6 @@ SwimmerFGroup:
 	db "NIKKI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, SEEL
 	db 28, SEEL
 	db 28, SEEL
@@ -5181,7 +4133,6 @@ SwimmerFGroup:
 	db "DIANA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 37, GOLDUCK
 
 	db -1 ; end
@@ -5192,7 +4143,6 @@ SwimmerFGroup:
 	db "BRIANA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, SEAKING
 	db 35, SEAKING
 
@@ -5210,7 +4160,6 @@ SailorGroup:
 	db "EUGENE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, POLIWHIRL
 	db 17, RATICATE
 	db 19, KRABBY
@@ -5223,7 +4172,6 @@ SailorGroup:
 	db "HUEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, POLIWAG
 	db 18, POLIWHIRL
 
@@ -5235,7 +4183,6 @@ SailorGroup:
 	db "TERRELL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, POLIWHIRL
 
 	db -1 ; end
@@ -5246,19 +4193,11 @@ SailorGroup:
 	db "KENT@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 18, KRABBY
-		db BUBBLE
-		db LEER
-		db VICEGRIP
-		db HARDEN
+	db BUBBLE, LEER, VICEGRIP, HARDEN
 
 	db 20, KRABBY
-		db BUBBLEBEAM
-		db LEER
-		db VICEGRIP
-		db HARDEN
+	db BUBBLEBEAM, LEER, VICEGRIP, HARDEN
 
 	db -1 ; end
 
@@ -5268,7 +4207,6 @@ SailorGroup:
 	db "ERNEST@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, MACHOP
 	db 18, MACHOP
 	db 18, POLIWHIRL
@@ -5281,7 +4219,6 @@ SailorGroup:
 	db "JEFF@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, RATICATE
 	db 32, RATICATE
 
@@ -5293,7 +4230,6 @@ SailorGroup:
 	db "GARRETT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, KINGLER
 
 	db -1 ; end
@@ -5304,7 +4240,6 @@ SailorGroup:
 	db "KENNETH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, MACHOP
 	db 28, MACHOP
 	db 28, POLIWRATH
@@ -5318,7 +4253,6 @@ SailorGroup:
 	db "STANLY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 31, MACHOP
 	db 33, MACHOKE
 	db 26, PSYDUCK
@@ -5331,7 +4265,6 @@ SailorGroup:
 	db "HARRY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, WOOPER
 
 	db -1 ; end
@@ -5342,7 +4275,6 @@ SailorGroup:
 	db "HUEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, POLIWHIRL
 	db 28, POLIWHIRL
 
@@ -5354,7 +4286,6 @@ SailorGroup:
 	db "HUEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, POLIWHIRL
 	db 34, POLIWRATH
 
@@ -5366,19 +4297,11 @@ SailorGroup:
 	db "HUEY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 38, POLITOED
-		db WHIRLPOOL
-		db RAIN_DANCE
-		db BODY_SLAM
-		db PERISH_SONG
+	db WHIRLPOOL, RAIN_DANCE, BODY_SLAM, PERISH_SONG
 
 	db 38, POLIWRATH
-		db SURF
-		db STRENGTH
-		db ICE_PUNCH
-		db SUBMISSION
+	db SURF, STRENGTH, ICE_PUNCH, SUBMISSION
 
 	db -1 ; end
 
@@ -5394,7 +4317,6 @@ SuperNerdGroup:
 	db "STAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, GRIMER
 
 	db -1 ; end
@@ -5405,7 +4327,6 @@ SuperNerdGroup:
 	db "ERIC@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 11, GRIMER
 	db 11, GRIMER
 
@@ -5417,7 +4338,6 @@ SuperNerdGroup:
 	db "GREGG@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, MAGNEMITE
 	db 20, MAGNEMITE
 	db 20, MAGNEMITE
@@ -5430,7 +4350,6 @@ SuperNerdGroup:
 	db "JAY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 22, KOFFING
 	db 22, KOFFING
 
@@ -5442,7 +4361,6 @@ SuperNerdGroup:
 	db "DAVE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, DITTO
 
 	db -1 ; end
@@ -5453,7 +4371,6 @@ SuperNerdGroup:
 	db "SAM@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, GRIMER
 	db 34, MUK
 
@@ -5465,7 +4382,6 @@ SuperNerdGroup:
 	db "TOM@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, MAGNEMITE
 	db 32, MAGNEMITE
 	db 32, MAGNEMITE
@@ -5478,7 +4394,6 @@ SuperNerdGroup:
 	db "PAT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 36, PORYGON
 
 	db -1 ; end
@@ -5489,7 +4404,6 @@ SuperNerdGroup:
 	db "SHAWN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 31, MAGNEMITE
 	db 33, MUK
 	db 31, MAGNEMITE
@@ -5502,7 +4416,6 @@ SuperNerdGroup:
 	db "TERU@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 7, MAGNEMITE
 	db 11, VOLTORB
 	db 7, MAGNEMITE
@@ -5516,7 +4429,6 @@ SuperNerdGroup:
 	db "RUSS@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, MAGNEMITE
 	db 27, MAGNEMITE
 	db 27, MAGNEMITE
@@ -5529,13 +4441,8 @@ SuperNerdGroup:
 	db "NORTON@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 30, PORYGON
-		db CONVERSION
-		db CONVERSION2
-		db RECOVER
-		db TRI_ATTACK
+	db CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK
 
 	db -1 ; end
 
@@ -5545,13 +4452,8 @@ SuperNerdGroup:
 	db "HUGH@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 39, SEADRA
-		db SMOKESCREEN
-		db TWISTER
-		db SURF
-		db WATERFALL
+	db SMOKESCREEN, TWISTER, SURF, WATERFALL
 
 	db -1 ; end
 
@@ -5561,13 +4463,8 @@ SuperNerdGroup:
 	db "MARKUS@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 19, SLOWPOKE
-		db CURSE
-		db WATER_GUN
-		db GROWL
-		db STRENGTH
+	db CURSE, WATER_GUN, GROWL, STRENGTH
 
 	db -1 ; end
 
@@ -5583,43 +4480,23 @@ Rival2Group:
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 41, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
+	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
 
 	db 42, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 41, MAGNETON
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
+	db THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
 
 	db 43, GENGAR
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
+	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
 
 	db 43, ALAKAZAM
-		db DISABLE
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
+	db DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
 
 	db 45, MEGANIUM
-		db RAZOR_LEAF
-		db POISONPOWDER
-		db BODY_SLAM
-		db LIGHT_SCREEN
+	db RAZOR_LEAF, POISONPOWDER, BODY_SLAM, LIGHT_SCREEN
 
 	db -1 ; end
 
@@ -5629,43 +4506,23 @@ Rival2Group:
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 41, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
+	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
 
 	db 42, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 41, MAGNETON
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
+	db THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
 
 	db 43, GENGAR
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
+	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
 
 	db 43, ALAKAZAM
-		db DISABLE
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
+	db DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
 
 	db 45, TYPHLOSION
-		db SMOKESCREEN
-		db QUICK_ATTACK
-		db FLAME_WHEEL
-		db SWIFT
+	db SMOKESCREEN, QUICK_ATTACK, FLAME_WHEEL, SWIFT
 
 	db -1 ; end
 
@@ -5675,43 +4532,23 @@ Rival2Group:
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 41, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
+	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
 
 	db 42, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 41, MAGNETON
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
+	db THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
 
 	db 43, GENGAR
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
+	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
 
 	db 43, ALAKAZAM
-		db DISABLE
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
+	db DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
 
 	db 45, FERALIGATR
-		db RAGE
-		db WATER_GUN
-		db SCARY_FACE
-		db SLASH
+	db RAGE, WATER_GUN, SCARY_FACE, SLASH
 
 	db -1 ; end
 
@@ -5721,43 +4558,23 @@ Rival2Group:
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 45, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
+	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
 
 	db 48, CROBAT
-		db TOXIC
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 45, MAGNETON
-		db THUNDER
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
+	db THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
 
 	db 46, GENGAR
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
+	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
 
 	db 46, ALAKAZAM
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
-		db REFLECT
+	db RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
 
 	db 50, MEGANIUM
-		db GIGA_DRAIN
-		db BODY_SLAM
-		db LIGHT_SCREEN
-		db SAFEGUARD
+	db GIGA_DRAIN, BODY_SLAM, LIGHT_SCREEN, SAFEGUARD
 
 	db -1 ; end
 
@@ -5767,43 +4584,23 @@ Rival2Group:
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 45, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
+	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
 
 	db 48, CROBAT
-		db TOXIC
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 45, MAGNETON
-		db THUNDER
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
+	db THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
 
 	db 46, GENGAR
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
+	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
 
 	db 46, ALAKAZAM
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
-		db REFLECT
+	db RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
 
 	db 50, TYPHLOSION
-		db SMOKESCREEN
-		db QUICK_ATTACK
-		db FIRE_BLAST
-		db SWIFT
+	db SMOKESCREEN, QUICK_ATTACK, FIRE_BLAST, SWIFT
 
 	db -1 ; end
 
@@ -5813,43 +4610,23 @@ Rival2Group:
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 45, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
+	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
 
 	db 48, CROBAT
-		db TOXIC
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 45, MAGNETON
-		db THUNDER
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
+	db THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
 
 	db 46, GENGAR
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
+	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
 
 	db 46, ALAKAZAM
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
-		db REFLECT
+	db RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
 
 	db 50, FERALIGATR
-		db SURF
-		db RAIN_DANCE
-		db SLASH
-		db SCREECH
+	db SURF, RAIN_DANCE, SLASH, SCREECH
 
 	db -1 ; end
 
@@ -5865,7 +4642,6 @@ GuitaristGroup:
 	db "CLYDE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, ELECTABUZZ
 
 	db -1 ; end
@@ -5876,7 +4652,6 @@ GuitaristGroup:
 	db "VINCENT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, MAGNEMITE
 	db 33, VOLTORB
 	db 32, MAGNEMITE
@@ -5896,7 +4671,6 @@ HikerGroup:
 	db "ANTHONY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 16, GEODUDE
 	db 18, MACHAMP
 
@@ -5908,7 +4682,6 @@ HikerGroup:
 	db "RUSSELL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 4, GEODUDE
 	db 6, GEODUDE
 	db 8, GEODUDE
@@ -5921,7 +4694,6 @@ HikerGroup:
 	db "PHILLIP@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, GEODUDE
 	db 23, GEODUDE
 	db 23, GRAVELER
@@ -5934,7 +4706,6 @@ HikerGroup:
 	db "LEONARD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, GEODUDE
 	db 25, MACHOP
 
@@ -5946,7 +4717,6 @@ HikerGroup:
 	db "ANTHONY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 11, GEODUDE
 	db 11, MACHOP
 
@@ -5958,7 +4728,6 @@ HikerGroup:
 	db "BENJAMIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 14, DIGLETT
 	db 14, GEODUDE
 	db 16, DUGTRIO
@@ -5971,7 +4740,6 @@ HikerGroup:
 	db "ERIK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, MACHOP
 	db 27, GRAVELER
 	db 27, MACHOP
@@ -5984,7 +4752,6 @@ HikerGroup:
 	db "MICHAEL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, GEODUDE
 	db 25, GRAVELER
 	db 25, GOLEM
@@ -5997,7 +4764,6 @@ HikerGroup:
 	db "PARRY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, ONIX
 	db 33, SWINUB
 
@@ -6009,19 +4775,11 @@ HikerGroup:
 	db "TIMOTHY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 27, DIGLETT
-		db MAGNITUDE
-		db DIG
-		db SAND_ATTACK
-		db SLASH
+	db MAGNITUDE, DIG, SAND_ATTACK, SLASH
 
 	db 27, DUGTRIO
-		db MAGNITUDE
-		db DIG
-		db SAND_ATTACK
-		db SLASH
+	db MAGNITUDE, DIG, SAND_ATTACK, SLASH
 
 	db -1 ; end
 
@@ -6031,7 +4789,6 @@ HikerGroup:
 	db "BAILEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 13, GEODUDE
 	db 13, GEODUDE
 	db 13, GEODUDE
@@ -6046,7 +4803,6 @@ HikerGroup:
 	db "ANTHONY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, GRAVELER
 	db 27, GRAVELER
 	db 29, MACHOKE
@@ -6059,7 +4815,6 @@ HikerGroup:
 	db "TIM@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 31, GRAVELER
 	db 31, GRAVELER
 	db 31, GRAVELER
@@ -6072,7 +4827,6 @@ HikerGroup:
 	db "NOLAND@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 31, SANDSLASH
 	db 33, GOLEM
 
@@ -6084,7 +4838,6 @@ HikerGroup:
 	db "SIDNEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, DUGTRIO
 	db 32, ONIX
 
@@ -6096,7 +4849,6 @@ HikerGroup:
 	db "KENNY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, SANDSLASH
 	db 29, GRAVELER
 	db 31, GOLEM
@@ -6110,7 +4862,6 @@ HikerGroup:
 	db "JIM@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, MACHAMP
 
 	db -1 ; end
@@ -6121,7 +4872,6 @@ HikerGroup:
 	db "DANIEL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 11, ONIX
 
 	db -1 ; end
@@ -6132,25 +4882,14 @@ HikerGroup:
 	db "PARRY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 35, PILOSWINE
-		db EARTHQUAKE
-		db BLIZZARD
-		db REST
-		db TAKE_DOWN
+	db EARTHQUAKE, BLIZZARD, REST, TAKE_DOWN
 
 	db 35, DUGTRIO
-		db MAGNITUDE
-		db DIG
-		db MUD_SLAP
-		db SLASH
+	db MAGNITUDE, DIG, MUD_SLAP, SLASH
 
 	db 38, STEELIX
-		db DIG
-		db IRON_TAIL
-		db SANDSTORM
-		db SLAM
+	db DIG, IRON_TAIL, SANDSTORM, SLAM
 
 	db -1 ; end
 
@@ -6160,7 +4899,6 @@ HikerGroup:
 	db "PARRY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 29, ONIX
 
 	db -1 ; end
@@ -6171,7 +4909,6 @@ HikerGroup:
 	db "ANTHONY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, GRAVELER
 	db 30, GRAVELER
 	db 32, MACHOKE
@@ -6184,25 +4921,14 @@ HikerGroup:
 	db "ANTHONY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 34, GRAVELER
-		db MAGNITUDE
-		db SELFDESTRUCT
-		db DEFENSE_CURL
-		db ROLLOUT
+	db MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT
 
 	db 36, GOLEM
-		db MAGNITUDE
-		db SELFDESTRUCT
-		db DEFENSE_CURL
-		db ROLLOUT
+	db MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT
 
 	db 34, MACHOKE
-		db KARATE_CHOP
-		db VITAL_THROW
-		db HEADBUTT
-		db DIG
+	db KARATE_CHOP, VITAL_THROW, HEADBUTT, DIG
 
 	db -1 ; end
 
@@ -6218,7 +4944,6 @@ BikerGroup:
 	db "BENNY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, KOFFING
 	db 20, KOFFING
 	db 20, KOFFING
@@ -6231,7 +4956,6 @@ BikerGroup:
 	db "KAZU@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, KOFFING
 	db 20, KOFFING
 	db 20, KOFFING
@@ -6244,7 +4968,6 @@ BikerGroup:
 	db "DWAYNE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, KOFFING
 	db 28, KOFFING
 	db 29, KOFFING
@@ -6258,7 +4981,6 @@ BikerGroup:
 	db "HARRIS@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, FLAREON
 
 	db -1 ; end
@@ -6269,7 +4991,6 @@ BikerGroup:
 	db "ZEKE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, KOFFING
 	db 32, KOFFING
 
@@ -6281,7 +5002,6 @@ BikerGroup:
 	db "CHARLES@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, KOFFING
 	db 30, CHARMELEON
 	db 30, WEEZING
@@ -6294,7 +5014,6 @@ BikerGroup:
 	db "RILEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, WEEZING
 
 	db -1 ; end
@@ -6305,7 +5024,6 @@ BikerGroup:
 	db "JOEL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, MAGMAR
 	db 32, MAGMAR
 
@@ -6317,7 +5035,6 @@ BikerGroup:
 	db "GLENN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, KOFFING
 	db 30, MAGMAR
 	db 32, WEEZING
@@ -6336,25 +5053,14 @@ BlaineGroup:
 	db "BLAINE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 45, MAGCARGO
-		db CURSE
-		db SMOG
-		db FLAMETHROWER
-		db ROCK_SLIDE
+	db CURSE, SMOG, FLAMETHROWER, ROCK_SLIDE
 
 	db 45, MAGMAR
-		db THUNDERPUNCH
-		db FIRE_PUNCH
-		db SUNNY_DAY
-		db CONFUSE_RAY
+	db THUNDERPUNCH, FIRE_PUNCH, SUNNY_DAY, CONFUSE_RAY
 
 	db 50, RAPIDASH
-		db QUICK_ATTACK
-		db FIRE_SPIN
-		db FURY_ATTACK
-		db FIRE_BLAST
+	db QUICK_ATTACK, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST
 
 	db -1 ; end
 
@@ -6370,7 +5076,6 @@ BurglarGroup:
 	db "DUNCAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, KOFFING
 	db 25, MAGMAR
 	db 23, KOFFING
@@ -6383,19 +5088,11 @@ BurglarGroup:
 	db "EDDIE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 26, GROWLITHE
-		db ROAR
-		db EMBER
-		db LEER
-		db TAKE_DOWN
+	db ROAR, EMBER, LEER, TAKE_DOWN
 
 	db 24, KOFFING
-		db TACKLE
-		db SMOG
-		db SLUDGE
-		db SMOKESCREEN
+	db TACKLE, SMOG, SLUDGE, SMOKESCREEN
 
 	db -1 ; end
 
@@ -6405,7 +5102,6 @@ BurglarGroup:
 	db "COREY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, KOFFING
 	db 28, MAGMAR
 	db 25, KOFFING
@@ -6425,7 +5121,6 @@ FirebreatherGroup:
 	db "OTIS@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 29, MAGMAR
 	db 32, WEEZING
 	db 29, MAGMAR
@@ -6438,7 +5133,6 @@ FirebreatherGroup:
 	db "DICK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, CHARMELEON
 
 	db -1 ; end
@@ -6449,7 +5143,6 @@ FirebreatherGroup:
 	db "NED@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, KOFFING
 	db 16, GROWLITHE
 	db 15, KOFFING
@@ -6462,7 +5155,6 @@ FirebreatherGroup:
 	db "BURT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, KOFFING
 	db 32, SLUGMA
 
@@ -6474,7 +5166,6 @@ FirebreatherGroup:
 	db "BILL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 6, KOFFING
 	db 6, KOFFING
 
@@ -6486,7 +5177,6 @@ FirebreatherGroup:
 	db "WALT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 11, MAGMAR
 	db 13, MAGMAR
 
@@ -6498,7 +5188,6 @@ FirebreatherGroup:
 	db "RAY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 9, VULPIX
 
 	db -1 ; end
@@ -6509,7 +5198,6 @@ FirebreatherGroup:
 	db "LYLE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, KOFFING
 	db 31, FLAREON
 	db 28, KOFFING
@@ -6528,7 +5216,6 @@ JugglerGroup:
 	db "IRWIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 2, VOLTORB
 	db 6, VOLTORB
 	db 10, VOLTORB
@@ -6542,7 +5229,6 @@ JugglerGroup:
 	db "FRITZ@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 29, MR__MIME
 	db 29, MAGMAR
 	db 29, MACHOKE
@@ -6555,7 +5241,6 @@ JugglerGroup:
 	db "HORTON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, ELECTRODE
 	db 33, ELECTRODE
 	db 33, ELECTRODE
@@ -6569,7 +5254,6 @@ JugglerGroup:
 	db "IRWIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 6, VOLTORB
 	db 10, VOLTORB
 	db 14, VOLTORB
@@ -6583,7 +5267,6 @@ JugglerGroup:
 	db "IRWIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, VOLTORB
 	db 22, VOLTORB
 	db 26, VOLTORB
@@ -6597,7 +5280,6 @@ JugglerGroup:
 	db "IRWIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, VOLTORB
 	db 22, VOLTORB
 	db 26, VOLTORB
@@ -6617,7 +5299,6 @@ BlackbeltGroup:
 	db "KENJI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, ONIX
 	db 30, HITMONLEE
 	db 27, ONIX
@@ -6631,13 +5312,8 @@ BlackbeltGroup:
 	db "YOSHI@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 27, HITMONLEE
-		db DOUBLE_KICK
-		db MEDITATE
-		db JUMP_KICK
-		db FOCUS_ENERGY
+	db DOUBLE_KICK, MEDITATE, JUMP_KICK, FOCUS_ENERGY
 
 	db -1 ; end
 
@@ -6647,31 +5323,17 @@ BlackbeltGroup:
 	db "KENJI@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 33, ONIX
-		db BIND
-		db ROCK_THROW
-		db TOXIC
-		db DIG
+	db BIND, ROCK_THROW, TOXIC, DIG
 
 	db 38, MACHAMP
-		db HEADBUTT
-		db SWAGGER
-		db THUNDERPUNCH
-		db VITAL_THROW
+	db HEADBUTT, SWAGGER, THUNDERPUNCH, VITAL_THROW
 
 	db 33, STEELIX
-		db EARTHQUAKE
-		db ROCK_THROW
-		db IRON_TAIL
-		db SANDSTORM
+	db EARTHQUAKE, ROCK_THROW, IRON_TAIL, SANDSTORM
 
 	db 36, HITMONLEE
-		db DOUBLE_TEAM
-		db HI_JUMP_KICK
-		db MUD_SLAP
-		db SWIFT
+	db DOUBLE_TEAM, HI_JUMP_KICK, MUD_SLAP, SWIFT
 
 	db -1 ; end
 
@@ -6681,13 +5343,8 @@ BlackbeltGroup:
 	db "LAO@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 27, HITMONCHAN
-		db COMET_PUNCH
-		db THUNDERPUNCH
-		db ICE_PUNCH
-		db FIRE_PUNCH
+	db COMET_PUNCH, THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH
 
 	db -1 ; end
 
@@ -6697,19 +5354,11 @@ BlackbeltGroup:
 	db "NOB@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 25, MACHOP
-		db LEER
-		db FOCUS_ENERGY
-		db KARATE_CHOP
-		db SEISMIC_TOSS
+	db LEER, FOCUS_ENERGY, KARATE_CHOP, SEISMIC_TOSS
 
 	db 25, MACHOKE
-		db LEER
-		db KARATE_CHOP
-		db SEISMIC_TOSS
-		db ROCK_SLIDE
+	db LEER, KARATE_CHOP, SEISMIC_TOSS, ROCK_SLIDE
 
 	db -1 ; end
 
@@ -6719,7 +5368,6 @@ BlackbeltGroup:
 	db "KIYO@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, HITMONLEE
 	db 34, HITMONCHAN
 
@@ -6731,7 +5379,6 @@ BlackbeltGroup:
 	db "LUNG@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, MANKEY
 	db 23, MANKEY
 	db 25, PRIMEAPE
@@ -6744,7 +5391,6 @@ BlackbeltGroup:
 	db "KENJI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, MACHOKE
 
 	db -1 ; end
@@ -6755,7 +5401,6 @@ BlackbeltGroup:
 	db "WAI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, MACHOKE
 	db 32, MACHOKE
 	db 34, MACHOKE
@@ -6774,25 +5419,14 @@ ExecutiveMGroup:
 	db "EXECUTIVE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 33, HOUNDOUR
-		db EMBER
-		db ROAR
-		db BITE
-		db FAINT_ATTACK
+	db EMBER, ROAR, BITE, FAINT_ATTACK
 
 	db 33, KOFFING
-		db TACKLE
-		db SLUDGE
-		db SMOKESCREEN
-		db HAZE
+	db TACKLE, SLUDGE, SMOKESCREEN, HAZE
 
 	db 35, HOUNDOOM
-		db EMBER
-		db SMOG
-		db BITE
-		db FAINT_ATTACK
+	db EMBER, SMOG, BITE, FAINT_ATTACK
 
 	db -1 ; end
 
@@ -6802,13 +5436,8 @@ ExecutiveMGroup:
 	db "EXECUTIVE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 36, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db -1 ; end
 
@@ -6818,43 +5447,23 @@ ExecutiveMGroup:
 	db "EXECUTIVE@"
 	db TRAINERTYPE_MOVES
 
-	; party
+	db 30, KOFFING
+	db TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
 
 	db 30, KOFFING
-		db TACKLE
-		db SELFDESTRUCT
-		db SLUDGE
-		db SMOKESCREEN
+	db TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
 
 	db 30, KOFFING
-		db TACKLE
-		db SELFDESTRUCT
-		db SLUDGE
-		db SMOKESCREEN
-
-	db 30, KOFFING
-		db TACKLE
-		db SELFDESTRUCT
-		db SLUDGE
-		db SMOKESCREEN
+	db TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
 
 	db 32, WEEZING
-		db TACKLE
-		db EXPLOSION
-		db SLUDGE
-		db SMOKESCREEN
+	db TACKLE, EXPLOSION, SLUDGE, SMOKESCREEN
 
 	db 30, KOFFING
-		db TACKLE
-		db SELFDESTRUCT
-		db SLUDGE
-		db SMOKESCREEN
+	db TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
 
 	db 30, KOFFING
-		db TACKLE
-		db SMOG
-		db SLUDGE
-		db SMOKESCREEN
+	db TACKLE, SMOG, SLUDGE, SMOKESCREEN
 
 	db -1 ; end
 
@@ -6864,7 +5473,6 @@ ExecutiveMGroup:
 	db "EXECUTIVE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 22, ZUBAT
 	db 24, RATICATE
 	db 22, KOFFING
@@ -6883,7 +5491,6 @@ PsychicGroup:
 	db "NATHAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, GIRAFARIG
 
 	db -1 ; end
@@ -6894,7 +5501,6 @@ PsychicGroup:
 	db "FRANKLIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 37, KADABRA
 
 	db -1 ; end
@@ -6905,7 +5511,6 @@ PsychicGroup:
 	db "HERMAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, EXEGGCUTE
 	db 30, EXEGGCUTE
 	db 30, EXEGGUTOR
@@ -6918,7 +5523,6 @@ PsychicGroup:
 	db "FIDEL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, XATU
 
 	db -1 ; end
@@ -6929,13 +5533,8 @@ PsychicGroup:
 	db "GREG@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 17, DROWZEE
-		db HYPNOSIS
-		db DISABLE
-		db DREAM_EATER
-		db 0
+	db HYPNOSIS, DISABLE, DREAM_EATER, NO_MOVE
 
 	db -1 ; end
 
@@ -6945,19 +5544,11 @@ PsychicGroup:
 	db "NORMAN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 17, SLOWPOKE
-		db TACKLE
-		db GROWL
-		db WATER_GUN
-		db 0
+	db TACKLE, GROWL, WATER_GUN, NO_MOVE
 
 	db 20, SLOWPOKE
-		db CURSE
-		db BODY_SLAM
-		db WATER_GUN
-		db CONFUSION
+	db CURSE, BODY_SLAM, WATER_GUN, CONFUSION
 
 	db -1 ; end
 
@@ -6967,25 +5558,14 @@ PsychicGroup:
 	db "MARK@"
 	db TRAINERTYPE_MOVES
 
-	; party
+	db 13, ABRA
+	db TELEPORT, FLASH, NO_MOVE, NO_MOVE
 
 	db 13, ABRA
-		db TELEPORT
-		db FLASH
-		db 0
-		db 0
-
-	db 13, ABRA
-		db TELEPORT
-		db FLASH
-		db 0
-		db 0
+	db TELEPORT, FLASH, NO_MOVE, NO_MOVE
 
 	db 15, KADABRA
-		db TELEPORT
-		db KINESIS
-		db CONFUSION
-		db 0
+	db TELEPORT, KINESIS, CONFUSION, NO_MOVE
 
 	db -1 ; end
 
@@ -6995,19 +5575,11 @@ PsychicGroup:
 	db "PHIL@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 24, NATU
-		db LEER
-		db NIGHT_SHADE
-		db FUTURE_SIGHT
-		db CONFUSE_RAY
+	db LEER, NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY
 
 	db 26, KADABRA
-		db DISABLE
-		db PSYBEAM
-		db RECOVER
-		db FUTURE_SIGHT
+	db DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
 
 	db -1 ; end
 
@@ -7017,7 +5589,6 @@ PsychicGroup:
 	db "RICHARD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 36, ESPEON
 
 	db -1 ; end
@@ -7028,7 +5599,6 @@ PsychicGroup:
 	db "GILBERT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, STARMIE
 	db 30, EXEGGCUTE
 	db 34, GIRAFARIG
@@ -7041,7 +5611,6 @@ PsychicGroup:
 	db "JARED@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, MR__MIME
 	db 32, EXEGGCUTE
 	db 35, EXEGGCUTE
@@ -7054,7 +5623,6 @@ PsychicGroup:
 	db "RODNEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 29, DROWZEE
 	db 33, HYPNO
 
@@ -7072,7 +5640,6 @@ PicnickerGroup:
 	db "LIZ@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 9, NIDORAN_F
 
 	db -1 ; end
@@ -7083,7 +5650,6 @@ PicnickerGroup:
 	db "GINA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 9, HOPPIP
 	db 9, HOPPIP
 	db 12, BULBASAUR
@@ -7096,13 +5662,8 @@ PicnickerGroup:
 	db "BROOKE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 16, PIKACHU
-		db THUNDERSHOCK
-		db GROWL
-		db QUICK_ATTACK
-		db DOUBLE_TEAM
+	db THUNDERSHOCK, GROWL, QUICK_ATTACK, DOUBLE_TEAM
 
 	db -1 ; end
 
@@ -7112,7 +5673,6 @@ PicnickerGroup:
 	db "KIM@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, VULPIX
 
 	db -1 ; end
@@ -7123,7 +5683,6 @@ PicnickerGroup:
 	db "CINDY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 36, NIDOQUEEN
 
 	db -1 ; end
@@ -7134,7 +5693,6 @@ PicnickerGroup:
 	db "HOPE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, FLAAFFY
 
 	db -1 ; end
@@ -7145,7 +5703,6 @@ PicnickerGroup:
 	db "SHARON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 31, FURRET
 	db 33, RAPIDASH
 
@@ -7157,7 +5714,6 @@ PicnickerGroup:
 	db "DEBRA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, SEAKING
 
 	db -1 ; end
@@ -7168,7 +5724,6 @@ PicnickerGroup:
 	db "GINA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 14, HOPPIP
 	db 14, HOPPIP
 	db 17, IVYSAUR
@@ -7181,7 +5736,6 @@ PicnickerGroup:
 	db "ERIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 16, PONYTA
 	db 16, PONYTA
 
@@ -7193,7 +5747,6 @@ PicnickerGroup:
 	db "LIZ@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, WEEPINBELL
 	db 15, NIDORINA
 
@@ -7205,7 +5758,6 @@ PicnickerGroup:
 	db "LIZ@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, WEEPINBELL
 	db 19, NIDORINO
 	db 21, NIDOQUEEN
@@ -7218,7 +5770,6 @@ PicnickerGroup:
 	db "HEIDI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, SKIPLOOM
 	db 32, SKIPLOOM
 
@@ -7230,7 +5781,6 @@ PicnickerGroup:
 	db "EDNA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, NIDORINA
 	db 34, RAICHU
 
@@ -7242,7 +5792,6 @@ PicnickerGroup:
 	db "GINA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, SKIPLOOM
 	db 26, SKIPLOOM
 	db 29, IVYSAUR
@@ -7255,13 +5804,8 @@ PicnickerGroup:
 	db "TIFFANY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 31, CLEFAIRY
-		db ENCORE
-		db SING
-		db DOUBLESLAP
-		db MINIMIZE
+	db ENCORE, SING, DOUBLESLAP, MINIMIZE
 
 	db -1 ; end
 
@@ -7271,13 +5815,8 @@ PicnickerGroup:
 	db "TIFFANY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 37, CLEFAIRY
-		db ENCORE
-		db DOUBLESLAP
-		db MINIMIZE
-		db METRONOME
+	db ENCORE, DOUBLESLAP, MINIMIZE, METRONOME
 
 	db -1 ; end
 
@@ -7287,7 +5826,6 @@ PicnickerGroup:
 	db "ERIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, PONYTA
 	db 32, PONYTA
 
@@ -7299,7 +5837,6 @@ PicnickerGroup:
 	db "TANYA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 37, EXEGGUTOR
 
 	db -1 ; end
@@ -7310,13 +5847,8 @@ PicnickerGroup:
 	db "TIFFANY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 20, CLEFAIRY
-		db ENCORE
-		db SING
-		db DOUBLESLAP
-		db MINIMIZE
+	db ENCORE, SING, DOUBLESLAP, MINIMIZE
 
 	db -1 ; end
 
@@ -7326,25 +5858,14 @@ PicnickerGroup:
 	db "ERIN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 36, PONYTA
-		db DOUBLE_TEAM
-		db STOMP
-		db FIRE_SPIN
-		db SUNNY_DAY
+	db DOUBLE_TEAM, STOMP, FIRE_SPIN, SUNNY_DAY
 
 	db 34, RAICHU
-		db SWIFT
-		db MUD_SLAP
-		db QUICK_ATTACK
-		db THUNDERBOLT
+	db SWIFT, MUD_SLAP, QUICK_ATTACK, THUNDERBOLT
 
 	db 36, PONYTA
-		db DOUBLE_TEAM
-		db STOMP
-		db FIRE_SPIN
-		db SUNNY_DAY
+	db DOUBLE_TEAM, STOMP, FIRE_SPIN, SUNNY_DAY
 
 	db -1 ; end
 
@@ -7354,7 +5875,6 @@ PicnickerGroup:
 	db "LIZ@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, WEEPINBELL
 	db 26, NIDORINO
 	db 26, NIDOQUEEN
@@ -7367,25 +5887,14 @@ PicnickerGroup:
 	db "LIZ@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 30, WEEPINBELL
-		db SLEEP_POWDER
-		db POISONPOWDER
-		db STUN_SPORE
-		db SLUDGE_BOMB
+	db SLEEP_POWDER, POISONPOWDER, STUN_SPORE, SLUDGE_BOMB
 
 	db 32, NIDOKING
-		db EARTHQUAKE
-		db DOUBLE_KICK
-		db POISON_STING
-		db IRON_TAIL
+	db EARTHQUAKE, DOUBLE_KICK, POISON_STING, IRON_TAIL
 
 	db 32, NIDOQUEEN
-		db EARTHQUAKE
-		db DOUBLE_KICK
-		db TAIL_WHIP
-		db BODY_SLAM
+	db EARTHQUAKE, DOUBLE_KICK, TAIL_WHIP, BODY_SLAM
 
 	db -1 ; end
 
@@ -7395,7 +5904,6 @@ PicnickerGroup:
 	db "GINA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, SKIPLOOM
 	db 30, SKIPLOOM
 	db 32, IVYSAUR
@@ -7408,25 +5916,14 @@ PicnickerGroup:
 	db "GINA@"
 	db TRAINERTYPE_MOVES
 
-	; party
+	db 33, JUMPLUFF
+	db STUN_SPORE, SUNNY_DAY, LEECH_SEED, COTTON_SPORE
 
 	db 33, JUMPLUFF
-		db STUN_SPORE
-		db SUNNY_DAY
-		db LEECH_SEED
-		db COTTON_SPORE
-
-	db 33, JUMPLUFF
-		db SUNNY_DAY
-		db SLEEP_POWDER
-		db LEECH_SEED
-		db COTTON_SPORE
+	db SUNNY_DAY, SLEEP_POWDER, LEECH_SEED, COTTON_SPORE
 
 	db 38, VENUSAUR
-		db SOLARBEAM
-		db RAZOR_LEAF
-		db HEADBUTT
-		db MUD_SLAP
+	db SOLARBEAM, RAZOR_LEAF, HEADBUTT, MUD_SLAP
 
 	db -1 ; end
 
@@ -7436,13 +5933,8 @@ PicnickerGroup:
 	db "TIFFANY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 43, CLEFAIRY
-		db METRONOME
-		db ENCORE
-		db MOONLIGHT
-		db MINIMIZE
+	db METRONOME, ENCORE, MOONLIGHT, MINIMIZE
 
 	db -1 ; end
 
@@ -7458,7 +5950,6 @@ CamperGroup:
 	db "ROLAND@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 9, NIDORAN_M
 
 	db -1 ; end
@@ -7469,7 +5960,6 @@ CamperGroup:
 	db "TODD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 14, PSYDUCK
 
 	db -1 ; end
@@ -7480,7 +5970,6 @@ CamperGroup:
 	db "IVAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, DIGLETT
 	db 10, ZUBAT
 	db 14, DIGLETT
@@ -7493,7 +5982,6 @@ CamperGroup:
 	db "ELLIOT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 13, SANDSHREW
 	db 15, MARILL
 
@@ -7505,7 +5993,6 @@ CamperGroup:
 	db "BARRY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 36, NIDOKING
 
 	db -1 ; end
@@ -7516,7 +6003,6 @@ CamperGroup:
 	db "LLOYD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, NIDOKING
 
 	db -1 ; end
@@ -7527,7 +6013,6 @@ CamperGroup:
 	db "DEAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, GOLDUCK
 	db 31, SANDSLASH
 
@@ -7539,7 +6024,6 @@ CamperGroup:
 	db "SID@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, DUGTRIO
 	db 29, PRIMEAPE
 	db 29, POLIWRATH
@@ -7552,7 +6036,6 @@ CamperGroup:
 	db "HARVEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, NIDORINO
 
 	db -1 ; end
@@ -7563,7 +6046,6 @@ CamperGroup:
 	db "DALE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, NIDORINO
 
 	db -1 ; end
@@ -7574,7 +6056,6 @@ CamperGroup:
 	db "TED@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, MANKEY
 
 	db -1 ; end
@@ -7585,7 +6066,6 @@ CamperGroup:
 	db "TODD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, GEODUDE
 	db 17, GEODUDE
 	db 23, PSYDUCK
@@ -7598,7 +6078,6 @@ CamperGroup:
 	db "TODD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, GEODUDE
 	db 23, GEODUDE
 	db 26, PSYDUCK
@@ -7611,7 +6090,6 @@ CamperGroup:
 	db "THOMAS@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, GRAVELER
 	db 36, GRAVELER
 	db 40, GOLBAT
@@ -7625,7 +6103,6 @@ CamperGroup:
 	db "LEROY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, GRAVELER
 	db 36, GRAVELER
 	db 40, GOLBAT
@@ -7639,7 +6116,6 @@ CamperGroup:
 	db "DAVID@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, GRAVELER
 	db 36, GRAVELER
 	db 40, GOLBAT
@@ -7653,7 +6129,6 @@ CamperGroup:
 	db "JOHN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, GRAVELER
 	db 36, GRAVELER
 	db 40, GOLBAT
@@ -7667,7 +6142,6 @@ CamperGroup:
 	db "JERRY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 37, SANDSLASH
 
 	db -1 ; end
@@ -7678,7 +6152,6 @@ CamperGroup:
 	db "SPENCER@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, SANDSHREW
 	db 17, SANDSLASH
 	db 19, ZUBAT
@@ -7691,7 +6164,6 @@ CamperGroup:
 	db "TODD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, GRAVELER
 	db 30, GRAVELER
 	db 30, SLUGMA
@@ -7705,31 +6177,17 @@ CamperGroup:
 	db "TODD@"
 	db TRAINERTYPE_MOVES
 
-	; party
+	db 33, GRAVELER
+	db SELFDESTRUCT, ROCK_THROW, HARDEN, MAGNITUDE
 
 	db 33, GRAVELER
-		db SELFDESTRUCT
-		db ROCK_THROW
-		db HARDEN
-		db MAGNITUDE
-
-	db 33, GRAVELER
-		db SELFDESTRUCT
-		db ROCK_THROW
-		db HARDEN
-		db MAGNITUDE
+	db SELFDESTRUCT, ROCK_THROW, HARDEN, MAGNITUDE
 
 	db 36, MAGCARGO
-		db ROCK_THROW
-		db HARDEN
-		db AMNESIA
-		db FLAMETHROWER
+	db ROCK_THROW, HARDEN, AMNESIA, FLAMETHROWER
 
 	db 34, GOLDUCK
-		db DISABLE
-		db PSYCHIC_M
-		db SURF
-		db PSYCH_UP
+	db DISABLE, PSYCHIC_M, SURF, PSYCH_UP
 
 	db -1 ; end
 
@@ -7739,7 +6197,6 @@ CamperGroup:
 	db "QUENTIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, FEAROW
 	db 30, PRIMEAPE
 	db 30, TAUROS
@@ -7758,25 +6215,14 @@ ExecutiveFGroup:
 	db "EXECUTIVE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 32, ARBOK
-		db WRAP
-		db POISON_STING
-		db BITE
-		db GLARE
+	db WRAP, POISON_STING, BITE, GLARE
 
 	db 32, VILEPLUME
-		db ABSORB
-		db SWEET_SCENT
-		db SLEEP_POWDER
-		db ACID
+	db ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID
 
 	db 32, MURKROW
-		db PECK
-		db PURSUIT
-		db HAZE
-		db NIGHT_SHADE
+	db PECK, PURSUIT, HAZE, NIGHT_SHADE
 
 	db -1 ; end
 
@@ -7786,25 +6232,14 @@ ExecutiveFGroup:
 	db "EXECUTIVE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 23, ARBOK
-		db WRAP
-		db LEER
-		db POISON_STING
-		db BITE
+	db WRAP, LEER, POISON_STING, BITE
 
 	db 23, GLOOM
-		db ABSORB
-		db SWEET_SCENT
-		db SLEEP_POWDER
-		db ACID
+	db ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID
 
 	db 25, MURKROW
-		db PECK
-		db PURSUIT
-		db HAZE
-		db 0
+	db PECK, PURSUIT, HAZE, NO_MOVE
 
 	db -1 ; end
 
@@ -7820,7 +6255,6 @@ SageGroup:
 	db "CHOW@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 3, BELLSPROUT
 	db 3, BELLSPROUT
 	db 3, BELLSPROUT
@@ -7833,7 +6267,6 @@ SageGroup:
 	db "NICO@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 3, BELLSPROUT
 	db 3, BELLSPROUT
 	db 3, BELLSPROUT
@@ -7846,7 +6279,6 @@ SageGroup:
 	db "JIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 6, BELLSPROUT
 
 	db -1 ; end
@@ -7857,7 +6289,6 @@ SageGroup:
 	db "TROY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 7, BELLSPROUT
 	db 7, HOOTHOOT
 
@@ -7869,7 +6300,6 @@ SageGroup:
 	db "JEFFREY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 22, HAUNTER
 
 	db -1 ; end
@@ -7880,7 +6310,6 @@ SageGroup:
 	db "PING@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 16, GASTLY
 	db 16, GASTLY
 	db 16, GASTLY
@@ -7895,7 +6324,6 @@ SageGroup:
 	db "EDMOND@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 3, BELLSPROUT
 	db 3, BELLSPROUT
 	db 3, BELLSPROUT
@@ -7908,7 +6336,6 @@ SageGroup:
 	db "NEAL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 6, BELLSPROUT
 
 	db -1 ; end
@@ -7919,7 +6346,6 @@ SageGroup:
 	db "LI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 7, BELLSPROUT
 	db 7, BELLSPROUT
 	db 10, HOOTHOOT
@@ -7932,7 +6358,6 @@ SageGroup:
 	db "GAKU@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, NOCTOWL
 	db 32, FLAREON
 
@@ -7944,7 +6369,6 @@ SageGroup:
 	db "MASA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, NOCTOWL
 	db 32, JOLTEON
 
@@ -7956,7 +6380,6 @@ SageGroup:
 	db "KOJI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, NOCTOWL
 	db 32, VAPOREON
 
@@ -7974,7 +6397,6 @@ MediumGroup:
 	db "MARTHA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, GASTLY
 	db 20, HAUNTER
 	db 20, GASTLY
@@ -7987,7 +6409,6 @@ MediumGroup:
 	db "GRACE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, HAUNTER
 	db 20, HAUNTER
 
@@ -7999,7 +6420,6 @@ MediumGroup:
 	db "BETHANY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, HAUNTER
 
 	db -1 ; end
@@ -8010,7 +6430,6 @@ MediumGroup:
 	db "MARGRET@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, HAUNTER
 
 	db -1 ; end
@@ -8021,7 +6440,6 @@ MediumGroup:
 	db "ETHEL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, HAUNTER
 
 	db -1 ; end
@@ -8032,7 +6450,6 @@ MediumGroup:
 	db "REBECCA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, DROWZEE
 	db 35, HYPNO
 
@@ -8044,7 +6461,6 @@ MediumGroup:
 	db "DORIS@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, SLOWPOKE
 	db 36, SLOWBRO
 
@@ -8062,7 +6478,6 @@ BoarderGroup:
 	db "RONALD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, SEEL
 	db 25, DEWGONG
 	db 24, SEEL
@@ -8075,7 +6490,6 @@ BoarderGroup:
 	db "BRAD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, SWINUB
 	db 26, SWINUB
 
@@ -8087,7 +6501,6 @@ BoarderGroup:
 	db "DOUGLAS@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, SHELLDER
 	db 25, CLOYSTER
 	db 24, SHELLDER
@@ -8106,7 +6519,6 @@ PokefanMGroup:
 	db "WILLIAM@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 14, RAICHU, BERRY
 
 	db -1 ; end
@@ -8117,7 +6529,6 @@ PokefanMGroup:
 	db "DEREK@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 17, PIKACHU, BERRY
 
 	db -1 ; end
@@ -8128,7 +6539,6 @@ PokefanMGroup:
 	db "ROBERT@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 33, QUAGSIRE, BERRY
 
 	db -1 ; end
@@ -8139,7 +6549,6 @@ PokefanMGroup:
 	db "JOSHUA@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 23, PIKACHU, BERRY
 	db 23, PIKACHU, BERRY
 	db 23, PIKACHU, BERRY
@@ -8155,7 +6564,6 @@ PokefanMGroup:
 	db "CARTER@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 29, BULBASAUR, BERRY
 	db 29, CHARMANDER, BERRY
 	db 29, SQUIRTLE, BERRY
@@ -8168,7 +6576,6 @@ PokefanMGroup:
 	db "TREVOR@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 33, PSYDUCK, BERRY
 
 	db -1 ; end
@@ -8179,7 +6586,6 @@ PokefanMGroup:
 	db "BRANDON@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 13, SNUBBULL, BERRY
 
 	db -1 ; end
@@ -8190,7 +6596,6 @@ PokefanMGroup:
 	db "JEREMY@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 28, MEOWTH, BERRY
 	db 28, MEOWTH, BERRY
 	db 28, MEOWTH, BERRY
@@ -8203,7 +6608,6 @@ PokefanMGroup:
 	db "COLIN@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 32, DELIBIRD, BERRY
 
 	db -1 ; end
@@ -8214,7 +6618,6 @@ PokefanMGroup:
 	db "DEREK@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 19, PIKACHU, BERRY
 
 	db -1 ; end
@@ -8225,7 +6628,6 @@ PokefanMGroup:
 	db "DEREK@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 36, PIKACHU, BERRY
 
 	db -1 ; end
@@ -8236,7 +6638,6 @@ PokefanMGroup:
 	db "ALEX@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 29, NIDOKING, BERRY
 	db 29, SLOWKING, BERRY
 	db 29, SEAKING, BERRY
@@ -8249,7 +6650,6 @@ PokefanMGroup:
 	db "REX@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 35, PHANPY, BERRY
 
 	db -1 ; end
@@ -8260,7 +6660,6 @@ PokefanMGroup:
 	db "ALLAN@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 35, TEDDIURSA, BERRY
 
 	db -1 ; end
@@ -8277,7 +6676,6 @@ KimonoGirlGroup:
 	db "NAOKO@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, SKIPLOOM
 	db 20, VULPIX
 	db 18, SKIPLOOM
@@ -8290,7 +6688,6 @@ KimonoGirlGroup:
 	db "NAOKO@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, FLAREON
 
 	db -1 ; end
@@ -8301,7 +6698,6 @@ KimonoGirlGroup:
 	db "SAYO@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, ESPEON
 
 	db -1 ; end
@@ -8312,7 +6708,6 @@ KimonoGirlGroup:
 	db "ZUKI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, UMBREON
 
 	db -1 ; end
@@ -8323,7 +6718,6 @@ KimonoGirlGroup:
 	db "KUNI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, VAPOREON
 
 	db -1 ; end
@@ -8334,7 +6728,6 @@ KimonoGirlGroup:
 	db "MIKI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, JOLTEON
 
 	db -1 ; end
@@ -8351,7 +6744,6 @@ TwinsGroup:
 	db "AMY & MAY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, SPINARAK
 	db 10, LEDYBA
 
@@ -8363,19 +6755,11 @@ TwinsGroup:
 	db "ANN & ANNE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 16, CLEFAIRY
-		db GROWL
-		db ENCORE
-		db DOUBLESLAP
-		db METRONOME
+	db GROWL, ENCORE, DOUBLESLAP, METRONOME
 
 	db 16, JIGGLYPUFF
-		db SING
-		db DEFENSE_CURL
-		db POUND
-		db DISABLE
+	db SING, DEFENSE_CURL, POUND, DISABLE
 
 	db -1 ; end
 
@@ -8385,19 +6769,11 @@ TwinsGroup:
 	db "ANN & ANNE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 16, JIGGLYPUFF
-		db SING
-		db DEFENSE_CURL
-		db POUND
-		db DISABLE
+	db SING, DEFENSE_CURL, POUND, DISABLE
 
 	db 16, CLEFAIRY
-		db GROWL
-		db ENCORE
-		db DOUBLESLAP
-		db METRONOME
+	db GROWL, ENCORE, DOUBLESLAP, METRONOME
 
 	db -1 ; end
 
@@ -8407,7 +6783,6 @@ TwinsGroup:
 	db "AMY & MAY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, LEDYBA
 	db 10, SPINARAK
 
@@ -8419,7 +6794,6 @@ TwinsGroup:
 	db "JO & ZOE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, VICTREEBEL
 	db 35, VILEPLUME
 
@@ -8431,7 +6805,6 @@ TwinsGroup:
 	db "JO & ZOE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, VILEPLUME
 	db 35, VICTREEBEL
 
@@ -8443,7 +6816,6 @@ TwinsGroup:
 	db "MEG & PEG@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 31, TEDDIURSA
 	db 31, PHANPY
 
@@ -8455,7 +6827,6 @@ TwinsGroup:
 	db "MEG & PEG@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 31, PHANPY
 	db 31, TEDDIURSA
 
@@ -8467,19 +6838,11 @@ TwinsGroup:
 	db "LEA & PIA@"
 	db TRAINERTYPE_MOVES
 
-	; party
+	db 35, DRATINI
+	db THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
 
 	db 35, DRATINI
-		db THUNDER_WAVE
-		db TWISTER
-		db FLAMETHROWER
-		db HEADBUTT
-
-	db 35, DRATINI
-		db THUNDER_WAVE
-		db TWISTER
-		db ICE_BEAM
-		db HEADBUTT
+	db THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
 
 	db -1 ; end
 
@@ -8489,19 +6852,11 @@ TwinsGroup:
 	db "LEA & PIA@"
 	db TRAINERTYPE_MOVES
 
-	; party
+	db 38, DRATINI
+	db THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
 
 	db 38, DRATINI
-		db THUNDER_WAVE
-		db TWISTER
-		db ICE_BEAM
-		db HEADBUTT
-
-	db 38, DRATINI
-		db THUNDER_WAVE
-		db TWISTER
-		db FLAMETHROWER
-		db HEADBUTT
+	db THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
 
 	db -1 ; end
 
@@ -8517,7 +6872,6 @@ PokefanFGroup:
 	db "BEVERLY@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 14, SNUBBULL, BERRY
 
 	db -1 ; end
@@ -8528,7 +6882,6 @@ PokefanFGroup:
 	db "RUTH@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 17, PIKACHU, BERRY
 
 	db -1 ; end
@@ -8539,7 +6892,6 @@ PokefanFGroup:
 	db "BEVERLY@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 18, SNUBBULL, BERRY
 
 	db -1 ; end
@@ -8550,7 +6902,6 @@ PokefanFGroup:
 	db "BEVERLY@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 30, GRANBULL, BERRY
 
 	db -1 ; end
@@ -8561,7 +6912,6 @@ PokefanFGroup:
 	db "GEORGIA@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 23, SENTRET, BERRY
 	db 23, SENTRET, BERRY
 	db 23, SENTRET, BERRY
@@ -8576,7 +6926,6 @@ PokefanFGroup:
 	db "JAIME@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 16, MEOWTH, BERRY
 
 	db -1 ; end
@@ -8593,43 +6942,23 @@ RedGroup:
 	db "RED@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 81, PIKACHU
-		db CHARM
-		db QUICK_ATTACK
-		db THUNDERBOLT
-		db THUNDER
+	db CHARM, QUICK_ATTACK, THUNDERBOLT, THUNDER
 
 	db 73, ESPEON
-		db MUD_SLAP
-		db REFLECT
-		db SWIFT
-		db PSYCHIC_M
+	db MUD_SLAP, REFLECT, SWIFT, PSYCHIC_M
 
 	db 75, SNORLAX
-		db AMNESIA
-		db SNORE
-		db REST
-		db BODY_SLAM
+	db AMNESIA, SNORE, REST, BODY_SLAM
 
 	db 77, VENUSAUR
-		db SUNNY_DAY
-		db GIGA_DRAIN
-		db SYNTHESIS
-		db SOLARBEAM
+	db SUNNY_DAY, GIGA_DRAIN, SYNTHESIS, SOLARBEAM
 
 	db 77, CHARIZARD
-		db FLAMETHROWER
-		db WING_ATTACK
-		db SLASH
-		db FIRE_SPIN
+	db FLAMETHROWER, WING_ATTACK, SLASH, FIRE_SPIN
 
 	db 77, BLASTOISE
-		db RAIN_DANCE
-		db SURF
-		db BLIZZARD
-		db WHIRLPOOL
+	db RAIN_DANCE, SURF, BLIZZARD, WHIRLPOOL
 
 	db -1 ; end
 
@@ -8645,43 +6974,23 @@ BlueGroup:
 	db "BLUE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 56, PIDGEOT
-		db QUICK_ATTACK
-		db WHIRLWIND
-		db WING_ATTACK
-		db MIRROR_MOVE
+	db QUICK_ATTACK, WHIRLWIND, WING_ATTACK, MIRROR_MOVE
 
 	db 54, ALAKAZAM
-		db DISABLE
-		db RECOVER
-		db PSYCHIC_M
-		db REFLECT
+	db DISABLE, RECOVER, PSYCHIC_M, REFLECT
 
 	db 56, RHYDON
-		db FURY_ATTACK
-		db SANDSTORM
-		db ROCK_SLIDE
-		db EARTHQUAKE
+	db FURY_ATTACK, SANDSTORM, ROCK_SLIDE, EARTHQUAKE
 
 	db 58, GYARADOS
-		db TWISTER
-		db HYDRO_PUMP
-		db RAIN_DANCE
-		db HYPER_BEAM
+	db TWISTER, HYDRO_PUMP, RAIN_DANCE, HYPER_BEAM
 
 	db 58, EXEGGUTOR
-		db SUNNY_DAY
-		db LEECH_SEED
-		db EGG_BOMB
-		db SOLARBEAM
+	db SUNNY_DAY, LEECH_SEED, EGG_BOMB, SOLARBEAM
 
 	db 58, ARCANINE
-		db ROAR
-		db SWIFT
-		db FLAMETHROWER
-		db EXTREMESPEED
+	db ROAR, SWIFT, FLAMETHROWER, EXTREMESPEED
 
 	db -1 ; end
 
@@ -8697,7 +7006,6 @@ OfficerGroup:
 	db "KEITH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, GROWLITHE
 
 	db -1 ; end
@@ -8708,7 +7016,6 @@ OfficerGroup:
 	db "DIRK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 14, GROWLITHE
 	db 14, GROWLITHE
 
@@ -8726,7 +7033,6 @@ GruntFGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 9, ZUBAT
 	db 11, EKANS
 
@@ -8738,7 +7044,6 @@ GruntFGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, ARBOK
 
 	db -1 ; end
@@ -8749,7 +7054,6 @@ GruntFGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, GLOOM
 	db 25, GLOOM
 
@@ -8761,7 +7065,6 @@ GruntFGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 21, EKANS
 	db 23, ODDISH
 	db 21, EKANS
@@ -8775,19 +7078,11 @@ GruntFGroup:
 	db "GRUNT@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 18, EKANS
-		db WRAP
-		db LEER
-		db POISON_STING
-		db BITE
+	db WRAP, LEER, POISON_STING, BITE
 
 	db 18, GLOOM
-		db ABSORB
-		db SWEET_SCENT
-		db STUN_SPORE
-		db SLEEP_POWDER
+	db ABSORB, SWEET_SCENT, STUN_SPORE, SLEEP_POWDER
 
 	db -1 ; end
 
@@ -8803,25 +7098,14 @@ MysticalmanGroup:
 	db "EUSINE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 23, DROWZEE
-		db DREAM_EATER
-		db HYPNOSIS
-		db DISABLE
-		db CONFUSION
+	db DREAM_EATER, HYPNOSIS, DISABLE, CONFUSION
 
 	db 23, HAUNTER
-		db LICK
-		db HYPNOSIS
-		db MEAN_LOOK
-		db CURSE
+	db LICK, HYPNOSIS, MEAN_LOOK, CURSE
 
 	db 25, ELECTRODE
-		db SCREECH
-		db SONICBOOM
-		db THUNDER
-		db ROLLOUT
+	db SCREECH, SONICBOOM, THUNDER, ROLLOUT
 
 	db -1 ; end
 

From 96ae7a7ee37571db441fe4a5ada1a6b56e876d6a Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Wed, 31 Jan 2018 00:37:03 -0500
Subject: [PATCH 073/135] More compact trainer data

---
 data/trainers/parties.asm | 5202 +++++++------------------------------
 1 file changed, 893 insertions(+), 4309 deletions(-)

diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index c4a2f4a8c..e21a7407d 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -1,5 +1,4 @@
 Trainers:
-
 ; All trainers follow a basic structure:
 	; Name
 		; String in format "TEXT@"
@@ -8,7106 +7,3691 @@ Trainers:
 		; TRAINERTYPE_MOVES:      level, species, moves
 		; TRAINERTYPE_ITEM:       level, species, item
 		; TRAINERTYPE_ITEM_MOVES: level, species, item, moves
-		; Up to six monsters following the data type
-	; $ff
+	; Up to six Pokémon following the data type
+	; -1 ; end
 
 
 FalknerGroup:
 ; ================================
-; ================
-
 	; FALKNER (1)
-	db "FALKNER@"
-	db TRAINERTYPE_MOVES
-
-	db 7, PIDGEY
-	db TACKLE, MUD_SLAP, NO_MOVE, NO_MOVE
-
-	db 9, PIDGEOTTO
-	db TACKLE, MUD_SLAP, GUST, NO_MOVE
-
+	db "FALKNER@", TRAINERTYPE_MOVES
+	db 7, PIDGEY, TACKLE, MUD_SLAP, NO_MOVE, NO_MOVE
+	db 9, PIDGEOTTO, TACKLE, MUD_SLAP, GUST, NO_MOVE
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 WhitneyGroup:
 ; ================================
-; ================
-
 	; WHITNEY (1)
-	db "WHITNEY@"
-	db TRAINERTYPE_MOVES
-
-	db 18, CLEFAIRY
-	db DOUBLESLAP, MIMIC, ENCORE, METRONOME
-
-	db 20, MILTANK
-	db ROLLOUT, ATTRACT, STOMP, MILK_DRINK
-
+	db "WHITNEY@", TRAINERTYPE_MOVES
+	db 18, CLEFAIRY, DOUBLESLAP, MIMIC, ENCORE, METRONOME
+	db 20, MILTANK, ROLLOUT, ATTRACT, STOMP, MILK_DRINK
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 BugsyGroup:
 ; ================================
-; ================
-
 	; BUGSY (1)
-	db "BUGSY@"
-	db TRAINERTYPE_MOVES
-
-	db 14, METAPOD
-	db TACKLE, STRING_SHOT, HARDEN, NO_MOVE
-
-	db 14, KAKUNA
-	db POISON_STING, STRING_SHOT, HARDEN, NO_MOVE
-
-	db 16, SCYTHER
-	db QUICK_ATTACK, LEER, FURY_CUTTER, NO_MOVE
-
+	db "BUGSY@", TRAINERTYPE_MOVES
+	db 14, METAPOD, TACKLE, STRING_SHOT, HARDEN, NO_MOVE
+	db 14, KAKUNA, POISON_STING, STRING_SHOT, HARDEN, NO_MOVE
+	db 16, SCYTHER, QUICK_ATTACK, LEER, FURY_CUTTER, NO_MOVE
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 MortyGroup:
 ; ================================
-; ================
-
 	; MORTY (1)
-	db "MORTY@"
-	db TRAINERTYPE_MOVES
-
-	db 21, GASTLY
-	db LICK, SPITE, MEAN_LOOK, CURSE
-
-	db 21, HAUNTER
-	db HYPNOSIS, MIMIC, CURSE, NIGHT_SHADE
-
-	db 25, GENGAR
-	db HYPNOSIS, SHADOW_BALL, MEAN_LOOK, DREAM_EATER
-
-	db 23, HAUNTER
-	db SPITE, MEAN_LOOK, MIMIC, NIGHT_SHADE
-
+	db "MORTY@", TRAINERTYPE_MOVES
+	db 21, GASTLY, LICK, SPITE, MEAN_LOOK, CURSE
+	db 21, HAUNTER, HYPNOSIS, MIMIC, CURSE, NIGHT_SHADE
+	db 25, GENGAR, HYPNOSIS, SHADOW_BALL, MEAN_LOOK, DREAM_EATER
+	db 23, HAUNTER, SPITE, MEAN_LOOK, MIMIC, NIGHT_SHADE
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 PryceGroup:
 ; ================================
-; ================
-
 	; PRYCE (1)
-	db "PRYCE@"
-	db TRAINERTYPE_MOVES
-
-	db 27, SEEL
-	db HEADBUTT, ICY_WIND, AURORA_BEAM, REST
-
-	db 29, DEWGONG
-	db HEADBUTT, ICY_WIND, AURORA_BEAM, REST
-
-	db 31, PILOSWINE
-	db ICY_WIND, FURY_ATTACK, MIST, BLIZZARD
-
+	db "PRYCE@", TRAINERTYPE_MOVES
+	db 27, SEEL, HEADBUTT, ICY_WIND, AURORA_BEAM, REST
+	db 29, DEWGONG, HEADBUTT, ICY_WIND, AURORA_BEAM, REST
+	db 31, PILOSWINE, ICY_WIND, FURY_ATTACK, MIST, BLIZZARD
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 JasmineGroup:
 ; ================================
-; ================
-
 	; JASMINE (1)
-	db "JASMINE@"
-	db TRAINERTYPE_MOVES
-
-	db 30, MAGNEMITE
-	db THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE
-
-	db 30, MAGNEMITE
-	db THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE
-
-	db 35, STEELIX
-	db SCREECH, SUNNY_DAY, ROCK_THROW, IRON_TAIL
-
+	db "JASMINE@", TRAINERTYPE_MOVES
+	db 30, MAGNEMITE, THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE
+	db 30, MAGNEMITE, THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE
+	db 35, STEELIX, SCREECH, SUNNY_DAY, ROCK_THROW, IRON_TAIL
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 ChuckGroup:
 ; ================================
-; ================
-
 	; CHUCK (1)
-	db "CHUCK@"
-	db TRAINERTYPE_MOVES
-
-	db 27, PRIMEAPE
-	db LEER, RAGE, KARATE_CHOP, FURY_SWIPES
-
-	db 30, POLIWRATH
-	db HYPNOSIS, MIND_READER, SURF, DYNAMICPUNCH
-
+	db "CHUCK@", TRAINERTYPE_MOVES
+	db 27, PRIMEAPE, LEER, RAGE, KARATE_CHOP, FURY_SWIPES
+	db 30, POLIWRATH, HYPNOSIS, MIND_READER, SURF, DYNAMICPUNCH
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 ClairGroup:
 ; ================================
-; ================
-
 	; CLAIR (1)
-	db "CLAIR@"
-	db TRAINERTYPE_MOVES
-
-	db 37, DRAGONAIR
-	db THUNDER_WAVE, SURF, SLAM, DRAGONBREATH
-
-	db 37, DRAGONAIR
-	db THUNDER_WAVE, THUNDERBOLT, SLAM, DRAGONBREATH
-
-	db 37, DRAGONAIR
-	db THUNDER_WAVE, ICE_BEAM, SLAM, DRAGONBREATH
-
-	db 40, KINGDRA
-	db SMOKESCREEN, SURF, HYPER_BEAM, DRAGONBREATH
-
+	db "CLAIR@", TRAINERTYPE_MOVES
+	db 37, DRAGONAIR, THUNDER_WAVE, SURF, SLAM, DRAGONBREATH
+	db 37, DRAGONAIR, THUNDER_WAVE, THUNDERBOLT, SLAM, DRAGONBREATH
+	db 37, DRAGONAIR, THUNDER_WAVE, ICE_BEAM, SLAM, DRAGONBREATH
+	db 40, KINGDRA, SMOKESCREEN, SURF, HYPER_BEAM, DRAGONBREATH
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 Rival1Group:
 ; ================================
-; ================
-
 	; RIVAL1 (1)
-	db "?@"
-	db TRAINERTYPE_NORMAL
-
+	db "?@", TRAINERTYPE_NORMAL
 	db 5, CHIKORITA
-
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (2)
-	db "?@"
-	db TRAINERTYPE_NORMAL
-
+	db "?@", TRAINERTYPE_NORMAL
 	db 5, CYNDAQUIL
-
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (3)
-	db "?@"
-	db TRAINERTYPE_NORMAL
-
+	db "?@", TRAINERTYPE_NORMAL
 	db 5, TOTODILE
-
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (4)
-	db "?@"
-	db TRAINERTYPE_NORMAL
-
+	db "?@", TRAINERTYPE_NORMAL
 	db 12, GASTLY
 	db 14, ZUBAT
 	db 16, BAYLEEF
-
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (5)
-	db "?@"
-	db TRAINERTYPE_NORMAL
-
+	db "?@", TRAINERTYPE_NORMAL
 	db 12, GASTLY
 	db 14, ZUBAT
 	db 16, QUILAVA
-
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (6)
-	db "?@"
-	db TRAINERTYPE_NORMAL
-
+	db "?@", TRAINERTYPE_NORMAL
 	db 12, GASTLY
 	db 14, ZUBAT
 	db 16, CROCONAW
-
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (7)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	db 20, HAUNTER
-	db LICK, SPITE, MEAN_LOOK, CURSE
-
-	db 18, MAGNEMITE
-	db TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
-
-	db 20, ZUBAT
-	db LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
-
-	db 22, BAYLEEF
-	db GROWL, REFLECT, RAZOR_LEAF, POISONPOWDER
-
+	db "?@", TRAINERTYPE_MOVES
+	db 20, HAUNTER, LICK, SPITE, MEAN_LOOK, CURSE
+	db 18, MAGNEMITE, TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
+	db 20, ZUBAT, LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
+	db 22, BAYLEEF, GROWL, REFLECT, RAZOR_LEAF, POISONPOWDER
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (8)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	db 20, HAUNTER
-	db LICK, SPITE, MEAN_LOOK, CURSE
-
-	db 18, MAGNEMITE
-	db TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
-
-	db 20, ZUBAT
-	db LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
-
-	db 22, QUILAVA
-	db LEER, SMOKESCREEN, EMBER, QUICK_ATTACK
-
+	db "?@", TRAINERTYPE_MOVES
+	db 20, HAUNTER, LICK, SPITE, MEAN_LOOK, CURSE
+	db 18, MAGNEMITE, TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
+	db 20, ZUBAT, LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
+	db 22, QUILAVA, LEER, SMOKESCREEN, EMBER, QUICK_ATTACK
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (9)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	db 20, HAUNTER
-	db LICK, SPITE, MEAN_LOOK, CURSE
-
-	db 18, MAGNEMITE
-	db TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
-
-	db 20, ZUBAT
-	db LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
-
-	db 22, CROCONAW
-	db LEER, RAGE, WATER_GUN, BITE
-
+	db "?@", TRAINERTYPE_MOVES
+	db 20, HAUNTER, LICK, SPITE, MEAN_LOOK, CURSE
+	db 18, MAGNEMITE, TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
+	db 20, ZUBAT, LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
+	db 22, CROCONAW, LEER, RAGE, WATER_GUN, BITE
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (10)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	db 30, GOLBAT
-	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
-
-	db 28, MAGNEMITE
-	db TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
-
-	db 30, HAUNTER
-	db LICK, MEAN_LOOK, CURSE, SHADOW_BALL
-
-	db 32, SNEASEL
-	db LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
-
-	db 32, MEGANIUM
-	db REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM
-
+	db "?@", TRAINERTYPE_MOVES
+	db 30, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 28, MAGNEMITE, TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
+	db 30, HAUNTER, LICK, MEAN_LOOK, CURSE, SHADOW_BALL
+	db 32, SNEASEL, LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
+	db 32, MEGANIUM, REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (11)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	db 30, GOLBAT
-	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
-
-	db 28, MAGNEMITE
-	db TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
-
-	db 30, HAUNTER
-	db LICK, MEAN_LOOK, CURSE, SHADOW_BALL
-
-	db 32, SNEASEL
-	db LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
-
-	db 32, QUILAVA
-	db SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL
-
+	db "?@", TRAINERTYPE_MOVES
+	db 30, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 28, MAGNEMITE, TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
+	db 30, HAUNTER, LICK, MEAN_LOOK, CURSE, SHADOW_BALL
+	db 32, SNEASEL, LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
+	db 32, QUILAVA, SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (12)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	db 30, GOLBAT
-	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
-
-	db 28, MAGNEMITE
-	db TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
-
-	db 30, HAUNTER
-	db LICK, MEAN_LOOK, CURSE, SHADOW_BALL
-
-	db 32, SNEASEL
-	db LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
-
-	db 32, FERALIGATR
-	db RAGE, WATER_GUN, BITE, SCARY_FACE
-
+	db "?@", TRAINERTYPE_MOVES
+	db 30, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 28, MAGNEMITE, TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
+	db 30, HAUNTER, LICK, MEAN_LOOK, CURSE, SHADOW_BALL
+	db 32, SNEASEL, LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
+	db 32, FERALIGATR, RAGE, WATER_GUN, BITE, SCARY_FACE
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (13)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	db 34, SNEASEL
-	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
-
-	db 36, GOLBAT
-	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
-
-	db 35, MAGNETON
-	db THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
-
-	db 35, HAUNTER
-	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
-
-	db 35, KADABRA
-	db DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
-
-	db 38, MEGANIUM
-	db REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM
-
+	db "?@", TRAINERTYPE_MOVES
+	db 34, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 36, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 35, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 35, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 35, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
+	db 38, MEGANIUM, REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (14)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	db 34, SNEASEL
-	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
-
-	db 36, GOLBAT
-	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
-
-	db 35, MAGNETON
-	db THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
-
-	db 35, HAUNTER
-	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
-
-	db 35, KADABRA
-	db DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
-
-	db 38, TYPHLOSION
-	db SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL
-
+	db "?@", TRAINERTYPE_MOVES
+	db 34, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 36, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 35, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 35, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 35, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
+	db 38, TYPHLOSION, SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (15)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	db 34, SNEASEL
-	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
-
-	db 36, GOLBAT
-	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
-
-	db 34, MAGNETON
-	db THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
-
-	db 35, HAUNTER
-	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
-
-	db 35, KADABRA
-	db DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
-
-	db 38, FERALIGATR
-	db RAGE, WATER_GUN, SCARY_FACE, SLASH
-
+	db "?@", TRAINERTYPE_MOVES
+	db 34, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 36, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 34, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 35, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 35, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
+	db 38, FERALIGATR, RAGE, WATER_GUN, SCARY_FACE, SLASH
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 PokemonProfGroup:
 ; ================================
-; ================
-; ================================
 
 
 WillGroup:
 ; ================================
-; ================
-
 	; WILL (1)
-	db "WILL@"
-	db TRAINERTYPE_MOVES
-
-	db 40, XATU
-	db QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
-
-	db 41, JYNX
-	db DOUBLESLAP, LOVELY_KISS, ICE_PUNCH, PSYCHIC_M
-
-	db 41, EXEGGUTOR
-	db REFLECT, LEECH_SEED, EGG_BOMB, PSYCHIC_M
-
-	db 41, SLOWBRO
-	db CURSE, AMNESIA, BODY_SLAM, PSYCHIC_M
-
-	db 42, XATU
-	db QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
-
+	db "WILL@", TRAINERTYPE_MOVES
+	db 40, XATU, QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
+	db 41, JYNX, DOUBLESLAP, LOVELY_KISS, ICE_PUNCH, PSYCHIC_M
+	db 41, EXEGGUTOR, REFLECT, LEECH_SEED, EGG_BOMB, PSYCHIC_M
+	db 41, SLOWBRO, CURSE, AMNESIA, BODY_SLAM, PSYCHIC_M
+	db 42, XATU, QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 PKMNTrainerGroup:
 ; ================================
-; ================
-
 	; CAL (1)
-	db "CAL@"
-	db TRAINERTYPE_NORMAL
-
+	db "CAL@", TRAINERTYPE_NORMAL
 	db 10, CHIKORITA
 	db 10, CYNDAQUIL
 	db 10, TOTODILE
-
 	db -1 ; end
 
-; ================
-
 	; CAL (2)
-	db "CAL@"
-	db TRAINERTYPE_NORMAL
-
+	db "CAL@", TRAINERTYPE_NORMAL
 	db 30, BAYLEEF
 	db 30, QUILAVA
 	db 30, CROCONAW
-
 	db -1 ; end
 
-; ================
-
 	; CAL (3)
-	db "CAL@"
-	db TRAINERTYPE_NORMAL
-
+	db "CAL@", TRAINERTYPE_NORMAL
 	db 50, MEGANIUM
 	db 50, TYPHLOSION
 	db 50, FERALIGATR
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 BrunoGroup:
 ; ================================
-; ================
-
 	; BRUNO (1)
-	db "BRUNO@"
-	db TRAINERTYPE_MOVES
-
-	db 42, HITMONTOP
-	db PURSUIT, QUICK_ATTACK, DIG, DETECT
-
-	db 42, HITMONLEE
-	db SWAGGER, DOUBLE_KICK, HI_JUMP_KICK, FORESIGHT
-
-	db 42, HITMONCHAN
-	db THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH, MACH_PUNCH
-
-	db 43, ONIX
-	db BIND, EARTHQUAKE, SANDSTORM, ROCK_SLIDE
-
-	db 46, MACHAMP
-	db ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP
-
+	db "BRUNO@", TRAINERTYPE_MOVES
+	db 42, HITMONTOP, PURSUIT, QUICK_ATTACK, DIG, DETECT
+	db 42, HITMONLEE, SWAGGER, DOUBLE_KICK, HI_JUMP_KICK, FORESIGHT
+	db 42, HITMONCHAN, THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH, MACH_PUNCH
+	db 43, ONIX, BIND, EARTHQUAKE, SANDSTORM, ROCK_SLIDE
+	db 46, MACHAMP, ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 KarenGroup:
 ; ================================
-; ================
-
 	; KAREN (1)
-	db "KAREN@"
-	db TRAINERTYPE_MOVES
-
-	db 42, UMBREON
-	db SAND_ATTACK, CONFUSE_RAY, FAINT_ATTACK, MEAN_LOOK
-
-	db 42, VILEPLUME
-	db STUN_SPORE, ACID, MOONLIGHT, PETAL_DANCE
-
-	db 45, GENGAR
-	db LICK, SPITE, CURSE, DESTINY_BOND
-
-	db 44, MURKROW
-	db QUICK_ATTACK, WHIRLWIND, PURSUIT, FAINT_ATTACK
-
-	db 47, HOUNDOOM
-	db ROAR, PURSUIT, FLAMETHROWER, CRUNCH
-
+	db "KAREN@", TRAINERTYPE_MOVES
+	db 42, UMBREON, SAND_ATTACK, CONFUSE_RAY, FAINT_ATTACK, MEAN_LOOK
+	db 42, VILEPLUME, STUN_SPORE, ACID, MOONLIGHT, PETAL_DANCE
+	db 45, GENGAR, LICK, SPITE, CURSE, DESTINY_BOND
+	db 44, MURKROW, QUICK_ATTACK, WHIRLWIND, PURSUIT, FAINT_ATTACK
+	db 47, HOUNDOOM, ROAR, PURSUIT, FLAMETHROWER, CRUNCH
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 KogaGroup:
 ; ================================
-; ================
-
 	; KOGA (1)
-	db "KOGA@"
-	db TRAINERTYPE_MOVES
-
-	db 40, ARIADOS
-	db DOUBLE_TEAM, SPIDER_WEB, BATON_PASS, GIGA_DRAIN
-
-	db 41, VENOMOTH
-	db SUPERSONIC, GUST, PSYCHIC_M, TOXIC
-
-	db 43, FORRETRESS
-	db PROTECT, SWIFT, EXPLOSION, SPIKES
-
-	db 42, MUK
-	db MINIMIZE, ACID_ARMOR, SLUDGE_BOMB, TOXIC
-
-	db 44, CROBAT
-	db DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC
-
+	db "KOGA@", TRAINERTYPE_MOVES
+	db 40, ARIADOS, DOUBLE_TEAM, SPIDER_WEB, BATON_PASS, GIGA_DRAIN
+	db 41, VENOMOTH, SUPERSONIC, GUST, PSYCHIC_M, TOXIC
+	db 43, FORRETRESS, PROTECT, SWIFT, EXPLOSION, SPIKES
+	db 42, MUK, MINIMIZE, ACID_ARMOR, SLUDGE_BOMB, TOXIC
+	db 44, CROBAT, DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 ChampionGroup:
 ; ================================
-; ================
-
 	; CHAMPION (1)
-	db "LANCE@"
-	db TRAINERTYPE_MOVES
-
-	db 44, GYARADOS
-	db FLAIL, RAIN_DANCE, SURF, HYPER_BEAM
-
-	db 47, DRAGONITE
-	db THUNDER_WAVE, TWISTER, THUNDER, HYPER_BEAM
-
-	db 47, DRAGONITE
-	db THUNDER_WAVE, TWISTER, BLIZZARD, HYPER_BEAM
-
-	db 46, AERODACTYL
-	db WING_ATTACK, ANCIENTPOWER, ROCK_SLIDE, HYPER_BEAM
-
-	db 46, CHARIZARD
-	db FLAMETHROWER, WING_ATTACK, SLASH, HYPER_BEAM
-
-	db 50, DRAGONITE
-	db FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM
-
+	db "LANCE@", TRAINERTYPE_MOVES
+	db 44, GYARADOS, FLAIL, RAIN_DANCE, SURF, HYPER_BEAM
+	db 47, DRAGONITE, THUNDER_WAVE, TWISTER, THUNDER, HYPER_BEAM
+	db 47, DRAGONITE, THUNDER_WAVE, TWISTER, BLIZZARD, HYPER_BEAM
+	db 46, AERODACTYL, WING_ATTACK, ANCIENTPOWER, ROCK_SLIDE, HYPER_BEAM
+	db 46, CHARIZARD, FLAMETHROWER, WING_ATTACK, SLASH, HYPER_BEAM
+	db 50, DRAGONITE, FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 BrockGroup:
 ; ================================
-; ================
-
 	; BROCK (1)
-	db "BROCK@"
-	db TRAINERTYPE_MOVES
-
-	db 41, GRAVELER
-	db DEFENSE_CURL, ROCK_SLIDE, ROLLOUT, EARTHQUAKE
-
-	db 41, RHYHORN
-	db FURY_ATTACK, SCARY_FACE, EARTHQUAKE, HORN_DRILL
-
-	db 42, OMASTAR
-	db BITE, SURF, PROTECT, SPIKE_CANNON
-
-	db 44, ONIX
-	db BIND, ROCK_SLIDE, BIDE, SANDSTORM
-
-	db 42, KABUTOPS
-	db SLASH, SURF, ENDURE, GIGA_DRAIN
-
+	db "BROCK@", TRAINERTYPE_MOVES
+	db 41, GRAVELER, DEFENSE_CURL, ROCK_SLIDE, ROLLOUT, EARTHQUAKE
+	db 41, RHYHORN, FURY_ATTACK, SCARY_FACE, EARTHQUAKE, HORN_DRILL
+	db 42, OMASTAR, BITE, SURF, PROTECT, SPIKE_CANNON
+	db 44, ONIX, BIND, ROCK_SLIDE, BIDE, SANDSTORM
+	db 42, KABUTOPS, SLASH, SURF, ENDURE, GIGA_DRAIN
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 MistyGroup:
 ; ================================
-; ================
-
 	; MISTY (1)
-	db "MISTY@"
-	db TRAINERTYPE_MOVES
-
-	db 42, GOLDUCK
-	db SURF, DISABLE, PSYCH_UP, PSYCHIC_M
-
-	db 42, QUAGSIRE
-	db SURF, AMNESIA, EARTHQUAKE, RAIN_DANCE
-
-	db 44, LAPRAS
-	db SURF, PERISH_SONG, BLIZZARD, RAIN_DANCE
-
-	db 47, STARMIE
-	db SURF, CONFUSE_RAY, RECOVER, ICE_BEAM
-
+	db "MISTY@", TRAINERTYPE_MOVES
+	db 42, GOLDUCK, SURF, DISABLE, PSYCH_UP, PSYCHIC_M
+	db 42, QUAGSIRE, SURF, AMNESIA, EARTHQUAKE, RAIN_DANCE
+	db 44, LAPRAS, SURF, PERISH_SONG, BLIZZARD, RAIN_DANCE
+	db 47, STARMIE, SURF, CONFUSE_RAY, RECOVER, ICE_BEAM
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 LtSurgeGroup:
 ; ================================
-; ================
-
 	; LT_SURGE (1)
-	db "LT.SURGE@"
-	db TRAINERTYPE_MOVES
-
-	db 44, RAICHU
-	db THUNDER_WAVE, QUICK_ATTACK, THUNDERBOLT, THUNDER
-
-	db 40, ELECTRODE
-	db SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION
-
-	db 40, MAGNETON
-	db LOCK_ON, DOUBLE_TEAM, SWIFT, ZAP_CANNON
-
-	db 40, ELECTRODE
-	db SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION
-
-	db 46, ELECTABUZZ
-	db QUICK_ATTACK, THUNDERPUNCH, LIGHT_SCREEN, THUNDER
-
+	db "LT.SURGE@", TRAINERTYPE_MOVES
+	db 44, RAICHU, THUNDER_WAVE, QUICK_ATTACK, THUNDERBOLT, THUNDER
+	db 40, ELECTRODE, SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION
+	db 40, MAGNETON, LOCK_ON, DOUBLE_TEAM, SWIFT, ZAP_CANNON
+	db 40, ELECTRODE, SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION
+	db 46, ELECTABUZZ, QUICK_ATTACK, THUNDERPUNCH, LIGHT_SCREEN, THUNDER
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 ScientistGroup:
 ; ================================
-; ================
-
 	; SCIENTIST (1)
-	db "ROSS@"
-	db TRAINERTYPE_NORMAL
-
+	db "ROSS@", TRAINERTYPE_NORMAL
 	db 22, KOFFING
 	db 22, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; SCIENTIST (2)
-	db "MITCH@"
-	db TRAINERTYPE_NORMAL
-
+	db "MITCH@", TRAINERTYPE_NORMAL
 	db 24, DITTO
-
 	db -1 ; end
 
-; ================
-
 	; SCIENTIST (3)
-	db "JED@"
-	db TRAINERTYPE_NORMAL
-
+	db "JED@", TRAINERTYPE_NORMAL
 	db 20, MAGNEMITE
 	db 20, MAGNEMITE
 	db 20, MAGNEMITE
-
 	db -1 ; end
 
-; ================
-
 	; SCIENTIST (4)
-	db "MARC@"
-	db TRAINERTYPE_NORMAL
-
+	db "MARC@", TRAINERTYPE_NORMAL
 	db 27, MAGNEMITE
 	db 27, MAGNEMITE
 	db 27, MAGNEMITE
-
 	db -1 ; end
 
-; ================
-
 	; SCIENTIST (5)
-	db "RICH@"
-	db TRAINERTYPE_MOVES
-
-	db 30, PORYGON
-	db CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK
-
+	db "RICH@", TRAINERTYPE_MOVES
+	db 30, PORYGON, CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 ErikaGroup:
 ; ================================
-; ================
-
 	; ERIKA (1)
-	db "ERIKA@"
-	db TRAINERTYPE_MOVES
-
-	db 42, TANGELA
-	db VINE_WHIP, BIND, GIGA_DRAIN, SLEEP_POWDER
-
-	db 41, JUMPLUFF
-	db MEGA_DRAIN, LEECH_SEED, COTTON_SPORE, GIGA_DRAIN
-
-	db 46, VICTREEBEL
-	db SUNNY_DAY, SYNTHESIS, ACID, RAZOR_LEAF
-
-	db 46, BELLOSSOM
-	db SUNNY_DAY, SYNTHESIS, PETAL_DANCE, SOLARBEAM
-
+	db "ERIKA@", TRAINERTYPE_MOVES
+	db 42, TANGELA, VINE_WHIP, BIND, GIGA_DRAIN, SLEEP_POWDER
+	db 41, JUMPLUFF, MEGA_DRAIN, LEECH_SEED, COTTON_SPORE, GIGA_DRAIN
+	db 46, VICTREEBEL, SUNNY_DAY, SYNTHESIS, ACID, RAZOR_LEAF
+	db 46, BELLOSSOM, SUNNY_DAY, SYNTHESIS, PETAL_DANCE, SOLARBEAM
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 YoungsterGroup:
 ; ================================
-; ================
-
 	; YOUNGSTER (1)
-	db "JOEY@"
-	db TRAINERTYPE_NORMAL
-
+	db "JOEY@", TRAINERTYPE_NORMAL
 	db 4, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (2)
-	db "MIKEY@"
-	db TRAINERTYPE_NORMAL
-
+	db "MIKEY@", TRAINERTYPE_NORMAL
 	db 2, PIDGEY
 	db 4, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (3)
-	db "ALBERT@"
-	db TRAINERTYPE_NORMAL
-
+	db "ALBERT@", TRAINERTYPE_NORMAL
 	db 6, RATTATA
 	db 8, ZUBAT
-
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (4)
-	db "GORDON@"
-	db TRAINERTYPE_NORMAL
-
+	db "GORDON@", TRAINERTYPE_NORMAL
 	db 10, WOOPER
-
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (5)
-	db "SAMUEL@"
-	db TRAINERTYPE_NORMAL
-
+	db "SAMUEL@", TRAINERTYPE_NORMAL
 	db 7, RATTATA
 	db 10, SANDSHREW
 	db 8, SPEAROW
 	db 8, SPEAROW
-
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (6)
-	db "IAN@"
-	db TRAINERTYPE_NORMAL
-
+	db "IAN@", TRAINERTYPE_NORMAL
 	db 10, MANKEY
 	db 12, DIGLETT
-
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (7)
-	db "JOEY@"
-	db TRAINERTYPE_NORMAL
-
+	db "JOEY@", TRAINERTYPE_NORMAL
 	db 15, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (8)
-	db "JOEY@"
-	db TRAINERTYPE_MOVES
-
-	db 21, RATICATE
-	db TAIL_WHIP, QUICK_ATTACK, HYPER_FANG, SCARY_FACE
-
+	db "JOEY@", TRAINERTYPE_MOVES
+	db 21, RATICATE, TAIL_WHIP, QUICK_ATTACK, HYPER_FANG, SCARY_FACE
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (9)
-	db "WARREN@"
-	db TRAINERTYPE_NORMAL
-
+	db "WARREN@", TRAINERTYPE_NORMAL
 	db 35, FEAROW
-
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (10)
-	db "JIMMY@"
-	db TRAINERTYPE_NORMAL
-
+	db "JIMMY@", TRAINERTYPE_NORMAL
 	db 33, RATICATE
 	db 33, ARBOK
-
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (11)
-	db "OWEN@"
-	db TRAINERTYPE_NORMAL
-
+	db "OWEN@", TRAINERTYPE_NORMAL
 	db 35, GROWLITHE
-
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (12)
-	db "JASON@"
-	db TRAINERTYPE_NORMAL
-
+	db "JASON@", TRAINERTYPE_NORMAL
 	db 33, SANDSLASH
 	db 33, CROBAT
-
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (13)
-	db "JOEY@"
-	db TRAINERTYPE_MOVES
-
-	db 30, RATICATE
-	db TAIL_WHIP, QUICK_ATTACK, HYPER_FANG, PURSUIT
-
+	db "JOEY@", TRAINERTYPE_MOVES
+	db 30, RATICATE, TAIL_WHIP, QUICK_ATTACK, HYPER_FANG, PURSUIT
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (14)
-	db "JOEY@"
-	db TRAINERTYPE_MOVES
-
-	db 37, RATICATE
-	db HYPER_BEAM, QUICK_ATTACK, HYPER_FANG, PURSUIT
-
+	db "JOEY@", TRAINERTYPE_MOVES
+	db 37, RATICATE, HYPER_BEAM, QUICK_ATTACK, HYPER_FANG, PURSUIT
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 SchoolboyGroup:
 ; ================================
-; ================
-
 	; SCHOOLBOY (1)
-	db "JACK@"
-	db TRAINERTYPE_NORMAL
-
+	db "JACK@", TRAINERTYPE_NORMAL
 	db 12, ODDISH
 	db 15, VOLTORB
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (2)
-	db "KIPP@"
-	db TRAINERTYPE_NORMAL
-
+	db "KIPP@", TRAINERTYPE_NORMAL
 	db 27, VOLTORB
 	db 27, MAGNEMITE
 	db 31, VOLTORB
 	db 31, MAGNETON
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (3)
-	db "ALAN@"
-	db TRAINERTYPE_NORMAL
-
+	db "ALAN@", TRAINERTYPE_NORMAL
 	db 16, TANGELA
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (4)
-	db "JOHNNY@"
-	db TRAINERTYPE_NORMAL
-
+	db "JOHNNY@", TRAINERTYPE_NORMAL
 	db 29, BELLSPROUT
 	db 31, WEEPINBELL
 	db 33, VICTREEBEL
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (5)
-	db "DANNY@"
-	db TRAINERTYPE_NORMAL
-
+	db "DANNY@", TRAINERTYPE_NORMAL
 	db 31, JYNX
 	db 31, ELECTABUZZ
 	db 31, MAGMAR
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (6)
-	db "TOMMY@"
-	db TRAINERTYPE_NORMAL
-
+	db "TOMMY@", TRAINERTYPE_NORMAL
 	db 32, XATU
 	db 34, ALAKAZAM
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (7)
-	db "DUDLEY@"
-	db TRAINERTYPE_NORMAL
-
+	db "DUDLEY@", TRAINERTYPE_NORMAL
 	db 35, ODDISH
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (8)
-	db "JOE@"
-	db TRAINERTYPE_NORMAL
-
+	db "JOE@", TRAINERTYPE_NORMAL
 	db 33, TANGELA
 	db 33, VAPOREON
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (9)
-	db "BILLY@"
-	db TRAINERTYPE_NORMAL
-
+	db "BILLY@", TRAINERTYPE_NORMAL
 	db 27, PARAS
 	db 27, PARAS
 	db 27, POLIWHIRL
 	db 35, DITTO
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (10)
-	db "CHAD@"
-	db TRAINERTYPE_NORMAL
-
+	db "CHAD@", TRAINERTYPE_NORMAL
 	db 19, MR__MIME
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (11)
-	db "NATE@"
-	db TRAINERTYPE_NORMAL
-
+	db "NATE@", TRAINERTYPE_NORMAL
 	db 32, LEDIAN
 	db 32, EXEGGUTOR
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (12)
-	db "RICKY@"
-	db TRAINERTYPE_NORMAL
-
+	db "RICKY@", TRAINERTYPE_NORMAL
 	db 32, AIPOM
 	db 32, DITTO
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (13)
-	db "JACK@"
-	db TRAINERTYPE_NORMAL
-
+	db "JACK@", TRAINERTYPE_NORMAL
 	db 14, ODDISH
 	db 17, VOLTORB
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (14)
-	db "JACK@"
-	db TRAINERTYPE_NORMAL
-
+	db "JACK@", TRAINERTYPE_NORMAL
 	db 28, GLOOM
 	db 31, ELECTRODE
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (15)
-	db "ALAN@"
-	db TRAINERTYPE_NORMAL
-
+	db "ALAN@", TRAINERTYPE_NORMAL
 	db 17, TANGELA
 	db 17, YANMA
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (16)
-	db "ALAN@"
-	db TRAINERTYPE_NORMAL
-
+	db "ALAN@", TRAINERTYPE_NORMAL
 	db 20, NATU
 	db 22, TANGELA
 	db 20, QUAGSIRE
 	db 25, YANMA
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (17)
-	db "CHAD@"
-	db TRAINERTYPE_NORMAL
-
+	db "CHAD@", TRAINERTYPE_NORMAL
 	db 19, MR__MIME
 	db 19, MAGNEMITE
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (18)
-	db "CHAD@"
-	db TRAINERTYPE_NORMAL
-
+	db "CHAD@", TRAINERTYPE_NORMAL
 	db 27, MR__MIME
 	db 31, MAGNETON
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (19)
-	db "JACK@"
-	db TRAINERTYPE_NORMAL
-
+	db "JACK@", TRAINERTYPE_NORMAL
 	db 30, GLOOM
 	db 33, GROWLITHE
 	db 33, ELECTRODE
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (20)
-	db "JACK@"
-	db TRAINERTYPE_MOVES
-
-	db 35, ELECTRODE
-	db SCREECH, SONICBOOM, ROLLOUT, LIGHT_SCREEN
-
-	db 35, GROWLITHE
-	db SUNNY_DAY, LEER, TAKE_DOWN, FLAME_WHEEL
-
-	db 37, VILEPLUME
-	db SOLARBEAM, SLEEP_POWDER, ACID, MOONLIGHT
-
+	db "JACK@", TRAINERTYPE_MOVES
+	db 35, ELECTRODE, SCREECH, SONICBOOM, ROLLOUT, LIGHT_SCREEN
+	db 35, GROWLITHE, SUNNY_DAY, LEER, TAKE_DOWN, FLAME_WHEEL
+	db 37, VILEPLUME, SOLARBEAM, SLEEP_POWDER, ACID, MOONLIGHT
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (21)
-	db "ALAN@"
-	db TRAINERTYPE_NORMAL
-
+	db "ALAN@", TRAINERTYPE_NORMAL
 	db 27, NATU
 	db 27, TANGELA
 	db 30, QUAGSIRE
 	db 30, YANMA
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (22)
-	db "ALAN@"
-	db TRAINERTYPE_MOVES
-
-	db 35, XATU
-	db PECK, NIGHT_SHADE, SWIFT, FUTURE_SIGHT
-
-	db 32, TANGELA
-	db POISONPOWDER, VINE_WHIP, BIND, MEGA_DRAIN
-
-	db 32, YANMA
-	db QUICK_ATTACK, DOUBLE_TEAM, SONICBOOM, SUPERSONIC
-
-	db 35, QUAGSIRE
-	db TAIL_WHIP, SLAM, AMNESIA, EARTHQUAKE
-
+	db "ALAN@", TRAINERTYPE_MOVES
+	db 35, XATU, PECK, NIGHT_SHADE, SWIFT, FUTURE_SIGHT
+	db 32, TANGELA, POISONPOWDER, VINE_WHIP, BIND, MEGA_DRAIN
+	db 32, YANMA, QUICK_ATTACK, DOUBLE_TEAM, SONICBOOM, SUPERSONIC
+	db 35, QUAGSIRE, TAIL_WHIP, SLAM, AMNESIA, EARTHQUAKE
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (23)
-	db "CHAD@"
-	db TRAINERTYPE_NORMAL
-
+	db "CHAD@", TRAINERTYPE_NORMAL
 	db 30, MR__MIME
 	db 34, MAGNETON
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (24)
-	db "CHAD@"
-	db TRAINERTYPE_MOVES
-
-	db 34, MR__MIME
-	db PSYCHIC_M, LIGHT_SCREEN, REFLECT, ENCORE
-
-	db 38, MAGNETON
-	db ZAP_CANNON, THUNDER_WAVE, LOCK_ON, SWIFT
-
+	db "CHAD@", TRAINERTYPE_MOVES
+	db 34, MR__MIME, PSYCHIC_M, LIGHT_SCREEN, REFLECT, ENCORE
+	db 38, MAGNETON, ZAP_CANNON, THUNDER_WAVE, LOCK_ON, SWIFT
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 BirdKeeperGroup:
 ; ================================
-; ================
-
 	; BIRD_KEEPER (1)
-	db "ROD@"
-	db TRAINERTYPE_NORMAL
-
+	db "ROD@", TRAINERTYPE_NORMAL
 	db 7, PIDGEY
 	db 7, PIDGEY
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (2)
-	db "ABE@"
-	db TRAINERTYPE_NORMAL
-
+	db "ABE@", TRAINERTYPE_NORMAL
 	db 9, SPEAROW
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (3)
-	db "BRYAN@"
-	db TRAINERTYPE_NORMAL
-
+	db "BRYAN@", TRAINERTYPE_NORMAL
 	db 12, PIDGEY
 	db 14, PIDGEOTTO
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (4)
-	db "THEO@"
-	db TRAINERTYPE_NORMAL
-
+	db "THEO@", TRAINERTYPE_NORMAL
 	db 17, PIDGEY
 	db 15, PIDGEY
 	db 19, PIDGEY
 	db 15, PIDGEY
 	db 15, PIDGEY
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (5)
-	db "TOBY@"
-	db TRAINERTYPE_NORMAL
-
+	db "TOBY@", TRAINERTYPE_NORMAL
 	db 15, DODUO
 	db 16, DODUO
 	db 17, DODUO
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (6)
-	db "DENIS@"
-	db TRAINERTYPE_NORMAL
-
+	db "DENIS@", TRAINERTYPE_NORMAL
 	db 18, SPEAROW
 	db 20, FEAROW
 	db 18, SPEAROW
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (7)
-	db "VANCE@"
-	db TRAINERTYPE_NORMAL
-
+	db "VANCE@", TRAINERTYPE_NORMAL
 	db 25, PIDGEOTTO
 	db 25, PIDGEOTTO
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (8)
-	db "HANK@"
-	db TRAINERTYPE_NORMAL
-
+	db "HANK@", TRAINERTYPE_NORMAL
 	db 12, PIDGEY
 	db 34, PIDGEOT
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (9)
-	db "ROY@"
-	db TRAINERTYPE_NORMAL
-
+	db "ROY@", TRAINERTYPE_NORMAL
 	db 29, FEAROW
 	db 35, FEAROW
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (10)
-	db "BORIS@"
-	db TRAINERTYPE_NORMAL
-
+	db "BORIS@", TRAINERTYPE_NORMAL
 	db 30, DODUO
 	db 28, DODUO
 	db 32, DODRIO
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (11)
-	db "BOB@"
-	db TRAINERTYPE_NORMAL
-
+	db "BOB@", TRAINERTYPE_NORMAL
 	db 34, NOCTOWL
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (12)
-	db "JOSE@"
-	db TRAINERTYPE_NORMAL
-
+	db "JOSE@", TRAINERTYPE_NORMAL
 	db 36, FARFETCH_D
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (13)
-	db "PETER@"
-	db TRAINERTYPE_NORMAL
-
+	db "PETER@", TRAINERTYPE_NORMAL
 	db 6, PIDGEY
 	db 6, PIDGEY
 	db 8, SPEAROW
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (14)
-	db "JOSE@"
-	db TRAINERTYPE_NORMAL
-
+	db "JOSE@", TRAINERTYPE_NORMAL
 	db 34, FARFETCH_D
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (15)
-	db "PERRY@"
-	db TRAINERTYPE_NORMAL
-
+	db "PERRY@", TRAINERTYPE_NORMAL
 	db 34, FARFETCH_D
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (16)
-	db "BRET@"
-	db TRAINERTYPE_NORMAL
-
+	db "BRET@", TRAINERTYPE_NORMAL
 	db 32, PIDGEOTTO
 	db 32, FEAROW
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (17)
-	db "JOSE@"
-	db TRAINERTYPE_MOVES
-
-	db 40, FARFETCH_D
-	db FURY_ATTACK, DETECT, FLY, SLASH
-
+	db "JOSE@", TRAINERTYPE_MOVES
+	db 40, FARFETCH_D, FURY_ATTACK, DETECT, FLY, SLASH
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (18)
-	db "VANCE@"
-	db TRAINERTYPE_NORMAL
-
+	db "VANCE@", TRAINERTYPE_NORMAL
 	db 32, PIDGEOTTO
 	db 32, PIDGEOTTO
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (19)
-	db "VANCE@"
-	db TRAINERTYPE_MOVES
-
-	db 38, PIDGEOT
-	db TOXIC, QUICK_ATTACK, WHIRLWIND, FLY
-
-	db 38, PIDGEOT
-	db SWIFT, DETECT, STEEL_WING, FLY
-
+	db "VANCE@", TRAINERTYPE_MOVES
+	db 38, PIDGEOT, TOXIC, QUICK_ATTACK, WHIRLWIND, FLY
+	db 38, PIDGEOT, SWIFT, DETECT, STEEL_WING, FLY
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 LassGroup:
 ; ================================
-; ================
-
 	; LASS (1)
-	db "CARRIE@"
-	db TRAINERTYPE_MOVES
-
-	db 18, SNUBBULL
-	db SCARY_FACE, CHARM, BITE, LICK
-
+	db "CARRIE@", TRAINERTYPE_MOVES
+	db 18, SNUBBULL, SCARY_FACE, CHARM, BITE, LICK
 	db -1 ; end
 
-; ================
-
 	; LASS (2)
-	db "BRIDGET@"
-	db TRAINERTYPE_NORMAL
-
+	db "BRIDGET@", TRAINERTYPE_NORMAL
 	db 15, JIGGLYPUFF
 	db 15, JIGGLYPUFF
 	db 15, JIGGLYPUFF
-
 	db -1 ; end
 
-; ================
-
 	; LASS (3)
-	db "ALICE@"
-	db TRAINERTYPE_NORMAL
-
+	db "ALICE@", TRAINERTYPE_NORMAL
 	db 30, GLOOM
 	db 34, ARBOK
 	db 30, GLOOM
-
 	db -1 ; end
 
-; ================
-
 	; LASS (4)
-	db "KRISE@"
-	db TRAINERTYPE_NORMAL
-
+	db "KRISE@", TRAINERTYPE_NORMAL
 	db 12, ODDISH
 	db 15, CUBONE
-
 	db -1 ; end
 
-; ================
-
 	; LASS (5)
-	db "CONNIE@"
-	db TRAINERTYPE_NORMAL
-
+	db "CONNIE@", TRAINERTYPE_NORMAL
 	db 21, MARILL
-
 	db -1 ; end
 
-; ================
-
 	; LASS (6)
-	db "LINDA@"
-	db TRAINERTYPE_NORMAL
-
+	db "LINDA@", TRAINERTYPE_NORMAL
 	db 30, BULBASAUR
 	db 32, IVYSAUR
 	db 34, VENUSAUR
-
 	db -1 ; end
 
-; ================
-
 	; LASS (7)
-	db "LAURA@"
-	db TRAINERTYPE_NORMAL
-
+	db "LAURA@", TRAINERTYPE_NORMAL
 	db 28, GLOOM
 	db 31, PIDGEOTTO
 	db 31, BELLOSSOM
-
 	db -1 ; end
 
-; ================
-
 	; LASS (8)
-	db "SHANNON@"
-	db TRAINERTYPE_NORMAL
-
+	db "SHANNON@", TRAINERTYPE_NORMAL
 	db 29, PARAS
 	db 29, PARAS
 	db 32, PARASECT
-
 	db -1 ; end
 
-; ================
-
 	; LASS (9)
-	db "MICHELLE@"
-	db TRAINERTYPE_NORMAL
-
+	db "MICHELLE@", TRAINERTYPE_NORMAL
 	db 32, SKIPLOOM
 	db 33, HOPPIP
 	db 34, JUMPLUFF
-
 	db -1 ; end
 
-; ================
-
 	; LASS (10)
-	db "DANA@"
-	db TRAINERTYPE_MOVES
-
-	db 18, FLAAFFY
-	db TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE
-
-	db 18, PSYDUCK
-	db SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
-
+	db "DANA@", TRAINERTYPE_MOVES
+	db 18, FLAAFFY, TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE
+	db 18, PSYDUCK, SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
 	db -1 ; end
 
-; ================
-
 	; LASS (11)
-	db "ELLEN@"
-	db TRAINERTYPE_NORMAL
-
+	db "ELLEN@", TRAINERTYPE_NORMAL
 	db 30, WIGGLYTUFF
 	db 34, GRANBULL
-
 	db -1 ; end
 
-; ================
-
 	; LASS (12)
-	db "CONNIE@"
-	db TRAINERTYPE_NORMAL
-
+	db "CONNIE@", TRAINERTYPE_NORMAL
 	db 21, MARILL
-
 	db -1 ; end
 
-; ================
-
 	; LASS (13)
-	db "CONNIE@"
-	db TRAINERTYPE_NORMAL
-
+	db "CONNIE@", TRAINERTYPE_NORMAL
 	db 21, MARILL
-
 	db -1 ; end
 
-; ================
-
 	; LASS (14)
-	db "DANA@"
-	db TRAINERTYPE_MOVES
-
-	db 21, FLAAFFY
-	db TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE
-
-	db 21, PSYDUCK
-	db SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
-
+	db "DANA@", TRAINERTYPE_MOVES
+	db 21, FLAAFFY, TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE
+	db 21, PSYDUCK, SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
 	db -1 ; end
 
-; ================
-
 	; LASS (15)
-	db "DANA@"
-	db TRAINERTYPE_MOVES
-
-	db 29, PSYDUCK
-	db SCRATCH, DISABLE, CONFUSION, SCREECH
-
-	db 29, AMPHAROS
-	db TACKLE, THUNDERSHOCK, THUNDER_WAVE, COTTON_SPORE
-
+	db "DANA@", TRAINERTYPE_MOVES
+	db 29, PSYDUCK, SCRATCH, DISABLE, CONFUSION, SCREECH
+	db 29, AMPHAROS, TACKLE, THUNDERSHOCK, THUNDER_WAVE, COTTON_SPORE
 	db -1 ; end
 
-; ================
-
 	; LASS (16)
-	db "DANA@"
-	db TRAINERTYPE_MOVES
-
-	db 32, PSYDUCK
-	db SCRATCH, DISABLE, CONFUSION, SCREECH
-
-	db 32, AMPHAROS
-	db TACKLE, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE
-
+	db "DANA@", TRAINERTYPE_MOVES
+	db 32, PSYDUCK, SCRATCH, DISABLE, CONFUSION, SCREECH
+	db 32, AMPHAROS, TACKLE, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE
 	db -1 ; end
 
-; ================
-
 	; LASS (17)
-	db "DANA@"
-	db TRAINERTYPE_MOVES
-
-	db 36, AMPHAROS
-	db SWIFT, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE
-
-	db 36, GOLDUCK
-	db DISABLE, SURF, PSYCHIC_M, SCREECH
-
+	db "DANA@", TRAINERTYPE_MOVES
+	db 36, AMPHAROS, SWIFT, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE
+	db 36, GOLDUCK, DISABLE, SURF, PSYCHIC_M, SCREECH
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 JanineGroup:
 ; ================================
-; ================
-
 	; JANINE (1)
-	db "JANINE@"
-	db TRAINERTYPE_MOVES
-
-	db 36, CROBAT
-	db SCREECH, SUPERSONIC, CONFUSE_RAY, WING_ATTACK
-
-	db 36, WEEZING
-	db SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION
-
-	db 36, WEEZING
-	db SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION
-
-	db 33, ARIADOS
-	db SCARY_FACE, GIGA_DRAIN, STRING_SHOT, NIGHT_SHADE
-
-	db 39, VENOMOTH
-	db FORESIGHT, DOUBLE_TEAM, GUST, PSYCHIC_M
-
+	db "JANINE@", TRAINERTYPE_MOVES
+	db 36, CROBAT, SCREECH, SUPERSONIC, CONFUSE_RAY, WING_ATTACK
+	db 36, WEEZING, SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION
+	db 36, WEEZING, SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION
+	db 33, ARIADOS, SCARY_FACE, GIGA_DRAIN, STRING_SHOT, NIGHT_SHADE
+	db 39, VENOMOTH, FORESIGHT, DOUBLE_TEAM, GUST, PSYCHIC_M
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 CooltrainerMGroup:
 ; ================================
-; ================
-
 	; COOLTRAINERM (1)
-	db "NICK@"
-	db TRAINERTYPE_MOVES
-
-	db 26, CHARMANDER
-	db EMBER, SMOKESCREEN, RAGE, SCARY_FACE
-
-	db 26, SQUIRTLE
-	db WITHDRAW, WATER_GUN, BITE, CURSE
-
-	db 26, BULBASAUR
-	db LEECH_SEED, POISONPOWDER, SLEEP_POWDER, RAZOR_LEAF
-
+	db "NICK@", TRAINERTYPE_MOVES
+	db 26, CHARMANDER, EMBER, SMOKESCREEN, RAGE, SCARY_FACE
+	db 26, SQUIRTLE, WITHDRAW, WATER_GUN, BITE, CURSE
+	db 26, BULBASAUR, LEECH_SEED, POISONPOWDER, SLEEP_POWDER, RAZOR_LEAF
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (2)
-	db "AARON@"
-	db TRAINERTYPE_NORMAL
-
+	db "AARON@", TRAINERTYPE_NORMAL
 	db 24, IVYSAUR
 	db 24, CHARMELEON
 	db 24, WARTORTLE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (3)
-	db "PAUL@"
-	db TRAINERTYPE_NORMAL
-
+	db "PAUL@", TRAINERTYPE_NORMAL
 	db 34, DRATINI
 	db 34, DRATINI
 	db 34, DRATINI
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (4)
-	db "CODY@"
-	db TRAINERTYPE_NORMAL
-
+	db "CODY@", TRAINERTYPE_NORMAL
 	db 34, HORSEA
 	db 36, SEADRA
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (5)
-	db "MIKE@"
-	db TRAINERTYPE_NORMAL
-
+	db "MIKE@", TRAINERTYPE_NORMAL
 	db 37, DRAGONAIR
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (6)
-	db "GAVEN@"
-	db TRAINERTYPE_MOVES
-
-	db 35, VICTREEBEL
-	db WRAP, TOXIC, ACID, RAZOR_LEAF
-
-	db 35, KINGLER
-	db BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT
-
-	db 35, FLAREON
-	db SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN
-
+	db "GAVEN@", TRAINERTYPE_MOVES
+	db 35, VICTREEBEL, WRAP, TOXIC, ACID, RAZOR_LEAF
+	db 35, KINGLER, BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT
+	db 35, FLAREON, SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (7)
-	db "GAVEN@"
-	db TRAINERTYPE_ITEM_MOVES
-
-	db 39, VICTREEBEL, NO_ITEM
-	db GIGA_DRAIN, TOXIC, SLUDGE_BOMB, RAZOR_LEAF
-
-	db 39, KINGLER, KINGS_ROCK
-	db SURF, STOMP, GUILLOTINE, BLIZZARD
-
-	db 39, FLAREON, NO_ITEM
-	db FLAMETHROWER, QUICK_ATTACK, BITE, FIRE_SPIN
-
+	db "GAVEN@", TRAINERTYPE_ITEM_MOVES
+	db 39, VICTREEBEL, NO_ITEM, GIGA_DRAIN, TOXIC, SLUDGE_BOMB, RAZOR_LEAF
+	db 39, KINGLER, KINGS_ROCK, SURF, STOMP, GUILLOTINE, BLIZZARD
+	db 39, FLAREON, NO_ITEM, FLAMETHROWER, QUICK_ATTACK, BITE, FIRE_SPIN
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (8)
-	db "RYAN@"
-	db TRAINERTYPE_MOVES
-
-	db 25, PIDGEOT
-	db SAND_ATTACK, QUICK_ATTACK, WHIRLWIND, WING_ATTACK
-
-	db 27, ELECTABUZZ
-	db THUNDERPUNCH, LIGHT_SCREEN, SWIFT, SCREECH
-
+	db "RYAN@", TRAINERTYPE_MOVES
+	db 25, PIDGEOT, SAND_ATTACK, QUICK_ATTACK, WHIRLWIND, WING_ATTACK
+	db 27, ELECTABUZZ, THUNDERPUNCH, LIGHT_SCREEN, SWIFT, SCREECH
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (9)
-	db "JAKE@"
-	db TRAINERTYPE_MOVES
-
-	db 33, PARASECT
-	db LEECH_LIFE, SPORE, SLASH, SWORDS_DANCE
-
-	db 35, GOLDUCK
-	db CONFUSION, SCREECH, PSYCH_UP, FURY_SWIPES
-
+	db "JAKE@", TRAINERTYPE_MOVES
+	db 33, PARASECT, LEECH_LIFE, SPORE, SLASH, SWORDS_DANCE
+	db 35, GOLDUCK, CONFUSION, SCREECH, PSYCH_UP, FURY_SWIPES
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (10)
-	db "GAVEN@"
-	db TRAINERTYPE_MOVES
-
-	db 32, VICTREEBEL
-	db WRAP, TOXIC, ACID, RAZOR_LEAF
-
-	db 32, KINGLER
-	db BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT
-
-	db 32, FLAREON
-	db SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN
-
+	db "GAVEN@", TRAINERTYPE_MOVES
+	db 32, VICTREEBEL, WRAP, TOXIC, ACID, RAZOR_LEAF
+	db 32, KINGLER, BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT
+	db 32, FLAREON, SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (11)
-	db "BLAKE@"
-	db TRAINERTYPE_MOVES
-
-	db 33, MAGNETON
-	db THUNDERBOLT, SUPERSONIC, SWIFT, SCREECH
-
-	db 31, QUAGSIRE
-	db WATER_GUN, SLAM, AMNESIA, EARTHQUAKE
-
-	db 31, EXEGGCUTE
-	db LEECH_SEED, CONFUSION, SLEEP_POWDER, SOLARBEAM
-
+	db "BLAKE@", TRAINERTYPE_MOVES
+	db 33, MAGNETON, THUNDERBOLT, SUPERSONIC, SWIFT, SCREECH
+	db 31, QUAGSIRE, WATER_GUN, SLAM, AMNESIA, EARTHQUAKE
+	db 31, EXEGGCUTE, LEECH_SEED, CONFUSION, SLEEP_POWDER, SOLARBEAM
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (12)
-	db "BRIAN@"
-	db TRAINERTYPE_MOVES
-
-	db 35, SANDSLASH
-	db SAND_ATTACK, POISON_STING, SLASH, SWIFT
-
+	db "BRIAN@", TRAINERTYPE_MOVES
+	db 35, SANDSLASH, SAND_ATTACK, POISON_STING, SLASH, SWIFT
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (13)
-	db "ERICK@"
-	db TRAINERTYPE_NORMAL
-
+	db "ERICK@", TRAINERTYPE_NORMAL
 	db 10, BULBASAUR
 	db 10, CHARMANDER
 	db 10, SQUIRTLE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (14)
-	db "ANDY@"
-	db TRAINERTYPE_NORMAL
-
+	db "ANDY@", TRAINERTYPE_NORMAL
 	db 10, BULBASAUR
 	db 10, CHARMANDER
 	db 10, SQUIRTLE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (15)
-	db "TYLER@"
-	db TRAINERTYPE_NORMAL
-
+	db "TYLER@", TRAINERTYPE_NORMAL
 	db 10, BULBASAUR
 	db 10, CHARMANDER
 	db 10, SQUIRTLE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (16)
-	db "SEAN@"
-	db TRAINERTYPE_NORMAL
-
+	db "SEAN@", TRAINERTYPE_NORMAL
 	db 35, FLAREON
 	db 35, TANGELA
 	db 35, TAUROS
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (17)
-	db "KEVIN@"
-	db TRAINERTYPE_NORMAL
-
+	db "KEVIN@", TRAINERTYPE_NORMAL
 	db 38, RHYHORN
 	db 35, CHARMELEON
 	db 35, WARTORTLE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (18)
-	db "STEVE@"
-	db TRAINERTYPE_NORMAL
-
+	db "STEVE@", TRAINERTYPE_NORMAL
 	db 14, BULBASAUR
 	db 14, CHARMANDER
 	db 14, SQUIRTLE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (19)
-	db "ALLEN@"
-	db TRAINERTYPE_MOVES
-
-	db 27, CHARMELEON
-	db EMBER, SMOKESCREEN, RAGE, SCARY_FACE
-
+	db "ALLEN@", TRAINERTYPE_MOVES
+	db 27, CHARMELEON, EMBER, SMOKESCREEN, RAGE, SCARY_FACE
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (20)
-	db "DARIN@"
-	db TRAINERTYPE_MOVES
-
-	db 37, DRAGONAIR
-	db WRAP, SURF, DRAGON_RAGE, SLAM
-
+	db "DARIN@", TRAINERTYPE_MOVES
+	db 37, DRAGONAIR, WRAP, SURF, DRAGON_RAGE, SLAM
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 CooltrainerFGroup:
 ; ================================
-; ================
-
 	; COOLTRAINERF (1)
-	db "GWEN@"
-	db TRAINERTYPE_NORMAL
-
+	db "GWEN@", TRAINERTYPE_NORMAL
 	db 26, EEVEE
 	db 22, FLAREON
 	db 22, VAPOREON
 	db 22, JOLTEON
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (2)
-	db "LOIS@"
-	db TRAINERTYPE_MOVES
-
-	db 25, SKIPLOOM
-	db SYNTHESIS, POISONPOWDER, MEGA_DRAIN, LEECH_SEED
-
-	db 25, NINETALES
-	db EMBER, QUICK_ATTACK, CONFUSE_RAY, SAFEGUARD
-
+	db "LOIS@", TRAINERTYPE_MOVES
+	db 25, SKIPLOOM, SYNTHESIS, POISONPOWDER, MEGA_DRAIN, LEECH_SEED
+	db 25, NINETALES, EMBER, QUICK_ATTACK, CONFUSE_RAY, SAFEGUARD
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (3)
-	db "FRAN@"
-	db TRAINERTYPE_NORMAL
-
+	db "FRAN@", TRAINERTYPE_NORMAL
 	db 37, SEADRA
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (4)
-	db "LOLA@"
-	db TRAINERTYPE_NORMAL
-
+	db "LOLA@", TRAINERTYPE_NORMAL
 	db 34, DRATINI
 	db 36, DRAGONAIR
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (5)
-	db "KATE@"
-	db TRAINERTYPE_NORMAL
-
+	db "KATE@", TRAINERTYPE_NORMAL
 	db 26, SHELLDER
 	db 28, CLOYSTER
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (6)
-	db "IRENE@"
-	db TRAINERTYPE_NORMAL
-
+	db "IRENE@", TRAINERTYPE_NORMAL
 	db 22, GOLDEEN
 	db 24, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (7)
-	db "KELLY@"
-	db TRAINERTYPE_NORMAL
-
+	db "KELLY@", TRAINERTYPE_NORMAL
 	db 27, MARILL
 	db 24, WARTORTLE
 	db 24, WARTORTLE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (8)
-	db "JOYCE@"
-	db TRAINERTYPE_MOVES
-
-	db 36, PIKACHU
-	db QUICK_ATTACK, DOUBLE_TEAM, THUNDERBOLT, THUNDER
-
-	db 32, BLASTOISE
-	db BITE, CURSE, SURF, RAIN_DANCE
-
+	db "JOYCE@", TRAINERTYPE_MOVES
+	db 36, PIKACHU, QUICK_ATTACK, DOUBLE_TEAM, THUNDERBOLT, THUNDER
+	db 32, BLASTOISE, BITE, CURSE, SURF, RAIN_DANCE
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (9)
-	db "BETH@"
-	db TRAINERTYPE_MOVES
-
-	db 36, RAPIDASH
-	db STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY
-
+	db "BETH@", TRAINERTYPE_MOVES
+	db 36, RAPIDASH, STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (10)
-	db "REENA@"
-	db TRAINERTYPE_NORMAL
-
+	db "REENA@", TRAINERTYPE_NORMAL
 	db 31, STARMIE
 	db 33, NIDOQUEEN
 	db 31, STARMIE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (11)
-	db "MEGAN@"
-	db TRAINERTYPE_MOVES
-
-	db 32, BULBASAUR
-	db GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF
-
-	db 32, IVYSAUR
-	db GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF
-
-	db 32, VENUSAUR
-	db BODY_SLAM, SLEEP_POWDER, RAZOR_LEAF, SWEET_SCENT
-
+	db "MEGAN@", TRAINERTYPE_MOVES
+	db 32, BULBASAUR, GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF
+	db 32, IVYSAUR, GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF
+	db 32, VENUSAUR, BODY_SLAM, SLEEP_POWDER, RAZOR_LEAF, SWEET_SCENT
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (12)
-	db "BETH@"
-	db TRAINERTYPE_MOVES
-
-	db 39, RAPIDASH
-	db STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY
-
+	db "BETH@", TRAINERTYPE_MOVES
+	db 39, RAPIDASH, STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (13)
-	db "CAROL@"
-	db TRAINERTYPE_NORMAL
-
+	db "CAROL@", TRAINERTYPE_NORMAL
 	db 35, ELECTRODE
 	db 35, STARMIE
 	db 35, NINETALES
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (14)
-	db "QUINN@"
-	db TRAINERTYPE_NORMAL
-
+	db "QUINN@", TRAINERTYPE_NORMAL
 	db 38, IVYSAUR
 	db 38, STARMIE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (15)
-	db "EMMA@"
-	db TRAINERTYPE_NORMAL
-
+	db "EMMA@", TRAINERTYPE_NORMAL
 	db 28, POLIWHIRL
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (16)
-	db "CYBIL@"
-	db TRAINERTYPE_MOVES
-
-	db 25, BUTTERFREE
-	db CONFUSION, SLEEP_POWDER, WHIRLWIND, GUST
-
-	db 25, BELLOSSOM
-	db ABSORB, STUN_SPORE, ACID, SOLARBEAM
-
+	db "CYBIL@", TRAINERTYPE_MOVES
+	db 25, BUTTERFREE, CONFUSION, SLEEP_POWDER, WHIRLWIND, GUST
+	db 25, BELLOSSOM, ABSORB, STUN_SPORE, ACID, SOLARBEAM
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (17)
-	db "JENN@"
-	db TRAINERTYPE_NORMAL
-
+	db "JENN@", TRAINERTYPE_NORMAL
 	db 24, STARYU
 	db 26, STARMIE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (18)
-	db "BETH@"
-	db TRAINERTYPE_ITEM_MOVES
-
-	db 43, RAPIDASH, FOCUS_BAND
-	db STOMP, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST
-
+	db "BETH@", TRAINERTYPE_ITEM_MOVES
+	db 43, RAPIDASH, FOCUS_BAND, STOMP, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (19)
-	db "REENA@"
-	db TRAINERTYPE_NORMAL
-
+	db "REENA@", TRAINERTYPE_NORMAL
 	db 34, STARMIE
 	db 36, NIDOQUEEN
 	db 34, STARMIE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (20)
-	db "REENA@"
-	db TRAINERTYPE_ITEM_MOVES
-
-	db 38, STARMIE, NO_ITEM
-	db DOUBLE_TEAM, PSYCHIC_M, WATERFALL, CONFUSE_RAY
-
-	db 40, NIDOQUEEN, PINK_BOW
-	db EARTHQUAKE, DOUBLE_KICK, TOXIC, BODY_SLAM
-
-	db 38, STARMIE, NO_ITEM
-	db BLIZZARD, PSYCHIC_M, WATERFALL, RECOVER
-
+	db "REENA@", TRAINERTYPE_ITEM_MOVES
+	db 38, STARMIE, NO_ITEM, DOUBLE_TEAM, PSYCHIC_M, WATERFALL, CONFUSE_RAY
+	db 40, NIDOQUEEN, PINK_BOW, EARTHQUAKE, DOUBLE_KICK, TOXIC, BODY_SLAM
+	db 38, STARMIE, NO_ITEM, BLIZZARD, PSYCHIC_M, WATERFALL, RECOVER
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (21)
-	db "CARA@"
-	db TRAINERTYPE_MOVES
-
-	db 33, HORSEA
-	db SMOKESCREEN, LEER, WHIRLPOOL, TWISTER
-
-	db 33, HORSEA
-	db SMOKESCREEN, LEER, WHIRLPOOL, TWISTER
-
-	db 35, SEADRA
-	db SWIFT, LEER, WATERFALL, TWISTER
-
+	db "CARA@", TRAINERTYPE_MOVES
+	db 33, HORSEA, SMOKESCREEN, LEER, WHIRLPOOL, TWISTER
+	db 33, HORSEA, SMOKESCREEN, LEER, WHIRLPOOL, TWISTER
+	db 35, SEADRA, SWIFT, LEER, WATERFALL, TWISTER
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 BeautyGroup:
 ; ================================
-; ================
-
 	; BEAUTY (1)
-	db "VICTORIA@"
-	db TRAINERTYPE_NORMAL
-
+	db "VICTORIA@", TRAINERTYPE_NORMAL
 	db 9, SENTRET
 	db 13, SENTRET
 	db 17, SENTRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (2)
-	db "SAMANTHA@"
-	db TRAINERTYPE_MOVES
-
-	db 16, MEOWTH
-	db SCRATCH, GROWL, BITE, PAY_DAY
-
-	db 16, MEOWTH
-	db SCRATCH, GROWL, BITE, SLASH
-
+	db "SAMANTHA@", TRAINERTYPE_MOVES
+	db 16, MEOWTH, SCRATCH, GROWL, BITE, PAY_DAY
+	db 16, MEOWTH, SCRATCH, GROWL, BITE, SLASH
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (3)
-	db "JULIE@"
-	db TRAINERTYPE_NORMAL
-
+	db "JULIE@", TRAINERTYPE_NORMAL
 	db 15, SENTRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (4)
-	db "JACLYN@"
-	db TRAINERTYPE_NORMAL
-
+	db "JACLYN@", TRAINERTYPE_NORMAL
 	db 15, SENTRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (5)
-	db "BRENDA@"
-	db TRAINERTYPE_NORMAL
-
+	db "BRENDA@", TRAINERTYPE_NORMAL
 	db 16, FURRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (6)
-	db "CASSIE@"
-	db TRAINERTYPE_NORMAL
-
+	db "CASSIE@", TRAINERTYPE_NORMAL
 	db 28, VILEPLUME
 	db 34, BUTTERFREE
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (7)
-	db "CAROLINE@"
-	db TRAINERTYPE_NORMAL
-
+	db "CAROLINE@", TRAINERTYPE_NORMAL
 	db 30, MARILL
 	db 32, SEEL
 	db 30, MARILL
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (8)
-	db "CARLENE@"
-	db TRAINERTYPE_NORMAL
-
+	db "CARLENE@", TRAINERTYPE_NORMAL
 	db 15, SENTRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (9)
-	db "JESSICA@"
-	db TRAINERTYPE_NORMAL
-
+	db "JESSICA@", TRAINERTYPE_NORMAL
 	db 15, SENTRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (10)
-	db "RACHAEL@"
-	db TRAINERTYPE_NORMAL
-
+	db "RACHAEL@", TRAINERTYPE_NORMAL
 	db 15, SENTRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (11)
-	db "ANGELICA@"
-	db TRAINERTYPE_NORMAL
-
+	db "ANGELICA@", TRAINERTYPE_NORMAL
 	db 15, SENTRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (12)
-	db "KENDRA@"
-	db TRAINERTYPE_NORMAL
-
+	db "KENDRA@", TRAINERTYPE_NORMAL
 	db 15, SENTRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (13)
-	db "VERONICA@"
-	db TRAINERTYPE_NORMAL
-
+	db "VERONICA@", TRAINERTYPE_NORMAL
 	db 15, SENTRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (14)
-	db "JULIA@"
-	db TRAINERTYPE_NORMAL
-
+	db "JULIA@", TRAINERTYPE_NORMAL
 	db 32, PARAS
 	db 32, EXEGGCUTE
 	db 35, PARASECT
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (15)
-	db "THERESA@"
-	db TRAINERTYPE_NORMAL
-
+	db "THERESA@", TRAINERTYPE_NORMAL
 	db 15, SENTRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (16)
-	db "VALERIE@"
-	db TRAINERTYPE_MOVES
-
-	db 17, HOPPIP
-	db SYNTHESIS, TAIL_WHIP, TACKLE, POISONPOWDER
-
-	db 17, SKIPLOOM
-	db SYNTHESIS, TAIL_WHIP, TACKLE, STUN_SPORE
-
+	db "VALERIE@", TRAINERTYPE_MOVES
+	db 17, HOPPIP, SYNTHESIS, TAIL_WHIP, TACKLE, POISONPOWDER
+	db 17, SKIPLOOM, SYNTHESIS, TAIL_WHIP, TACKLE, STUN_SPORE
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (17)
-	db "OLIVIA@"
-	db TRAINERTYPE_NORMAL
-
+	db "OLIVIA@", TRAINERTYPE_NORMAL
 	db 19, CORSOLA
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 PokemaniacGroup:
 ; ================================
-; ================
-
 	; POKEMANIAC (1)
-	db "LARRY@"
-	db TRAINERTYPE_NORMAL
-
+	db "LARRY@", TRAINERTYPE_NORMAL
 	db 10, SLOWPOKE
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (2)
-	db "ANDREW@"
-	db TRAINERTYPE_NORMAL
-
+	db "ANDREW@", TRAINERTYPE_NORMAL
 	db 24, MAROWAK
 	db 24, MAROWAK
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (3)
-	db "CALVIN@"
-	db TRAINERTYPE_NORMAL
-
+	db "CALVIN@", TRAINERTYPE_NORMAL
 	db 26, KANGASKHAN
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (4)
-	db "SHANE@"
-	db TRAINERTYPE_NORMAL
-
+	db "SHANE@", TRAINERTYPE_NORMAL
 	db 16, NIDORINA
 	db 16, NIDORINO
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (5)
-	db "BEN@"
-	db TRAINERTYPE_NORMAL
-
+	db "BEN@", TRAINERTYPE_NORMAL
 	db 19, SLOWBRO
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (6)
-	db "BRENT@"
-	db TRAINERTYPE_NORMAL
-
+	db "BRENT@", TRAINERTYPE_NORMAL
 	db 19, LICKITUNG
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (7)
-	db "RON@"
-	db TRAINERTYPE_NORMAL
-
+	db "RON@", TRAINERTYPE_NORMAL
 	db 19, NIDOKING
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (8)
-	db "ETHAN@"
-	db TRAINERTYPE_NORMAL
-
+	db "ETHAN@", TRAINERTYPE_NORMAL
 	db 31, RHYHORN
 	db 31, RHYDON
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (9)
-	db "BRENT@"
-	db TRAINERTYPE_NORMAL
-
+	db "BRENT@", TRAINERTYPE_NORMAL
 	db 25, KANGASKHAN
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (10)
-	db "BRENT@"
-	db TRAINERTYPE_MOVES
-
-	db 36, PORYGON
-	db RECOVER, PSYCHIC_M, CONVERSION2, TRI_ATTACK
-
+	db "BRENT@", TRAINERTYPE_MOVES
+	db 36, PORYGON, RECOVER, PSYCHIC_M, CONVERSION2, TRI_ATTACK
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (11)
-	db "ISSAC@"
-	db TRAINERTYPE_MOVES
-
-	db 12, LICKITUNG
-	db LICK, SUPERSONIC, CUT, NO_MOVE
-
+	db "ISSAC@", TRAINERTYPE_MOVES
+	db 12, LICKITUNG, LICK, SUPERSONIC, CUT, NO_MOVE
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (12)
-	db "DONALD@"
-	db TRAINERTYPE_NORMAL
-
+	db "DONALD@", TRAINERTYPE_NORMAL
 	db 10, SLOWPOKE
 	db 10, SLOWPOKE
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (13)
-	db "ZACH@"
-	db TRAINERTYPE_NORMAL
-
+	db "ZACH@", TRAINERTYPE_NORMAL
 	db 27, RHYHORN
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (14)
-	db "BRENT@"
-	db TRAINERTYPE_MOVES
-
-	db 41, CHANSEY
-	db ROLLOUT, ATTRACT, EGG_BOMB, SOFTBOILED
-
+	db "BRENT@", TRAINERTYPE_MOVES
+	db 41, CHANSEY, ROLLOUT, ATTRACT, EGG_BOMB, SOFTBOILED
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (15)
-	db "MILLER@"
-	db TRAINERTYPE_NORMAL
-
+	db "MILLER@", TRAINERTYPE_NORMAL
 	db 17, NIDOKING
 	db 17, NIDOQUEEN
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 GruntMGroup:
 ; ================================
-; ================
-
 	; GRUNTM (1)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 14, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (2)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 7, RATTATA
 	db 9, ZUBAT
 	db 9, ZUBAT
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (3)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 24, RATICATE
 	db 24, RATICATE
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (4)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 23, GRIMER
 	db 23, GRIMER
 	db 25, MUK
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (5)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 21, RATTATA
 	db 21, RATTATA
 	db 23, RATTATA
 	db 23, RATTATA
 	db 23, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (6)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 26, ZUBAT
 	db 26, ZUBAT
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (7)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 23, KOFFING
 	db 23, GRIMER
 	db 23, ZUBAT
 	db 23, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (8)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 26, WEEZING
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (9)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 24, RATICATE
 	db 26, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (10)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 22, ZUBAT
 	db 24, GOLBAT
 	db 22, GRIMER
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (11)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 23, MUK
 	db 23, KOFFING
 	db 25, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (12)
-	db "EXECUTIVE@"
-	db TRAINERTYPE_NORMAL
-
+	db "EXECUTIVE@", TRAINERTYPE_NORMAL
 	db 33, HOUNDOUR
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (13)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 27, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (14)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 24, RATICATE
 	db 24, GOLBAT
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (15)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 26, GRIMER
 	db 23, WEEZING
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (16)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 16, RATTATA
 	db 16, RATTATA
 	db 16, RATTATA
 	db 16, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (17)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 18, GOLBAT
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (18)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 17, RATTATA
 	db 17, ZUBAT
 	db 17, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (19)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 18, VENONAT
 	db 18, VENONAT
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (20)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 17, DROWZEE
 	db 19, ZUBAT
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (21)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 16, ZUBAT
 	db 17, GRIMER
 	db 18, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (22)
-	db "EXECUTIVE@"
-	db TRAINERTYPE_NORMAL
-
+	db "EXECUTIVE@", TRAINERTYPE_NORMAL
 	db 36, GOLBAT
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (23)
-	db "EXECUTIVE@"
-	db TRAINERTYPE_NORMAL
-
+	db "EXECUTIVE@", TRAINERTYPE_NORMAL
 	db 30, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (24)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 25, KOFFING
 	db 25, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (25)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 24, KOFFING
 	db 24, MUK
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (26)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 15, RATTATA
 	db 15, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (27)
-	db "EXECUTIVE@"
-	db TRAINERTYPE_NORMAL
-
+	db "EXECUTIVE@", TRAINERTYPE_NORMAL
 	db 22, ZUBAT
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (28)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 19, RATICATE
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (29)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 9, RATTATA
 	db 9, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (30)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 25, GOLBAT
 	db 25, GOLBAT
 	db 30, ARBOK
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (31)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 30, GOLBAT
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 GentlemanGroup:
 ; ================================
-; ================
-
 	; GENTLEMAN (1)
-	db "PRESTON@"
-	db TRAINERTYPE_NORMAL
-
+	db "PRESTON@", TRAINERTYPE_NORMAL
 	db 18, GROWLITHE
 	db 18, GROWLITHE
-
 	db -1 ; end
 
-; ================
-
 	; GENTLEMAN (2)
-	db "EDWARD@"
-	db TRAINERTYPE_NORMAL
-
+	db "EDWARD@", TRAINERTYPE_NORMAL
 	db 33, PERSIAN
-
 	db -1 ; end
 
-; ================
-
 	; GENTLEMAN (3)
-	db "GREGORY@"
-	db TRAINERTYPE_NORMAL
-
+	db "GREGORY@", TRAINERTYPE_NORMAL
 	db 37, PIKACHU
 	db 33, FLAAFFY
-
 	db -1 ; end
 
-; ================
-
 	; GENTLEMAN (4)
-	db "VIRGIL@"
-	db TRAINERTYPE_NORMAL
-
+	db "VIRGIL@", TRAINERTYPE_NORMAL
 	db 20, PONYTA
-
 	db -1 ; end
 
-; ================
-
 	; GENTLEMAN (5)
-	db "ALFRED@"
-	db TRAINERTYPE_NORMAL
-
+	db "ALFRED@", TRAINERTYPE_NORMAL
 	db 20, NOCTOWL
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 SkierGroup:
 ; ================================
-; ================
-
 	; SKIER (1)
-	db "ROXANNE@"
-	db TRAINERTYPE_NORMAL
-
+	db "ROXANNE@", TRAINERTYPE_NORMAL
 	db 28, JYNX
-
 	db -1 ; end
 
-; ================
-
 	; SKIER (2)
-	db "CLARISSA@"
-	db TRAINERTYPE_NORMAL
-
+	db "CLARISSA@", TRAINERTYPE_NORMAL
 	db 28, DEWGONG
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 TeacherGroup:
 ; ================================
-; ================
-
 	; TEACHER (1)
-	db "COLETTE@"
-	db TRAINERTYPE_NORMAL
-
+	db "COLETTE@", TRAINERTYPE_NORMAL
 	db 36, CLEFAIRY
-
 	db -1 ; end
 
-; ================
-
 	; TEACHER (2)
-	db "HILLARY@"
-	db TRAINERTYPE_NORMAL
-
+	db "HILLARY@", TRAINERTYPE_NORMAL
 	db 32, AIPOM
 	db 36, CUBONE
-
 	db -1 ; end
 
-; ================
-
 	; TEACHER (3)
-	db "SHIRLEY@"
-	db TRAINERTYPE_NORMAL
-
+	db "SHIRLEY@", TRAINERTYPE_NORMAL
 	db 35, JIGGLYPUFF
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 SabrinaGroup:
 ; ================================
-; ================
-
 	; SABRINA (1)
-	db "SABRINA@"
-	db TRAINERTYPE_MOVES
-
-	db 46, ESPEON
-	db SAND_ATTACK, QUICK_ATTACK, SWIFT, PSYCHIC_M
-
-	db 46, MR__MIME
-	db BARRIER, REFLECT, BATON_PASS, PSYCHIC_M
-
-	db 48, ALAKAZAM
-	db RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
-
+	db "SABRINA@", TRAINERTYPE_MOVES
+	db 46, ESPEON, SAND_ATTACK, QUICK_ATTACK, SWIFT, PSYCHIC_M
+	db 46, MR__MIME, BARRIER, REFLECT, BATON_PASS, PSYCHIC_M
+	db 48, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 BugCatcherGroup:
 ; ================================
-; ================
-
 	; BUG_CATCHER (1)
-	db "DON@"
-	db TRAINERTYPE_NORMAL
-
+	db "DON@", TRAINERTYPE_NORMAL
 	db 3, CATERPIE
 	db 3, CATERPIE
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (2)
-	db "ROB@"
-	db TRAINERTYPE_NORMAL
-
+	db "ROB@", TRAINERTYPE_NORMAL
 	db 32, BEEDRILL
 	db 32, BUTTERFREE
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (3)
-	db "ED@"
-	db TRAINERTYPE_NORMAL
-
+	db "ED@", TRAINERTYPE_NORMAL
 	db 30, BEEDRILL
 	db 30, BEEDRILL
 	db 30, BEEDRILL
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (4)
-	db "WADE@"
-	db TRAINERTYPE_NORMAL
-
+	db "WADE@", TRAINERTYPE_NORMAL
 	db 2, CATERPIE
 	db 2, CATERPIE
 	db 3, WEEDLE
 	db 2, CATERPIE
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (5)
-	db "BENNY@"
-	db TRAINERTYPE_NORMAL
-
+	db "BENNY@", TRAINERTYPE_NORMAL
 	db 7, WEEDLE
 	db 9, KAKUNA
 	db 12, BEEDRILL
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (6)
-	db "AL@"
-	db TRAINERTYPE_NORMAL
-
+	db "AL@", TRAINERTYPE_NORMAL
 	db 12, CATERPIE
 	db 12, WEEDLE
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (7)
-	db "JOSH@"
-	db TRAINERTYPE_NORMAL
-
+	db "JOSH@", TRAINERTYPE_NORMAL
 	db 13, PARAS
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (8)
-	db "ARNIE@"
-	db TRAINERTYPE_NORMAL
-
+	db "ARNIE@", TRAINERTYPE_NORMAL
 	db 15, VENONAT
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (9)
-	db "KEN@"
-	db TRAINERTYPE_NORMAL
-
+	db "KEN@", TRAINERTYPE_NORMAL
 	db 30, ARIADOS
 	db 32, PINSIR
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (10)
-	db "WADE@"
-	db TRAINERTYPE_NORMAL
-
+	db "WADE@", TRAINERTYPE_NORMAL
 	db 9, METAPOD
 	db 9, METAPOD
 	db 10, KAKUNA
 	db 9, METAPOD
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (11)
-	db "WADE@"
-	db TRAINERTYPE_NORMAL
-
+	db "WADE@", TRAINERTYPE_NORMAL
 	db 14, BUTTERFREE
 	db 14, BUTTERFREE
 	db 15, BEEDRILL
 	db 14, BUTTERFREE
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (12)
-	db "DOUG@"
-	db TRAINERTYPE_NORMAL
-
+	db "DOUG@", TRAINERTYPE_NORMAL
 	db 34, ARIADOS
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (13)
-	db "ARNIE@"
-	db TRAINERTYPE_NORMAL
-
+	db "ARNIE@", TRAINERTYPE_NORMAL
 	db 19, VENONAT
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (14)
-	db "ARNIE@"
-	db TRAINERTYPE_MOVES
-
-	db 28, VENOMOTH
-	db DISABLE, SUPERSONIC, CONFUSION, LEECH_LIFE
-
+	db "ARNIE@", TRAINERTYPE_MOVES
+	db 28, VENOMOTH, DISABLE, SUPERSONIC, CONFUSION, LEECH_LIFE
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (15)
-	db "WADE@"
-	db TRAINERTYPE_MOVES
-
-	db 24, BUTTERFREE
-	db CONFUSION, POISONPOWDER, SUPERSONIC, WHIRLWIND
-
-	db 24, BUTTERFREE
-	db CONFUSION, STUN_SPORE, SUPERSONIC, WHIRLWIND
-
-	db 25, BEEDRILL
-	db FURY_ATTACK, FOCUS_ENERGY, TWINEEDLE, RAGE
-
-	db 24, BUTTERFREE
-	db CONFUSION, SLEEP_POWDER, SUPERSONIC, WHIRLWIND
-
+	db "WADE@", TRAINERTYPE_MOVES
+	db 24, BUTTERFREE, CONFUSION, POISONPOWDER, SUPERSONIC, WHIRLWIND
+	db 24, BUTTERFREE, CONFUSION, STUN_SPORE, SUPERSONIC, WHIRLWIND
+	db 25, BEEDRILL, FURY_ATTACK, FOCUS_ENERGY, TWINEEDLE, RAGE
+	db 24, BUTTERFREE, CONFUSION, SLEEP_POWDER, SUPERSONIC, WHIRLWIND
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (16)
-	db "WADE@"
-	db TRAINERTYPE_MOVES
-
-	db 30, BUTTERFREE
-	db CONFUSION, POISONPOWDER, SUPERSONIC, GUST
-
-	db 30, BUTTERFREE
-	db CONFUSION, STUN_SPORE, SUPERSONIC, GUST
-
-	db 32, BEEDRILL
-	db FURY_ATTACK, PURSUIT, TWINEEDLE, DOUBLE_TEAM
-
-	db 34, BUTTERFREE
-	db PSYBEAM, SLEEP_POWDER, GUST, WHIRLWIND
-
+	db "WADE@", TRAINERTYPE_MOVES
+	db 30, BUTTERFREE, CONFUSION, POISONPOWDER, SUPERSONIC, GUST
+	db 30, BUTTERFREE, CONFUSION, STUN_SPORE, SUPERSONIC, GUST
+	db 32, BEEDRILL, FURY_ATTACK, PURSUIT, TWINEEDLE, DOUBLE_TEAM
+	db 34, BUTTERFREE, PSYBEAM, SLEEP_POWDER, GUST, WHIRLWIND
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (17)
-	db "ARNIE@"
-	db TRAINERTYPE_MOVES
-
-	db 36, VENOMOTH
-	db GUST, SUPERSONIC, PSYBEAM, LEECH_LIFE
-
+	db "ARNIE@", TRAINERTYPE_MOVES
+	db 36, VENOMOTH, GUST, SUPERSONIC, PSYBEAM, LEECH_LIFE
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (18)
-	db "ARNIE@"
-	db TRAINERTYPE_MOVES
-
-	db 40, VENOMOTH
-	db GUST, SUPERSONIC, PSYCHIC_M, TOXIC
-
+	db "ARNIE@", TRAINERTYPE_MOVES
+	db 40, VENOMOTH, GUST, SUPERSONIC, PSYCHIC_M, TOXIC
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (19)
-	db "WAYNE@"
-	db TRAINERTYPE_NORMAL
-
+	db "WAYNE@", TRAINERTYPE_NORMAL
 	db 8, LEDYBA
 	db 10, PARAS
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 FisherGroup:
 ; ================================
-; ================
-
 	; FISHER (1)
-	db "JUSTIN@"
-	db TRAINERTYPE_NORMAL
-
+	db "JUSTIN@", TRAINERTYPE_NORMAL
 	db 5, MAGIKARP
 	db 5, MAGIKARP
 	db 15, MAGIKARP
 	db 5, MAGIKARP
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (2)
-	db "RALPH@"
-	db TRAINERTYPE_NORMAL
-
+	db "RALPH@", TRAINERTYPE_NORMAL
 	db 10, GOLDEEN
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (3)
-	db "ARNOLD@"
-	db TRAINERTYPE_NORMAL
-
+	db "ARNOLD@", TRAINERTYPE_NORMAL
 	db 34, TENTACRUEL
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (4)
-	db "KYLE@"
-	db TRAINERTYPE_NORMAL
-
+	db "KYLE@", TRAINERTYPE_NORMAL
 	db 28, SEAKING
 	db 31, POLIWHIRL
 	db 31, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (5)
-	db "HENRY@"
-	db TRAINERTYPE_NORMAL
-
+	db "HENRY@", TRAINERTYPE_NORMAL
 	db 8, POLIWAG
 	db 8, POLIWAG
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (6)
-	db "MARVIN@"
-	db TRAINERTYPE_NORMAL
-
+	db "MARVIN@", TRAINERTYPE_NORMAL
 	db 10, MAGIKARP
 	db 10, GYARADOS
 	db 15, MAGIKARP
 	db 15, GYARADOS
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (7)
-	db "TULLY@"
-	db TRAINERTYPE_NORMAL
-
+	db "TULLY@", TRAINERTYPE_NORMAL
 	db 18, QWILFISH
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (8)
-	db "ANDRE@"
-	db TRAINERTYPE_NORMAL
-
+	db "ANDRE@", TRAINERTYPE_NORMAL
 	db 27, GYARADOS
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (9)
-	db "RAYMOND@"
-	db TRAINERTYPE_NORMAL
-
+	db "RAYMOND@", TRAINERTYPE_NORMAL
 	db 22, MAGIKARP
 	db 22, MAGIKARP
 	db 22, MAGIKARP
 	db 22, MAGIKARP
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (10)
-	db "WILTON@"
-	db TRAINERTYPE_NORMAL
-
+	db "WILTON@", TRAINERTYPE_NORMAL
 	db 23, GOLDEEN
 	db 23, GOLDEEN
 	db 25, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (11)
-	db "EDGAR@"
-	db TRAINERTYPE_MOVES
-
-	db 25, REMORAID
-	db LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM
-
-	db 25, REMORAID
-	db LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM
-
+	db "EDGAR@", TRAINERTYPE_MOVES
+	db 25, REMORAID, LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM
+	db 25, REMORAID, LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM
 	db -1 ; end
 
-; ================
-
 	; FISHER (12)
-	db "JONAH@"
-	db TRAINERTYPE_NORMAL
-
+	db "JONAH@", TRAINERTYPE_NORMAL
 	db 25, SHELLDER
 	db 29, OCTILLERY
 	db 25, REMORAID
 	db 29, CLOYSTER
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (13)
-	db "MARTIN@"
-	db TRAINERTYPE_NORMAL
-
+	db "MARTIN@", TRAINERTYPE_NORMAL
 	db 32, REMORAID
 	db 32, REMORAID
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (14)
-	db "STEPHEN@"
-	db TRAINERTYPE_NORMAL
-
+	db "STEPHEN@", TRAINERTYPE_NORMAL
 	db 25, MAGIKARP
 	db 25, MAGIKARP
 	db 31, QWILFISH
 	db 31, TENTACRUEL
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (15)
-	db "BARNEY@"
-	db TRAINERTYPE_NORMAL
-
+	db "BARNEY@", TRAINERTYPE_NORMAL
 	db 30, GYARADOS
 	db 30, GYARADOS
 	db 30, GYARADOS
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (16)
-	db "RALPH@"
-	db TRAINERTYPE_NORMAL
-
+	db "RALPH@", TRAINERTYPE_NORMAL
 	db 17, GOLDEEN
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (17)
-	db "RALPH@"
-	db TRAINERTYPE_NORMAL
-
+	db "RALPH@", TRAINERTYPE_NORMAL
 	db 17, QWILFISH
 	db 19, GOLDEEN
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (18)
-	db "TULLY@"
-	db TRAINERTYPE_NORMAL
-
+	db "TULLY@", TRAINERTYPE_NORMAL
 	db 23, QWILFISH
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (19)
-	db "TULLY@"
-	db TRAINERTYPE_NORMAL
-
+	db "TULLY@", TRAINERTYPE_NORMAL
 	db 32, GOLDEEN
 	db 32, GOLDEEN
 	db 32, QWILFISH
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (20)
-	db "WILTON@"
-	db TRAINERTYPE_NORMAL
-
+	db "WILTON@", TRAINERTYPE_NORMAL
 	db 29, GOLDEEN
 	db 29, GOLDEEN
 	db 32, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (21)
-	db "SCOTT@"
-	db TRAINERTYPE_NORMAL
-
+	db "SCOTT@", TRAINERTYPE_NORMAL
 	db 30, QWILFISH
 	db 30, QWILFISH
 	db 34, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (22)
-	db "WILTON@"
-	db TRAINERTYPE_MOVES
-
-	db 34, SEAKING
-	db SUPERSONIC, WATERFALL, FLAIL, FURY_ATTACK
-
-	db 34, SEAKING
-	db SUPERSONIC, WATERFALL, FLAIL, FURY_ATTACK
-
-	db 38, REMORAID
-	db PSYBEAM, AURORA_BEAM, BUBBLEBEAM, HYPER_BEAM
-
+	db "WILTON@", TRAINERTYPE_MOVES
+	db 34, SEAKING, SUPERSONIC, WATERFALL, FLAIL, FURY_ATTACK
+	db 34, SEAKING, SUPERSONIC, WATERFALL, FLAIL, FURY_ATTACK
+	db 38, REMORAID, PSYBEAM, AURORA_BEAM, BUBBLEBEAM, HYPER_BEAM
 	db -1 ; end
 
-; ================
-
 	; FISHER (23)
-	db "RALPH@"
-	db TRAINERTYPE_NORMAL
-
+	db "RALPH@", TRAINERTYPE_NORMAL
 	db 30, QWILFISH
 	db 32, GOLDEEN
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (24)
-	db "RALPH@"
-	db TRAINERTYPE_MOVES
-
-	db 35, QWILFISH
-	db TOXIC, MINIMIZE, SURF, PIN_MISSILE
-
-	db 39, SEAKING
-	db ENDURE, FLAIL, FURY_ATTACK, WATERFALL
-
+	db "RALPH@", TRAINERTYPE_MOVES
+	db 35, QWILFISH, TOXIC, MINIMIZE, SURF, PIN_MISSILE
+	db 39, SEAKING, ENDURE, FLAIL, FURY_ATTACK, WATERFALL
 	db -1 ; end
 
-; ================
-
 	; FISHER (25)
-	db "TULLY@"
-	db TRAINERTYPE_MOVES
-
-	db 34, SEAKING
-	db SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK
-
-	db 34, SEAKING
-	db SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK
-
-	db 37, QWILFISH
-	db ROLLOUT, SURF, PIN_MISSILE, TAKE_DOWN
-
+	db "TULLY@", TRAINERTYPE_MOVES
+	db 34, SEAKING, SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK
+	db 34, SEAKING, SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK
+	db 37, QWILFISH, ROLLOUT, SURF, PIN_MISSILE, TAKE_DOWN
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 SwimmerMGroup:
 ; ================================
-; ================
-
 	; SWIMMERM (1)
-	db "HAROLD@"
-	db TRAINERTYPE_NORMAL
-
+	db "HAROLD@", TRAINERTYPE_NORMAL
 	db 32, REMORAID
 	db 30, SEADRA
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (2)
-	db "SIMON@"
-	db TRAINERTYPE_NORMAL
-
+	db "SIMON@", TRAINERTYPE_NORMAL
 	db 20, TENTACOOL
 	db 20, TENTACOOL
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (3)
-	db "RANDALL@"
-	db TRAINERTYPE_NORMAL
-
+	db "RANDALL@", TRAINERTYPE_NORMAL
 	db 18, SHELLDER
 	db 20, WARTORTLE
 	db 18, SHELLDER
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (4)
-	db "CHARLIE@"
-	db TRAINERTYPE_NORMAL
-
+	db "CHARLIE@", TRAINERTYPE_NORMAL
 	db 21, SHELLDER
 	db 19, TENTACOOL
 	db 19, TENTACRUEL
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (5)
-	db "GEORGE@"
-	db TRAINERTYPE_NORMAL
-
+	db "GEORGE@", TRAINERTYPE_NORMAL
 	db 16, TENTACOOL
 	db 17, TENTACOOL
 	db 16, TENTACOOL
 	db 19, STARYU
 	db 17, TENTACOOL
 	db 19, REMORAID
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (6)
-	db "BERKE@"
-	db TRAINERTYPE_NORMAL
-
+	db "BERKE@", TRAINERTYPE_NORMAL
 	db 23, QWILFISH
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (7)
-	db "KIRK@"
-	db TRAINERTYPE_NORMAL
-
+	db "KIRK@", TRAINERTYPE_NORMAL
 	db 20, GYARADOS
 	db 20, GYARADOS
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (8)
-	db "MATHEW@"
-	db TRAINERTYPE_NORMAL
-
+	db "MATHEW@", TRAINERTYPE_NORMAL
 	db 23, KRABBY
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (9)
-	db "HAL@"
-	db TRAINERTYPE_NORMAL
-
+	db "HAL@", TRAINERTYPE_NORMAL
 	db 24, SEEL
 	db 25, DEWGONG
 	db 24, SEEL
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (10)
-	db "PATON@"
-	db TRAINERTYPE_NORMAL
-
+	db "PATON@", TRAINERTYPE_NORMAL
 	db 26, PILOSWINE
 	db 26, PILOSWINE
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (11)
-	db "DARYL@"
-	db TRAINERTYPE_NORMAL
-
+	db "DARYL@", TRAINERTYPE_NORMAL
 	db 24, SHELLDER
 	db 25, CLOYSTER
 	db 24, SHELLDER
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (12)
-	db "WALTER@"
-	db TRAINERTYPE_NORMAL
-
+	db "WALTER@", TRAINERTYPE_NORMAL
 	db 15, HORSEA
 	db 15, HORSEA
 	db 20, SEADRA
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (13)
-	db "TONY@"
-	db TRAINERTYPE_NORMAL
-
+	db "TONY@", TRAINERTYPE_NORMAL
 	db 13, STARYU
 	db 18, STARMIE
 	db 16, HORSEA
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (14)
-	db "JEROME@"
-	db TRAINERTYPE_NORMAL
-
+	db "JEROME@", TRAINERTYPE_NORMAL
 	db 26, SEADRA
 	db 28, TENTACOOL
 	db 30, TENTACRUEL
 	db 28, GOLDEEN
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (15)
-	db "TUCKER@"
-	db TRAINERTYPE_NORMAL
-
+	db "TUCKER@", TRAINERTYPE_NORMAL
 	db 30, SHELLDER
 	db 34, CLOYSTER
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (16)
-	db "RICK@"
-	db TRAINERTYPE_NORMAL
-
+	db "RICK@", TRAINERTYPE_NORMAL
 	db 13, STARYU
 	db 18, STARMIE
 	db 16, HORSEA
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (17)
-	db "CAMERON@"
-	db TRAINERTYPE_NORMAL
-
+	db "CAMERON@", TRAINERTYPE_NORMAL
 	db 34, MARILL
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (18)
-	db "SETH@"
-	db TRAINERTYPE_NORMAL
-
+	db "SETH@", TRAINERTYPE_NORMAL
 	db 29, QUAGSIRE
 	db 29, OCTILLERY
 	db 32, QUAGSIRE
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (19)
-	db "JAMES@"
-	db TRAINERTYPE_NORMAL
-
+	db "JAMES@", TRAINERTYPE_NORMAL
 	db 13, STARYU
 	db 18, STARMIE
 	db 16, HORSEA
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (20)
-	db "LEWIS@"
-	db TRAINERTYPE_NORMAL
-
+	db "LEWIS@", TRAINERTYPE_NORMAL
 	db 13, STARYU
 	db 18, STARMIE
 	db 16, HORSEA
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (21)
-	db "PARKER@"
-	db TRAINERTYPE_NORMAL
-
+	db "PARKER@", TRAINERTYPE_NORMAL
 	db 32, HORSEA
 	db 32, HORSEA
 	db 35, SEADRA
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 SwimmerFGroup:
 ; ================================
-; ================
-
 	; SWIMMERF (1)
-	db "ELAINE@"
-	db TRAINERTYPE_NORMAL
-
+	db "ELAINE@", TRAINERTYPE_NORMAL
 	db 21, STARYU
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (2)
-	db "PAULA@"
-	db TRAINERTYPE_NORMAL
-
+	db "PAULA@", TRAINERTYPE_NORMAL
 	db 19, STARYU
 	db 19, SHELLDER
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (3)
-	db "KAYLEE@"
-	db TRAINERTYPE_NORMAL
-
+	db "KAYLEE@", TRAINERTYPE_NORMAL
 	db 18, GOLDEEN
 	db 20, GOLDEEN
 	db 20, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (4)
-	db "SUSIE@"
-	db TRAINERTYPE_MOVES
-
-	db 20, PSYDUCK
-	db SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
-
-	db 22, GOLDEEN
-	db PECK, TAIL_WHIP, SUPERSONIC, HORN_ATTACK
-
+	db "SUSIE@", TRAINERTYPE_MOVES
+	db 20, PSYDUCK, SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
+	db 22, GOLDEEN, PECK, TAIL_WHIP, SUPERSONIC, HORN_ATTACK
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (5)
-	db "DENISE@"
-	db TRAINERTYPE_NORMAL
-
+	db "DENISE@", TRAINERTYPE_NORMAL
 	db 22, SEEL
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (6)
-	db "KARA@"
-	db TRAINERTYPE_NORMAL
-
+	db "KARA@", TRAINERTYPE_NORMAL
 	db 20, STARYU
 	db 20, STARMIE
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (7)
-	db "WENDY@"
-	db TRAINERTYPE_MOVES
-
-	db 21, HORSEA
-	db BUBBLE, SMOKESCREEN, LEER, WATER_GUN
-
-	db 21, HORSEA
-	db DRAGON_RAGE, SMOKESCREEN, LEER, WATER_GUN
-
+	db "WENDY@", TRAINERTYPE_MOVES
+	db 21, HORSEA, BUBBLE, SMOKESCREEN, LEER, WATER_GUN
+	db 21, HORSEA, DRAGON_RAGE, SMOKESCREEN, LEER, WATER_GUN
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (8)
-	db "LISA@"
-	db TRAINERTYPE_NORMAL
-
+	db "LISA@", TRAINERTYPE_NORMAL
 	db 28, JYNX
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (9)
-	db "JILL@"
-	db TRAINERTYPE_NORMAL
-
+	db "JILL@", TRAINERTYPE_NORMAL
 	db 28, DEWGONG
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (10)
-	db "MARY@"
-	db TRAINERTYPE_NORMAL
-
+	db "MARY@", TRAINERTYPE_NORMAL
 	db 20, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (11)
-	db "KATIE@"
-	db TRAINERTYPE_NORMAL
-
+	db "KATIE@", TRAINERTYPE_NORMAL
 	db 33, DEWGONG
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (12)
-	db "DAWN@"
-	db TRAINERTYPE_NORMAL
-
+	db "DAWN@", TRAINERTYPE_NORMAL
 	db 34, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (13)
-	db "TARA@"
-	db TRAINERTYPE_NORMAL
-
+	db "TARA@", TRAINERTYPE_NORMAL
 	db 20, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (14)
-	db "NICOLE@"
-	db TRAINERTYPE_NORMAL
-
+	db "NICOLE@", TRAINERTYPE_NORMAL
 	db 29, MARILL
 	db 29, MARILL
 	db 32, LAPRAS
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (15)
-	db "LORI@"
-	db TRAINERTYPE_NORMAL
-
+	db "LORI@", TRAINERTYPE_NORMAL
 	db 32, STARMIE
 	db 32, STARMIE
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (16)
-	db "JODY@"
-	db TRAINERTYPE_NORMAL
-
+	db "JODY@", TRAINERTYPE_NORMAL
 	db 20, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (17)
-	db "NIKKI@"
-	db TRAINERTYPE_NORMAL
-
+	db "NIKKI@", TRAINERTYPE_NORMAL
 	db 28, SEEL
 	db 28, SEEL
 	db 28, SEEL
 	db 28, DEWGONG
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (18)
-	db "DIANA@"
-	db TRAINERTYPE_NORMAL
-
+	db "DIANA@", TRAINERTYPE_NORMAL
 	db 37, GOLDUCK
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (19)
-	db "BRIANA@"
-	db TRAINERTYPE_NORMAL
-
+	db "BRIANA@", TRAINERTYPE_NORMAL
 	db 35, SEAKING
 	db 35, SEAKING
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 SailorGroup:
 ; ================================
-; ================
-
 	; SAILOR (1)
-	db "EUGENE@"
-	db TRAINERTYPE_NORMAL
-
+	db "EUGENE@", TRAINERTYPE_NORMAL
 	db 17, POLIWHIRL
 	db 17, RATICATE
 	db 19, KRABBY
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (2)
-	db "HUEY@"
-	db TRAINERTYPE_NORMAL
-
+	db "HUEY@", TRAINERTYPE_NORMAL
 	db 18, POLIWAG
 	db 18, POLIWHIRL
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (3)
-	db "TERRELL@"
-	db TRAINERTYPE_NORMAL
-
+	db "TERRELL@", TRAINERTYPE_NORMAL
 	db 20, POLIWHIRL
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (4)
-	db "KENT@"
-	db TRAINERTYPE_MOVES
-
-	db 18, KRABBY
-	db BUBBLE, LEER, VICEGRIP, HARDEN
-
-	db 20, KRABBY
-	db BUBBLEBEAM, LEER, VICEGRIP, HARDEN
-
+	db "KENT@", TRAINERTYPE_MOVES
+	db 18, KRABBY, BUBBLE, LEER, VICEGRIP, HARDEN
+	db 20, KRABBY, BUBBLEBEAM, LEER, VICEGRIP, HARDEN
 	db -1 ; end
 
-; ================
-
 	; SAILOR (5)
-	db "ERNEST@"
-	db TRAINERTYPE_NORMAL
-
+	db "ERNEST@", TRAINERTYPE_NORMAL
 	db 18, MACHOP
 	db 18, MACHOP
 	db 18, POLIWHIRL
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (6)
-	db "JEFF@"
-	db TRAINERTYPE_NORMAL
-
+	db "JEFF@", TRAINERTYPE_NORMAL
 	db 32, RATICATE
 	db 32, RATICATE
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (7)
-	db "GARRETT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GARRETT@", TRAINERTYPE_NORMAL
 	db 34, KINGLER
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (8)
-	db "KENNETH@"
-	db TRAINERTYPE_NORMAL
-
+	db "KENNETH@", TRAINERTYPE_NORMAL
 	db 28, MACHOP
 	db 28, MACHOP
 	db 28, POLIWRATH
 	db 28, MACHOP
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (9)
-	db "STANLY@"
-	db TRAINERTYPE_NORMAL
-
+	db "STANLY@", TRAINERTYPE_NORMAL
 	db 31, MACHOP
 	db 33, MACHOKE
 	db 26, PSYDUCK
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (10)
-	db "HARRY@"
-	db TRAINERTYPE_NORMAL
-
+	db "HARRY@", TRAINERTYPE_NORMAL
 	db 19, WOOPER
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (11)
-	db "HUEY@"
-	db TRAINERTYPE_NORMAL
-
+	db "HUEY@", TRAINERTYPE_NORMAL
 	db 28, POLIWHIRL
 	db 28, POLIWHIRL
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (12)
-	db "HUEY@"
-	db TRAINERTYPE_NORMAL
-
+	db "HUEY@", TRAINERTYPE_NORMAL
 	db 34, POLIWHIRL
 	db 34, POLIWRATH
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (13)
-	db "HUEY@"
-	db TRAINERTYPE_MOVES
-
-	db 38, POLITOED
-	db WHIRLPOOL, RAIN_DANCE, BODY_SLAM, PERISH_SONG
-
-	db 38, POLIWRATH
-	db SURF, STRENGTH, ICE_PUNCH, SUBMISSION
-
+	db "HUEY@", TRAINERTYPE_MOVES
+	db 38, POLITOED, WHIRLPOOL, RAIN_DANCE, BODY_SLAM, PERISH_SONG
+	db 38, POLIWRATH, SURF, STRENGTH, ICE_PUNCH, SUBMISSION
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 SuperNerdGroup:
 ; ================================
-; ================
-
 	; SUPER_NERD (1)
-	db "STAN@"
-	db TRAINERTYPE_NORMAL
-
+	db "STAN@", TRAINERTYPE_NORMAL
 	db 20, GRIMER
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (2)
-	db "ERIC@"
-	db TRAINERTYPE_NORMAL
-
+	db "ERIC@", TRAINERTYPE_NORMAL
 	db 11, GRIMER
 	db 11, GRIMER
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (3)
-	db "GREGG@"
-	db TRAINERTYPE_NORMAL
-
+	db "GREGG@", TRAINERTYPE_NORMAL
 	db 20, MAGNEMITE
 	db 20, MAGNEMITE
 	db 20, MAGNEMITE
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (4)
-	db "JAY@"
-	db TRAINERTYPE_NORMAL
-
+	db "JAY@", TRAINERTYPE_NORMAL
 	db 22, KOFFING
 	db 22, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (5)
-	db "DAVE@"
-	db TRAINERTYPE_NORMAL
-
+	db "DAVE@", TRAINERTYPE_NORMAL
 	db 24, DITTO
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (6)
-	db "SAM@"
-	db TRAINERTYPE_NORMAL
-
+	db "SAM@", TRAINERTYPE_NORMAL
 	db 34, GRIMER
 	db 34, MUK
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (7)
-	db "TOM@"
-	db TRAINERTYPE_NORMAL
-
+	db "TOM@", TRAINERTYPE_NORMAL
 	db 32, MAGNEMITE
 	db 32, MAGNEMITE
 	db 32, MAGNEMITE
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (8)
-	db "PAT@"
-	db TRAINERTYPE_NORMAL
-
+	db "PAT@", TRAINERTYPE_NORMAL
 	db 36, PORYGON
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (9)
-	db "SHAWN@"
-	db TRAINERTYPE_NORMAL
-
+	db "SHAWN@", TRAINERTYPE_NORMAL
 	db 31, MAGNEMITE
 	db 33, MUK
 	db 31, MAGNEMITE
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (10)
-	db "TERU@"
-	db TRAINERTYPE_NORMAL
-
+	db "TERU@", TRAINERTYPE_NORMAL
 	db 7, MAGNEMITE
 	db 11, VOLTORB
 	db 7, MAGNEMITE
 	db 9, MAGNEMITE
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (11)
-	db "RUSS@"
-	db TRAINERTYPE_NORMAL
-
+	db "RUSS@", TRAINERTYPE_NORMAL
 	db 27, MAGNEMITE
 	db 27, MAGNEMITE
 	db 27, MAGNEMITE
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (12)
-	db "NORTON@"
-	db TRAINERTYPE_MOVES
-
-	db 30, PORYGON
-	db CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK
-
+	db "NORTON@", TRAINERTYPE_MOVES
+	db 30, PORYGON, CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (13)
-	db "HUGH@"
-	db TRAINERTYPE_MOVES
-
-	db 39, SEADRA
-	db SMOKESCREEN, TWISTER, SURF, WATERFALL
-
+	db "HUGH@", TRAINERTYPE_MOVES
+	db 39, SEADRA, SMOKESCREEN, TWISTER, SURF, WATERFALL
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (14)
-	db "MARKUS@"
-	db TRAINERTYPE_MOVES
-
-	db 19, SLOWPOKE
-	db CURSE, WATER_GUN, GROWL, STRENGTH
-
+	db "MARKUS@", TRAINERTYPE_MOVES
+	db 19, SLOWPOKE, CURSE, WATER_GUN, GROWL, STRENGTH
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 Rival2Group:
 ; ================================
-; ================
-
 	; RIVAL2 (1)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	db 41, SNEASEL
-	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
-
-	db 42, GOLBAT
-	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
-
-	db 41, MAGNETON
-	db THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
-
-	db 43, GENGAR
-	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
-
-	db 43, ALAKAZAM
-	db DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
-
-	db 45, MEGANIUM
-	db RAZOR_LEAF, POISONPOWDER, BODY_SLAM, LIGHT_SCREEN
-
+	db "?@", TRAINERTYPE_MOVES
+	db 41, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 42, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 41, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 43, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 43, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
+	db 45, MEGANIUM, RAZOR_LEAF, POISONPOWDER, BODY_SLAM, LIGHT_SCREEN
 	db -1 ; end
 
-; ================
-
 	; RIVAL2 (2)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	db 41, SNEASEL
-	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
-
-	db 42, GOLBAT
-	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
-
-	db 41, MAGNETON
-	db THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
-
-	db 43, GENGAR
-	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
-
-	db 43, ALAKAZAM
-	db DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
-
-	db 45, TYPHLOSION
-	db SMOKESCREEN, QUICK_ATTACK, FLAME_WHEEL, SWIFT
-
+	db "?@", TRAINERTYPE_MOVES
+	db 41, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 42, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 41, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 43, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 43, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
+	db 45, TYPHLOSION, SMOKESCREEN, QUICK_ATTACK, FLAME_WHEEL, SWIFT
 	db -1 ; end
 
-; ================
-
 	; RIVAL2 (3)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	db 41, SNEASEL
-	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
-
-	db 42, GOLBAT
-	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
-
-	db 41, MAGNETON
-	db THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
-
-	db 43, GENGAR
-	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
-
-	db 43, ALAKAZAM
-	db DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
-
-	db 45, FERALIGATR
-	db RAGE, WATER_GUN, SCARY_FACE, SLASH
-
+	db "?@", TRAINERTYPE_MOVES
+	db 41, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 42, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 41, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 43, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 43, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
+	db 45, FERALIGATR, RAGE, WATER_GUN, SCARY_FACE, SLASH
 	db -1 ; end
 
-; ================
-
 	; RIVAL2 (4)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	db 45, SNEASEL
-	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
-
-	db 48, CROBAT
-	db TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
-
-	db 45, MAGNETON
-	db THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
-
-	db 46, GENGAR
-	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
-
-	db 46, ALAKAZAM
-	db RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
-
-	db 50, MEGANIUM
-	db GIGA_DRAIN, BODY_SLAM, LIGHT_SCREEN, SAFEGUARD
-
+	db "?@", TRAINERTYPE_MOVES
+	db 45, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 48, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
+	db 45, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 46, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 46, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
+	db 50, MEGANIUM, GIGA_DRAIN, BODY_SLAM, LIGHT_SCREEN, SAFEGUARD
 	db -1 ; end
 
-; ================
-
 	; RIVAL2 (5)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	db 45, SNEASEL
-	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
-
-	db 48, CROBAT
-	db TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
-
-	db 45, MAGNETON
-	db THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
-
-	db 46, GENGAR
-	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
-
-	db 46, ALAKAZAM
-	db RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
-
-	db 50, TYPHLOSION
-	db SMOKESCREEN, QUICK_ATTACK, FIRE_BLAST, SWIFT
-
+	db "?@", TRAINERTYPE_MOVES
+	db 45, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 48, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
+	db 45, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 46, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 46, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
+	db 50, TYPHLOSION, SMOKESCREEN, QUICK_ATTACK, FIRE_BLAST, SWIFT
 	db -1 ; end
 
-; ================
-
 	; RIVAL2 (6)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	db 45, SNEASEL
-	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
-
-	db 48, CROBAT
-	db TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
-
-	db 45, MAGNETON
-	db THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
-
-	db 46, GENGAR
-	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
-
-	db 46, ALAKAZAM
-	db RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
-
-	db 50, FERALIGATR
-	db SURF, RAIN_DANCE, SLASH, SCREECH
-
+	db "?@", TRAINERTYPE_MOVES
+	db 45, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 48, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
+	db 45, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 46, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 46, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
+	db 50, FERALIGATR, SURF, RAIN_DANCE, SLASH, SCREECH
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 GuitaristGroup:
 ; ================================
-; ================
-
 	; GUITARIST (1)
-	db "CLYDE@"
-	db TRAINERTYPE_NORMAL
-
+	db "CLYDE@", TRAINERTYPE_NORMAL
 	db 34, ELECTABUZZ
-
 	db -1 ; end
 
-; ================
-
 	; GUITARIST (2)
-	db "VINCENT@"
-	db TRAINERTYPE_NORMAL
-
+	db "VINCENT@", TRAINERTYPE_NORMAL
 	db 27, MAGNEMITE
 	db 33, VOLTORB
 	db 32, MAGNEMITE
 	db 32, MAGNEMITE
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 HikerGroup:
 ; ================================
-; ================
-
 	; HIKER (1)
-	db "ANTHONY@"
-	db TRAINERTYPE_NORMAL
-
+	db "ANTHONY@", TRAINERTYPE_NORMAL
 	db 16, GEODUDE
 	db 18, MACHAMP
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (2)
-	db "RUSSELL@"
-	db TRAINERTYPE_NORMAL
-
+	db "RUSSELL@", TRAINERTYPE_NORMAL
 	db 4, GEODUDE
 	db 6, GEODUDE
 	db 8, GEODUDE
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (3)
-	db "PHILLIP@"
-	db TRAINERTYPE_NORMAL
-
+	db "PHILLIP@", TRAINERTYPE_NORMAL
 	db 23, GEODUDE
 	db 23, GEODUDE
 	db 23, GRAVELER
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (4)
-	db "LEONARD@"
-	db TRAINERTYPE_NORMAL
-
+	db "LEONARD@", TRAINERTYPE_NORMAL
 	db 23, GEODUDE
 	db 25, MACHOP
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (5)
-	db "ANTHONY@"
-	db TRAINERTYPE_NORMAL
-
+	db "ANTHONY@", TRAINERTYPE_NORMAL
 	db 11, GEODUDE
 	db 11, MACHOP
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (6)
-	db "BENJAMIN@"
-	db TRAINERTYPE_NORMAL
-
+	db "BENJAMIN@", TRAINERTYPE_NORMAL
 	db 14, DIGLETT
 	db 14, GEODUDE
 	db 16, DUGTRIO
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (7)
-	db "ERIK@"
-	db TRAINERTYPE_NORMAL
-
+	db "ERIK@", TRAINERTYPE_NORMAL
 	db 24, MACHOP
 	db 27, GRAVELER
 	db 27, MACHOP
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (8)
-	db "MICHAEL@"
-	db TRAINERTYPE_NORMAL
-
+	db "MICHAEL@", TRAINERTYPE_NORMAL
 	db 25, GEODUDE
 	db 25, GRAVELER
 	db 25, GOLEM
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (9)
-	db "PARRY@"
-	db TRAINERTYPE_NORMAL
-
+	db "PARRY@", TRAINERTYPE_NORMAL
 	db 35, ONIX
 	db 33, SWINUB
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (10)
-	db "TIMOTHY@"
-	db TRAINERTYPE_MOVES
-
-	db 27, DIGLETT
-	db MAGNITUDE, DIG, SAND_ATTACK, SLASH
-
-	db 27, DUGTRIO
-	db MAGNITUDE, DIG, SAND_ATTACK, SLASH
-
+	db "TIMOTHY@", TRAINERTYPE_MOVES
+	db 27, DIGLETT, MAGNITUDE, DIG, SAND_ATTACK, SLASH
+	db 27, DUGTRIO, MAGNITUDE, DIG, SAND_ATTACK, SLASH
 	db -1 ; end
 
-; ================
-
 	; HIKER (11)
-	db "BAILEY@"
-	db TRAINERTYPE_NORMAL
-
+	db "BAILEY@", TRAINERTYPE_NORMAL
 	db 13, GEODUDE
 	db 13, GEODUDE
 	db 13, GEODUDE
 	db 13, GEODUDE
 	db 13, GEODUDE
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (12)
-	db "ANTHONY@"
-	db TRAINERTYPE_NORMAL
-
+	db "ANTHONY@", TRAINERTYPE_NORMAL
 	db 25, GRAVELER
 	db 27, GRAVELER
 	db 29, MACHOKE
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (13)
-	db "TIM@"
-	db TRAINERTYPE_NORMAL
-
+	db "TIM@", TRAINERTYPE_NORMAL
 	db 31, GRAVELER
 	db 31, GRAVELER
 	db 31, GRAVELER
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (14)
-	db "NOLAND@"
-	db TRAINERTYPE_NORMAL
-
+	db "NOLAND@", TRAINERTYPE_NORMAL
 	db 31, SANDSLASH
 	db 33, GOLEM
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (15)
-	db "SIDNEY@"
-	db TRAINERTYPE_NORMAL
-
+	db "SIDNEY@", TRAINERTYPE_NORMAL
 	db 34, DUGTRIO
 	db 32, ONIX
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (16)
-	db "KENNY@"
-	db TRAINERTYPE_NORMAL
-
+	db "KENNY@", TRAINERTYPE_NORMAL
 	db 27, SANDSLASH
 	db 29, GRAVELER
 	db 31, GOLEM
 	db 29, GRAVELER
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (17)
-	db "JIM@"
-	db TRAINERTYPE_NORMAL
-
+	db "JIM@", TRAINERTYPE_NORMAL
 	db 35, MACHAMP
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (18)
-	db "DANIEL@"
-	db TRAINERTYPE_NORMAL
-
+	db "DANIEL@", TRAINERTYPE_NORMAL
 	db 11, ONIX
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (19)
-	db "PARRY@"
-	db TRAINERTYPE_MOVES
-
-	db 35, PILOSWINE
-	db EARTHQUAKE, BLIZZARD, REST, TAKE_DOWN
-
-	db 35, DUGTRIO
-	db MAGNITUDE, DIG, MUD_SLAP, SLASH
-
-	db 38, STEELIX
-	db DIG, IRON_TAIL, SANDSTORM, SLAM
-
+	db "PARRY@", TRAINERTYPE_MOVES
+	db 35, PILOSWINE, EARTHQUAKE, BLIZZARD, REST, TAKE_DOWN
+	db 35, DUGTRIO, MAGNITUDE, DIG, MUD_SLAP, SLASH
+	db 38, STEELIX, DIG, IRON_TAIL, SANDSTORM, SLAM
 	db -1 ; end
 
-; ================
-
 	; HIKER (20)
-	db "PARRY@"
-	db TRAINERTYPE_NORMAL
-
+	db "PARRY@", TRAINERTYPE_NORMAL
 	db 29, ONIX
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (21)
-	db "ANTHONY@"
-	db TRAINERTYPE_NORMAL
-
+	db "ANTHONY@", TRAINERTYPE_NORMAL
 	db 30, GRAVELER
 	db 30, GRAVELER
 	db 32, MACHOKE
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (22)
-	db "ANTHONY@"
-	db TRAINERTYPE_MOVES
-
-	db 34, GRAVELER
-	db MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT
-
-	db 36, GOLEM
-	db MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT
-
-	db 34, MACHOKE
-	db KARATE_CHOP, VITAL_THROW, HEADBUTT, DIG
-
+	db "ANTHONY@", TRAINERTYPE_MOVES
+	db 34, GRAVELER, MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT
+	db 36, GOLEM, MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT
+	db 34, MACHOKE, KARATE_CHOP, VITAL_THROW, HEADBUTT, DIG
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 BikerGroup:
 ; ================================
-; ================
-
 	; BIKER (1)
-	db "BENNY@"
-	db TRAINERTYPE_NORMAL
-
+	db "BENNY@", TRAINERTYPE_NORMAL
 	db 20, KOFFING
 	db 20, KOFFING
 	db 20, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; BIKER (2)
-	db "KAZU@"
-	db TRAINERTYPE_NORMAL
-
+	db "KAZU@", TRAINERTYPE_NORMAL
 	db 20, KOFFING
 	db 20, KOFFING
 	db 20, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; BIKER (3)
-	db "DWAYNE@"
-	db TRAINERTYPE_NORMAL
-
+	db "DWAYNE@", TRAINERTYPE_NORMAL
 	db 27, KOFFING
 	db 28, KOFFING
 	db 29, KOFFING
 	db 30, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; BIKER (4)
-	db "HARRIS@"
-	db TRAINERTYPE_NORMAL
-
+	db "HARRIS@", TRAINERTYPE_NORMAL
 	db 34, FLAREON
-
 	db -1 ; end
 
-; ================
-
 	; BIKER (5)
-	db "ZEKE@"
-	db TRAINERTYPE_NORMAL
-
+	db "ZEKE@", TRAINERTYPE_NORMAL
 	db 32, KOFFING
 	db 32, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; BIKER (6)
-	db "CHARLES@"
-	db TRAINERTYPE_NORMAL
-
+	db "CHARLES@", TRAINERTYPE_NORMAL
 	db 30, KOFFING
 	db 30, CHARMELEON
 	db 30, WEEZING
-
 	db -1 ; end
 
-; ================
-
 	; BIKER (7)
-	db "RILEY@"
-	db TRAINERTYPE_NORMAL
-
+	db "RILEY@", TRAINERTYPE_NORMAL
 	db 34, WEEZING
-
 	db -1 ; end
 
-; ================
-
 	; BIKER (8)
-	db "JOEL@"
-	db TRAINERTYPE_NORMAL
-
+	db "JOEL@", TRAINERTYPE_NORMAL
 	db 32, MAGMAR
 	db 32, MAGMAR
-
 	db -1 ; end
 
-; ================
-
 	; BIKER (9)
-	db "GLENN@"
-	db TRAINERTYPE_NORMAL
-
+	db "GLENN@", TRAINERTYPE_NORMAL
 	db 28, KOFFING
 	db 30, MAGMAR
 	db 32, WEEZING
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 BlaineGroup:
 ; ================================
-; ================
-
 	; BLAINE (1)
-	db "BLAINE@"
-	db TRAINERTYPE_MOVES
-
-	db 45, MAGCARGO
-	db CURSE, SMOG, FLAMETHROWER, ROCK_SLIDE
-
-	db 45, MAGMAR
-	db THUNDERPUNCH, FIRE_PUNCH, SUNNY_DAY, CONFUSE_RAY
-
-	db 50, RAPIDASH
-	db QUICK_ATTACK, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST
-
+	db "BLAINE@", TRAINERTYPE_MOVES
+	db 45, MAGCARGO, CURSE, SMOG, FLAMETHROWER, ROCK_SLIDE
+	db 45, MAGMAR, THUNDERPUNCH, FIRE_PUNCH, SUNNY_DAY, CONFUSE_RAY
+	db 50, RAPIDASH, QUICK_ATTACK, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 BurglarGroup:
 ; ================================
-; ================
-
 	; BURGLAR (1)
-	db "DUNCAN@"
-	db TRAINERTYPE_NORMAL
-
+	db "DUNCAN@", TRAINERTYPE_NORMAL
 	db 23, KOFFING
 	db 25, MAGMAR
 	db 23, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; BURGLAR (2)
-	db "EDDIE@"
-	db TRAINERTYPE_MOVES
-
-	db 26, GROWLITHE
-	db ROAR, EMBER, LEER, TAKE_DOWN
-
-	db 24, KOFFING
-	db TACKLE, SMOG, SLUDGE, SMOKESCREEN
-
+	db "EDDIE@", TRAINERTYPE_MOVES
+	db 26, GROWLITHE, ROAR, EMBER, LEER, TAKE_DOWN
+	db 24, KOFFING, TACKLE, SMOG, SLUDGE, SMOKESCREEN
 	db -1 ; end
 
-; ================
-
 	; BURGLAR (3)
-	db "COREY@"
-	db TRAINERTYPE_NORMAL
-
+	db "COREY@", TRAINERTYPE_NORMAL
 	db 25, KOFFING
 	db 28, MAGMAR
 	db 25, KOFFING
 	db 30, KOFFING
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 FirebreatherGroup:
 ; ================================
-; ================
-
 	; FIREBREATHER (1)
-	db "OTIS@"
-	db TRAINERTYPE_NORMAL
-
+	db "OTIS@", TRAINERTYPE_NORMAL
 	db 29, MAGMAR
 	db 32, WEEZING
 	db 29, MAGMAR
-
 	db -1 ; end
 
-; ================
-
 	; FIREBREATHER (2)
-	db "DICK@"
-	db TRAINERTYPE_NORMAL
-
+	db "DICK@", TRAINERTYPE_NORMAL
 	db 17, CHARMELEON
-
 	db -1 ; end
 
-; ================
-
 	; FIREBREATHER (3)
-	db "NED@"
-	db TRAINERTYPE_NORMAL
-
+	db "NED@", TRAINERTYPE_NORMAL
 	db 15, KOFFING
 	db 16, GROWLITHE
 	db 15, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; FIREBREATHER (4)
-	db "BURT@"
-	db TRAINERTYPE_NORMAL
-
+	db "BURT@", TRAINERTYPE_NORMAL
 	db 32, KOFFING
 	db 32, SLUGMA
-
 	db -1 ; end
 
-; ================
-
 	; FIREBREATHER (5)
-	db "BILL@"
-	db TRAINERTYPE_NORMAL
-
+	db "BILL@", TRAINERTYPE_NORMAL
 	db 6, KOFFING
 	db 6, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; FIREBREATHER (6)
-	db "WALT@"
-	db TRAINERTYPE_NORMAL
-
+	db "WALT@", TRAINERTYPE_NORMAL
 	db 11, MAGMAR
 	db 13, MAGMAR
-
 	db -1 ; end
 
-; ================
-
 	; FIREBREATHER (7)
-	db "RAY@"
-	db TRAINERTYPE_NORMAL
-
+	db "RAY@", TRAINERTYPE_NORMAL
 	db 9, VULPIX
-
 	db -1 ; end
 
-; ================
-
 	; FIREBREATHER (8)
-	db "LYLE@"
-	db TRAINERTYPE_NORMAL
-
+	db "LYLE@", TRAINERTYPE_NORMAL
 	db 28, KOFFING
 	db 31, FLAREON
 	db 28, KOFFING
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 JugglerGroup:
 ; ================================
-; ================
-
 	; JUGGLER (1)
-	db "IRWIN@"
-	db TRAINERTYPE_NORMAL
-
+	db "IRWIN@", TRAINERTYPE_NORMAL
 	db 2, VOLTORB
 	db 6, VOLTORB
 	db 10, VOLTORB
 	db 14, VOLTORB
-
 	db -1 ; end
 
-; ================
-
 	; JUGGLER (2)
-	db "FRITZ@"
-	db TRAINERTYPE_NORMAL
-
+	db "FRITZ@", TRAINERTYPE_NORMAL
 	db 29, MR__MIME
 	db 29, MAGMAR
 	db 29, MACHOKE
-
 	db -1 ; end
 
-; ================
-
 	; JUGGLER (3)
-	db "HORTON@"
-	db TRAINERTYPE_NORMAL
-
+	db "HORTON@", TRAINERTYPE_NORMAL
 	db 33, ELECTRODE
 	db 33, ELECTRODE
 	db 33, ELECTRODE
 	db 33, ELECTRODE
-
 	db -1 ; end
 
-; ================
-
 	; JUGGLER (4)
-	db "IRWIN@"
-	db TRAINERTYPE_NORMAL
-
+	db "IRWIN@", TRAINERTYPE_NORMAL
 	db 6, VOLTORB
 	db 10, VOLTORB
 	db 14, VOLTORB
 	db 18, VOLTORB
-
 	db -1 ; end
 
-; ================
-
 	; JUGGLER (5)
-	db "IRWIN@"
-	db TRAINERTYPE_NORMAL
-
+	db "IRWIN@", TRAINERTYPE_NORMAL
 	db 18, VOLTORB
 	db 22, VOLTORB
 	db 26, VOLTORB
 	db 30, ELECTRODE
-
 	db -1 ; end
 
-; ================
-
 	; JUGGLER (6)
-	db "IRWIN@"
-	db TRAINERTYPE_NORMAL
-
+	db "IRWIN@", TRAINERTYPE_NORMAL
 	db 18, VOLTORB
 	db 22, VOLTORB
 	db 26, VOLTORB
 	db 30, ELECTRODE
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 BlackbeltGroup:
 ; ================================
-; ================
-
 	; BLACKBELT_T (1)
-	db "KENJI@"
-	db TRAINERTYPE_NORMAL
-
+	db "KENJI@", TRAINERTYPE_NORMAL
 	db 27, ONIX
 	db 30, HITMONLEE
 	db 27, ONIX
 	db 32, MACHOKE
-
 	db -1 ; end
 
-; ================
-
 	; BLACKBELT_T (2)
-	db "YOSHI@"
-	db TRAINERTYPE_MOVES
-
-	db 27, HITMONLEE
-	db DOUBLE_KICK, MEDITATE, JUMP_KICK, FOCUS_ENERGY
-
+	db "YOSHI@", TRAINERTYPE_MOVES
+	db 27, HITMONLEE, DOUBLE_KICK, MEDITATE, JUMP_KICK, FOCUS_ENERGY
 	db -1 ; end
 
-; ================
-
 	; BLACKBELT_T (3)
-	db "KENJI@"
-	db TRAINERTYPE_MOVES
-
-	db 33, ONIX
-	db BIND, ROCK_THROW, TOXIC, DIG
-
-	db 38, MACHAMP
-	db HEADBUTT, SWAGGER, THUNDERPUNCH, VITAL_THROW
-
-	db 33, STEELIX
-	db EARTHQUAKE, ROCK_THROW, IRON_TAIL, SANDSTORM
-
-	db 36, HITMONLEE
-	db DOUBLE_TEAM, HI_JUMP_KICK, MUD_SLAP, SWIFT
-
+	db "KENJI@", TRAINERTYPE_MOVES
+	db 33, ONIX, BIND, ROCK_THROW, TOXIC, DIG
+	db 38, MACHAMP, HEADBUTT, SWAGGER, THUNDERPUNCH, VITAL_THROW
+	db 33, STEELIX, EARTHQUAKE, ROCK_THROW, IRON_TAIL, SANDSTORM
+	db 36, HITMONLEE, DOUBLE_TEAM, HI_JUMP_KICK, MUD_SLAP, SWIFT
 	db -1 ; end
 
-; ================
-
 	; BLACKBELT_T (4)
-	db "LAO@"
-	db TRAINERTYPE_MOVES
-
-	db 27, HITMONCHAN
-	db COMET_PUNCH, THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH
-
+	db "LAO@", TRAINERTYPE_MOVES
+	db 27, HITMONCHAN, COMET_PUNCH, THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH
 	db -1 ; end
 
-; ================
-
 	; BLACKBELT_T (5)
-	db "NOB@"
-	db TRAINERTYPE_MOVES
-
-	db 25, MACHOP
-	db LEER, FOCUS_ENERGY, KARATE_CHOP, SEISMIC_TOSS
-
-	db 25, MACHOKE
-	db LEER, KARATE_CHOP, SEISMIC_TOSS, ROCK_SLIDE
-
+	db "NOB@", TRAINERTYPE_MOVES
+	db 25, MACHOP, LEER, FOCUS_ENERGY, KARATE_CHOP, SEISMIC_TOSS
+	db 25, MACHOKE, LEER, KARATE_CHOP, SEISMIC_TOSS, ROCK_SLIDE
 	db -1 ; end
 
-; ================
-
 	; BLACKBELT_T (6)
-	db "KIYO@"
-	db TRAINERTYPE_NORMAL
-
+	db "KIYO@", TRAINERTYPE_NORMAL
 	db 34, HITMONLEE
 	db 34, HITMONCHAN
-
 	db -1 ; end
 
-; ================
-
 	; BLACKBELT_T (7)
-	db "LUNG@"
-	db TRAINERTYPE_NORMAL
-
+	db "LUNG@", TRAINERTYPE_NORMAL
 	db 23, MANKEY
 	db 23, MANKEY
 	db 25, PRIMEAPE
-
 	db -1 ; end
 
-; ================
-
 	; BLACKBELT_T (8)
-	db "KENJI@"
-	db TRAINERTYPE_NORMAL
-
+	db "KENJI@", TRAINERTYPE_NORMAL
 	db 28, MACHOKE
-
 	db -1 ; end
 
-; ================
-
 	; BLACKBELT_T (9)
-	db "WAI@"
-	db TRAINERTYPE_NORMAL
-
+	db "WAI@", TRAINERTYPE_NORMAL
 	db 30, MACHOKE
 	db 32, MACHOKE
 	db 34, MACHOKE
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 ExecutiveMGroup:
 ; ================================
-; ================
-
 	; EXECUTIVEM (1)
-	db "EXECUTIVE@"
-	db TRAINERTYPE_MOVES
-
-	db 33, HOUNDOUR
-	db EMBER, ROAR, BITE, FAINT_ATTACK
-
-	db 33, KOFFING
-	db TACKLE, SLUDGE, SMOKESCREEN, HAZE
-
-	db 35, HOUNDOOM
-	db EMBER, SMOG, BITE, FAINT_ATTACK
-
+	db "EXECUTIVE@", TRAINERTYPE_MOVES
+	db 33, HOUNDOUR, EMBER, ROAR, BITE, FAINT_ATTACK
+	db 33, KOFFING, TACKLE, SLUDGE, SMOKESCREEN, HAZE
+	db 35, HOUNDOOM, EMBER, SMOG, BITE, FAINT_ATTACK
 	db -1 ; end
 
-; ================
-
 	; EXECUTIVEM (2)
-	db "EXECUTIVE@"
-	db TRAINERTYPE_MOVES
-
-	db 36, GOLBAT
-	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
-
+	db "EXECUTIVE@", TRAINERTYPE_MOVES
+	db 36, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 	db -1 ; end
 
-; ================
-
 	; EXECUTIVEM (3)
-	db "EXECUTIVE@"
-	db TRAINERTYPE_MOVES
-
-	db 30, KOFFING
-	db TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
-
-	db 30, KOFFING
-	db TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
-
-	db 30, KOFFING
-	db TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
-
-	db 32, WEEZING
-	db TACKLE, EXPLOSION, SLUDGE, SMOKESCREEN
-
-	db 30, KOFFING
-	db TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
-
-	db 30, KOFFING
-	db TACKLE, SMOG, SLUDGE, SMOKESCREEN
-
+	db "EXECUTIVE@", TRAINERTYPE_MOVES
+	db 30, KOFFING, TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
+	db 30, KOFFING, TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
+	db 30, KOFFING, TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
+	db 32, WEEZING, TACKLE, EXPLOSION, SLUDGE, SMOKESCREEN
+	db 30, KOFFING, TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
+	db 30, KOFFING, TACKLE, SMOG, SLUDGE, SMOKESCREEN
 	db -1 ; end
 
-; ================
-
 	; EXECUTIVEM (4)
-	db "EXECUTIVE@"
-	db TRAINERTYPE_NORMAL
-
+	db "EXECUTIVE@", TRAINERTYPE_NORMAL
 	db 22, ZUBAT
 	db 24, RATICATE
 	db 22, KOFFING
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 PsychicGroup:
 ; ================================
-; ================
-
 	; PSYCHIC_T (1)
-	db "NATHAN@"
-	db TRAINERTYPE_NORMAL
-
+	db "NATHAN@", TRAINERTYPE_NORMAL
 	db 26, GIRAFARIG
-
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (2)
-	db "FRANKLIN@"
-	db TRAINERTYPE_NORMAL
-
+	db "FRANKLIN@", TRAINERTYPE_NORMAL
 	db 37, KADABRA
-
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (3)
-	db "HERMAN@"
-	db TRAINERTYPE_NORMAL
-
+	db "HERMAN@", TRAINERTYPE_NORMAL
 	db 30, EXEGGCUTE
 	db 30, EXEGGCUTE
 	db 30, EXEGGUTOR
-
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (4)
-	db "FIDEL@"
-	db TRAINERTYPE_NORMAL
-
+	db "FIDEL@", TRAINERTYPE_NORMAL
 	db 34, XATU
-
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (5)
-	db "GREG@"
-	db TRAINERTYPE_MOVES
-
-	db 17, DROWZEE
-	db HYPNOSIS, DISABLE, DREAM_EATER, NO_MOVE
-
+	db "GREG@", TRAINERTYPE_MOVES
+	db 17, DROWZEE, HYPNOSIS, DISABLE, DREAM_EATER, NO_MOVE
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (6)
-	db "NORMAN@"
-	db TRAINERTYPE_MOVES
-
-	db 17, SLOWPOKE
-	db TACKLE, GROWL, WATER_GUN, NO_MOVE
-
-	db 20, SLOWPOKE
-	db CURSE, BODY_SLAM, WATER_GUN, CONFUSION
-
+	db "NORMAN@", TRAINERTYPE_MOVES
+	db 17, SLOWPOKE, TACKLE, GROWL, WATER_GUN, NO_MOVE
+	db 20, SLOWPOKE, CURSE, BODY_SLAM, WATER_GUN, CONFUSION
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (7)
-	db "MARK@"
-	db TRAINERTYPE_MOVES
-
-	db 13, ABRA
-	db TELEPORT, FLASH, NO_MOVE, NO_MOVE
-
-	db 13, ABRA
-	db TELEPORT, FLASH, NO_MOVE, NO_MOVE
-
-	db 15, KADABRA
-	db TELEPORT, KINESIS, CONFUSION, NO_MOVE
-
+	db "MARK@", TRAINERTYPE_MOVES
+	db 13, ABRA, TELEPORT, FLASH, NO_MOVE, NO_MOVE
+	db 13, ABRA, TELEPORT, FLASH, NO_MOVE, NO_MOVE
+	db 15, KADABRA, TELEPORT, KINESIS, CONFUSION, NO_MOVE
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (8)
-	db "PHIL@"
-	db TRAINERTYPE_MOVES
-
-	db 24, NATU
-	db LEER, NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY
-
-	db 26, KADABRA
-	db DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
-
+	db "PHIL@", TRAINERTYPE_MOVES
+	db 24, NATU, LEER, NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY
+	db 26, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (9)
-	db "RICHARD@"
-	db TRAINERTYPE_NORMAL
-
+	db "RICHARD@", TRAINERTYPE_NORMAL
 	db 36, ESPEON
-
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (10)
-	db "GILBERT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GILBERT@", TRAINERTYPE_NORMAL
 	db 30, STARMIE
 	db 30, EXEGGCUTE
 	db 34, GIRAFARIG
-
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (11)
-	db "JARED@"
-	db TRAINERTYPE_NORMAL
-
+	db "JARED@", TRAINERTYPE_NORMAL
 	db 32, MR__MIME
 	db 32, EXEGGCUTE
 	db 35, EXEGGCUTE
-
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (12)
-	db "RODNEY@"
-	db TRAINERTYPE_NORMAL
-
+	db "RODNEY@", TRAINERTYPE_NORMAL
 	db 29, DROWZEE
 	db 33, HYPNO
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 PicnickerGroup:
 ; ================================
-; ================
-
 	; PICNICKER (1)
-	db "LIZ@"
-	db TRAINERTYPE_NORMAL
-
+	db "LIZ@", TRAINERTYPE_NORMAL
 	db 9, NIDORAN_F
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (2)
-	db "GINA@"
-	db TRAINERTYPE_NORMAL
-
+	db "GINA@", TRAINERTYPE_NORMAL
 	db 9, HOPPIP
 	db 9, HOPPIP
 	db 12, BULBASAUR
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (3)
-	db "BROOKE@"
-	db TRAINERTYPE_MOVES
-
-	db 16, PIKACHU
-	db THUNDERSHOCK, GROWL, QUICK_ATTACK, DOUBLE_TEAM
-
+	db "BROOKE@", TRAINERTYPE_MOVES
+	db 16, PIKACHU, THUNDERSHOCK, GROWL, QUICK_ATTACK, DOUBLE_TEAM
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (4)
-	db "KIM@"
-	db TRAINERTYPE_NORMAL
-
+	db "KIM@", TRAINERTYPE_NORMAL
 	db 15, VULPIX
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (5)
-	db "CINDY@"
-	db TRAINERTYPE_NORMAL
-
+	db "CINDY@", TRAINERTYPE_NORMAL
 	db 36, NIDOQUEEN
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (6)
-	db "HOPE@"
-	db TRAINERTYPE_NORMAL
-
+	db "HOPE@", TRAINERTYPE_NORMAL
 	db 34, FLAAFFY
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (7)
-	db "SHARON@"
-	db TRAINERTYPE_NORMAL
-
+	db "SHARON@", TRAINERTYPE_NORMAL
 	db 31, FURRET
 	db 33, RAPIDASH
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (8)
-	db "DEBRA@"
-	db TRAINERTYPE_NORMAL
-
+	db "DEBRA@", TRAINERTYPE_NORMAL
 	db 33, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (9)
-	db "GINA@"
-	db TRAINERTYPE_NORMAL
-
+	db "GINA@", TRAINERTYPE_NORMAL
 	db 14, HOPPIP
 	db 14, HOPPIP
 	db 17, IVYSAUR
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (10)
-	db "ERIN@"
-	db TRAINERTYPE_NORMAL
-
+	db "ERIN@", TRAINERTYPE_NORMAL
 	db 16, PONYTA
 	db 16, PONYTA
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (11)
-	db "LIZ@"
-	db TRAINERTYPE_NORMAL
-
+	db "LIZ@", TRAINERTYPE_NORMAL
 	db 15, WEEPINBELL
 	db 15, NIDORINA
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (12)
-	db "LIZ@"
-	db TRAINERTYPE_NORMAL
-
+	db "LIZ@", TRAINERTYPE_NORMAL
 	db 19, WEEPINBELL
 	db 19, NIDORINO
 	db 21, NIDOQUEEN
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (13)
-	db "HEIDI@"
-	db TRAINERTYPE_NORMAL
-
+	db "HEIDI@", TRAINERTYPE_NORMAL
 	db 32, SKIPLOOM
 	db 32, SKIPLOOM
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (14)
-	db "EDNA@"
-	db TRAINERTYPE_NORMAL
-
+	db "EDNA@", TRAINERTYPE_NORMAL
 	db 30, NIDORINA
 	db 34, RAICHU
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (15)
-	db "GINA@"
-	db TRAINERTYPE_NORMAL
-
+	db "GINA@", TRAINERTYPE_NORMAL
 	db 26, SKIPLOOM
 	db 26, SKIPLOOM
 	db 29, IVYSAUR
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (16)
-	db "TIFFANY@"
-	db TRAINERTYPE_MOVES
-
-	db 31, CLEFAIRY
-	db ENCORE, SING, DOUBLESLAP, MINIMIZE
-
+	db "TIFFANY@", TRAINERTYPE_MOVES
+	db 31, CLEFAIRY, ENCORE, SING, DOUBLESLAP, MINIMIZE
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (17)
-	db "TIFFANY@"
-	db TRAINERTYPE_MOVES
-
-	db 37, CLEFAIRY
-	db ENCORE, DOUBLESLAP, MINIMIZE, METRONOME
-
+	db "TIFFANY@", TRAINERTYPE_MOVES
+	db 37, CLEFAIRY, ENCORE, DOUBLESLAP, MINIMIZE, METRONOME
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (18)
-	db "ERIN@"
-	db TRAINERTYPE_NORMAL
-
+	db "ERIN@", TRAINERTYPE_NORMAL
 	db 32, PONYTA
 	db 32, PONYTA
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (19)
-	db "TANYA@"
-	db TRAINERTYPE_NORMAL
-
+	db "TANYA@", TRAINERTYPE_NORMAL
 	db 37, EXEGGUTOR
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (20)
-	db "TIFFANY@"
-	db TRAINERTYPE_MOVES
-
-	db 20, CLEFAIRY
-	db ENCORE, SING, DOUBLESLAP, MINIMIZE
-
+	db "TIFFANY@", TRAINERTYPE_MOVES
+	db 20, CLEFAIRY, ENCORE, SING, DOUBLESLAP, MINIMIZE
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (21)
-	db "ERIN@"
-	db TRAINERTYPE_MOVES
-
-	db 36, PONYTA
-	db DOUBLE_TEAM, STOMP, FIRE_SPIN, SUNNY_DAY
-
-	db 34, RAICHU
-	db SWIFT, MUD_SLAP, QUICK_ATTACK, THUNDERBOLT
-
-	db 36, PONYTA
-	db DOUBLE_TEAM, STOMP, FIRE_SPIN, SUNNY_DAY
-
+	db "ERIN@", TRAINERTYPE_MOVES
+	db 36, PONYTA, DOUBLE_TEAM, STOMP, FIRE_SPIN, SUNNY_DAY
+	db 34, RAICHU, SWIFT, MUD_SLAP, QUICK_ATTACK, THUNDERBOLT
+	db 36, PONYTA, DOUBLE_TEAM, STOMP, FIRE_SPIN, SUNNY_DAY
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (22)
-	db "LIZ@"
-	db TRAINERTYPE_NORMAL
-
+	db "LIZ@", TRAINERTYPE_NORMAL
 	db 24, WEEPINBELL
 	db 26, NIDORINO
 	db 26, NIDOQUEEN
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (23)
-	db "LIZ@"
-	db TRAINERTYPE_MOVES
-
-	db 30, WEEPINBELL
-	db SLEEP_POWDER, POISONPOWDER, STUN_SPORE, SLUDGE_BOMB
-
-	db 32, NIDOKING
-	db EARTHQUAKE, DOUBLE_KICK, POISON_STING, IRON_TAIL
-
-	db 32, NIDOQUEEN
-	db EARTHQUAKE, DOUBLE_KICK, TAIL_WHIP, BODY_SLAM
-
+	db "LIZ@", TRAINERTYPE_MOVES
+	db 30, WEEPINBELL, SLEEP_POWDER, POISONPOWDER, STUN_SPORE, SLUDGE_BOMB
+	db 32, NIDOKING, EARTHQUAKE, DOUBLE_KICK, POISON_STING, IRON_TAIL
+	db 32, NIDOQUEEN, EARTHQUAKE, DOUBLE_KICK, TAIL_WHIP, BODY_SLAM
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (24)
-	db "GINA@"
-	db TRAINERTYPE_NORMAL
-
+	db "GINA@", TRAINERTYPE_NORMAL
 	db 30, SKIPLOOM
 	db 30, SKIPLOOM
 	db 32, IVYSAUR
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (25)
-	db "GINA@"
-	db TRAINERTYPE_MOVES
-
-	db 33, JUMPLUFF
-	db STUN_SPORE, SUNNY_DAY, LEECH_SEED, COTTON_SPORE
-
-	db 33, JUMPLUFF
-	db SUNNY_DAY, SLEEP_POWDER, LEECH_SEED, COTTON_SPORE
-
-	db 38, VENUSAUR
-	db SOLARBEAM, RAZOR_LEAF, HEADBUTT, MUD_SLAP
-
+	db "GINA@", TRAINERTYPE_MOVES
+	db 33, JUMPLUFF, STUN_SPORE, SUNNY_DAY, LEECH_SEED, COTTON_SPORE
+	db 33, JUMPLUFF, SUNNY_DAY, SLEEP_POWDER, LEECH_SEED, COTTON_SPORE
+	db 38, VENUSAUR, SOLARBEAM, RAZOR_LEAF, HEADBUTT, MUD_SLAP
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (26)
-	db "TIFFANY@"
-	db TRAINERTYPE_MOVES
-
-	db 43, CLEFAIRY
-	db METRONOME, ENCORE, MOONLIGHT, MINIMIZE
-
+	db "TIFFANY@", TRAINERTYPE_MOVES
+	db 43, CLEFAIRY, METRONOME, ENCORE, MOONLIGHT, MINIMIZE
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 CamperGroup:
 ; ================================
-; ================
-
 	; CAMPER (1)
-	db "ROLAND@"
-	db TRAINERTYPE_NORMAL
-
+	db "ROLAND@", TRAINERTYPE_NORMAL
 	db 9, NIDORAN_M
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (2)
-	db "TODD@"
-	db TRAINERTYPE_NORMAL
-
+	db "TODD@", TRAINERTYPE_NORMAL
 	db 14, PSYDUCK
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (3)
-	db "IVAN@"
-	db TRAINERTYPE_NORMAL
-
+	db "IVAN@", TRAINERTYPE_NORMAL
 	db 10, DIGLETT
 	db 10, ZUBAT
 	db 14, DIGLETT
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (4)
-	db "ELLIOT@"
-	db TRAINERTYPE_NORMAL
-
+	db "ELLIOT@", TRAINERTYPE_NORMAL
 	db 13, SANDSHREW
 	db 15, MARILL
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (5)
-	db "BARRY@"
-	db TRAINERTYPE_NORMAL
-
+	db "BARRY@", TRAINERTYPE_NORMAL
 	db 36, NIDOKING
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (6)
-	db "LLOYD@"
-	db TRAINERTYPE_NORMAL
-
+	db "LLOYD@", TRAINERTYPE_NORMAL
 	db 34, NIDOKING
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (7)
-	db "DEAN@"
-	db TRAINERTYPE_NORMAL
-
+	db "DEAN@", TRAINERTYPE_NORMAL
 	db 33, GOLDUCK
 	db 31, SANDSLASH
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (8)
-	db "SID@"
-	db TRAINERTYPE_NORMAL
-
+	db "SID@", TRAINERTYPE_NORMAL
 	db 32, DUGTRIO
 	db 29, PRIMEAPE
 	db 29, POLIWRATH
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (9)
-	db "HARVEY@"
-	db TRAINERTYPE_NORMAL
-
+	db "HARVEY@", TRAINERTYPE_NORMAL
 	db 15, NIDORINO
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (10)
-	db "DALE@"
-	db TRAINERTYPE_NORMAL
-
+	db "DALE@", TRAINERTYPE_NORMAL
 	db 15, NIDORINO
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (11)
-	db "TED@"
-	db TRAINERTYPE_NORMAL
-
+	db "TED@", TRAINERTYPE_NORMAL
 	db 17, MANKEY
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (12)
-	db "TODD@"
-	db TRAINERTYPE_NORMAL
-
+	db "TODD@", TRAINERTYPE_NORMAL
 	db 17, GEODUDE
 	db 17, GEODUDE
 	db 23, PSYDUCK
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (13)
-	db "TODD@"
-	db TRAINERTYPE_NORMAL
-
+	db "TODD@", TRAINERTYPE_NORMAL
 	db 23, GEODUDE
 	db 23, GEODUDE
 	db 26, PSYDUCK
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (14)
-	db "THOMAS@"
-	db TRAINERTYPE_NORMAL
-
+	db "THOMAS@", TRAINERTYPE_NORMAL
 	db 33, GRAVELER
 	db 36, GRAVELER
 	db 40, GOLBAT
 	db 42, GOLDUCK
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (15)
-	db "LEROY@"
-	db TRAINERTYPE_NORMAL
-
+	db "LEROY@", TRAINERTYPE_NORMAL
 	db 33, GRAVELER
 	db 36, GRAVELER
 	db 40, GOLBAT
 	db 42, GOLDUCK
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (16)
-	db "DAVID@"
-	db TRAINERTYPE_NORMAL
-
+	db "DAVID@", TRAINERTYPE_NORMAL
 	db 33, GRAVELER
 	db 36, GRAVELER
 	db 40, GOLBAT
 	db 42, GOLDUCK
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (17)
-	db "JOHN@"
-	db TRAINERTYPE_NORMAL
-
+	db "JOHN@", TRAINERTYPE_NORMAL
 	db 33, GRAVELER
 	db 36, GRAVELER
 	db 40, GOLBAT
 	db 42, GOLDUCK
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (18)
-	db "JERRY@"
-	db TRAINERTYPE_NORMAL
-
+	db "JERRY@", TRAINERTYPE_NORMAL
 	db 37, SANDSLASH
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (19)
-	db "SPENCER@"
-	db TRAINERTYPE_NORMAL
-
+	db "SPENCER@", TRAINERTYPE_NORMAL
 	db 17, SANDSHREW
 	db 17, SANDSLASH
 	db 19, ZUBAT
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (20)
-	db "TODD@"
-	db TRAINERTYPE_NORMAL
-
+	db "TODD@", TRAINERTYPE_NORMAL
 	db 30, GRAVELER
 	db 30, GRAVELER
 	db 30, SLUGMA
 	db 32, PSYDUCK
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (21)
-	db "TODD@"
-	db TRAINERTYPE_MOVES
-
-	db 33, GRAVELER
-	db SELFDESTRUCT, ROCK_THROW, HARDEN, MAGNITUDE
-
-	db 33, GRAVELER
-	db SELFDESTRUCT, ROCK_THROW, HARDEN, MAGNITUDE
-
-	db 36, MAGCARGO
-	db ROCK_THROW, HARDEN, AMNESIA, FLAMETHROWER
-
-	db 34, GOLDUCK
-	db DISABLE, PSYCHIC_M, SURF, PSYCH_UP
-
+	db "TODD@", TRAINERTYPE_MOVES
+	db 33, GRAVELER, SELFDESTRUCT, ROCK_THROW, HARDEN, MAGNITUDE
+	db 33, GRAVELER, SELFDESTRUCT, ROCK_THROW, HARDEN, MAGNITUDE
+	db 36, MAGCARGO, ROCK_THROW, HARDEN, AMNESIA, FLAMETHROWER
+	db 34, GOLDUCK, DISABLE, PSYCHIC_M, SURF, PSYCH_UP
 	db -1 ; end
 
-; ================
-
 	; CAMPER (22)
-	db "QUENTIN@"
-	db TRAINERTYPE_NORMAL
-
+	db "QUENTIN@", TRAINERTYPE_NORMAL
 	db 30, FEAROW
 	db 30, PRIMEAPE
 	db 30, TAUROS
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 ExecutiveFGroup:
 ; ================================
-; ================
-
 	; EXECUTIVEF (1)
-	db "EXECUTIVE@"
-	db TRAINERTYPE_MOVES
-
-	db 32, ARBOK
-	db WRAP, POISON_STING, BITE, GLARE
-
-	db 32, VILEPLUME
-	db ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID
-
-	db 32, MURKROW
-	db PECK, PURSUIT, HAZE, NIGHT_SHADE
-
+	db "EXECUTIVE@", TRAINERTYPE_MOVES
+	db 32, ARBOK, WRAP, POISON_STING, BITE, GLARE
+	db 32, VILEPLUME, ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID
+	db 32, MURKROW, PECK, PURSUIT, HAZE, NIGHT_SHADE
 	db -1 ; end
 
-; ================
-
 	; EXECUTIVEF (2)
-	db "EXECUTIVE@"
-	db TRAINERTYPE_MOVES
-
-	db 23, ARBOK
-	db WRAP, LEER, POISON_STING, BITE
-
-	db 23, GLOOM
-	db ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID
-
-	db 25, MURKROW
-	db PECK, PURSUIT, HAZE, NO_MOVE
-
+	db "EXECUTIVE@", TRAINERTYPE_MOVES
+	db 23, ARBOK, WRAP, LEER, POISON_STING, BITE
+	db 23, GLOOM, ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID
+	db 25, MURKROW, PECK, PURSUIT, HAZE, NO_MOVE
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 SageGroup:
 ; ================================
-; ================
-
 	; SAGE (1)
-	db "CHOW@"
-	db TRAINERTYPE_NORMAL
-
+	db "CHOW@", TRAINERTYPE_NORMAL
 	db 3, BELLSPROUT
 	db 3, BELLSPROUT
 	db 3, BELLSPROUT
-
 	db -1 ; end
 
-; ================
-
 	; SAGE (2)
-	db "NICO@"
-	db TRAINERTYPE_NORMAL
-
+	db "NICO@", TRAINERTYPE_NORMAL
 	db 3, BELLSPROUT
 	db 3, BELLSPROUT
 	db 3, BELLSPROUT
-
 	db -1 ; end
 
-; ================
-
 	; SAGE (3)
-	db "JIN@"
-	db TRAINERTYPE_NORMAL
-
+	db "JIN@", TRAINERTYPE_NORMAL
 	db 6, BELLSPROUT
-
 	db -1 ; end
 
-; ================
-
 	; SAGE (4)
-	db "TROY@"
-	db TRAINERTYPE_NORMAL
-
+	db "TROY@", TRAINERTYPE_NORMAL
 	db 7, BELLSPROUT
 	db 7, HOOTHOOT
-
 	db -1 ; end
 
-; ================
-
 	; SAGE (5)
-	db "JEFFREY@"
-	db TRAINERTYPE_NORMAL
-
+	db "JEFFREY@", TRAINERTYPE_NORMAL
 	db 22, HAUNTER
-
 	db -1 ; end
 
-; ================
-
 	; SAGE (6)
-	db "PING@"
-	db TRAINERTYPE_NORMAL
-
+	db "PING@", TRAINERTYPE_NORMAL
 	db 16, GASTLY
 	db 16, GASTLY
 	db 16, GASTLY
 	db 16, GASTLY
 	db 16, GASTLY
-
 	db -1 ; end
 
-; ================
-
 	; SAGE (7)
-	db "EDMOND@"
-	db TRAINERTYPE_NORMAL
-
+	db "EDMOND@", TRAINERTYPE_NORMAL
 	db 3, BELLSPROUT
 	db 3, BELLSPROUT
 	db 3, BELLSPROUT
-
 	db -1 ; end
 
-; ================
-
 	; SAGE (8)
-	db "NEAL@"
-	db TRAINERTYPE_NORMAL
-
+	db "NEAL@", TRAINERTYPE_NORMAL
 	db 6, BELLSPROUT
-
 	db -1 ; end
 
-; ================
-
 	; SAGE (9)
-	db "LI@"
-	db TRAINERTYPE_NORMAL
-
+	db "LI@", TRAINERTYPE_NORMAL
 	db 7, BELLSPROUT
 	db 7, BELLSPROUT
 	db 10, HOOTHOOT
-
 	db -1 ; end
 
-; ================
-
 	; SAGE (10)
-	db "GAKU@"
-	db TRAINERTYPE_NORMAL
-
+	db "GAKU@", TRAINERTYPE_NORMAL
 	db 32, NOCTOWL
 	db 32, FLAREON
-
 	db -1 ; end
 
-; ================
-
 	; SAGE (11)
-	db "MASA@"
-	db TRAINERTYPE_NORMAL
-
+	db "MASA@", TRAINERTYPE_NORMAL
 	db 32, NOCTOWL
 	db 32, JOLTEON
-
 	db -1 ; end
 
-; ================
-
 	; SAGE (12)
-	db "KOJI@"
-	db TRAINERTYPE_NORMAL
-
+	db "KOJI@", TRAINERTYPE_NORMAL
 	db 32, NOCTOWL
 	db 32, VAPOREON
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 MediumGroup:
 ; ================================
-; ================
-
 	; MEDIUM (1)
-	db "MARTHA@"
-	db TRAINERTYPE_NORMAL
-
+	db "MARTHA@", TRAINERTYPE_NORMAL
 	db 18, GASTLY
 	db 20, HAUNTER
 	db 20, GASTLY
-
 	db -1 ; end
 
-; ================
-
 	; MEDIUM (2)
-	db "GRACE@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRACE@", TRAINERTYPE_NORMAL
 	db 20, HAUNTER
 	db 20, HAUNTER
-
 	db -1 ; end
 
-; ================
-
 	; MEDIUM (3)
-	db "BETHANY@"
-	db TRAINERTYPE_NORMAL
-
+	db "BETHANY@", TRAINERTYPE_NORMAL
 	db 25, HAUNTER
-
 	db -1 ; end
 
-; ================
-
 	; MEDIUM (4)
-	db "MARGRET@"
-	db TRAINERTYPE_NORMAL
-
+	db "MARGRET@", TRAINERTYPE_NORMAL
 	db 25, HAUNTER
-
 	db -1 ; end
 
-; ================
-
 	; MEDIUM (5)
-	db "ETHEL@"
-	db TRAINERTYPE_NORMAL
-
+	db "ETHEL@", TRAINERTYPE_NORMAL
 	db 25, HAUNTER
-
 	db -1 ; end
 
-; ================
-
 	; MEDIUM (6)
-	db "REBECCA@"
-	db TRAINERTYPE_NORMAL
-
+	db "REBECCA@", TRAINERTYPE_NORMAL
 	db 35, DROWZEE
 	db 35, HYPNO
-
 	db -1 ; end
 
-; ================
-
 	; MEDIUM (7)
-	db "DORIS@"
-	db TRAINERTYPE_NORMAL
-
+	db "DORIS@", TRAINERTYPE_NORMAL
 	db 34, SLOWPOKE
 	db 36, SLOWBRO
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 BoarderGroup:
 ; ================================
-; ================
-
 	; BOARDER (1)
-	db "RONALD@"
-	db TRAINERTYPE_NORMAL
-
+	db "RONALD@", TRAINERTYPE_NORMAL
 	db 24, SEEL
 	db 25, DEWGONG
 	db 24, SEEL
-
 	db -1 ; end
 
-; ================
-
 	; BOARDER (2)
-	db "BRAD@"
-	db TRAINERTYPE_NORMAL
-
+	db "BRAD@", TRAINERTYPE_NORMAL
 	db 26, SWINUB
 	db 26, SWINUB
-
 	db -1 ; end
 
-; ================
-
 	; BOARDER (3)
-	db "DOUGLAS@"
-	db TRAINERTYPE_NORMAL
-
+	db "DOUGLAS@", TRAINERTYPE_NORMAL
 	db 24, SHELLDER
 	db 25, CLOYSTER
 	db 24, SHELLDER
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 PokefanMGroup:
 ; ================================
-; ================
-
 	; POKEFANM (1)
-	db "WILLIAM@"
-	db TRAINERTYPE_ITEM
-
+	db "WILLIAM@", TRAINERTYPE_ITEM
 	db 14, RAICHU, BERRY
-
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (2)
-	db "DEREK@"
-	db TRAINERTYPE_ITEM
-
+	db "DEREK@", TRAINERTYPE_ITEM
 	db 17, PIKACHU, BERRY
-
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (3)
-	db "ROBERT@"
-	db TRAINERTYPE_ITEM
-
+	db "ROBERT@", TRAINERTYPE_ITEM
 	db 33, QUAGSIRE, BERRY
-
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (4)
-	db "JOSHUA@"
-	db TRAINERTYPE_ITEM
-
+	db "JOSHUA@", TRAINERTYPE_ITEM
 	db 23, PIKACHU, BERRY
 	db 23, PIKACHU, BERRY
 	db 23, PIKACHU, BERRY
 	db 23, PIKACHU, BERRY
 	db 23, PIKACHU, BERRY
 	db 23, PIKACHU, BERRY
-
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (5)
-	db "CARTER@"
-	db TRAINERTYPE_ITEM
-
+	db "CARTER@", TRAINERTYPE_ITEM
 	db 29, BULBASAUR, BERRY
 	db 29, CHARMANDER, BERRY
 	db 29, SQUIRTLE, BERRY
-
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (6)
-	db "TREVOR@"
-	db TRAINERTYPE_ITEM
-
+	db "TREVOR@", TRAINERTYPE_ITEM
 	db 33, PSYDUCK, BERRY
-
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (7)
-	db "BRANDON@"
-	db TRAINERTYPE_ITEM
-
+	db "BRANDON@", TRAINERTYPE_ITEM
 	db 13, SNUBBULL, BERRY
-
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (8)
-	db "JEREMY@"
-	db TRAINERTYPE_ITEM
-
+	db "JEREMY@", TRAINERTYPE_ITEM
 	db 28, MEOWTH, BERRY
 	db 28, MEOWTH, BERRY
 	db 28, MEOWTH, BERRY
-
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (9)
-	db "COLIN@"
-	db TRAINERTYPE_ITEM
-
+	db "COLIN@", TRAINERTYPE_ITEM
 	db 32, DELIBIRD, BERRY
-
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (10)
-	db "DEREK@"
-	db TRAINERTYPE_ITEM
-
+	db "DEREK@", TRAINERTYPE_ITEM
 	db 19, PIKACHU, BERRY
-
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (11)
-	db "DEREK@"
-	db TRAINERTYPE_ITEM
-
+	db "DEREK@", TRAINERTYPE_ITEM
 	db 36, PIKACHU, BERRY
-
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (12)
-	db "ALEX@"
-	db TRAINERTYPE_ITEM
-
+	db "ALEX@", TRAINERTYPE_ITEM
 	db 29, NIDOKING, BERRY
 	db 29, SLOWKING, BERRY
 	db 29, SEAKING, BERRY
-
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (13)
-	db "REX@"
-	db TRAINERTYPE_ITEM
-
+	db "REX@", TRAINERTYPE_ITEM
 	db 35, PHANPY, BERRY
-
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (14)
-	db "ALLAN@"
-	db TRAINERTYPE_ITEM
-
+	db "ALLAN@", TRAINERTYPE_ITEM
 	db 35, TEDDIURSA, BERRY
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 KimonoGirlGroup:
 ; ================================
-; ================
-
 	; KIMONO_GIRL (1)
-	db "NAOKO@"
-	db TRAINERTYPE_NORMAL
-
+	db "NAOKO@", TRAINERTYPE_NORMAL
 	db 20, SKIPLOOM
 	db 20, VULPIX
 	db 18, SKIPLOOM
-
 	db -1 ; end
 
-; ================
-
 	; KIMONO_GIRL (2)
-	db "NAOKO@"
-	db TRAINERTYPE_NORMAL
-
+	db "NAOKO@", TRAINERTYPE_NORMAL
 	db 17, FLAREON
-
 	db -1 ; end
 
-; ================
-
 	; KIMONO_GIRL (3)
-	db "SAYO@"
-	db TRAINERTYPE_NORMAL
-
+	db "SAYO@", TRAINERTYPE_NORMAL
 	db 17, ESPEON
-
 	db -1 ; end
 
-; ================
-
 	; KIMONO_GIRL (4)
-	db "ZUKI@"
-	db TRAINERTYPE_NORMAL
-
+	db "ZUKI@", TRAINERTYPE_NORMAL
 	db 17, UMBREON
-
 	db -1 ; end
 
-; ================
-
 	; KIMONO_GIRL (5)
-	db "KUNI@"
-	db TRAINERTYPE_NORMAL
-
+	db "KUNI@", TRAINERTYPE_NORMAL
 	db 17, VAPOREON
-
 	db -1 ; end
 
-; ================
-
 	; KIMONO_GIRL (6)
-	db "MIKI@"
-	db TRAINERTYPE_NORMAL
-
+	db "MIKI@", TRAINERTYPE_NORMAL
 	db 17, JOLTEON
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 TwinsGroup:
 ; ================================
-; ================
-
 	; TWINS (1)
-	db "AMY & MAY@"
-	db TRAINERTYPE_NORMAL
-
+	db "AMY & MAY@", TRAINERTYPE_NORMAL
 	db 10, SPINARAK
 	db 10, LEDYBA
-
 	db -1 ; end
 
-; ================
-
 	; TWINS (2)
-	db "ANN & ANNE@"
-	db TRAINERTYPE_MOVES
-
-	db 16, CLEFAIRY
-	db GROWL, ENCORE, DOUBLESLAP, METRONOME
-
-	db 16, JIGGLYPUFF
-	db SING, DEFENSE_CURL, POUND, DISABLE
-
+	db "ANN & ANNE@", TRAINERTYPE_MOVES
+	db 16, CLEFAIRY, GROWL, ENCORE, DOUBLESLAP, METRONOME
+	db 16, JIGGLYPUFF, SING, DEFENSE_CURL, POUND, DISABLE
 	db -1 ; end
 
-; ================
-
 	; TWINS (3)
-	db "ANN & ANNE@"
-	db TRAINERTYPE_MOVES
-
-	db 16, JIGGLYPUFF
-	db SING, DEFENSE_CURL, POUND, DISABLE
-
-	db 16, CLEFAIRY
-	db GROWL, ENCORE, DOUBLESLAP, METRONOME
-
+	db "ANN & ANNE@", TRAINERTYPE_MOVES
+	db 16, JIGGLYPUFF, SING, DEFENSE_CURL, POUND, DISABLE
+	db 16, CLEFAIRY, GROWL, ENCORE, DOUBLESLAP, METRONOME
 	db -1 ; end
 
-; ================
-
 	; TWINS (4)
-	db "AMY & MAY@"
-	db TRAINERTYPE_NORMAL
-
+	db "AMY & MAY@", TRAINERTYPE_NORMAL
 	db 10, LEDYBA
 	db 10, SPINARAK
-
 	db -1 ; end
 
-; ================
-
 	; TWINS (5)
-	db "JO & ZOE@"
-	db TRAINERTYPE_NORMAL
-
+	db "JO & ZOE@", TRAINERTYPE_NORMAL
 	db 35, VICTREEBEL
 	db 35, VILEPLUME
-
 	db -1 ; end
 
-; ================
-
 	; TWINS (6)
-	db "JO & ZOE@"
-	db TRAINERTYPE_NORMAL
-
+	db "JO & ZOE@", TRAINERTYPE_NORMAL
 	db 35, VILEPLUME
 	db 35, VICTREEBEL
-
 	db -1 ; end
 
-; ================
-
 	; TWINS (7)
-	db "MEG & PEG@"
-	db TRAINERTYPE_NORMAL
-
+	db "MEG & PEG@", TRAINERTYPE_NORMAL
 	db 31, TEDDIURSA
 	db 31, PHANPY
-
 	db -1 ; end
 
-; ================
-
 	; TWINS (8)
-	db "MEG & PEG@"
-	db TRAINERTYPE_NORMAL
-
+	db "MEG & PEG@", TRAINERTYPE_NORMAL
 	db 31, PHANPY
 	db 31, TEDDIURSA
-
 	db -1 ; end
 
-; ================
-
 	; TWINS (9)
-	db "LEA & PIA@"
-	db TRAINERTYPE_MOVES
-
-	db 35, DRATINI
-	db THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
-
-	db 35, DRATINI
-	db THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
-
+	db "LEA & PIA@", TRAINERTYPE_MOVES
+	db 35, DRATINI, THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
+	db 35, DRATINI, THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
 	db -1 ; end
 
-; ================
-
 	; TWINS (10)
-	db "LEA & PIA@"
-	db TRAINERTYPE_MOVES
-
-	db 38, DRATINI
-	db THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
-
-	db 38, DRATINI
-	db THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
-
+	db "LEA & PIA@", TRAINERTYPE_MOVES
+	db 38, DRATINI, THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
+	db 38, DRATINI, THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 PokefanFGroup:
 ; ================================
-; ================
-
 	; POKEFANF (1)
-	db "BEVERLY@"
-	db TRAINERTYPE_ITEM
-
+	db "BEVERLY@", TRAINERTYPE_ITEM
 	db 14, SNUBBULL, BERRY
-
 	db -1 ; end
 
-; ================
-
 	; POKEFANF (2)
-	db "RUTH@"
-	db TRAINERTYPE_ITEM
-
+	db "RUTH@", TRAINERTYPE_ITEM
 	db 17, PIKACHU, BERRY
-
 	db -1 ; end
 
-; ================
-
 	; POKEFANF (3)
-	db "BEVERLY@"
-	db TRAINERTYPE_ITEM
-
+	db "BEVERLY@", TRAINERTYPE_ITEM
 	db 18, SNUBBULL, BERRY
-
 	db -1 ; end
 
-; ================
-
 	; POKEFANF (4)
-	db "BEVERLY@"
-	db TRAINERTYPE_ITEM
-
+	db "BEVERLY@", TRAINERTYPE_ITEM
 	db 30, GRANBULL, BERRY
-
 	db -1 ; end
 
-; ================
-
 	; POKEFANF (5)
-	db "GEORGIA@"
-	db TRAINERTYPE_ITEM
-
+	db "GEORGIA@", TRAINERTYPE_ITEM
 	db 23, SENTRET, BERRY
 	db 23, SENTRET, BERRY
 	db 23, SENTRET, BERRY
 	db 28, FURRET, BERRY
 	db 23, SENTRET, BERRY
-
 	db -1 ; end
 
-; ================
-
 	; POKEFANF (6)
-	db "JAIME@"
-	db TRAINERTYPE_ITEM
-
+	db "JAIME@", TRAINERTYPE_ITEM
 	db 16, MEOWTH, BERRY
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 RedGroup:
 ; ================================
-; ================
-
 	; RED (1)
-	db "RED@"
-	db TRAINERTYPE_MOVES
-
-	db 81, PIKACHU
-	db CHARM, QUICK_ATTACK, THUNDERBOLT, THUNDER
-
-	db 73, ESPEON
-	db MUD_SLAP, REFLECT, SWIFT, PSYCHIC_M
-
-	db 75, SNORLAX
-	db AMNESIA, SNORE, REST, BODY_SLAM
-
-	db 77, VENUSAUR
-	db SUNNY_DAY, GIGA_DRAIN, SYNTHESIS, SOLARBEAM
-
-	db 77, CHARIZARD
-	db FLAMETHROWER, WING_ATTACK, SLASH, FIRE_SPIN
-
-	db 77, BLASTOISE
-	db RAIN_DANCE, SURF, BLIZZARD, WHIRLPOOL
-
+	db "RED@", TRAINERTYPE_MOVES
+	db 81, PIKACHU, CHARM, QUICK_ATTACK, THUNDERBOLT, THUNDER
+	db 73, ESPEON, MUD_SLAP, REFLECT, SWIFT, PSYCHIC_M
+	db 75, SNORLAX, AMNESIA, SNORE, REST, BODY_SLAM
+	db 77, VENUSAUR, SUNNY_DAY, GIGA_DRAIN, SYNTHESIS, SOLARBEAM
+	db 77, CHARIZARD, FLAMETHROWER, WING_ATTACK, SLASH, FIRE_SPIN
+	db 77, BLASTOISE, RAIN_DANCE, SURF, BLIZZARD, WHIRLPOOL
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 BlueGroup:
 ; ================================
-; ================
-
 	; BLUE (1)
-	db "BLUE@"
-	db TRAINERTYPE_MOVES
-
-	db 56, PIDGEOT
-	db QUICK_ATTACK, WHIRLWIND, WING_ATTACK, MIRROR_MOVE
-
-	db 54, ALAKAZAM
-	db DISABLE, RECOVER, PSYCHIC_M, REFLECT
-
-	db 56, RHYDON
-	db FURY_ATTACK, SANDSTORM, ROCK_SLIDE, EARTHQUAKE
-
-	db 58, GYARADOS
-	db TWISTER, HYDRO_PUMP, RAIN_DANCE, HYPER_BEAM
-
-	db 58, EXEGGUTOR
-	db SUNNY_DAY, LEECH_SEED, EGG_BOMB, SOLARBEAM
-
-	db 58, ARCANINE
-	db ROAR, SWIFT, FLAMETHROWER, EXTREMESPEED
-
+	db "BLUE@", TRAINERTYPE_MOVES
+	db 56, PIDGEOT, QUICK_ATTACK, WHIRLWIND, WING_ATTACK, MIRROR_MOVE
+	db 54, ALAKAZAM, DISABLE, RECOVER, PSYCHIC_M, REFLECT
+	db 56, RHYDON, FURY_ATTACK, SANDSTORM, ROCK_SLIDE, EARTHQUAKE
+	db 58, GYARADOS, TWISTER, HYDRO_PUMP, RAIN_DANCE, HYPER_BEAM
+	db 58, EXEGGUTOR, SUNNY_DAY, LEECH_SEED, EGG_BOMB, SOLARBEAM
+	db 58, ARCANINE, ROAR, SWIFT, FLAMETHROWER, EXTREMESPEED
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 OfficerGroup:
 ; ================================
-; ================
-
 	; OFFICER (1)
-	db "KEITH@"
-	db TRAINERTYPE_NORMAL
-
+	db "KEITH@", TRAINERTYPE_NORMAL
 	db 17, GROWLITHE
-
 	db -1 ; end
 
-; ================
-
 	; OFFICER (2)
-	db "DIRK@"
-	db TRAINERTYPE_NORMAL
-
+	db "DIRK@", TRAINERTYPE_NORMAL
 	db 14, GROWLITHE
 	db 14, GROWLITHE
-
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 GruntFGroup:
 ; ================================
-; ================
-
 	; GRUNTF (1)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 9, ZUBAT
 	db 11, EKANS
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTF (2)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 26, ARBOK
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTF (3)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 25, GLOOM
 	db 25, GLOOM
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTF (4)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 21, EKANS
 	db 23, ODDISH
 	db 21, EKANS
 	db 24, GLOOM
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTF (5)
-	db "GRUNT@"
-	db TRAINERTYPE_MOVES
-
-	db 18, EKANS
-	db WRAP, LEER, POISON_STING, BITE
-
-	db 18, GLOOM
-	db ABSORB, SWEET_SCENT, STUN_SPORE, SLEEP_POWDER
-
+	db "GRUNT@", TRAINERTYPE_MOVES
+	db 18, EKANS, WRAP, LEER, POISON_STING, BITE
+	db 18, GLOOM, ABSORB, SWEET_SCENT, STUN_SPORE, SLEEP_POWDER
 	db -1 ; end
-
-; ================
 ; ================================
 
 
 MysticalmanGroup:
 ; ================================
-; ================
-
 	; MYSTICALMAN (1)
-	db "EUSINE@"
-	db TRAINERTYPE_MOVES
-
-	db 23, DROWZEE
-	db DREAM_EATER, HYPNOSIS, DISABLE, CONFUSION
-
-	db 23, HAUNTER
-	db LICK, HYPNOSIS, MEAN_LOOK, CURSE
-
-	db 25, ELECTRODE
-	db SCREECH, SONICBOOM, THUNDER, ROLLOUT
-
+	db "EUSINE@", TRAINERTYPE_MOVES
+	db 23, DROWZEE, DREAM_EATER, HYPNOSIS, DISABLE, CONFUSION
+	db 23, HAUNTER, LICK, HYPNOSIS, MEAN_LOOK, CURSE
+	db 25, ELECTRODE, SCREECH, SONICBOOM, THUNDER, ROLLOUT
 	db -1 ; end
-
-; ================
 ; ================================

From 9ac2cea1f7b76e81def9d98761315cdf7790275a Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Wed, 31 Jan 2018 00:46:03 -0500
Subject: [PATCH 074/135] Align columns

---
 data/trainers/parties.asm | 854 +++++++++++++++++++-------------------
 1 file changed, 427 insertions(+), 427 deletions(-)

diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index e21a7407d..98558c75d 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -15,8 +15,8 @@ FalknerGroup:
 ; ================================
 	; FALKNER (1)
 	db "FALKNER@", TRAINERTYPE_MOVES
-	db 7, PIDGEY, TACKLE, MUD_SLAP, NO_MOVE, NO_MOVE
-	db 9, PIDGEOTTO, TACKLE, MUD_SLAP, GUST, NO_MOVE
+	db  7, PIDGEY,     TACKLE, MUD_SLAP, NO_MOVE, NO_MOVE
+	db  9, PIDGEOTTO,  TACKLE, MUD_SLAP, GUST, NO_MOVE
 	db -1 ; end
 ; ================================
 
@@ -25,8 +25,8 @@ WhitneyGroup:
 ; ================================
 	; WHITNEY (1)
 	db "WHITNEY@", TRAINERTYPE_MOVES
-	db 18, CLEFAIRY, DOUBLESLAP, MIMIC, ENCORE, METRONOME
-	db 20, MILTANK, ROLLOUT, ATTRACT, STOMP, MILK_DRINK
+	db 18, CLEFAIRY,   DOUBLESLAP, MIMIC, ENCORE, METRONOME
+	db 20, MILTANK,    ROLLOUT, ATTRACT, STOMP, MILK_DRINK
 	db -1 ; end
 ; ================================
 
@@ -35,9 +35,9 @@ BugsyGroup:
 ; ================================
 	; BUGSY (1)
 	db "BUGSY@", TRAINERTYPE_MOVES
-	db 14, METAPOD, TACKLE, STRING_SHOT, HARDEN, NO_MOVE
-	db 14, KAKUNA, POISON_STING, STRING_SHOT, HARDEN, NO_MOVE
-	db 16, SCYTHER, QUICK_ATTACK, LEER, FURY_CUTTER, NO_MOVE
+	db 14, METAPOD,    TACKLE, STRING_SHOT, HARDEN, NO_MOVE
+	db 14, KAKUNA,     POISON_STING, STRING_SHOT, HARDEN, NO_MOVE
+	db 16, SCYTHER,    QUICK_ATTACK, LEER, FURY_CUTTER, NO_MOVE
 	db -1 ; end
 ; ================================
 
@@ -46,10 +46,10 @@ MortyGroup:
 ; ================================
 	; MORTY (1)
 	db "MORTY@", TRAINERTYPE_MOVES
-	db 21, GASTLY, LICK, SPITE, MEAN_LOOK, CURSE
-	db 21, HAUNTER, HYPNOSIS, MIMIC, CURSE, NIGHT_SHADE
-	db 25, GENGAR, HYPNOSIS, SHADOW_BALL, MEAN_LOOK, DREAM_EATER
-	db 23, HAUNTER, SPITE, MEAN_LOOK, MIMIC, NIGHT_SHADE
+	db 21, GASTLY,     LICK, SPITE, MEAN_LOOK, CURSE
+	db 21, HAUNTER,    HYPNOSIS, MIMIC, CURSE, NIGHT_SHADE
+	db 25, GENGAR,     HYPNOSIS, SHADOW_BALL, MEAN_LOOK, DREAM_EATER
+	db 23, HAUNTER,    SPITE, MEAN_LOOK, MIMIC, NIGHT_SHADE
 	db -1 ; end
 ; ================================
 
@@ -58,9 +58,9 @@ PryceGroup:
 ; ================================
 	; PRYCE (1)
 	db "PRYCE@", TRAINERTYPE_MOVES
-	db 27, SEEL, HEADBUTT, ICY_WIND, AURORA_BEAM, REST
-	db 29, DEWGONG, HEADBUTT, ICY_WIND, AURORA_BEAM, REST
-	db 31, PILOSWINE, ICY_WIND, FURY_ATTACK, MIST, BLIZZARD
+	db 27, SEEL,       HEADBUTT, ICY_WIND, AURORA_BEAM, REST
+	db 29, DEWGONG,    HEADBUTT, ICY_WIND, AURORA_BEAM, REST
+	db 31, PILOSWINE,  ICY_WIND, FURY_ATTACK, MIST, BLIZZARD
 	db -1 ; end
 ; ================================
 
@@ -69,9 +69,9 @@ JasmineGroup:
 ; ================================
 	; JASMINE (1)
 	db "JASMINE@", TRAINERTYPE_MOVES
-	db 30, MAGNEMITE, THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE
-	db 30, MAGNEMITE, THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE
-	db 35, STEELIX, SCREECH, SUNNY_DAY, ROCK_THROW, IRON_TAIL
+	db 30, MAGNEMITE,  THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE
+	db 30, MAGNEMITE,  THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE
+	db 35, STEELIX,    SCREECH, SUNNY_DAY, ROCK_THROW, IRON_TAIL
 	db -1 ; end
 ; ================================
 
@@ -80,8 +80,8 @@ ChuckGroup:
 ; ================================
 	; CHUCK (1)
 	db "CHUCK@", TRAINERTYPE_MOVES
-	db 27, PRIMEAPE, LEER, RAGE, KARATE_CHOP, FURY_SWIPES
-	db 30, POLIWRATH, HYPNOSIS, MIND_READER, SURF, DYNAMICPUNCH
+	db 27, PRIMEAPE,   LEER, RAGE, KARATE_CHOP, FURY_SWIPES
+	db 30, POLIWRATH,  HYPNOSIS, MIND_READER, SURF, DYNAMICPUNCH
 	db -1 ; end
 ; ================================
 
@@ -90,10 +90,10 @@ ClairGroup:
 ; ================================
 	; CLAIR (1)
 	db "CLAIR@", TRAINERTYPE_MOVES
-	db 37, DRAGONAIR, THUNDER_WAVE, SURF, SLAM, DRAGONBREATH
-	db 37, DRAGONAIR, THUNDER_WAVE, THUNDERBOLT, SLAM, DRAGONBREATH
-	db 37, DRAGONAIR, THUNDER_WAVE, ICE_BEAM, SLAM, DRAGONBREATH
-	db 40, KINGDRA, SMOKESCREEN, SURF, HYPER_BEAM, DRAGONBREATH
+	db 37, DRAGONAIR,  THUNDER_WAVE, SURF, SLAM, DRAGONBREATH
+	db 37, DRAGONAIR,  THUNDER_WAVE, THUNDERBOLT, SLAM, DRAGONBREATH
+	db 37, DRAGONAIR,  THUNDER_WAVE, ICE_BEAM, SLAM, DRAGONBREATH
+	db 40, KINGDRA,    SMOKESCREEN, SURF, HYPER_BEAM, DRAGONBREATH
 	db -1 ; end
 ; ================================
 
@@ -102,17 +102,17 @@ Rival1Group:
 ; ================================
 	; RIVAL1 (1)
 	db "?@", TRAINERTYPE_NORMAL
-	db 5, CHIKORITA
+	db  5, CHIKORITA
 	db -1 ; end
 
 	; RIVAL1 (2)
 	db "?@", TRAINERTYPE_NORMAL
-	db 5, CYNDAQUIL
+	db  5, CYNDAQUIL
 	db -1 ; end
 
 	; RIVAL1 (3)
 	db "?@", TRAINERTYPE_NORMAL
-	db 5, TOTODILE
+	db  5, TOTODILE
 	db -1 ; end
 
 	; RIVAL1 (4)
@@ -138,82 +138,82 @@ Rival1Group:
 
 	; RIVAL1 (7)
 	db "?@", TRAINERTYPE_MOVES
-	db 20, HAUNTER, LICK, SPITE, MEAN_LOOK, CURSE
-	db 18, MAGNEMITE, TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
-	db 20, ZUBAT, LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
-	db 22, BAYLEEF, GROWL, REFLECT, RAZOR_LEAF, POISONPOWDER
+	db 20, HAUNTER,    LICK, SPITE, MEAN_LOOK, CURSE
+	db 18, MAGNEMITE,  TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
+	db 20, ZUBAT,      LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
+	db 22, BAYLEEF,    GROWL, REFLECT, RAZOR_LEAF, POISONPOWDER
 	db -1 ; end
 
 	; RIVAL1 (8)
 	db "?@", TRAINERTYPE_MOVES
-	db 20, HAUNTER, LICK, SPITE, MEAN_LOOK, CURSE
-	db 18, MAGNEMITE, TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
-	db 20, ZUBAT, LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
-	db 22, QUILAVA, LEER, SMOKESCREEN, EMBER, QUICK_ATTACK
+	db 20, HAUNTER,    LICK, SPITE, MEAN_LOOK, CURSE
+	db 18, MAGNEMITE,  TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
+	db 20, ZUBAT,      LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
+	db 22, QUILAVA,    LEER, SMOKESCREEN, EMBER, QUICK_ATTACK
 	db -1 ; end
 
 	; RIVAL1 (9)
 	db "?@", TRAINERTYPE_MOVES
-	db 20, HAUNTER, LICK, SPITE, MEAN_LOOK, CURSE
-	db 18, MAGNEMITE, TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
-	db 20, ZUBAT, LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
-	db 22, CROCONAW, LEER, RAGE, WATER_GUN, BITE
+	db 20, HAUNTER,    LICK, SPITE, MEAN_LOOK, CURSE
+	db 18, MAGNEMITE,  TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
+	db 20, ZUBAT,      LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
+	db 22, CROCONAW,   LEER, RAGE, WATER_GUN, BITE
 	db -1 ; end
 
 	; RIVAL1 (10)
 	db "?@", TRAINERTYPE_MOVES
-	db 30, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
-	db 28, MAGNEMITE, TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
-	db 30, HAUNTER, LICK, MEAN_LOOK, CURSE, SHADOW_BALL
-	db 32, SNEASEL, LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
-	db 32, MEGANIUM, REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM
+	db 30, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 28, MAGNEMITE,  TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
+	db 30, HAUNTER,    LICK, MEAN_LOOK, CURSE, SHADOW_BALL
+	db 32, SNEASEL,    LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
+	db 32, MEGANIUM,   REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM
 	db -1 ; end
 
 	; RIVAL1 (11)
 	db "?@", TRAINERTYPE_MOVES
-	db 30, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
-	db 28, MAGNEMITE, TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
-	db 30, HAUNTER, LICK, MEAN_LOOK, CURSE, SHADOW_BALL
-	db 32, SNEASEL, LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
-	db 32, QUILAVA, SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL
+	db 30, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 28, MAGNEMITE,  TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
+	db 30, HAUNTER,    LICK, MEAN_LOOK, CURSE, SHADOW_BALL
+	db 32, SNEASEL,    LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
+	db 32, QUILAVA,    SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL
 	db -1 ; end
 
 	; RIVAL1 (12)
 	db "?@", TRAINERTYPE_MOVES
-	db 30, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
-	db 28, MAGNEMITE, TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
-	db 30, HAUNTER, LICK, MEAN_LOOK, CURSE, SHADOW_BALL
-	db 32, SNEASEL, LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
+	db 30, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 28, MAGNEMITE,  TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
+	db 30, HAUNTER,    LICK, MEAN_LOOK, CURSE, SHADOW_BALL
+	db 32, SNEASEL,    LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
 	db 32, FERALIGATR, RAGE, WATER_GUN, BITE, SCARY_FACE
 	db -1 ; end
 
 	; RIVAL1 (13)
 	db "?@", TRAINERTYPE_MOVES
-	db 34, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
-	db 36, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
-	db 35, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
-	db 35, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
-	db 35, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
-	db 38, MEGANIUM, REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM
+	db 34, SNEASEL,    QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 36, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 35, MAGNETON,   THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 35, HAUNTER,    MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 35, KADABRA,    DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
+	db 38, MEGANIUM,   REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM
 	db -1 ; end
 
 	; RIVAL1 (14)
 	db "?@", TRAINERTYPE_MOVES
-	db 34, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
-	db 36, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
-	db 35, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
-	db 35, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
-	db 35, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
+	db 34, SNEASEL,    QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 36, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 35, MAGNETON,   THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 35, HAUNTER,    MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 35, KADABRA,    DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
 	db 38, TYPHLOSION, SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL
 	db -1 ; end
 
 	; RIVAL1 (15)
 	db "?@", TRAINERTYPE_MOVES
-	db 34, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
-	db 36, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
-	db 34, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
-	db 35, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
-	db 35, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
+	db 34, SNEASEL,    QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 36, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 34, MAGNETON,   THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 35, HAUNTER,    MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 35, KADABRA,    DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
 	db 38, FERALIGATR, RAGE, WATER_GUN, SCARY_FACE, SLASH
 	db -1 ; end
 ; ================================
@@ -227,11 +227,11 @@ WillGroup:
 ; ================================
 	; WILL (1)
 	db "WILL@", TRAINERTYPE_MOVES
-	db 40, XATU, QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
-	db 41, JYNX, DOUBLESLAP, LOVELY_KISS, ICE_PUNCH, PSYCHIC_M
-	db 41, EXEGGUTOR, REFLECT, LEECH_SEED, EGG_BOMB, PSYCHIC_M
-	db 41, SLOWBRO, CURSE, AMNESIA, BODY_SLAM, PSYCHIC_M
-	db 42, XATU, QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
+	db 40, XATU,       QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
+	db 41, JYNX,       DOUBLESLAP, LOVELY_KISS, ICE_PUNCH, PSYCHIC_M
+	db 41, EXEGGUTOR,  REFLECT, LEECH_SEED, EGG_BOMB, PSYCHIC_M
+	db 41, SLOWBRO,    CURSE, AMNESIA, BODY_SLAM, PSYCHIC_M
+	db 42, XATU,       QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
 	db -1 ; end
 ; ================================
 
@@ -265,11 +265,11 @@ BrunoGroup:
 ; ================================
 	; BRUNO (1)
 	db "BRUNO@", TRAINERTYPE_MOVES
-	db 42, HITMONTOP, PURSUIT, QUICK_ATTACK, DIG, DETECT
-	db 42, HITMONLEE, SWAGGER, DOUBLE_KICK, HI_JUMP_KICK, FORESIGHT
+	db 42, HITMONTOP,  PURSUIT, QUICK_ATTACK, DIG, DETECT
+	db 42, HITMONLEE,  SWAGGER, DOUBLE_KICK, HI_JUMP_KICK, FORESIGHT
 	db 42, HITMONCHAN, THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH, MACH_PUNCH
-	db 43, ONIX, BIND, EARTHQUAKE, SANDSTORM, ROCK_SLIDE
-	db 46, MACHAMP, ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP
+	db 43, ONIX,       BIND, EARTHQUAKE, SANDSTORM, ROCK_SLIDE
+	db 46, MACHAMP,    ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP
 	db -1 ; end
 ; ================================
 
@@ -278,11 +278,11 @@ KarenGroup:
 ; ================================
 	; KAREN (1)
 	db "KAREN@", TRAINERTYPE_MOVES
-	db 42, UMBREON, SAND_ATTACK, CONFUSE_RAY, FAINT_ATTACK, MEAN_LOOK
-	db 42, VILEPLUME, STUN_SPORE, ACID, MOONLIGHT, PETAL_DANCE
-	db 45, GENGAR, LICK, SPITE, CURSE, DESTINY_BOND
-	db 44, MURKROW, QUICK_ATTACK, WHIRLWIND, PURSUIT, FAINT_ATTACK
-	db 47, HOUNDOOM, ROAR, PURSUIT, FLAMETHROWER, CRUNCH
+	db 42, UMBREON,    SAND_ATTACK, CONFUSE_RAY, FAINT_ATTACK, MEAN_LOOK
+	db 42, VILEPLUME,  STUN_SPORE, ACID, MOONLIGHT, PETAL_DANCE
+	db 45, GENGAR,     LICK, SPITE, CURSE, DESTINY_BOND
+	db 44, MURKROW,    QUICK_ATTACK, WHIRLWIND, PURSUIT, FAINT_ATTACK
+	db 47, HOUNDOOM,   ROAR, PURSUIT, FLAMETHROWER, CRUNCH
 	db -1 ; end
 ; ================================
 
@@ -291,11 +291,11 @@ KogaGroup:
 ; ================================
 	; KOGA (1)
 	db "KOGA@", TRAINERTYPE_MOVES
-	db 40, ARIADOS, DOUBLE_TEAM, SPIDER_WEB, BATON_PASS, GIGA_DRAIN
-	db 41, VENOMOTH, SUPERSONIC, GUST, PSYCHIC_M, TOXIC
+	db 40, ARIADOS,    DOUBLE_TEAM, SPIDER_WEB, BATON_PASS, GIGA_DRAIN
+	db 41, VENOMOTH,   SUPERSONIC, GUST, PSYCHIC_M, TOXIC
 	db 43, FORRETRESS, PROTECT, SWIFT, EXPLOSION, SPIKES
-	db 42, MUK, MINIMIZE, ACID_ARMOR, SLUDGE_BOMB, TOXIC
-	db 44, CROBAT, DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC
+	db 42, MUK,        MINIMIZE, ACID_ARMOR, SLUDGE_BOMB, TOXIC
+	db 44, CROBAT,     DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC
 	db -1 ; end
 ; ================================
 
@@ -304,12 +304,12 @@ ChampionGroup:
 ; ================================
 	; CHAMPION (1)
 	db "LANCE@", TRAINERTYPE_MOVES
-	db 44, GYARADOS, FLAIL, RAIN_DANCE, SURF, HYPER_BEAM
-	db 47, DRAGONITE, THUNDER_WAVE, TWISTER, THUNDER, HYPER_BEAM
-	db 47, DRAGONITE, THUNDER_WAVE, TWISTER, BLIZZARD, HYPER_BEAM
+	db 44, GYARADOS,   FLAIL, RAIN_DANCE, SURF, HYPER_BEAM
+	db 47, DRAGONITE,  THUNDER_WAVE, TWISTER, THUNDER, HYPER_BEAM
+	db 47, DRAGONITE,  THUNDER_WAVE, TWISTER, BLIZZARD, HYPER_BEAM
 	db 46, AERODACTYL, WING_ATTACK, ANCIENTPOWER, ROCK_SLIDE, HYPER_BEAM
-	db 46, CHARIZARD, FLAMETHROWER, WING_ATTACK, SLASH, HYPER_BEAM
-	db 50, DRAGONITE, FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM
+	db 46, CHARIZARD,  FLAMETHROWER, WING_ATTACK, SLASH, HYPER_BEAM
+	db 50, DRAGONITE,  FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM
 	db -1 ; end
 ; ================================
 
@@ -318,11 +318,11 @@ BrockGroup:
 ; ================================
 	; BROCK (1)
 	db "BROCK@", TRAINERTYPE_MOVES
-	db 41, GRAVELER, DEFENSE_CURL, ROCK_SLIDE, ROLLOUT, EARTHQUAKE
-	db 41, RHYHORN, FURY_ATTACK, SCARY_FACE, EARTHQUAKE, HORN_DRILL
-	db 42, OMASTAR, BITE, SURF, PROTECT, SPIKE_CANNON
-	db 44, ONIX, BIND, ROCK_SLIDE, BIDE, SANDSTORM
-	db 42, KABUTOPS, SLASH, SURF, ENDURE, GIGA_DRAIN
+	db 41, GRAVELER,   DEFENSE_CURL, ROCK_SLIDE, ROLLOUT, EARTHQUAKE
+	db 41, RHYHORN,    FURY_ATTACK, SCARY_FACE, EARTHQUAKE, HORN_DRILL
+	db 42, OMASTAR,    BITE, SURF, PROTECT, SPIKE_CANNON
+	db 44, ONIX,       BIND, ROCK_SLIDE, BIDE, SANDSTORM
+	db 42, KABUTOPS,   SLASH, SURF, ENDURE, GIGA_DRAIN
 	db -1 ; end
 ; ================================
 
@@ -331,10 +331,10 @@ MistyGroup:
 ; ================================
 	; MISTY (1)
 	db "MISTY@", TRAINERTYPE_MOVES
-	db 42, GOLDUCK, SURF, DISABLE, PSYCH_UP, PSYCHIC_M
-	db 42, QUAGSIRE, SURF, AMNESIA, EARTHQUAKE, RAIN_DANCE
-	db 44, LAPRAS, SURF, PERISH_SONG, BLIZZARD, RAIN_DANCE
-	db 47, STARMIE, SURF, CONFUSE_RAY, RECOVER, ICE_BEAM
+	db 42, GOLDUCK,    SURF, DISABLE, PSYCH_UP, PSYCHIC_M
+	db 42, QUAGSIRE,   SURF, AMNESIA, EARTHQUAKE, RAIN_DANCE
+	db 44, LAPRAS,     SURF, PERISH_SONG, BLIZZARD, RAIN_DANCE
+	db 47, STARMIE,    SURF, CONFUSE_RAY, RECOVER, ICE_BEAM
 	db -1 ; end
 ; ================================
 
@@ -343,10 +343,10 @@ LtSurgeGroup:
 ; ================================
 	; LT_SURGE (1)
 	db "LT.SURGE@", TRAINERTYPE_MOVES
-	db 44, RAICHU, THUNDER_WAVE, QUICK_ATTACK, THUNDERBOLT, THUNDER
-	db 40, ELECTRODE, SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION
-	db 40, MAGNETON, LOCK_ON, DOUBLE_TEAM, SWIFT, ZAP_CANNON
-	db 40, ELECTRODE, SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION
+	db 44, RAICHU,     THUNDER_WAVE, QUICK_ATTACK, THUNDERBOLT, THUNDER
+	db 40, ELECTRODE,  SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION
+	db 40, MAGNETON,   LOCK_ON, DOUBLE_TEAM, SWIFT, ZAP_CANNON
+	db 40, ELECTRODE,  SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION
 	db 46, ELECTABUZZ, QUICK_ATTACK, THUNDERPUNCH, LIGHT_SCREEN, THUNDER
 	db -1 ; end
 ; ================================
@@ -381,7 +381,7 @@ ScientistGroup:
 
 	; SCIENTIST (5)
 	db "RICH@", TRAINERTYPE_MOVES
-	db 30, PORYGON, CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK
+	db 30, PORYGON,    CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK
 	db -1 ; end
 ; ================================
 
@@ -390,10 +390,10 @@ ErikaGroup:
 ; ================================
 	; ERIKA (1)
 	db "ERIKA@", TRAINERTYPE_MOVES
-	db 42, TANGELA, VINE_WHIP, BIND, GIGA_DRAIN, SLEEP_POWDER
-	db 41, JUMPLUFF, MEGA_DRAIN, LEECH_SEED, COTTON_SPORE, GIGA_DRAIN
+	db 42, TANGELA,    VINE_WHIP, BIND, GIGA_DRAIN, SLEEP_POWDER
+	db 41, JUMPLUFF,   MEGA_DRAIN, LEECH_SEED, COTTON_SPORE, GIGA_DRAIN
 	db 46, VICTREEBEL, SUNNY_DAY, SYNTHESIS, ACID, RAZOR_LEAF
-	db 46, BELLOSSOM, SUNNY_DAY, SYNTHESIS, PETAL_DANCE, SOLARBEAM
+	db 46, BELLOSSOM,  SUNNY_DAY, SYNTHESIS, PETAL_DANCE, SOLARBEAM
 	db -1 ; end
 ; ================================
 
@@ -402,19 +402,19 @@ YoungsterGroup:
 ; ================================
 	; YOUNGSTER (1)
 	db "JOEY@", TRAINERTYPE_NORMAL
-	db 4, RATTATA
+	db  4, RATTATA
 	db -1 ; end
 
 	; YOUNGSTER (2)
 	db "MIKEY@", TRAINERTYPE_NORMAL
-	db 2, PIDGEY
-	db 4, RATTATA
+	db  2, PIDGEY
+	db  4, RATTATA
 	db -1 ; end
 
 	; YOUNGSTER (3)
 	db "ALBERT@", TRAINERTYPE_NORMAL
-	db 6, RATTATA
-	db 8, ZUBAT
+	db  6, RATTATA
+	db  8, ZUBAT
 	db -1 ; end
 
 	; YOUNGSTER (4)
@@ -424,10 +424,10 @@ YoungsterGroup:
 
 	; YOUNGSTER (5)
 	db "SAMUEL@", TRAINERTYPE_NORMAL
-	db 7, RATTATA
+	db  7, RATTATA
 	db 10, SANDSHREW
-	db 8, SPEAROW
-	db 8, SPEAROW
+	db  8, SPEAROW
+	db  8, SPEAROW
 	db -1 ; end
 
 	; YOUNGSTER (6)
@@ -443,7 +443,7 @@ YoungsterGroup:
 
 	; YOUNGSTER (8)
 	db "JOEY@", TRAINERTYPE_MOVES
-	db 21, RATICATE, TAIL_WHIP, QUICK_ATTACK, HYPER_FANG, SCARY_FACE
+	db 21, RATICATE,   TAIL_WHIP, QUICK_ATTACK, HYPER_FANG, SCARY_FACE
 	db -1 ; end
 
 	; YOUNGSTER (9)
@@ -470,12 +470,12 @@ YoungsterGroup:
 
 	; YOUNGSTER (13)
 	db "JOEY@", TRAINERTYPE_MOVES
-	db 30, RATICATE, TAIL_WHIP, QUICK_ATTACK, HYPER_FANG, PURSUIT
+	db 30, RATICATE,   TAIL_WHIP, QUICK_ATTACK, HYPER_FANG, PURSUIT
 	db -1 ; end
 
 	; YOUNGSTER (14)
 	db "JOEY@", TRAINERTYPE_MOVES
-	db 37, RATICATE, HYPER_BEAM, QUICK_ATTACK, HYPER_FANG, PURSUIT
+	db 37, RATICATE,   HYPER_BEAM, QUICK_ATTACK, HYPER_FANG, PURSUIT
 	db -1 ; end
 ; ================================
 
@@ -604,9 +604,9 @@ SchoolboyGroup:
 
 	; SCHOOLBOY (20)
 	db "JACK@", TRAINERTYPE_MOVES
-	db 35, ELECTRODE, SCREECH, SONICBOOM, ROLLOUT, LIGHT_SCREEN
-	db 35, GROWLITHE, SUNNY_DAY, LEER, TAKE_DOWN, FLAME_WHEEL
-	db 37, VILEPLUME, SOLARBEAM, SLEEP_POWDER, ACID, MOONLIGHT
+	db 35, ELECTRODE,  SCREECH, SONICBOOM, ROLLOUT, LIGHT_SCREEN
+	db 35, GROWLITHE,  SUNNY_DAY, LEER, TAKE_DOWN, FLAME_WHEEL
+	db 37, VILEPLUME,  SOLARBEAM, SLEEP_POWDER, ACID, MOONLIGHT
 	db -1 ; end
 
 	; SCHOOLBOY (21)
@@ -619,10 +619,10 @@ SchoolboyGroup:
 
 	; SCHOOLBOY (22)
 	db "ALAN@", TRAINERTYPE_MOVES
-	db 35, XATU, PECK, NIGHT_SHADE, SWIFT, FUTURE_SIGHT
-	db 32, TANGELA, POISONPOWDER, VINE_WHIP, BIND, MEGA_DRAIN
-	db 32, YANMA, QUICK_ATTACK, DOUBLE_TEAM, SONICBOOM, SUPERSONIC
-	db 35, QUAGSIRE, TAIL_WHIP, SLAM, AMNESIA, EARTHQUAKE
+	db 35, XATU,       PECK, NIGHT_SHADE, SWIFT, FUTURE_SIGHT
+	db 32, TANGELA,    POISONPOWDER, VINE_WHIP, BIND, MEGA_DRAIN
+	db 32, YANMA,      QUICK_ATTACK, DOUBLE_TEAM, SONICBOOM, SUPERSONIC
+	db 35, QUAGSIRE,   TAIL_WHIP, SLAM, AMNESIA, EARTHQUAKE
 	db -1 ; end
 
 	; SCHOOLBOY (23)
@@ -633,8 +633,8 @@ SchoolboyGroup:
 
 	; SCHOOLBOY (24)
 	db "CHAD@", TRAINERTYPE_MOVES
-	db 34, MR__MIME, PSYCHIC_M, LIGHT_SCREEN, REFLECT, ENCORE
-	db 38, MAGNETON, ZAP_CANNON, THUNDER_WAVE, LOCK_ON, SWIFT
+	db 34, MR__MIME,   PSYCHIC_M, LIGHT_SCREEN, REFLECT, ENCORE
+	db 38, MAGNETON,   ZAP_CANNON, THUNDER_WAVE, LOCK_ON, SWIFT
 	db -1 ; end
 ; ================================
 
@@ -643,13 +643,13 @@ BirdKeeperGroup:
 ; ================================
 	; BIRD_KEEPER (1)
 	db "ROD@", TRAINERTYPE_NORMAL
-	db 7, PIDGEY
-	db 7, PIDGEY
+	db  7, PIDGEY
+	db  7, PIDGEY
 	db -1 ; end
 
 	; BIRD_KEEPER (2)
 	db "ABE@", TRAINERTYPE_NORMAL
-	db 9, SPEAROW
+	db  9, SPEAROW
 	db -1 ; end
 
 	; BIRD_KEEPER (3)
@@ -718,9 +718,9 @@ BirdKeeperGroup:
 
 	; BIRD_KEEPER (13)
 	db "PETER@", TRAINERTYPE_NORMAL
-	db 6, PIDGEY
-	db 6, PIDGEY
-	db 8, SPEAROW
+	db  6, PIDGEY
+	db  6, PIDGEY
+	db  8, SPEAROW
 	db -1 ; end
 
 	; BIRD_KEEPER (14)
@@ -752,8 +752,8 @@ BirdKeeperGroup:
 
 	; BIRD_KEEPER (19)
 	db "VANCE@", TRAINERTYPE_MOVES
-	db 38, PIDGEOT, TOXIC, QUICK_ATTACK, WHIRLWIND, FLY
-	db 38, PIDGEOT, SWIFT, DETECT, STEEL_WING, FLY
+	db 38, PIDGEOT,    TOXIC, QUICK_ATTACK, WHIRLWIND, FLY
+	db 38, PIDGEOT,    SWIFT, DETECT, STEEL_WING, FLY
 	db -1 ; end
 ; ================================
 
@@ -762,7 +762,7 @@ LassGroup:
 ; ================================
 	; LASS (1)
 	db "CARRIE@", TRAINERTYPE_MOVES
-	db 18, SNUBBULL, SCARY_FACE, CHARM, BITE, LICK
+	db 18, SNUBBULL,   SCARY_FACE, CHARM, BITE, LICK
 	db -1 ; end
 
 	; LASS (2)
@@ -820,8 +820,8 @@ LassGroup:
 
 	; LASS (10)
 	db "DANA@", TRAINERTYPE_MOVES
-	db 18, FLAAFFY, TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE
-	db 18, PSYDUCK, SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
+	db 18, FLAAFFY,    TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE
+	db 18, PSYDUCK,    SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
 	db -1 ; end
 
 	; LASS (11)
@@ -842,26 +842,26 @@ LassGroup:
 
 	; LASS (14)
 	db "DANA@", TRAINERTYPE_MOVES
-	db 21, FLAAFFY, TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE
-	db 21, PSYDUCK, SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
+	db 21, FLAAFFY,    TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE
+	db 21, PSYDUCK,    SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
 	db -1 ; end
 
 	; LASS (15)
 	db "DANA@", TRAINERTYPE_MOVES
-	db 29, PSYDUCK, SCRATCH, DISABLE, CONFUSION, SCREECH
-	db 29, AMPHAROS, TACKLE, THUNDERSHOCK, THUNDER_WAVE, COTTON_SPORE
+	db 29, PSYDUCK,    SCRATCH, DISABLE, CONFUSION, SCREECH
+	db 29, AMPHAROS,   TACKLE, THUNDERSHOCK, THUNDER_WAVE, COTTON_SPORE
 	db -1 ; end
 
 	; LASS (16)
 	db "DANA@", TRAINERTYPE_MOVES
-	db 32, PSYDUCK, SCRATCH, DISABLE, CONFUSION, SCREECH
-	db 32, AMPHAROS, TACKLE, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE
+	db 32, PSYDUCK,    SCRATCH, DISABLE, CONFUSION, SCREECH
+	db 32, AMPHAROS,   TACKLE, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE
 	db -1 ; end
 
 	; LASS (17)
 	db "DANA@", TRAINERTYPE_MOVES
-	db 36, AMPHAROS, SWIFT, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE
-	db 36, GOLDUCK, DISABLE, SURF, PSYCHIC_M, SCREECH
+	db 36, AMPHAROS,   SWIFT, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE
+	db 36, GOLDUCK,    DISABLE, SURF, PSYCHIC_M, SCREECH
 	db -1 ; end
 ; ================================
 
@@ -870,11 +870,11 @@ JanineGroup:
 ; ================================
 	; JANINE (1)
 	db "JANINE@", TRAINERTYPE_MOVES
-	db 36, CROBAT, SCREECH, SUPERSONIC, CONFUSE_RAY, WING_ATTACK
-	db 36, WEEZING, SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION
-	db 36, WEEZING, SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION
-	db 33, ARIADOS, SCARY_FACE, GIGA_DRAIN, STRING_SHOT, NIGHT_SHADE
-	db 39, VENOMOTH, FORESIGHT, DOUBLE_TEAM, GUST, PSYCHIC_M
+	db 36, CROBAT,     SCREECH, SUPERSONIC, CONFUSE_RAY, WING_ATTACK
+	db 36, WEEZING,    SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION
+	db 36, WEEZING,    SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION
+	db 33, ARIADOS,    SCARY_FACE, GIGA_DRAIN, STRING_SHOT, NIGHT_SHADE
+	db 39, VENOMOTH,   FORESIGHT, DOUBLE_TEAM, GUST, PSYCHIC_M
 	db -1 ; end
 ; ================================
 
@@ -884,8 +884,8 @@ CooltrainerMGroup:
 	; COOLTRAINERM (1)
 	db "NICK@", TRAINERTYPE_MOVES
 	db 26, CHARMANDER, EMBER, SMOKESCREEN, RAGE, SCARY_FACE
-	db 26, SQUIRTLE, WITHDRAW, WATER_GUN, BITE, CURSE
-	db 26, BULBASAUR, LEECH_SEED, POISONPOWDER, SLEEP_POWDER, RAZOR_LEAF
+	db 26, SQUIRTLE,   WITHDRAW, WATER_GUN, BITE, CURSE
+	db 26, BULBASAUR,  LEECH_SEED, POISONPOWDER, SLEEP_POWDER, RAZOR_LEAF
 	db -1 ; end
 
 	; COOLTRAINERM (2)
@@ -916,46 +916,46 @@ CooltrainerMGroup:
 	; COOLTRAINERM (6)
 	db "GAVEN@", TRAINERTYPE_MOVES
 	db 35, VICTREEBEL, WRAP, TOXIC, ACID, RAZOR_LEAF
-	db 35, KINGLER, BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT
-	db 35, FLAREON, SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN
+	db 35, KINGLER,    BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT
+	db 35, FLAREON,    SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN
 	db -1 ; end
 
 	; COOLTRAINERM (7)
 	db "GAVEN@", TRAINERTYPE_ITEM_MOVES
-	db 39, VICTREEBEL, NO_ITEM, GIGA_DRAIN, TOXIC, SLUDGE_BOMB, RAZOR_LEAF
-	db 39, KINGLER, KINGS_ROCK, SURF, STOMP, GUILLOTINE, BLIZZARD
-	db 39, FLAREON, NO_ITEM, FLAMETHROWER, QUICK_ATTACK, BITE, FIRE_SPIN
+	db 39, VICTREEBEL, NO_ITEM,      GIGA_DRAIN, TOXIC, SLUDGE_BOMB, RAZOR_LEAF
+	db 39, KINGLER,    KINGS_ROCK,   SURF, STOMP, GUILLOTINE, BLIZZARD
+	db 39, FLAREON,    NO_ITEM,      FLAMETHROWER, QUICK_ATTACK, BITE, FIRE_SPIN
 	db -1 ; end
 
 	; COOLTRAINERM (8)
 	db "RYAN@", TRAINERTYPE_MOVES
-	db 25, PIDGEOT, SAND_ATTACK, QUICK_ATTACK, WHIRLWIND, WING_ATTACK
+	db 25, PIDGEOT,    SAND_ATTACK, QUICK_ATTACK, WHIRLWIND, WING_ATTACK
 	db 27, ELECTABUZZ, THUNDERPUNCH, LIGHT_SCREEN, SWIFT, SCREECH
 	db -1 ; end
 
 	; COOLTRAINERM (9)
 	db "JAKE@", TRAINERTYPE_MOVES
-	db 33, PARASECT, LEECH_LIFE, SPORE, SLASH, SWORDS_DANCE
-	db 35, GOLDUCK, CONFUSION, SCREECH, PSYCH_UP, FURY_SWIPES
+	db 33, PARASECT,   LEECH_LIFE, SPORE, SLASH, SWORDS_DANCE
+	db 35, GOLDUCK,    CONFUSION, SCREECH, PSYCH_UP, FURY_SWIPES
 	db -1 ; end
 
 	; COOLTRAINERM (10)
 	db "GAVEN@", TRAINERTYPE_MOVES
 	db 32, VICTREEBEL, WRAP, TOXIC, ACID, RAZOR_LEAF
-	db 32, KINGLER, BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT
-	db 32, FLAREON, SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN
+	db 32, KINGLER,    BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT
+	db 32, FLAREON,    SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN
 	db -1 ; end
 
 	; COOLTRAINERM (11)
 	db "BLAKE@", TRAINERTYPE_MOVES
-	db 33, MAGNETON, THUNDERBOLT, SUPERSONIC, SWIFT, SCREECH
-	db 31, QUAGSIRE, WATER_GUN, SLAM, AMNESIA, EARTHQUAKE
-	db 31, EXEGGCUTE, LEECH_SEED, CONFUSION, SLEEP_POWDER, SOLARBEAM
+	db 33, MAGNETON,   THUNDERBOLT, SUPERSONIC, SWIFT, SCREECH
+	db 31, QUAGSIRE,   WATER_GUN, SLAM, AMNESIA, EARTHQUAKE
+	db 31, EXEGGCUTE,  LEECH_SEED, CONFUSION, SLEEP_POWDER, SOLARBEAM
 	db -1 ; end
 
 	; COOLTRAINERM (12)
 	db "BRIAN@", TRAINERTYPE_MOVES
-	db 35, SANDSLASH, SAND_ATTACK, POISON_STING, SLASH, SWIFT
+	db 35, SANDSLASH,  SAND_ATTACK, POISON_STING, SLASH, SWIFT
 	db -1 ; end
 
 	; COOLTRAINERM (13)
@@ -1007,7 +1007,7 @@ CooltrainerMGroup:
 
 	; COOLTRAINERM (20)
 	db "DARIN@", TRAINERTYPE_MOVES
-	db 37, DRAGONAIR, WRAP, SURF, DRAGON_RAGE, SLAM
+	db 37, DRAGONAIR,  WRAP, SURF, DRAGON_RAGE, SLAM
 	db -1 ; end
 ; ================================
 
@@ -1024,8 +1024,8 @@ CooltrainerFGroup:
 
 	; COOLTRAINERF (2)
 	db "LOIS@", TRAINERTYPE_MOVES
-	db 25, SKIPLOOM, SYNTHESIS, POISONPOWDER, MEGA_DRAIN, LEECH_SEED
-	db 25, NINETALES, EMBER, QUICK_ATTACK, CONFUSE_RAY, SAFEGUARD
+	db 25, SKIPLOOM,   SYNTHESIS, POISONPOWDER, MEGA_DRAIN, LEECH_SEED
+	db 25, NINETALES,  EMBER, QUICK_ATTACK, CONFUSE_RAY, SAFEGUARD
 	db -1 ; end
 
 	; COOLTRAINERF (3)
@@ -1060,13 +1060,13 @@ CooltrainerFGroup:
 
 	; COOLTRAINERF (8)
 	db "JOYCE@", TRAINERTYPE_MOVES
-	db 36, PIKACHU, QUICK_ATTACK, DOUBLE_TEAM, THUNDERBOLT, THUNDER
-	db 32, BLASTOISE, BITE, CURSE, SURF, RAIN_DANCE
+	db 36, PIKACHU,    QUICK_ATTACK, DOUBLE_TEAM, THUNDERBOLT, THUNDER
+	db 32, BLASTOISE,  BITE, CURSE, SURF, RAIN_DANCE
 	db -1 ; end
 
 	; COOLTRAINERF (9)
 	db "BETH@", TRAINERTYPE_MOVES
-	db 36, RAPIDASH, STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY
+	db 36, RAPIDASH,   STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY
 	db -1 ; end
 
 	; COOLTRAINERF (10)
@@ -1078,14 +1078,14 @@ CooltrainerFGroup:
 
 	; COOLTRAINERF (11)
 	db "MEGAN@", TRAINERTYPE_MOVES
-	db 32, BULBASAUR, GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF
-	db 32, IVYSAUR, GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF
-	db 32, VENUSAUR, BODY_SLAM, SLEEP_POWDER, RAZOR_LEAF, SWEET_SCENT
+	db 32, BULBASAUR,  GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF
+	db 32, IVYSAUR,    GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF
+	db 32, VENUSAUR,   BODY_SLAM, SLEEP_POWDER, RAZOR_LEAF, SWEET_SCENT
 	db -1 ; end
 
 	; COOLTRAINERF (12)
 	db "BETH@", TRAINERTYPE_MOVES
-	db 39, RAPIDASH, STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY
+	db 39, RAPIDASH,   STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY
 	db -1 ; end
 
 	; COOLTRAINERF (13)
@@ -1109,7 +1109,7 @@ CooltrainerFGroup:
 	; COOLTRAINERF (16)
 	db "CYBIL@", TRAINERTYPE_MOVES
 	db 25, BUTTERFREE, CONFUSION, SLEEP_POWDER, WHIRLWIND, GUST
-	db 25, BELLOSSOM, ABSORB, STUN_SPORE, ACID, SOLARBEAM
+	db 25, BELLOSSOM,  ABSORB, STUN_SPORE, ACID, SOLARBEAM
 	db -1 ; end
 
 	; COOLTRAINERF (17)
@@ -1120,7 +1120,7 @@ CooltrainerFGroup:
 
 	; COOLTRAINERF (18)
 	db "BETH@", TRAINERTYPE_ITEM_MOVES
-	db 43, RAPIDASH, FOCUS_BAND, STOMP, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST
+	db 43, RAPIDASH,   FOCUS_BAND,   STOMP, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST
 	db -1 ; end
 
 	; COOLTRAINERF (19)
@@ -1132,16 +1132,16 @@ CooltrainerFGroup:
 
 	; COOLTRAINERF (20)
 	db "REENA@", TRAINERTYPE_ITEM_MOVES
-	db 38, STARMIE, NO_ITEM, DOUBLE_TEAM, PSYCHIC_M, WATERFALL, CONFUSE_RAY
-	db 40, NIDOQUEEN, PINK_BOW, EARTHQUAKE, DOUBLE_KICK, TOXIC, BODY_SLAM
-	db 38, STARMIE, NO_ITEM, BLIZZARD, PSYCHIC_M, WATERFALL, RECOVER
+	db 38, STARMIE,    NO_ITEM,      DOUBLE_TEAM, PSYCHIC_M, WATERFALL, CONFUSE_RAY
+	db 40, NIDOQUEEN,  PINK_BOW,     EARTHQUAKE, DOUBLE_KICK, TOXIC, BODY_SLAM
+	db 38, STARMIE,    NO_ITEM,      BLIZZARD, PSYCHIC_M, WATERFALL, RECOVER
 	db -1 ; end
 
 	; COOLTRAINERF (21)
 	db "CARA@", TRAINERTYPE_MOVES
-	db 33, HORSEA, SMOKESCREEN, LEER, WHIRLPOOL, TWISTER
-	db 33, HORSEA, SMOKESCREEN, LEER, WHIRLPOOL, TWISTER
-	db 35, SEADRA, SWIFT, LEER, WATERFALL, TWISTER
+	db 33, HORSEA,     SMOKESCREEN, LEER, WHIRLPOOL, TWISTER
+	db 33, HORSEA,     SMOKESCREEN, LEER, WHIRLPOOL, TWISTER
+	db 35, SEADRA,     SWIFT, LEER, WATERFALL, TWISTER
 	db -1 ; end
 ; ================================
 
@@ -1150,15 +1150,15 @@ BeautyGroup:
 ; ================================
 	; BEAUTY (1)
 	db "VICTORIA@", TRAINERTYPE_NORMAL
-	db 9, SENTRET
+	db  9, SENTRET
 	db 13, SENTRET
 	db 17, SENTRET
 	db -1 ; end
 
 	; BEAUTY (2)
 	db "SAMANTHA@", TRAINERTYPE_MOVES
-	db 16, MEOWTH, SCRATCH, GROWL, BITE, PAY_DAY
-	db 16, MEOWTH, SCRATCH, GROWL, BITE, SLASH
+	db 16, MEOWTH,     SCRATCH, GROWL, BITE, PAY_DAY
+	db 16, MEOWTH,     SCRATCH, GROWL, BITE, SLASH
 	db -1 ; end
 
 	; BEAUTY (3)
@@ -1233,8 +1233,8 @@ BeautyGroup:
 
 	; BEAUTY (16)
 	db "VALERIE@", TRAINERTYPE_MOVES
-	db 17, HOPPIP, SYNTHESIS, TAIL_WHIP, TACKLE, POISONPOWDER
-	db 17, SKIPLOOM, SYNTHESIS, TAIL_WHIP, TACKLE, STUN_SPORE
+	db 17, HOPPIP,     SYNTHESIS, TAIL_WHIP, TACKLE, POISONPOWDER
+	db 17, SKIPLOOM,   SYNTHESIS, TAIL_WHIP, TACKLE, STUN_SPORE
 	db -1 ; end
 
 	; BEAUTY (17)
@@ -1296,12 +1296,12 @@ PokemaniacGroup:
 
 	; POKEMANIAC (10)
 	db "BRENT@", TRAINERTYPE_MOVES
-	db 36, PORYGON, RECOVER, PSYCHIC_M, CONVERSION2, TRI_ATTACK
+	db 36, PORYGON,    RECOVER, PSYCHIC_M, CONVERSION2, TRI_ATTACK
 	db -1 ; end
 
 	; POKEMANIAC (11)
 	db "ISSAC@", TRAINERTYPE_MOVES
-	db 12, LICKITUNG, LICK, SUPERSONIC, CUT, NO_MOVE
+	db 12, LICKITUNG,  LICK, SUPERSONIC, CUT, NO_MOVE
 	db -1 ; end
 
 	; POKEMANIAC (12)
@@ -1317,7 +1317,7 @@ PokemaniacGroup:
 
 	; POKEMANIAC (14)
 	db "BRENT@", TRAINERTYPE_MOVES
-	db 41, CHANSEY, ROLLOUT, ATTRACT, EGG_BOMB, SOFTBOILED
+	db 41, CHANSEY,    ROLLOUT, ATTRACT, EGG_BOMB, SOFTBOILED
 	db -1 ; end
 
 	; POKEMANIAC (15)
@@ -1337,9 +1337,9 @@ GruntMGroup:
 
 	; GRUNTM (2)
 	db "GRUNT@", TRAINERTYPE_NORMAL
-	db 7, RATTATA
-	db 9, ZUBAT
-	db 9, ZUBAT
+	db  7, RATTATA
+	db  9, ZUBAT
+	db  9, ZUBAT
 	db -1 ; end
 
 	; GRUNTM (3)
@@ -1504,8 +1504,8 @@ GruntMGroup:
 
 	; GRUNTM (29)
 	db "GRUNT@", TRAINERTYPE_NORMAL
-	db 9, RATTATA
-	db 9, RATTATA
+	db  9, RATTATA
+	db  9, RATTATA
 	db -1 ; end
 
 	; GRUNTM (30)
@@ -1591,9 +1591,9 @@ SabrinaGroup:
 ; ================================
 	; SABRINA (1)
 	db "SABRINA@", TRAINERTYPE_MOVES
-	db 46, ESPEON, SAND_ATTACK, QUICK_ATTACK, SWIFT, PSYCHIC_M
-	db 46, MR__MIME, BARRIER, REFLECT, BATON_PASS, PSYCHIC_M
-	db 48, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
+	db 46, ESPEON,     SAND_ATTACK, QUICK_ATTACK, SWIFT, PSYCHIC_M
+	db 46, MR__MIME,   BARRIER, REFLECT, BATON_PASS, PSYCHIC_M
+	db 48, ALAKAZAM,   RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
 	db -1 ; end
 ; ================================
 
@@ -1602,8 +1602,8 @@ BugCatcherGroup:
 ; ================================
 	; BUG_CATCHER (1)
 	db "DON@", TRAINERTYPE_NORMAL
-	db 3, CATERPIE
-	db 3, CATERPIE
+	db  3, CATERPIE
+	db  3, CATERPIE
 	db -1 ; end
 
 	; BUG_CATCHER (2)
@@ -1621,16 +1621,16 @@ BugCatcherGroup:
 
 	; BUG_CATCHER (4)
 	db "WADE@", TRAINERTYPE_NORMAL
-	db 2, CATERPIE
-	db 2, CATERPIE
-	db 3, WEEDLE
-	db 2, CATERPIE
+	db  2, CATERPIE
+	db  2, CATERPIE
+	db  3, WEEDLE
+	db  2, CATERPIE
 	db -1 ; end
 
 	; BUG_CATCHER (5)
 	db "BENNY@", TRAINERTYPE_NORMAL
-	db 7, WEEDLE
-	db 9, KAKUNA
+	db  7, WEEDLE
+	db  9, KAKUNA
 	db 12, BEEDRILL
 	db -1 ; end
 
@@ -1658,10 +1658,10 @@ BugCatcherGroup:
 
 	; BUG_CATCHER (10)
 	db "WADE@", TRAINERTYPE_NORMAL
-	db 9, METAPOD
-	db 9, METAPOD
+	db  9, METAPOD
+	db  9, METAPOD
 	db 10, KAKUNA
-	db 9, METAPOD
+	db  9, METAPOD
 	db -1 ; end
 
 	; BUG_CATCHER (11)
@@ -1684,14 +1684,14 @@ BugCatcherGroup:
 
 	; BUG_CATCHER (14)
 	db "ARNIE@", TRAINERTYPE_MOVES
-	db 28, VENOMOTH, DISABLE, SUPERSONIC, CONFUSION, LEECH_LIFE
+	db 28, VENOMOTH,   DISABLE, SUPERSONIC, CONFUSION, LEECH_LIFE
 	db -1 ; end
 
 	; BUG_CATCHER (15)
 	db "WADE@", TRAINERTYPE_MOVES
 	db 24, BUTTERFREE, CONFUSION, POISONPOWDER, SUPERSONIC, WHIRLWIND
 	db 24, BUTTERFREE, CONFUSION, STUN_SPORE, SUPERSONIC, WHIRLWIND
-	db 25, BEEDRILL, FURY_ATTACK, FOCUS_ENERGY, TWINEEDLE, RAGE
+	db 25, BEEDRILL,   FURY_ATTACK, FOCUS_ENERGY, TWINEEDLE, RAGE
 	db 24, BUTTERFREE, CONFUSION, SLEEP_POWDER, SUPERSONIC, WHIRLWIND
 	db -1 ; end
 
@@ -1699,23 +1699,23 @@ BugCatcherGroup:
 	db "WADE@", TRAINERTYPE_MOVES
 	db 30, BUTTERFREE, CONFUSION, POISONPOWDER, SUPERSONIC, GUST
 	db 30, BUTTERFREE, CONFUSION, STUN_SPORE, SUPERSONIC, GUST
-	db 32, BEEDRILL, FURY_ATTACK, PURSUIT, TWINEEDLE, DOUBLE_TEAM
+	db 32, BEEDRILL,   FURY_ATTACK, PURSUIT, TWINEEDLE, DOUBLE_TEAM
 	db 34, BUTTERFREE, PSYBEAM, SLEEP_POWDER, GUST, WHIRLWIND
 	db -1 ; end
 
 	; BUG_CATCHER (17)
 	db "ARNIE@", TRAINERTYPE_MOVES
-	db 36, VENOMOTH, GUST, SUPERSONIC, PSYBEAM, LEECH_LIFE
+	db 36, VENOMOTH,   GUST, SUPERSONIC, PSYBEAM, LEECH_LIFE
 	db -1 ; end
 
 	; BUG_CATCHER (18)
 	db "ARNIE@", TRAINERTYPE_MOVES
-	db 40, VENOMOTH, GUST, SUPERSONIC, PSYCHIC_M, TOXIC
+	db 40, VENOMOTH,   GUST, SUPERSONIC, PSYCHIC_M, TOXIC
 	db -1 ; end
 
 	; BUG_CATCHER (19)
 	db "WAYNE@", TRAINERTYPE_NORMAL
-	db 8, LEDYBA
+	db  8, LEDYBA
 	db 10, PARAS
 	db -1 ; end
 ; ================================
@@ -1725,10 +1725,10 @@ FisherGroup:
 ; ================================
 	; FISHER (1)
 	db "JUSTIN@", TRAINERTYPE_NORMAL
-	db 5, MAGIKARP
-	db 5, MAGIKARP
+	db  5, MAGIKARP
+	db  5, MAGIKARP
 	db 15, MAGIKARP
-	db 5, MAGIKARP
+	db  5, MAGIKARP
 	db -1 ; end
 
 	; FISHER (2)
@@ -1750,8 +1750,8 @@ FisherGroup:
 
 	; FISHER (5)
 	db "HENRY@", TRAINERTYPE_NORMAL
-	db 8, POLIWAG
-	db 8, POLIWAG
+	db  8, POLIWAG
+	db  8, POLIWAG
 	db -1 ; end
 
 	; FISHER (6)
@@ -1789,8 +1789,8 @@ FisherGroup:
 
 	; FISHER (11)
 	db "EDGAR@", TRAINERTYPE_MOVES
-	db 25, REMORAID, LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM
-	db 25, REMORAID, LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM
+	db 25, REMORAID,   LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM
+	db 25, REMORAID,   LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM
 	db -1 ; end
 
 	; FISHER (12)
@@ -1861,9 +1861,9 @@ FisherGroup:
 
 	; FISHER (22)
 	db "WILTON@", TRAINERTYPE_MOVES
-	db 34, SEAKING, SUPERSONIC, WATERFALL, FLAIL, FURY_ATTACK
-	db 34, SEAKING, SUPERSONIC, WATERFALL, FLAIL, FURY_ATTACK
-	db 38, REMORAID, PSYBEAM, AURORA_BEAM, BUBBLEBEAM, HYPER_BEAM
+	db 34, SEAKING,    SUPERSONIC, WATERFALL, FLAIL, FURY_ATTACK
+	db 34, SEAKING,    SUPERSONIC, WATERFALL, FLAIL, FURY_ATTACK
+	db 38, REMORAID,   PSYBEAM, AURORA_BEAM, BUBBLEBEAM, HYPER_BEAM
 	db -1 ; end
 
 	; FISHER (23)
@@ -1874,15 +1874,15 @@ FisherGroup:
 
 	; FISHER (24)
 	db "RALPH@", TRAINERTYPE_MOVES
-	db 35, QWILFISH, TOXIC, MINIMIZE, SURF, PIN_MISSILE
-	db 39, SEAKING, ENDURE, FLAIL, FURY_ATTACK, WATERFALL
+	db 35, QWILFISH,   TOXIC, MINIMIZE, SURF, PIN_MISSILE
+	db 39, SEAKING,    ENDURE, FLAIL, FURY_ATTACK, WATERFALL
 	db -1 ; end
 
 	; FISHER (25)
 	db "TULLY@", TRAINERTYPE_MOVES
-	db 34, SEAKING, SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK
-	db 34, SEAKING, SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK
-	db 37, QWILFISH, ROLLOUT, SURF, PIN_MISSILE, TAKE_DOWN
+	db 34, SEAKING,    SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK
+	db 34, SEAKING,    SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK
+	db 37, QWILFISH,   ROLLOUT, SURF, PIN_MISSILE, TAKE_DOWN
 	db -1 ; end
 ; ================================
 
@@ -2053,8 +2053,8 @@ SwimmerFGroup:
 
 	; SWIMMERF (4)
 	db "SUSIE@", TRAINERTYPE_MOVES
-	db 20, PSYDUCK, SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
-	db 22, GOLDEEN, PECK, TAIL_WHIP, SUPERSONIC, HORN_ATTACK
+	db 20, PSYDUCK,    SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
+	db 22, GOLDEEN,    PECK, TAIL_WHIP, SUPERSONIC, HORN_ATTACK
 	db -1 ; end
 
 	; SWIMMERF (5)
@@ -2070,8 +2070,8 @@ SwimmerFGroup:
 
 	; SWIMMERF (7)
 	db "WENDY@", TRAINERTYPE_MOVES
-	db 21, HORSEA, BUBBLE, SMOKESCREEN, LEER, WATER_GUN
-	db 21, HORSEA, DRAGON_RAGE, SMOKESCREEN, LEER, WATER_GUN
+	db 21, HORSEA,     BUBBLE, SMOKESCREEN, LEER, WATER_GUN
+	db 21, HORSEA,     DRAGON_RAGE, SMOKESCREEN, LEER, WATER_GUN
 	db -1 ; end
 
 	; SWIMMERF (8)
@@ -2165,8 +2165,8 @@ SailorGroup:
 
 	; SAILOR (4)
 	db "KENT@", TRAINERTYPE_MOVES
-	db 18, KRABBY, BUBBLE, LEER, VICEGRIP, HARDEN
-	db 20, KRABBY, BUBBLEBEAM, LEER, VICEGRIP, HARDEN
+	db 18, KRABBY,     BUBBLE, LEER, VICEGRIP, HARDEN
+	db 20, KRABBY,     BUBBLEBEAM, LEER, VICEGRIP, HARDEN
 	db -1 ; end
 
 	; SAILOR (5)
@@ -2221,8 +2221,8 @@ SailorGroup:
 
 	; SAILOR (13)
 	db "HUEY@", TRAINERTYPE_MOVES
-	db 38, POLITOED, WHIRLPOOL, RAIN_DANCE, BODY_SLAM, PERISH_SONG
-	db 38, POLIWRATH, SURF, STRENGTH, ICE_PUNCH, SUBMISSION
+	db 38, POLITOED,   WHIRLPOOL, RAIN_DANCE, BODY_SLAM, PERISH_SONG
+	db 38, POLIWRATH,  SURF, STRENGTH, ICE_PUNCH, SUBMISSION
 	db -1 ; end
 ; ================================
 
@@ -2285,10 +2285,10 @@ SuperNerdGroup:
 
 	; SUPER_NERD (10)
 	db "TERU@", TRAINERTYPE_NORMAL
-	db 7, MAGNEMITE
+	db  7, MAGNEMITE
 	db 11, VOLTORB
-	db 7, MAGNEMITE
-	db 9, MAGNEMITE
+	db  7, MAGNEMITE
+	db  9, MAGNEMITE
 	db -1 ; end
 
 	; SUPER_NERD (11)
@@ -2300,17 +2300,17 @@ SuperNerdGroup:
 
 	; SUPER_NERD (12)
 	db "NORTON@", TRAINERTYPE_MOVES
-	db 30, PORYGON, CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK
+	db 30, PORYGON,    CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK
 	db -1 ; end
 
 	; SUPER_NERD (13)
 	db "HUGH@", TRAINERTYPE_MOVES
-	db 39, SEADRA, SMOKESCREEN, TWISTER, SURF, WATERFALL
+	db 39, SEADRA,     SMOKESCREEN, TWISTER, SURF, WATERFALL
 	db -1 ; end
 
 	; SUPER_NERD (14)
 	db "MARKUS@", TRAINERTYPE_MOVES
-	db 19, SLOWPOKE, CURSE, WATER_GUN, GROWL, STRENGTH
+	db 19, SLOWPOKE,   CURSE, WATER_GUN, GROWL, STRENGTH
 	db -1 ; end
 ; ================================
 
@@ -2319,61 +2319,61 @@ Rival2Group:
 ; ================================
 	; RIVAL2 (1)
 	db "?@", TRAINERTYPE_MOVES
-	db 41, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
-	db 42, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
-	db 41, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
-	db 43, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
-	db 43, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
-	db 45, MEGANIUM, RAZOR_LEAF, POISONPOWDER, BODY_SLAM, LIGHT_SCREEN
+	db 41, SNEASEL,    QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 42, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 41, MAGNETON,   THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 43, GENGAR,     MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 43, ALAKAZAM,   DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
+	db 45, MEGANIUM,   RAZOR_LEAF, POISONPOWDER, BODY_SLAM, LIGHT_SCREEN
 	db -1 ; end
 
 	; RIVAL2 (2)
 	db "?@", TRAINERTYPE_MOVES
-	db 41, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
-	db 42, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
-	db 41, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
-	db 43, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
-	db 43, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
+	db 41, SNEASEL,    QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 42, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 41, MAGNETON,   THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 43, GENGAR,     MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 43, ALAKAZAM,   DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
 	db 45, TYPHLOSION, SMOKESCREEN, QUICK_ATTACK, FLAME_WHEEL, SWIFT
 	db -1 ; end
 
 	; RIVAL2 (3)
 	db "?@", TRAINERTYPE_MOVES
-	db 41, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
-	db 42, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
-	db 41, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
-	db 43, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
-	db 43, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
+	db 41, SNEASEL,    QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 42, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 41, MAGNETON,   THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 43, GENGAR,     MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 43, ALAKAZAM,   DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
 	db 45, FERALIGATR, RAGE, WATER_GUN, SCARY_FACE, SLASH
 	db -1 ; end
 
 	; RIVAL2 (4)
 	db "?@", TRAINERTYPE_MOVES
-	db 45, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
-	db 48, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
-	db 45, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
-	db 46, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
-	db 46, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
-	db 50, MEGANIUM, GIGA_DRAIN, BODY_SLAM, LIGHT_SCREEN, SAFEGUARD
+	db 45, SNEASEL,    QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 48, CROBAT,     TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
+	db 45, MAGNETON,   THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 46, GENGAR,     MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 46, ALAKAZAM,   RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
+	db 50, MEGANIUM,   GIGA_DRAIN, BODY_SLAM, LIGHT_SCREEN, SAFEGUARD
 	db -1 ; end
 
 	; RIVAL2 (5)
 	db "?@", TRAINERTYPE_MOVES
-	db 45, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
-	db 48, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
-	db 45, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
-	db 46, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
-	db 46, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
+	db 45, SNEASEL,    QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 48, CROBAT,     TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
+	db 45, MAGNETON,   THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 46, GENGAR,     MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 46, ALAKAZAM,   RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
 	db 50, TYPHLOSION, SMOKESCREEN, QUICK_ATTACK, FIRE_BLAST, SWIFT
 	db -1 ; end
 
 	; RIVAL2 (6)
 	db "?@", TRAINERTYPE_MOVES
-	db 45, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
-	db 48, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
-	db 45, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
-	db 46, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
-	db 46, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
+	db 45, SNEASEL,    QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 48, CROBAT,     TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
+	db 45, MAGNETON,   THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 46, GENGAR,     MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 46, ALAKAZAM,   RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
 	db 50, FERALIGATR, SURF, RAIN_DANCE, SLASH, SCREECH
 	db -1 ; end
 ; ================================
@@ -2406,9 +2406,9 @@ HikerGroup:
 
 	; HIKER (2)
 	db "RUSSELL@", TRAINERTYPE_NORMAL
-	db 4, GEODUDE
-	db 6, GEODUDE
-	db 8, GEODUDE
+	db  4, GEODUDE
+	db  6, GEODUDE
+	db  8, GEODUDE
 	db -1 ; end
 
 	; HIKER (3)
@@ -2459,8 +2459,8 @@ HikerGroup:
 
 	; HIKER (10)
 	db "TIMOTHY@", TRAINERTYPE_MOVES
-	db 27, DIGLETT, MAGNITUDE, DIG, SAND_ATTACK, SLASH
-	db 27, DUGTRIO, MAGNITUDE, DIG, SAND_ATTACK, SLASH
+	db 27, DIGLETT,    MAGNITUDE, DIG, SAND_ATTACK, SLASH
+	db 27, DUGTRIO,    MAGNITUDE, DIG, SAND_ATTACK, SLASH
 	db -1 ; end
 
 	; HIKER (11)
@@ -2518,9 +2518,9 @@ HikerGroup:
 
 	; HIKER (19)
 	db "PARRY@", TRAINERTYPE_MOVES
-	db 35, PILOSWINE, EARTHQUAKE, BLIZZARD, REST, TAKE_DOWN
-	db 35, DUGTRIO, MAGNITUDE, DIG, MUD_SLAP, SLASH
-	db 38, STEELIX, DIG, IRON_TAIL, SANDSTORM, SLAM
+	db 35, PILOSWINE,  EARTHQUAKE, BLIZZARD, REST, TAKE_DOWN
+	db 35, DUGTRIO,    MAGNITUDE, DIG, MUD_SLAP, SLASH
+	db 38, STEELIX,    DIG, IRON_TAIL, SANDSTORM, SLAM
 	db -1 ; end
 
 	; HIKER (20)
@@ -2537,9 +2537,9 @@ HikerGroup:
 
 	; HIKER (22)
 	db "ANTHONY@", TRAINERTYPE_MOVES
-	db 34, GRAVELER, MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT
-	db 36, GOLEM, MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT
-	db 34, MACHOKE, KARATE_CHOP, VITAL_THROW, HEADBUTT, DIG
+	db 34, GRAVELER,   MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT
+	db 36, GOLEM,      MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT
+	db 34, MACHOKE,    KARATE_CHOP, VITAL_THROW, HEADBUTT, DIG
 	db -1 ; end
 ; ================================
 
@@ -2610,9 +2610,9 @@ BlaineGroup:
 ; ================================
 	; BLAINE (1)
 	db "BLAINE@", TRAINERTYPE_MOVES
-	db 45, MAGCARGO, CURSE, SMOG, FLAMETHROWER, ROCK_SLIDE
-	db 45, MAGMAR, THUNDERPUNCH, FIRE_PUNCH, SUNNY_DAY, CONFUSE_RAY
-	db 50, RAPIDASH, QUICK_ATTACK, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST
+	db 45, MAGCARGO,   CURSE, SMOG, FLAMETHROWER, ROCK_SLIDE
+	db 45, MAGMAR,     THUNDERPUNCH, FIRE_PUNCH, SUNNY_DAY, CONFUSE_RAY
+	db 50, RAPIDASH,   QUICK_ATTACK, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST
 	db -1 ; end
 ; ================================
 
@@ -2628,8 +2628,8 @@ BurglarGroup:
 
 	; BURGLAR (2)
 	db "EDDIE@", TRAINERTYPE_MOVES
-	db 26, GROWLITHE, ROAR, EMBER, LEER, TAKE_DOWN
-	db 24, KOFFING, TACKLE, SMOG, SLUDGE, SMOKESCREEN
+	db 26, GROWLITHE,  ROAR, EMBER, LEER, TAKE_DOWN
+	db 24, KOFFING,    TACKLE, SMOG, SLUDGE, SMOKESCREEN
 	db -1 ; end
 
 	; BURGLAR (3)
@@ -2671,8 +2671,8 @@ FirebreatherGroup:
 
 	; FIREBREATHER (5)
 	db "BILL@", TRAINERTYPE_NORMAL
-	db 6, KOFFING
-	db 6, KOFFING
+	db  6, KOFFING
+	db  6, KOFFING
 	db -1 ; end
 
 	; FIREBREATHER (6)
@@ -2683,7 +2683,7 @@ FirebreatherGroup:
 
 	; FIREBREATHER (7)
 	db "RAY@", TRAINERTYPE_NORMAL
-	db 9, VULPIX
+	db  9, VULPIX
 	db -1 ; end
 
 	; FIREBREATHER (8)
@@ -2699,8 +2699,8 @@ JugglerGroup:
 ; ================================
 	; JUGGLER (1)
 	db "IRWIN@", TRAINERTYPE_NORMAL
-	db 2, VOLTORB
-	db 6, VOLTORB
+	db  2, VOLTORB
+	db  6, VOLTORB
 	db 10, VOLTORB
 	db 14, VOLTORB
 	db -1 ; end
@@ -2722,7 +2722,7 @@ JugglerGroup:
 
 	; JUGGLER (4)
 	db "IRWIN@", TRAINERTYPE_NORMAL
-	db 6, VOLTORB
+	db  6, VOLTORB
 	db 10, VOLTORB
 	db 14, VOLTORB
 	db 18, VOLTORB
@@ -2758,15 +2758,15 @@ BlackbeltGroup:
 
 	; BLACKBELT_T (2)
 	db "YOSHI@", TRAINERTYPE_MOVES
-	db 27, HITMONLEE, DOUBLE_KICK, MEDITATE, JUMP_KICK, FOCUS_ENERGY
+	db 27, HITMONLEE,  DOUBLE_KICK, MEDITATE, JUMP_KICK, FOCUS_ENERGY
 	db -1 ; end
 
 	; BLACKBELT_T (3)
 	db "KENJI@", TRAINERTYPE_MOVES
-	db 33, ONIX, BIND, ROCK_THROW, TOXIC, DIG
-	db 38, MACHAMP, HEADBUTT, SWAGGER, THUNDERPUNCH, VITAL_THROW
-	db 33, STEELIX, EARTHQUAKE, ROCK_THROW, IRON_TAIL, SANDSTORM
-	db 36, HITMONLEE, DOUBLE_TEAM, HI_JUMP_KICK, MUD_SLAP, SWIFT
+	db 33, ONIX,       BIND, ROCK_THROW, TOXIC, DIG
+	db 38, MACHAMP,    HEADBUTT, SWAGGER, THUNDERPUNCH, VITAL_THROW
+	db 33, STEELIX,    EARTHQUAKE, ROCK_THROW, IRON_TAIL, SANDSTORM
+	db 36, HITMONLEE,  DOUBLE_TEAM, HI_JUMP_KICK, MUD_SLAP, SWIFT
 	db -1 ; end
 
 	; BLACKBELT_T (4)
@@ -2776,8 +2776,8 @@ BlackbeltGroup:
 
 	; BLACKBELT_T (5)
 	db "NOB@", TRAINERTYPE_MOVES
-	db 25, MACHOP, LEER, FOCUS_ENERGY, KARATE_CHOP, SEISMIC_TOSS
-	db 25, MACHOKE, LEER, KARATE_CHOP, SEISMIC_TOSS, ROCK_SLIDE
+	db 25, MACHOP,     LEER, FOCUS_ENERGY, KARATE_CHOP, SEISMIC_TOSS
+	db 25, MACHOKE,    LEER, KARATE_CHOP, SEISMIC_TOSS, ROCK_SLIDE
 	db -1 ; end
 
 	; BLACKBELT_T (6)
@@ -2811,24 +2811,24 @@ ExecutiveMGroup:
 ; ================================
 	; EXECUTIVEM (1)
 	db "EXECUTIVE@", TRAINERTYPE_MOVES
-	db 33, HOUNDOUR, EMBER, ROAR, BITE, FAINT_ATTACK
-	db 33, KOFFING, TACKLE, SLUDGE, SMOKESCREEN, HAZE
-	db 35, HOUNDOOM, EMBER, SMOG, BITE, FAINT_ATTACK
+	db 33, HOUNDOUR,   EMBER, ROAR, BITE, FAINT_ATTACK
+	db 33, KOFFING,    TACKLE, SLUDGE, SMOKESCREEN, HAZE
+	db 35, HOUNDOOM,   EMBER, SMOG, BITE, FAINT_ATTACK
 	db -1 ; end
 
 	; EXECUTIVEM (2)
 	db "EXECUTIVE@", TRAINERTYPE_MOVES
-	db 36, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 36, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 	db -1 ; end
 
 	; EXECUTIVEM (3)
 	db "EXECUTIVE@", TRAINERTYPE_MOVES
-	db 30, KOFFING, TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
-	db 30, KOFFING, TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
-	db 30, KOFFING, TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
-	db 32, WEEZING, TACKLE, EXPLOSION, SLUDGE, SMOKESCREEN
-	db 30, KOFFING, TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
-	db 30, KOFFING, TACKLE, SMOG, SLUDGE, SMOKESCREEN
+	db 30, KOFFING,    TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
+	db 30, KOFFING,    TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
+	db 30, KOFFING,    TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
+	db 32, WEEZING,    TACKLE, EXPLOSION, SLUDGE, SMOKESCREEN
+	db 30, KOFFING,    TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
+	db 30, KOFFING,    TACKLE, SMOG, SLUDGE, SMOKESCREEN
 	db -1 ; end
 
 	; EXECUTIVEM (4)
@@ -2866,26 +2866,26 @@ PsychicGroup:
 
 	; PSYCHIC_T (5)
 	db "GREG@", TRAINERTYPE_MOVES
-	db 17, DROWZEE, HYPNOSIS, DISABLE, DREAM_EATER, NO_MOVE
+	db 17, DROWZEE,    HYPNOSIS, DISABLE, DREAM_EATER, NO_MOVE
 	db -1 ; end
 
 	; PSYCHIC_T (6)
 	db "NORMAN@", TRAINERTYPE_MOVES
-	db 17, SLOWPOKE, TACKLE, GROWL, WATER_GUN, NO_MOVE
-	db 20, SLOWPOKE, CURSE, BODY_SLAM, WATER_GUN, CONFUSION
+	db 17, SLOWPOKE,   TACKLE, GROWL, WATER_GUN, NO_MOVE
+	db 20, SLOWPOKE,   CURSE, BODY_SLAM, WATER_GUN, CONFUSION
 	db -1 ; end
 
 	; PSYCHIC_T (7)
 	db "MARK@", TRAINERTYPE_MOVES
-	db 13, ABRA, TELEPORT, FLASH, NO_MOVE, NO_MOVE
-	db 13, ABRA, TELEPORT, FLASH, NO_MOVE, NO_MOVE
-	db 15, KADABRA, TELEPORT, KINESIS, CONFUSION, NO_MOVE
+	db 13, ABRA,       TELEPORT, FLASH, NO_MOVE, NO_MOVE
+	db 13, ABRA,       TELEPORT, FLASH, NO_MOVE, NO_MOVE
+	db 15, KADABRA,    TELEPORT, KINESIS, CONFUSION, NO_MOVE
 	db -1 ; end
 
 	; PSYCHIC_T (8)
 	db "PHIL@", TRAINERTYPE_MOVES
-	db 24, NATU, LEER, NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY
-	db 26, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
+	db 24, NATU,       LEER, NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY
+	db 26, KADABRA,    DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
 	db -1 ; end
 
 	; PSYCHIC_T (9)
@@ -2919,19 +2919,19 @@ PicnickerGroup:
 ; ================================
 	; PICNICKER (1)
 	db "LIZ@", TRAINERTYPE_NORMAL
-	db 9, NIDORAN_F
+	db  9, NIDORAN_F
 	db -1 ; end
 
 	; PICNICKER (2)
 	db "GINA@", TRAINERTYPE_NORMAL
-	db 9, HOPPIP
-	db 9, HOPPIP
+	db  9, HOPPIP
+	db  9, HOPPIP
 	db 12, BULBASAUR
 	db -1 ; end
 
 	; PICNICKER (3)
 	db "BROOKE@", TRAINERTYPE_MOVES
-	db 16, PIKACHU, THUNDERSHOCK, GROWL, QUICK_ATTACK, DOUBLE_TEAM
+	db 16, PIKACHU,    THUNDERSHOCK, GROWL, QUICK_ATTACK, DOUBLE_TEAM
 	db -1 ; end
 
 	; PICNICKER (4)
@@ -3007,12 +3007,12 @@ PicnickerGroup:
 
 	; PICNICKER (16)
 	db "TIFFANY@", TRAINERTYPE_MOVES
-	db 31, CLEFAIRY, ENCORE, SING, DOUBLESLAP, MINIMIZE
+	db 31, CLEFAIRY,   ENCORE, SING, DOUBLESLAP, MINIMIZE
 	db -1 ; end
 
 	; PICNICKER (17)
 	db "TIFFANY@", TRAINERTYPE_MOVES
-	db 37, CLEFAIRY, ENCORE, DOUBLESLAP, MINIMIZE, METRONOME
+	db 37, CLEFAIRY,   ENCORE, DOUBLESLAP, MINIMIZE, METRONOME
 	db -1 ; end
 
 	; PICNICKER (18)
@@ -3028,14 +3028,14 @@ PicnickerGroup:
 
 	; PICNICKER (20)
 	db "TIFFANY@", TRAINERTYPE_MOVES
-	db 20, CLEFAIRY, ENCORE, SING, DOUBLESLAP, MINIMIZE
+	db 20, CLEFAIRY,   ENCORE, SING, DOUBLESLAP, MINIMIZE
 	db -1 ; end
 
 	; PICNICKER (21)
 	db "ERIN@", TRAINERTYPE_MOVES
-	db 36, PONYTA, DOUBLE_TEAM, STOMP, FIRE_SPIN, SUNNY_DAY
-	db 34, RAICHU, SWIFT, MUD_SLAP, QUICK_ATTACK, THUNDERBOLT
-	db 36, PONYTA, DOUBLE_TEAM, STOMP, FIRE_SPIN, SUNNY_DAY
+	db 36, PONYTA,     DOUBLE_TEAM, STOMP, FIRE_SPIN, SUNNY_DAY
+	db 34, RAICHU,     SWIFT, MUD_SLAP, QUICK_ATTACK, THUNDERBOLT
+	db 36, PONYTA,     DOUBLE_TEAM, STOMP, FIRE_SPIN, SUNNY_DAY
 	db -1 ; end
 
 	; PICNICKER (22)
@@ -3048,8 +3048,8 @@ PicnickerGroup:
 	; PICNICKER (23)
 	db "LIZ@", TRAINERTYPE_MOVES
 	db 30, WEEPINBELL, SLEEP_POWDER, POISONPOWDER, STUN_SPORE, SLUDGE_BOMB
-	db 32, NIDOKING, EARTHQUAKE, DOUBLE_KICK, POISON_STING, IRON_TAIL
-	db 32, NIDOQUEEN, EARTHQUAKE, DOUBLE_KICK, TAIL_WHIP, BODY_SLAM
+	db 32, NIDOKING,   EARTHQUAKE, DOUBLE_KICK, POISON_STING, IRON_TAIL
+	db 32, NIDOQUEEN,  EARTHQUAKE, DOUBLE_KICK, TAIL_WHIP, BODY_SLAM
 	db -1 ; end
 
 	; PICNICKER (24)
@@ -3061,14 +3061,14 @@ PicnickerGroup:
 
 	; PICNICKER (25)
 	db "GINA@", TRAINERTYPE_MOVES
-	db 33, JUMPLUFF, STUN_SPORE, SUNNY_DAY, LEECH_SEED, COTTON_SPORE
-	db 33, JUMPLUFF, SUNNY_DAY, SLEEP_POWDER, LEECH_SEED, COTTON_SPORE
-	db 38, VENUSAUR, SOLARBEAM, RAZOR_LEAF, HEADBUTT, MUD_SLAP
+	db 33, JUMPLUFF,   STUN_SPORE, SUNNY_DAY, LEECH_SEED, COTTON_SPORE
+	db 33, JUMPLUFF,   SUNNY_DAY, SLEEP_POWDER, LEECH_SEED, COTTON_SPORE
+	db 38, VENUSAUR,   SOLARBEAM, RAZOR_LEAF, HEADBUTT, MUD_SLAP
 	db -1 ; end
 
 	; PICNICKER (26)
 	db "TIFFANY@", TRAINERTYPE_MOVES
-	db 43, CLEFAIRY, METRONOME, ENCORE, MOONLIGHT, MINIMIZE
+	db 43, CLEFAIRY,   METRONOME, ENCORE, MOONLIGHT, MINIMIZE
 	db -1 ; end
 ; ================================
 
@@ -3077,7 +3077,7 @@ CamperGroup:
 ; ================================
 	; CAMPER (1)
 	db "ROLAND@", TRAINERTYPE_NORMAL
-	db 9, NIDORAN_M
+	db  9, NIDORAN_M
 	db -1 ; end
 
 	; CAMPER (2)
@@ -3204,10 +3204,10 @@ CamperGroup:
 
 	; CAMPER (21)
 	db "TODD@", TRAINERTYPE_MOVES
-	db 33, GRAVELER, SELFDESTRUCT, ROCK_THROW, HARDEN, MAGNITUDE
-	db 33, GRAVELER, SELFDESTRUCT, ROCK_THROW, HARDEN, MAGNITUDE
-	db 36, MAGCARGO, ROCK_THROW, HARDEN, AMNESIA, FLAMETHROWER
-	db 34, GOLDUCK, DISABLE, PSYCHIC_M, SURF, PSYCH_UP
+	db 33, GRAVELER,   SELFDESTRUCT, ROCK_THROW, HARDEN, MAGNITUDE
+	db 33, GRAVELER,   SELFDESTRUCT, ROCK_THROW, HARDEN, MAGNITUDE
+	db 36, MAGCARGO,   ROCK_THROW, HARDEN, AMNESIA, FLAMETHROWER
+	db 34, GOLDUCK,    DISABLE, PSYCHIC_M, SURF, PSYCH_UP
 	db -1 ; end
 
 	; CAMPER (22)
@@ -3223,16 +3223,16 @@ ExecutiveFGroup:
 ; ================================
 	; EXECUTIVEF (1)
 	db "EXECUTIVE@", TRAINERTYPE_MOVES
-	db 32, ARBOK, WRAP, POISON_STING, BITE, GLARE
-	db 32, VILEPLUME, ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID
-	db 32, MURKROW, PECK, PURSUIT, HAZE, NIGHT_SHADE
+	db 32, ARBOK,      WRAP, POISON_STING, BITE, GLARE
+	db 32, VILEPLUME,  ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID
+	db 32, MURKROW,    PECK, PURSUIT, HAZE, NIGHT_SHADE
 	db -1 ; end
 
 	; EXECUTIVEF (2)
 	db "EXECUTIVE@", TRAINERTYPE_MOVES
-	db 23, ARBOK, WRAP, LEER, POISON_STING, BITE
-	db 23, GLOOM, ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID
-	db 25, MURKROW, PECK, PURSUIT, HAZE, NO_MOVE
+	db 23, ARBOK,      WRAP, LEER, POISON_STING, BITE
+	db 23, GLOOM,      ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID
+	db 25, MURKROW,    PECK, PURSUIT, HAZE, NO_MOVE
 	db -1 ; end
 ; ================================
 
@@ -3241,27 +3241,27 @@ SageGroup:
 ; ================================
 	; SAGE (1)
 	db "CHOW@", TRAINERTYPE_NORMAL
-	db 3, BELLSPROUT
-	db 3, BELLSPROUT
-	db 3, BELLSPROUT
+	db  3, BELLSPROUT
+	db  3, BELLSPROUT
+	db  3, BELLSPROUT
 	db -1 ; end
 
 	; SAGE (2)
 	db "NICO@", TRAINERTYPE_NORMAL
-	db 3, BELLSPROUT
-	db 3, BELLSPROUT
-	db 3, BELLSPROUT
+	db  3, BELLSPROUT
+	db  3, BELLSPROUT
+	db  3, BELLSPROUT
 	db -1 ; end
 
 	; SAGE (3)
 	db "JIN@", TRAINERTYPE_NORMAL
-	db 6, BELLSPROUT
+	db  6, BELLSPROUT
 	db -1 ; end
 
 	; SAGE (4)
 	db "TROY@", TRAINERTYPE_NORMAL
-	db 7, BELLSPROUT
-	db 7, HOOTHOOT
+	db  7, BELLSPROUT
+	db  7, HOOTHOOT
 	db -1 ; end
 
 	; SAGE (5)
@@ -3280,20 +3280,20 @@ SageGroup:
 
 	; SAGE (7)
 	db "EDMOND@", TRAINERTYPE_NORMAL
-	db 3, BELLSPROUT
-	db 3, BELLSPROUT
-	db 3, BELLSPROUT
+	db  3, BELLSPROUT
+	db  3, BELLSPROUT
+	db  3, BELLSPROUT
 	db -1 ; end
 
 	; SAGE (8)
 	db "NEAL@", TRAINERTYPE_NORMAL
-	db 6, BELLSPROUT
+	db  6, BELLSPROUT
 	db -1 ; end
 
 	; SAGE (9)
 	db "LI@", TRAINERTYPE_NORMAL
-	db 7, BELLSPROUT
-	db 7, BELLSPROUT
+	db  7, BELLSPROUT
+	db  7, BELLSPROUT
 	db 10, HOOTHOOT
 	db -1 ; end
 
@@ -3389,83 +3389,83 @@ PokefanMGroup:
 ; ================================
 	; POKEFANM (1)
 	db "WILLIAM@", TRAINERTYPE_ITEM
-	db 14, RAICHU, BERRY
+	db 14, RAICHU,     BERRY
 	db -1 ; end
 
 	; POKEFANM (2)
 	db "DEREK@", TRAINERTYPE_ITEM
-	db 17, PIKACHU, BERRY
+	db 17, PIKACHU,    BERRY
 	db -1 ; end
 
 	; POKEFANM (3)
 	db "ROBERT@", TRAINERTYPE_ITEM
-	db 33, QUAGSIRE, BERRY
+	db 33, QUAGSIRE,   BERRY
 	db -1 ; end
 
 	; POKEFANM (4)
 	db "JOSHUA@", TRAINERTYPE_ITEM
-	db 23, PIKACHU, BERRY
-	db 23, PIKACHU, BERRY
-	db 23, PIKACHU, BERRY
-	db 23, PIKACHU, BERRY
-	db 23, PIKACHU, BERRY
-	db 23, PIKACHU, BERRY
+	db 23, PIKACHU,    BERRY
+	db 23, PIKACHU,    BERRY
+	db 23, PIKACHU,    BERRY
+	db 23, PIKACHU,    BERRY
+	db 23, PIKACHU,    BERRY
+	db 23, PIKACHU,    BERRY
 	db -1 ; end
 
 	; POKEFANM (5)
 	db "CARTER@", TRAINERTYPE_ITEM
-	db 29, BULBASAUR, BERRY
+	db 29, BULBASAUR,  BERRY
 	db 29, CHARMANDER, BERRY
-	db 29, SQUIRTLE, BERRY
+	db 29, SQUIRTLE,   BERRY
 	db -1 ; end
 
 	; POKEFANM (6)
 	db "TREVOR@", TRAINERTYPE_ITEM
-	db 33, PSYDUCK, BERRY
+	db 33, PSYDUCK,    BERRY
 	db -1 ; end
 
 	; POKEFANM (7)
 	db "BRANDON@", TRAINERTYPE_ITEM
-	db 13, SNUBBULL, BERRY
+	db 13, SNUBBULL,   BERRY
 	db -1 ; end
 
 	; POKEFANM (8)
 	db "JEREMY@", TRAINERTYPE_ITEM
-	db 28, MEOWTH, BERRY
-	db 28, MEOWTH, BERRY
-	db 28, MEOWTH, BERRY
+	db 28, MEOWTH,     BERRY
+	db 28, MEOWTH,     BERRY
+	db 28, MEOWTH,     BERRY
 	db -1 ; end
 
 	; POKEFANM (9)
 	db "COLIN@", TRAINERTYPE_ITEM
-	db 32, DELIBIRD, BERRY
+	db 32, DELIBIRD,   BERRY
 	db -1 ; end
 
 	; POKEFANM (10)
 	db "DEREK@", TRAINERTYPE_ITEM
-	db 19, PIKACHU, BERRY
+	db 19, PIKACHU,    BERRY
 	db -1 ; end
 
 	; POKEFANM (11)
 	db "DEREK@", TRAINERTYPE_ITEM
-	db 36, PIKACHU, BERRY
+	db 36, PIKACHU,    BERRY
 	db -1 ; end
 
 	; POKEFANM (12)
 	db "ALEX@", TRAINERTYPE_ITEM
-	db 29, NIDOKING, BERRY
-	db 29, SLOWKING, BERRY
-	db 29, SEAKING, BERRY
+	db 29, NIDOKING,   BERRY
+	db 29, SLOWKING,   BERRY
+	db 29, SEAKING,    BERRY
 	db -1 ; end
 
 	; POKEFANM (13)
 	db "REX@", TRAINERTYPE_ITEM
-	db 35, PHANPY, BERRY
+	db 35, PHANPY,     BERRY
 	db -1 ; end
 
 	; POKEFANM (14)
 	db "ALLAN@", TRAINERTYPE_ITEM
-	db 35, TEDDIURSA, BERRY
+	db 35, TEDDIURSA,  BERRY
 	db -1 ; end
 ; ================================
 
@@ -3516,14 +3516,14 @@ TwinsGroup:
 
 	; TWINS (2)
 	db "ANN & ANNE@", TRAINERTYPE_MOVES
-	db 16, CLEFAIRY, GROWL, ENCORE, DOUBLESLAP, METRONOME
+	db 16, CLEFAIRY,   GROWL, ENCORE, DOUBLESLAP, METRONOME
 	db 16, JIGGLYPUFF, SING, DEFENSE_CURL, POUND, DISABLE
 	db -1 ; end
 
 	; TWINS (3)
 	db "ANN & ANNE@", TRAINERTYPE_MOVES
 	db 16, JIGGLYPUFF, SING, DEFENSE_CURL, POUND, DISABLE
-	db 16, CLEFAIRY, GROWL, ENCORE, DOUBLESLAP, METRONOME
+	db 16, CLEFAIRY,   GROWL, ENCORE, DOUBLESLAP, METRONOME
 	db -1 ; end
 
 	; TWINS (4)
@@ -3558,14 +3558,14 @@ TwinsGroup:
 
 	; TWINS (9)
 	db "LEA & PIA@", TRAINERTYPE_MOVES
-	db 35, DRATINI, THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
-	db 35, DRATINI, THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
+	db 35, DRATINI,    THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
+	db 35, DRATINI,    THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
 	db -1 ; end
 
 	; TWINS (10)
 	db "LEA & PIA@", TRAINERTYPE_MOVES
-	db 38, DRATINI, THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
-	db 38, DRATINI, THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
+	db 38, DRATINI,    THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
+	db 38, DRATINI,    THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
 	db -1 ; end
 ; ================================
 
@@ -3574,36 +3574,36 @@ PokefanFGroup:
 ; ================================
 	; POKEFANF (1)
 	db "BEVERLY@", TRAINERTYPE_ITEM
-	db 14, SNUBBULL, BERRY
+	db 14, SNUBBULL,   BERRY
 	db -1 ; end
 
 	; POKEFANF (2)
 	db "RUTH@", TRAINERTYPE_ITEM
-	db 17, PIKACHU, BERRY
+	db 17, PIKACHU,    BERRY
 	db -1 ; end
 
 	; POKEFANF (3)
 	db "BEVERLY@", TRAINERTYPE_ITEM
-	db 18, SNUBBULL, BERRY
+	db 18, SNUBBULL,   BERRY
 	db -1 ; end
 
 	; POKEFANF (4)
 	db "BEVERLY@", TRAINERTYPE_ITEM
-	db 30, GRANBULL, BERRY
+	db 30, GRANBULL,   BERRY
 	db -1 ; end
 
 	; POKEFANF (5)
 	db "GEORGIA@", TRAINERTYPE_ITEM
-	db 23, SENTRET, BERRY
-	db 23, SENTRET, BERRY
-	db 23, SENTRET, BERRY
-	db 28, FURRET, BERRY
-	db 23, SENTRET, BERRY
+	db 23, SENTRET,    BERRY
+	db 23, SENTRET,    BERRY
+	db 23, SENTRET,    BERRY
+	db 28, FURRET,     BERRY
+	db 23, SENTRET,    BERRY
 	db -1 ; end
 
 	; POKEFANF (6)
 	db "JAIME@", TRAINERTYPE_ITEM
-	db 16, MEOWTH, BERRY
+	db 16, MEOWTH,     BERRY
 	db -1 ; end
 ; ================================
 
@@ -3612,12 +3612,12 @@ RedGroup:
 ; ================================
 	; RED (1)
 	db "RED@", TRAINERTYPE_MOVES
-	db 81, PIKACHU, CHARM, QUICK_ATTACK, THUNDERBOLT, THUNDER
-	db 73, ESPEON, MUD_SLAP, REFLECT, SWIFT, PSYCHIC_M
-	db 75, SNORLAX, AMNESIA, SNORE, REST, BODY_SLAM
-	db 77, VENUSAUR, SUNNY_DAY, GIGA_DRAIN, SYNTHESIS, SOLARBEAM
-	db 77, CHARIZARD, FLAMETHROWER, WING_ATTACK, SLASH, FIRE_SPIN
-	db 77, BLASTOISE, RAIN_DANCE, SURF, BLIZZARD, WHIRLPOOL
+	db 81, PIKACHU,    CHARM, QUICK_ATTACK, THUNDERBOLT, THUNDER
+	db 73, ESPEON,     MUD_SLAP, REFLECT, SWIFT, PSYCHIC_M
+	db 75, SNORLAX,    AMNESIA, SNORE, REST, BODY_SLAM
+	db 77, VENUSAUR,   SUNNY_DAY, GIGA_DRAIN, SYNTHESIS, SOLARBEAM
+	db 77, CHARIZARD,  FLAMETHROWER, WING_ATTACK, SLASH, FIRE_SPIN
+	db 77, BLASTOISE,  RAIN_DANCE, SURF, BLIZZARD, WHIRLPOOL
 	db -1 ; end
 ; ================================
 
@@ -3626,12 +3626,12 @@ BlueGroup:
 ; ================================
 	; BLUE (1)
 	db "BLUE@", TRAINERTYPE_MOVES
-	db 56, PIDGEOT, QUICK_ATTACK, WHIRLWIND, WING_ATTACK, MIRROR_MOVE
-	db 54, ALAKAZAM, DISABLE, RECOVER, PSYCHIC_M, REFLECT
-	db 56, RHYDON, FURY_ATTACK, SANDSTORM, ROCK_SLIDE, EARTHQUAKE
-	db 58, GYARADOS, TWISTER, HYDRO_PUMP, RAIN_DANCE, HYPER_BEAM
-	db 58, EXEGGUTOR, SUNNY_DAY, LEECH_SEED, EGG_BOMB, SOLARBEAM
-	db 58, ARCANINE, ROAR, SWIFT, FLAMETHROWER, EXTREMESPEED
+	db 56, PIDGEOT,    QUICK_ATTACK, WHIRLWIND, WING_ATTACK, MIRROR_MOVE
+	db 54, ALAKAZAM,   DISABLE, RECOVER, PSYCHIC_M, REFLECT
+	db 56, RHYDON,     FURY_ATTACK, SANDSTORM, ROCK_SLIDE, EARTHQUAKE
+	db 58, GYARADOS,   TWISTER, HYDRO_PUMP, RAIN_DANCE, HYPER_BEAM
+	db 58, EXEGGUTOR,  SUNNY_DAY, LEECH_SEED, EGG_BOMB, SOLARBEAM
+	db 58, ARCANINE,   ROAR, SWIFT, FLAMETHROWER, EXTREMESPEED
 	db -1 ; end
 ; ================================
 
@@ -3655,7 +3655,7 @@ GruntFGroup:
 ; ================================
 	; GRUNTF (1)
 	db "GRUNT@", TRAINERTYPE_NORMAL
-	db 9, ZUBAT
+	db  9, ZUBAT
 	db 11, EKANS
 	db -1 ; end
 
@@ -3680,8 +3680,8 @@ GruntFGroup:
 
 	; GRUNTF (5)
 	db "GRUNT@", TRAINERTYPE_MOVES
-	db 18, EKANS, WRAP, LEER, POISON_STING, BITE
-	db 18, GLOOM, ABSORB, SWEET_SCENT, STUN_SPORE, SLEEP_POWDER
+	db 18, EKANS,      WRAP, LEER, POISON_STING, BITE
+	db 18, GLOOM,      ABSORB, SWEET_SCENT, STUN_SPORE, SLEEP_POWDER
 	db -1 ; end
 ; ================================
 
@@ -3690,8 +3690,8 @@ MysticalmanGroup:
 ; ================================
 	; MYSTICALMAN (1)
 	db "EUSINE@", TRAINERTYPE_MOVES
-	db 23, DROWZEE, DREAM_EATER, HYPNOSIS, DISABLE, CONFUSION
-	db 23, HAUNTER, LICK, HYPNOSIS, MEAN_LOOK, CURSE
-	db 25, ELECTRODE, SCREECH, SONICBOOM, THUNDER, ROLLOUT
+	db 23, DROWZEE,    DREAM_EATER, HYPNOSIS, DISABLE, CONFUSION
+	db 23, HAUNTER,    LICK, HYPNOSIS, MEAN_LOOK, CURSE
+	db 25, ELECTRODE,  SCREECH, SONICBOOM, THUNDER, ROLLOUT
 	db -1 ; end
 ; ================================

From 50f6007cc2714d4f47758305481ab33d865505e6 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Wed, 31 Jan 2018 10:36:27 -0500
Subject: [PATCH 075/135] No need for ==== lines

---
 data/trainers/parties.asm | 151 ++------------------------------------
 1 file changed, 8 insertions(+), 143 deletions(-)

diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index 98558c75d..805dbe38e 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -1,49 +1,40 @@
 Trainers:
-; All trainers follow a basic structure:
-	; Name
-		; String in format "TEXT@"
-	; Type
-		; TRAINERTYPE_NORMAL:     level, species
-		; TRAINERTYPE_MOVES:      level, species, moves
-		; TRAINERTYPE_ITEM:       level, species, item
-		; TRAINERTYPE_ITEM_MOVES: level, species, item, moves
-	; Up to six Pokémon following the data type
-	; -1 ; end
+; Trainer data structure:
+;	db "NAME@", TRAINERTYPE_* constant
+;	1 to 6 Pokémon:
+;	* for TRAINERTYPE_NORMAL:     db level, species
+;	* for TRAINERTYPE_ITEM:       db level, species, item
+;	* for TRAINERTYPE_MOVES:      db level, species, 4 moves
+;	* for TRAINERTYPE_ITEM_MOVES: db level, species, item, 4 moves
+;	db -1 ; end
 
 
 FalknerGroup:
-; ================================
 	; FALKNER (1)
 	db "FALKNER@", TRAINERTYPE_MOVES
 	db  7, PIDGEY,     TACKLE, MUD_SLAP, NO_MOVE, NO_MOVE
 	db  9, PIDGEOTTO,  TACKLE, MUD_SLAP, GUST, NO_MOVE
 	db -1 ; end
-; ================================
 
 
 WhitneyGroup:
-; ================================
 	; WHITNEY (1)
 	db "WHITNEY@", TRAINERTYPE_MOVES
 	db 18, CLEFAIRY,   DOUBLESLAP, MIMIC, ENCORE, METRONOME
 	db 20, MILTANK,    ROLLOUT, ATTRACT, STOMP, MILK_DRINK
 	db -1 ; end
-; ================================
 
 
 BugsyGroup:
-; ================================
 	; BUGSY (1)
 	db "BUGSY@", TRAINERTYPE_MOVES
 	db 14, METAPOD,    TACKLE, STRING_SHOT, HARDEN, NO_MOVE
 	db 14, KAKUNA,     POISON_STING, STRING_SHOT, HARDEN, NO_MOVE
 	db 16, SCYTHER,    QUICK_ATTACK, LEER, FURY_CUTTER, NO_MOVE
 	db -1 ; end
-; ================================
 
 
 MortyGroup:
-; ================================
 	; MORTY (1)
 	db "MORTY@", TRAINERTYPE_MOVES
 	db 21, GASTLY,     LICK, SPITE, MEAN_LOOK, CURSE
@@ -51,43 +42,35 @@ MortyGroup:
 	db 25, GENGAR,     HYPNOSIS, SHADOW_BALL, MEAN_LOOK, DREAM_EATER
 	db 23, HAUNTER,    SPITE, MEAN_LOOK, MIMIC, NIGHT_SHADE
 	db -1 ; end
-; ================================
 
 
 PryceGroup:
-; ================================
 	; PRYCE (1)
 	db "PRYCE@", TRAINERTYPE_MOVES
 	db 27, SEEL,       HEADBUTT, ICY_WIND, AURORA_BEAM, REST
 	db 29, DEWGONG,    HEADBUTT, ICY_WIND, AURORA_BEAM, REST
 	db 31, PILOSWINE,  ICY_WIND, FURY_ATTACK, MIST, BLIZZARD
 	db -1 ; end
-; ================================
 
 
 JasmineGroup:
-; ================================
 	; JASMINE (1)
 	db "JASMINE@", TRAINERTYPE_MOVES
 	db 30, MAGNEMITE,  THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE
 	db 30, MAGNEMITE,  THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE
 	db 35, STEELIX,    SCREECH, SUNNY_DAY, ROCK_THROW, IRON_TAIL
 	db -1 ; end
-; ================================
 
 
 ChuckGroup:
-; ================================
 	; CHUCK (1)
 	db "CHUCK@", TRAINERTYPE_MOVES
 	db 27, PRIMEAPE,   LEER, RAGE, KARATE_CHOP, FURY_SWIPES
 	db 30, POLIWRATH,  HYPNOSIS, MIND_READER, SURF, DYNAMICPUNCH
 	db -1 ; end
-; ================================
 
 
 ClairGroup:
-; ================================
 	; CLAIR (1)
 	db "CLAIR@", TRAINERTYPE_MOVES
 	db 37, DRAGONAIR,  THUNDER_WAVE, SURF, SLAM, DRAGONBREATH
@@ -95,11 +78,9 @@ ClairGroup:
 	db 37, DRAGONAIR,  THUNDER_WAVE, ICE_BEAM, SLAM, DRAGONBREATH
 	db 40, KINGDRA,    SMOKESCREEN, SURF, HYPER_BEAM, DRAGONBREATH
 	db -1 ; end
-; ================================
 
 
 Rival1Group:
-; ================================
 	; RIVAL1 (1)
 	db "?@", TRAINERTYPE_NORMAL
 	db  5, CHIKORITA
@@ -216,15 +197,12 @@ Rival1Group:
 	db 35, KADABRA,    DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
 	db 38, FERALIGATR, RAGE, WATER_GUN, SCARY_FACE, SLASH
 	db -1 ; end
-; ================================
 
 
 PokemonProfGroup:
-; ================================
 
 
 WillGroup:
-; ================================
 	; WILL (1)
 	db "WILL@", TRAINERTYPE_MOVES
 	db 40, XATU,       QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
@@ -233,11 +211,9 @@ WillGroup:
 	db 41, SLOWBRO,    CURSE, AMNESIA, BODY_SLAM, PSYCHIC_M
 	db 42, XATU,       QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
 	db -1 ; end
-; ================================
 
 
 PKMNTrainerGroup:
-; ================================
 	; CAL (1)
 	db "CAL@", TRAINERTYPE_NORMAL
 	db 10, CHIKORITA
@@ -258,11 +234,9 @@ PKMNTrainerGroup:
 	db 50, TYPHLOSION
 	db 50, FERALIGATR
 	db -1 ; end
-; ================================
 
 
 BrunoGroup:
-; ================================
 	; BRUNO (1)
 	db "BRUNO@", TRAINERTYPE_MOVES
 	db 42, HITMONTOP,  PURSUIT, QUICK_ATTACK, DIG, DETECT
@@ -271,11 +245,9 @@ BrunoGroup:
 	db 43, ONIX,       BIND, EARTHQUAKE, SANDSTORM, ROCK_SLIDE
 	db 46, MACHAMP,    ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP
 	db -1 ; end
-; ================================
 
 
 KarenGroup:
-; ================================
 	; KAREN (1)
 	db "KAREN@", TRAINERTYPE_MOVES
 	db 42, UMBREON,    SAND_ATTACK, CONFUSE_RAY, FAINT_ATTACK, MEAN_LOOK
@@ -284,11 +256,9 @@ KarenGroup:
 	db 44, MURKROW,    QUICK_ATTACK, WHIRLWIND, PURSUIT, FAINT_ATTACK
 	db 47, HOUNDOOM,   ROAR, PURSUIT, FLAMETHROWER, CRUNCH
 	db -1 ; end
-; ================================
 
 
 KogaGroup:
-; ================================
 	; KOGA (1)
 	db "KOGA@", TRAINERTYPE_MOVES
 	db 40, ARIADOS,    DOUBLE_TEAM, SPIDER_WEB, BATON_PASS, GIGA_DRAIN
@@ -297,11 +267,9 @@ KogaGroup:
 	db 42, MUK,        MINIMIZE, ACID_ARMOR, SLUDGE_BOMB, TOXIC
 	db 44, CROBAT,     DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC
 	db -1 ; end
-; ================================
 
 
 ChampionGroup:
-; ================================
 	; CHAMPION (1)
 	db "LANCE@", TRAINERTYPE_MOVES
 	db 44, GYARADOS,   FLAIL, RAIN_DANCE, SURF, HYPER_BEAM
@@ -311,11 +279,9 @@ ChampionGroup:
 	db 46, CHARIZARD,  FLAMETHROWER, WING_ATTACK, SLASH, HYPER_BEAM
 	db 50, DRAGONITE,  FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM
 	db -1 ; end
-; ================================
 
 
 BrockGroup:
-; ================================
 	; BROCK (1)
 	db "BROCK@", TRAINERTYPE_MOVES
 	db 41, GRAVELER,   DEFENSE_CURL, ROCK_SLIDE, ROLLOUT, EARTHQUAKE
@@ -324,11 +290,9 @@ BrockGroup:
 	db 44, ONIX,       BIND, ROCK_SLIDE, BIDE, SANDSTORM
 	db 42, KABUTOPS,   SLASH, SURF, ENDURE, GIGA_DRAIN
 	db -1 ; end
-; ================================
 
 
 MistyGroup:
-; ================================
 	; MISTY (1)
 	db "MISTY@", TRAINERTYPE_MOVES
 	db 42, GOLDUCK,    SURF, DISABLE, PSYCH_UP, PSYCHIC_M
@@ -336,11 +300,9 @@ MistyGroup:
 	db 44, LAPRAS,     SURF, PERISH_SONG, BLIZZARD, RAIN_DANCE
 	db 47, STARMIE,    SURF, CONFUSE_RAY, RECOVER, ICE_BEAM
 	db -1 ; end
-; ================================
 
 
 LtSurgeGroup:
-; ================================
 	; LT_SURGE (1)
 	db "LT.SURGE@", TRAINERTYPE_MOVES
 	db 44, RAICHU,     THUNDER_WAVE, QUICK_ATTACK, THUNDERBOLT, THUNDER
@@ -349,11 +311,9 @@ LtSurgeGroup:
 	db 40, ELECTRODE,  SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION
 	db 46, ELECTABUZZ, QUICK_ATTACK, THUNDERPUNCH, LIGHT_SCREEN, THUNDER
 	db -1 ; end
-; ================================
 
 
 ScientistGroup:
-; ================================
 	; SCIENTIST (1)
 	db "ROSS@", TRAINERTYPE_NORMAL
 	db 22, KOFFING
@@ -383,11 +343,9 @@ ScientistGroup:
 	db "RICH@", TRAINERTYPE_MOVES
 	db 30, PORYGON,    CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK
 	db -1 ; end
-; ================================
 
 
 ErikaGroup:
-; ================================
 	; ERIKA (1)
 	db "ERIKA@", TRAINERTYPE_MOVES
 	db 42, TANGELA,    VINE_WHIP, BIND, GIGA_DRAIN, SLEEP_POWDER
@@ -395,11 +353,9 @@ ErikaGroup:
 	db 46, VICTREEBEL, SUNNY_DAY, SYNTHESIS, ACID, RAZOR_LEAF
 	db 46, BELLOSSOM,  SUNNY_DAY, SYNTHESIS, PETAL_DANCE, SOLARBEAM
 	db -1 ; end
-; ================================
 
 
 YoungsterGroup:
-; ================================
 	; YOUNGSTER (1)
 	db "JOEY@", TRAINERTYPE_NORMAL
 	db  4, RATTATA
@@ -477,11 +433,9 @@ YoungsterGroup:
 	db "JOEY@", TRAINERTYPE_MOVES
 	db 37, RATICATE,   HYPER_BEAM, QUICK_ATTACK, HYPER_FANG, PURSUIT
 	db -1 ; end
-; ================================
 
 
 SchoolboyGroup:
-; ================================
 	; SCHOOLBOY (1)
 	db "JACK@", TRAINERTYPE_NORMAL
 	db 12, ODDISH
@@ -636,11 +590,9 @@ SchoolboyGroup:
 	db 34, MR__MIME,   PSYCHIC_M, LIGHT_SCREEN, REFLECT, ENCORE
 	db 38, MAGNETON,   ZAP_CANNON, THUNDER_WAVE, LOCK_ON, SWIFT
 	db -1 ; end
-; ================================
 
 
 BirdKeeperGroup:
-; ================================
 	; BIRD_KEEPER (1)
 	db "ROD@", TRAINERTYPE_NORMAL
 	db  7, PIDGEY
@@ -755,11 +707,9 @@ BirdKeeperGroup:
 	db 38, PIDGEOT,    TOXIC, QUICK_ATTACK, WHIRLWIND, FLY
 	db 38, PIDGEOT,    SWIFT, DETECT, STEEL_WING, FLY
 	db -1 ; end
-; ================================
 
 
 LassGroup:
-; ================================
 	; LASS (1)
 	db "CARRIE@", TRAINERTYPE_MOVES
 	db 18, SNUBBULL,   SCARY_FACE, CHARM, BITE, LICK
@@ -863,11 +813,9 @@ LassGroup:
 	db 36, AMPHAROS,   SWIFT, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE
 	db 36, GOLDUCK,    DISABLE, SURF, PSYCHIC_M, SCREECH
 	db -1 ; end
-; ================================
 
 
 JanineGroup:
-; ================================
 	; JANINE (1)
 	db "JANINE@", TRAINERTYPE_MOVES
 	db 36, CROBAT,     SCREECH, SUPERSONIC, CONFUSE_RAY, WING_ATTACK
@@ -876,11 +824,9 @@ JanineGroup:
 	db 33, ARIADOS,    SCARY_FACE, GIGA_DRAIN, STRING_SHOT, NIGHT_SHADE
 	db 39, VENOMOTH,   FORESIGHT, DOUBLE_TEAM, GUST, PSYCHIC_M
 	db -1 ; end
-; ================================
 
 
 CooltrainerMGroup:
-; ================================
 	; COOLTRAINERM (1)
 	db "NICK@", TRAINERTYPE_MOVES
 	db 26, CHARMANDER, EMBER, SMOKESCREEN, RAGE, SCARY_FACE
@@ -1009,11 +955,9 @@ CooltrainerMGroup:
 	db "DARIN@", TRAINERTYPE_MOVES
 	db 37, DRAGONAIR,  WRAP, SURF, DRAGON_RAGE, SLAM
 	db -1 ; end
-; ================================
 
 
 CooltrainerFGroup:
-; ================================
 	; COOLTRAINERF (1)
 	db "GWEN@", TRAINERTYPE_NORMAL
 	db 26, EEVEE
@@ -1143,11 +1087,9 @@ CooltrainerFGroup:
 	db 33, HORSEA,     SMOKESCREEN, LEER, WHIRLPOOL, TWISTER
 	db 35, SEADRA,     SWIFT, LEER, WATERFALL, TWISTER
 	db -1 ; end
-; ================================
 
 
 BeautyGroup:
-; ================================
 	; BEAUTY (1)
 	db "VICTORIA@", TRAINERTYPE_NORMAL
 	db  9, SENTRET
@@ -1241,11 +1183,9 @@ BeautyGroup:
 	db "OLIVIA@", TRAINERTYPE_NORMAL
 	db 19, CORSOLA
 	db -1 ; end
-; ================================
 
 
 PokemaniacGroup:
-; ================================
 	; POKEMANIAC (1)
 	db "LARRY@", TRAINERTYPE_NORMAL
 	db 10, SLOWPOKE
@@ -1325,11 +1265,9 @@ PokemaniacGroup:
 	db 17, NIDOKING
 	db 17, NIDOQUEEN
 	db -1 ; end
-; ================================
 
 
 GruntMGroup:
-; ================================
 	; GRUNTM (1)
 	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 14, KOFFING
@@ -1519,11 +1457,9 @@ GruntMGroup:
 	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 30, GOLBAT
 	db -1 ; end
-; ================================
 
 
 GentlemanGroup:
-; ================================
 	; GENTLEMAN (1)
 	db "PRESTON@", TRAINERTYPE_NORMAL
 	db 18, GROWLITHE
@@ -1550,11 +1486,9 @@ GentlemanGroup:
 	db "ALFRED@", TRAINERTYPE_NORMAL
 	db 20, NOCTOWL
 	db -1 ; end
-; ================================
 
 
 SkierGroup:
-; ================================
 	; SKIER (1)
 	db "ROXANNE@", TRAINERTYPE_NORMAL
 	db 28, JYNX
@@ -1564,11 +1498,9 @@ SkierGroup:
 	db "CLARISSA@", TRAINERTYPE_NORMAL
 	db 28, DEWGONG
 	db -1 ; end
-; ================================
 
 
 TeacherGroup:
-; ================================
 	; TEACHER (1)
 	db "COLETTE@", TRAINERTYPE_NORMAL
 	db 36, CLEFAIRY
@@ -1584,22 +1516,18 @@ TeacherGroup:
 	db "SHIRLEY@", TRAINERTYPE_NORMAL
 	db 35, JIGGLYPUFF
 	db -1 ; end
-; ================================
 
 
 SabrinaGroup:
-; ================================
 	; SABRINA (1)
 	db "SABRINA@", TRAINERTYPE_MOVES
 	db 46, ESPEON,     SAND_ATTACK, QUICK_ATTACK, SWIFT, PSYCHIC_M
 	db 46, MR__MIME,   BARRIER, REFLECT, BATON_PASS, PSYCHIC_M
 	db 48, ALAKAZAM,   RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
 	db -1 ; end
-; ================================
 
 
 BugCatcherGroup:
-; ================================
 	; BUG_CATCHER (1)
 	db "DON@", TRAINERTYPE_NORMAL
 	db  3, CATERPIE
@@ -1718,11 +1646,9 @@ BugCatcherGroup:
 	db  8, LEDYBA
 	db 10, PARAS
 	db -1 ; end
-; ================================
 
 
 FisherGroup:
-; ================================
 	; FISHER (1)
 	db "JUSTIN@", TRAINERTYPE_NORMAL
 	db  5, MAGIKARP
@@ -1884,11 +1810,9 @@ FisherGroup:
 	db 34, SEAKING,    SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK
 	db 37, QWILFISH,   ROLLOUT, SURF, PIN_MISSILE, TAKE_DOWN
 	db -1 ; end
-; ================================
 
 
 SwimmerMGroup:
-; ================================
 	; SWIMMERM (1)
 	db "HAROLD@", TRAINERTYPE_NORMAL
 	db 32, REMORAID
@@ -2028,11 +1952,9 @@ SwimmerMGroup:
 	db 32, HORSEA
 	db 35, SEADRA
 	db -1 ; end
-; ================================
 
 
 SwimmerFGroup:
-; ================================
 	; SWIMMERF (1)
 	db "ELAINE@", TRAINERTYPE_NORMAL
 	db 21, STARYU
@@ -2140,11 +2062,9 @@ SwimmerFGroup:
 	db 35, SEAKING
 	db 35, SEAKING
 	db -1 ; end
-; ================================
 
 
 SailorGroup:
-; ================================
 	; SAILOR (1)
 	db "EUGENE@", TRAINERTYPE_NORMAL
 	db 17, POLIWHIRL
@@ -2224,11 +2144,9 @@ SailorGroup:
 	db 38, POLITOED,   WHIRLPOOL, RAIN_DANCE, BODY_SLAM, PERISH_SONG
 	db 38, POLIWRATH,  SURF, STRENGTH, ICE_PUNCH, SUBMISSION
 	db -1 ; end
-; ================================
 
 
 SuperNerdGroup:
-; ================================
 	; SUPER_NERD (1)
 	db "STAN@", TRAINERTYPE_NORMAL
 	db 20, GRIMER
@@ -2312,11 +2230,9 @@ SuperNerdGroup:
 	db "MARKUS@", TRAINERTYPE_MOVES
 	db 19, SLOWPOKE,   CURSE, WATER_GUN, GROWL, STRENGTH
 	db -1 ; end
-; ================================
 
 
 Rival2Group:
-; ================================
 	; RIVAL2 (1)
 	db "?@", TRAINERTYPE_MOVES
 	db 41, SNEASEL,    QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
@@ -2376,11 +2292,9 @@ Rival2Group:
 	db 46, ALAKAZAM,   RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
 	db 50, FERALIGATR, SURF, RAIN_DANCE, SLASH, SCREECH
 	db -1 ; end
-; ================================
 
 
 GuitaristGroup:
-; ================================
 	; GUITARIST (1)
 	db "CLYDE@", TRAINERTYPE_NORMAL
 	db 34, ELECTABUZZ
@@ -2393,11 +2307,9 @@ GuitaristGroup:
 	db 32, MAGNEMITE
 	db 32, MAGNEMITE
 	db -1 ; end
-; ================================
 
 
 HikerGroup:
-; ================================
 	; HIKER (1)
 	db "ANTHONY@", TRAINERTYPE_NORMAL
 	db 16, GEODUDE
@@ -2541,11 +2453,9 @@ HikerGroup:
 	db 36, GOLEM,      MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT
 	db 34, MACHOKE,    KARATE_CHOP, VITAL_THROW, HEADBUTT, DIG
 	db -1 ; end
-; ================================
 
 
 BikerGroup:
-; ================================
 	; BIKER (1)
 	db "BENNY@", TRAINERTYPE_NORMAL
 	db 20, KOFFING
@@ -2603,22 +2513,18 @@ BikerGroup:
 	db 30, MAGMAR
 	db 32, WEEZING
 	db -1 ; end
-; ================================
 
 
 BlaineGroup:
-; ================================
 	; BLAINE (1)
 	db "BLAINE@", TRAINERTYPE_MOVES
 	db 45, MAGCARGO,   CURSE, SMOG, FLAMETHROWER, ROCK_SLIDE
 	db 45, MAGMAR,     THUNDERPUNCH, FIRE_PUNCH, SUNNY_DAY, CONFUSE_RAY
 	db 50, RAPIDASH,   QUICK_ATTACK, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST
 	db -1 ; end
-; ================================
 
 
 BurglarGroup:
-; ================================
 	; BURGLAR (1)
 	db "DUNCAN@", TRAINERTYPE_NORMAL
 	db 23, KOFFING
@@ -2639,11 +2545,9 @@ BurglarGroup:
 	db 25, KOFFING
 	db 30, KOFFING
 	db -1 ; end
-; ================================
 
 
 FirebreatherGroup:
-; ================================
 	; FIREBREATHER (1)
 	db "OTIS@", TRAINERTYPE_NORMAL
 	db 29, MAGMAR
@@ -2692,11 +2596,9 @@ FirebreatherGroup:
 	db 31, FLAREON
 	db 28, KOFFING
 	db -1 ; end
-; ================================
 
 
 JugglerGroup:
-; ================================
 	; JUGGLER (1)
 	db "IRWIN@", TRAINERTYPE_NORMAL
 	db  2, VOLTORB
@@ -2743,11 +2645,9 @@ JugglerGroup:
 	db 26, VOLTORB
 	db 30, ELECTRODE
 	db -1 ; end
-; ================================
 
 
 BlackbeltGroup:
-; ================================
 	; BLACKBELT_T (1)
 	db "KENJI@", TRAINERTYPE_NORMAL
 	db 27, ONIX
@@ -2804,11 +2704,9 @@ BlackbeltGroup:
 	db 32, MACHOKE
 	db 34, MACHOKE
 	db -1 ; end
-; ================================
 
 
 ExecutiveMGroup:
-; ================================
 	; EXECUTIVEM (1)
 	db "EXECUTIVE@", TRAINERTYPE_MOVES
 	db 33, HOUNDOUR,   EMBER, ROAR, BITE, FAINT_ATTACK
@@ -2837,11 +2735,9 @@ ExecutiveMGroup:
 	db 24, RATICATE
 	db 22, KOFFING
 	db -1 ; end
-; ================================
 
 
 PsychicGroup:
-; ================================
 	; PSYCHIC_T (1)
 	db "NATHAN@", TRAINERTYPE_NORMAL
 	db 26, GIRAFARIG
@@ -2912,11 +2808,9 @@ PsychicGroup:
 	db 29, DROWZEE
 	db 33, HYPNO
 	db -1 ; end
-; ================================
 
 
 PicnickerGroup:
-; ================================
 	; PICNICKER (1)
 	db "LIZ@", TRAINERTYPE_NORMAL
 	db  9, NIDORAN_F
@@ -3070,11 +2964,9 @@ PicnickerGroup:
 	db "TIFFANY@", TRAINERTYPE_MOVES
 	db 43, CLEFAIRY,   METRONOME, ENCORE, MOONLIGHT, MINIMIZE
 	db -1 ; end
-; ================================
 
 
 CamperGroup:
-; ================================
 	; CAMPER (1)
 	db "ROLAND@", TRAINERTYPE_NORMAL
 	db  9, NIDORAN_M
@@ -3216,11 +3108,9 @@ CamperGroup:
 	db 30, PRIMEAPE
 	db 30, TAUROS
 	db -1 ; end
-; ================================
 
 
 ExecutiveFGroup:
-; ================================
 	; EXECUTIVEF (1)
 	db "EXECUTIVE@", TRAINERTYPE_MOVES
 	db 32, ARBOK,      WRAP, POISON_STING, BITE, GLARE
@@ -3234,11 +3124,9 @@ ExecutiveFGroup:
 	db 23, GLOOM,      ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID
 	db 25, MURKROW,    PECK, PURSUIT, HAZE, NO_MOVE
 	db -1 ; end
-; ================================
 
 
 SageGroup:
-; ================================
 	; SAGE (1)
 	db "CHOW@", TRAINERTYPE_NORMAL
 	db  3, BELLSPROUT
@@ -3314,11 +3202,9 @@ SageGroup:
 	db 32, NOCTOWL
 	db 32, VAPOREON
 	db -1 ; end
-; ================================
 
 
 MediumGroup:
-; ================================
 	; MEDIUM (1)
 	db "MARTHA@", TRAINERTYPE_NORMAL
 	db 18, GASTLY
@@ -3358,11 +3244,9 @@ MediumGroup:
 	db 34, SLOWPOKE
 	db 36, SLOWBRO
 	db -1 ; end
-; ================================
 
 
 BoarderGroup:
-; ================================
 	; BOARDER (1)
 	db "RONALD@", TRAINERTYPE_NORMAL
 	db 24, SEEL
@@ -3382,11 +3266,9 @@ BoarderGroup:
 	db 25, CLOYSTER
 	db 24, SHELLDER
 	db -1 ; end
-; ================================
 
 
 PokefanMGroup:
-; ================================
 	; POKEFANM (1)
 	db "WILLIAM@", TRAINERTYPE_ITEM
 	db 14, RAICHU,     BERRY
@@ -3467,11 +3349,9 @@ PokefanMGroup:
 	db "ALLAN@", TRAINERTYPE_ITEM
 	db 35, TEDDIURSA,  BERRY
 	db -1 ; end
-; ================================
 
 
 KimonoGirlGroup:
-; ================================
 	; KIMONO_GIRL (1)
 	db "NAOKO@", TRAINERTYPE_NORMAL
 	db 20, SKIPLOOM
@@ -3503,11 +3383,9 @@ KimonoGirlGroup:
 	db "MIKI@", TRAINERTYPE_NORMAL
 	db 17, JOLTEON
 	db -1 ; end
-; ================================
 
 
 TwinsGroup:
-; ================================
 	; TWINS (1)
 	db "AMY & MAY@", TRAINERTYPE_NORMAL
 	db 10, SPINARAK
@@ -3567,11 +3445,9 @@ TwinsGroup:
 	db 38, DRATINI,    THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
 	db 38, DRATINI,    THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
 	db -1 ; end
-; ================================
 
 
 PokefanFGroup:
-; ================================
 	; POKEFANF (1)
 	db "BEVERLY@", TRAINERTYPE_ITEM
 	db 14, SNUBBULL,   BERRY
@@ -3605,11 +3481,9 @@ PokefanFGroup:
 	db "JAIME@", TRAINERTYPE_ITEM
 	db 16, MEOWTH,     BERRY
 	db -1 ; end
-; ================================
 
 
 RedGroup:
-; ================================
 	; RED (1)
 	db "RED@", TRAINERTYPE_MOVES
 	db 81, PIKACHU,    CHARM, QUICK_ATTACK, THUNDERBOLT, THUNDER
@@ -3619,11 +3493,9 @@ RedGroup:
 	db 77, CHARIZARD,  FLAMETHROWER, WING_ATTACK, SLASH, FIRE_SPIN
 	db 77, BLASTOISE,  RAIN_DANCE, SURF, BLIZZARD, WHIRLPOOL
 	db -1 ; end
-; ================================
 
 
 BlueGroup:
-; ================================
 	; BLUE (1)
 	db "BLUE@", TRAINERTYPE_MOVES
 	db 56, PIDGEOT,    QUICK_ATTACK, WHIRLWIND, WING_ATTACK, MIRROR_MOVE
@@ -3633,11 +3505,9 @@ BlueGroup:
 	db 58, EXEGGUTOR,  SUNNY_DAY, LEECH_SEED, EGG_BOMB, SOLARBEAM
 	db 58, ARCANINE,   ROAR, SWIFT, FLAMETHROWER, EXTREMESPEED
 	db -1 ; end
-; ================================
 
 
 OfficerGroup:
-; ================================
 	; OFFICER (1)
 	db "KEITH@", TRAINERTYPE_NORMAL
 	db 17, GROWLITHE
@@ -3648,11 +3518,9 @@ OfficerGroup:
 	db 14, GROWLITHE
 	db 14, GROWLITHE
 	db -1 ; end
-; ================================
 
 
 GruntFGroup:
-; ================================
 	; GRUNTF (1)
 	db "GRUNT@", TRAINERTYPE_NORMAL
 	db  9, ZUBAT
@@ -3683,15 +3551,12 @@ GruntFGroup:
 	db 18, EKANS,      WRAP, LEER, POISON_STING, BITE
 	db 18, GLOOM,      ABSORB, SWEET_SCENT, STUN_SPORE, SLEEP_POWDER
 	db -1 ; end
-; ================================
 
 
 MysticalmanGroup:
-; ================================
 	; MYSTICALMAN (1)
 	db "EUSINE@", TRAINERTYPE_MOVES
 	db 23, DROWZEE,    DREAM_EATER, HYPNOSIS, DISABLE, CONFUSION
 	db 23, HAUNTER,    LICK, HYPNOSIS, MEAN_LOOK, CURSE
 	db 25, ELECTRODE,  SCREECH, SONICBOOM, THUNDER, ROLLOUT
 	db -1 ; end
-; ================================

From a9334f7468b81e5d9e1077e1430f439776f0c7c4 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Wed, 31 Jan 2018 10:55:35 -0500
Subject: [PATCH 076/135] Correct engine flag constants

---
 constants/engine_flags.asm   | 2 +-
 constants/wram_constants.asm | 4 ++--
 data/engine_flags.asm        | 4 ++--
 engine/events_2.asm          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm
index af8bebe95..7941f3b10 100644
--- a/constants/engine_flags.asm
+++ b/constants/engine_flags.asm
@@ -28,7 +28,7 @@
 	const ENGINE_SAFARI_ZONE
 	const ENGINE_ROCKETS_IN_RADIO_TOWER
 	const ENGINE_BIKE_SHOP_CALL_ENABLED
-	const ENGINE_CAN_USE_SWEET_SCENT
+	const ENGINE_15
 	const ENGINE_REACHED_GOLDENROD
 	const ENGINE_ROCKETS_IN_MAHOGANY
 ; wBikeFlags
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index 15846d896..fa8edf232 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -161,9 +161,9 @@ NUM_OBJECTS   EQU $10
 	const STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F ; 0
 	const STATUSFLAGS2_SAFARI_GAME_F            ; 1
 	const STATUSFLAGS2_BUG_CONTEST_TIMER_F      ; 2
-	const STATUSFLAGS2_UNUSED_F                 ; 3
+	const STATUSFLAGS2_UNUSED_3_F               ; 3
 	const STATUSFLAGS2_BIKE_SHOP_CALL_F         ; 4
-	const STATUSFLAGS2_CAN_USE_SWEET_SCENT_F    ; 5
+	const STATUSFLAGS2_UNUSED_5_F               ; 5
 	const STATUSFLAGS2_REACHED_GOLDENROD_F      ; 6
 	const STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F    ; 7
 
diff --git a/data/engine_flags.asm b/data/engine_flags.asm
index 261d38d7f..80834bdac 100644
--- a/data/engine_flags.asm
+++ b/data/engine_flags.asm
@@ -35,7 +35,7 @@ EngineFlags: ; 80462
 	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_CAN_USE_SWEET_SCENT_F
+	engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_5_F
 	engine_flag wStatusFlags2, STATUSFLAGS2_REACHED_GOLDENROD_F
 	engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F
 
@@ -102,7 +102,7 @@ EngineFlags: ; 80462
 
 	engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F
 
-	engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_F
+	engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_3_F
 
 	engine_flag wDailyFlags, DAILYFLAGS_KURT_MAKING_BALLS_F ; $50
 	engine_flag wDailyFlags, DAILYFLAGS_BUG_CONTEST_F
diff --git a/engine/events_2.asm b/engine/events_2.asm
index c27b4737f..de4c47823 100644
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -150,7 +150,7 @@ WildBattleScript: ; 97cf9
 
 CanUseSweetScent:: ; 97cfd
 	ld hl, wStatusFlags
-	bit STATUSFLAGS2_CAN_USE_SWEET_SCENT_F, [hl]
+	bit STATUSFLAGS_NO_WILD_ENCOUNTERS_F, [hl]
 	jr nz, .no
 	ld a, [wEnvironment]
 	cp CAVE

From a2607623d3fa20363965e63740568d0a8d61b3da Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Wed, 31 Jan 2018 11:04:17 -0500
Subject: [PATCH 077/135] Comment the person constants sections, like the
 others

---
 constants/script_constants.asm                   | 2 +-
 docs/map_event_scripts.md                        | 2 +-
 maps/AzaleaGym.asm                               | 2 +-
 maps/AzaleaMart.asm                              | 2 +-
 maps/AzaleaPokecenter1F.asm                      | 2 +-
 maps/AzaleaTown.asm                              | 2 +-
 maps/BattleTower1F.asm                           | 2 +-
 maps/BattleTowerBattleRoom.asm                   | 2 +-
 maps/BattleTowerElevator.asm                     | 2 +-
 maps/BattleTowerHallway.asm                      | 2 +-
 maps/BattleTowerOutside.asm                      | 2 +-
 maps/BillsBrothersHouse.asm                      | 2 +-
 maps/BillsFamilysHouse.asm                       | 2 +-
 maps/BillsHouse.asm                              | 2 +-
 maps/BlackthornCity.asm                          | 2 +-
 maps/BlackthornDragonSpeechHouse.asm             | 2 +-
 maps/BlackthornEmysHouse.asm                     | 2 +-
 maps/BlackthornGym1F.asm                         | 2 +-
 maps/BlackthornGym2F.asm                         | 2 +-
 maps/BlackthornMart.asm                          | 2 +-
 maps/BlackthornPokecenter1F.asm                  | 2 +-
 maps/BluesHouse.asm                              | 2 +-
 maps/BrunosRoom.asm                              | 2 +-
 maps/BurnedTower1F.asm                           | 2 +-
 maps/BurnedTowerB1F.asm                          | 2 +-
 maps/CeladonCafe.asm                             | 2 +-
 maps/CeladonCity.asm                             | 2 +-
 maps/CeladonDeptStore1F.asm                      | 2 +-
 maps/CeladonDeptStore2F.asm                      | 2 +-
 maps/CeladonDeptStore3F.asm                      | 2 +-
 maps/CeladonDeptStore4F.asm                      | 2 +-
 maps/CeladonDeptStore5F.asm                      | 2 +-
 maps/CeladonDeptStore6F.asm                      | 2 +-
 maps/CeladonGameCorner.asm                       | 2 +-
 maps/CeladonGameCornerPrizeRoom.asm              | 2 +-
 maps/CeladonGym.asm                              | 2 +-
 maps/CeladonMansion1F.asm                        | 2 +-
 maps/CeladonMansion3F.asm                        | 2 +-
 maps/CeladonMansionRoof.asm                      | 2 +-
 maps/CeladonMansionRoofHouse.asm                 | 2 +-
 maps/CeladonPokecenter1F.asm                     | 2 +-
 maps/CeruleanCity.asm                            | 2 +-
 maps/CeruleanGym.asm                             | 2 +-
 maps/CeruleanGymBadgeSpeechHouse.asm             | 2 +-
 maps/CeruleanMart.asm                            | 2 +-
 maps/CeruleanPokecenter1F.asm                    | 2 +-
 maps/CeruleanPoliceStation.asm                   | 2 +-
 maps/CeruleanTradeSpeechHouse.asm                | 2 +-
 maps/CharcoalKiln.asm                            | 2 +-
 maps/CherrygroveCity.asm                         | 2 +-
 maps/CherrygroveEvolutionSpeechHouse.asm         | 2 +-
 maps/CherrygroveGymSpeechHouse.asm               | 2 +-
 maps/CherrygroveMart.asm                         | 2 +-
 maps/CherrygrovePokecenter1F.asm                 | 2 +-
 maps/CianwoodCity.asm                            | 2 +-
 maps/CianwoodGym.asm                             | 2 +-
 maps/CianwoodLugiaSpeechHouse.asm                | 2 +-
 maps/CianwoodPharmacy.asm                        | 2 +-
 maps/CianwoodPhotoStudio.asm                     | 2 +-
 maps/CianwoodPokecenter1F.asm                    | 2 +-
 maps/CinnabarIsland.asm                          | 2 +-
 maps/CinnabarPokecenter1F.asm                    | 2 +-
 maps/Colosseum.asm                               | 2 +-
 maps/CopycatsHouse1F.asm                         | 2 +-
 maps/CopycatsHouse2F.asm                         | 2 +-
 maps/DanceTheatre.asm                            | 2 +-
 maps/DarkCaveBlackthornEntrance.asm              | 2 +-
 maps/DarkCaveVioletEntrance.asm                  | 2 +-
 maps/DayCare.asm                                 | 2 +-
 maps/DayOfWeekSiblingsHouse.asm                  | 2 +-
 maps/DiglettsCave.asm                            | 2 +-
 maps/DragonShrine.asm                            | 2 +-
 maps/DragonsDenB1F.asm                           | 2 +-
 maps/EarlsPokemonAcademy.asm                     | 2 +-
 maps/EcruteakCity.asm                            | 2 +-
 maps/EcruteakGym.asm                             | 2 +-
 maps/EcruteakItemfinderHouse.asm                 | 2 +-
 maps/EcruteakLugiaSpeechHouse.asm                | 2 +-
 maps/EcruteakMart.asm                            | 2 +-
 maps/EcruteakPokecenter1F.asm                    | 2 +-
 maps/EcruteakTinTowerEntrance.asm                | 2 +-
 maps/ElmsHouse.asm                               | 2 +-
 maps/ElmsLab.asm                                 | 2 +-
 maps/FastShip1F.asm                              | 2 +-
 maps/FastShipB1F.asm                             | 2 +-
 maps/FastShipCabins_NNW_NNE_NE.asm               | 2 +-
 maps/FastShipCabins_SE_SSE_CaptainsCabin.asm     | 2 +-
 maps/FastShipCabins_SW_SSW_NW.asm                | 2 +-
 maps/FightingDojo.asm                            | 2 +-
 maps/FuchsiaCity.asm                             | 2 +-
 maps/FuchsiaGym.asm                              | 2 +-
 maps/FuchsiaMart.asm                             | 2 +-
 maps/FuchsiaPokecenter1F.asm                     | 2 +-
 maps/GoldenrodBikeShop.asm                       | 2 +-
 maps/GoldenrodCity.asm                           | 2 +-
 maps/GoldenrodDeptStore1F.asm                    | 2 +-
 maps/GoldenrodDeptStore2F.asm                    | 2 +-
 maps/GoldenrodDeptStore3F.asm                    | 2 +-
 maps/GoldenrodDeptStore4F.asm                    | 2 +-
 maps/GoldenrodDeptStore5F.asm                    | 2 +-
 maps/GoldenrodDeptStore6F.asm                    | 2 +-
 maps/GoldenrodDeptStoreB1F.asm                   | 2 +-
 maps/GoldenrodDeptStoreRoof.asm                  | 2 +-
 maps/GoldenrodFlowerShop.asm                     | 2 +-
 maps/GoldenrodGameCorner.asm                     | 2 +-
 maps/GoldenrodGym.asm                            | 2 +-
 maps/GoldenrodHappinessRater.asm                 | 2 +-
 maps/GoldenrodMagnetTrainStation.asm             | 2 +-
 maps/GoldenrodNameRater.asm                      | 2 +-
 maps/GoldenrodPPSpeechHouse.asm                  | 2 +-
 maps/GoldenrodPokecenter1F.asm                   | 2 +-
 maps/GoldenrodUnderground.asm                    | 2 +-
 maps/GoldenrodUndergroundSwitchRoomEntrances.asm | 2 +-
 maps/GoldenrodUndergroundWarehouse.asm           | 2 +-
 maps/GuideGentsHouse.asm                         | 2 +-
 maps/HallOfFame.asm                              | 2 +-
 maps/IcePath1F.asm                               | 2 +-
 maps/IcePathB1F.asm                              | 2 +-
 maps/IcePathB2FBlackthornSide.asm                | 2 +-
 maps/IcePathB2FMahoganySide.asm                  | 2 +-
 maps/IcePathB3F.asm                              | 2 +-
 maps/IlexForest.asm                              | 2 +-
 maps/IlexForestAzaleaGate.asm                    | 2 +-
 maps/IndigoPlateauPokecenter1F.asm               | 2 +-
 maps/KarensRoom.asm                              | 2 +-
 maps/KogasRoom.asm                               | 2 +-
 maps/KurtsHouse.asm                              | 2 +-
 maps/LakeOfRage.asm                              | 2 +-
 maps/LakeOfRageHiddenPowerHouse.asm              | 2 +-
 maps/LakeOfRageMagikarpHouse.asm                 | 2 +-
 maps/LancesRoom.asm                              | 2 +-
 maps/LavRadioTower1F.asm                         | 2 +-
 maps/LavenderMart.asm                            | 2 +-
 maps/LavenderNameRater.asm                       | 2 +-
 maps/LavenderPokecenter1F.asm                    | 2 +-
 maps/LavenderSpeechHouse.asm                     | 2 +-
 maps/LavenderTown.asm                            | 2 +-
 maps/MahoganyGym.asm                             | 2 +-
 maps/MahoganyMart1F.asm                          | 2 +-
 maps/MahoganyPokecenter1F.asm                    | 2 +-
 maps/MahoganyRedGyaradosSpeechHouse.asm          | 2 +-
 maps/MahoganyTown.asm                            | 2 +-
 maps/ManiasHouse.asm                             | 2 +-
 maps/MountMoon.asm                               | 2 +-
 maps/MountMoonGiftShop.asm                       | 2 +-
 maps/MountMoonSquare.asm                         | 2 +-
 maps/MountMortar1FInside.asm                     | 2 +-
 maps/MountMortar1FOutside.asm                    | 2 +-
 maps/MountMortar2FInside.asm                     | 2 +-
 maps/MountMortarB1F.asm                          | 2 +-
 maps/MoveDeletersHouse.asm                       | 2 +-
 maps/MrFujisHouse.asm                            | 2 +-
 maps/MrPokemonsHouse.asm                         | 2 +-
 maps/MrPsychicsHouse.asm                         | 2 +-
 maps/NationalPark.asm                            | 2 +-
 maps/NationalParkBugContest.asm                  | 2 +-
 maps/NewBarkTown.asm                             | 2 +-
 maps/OaksLab.asm                                 | 2 +-
 maps/OlivineCafe.asm                             | 2 +-
 maps/OlivineCity.asm                             | 2 +-
 maps/OlivineGoodRodHouse.asm                     | 2 +-
 maps/OlivineGym.asm                              | 2 +-
 maps/OlivineHouseBeta.asm                        | 2 +-
 maps/OlivineLighthouse1F.asm                     | 2 +-
 maps/OlivineLighthouse2F.asm                     | 2 +-
 maps/OlivineLighthouse3F.asm                     | 2 +-
 maps/OlivineLighthouse4F.asm                     | 2 +-
 maps/OlivineLighthouse5F.asm                     | 2 +-
 maps/OlivineLighthouse6F.asm                     | 2 +-
 maps/OlivineMart.asm                             | 2 +-
 maps/OlivinePokecenter1F.asm                     | 2 +-
 maps/OlivinePort.asm                             | 2 +-
 maps/OlivinePortPassage.asm                      | 2 +-
 maps/OlivinePunishmentSpeechHouse.asm            | 2 +-
 maps/OlivineTimsHouse.asm                        | 2 +-
 maps/PalletTown.asm                              | 2 +-
 maps/PewterCity.asm                              | 2 +-
 maps/PewterGym.asm                               | 2 +-
 maps/PewterMart.asm                              | 2 +-
 maps/PewterNidoranSpeechHouse.asm                | 2 +-
 maps/PewterPokecenter1F.asm                      | 2 +-
 maps/PewterSnoozeSpeechHouse.asm                 | 2 +-
 maps/PlayersHouse1F.asm                          | 2 +-
 maps/PlayersHouse2F.asm                          | 2 +-
 maps/PlayersNeighborsHouse.asm                   | 2 +-
 maps/PokeSeersHouse.asm                          | 2 +-
 maps/Pokecenter2F.asm                            | 2 +-
 maps/PokecomCenterAdminRoomMobile.asm            | 2 +-
 maps/PokemonFanClub.asm                          | 2 +-
 maps/PowerPlant.asm                              | 2 +-
 maps/RadioTower1F.asm                            | 2 +-
 maps/RadioTower2F.asm                            | 2 +-
 maps/RadioTower3F.asm                            | 2 +-
 maps/RadioTower4F.asm                            | 2 +-
 maps/RadioTower5F.asm                            | 2 +-
 maps/RedsHouse1F.asm                             | 2 +-
 maps/RockTunnel1F.asm                            | 2 +-
 maps/RockTunnelB1F.asm                           | 2 +-
 maps/Route1.asm                                  | 2 +-
 maps/Route10Pokecenter1F.asm                     | 2 +-
 maps/Route10South.asm                            | 2 +-
 maps/Route11.asm                                 | 2 +-
 maps/Route12.asm                                 | 2 +-
 maps/Route12SuperRodHouse.asm                    | 2 +-
 maps/Route13.asm                                 | 2 +-
 maps/Route14.asm                                 | 2 +-
 maps/Route15.asm                                 | 2 +-
 maps/Route15FuchsiaGate.asm                      | 2 +-
 maps/Route16FuchsiaSpeechHouse.asm               | 2 +-
 maps/Route16Gate.asm                             | 2 +-
 maps/Route17.asm                                 | 2 +-
 maps/Route17Route18Gate.asm                      | 2 +-
 maps/Route18.asm                                 | 2 +-
 maps/Route19.asm                                 | 2 +-
 maps/Route19FuchsiaGate.asm                      | 2 +-
 maps/Route2.asm                                  | 2 +-
 maps/Route20.asm                                 | 2 +-
 maps/Route21.asm                                 | 2 +-
 maps/Route24.asm                                 | 2 +-
 maps/Route25.asm                                 | 2 +-
 maps/Route26.asm                                 | 2 +-
 maps/Route26HealHouse.asm                        | 2 +-
 maps/Route27.asm                                 | 2 +-
 maps/Route27SandstormHouse.asm                   | 2 +-
 maps/Route28SteelWingHouse.asm                   | 2 +-
 maps/Route29.asm                                 | 2 +-
 maps/Route29Route46Gate.asm                      | 2 +-
 maps/Route2Gate.asm                              | 2 +-
 maps/Route2NuggetHouse.asm                       | 2 +-
 maps/Route3.asm                                  | 2 +-
 maps/Route30.asm                                 | 2 +-
 maps/Route30BerryHouse.asm                       | 2 +-
 maps/Route31.asm                                 | 2 +-
 maps/Route31VioletGate.asm                       | 2 +-
 maps/Route32.asm                                 | 2 +-
 maps/Route32Pokecenter1F.asm                     | 2 +-
 maps/Route32RuinsOfAlphGate.asm                  | 2 +-
 maps/Route33.asm                                 | 2 +-
 maps/Route34.asm                                 | 2 +-
 maps/Route34IlexForestGate.asm                   | 2 +-
 maps/Route35.asm                                 | 2 +-
 maps/Route35GoldenrodGate.asm                    | 2 +-
 maps/Route35NationalParkGate.asm                 | 2 +-
 maps/Route36.asm                                 | 2 +-
 maps/Route36NationalParkGate.asm                 | 2 +-
 maps/Route36RuinsOfAlphGate.asm                  | 2 +-
 maps/Route37.asm                                 | 2 +-
 maps/Route38.asm                                 | 2 +-
 maps/Route38EcruteakGate.asm                     | 2 +-
 maps/Route39.asm                                 | 2 +-
 maps/Route39Barn.asm                             | 2 +-
 maps/Route39Farmhouse.asm                        | 2 +-
 maps/Route4.asm                                  | 2 +-
 maps/Route40.asm                                 | 2 +-
 maps/Route40BattleTowerGate.asm                  | 2 +-
 maps/Route41.asm                                 | 2 +-
 maps/Route42.asm                                 | 2 +-
 maps/Route42EcruteakGate.asm                     | 2 +-
 maps/Route43.asm                                 | 2 +-
 maps/Route43Gate.asm                             | 2 +-
 maps/Route43MahoganyGate.asm                     | 2 +-
 maps/Route44.asm                                 | 2 +-
 maps/Route45.asm                                 | 2 +-
 maps/Route46.asm                                 | 2 +-
 maps/Route5.asm                                  | 2 +-
 maps/Route5CleanseTagHouse.asm                   | 2 +-
 maps/Route5SaffronGate.asm                       | 2 +-
 maps/Route5UndergroundPathEntrance.asm           | 2 +-
 maps/Route6.asm                                  | 2 +-
 maps/Route6SaffronGate.asm                       | 2 +-
 maps/Route7SaffronGate.asm                       | 2 +-
 maps/Route8.asm                                  | 2 +-
 maps/Route8SaffronGate.asm                       | 2 +-
 maps/Route9.asm                                  | 2 +-
 maps/RuinsOfAlphAerodactylItemRoom.asm           | 2 +-
 maps/RuinsOfAlphHoOhItemRoom.asm                 | 2 +-
 maps/RuinsOfAlphInnerChamber.asm                 | 2 +-
 maps/RuinsOfAlphKabutoChamber.asm                | 2 +-
 maps/RuinsOfAlphKabutoItemRoom.asm               | 2 +-
 maps/RuinsOfAlphOmanyteItemRoom.asm              | 2 +-
 maps/RuinsOfAlphOutside.asm                      | 2 +-
 maps/RuinsOfAlphResearchCenter.asm               | 2 +-
 maps/SafariZoneWardensHome.asm                   | 2 +-
 maps/SaffronCity.asm                             | 2 +-
 maps/SaffronGym.asm                              | 2 +-
 maps/SaffronMagnetTrainStation.asm               | 2 +-
 maps/SaffronMart.asm                             | 2 +-
 maps/SaffronPokecenter1F.asm                     | 2 +-
 maps/SeafoamGym.asm                              | 2 +-
 maps/SilphCo1F.asm                               | 2 +-
 maps/SilverCaveItemRooms.asm                     | 2 +-
 maps/SilverCavePokecenter1F.asm                  | 2 +-
 maps/SilverCaveRoom1.asm                         | 2 +-
 maps/SilverCaveRoom2.asm                         | 2 +-
 maps/SilverCaveRoom3.asm                         | 2 +-
 maps/SlowpokeWellB1F.asm                         | 2 +-
 maps/SlowpokeWellB2F.asm                         | 2 +-
 maps/SoulHouse.asm                               | 2 +-
 maps/SproutTower1F.asm                           | 2 +-
 maps/SproutTower2F.asm                           | 2 +-
 maps/SproutTower3F.asm                           | 2 +-
 maps/TeamRocketBaseB1F.asm                       | 2 +-
 maps/TeamRocketBaseB2F.asm                       | 2 +-
 maps/TeamRocketBaseB3F.asm                       | 2 +-
 maps/TimeCapsule.asm                             | 2 +-
 maps/TinTower1F.asm                              | 2 +-
 maps/TinTower3F.asm                              | 2 +-
 maps/TinTower4F.asm                              | 2 +-
 maps/TinTower5F.asm                              | 2 +-
 maps/TinTower6F.asm                              | 2 +-
 maps/TinTower7F.asm                              | 2 +-
 maps/TinTower8F.asm                              | 2 +-
 maps/TinTower9F.asm                              | 2 +-
 maps/TinTowerRoof.asm                            | 2 +-
 maps/TohjoFalls.asm                              | 2 +-
 maps/TradeCenter.asm                             | 2 +-
 maps/TrainerHouse1F.asm                          | 2 +-
 maps/TrainerHouseB1F.asm                         | 2 +-
 maps/UnionCave1F.asm                             | 2 +-
 maps/UnionCaveB1F.asm                            | 2 +-
 maps/UnionCaveB2F.asm                            | 2 +-
 maps/VermilionCity.asm                           | 2 +-
 maps/VermilionDiglettsCaveSpeechHouse.asm        | 2 +-
 maps/VermilionFishingSpeechHouse.asm             | 2 +-
 maps/VermilionGym.asm                            | 2 +-
 maps/VermilionMagnetTrainSpeechHouse.asm         | 2 +-
 maps/VermilionMart.asm                           | 2 +-
 maps/VermilionPokecenter1F.asm                   | 2 +-
 maps/VermilionPort.asm                           | 2 +-
 maps/VermilionPortPassage.asm                    | 2 +-
 maps/VictoryRoad.asm                             | 2 +-
 maps/VictoryRoadGate.asm                         | 2 +-
 maps/VioletCity.asm                              | 2 +-
 maps/VioletGym.asm                               | 2 +-
 maps/VioletKylesHouse.asm                        | 2 +-
 maps/VioletMart.asm                              | 2 +-
 maps/VioletNicknameSpeechHouse.asm               | 2 +-
 maps/VioletPokecenter1F.asm                      | 2 +-
 maps/ViridianCity.asm                            | 2 +-
 maps/ViridianGym.asm                             | 2 +-
 maps/ViridianMart.asm                            | 2 +-
 maps/ViridianNicknameSpeechHouse.asm             | 2 +-
 maps/ViridianPokecenter1F.asm                    | 2 +-
 maps/WhirlIslandB1F.asm                          | 2 +-
 maps/WhirlIslandB2F.asm                          | 2 +-
 maps/WhirlIslandLugiaChamber.asm                 | 2 +-
 maps/WhirlIslandNE.asm                           | 2 +-
 maps/WhirlIslandSW.asm                           | 2 +-
 maps/WillsRoom.asm                               | 2 +-
 maps/WiseTriosRoom.asm                           | 2 +-
 350 files changed, 350 insertions(+), 350 deletions(-)

diff --git a/constants/script_constants.asm b/constants/script_constants.asm
index 0cf3b058e..eb7f9b8d6 100644
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -1,4 +1,4 @@
-; script vars
+; person constants
 PLAYER      EQU  0
 LAST_TALKED EQU -2
 
diff --git a/docs/map_event_scripts.md b/docs/map_event_scripts.md
index 33f51eb37..129a47fab 100644
--- a/docs/map_event_scripts.md
+++ b/docs/map_event_scripts.md
@@ -4,7 +4,7 @@
 ## Person constants
 
 
-const_value set 2
+const_value set 2 ; person constants
 	const MAPNAME_OBJECTNAME
 

 
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
index b23523a47..3dad852e5 100644
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const AZALEAGYM_BUGSY
 	const AZALEAGYM_BUG_CATCHER1
 	const AZALEAGYM_BUG_CATCHER2
diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm
index 4d8b4997a..0f5d4cde7 100644
--- a/maps/AzaleaMart.asm
+++ b/maps/AzaleaMart.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const AZALEAMART_CLERK
 	const AZALEAMART_COOLTRAINER_M
 	const AZALEAMART_BUG_CATCHER
diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm
index e644e99f1..fcf04c2a6 100644
--- a/maps/AzaleaPokecenter1F.asm
+++ b/maps/AzaleaPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const AZALEAPOKECENTER1F_NURSE
 	const AZALEAPOKECENTER1F_GENTLEMAN
 	const AZALEAPOKECENTER1F_FISHING_GURU
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index e9026e05e..3ff773c07 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const AZALEATOWN_AZALEA_ROCKET1
 	const AZALEATOWN_GRAMPS
 	const AZALEATOWN_TEACHER
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index 42242bd8c..07dbe0ae2 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const BATTLETOWER1F_RECEPTIONIST
 	const BATTLETOWER1F_YOUNGSTER
 	const BATTLETOWER1F_COOLTRAINER_F
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index 24011c144..96f11974e 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const BATTLETOWERBATTLEROOM_YOUNGSTER
 	const BATTLETOWERBATTLEROOM_RECEPTIONIST
 
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
index 1704c3601..ec4b68f21 100644
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const BATTLETOWERELEVATOR_RECEPTIONIST
 
 BattleTowerElevator_MapScripts:
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
index 3cfc923e0..f4255a378 100644
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const BATTLETOWERHALLWAY_RECEPTIONIST
 
 BattleTowerHallway_MapScripts:
diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm
index f9b58af82..b42d43c9c 100644
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const BATTLETOWEROUTSIDE_STANDING_YOUNGSTER
 	const BATTLETOWEROUTSIDE_BUENA
 	const BATTLETOWEROUTSIDE_SAILOR
diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm
index ff951b05c..6fbf2f7c2 100644
--- a/maps/BillsBrothersHouse.asm
+++ b/maps/BillsBrothersHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const BILLSBROTHERSHOUSE_POKEFAN_F
 	const BILLSBROTHERSHOUSE_YOUNGSTER
 
diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm
index 05c757e71..acab1aa10 100644
--- a/maps/BillsFamilysHouse.asm
+++ b/maps/BillsFamilysHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const BILLSFAMILYSHOUSE_BILL
 	const BILLSFAMILYSHOUSE_POKEFAN_F
 	const BILLSFAMILYSHOUSE_TWIN
diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
index f27b4a5a3..33c7372d2 100644
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const BILLSHOUSE_GRAMPS
 
 BillsHouse_MapScripts:
diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm
index edc4e2f66..648f37f32 100644
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const BLACKTHORNCITY_SUPER_NERD1
 	const BLACKTHORNCITY_SUPER_NERD2
 	const BLACKTHORNCITY_GRAMPS1
diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm
index 3ee16fefc..bf3bb9772 100644
--- a/maps/BlackthornDragonSpeechHouse.asm
+++ b/maps/BlackthornDragonSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const BLACKTHORNDRAGONSPEECHHOUSE_GRANNY
 	const BLACKTHORNDRAGONSPEECHHOUSE_EKANS
 
diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm
index 21599704c..189d928f7 100644
--- a/maps/BlackthornEmysHouse.asm
+++ b/maps/BlackthornEmysHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const BLACKTHORNEMYSHOUSE_EMY
 
 BlackthornEmysHouse_MapScripts:
diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm
index 2f3f22971..9e6c06ee9 100644
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const BLACKTHORNGYM1F_CLAIR
 	const BLACKTHORNGYM1F_COOLTRAINER_M1
 	const BLACKTHORNGYM1F_COOLTRAINER_M2
diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm
index 2417a14b1..2a809027f 100644
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const BLACKTHORNGYM2F_COOLTRAINER_M
 	const BLACKTHORNGYM2F_COOLTRAINER_F
 	const BLACKTHORNGYM2F_BOULDER1
diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm
index 0272436fd..48a75323b 100644
--- a/maps/BlackthornMart.asm
+++ b/maps/BlackthornMart.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const BLACKTHORNMART_CLERK
 	const BLACKTHORNMART_COOLTRAINER_M
 	const BLACKTHORNMART_BLACK_BELT
diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm
index e7baf90d9..b27bd816c 100644
--- a/maps/BlackthornPokecenter1F.asm
+++ b/maps/BlackthornPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const BLACKTHORNPOKECENTER1F_NURSE
 	const BLACKTHORNPOKECENTER1F_GENTLEMAN
 	const BLACKTHORNPOKECENTER1F_TWIN
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
index e6283bd40..e2ab5e1de 100644
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const BLUESHOUSE_DAISY
 
 BluesHouse_MapScripts:
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
index ef1557c03..371003777 100644
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const BRUNOSROOM_BRUNO
 
 BrunosRoom_MapScripts:
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index fb7b950f5..f60c64237 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const BURNEDTOWER1F_ROCK
 	const BURNEDTOWER1F_EUSINE
 	const BURNEDTOWER1F_SILVER
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index 0f1059349..9d383f8a2 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const BURNEDTOWERB1F_BOULDER
 	const BURNEDTOWERB1F_RAIKOU1
 	const BURNEDTOWERB1F_ENTEI1
diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm
index 8d2d04824..81934496e 100644
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CELADONCAFE_SUPER_NERD
 	const CELADONCAFE_FISHER1
 	const CELADONCAFE_FISHER2
diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm
index e7e62ac4e..cc1c22649 100644
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CELADONCITY_FISHER
 	const CELADONCITY_POLIWAG
 	const CELADONCITY_TEACHER1
diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm
index 5eede6743..9f43067a9 100644
--- a/maps/CeladonDeptStore1F.asm
+++ b/maps/CeladonDeptStore1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CELADONDEPTSTORE1F_RECEPTIONIST
 	const CELADONDEPTSTORE1F_GENTLEMAN
 	const CELADONDEPTSTORE1F_TEACHER
diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm
index 4ec78cb6f..44aa1591c 100644
--- a/maps/CeladonDeptStore2F.asm
+++ b/maps/CeladonDeptStore2F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CELADONDEPTSTORE2F_CLERK1
 	const CELADONDEPTSTORE2F_CLERK2
 	const CELADONDEPTSTORE2F_POKEFAN_M
diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm
index 4950dee28..718ec6491 100644
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CELADONDEPTSTORE3F_CLERK
 	const CELADONDEPTSTORE3F_YOUNGSTER
 	const CELADONDEPTSTORE3F_GAMEBOY_KID1
diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm
index 1d8e8e7fc..a0034dcb0 100644
--- a/maps/CeladonDeptStore4F.asm
+++ b/maps/CeladonDeptStore4F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CELADONDEPTSTORE4F_CLERK
 	const CELADONDEPTSTORE4F_SUPER_NERD
 	const CELADONDEPTSTORE4F_YOUNGSTER
diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm
index 63c65acab..c2d6ecfa5 100644
--- a/maps/CeladonDeptStore5F.asm
+++ b/maps/CeladonDeptStore5F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CELADONDEPTSTORE5F_CLERK1
 	const CELADONDEPTSTORE5F_CLERK2
 	const CELADONDEPTSTORE5F_GENTLEMAN
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index f70a7d725..f5a64328d 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CELADONDEPTSTORE6F_SUPER_NERD
 	const CELADONDEPTSTORE6F_YOUNGSTER
 
diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm
index 1c213bacf..394d4a932 100644
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CELADONGAMECORNER_CLERK
 	const CELADONGAMECORNER_RECEPTIONIST
 	const CELADONGAMECORNER_POKEFAN_M
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index cc64e736e..12b3aa4dc 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CELADONGAMECORNERPRIZEROOM_GENTLEMAN
 	const CELADONGAMECORNERPRIZEROOM_PHARMACIST
 
diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm
index 1c6e1169c..0f5218d6c 100644
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CELADONGYM_ERIKA
 	const CELADONGYM_LASS1
 	const CELADONGYM_LASS2
diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm
index 5d14663a9..fad635f28 100644
--- a/maps/CeladonMansion1F.asm
+++ b/maps/CeladonMansion1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CELADONMANSION1F_GRANNY
 	const CELADONMANSION1F_GROWLITHE1
 	const CELADONMANSION1F_CLEFAIRY
diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm
index 39ac12d7a..c002bf2b3 100644
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CELADONMANSION3F_COOLTRAINER_M
 	const CELADONMANSION3F_GYM_GUY
 	const CELADONMANSION3F_SUPER_NERD
diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm
index 254000bd1..862f4d6cc 100644
--- a/maps/CeladonMansionRoof.asm
+++ b/maps/CeladonMansionRoof.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CELADONMANSIONROOF_FISHER
 
 CeladonMansionRoof_MapScripts:
diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm
index b82709b6c..008c967dc 100644
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CELADONMANSIONROOFHOUSE_PHARMACIST
 
 CeladonMansionRoofHouse_MapScripts:
diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm
index 0590da32d..35b488600 100644
--- a/maps/CeladonPokecenter1F.asm
+++ b/maps/CeladonPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CELADONPOKECENTER1F_NURSE
 	const CELADONPOKECENTER1F_GENTLEMAN
 	const CELADONPOKECENTER1F_PHARMACIST
diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm
index 6fa79be19..d65c1a9b8 100644
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CERULEANCITY_COOLTRAINER_M
 	const CERULEANCITY_SUPER_NERD
 	const CERULEANCITY_SLOWPOKE
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index f43cf4d12..148a535af 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CERULEANGYM_ROCKET
 	const CERULEANGYM_MISTY
 	const CERULEANGYM_SWIMMER_GIRL1
diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm
index 19b60dfdb..3294aa1a0 100644
--- a/maps/CeruleanGymBadgeSpeechHouse.asm
+++ b/maps/CeruleanGymBadgeSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M
 
 CeruleanGymBadgeSpeechHouse_MapScripts:
diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm
index d66986a89..ba11d432c 100644
--- a/maps/CeruleanMart.asm
+++ b/maps/CeruleanMart.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CERULEANMART_CLERK
 	const CERULEANMART_COOLTRAINER_M
 	const CERULEANMART_COOLTRAINER_F
diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm
index 7988f7154..81851f02b 100644
--- a/maps/CeruleanPokecenter1F.asm
+++ b/maps/CeruleanPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CERULEANPOKECENTER1F_NURSE
 	const CERULEANPOKECENTER1F_SUPER_NERD
 	const CERULEANPOKECENTER1F_GYM_GUY
diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm
index 7adaba556..5f1a44fe3 100644
--- a/maps/CeruleanPoliceStation.asm
+++ b/maps/CeruleanPoliceStation.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CERULEANPOLICESTATION_FISHING_GURU
 	const CERULEANPOLICESTATION_POKEFAN_F
 	const CERULEANPOLICESTATION_DIGLETT
diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm
index 785b43cc9..7e33a1b5c 100644
--- a/maps/CeruleanTradeSpeechHouse.asm
+++ b/maps/CeruleanTradeSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CERULEANTRADESPEECHHOUSE_GRANNY
 	const CERULEANTRADESPEECHHOUSE_GRAMPS
 	const CERULEANTRADESPEECHHOUSE_RHYDON
diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm
index 91ee79e25..1f9465743 100644
--- a/maps/CharcoalKiln.asm
+++ b/maps/CharcoalKiln.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CHARCOALKILN_BLACK_BELT
 	const CHARCOALKILN_YOUNGSTER
 	const CHARCOALKILN_MOLTRES
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index 4df1fd299..d92bcff1b 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CHERRYGROVECITY_GRAMPS
 	const CHERRYGROVECITY_SILVER
 	const CHERRYGROVECITY_TEACHER
diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm
index 8ecad6337..a111f7409 100644
--- a/maps/CherrygroveEvolutionSpeechHouse.asm
+++ b/maps/CherrygroveEvolutionSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CHERRYGROVEEVOLUTIONSPEECHHOUSE_LASS
 	const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER
 
diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm
index df5c588c6..e0c2ffb8e 100644
--- a/maps/CherrygroveGymSpeechHouse.asm
+++ b/maps/CherrygroveGymSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CHERRYGROVEGYMSPEECHHOUSE_POKEFAN_M
 	const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER
 
diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm
index 7ccc16f59..cdf5268f4 100644
--- a/maps/CherrygroveMart.asm
+++ b/maps/CherrygroveMart.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CHERRYGROVEMART_CLERK
 	const CHERRYGROVEMART_COOLTRAINER_M
 	const CHERRYGROVEMART_YOUNGSTER
diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm
index abc16919f..9b6afa0c8 100644
--- a/maps/CherrygrovePokecenter1F.asm
+++ b/maps/CherrygrovePokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CHERRYGROVEPOKECENTER1F_NURSE
 	const CHERRYGROVEPOKECENTER1F_FISHER
 	const CHERRYGROVEPOKECENTER1F_GENTLEMAN
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index c7fa3e8b0..f269c2a87 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CIANWOODCITY_STANDING_YOUNGSTER
 	const CIANWOODCITY_POKEFAN_M
 	const CIANWOODCITY_LASS
diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm
index fd4109957..82053ae14 100644
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CIANWOODGYM_CHUCK
 	const CIANWOODGYM_BLACK_BELT1
 	const CIANWOODGYM_BLACK_BELT2
diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm
index 1049d5280..aa02289a6 100644
--- a/maps/CianwoodLugiaSpeechHouse.asm
+++ b/maps/CianwoodLugiaSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CIANWOODLUGIASPEECHHOUSE_TEACHER
 	const CIANWOODLUGIASPEECHHOUSE_LASS
 	const CIANWOODLUGIASPEECHHOUSE_TWIN
diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm
index 8bb278e3d..ecbcb72da 100644
--- a/maps/CianwoodPharmacy.asm
+++ b/maps/CianwoodPharmacy.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CIANWOODPHARMACY_PHARMACIST
 
 CianwoodPharmacy_MapScripts:
diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm
index 956d64948..bc857b575 100644
--- a/maps/CianwoodPhotoStudio.asm
+++ b/maps/CianwoodPhotoStudio.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CIANWOODPHOTOSTUDIO_FISHING_GURU
 
 CianwoodPhotoStudio_MapScripts:
diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm
index 3b7e41f17..e10e93f0d 100644
--- a/maps/CianwoodPokecenter1F.asm
+++ b/maps/CianwoodPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CIANWOODPOKECENTER1F_NURSE
 	const CIANWOODPOKECENTER1F_LASS
 	const CIANWOODPOKECENTER1F_GYM_GUY
diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm
index 021da6387..7d0f4655f 100644
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CINNABARISLAND_BLUE
 
 CinnabarIsland_MapScripts:
diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm
index c5f5956e9..09f36ce2b 100644
--- a/maps/CinnabarPokecenter1F.asm
+++ b/maps/CinnabarPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const CINNABARPOKECENTER1F_NURSE
 	const CINNABARPOKECENTER1F_COOLTRAINER_F
 	const CINNABARPOKECENTER1F_FISHER
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index 7dd4083a9..856a80058 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const COLOSSEUM_CHRIS1
 	const COLOSSEUM_CHRIS2
 
diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm
index 96249fe8d..df321aabf 100644
--- a/maps/CopycatsHouse1F.asm
+++ b/maps/CopycatsHouse1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const COPYCATSHOUSE1F_POKEFAN_M
 	const COPYCATSHOUSE1F_POKEFAN_F
 	const COPYCATSHOUSE1F_CLEFAIRY
diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm
index 722b39dcc..819d18eda 100644
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const COPYCATSHOUSE2F_COPYCAT1 ; if player is male
 	const COPYCATSHOUSE2F_DODRIO
 	const COPYCATSHOUSE2F_FAIRYDOLL ; lost item
diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm
index fa3c4abca..37c2f9264 100644
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const DANCETHEATRE_KIMONO_GIRL1
 	const DANCETHEATRE_KIMONO_GIRL2
 	const DANCETHEATRE_KIMONO_GIRL3
diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm
index cbc858e70..8b1c2a772 100644
--- a/maps/DarkCaveBlackthornEntrance.asm
+++ b/maps/DarkCaveBlackthornEntrance.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const DARKCAVEBLACKTHORNENTRANCE_PHARMACIST
 	const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL1
 	const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2
diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm
index 733f260f0..60b0b92bc 100644
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const DARKCAVEVIOLETENTRANCE_POKE_BALL1
 	const DARKCAVEVIOLETENTRANCE_ROCK1
 	const DARKCAVEVIOLETENTRANCE_ROCK2
diff --git a/maps/DayCare.asm b/maps/DayCare.asm
index e6b3ea986..f6d4b6693 100644
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const DAYCARE_GRAMPS
 	const DAYCARE_GRANNY
 
diff --git a/maps/DayOfWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm
index b88641ef0..c5d900300 100644
--- a/maps/DayOfWeekSiblingsHouse.asm
+++ b/maps/DayOfWeekSiblingsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const DAYOFWEEKSIBLINGSHOUSE_POKEDEX
 
 DayOfWeekSiblingsHouse_MapScripts:
diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm
index 74ed60bc9..e1eaba04a 100644
--- a/maps/DiglettsCave.asm
+++ b/maps/DiglettsCave.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const DIGLETTSCAVE_POKEFAN_M
 
 DiglettsCave_MapScripts:
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index eb8485e5e..50baf8455 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const DRAGONSHRINE_ELDER1
 	const DRAGONSHRINE_ELDER2
 	const DRAGONSHRINE_ELDER3
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 4f2545a5a..cb25c8603 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const DRAGONSDENB1F_POKE_BALL1
 	const DRAGONSDENB1F_CLAIR
 	const DRAGONSDENB1F_SILVER
diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm
index e650fa409..47e70add1 100644
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const EARLSPOKEMONACADEMY_EARL
 	const EARLSPOKEMONACADEMY_YOUNGSTER1
 	const EARLSPOKEMONACADEMY_GAMEBOY_KID1
diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm
index c23c36c0e..1fb53baf5 100644
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ECRUTEAKCITY_GRAMPS1
 	const ECRUTEAKCITY_GRAMPS2
 	const ECRUTEAKCITY_LASS1
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index 176d6a370..820fce044 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ECRUTEAKGYM_MORTY
 	const ECRUTEAKGYM_SAGE1
 	const ECRUTEAKGYM_SAGE2
diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm
index a5e7ad29b..4f7400bfe 100644
--- a/maps/EcruteakItemfinderHouse.asm
+++ b/maps/EcruteakItemfinderHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ECRUTEAKITEMFINDERHOUSE_COOLTRAINER_M
 	const ECRUTEAKITEMFINDERHOUSE_POKEDEX
 
diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm
index 9149d06bc..5a94ff6ec 100644
--- a/maps/EcruteakLugiaSpeechHouse.asm
+++ b/maps/EcruteakLugiaSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ECRUTEAKLUGIASPEECHHOUSE_GRAMPS
 	const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER
 
diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm
index f8d4f10bd..164a5f253 100644
--- a/maps/EcruteakMart.asm
+++ b/maps/EcruteakMart.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ECRUTEAKMART_CLERK
 	const ECRUTEAKMART_SUPER_NERD
 	const ECRUTEAKMART_GRANNY
diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm
index fc56b0b0d..9e1d409f5 100644
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ECRUTEAKPOKECENTER1F_NURSE
 	const ECRUTEAKPOKECENTER1F_POKEFAN_M
 	const ECRUTEAKPOKECENTER1F_COOLTRAINER_F
diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm
index 17ffc7b08..933dbe52f 100644
--- a/maps/EcruteakTinTowerEntrance.asm
+++ b/maps/EcruteakTinTowerEntrance.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ECRUTEAKTINTOWERENTRANCE_SAGE1
 	const ECRUTEAKTINTOWERENTRANCE_SAGE2
 	const ECRUTEAKTINTOWERENTRANCE_SAGE3
diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm
index 28cba0a3f..16f1425fd 100644
--- a/maps/ElmsHouse.asm
+++ b/maps/ElmsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ELMSHOUSE_ELMS_WIFE
 	const ELMSHOUSE_ELMS_SON
 
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 2dff90e41..965d84e66 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ELMSLAB_ELM
 	const ELMSLAB_ELMS_AIDE
 	const ELMSLAB_POKE_BALL1
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index 19bb91a37..f61d95d61 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const FASTSHIP1F_SAILOR1
 	const FASTSHIP1F_SAILOR2
 	const FASTSHIP1F_SAILOR3
diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm
index 252511f93..91036b42c 100644
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const FASTSHIPB1F_SAILOR1
 	const FASTSHIPB1F_SAILOR2
 	const FASTSHIPB1F_SAILOR3
diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm
index 1314070d4..836caf2f3 100644
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_M
 	const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_F
 	const FASTSHIPCABINS_NNW_NNE_NE_SUPER_NERD
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index fdb1e9a37..14b67f576 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_CAPTAIN
 	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN
 	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1
diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm
index ecdf5e412..6cf80814f 100644
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const FASTSHIPCABINS_SW_SSW_NW_FISHER
 	const FASTSHIPCABINS_SW_SSW_NW_BUG_CATCHER
 	const FASTSHIPCABINS_SW_SSW_NW_BUENA
diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm
index 20e81db02..5481b2581 100644
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const FIGHTINGDOJO_BLACK_BELT
 	const FIGHTINGDOJO_POKE_BALL
 
diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm
index 076587ca0..ac931c6c8 100644
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const FUCHSIACITY_YOUNGSTER
 	const FUCHSIACITY_POKEFAN_M
 	const FUCHSIACITY_TEACHER
diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm
index 4a1d1ffe8..c8d0c9929 100644
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const FUCHSIAGYM_JANINE
 	const FUCHSIAGYM_FUCHSIA_GYM_1
 	const FUCHSIAGYM_FUCHSIA_GYM_2
diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm
index cfc7eb659..b4b08bc14 100644
--- a/maps/FuchsiaMart.asm
+++ b/maps/FuchsiaMart.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const FUCHSIAMART_CLERK
 	const FUCHSIAMART_FISHER
 	const FUCHSIAMART_COOLTRAINER_F
diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm
index 829fab00d..1527a63aa 100644
--- a/maps/FuchsiaPokecenter1F.asm
+++ b/maps/FuchsiaPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const FUCHSIAPOKECENTER1F_NURSE
 	const FUCHSIAPOKECENTER1F_COOLTRAINER_M
 	const FUCHSIAPOKECENTER1F_COOLTRAINER_F
diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm
index 0c681f60b..2b653e752 100644
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODBIKESHOP_CLERK
 
 GoldenrodBikeShop_MapScripts:
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 045dd05bc..85788cd38 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODCITY_POKEFAN_M1
 	const GOLDENRODCITY_YOUNGSTER1
 	const GOLDENRODCITY_COOLTRAINER_F1
diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm
index 88aebfdd1..c6c8e3f11 100644
--- a/maps/GoldenrodDeptStore1F.asm
+++ b/maps/GoldenrodDeptStore1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODDEPTSTORE1F_RECEPTIONIST
 	const GOLDENRODDEPTSTORE1F_POKEFAN_F
 	const GOLDENRODDEPTSTORE1F_BUG_CATCHER
diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm
index bb2090eb9..4171cd8d2 100644
--- a/maps/GoldenrodDeptStore2F.asm
+++ b/maps/GoldenrodDeptStore2F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODDEPTSTORE2F_CLERK1
 	const GOLDENRODDEPTSTORE2F_CLERK2
 	const GOLDENRODDEPTSTORE2F_YOUNGSTER
diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm
index 5ddfe04c7..62d084a37 100644
--- a/maps/GoldenrodDeptStore3F.asm
+++ b/maps/GoldenrodDeptStore3F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODDEPTSTORE3F_CLERK
 	const GOLDENRODDEPTSTORE3F_SUPER_NERD
 	const GOLDENRODDEPTSTORE3F_ROCKER
diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm
index 426996978..746ed8c4e 100644
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODDEPTSTORE4F_CLERK
 	const GOLDENRODDEPTSTORE4F_COOLTRAINER_M
 	const GOLDENRODDEPTSTORE4F_BUG_CATCHER
diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm
index 6f2577f15..9c7475e13 100644
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODDEPTSTORE5F_CLERK
 	const GOLDENRODDEPTSTORE5F_LASS
 	const GOLDENRODDEPTSTORE5F_MIKE
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index 295f5b6ea..afa67eece 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODDEPTSTORE6F_LASS
 	const GOLDENRODDEPTSTORE6F_SUPER_NERD
 
diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm
index 83849fe60..1db75499d 100644
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODDEPTSTOREB1F_POKE_BALL1
 	const GOLDENRODDEPTSTOREB1F_POKE_BALL2
 	const GOLDENRODDEPTSTOREB1F_POKE_BALL3
diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm
index d83f760cb..96c93abc6 100644
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODDEPTSTOREROOF_CLERK
 	const GOLDENRODDEPTSTOREROOF_POKEFAN_F
 	const GOLDENRODDEPTSTOREROOF_FISHER
diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm
index c80183bb0..da4c6c3ee 100644
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODFLOWERSHOP_TEACHER
 	const GOLDENRODFLOWERSHOP_FLORIA
 
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index a83ce3e96..68bcbdc8b 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODGAMECORNER_CLERK
 	const GOLDENRODGAMECORNER_RECEPTIONIST1
 	const GOLDENRODGAMECORNER_RECEPTIONIST2
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
index ccfac2120..3b844fd62 100644
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODGYM_WHITNEY
 	const GOLDENRODGYM_LASS1
 	const GOLDENRODGYM_LASS2
diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm
index aa8bbd9f4..872a81414 100644
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODHAPPINESSRATER_TEACHER
 	const GOLDENRODHAPPINESSRATER_POKEFAN_M
 	const GOLDENRODHAPPINESSRATER_TWIN
diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm
index a3117a355..e9f100d55 100644
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODMAGNETTRAINSTATION_OFFICER
 	const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN
 
diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm
index d807b7e3e..b7f0a52d8 100644
--- a/maps/GoldenrodNameRater.asm
+++ b/maps/GoldenrodNameRater.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODNAMERATER_NAME_RATER
 
 GoldenrodNameRater_MapScripts:
diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm
index da2965def..263d3a46e 100644
--- a/maps/GoldenrodPPSpeechHouse.asm
+++ b/maps/GoldenrodPPSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODPPSPEECHHOUSE_FISHER
 	const GOLDENRODPPSPEECHHOUSE_LASS
 
diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm
index 3765181b2..ca288ceca 100644
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODPOKECENTER1F_NURSE
 	const GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
 	const GOLDENRODPOKECENTER1F_GAMEBOY_KID
diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm
index 765b48427..2a026b551 100644
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODUNDERGROUND_SUPER_NERD1
 	const GOLDENRODUNDERGROUND_SUPER_NERD2
 	const GOLDENRODUNDERGROUND_SUPER_NERD3
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index 27c77e1ba..62eeb9356 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -31,7 +31,7 @@ doorstate: MACRO
 	changeblock UGDOOR_\1_YCOORD, UGDOOR_\1_XCOORD, UNDERGROUND_DOOR_\2
 ENDM
 
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST1
 	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST2
 	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET1
diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm
index a4d283739..0bfb3bf99 100644
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET1
 	const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET2
 	const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET3
diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm
index 42382ec94..201b72021 100644
--- a/maps/GuideGentsHouse.asm
+++ b/maps/GuideGentsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const GUIDEGENTSHOUSE_GRAMPS
 
 GuideGentsHouse_MapScripts:
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index 571a5a964..1c68545db 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const HALLOFFAME_LANCE
 
 HallOfFame_MapScripts:
diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm
index fbb3a9198..82676465a 100644
--- a/maps/IcePath1F.asm
+++ b/maps/IcePath1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ICEPATH1F_POKE_BALL1
 	const ICEPATH1F_POKE_BALL2
 	const ICEPATH1F_POKE_BALL3
diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm
index b40bea795..3c33bc44c 100644
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ICEPATHB1F_BOULDER1
 	const ICEPATHB1F_BOULDER2
 	const ICEPATHB1F_BOULDER3
diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm
index 2170bacd6..22be3224a 100644
--- a/maps/IcePathB2FBlackthornSide.asm
+++ b/maps/IcePathB2FBlackthornSide.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL
 
 IcePathB2FBlackthornSide_MapScripts:
diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm
index 05f9ee3ec..c0299be4b 100644
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ICEPATHB2FMAHOGANYSIDE_BOULDER1
 	const ICEPATHB2FMAHOGANYSIDE_BOULDER2
 	const ICEPATHB2FMAHOGANYSIDE_BOULDER3
diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm
index 8e93a991c..b6234ffdb 100644
--- a/maps/IcePathB3F.asm
+++ b/maps/IcePathB3F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ICEPATHB3F_POKE_BALL
 	const ICEPATHB3F_ROCK
 
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index 17190a96c..840c7094e 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ILEXFOREST_FARFETCHD
 	const ILEXFOREST_YOUNGSTER1
 	const ILEXFOREST_BLACK_BELT
diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm
index 8f64f2794..3c403c33f 100644
--- a/maps/IlexForestAzaleaGate.asm
+++ b/maps/IlexForestAzaleaGate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ILEXFORESTAZALEAGATE_OFFICER
 	const ILEXFORESTAZALEAGATE_GRANNY
 
diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm
index 702f9692b..49c661f95 100644
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const INDIGOPLATEAUPOKECENTER1F_NURSE
 	const INDIGOPLATEAUPOKECENTER1F_CLERK
 	const INDIGOPLATEAUPOKECENTER1F_COOLTRAINER_M
diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
index 3b9ff0d3a..cb06c84d7 100644
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const KARENSROOM_KAREN
 
 KarensRoom_MapScripts:
diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
index 9c88d1a2c..193ffe768 100644
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const KOGASROOM_KOGA
 
 KogasRoom_MapScripts:
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index fe04823d8..e150d2395 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const KURTSHOUSE_KURT1
 	const KURTSHOUSE_TWIN1
 	const KURTSHOUSE_SLOWPOKE
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm
index 2630738b9..10e6d2c3e 100644
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const LAKEOFRAGE_LANCE
 	const LAKEOFRAGE_GRAMPS
 	const LAKEOFRAGE_SUPER_NERD1
diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm
index 4fa55dd54..de5294793 100644
--- a/maps/LakeOfRageHiddenPowerHouse.asm
+++ b/maps/LakeOfRageHiddenPowerHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER
 
 LakeOfRageHiddenPowerHouse_MapScripts:
diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm
index c5e05a423..683caae26 100644
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU
 
 LakeOfRageMagikarpHouse_MapScripts:
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index 657a45942..13c95305b 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const LANCESROOM_LANCE
 	const LANCESROOM_MARY
 	const LANCESROOM_OAK
diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm
index 1b2a302e7..6787d7889 100644
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const LAVRADIOTOWER1F_RECEPTIONIST
 	const LAVRADIOTOWER1F_OFFICER
 	const LAVRADIOTOWER1F_SUPER_NERD1
diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm
index cdbb7e8cb..41a9b9291 100644
--- a/maps/LavenderMart.asm
+++ b/maps/LavenderMart.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const LAVENDERMART_CLERK
 	const LAVENDERMART_POKEFAN_M
 	const LAVENDERMART_ROCKER
diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm
index d0fe4aff5..10da518dd 100644
--- a/maps/LavenderNameRater.asm
+++ b/maps/LavenderNameRater.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const LAVENDERNAMERATER_NAME_RATER
 
 LavenderNameRater_MapScripts:
diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm
index 250d6e98f..33c910a16 100644
--- a/maps/LavenderPokecenter1F.asm
+++ b/maps/LavenderPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const LAVENDERPOKECENTER1F_NURSE
 	const LAVENDERPOKECENTER1F_GENTLEMAN
 	const LAVENDERPOKECENTER1F_TEACHER
diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm
index d020861ac..8c036236d 100644
--- a/maps/LavenderSpeechHouse.asm
+++ b/maps/LavenderSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const LAVENDERSPEECHHOUSE_POKEFAN_F
 
 LavenderSpeechHouse_MapScripts:
diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm
index 94075b2c2..6a43962d9 100644
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const LAVENDERTOWN_POKEFAN_M
 	const LAVENDERTOWN_TEACHER
 	const LAVENDERTOWN_GRAMPS
diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm
index 860e54c1c..34512ea99 100644
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const MAHOGANYGYM_PRYCE
 	const MAHOGANYGYM_BUENA1
 	const MAHOGANYGYM_ROCKER1
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index 09748c48e..9a1da5330 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const MAHOGANYMART1F_PHARMACIST
 	const MAHOGANYMART1F_BLACK_BELT
 	const MAHOGANYMART1F_LANCE
diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm
index 4a2a32f26..f7be3cde7 100644
--- a/maps/MahoganyPokecenter1F.asm
+++ b/maps/MahoganyPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const MAHOGANYPOKECENTER1F_NURSE
 	const MAHOGANYPOKECENTER1F_POKEFAN_M
 	const MAHOGANYPOKECENTER1F_YOUNGSTER
diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm
index fd4734de7..c80c902f7 100644
--- a/maps/MahoganyRedGyaradosSpeechHouse.asm
+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const MAHOGANYREDGYARADOSSPEECHHOUSE_BLACK_BELT
 	const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER
 
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index c33ec64ba..ac5639ebc 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const MAHOGANYTOWN_POKEFAN_M
 	const MAHOGANYTOWN_GRAMPS
 	const MAHOGANYTOWN_FISHER
diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm
index 502aad783..5bef1bf6f 100644
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const MANIASHOUSE_ROCKER
 
 ManiasHouse_MapScripts:
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index 5b978bc0e..1c00e6dbf 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const MOUNTMOON_SILVER
 
 MountMoon_MapScripts:
diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm
index 7188a7c00..be6a195ac 100644
--- a/maps/MountMoonGiftShop.asm
+++ b/maps/MountMoonGiftShop.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const MOUNTMOONGIFTSHOP_GRAMPS1 ; morning only
 	const MOUNTMOONGIFTSHOP_GRAMPS2 ; day only
 	const MOUNTMOONGIFTSHOP_LASS1 ; morning only
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index b12e7b391..e264bb1eb 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const MOUNTMOONSQUARE_FAIRY1
 	const MOUNTMOONSQUARE_FAIRY2
 	const MOUNTMOONSQUARE_ROCK
diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm
index 30b59906a..24074d061 100644
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const MOUNTMORTAR1FINSIDE_BOULDER
 	const MOUNTMORTAR1FINSIDE_POKE_BALL1
 	const MOUNTMORTAR1FINSIDE_POKE_BALL2
diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm
index cb9518c3a..8c3c63164 100644
--- a/maps/MountMortar1FOutside.asm
+++ b/maps/MountMortar1FOutside.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const MOUNTMORTAR1FOUTSIDE_POKE_BALL1
 	const MOUNTMORTAR1FOUTSIDE_POKE_BALL2
 
diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm
index c0bf05700..7f70c89aa 100644
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const MOUNTMORTAR2FINSIDE_POKE_BALL1
 	const MOUNTMORTAR2FINSIDE_POKE_BALL2
 	const MOUNTMORTAR2FINSIDE_POKE_BALL3
diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm
index 1aa27592e..de30974ad 100644
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const MOUNTMORTARB1F_POKE_BALL1
 	const MOUNTMORTARB1F_POKE_BALL2
 	const MOUNTMORTARB1F_BOULDER
diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm
index 743acf816..e61ba452e 100644
--- a/maps/MoveDeletersHouse.asm
+++ b/maps/MoveDeletersHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const MOVEDELETERSHOUSE_SUPER_NERD
 
 MoveDeletersHouse_MapScripts:
diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm
index 881487ff6..9ed6bd18e 100644
--- a/maps/MrFujisHouse.asm
+++ b/maps/MrFujisHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const MRFUJISHOUSE_SUPER_NERD
 	const MRFUJISHOUSE_LASS
 	const MRFUJISHOUSE_PSYDUCK
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index 4a4249cc5..c23deb54f 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const MRPOKEMONSHOUSE_GENTLEMAN
 	const MRPOKEMONSHOUSE_OAK
 
diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm
index b79c08b6e..75c7f6a59 100644
--- a/maps/MrPsychicsHouse.asm
+++ b/maps/MrPsychicsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const MRPSYCHICSHOUSE_FISHING_GURU
 
 MrPsychicsHouse_MapScripts:
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index 095324ea5..6118f507c 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const NATIONALPARK_LASS1
 	const NATIONALPARK_POKEFAN_F1
 	const NATIONALPARK_TEACHER1
diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm
index e52e0c71a..616446d9a 100644
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const NATIONALPARKBUGCONTEST_YOUNGSTER1
 	const NATIONALPARKBUGCONTEST_YOUNGSTER2
 	const NATIONALPARKBUGCONTEST_ROCKER
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index 985f7e4cf..40b241392 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const NEWBARKTOWN_TEACHER
 	const NEWBARKTOWN_FISHER
 	const NEWBARKTOWN_SILVER
diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm
index bf505711e..913128d75 100644
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const OAKSLAB_OAK
 	const OAKSLAB_SCIENTIST1
 	const OAKSLAB_SCIENTIST2
diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm
index f651f0e97..0128a216b 100644
--- a/maps/OlivineCafe.asm
+++ b/maps/OlivineCafe.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const OLIVINECAFE_SAILOR1
 	const OLIVINECAFE_FISHING_GURU
 	const OLIVINECAFE_SAILOR2
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index 8c418d99d..e44801fa8 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const OLIVINECITY_SAILOR1
 	const OLIVINECITY_STANDING_YOUNGSTER
 	const OLIVINECITY_SAILOR2
diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm
index 8bee6f363..3134ac531 100644
--- a/maps/OlivineGoodRodHouse.asm
+++ b/maps/OlivineGoodRodHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const OLIVINEGOODRODHOUSE_FISHING_GURU
 
 OlivineGoodRodHouse_MapScripts:
diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm
index e8ab40213..01ac72662 100644
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const OLIVINEGYM_JASMINE
 	const OLIVINEGYM_GYM_GUY
 
diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm
index 3297736e6..5cdebfef2 100644
--- a/maps/OlivineHouseBeta.asm
+++ b/maps/OlivineHouseBeta.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const OLIVINEHOUSEBETA_TEACHER
 	const OLIVINEHOUSEBETA_RHYDON
 
diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm
index bc09e9ef4..f8da48801 100644
--- a/maps/OlivineLighthouse1F.asm
+++ b/maps/OlivineLighthouse1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const OLIVINELIGHTHOUSE1F_SAILOR
 	const OLIVINELIGHTHOUSE1F_POKEFAN_F
 
diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm
index 2bc489c57..f1e087d50 100644
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const OLIVINELIGHTHOUSE2F_SAILOR
 	const OLIVINELIGHTHOUSE2F_GENTLEMAN
 
diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm
index 1a02febe8..55211a8c7 100644
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const OLIVINELIGHTHOUSE3F_SAILOR
 	const OLIVINELIGHTHOUSE3F_GENTLEMAN
 	const OLIVINELIGHTHOUSE3F_YOUNGSTER
diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm
index 21f59b17a..db4eb73ac 100644
--- a/maps/OlivineLighthouse4F.asm
+++ b/maps/OlivineLighthouse4F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const OLIVINELIGHTHOUSE4F_SAILOR
 	const OLIVINELIGHTHOUSE4F_LASS
 
diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm
index 792f77132..77c155eb1 100644
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const OLIVINELIGHTHOUSE5F_SAILOR
 	const OLIVINELIGHTHOUSE5F_YOUNGSTER
 	const OLIVINELIGHTHOUSE5F_POKE_BALL1
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index 9c2620eb5..b644924b2 100644
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const OLIVINELIGHTHOUSE6F_JASMINE
 	const OLIVINELIGHTHOUSE6F_MONSTER
 	const OLIVINELIGHTHOUSE6F_POKE_BALL
diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm
index ff4ed669a..36c0bd826 100644
--- a/maps/OlivineMart.asm
+++ b/maps/OlivineMart.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const OLIVINEMART_CLERK
 	const OLIVINEMART_COOLTRAINER_F
 	const OLIVINEMART_LASS
diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm
index 16a774912..ff9bbcc98 100644
--- a/maps/OlivinePokecenter1F.asm
+++ b/maps/OlivinePokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const OLIVINEPOKECENTER1F_NURSE
 	const OLIVINEPOKECENTER1F_FISHING_GURU
 	const OLIVINEPOKECENTER1F_FISHER
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index ce949a4ba..e6b74b315 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const OLIVINEPORT_SAILOR1
 	const OLIVINEPORT_SAILOR2
 	const OLIVINEPORT_SAILOR3
diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm
index 2d8cf9e55..913dad068 100644
--- a/maps/OlivinePortPassage.asm
+++ b/maps/OlivinePortPassage.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const OLIVINEPORTPASSAGE_POKEFAN_M
 
 OlivinePortPassage_MapScripts:
diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm
index 6133c8f53..1989e222b 100644
--- a/maps/OlivinePunishmentSpeechHouse.asm
+++ b/maps/OlivinePunishmentSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const OLIVINEPUNISHMENTSPEECHHOUSE_POKEFAN_M
 	const OLIVINEPUNISHMENTSPEECHHOUSE_LASS
 
diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm
index 0038bf6b9..497e60f07 100644
--- a/maps/OlivineTimsHouse.asm
+++ b/maps/OlivineTimsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const OLIVINETIMSHOUSE_TIM
 
 OlivineTimsHouse_MapScripts:
diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm
index 80601f222..90ca2bbb4 100644
--- a/maps/PalletTown.asm
+++ b/maps/PalletTown.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const PALLETTOWN_TEACHER
 	const PALLETTOWN_FISHER
 
diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm
index 1008bf2fa..71e7e642e 100644
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const PEWTERCITY_COOLTRAINER_F
 	const PEWTERCITY_BUG_CATCHER
 	const PEWTERCITY_GRAMPS
diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm
index 0fa0bcc13..17e634a34 100644
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const PEWTERGYM_BROCK
 	const PEWTERGYM_YOUNGSTER
 	const PEWTERGYM_GYM_GUY
diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm
index f4aa7614e..8445f0340 100644
--- a/maps/PewterMart.asm
+++ b/maps/PewterMart.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const PEWTERMART_CLERK
 	const PEWTERMART_YOUNGSTER
 	const PEWTERMART_SUPER_NERD
diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm
index 4f4424e9e..ffa5fa414 100644
--- a/maps/PewterNidoranSpeechHouse.asm
+++ b/maps/PewterNidoranSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const PEWTERNIDORANSPEECHHOUSE_SUPER_NERD
 	const PEWTERNIDORANSPEECHHOUSE_NIDORAN_M
 
diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm
index 1948928b6..dcfa043d4 100644
--- a/maps/PewterPokecenter1F.asm
+++ b/maps/PewterPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const PEWTERPOKECENTER1F_NURSE
 	const PEWTERPOKECENTER1F_TEACHER
 	const PEWTERPOKECENTER1F_JIGGLYPUFF
diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm
index 4e76da519..2229b884d 100644
--- a/maps/PewterSnoozeSpeechHouse.asm
+++ b/maps/PewterSnoozeSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const PEWTERSNOOZESPEECHHOUSE_GRAMPS
 
 PewterSnoozeSpeechHouse_MapScripts:
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index 5ac942d53..39400f2cc 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const PLAYERSHOUSE1F_MOM1
 	const PLAYERSHOUSE1F_MOM2
 	const PLAYERSHOUSE1F_MOM3
diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm
index 011fbbd0c..2e3683600 100644
--- a/maps/PlayersHouse2F.asm
+++ b/maps/PlayersHouse2F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const PLAYERSHOUSE2F_CONSOLE
 	const PLAYERSHOUSE2F_DOLL_1
 	const PLAYERSHOUSE2F_DOLL_2
diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm
index 514802636..196fc9fe6 100644
--- a/maps/PlayersNeighborsHouse.asm
+++ b/maps/PlayersNeighborsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const PLAYERSNEIGHBORSHOUSE_COOLTRAINER_F
 	const PLAYERSNEIGHBORSHOUSE_POKEFAN_F
 
diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm
index bef008511..ecbff92aa 100644
--- a/maps/PokeSeersHouse.asm
+++ b/maps/PokeSeersHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const POKESEERSHOUSE_GRANNY
 
 PokeSeersHouse_MapScripts:
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 05b3ca63a..21bedbac5 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const POKECENTER2F_TRADE_RECEPTIONIST
 	const POKECENTER2F_BATTLE_RECEPTIONIST
 	const POKECENTER2F_TIME_CAPSULE_RECEPTIONIST
diff --git a/maps/PokecomCenterAdminRoomMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm
index 5af6eed77..873057f13 100644
--- a/maps/PokecomCenterAdminRoomMobile.asm
+++ b/maps/PokecomCenterAdminRoomMobile.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const POKECOMCENTERADMINROOMMOBILE_SCIENTIST1
 	const POKECOMCENTERADMINROOMMOBILE_SCIENTIST2
 	const POKECOMCENTERADMINROOMMOBILE_SCIENTIST3
diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm
index 78bd8607a..8d14c094f 100644
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const POKEMONFANCLUB_GENTLEMAN
 	const POKEMONFANCLUB_RECEPTIONIST
 	const POKEMONFANCLUB_FISHER
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index fdc17e2a4..30fab8d5b 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const POWERPLANT_OFFICER1
 	const POWERPLANT_GYM_GUY1
 	const POWERPLANT_GYM_GUY2
diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm
index 73fee4d01..5f89c1118 100644
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const RADIOTOWER1F_RECEPTIONIST
 	const RADIOTOWER1F_LASS
 	const RADIOTOWER1F_YOUNGSTER
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
index aefb31799..5a590f02b 100644
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const RADIOTOWER2F_SUPER_NERD
 	const RADIOTOWER2F_TEACHER
 	const RADIOTOWER2F_ROCKET1
diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm
index 64d5a7ec5..126538721 100644
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const RADIOTOWER3F_SUPER_NERD
 	const RADIOTOWER3F_GYM_GUY
 	const RADIOTOWER3F_COOLTRAINER_F
diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm
index 3167b3c7b..21299684a 100644
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const RADIOTOWER4F_FISHER
 	const RADIOTOWER4F_TEACHER
 	const RADIOTOWER4F_GROWLITHE
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index efc0e3cef..2cfc77eea 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const RADIOTOWER5F_DIRECTOR
 	const RADIOTOWER5F_ROCKET
 	const RADIOTOWER5F_ROCKET_GIRL
diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm
index 4c7f1addf..e18f0dc87 100644
--- a/maps/RedsHouse1F.asm
+++ b/maps/RedsHouse1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const REDSHOUSE1F_REDS_MOM
 
 RedsHouse1F_MapScripts:
diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm
index 6b8a8fe35..ea80ca780 100644
--- a/maps/RockTunnel1F.asm
+++ b/maps/RockTunnel1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROCKTUNNEL1F_POKE_BALL1
 	const ROCKTUNNEL1F_POKE_BALL2
 
diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm
index 799e31fc8..47090d74c 100644
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROCKTUNNELB1F_POKE_BALL1
 	const ROCKTUNNELB1F_POKE_BALL2
 	const ROCKTUNNELB1F_POKE_BALL3
diff --git a/maps/Route1.asm b/maps/Route1.asm
index 834605d8a..68b96f274 100644
--- a/maps/Route1.asm
+++ b/maps/Route1.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE1_YOUNGSTER
 	const ROUTE1_COOLTRAINER_F
 	const ROUTE1_FRUIT_TREE
diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm
index 6e33641a9..54d489b59 100644
--- a/maps/Route10Pokecenter1F.asm
+++ b/maps/Route10Pokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE10POKECENTER1F_NURSE
 	const ROUTE10POKECENTER1F_GENTLEMAN
 	const ROUTE10POKECENTER1F_GYM_GUY
diff --git a/maps/Route10South.asm b/maps/Route10South.asm
index f5946ea74..de5b899d0 100644
--- a/maps/Route10South.asm
+++ b/maps/Route10South.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE10SOUTH_POKEFAN_M1
 	const ROUTE10SOUTH_POKEFAN_M2
 
diff --git a/maps/Route11.asm b/maps/Route11.asm
index 1e7f9d7c7..c2c5c3912 100644
--- a/maps/Route11.asm
+++ b/maps/Route11.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE11_YOUNGSTER1
 	const ROUTE11_YOUNGSTER2
 	const ROUTE11_YOUNGSTER3
diff --git a/maps/Route12.asm b/maps/Route12.asm
index 78671620c..955f2803a 100644
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE12_FISHER1
 	const ROUTE12_FISHER2
 	const ROUTE12_FISHER3
diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm
index 0c41049e5..5599ebe18 100644
--- a/maps/Route12SuperRodHouse.asm
+++ b/maps/Route12SuperRodHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE12SUPERRODHOUSE_FISHING_GURU
 
 Route12SuperRodHouse_MapScripts:
diff --git a/maps/Route13.asm b/maps/Route13.asm
index c97a54830..60a9e7998 100644
--- a/maps/Route13.asm
+++ b/maps/Route13.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE13_YOUNGSTER1
 	const ROUTE13_YOUNGSTER2
 	const ROUTE13_POKEFAN_M1
diff --git a/maps/Route14.asm b/maps/Route14.asm
index aa388dfb9..17d576c17 100644
--- a/maps/Route14.asm
+++ b/maps/Route14.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE14_POKEFAN_M1
 	const ROUTE14_YOUNGSTER
 	const ROUTE14_POKEFAN_M2
diff --git a/maps/Route15.asm b/maps/Route15.asm
index 39737342e..1d855de73 100644
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE15_YOUNGSTER1
 	const ROUTE15_YOUNGSTER2
 	const ROUTE15_YOUNGSTER3
diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm
index 3d31256f7..59fbf8c78 100644
--- a/maps/Route15FuchsiaGate.asm
+++ b/maps/Route15FuchsiaGate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE15FUCHSIAGATE_OFFICER
 
 Route15FuchsiaGate_MapScripts:
diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm
index ffac53705..0d3a47d0b 100644
--- a/maps/Route16FuchsiaSpeechHouse.asm
+++ b/maps/Route16FuchsiaSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD
 
 Route16FuchsiaSpeechHouse_MapScripts:
diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm
index 9bfbce366..b42875e79 100644
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE16GATE_OFFICER
 
 Route16Gate_MapScripts:
diff --git a/maps/Route17.asm b/maps/Route17.asm
index 5fe83bd41..34c150bac 100644
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE17_BIKER1
 	const ROUTE17_BIKER2
 	const ROUTE17_BIKER3
diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm
index 5b863d524..c778c4c11 100644
--- a/maps/Route17Route18Gate.asm
+++ b/maps/Route17Route18Gate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE17ROUTE18GATE_OFFICER
 
 Route17Route18Gate_MapScripts:
diff --git a/maps/Route18.asm b/maps/Route18.asm
index 51dee07e9..d6b858bc6 100644
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE18_YOUNGSTER1
 	const ROUTE18_YOUNGSTER2
 
diff --git a/maps/Route19.asm b/maps/Route19.asm
index 123da8374..3d1d7fbb8 100644
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE19_SWIMMER_GIRL
 	const ROUTE19_SWIMMER_GUY1
 	const ROUTE19_SWIMMER_GUY2
diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm
index ea0a5fa04..9357f6efe 100644
--- a/maps/Route19FuchsiaGate.asm
+++ b/maps/Route19FuchsiaGate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE19FUCHSIAGATE_OFFICER
 
 Route19FuchsiaGate_MapScripts:
diff --git a/maps/Route2.asm b/maps/Route2.asm
index 04e11f88b..694a5feec 100644
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE2_BUG_CATCHER1
 	const ROUTE2_BUG_CATCHER2
 	const ROUTE2_BUG_CATCHER3
diff --git a/maps/Route20.asm b/maps/Route20.asm
index da7900400..3ffc6a6a8 100644
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE20_SWIMMER_GIRL1
 	const ROUTE20_SWIMMER_GIRL2
 	const ROUTE20_SWIMMER_GUY
diff --git a/maps/Route21.asm b/maps/Route21.asm
index e7bee259d..b6bc080f8 100644
--- a/maps/Route21.asm
+++ b/maps/Route21.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE21_SWIMMER_GIRL
 	const ROUTE21_SWIMMER_GUY
 	const ROUTE21_FISHER
diff --git a/maps/Route24.asm b/maps/Route24.asm
index ada8cdab1..6ad4d81ec 100644
--- a/maps/Route24.asm
+++ b/maps/Route24.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE24_ROCKET
 
 Route24_MapScripts:
diff --git a/maps/Route25.asm b/maps/Route25.asm
index b27472063..a0cc96cbd 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE25_MISTY
 	const ROUTE25_COOLTRAINER_M1
 	const ROUTE25_YOUNGSTER1
diff --git a/maps/Route26.asm b/maps/Route26.asm
index 332e361b3..ae2010817 100644
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE26_COOLTRAINER_M1
 	const ROUTE26_COOLTRAINER_M2
 	const ROUTE26_COOLTRAINER_F1
diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm
index 453ec4693..b85d9820d 100644
--- a/maps/Route26HealHouse.asm
+++ b/maps/Route26HealHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE26HEALHOUSE_TEACHER
 
 Route26HealHouse_MapScripts:
diff --git a/maps/Route27.asm b/maps/Route27.asm
index d7c02cb3b..5ecaf3db2 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE27_COOLTRAINER_M1
 	const ROUTE27_COOLTRAINER_M2
 	const ROUTE27_COOLTRAINER_F1
diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm
index cd78cb62c..1007e9074 100644
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE27SANDSTORMHOUSE_GRANNY
 
 Route27SandstormHouse_MapScripts:
diff --git a/maps/Route28SteelWingHouse.asm b/maps/Route28SteelWingHouse.asm
index b3c7856bb..0d1cae45b 100644
--- a/maps/Route28SteelWingHouse.asm
+++ b/maps/Route28SteelWingHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE28STEELWINGHOUSE_CELEBRITY
 	const ROUTE28STEELWINGHOUSE_FEAROW
 
diff --git a/maps/Route29.asm b/maps/Route29.asm
index 66b761e2a..63bd7b7be 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE29_COOLTRAINER_M1
 	const ROUTE29_YOUNGSTER
 	const ROUTE29_TEACHER1
diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm
index ec28965b8..15e5bbb8e 100644
--- a/maps/Route29Route46Gate.asm
+++ b/maps/Route29Route46Gate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE29ROUTE46GATE_OFFICER
 	const ROUTE29ROUTE46GATE_YOUNGSTER
 
diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm
index d3626f169..7a80d9424 100644
--- a/maps/Route2Gate.asm
+++ b/maps/Route2Gate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE2GATE_SCIENTIST
 
 Route2Gate_MapScripts:
diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm
index 451d9d177..58e862beb 100644
--- a/maps/Route2NuggetHouse.asm
+++ b/maps/Route2NuggetHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE2NUGGETHOUSE_FISHER
 
 Route2NuggetHouse_MapScripts:
diff --git a/maps/Route3.asm b/maps/Route3.asm
index 65c8a35d2..b77d3d5df 100644
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE3_FISHER1
 	const ROUTE3_YOUNGSTER1
 	const ROUTE3_YOUNGSTER2
diff --git a/maps/Route30.asm b/maps/Route30.asm
index 78d41fac8..fa8448aa6 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE30_YOUNGSTER1
 	const ROUTE30_YOUNGSTER2
 	const ROUTE30_YOUNGSTER3
diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm
index a6586ce6a..3baad0209 100644
--- a/maps/Route30BerryHouse.asm
+++ b/maps/Route30BerryHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE30BERRYHOUSE_POKEFAN_M
 
 Route30BerryHouse_MapScripts:
diff --git a/maps/Route31.asm b/maps/Route31.asm
index 0d774ebdb..e30e56600 100644
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE31_FISHER
 	const ROUTE31_YOUNGSTER
 	const ROUTE31_BUG_CATCHER
diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm
index a85a0bc44..4a3912567 100644
--- a/maps/Route31VioletGate.asm
+++ b/maps/Route31VioletGate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE31VIOLETGATE_OFFICER
 	const ROUTE31VIOLETGATE_COOLTRAINER_F
 
diff --git a/maps/Route32.asm b/maps/Route32.asm
index 00d1bc473..54fa28ddd 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE32_FISHER1
 	const ROUTE32_FISHER2
 	const ROUTE32_FISHER3
diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm
index 3c852bff5..186fe7934 100644
--- a/maps/Route32Pokecenter1F.asm
+++ b/maps/Route32Pokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE32POKECENTER1F_NURSE
 	const ROUTE32POKECENTER1F_FISHING_GURU
 	const ROUTE32POKECENTER1F_COOLTRAINER_F
diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm
index b2b6af2d0..c35c5a752 100644
--- a/maps/Route32RuinsOfAlphGate.asm
+++ b/maps/Route32RuinsOfAlphGate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE32RUINSOFALPHGATE_OFFICER
 	const ROUTE32RUINSOFALPHGATE_POKEFAN_M
 	const ROUTE32RUINSOFALPHGATE_YOUNGSTER
diff --git a/maps/Route33.asm b/maps/Route33.asm
index 5993e361a..d54b01f81 100644
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE33_POKEFAN_M
 	const ROUTE33_LASS
 	const ROUTE33_FRUIT_TREE
diff --git a/maps/Route34.asm b/maps/Route34.asm
index 178694c68..ba757f877 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE34_YOUNGSTER1
 	const ROUTE34_YOUNGSTER2
 	const ROUTE34_YOUNGSTER3
diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
index f73e488bc..7d885a569 100644
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE34ILEXFORESTGATE_TEACHER1
 	const ROUTE34ILEXFORESTGATE_BUTTERFREE
 	const ROUTE34ILEXFORESTGATE_LASS
diff --git a/maps/Route35.asm b/maps/Route35.asm
index 6bfeff6da..a73738072 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE35_YOUNGSTER1
 	const ROUTE35_YOUNGSTER2
 	const ROUTE35_LASS1
diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm
index 386ac66fe..f09ad646f 100644
--- a/maps/Route35GoldenrodGate.asm
+++ b/maps/Route35GoldenrodGate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE35GOLDENRODGATE_OFFICER
 	const ROUTE35GOLDENRODGATE_POKEFAN_F
 	const ROUTE35GOLDENRODGATE_FISHER
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index 8be5b768a..94eca4488 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE35NATIONALPARKGATE_OFFICER1
 	const ROUTE35NATIONALPARKGATE_YOUNGSTER
 	const ROUTE35NATIONALPARKGATE_OFFICER2
diff --git a/maps/Route36.asm b/maps/Route36.asm
index d62e7ebd1..3cfbd4df5 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE36_YOUNGSTER1
 	const ROUTE36_YOUNGSTER2
 	const ROUTE36_WEIRD_TREE
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index a635fd8a7..cf1e0b798 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE36NATIONALPARKGATE_OFFICER1
 	const ROUTE36NATIONALPARKGATE_YOUNGSTER1
 	const ROUTE36NATIONALPARKGATE_YOUNGSTER2
diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm
index acea3628c..0f5519d9e 100644
--- a/maps/Route36RuinsOfAlphGate.asm
+++ b/maps/Route36RuinsOfAlphGate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE36RUINSOFALPHGATE_OFFICER
 	const ROUTE36RUINSOFALPHGATE_GRAMPS
 
diff --git a/maps/Route37.asm b/maps/Route37.asm
index 0a875ecec..7712903a6 100644
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE37_WEIRD_TREE1
 	const ROUTE37_WEIRD_TREE2
 	const ROUTE37_YOUNGSTER
diff --git a/maps/Route38.asm b/maps/Route38.asm
index e1102333a..cda7a868b 100644
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE38_STANDING_YOUNGSTER1
 	const ROUTE38_LASS
 	const ROUTE38_STANDING_YOUNGSTER2
diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm
index adf5419d3..f9912b625 100644
--- a/maps/Route38EcruteakGate.asm
+++ b/maps/Route38EcruteakGate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE38ECRUTEAKGATE_OFFICER
 
 Route38EcruteakGate_MapScripts:
diff --git a/maps/Route39.asm b/maps/Route39.asm
index 4e3b35067..4af19cb69 100644
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE39_SAILOR
 	const ROUTE39_POKEFAN_M
 	const ROUTE39_POKEFAN_F1
diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm
index 103d924e6..7a41f9086 100644
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE39BARN_TWIN1
 	const ROUTE39BARN_TWIN2
 	const ROUTE39BARN_MOOMOO
diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm
index 96a19b608..d2622a4bf 100644
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE39FARMHOUSE_POKEFAN_M
 	const ROUTE39FARMHOUSE_POKEFAN_F
 
diff --git a/maps/Route4.asm b/maps/Route4.asm
index 5662ec516..61f245289 100644
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE4_YOUNGSTER
 	const ROUTE4_LASS1
 	const ROUTE4_LASS2
diff --git a/maps/Route40.asm b/maps/Route40.asm
index 53ce2f959..780a7ca86 100644
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE40_OLIVINE_RIVAL1
 	const ROUTE40_OLIVINE_RIVAL2
 	const ROUTE40_SWIMMER_GIRL1
diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm
index d30401714..98ce051bf 100644
--- a/maps/Route40BattleTowerGate.asm
+++ b/maps/Route40BattleTowerGate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE40BATTLETOWERGATE_ROCKER
 	const ROUTE40BATTLETOWERGATE_TWIN
 
diff --git a/maps/Route41.asm b/maps/Route41.asm
index 4307ff3b4..5da9216fb 100644
--- a/maps/Route41.asm
+++ b/maps/Route41.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE41_OLIVINE_RIVAL1
 	const ROUTE41_OLIVINE_RIVAL2
 	const ROUTE41_OLIVINE_RIVAL3
diff --git a/maps/Route42.asm b/maps/Route42.asm
index 92f28fc22..f86a091ce 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE42_FISHER
 	const ROUTE42_POKEFAN_M
 	const ROUTE42_SUPER_NERD
diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm
index 2417cd0d8..4a15d5042 100644
--- a/maps/Route42EcruteakGate.asm
+++ b/maps/Route42EcruteakGate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE42ECRUTEAKGATE_OFFICER
 
 Route42EcruteakGate_MapScripts:
diff --git a/maps/Route43.asm b/maps/Route43.asm
index 0958475db..229cf419e 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE43_SUPER_NERD1
 	const ROUTE43_SUPER_NERD2
 	const ROUTE43_SUPER_NERD3
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index 886768431..b244ea2aa 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -1,6 +1,6 @@
 ROUTE43GATE_TOLL EQU 1000
 
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE43GATE_OFFICER
 	const ROUTE43GATE_ROCKET1
 	const ROUTE43GATE_ROCKET2
diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm
index 0f5243349..0aa77bd26 100644
--- a/maps/Route43MahoganyGate.asm
+++ b/maps/Route43MahoganyGate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE43MAHOGANYGATE_OFFICER
 
 Route43MahoganyGate_MapScripts:
diff --git a/maps/Route44.asm b/maps/Route44.asm
index 4b3a188cc..c088cd087 100644
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE44_FISHER1
 	const ROUTE44_FISHER2
 	const ROUTE44_YOUNGSTER1
diff --git a/maps/Route45.asm b/maps/Route45.asm
index f5d1c9e9b..6c83d67a1 100644
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE45_POKEFAN_M1
 	const ROUTE45_POKEFAN_M2
 	const ROUTE45_POKEFAN_M3
diff --git a/maps/Route46.asm b/maps/Route46.asm
index 9e4b04f08..f464b3257 100644
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE46_POKEFAN_M
 	const ROUTE46_YOUNGSTER
 	const ROUTE46_LASS
diff --git a/maps/Route5.asm b/maps/Route5.asm
index a53bb0f3c..e7d99d930 100644
--- a/maps/Route5.asm
+++ b/maps/Route5.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE5_POKEFAN_M
 
 Route5_MapScripts:
diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm
index dc6edf16c..e91c46ab3 100644
--- a/maps/Route5CleanseTagHouse.asm
+++ b/maps/Route5CleanseTagHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE5CLEANSETAGHOUSE_GRANNY
 	const ROUTE5CLEANSETAGHOUSE_TEACHER
 
diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm
index c10a35d75..d6ac38aa8 100644
--- a/maps/Route5SaffronGate.asm
+++ b/maps/Route5SaffronGate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE5SAFFRONGATE_OFFICER
 
 Route5SaffronGate_MapScripts:
diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm
index 39013b51d..fd16ea861 100644
--- a/maps/Route5UndergroundPathEntrance.asm
+++ b/maps/Route5UndergroundPathEntrance.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE5UNDERGROUNDPATHENTRANCE_TEACHER
 
 Route5UndergroundPathEntrance_MapScripts:
diff --git a/maps/Route6.asm b/maps/Route6.asm
index fb00e641e..aa6101c20 100644
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE6_POKEFAN_M1
 	const ROUTE6_POKEFAN_M2
 	const ROUTE6_POKEFAN_M3
diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm
index dfc8590e8..8fa0197ca 100644
--- a/maps/Route6SaffronGate.asm
+++ b/maps/Route6SaffronGate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE6SAFFRONGATE_OFFICER
 
 Route6SaffronGate_MapScripts:
diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm
index 57b8ff6cc..9d9144994 100644
--- a/maps/Route7SaffronGate.asm
+++ b/maps/Route7SaffronGate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE7SAFFRONGATE_OFFICER
 
 Route7SaffronGate_MapScripts:
diff --git a/maps/Route8.asm b/maps/Route8.asm
index e66a06a83..5f0a4c44f 100644
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE8_BIKER1
 	const ROUTE8_BIKER2
 	const ROUTE8_BIKER3
diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm
index beb0da6a5..a9bce58d3 100644
--- a/maps/Route8SaffronGate.asm
+++ b/maps/Route8SaffronGate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE8SAFFRONGATE_OFFICER
 
 Route8SaffronGate_MapScripts:
diff --git a/maps/Route9.asm b/maps/Route9.asm
index d25430d27..251c8cc1d 100644
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const ROUTE9_YOUNGSTER1
 	const ROUTE9_LASS1
 	const ROUTE9_YOUNGSTER2
diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm
index b5a43250d..c44e87ce8 100644
--- a/maps/RuinsOfAlphAerodactylItemRoom.asm
+++ b/maps/RuinsOfAlphAerodactylItemRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL1
 	const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL2
 	const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL3
diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm
index 94ae48fd7..50ef6843f 100644
--- a/maps/RuinsOfAlphHoOhItemRoom.asm
+++ b/maps/RuinsOfAlphHoOhItemRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const RUINSOFALPHHOOHITEMROOM_POKE_BALL1
 	const RUINSOFALPHHOOHITEMROOM_POKE_BALL2
 	const RUINSOFALPHHOOHITEMROOM_POKE_BALL3
diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm
index ff9130613..10ca74514 100644
--- a/maps/RuinsOfAlphInnerChamber.asm
+++ b/maps/RuinsOfAlphInnerChamber.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const RUINSOFALPHINNERCHAMBER_FISHER
 	const RUINSOFALPHINNERCHAMBER_TEACHER
 	const RUINSOFALPHINNERCHAMBER_GRAMPS
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index 449fdaaaf..b47a1a885 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const RUINSOFALPHKABUTOCHAMBER_RECEPTIONIST
 	const RUINSOFALPHKABUTOCHAMBER_SCIENTIST
 
diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm
index efd2766db..f63330f59 100644
--- a/maps/RuinsOfAlphKabutoItemRoom.asm
+++ b/maps/RuinsOfAlphKabutoItemRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const RUINSOFALPHKABUTOITEMROOM_POKE_BALL1
 	const RUINSOFALPHKABUTOITEMROOM_POKE_BALL2
 	const RUINSOFALPHKABUTOITEMROOM_POKE_BALL3
diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm
index 376531c07..6a6f8aebf 100644
--- a/maps/RuinsOfAlphOmanyteItemRoom.asm
+++ b/maps/RuinsOfAlphOmanyteItemRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL1
 	const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL2
 	const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL3
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index 068a60a51..149ed48ea 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const RUINSOFALPHOUTSIDE_YOUNGSTER1
 	const RUINSOFALPHOUTSIDE_SCIENTIST
 	const RUINSOFALPHOUTSIDE_FISHER
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index 325f9dd9e..1020865cb 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const RUINSOFALPHRESEARCHCENTER_SCIENTIST1
 	const RUINSOFALPHRESEARCHCENTER_SCIENTIST2
 	const RUINSOFALPHRESEARCHCENTER_SCIENTIST3
diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm
index 2717a0c8d..17e147a7a 100644
--- a/maps/SafariZoneWardensHome.asm
+++ b/maps/SafariZoneWardensHome.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const SAFARIZONEWARDENSHOME_LASS
 
 SafariZoneWardensHome_MapScripts:
diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm
index bca1d0dde..8c4853eda 100644
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const SAFFRONCITY_LASS1
 	const SAFFRONCITY_POKEFAN_M
 	const SAFFRONCITY_COOLTRAINER_M
diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm
index 9cceafe44..a0de9bdee 100644
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const SAFFRONGYM_SABRINA
 	const SAFFRONGYM_GRANNY1
 	const SAFFRONGYM_YOUNGSTER1
diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm
index 69a7a3559..399a30006 100644
--- a/maps/SaffronMagnetTrainStation.asm
+++ b/maps/SaffronMagnetTrainStation.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const SAFFRONMAGNETTRAINSTATION_OFFICER
 	const SAFFRONMAGNETTRAINSTATION_GYM_GUY
 	const SAFFRONMAGNETTRAINSTATION_TEACHER
diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm
index 65fbf100e..f2ffdc078 100644
--- a/maps/SaffronMart.asm
+++ b/maps/SaffronMart.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const SAFFRONMART_CLERK
 	const SAFFRONMART_COOLTRAINER_M
 	const SAFFRONMART_COOLTRAINER_F
diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm
index b72315b15..d28f746e0 100644
--- a/maps/SaffronPokecenter1F.asm
+++ b/maps/SaffronPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const SAFFRONPOKECENTER1F_NURSE
 	const SAFFRONPOKECENTER1F_TEACHER
 	const SAFFRONPOKECENTER1F_FISHER
diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm
index 8931fdf8a..bb845bcea 100644
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const SEAFOAMGYM_BLAINE
 	const SEAFOAMGYM_GYM_GUY
 
diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm
index eefb4d50e..546d168b0 100644
--- a/maps/SilphCo1F.asm
+++ b/maps/SilphCo1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const SILPHCO1F_RECEPTIONIST
 	const SILPHCO1F_OFFICER
 
diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm
index 04574f3c5..66a053415 100644
--- a/maps/SilverCaveItemRooms.asm
+++ b/maps/SilverCaveItemRooms.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const SILVERCAVEITEMROOMS_POKE_BALL1
 	const SILVERCAVEITEMROOMS_POKE_BALL2
 
diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm
index 5ee974367..5bbc5a938 100644
--- a/maps/SilverCavePokecenter1F.asm
+++ b/maps/SilverCavePokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const SILVERCAVEPOKECENTER1F_NURSE
 	const SILVERCAVEPOKECENTER1F_GRANNY
 
diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm
index ada015512..6d1e4a78a 100644
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const SILVERCAVEROOM1_POKE_BALL1
 	const SILVERCAVEROOM1_POKE_BALL2
 	const SILVERCAVEROOM1_POKE_BALL3
diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm
index 0b06f893f..00dc158a5 100644
--- a/maps/SilverCaveRoom2.asm
+++ b/maps/SilverCaveRoom2.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const SILVERCAVEROOM2_POKE_BALL1
 	const SILVERCAVEROOM2_POKE_BALL2
 	const SILVERCAVEROOM2_POKE_BALL3
diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm
index 12f5eeb87..747759765 100644
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const SILVERCAVEROOM3_RED
 
 SilverCaveRoom3_MapScripts:
diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm
index 53531527d..2b5c1e116 100644
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const SLOWPOKEWELLB1F_ROCKET1
 	const SLOWPOKEWELLB1F_ROCKET2
 	const SLOWPOKEWELLB1F_ROCKET3
diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm
index 6f3ca2f54..2fc8f5e6d 100644
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const SLOWPOKEWELLB2F_GYM_GUY
 	const SLOWPOKEWELLB2F_POKE_BALL
 
diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm
index ee4d394e2..48ad6f728 100644
--- a/maps/SoulHouse.asm
+++ b/maps/SoulHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const SOULHOUSE_MRFUJI
 	const SOULHOUSE_TEACHER
 	const SOULHOUSE_LASS
diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm
index 7dd9288a9..1be0f6fb7 100644
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const SPROUTTOWER1F_SAGE1
 	const SPROUTTOWER1F_SAGE2
 	const SPROUTTOWER1F_GRANNY
diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm
index f945086a4..59c59eee1 100644
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const SPROUTTOWER2F_SAGE1
 	const SPROUTTOWER2F_SAGE2
 	const SPROUTTOWER2F_POKE_BALL
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index 4917ad5ad..0c89427b7 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const SPROUTTOWER3F_SAGE1
 	const SPROUTTOWER3F_SAGE2
 	const SPROUTTOWER3F_SAGE3
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index 0e02a0008..9e87b6d69 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const TEAMROCKETBASEB1F_ROCKET1
 	const TEAMROCKETBASEB1F_ROCKET2
 	const TEAMROCKETBASEB1F_SCIENTIST
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 3e8d0688e..27dc7d523 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const TEAMROCKETBASEB2F_ROCKET1
 	const TEAMROCKETBASEB2F_ROCKET_GIRL
 	const TEAMROCKETBASEB2F_LANCE
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index cabae5bd1..21fa5aa9c 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const TEAMROCKETBASEB3F_LANCE
 	const TEAMROCKETBASEB3F_ROCKET1
 	const TEAMROCKETBASEB3F_MOLTRES
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index 1f34782f9..97421a769 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const TIMECAPSULE_CHRIS1
 	const TIMECAPSULE_CHRIS2
 
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index 9956fb9e7..971dfd3f8 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const TINTOWER1F_SUICUNE
 	const TINTOWER1F_RAIKOU
 	const TINTOWER1F_ENTEI
diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm
index f3f8f230b..ecb2a1402 100644
--- a/maps/TinTower3F.asm
+++ b/maps/TinTower3F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const TINTOWER3F_POKE_BALL
 
 TinTower3F_MapScripts:
diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm
index 453e985a0..cbc92ec1c 100644
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const TINTOWER4F_POKE_BALL1
 	const TINTOWER4F_POKE_BALL2
 	const TINTOWER4F_POKE_BALL3
diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm
index 1fb058b10..adfaf1880 100644
--- a/maps/TinTower5F.asm
+++ b/maps/TinTower5F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const TINTOWER5F_POKE_BALL
 
 TinTower5F_MapScripts:
diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm
index 5a4ee770b..aebd4c1f9 100644
--- a/maps/TinTower6F.asm
+++ b/maps/TinTower6F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const TINTOWER6F_POKE_BALL
 
 TinTower6F_MapScripts:
diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm
index 429657d1b..58bd8b29e 100644
--- a/maps/TinTower7F.asm
+++ b/maps/TinTower7F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const TINTOWER7F_POKE_BALL
 
 TinTower7F_MapScripts:
diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm
index 403f8e4b1..d5b4d467c 100644
--- a/maps/TinTower8F.asm
+++ b/maps/TinTower8F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const TINTOWER8F_POKE_BALL1
 	const TINTOWER8F_POKE_BALL2
 	const TINTOWER8F_POKE_BALL3
diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm
index 9096927c8..01a40f12e 100644
--- a/maps/TinTower9F.asm
+++ b/maps/TinTower9F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const TINTOWER9F_POKE_BALL
 
 TinTower9F_MapScripts:
diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm
index 92dde683d..21e30dbe2 100644
--- a/maps/TinTowerRoof.asm
+++ b/maps/TinTowerRoof.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const TINTOWERROOF_HO_OH
 
 TinTowerRoof_MapScripts:
diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm
index f0e2cb36b..242adc14f 100644
--- a/maps/TohjoFalls.asm
+++ b/maps/TohjoFalls.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const TOHJOFALLS_POKE_BALL
 
 TohjoFalls_MapScripts:
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index 8bf282bbf..77353d20c 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const TRADECENTER_CHRIS1
 	const TRADECENTER_CHRIS2
 
diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm
index 8714c17f7..b00bc2378 100644
--- a/maps/TrainerHouse1F.asm
+++ b/maps/TrainerHouse1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const TRAINERHOUSE1F_RECEPTIONIST
 	const TRAINERHOUSE1F_COOLTRAINER_M
 	const TRAINERHOUSE1F_COOLTRAINER_F
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index 3fc986b3a..7d9586543 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const TRAINERHOUSEB1F_RECEPTIONIST
 	const TRAINERHOUSEB1F_CHRIS
 
diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm
index 077869795..a68947bd0 100644
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const UNIONCAVE1F_POKEFAN_M1
 	const UNIONCAVE1F_SUPER_NERD
 	const UNIONCAVE1F_POKEFAN_M2
diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm
index 5d5719a41..3f5da7612 100644
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const UNIONCAVEB1F_POKEFAN_M1
 	const UNIONCAVEB1F_POKEFAN_M2
 	const UNIONCAVEB1F_SUPER_NERD1
diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm
index c53636179..5ec846c63 100644
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const UNIONCAVEB2F_ROCKER
 	const UNIONCAVEB2F_COOLTRAINER_F1
 	const UNIONCAVEB2F_COOLTRAINER_F2
diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm
index fb07c28e8..e1d66413d 100644
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VERMILIONCITY_TEACHER
 	const VERMILIONCITY_GRAMPS
 	const VERMILIONCITY_MACHOP
diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm
index efcc6fde3..eaf5b0e07 100644
--- a/maps/VermilionDiglettsCaveSpeechHouse.asm
+++ b/maps/VermilionDiglettsCaveSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VERMILIONDIGLETTSCAVESPEECHHOUSE_GENTLEMAN
 
 VermilionDiglettsCaveSpeechHouse_MapScripts:
diff --git a/maps/VermilionFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm
index b55b2ca11..5be17c675 100644
--- a/maps/VermilionFishingSpeechHouse.asm
+++ b/maps/VermilionFishingSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VERMILIONFISHINGSPEECHHOUSE_FISHING_GURU
 
 VermilionFishingSpeechHouse_MapScripts:
diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm
index 0432ca163..86c82863d 100644
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VERMILIONGYM_SURGE
 	const VERMILIONGYM_GENTLEMAN
 	const VERMILIONGYM_ROCKER
diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm
index 596b8407f..ee04792a2 100644
--- a/maps/VermilionMagnetTrainSpeechHouse.asm
+++ b/maps/VermilionMagnetTrainSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VERMILIONMAGNETTRAINSPEECHHOUSE_POKEFAN_F
 	const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER
 
diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm
index 0de709e44..bcaaad868 100644
--- a/maps/VermilionMart.asm
+++ b/maps/VermilionMart.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VERMILIONMART_CLERK
 	const VERMILIONMART_SUPER_NERD
 	const VERMILIONMART_BUENA
diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm
index 0c3712b3a..095ff49ab 100644
--- a/maps/VermilionPokecenter1F.asm
+++ b/maps/VermilionPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VERMILIONPOKECENTER1F_NURSE
 	const VERMILIONPOKECENTER1F_FISHING_GURU
 	const VERMILIONPOKECENTER1F_SAILOR
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index 7a8faa118..a89474dc1 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VERMILIONPORT_SAILOR1
 	const VERMILIONPORT_SAILOR2
 	const VERMILIONPORT_SUPER_NERD
diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm
index 1364202a4..5184fa00f 100644
--- a/maps/VermilionPortPassage.asm
+++ b/maps/VermilionPortPassage.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VERMILIONPORTPASSAGE_TEACHER
 
 VermilionPortPassage_MapScripts:
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index 062371647..06ba3a805 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VICTORYROAD_SILVER
 	const VICTORYROAD_POKE_BALL1
 	const VICTORYROAD_POKE_BALL2
diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm
index 3f5054dd5..59fc5bbea 100644
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VICTORYROADGATE_OFFICER
 	const VICTORYROADGATE_BLACK_BELT1
 	const VICTORYROADGATE_BLACK_BELT2
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
index 93ca00b36..09bd2cc71 100644
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VIOLETCITY_EARL
 	const VIOLETCITY_LASS
 	const VIOLETCITY_SUPER_NERD
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
index 1b8b3414a..0bbef6640 100644
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VIOLETGYM_FALKNER
 	const VIOLETGYM_YOUNGSTER1
 	const VIOLETGYM_YOUNGSTER2
diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm
index be3ae329b..e274331d2 100644
--- a/maps/VioletKylesHouse.asm
+++ b/maps/VioletKylesHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VIOLETKYLESHOUSE_POKEFAN_M
 	const VIOLETKYLESHOUSE_KYLE
 
diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm
index 006a28208..accbb493c 100644
--- a/maps/VioletMart.asm
+++ b/maps/VioletMart.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VIOLETMART_CLERK
 	const VIOLETMART_GRANNY
 	const VIOLETMART_COOLTRAINER_M
diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm
index 90d137801..c79b8afcd 100644
--- a/maps/VioletNicknameSpeechHouse.asm
+++ b/maps/VioletNicknameSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VIOLETNICKNAMESPEECHHOUSE_TEACHER
 	const VIOLETNICKNAMESPEECHHOUSE_LASS
 	const VIOLETNICKNAMESPEECHHOUSE_BIRD
diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm
index 39171fa21..e96d696f0 100644
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VIOLETPOKECENTER1F_NURSE
 	const VIOLETPOKECENTER1F_GAMEBOY_KID
 	const VIOLETPOKECENTER1F_GENTLEMAN
diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm
index 435c21546..0b254e035 100644
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VIRIDIANCITY_GRAMPS1
 	const VIRIDIANCITY_GRAMPS2
 	const VIRIDIANCITY_FISHER
diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm
index f194f434c..2daa02820 100644
--- a/maps/ViridianGym.asm
+++ b/maps/ViridianGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VIRIDIANGYM_BLUE
 	const VIRIDIANGYM_GYM_GUY
 
diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm
index be8e454b9..3247ffbf1 100644
--- a/maps/ViridianMart.asm
+++ b/maps/ViridianMart.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VIRIDIANMART_CLERK
 	const VIRIDIANMART_LASS
 	const VIRIDIANMART_COOLTRAINER_M
diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm
index c7115761d..65cffe9d9 100644
--- a/maps/ViridianNicknameSpeechHouse.asm
+++ b/maps/ViridianNicknameSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VIRIDIANNICKNAMESPEECHHOUSE_POKEFAN_M
 	const VIRIDIANNICKNAMESPEECHHOUSE_LASS
 	const VIRIDIANNICKNAMESPEECHHOUSE_SPEARY
diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm
index 296fee253..2b7a31b5d 100644
--- a/maps/ViridianPokecenter1F.asm
+++ b/maps/ViridianPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const VIRIDIANPOKECENTER1F_NURSE
 	const VIRIDIANPOKECENTER1F_COOLTRAINER_M
 	const VIRIDIANPOKECENTER1F_COOLTRAINER_F
diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm
index b6e3c7fad..302317e91 100644
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const WHIRLISLANDB1F_POKE_BALL1
 	const WHIRLISLANDB1F_POKE_BALL2
 	const WHIRLISLANDB1F_POKE_BALL3
diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm
index 97df1a598..1f93a1709 100644
--- a/maps/WhirlIslandB2F.asm
+++ b/maps/WhirlIslandB2F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const WHIRLISLANDB2F_POKE_BALL1
 	const WHIRLISLANDB2F_POKE_BALL2
 	const WHIRLISLANDB2F_POKE_BALL3
diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm
index 162cdc88f..cb5e1af8a 100644
--- a/maps/WhirlIslandLugiaChamber.asm
+++ b/maps/WhirlIslandLugiaChamber.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const WHIRLISLANDLUGIACHAMBER_LUGIA
 
 WhirlIslandLugiaChamber_MapScripts:
diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm
index c38d94baa..37885de6e 100644
--- a/maps/WhirlIslandNE.asm
+++ b/maps/WhirlIslandNE.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const WHIRLISLANDNE_POKE_BALL
 
 WhirlIslandNE_MapScripts:
diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm
index 75e8cc3ff..7d0c436be 100644
--- a/maps/WhirlIslandSW.asm
+++ b/maps/WhirlIslandSW.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const WHIRLISLANDSW_POKE_BALL
 
 WhirlIslandSW_MapScripts:
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm
index e56a5777f..8e8dd4147 100644
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const WILLSROOM_WILL
 
 WillsRoom_MapScripts:
diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm
index d92e48c4a..b381561de 100644
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2
+const_value set 2 ; person constants
 	const WISETRIOSROOM_SAGE1
 	const WISETRIOSROOM_SAGE2
 	const WISETRIOSROOM_SAGE3

From 50a78c0876bbccad8269a626ca5bc6b5d8f679e0 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Wed, 31 Jan 2018 11:08:47 -0500
Subject: [PATCH 078/135] =?UTF-8?q?Forgot=20the=20person=E2=86=92object=20?=
 =?UTF-8?q?rename?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/map_event_scripts.md                        | 4 ++--
 maps/AzaleaGym.asm                               | 2 +-
 maps/AzaleaMart.asm                              | 2 +-
 maps/AzaleaPokecenter1F.asm                      | 2 +-
 maps/AzaleaTown.asm                              | 2 +-
 maps/BattleTower1F.asm                           | 2 +-
 maps/BattleTowerBattleRoom.asm                   | 2 +-
 maps/BattleTowerElevator.asm                     | 2 +-
 maps/BattleTowerHallway.asm                      | 2 +-
 maps/BattleTowerOutside.asm                      | 2 +-
 maps/BillsBrothersHouse.asm                      | 2 +-
 maps/BillsFamilysHouse.asm                       | 2 +-
 maps/BillsHouse.asm                              | 2 +-
 maps/BlackthornCity.asm                          | 2 +-
 maps/BlackthornDragonSpeechHouse.asm             | 2 +-
 maps/BlackthornEmysHouse.asm                     | 2 +-
 maps/BlackthornGym1F.asm                         | 2 +-
 maps/BlackthornGym2F.asm                         | 2 +-
 maps/BlackthornMart.asm                          | 2 +-
 maps/BlackthornPokecenter1F.asm                  | 2 +-
 maps/BluesHouse.asm                              | 2 +-
 maps/BrunosRoom.asm                              | 2 +-
 maps/BurnedTower1F.asm                           | 2 +-
 maps/BurnedTowerB1F.asm                          | 2 +-
 maps/CeladonCafe.asm                             | 2 +-
 maps/CeladonCity.asm                             | 2 +-
 maps/CeladonDeptStore1F.asm                      | 2 +-
 maps/CeladonDeptStore2F.asm                      | 2 +-
 maps/CeladonDeptStore3F.asm                      | 2 +-
 maps/CeladonDeptStore4F.asm                      | 2 +-
 maps/CeladonDeptStore5F.asm                      | 2 +-
 maps/CeladonDeptStore6F.asm                      | 2 +-
 maps/CeladonGameCorner.asm                       | 2 +-
 maps/CeladonGameCornerPrizeRoom.asm              | 2 +-
 maps/CeladonGym.asm                              | 2 +-
 maps/CeladonMansion1F.asm                        | 2 +-
 maps/CeladonMansion3F.asm                        | 2 +-
 maps/CeladonMansionRoof.asm                      | 2 +-
 maps/CeladonMansionRoofHouse.asm                 | 2 +-
 maps/CeladonPokecenter1F.asm                     | 2 +-
 maps/CeruleanCity.asm                            | 2 +-
 maps/CeruleanGym.asm                             | 2 +-
 maps/CeruleanGymBadgeSpeechHouse.asm             | 2 +-
 maps/CeruleanMart.asm                            | 2 +-
 maps/CeruleanPokecenter1F.asm                    | 2 +-
 maps/CeruleanPoliceStation.asm                   | 2 +-
 maps/CeruleanTradeSpeechHouse.asm                | 2 +-
 maps/CharcoalKiln.asm                            | 2 +-
 maps/CherrygroveCity.asm                         | 2 +-
 maps/CherrygroveEvolutionSpeechHouse.asm         | 2 +-
 maps/CherrygroveGymSpeechHouse.asm               | 2 +-
 maps/CherrygroveMart.asm                         | 2 +-
 maps/CherrygrovePokecenter1F.asm                 | 2 +-
 maps/CianwoodCity.asm                            | 2 +-
 maps/CianwoodGym.asm                             | 2 +-
 maps/CianwoodLugiaSpeechHouse.asm                | 2 +-
 maps/CianwoodPharmacy.asm                        | 2 +-
 maps/CianwoodPhotoStudio.asm                     | 2 +-
 maps/CianwoodPokecenter1F.asm                    | 2 +-
 maps/CinnabarIsland.asm                          | 2 +-
 maps/CinnabarPokecenter1F.asm                    | 2 +-
 maps/Colosseum.asm                               | 2 +-
 maps/CopycatsHouse1F.asm                         | 2 +-
 maps/CopycatsHouse2F.asm                         | 2 +-
 maps/DanceTheatre.asm                            | 2 +-
 maps/DarkCaveBlackthornEntrance.asm              | 2 +-
 maps/DarkCaveVioletEntrance.asm                  | 2 +-
 maps/DayCare.asm                                 | 2 +-
 maps/DayOfWeekSiblingsHouse.asm                  | 2 +-
 maps/DiglettsCave.asm                            | 2 +-
 maps/DragonShrine.asm                            | 2 +-
 maps/DragonsDenB1F.asm                           | 2 +-
 maps/EarlsPokemonAcademy.asm                     | 2 +-
 maps/EcruteakCity.asm                            | 2 +-
 maps/EcruteakGym.asm                             | 2 +-
 maps/EcruteakItemfinderHouse.asm                 | 2 +-
 maps/EcruteakLugiaSpeechHouse.asm                | 2 +-
 maps/EcruteakMart.asm                            | 2 +-
 maps/EcruteakPokecenter1F.asm                    | 2 +-
 maps/EcruteakTinTowerEntrance.asm                | 2 +-
 maps/ElmsHouse.asm                               | 2 +-
 maps/ElmsLab.asm                                 | 2 +-
 maps/FastShip1F.asm                              | 2 +-
 maps/FastShipB1F.asm                             | 2 +-
 maps/FastShipCabins_NNW_NNE_NE.asm               | 2 +-
 maps/FastShipCabins_SE_SSE_CaptainsCabin.asm     | 2 +-
 maps/FastShipCabins_SW_SSW_NW.asm                | 2 +-
 maps/FightingDojo.asm                            | 2 +-
 maps/FuchsiaCity.asm                             | 2 +-
 maps/FuchsiaGym.asm                              | 2 +-
 maps/FuchsiaMart.asm                             | 2 +-
 maps/FuchsiaPokecenter1F.asm                     | 2 +-
 maps/GoldenrodBikeShop.asm                       | 2 +-
 maps/GoldenrodCity.asm                           | 2 +-
 maps/GoldenrodDeptStore1F.asm                    | 2 +-
 maps/GoldenrodDeptStore2F.asm                    | 2 +-
 maps/GoldenrodDeptStore3F.asm                    | 2 +-
 maps/GoldenrodDeptStore4F.asm                    | 2 +-
 maps/GoldenrodDeptStore5F.asm                    | 2 +-
 maps/GoldenrodDeptStore6F.asm                    | 2 +-
 maps/GoldenrodDeptStoreB1F.asm                   | 2 +-
 maps/GoldenrodDeptStoreRoof.asm                  | 2 +-
 maps/GoldenrodFlowerShop.asm                     | 2 +-
 maps/GoldenrodGameCorner.asm                     | 2 +-
 maps/GoldenrodGym.asm                            | 2 +-
 maps/GoldenrodHappinessRater.asm                 | 2 +-
 maps/GoldenrodMagnetTrainStation.asm             | 2 +-
 maps/GoldenrodNameRater.asm                      | 2 +-
 maps/GoldenrodPPSpeechHouse.asm                  | 2 +-
 maps/GoldenrodPokecenter1F.asm                   | 2 +-
 maps/GoldenrodUnderground.asm                    | 2 +-
 maps/GoldenrodUndergroundSwitchRoomEntrances.asm | 2 +-
 maps/GoldenrodUndergroundWarehouse.asm           | 2 +-
 maps/GuideGentsHouse.asm                         | 2 +-
 maps/HallOfFame.asm                              | 2 +-
 maps/IcePath1F.asm                               | 2 +-
 maps/IcePathB1F.asm                              | 2 +-
 maps/IcePathB2FBlackthornSide.asm                | 2 +-
 maps/IcePathB2FMahoganySide.asm                  | 2 +-
 maps/IcePathB3F.asm                              | 2 +-
 maps/IlexForest.asm                              | 2 +-
 maps/IlexForestAzaleaGate.asm                    | 2 +-
 maps/IndigoPlateauPokecenter1F.asm               | 2 +-
 maps/KarensRoom.asm                              | 2 +-
 maps/KogasRoom.asm                               | 2 +-
 maps/KurtsHouse.asm                              | 2 +-
 maps/LakeOfRage.asm                              | 2 +-
 maps/LakeOfRageHiddenPowerHouse.asm              | 2 +-
 maps/LakeOfRageMagikarpHouse.asm                 | 2 +-
 maps/LancesRoom.asm                              | 2 +-
 maps/LavRadioTower1F.asm                         | 2 +-
 maps/LavenderMart.asm                            | 2 +-
 maps/LavenderNameRater.asm                       | 2 +-
 maps/LavenderPokecenter1F.asm                    | 2 +-
 maps/LavenderSpeechHouse.asm                     | 2 +-
 maps/LavenderTown.asm                            | 2 +-
 maps/MahoganyGym.asm                             | 2 +-
 maps/MahoganyMart1F.asm                          | 2 +-
 maps/MahoganyPokecenter1F.asm                    | 2 +-
 maps/MahoganyRedGyaradosSpeechHouse.asm          | 2 +-
 maps/MahoganyTown.asm                            | 2 +-
 maps/ManiasHouse.asm                             | 2 +-
 maps/MountMoon.asm                               | 2 +-
 maps/MountMoonGiftShop.asm                       | 2 +-
 maps/MountMoonSquare.asm                         | 2 +-
 maps/MountMortar1FInside.asm                     | 2 +-
 maps/MountMortar1FOutside.asm                    | 2 +-
 maps/MountMortar2FInside.asm                     | 2 +-
 maps/MountMortarB1F.asm                          | 2 +-
 maps/MoveDeletersHouse.asm                       | 2 +-
 maps/MrFujisHouse.asm                            | 2 +-
 maps/MrPokemonsHouse.asm                         | 2 +-
 maps/MrPsychicsHouse.asm                         | 2 +-
 maps/NationalPark.asm                            | 2 +-
 maps/NationalParkBugContest.asm                  | 2 +-
 maps/NewBarkTown.asm                             | 2 +-
 maps/OaksLab.asm                                 | 2 +-
 maps/OlivineCafe.asm                             | 2 +-
 maps/OlivineCity.asm                             | 2 +-
 maps/OlivineGoodRodHouse.asm                     | 2 +-
 maps/OlivineGym.asm                              | 2 +-
 maps/OlivineHouseBeta.asm                        | 2 +-
 maps/OlivineLighthouse1F.asm                     | 2 +-
 maps/OlivineLighthouse2F.asm                     | 2 +-
 maps/OlivineLighthouse3F.asm                     | 2 +-
 maps/OlivineLighthouse4F.asm                     | 2 +-
 maps/OlivineLighthouse5F.asm                     | 2 +-
 maps/OlivineLighthouse6F.asm                     | 2 +-
 maps/OlivineMart.asm                             | 2 +-
 maps/OlivinePokecenter1F.asm                     | 2 +-
 maps/OlivinePort.asm                             | 2 +-
 maps/OlivinePortPassage.asm                      | 2 +-
 maps/OlivinePunishmentSpeechHouse.asm            | 2 +-
 maps/OlivineTimsHouse.asm                        | 2 +-
 maps/PalletTown.asm                              | 2 +-
 maps/PewterCity.asm                              | 2 +-
 maps/PewterGym.asm                               | 2 +-
 maps/PewterMart.asm                              | 2 +-
 maps/PewterNidoranSpeechHouse.asm                | 2 +-
 maps/PewterPokecenter1F.asm                      | 2 +-
 maps/PewterSnoozeSpeechHouse.asm                 | 2 +-
 maps/PlayersHouse1F.asm                          | 2 +-
 maps/PlayersHouse2F.asm                          | 2 +-
 maps/PlayersNeighborsHouse.asm                   | 2 +-
 maps/PokeSeersHouse.asm                          | 2 +-
 maps/Pokecenter2F.asm                            | 2 +-
 maps/PokecomCenterAdminRoomMobile.asm            | 2 +-
 maps/PokemonFanClub.asm                          | 2 +-
 maps/PowerPlant.asm                              | 2 +-
 maps/RadioTower1F.asm                            | 2 +-
 maps/RadioTower2F.asm                            | 2 +-
 maps/RadioTower3F.asm                            | 2 +-
 maps/RadioTower4F.asm                            | 2 +-
 maps/RadioTower5F.asm                            | 2 +-
 maps/RedsHouse1F.asm                             | 2 +-
 maps/RockTunnel1F.asm                            | 2 +-
 maps/RockTunnelB1F.asm                           | 2 +-
 maps/Route1.asm                                  | 2 +-
 maps/Route10Pokecenter1F.asm                     | 2 +-
 maps/Route10South.asm                            | 2 +-
 maps/Route11.asm                                 | 2 +-
 maps/Route12.asm                                 | 2 +-
 maps/Route12SuperRodHouse.asm                    | 2 +-
 maps/Route13.asm                                 | 2 +-
 maps/Route14.asm                                 | 2 +-
 maps/Route15.asm                                 | 2 +-
 maps/Route15FuchsiaGate.asm                      | 2 +-
 maps/Route16FuchsiaSpeechHouse.asm               | 2 +-
 maps/Route16Gate.asm                             | 2 +-
 maps/Route17.asm                                 | 2 +-
 maps/Route17Route18Gate.asm                      | 2 +-
 maps/Route18.asm                                 | 2 +-
 maps/Route19.asm                                 | 2 +-
 maps/Route19FuchsiaGate.asm                      | 2 +-
 maps/Route2.asm                                  | 2 +-
 maps/Route20.asm                                 | 2 +-
 maps/Route21.asm                                 | 2 +-
 maps/Route24.asm                                 | 2 +-
 maps/Route25.asm                                 | 2 +-
 maps/Route26.asm                                 | 2 +-
 maps/Route26HealHouse.asm                        | 2 +-
 maps/Route27.asm                                 | 2 +-
 maps/Route27SandstormHouse.asm                   | 2 +-
 maps/Route28SteelWingHouse.asm                   | 2 +-
 maps/Route29.asm                                 | 2 +-
 maps/Route29Route46Gate.asm                      | 2 +-
 maps/Route2Gate.asm                              | 2 +-
 maps/Route2NuggetHouse.asm                       | 2 +-
 maps/Route3.asm                                  | 2 +-
 maps/Route30.asm                                 | 2 +-
 maps/Route30BerryHouse.asm                       | 2 +-
 maps/Route31.asm                                 | 2 +-
 maps/Route31VioletGate.asm                       | 2 +-
 maps/Route32.asm                                 | 2 +-
 maps/Route32Pokecenter1F.asm                     | 2 +-
 maps/Route32RuinsOfAlphGate.asm                  | 2 +-
 maps/Route33.asm                                 | 2 +-
 maps/Route34.asm                                 | 2 +-
 maps/Route34IlexForestGate.asm                   | 2 +-
 maps/Route35.asm                                 | 2 +-
 maps/Route35GoldenrodGate.asm                    | 2 +-
 maps/Route35NationalParkGate.asm                 | 2 +-
 maps/Route36.asm                                 | 2 +-
 maps/Route36NationalParkGate.asm                 | 2 +-
 maps/Route36RuinsOfAlphGate.asm                  | 2 +-
 maps/Route37.asm                                 | 2 +-
 maps/Route38.asm                                 | 2 +-
 maps/Route38EcruteakGate.asm                     | 2 +-
 maps/Route39.asm                                 | 2 +-
 maps/Route39Barn.asm                             | 2 +-
 maps/Route39Farmhouse.asm                        | 2 +-
 maps/Route4.asm                                  | 2 +-
 maps/Route40.asm                                 | 2 +-
 maps/Route40BattleTowerGate.asm                  | 2 +-
 maps/Route41.asm                                 | 2 +-
 maps/Route42.asm                                 | 2 +-
 maps/Route42EcruteakGate.asm                     | 2 +-
 maps/Route43.asm                                 | 2 +-
 maps/Route43Gate.asm                             | 2 +-
 maps/Route43MahoganyGate.asm                     | 2 +-
 maps/Route44.asm                                 | 2 +-
 maps/Route45.asm                                 | 2 +-
 maps/Route46.asm                                 | 2 +-
 maps/Route5.asm                                  | 2 +-
 maps/Route5CleanseTagHouse.asm                   | 2 +-
 maps/Route5SaffronGate.asm                       | 2 +-
 maps/Route5UndergroundPathEntrance.asm           | 2 +-
 maps/Route6.asm                                  | 2 +-
 maps/Route6SaffronGate.asm                       | 2 +-
 maps/Route7SaffronGate.asm                       | 2 +-
 maps/Route8.asm                                  | 2 +-
 maps/Route8SaffronGate.asm                       | 2 +-
 maps/Route9.asm                                  | 2 +-
 maps/RuinsOfAlphAerodactylItemRoom.asm           | 2 +-
 maps/RuinsOfAlphHoOhItemRoom.asm                 | 2 +-
 maps/RuinsOfAlphInnerChamber.asm                 | 2 +-
 maps/RuinsOfAlphKabutoChamber.asm                | 2 +-
 maps/RuinsOfAlphKabutoItemRoom.asm               | 2 +-
 maps/RuinsOfAlphOmanyteItemRoom.asm              | 2 +-
 maps/RuinsOfAlphOutside.asm                      | 2 +-
 maps/RuinsOfAlphResearchCenter.asm               | 2 +-
 maps/SafariZoneWardensHome.asm                   | 2 +-
 maps/SaffronCity.asm                             | 2 +-
 maps/SaffronGym.asm                              | 2 +-
 maps/SaffronMagnetTrainStation.asm               | 2 +-
 maps/SaffronMart.asm                             | 2 +-
 maps/SaffronPokecenter1F.asm                     | 2 +-
 maps/SeafoamGym.asm                              | 2 +-
 maps/SilphCo1F.asm                               | 2 +-
 maps/SilverCaveItemRooms.asm                     | 2 +-
 maps/SilverCavePokecenter1F.asm                  | 2 +-
 maps/SilverCaveRoom1.asm                         | 2 +-
 maps/SilverCaveRoom2.asm                         | 2 +-
 maps/SilverCaveRoom3.asm                         | 2 +-
 maps/SlowpokeWellB1F.asm                         | 2 +-
 maps/SlowpokeWellB2F.asm                         | 2 +-
 maps/SoulHouse.asm                               | 2 +-
 maps/SproutTower1F.asm                           | 2 +-
 maps/SproutTower2F.asm                           | 2 +-
 maps/SproutTower3F.asm                           | 2 +-
 maps/TeamRocketBaseB1F.asm                       | 2 +-
 maps/TeamRocketBaseB2F.asm                       | 2 +-
 maps/TeamRocketBaseB3F.asm                       | 2 +-
 maps/TimeCapsule.asm                             | 2 +-
 maps/TinTower1F.asm                              | 2 +-
 maps/TinTower3F.asm                              | 2 +-
 maps/TinTower4F.asm                              | 2 +-
 maps/TinTower5F.asm                              | 2 +-
 maps/TinTower6F.asm                              | 2 +-
 maps/TinTower7F.asm                              | 2 +-
 maps/TinTower8F.asm                              | 2 +-
 maps/TinTower9F.asm                              | 2 +-
 maps/TinTowerRoof.asm                            | 2 +-
 maps/TohjoFalls.asm                              | 2 +-
 maps/TradeCenter.asm                             | 2 +-
 maps/TrainerHouse1F.asm                          | 2 +-
 maps/TrainerHouseB1F.asm                         | 2 +-
 maps/UnionCave1F.asm                             | 2 +-
 maps/UnionCaveB1F.asm                            | 2 +-
 maps/UnionCaveB2F.asm                            | 2 +-
 maps/VermilionCity.asm                           | 2 +-
 maps/VermilionDiglettsCaveSpeechHouse.asm        | 2 +-
 maps/VermilionFishingSpeechHouse.asm             | 2 +-
 maps/VermilionGym.asm                            | 2 +-
 maps/VermilionMagnetTrainSpeechHouse.asm         | 2 +-
 maps/VermilionMart.asm                           | 2 +-
 maps/VermilionPokecenter1F.asm                   | 2 +-
 maps/VermilionPort.asm                           | 2 +-
 maps/VermilionPortPassage.asm                    | 2 +-
 maps/VictoryRoad.asm                             | 2 +-
 maps/VictoryRoadGate.asm                         | 2 +-
 maps/VioletCity.asm                              | 2 +-
 maps/VioletGym.asm                               | 2 +-
 maps/VioletKylesHouse.asm                        | 2 +-
 maps/VioletMart.asm                              | 2 +-
 maps/VioletNicknameSpeechHouse.asm               | 2 +-
 maps/VioletPokecenter1F.asm                      | 2 +-
 maps/ViridianCity.asm                            | 2 +-
 maps/ViridianGym.asm                             | 2 +-
 maps/ViridianMart.asm                            | 2 +-
 maps/ViridianNicknameSpeechHouse.asm             | 2 +-
 maps/ViridianPokecenter1F.asm                    | 2 +-
 maps/WhirlIslandB1F.asm                          | 2 +-
 maps/WhirlIslandB2F.asm                          | 2 +-
 maps/WhirlIslandLugiaChamber.asm                 | 2 +-
 maps/WhirlIslandNE.asm                           | 2 +-
 maps/WhirlIslandSW.asm                           | 2 +-
 maps/WillsRoom.asm                               | 2 +-
 maps/WiseTriosRoom.asm                           | 2 +-
 349 files changed, 350 insertions(+), 350 deletions(-)

diff --git a/docs/map_event_scripts.md b/docs/map_event_scripts.md
index 129a47fab..954e6a5c0 100644
--- a/docs/map_event_scripts.md
+++ b/docs/map_event_scripts.md
@@ -1,10 +1,10 @@
 # Map Event Scripts
 
 
-## Person constants
+## Object constants
 
 
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const MAPNAME_OBJECTNAME
 

 
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
index 3dad852e5..5681c3df8 100644
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const AZALEAGYM_BUGSY
 	const AZALEAGYM_BUG_CATCHER1
 	const AZALEAGYM_BUG_CATCHER2
diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm
index 0f5d4cde7..984b7651a 100644
--- a/maps/AzaleaMart.asm
+++ b/maps/AzaleaMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const AZALEAMART_CLERK
 	const AZALEAMART_COOLTRAINER_M
 	const AZALEAMART_BUG_CATCHER
diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm
index fcf04c2a6..b135229d0 100644
--- a/maps/AzaleaPokecenter1F.asm
+++ b/maps/AzaleaPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const AZALEAPOKECENTER1F_NURSE
 	const AZALEAPOKECENTER1F_GENTLEMAN
 	const AZALEAPOKECENTER1F_FISHING_GURU
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index 3ff773c07..15d867608 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const AZALEATOWN_AZALEA_ROCKET1
 	const AZALEATOWN_GRAMPS
 	const AZALEATOWN_TEACHER
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index 07dbe0ae2..526f08274 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const BATTLETOWER1F_RECEPTIONIST
 	const BATTLETOWER1F_YOUNGSTER
 	const BATTLETOWER1F_COOLTRAINER_F
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index 96f11974e..bb3203d06 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const BATTLETOWERBATTLEROOM_YOUNGSTER
 	const BATTLETOWERBATTLEROOM_RECEPTIONIST
 
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
index ec4b68f21..ec2c0462c 100644
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const BATTLETOWERELEVATOR_RECEPTIONIST
 
 BattleTowerElevator_MapScripts:
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
index f4255a378..fe249f2d9 100644
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const BATTLETOWERHALLWAY_RECEPTIONIST
 
 BattleTowerHallway_MapScripts:
diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm
index b42d43c9c..5ade6be43 100644
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const BATTLETOWEROUTSIDE_STANDING_YOUNGSTER
 	const BATTLETOWEROUTSIDE_BUENA
 	const BATTLETOWEROUTSIDE_SAILOR
diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm
index 6fbf2f7c2..2652b7e6c 100644
--- a/maps/BillsBrothersHouse.asm
+++ b/maps/BillsBrothersHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const BILLSBROTHERSHOUSE_POKEFAN_F
 	const BILLSBROTHERSHOUSE_YOUNGSTER
 
diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm
index acab1aa10..5b0c0ec5f 100644
--- a/maps/BillsFamilysHouse.asm
+++ b/maps/BillsFamilysHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const BILLSFAMILYSHOUSE_BILL
 	const BILLSFAMILYSHOUSE_POKEFAN_F
 	const BILLSFAMILYSHOUSE_TWIN
diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
index 33c7372d2..5dca2ea41 100644
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const BILLSHOUSE_GRAMPS
 
 BillsHouse_MapScripts:
diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm
index 648f37f32..c413df225 100644
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const BLACKTHORNCITY_SUPER_NERD1
 	const BLACKTHORNCITY_SUPER_NERD2
 	const BLACKTHORNCITY_GRAMPS1
diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm
index bf3bb9772..19e8fd744 100644
--- a/maps/BlackthornDragonSpeechHouse.asm
+++ b/maps/BlackthornDragonSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const BLACKTHORNDRAGONSPEECHHOUSE_GRANNY
 	const BLACKTHORNDRAGONSPEECHHOUSE_EKANS
 
diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm
index 189d928f7..c3a4e4939 100644
--- a/maps/BlackthornEmysHouse.asm
+++ b/maps/BlackthornEmysHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const BLACKTHORNEMYSHOUSE_EMY
 
 BlackthornEmysHouse_MapScripts:
diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm
index 9e6c06ee9..d8e74049f 100644
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const BLACKTHORNGYM1F_CLAIR
 	const BLACKTHORNGYM1F_COOLTRAINER_M1
 	const BLACKTHORNGYM1F_COOLTRAINER_M2
diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm
index 2a809027f..6e923c44a 100644
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const BLACKTHORNGYM2F_COOLTRAINER_M
 	const BLACKTHORNGYM2F_COOLTRAINER_F
 	const BLACKTHORNGYM2F_BOULDER1
diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm
index 48a75323b..03315f745 100644
--- a/maps/BlackthornMart.asm
+++ b/maps/BlackthornMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const BLACKTHORNMART_CLERK
 	const BLACKTHORNMART_COOLTRAINER_M
 	const BLACKTHORNMART_BLACK_BELT
diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm
index b27bd816c..61c9e50a9 100644
--- a/maps/BlackthornPokecenter1F.asm
+++ b/maps/BlackthornPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const BLACKTHORNPOKECENTER1F_NURSE
 	const BLACKTHORNPOKECENTER1F_GENTLEMAN
 	const BLACKTHORNPOKECENTER1F_TWIN
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
index e2ab5e1de..474b9c370 100644
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const BLUESHOUSE_DAISY
 
 BluesHouse_MapScripts:
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
index 371003777..4f900e180 100644
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const BRUNOSROOM_BRUNO
 
 BrunosRoom_MapScripts:
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index f60c64237..349f3a674 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const BURNEDTOWER1F_ROCK
 	const BURNEDTOWER1F_EUSINE
 	const BURNEDTOWER1F_SILVER
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index 9d383f8a2..4e04f5c2a 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const BURNEDTOWERB1F_BOULDER
 	const BURNEDTOWERB1F_RAIKOU1
 	const BURNEDTOWERB1F_ENTEI1
diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm
index 81934496e..e0dd922b2 100644
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CELADONCAFE_SUPER_NERD
 	const CELADONCAFE_FISHER1
 	const CELADONCAFE_FISHER2
diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm
index cc1c22649..c1a19e8b6 100644
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CELADONCITY_FISHER
 	const CELADONCITY_POLIWAG
 	const CELADONCITY_TEACHER1
diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm
index 9f43067a9..f8d44e887 100644
--- a/maps/CeladonDeptStore1F.asm
+++ b/maps/CeladonDeptStore1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CELADONDEPTSTORE1F_RECEPTIONIST
 	const CELADONDEPTSTORE1F_GENTLEMAN
 	const CELADONDEPTSTORE1F_TEACHER
diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm
index 44aa1591c..ef774ab35 100644
--- a/maps/CeladonDeptStore2F.asm
+++ b/maps/CeladonDeptStore2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CELADONDEPTSTORE2F_CLERK1
 	const CELADONDEPTSTORE2F_CLERK2
 	const CELADONDEPTSTORE2F_POKEFAN_M
diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm
index 718ec6491..6f73f1772 100644
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CELADONDEPTSTORE3F_CLERK
 	const CELADONDEPTSTORE3F_YOUNGSTER
 	const CELADONDEPTSTORE3F_GAMEBOY_KID1
diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm
index a0034dcb0..676088476 100644
--- a/maps/CeladonDeptStore4F.asm
+++ b/maps/CeladonDeptStore4F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CELADONDEPTSTORE4F_CLERK
 	const CELADONDEPTSTORE4F_SUPER_NERD
 	const CELADONDEPTSTORE4F_YOUNGSTER
diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm
index c2d6ecfa5..7a380064b 100644
--- a/maps/CeladonDeptStore5F.asm
+++ b/maps/CeladonDeptStore5F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CELADONDEPTSTORE5F_CLERK1
 	const CELADONDEPTSTORE5F_CLERK2
 	const CELADONDEPTSTORE5F_GENTLEMAN
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index f5a64328d..1c472b0a6 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CELADONDEPTSTORE6F_SUPER_NERD
 	const CELADONDEPTSTORE6F_YOUNGSTER
 
diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm
index 394d4a932..d453f757f 100644
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CELADONGAMECORNER_CLERK
 	const CELADONGAMECORNER_RECEPTIONIST
 	const CELADONGAMECORNER_POKEFAN_M
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index 12b3aa4dc..e3106a78b 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CELADONGAMECORNERPRIZEROOM_GENTLEMAN
 	const CELADONGAMECORNERPRIZEROOM_PHARMACIST
 
diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm
index 0f5218d6c..5422ae253 100644
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CELADONGYM_ERIKA
 	const CELADONGYM_LASS1
 	const CELADONGYM_LASS2
diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm
index fad635f28..57ac84436 100644
--- a/maps/CeladonMansion1F.asm
+++ b/maps/CeladonMansion1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CELADONMANSION1F_GRANNY
 	const CELADONMANSION1F_GROWLITHE1
 	const CELADONMANSION1F_CLEFAIRY
diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm
index c002bf2b3..8b363fe04 100644
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CELADONMANSION3F_COOLTRAINER_M
 	const CELADONMANSION3F_GYM_GUY
 	const CELADONMANSION3F_SUPER_NERD
diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm
index 862f4d6cc..969290800 100644
--- a/maps/CeladonMansionRoof.asm
+++ b/maps/CeladonMansionRoof.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CELADONMANSIONROOF_FISHER
 
 CeladonMansionRoof_MapScripts:
diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm
index 008c967dc..01e70490e 100644
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CELADONMANSIONROOFHOUSE_PHARMACIST
 
 CeladonMansionRoofHouse_MapScripts:
diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm
index 35b488600..ac68363fc 100644
--- a/maps/CeladonPokecenter1F.asm
+++ b/maps/CeladonPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CELADONPOKECENTER1F_NURSE
 	const CELADONPOKECENTER1F_GENTLEMAN
 	const CELADONPOKECENTER1F_PHARMACIST
diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm
index d65c1a9b8..d06370a37 100644
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CERULEANCITY_COOLTRAINER_M
 	const CERULEANCITY_SUPER_NERD
 	const CERULEANCITY_SLOWPOKE
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index 148a535af..ad03c9aba 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CERULEANGYM_ROCKET
 	const CERULEANGYM_MISTY
 	const CERULEANGYM_SWIMMER_GIRL1
diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm
index 3294aa1a0..0abe42089 100644
--- a/maps/CeruleanGymBadgeSpeechHouse.asm
+++ b/maps/CeruleanGymBadgeSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M
 
 CeruleanGymBadgeSpeechHouse_MapScripts:
diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm
index ba11d432c..ab5973ab0 100644
--- a/maps/CeruleanMart.asm
+++ b/maps/CeruleanMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CERULEANMART_CLERK
 	const CERULEANMART_COOLTRAINER_M
 	const CERULEANMART_COOLTRAINER_F
diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm
index 81851f02b..02c86774c 100644
--- a/maps/CeruleanPokecenter1F.asm
+++ b/maps/CeruleanPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CERULEANPOKECENTER1F_NURSE
 	const CERULEANPOKECENTER1F_SUPER_NERD
 	const CERULEANPOKECENTER1F_GYM_GUY
diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm
index 5f1a44fe3..f653716f4 100644
--- a/maps/CeruleanPoliceStation.asm
+++ b/maps/CeruleanPoliceStation.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CERULEANPOLICESTATION_FISHING_GURU
 	const CERULEANPOLICESTATION_POKEFAN_F
 	const CERULEANPOLICESTATION_DIGLETT
diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm
index 7e33a1b5c..e7f19a518 100644
--- a/maps/CeruleanTradeSpeechHouse.asm
+++ b/maps/CeruleanTradeSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CERULEANTRADESPEECHHOUSE_GRANNY
 	const CERULEANTRADESPEECHHOUSE_GRAMPS
 	const CERULEANTRADESPEECHHOUSE_RHYDON
diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm
index 1f9465743..1eb7bfb1c 100644
--- a/maps/CharcoalKiln.asm
+++ b/maps/CharcoalKiln.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CHARCOALKILN_BLACK_BELT
 	const CHARCOALKILN_YOUNGSTER
 	const CHARCOALKILN_MOLTRES
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index d92bcff1b..29a437826 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CHERRYGROVECITY_GRAMPS
 	const CHERRYGROVECITY_SILVER
 	const CHERRYGROVECITY_TEACHER
diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm
index a111f7409..b49d2de52 100644
--- a/maps/CherrygroveEvolutionSpeechHouse.asm
+++ b/maps/CherrygroveEvolutionSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CHERRYGROVEEVOLUTIONSPEECHHOUSE_LASS
 	const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER
 
diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm
index e0c2ffb8e..995b3a7f7 100644
--- a/maps/CherrygroveGymSpeechHouse.asm
+++ b/maps/CherrygroveGymSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CHERRYGROVEGYMSPEECHHOUSE_POKEFAN_M
 	const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER
 
diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm
index cdf5268f4..777bc1db4 100644
--- a/maps/CherrygroveMart.asm
+++ b/maps/CherrygroveMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CHERRYGROVEMART_CLERK
 	const CHERRYGROVEMART_COOLTRAINER_M
 	const CHERRYGROVEMART_YOUNGSTER
diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm
index 9b6afa0c8..8374215b8 100644
--- a/maps/CherrygrovePokecenter1F.asm
+++ b/maps/CherrygrovePokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CHERRYGROVEPOKECENTER1F_NURSE
 	const CHERRYGROVEPOKECENTER1F_FISHER
 	const CHERRYGROVEPOKECENTER1F_GENTLEMAN
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index f269c2a87..af154437e 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CIANWOODCITY_STANDING_YOUNGSTER
 	const CIANWOODCITY_POKEFAN_M
 	const CIANWOODCITY_LASS
diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm
index 82053ae14..365c68e11 100644
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CIANWOODGYM_CHUCK
 	const CIANWOODGYM_BLACK_BELT1
 	const CIANWOODGYM_BLACK_BELT2
diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm
index aa02289a6..88bbf8065 100644
--- a/maps/CianwoodLugiaSpeechHouse.asm
+++ b/maps/CianwoodLugiaSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CIANWOODLUGIASPEECHHOUSE_TEACHER
 	const CIANWOODLUGIASPEECHHOUSE_LASS
 	const CIANWOODLUGIASPEECHHOUSE_TWIN
diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm
index ecbcb72da..016531227 100644
--- a/maps/CianwoodPharmacy.asm
+++ b/maps/CianwoodPharmacy.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CIANWOODPHARMACY_PHARMACIST
 
 CianwoodPharmacy_MapScripts:
diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm
index bc857b575..3fb00c944 100644
--- a/maps/CianwoodPhotoStudio.asm
+++ b/maps/CianwoodPhotoStudio.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CIANWOODPHOTOSTUDIO_FISHING_GURU
 
 CianwoodPhotoStudio_MapScripts:
diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm
index e10e93f0d..2698b9089 100644
--- a/maps/CianwoodPokecenter1F.asm
+++ b/maps/CianwoodPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CIANWOODPOKECENTER1F_NURSE
 	const CIANWOODPOKECENTER1F_LASS
 	const CIANWOODPOKECENTER1F_GYM_GUY
diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm
index 7d0f4655f..e920b5c92 100644
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CINNABARISLAND_BLUE
 
 CinnabarIsland_MapScripts:
diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm
index 09f36ce2b..e4e8d42af 100644
--- a/maps/CinnabarPokecenter1F.asm
+++ b/maps/CinnabarPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const CINNABARPOKECENTER1F_NURSE
 	const CINNABARPOKECENTER1F_COOLTRAINER_F
 	const CINNABARPOKECENTER1F_FISHER
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index 856a80058..a8c85bf6c 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const COLOSSEUM_CHRIS1
 	const COLOSSEUM_CHRIS2
 
diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm
index df321aabf..1550d8340 100644
--- a/maps/CopycatsHouse1F.asm
+++ b/maps/CopycatsHouse1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const COPYCATSHOUSE1F_POKEFAN_M
 	const COPYCATSHOUSE1F_POKEFAN_F
 	const COPYCATSHOUSE1F_CLEFAIRY
diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm
index 819d18eda..37d654090 100644
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const COPYCATSHOUSE2F_COPYCAT1 ; if player is male
 	const COPYCATSHOUSE2F_DODRIO
 	const COPYCATSHOUSE2F_FAIRYDOLL ; lost item
diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm
index 37c2f9264..4873e7981 100644
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const DANCETHEATRE_KIMONO_GIRL1
 	const DANCETHEATRE_KIMONO_GIRL2
 	const DANCETHEATRE_KIMONO_GIRL3
diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm
index 8b1c2a772..c9a7ac415 100644
--- a/maps/DarkCaveBlackthornEntrance.asm
+++ b/maps/DarkCaveBlackthornEntrance.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const DARKCAVEBLACKTHORNENTRANCE_PHARMACIST
 	const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL1
 	const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2
diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm
index 60b0b92bc..3050258ff 100644
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const DARKCAVEVIOLETENTRANCE_POKE_BALL1
 	const DARKCAVEVIOLETENTRANCE_ROCK1
 	const DARKCAVEVIOLETENTRANCE_ROCK2
diff --git a/maps/DayCare.asm b/maps/DayCare.asm
index f6d4b6693..6fad13a54 100644
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const DAYCARE_GRAMPS
 	const DAYCARE_GRANNY
 
diff --git a/maps/DayOfWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm
index c5d900300..6a3d59b77 100644
--- a/maps/DayOfWeekSiblingsHouse.asm
+++ b/maps/DayOfWeekSiblingsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const DAYOFWEEKSIBLINGSHOUSE_POKEDEX
 
 DayOfWeekSiblingsHouse_MapScripts:
diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm
index e1eaba04a..0de2befa4 100644
--- a/maps/DiglettsCave.asm
+++ b/maps/DiglettsCave.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const DIGLETTSCAVE_POKEFAN_M
 
 DiglettsCave_MapScripts:
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index 50baf8455..9d87efb33 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const DRAGONSHRINE_ELDER1
 	const DRAGONSHRINE_ELDER2
 	const DRAGONSHRINE_ELDER3
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index cb25c8603..36597835b 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const DRAGONSDENB1F_POKE_BALL1
 	const DRAGONSDENB1F_CLAIR
 	const DRAGONSDENB1F_SILVER
diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm
index 47e70add1..2d27c9c8f 100644
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const EARLSPOKEMONACADEMY_EARL
 	const EARLSPOKEMONACADEMY_YOUNGSTER1
 	const EARLSPOKEMONACADEMY_GAMEBOY_KID1
diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm
index 1fb53baf5..6f0960530 100644
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ECRUTEAKCITY_GRAMPS1
 	const ECRUTEAKCITY_GRAMPS2
 	const ECRUTEAKCITY_LASS1
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index 820fce044..4dad860bd 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ECRUTEAKGYM_MORTY
 	const ECRUTEAKGYM_SAGE1
 	const ECRUTEAKGYM_SAGE2
diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm
index 4f7400bfe..9836f2198 100644
--- a/maps/EcruteakItemfinderHouse.asm
+++ b/maps/EcruteakItemfinderHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ECRUTEAKITEMFINDERHOUSE_COOLTRAINER_M
 	const ECRUTEAKITEMFINDERHOUSE_POKEDEX
 
diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm
index 5a94ff6ec..caee5ddaa 100644
--- a/maps/EcruteakLugiaSpeechHouse.asm
+++ b/maps/EcruteakLugiaSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ECRUTEAKLUGIASPEECHHOUSE_GRAMPS
 	const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER
 
diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm
index 164a5f253..be43855ab 100644
--- a/maps/EcruteakMart.asm
+++ b/maps/EcruteakMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ECRUTEAKMART_CLERK
 	const ECRUTEAKMART_SUPER_NERD
 	const ECRUTEAKMART_GRANNY
diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm
index 9e1d409f5..022ecd13f 100644
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ECRUTEAKPOKECENTER1F_NURSE
 	const ECRUTEAKPOKECENTER1F_POKEFAN_M
 	const ECRUTEAKPOKECENTER1F_COOLTRAINER_F
diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm
index 933dbe52f..da281bf90 100644
--- a/maps/EcruteakTinTowerEntrance.asm
+++ b/maps/EcruteakTinTowerEntrance.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ECRUTEAKTINTOWERENTRANCE_SAGE1
 	const ECRUTEAKTINTOWERENTRANCE_SAGE2
 	const ECRUTEAKTINTOWERENTRANCE_SAGE3
diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm
index 16f1425fd..2adec1838 100644
--- a/maps/ElmsHouse.asm
+++ b/maps/ElmsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ELMSHOUSE_ELMS_WIFE
 	const ELMSHOUSE_ELMS_SON
 
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 965d84e66..bc8ce87a7 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ELMSLAB_ELM
 	const ELMSLAB_ELMS_AIDE
 	const ELMSLAB_POKE_BALL1
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index f61d95d61..4ccc1d56f 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const FASTSHIP1F_SAILOR1
 	const FASTSHIP1F_SAILOR2
 	const FASTSHIP1F_SAILOR3
diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm
index 91036b42c..a3a65c63f 100644
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const FASTSHIPB1F_SAILOR1
 	const FASTSHIPB1F_SAILOR2
 	const FASTSHIPB1F_SAILOR3
diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm
index 836caf2f3..719c7d4b2 100644
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_M
 	const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_F
 	const FASTSHIPCABINS_NNW_NNE_NE_SUPER_NERD
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index 14b67f576..a1e19be2c 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_CAPTAIN
 	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN
 	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1
diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm
index 6cf80814f..a6d898ff9 100644
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const FASTSHIPCABINS_SW_SSW_NW_FISHER
 	const FASTSHIPCABINS_SW_SSW_NW_BUG_CATCHER
 	const FASTSHIPCABINS_SW_SSW_NW_BUENA
diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm
index 5481b2581..6c8125dae 100644
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const FIGHTINGDOJO_BLACK_BELT
 	const FIGHTINGDOJO_POKE_BALL
 
diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm
index ac931c6c8..b76e574b6 100644
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const FUCHSIACITY_YOUNGSTER
 	const FUCHSIACITY_POKEFAN_M
 	const FUCHSIACITY_TEACHER
diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm
index c8d0c9929..402f89d23 100644
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const FUCHSIAGYM_JANINE
 	const FUCHSIAGYM_FUCHSIA_GYM_1
 	const FUCHSIAGYM_FUCHSIA_GYM_2
diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm
index b4b08bc14..0cb11eb56 100644
--- a/maps/FuchsiaMart.asm
+++ b/maps/FuchsiaMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const FUCHSIAMART_CLERK
 	const FUCHSIAMART_FISHER
 	const FUCHSIAMART_COOLTRAINER_F
diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm
index 1527a63aa..c7691e111 100644
--- a/maps/FuchsiaPokecenter1F.asm
+++ b/maps/FuchsiaPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const FUCHSIAPOKECENTER1F_NURSE
 	const FUCHSIAPOKECENTER1F_COOLTRAINER_M
 	const FUCHSIAPOKECENTER1F_COOLTRAINER_F
diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm
index 2b653e752..b5506e149 100644
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODBIKESHOP_CLERK
 
 GoldenrodBikeShop_MapScripts:
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 85788cd38..f69f86dea 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODCITY_POKEFAN_M1
 	const GOLDENRODCITY_YOUNGSTER1
 	const GOLDENRODCITY_COOLTRAINER_F1
diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm
index c6c8e3f11..50314f07a 100644
--- a/maps/GoldenrodDeptStore1F.asm
+++ b/maps/GoldenrodDeptStore1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODDEPTSTORE1F_RECEPTIONIST
 	const GOLDENRODDEPTSTORE1F_POKEFAN_F
 	const GOLDENRODDEPTSTORE1F_BUG_CATCHER
diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm
index 4171cd8d2..121937ad5 100644
--- a/maps/GoldenrodDeptStore2F.asm
+++ b/maps/GoldenrodDeptStore2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODDEPTSTORE2F_CLERK1
 	const GOLDENRODDEPTSTORE2F_CLERK2
 	const GOLDENRODDEPTSTORE2F_YOUNGSTER
diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm
index 62d084a37..951cb7965 100644
--- a/maps/GoldenrodDeptStore3F.asm
+++ b/maps/GoldenrodDeptStore3F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODDEPTSTORE3F_CLERK
 	const GOLDENRODDEPTSTORE3F_SUPER_NERD
 	const GOLDENRODDEPTSTORE3F_ROCKER
diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm
index 746ed8c4e..a671c44ce 100644
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODDEPTSTORE4F_CLERK
 	const GOLDENRODDEPTSTORE4F_COOLTRAINER_M
 	const GOLDENRODDEPTSTORE4F_BUG_CATCHER
diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm
index 9c7475e13..8708f52b0 100644
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODDEPTSTORE5F_CLERK
 	const GOLDENRODDEPTSTORE5F_LASS
 	const GOLDENRODDEPTSTORE5F_MIKE
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index afa67eece..a143bd758 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODDEPTSTORE6F_LASS
 	const GOLDENRODDEPTSTORE6F_SUPER_NERD
 
diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm
index 1db75499d..1de53a034 100644
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODDEPTSTOREB1F_POKE_BALL1
 	const GOLDENRODDEPTSTOREB1F_POKE_BALL2
 	const GOLDENRODDEPTSTOREB1F_POKE_BALL3
diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm
index 96c93abc6..90b0db3bf 100644
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODDEPTSTOREROOF_CLERK
 	const GOLDENRODDEPTSTOREROOF_POKEFAN_F
 	const GOLDENRODDEPTSTOREROOF_FISHER
diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm
index da4c6c3ee..9adf901c4 100644
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODFLOWERSHOP_TEACHER
 	const GOLDENRODFLOWERSHOP_FLORIA
 
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index 68bcbdc8b..823ea9907 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODGAMECORNER_CLERK
 	const GOLDENRODGAMECORNER_RECEPTIONIST1
 	const GOLDENRODGAMECORNER_RECEPTIONIST2
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
index 3b844fd62..fba07c9df 100644
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODGYM_WHITNEY
 	const GOLDENRODGYM_LASS1
 	const GOLDENRODGYM_LASS2
diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm
index 872a81414..7dc7e4f53 100644
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODHAPPINESSRATER_TEACHER
 	const GOLDENRODHAPPINESSRATER_POKEFAN_M
 	const GOLDENRODHAPPINESSRATER_TWIN
diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm
index e9f100d55..7c4af43a3 100644
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODMAGNETTRAINSTATION_OFFICER
 	const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN
 
diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm
index b7f0a52d8..f105e6826 100644
--- a/maps/GoldenrodNameRater.asm
+++ b/maps/GoldenrodNameRater.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODNAMERATER_NAME_RATER
 
 GoldenrodNameRater_MapScripts:
diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm
index 263d3a46e..61010b316 100644
--- a/maps/GoldenrodPPSpeechHouse.asm
+++ b/maps/GoldenrodPPSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODPPSPEECHHOUSE_FISHER
 	const GOLDENRODPPSPEECHHOUSE_LASS
 
diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm
index ca288ceca..162c0d04f 100644
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODPOKECENTER1F_NURSE
 	const GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
 	const GOLDENRODPOKECENTER1F_GAMEBOY_KID
diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm
index 2a026b551..46d01a4d8 100644
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODUNDERGROUND_SUPER_NERD1
 	const GOLDENRODUNDERGROUND_SUPER_NERD2
 	const GOLDENRODUNDERGROUND_SUPER_NERD3
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index 62eeb9356..f8476e0f4 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -31,7 +31,7 @@ doorstate: MACRO
 	changeblock UGDOOR_\1_YCOORD, UGDOOR_\1_XCOORD, UNDERGROUND_DOOR_\2
 ENDM
 
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST1
 	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST2
 	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET1
diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm
index 0bfb3bf99..99785528e 100644
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET1
 	const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET2
 	const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET3
diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm
index 201b72021..ca307d98e 100644
--- a/maps/GuideGentsHouse.asm
+++ b/maps/GuideGentsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const GUIDEGENTSHOUSE_GRAMPS
 
 GuideGentsHouse_MapScripts:
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index 1c68545db..55c856de4 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const HALLOFFAME_LANCE
 
 HallOfFame_MapScripts:
diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm
index 82676465a..dd76d5597 100644
--- a/maps/IcePath1F.asm
+++ b/maps/IcePath1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ICEPATH1F_POKE_BALL1
 	const ICEPATH1F_POKE_BALL2
 	const ICEPATH1F_POKE_BALL3
diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm
index 3c33bc44c..9dfe2fc3d 100644
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ICEPATHB1F_BOULDER1
 	const ICEPATHB1F_BOULDER2
 	const ICEPATHB1F_BOULDER3
diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm
index 22be3224a..86a171820 100644
--- a/maps/IcePathB2FBlackthornSide.asm
+++ b/maps/IcePathB2FBlackthornSide.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL
 
 IcePathB2FBlackthornSide_MapScripts:
diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm
index c0299be4b..61f38c1d3 100644
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ICEPATHB2FMAHOGANYSIDE_BOULDER1
 	const ICEPATHB2FMAHOGANYSIDE_BOULDER2
 	const ICEPATHB2FMAHOGANYSIDE_BOULDER3
diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm
index b6234ffdb..352db71ed 100644
--- a/maps/IcePathB3F.asm
+++ b/maps/IcePathB3F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ICEPATHB3F_POKE_BALL
 	const ICEPATHB3F_ROCK
 
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index 840c7094e..25ebe0c42 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ILEXFOREST_FARFETCHD
 	const ILEXFOREST_YOUNGSTER1
 	const ILEXFOREST_BLACK_BELT
diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm
index 3c403c33f..881b58640 100644
--- a/maps/IlexForestAzaleaGate.asm
+++ b/maps/IlexForestAzaleaGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ILEXFORESTAZALEAGATE_OFFICER
 	const ILEXFORESTAZALEAGATE_GRANNY
 
diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm
index 49c661f95..9f820c967 100644
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const INDIGOPLATEAUPOKECENTER1F_NURSE
 	const INDIGOPLATEAUPOKECENTER1F_CLERK
 	const INDIGOPLATEAUPOKECENTER1F_COOLTRAINER_M
diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
index cb06c84d7..badcaf0b8 100644
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const KARENSROOM_KAREN
 
 KarensRoom_MapScripts:
diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
index 193ffe768..bf05e7623 100644
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const KOGASROOM_KOGA
 
 KogasRoom_MapScripts:
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index e150d2395..ae04c5814 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const KURTSHOUSE_KURT1
 	const KURTSHOUSE_TWIN1
 	const KURTSHOUSE_SLOWPOKE
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm
index 10e6d2c3e..1130ccd21 100644
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const LAKEOFRAGE_LANCE
 	const LAKEOFRAGE_GRAMPS
 	const LAKEOFRAGE_SUPER_NERD1
diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm
index de5294793..d6235e606 100644
--- a/maps/LakeOfRageHiddenPowerHouse.asm
+++ b/maps/LakeOfRageHiddenPowerHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER
 
 LakeOfRageHiddenPowerHouse_MapScripts:
diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm
index 683caae26..c08414e9c 100644
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU
 
 LakeOfRageMagikarpHouse_MapScripts:
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index 13c95305b..5873e601f 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const LANCESROOM_LANCE
 	const LANCESROOM_MARY
 	const LANCESROOM_OAK
diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm
index 6787d7889..4d3e18175 100644
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const LAVRADIOTOWER1F_RECEPTIONIST
 	const LAVRADIOTOWER1F_OFFICER
 	const LAVRADIOTOWER1F_SUPER_NERD1
diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm
index 41a9b9291..3a391a529 100644
--- a/maps/LavenderMart.asm
+++ b/maps/LavenderMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const LAVENDERMART_CLERK
 	const LAVENDERMART_POKEFAN_M
 	const LAVENDERMART_ROCKER
diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm
index 10da518dd..b3ddfd158 100644
--- a/maps/LavenderNameRater.asm
+++ b/maps/LavenderNameRater.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const LAVENDERNAMERATER_NAME_RATER
 
 LavenderNameRater_MapScripts:
diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm
index 33c910a16..e18e2f5b7 100644
--- a/maps/LavenderPokecenter1F.asm
+++ b/maps/LavenderPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const LAVENDERPOKECENTER1F_NURSE
 	const LAVENDERPOKECENTER1F_GENTLEMAN
 	const LAVENDERPOKECENTER1F_TEACHER
diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm
index 8c036236d..73f159b02 100644
--- a/maps/LavenderSpeechHouse.asm
+++ b/maps/LavenderSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const LAVENDERSPEECHHOUSE_POKEFAN_F
 
 LavenderSpeechHouse_MapScripts:
diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm
index 6a43962d9..f528e90c9 100644
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const LAVENDERTOWN_POKEFAN_M
 	const LAVENDERTOWN_TEACHER
 	const LAVENDERTOWN_GRAMPS
diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm
index 34512ea99..1dd398448 100644
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const MAHOGANYGYM_PRYCE
 	const MAHOGANYGYM_BUENA1
 	const MAHOGANYGYM_ROCKER1
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index 9a1da5330..0ea9e0348 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const MAHOGANYMART1F_PHARMACIST
 	const MAHOGANYMART1F_BLACK_BELT
 	const MAHOGANYMART1F_LANCE
diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm
index f7be3cde7..affae9afc 100644
--- a/maps/MahoganyPokecenter1F.asm
+++ b/maps/MahoganyPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const MAHOGANYPOKECENTER1F_NURSE
 	const MAHOGANYPOKECENTER1F_POKEFAN_M
 	const MAHOGANYPOKECENTER1F_YOUNGSTER
diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm
index c80c902f7..51e895be6 100644
--- a/maps/MahoganyRedGyaradosSpeechHouse.asm
+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const MAHOGANYREDGYARADOSSPEECHHOUSE_BLACK_BELT
 	const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER
 
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index ac5639ebc..4058a85dc 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const MAHOGANYTOWN_POKEFAN_M
 	const MAHOGANYTOWN_GRAMPS
 	const MAHOGANYTOWN_FISHER
diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm
index 5bef1bf6f..5dd992685 100644
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const MANIASHOUSE_ROCKER
 
 ManiasHouse_MapScripts:
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index 1c00e6dbf..528192eb0 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const MOUNTMOON_SILVER
 
 MountMoon_MapScripts:
diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm
index be6a195ac..f4bc75cca 100644
--- a/maps/MountMoonGiftShop.asm
+++ b/maps/MountMoonGiftShop.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const MOUNTMOONGIFTSHOP_GRAMPS1 ; morning only
 	const MOUNTMOONGIFTSHOP_GRAMPS2 ; day only
 	const MOUNTMOONGIFTSHOP_LASS1 ; morning only
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index e264bb1eb..f11f0e9ad 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const MOUNTMOONSQUARE_FAIRY1
 	const MOUNTMOONSQUARE_FAIRY2
 	const MOUNTMOONSQUARE_ROCK
diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm
index 24074d061..d52255cac 100644
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const MOUNTMORTAR1FINSIDE_BOULDER
 	const MOUNTMORTAR1FINSIDE_POKE_BALL1
 	const MOUNTMORTAR1FINSIDE_POKE_BALL2
diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm
index 8c3c63164..7b4f6ef4d 100644
--- a/maps/MountMortar1FOutside.asm
+++ b/maps/MountMortar1FOutside.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const MOUNTMORTAR1FOUTSIDE_POKE_BALL1
 	const MOUNTMORTAR1FOUTSIDE_POKE_BALL2
 
diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm
index 7f70c89aa..b03e6eeba 100644
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const MOUNTMORTAR2FINSIDE_POKE_BALL1
 	const MOUNTMORTAR2FINSIDE_POKE_BALL2
 	const MOUNTMORTAR2FINSIDE_POKE_BALL3
diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm
index de30974ad..3e0c96912 100644
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const MOUNTMORTARB1F_POKE_BALL1
 	const MOUNTMORTARB1F_POKE_BALL2
 	const MOUNTMORTARB1F_BOULDER
diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm
index e61ba452e..7761cea57 100644
--- a/maps/MoveDeletersHouse.asm
+++ b/maps/MoveDeletersHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const MOVEDELETERSHOUSE_SUPER_NERD
 
 MoveDeletersHouse_MapScripts:
diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm
index 9ed6bd18e..731001d7f 100644
--- a/maps/MrFujisHouse.asm
+++ b/maps/MrFujisHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const MRFUJISHOUSE_SUPER_NERD
 	const MRFUJISHOUSE_LASS
 	const MRFUJISHOUSE_PSYDUCK
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index c23deb54f..ab62fc3f7 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const MRPOKEMONSHOUSE_GENTLEMAN
 	const MRPOKEMONSHOUSE_OAK
 
diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm
index 75c7f6a59..d7c6eb4da 100644
--- a/maps/MrPsychicsHouse.asm
+++ b/maps/MrPsychicsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const MRPSYCHICSHOUSE_FISHING_GURU
 
 MrPsychicsHouse_MapScripts:
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index 6118f507c..681ea96f8 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const NATIONALPARK_LASS1
 	const NATIONALPARK_POKEFAN_F1
 	const NATIONALPARK_TEACHER1
diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm
index 616446d9a..5161cf8bf 100644
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const NATIONALPARKBUGCONTEST_YOUNGSTER1
 	const NATIONALPARKBUGCONTEST_YOUNGSTER2
 	const NATIONALPARKBUGCONTEST_ROCKER
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index 40b241392..6e59a96db 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const NEWBARKTOWN_TEACHER
 	const NEWBARKTOWN_FISHER
 	const NEWBARKTOWN_SILVER
diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm
index 913128d75..c3f714aa2 100644
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const OAKSLAB_OAK
 	const OAKSLAB_SCIENTIST1
 	const OAKSLAB_SCIENTIST2
diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm
index 0128a216b..e6f9e3696 100644
--- a/maps/OlivineCafe.asm
+++ b/maps/OlivineCafe.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const OLIVINECAFE_SAILOR1
 	const OLIVINECAFE_FISHING_GURU
 	const OLIVINECAFE_SAILOR2
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index e44801fa8..635f0ab0d 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const OLIVINECITY_SAILOR1
 	const OLIVINECITY_STANDING_YOUNGSTER
 	const OLIVINECITY_SAILOR2
diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm
index 3134ac531..3aecc8590 100644
--- a/maps/OlivineGoodRodHouse.asm
+++ b/maps/OlivineGoodRodHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const OLIVINEGOODRODHOUSE_FISHING_GURU
 
 OlivineGoodRodHouse_MapScripts:
diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm
index 01ac72662..2bc723c31 100644
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const OLIVINEGYM_JASMINE
 	const OLIVINEGYM_GYM_GUY
 
diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm
index 5cdebfef2..1e50ada20 100644
--- a/maps/OlivineHouseBeta.asm
+++ b/maps/OlivineHouseBeta.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const OLIVINEHOUSEBETA_TEACHER
 	const OLIVINEHOUSEBETA_RHYDON
 
diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm
index f8da48801..6fa52b850 100644
--- a/maps/OlivineLighthouse1F.asm
+++ b/maps/OlivineLighthouse1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const OLIVINELIGHTHOUSE1F_SAILOR
 	const OLIVINELIGHTHOUSE1F_POKEFAN_F
 
diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm
index f1e087d50..51a814a72 100644
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const OLIVINELIGHTHOUSE2F_SAILOR
 	const OLIVINELIGHTHOUSE2F_GENTLEMAN
 
diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm
index 55211a8c7..cd8f54b33 100644
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const OLIVINELIGHTHOUSE3F_SAILOR
 	const OLIVINELIGHTHOUSE3F_GENTLEMAN
 	const OLIVINELIGHTHOUSE3F_YOUNGSTER
diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm
index db4eb73ac..8bcd055b5 100644
--- a/maps/OlivineLighthouse4F.asm
+++ b/maps/OlivineLighthouse4F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const OLIVINELIGHTHOUSE4F_SAILOR
 	const OLIVINELIGHTHOUSE4F_LASS
 
diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm
index 77c155eb1..7b1df8982 100644
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const OLIVINELIGHTHOUSE5F_SAILOR
 	const OLIVINELIGHTHOUSE5F_YOUNGSTER
 	const OLIVINELIGHTHOUSE5F_POKE_BALL1
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index b644924b2..a8f600b99 100644
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const OLIVINELIGHTHOUSE6F_JASMINE
 	const OLIVINELIGHTHOUSE6F_MONSTER
 	const OLIVINELIGHTHOUSE6F_POKE_BALL
diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm
index 36c0bd826..78bcb1aee 100644
--- a/maps/OlivineMart.asm
+++ b/maps/OlivineMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const OLIVINEMART_CLERK
 	const OLIVINEMART_COOLTRAINER_F
 	const OLIVINEMART_LASS
diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm
index ff9bbcc98..b9fa1cc44 100644
--- a/maps/OlivinePokecenter1F.asm
+++ b/maps/OlivinePokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const OLIVINEPOKECENTER1F_NURSE
 	const OLIVINEPOKECENTER1F_FISHING_GURU
 	const OLIVINEPOKECENTER1F_FISHER
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index e6b74b315..caccd4241 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const OLIVINEPORT_SAILOR1
 	const OLIVINEPORT_SAILOR2
 	const OLIVINEPORT_SAILOR3
diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm
index 913dad068..63298a665 100644
--- a/maps/OlivinePortPassage.asm
+++ b/maps/OlivinePortPassage.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const OLIVINEPORTPASSAGE_POKEFAN_M
 
 OlivinePortPassage_MapScripts:
diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm
index 1989e222b..d11c76af1 100644
--- a/maps/OlivinePunishmentSpeechHouse.asm
+++ b/maps/OlivinePunishmentSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const OLIVINEPUNISHMENTSPEECHHOUSE_POKEFAN_M
 	const OLIVINEPUNISHMENTSPEECHHOUSE_LASS
 
diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm
index 497e60f07..9c59d5cda 100644
--- a/maps/OlivineTimsHouse.asm
+++ b/maps/OlivineTimsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const OLIVINETIMSHOUSE_TIM
 
 OlivineTimsHouse_MapScripts:
diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm
index 90ca2bbb4..94b383489 100644
--- a/maps/PalletTown.asm
+++ b/maps/PalletTown.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const PALLETTOWN_TEACHER
 	const PALLETTOWN_FISHER
 
diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm
index 71e7e642e..996c5b935 100644
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const PEWTERCITY_COOLTRAINER_F
 	const PEWTERCITY_BUG_CATCHER
 	const PEWTERCITY_GRAMPS
diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm
index 17e634a34..546736b6e 100644
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const PEWTERGYM_BROCK
 	const PEWTERGYM_YOUNGSTER
 	const PEWTERGYM_GYM_GUY
diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm
index 8445f0340..a747a1918 100644
--- a/maps/PewterMart.asm
+++ b/maps/PewterMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const PEWTERMART_CLERK
 	const PEWTERMART_YOUNGSTER
 	const PEWTERMART_SUPER_NERD
diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm
index ffa5fa414..4e7f83863 100644
--- a/maps/PewterNidoranSpeechHouse.asm
+++ b/maps/PewterNidoranSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const PEWTERNIDORANSPEECHHOUSE_SUPER_NERD
 	const PEWTERNIDORANSPEECHHOUSE_NIDORAN_M
 
diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm
index dcfa043d4..e81178f07 100644
--- a/maps/PewterPokecenter1F.asm
+++ b/maps/PewterPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const PEWTERPOKECENTER1F_NURSE
 	const PEWTERPOKECENTER1F_TEACHER
 	const PEWTERPOKECENTER1F_JIGGLYPUFF
diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm
index 2229b884d..56b317e98 100644
--- a/maps/PewterSnoozeSpeechHouse.asm
+++ b/maps/PewterSnoozeSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const PEWTERSNOOZESPEECHHOUSE_GRAMPS
 
 PewterSnoozeSpeechHouse_MapScripts:
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index 39400f2cc..2850ee979 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const PLAYERSHOUSE1F_MOM1
 	const PLAYERSHOUSE1F_MOM2
 	const PLAYERSHOUSE1F_MOM3
diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm
index 2e3683600..3709184bf 100644
--- a/maps/PlayersHouse2F.asm
+++ b/maps/PlayersHouse2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const PLAYERSHOUSE2F_CONSOLE
 	const PLAYERSHOUSE2F_DOLL_1
 	const PLAYERSHOUSE2F_DOLL_2
diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm
index 196fc9fe6..377062191 100644
--- a/maps/PlayersNeighborsHouse.asm
+++ b/maps/PlayersNeighborsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const PLAYERSNEIGHBORSHOUSE_COOLTRAINER_F
 	const PLAYERSNEIGHBORSHOUSE_POKEFAN_F
 
diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm
index ecbff92aa..ae709ef8a 100644
--- a/maps/PokeSeersHouse.asm
+++ b/maps/PokeSeersHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const POKESEERSHOUSE_GRANNY
 
 PokeSeersHouse_MapScripts:
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 21bedbac5..cd890bc94 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const POKECENTER2F_TRADE_RECEPTIONIST
 	const POKECENTER2F_BATTLE_RECEPTIONIST
 	const POKECENTER2F_TIME_CAPSULE_RECEPTIONIST
diff --git a/maps/PokecomCenterAdminRoomMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm
index 873057f13..f201f90d6 100644
--- a/maps/PokecomCenterAdminRoomMobile.asm
+++ b/maps/PokecomCenterAdminRoomMobile.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const POKECOMCENTERADMINROOMMOBILE_SCIENTIST1
 	const POKECOMCENTERADMINROOMMOBILE_SCIENTIST2
 	const POKECOMCENTERADMINROOMMOBILE_SCIENTIST3
diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm
index 8d14c094f..e39103888 100644
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const POKEMONFANCLUB_GENTLEMAN
 	const POKEMONFANCLUB_RECEPTIONIST
 	const POKEMONFANCLUB_FISHER
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index 30fab8d5b..ea01312ec 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const POWERPLANT_OFFICER1
 	const POWERPLANT_GYM_GUY1
 	const POWERPLANT_GYM_GUY2
diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm
index 5f89c1118..c19fbcbd2 100644
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const RADIOTOWER1F_RECEPTIONIST
 	const RADIOTOWER1F_LASS
 	const RADIOTOWER1F_YOUNGSTER
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
index 5a590f02b..12360c4c2 100644
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const RADIOTOWER2F_SUPER_NERD
 	const RADIOTOWER2F_TEACHER
 	const RADIOTOWER2F_ROCKET1
diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm
index 126538721..666b2eba0 100644
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const RADIOTOWER3F_SUPER_NERD
 	const RADIOTOWER3F_GYM_GUY
 	const RADIOTOWER3F_COOLTRAINER_F
diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm
index 21299684a..0ef1fc1a4 100644
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const RADIOTOWER4F_FISHER
 	const RADIOTOWER4F_TEACHER
 	const RADIOTOWER4F_GROWLITHE
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index 2cfc77eea..ae3e22b88 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const RADIOTOWER5F_DIRECTOR
 	const RADIOTOWER5F_ROCKET
 	const RADIOTOWER5F_ROCKET_GIRL
diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm
index e18f0dc87..6e0e33ba6 100644
--- a/maps/RedsHouse1F.asm
+++ b/maps/RedsHouse1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const REDSHOUSE1F_REDS_MOM
 
 RedsHouse1F_MapScripts:
diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm
index ea80ca780..85c5233b2 100644
--- a/maps/RockTunnel1F.asm
+++ b/maps/RockTunnel1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROCKTUNNEL1F_POKE_BALL1
 	const ROCKTUNNEL1F_POKE_BALL2
 
diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm
index 47090d74c..48f7ecb0b 100644
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROCKTUNNELB1F_POKE_BALL1
 	const ROCKTUNNELB1F_POKE_BALL2
 	const ROCKTUNNELB1F_POKE_BALL3
diff --git a/maps/Route1.asm b/maps/Route1.asm
index 68b96f274..de43075b5 100644
--- a/maps/Route1.asm
+++ b/maps/Route1.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE1_YOUNGSTER
 	const ROUTE1_COOLTRAINER_F
 	const ROUTE1_FRUIT_TREE
diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm
index 54d489b59..ebddd0133 100644
--- a/maps/Route10Pokecenter1F.asm
+++ b/maps/Route10Pokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE10POKECENTER1F_NURSE
 	const ROUTE10POKECENTER1F_GENTLEMAN
 	const ROUTE10POKECENTER1F_GYM_GUY
diff --git a/maps/Route10South.asm b/maps/Route10South.asm
index de5b899d0..fa8dcbe8a 100644
--- a/maps/Route10South.asm
+++ b/maps/Route10South.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE10SOUTH_POKEFAN_M1
 	const ROUTE10SOUTH_POKEFAN_M2
 
diff --git a/maps/Route11.asm b/maps/Route11.asm
index c2c5c3912..d1bd97060 100644
--- a/maps/Route11.asm
+++ b/maps/Route11.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE11_YOUNGSTER1
 	const ROUTE11_YOUNGSTER2
 	const ROUTE11_YOUNGSTER3
diff --git a/maps/Route12.asm b/maps/Route12.asm
index 955f2803a..73d2a9b73 100644
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE12_FISHER1
 	const ROUTE12_FISHER2
 	const ROUTE12_FISHER3
diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm
index 5599ebe18..ea4bcd2d7 100644
--- a/maps/Route12SuperRodHouse.asm
+++ b/maps/Route12SuperRodHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE12SUPERRODHOUSE_FISHING_GURU
 
 Route12SuperRodHouse_MapScripts:
diff --git a/maps/Route13.asm b/maps/Route13.asm
index 60a9e7998..a61770be8 100644
--- a/maps/Route13.asm
+++ b/maps/Route13.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE13_YOUNGSTER1
 	const ROUTE13_YOUNGSTER2
 	const ROUTE13_POKEFAN_M1
diff --git a/maps/Route14.asm b/maps/Route14.asm
index 17d576c17..0db21d474 100644
--- a/maps/Route14.asm
+++ b/maps/Route14.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE14_POKEFAN_M1
 	const ROUTE14_YOUNGSTER
 	const ROUTE14_POKEFAN_M2
diff --git a/maps/Route15.asm b/maps/Route15.asm
index 1d855de73..437eb3925 100644
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE15_YOUNGSTER1
 	const ROUTE15_YOUNGSTER2
 	const ROUTE15_YOUNGSTER3
diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm
index 59fbf8c78..c9d237a00 100644
--- a/maps/Route15FuchsiaGate.asm
+++ b/maps/Route15FuchsiaGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE15FUCHSIAGATE_OFFICER
 
 Route15FuchsiaGate_MapScripts:
diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm
index 0d3a47d0b..b65c1037b 100644
--- a/maps/Route16FuchsiaSpeechHouse.asm
+++ b/maps/Route16FuchsiaSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD
 
 Route16FuchsiaSpeechHouse_MapScripts:
diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm
index b42875e79..57b298f08 100644
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE16GATE_OFFICER
 
 Route16Gate_MapScripts:
diff --git a/maps/Route17.asm b/maps/Route17.asm
index 34c150bac..410d7bbd0 100644
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE17_BIKER1
 	const ROUTE17_BIKER2
 	const ROUTE17_BIKER3
diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm
index c778c4c11..bed797ff7 100644
--- a/maps/Route17Route18Gate.asm
+++ b/maps/Route17Route18Gate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE17ROUTE18GATE_OFFICER
 
 Route17Route18Gate_MapScripts:
diff --git a/maps/Route18.asm b/maps/Route18.asm
index d6b858bc6..70ff5368a 100644
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE18_YOUNGSTER1
 	const ROUTE18_YOUNGSTER2
 
diff --git a/maps/Route19.asm b/maps/Route19.asm
index 3d1d7fbb8..13e111726 100644
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE19_SWIMMER_GIRL
 	const ROUTE19_SWIMMER_GUY1
 	const ROUTE19_SWIMMER_GUY2
diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm
index 9357f6efe..3673b2908 100644
--- a/maps/Route19FuchsiaGate.asm
+++ b/maps/Route19FuchsiaGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE19FUCHSIAGATE_OFFICER
 
 Route19FuchsiaGate_MapScripts:
diff --git a/maps/Route2.asm b/maps/Route2.asm
index 694a5feec..8c8a2b95f 100644
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE2_BUG_CATCHER1
 	const ROUTE2_BUG_CATCHER2
 	const ROUTE2_BUG_CATCHER3
diff --git a/maps/Route20.asm b/maps/Route20.asm
index 3ffc6a6a8..91145b8ea 100644
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE20_SWIMMER_GIRL1
 	const ROUTE20_SWIMMER_GIRL2
 	const ROUTE20_SWIMMER_GUY
diff --git a/maps/Route21.asm b/maps/Route21.asm
index b6bc080f8..a2bfc3348 100644
--- a/maps/Route21.asm
+++ b/maps/Route21.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE21_SWIMMER_GIRL
 	const ROUTE21_SWIMMER_GUY
 	const ROUTE21_FISHER
diff --git a/maps/Route24.asm b/maps/Route24.asm
index 6ad4d81ec..c1e701d01 100644
--- a/maps/Route24.asm
+++ b/maps/Route24.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE24_ROCKET
 
 Route24_MapScripts:
diff --git a/maps/Route25.asm b/maps/Route25.asm
index a0cc96cbd..e4c7efda5 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE25_MISTY
 	const ROUTE25_COOLTRAINER_M1
 	const ROUTE25_YOUNGSTER1
diff --git a/maps/Route26.asm b/maps/Route26.asm
index ae2010817..08037328a 100644
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE26_COOLTRAINER_M1
 	const ROUTE26_COOLTRAINER_M2
 	const ROUTE26_COOLTRAINER_F1
diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm
index b85d9820d..7d92969e6 100644
--- a/maps/Route26HealHouse.asm
+++ b/maps/Route26HealHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE26HEALHOUSE_TEACHER
 
 Route26HealHouse_MapScripts:
diff --git a/maps/Route27.asm b/maps/Route27.asm
index 5ecaf3db2..8d7d81d9e 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE27_COOLTRAINER_M1
 	const ROUTE27_COOLTRAINER_M2
 	const ROUTE27_COOLTRAINER_F1
diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm
index 1007e9074..71acec3de 100644
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE27SANDSTORMHOUSE_GRANNY
 
 Route27SandstormHouse_MapScripts:
diff --git a/maps/Route28SteelWingHouse.asm b/maps/Route28SteelWingHouse.asm
index 0d1cae45b..88ff3d0d4 100644
--- a/maps/Route28SteelWingHouse.asm
+++ b/maps/Route28SteelWingHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE28STEELWINGHOUSE_CELEBRITY
 	const ROUTE28STEELWINGHOUSE_FEAROW
 
diff --git a/maps/Route29.asm b/maps/Route29.asm
index 63bd7b7be..3b07029f7 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE29_COOLTRAINER_M1
 	const ROUTE29_YOUNGSTER
 	const ROUTE29_TEACHER1
diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm
index 15e5bbb8e..41955f82c 100644
--- a/maps/Route29Route46Gate.asm
+++ b/maps/Route29Route46Gate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE29ROUTE46GATE_OFFICER
 	const ROUTE29ROUTE46GATE_YOUNGSTER
 
diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm
index 7a80d9424..6556ab8b7 100644
--- a/maps/Route2Gate.asm
+++ b/maps/Route2Gate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE2GATE_SCIENTIST
 
 Route2Gate_MapScripts:
diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm
index 58e862beb..5ad1dac2e 100644
--- a/maps/Route2NuggetHouse.asm
+++ b/maps/Route2NuggetHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE2NUGGETHOUSE_FISHER
 
 Route2NuggetHouse_MapScripts:
diff --git a/maps/Route3.asm b/maps/Route3.asm
index b77d3d5df..72a8848c8 100644
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE3_FISHER1
 	const ROUTE3_YOUNGSTER1
 	const ROUTE3_YOUNGSTER2
diff --git a/maps/Route30.asm b/maps/Route30.asm
index fa8448aa6..e26c6fe26 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE30_YOUNGSTER1
 	const ROUTE30_YOUNGSTER2
 	const ROUTE30_YOUNGSTER3
diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm
index 3baad0209..e1c17a11a 100644
--- a/maps/Route30BerryHouse.asm
+++ b/maps/Route30BerryHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE30BERRYHOUSE_POKEFAN_M
 
 Route30BerryHouse_MapScripts:
diff --git a/maps/Route31.asm b/maps/Route31.asm
index e30e56600..e47a2a7f1 100644
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE31_FISHER
 	const ROUTE31_YOUNGSTER
 	const ROUTE31_BUG_CATCHER
diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm
index 4a3912567..72783eb79 100644
--- a/maps/Route31VioletGate.asm
+++ b/maps/Route31VioletGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE31VIOLETGATE_OFFICER
 	const ROUTE31VIOLETGATE_COOLTRAINER_F
 
diff --git a/maps/Route32.asm b/maps/Route32.asm
index 54fa28ddd..e445cedfb 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE32_FISHER1
 	const ROUTE32_FISHER2
 	const ROUTE32_FISHER3
diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm
index 186fe7934..fef720d3b 100644
--- a/maps/Route32Pokecenter1F.asm
+++ b/maps/Route32Pokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE32POKECENTER1F_NURSE
 	const ROUTE32POKECENTER1F_FISHING_GURU
 	const ROUTE32POKECENTER1F_COOLTRAINER_F
diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm
index c35c5a752..bada251da 100644
--- a/maps/Route32RuinsOfAlphGate.asm
+++ b/maps/Route32RuinsOfAlphGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE32RUINSOFALPHGATE_OFFICER
 	const ROUTE32RUINSOFALPHGATE_POKEFAN_M
 	const ROUTE32RUINSOFALPHGATE_YOUNGSTER
diff --git a/maps/Route33.asm b/maps/Route33.asm
index d54b01f81..71608ce8f 100644
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE33_POKEFAN_M
 	const ROUTE33_LASS
 	const ROUTE33_FRUIT_TREE
diff --git a/maps/Route34.asm b/maps/Route34.asm
index ba757f877..dcd079d73 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE34_YOUNGSTER1
 	const ROUTE34_YOUNGSTER2
 	const ROUTE34_YOUNGSTER3
diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
index 7d885a569..e689a5cd1 100644
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE34ILEXFORESTGATE_TEACHER1
 	const ROUTE34ILEXFORESTGATE_BUTTERFREE
 	const ROUTE34ILEXFORESTGATE_LASS
diff --git a/maps/Route35.asm b/maps/Route35.asm
index a73738072..1d40dd1e6 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE35_YOUNGSTER1
 	const ROUTE35_YOUNGSTER2
 	const ROUTE35_LASS1
diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm
index f09ad646f..7f52d0d36 100644
--- a/maps/Route35GoldenrodGate.asm
+++ b/maps/Route35GoldenrodGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE35GOLDENRODGATE_OFFICER
 	const ROUTE35GOLDENRODGATE_POKEFAN_F
 	const ROUTE35GOLDENRODGATE_FISHER
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index 94eca4488..afec3d1bc 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE35NATIONALPARKGATE_OFFICER1
 	const ROUTE35NATIONALPARKGATE_YOUNGSTER
 	const ROUTE35NATIONALPARKGATE_OFFICER2
diff --git a/maps/Route36.asm b/maps/Route36.asm
index 3cfbd4df5..6483f865f 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE36_YOUNGSTER1
 	const ROUTE36_YOUNGSTER2
 	const ROUTE36_WEIRD_TREE
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index cf1e0b798..014d4b499 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE36NATIONALPARKGATE_OFFICER1
 	const ROUTE36NATIONALPARKGATE_YOUNGSTER1
 	const ROUTE36NATIONALPARKGATE_YOUNGSTER2
diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm
index 0f5519d9e..87a357167 100644
--- a/maps/Route36RuinsOfAlphGate.asm
+++ b/maps/Route36RuinsOfAlphGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE36RUINSOFALPHGATE_OFFICER
 	const ROUTE36RUINSOFALPHGATE_GRAMPS
 
diff --git a/maps/Route37.asm b/maps/Route37.asm
index 7712903a6..7e7d14753 100644
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE37_WEIRD_TREE1
 	const ROUTE37_WEIRD_TREE2
 	const ROUTE37_YOUNGSTER
diff --git a/maps/Route38.asm b/maps/Route38.asm
index cda7a868b..b604bcede 100644
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE38_STANDING_YOUNGSTER1
 	const ROUTE38_LASS
 	const ROUTE38_STANDING_YOUNGSTER2
diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm
index f9912b625..6dcd59c73 100644
--- a/maps/Route38EcruteakGate.asm
+++ b/maps/Route38EcruteakGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE38ECRUTEAKGATE_OFFICER
 
 Route38EcruteakGate_MapScripts:
diff --git a/maps/Route39.asm b/maps/Route39.asm
index 4af19cb69..24d536aae 100644
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE39_SAILOR
 	const ROUTE39_POKEFAN_M
 	const ROUTE39_POKEFAN_F1
diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm
index 7a41f9086..2b6e949fb 100644
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE39BARN_TWIN1
 	const ROUTE39BARN_TWIN2
 	const ROUTE39BARN_MOOMOO
diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm
index d2622a4bf..18cebb4e1 100644
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE39FARMHOUSE_POKEFAN_M
 	const ROUTE39FARMHOUSE_POKEFAN_F
 
diff --git a/maps/Route4.asm b/maps/Route4.asm
index 61f245289..c7fac12eb 100644
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE4_YOUNGSTER
 	const ROUTE4_LASS1
 	const ROUTE4_LASS2
diff --git a/maps/Route40.asm b/maps/Route40.asm
index 780a7ca86..ea55d433a 100644
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE40_OLIVINE_RIVAL1
 	const ROUTE40_OLIVINE_RIVAL2
 	const ROUTE40_SWIMMER_GIRL1
diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm
index 98ce051bf..5e09612cf 100644
--- a/maps/Route40BattleTowerGate.asm
+++ b/maps/Route40BattleTowerGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE40BATTLETOWERGATE_ROCKER
 	const ROUTE40BATTLETOWERGATE_TWIN
 
diff --git a/maps/Route41.asm b/maps/Route41.asm
index 5da9216fb..c3eb56ca4 100644
--- a/maps/Route41.asm
+++ b/maps/Route41.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE41_OLIVINE_RIVAL1
 	const ROUTE41_OLIVINE_RIVAL2
 	const ROUTE41_OLIVINE_RIVAL3
diff --git a/maps/Route42.asm b/maps/Route42.asm
index f86a091ce..44121b503 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE42_FISHER
 	const ROUTE42_POKEFAN_M
 	const ROUTE42_SUPER_NERD
diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm
index 4a15d5042..1c5a13e38 100644
--- a/maps/Route42EcruteakGate.asm
+++ b/maps/Route42EcruteakGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE42ECRUTEAKGATE_OFFICER
 
 Route42EcruteakGate_MapScripts:
diff --git a/maps/Route43.asm b/maps/Route43.asm
index 229cf419e..90919060a 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE43_SUPER_NERD1
 	const ROUTE43_SUPER_NERD2
 	const ROUTE43_SUPER_NERD3
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index b244ea2aa..08d109c12 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -1,6 +1,6 @@
 ROUTE43GATE_TOLL EQU 1000
 
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE43GATE_OFFICER
 	const ROUTE43GATE_ROCKET1
 	const ROUTE43GATE_ROCKET2
diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm
index 0aa77bd26..d69265e6c 100644
--- a/maps/Route43MahoganyGate.asm
+++ b/maps/Route43MahoganyGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE43MAHOGANYGATE_OFFICER
 
 Route43MahoganyGate_MapScripts:
diff --git a/maps/Route44.asm b/maps/Route44.asm
index c088cd087..978f8e976 100644
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE44_FISHER1
 	const ROUTE44_FISHER2
 	const ROUTE44_YOUNGSTER1
diff --git a/maps/Route45.asm b/maps/Route45.asm
index 6c83d67a1..47aa5649c 100644
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE45_POKEFAN_M1
 	const ROUTE45_POKEFAN_M2
 	const ROUTE45_POKEFAN_M3
diff --git a/maps/Route46.asm b/maps/Route46.asm
index f464b3257..33a8d46ef 100644
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE46_POKEFAN_M
 	const ROUTE46_YOUNGSTER
 	const ROUTE46_LASS
diff --git a/maps/Route5.asm b/maps/Route5.asm
index e7d99d930..d6d557e67 100644
--- a/maps/Route5.asm
+++ b/maps/Route5.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE5_POKEFAN_M
 
 Route5_MapScripts:
diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm
index e91c46ab3..d8fe0714f 100644
--- a/maps/Route5CleanseTagHouse.asm
+++ b/maps/Route5CleanseTagHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE5CLEANSETAGHOUSE_GRANNY
 	const ROUTE5CLEANSETAGHOUSE_TEACHER
 
diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm
index d6ac38aa8..096e2d041 100644
--- a/maps/Route5SaffronGate.asm
+++ b/maps/Route5SaffronGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE5SAFFRONGATE_OFFICER
 
 Route5SaffronGate_MapScripts:
diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm
index fd16ea861..774035bd1 100644
--- a/maps/Route5UndergroundPathEntrance.asm
+++ b/maps/Route5UndergroundPathEntrance.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE5UNDERGROUNDPATHENTRANCE_TEACHER
 
 Route5UndergroundPathEntrance_MapScripts:
diff --git a/maps/Route6.asm b/maps/Route6.asm
index aa6101c20..56f1a7e73 100644
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE6_POKEFAN_M1
 	const ROUTE6_POKEFAN_M2
 	const ROUTE6_POKEFAN_M3
diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm
index 8fa0197ca..ab4a6c481 100644
--- a/maps/Route6SaffronGate.asm
+++ b/maps/Route6SaffronGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE6SAFFRONGATE_OFFICER
 
 Route6SaffronGate_MapScripts:
diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm
index 9d9144994..c9144a255 100644
--- a/maps/Route7SaffronGate.asm
+++ b/maps/Route7SaffronGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE7SAFFRONGATE_OFFICER
 
 Route7SaffronGate_MapScripts:
diff --git a/maps/Route8.asm b/maps/Route8.asm
index 5f0a4c44f..ba46ea877 100644
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE8_BIKER1
 	const ROUTE8_BIKER2
 	const ROUTE8_BIKER3
diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm
index a9bce58d3..58fba365e 100644
--- a/maps/Route8SaffronGate.asm
+++ b/maps/Route8SaffronGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE8SAFFRONGATE_OFFICER
 
 Route8SaffronGate_MapScripts:
diff --git a/maps/Route9.asm b/maps/Route9.asm
index 251c8cc1d..55b3e50df 100644
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const ROUTE9_YOUNGSTER1
 	const ROUTE9_LASS1
 	const ROUTE9_YOUNGSTER2
diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm
index c44e87ce8..5f6ba0bf6 100644
--- a/maps/RuinsOfAlphAerodactylItemRoom.asm
+++ b/maps/RuinsOfAlphAerodactylItemRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL1
 	const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL2
 	const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL3
diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm
index 50ef6843f..2acc16dbe 100644
--- a/maps/RuinsOfAlphHoOhItemRoom.asm
+++ b/maps/RuinsOfAlphHoOhItemRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const RUINSOFALPHHOOHITEMROOM_POKE_BALL1
 	const RUINSOFALPHHOOHITEMROOM_POKE_BALL2
 	const RUINSOFALPHHOOHITEMROOM_POKE_BALL3
diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm
index 10ca74514..e51489af2 100644
--- a/maps/RuinsOfAlphInnerChamber.asm
+++ b/maps/RuinsOfAlphInnerChamber.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const RUINSOFALPHINNERCHAMBER_FISHER
 	const RUINSOFALPHINNERCHAMBER_TEACHER
 	const RUINSOFALPHINNERCHAMBER_GRAMPS
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index b47a1a885..ac003b6f9 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const RUINSOFALPHKABUTOCHAMBER_RECEPTIONIST
 	const RUINSOFALPHKABUTOCHAMBER_SCIENTIST
 
diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm
index f63330f59..450bb5de5 100644
--- a/maps/RuinsOfAlphKabutoItemRoom.asm
+++ b/maps/RuinsOfAlphKabutoItemRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const RUINSOFALPHKABUTOITEMROOM_POKE_BALL1
 	const RUINSOFALPHKABUTOITEMROOM_POKE_BALL2
 	const RUINSOFALPHKABUTOITEMROOM_POKE_BALL3
diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm
index 6a6f8aebf..73edc01d8 100644
--- a/maps/RuinsOfAlphOmanyteItemRoom.asm
+++ b/maps/RuinsOfAlphOmanyteItemRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL1
 	const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL2
 	const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL3
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index 149ed48ea..ac4cdc282 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const RUINSOFALPHOUTSIDE_YOUNGSTER1
 	const RUINSOFALPHOUTSIDE_SCIENTIST
 	const RUINSOFALPHOUTSIDE_FISHER
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index 1020865cb..427ca14da 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const RUINSOFALPHRESEARCHCENTER_SCIENTIST1
 	const RUINSOFALPHRESEARCHCENTER_SCIENTIST2
 	const RUINSOFALPHRESEARCHCENTER_SCIENTIST3
diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm
index 17e147a7a..e5d0d6557 100644
--- a/maps/SafariZoneWardensHome.asm
+++ b/maps/SafariZoneWardensHome.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const SAFARIZONEWARDENSHOME_LASS
 
 SafariZoneWardensHome_MapScripts:
diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm
index 8c4853eda..2ca9e6021 100644
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const SAFFRONCITY_LASS1
 	const SAFFRONCITY_POKEFAN_M
 	const SAFFRONCITY_COOLTRAINER_M
diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm
index a0de9bdee..7911d9d56 100644
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const SAFFRONGYM_SABRINA
 	const SAFFRONGYM_GRANNY1
 	const SAFFRONGYM_YOUNGSTER1
diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm
index 399a30006..b0f3faf7b 100644
--- a/maps/SaffronMagnetTrainStation.asm
+++ b/maps/SaffronMagnetTrainStation.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const SAFFRONMAGNETTRAINSTATION_OFFICER
 	const SAFFRONMAGNETTRAINSTATION_GYM_GUY
 	const SAFFRONMAGNETTRAINSTATION_TEACHER
diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm
index f2ffdc078..8d3e89e3e 100644
--- a/maps/SaffronMart.asm
+++ b/maps/SaffronMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const SAFFRONMART_CLERK
 	const SAFFRONMART_COOLTRAINER_M
 	const SAFFRONMART_COOLTRAINER_F
diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm
index d28f746e0..3399e4f95 100644
--- a/maps/SaffronPokecenter1F.asm
+++ b/maps/SaffronPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const SAFFRONPOKECENTER1F_NURSE
 	const SAFFRONPOKECENTER1F_TEACHER
 	const SAFFRONPOKECENTER1F_FISHER
diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm
index bb845bcea..651a6b540 100644
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const SEAFOAMGYM_BLAINE
 	const SEAFOAMGYM_GYM_GUY
 
diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm
index 546d168b0..1aa66b2da 100644
--- a/maps/SilphCo1F.asm
+++ b/maps/SilphCo1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const SILPHCO1F_RECEPTIONIST
 	const SILPHCO1F_OFFICER
 
diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm
index 66a053415..7ef61fba9 100644
--- a/maps/SilverCaveItemRooms.asm
+++ b/maps/SilverCaveItemRooms.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const SILVERCAVEITEMROOMS_POKE_BALL1
 	const SILVERCAVEITEMROOMS_POKE_BALL2
 
diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm
index 5bbc5a938..234585be3 100644
--- a/maps/SilverCavePokecenter1F.asm
+++ b/maps/SilverCavePokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const SILVERCAVEPOKECENTER1F_NURSE
 	const SILVERCAVEPOKECENTER1F_GRANNY
 
diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm
index 6d1e4a78a..1df3d2603 100644
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const SILVERCAVEROOM1_POKE_BALL1
 	const SILVERCAVEROOM1_POKE_BALL2
 	const SILVERCAVEROOM1_POKE_BALL3
diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm
index 00dc158a5..6c721e6f7 100644
--- a/maps/SilverCaveRoom2.asm
+++ b/maps/SilverCaveRoom2.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const SILVERCAVEROOM2_POKE_BALL1
 	const SILVERCAVEROOM2_POKE_BALL2
 	const SILVERCAVEROOM2_POKE_BALL3
diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm
index 747759765..3fece56d7 100644
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const SILVERCAVEROOM3_RED
 
 SilverCaveRoom3_MapScripts:
diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm
index 2b5c1e116..9cbeca82c 100644
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const SLOWPOKEWELLB1F_ROCKET1
 	const SLOWPOKEWELLB1F_ROCKET2
 	const SLOWPOKEWELLB1F_ROCKET3
diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm
index 2fc8f5e6d..de70031b2 100644
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const SLOWPOKEWELLB2F_GYM_GUY
 	const SLOWPOKEWELLB2F_POKE_BALL
 
diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm
index 48ad6f728..6b741e62a 100644
--- a/maps/SoulHouse.asm
+++ b/maps/SoulHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const SOULHOUSE_MRFUJI
 	const SOULHOUSE_TEACHER
 	const SOULHOUSE_LASS
diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm
index 1be0f6fb7..71278bcaf 100644
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const SPROUTTOWER1F_SAGE1
 	const SPROUTTOWER1F_SAGE2
 	const SPROUTTOWER1F_GRANNY
diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm
index 59c59eee1..84983e833 100644
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const SPROUTTOWER2F_SAGE1
 	const SPROUTTOWER2F_SAGE2
 	const SPROUTTOWER2F_POKE_BALL
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index 0c89427b7..012cf74fe 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const SPROUTTOWER3F_SAGE1
 	const SPROUTTOWER3F_SAGE2
 	const SPROUTTOWER3F_SAGE3
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index 9e87b6d69..098ac842a 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const TEAMROCKETBASEB1F_ROCKET1
 	const TEAMROCKETBASEB1F_ROCKET2
 	const TEAMROCKETBASEB1F_SCIENTIST
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 27dc7d523..0b9647164 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const TEAMROCKETBASEB2F_ROCKET1
 	const TEAMROCKETBASEB2F_ROCKET_GIRL
 	const TEAMROCKETBASEB2F_LANCE
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index 21fa5aa9c..88665bc08 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const TEAMROCKETBASEB3F_LANCE
 	const TEAMROCKETBASEB3F_ROCKET1
 	const TEAMROCKETBASEB3F_MOLTRES
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index 97421a769..32e216aaa 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const TIMECAPSULE_CHRIS1
 	const TIMECAPSULE_CHRIS2
 
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index 971dfd3f8..d80ec69c8 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const TINTOWER1F_SUICUNE
 	const TINTOWER1F_RAIKOU
 	const TINTOWER1F_ENTEI
diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm
index ecb2a1402..fcd70791e 100644
--- a/maps/TinTower3F.asm
+++ b/maps/TinTower3F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const TINTOWER3F_POKE_BALL
 
 TinTower3F_MapScripts:
diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm
index cbc92ec1c..9397ff802 100644
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const TINTOWER4F_POKE_BALL1
 	const TINTOWER4F_POKE_BALL2
 	const TINTOWER4F_POKE_BALL3
diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm
index adfaf1880..2d1521590 100644
--- a/maps/TinTower5F.asm
+++ b/maps/TinTower5F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const TINTOWER5F_POKE_BALL
 
 TinTower5F_MapScripts:
diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm
index aebd4c1f9..b35b5403d 100644
--- a/maps/TinTower6F.asm
+++ b/maps/TinTower6F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const TINTOWER6F_POKE_BALL
 
 TinTower6F_MapScripts:
diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm
index 58bd8b29e..557a3609f 100644
--- a/maps/TinTower7F.asm
+++ b/maps/TinTower7F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const TINTOWER7F_POKE_BALL
 
 TinTower7F_MapScripts:
diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm
index d5b4d467c..d8c2e97cb 100644
--- a/maps/TinTower8F.asm
+++ b/maps/TinTower8F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const TINTOWER8F_POKE_BALL1
 	const TINTOWER8F_POKE_BALL2
 	const TINTOWER8F_POKE_BALL3
diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm
index 01a40f12e..fc768a378 100644
--- a/maps/TinTower9F.asm
+++ b/maps/TinTower9F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const TINTOWER9F_POKE_BALL
 
 TinTower9F_MapScripts:
diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm
index 21e30dbe2..f96faf98c 100644
--- a/maps/TinTowerRoof.asm
+++ b/maps/TinTowerRoof.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const TINTOWERROOF_HO_OH
 
 TinTowerRoof_MapScripts:
diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm
index 242adc14f..bade89d75 100644
--- a/maps/TohjoFalls.asm
+++ b/maps/TohjoFalls.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const TOHJOFALLS_POKE_BALL
 
 TohjoFalls_MapScripts:
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index 77353d20c..915edcb12 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const TRADECENTER_CHRIS1
 	const TRADECENTER_CHRIS2
 
diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm
index b00bc2378..4334fa9ab 100644
--- a/maps/TrainerHouse1F.asm
+++ b/maps/TrainerHouse1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const TRAINERHOUSE1F_RECEPTIONIST
 	const TRAINERHOUSE1F_COOLTRAINER_M
 	const TRAINERHOUSE1F_COOLTRAINER_F
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index 7d9586543..c8ed1bbbb 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const TRAINERHOUSEB1F_RECEPTIONIST
 	const TRAINERHOUSEB1F_CHRIS
 
diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm
index a68947bd0..149e70ce0 100644
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const UNIONCAVE1F_POKEFAN_M1
 	const UNIONCAVE1F_SUPER_NERD
 	const UNIONCAVE1F_POKEFAN_M2
diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm
index 3f5da7612..2d729d299 100644
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const UNIONCAVEB1F_POKEFAN_M1
 	const UNIONCAVEB1F_POKEFAN_M2
 	const UNIONCAVEB1F_SUPER_NERD1
diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm
index 5ec846c63..af63ea9b9 100644
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const UNIONCAVEB2F_ROCKER
 	const UNIONCAVEB2F_COOLTRAINER_F1
 	const UNIONCAVEB2F_COOLTRAINER_F2
diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm
index e1d66413d..a0882fdd5 100644
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VERMILIONCITY_TEACHER
 	const VERMILIONCITY_GRAMPS
 	const VERMILIONCITY_MACHOP
diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm
index eaf5b0e07..4f5d80a2f 100644
--- a/maps/VermilionDiglettsCaveSpeechHouse.asm
+++ b/maps/VermilionDiglettsCaveSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VERMILIONDIGLETTSCAVESPEECHHOUSE_GENTLEMAN
 
 VermilionDiglettsCaveSpeechHouse_MapScripts:
diff --git a/maps/VermilionFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm
index 5be17c675..9f3cfeefd 100644
--- a/maps/VermilionFishingSpeechHouse.asm
+++ b/maps/VermilionFishingSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VERMILIONFISHINGSPEECHHOUSE_FISHING_GURU
 
 VermilionFishingSpeechHouse_MapScripts:
diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm
index 86c82863d..e04195f4d 100644
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VERMILIONGYM_SURGE
 	const VERMILIONGYM_GENTLEMAN
 	const VERMILIONGYM_ROCKER
diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm
index ee04792a2..d5027f2cc 100644
--- a/maps/VermilionMagnetTrainSpeechHouse.asm
+++ b/maps/VermilionMagnetTrainSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VERMILIONMAGNETTRAINSPEECHHOUSE_POKEFAN_F
 	const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER
 
diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm
index bcaaad868..c8a3a8cec 100644
--- a/maps/VermilionMart.asm
+++ b/maps/VermilionMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VERMILIONMART_CLERK
 	const VERMILIONMART_SUPER_NERD
 	const VERMILIONMART_BUENA
diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm
index 095ff49ab..67eefe48f 100644
--- a/maps/VermilionPokecenter1F.asm
+++ b/maps/VermilionPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VERMILIONPOKECENTER1F_NURSE
 	const VERMILIONPOKECENTER1F_FISHING_GURU
 	const VERMILIONPOKECENTER1F_SAILOR
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index a89474dc1..577e20bac 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VERMILIONPORT_SAILOR1
 	const VERMILIONPORT_SAILOR2
 	const VERMILIONPORT_SUPER_NERD
diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm
index 5184fa00f..d6255b560 100644
--- a/maps/VermilionPortPassage.asm
+++ b/maps/VermilionPortPassage.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VERMILIONPORTPASSAGE_TEACHER
 
 VermilionPortPassage_MapScripts:
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index 06ba3a805..7b4b062ab 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VICTORYROAD_SILVER
 	const VICTORYROAD_POKE_BALL1
 	const VICTORYROAD_POKE_BALL2
diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm
index 59fc5bbea..a798da797 100644
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VICTORYROADGATE_OFFICER
 	const VICTORYROADGATE_BLACK_BELT1
 	const VICTORYROADGATE_BLACK_BELT2
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
index 09bd2cc71..616866de7 100644
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VIOLETCITY_EARL
 	const VIOLETCITY_LASS
 	const VIOLETCITY_SUPER_NERD
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
index 0bbef6640..d3779ddf2 100644
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VIOLETGYM_FALKNER
 	const VIOLETGYM_YOUNGSTER1
 	const VIOLETGYM_YOUNGSTER2
diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm
index e274331d2..a30522f6f 100644
--- a/maps/VioletKylesHouse.asm
+++ b/maps/VioletKylesHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VIOLETKYLESHOUSE_POKEFAN_M
 	const VIOLETKYLESHOUSE_KYLE
 
diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm
index accbb493c..062bf664d 100644
--- a/maps/VioletMart.asm
+++ b/maps/VioletMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VIOLETMART_CLERK
 	const VIOLETMART_GRANNY
 	const VIOLETMART_COOLTRAINER_M
diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm
index c79b8afcd..85ec155fb 100644
--- a/maps/VioletNicknameSpeechHouse.asm
+++ b/maps/VioletNicknameSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VIOLETNICKNAMESPEECHHOUSE_TEACHER
 	const VIOLETNICKNAMESPEECHHOUSE_LASS
 	const VIOLETNICKNAMESPEECHHOUSE_BIRD
diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm
index e96d696f0..324dfc8c0 100644
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VIOLETPOKECENTER1F_NURSE
 	const VIOLETPOKECENTER1F_GAMEBOY_KID
 	const VIOLETPOKECENTER1F_GENTLEMAN
diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm
index 0b254e035..544072054 100644
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VIRIDIANCITY_GRAMPS1
 	const VIRIDIANCITY_GRAMPS2
 	const VIRIDIANCITY_FISHER
diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm
index 2daa02820..5d3e34335 100644
--- a/maps/ViridianGym.asm
+++ b/maps/ViridianGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VIRIDIANGYM_BLUE
 	const VIRIDIANGYM_GYM_GUY
 
diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm
index 3247ffbf1..9b3f6af3a 100644
--- a/maps/ViridianMart.asm
+++ b/maps/ViridianMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VIRIDIANMART_CLERK
 	const VIRIDIANMART_LASS
 	const VIRIDIANMART_COOLTRAINER_M
diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm
index 65cffe9d9..73001124a 100644
--- a/maps/ViridianNicknameSpeechHouse.asm
+++ b/maps/ViridianNicknameSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VIRIDIANNICKNAMESPEECHHOUSE_POKEFAN_M
 	const VIRIDIANNICKNAMESPEECHHOUSE_LASS
 	const VIRIDIANNICKNAMESPEECHHOUSE_SPEARY
diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm
index 2b7a31b5d..aa5df856e 100644
--- a/maps/ViridianPokecenter1F.asm
+++ b/maps/ViridianPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const VIRIDIANPOKECENTER1F_NURSE
 	const VIRIDIANPOKECENTER1F_COOLTRAINER_M
 	const VIRIDIANPOKECENTER1F_COOLTRAINER_F
diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm
index 302317e91..aeacbdf1f 100644
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const WHIRLISLANDB1F_POKE_BALL1
 	const WHIRLISLANDB1F_POKE_BALL2
 	const WHIRLISLANDB1F_POKE_BALL3
diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm
index 1f93a1709..413a6256e 100644
--- a/maps/WhirlIslandB2F.asm
+++ b/maps/WhirlIslandB2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const WHIRLISLANDB2F_POKE_BALL1
 	const WHIRLISLANDB2F_POKE_BALL2
 	const WHIRLISLANDB2F_POKE_BALL3
diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm
index cb5e1af8a..ab06aef0f 100644
--- a/maps/WhirlIslandLugiaChamber.asm
+++ b/maps/WhirlIslandLugiaChamber.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const WHIRLISLANDLUGIACHAMBER_LUGIA
 
 WhirlIslandLugiaChamber_MapScripts:
diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm
index 37885de6e..c92e798d5 100644
--- a/maps/WhirlIslandNE.asm
+++ b/maps/WhirlIslandNE.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const WHIRLISLANDNE_POKE_BALL
 
 WhirlIslandNE_MapScripts:
diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm
index 7d0c436be..084a63b5f 100644
--- a/maps/WhirlIslandSW.asm
+++ b/maps/WhirlIslandSW.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const WHIRLISLANDSW_POKE_BALL
 
 WhirlIslandSW_MapScripts:
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm
index 8e8dd4147..8f0e73aa3 100644
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const WILLSROOM_WILL
 
 WillsRoom_MapScripts:
diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm
index b381561de..2fb21c5d9 100644
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; person constants
+const_value set 2 ; object constants
 	const WISETRIOSROOM_SAGE1
 	const WISETRIOSROOM_SAGE2
 	const WISETRIOSROOM_SAGE3

From 9e368eee1f2f14e0d7e13f0d41dc89292051ec56 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Wed, 31 Jan 2018 11:11:09 -0500
Subject: [PATCH 079/135] Add TOC

---
 docs/map_event_scripts.md | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/docs/map_event_scripts.md b/docs/map_event_scripts.md
index 954e6a5c0..b9f2f35a8 100644
--- a/docs/map_event_scripts.md
+++ b/docs/map_event_scripts.md
@@ -1,6 +1,26 @@
 # Map Event Scripts
 
 
+## Contents
+
+- [Object constants](#object-constants)
+- [Map scripts](#map-scripts)
+  - [Scene scripts](#scene-scripts)
+  - [Callbacks](#callbacks)
+    - [Callback types](#callback-types)
+- [Event scripts](#event-scripts)
+- [Text](#text)
+- [Movement data](#movement-data)
+- [Map events](#map-events)
+  - [Warp events](#warp-events)
+  - [Coord events](#coord-events)
+  - [BG events](#bg-events)
+    - [BG event types](#bg-event-types)
+  - [Object events](#object-events)
+    - [Movement types](#movement-types)
+    - [Object types](#object-types)
+
+
 ## Object constants
 
 
@@ -31,7 +51,7 @@ const_value set 2 ; object constants
 	callback type, script
 

 
-Callback types:
+#### Callback types
 
 - `MAPCALLBACK_NEWMAP`
 
@@ -105,7 +125,7 @@ Callback types:
 	bg_event x, y, type, script
 

 
-BG event types:
+#### BG event types
 
 - `BGEVENT_READ`
 
@@ -132,7 +152,7 @@ BG event types:
 	object_event x, y, sprite, movement, rx, ry, h1, h2, palette, type, range, script, event_flag
 

 
-Movement types:
+#### Movement types
 
 - `SPRITEMOVEDATA_STILL`
 
@@ -168,7 +188,7 @@ Movement types:
 
 - `SPRITEMOVEDATA_SWIM_WANDER`
 
-Object types:
+#### Object types
 
 - `OBJECTTYPE_SCRIPT`
 

From 08891da82254aa4051bf594d4abc2db8e4043d8f Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Wed, 31 Jan 2018 11:38:45 -0500
Subject: [PATCH 080/135] const_def N

---
 constants/battle_anim_constants.asm              |  4 ++--
 constants/battle_constants.asm                   |  6 +++---
 constants/battle_tower_constants.asm             |  2 +-
 constants/credits_constants.asm                  |  2 +-
 constants/item_data_constants.asm                | 14 +++++++-------
 constants/map_data_constants.asm                 |  2 +-
 constants/map_setup_constants.asm                |  4 ++--
 constants/menu_constants.asm                     |  8 ++++----
 constants/pokemon_constants.asm                  |  4 ++--
 constants/pokemon_data_constants.asm             |  8 ++++----
 constants/printer_constants.asm                  |  2 +-
 constants/script_constants.asm                   |  6 +++---
 constants/sprite_constants.asm                   |  6 +++---
 constants/sprite_data_constants.asm              |  4 ++--
 constants/text_constants.asm                     |  4 ++--
 constants/tileset_constants.asm                  |  2 +-
 constants/wram_constants.asm                     |  4 ++--
 data/mon_menu.asm                                |  2 +-
 docs/map_event_scripts.md                        |  2 +-
 engine/debug.asm                                 |  2 +-
 engine/stats_screen.asm                          |  2 +-
 macros/enum.asm                                  |  4 ++++
 maps/AzaleaGym.asm                               |  2 +-
 maps/AzaleaMart.asm                              |  2 +-
 maps/AzaleaPokecenter1F.asm                      |  2 +-
 maps/AzaleaTown.asm                              |  2 +-
 maps/BattleTower1F.asm                           |  2 +-
 maps/BattleTowerBattleRoom.asm                   |  2 +-
 maps/BattleTowerElevator.asm                     |  2 +-
 maps/BattleTowerHallway.asm                      |  2 +-
 maps/BattleTowerOutside.asm                      |  2 +-
 maps/BillsBrothersHouse.asm                      |  2 +-
 maps/BillsFamilysHouse.asm                       |  2 +-
 maps/BillsHouse.asm                              |  2 +-
 maps/BlackthornCity.asm                          |  2 +-
 maps/BlackthornDragonSpeechHouse.asm             |  2 +-
 maps/BlackthornEmysHouse.asm                     |  2 +-
 maps/BlackthornGym1F.asm                         |  2 +-
 maps/BlackthornGym2F.asm                         |  2 +-
 maps/BlackthornMart.asm                          |  2 +-
 maps/BlackthornPokecenter1F.asm                  |  2 +-
 maps/BluesHouse.asm                              |  2 +-
 maps/BrunosRoom.asm                              |  2 +-
 maps/BurnedTower1F.asm                           |  2 +-
 maps/BurnedTowerB1F.asm                          |  2 +-
 maps/CeladonCafe.asm                             |  2 +-
 maps/CeladonCity.asm                             |  2 +-
 maps/CeladonDeptStore1F.asm                      |  2 +-
 maps/CeladonDeptStore2F.asm                      |  2 +-
 maps/CeladonDeptStore3F.asm                      |  2 +-
 maps/CeladonDeptStore4F.asm                      |  2 +-
 maps/CeladonDeptStore5F.asm                      |  2 +-
 maps/CeladonDeptStore6F.asm                      |  2 +-
 maps/CeladonGameCorner.asm                       |  2 +-
 maps/CeladonGameCornerPrizeRoom.asm              |  2 +-
 maps/CeladonGym.asm                              |  2 +-
 maps/CeladonMansion1F.asm                        |  2 +-
 maps/CeladonMansion3F.asm                        |  2 +-
 maps/CeladonMansionRoof.asm                      |  2 +-
 maps/CeladonMansionRoofHouse.asm                 |  2 +-
 maps/CeladonPokecenter1F.asm                     |  2 +-
 maps/CeruleanCity.asm                            |  2 +-
 maps/CeruleanGym.asm                             |  2 +-
 maps/CeruleanGymBadgeSpeechHouse.asm             |  2 +-
 maps/CeruleanMart.asm                            |  2 +-
 maps/CeruleanPokecenter1F.asm                    |  2 +-
 maps/CeruleanPoliceStation.asm                   |  2 +-
 maps/CeruleanTradeSpeechHouse.asm                |  2 +-
 maps/CharcoalKiln.asm                            |  2 +-
 maps/CherrygroveCity.asm                         |  2 +-
 maps/CherrygroveEvolutionSpeechHouse.asm         |  2 +-
 maps/CherrygroveGymSpeechHouse.asm               |  2 +-
 maps/CherrygroveMart.asm                         |  2 +-
 maps/CherrygrovePokecenter1F.asm                 |  2 +-
 maps/CianwoodCity.asm                            |  2 +-
 maps/CianwoodGym.asm                             |  2 +-
 maps/CianwoodLugiaSpeechHouse.asm                |  2 +-
 maps/CianwoodPharmacy.asm                        |  2 +-
 maps/CianwoodPhotoStudio.asm                     |  2 +-
 maps/CianwoodPokecenter1F.asm                    |  2 +-
 maps/CinnabarIsland.asm                          |  2 +-
 maps/CinnabarPokecenter1F.asm                    |  2 +-
 maps/Colosseum.asm                               |  2 +-
 maps/CopycatsHouse1F.asm                         |  2 +-
 maps/CopycatsHouse2F.asm                         |  2 +-
 maps/DanceTheatre.asm                            |  2 +-
 maps/DarkCaveBlackthornEntrance.asm              |  2 +-
 maps/DarkCaveVioletEntrance.asm                  |  2 +-
 maps/DayCare.asm                                 |  2 +-
 maps/DayOfWeekSiblingsHouse.asm                  |  2 +-
 maps/DiglettsCave.asm                            |  2 +-
 maps/DragonShrine.asm                            |  2 +-
 maps/DragonsDenB1F.asm                           |  2 +-
 maps/EarlsPokemonAcademy.asm                     |  2 +-
 maps/EcruteakCity.asm                            |  2 +-
 maps/EcruteakGym.asm                             |  2 +-
 maps/EcruteakItemfinderHouse.asm                 |  2 +-
 maps/EcruteakLugiaSpeechHouse.asm                |  2 +-
 maps/EcruteakMart.asm                            |  2 +-
 maps/EcruteakPokecenter1F.asm                    |  2 +-
 maps/EcruteakTinTowerEntrance.asm                |  2 +-
 maps/ElmsHouse.asm                               |  2 +-
 maps/ElmsLab.asm                                 |  2 +-
 maps/FastShip1F.asm                              |  2 +-
 maps/FastShipB1F.asm                             |  2 +-
 maps/FastShipCabins_NNW_NNE_NE.asm               |  2 +-
 maps/FastShipCabins_SE_SSE_CaptainsCabin.asm     |  2 +-
 maps/FastShipCabins_SW_SSW_NW.asm                |  2 +-
 maps/FightingDojo.asm                            |  2 +-
 maps/FuchsiaCity.asm                             |  2 +-
 maps/FuchsiaGym.asm                              |  2 +-
 maps/FuchsiaMart.asm                             |  2 +-
 maps/FuchsiaPokecenter1F.asm                     |  2 +-
 maps/GoldenrodBikeShop.asm                       |  2 +-
 maps/GoldenrodCity.asm                           |  2 +-
 maps/GoldenrodDeptStore1F.asm                    |  2 +-
 maps/GoldenrodDeptStore2F.asm                    |  2 +-
 maps/GoldenrodDeptStore3F.asm                    |  2 +-
 maps/GoldenrodDeptStore4F.asm                    |  2 +-
 maps/GoldenrodDeptStore5F.asm                    |  2 +-
 maps/GoldenrodDeptStore6F.asm                    |  2 +-
 maps/GoldenrodDeptStoreB1F.asm                   |  2 +-
 maps/GoldenrodDeptStoreRoof.asm                  |  2 +-
 maps/GoldenrodFlowerShop.asm                     |  2 +-
 maps/GoldenrodGameCorner.asm                     |  2 +-
 maps/GoldenrodGym.asm                            |  2 +-
 maps/GoldenrodHappinessRater.asm                 |  2 +-
 maps/GoldenrodMagnetTrainStation.asm             |  2 +-
 maps/GoldenrodNameRater.asm                      |  2 +-
 maps/GoldenrodPPSpeechHouse.asm                  |  2 +-
 maps/GoldenrodPokecenter1F.asm                   |  2 +-
 maps/GoldenrodUnderground.asm                    |  2 +-
 maps/GoldenrodUndergroundSwitchRoomEntrances.asm |  2 +-
 maps/GoldenrodUndergroundWarehouse.asm           |  2 +-
 maps/GuideGentsHouse.asm                         |  2 +-
 maps/HallOfFame.asm                              |  2 +-
 maps/IcePath1F.asm                               |  2 +-
 maps/IcePathB1F.asm                              |  2 +-
 maps/IcePathB2FBlackthornSide.asm                |  2 +-
 maps/IcePathB2FMahoganySide.asm                  |  2 +-
 maps/IcePathB3F.asm                              |  2 +-
 maps/IlexForest.asm                              |  2 +-
 maps/IlexForestAzaleaGate.asm                    |  2 +-
 maps/IndigoPlateauPokecenter1F.asm               |  2 +-
 maps/KarensRoom.asm                              |  2 +-
 maps/KogasRoom.asm                               |  2 +-
 maps/KurtsHouse.asm                              |  2 +-
 maps/LakeOfRage.asm                              |  2 +-
 maps/LakeOfRageHiddenPowerHouse.asm              |  2 +-
 maps/LakeOfRageMagikarpHouse.asm                 |  2 +-
 maps/LancesRoom.asm                              |  2 +-
 maps/LavRadioTower1F.asm                         |  2 +-
 maps/LavenderMart.asm                            |  2 +-
 maps/LavenderNameRater.asm                       |  2 +-
 maps/LavenderPokecenter1F.asm                    |  2 +-
 maps/LavenderSpeechHouse.asm                     |  2 +-
 maps/LavenderTown.asm                            |  2 +-
 maps/MahoganyGym.asm                             |  2 +-
 maps/MahoganyMart1F.asm                          |  2 +-
 maps/MahoganyPokecenter1F.asm                    |  2 +-
 maps/MahoganyRedGyaradosSpeechHouse.asm          |  2 +-
 maps/MahoganyTown.asm                            |  2 +-
 maps/ManiasHouse.asm                             |  2 +-
 maps/MountMoon.asm                               |  2 +-
 maps/MountMoonGiftShop.asm                       |  2 +-
 maps/MountMoonSquare.asm                         |  2 +-
 maps/MountMortar1FInside.asm                     |  2 +-
 maps/MountMortar1FOutside.asm                    |  2 +-
 maps/MountMortar2FInside.asm                     |  2 +-
 maps/MountMortarB1F.asm                          |  2 +-
 maps/MoveDeletersHouse.asm                       |  2 +-
 maps/MrFujisHouse.asm                            |  2 +-
 maps/MrPokemonsHouse.asm                         |  2 +-
 maps/MrPsychicsHouse.asm                         |  2 +-
 maps/NationalPark.asm                            |  2 +-
 maps/NationalParkBugContest.asm                  |  2 +-
 maps/NewBarkTown.asm                             |  2 +-
 maps/OaksLab.asm                                 |  2 +-
 maps/OlivineCafe.asm                             |  2 +-
 maps/OlivineCity.asm                             |  2 +-
 maps/OlivineGoodRodHouse.asm                     |  2 +-
 maps/OlivineGym.asm                              |  2 +-
 maps/OlivineHouseBeta.asm                        |  2 +-
 maps/OlivineLighthouse1F.asm                     |  2 +-
 maps/OlivineLighthouse2F.asm                     |  2 +-
 maps/OlivineLighthouse3F.asm                     |  2 +-
 maps/OlivineLighthouse4F.asm                     |  2 +-
 maps/OlivineLighthouse5F.asm                     |  2 +-
 maps/OlivineLighthouse6F.asm                     |  2 +-
 maps/OlivineMart.asm                             |  2 +-
 maps/OlivinePokecenter1F.asm                     |  2 +-
 maps/OlivinePort.asm                             |  2 +-
 maps/OlivinePortPassage.asm                      |  2 +-
 maps/OlivinePunishmentSpeechHouse.asm            |  2 +-
 maps/OlivineTimsHouse.asm                        |  2 +-
 maps/PalletTown.asm                              |  2 +-
 maps/PewterCity.asm                              |  2 +-
 maps/PewterGym.asm                               |  2 +-
 maps/PewterMart.asm                              |  2 +-
 maps/PewterNidoranSpeechHouse.asm                |  2 +-
 maps/PewterPokecenter1F.asm                      |  2 +-
 maps/PewterSnoozeSpeechHouse.asm                 |  2 +-
 maps/PlayersHouse1F.asm                          |  2 +-
 maps/PlayersHouse2F.asm                          |  2 +-
 maps/PlayersNeighborsHouse.asm                   |  2 +-
 maps/PokeSeersHouse.asm                          |  2 +-
 maps/Pokecenter2F.asm                            |  2 +-
 maps/PokecomCenterAdminRoomMobile.asm            |  2 +-
 maps/PokemonFanClub.asm                          |  2 +-
 maps/PowerPlant.asm                              |  2 +-
 maps/RadioTower1F.asm                            |  2 +-
 maps/RadioTower2F.asm                            |  2 +-
 maps/RadioTower3F.asm                            |  2 +-
 maps/RadioTower4F.asm                            |  2 +-
 maps/RadioTower5F.asm                            |  2 +-
 maps/RedsHouse1F.asm                             |  2 +-
 maps/RockTunnel1F.asm                            |  2 +-
 maps/RockTunnelB1F.asm                           |  2 +-
 maps/Route1.asm                                  |  2 +-
 maps/Route10Pokecenter1F.asm                     |  2 +-
 maps/Route10South.asm                            |  2 +-
 maps/Route11.asm                                 |  2 +-
 maps/Route12.asm                                 |  2 +-
 maps/Route12SuperRodHouse.asm                    |  2 +-
 maps/Route13.asm                                 |  2 +-
 maps/Route14.asm                                 |  2 +-
 maps/Route15.asm                                 |  2 +-
 maps/Route15FuchsiaGate.asm                      |  2 +-
 maps/Route16FuchsiaSpeechHouse.asm               |  2 +-
 maps/Route16Gate.asm                             |  2 +-
 maps/Route17.asm                                 |  2 +-
 maps/Route17Route18Gate.asm                      |  2 +-
 maps/Route18.asm                                 |  2 +-
 maps/Route19.asm                                 |  2 +-
 maps/Route19FuchsiaGate.asm                      |  2 +-
 maps/Route2.asm                                  |  2 +-
 maps/Route20.asm                                 |  2 +-
 maps/Route21.asm                                 |  2 +-
 maps/Route24.asm                                 |  2 +-
 maps/Route25.asm                                 |  2 +-
 maps/Route26.asm                                 |  2 +-
 maps/Route26HealHouse.asm                        |  2 +-
 maps/Route27.asm                                 |  2 +-
 maps/Route27SandstormHouse.asm                   |  2 +-
 maps/Route28SteelWingHouse.asm                   |  2 +-
 maps/Route29.asm                                 |  2 +-
 maps/Route29Route46Gate.asm                      |  2 +-
 maps/Route2Gate.asm                              |  2 +-
 maps/Route2NuggetHouse.asm                       |  2 +-
 maps/Route3.asm                                  |  2 +-
 maps/Route30.asm                                 |  2 +-
 maps/Route30BerryHouse.asm                       |  2 +-
 maps/Route31.asm                                 |  2 +-
 maps/Route31VioletGate.asm                       |  2 +-
 maps/Route32.asm                                 |  2 +-
 maps/Route32Pokecenter1F.asm                     |  2 +-
 maps/Route32RuinsOfAlphGate.asm                  |  2 +-
 maps/Route33.asm                                 |  2 +-
 maps/Route34.asm                                 |  2 +-
 maps/Route34IlexForestGate.asm                   |  2 +-
 maps/Route35.asm                                 |  2 +-
 maps/Route35GoldenrodGate.asm                    |  2 +-
 maps/Route35NationalParkGate.asm                 |  2 +-
 maps/Route36.asm                                 |  2 +-
 maps/Route36NationalParkGate.asm                 |  2 +-
 maps/Route36RuinsOfAlphGate.asm                  |  2 +-
 maps/Route37.asm                                 |  2 +-
 maps/Route38.asm                                 |  2 +-
 maps/Route38EcruteakGate.asm                     |  2 +-
 maps/Route39.asm                                 |  2 +-
 maps/Route39Barn.asm                             |  2 +-
 maps/Route39Farmhouse.asm                        |  2 +-
 maps/Route4.asm                                  |  2 +-
 maps/Route40.asm                                 |  2 +-
 maps/Route40BattleTowerGate.asm                  |  2 +-
 maps/Route41.asm                                 |  2 +-
 maps/Route42.asm                                 |  2 +-
 maps/Route42EcruteakGate.asm                     |  2 +-
 maps/Route43.asm                                 |  2 +-
 maps/Route43Gate.asm                             |  2 +-
 maps/Route43MahoganyGate.asm                     |  2 +-
 maps/Route44.asm                                 |  2 +-
 maps/Route45.asm                                 |  2 +-
 maps/Route46.asm                                 |  2 +-
 maps/Route5.asm                                  |  2 +-
 maps/Route5CleanseTagHouse.asm                   |  2 +-
 maps/Route5SaffronGate.asm                       |  2 +-
 maps/Route5UndergroundPathEntrance.asm           |  2 +-
 maps/Route6.asm                                  |  2 +-
 maps/Route6SaffronGate.asm                       |  2 +-
 maps/Route7SaffronGate.asm                       |  2 +-
 maps/Route8.asm                                  |  2 +-
 maps/Route8SaffronGate.asm                       |  2 +-
 maps/Route9.asm                                  |  2 +-
 maps/RuinsOfAlphAerodactylItemRoom.asm           |  2 +-
 maps/RuinsOfAlphHoOhItemRoom.asm                 |  2 +-
 maps/RuinsOfAlphInnerChamber.asm                 |  2 +-
 maps/RuinsOfAlphKabutoChamber.asm                |  2 +-
 maps/RuinsOfAlphKabutoItemRoom.asm               |  2 +-
 maps/RuinsOfAlphOmanyteItemRoom.asm              |  2 +-
 maps/RuinsOfAlphOutside.asm                      |  2 +-
 maps/RuinsOfAlphResearchCenter.asm               |  2 +-
 maps/SafariZoneWardensHome.asm                   |  2 +-
 maps/SaffronCity.asm                             |  2 +-
 maps/SaffronGym.asm                              |  2 +-
 maps/SaffronMagnetTrainStation.asm               |  2 +-
 maps/SaffronMart.asm                             |  2 +-
 maps/SaffronPokecenter1F.asm                     |  2 +-
 maps/SeafoamGym.asm                              |  2 +-
 maps/SilphCo1F.asm                               |  2 +-
 maps/SilverCaveItemRooms.asm                     |  2 +-
 maps/SilverCavePokecenter1F.asm                  |  2 +-
 maps/SilverCaveRoom1.asm                         |  2 +-
 maps/SilverCaveRoom2.asm                         |  2 +-
 maps/SilverCaveRoom3.asm                         |  2 +-
 maps/SlowpokeWellB1F.asm                         |  2 +-
 maps/SlowpokeWellB2F.asm                         |  2 +-
 maps/SoulHouse.asm                               |  2 +-
 maps/SproutTower1F.asm                           |  2 +-
 maps/SproutTower2F.asm                           |  2 +-
 maps/SproutTower3F.asm                           |  2 +-
 maps/TeamRocketBaseB1F.asm                       |  2 +-
 maps/TeamRocketBaseB2F.asm                       |  2 +-
 maps/TeamRocketBaseB3F.asm                       |  2 +-
 maps/TimeCapsule.asm                             |  2 +-
 maps/TinTower1F.asm                              |  2 +-
 maps/TinTower3F.asm                              |  2 +-
 maps/TinTower4F.asm                              |  2 +-
 maps/TinTower5F.asm                              |  2 +-
 maps/TinTower6F.asm                              |  2 +-
 maps/TinTower7F.asm                              |  2 +-
 maps/TinTower8F.asm                              |  2 +-
 maps/TinTower9F.asm                              |  2 +-
 maps/TinTowerRoof.asm                            |  2 +-
 maps/TohjoFalls.asm                              |  2 +-
 maps/TradeCenter.asm                             |  2 +-
 maps/TrainerHouse1F.asm                          |  2 +-
 maps/TrainerHouseB1F.asm                         |  2 +-
 maps/UnionCave1F.asm                             |  2 +-
 maps/UnionCaveB1F.asm                            |  2 +-
 maps/UnionCaveB2F.asm                            |  2 +-
 maps/VermilionCity.asm                           |  2 +-
 maps/VermilionDiglettsCaveSpeechHouse.asm        |  2 +-
 maps/VermilionFishingSpeechHouse.asm             |  2 +-
 maps/VermilionGym.asm                            |  2 +-
 maps/VermilionMagnetTrainSpeechHouse.asm         |  2 +-
 maps/VermilionMart.asm                           |  2 +-
 maps/VermilionPokecenter1F.asm                   |  2 +-
 maps/VermilionPort.asm                           |  2 +-
 maps/VermilionPortPassage.asm                    |  2 +-
 maps/VictoryRoad.asm                             |  2 +-
 maps/VictoryRoadGate.asm                         |  2 +-
 maps/VioletCity.asm                              |  2 +-
 maps/VioletGym.asm                               |  2 +-
 maps/VioletKylesHouse.asm                        |  2 +-
 maps/VioletMart.asm                              |  2 +-
 maps/VioletNicknameSpeechHouse.asm               |  2 +-
 maps/VioletPokecenter1F.asm                      |  2 +-
 maps/ViridianCity.asm                            |  2 +-
 maps/ViridianGym.asm                             |  2 +-
 maps/ViridianMart.asm                            |  2 +-
 maps/ViridianNicknameSpeechHouse.asm             |  2 +-
 maps/ViridianPokecenter1F.asm                    |  2 +-
 maps/WhirlIslandB1F.asm                          |  2 +-
 maps/WhirlIslandB2F.asm                          |  2 +-
 maps/WhirlIslandLugiaChamber.asm                 |  2 +-
 maps/WhirlIslandNE.asm                           |  2 +-
 maps/WhirlIslandSW.asm                           |  2 +-
 maps/WillsRoom.asm                               |  2 +-
 maps/WiseTriosRoom.asm                           |  2 +-
 370 files changed, 397 insertions(+), 393 deletions(-)

diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm
index c55d4e9d6..58e19462e 100644
--- a/constants/battle_anim_constants.asm
+++ b/constants/battle_anim_constants.asm
@@ -708,7 +708,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
 	const BATTLEANIMOAMSET_D7
 
 ; BattleBGEffects indexes (see engine/battle_anims/bg_effects.asm)
-const_value set 1
+	const_def 1
 	const ANIM_BG_FLASH_INVERTED
 	const ANIM_BG_FLASH_WHITE
 	const ANIM_BG_WHITE_HUES
@@ -764,7 +764,7 @@ const_value set 1
 	const ANIM_BG_35
 
 ; AnimObjGFX indexes (see data/battle_anims/object_gfx.asm)
-const_value set 1
+	const_def 1
 	const ANIM_GFX_HIT
 	const ANIM_GFX_CUT
 	const ANIM_GFX_FIRE
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm
index 6f4f48669..949e28ab4 100644
--- a/constants/battle_constants.asm
+++ b/constants/battle_constants.asm
@@ -55,7 +55,7 @@ MOVE_LENGTH EQU const_value
 ; indexes for:
 ; - PlayerStats and EnemyStats (see wram.asm)
 ; - party_struct and battle_struct members (see macros/wram.asm)
-const_value set 1
+	const_def 1
 	const STAT_HP
 	const STAT_ATK
 	const STAT_DEF
@@ -76,7 +76,7 @@ ATKDEFDV_SHINY EQU $EA
 SPDSPCDV_SHINY EQU $AA
 
 ; battle classes (wBattleMode values)
-const_value set 1
+	const_def 1
 	const WILD_BATTLE
 	const TRAINER_BATTLE
 
@@ -151,7 +151,7 @@ const_value set 1
 
 ; status condition bit flags
 SLP EQU %111 ; 0-7 turns
-const_value set 3
+	const_def 3
 	const PSN
 	const BRN
 	const FRZ
diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm
index 71b8de8be..81e1880a0 100755
--- a/constants/battle_tower_constants.asm
+++ b/constants/battle_tower_constants.asm
@@ -47,7 +47,7 @@ BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_PARTY_LENGTH * (P
 MOBILE_EVENT_OBJECT_GS_BALL EQU $b
 
 ; BattleTowerText arguments (see engine/events/battle_tower/trainer_text.asm)
-const_value set 1
+	const_def 1
 	const BATTLETOWERTEXT_INTRO
 	const BATTLETOWERTEXT_WIN_TEXT
 	const BATTLETOWERTEXT_LOSS_TEXT
diff --git a/constants/credits_constants.asm b/constants/credits_constants.asm
index fba7583c0..7b23e11e1 100644
--- a/constants/credits_constants.asm
+++ b/constants/credits_constants.asm
@@ -105,7 +105,7 @@
 	const PAAD_TESTING
 
 ; CreditsScript indexes (see data/credits_script.asm)
-const_value set -7
+	const_def -7
 	const CREDITS_THEEND
 	const CREDITS_WAIT2
 	const CREDITS_MUSIC
diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm
index 495469e02..1af3c47ac 100644
--- a/constants/item_data_constants.asm
+++ b/constants/item_data_constants.asm
@@ -10,7 +10,7 @@
 ITEMATTR_STRUCT_LENGTH EQU const_value
 
 ; item types
-const_value set 1
+	const_def 1
 	const ITEM     ; 1
 	const KEY_ITEM ; 2
 	const BALL     ; 3
@@ -65,7 +65,7 @@ MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct
 	const HELD_7
 	const HELD_CLEANSE_TAG
 
-const_value set 10
+	const_def 10
 	const HELD_HEAL_POISON
 	const HELD_HEAL_FREEZE
 	const HELD_HEAL_BURN
@@ -74,7 +74,7 @@ const_value set 10
 	const HELD_HEAL_STATUS
 	const HELD_HEAL_CONFUSION
 
-const_value set 20
+	const_def 20
 	const HELD_PREVENT_POISON
 	const HELD_PREVENT_BURN
 	const HELD_PREVENT_FREEZE
@@ -82,7 +82,7 @@ const_value set 20
 	const HELD_PREVENT_PARALYZE
 	const HELD_PREVENT_CONFUSE
 
-const_value set 30
+	const_def 30
 	const HELD_30
 	const HELD_ATTACK_UP
 	const HELD_DEFENSE_UP
@@ -93,12 +93,12 @@ const_value set 30
 	const HELD_EVASION_UP
 	const HELD_38
 
-const_value set 40
+	const_def 40
 	const HELD_40
 	const HELD_41
 	const HELD_METAL_POWDER
 
-const_value set 50
+	const_def 50
 	const HELD_NORMAL_BOOST
 	const HELD_FIGHTING_BOOST
 	const HELD_FLYING_BOOST
@@ -117,7 +117,7 @@ const_value set 50
 	const HELD_DARK_BOOST
 	const HELD_STEEL_BOOST
 
-const_value set 70
+	const_def 70
 	const HELD_CATCH_CHANCE
 	const HELD_71
 	const HELD_ESCAPE
diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm
index a569aec21..6e5c4b23f 100644
--- a/constants/map_data_constants.asm
+++ b/constants/map_data_constants.asm
@@ -18,7 +18,7 @@ MAP_NONE   EQU 0
 NUM_MAPDEF_ATTRIBUTES EQU const_value
 
 ; map environments (wEnvironment)
-const_value set 1
+	const_def 1
 	const TOWN
 	const ROUTE
 	const INDOOR
diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm
index d9abd6e9b..a281c8813 100644
--- a/constants/map_setup_constants.asm
+++ b/constants/map_setup_constants.asm
@@ -1,6 +1,6 @@
 ; hMapEntryMethod values
 ; MapSetupScripts indexes (see data/maps/setup_scripts.asm)
-const_value set $f1
+	const_def $f1
 	const MAPSETUP_WARP       ; f1
 	const MAPSETUP_CONTINUE   ; f2
 	const MAPSETUP_RELOADMAP  ; f3
@@ -67,7 +67,7 @@ const_value set $f1
 map_end EQU -1
 
 ; callback types
-const_value set 1
+	const_def 1
 	const MAPCALLBACK_TILES
 	const MAPCALLBACK_OBJECTS
 	const MAPCALLBACK_CMDQUEUE
diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm
index 08f584ff1..f1ca20ae5 100644
--- a/constants/menu_constants.asm
+++ b/constants/menu_constants.asm
@@ -35,8 +35,8 @@
 
 ; MonMenuOptions indexes (see data/mon_menu.asm)
 ; used by PokemonActionSubmenu (see engine/start_menu.asm)
-const_value set 1
-; moves
+	const_def 1
+	; moves
 	const MONMENUITEM_CUT        ; 1
 	const MONMENUITEM_FLY        ; 2
 	const MONMENUITEM_SURF       ; 3
@@ -51,7 +51,7 @@ const_value set 1
 	const MONMENUITEM_ROCKSMASH  ; 12
 	const MONMENUITEM_MILKDRINK  ; 13
 	const MONMENUITEM_SWEETSCENT ; 14
-; options
+	; options
 	const MONMENUITEM_STATS      ; 15
 	const MONMENUITEM_SWITCH     ; 16
 	const MONMENUITEM_ITEM       ; 17
@@ -84,7 +84,7 @@ HMENURETURN_ASM    EQU %11111111
 	const PARTYMENUACTION_GIVE_ITEM
 	const PARTYMENUACTION_MOBILE ; mobile
 ; PrintPartyMenuActionText arguments (see engine/party_menu.asm)
-const_value set $f0
+	const_def $f0
 	const PARTYMENUTEXT_HEAL_PSN
 	const PARTYMENUTEXT_HEAL_BRN
 	const PARTYMENUTEXT_HEAL_FRZ
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index 8b3b45100..a72145c54 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -18,7 +18,7 @@
 ; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm)
 ; - FramesPointers (see gfx/pokemon/frame_pointers.asm)
 ; - Footprints (see gfx/footprints.asm)
-const_value set 1
+	const_def 1
 	const BULBASAUR  ; 01
 	const IVYSAUR    ; 02
 	const VENUSAUR   ; 03
@@ -284,7 +284,7 @@ NUM_POKEMON EQU const_value +- 1
 ; - UnownAnimationIdlePointers (see gfx/pokemon/unown_idle_pointers.asm)
 ; - UnownBitmasksPointers (see gfx/pokemon/unown_bitmask_pointers.asm)
 ; - UnownFramesPointers (see gfx/pokemon/unown_frame_pointers.asm)
-const_value set 1
+	const_def 1
 	const UNOWN_A ;  1
 	const UNOWN_B ;  2
 	const UNOWN_C ;  3
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index 09a5abfd1..1a1cc6ab8 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -45,7 +45,7 @@ GENDERLESS   EQU 255
 	const SLOW
 
 ; BaseEggGroups values
-const_value set 1
+	const_def 1
 	const MONSTER      ; 1
 	const AMPHIBIAN    ; 2
 	const INSECT       ; 3
@@ -131,7 +131,7 @@ NUM_HOF_TEAMS = 30
 
 
 ; evolution types (used in data/pokemon/evos_attacks.asm)
-const_value set 1
+	const_def 1
 	const EVOLVE_LEVEL
 	const EVOLVE_ITEM
 	const EVOLVE_TRADE
@@ -139,13 +139,13 @@ const_value set 1
 	const EVOLVE_STAT
 
 ; EVOLVE_HAPPINESS triggers
-const_value set 1
+	const_def 1
 	const TR_ANYTIME
 	const TR_MORNDAY
 	const TR_NITE
 
 ; EVOLVE_STAT triggers
-const_value set 1
+	const_def 1
 	const ATK_GT_DEF
 	const ATK_LT_DEF
 	const ATK_EQ_DEF
diff --git a/constants/printer_constants.asm b/constants/printer_constants.asm
index b6b5da7e7..f0b8b4818 100755
--- a/constants/printer_constants.asm
+++ b/constants/printer_constants.asm
@@ -1,5 +1,5 @@
 ; wPrinterStatus
-const_value set 1
+	const_def 1
 	const PRINTER_STATUS_CHECKING
 	const PRINTER_STATUS_TRANSMITTING
 	const PRINTER_STATUS_PRINTING
diff --git a/constants/script_constants.asm b/constants/script_constants.asm
index eb7f9b8d6..4ffdb6c16 100644
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -76,7 +76,7 @@ RETVAR_EXECUTE EQU (2 << 6)
 
 
 ; PlayerEventScriptPointers indexes (see engine/events.asm)
-const_value set -1
+	const_def -1
 	const PLAYEREVENT_MAPSCRIPT
 	const PLAYEREVENT_NONE
 	const PLAYEREVENT_SEENBYTRAINER
@@ -168,7 +168,7 @@ EMOTE_MEM EQU -1
 
 ; fruittree arguments
 ; FruitTreeItems indexes (see data/items/fruit_trees.asm)
-const_value set 1
+	const_def 1
 	const FRUITTREE_ROUTE_29      ; 01
 	const FRUITTREE_ROUTE_30_1    ; 02
 	const FRUITTREE_ROUTE_38      ; 03
@@ -275,7 +275,7 @@ NUM_UNOWN_PUZZLES EQU const_value
 	const UNOWNWORDS_HO_OH  ; 3
 
 ; MoveTutor writebyte arguments
-const_value set 1
+	const_def 1
 	const MOVETUTOR_FLAMETHROWER ; 1
 	const MOVETUTOR_THUNDERBOLT  ; 2
 	const MOVETUTOR_ICE_BEAM     ; 3
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
index 767d7a3c6..cef3dd486 100644
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -106,7 +106,7 @@
 	const SPRITE_STANDING_YOUNGSTER ; 66
 
 ; SpriteMons indexes (see data/sprites/sprite_mons.asm)
-const_value set $80
+	const_def $80
 SPRITE_POKEMON EQU const_value
 	const SPRITE_UNOWN ; 80
 	const SPRITE_GEODUDE ; 81
@@ -145,12 +145,12 @@ SPRITE_POKEMON EQU const_value
 	const SPRITE_HO_OH ; a2
 
 ; special GetMonSprite values (see engine/overworld.asm)
-const_value set $e0
+	const_def $e0
 	const SPRITE_DAY_CARE_MON_1 ; e0
 	const SPRITE_DAY_CARE_MON_2 ; e1
 
 ; VariableSprites indexes (see wram.asm)
-const_value set $f0
+	const_def $f0
 SPRITE_VARS EQU const_value
 	const SPRITE_CONSOLE ; f0
 	const SPRITE_DOLL_1 ; f1
diff --git a/constants/sprite_data_constants.asm b/constants/sprite_data_constants.asm
index 0ab039efa..329833b1e 100644
--- a/constants/sprite_data_constants.asm
+++ b/constants/sprite_data_constants.asm
@@ -9,7 +9,7 @@
 NUM_SPRITEDATA_FIELDS EQU const_value
 
 ; sprite types
-const_value set 1
+	const_def 1
 	const WALKING_SPRITE  ; 1
 	const STANDING_SPRITE ; 2
 	const STILL_SPRITE    ; 3
@@ -27,7 +27,7 @@ const_value set 1
 
 ; object_events set bit 3 so as not to use the sprite's default palette
 ; MapObjectPals indexes (see gfx/overworld/npc_sprites.pal)
-const_value set (1 << 3)
+	const_def 1 << 3
 	const PAL_NPC_RED    ; 8
 	const PAL_NPC_BLUE   ; 9
 	const PAL_NPC_GREEN  ; a
diff --git a/constants/text_constants.asm b/constants/text_constants.asm
index a6052065c..a64039f64 100644
--- a/constants/text_constants.asm
+++ b/constants/text_constants.asm
@@ -9,7 +9,7 @@ TRAINER_CLASS_NAME_LENGTH EQU 13
 NAME_LENGTH_JAPANESE EQU 6
 
 ; GetName types (see home/names.asm)
-const_value set 1
+	const_def 1
 	const MON_NAME              ; 1
 	const MOVE_NAME             ; 2
 	const DUMMY_NAME            ; 3
@@ -31,7 +31,7 @@ TEXTBOX_Y      EQU SCREEN_HEIGHT - TEXTBOX_HEIGHT
 TEXTBOX_INNERY EQU TEXTBOX_Y + 2
 
 ; PrintNum bit flags
-const_value set 5
+	const_def 5
 	const PRINTNUM_MONEY_F        ; 5
 	const PRINTNUM_RIGHTALIGN_F   ; 6
 	const PRINTNUM_LEADINGZEROS_F ; 7
diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm
index 5fda5bd5b..e89714fee 100644
--- a/constants/tileset_constants.asm
+++ b/constants/tileset_constants.asm
@@ -1,5 +1,5 @@
 ; Tilesets indexes (see data/tilesets.asm)
-const_value set 1
+	const_def 1
 	const TILESET_JOHTO                ; 01
 	const TILESET_JOHTO_MODERN         ; 02
 	const TILESET_KANTO                ; 03
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index fa8edf232..65af255be 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -21,7 +21,7 @@ GAMETIMERPAUSE_TIMER_PAUSED_F EQU 0
 GAMETIMERPAUSE_MOBILE_7_F     EQU 7
 
 ; Options:: ; cfcc
-const_value set 4
+	const_def 4
 	const NO_TEXT_SCROLL ; 4
 	const STEREO         ; 5
 	const BATTLE_SHIFT   ; 6
@@ -60,7 +60,7 @@ GBPRINTER_DARKEST  EQU $7f
 	const MENU_ACCOUNT ; 0
 
 ; WalkingDirection:: ; d043
-const_value set -1
+	const_def -1
 	const STANDING ; -1
 	const DOWN     ; 0
 	const UP       ; 1
diff --git a/data/mon_menu.asm b/data/mon_menu.asm
index e8a262059..ec9a59a94 100644
--- a/data/mon_menu.asm
+++ b/data/mon_menu.asm
@@ -1,5 +1,5 @@
 ; MonMenuOptionStrings indexes
-const_value set 1
+	const_def 1
 	const MONMENUVALUE_STATS  ; 1
 	const MONMENUVALUE_SWITCH ; 2
 	const MONMENUVALUE_ITEM   ; 3
diff --git a/docs/map_event_scripts.md b/docs/map_event_scripts.md
index b9f2f35a8..c8edc9dc1 100644
--- a/docs/map_event_scripts.md
+++ b/docs/map_event_scripts.md
@@ -24,7 +24,7 @@
 ## Object constants
 
 
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const MAPNAME_OBJECTNAME
 

 
diff --git a/engine/debug.asm b/engine/debug.asm
index c15481926..4e3ce6f60 100755
--- a/engine/debug.asm
+++ b/engine/debug.asm
@@ -1,4 +1,4 @@
-const_value set $6a
+	const_def $6a
 	const DEBUGTEST_UP_ARROW ; $6a
 	const DEBUGTEST_TICKS    ; $6b
 	const DEBUGTEST_WHITE    ; $6c
diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm
index a65cecc8a..8079088d9 100755
--- a/engine/stats_screen.asm
+++ b/engine/stats_screen.asm
@@ -1,4 +1,4 @@
-const_value set 1
+	const_def 1
 	const PINK_PAGE  ; 1
 	const GREEN_PAGE ; 2
 	const BLUE_PAGE  ; 3
diff --git a/macros/enum.asm b/macros/enum.asm
index c1321a636..385aee6f8 100644
--- a/macros/enum.asm
+++ b/macros/enum.asm
@@ -26,7 +26,11 @@ ENDM
 ; Enumerate constants
 
 const_def: MACRO
+if _NARG >= 1
+const_value = \1
+else
 const_value = 0
+endc
 ENDM
 
 const: MACRO
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
index 5681c3df8..7967fed01 100644
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const AZALEAGYM_BUGSY
 	const AZALEAGYM_BUG_CATCHER1
 	const AZALEAGYM_BUG_CATCHER2
diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm
index 984b7651a..3d224bb74 100644
--- a/maps/AzaleaMart.asm
+++ b/maps/AzaleaMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const AZALEAMART_CLERK
 	const AZALEAMART_COOLTRAINER_M
 	const AZALEAMART_BUG_CATCHER
diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm
index b135229d0..84c7a3bae 100644
--- a/maps/AzaleaPokecenter1F.asm
+++ b/maps/AzaleaPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const AZALEAPOKECENTER1F_NURSE
 	const AZALEAPOKECENTER1F_GENTLEMAN
 	const AZALEAPOKECENTER1F_FISHING_GURU
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index 15d867608..aba022cad 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const AZALEATOWN_AZALEA_ROCKET1
 	const AZALEATOWN_GRAMPS
 	const AZALEATOWN_TEACHER
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index 526f08274..8fd6f9f97 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const BATTLETOWER1F_RECEPTIONIST
 	const BATTLETOWER1F_YOUNGSTER
 	const BATTLETOWER1F_COOLTRAINER_F
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index bb3203d06..06d582ea8 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const BATTLETOWERBATTLEROOM_YOUNGSTER
 	const BATTLETOWERBATTLEROOM_RECEPTIONIST
 
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
index ec2c0462c..4e6912c00 100644
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const BATTLETOWERELEVATOR_RECEPTIONIST
 
 BattleTowerElevator_MapScripts:
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
index fe249f2d9..47971c815 100644
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const BATTLETOWERHALLWAY_RECEPTIONIST
 
 BattleTowerHallway_MapScripts:
diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm
index 5ade6be43..23d265637 100644
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const BATTLETOWEROUTSIDE_STANDING_YOUNGSTER
 	const BATTLETOWEROUTSIDE_BUENA
 	const BATTLETOWEROUTSIDE_SAILOR
diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm
index 2652b7e6c..452b1fdb8 100644
--- a/maps/BillsBrothersHouse.asm
+++ b/maps/BillsBrothersHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const BILLSBROTHERSHOUSE_POKEFAN_F
 	const BILLSBROTHERSHOUSE_YOUNGSTER
 
diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm
index 5b0c0ec5f..a0ce47a75 100644
--- a/maps/BillsFamilysHouse.asm
+++ b/maps/BillsFamilysHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const BILLSFAMILYSHOUSE_BILL
 	const BILLSFAMILYSHOUSE_POKEFAN_F
 	const BILLSFAMILYSHOUSE_TWIN
diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
index 5dca2ea41..6de4d2bc7 100644
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const BILLSHOUSE_GRAMPS
 
 BillsHouse_MapScripts:
diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm
index c413df225..0ba92b110 100644
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const BLACKTHORNCITY_SUPER_NERD1
 	const BLACKTHORNCITY_SUPER_NERD2
 	const BLACKTHORNCITY_GRAMPS1
diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm
index 19e8fd744..d9425f9ed 100644
--- a/maps/BlackthornDragonSpeechHouse.asm
+++ b/maps/BlackthornDragonSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const BLACKTHORNDRAGONSPEECHHOUSE_GRANNY
 	const BLACKTHORNDRAGONSPEECHHOUSE_EKANS
 
diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm
index c3a4e4939..8e9d9af23 100644
--- a/maps/BlackthornEmysHouse.asm
+++ b/maps/BlackthornEmysHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const BLACKTHORNEMYSHOUSE_EMY
 
 BlackthornEmysHouse_MapScripts:
diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm
index d8e74049f..1e9b7fb7e 100644
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const BLACKTHORNGYM1F_CLAIR
 	const BLACKTHORNGYM1F_COOLTRAINER_M1
 	const BLACKTHORNGYM1F_COOLTRAINER_M2
diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm
index 6e923c44a..73cf4bc88 100644
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const BLACKTHORNGYM2F_COOLTRAINER_M
 	const BLACKTHORNGYM2F_COOLTRAINER_F
 	const BLACKTHORNGYM2F_BOULDER1
diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm
index 03315f745..d0a4e541b 100644
--- a/maps/BlackthornMart.asm
+++ b/maps/BlackthornMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const BLACKTHORNMART_CLERK
 	const BLACKTHORNMART_COOLTRAINER_M
 	const BLACKTHORNMART_BLACK_BELT
diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm
index 61c9e50a9..c39cd68b3 100644
--- a/maps/BlackthornPokecenter1F.asm
+++ b/maps/BlackthornPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const BLACKTHORNPOKECENTER1F_NURSE
 	const BLACKTHORNPOKECENTER1F_GENTLEMAN
 	const BLACKTHORNPOKECENTER1F_TWIN
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
index 474b9c370..ebc528bbe 100644
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const BLUESHOUSE_DAISY
 
 BluesHouse_MapScripts:
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
index 4f900e180..06694dc9c 100644
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const BRUNOSROOM_BRUNO
 
 BrunosRoom_MapScripts:
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index 349f3a674..4c8f5e912 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const BURNEDTOWER1F_ROCK
 	const BURNEDTOWER1F_EUSINE
 	const BURNEDTOWER1F_SILVER
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index 4e04f5c2a..ab4d5f5ce 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const BURNEDTOWERB1F_BOULDER
 	const BURNEDTOWERB1F_RAIKOU1
 	const BURNEDTOWERB1F_ENTEI1
diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm
index e0dd922b2..039231283 100644
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CELADONCAFE_SUPER_NERD
 	const CELADONCAFE_FISHER1
 	const CELADONCAFE_FISHER2
diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm
index c1a19e8b6..606587906 100644
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CELADONCITY_FISHER
 	const CELADONCITY_POLIWAG
 	const CELADONCITY_TEACHER1
diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm
index f8d44e887..515ab70b0 100644
--- a/maps/CeladonDeptStore1F.asm
+++ b/maps/CeladonDeptStore1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CELADONDEPTSTORE1F_RECEPTIONIST
 	const CELADONDEPTSTORE1F_GENTLEMAN
 	const CELADONDEPTSTORE1F_TEACHER
diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm
index ef774ab35..6810cf390 100644
--- a/maps/CeladonDeptStore2F.asm
+++ b/maps/CeladonDeptStore2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CELADONDEPTSTORE2F_CLERK1
 	const CELADONDEPTSTORE2F_CLERK2
 	const CELADONDEPTSTORE2F_POKEFAN_M
diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm
index 6f73f1772..2527599c4 100644
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CELADONDEPTSTORE3F_CLERK
 	const CELADONDEPTSTORE3F_YOUNGSTER
 	const CELADONDEPTSTORE3F_GAMEBOY_KID1
diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm
index 676088476..46532322f 100644
--- a/maps/CeladonDeptStore4F.asm
+++ b/maps/CeladonDeptStore4F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CELADONDEPTSTORE4F_CLERK
 	const CELADONDEPTSTORE4F_SUPER_NERD
 	const CELADONDEPTSTORE4F_YOUNGSTER
diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm
index 7a380064b..94fc55de3 100644
--- a/maps/CeladonDeptStore5F.asm
+++ b/maps/CeladonDeptStore5F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CELADONDEPTSTORE5F_CLERK1
 	const CELADONDEPTSTORE5F_CLERK2
 	const CELADONDEPTSTORE5F_GENTLEMAN
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index 1c472b0a6..d85fdda2e 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CELADONDEPTSTORE6F_SUPER_NERD
 	const CELADONDEPTSTORE6F_YOUNGSTER
 
diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm
index d453f757f..d39f09586 100644
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CELADONGAMECORNER_CLERK
 	const CELADONGAMECORNER_RECEPTIONIST
 	const CELADONGAMECORNER_POKEFAN_M
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index e3106a78b..347aa1513 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CELADONGAMECORNERPRIZEROOM_GENTLEMAN
 	const CELADONGAMECORNERPRIZEROOM_PHARMACIST
 
diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm
index 5422ae253..1d6a23b40 100644
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CELADONGYM_ERIKA
 	const CELADONGYM_LASS1
 	const CELADONGYM_LASS2
diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm
index 57ac84436..79c4fbaec 100644
--- a/maps/CeladonMansion1F.asm
+++ b/maps/CeladonMansion1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CELADONMANSION1F_GRANNY
 	const CELADONMANSION1F_GROWLITHE1
 	const CELADONMANSION1F_CLEFAIRY
diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm
index 8b363fe04..ce7e0c1fc 100644
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CELADONMANSION3F_COOLTRAINER_M
 	const CELADONMANSION3F_GYM_GUY
 	const CELADONMANSION3F_SUPER_NERD
diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm
index 969290800..de9bed48f 100644
--- a/maps/CeladonMansionRoof.asm
+++ b/maps/CeladonMansionRoof.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CELADONMANSIONROOF_FISHER
 
 CeladonMansionRoof_MapScripts:
diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm
index 01e70490e..a818b2875 100644
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CELADONMANSIONROOFHOUSE_PHARMACIST
 
 CeladonMansionRoofHouse_MapScripts:
diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm
index ac68363fc..098d4f9f5 100644
--- a/maps/CeladonPokecenter1F.asm
+++ b/maps/CeladonPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CELADONPOKECENTER1F_NURSE
 	const CELADONPOKECENTER1F_GENTLEMAN
 	const CELADONPOKECENTER1F_PHARMACIST
diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm
index d06370a37..36495ce7d 100644
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CERULEANCITY_COOLTRAINER_M
 	const CERULEANCITY_SUPER_NERD
 	const CERULEANCITY_SLOWPOKE
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index ad03c9aba..cc11ce209 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CERULEANGYM_ROCKET
 	const CERULEANGYM_MISTY
 	const CERULEANGYM_SWIMMER_GIRL1
diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm
index 0abe42089..2e15a2d43 100644
--- a/maps/CeruleanGymBadgeSpeechHouse.asm
+++ b/maps/CeruleanGymBadgeSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M
 
 CeruleanGymBadgeSpeechHouse_MapScripts:
diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm
index ab5973ab0..4165f1c3e 100644
--- a/maps/CeruleanMart.asm
+++ b/maps/CeruleanMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CERULEANMART_CLERK
 	const CERULEANMART_COOLTRAINER_M
 	const CERULEANMART_COOLTRAINER_F
diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm
index 02c86774c..6a777da4a 100644
--- a/maps/CeruleanPokecenter1F.asm
+++ b/maps/CeruleanPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CERULEANPOKECENTER1F_NURSE
 	const CERULEANPOKECENTER1F_SUPER_NERD
 	const CERULEANPOKECENTER1F_GYM_GUY
diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm
index f653716f4..a06c81ef7 100644
--- a/maps/CeruleanPoliceStation.asm
+++ b/maps/CeruleanPoliceStation.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CERULEANPOLICESTATION_FISHING_GURU
 	const CERULEANPOLICESTATION_POKEFAN_F
 	const CERULEANPOLICESTATION_DIGLETT
diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm
index e7f19a518..5f6cf03ed 100644
--- a/maps/CeruleanTradeSpeechHouse.asm
+++ b/maps/CeruleanTradeSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CERULEANTRADESPEECHHOUSE_GRANNY
 	const CERULEANTRADESPEECHHOUSE_GRAMPS
 	const CERULEANTRADESPEECHHOUSE_RHYDON
diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm
index 1eb7bfb1c..94b936421 100644
--- a/maps/CharcoalKiln.asm
+++ b/maps/CharcoalKiln.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CHARCOALKILN_BLACK_BELT
 	const CHARCOALKILN_YOUNGSTER
 	const CHARCOALKILN_MOLTRES
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index 29a437826..aadb9c98e 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CHERRYGROVECITY_GRAMPS
 	const CHERRYGROVECITY_SILVER
 	const CHERRYGROVECITY_TEACHER
diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm
index b49d2de52..fdda1d4c0 100644
--- a/maps/CherrygroveEvolutionSpeechHouse.asm
+++ b/maps/CherrygroveEvolutionSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CHERRYGROVEEVOLUTIONSPEECHHOUSE_LASS
 	const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER
 
diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm
index 995b3a7f7..c8ba5248e 100644
--- a/maps/CherrygroveGymSpeechHouse.asm
+++ b/maps/CherrygroveGymSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CHERRYGROVEGYMSPEECHHOUSE_POKEFAN_M
 	const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER
 
diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm
index 777bc1db4..e05d21749 100644
--- a/maps/CherrygroveMart.asm
+++ b/maps/CherrygroveMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CHERRYGROVEMART_CLERK
 	const CHERRYGROVEMART_COOLTRAINER_M
 	const CHERRYGROVEMART_YOUNGSTER
diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm
index 8374215b8..194b48e03 100644
--- a/maps/CherrygrovePokecenter1F.asm
+++ b/maps/CherrygrovePokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CHERRYGROVEPOKECENTER1F_NURSE
 	const CHERRYGROVEPOKECENTER1F_FISHER
 	const CHERRYGROVEPOKECENTER1F_GENTLEMAN
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index af154437e..5d0d1c6fc 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CIANWOODCITY_STANDING_YOUNGSTER
 	const CIANWOODCITY_POKEFAN_M
 	const CIANWOODCITY_LASS
diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm
index 365c68e11..4da9613b9 100644
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CIANWOODGYM_CHUCK
 	const CIANWOODGYM_BLACK_BELT1
 	const CIANWOODGYM_BLACK_BELT2
diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm
index 88bbf8065..686802ccc 100644
--- a/maps/CianwoodLugiaSpeechHouse.asm
+++ b/maps/CianwoodLugiaSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CIANWOODLUGIASPEECHHOUSE_TEACHER
 	const CIANWOODLUGIASPEECHHOUSE_LASS
 	const CIANWOODLUGIASPEECHHOUSE_TWIN
diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm
index 016531227..bc7bffe0d 100644
--- a/maps/CianwoodPharmacy.asm
+++ b/maps/CianwoodPharmacy.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CIANWOODPHARMACY_PHARMACIST
 
 CianwoodPharmacy_MapScripts:
diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm
index 3fb00c944..6abdd835c 100644
--- a/maps/CianwoodPhotoStudio.asm
+++ b/maps/CianwoodPhotoStudio.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CIANWOODPHOTOSTUDIO_FISHING_GURU
 
 CianwoodPhotoStudio_MapScripts:
diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm
index 2698b9089..1a561c517 100644
--- a/maps/CianwoodPokecenter1F.asm
+++ b/maps/CianwoodPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CIANWOODPOKECENTER1F_NURSE
 	const CIANWOODPOKECENTER1F_LASS
 	const CIANWOODPOKECENTER1F_GYM_GUY
diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm
index e920b5c92..9f559bff3 100644
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CINNABARISLAND_BLUE
 
 CinnabarIsland_MapScripts:
diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm
index e4e8d42af..81610ee64 100644
--- a/maps/CinnabarPokecenter1F.asm
+++ b/maps/CinnabarPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const CINNABARPOKECENTER1F_NURSE
 	const CINNABARPOKECENTER1F_COOLTRAINER_F
 	const CINNABARPOKECENTER1F_FISHER
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index a8c85bf6c..ea5a0ba29 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const COLOSSEUM_CHRIS1
 	const COLOSSEUM_CHRIS2
 
diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm
index 1550d8340..fb5cbd042 100644
--- a/maps/CopycatsHouse1F.asm
+++ b/maps/CopycatsHouse1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const COPYCATSHOUSE1F_POKEFAN_M
 	const COPYCATSHOUSE1F_POKEFAN_F
 	const COPYCATSHOUSE1F_CLEFAIRY
diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm
index 37d654090..d385ef0d5 100644
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const COPYCATSHOUSE2F_COPYCAT1 ; if player is male
 	const COPYCATSHOUSE2F_DODRIO
 	const COPYCATSHOUSE2F_FAIRYDOLL ; lost item
diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm
index 4873e7981..ec4a257bb 100644
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const DANCETHEATRE_KIMONO_GIRL1
 	const DANCETHEATRE_KIMONO_GIRL2
 	const DANCETHEATRE_KIMONO_GIRL3
diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm
index c9a7ac415..71b160fd9 100644
--- a/maps/DarkCaveBlackthornEntrance.asm
+++ b/maps/DarkCaveBlackthornEntrance.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const DARKCAVEBLACKTHORNENTRANCE_PHARMACIST
 	const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL1
 	const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2
diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm
index 3050258ff..eba31b40d 100644
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const DARKCAVEVIOLETENTRANCE_POKE_BALL1
 	const DARKCAVEVIOLETENTRANCE_ROCK1
 	const DARKCAVEVIOLETENTRANCE_ROCK2
diff --git a/maps/DayCare.asm b/maps/DayCare.asm
index 6fad13a54..ce7e04c21 100644
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const DAYCARE_GRAMPS
 	const DAYCARE_GRANNY
 
diff --git a/maps/DayOfWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm
index 6a3d59b77..40efae76e 100644
--- a/maps/DayOfWeekSiblingsHouse.asm
+++ b/maps/DayOfWeekSiblingsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const DAYOFWEEKSIBLINGSHOUSE_POKEDEX
 
 DayOfWeekSiblingsHouse_MapScripts:
diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm
index 0de2befa4..6552e4d57 100644
--- a/maps/DiglettsCave.asm
+++ b/maps/DiglettsCave.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const DIGLETTSCAVE_POKEFAN_M
 
 DiglettsCave_MapScripts:
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index 9d87efb33..3de5e46cc 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const DRAGONSHRINE_ELDER1
 	const DRAGONSHRINE_ELDER2
 	const DRAGONSHRINE_ELDER3
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 36597835b..f9c0809fa 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const DRAGONSDENB1F_POKE_BALL1
 	const DRAGONSDENB1F_CLAIR
 	const DRAGONSDENB1F_SILVER
diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm
index 2d27c9c8f..b20863fd1 100644
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const EARLSPOKEMONACADEMY_EARL
 	const EARLSPOKEMONACADEMY_YOUNGSTER1
 	const EARLSPOKEMONACADEMY_GAMEBOY_KID1
diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm
index 6f0960530..6ba623bab 100644
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ECRUTEAKCITY_GRAMPS1
 	const ECRUTEAKCITY_GRAMPS2
 	const ECRUTEAKCITY_LASS1
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index 4dad860bd..1c1abddda 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ECRUTEAKGYM_MORTY
 	const ECRUTEAKGYM_SAGE1
 	const ECRUTEAKGYM_SAGE2
diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm
index 9836f2198..7ecf9dcb6 100644
--- a/maps/EcruteakItemfinderHouse.asm
+++ b/maps/EcruteakItemfinderHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ECRUTEAKITEMFINDERHOUSE_COOLTRAINER_M
 	const ECRUTEAKITEMFINDERHOUSE_POKEDEX
 
diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm
index caee5ddaa..47735d27a 100644
--- a/maps/EcruteakLugiaSpeechHouse.asm
+++ b/maps/EcruteakLugiaSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ECRUTEAKLUGIASPEECHHOUSE_GRAMPS
 	const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER
 
diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm
index be43855ab..07e680de6 100644
--- a/maps/EcruteakMart.asm
+++ b/maps/EcruteakMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ECRUTEAKMART_CLERK
 	const ECRUTEAKMART_SUPER_NERD
 	const ECRUTEAKMART_GRANNY
diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm
index 022ecd13f..1afaa6ea3 100644
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ECRUTEAKPOKECENTER1F_NURSE
 	const ECRUTEAKPOKECENTER1F_POKEFAN_M
 	const ECRUTEAKPOKECENTER1F_COOLTRAINER_F
diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm
index da281bf90..184abc16b 100644
--- a/maps/EcruteakTinTowerEntrance.asm
+++ b/maps/EcruteakTinTowerEntrance.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ECRUTEAKTINTOWERENTRANCE_SAGE1
 	const ECRUTEAKTINTOWERENTRANCE_SAGE2
 	const ECRUTEAKTINTOWERENTRANCE_SAGE3
diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm
index 2adec1838..d41cc9ea4 100644
--- a/maps/ElmsHouse.asm
+++ b/maps/ElmsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ELMSHOUSE_ELMS_WIFE
 	const ELMSHOUSE_ELMS_SON
 
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index bc8ce87a7..a5030a436 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ELMSLAB_ELM
 	const ELMSLAB_ELMS_AIDE
 	const ELMSLAB_POKE_BALL1
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index 4ccc1d56f..9e20d9d41 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const FASTSHIP1F_SAILOR1
 	const FASTSHIP1F_SAILOR2
 	const FASTSHIP1F_SAILOR3
diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm
index a3a65c63f..08d27eef3 100644
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const FASTSHIPB1F_SAILOR1
 	const FASTSHIPB1F_SAILOR2
 	const FASTSHIPB1F_SAILOR3
diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm
index 719c7d4b2..8d69f3e31 100644
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_M
 	const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_F
 	const FASTSHIPCABINS_NNW_NNE_NE_SUPER_NERD
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index a1e19be2c..ba9a31fbe 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_CAPTAIN
 	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN
 	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1
diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm
index a6d898ff9..15daeeae2 100644
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const FASTSHIPCABINS_SW_SSW_NW_FISHER
 	const FASTSHIPCABINS_SW_SSW_NW_BUG_CATCHER
 	const FASTSHIPCABINS_SW_SSW_NW_BUENA
diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm
index 6c8125dae..3ec583d79 100644
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const FIGHTINGDOJO_BLACK_BELT
 	const FIGHTINGDOJO_POKE_BALL
 
diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm
index b76e574b6..a576868a7 100644
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const FUCHSIACITY_YOUNGSTER
 	const FUCHSIACITY_POKEFAN_M
 	const FUCHSIACITY_TEACHER
diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm
index 402f89d23..a64dd49e1 100644
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const FUCHSIAGYM_JANINE
 	const FUCHSIAGYM_FUCHSIA_GYM_1
 	const FUCHSIAGYM_FUCHSIA_GYM_2
diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm
index 0cb11eb56..98808262f 100644
--- a/maps/FuchsiaMart.asm
+++ b/maps/FuchsiaMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const FUCHSIAMART_CLERK
 	const FUCHSIAMART_FISHER
 	const FUCHSIAMART_COOLTRAINER_F
diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm
index c7691e111..01609dc48 100644
--- a/maps/FuchsiaPokecenter1F.asm
+++ b/maps/FuchsiaPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const FUCHSIAPOKECENTER1F_NURSE
 	const FUCHSIAPOKECENTER1F_COOLTRAINER_M
 	const FUCHSIAPOKECENTER1F_COOLTRAINER_F
diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm
index b5506e149..980b3c940 100644
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODBIKESHOP_CLERK
 
 GoldenrodBikeShop_MapScripts:
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index f69f86dea..623107e95 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODCITY_POKEFAN_M1
 	const GOLDENRODCITY_YOUNGSTER1
 	const GOLDENRODCITY_COOLTRAINER_F1
diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm
index 50314f07a..b38f5cddd 100644
--- a/maps/GoldenrodDeptStore1F.asm
+++ b/maps/GoldenrodDeptStore1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODDEPTSTORE1F_RECEPTIONIST
 	const GOLDENRODDEPTSTORE1F_POKEFAN_F
 	const GOLDENRODDEPTSTORE1F_BUG_CATCHER
diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm
index 121937ad5..6c6f99124 100644
--- a/maps/GoldenrodDeptStore2F.asm
+++ b/maps/GoldenrodDeptStore2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODDEPTSTORE2F_CLERK1
 	const GOLDENRODDEPTSTORE2F_CLERK2
 	const GOLDENRODDEPTSTORE2F_YOUNGSTER
diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm
index 951cb7965..1bd2fecf8 100644
--- a/maps/GoldenrodDeptStore3F.asm
+++ b/maps/GoldenrodDeptStore3F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODDEPTSTORE3F_CLERK
 	const GOLDENRODDEPTSTORE3F_SUPER_NERD
 	const GOLDENRODDEPTSTORE3F_ROCKER
diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm
index a671c44ce..4263957f8 100644
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODDEPTSTORE4F_CLERK
 	const GOLDENRODDEPTSTORE4F_COOLTRAINER_M
 	const GOLDENRODDEPTSTORE4F_BUG_CATCHER
diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm
index 8708f52b0..31f5c0e3f 100644
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODDEPTSTORE5F_CLERK
 	const GOLDENRODDEPTSTORE5F_LASS
 	const GOLDENRODDEPTSTORE5F_MIKE
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index a143bd758..4fb4b9ff9 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODDEPTSTORE6F_LASS
 	const GOLDENRODDEPTSTORE6F_SUPER_NERD
 
diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm
index 1de53a034..d18a191da 100644
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODDEPTSTOREB1F_POKE_BALL1
 	const GOLDENRODDEPTSTOREB1F_POKE_BALL2
 	const GOLDENRODDEPTSTOREB1F_POKE_BALL3
diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm
index 90b0db3bf..f991bfe9d 100644
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODDEPTSTOREROOF_CLERK
 	const GOLDENRODDEPTSTOREROOF_POKEFAN_F
 	const GOLDENRODDEPTSTOREROOF_FISHER
diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm
index 9adf901c4..9e182f8d8 100644
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODFLOWERSHOP_TEACHER
 	const GOLDENRODFLOWERSHOP_FLORIA
 
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index 823ea9907..d435b7e5e 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODGAMECORNER_CLERK
 	const GOLDENRODGAMECORNER_RECEPTIONIST1
 	const GOLDENRODGAMECORNER_RECEPTIONIST2
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
index fba07c9df..2453afa30 100644
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODGYM_WHITNEY
 	const GOLDENRODGYM_LASS1
 	const GOLDENRODGYM_LASS2
diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm
index 7dc7e4f53..2b582347b 100644
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODHAPPINESSRATER_TEACHER
 	const GOLDENRODHAPPINESSRATER_POKEFAN_M
 	const GOLDENRODHAPPINESSRATER_TWIN
diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm
index 7c4af43a3..e678d71e0 100644
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODMAGNETTRAINSTATION_OFFICER
 	const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN
 
diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm
index f105e6826..40a5d4719 100644
--- a/maps/GoldenrodNameRater.asm
+++ b/maps/GoldenrodNameRater.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODNAMERATER_NAME_RATER
 
 GoldenrodNameRater_MapScripts:
diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm
index 61010b316..82d0fc72e 100644
--- a/maps/GoldenrodPPSpeechHouse.asm
+++ b/maps/GoldenrodPPSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODPPSPEECHHOUSE_FISHER
 	const GOLDENRODPPSPEECHHOUSE_LASS
 
diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm
index 162c0d04f..521cacfe3 100644
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODPOKECENTER1F_NURSE
 	const GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
 	const GOLDENRODPOKECENTER1F_GAMEBOY_KID
diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm
index 46d01a4d8..daa35641f 100644
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODUNDERGROUND_SUPER_NERD1
 	const GOLDENRODUNDERGROUND_SUPER_NERD2
 	const GOLDENRODUNDERGROUND_SUPER_NERD3
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index f8476e0f4..3ac711ba2 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -31,7 +31,7 @@ doorstate: MACRO
 	changeblock UGDOOR_\1_YCOORD, UGDOOR_\1_XCOORD, UNDERGROUND_DOOR_\2
 ENDM
 
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST1
 	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST2
 	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET1
diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm
index 99785528e..4227dc7cc 100644
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET1
 	const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET2
 	const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET3
diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm
index ca307d98e..98ac32ada 100644
--- a/maps/GuideGentsHouse.asm
+++ b/maps/GuideGentsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const GUIDEGENTSHOUSE_GRAMPS
 
 GuideGentsHouse_MapScripts:
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index 55c856de4..314628091 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const HALLOFFAME_LANCE
 
 HallOfFame_MapScripts:
diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm
index dd76d5597..58edccf9b 100644
--- a/maps/IcePath1F.asm
+++ b/maps/IcePath1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ICEPATH1F_POKE_BALL1
 	const ICEPATH1F_POKE_BALL2
 	const ICEPATH1F_POKE_BALL3
diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm
index 9dfe2fc3d..0fa627255 100644
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ICEPATHB1F_BOULDER1
 	const ICEPATHB1F_BOULDER2
 	const ICEPATHB1F_BOULDER3
diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm
index 86a171820..85d35d7b7 100644
--- a/maps/IcePathB2FBlackthornSide.asm
+++ b/maps/IcePathB2FBlackthornSide.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL
 
 IcePathB2FBlackthornSide_MapScripts:
diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm
index 61f38c1d3..cecdd5452 100644
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ICEPATHB2FMAHOGANYSIDE_BOULDER1
 	const ICEPATHB2FMAHOGANYSIDE_BOULDER2
 	const ICEPATHB2FMAHOGANYSIDE_BOULDER3
diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm
index 352db71ed..dbe60aea7 100644
--- a/maps/IcePathB3F.asm
+++ b/maps/IcePathB3F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ICEPATHB3F_POKE_BALL
 	const ICEPATHB3F_ROCK
 
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index 25ebe0c42..0407c97f4 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ILEXFOREST_FARFETCHD
 	const ILEXFOREST_YOUNGSTER1
 	const ILEXFOREST_BLACK_BELT
diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm
index 881b58640..c0dc50d9b 100644
--- a/maps/IlexForestAzaleaGate.asm
+++ b/maps/IlexForestAzaleaGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ILEXFORESTAZALEAGATE_OFFICER
 	const ILEXFORESTAZALEAGATE_GRANNY
 
diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm
index 9f820c967..eb2ef3328 100644
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const INDIGOPLATEAUPOKECENTER1F_NURSE
 	const INDIGOPLATEAUPOKECENTER1F_CLERK
 	const INDIGOPLATEAUPOKECENTER1F_COOLTRAINER_M
diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
index badcaf0b8..814e9825b 100644
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const KARENSROOM_KAREN
 
 KarensRoom_MapScripts:
diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
index bf05e7623..63726fe91 100644
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const KOGASROOM_KOGA
 
 KogasRoom_MapScripts:
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index ae04c5814..ea462477b 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const KURTSHOUSE_KURT1
 	const KURTSHOUSE_TWIN1
 	const KURTSHOUSE_SLOWPOKE
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm
index 1130ccd21..a66aa5126 100644
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const LAKEOFRAGE_LANCE
 	const LAKEOFRAGE_GRAMPS
 	const LAKEOFRAGE_SUPER_NERD1
diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm
index d6235e606..2c9b3e645 100644
--- a/maps/LakeOfRageHiddenPowerHouse.asm
+++ b/maps/LakeOfRageHiddenPowerHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER
 
 LakeOfRageHiddenPowerHouse_MapScripts:
diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm
index c08414e9c..4f41b1a4c 100644
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU
 
 LakeOfRageMagikarpHouse_MapScripts:
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index 5873e601f..eae0d03c2 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const LANCESROOM_LANCE
 	const LANCESROOM_MARY
 	const LANCESROOM_OAK
diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm
index 4d3e18175..30e7871fd 100644
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const LAVRADIOTOWER1F_RECEPTIONIST
 	const LAVRADIOTOWER1F_OFFICER
 	const LAVRADIOTOWER1F_SUPER_NERD1
diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm
index 3a391a529..2f313d3a3 100644
--- a/maps/LavenderMart.asm
+++ b/maps/LavenderMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const LAVENDERMART_CLERK
 	const LAVENDERMART_POKEFAN_M
 	const LAVENDERMART_ROCKER
diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm
index b3ddfd158..93ab36b9a 100644
--- a/maps/LavenderNameRater.asm
+++ b/maps/LavenderNameRater.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const LAVENDERNAMERATER_NAME_RATER
 
 LavenderNameRater_MapScripts:
diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm
index e18e2f5b7..ec9d41ab4 100644
--- a/maps/LavenderPokecenter1F.asm
+++ b/maps/LavenderPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const LAVENDERPOKECENTER1F_NURSE
 	const LAVENDERPOKECENTER1F_GENTLEMAN
 	const LAVENDERPOKECENTER1F_TEACHER
diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm
index 73f159b02..7891ce23d 100644
--- a/maps/LavenderSpeechHouse.asm
+++ b/maps/LavenderSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const LAVENDERSPEECHHOUSE_POKEFAN_F
 
 LavenderSpeechHouse_MapScripts:
diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm
index f528e90c9..8e16f47c7 100644
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const LAVENDERTOWN_POKEFAN_M
 	const LAVENDERTOWN_TEACHER
 	const LAVENDERTOWN_GRAMPS
diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm
index 1dd398448..0828bdf7a 100644
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const MAHOGANYGYM_PRYCE
 	const MAHOGANYGYM_BUENA1
 	const MAHOGANYGYM_ROCKER1
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index 0ea9e0348..78ae42318 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const MAHOGANYMART1F_PHARMACIST
 	const MAHOGANYMART1F_BLACK_BELT
 	const MAHOGANYMART1F_LANCE
diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm
index affae9afc..c28a62c67 100644
--- a/maps/MahoganyPokecenter1F.asm
+++ b/maps/MahoganyPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const MAHOGANYPOKECENTER1F_NURSE
 	const MAHOGANYPOKECENTER1F_POKEFAN_M
 	const MAHOGANYPOKECENTER1F_YOUNGSTER
diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm
index 51e895be6..2a657d60f 100644
--- a/maps/MahoganyRedGyaradosSpeechHouse.asm
+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const MAHOGANYREDGYARADOSSPEECHHOUSE_BLACK_BELT
 	const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER
 
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index 4058a85dc..eb02ba0d9 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const MAHOGANYTOWN_POKEFAN_M
 	const MAHOGANYTOWN_GRAMPS
 	const MAHOGANYTOWN_FISHER
diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm
index 5dd992685..0bf8a2c20 100644
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const MANIASHOUSE_ROCKER
 
 ManiasHouse_MapScripts:
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index 528192eb0..510dc69a0 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const MOUNTMOON_SILVER
 
 MountMoon_MapScripts:
diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm
index f4bc75cca..df3a7aca6 100644
--- a/maps/MountMoonGiftShop.asm
+++ b/maps/MountMoonGiftShop.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const MOUNTMOONGIFTSHOP_GRAMPS1 ; morning only
 	const MOUNTMOONGIFTSHOP_GRAMPS2 ; day only
 	const MOUNTMOONGIFTSHOP_LASS1 ; morning only
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index f11f0e9ad..742c169c0 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const MOUNTMOONSQUARE_FAIRY1
 	const MOUNTMOONSQUARE_FAIRY2
 	const MOUNTMOONSQUARE_ROCK
diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm
index d52255cac..5f9056e29 100644
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const MOUNTMORTAR1FINSIDE_BOULDER
 	const MOUNTMORTAR1FINSIDE_POKE_BALL1
 	const MOUNTMORTAR1FINSIDE_POKE_BALL2
diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm
index 7b4f6ef4d..c261d1a3b 100644
--- a/maps/MountMortar1FOutside.asm
+++ b/maps/MountMortar1FOutside.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const MOUNTMORTAR1FOUTSIDE_POKE_BALL1
 	const MOUNTMORTAR1FOUTSIDE_POKE_BALL2
 
diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm
index b03e6eeba..ce6811bca 100644
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const MOUNTMORTAR2FINSIDE_POKE_BALL1
 	const MOUNTMORTAR2FINSIDE_POKE_BALL2
 	const MOUNTMORTAR2FINSIDE_POKE_BALL3
diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm
index 3e0c96912..986e6e928 100644
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const MOUNTMORTARB1F_POKE_BALL1
 	const MOUNTMORTARB1F_POKE_BALL2
 	const MOUNTMORTARB1F_BOULDER
diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm
index 7761cea57..0b42fe99e 100644
--- a/maps/MoveDeletersHouse.asm
+++ b/maps/MoveDeletersHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const MOVEDELETERSHOUSE_SUPER_NERD
 
 MoveDeletersHouse_MapScripts:
diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm
index 731001d7f..fc547e2d6 100644
--- a/maps/MrFujisHouse.asm
+++ b/maps/MrFujisHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const MRFUJISHOUSE_SUPER_NERD
 	const MRFUJISHOUSE_LASS
 	const MRFUJISHOUSE_PSYDUCK
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index ab62fc3f7..5d85b2fbf 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const MRPOKEMONSHOUSE_GENTLEMAN
 	const MRPOKEMONSHOUSE_OAK
 
diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm
index d7c6eb4da..610a5e846 100644
--- a/maps/MrPsychicsHouse.asm
+++ b/maps/MrPsychicsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const MRPSYCHICSHOUSE_FISHING_GURU
 
 MrPsychicsHouse_MapScripts:
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index 681ea96f8..850c2ab9d 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const NATIONALPARK_LASS1
 	const NATIONALPARK_POKEFAN_F1
 	const NATIONALPARK_TEACHER1
diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm
index 5161cf8bf..dd969f477 100644
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const NATIONALPARKBUGCONTEST_YOUNGSTER1
 	const NATIONALPARKBUGCONTEST_YOUNGSTER2
 	const NATIONALPARKBUGCONTEST_ROCKER
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index 6e59a96db..82d5364cd 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const NEWBARKTOWN_TEACHER
 	const NEWBARKTOWN_FISHER
 	const NEWBARKTOWN_SILVER
diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm
index c3f714aa2..f6bae3fd2 100644
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const OAKSLAB_OAK
 	const OAKSLAB_SCIENTIST1
 	const OAKSLAB_SCIENTIST2
diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm
index e6f9e3696..79a7f0540 100644
--- a/maps/OlivineCafe.asm
+++ b/maps/OlivineCafe.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const OLIVINECAFE_SAILOR1
 	const OLIVINECAFE_FISHING_GURU
 	const OLIVINECAFE_SAILOR2
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index 635f0ab0d..a7ef4f8b6 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const OLIVINECITY_SAILOR1
 	const OLIVINECITY_STANDING_YOUNGSTER
 	const OLIVINECITY_SAILOR2
diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm
index 3aecc8590..65e8a773d 100644
--- a/maps/OlivineGoodRodHouse.asm
+++ b/maps/OlivineGoodRodHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const OLIVINEGOODRODHOUSE_FISHING_GURU
 
 OlivineGoodRodHouse_MapScripts:
diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm
index 2bc723c31..5c024f015 100644
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const OLIVINEGYM_JASMINE
 	const OLIVINEGYM_GYM_GUY
 
diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm
index 1e50ada20..085c67685 100644
--- a/maps/OlivineHouseBeta.asm
+++ b/maps/OlivineHouseBeta.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const OLIVINEHOUSEBETA_TEACHER
 	const OLIVINEHOUSEBETA_RHYDON
 
diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm
index 6fa52b850..66d8d89ac 100644
--- a/maps/OlivineLighthouse1F.asm
+++ b/maps/OlivineLighthouse1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const OLIVINELIGHTHOUSE1F_SAILOR
 	const OLIVINELIGHTHOUSE1F_POKEFAN_F
 
diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm
index 51a814a72..bedd5d8c9 100644
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const OLIVINELIGHTHOUSE2F_SAILOR
 	const OLIVINELIGHTHOUSE2F_GENTLEMAN
 
diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm
index cd8f54b33..63f02d6e2 100644
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const OLIVINELIGHTHOUSE3F_SAILOR
 	const OLIVINELIGHTHOUSE3F_GENTLEMAN
 	const OLIVINELIGHTHOUSE3F_YOUNGSTER
diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm
index 8bcd055b5..51b764d35 100644
--- a/maps/OlivineLighthouse4F.asm
+++ b/maps/OlivineLighthouse4F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const OLIVINELIGHTHOUSE4F_SAILOR
 	const OLIVINELIGHTHOUSE4F_LASS
 
diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm
index 7b1df8982..a5219ff17 100644
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const OLIVINELIGHTHOUSE5F_SAILOR
 	const OLIVINELIGHTHOUSE5F_YOUNGSTER
 	const OLIVINELIGHTHOUSE5F_POKE_BALL1
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index a8f600b99..110b25353 100644
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const OLIVINELIGHTHOUSE6F_JASMINE
 	const OLIVINELIGHTHOUSE6F_MONSTER
 	const OLIVINELIGHTHOUSE6F_POKE_BALL
diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm
index 78bcb1aee..1356455a1 100644
--- a/maps/OlivineMart.asm
+++ b/maps/OlivineMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const OLIVINEMART_CLERK
 	const OLIVINEMART_COOLTRAINER_F
 	const OLIVINEMART_LASS
diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm
index b9fa1cc44..4e970a2bf 100644
--- a/maps/OlivinePokecenter1F.asm
+++ b/maps/OlivinePokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const OLIVINEPOKECENTER1F_NURSE
 	const OLIVINEPOKECENTER1F_FISHING_GURU
 	const OLIVINEPOKECENTER1F_FISHER
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index caccd4241..399cd2f69 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const OLIVINEPORT_SAILOR1
 	const OLIVINEPORT_SAILOR2
 	const OLIVINEPORT_SAILOR3
diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm
index 63298a665..4e68743a9 100644
--- a/maps/OlivinePortPassage.asm
+++ b/maps/OlivinePortPassage.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const OLIVINEPORTPASSAGE_POKEFAN_M
 
 OlivinePortPassage_MapScripts:
diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm
index d11c76af1..a6a436674 100644
--- a/maps/OlivinePunishmentSpeechHouse.asm
+++ b/maps/OlivinePunishmentSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const OLIVINEPUNISHMENTSPEECHHOUSE_POKEFAN_M
 	const OLIVINEPUNISHMENTSPEECHHOUSE_LASS
 
diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm
index 9c59d5cda..83ce60ddc 100644
--- a/maps/OlivineTimsHouse.asm
+++ b/maps/OlivineTimsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const OLIVINETIMSHOUSE_TIM
 
 OlivineTimsHouse_MapScripts:
diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm
index 94b383489..65cca5e3b 100644
--- a/maps/PalletTown.asm
+++ b/maps/PalletTown.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const PALLETTOWN_TEACHER
 	const PALLETTOWN_FISHER
 
diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm
index 996c5b935..5be0c8087 100644
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const PEWTERCITY_COOLTRAINER_F
 	const PEWTERCITY_BUG_CATCHER
 	const PEWTERCITY_GRAMPS
diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm
index 546736b6e..211d7ac3b 100644
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const PEWTERGYM_BROCK
 	const PEWTERGYM_YOUNGSTER
 	const PEWTERGYM_GYM_GUY
diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm
index a747a1918..be0b3413f 100644
--- a/maps/PewterMart.asm
+++ b/maps/PewterMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const PEWTERMART_CLERK
 	const PEWTERMART_YOUNGSTER
 	const PEWTERMART_SUPER_NERD
diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm
index 4e7f83863..4202f9766 100644
--- a/maps/PewterNidoranSpeechHouse.asm
+++ b/maps/PewterNidoranSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const PEWTERNIDORANSPEECHHOUSE_SUPER_NERD
 	const PEWTERNIDORANSPEECHHOUSE_NIDORAN_M
 
diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm
index e81178f07..83a065116 100644
--- a/maps/PewterPokecenter1F.asm
+++ b/maps/PewterPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const PEWTERPOKECENTER1F_NURSE
 	const PEWTERPOKECENTER1F_TEACHER
 	const PEWTERPOKECENTER1F_JIGGLYPUFF
diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm
index 56b317e98..d7feb63ad 100644
--- a/maps/PewterSnoozeSpeechHouse.asm
+++ b/maps/PewterSnoozeSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const PEWTERSNOOZESPEECHHOUSE_GRAMPS
 
 PewterSnoozeSpeechHouse_MapScripts:
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index 2850ee979..34e53f347 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const PLAYERSHOUSE1F_MOM1
 	const PLAYERSHOUSE1F_MOM2
 	const PLAYERSHOUSE1F_MOM3
diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm
index 3709184bf..d3748359c 100644
--- a/maps/PlayersHouse2F.asm
+++ b/maps/PlayersHouse2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const PLAYERSHOUSE2F_CONSOLE
 	const PLAYERSHOUSE2F_DOLL_1
 	const PLAYERSHOUSE2F_DOLL_2
diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm
index 377062191..e5afd0949 100644
--- a/maps/PlayersNeighborsHouse.asm
+++ b/maps/PlayersNeighborsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const PLAYERSNEIGHBORSHOUSE_COOLTRAINER_F
 	const PLAYERSNEIGHBORSHOUSE_POKEFAN_F
 
diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm
index ae709ef8a..6d0cadefe 100644
--- a/maps/PokeSeersHouse.asm
+++ b/maps/PokeSeersHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const POKESEERSHOUSE_GRANNY
 
 PokeSeersHouse_MapScripts:
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index cd890bc94..8b7eafc61 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const POKECENTER2F_TRADE_RECEPTIONIST
 	const POKECENTER2F_BATTLE_RECEPTIONIST
 	const POKECENTER2F_TIME_CAPSULE_RECEPTIONIST
diff --git a/maps/PokecomCenterAdminRoomMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm
index f201f90d6..48428ec33 100644
--- a/maps/PokecomCenterAdminRoomMobile.asm
+++ b/maps/PokecomCenterAdminRoomMobile.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const POKECOMCENTERADMINROOMMOBILE_SCIENTIST1
 	const POKECOMCENTERADMINROOMMOBILE_SCIENTIST2
 	const POKECOMCENTERADMINROOMMOBILE_SCIENTIST3
diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm
index e39103888..bba5fff95 100644
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const POKEMONFANCLUB_GENTLEMAN
 	const POKEMONFANCLUB_RECEPTIONIST
 	const POKEMONFANCLUB_FISHER
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index ea01312ec..c5305e61f 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const POWERPLANT_OFFICER1
 	const POWERPLANT_GYM_GUY1
 	const POWERPLANT_GYM_GUY2
diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm
index c19fbcbd2..655d77a91 100644
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const RADIOTOWER1F_RECEPTIONIST
 	const RADIOTOWER1F_LASS
 	const RADIOTOWER1F_YOUNGSTER
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
index 12360c4c2..049c2c596 100644
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const RADIOTOWER2F_SUPER_NERD
 	const RADIOTOWER2F_TEACHER
 	const RADIOTOWER2F_ROCKET1
diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm
index 666b2eba0..737d19cce 100644
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const RADIOTOWER3F_SUPER_NERD
 	const RADIOTOWER3F_GYM_GUY
 	const RADIOTOWER3F_COOLTRAINER_F
diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm
index 0ef1fc1a4..8b9adc7d0 100644
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const RADIOTOWER4F_FISHER
 	const RADIOTOWER4F_TEACHER
 	const RADIOTOWER4F_GROWLITHE
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index ae3e22b88..9cf31369e 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const RADIOTOWER5F_DIRECTOR
 	const RADIOTOWER5F_ROCKET
 	const RADIOTOWER5F_ROCKET_GIRL
diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm
index 6e0e33ba6..eb23329db 100644
--- a/maps/RedsHouse1F.asm
+++ b/maps/RedsHouse1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const REDSHOUSE1F_REDS_MOM
 
 RedsHouse1F_MapScripts:
diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm
index 85c5233b2..8577d592e 100644
--- a/maps/RockTunnel1F.asm
+++ b/maps/RockTunnel1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROCKTUNNEL1F_POKE_BALL1
 	const ROCKTUNNEL1F_POKE_BALL2
 
diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm
index 48f7ecb0b..df9c0db34 100644
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROCKTUNNELB1F_POKE_BALL1
 	const ROCKTUNNELB1F_POKE_BALL2
 	const ROCKTUNNELB1F_POKE_BALL3
diff --git a/maps/Route1.asm b/maps/Route1.asm
index de43075b5..d3d48d91e 100644
--- a/maps/Route1.asm
+++ b/maps/Route1.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE1_YOUNGSTER
 	const ROUTE1_COOLTRAINER_F
 	const ROUTE1_FRUIT_TREE
diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm
index ebddd0133..7b409c8c9 100644
--- a/maps/Route10Pokecenter1F.asm
+++ b/maps/Route10Pokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE10POKECENTER1F_NURSE
 	const ROUTE10POKECENTER1F_GENTLEMAN
 	const ROUTE10POKECENTER1F_GYM_GUY
diff --git a/maps/Route10South.asm b/maps/Route10South.asm
index fa8dcbe8a..655722c21 100644
--- a/maps/Route10South.asm
+++ b/maps/Route10South.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE10SOUTH_POKEFAN_M1
 	const ROUTE10SOUTH_POKEFAN_M2
 
diff --git a/maps/Route11.asm b/maps/Route11.asm
index d1bd97060..9cb88e091 100644
--- a/maps/Route11.asm
+++ b/maps/Route11.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE11_YOUNGSTER1
 	const ROUTE11_YOUNGSTER2
 	const ROUTE11_YOUNGSTER3
diff --git a/maps/Route12.asm b/maps/Route12.asm
index 73d2a9b73..5dc4a81f8 100644
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE12_FISHER1
 	const ROUTE12_FISHER2
 	const ROUTE12_FISHER3
diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm
index ea4bcd2d7..6856f2ab4 100644
--- a/maps/Route12SuperRodHouse.asm
+++ b/maps/Route12SuperRodHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE12SUPERRODHOUSE_FISHING_GURU
 
 Route12SuperRodHouse_MapScripts:
diff --git a/maps/Route13.asm b/maps/Route13.asm
index a61770be8..3f466b04e 100644
--- a/maps/Route13.asm
+++ b/maps/Route13.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE13_YOUNGSTER1
 	const ROUTE13_YOUNGSTER2
 	const ROUTE13_POKEFAN_M1
diff --git a/maps/Route14.asm b/maps/Route14.asm
index 0db21d474..ab862d46a 100644
--- a/maps/Route14.asm
+++ b/maps/Route14.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE14_POKEFAN_M1
 	const ROUTE14_YOUNGSTER
 	const ROUTE14_POKEFAN_M2
diff --git a/maps/Route15.asm b/maps/Route15.asm
index 437eb3925..0f0725262 100644
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE15_YOUNGSTER1
 	const ROUTE15_YOUNGSTER2
 	const ROUTE15_YOUNGSTER3
diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm
index c9d237a00..c1ce3787e 100644
--- a/maps/Route15FuchsiaGate.asm
+++ b/maps/Route15FuchsiaGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE15FUCHSIAGATE_OFFICER
 
 Route15FuchsiaGate_MapScripts:
diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm
index b65c1037b..aa2d700c9 100644
--- a/maps/Route16FuchsiaSpeechHouse.asm
+++ b/maps/Route16FuchsiaSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD
 
 Route16FuchsiaSpeechHouse_MapScripts:
diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm
index 57b298f08..d2df553f0 100644
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE16GATE_OFFICER
 
 Route16Gate_MapScripts:
diff --git a/maps/Route17.asm b/maps/Route17.asm
index 410d7bbd0..4035e1a13 100644
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE17_BIKER1
 	const ROUTE17_BIKER2
 	const ROUTE17_BIKER3
diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm
index bed797ff7..c448d333d 100644
--- a/maps/Route17Route18Gate.asm
+++ b/maps/Route17Route18Gate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE17ROUTE18GATE_OFFICER
 
 Route17Route18Gate_MapScripts:
diff --git a/maps/Route18.asm b/maps/Route18.asm
index 70ff5368a..a30ab3332 100644
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE18_YOUNGSTER1
 	const ROUTE18_YOUNGSTER2
 
diff --git a/maps/Route19.asm b/maps/Route19.asm
index 13e111726..a0b947c7c 100644
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE19_SWIMMER_GIRL
 	const ROUTE19_SWIMMER_GUY1
 	const ROUTE19_SWIMMER_GUY2
diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm
index 3673b2908..04afecfdc 100644
--- a/maps/Route19FuchsiaGate.asm
+++ b/maps/Route19FuchsiaGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE19FUCHSIAGATE_OFFICER
 
 Route19FuchsiaGate_MapScripts:
diff --git a/maps/Route2.asm b/maps/Route2.asm
index 8c8a2b95f..c42ce8d86 100644
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE2_BUG_CATCHER1
 	const ROUTE2_BUG_CATCHER2
 	const ROUTE2_BUG_CATCHER3
diff --git a/maps/Route20.asm b/maps/Route20.asm
index 91145b8ea..c5aa82140 100644
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE20_SWIMMER_GIRL1
 	const ROUTE20_SWIMMER_GIRL2
 	const ROUTE20_SWIMMER_GUY
diff --git a/maps/Route21.asm b/maps/Route21.asm
index a2bfc3348..54612a7ef 100644
--- a/maps/Route21.asm
+++ b/maps/Route21.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE21_SWIMMER_GIRL
 	const ROUTE21_SWIMMER_GUY
 	const ROUTE21_FISHER
diff --git a/maps/Route24.asm b/maps/Route24.asm
index c1e701d01..173be8f99 100644
--- a/maps/Route24.asm
+++ b/maps/Route24.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE24_ROCKET
 
 Route24_MapScripts:
diff --git a/maps/Route25.asm b/maps/Route25.asm
index e4c7efda5..a67718922 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE25_MISTY
 	const ROUTE25_COOLTRAINER_M1
 	const ROUTE25_YOUNGSTER1
diff --git a/maps/Route26.asm b/maps/Route26.asm
index 08037328a..971729d94 100644
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE26_COOLTRAINER_M1
 	const ROUTE26_COOLTRAINER_M2
 	const ROUTE26_COOLTRAINER_F1
diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm
index 7d92969e6..76c5b670b 100644
--- a/maps/Route26HealHouse.asm
+++ b/maps/Route26HealHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE26HEALHOUSE_TEACHER
 
 Route26HealHouse_MapScripts:
diff --git a/maps/Route27.asm b/maps/Route27.asm
index 8d7d81d9e..bc39ed3cf 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE27_COOLTRAINER_M1
 	const ROUTE27_COOLTRAINER_M2
 	const ROUTE27_COOLTRAINER_F1
diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm
index 71acec3de..34afb530f 100644
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE27SANDSTORMHOUSE_GRANNY
 
 Route27SandstormHouse_MapScripts:
diff --git a/maps/Route28SteelWingHouse.asm b/maps/Route28SteelWingHouse.asm
index 88ff3d0d4..df418b8f7 100644
--- a/maps/Route28SteelWingHouse.asm
+++ b/maps/Route28SteelWingHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE28STEELWINGHOUSE_CELEBRITY
 	const ROUTE28STEELWINGHOUSE_FEAROW
 
diff --git a/maps/Route29.asm b/maps/Route29.asm
index 3b07029f7..39fc0c960 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE29_COOLTRAINER_M1
 	const ROUTE29_YOUNGSTER
 	const ROUTE29_TEACHER1
diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm
index 41955f82c..9259074f3 100644
--- a/maps/Route29Route46Gate.asm
+++ b/maps/Route29Route46Gate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE29ROUTE46GATE_OFFICER
 	const ROUTE29ROUTE46GATE_YOUNGSTER
 
diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm
index 6556ab8b7..9b90d34e4 100644
--- a/maps/Route2Gate.asm
+++ b/maps/Route2Gate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE2GATE_SCIENTIST
 
 Route2Gate_MapScripts:
diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm
index 5ad1dac2e..cacd90080 100644
--- a/maps/Route2NuggetHouse.asm
+++ b/maps/Route2NuggetHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE2NUGGETHOUSE_FISHER
 
 Route2NuggetHouse_MapScripts:
diff --git a/maps/Route3.asm b/maps/Route3.asm
index 72a8848c8..6821bea8e 100644
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE3_FISHER1
 	const ROUTE3_YOUNGSTER1
 	const ROUTE3_YOUNGSTER2
diff --git a/maps/Route30.asm b/maps/Route30.asm
index e26c6fe26..9cf36ad60 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE30_YOUNGSTER1
 	const ROUTE30_YOUNGSTER2
 	const ROUTE30_YOUNGSTER3
diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm
index e1c17a11a..e8403352d 100644
--- a/maps/Route30BerryHouse.asm
+++ b/maps/Route30BerryHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE30BERRYHOUSE_POKEFAN_M
 
 Route30BerryHouse_MapScripts:
diff --git a/maps/Route31.asm b/maps/Route31.asm
index e47a2a7f1..3215a83bd 100644
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE31_FISHER
 	const ROUTE31_YOUNGSTER
 	const ROUTE31_BUG_CATCHER
diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm
index 72783eb79..2d07a5ef3 100644
--- a/maps/Route31VioletGate.asm
+++ b/maps/Route31VioletGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE31VIOLETGATE_OFFICER
 	const ROUTE31VIOLETGATE_COOLTRAINER_F
 
diff --git a/maps/Route32.asm b/maps/Route32.asm
index e445cedfb..6a93d73e3 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE32_FISHER1
 	const ROUTE32_FISHER2
 	const ROUTE32_FISHER3
diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm
index fef720d3b..0dbc204b8 100644
--- a/maps/Route32Pokecenter1F.asm
+++ b/maps/Route32Pokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE32POKECENTER1F_NURSE
 	const ROUTE32POKECENTER1F_FISHING_GURU
 	const ROUTE32POKECENTER1F_COOLTRAINER_F
diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm
index bada251da..ebcdb8e83 100644
--- a/maps/Route32RuinsOfAlphGate.asm
+++ b/maps/Route32RuinsOfAlphGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE32RUINSOFALPHGATE_OFFICER
 	const ROUTE32RUINSOFALPHGATE_POKEFAN_M
 	const ROUTE32RUINSOFALPHGATE_YOUNGSTER
diff --git a/maps/Route33.asm b/maps/Route33.asm
index 71608ce8f..4aa3fd6f4 100644
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE33_POKEFAN_M
 	const ROUTE33_LASS
 	const ROUTE33_FRUIT_TREE
diff --git a/maps/Route34.asm b/maps/Route34.asm
index dcd079d73..e20b348b9 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE34_YOUNGSTER1
 	const ROUTE34_YOUNGSTER2
 	const ROUTE34_YOUNGSTER3
diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
index e689a5cd1..85b0ec3b2 100644
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE34ILEXFORESTGATE_TEACHER1
 	const ROUTE34ILEXFORESTGATE_BUTTERFREE
 	const ROUTE34ILEXFORESTGATE_LASS
diff --git a/maps/Route35.asm b/maps/Route35.asm
index 1d40dd1e6..52ebe785d 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE35_YOUNGSTER1
 	const ROUTE35_YOUNGSTER2
 	const ROUTE35_LASS1
diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm
index 7f52d0d36..3aeae2ff2 100644
--- a/maps/Route35GoldenrodGate.asm
+++ b/maps/Route35GoldenrodGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE35GOLDENRODGATE_OFFICER
 	const ROUTE35GOLDENRODGATE_POKEFAN_F
 	const ROUTE35GOLDENRODGATE_FISHER
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index afec3d1bc..15d5eb5dc 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE35NATIONALPARKGATE_OFFICER1
 	const ROUTE35NATIONALPARKGATE_YOUNGSTER
 	const ROUTE35NATIONALPARKGATE_OFFICER2
diff --git a/maps/Route36.asm b/maps/Route36.asm
index 6483f865f..e383cfa6b 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE36_YOUNGSTER1
 	const ROUTE36_YOUNGSTER2
 	const ROUTE36_WEIRD_TREE
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index 014d4b499..6668b2457 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE36NATIONALPARKGATE_OFFICER1
 	const ROUTE36NATIONALPARKGATE_YOUNGSTER1
 	const ROUTE36NATIONALPARKGATE_YOUNGSTER2
diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm
index 87a357167..077b9debe 100644
--- a/maps/Route36RuinsOfAlphGate.asm
+++ b/maps/Route36RuinsOfAlphGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE36RUINSOFALPHGATE_OFFICER
 	const ROUTE36RUINSOFALPHGATE_GRAMPS
 
diff --git a/maps/Route37.asm b/maps/Route37.asm
index 7e7d14753..7b0cdbe74 100644
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE37_WEIRD_TREE1
 	const ROUTE37_WEIRD_TREE2
 	const ROUTE37_YOUNGSTER
diff --git a/maps/Route38.asm b/maps/Route38.asm
index b604bcede..32b9a6feb 100644
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE38_STANDING_YOUNGSTER1
 	const ROUTE38_LASS
 	const ROUTE38_STANDING_YOUNGSTER2
diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm
index 6dcd59c73..f97705b22 100644
--- a/maps/Route38EcruteakGate.asm
+++ b/maps/Route38EcruteakGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE38ECRUTEAKGATE_OFFICER
 
 Route38EcruteakGate_MapScripts:
diff --git a/maps/Route39.asm b/maps/Route39.asm
index 24d536aae..426eb6449 100644
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE39_SAILOR
 	const ROUTE39_POKEFAN_M
 	const ROUTE39_POKEFAN_F1
diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm
index 2b6e949fb..68187ecd5 100644
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE39BARN_TWIN1
 	const ROUTE39BARN_TWIN2
 	const ROUTE39BARN_MOOMOO
diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm
index 18cebb4e1..caf17f96b 100644
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE39FARMHOUSE_POKEFAN_M
 	const ROUTE39FARMHOUSE_POKEFAN_F
 
diff --git a/maps/Route4.asm b/maps/Route4.asm
index c7fac12eb..371bca62b 100644
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE4_YOUNGSTER
 	const ROUTE4_LASS1
 	const ROUTE4_LASS2
diff --git a/maps/Route40.asm b/maps/Route40.asm
index ea55d433a..1a3cde94a 100644
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE40_OLIVINE_RIVAL1
 	const ROUTE40_OLIVINE_RIVAL2
 	const ROUTE40_SWIMMER_GIRL1
diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm
index 5e09612cf..be048fa04 100644
--- a/maps/Route40BattleTowerGate.asm
+++ b/maps/Route40BattleTowerGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE40BATTLETOWERGATE_ROCKER
 	const ROUTE40BATTLETOWERGATE_TWIN
 
diff --git a/maps/Route41.asm b/maps/Route41.asm
index c3eb56ca4..b061f469d 100644
--- a/maps/Route41.asm
+++ b/maps/Route41.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE41_OLIVINE_RIVAL1
 	const ROUTE41_OLIVINE_RIVAL2
 	const ROUTE41_OLIVINE_RIVAL3
diff --git a/maps/Route42.asm b/maps/Route42.asm
index 44121b503..91590df01 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE42_FISHER
 	const ROUTE42_POKEFAN_M
 	const ROUTE42_SUPER_NERD
diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm
index 1c5a13e38..4b0196f29 100644
--- a/maps/Route42EcruteakGate.asm
+++ b/maps/Route42EcruteakGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE42ECRUTEAKGATE_OFFICER
 
 Route42EcruteakGate_MapScripts:
diff --git a/maps/Route43.asm b/maps/Route43.asm
index 90919060a..1860caa49 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE43_SUPER_NERD1
 	const ROUTE43_SUPER_NERD2
 	const ROUTE43_SUPER_NERD3
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index 08d109c12..81935c025 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -1,6 +1,6 @@
 ROUTE43GATE_TOLL EQU 1000
 
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE43GATE_OFFICER
 	const ROUTE43GATE_ROCKET1
 	const ROUTE43GATE_ROCKET2
diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm
index d69265e6c..c2641abcd 100644
--- a/maps/Route43MahoganyGate.asm
+++ b/maps/Route43MahoganyGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE43MAHOGANYGATE_OFFICER
 
 Route43MahoganyGate_MapScripts:
diff --git a/maps/Route44.asm b/maps/Route44.asm
index 978f8e976..5cb2f9e9e 100644
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE44_FISHER1
 	const ROUTE44_FISHER2
 	const ROUTE44_YOUNGSTER1
diff --git a/maps/Route45.asm b/maps/Route45.asm
index 47aa5649c..721e3cb4c 100644
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE45_POKEFAN_M1
 	const ROUTE45_POKEFAN_M2
 	const ROUTE45_POKEFAN_M3
diff --git a/maps/Route46.asm b/maps/Route46.asm
index 33a8d46ef..86b7b7396 100644
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE46_POKEFAN_M
 	const ROUTE46_YOUNGSTER
 	const ROUTE46_LASS
diff --git a/maps/Route5.asm b/maps/Route5.asm
index d6d557e67..f1d7f0ef4 100644
--- a/maps/Route5.asm
+++ b/maps/Route5.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE5_POKEFAN_M
 
 Route5_MapScripts:
diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm
index d8fe0714f..2e268d68d 100644
--- a/maps/Route5CleanseTagHouse.asm
+++ b/maps/Route5CleanseTagHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE5CLEANSETAGHOUSE_GRANNY
 	const ROUTE5CLEANSETAGHOUSE_TEACHER
 
diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm
index 096e2d041..8ab29c1e5 100644
--- a/maps/Route5SaffronGate.asm
+++ b/maps/Route5SaffronGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE5SAFFRONGATE_OFFICER
 
 Route5SaffronGate_MapScripts:
diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm
index 774035bd1..5ffbee7d0 100644
--- a/maps/Route5UndergroundPathEntrance.asm
+++ b/maps/Route5UndergroundPathEntrance.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE5UNDERGROUNDPATHENTRANCE_TEACHER
 
 Route5UndergroundPathEntrance_MapScripts:
diff --git a/maps/Route6.asm b/maps/Route6.asm
index 56f1a7e73..5a42ddc0c 100644
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE6_POKEFAN_M1
 	const ROUTE6_POKEFAN_M2
 	const ROUTE6_POKEFAN_M3
diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm
index ab4a6c481..fb278c277 100644
--- a/maps/Route6SaffronGate.asm
+++ b/maps/Route6SaffronGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE6SAFFRONGATE_OFFICER
 
 Route6SaffronGate_MapScripts:
diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm
index c9144a255..566b58123 100644
--- a/maps/Route7SaffronGate.asm
+++ b/maps/Route7SaffronGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE7SAFFRONGATE_OFFICER
 
 Route7SaffronGate_MapScripts:
diff --git a/maps/Route8.asm b/maps/Route8.asm
index ba46ea877..a70558e44 100644
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE8_BIKER1
 	const ROUTE8_BIKER2
 	const ROUTE8_BIKER3
diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm
index 58fba365e..51c9d8958 100644
--- a/maps/Route8SaffronGate.asm
+++ b/maps/Route8SaffronGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE8SAFFRONGATE_OFFICER
 
 Route8SaffronGate_MapScripts:
diff --git a/maps/Route9.asm b/maps/Route9.asm
index 55b3e50df..984f08413 100644
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const ROUTE9_YOUNGSTER1
 	const ROUTE9_LASS1
 	const ROUTE9_YOUNGSTER2
diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm
index 5f6ba0bf6..732ac2a16 100644
--- a/maps/RuinsOfAlphAerodactylItemRoom.asm
+++ b/maps/RuinsOfAlphAerodactylItemRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL1
 	const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL2
 	const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL3
diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm
index 2acc16dbe..4536e09b6 100644
--- a/maps/RuinsOfAlphHoOhItemRoom.asm
+++ b/maps/RuinsOfAlphHoOhItemRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const RUINSOFALPHHOOHITEMROOM_POKE_BALL1
 	const RUINSOFALPHHOOHITEMROOM_POKE_BALL2
 	const RUINSOFALPHHOOHITEMROOM_POKE_BALL3
diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm
index e51489af2..445cb36b9 100644
--- a/maps/RuinsOfAlphInnerChamber.asm
+++ b/maps/RuinsOfAlphInnerChamber.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const RUINSOFALPHINNERCHAMBER_FISHER
 	const RUINSOFALPHINNERCHAMBER_TEACHER
 	const RUINSOFALPHINNERCHAMBER_GRAMPS
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index ac003b6f9..26743a3df 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const RUINSOFALPHKABUTOCHAMBER_RECEPTIONIST
 	const RUINSOFALPHKABUTOCHAMBER_SCIENTIST
 
diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm
index 450bb5de5..5239b562e 100644
--- a/maps/RuinsOfAlphKabutoItemRoom.asm
+++ b/maps/RuinsOfAlphKabutoItemRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const RUINSOFALPHKABUTOITEMROOM_POKE_BALL1
 	const RUINSOFALPHKABUTOITEMROOM_POKE_BALL2
 	const RUINSOFALPHKABUTOITEMROOM_POKE_BALL3
diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm
index 73edc01d8..a9a0acde5 100644
--- a/maps/RuinsOfAlphOmanyteItemRoom.asm
+++ b/maps/RuinsOfAlphOmanyteItemRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL1
 	const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL2
 	const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL3
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index ac4cdc282..c6197632a 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const RUINSOFALPHOUTSIDE_YOUNGSTER1
 	const RUINSOFALPHOUTSIDE_SCIENTIST
 	const RUINSOFALPHOUTSIDE_FISHER
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index 427ca14da..f5b1e1564 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const RUINSOFALPHRESEARCHCENTER_SCIENTIST1
 	const RUINSOFALPHRESEARCHCENTER_SCIENTIST2
 	const RUINSOFALPHRESEARCHCENTER_SCIENTIST3
diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm
index e5d0d6557..c0c75f227 100644
--- a/maps/SafariZoneWardensHome.asm
+++ b/maps/SafariZoneWardensHome.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const SAFARIZONEWARDENSHOME_LASS
 
 SafariZoneWardensHome_MapScripts:
diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm
index 2ca9e6021..06c7119d7 100644
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const SAFFRONCITY_LASS1
 	const SAFFRONCITY_POKEFAN_M
 	const SAFFRONCITY_COOLTRAINER_M
diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm
index 7911d9d56..f6926ddc0 100644
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const SAFFRONGYM_SABRINA
 	const SAFFRONGYM_GRANNY1
 	const SAFFRONGYM_YOUNGSTER1
diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm
index b0f3faf7b..205bad774 100644
--- a/maps/SaffronMagnetTrainStation.asm
+++ b/maps/SaffronMagnetTrainStation.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const SAFFRONMAGNETTRAINSTATION_OFFICER
 	const SAFFRONMAGNETTRAINSTATION_GYM_GUY
 	const SAFFRONMAGNETTRAINSTATION_TEACHER
diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm
index 8d3e89e3e..2d9708c49 100644
--- a/maps/SaffronMart.asm
+++ b/maps/SaffronMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const SAFFRONMART_CLERK
 	const SAFFRONMART_COOLTRAINER_M
 	const SAFFRONMART_COOLTRAINER_F
diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm
index 3399e4f95..9680de72f 100644
--- a/maps/SaffronPokecenter1F.asm
+++ b/maps/SaffronPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const SAFFRONPOKECENTER1F_NURSE
 	const SAFFRONPOKECENTER1F_TEACHER
 	const SAFFRONPOKECENTER1F_FISHER
diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm
index 651a6b540..2870ea52a 100644
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const SEAFOAMGYM_BLAINE
 	const SEAFOAMGYM_GYM_GUY
 
diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm
index 1aa66b2da..a14659571 100644
--- a/maps/SilphCo1F.asm
+++ b/maps/SilphCo1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const SILPHCO1F_RECEPTIONIST
 	const SILPHCO1F_OFFICER
 
diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm
index 7ef61fba9..3aa1b2ab5 100644
--- a/maps/SilverCaveItemRooms.asm
+++ b/maps/SilverCaveItemRooms.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const SILVERCAVEITEMROOMS_POKE_BALL1
 	const SILVERCAVEITEMROOMS_POKE_BALL2
 
diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm
index 234585be3..326e5bde2 100644
--- a/maps/SilverCavePokecenter1F.asm
+++ b/maps/SilverCavePokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const SILVERCAVEPOKECENTER1F_NURSE
 	const SILVERCAVEPOKECENTER1F_GRANNY
 
diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm
index 1df3d2603..b6dad455c 100644
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const SILVERCAVEROOM1_POKE_BALL1
 	const SILVERCAVEROOM1_POKE_BALL2
 	const SILVERCAVEROOM1_POKE_BALL3
diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm
index 6c721e6f7..774e105bc 100644
--- a/maps/SilverCaveRoom2.asm
+++ b/maps/SilverCaveRoom2.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const SILVERCAVEROOM2_POKE_BALL1
 	const SILVERCAVEROOM2_POKE_BALL2
 	const SILVERCAVEROOM2_POKE_BALL3
diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm
index 3fece56d7..4c4e5ef02 100644
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const SILVERCAVEROOM3_RED
 
 SilverCaveRoom3_MapScripts:
diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm
index 9cbeca82c..518c20e4b 100644
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const SLOWPOKEWELLB1F_ROCKET1
 	const SLOWPOKEWELLB1F_ROCKET2
 	const SLOWPOKEWELLB1F_ROCKET3
diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm
index de70031b2..195ab560c 100644
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const SLOWPOKEWELLB2F_GYM_GUY
 	const SLOWPOKEWELLB2F_POKE_BALL
 
diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm
index 6b741e62a..d8bd3951e 100644
--- a/maps/SoulHouse.asm
+++ b/maps/SoulHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const SOULHOUSE_MRFUJI
 	const SOULHOUSE_TEACHER
 	const SOULHOUSE_LASS
diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm
index 71278bcaf..d3d8ff323 100644
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const SPROUTTOWER1F_SAGE1
 	const SPROUTTOWER1F_SAGE2
 	const SPROUTTOWER1F_GRANNY
diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm
index 84983e833..73cc7bd48 100644
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const SPROUTTOWER2F_SAGE1
 	const SPROUTTOWER2F_SAGE2
 	const SPROUTTOWER2F_POKE_BALL
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index 012cf74fe..74d614246 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const SPROUTTOWER3F_SAGE1
 	const SPROUTTOWER3F_SAGE2
 	const SPROUTTOWER3F_SAGE3
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index 098ac842a..b18d55ce8 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const TEAMROCKETBASEB1F_ROCKET1
 	const TEAMROCKETBASEB1F_ROCKET2
 	const TEAMROCKETBASEB1F_SCIENTIST
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 0b9647164..250a11fb8 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const TEAMROCKETBASEB2F_ROCKET1
 	const TEAMROCKETBASEB2F_ROCKET_GIRL
 	const TEAMROCKETBASEB2F_LANCE
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index 88665bc08..dd491e6f4 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const TEAMROCKETBASEB3F_LANCE
 	const TEAMROCKETBASEB3F_ROCKET1
 	const TEAMROCKETBASEB3F_MOLTRES
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index 32e216aaa..a0c59f6b3 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const TIMECAPSULE_CHRIS1
 	const TIMECAPSULE_CHRIS2
 
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index d80ec69c8..b9ab9a0f3 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const TINTOWER1F_SUICUNE
 	const TINTOWER1F_RAIKOU
 	const TINTOWER1F_ENTEI
diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm
index fcd70791e..ce81f87c0 100644
--- a/maps/TinTower3F.asm
+++ b/maps/TinTower3F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const TINTOWER3F_POKE_BALL
 
 TinTower3F_MapScripts:
diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm
index 9397ff802..6d7a69860 100644
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const TINTOWER4F_POKE_BALL1
 	const TINTOWER4F_POKE_BALL2
 	const TINTOWER4F_POKE_BALL3
diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm
index 2d1521590..0e199be0b 100644
--- a/maps/TinTower5F.asm
+++ b/maps/TinTower5F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const TINTOWER5F_POKE_BALL
 
 TinTower5F_MapScripts:
diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm
index b35b5403d..ac4e7adb6 100644
--- a/maps/TinTower6F.asm
+++ b/maps/TinTower6F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const TINTOWER6F_POKE_BALL
 
 TinTower6F_MapScripts:
diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm
index 557a3609f..323ee7cdd 100644
--- a/maps/TinTower7F.asm
+++ b/maps/TinTower7F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const TINTOWER7F_POKE_BALL
 
 TinTower7F_MapScripts:
diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm
index d8c2e97cb..af18d7615 100644
--- a/maps/TinTower8F.asm
+++ b/maps/TinTower8F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const TINTOWER8F_POKE_BALL1
 	const TINTOWER8F_POKE_BALL2
 	const TINTOWER8F_POKE_BALL3
diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm
index fc768a378..070ced50d 100644
--- a/maps/TinTower9F.asm
+++ b/maps/TinTower9F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const TINTOWER9F_POKE_BALL
 
 TinTower9F_MapScripts:
diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm
index f96faf98c..d997c0f03 100644
--- a/maps/TinTowerRoof.asm
+++ b/maps/TinTowerRoof.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const TINTOWERROOF_HO_OH
 
 TinTowerRoof_MapScripts:
diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm
index bade89d75..6e25876e5 100644
--- a/maps/TohjoFalls.asm
+++ b/maps/TohjoFalls.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const TOHJOFALLS_POKE_BALL
 
 TohjoFalls_MapScripts:
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index 915edcb12..0d911108a 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const TRADECENTER_CHRIS1
 	const TRADECENTER_CHRIS2
 
diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm
index 4334fa9ab..666b795c4 100644
--- a/maps/TrainerHouse1F.asm
+++ b/maps/TrainerHouse1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const TRAINERHOUSE1F_RECEPTIONIST
 	const TRAINERHOUSE1F_COOLTRAINER_M
 	const TRAINERHOUSE1F_COOLTRAINER_F
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index c8ed1bbbb..7c6a1262d 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const TRAINERHOUSEB1F_RECEPTIONIST
 	const TRAINERHOUSEB1F_CHRIS
 
diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm
index 149e70ce0..84189c9d3 100644
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const UNIONCAVE1F_POKEFAN_M1
 	const UNIONCAVE1F_SUPER_NERD
 	const UNIONCAVE1F_POKEFAN_M2
diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm
index 2d729d299..6a9d7da72 100644
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const UNIONCAVEB1F_POKEFAN_M1
 	const UNIONCAVEB1F_POKEFAN_M2
 	const UNIONCAVEB1F_SUPER_NERD1
diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm
index af63ea9b9..0e9be1712 100644
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const UNIONCAVEB2F_ROCKER
 	const UNIONCAVEB2F_COOLTRAINER_F1
 	const UNIONCAVEB2F_COOLTRAINER_F2
diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm
index a0882fdd5..55feb54b5 100644
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VERMILIONCITY_TEACHER
 	const VERMILIONCITY_GRAMPS
 	const VERMILIONCITY_MACHOP
diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm
index 4f5d80a2f..a7c9c9979 100644
--- a/maps/VermilionDiglettsCaveSpeechHouse.asm
+++ b/maps/VermilionDiglettsCaveSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VERMILIONDIGLETTSCAVESPEECHHOUSE_GENTLEMAN
 
 VermilionDiglettsCaveSpeechHouse_MapScripts:
diff --git a/maps/VermilionFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm
index 9f3cfeefd..84fc0dc04 100644
--- a/maps/VermilionFishingSpeechHouse.asm
+++ b/maps/VermilionFishingSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VERMILIONFISHINGSPEECHHOUSE_FISHING_GURU
 
 VermilionFishingSpeechHouse_MapScripts:
diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm
index e04195f4d..9da49e767 100644
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VERMILIONGYM_SURGE
 	const VERMILIONGYM_GENTLEMAN
 	const VERMILIONGYM_ROCKER
diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm
index d5027f2cc..b88489650 100644
--- a/maps/VermilionMagnetTrainSpeechHouse.asm
+++ b/maps/VermilionMagnetTrainSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VERMILIONMAGNETTRAINSPEECHHOUSE_POKEFAN_F
 	const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER
 
diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm
index c8a3a8cec..8c7fd611b 100644
--- a/maps/VermilionMart.asm
+++ b/maps/VermilionMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VERMILIONMART_CLERK
 	const VERMILIONMART_SUPER_NERD
 	const VERMILIONMART_BUENA
diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm
index 67eefe48f..7330b6f31 100644
--- a/maps/VermilionPokecenter1F.asm
+++ b/maps/VermilionPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VERMILIONPOKECENTER1F_NURSE
 	const VERMILIONPOKECENTER1F_FISHING_GURU
 	const VERMILIONPOKECENTER1F_SAILOR
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index 577e20bac..eed1716a2 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VERMILIONPORT_SAILOR1
 	const VERMILIONPORT_SAILOR2
 	const VERMILIONPORT_SUPER_NERD
diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm
index d6255b560..e7afefffe 100644
--- a/maps/VermilionPortPassage.asm
+++ b/maps/VermilionPortPassage.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VERMILIONPORTPASSAGE_TEACHER
 
 VermilionPortPassage_MapScripts:
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index 7b4b062ab..480a79b9f 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VICTORYROAD_SILVER
 	const VICTORYROAD_POKE_BALL1
 	const VICTORYROAD_POKE_BALL2
diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm
index a798da797..4fdbfe5eb 100644
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VICTORYROADGATE_OFFICER
 	const VICTORYROADGATE_BLACK_BELT1
 	const VICTORYROADGATE_BLACK_BELT2
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
index 616866de7..bcbdcb870 100644
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VIOLETCITY_EARL
 	const VIOLETCITY_LASS
 	const VIOLETCITY_SUPER_NERD
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
index d3779ddf2..c803d7ef1 100644
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VIOLETGYM_FALKNER
 	const VIOLETGYM_YOUNGSTER1
 	const VIOLETGYM_YOUNGSTER2
diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm
index a30522f6f..288b8cbb2 100644
--- a/maps/VioletKylesHouse.asm
+++ b/maps/VioletKylesHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VIOLETKYLESHOUSE_POKEFAN_M
 	const VIOLETKYLESHOUSE_KYLE
 
diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm
index 062bf664d..fd520e94b 100644
--- a/maps/VioletMart.asm
+++ b/maps/VioletMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VIOLETMART_CLERK
 	const VIOLETMART_GRANNY
 	const VIOLETMART_COOLTRAINER_M
diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm
index 85ec155fb..0706369d7 100644
--- a/maps/VioletNicknameSpeechHouse.asm
+++ b/maps/VioletNicknameSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VIOLETNICKNAMESPEECHHOUSE_TEACHER
 	const VIOLETNICKNAMESPEECHHOUSE_LASS
 	const VIOLETNICKNAMESPEECHHOUSE_BIRD
diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm
index 324dfc8c0..d7f6756fa 100644
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VIOLETPOKECENTER1F_NURSE
 	const VIOLETPOKECENTER1F_GAMEBOY_KID
 	const VIOLETPOKECENTER1F_GENTLEMAN
diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm
index 544072054..92dabcf8b 100644
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VIRIDIANCITY_GRAMPS1
 	const VIRIDIANCITY_GRAMPS2
 	const VIRIDIANCITY_FISHER
diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm
index 5d3e34335..3079b852e 100644
--- a/maps/ViridianGym.asm
+++ b/maps/ViridianGym.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VIRIDIANGYM_BLUE
 	const VIRIDIANGYM_GYM_GUY
 
diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm
index 9b3f6af3a..7f41f5c73 100644
--- a/maps/ViridianMart.asm
+++ b/maps/ViridianMart.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VIRIDIANMART_CLERK
 	const VIRIDIANMART_LASS
 	const VIRIDIANMART_COOLTRAINER_M
diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm
index 73001124a..7c186e22d 100644
--- a/maps/ViridianNicknameSpeechHouse.asm
+++ b/maps/ViridianNicknameSpeechHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VIRIDIANNICKNAMESPEECHHOUSE_POKEFAN_M
 	const VIRIDIANNICKNAMESPEECHHOUSE_LASS
 	const VIRIDIANNICKNAMESPEECHHOUSE_SPEARY
diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm
index aa5df856e..8fc0749d8 100644
--- a/maps/ViridianPokecenter1F.asm
+++ b/maps/ViridianPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const VIRIDIANPOKECENTER1F_NURSE
 	const VIRIDIANPOKECENTER1F_COOLTRAINER_M
 	const VIRIDIANPOKECENTER1F_COOLTRAINER_F
diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm
index aeacbdf1f..f5d19b391 100644
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const WHIRLISLANDB1F_POKE_BALL1
 	const WHIRLISLANDB1F_POKE_BALL2
 	const WHIRLISLANDB1F_POKE_BALL3
diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm
index 413a6256e..6a8754b6c 100644
--- a/maps/WhirlIslandB2F.asm
+++ b/maps/WhirlIslandB2F.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const WHIRLISLANDB2F_POKE_BALL1
 	const WHIRLISLANDB2F_POKE_BALL2
 	const WHIRLISLANDB2F_POKE_BALL3
diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm
index ab06aef0f..cc3138331 100644
--- a/maps/WhirlIslandLugiaChamber.asm
+++ b/maps/WhirlIslandLugiaChamber.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const WHIRLISLANDLUGIACHAMBER_LUGIA
 
 WhirlIslandLugiaChamber_MapScripts:
diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm
index c92e798d5..d1a41c13b 100644
--- a/maps/WhirlIslandNE.asm
+++ b/maps/WhirlIslandNE.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const WHIRLISLANDNE_POKE_BALL
 
 WhirlIslandNE_MapScripts:
diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm
index 084a63b5f..c2e1d8295 100644
--- a/maps/WhirlIslandSW.asm
+++ b/maps/WhirlIslandSW.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const WHIRLISLANDSW_POKE_BALL
 
 WhirlIslandSW_MapScripts:
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm
index 8f0e73aa3..17c6fd7ee 100644
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const WILLSROOM_WILL
 
 WillsRoom_MapScripts:
diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm
index 2fb21c5d9..79694c5da 100644
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const WISETRIOSROOM_SAGE1
 	const WISETRIOSROOM_SAGE2
 	const WISETRIOSROOM_SAGE3

From b8f4b1b8a7991222ae2320e5891ded675d541043 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Wed, 31 Jan 2018 11:45:18 -0500
Subject: [PATCH 081/135] MINERAL egg group works

---
 constants/pokemon_data_constants.asm  | 10 +++++-----
 data/pokemon/base_stats/ditto.asm     |  2 +-
 data/pokemon/base_stats/electrode.asm |  2 +-
 data/pokemon/base_stats/geodude.asm   |  2 +-
 data/pokemon/base_stats/golem.asm     |  2 +-
 data/pokemon/base_stats/graveler.asm  |  2 +-
 data/pokemon/base_stats/magnemite.asm |  2 +-
 data/pokemon/base_stats/magneton.asm  |  2 +-
 data/pokemon/base_stats/onix.asm      |  2 +-
 data/pokemon/base_stats/porygon.asm   |  2 +-
 data/pokemon/base_stats/porygon2.asm  |  2 +-
 data/pokemon/base_stats/steelix.asm   |  2 +-
 data/pokemon/base_stats/sudowoodo.asm |  2 +-
 data/pokemon/base_stats/voltorb.asm   |  2 +-
 14 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index 1a1cc6ab8..238f23aa2 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -27,12 +27,12 @@ BASE_DATA_SIZE   EQUS "(CurBaseDataEnd - CurBaseData)"
 
 ; gender ratio constants
 GENDER_F0    EQU 0 percent
-GENDER_F12_5 EQU 31 ; 12.5 percent
+GENDER_F12_5 EQU 12 percent + 1
 GENDER_F25   EQU 25 percent
 GENDER_F50   EQU 50 percent
 GENDER_F75   EQU 75 percent
-GENDER_F100  EQU 254 ; 100 percent
-GENDERLESS   EQU 255
+GENDER_F100  EQU 100 percent - 1
+GENDERLESS   EQU -1
 
 ; BaseGrowthRate values
 ; GrowthRates indexes (see data/growth_rates.asm)
@@ -55,10 +55,10 @@ GENDERLESS   EQU 255
 	const PLANT        ; 7
 	const HUMANSHAPE   ; 8
 	const INVERTEBRATE ; 9
-	const INANIMATE    ; a
+	const MINERAL      ; a
 	const AMORPHOUS    ; b
 	const FISH         ; c
-	const LADIES_MAN   ; d
+	const POLY         ; d
 	const REPTILE      ; e
 	const NO_EGGS      ; f
 
diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm
index cb449773d..71a5b4762 100644
--- a/data/pokemon/base_stats/ditto.asm
+++ b/data/pokemon/base_stats/ditto.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/ditto/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
-	dn LADIES_MAN, LADIES_MAN ; egg groups
+	dn POLY, POLY ; egg groups
 
 	; tm/hm learnset
 	tmhm
diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm
index 48ae46276..f00eed0cc 100644
--- a/data/pokemon/base_stats/electrode.asm
+++ b/data/pokemon/base_stats/electrode.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/electrode/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	dn MINERAL, MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm
index 9664d4318..b3c3603ba 100644
--- a/data/pokemon/base_stats/geodude.asm
+++ b/data/pokemon/base_stats/geodude.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/geodude/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	dn MINERAL, MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm
index 18c83b397..6de25b590 100644
--- a/data/pokemon/base_stats/golem.asm
+++ b/data/pokemon/base_stats/golem.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/golem/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	dn MINERAL, MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm
index 0a19caf64..98eaef882 100644
--- a/data/pokemon/base_stats/graveler.asm
+++ b/data/pokemon/base_stats/graveler.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/graveler/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	dn MINERAL, MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm
index 0a5620487..aff31035e 100644
--- a/data/pokemon/base_stats/magnemite.asm
+++ b/data/pokemon/base_stats/magnemite.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/magnemite/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	dn MINERAL, MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm
index b5faa573a..0b694fcf6 100644
--- a/data/pokemon/base_stats/magneton.asm
+++ b/data/pokemon/base_stats/magneton.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/magneton/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	dn MINERAL, MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm
index a28fe72d9..45e38bb32 100644
--- a/data/pokemon/base_stats/onix.asm
+++ b/data/pokemon/base_stats/onix.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/onix/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	dn MINERAL, MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, STRENGTH
diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm
index b9c6f7df7..aee297b9d 100644
--- a/data/pokemon/base_stats/porygon.asm
+++ b/data/pokemon/base_stats/porygon.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/porygon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	dn MINERAL, MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/porygon2.asm b/data/pokemon/base_stats/porygon2.asm
index 50022cae8..8cc3211ef 100644
--- a/data/pokemon/base_stats/porygon2.asm
+++ b/data/pokemon/base_stats/porygon2.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/porygon2/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	dn MINERAL, MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/steelix.asm b/data/pokemon/base_stats/steelix.asm
index d337a2d52..2908396fc 100644
--- a/data/pokemon/base_stats/steelix.asm
+++ b/data/pokemon/base_stats/steelix.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/steelix/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	dn MINERAL, MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, CUT, STRENGTH
diff --git a/data/pokemon/base_stats/sudowoodo.asm b/data/pokemon/base_stats/sudowoodo.asm
index ecd0b4be4..52ff96429 100644
--- a/data/pokemon/base_stats/sudowoodo.asm
+++ b/data/pokemon/base_stats/sudowoodo.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/sudowoodo/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	dn MINERAL, MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH
diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm
index 34f4f6d90..0bbcd7275 100644
--- a/data/pokemon/base_stats/voltorb.asm
+++ b/data/pokemon/base_stats/voltorb.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/voltorb/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	dn MINERAL, MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT

From 0eeb00d6ac67199b3343c5a6ddc739b251f7a68f Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Wed, 31 Jan 2018 12:03:43 -0500
Subject: [PATCH 082/135] Official egg group names

---
 constants/pokemon_data_constants.asm   | 42 +++++++++++++-------------
 data/growth_rates.asm                  |  2 +-
 data/pokemon/base_stats/abra.asm       |  4 +--
 data/pokemon/base_stats/aerodactyl.asm |  4 +--
 data/pokemon/base_stats/aipom.asm      |  4 +--
 data/pokemon/base_stats/alakazam.asm   |  4 +--
 data/pokemon/base_stats/ampharos.asm   |  4 +--
 data/pokemon/base_stats/arbok.asm      |  4 +--
 data/pokemon/base_stats/arcanine.asm   |  4 +--
 data/pokemon/base_stats/ariados.asm    |  4 +--
 data/pokemon/base_stats/articuno.asm   |  4 +--
 data/pokemon/base_stats/azumarill.asm  |  4 +--
 data/pokemon/base_stats/bayleef.asm    |  4 +--
 data/pokemon/base_stats/beedrill.asm   |  4 +--
 data/pokemon/base_stats/bellossom.asm  |  4 +--
 data/pokemon/base_stats/bellsprout.asm |  4 +--
 data/pokemon/base_stats/blastoise.asm  |  4 +--
 data/pokemon/base_stats/blissey.asm    |  4 +--
 data/pokemon/base_stats/bulbasaur.asm  |  4 +--
 data/pokemon/base_stats/butterfree.asm |  4 +--
 data/pokemon/base_stats/caterpie.asm   |  4 +--
 data/pokemon/base_stats/celebi.asm     |  4 +--
 data/pokemon/base_stats/chansey.asm    |  4 +--
 data/pokemon/base_stats/charizard.asm  |  4 +--
 data/pokemon/base_stats/charmander.asm |  4 +--
 data/pokemon/base_stats/charmeleon.asm |  4 +--
 data/pokemon/base_stats/chikorita.asm  |  4 +--
 data/pokemon/base_stats/chinchou.asm   |  4 +--
 data/pokemon/base_stats/clefable.asm   |  4 +--
 data/pokemon/base_stats/clefairy.asm   |  4 +--
 data/pokemon/base_stats/cleffa.asm     |  4 +--
 data/pokemon/base_stats/cloyster.asm   |  4 +--
 data/pokemon/base_stats/corsola.asm    |  4 +--
 data/pokemon/base_stats/crobat.asm     |  4 +--
 data/pokemon/base_stats/croconaw.asm   |  4 +--
 data/pokemon/base_stats/cubone.asm     |  4 +--
 data/pokemon/base_stats/cyndaquil.asm  |  4 +--
 data/pokemon/base_stats/delibird.asm   |  4 +--
 data/pokemon/base_stats/dewgong.asm    |  4 +--
 data/pokemon/base_stats/diglett.asm    |  4 +--
 data/pokemon/base_stats/ditto.asm      |  4 +--
 data/pokemon/base_stats/dodrio.asm     |  4 +--
 data/pokemon/base_stats/doduo.asm      |  4 +--
 data/pokemon/base_stats/donphan.asm    |  4 +--
 data/pokemon/base_stats/dragonair.asm  |  4 +--
 data/pokemon/base_stats/dragonite.asm  |  4 +--
 data/pokemon/base_stats/dratini.asm    |  4 +--
 data/pokemon/base_stats/drowzee.asm    |  4 +--
 data/pokemon/base_stats/dugtrio.asm    |  4 +--
 data/pokemon/base_stats/dunsparce.asm  |  4 +--
 data/pokemon/base_stats/eevee.asm      |  4 +--
 data/pokemon/base_stats/ekans.asm      |  4 +--
 data/pokemon/base_stats/electabuzz.asm |  4 +--
 data/pokemon/base_stats/electrode.asm  |  4 +--
 data/pokemon/base_stats/elekid.asm     |  4 +--
 data/pokemon/base_stats/entei.asm      |  4 +--
 data/pokemon/base_stats/espeon.asm     |  4 +--
 data/pokemon/base_stats/exeggcute.asm  |  4 +--
 data/pokemon/base_stats/exeggutor.asm  |  4 +--
 data/pokemon/base_stats/farfetch_d.asm |  4 +--
 data/pokemon/base_stats/fearow.asm     |  4 +--
 data/pokemon/base_stats/feraligatr.asm |  4 +--
 data/pokemon/base_stats/flaaffy.asm    |  4 +--
 data/pokemon/base_stats/flareon.asm    |  4 +--
 data/pokemon/base_stats/forretress.asm |  4 +--
 data/pokemon/base_stats/furret.asm     |  4 +--
 data/pokemon/base_stats/gastly.asm     |  4 +--
 data/pokemon/base_stats/gengar.asm     |  4 +--
 data/pokemon/base_stats/geodude.asm    |  4 +--
 data/pokemon/base_stats/girafarig.asm  |  4 +--
 data/pokemon/base_stats/gligar.asm     |  4 +--
 data/pokemon/base_stats/gloom.asm      |  4 +--
 data/pokemon/base_stats/golbat.asm     |  4 +--
 data/pokemon/base_stats/goldeen.asm    |  4 +--
 data/pokemon/base_stats/golduck.asm    |  4 +--
 data/pokemon/base_stats/golem.asm      |  4 +--
 data/pokemon/base_stats/granbull.asm   |  4 +--
 data/pokemon/base_stats/graveler.asm   |  4 +--
 data/pokemon/base_stats/grimer.asm     |  4 +--
 data/pokemon/base_stats/growlithe.asm  |  4 +--
 data/pokemon/base_stats/gyarados.asm   |  4 +--
 data/pokemon/base_stats/haunter.asm    |  4 +--
 data/pokemon/base_stats/heracross.asm  |  4 +--
 data/pokemon/base_stats/hitmonchan.asm |  4 +--
 data/pokemon/base_stats/hitmonlee.asm  |  4 +--
 data/pokemon/base_stats/hitmontop.asm  |  4 +--
 data/pokemon/base_stats/ho_oh.asm      |  4 +--
 data/pokemon/base_stats/hoothoot.asm   |  4 +--
 data/pokemon/base_stats/hoppip.asm     |  4 +--
 data/pokemon/base_stats/horsea.asm     |  4 +--
 data/pokemon/base_stats/houndoom.asm   |  4 +--
 data/pokemon/base_stats/houndour.asm   |  4 +--
 data/pokemon/base_stats/hypno.asm      |  4 +--
 data/pokemon/base_stats/igglybuff.asm  |  4 +--
 data/pokemon/base_stats/ivysaur.asm    |  4 +--
 data/pokemon/base_stats/jigglypuff.asm |  4 +--
 data/pokemon/base_stats/jolteon.asm    |  4 +--
 data/pokemon/base_stats/jumpluff.asm   |  4 +--
 data/pokemon/base_stats/jynx.asm       |  4 +--
 data/pokemon/base_stats/kabuto.asm     |  4 +--
 data/pokemon/base_stats/kabutops.asm   |  4 +--
 data/pokemon/base_stats/kadabra.asm    |  4 +--
 data/pokemon/base_stats/kakuna.asm     |  4 +--
 data/pokemon/base_stats/kangaskhan.asm |  4 +--
 data/pokemon/base_stats/kingdra.asm    |  4 +--
 data/pokemon/base_stats/kingler.asm    |  4 +--
 data/pokemon/base_stats/koffing.asm    |  4 +--
 data/pokemon/base_stats/krabby.asm     |  4 +--
 data/pokemon/base_stats/lanturn.asm    |  4 +--
 data/pokemon/base_stats/lapras.asm     |  4 +--
 data/pokemon/base_stats/larvitar.asm   |  4 +--
 data/pokemon/base_stats/ledian.asm     |  4 +--
 data/pokemon/base_stats/ledyba.asm     |  4 +--
 data/pokemon/base_stats/lickitung.asm  |  4 +--
 data/pokemon/base_stats/lugia.asm      |  4 +--
 data/pokemon/base_stats/machamp.asm    |  4 +--
 data/pokemon/base_stats/machoke.asm    |  4 +--
 data/pokemon/base_stats/machop.asm     |  4 +--
 data/pokemon/base_stats/magby.asm      |  4 +--
 data/pokemon/base_stats/magcargo.asm   |  4 +--
 data/pokemon/base_stats/magikarp.asm   |  4 +--
 data/pokemon/base_stats/magmar.asm     |  4 +--
 data/pokemon/base_stats/magnemite.asm  |  4 +--
 data/pokemon/base_stats/magneton.asm   |  4 +--
 data/pokemon/base_stats/mankey.asm     |  4 +--
 data/pokemon/base_stats/mantine.asm    |  4 +--
 data/pokemon/base_stats/mareep.asm     |  4 +--
 data/pokemon/base_stats/marill.asm     |  4 +--
 data/pokemon/base_stats/marowak.asm    |  4 +--
 data/pokemon/base_stats/meganium.asm   |  4 +--
 data/pokemon/base_stats/meowth.asm     |  4 +--
 data/pokemon/base_stats/metapod.asm    |  4 +--
 data/pokemon/base_stats/mew.asm        |  4 +--
 data/pokemon/base_stats/mewtwo.asm     |  4 +--
 data/pokemon/base_stats/miltank.asm    |  4 +--
 data/pokemon/base_stats/misdreavus.asm |  4 +--
 data/pokemon/base_stats/moltres.asm    |  4 +--
 data/pokemon/base_stats/mr__mime.asm   |  4 +--
 data/pokemon/base_stats/muk.asm        |  4 +--
 data/pokemon/base_stats/murkrow.asm    |  4 +--
 data/pokemon/base_stats/natu.asm       |  4 +--
 data/pokemon/base_stats/nidoking.asm   |  4 +--
 data/pokemon/base_stats/nidoqueen.asm  |  4 +--
 data/pokemon/base_stats/nidoran_f.asm  |  4 +--
 data/pokemon/base_stats/nidoran_m.asm  |  4 +--
 data/pokemon/base_stats/nidorina.asm   |  4 +--
 data/pokemon/base_stats/nidorino.asm   |  4 +--
 data/pokemon/base_stats/ninetales.asm  |  4 +--
 data/pokemon/base_stats/noctowl.asm    |  4 +--
 data/pokemon/base_stats/octillery.asm  |  4 +--
 data/pokemon/base_stats/oddish.asm     |  4 +--
 data/pokemon/base_stats/omanyte.asm    |  4 +--
 data/pokemon/base_stats/omastar.asm    |  4 +--
 data/pokemon/base_stats/onix.asm       |  4 +--
 data/pokemon/base_stats/paras.asm      |  4 +--
 data/pokemon/base_stats/parasect.asm   |  4 +--
 data/pokemon/base_stats/persian.asm    |  4 +--
 data/pokemon/base_stats/phanpy.asm     |  4 +--
 data/pokemon/base_stats/pichu.asm      |  4 +--
 data/pokemon/base_stats/pidgeot.asm    |  4 +--
 data/pokemon/base_stats/pidgeotto.asm  |  4 +--
 data/pokemon/base_stats/pidgey.asm     |  4 +--
 data/pokemon/base_stats/pikachu.asm    |  4 +--
 data/pokemon/base_stats/piloswine.asm  |  4 +--
 data/pokemon/base_stats/pineco.asm     |  4 +--
 data/pokemon/base_stats/pinsir.asm     |  4 +--
 data/pokemon/base_stats/politoed.asm   |  4 +--
 data/pokemon/base_stats/poliwag.asm    |  4 +--
 data/pokemon/base_stats/poliwhirl.asm  |  4 +--
 data/pokemon/base_stats/poliwrath.asm  |  4 +--
 data/pokemon/base_stats/ponyta.asm     |  4 +--
 data/pokemon/base_stats/porygon.asm    |  4 +--
 data/pokemon/base_stats/porygon2.asm   |  4 +--
 data/pokemon/base_stats/primeape.asm   |  4 +--
 data/pokemon/base_stats/psyduck.asm    |  4 +--
 data/pokemon/base_stats/pupitar.asm    |  4 +--
 data/pokemon/base_stats/quagsire.asm   |  4 +--
 data/pokemon/base_stats/quilava.asm    |  4 +--
 data/pokemon/base_stats/qwilfish.asm   |  4 +--
 data/pokemon/base_stats/raichu.asm     |  4 +--
 data/pokemon/base_stats/raikou.asm     |  4 +--
 data/pokemon/base_stats/rapidash.asm   |  4 +--
 data/pokemon/base_stats/raticate.asm   |  4 +--
 data/pokemon/base_stats/rattata.asm    |  4 +--
 data/pokemon/base_stats/remoraid.asm   |  4 +--
 data/pokemon/base_stats/rhydon.asm     |  4 +--
 data/pokemon/base_stats/rhyhorn.asm    |  4 +--
 data/pokemon/base_stats/sandshrew.asm  |  4 +--
 data/pokemon/base_stats/sandslash.asm  |  4 +--
 data/pokemon/base_stats/scizor.asm     |  4 +--
 data/pokemon/base_stats/scyther.asm    |  4 +--
 data/pokemon/base_stats/seadra.asm     |  4 +--
 data/pokemon/base_stats/seaking.asm    |  4 +--
 data/pokemon/base_stats/seel.asm       |  4 +--
 data/pokemon/base_stats/sentret.asm    |  4 +--
 data/pokemon/base_stats/shellder.asm   |  4 +--
 data/pokemon/base_stats/shuckle.asm    |  4 +--
 data/pokemon/base_stats/skarmory.asm   |  4 +--
 data/pokemon/base_stats/skiploom.asm   |  4 +--
 data/pokemon/base_stats/slowbro.asm    |  4 +--
 data/pokemon/base_stats/slowking.asm   |  4 +--
 data/pokemon/base_stats/slowpoke.asm   |  4 +--
 data/pokemon/base_stats/slugma.asm     |  4 +--
 data/pokemon/base_stats/smeargle.asm   |  4 +--
 data/pokemon/base_stats/smoochum.asm   |  4 +--
 data/pokemon/base_stats/sneasel.asm    |  4 +--
 data/pokemon/base_stats/snorlax.asm    |  4 +--
 data/pokemon/base_stats/snubbull.asm   |  4 +--
 data/pokemon/base_stats/spearow.asm    |  4 +--
 data/pokemon/base_stats/spinarak.asm   |  4 +--
 data/pokemon/base_stats/squirtle.asm   |  4 +--
 data/pokemon/base_stats/stantler.asm   |  4 +--
 data/pokemon/base_stats/starmie.asm    |  4 +--
 data/pokemon/base_stats/staryu.asm     |  4 +--
 data/pokemon/base_stats/steelix.asm    |  4 +--
 data/pokemon/base_stats/sudowoodo.asm  |  4 +--
 data/pokemon/base_stats/suicune.asm    |  4 +--
 data/pokemon/base_stats/sunflora.asm   |  4 +--
 data/pokemon/base_stats/sunkern.asm    |  4 +--
 data/pokemon/base_stats/swinub.asm     |  4 +--
 data/pokemon/base_stats/tangela.asm    |  4 +--
 data/pokemon/base_stats/tauros.asm     |  4 +--
 data/pokemon/base_stats/teddiursa.asm  |  4 +--
 data/pokemon/base_stats/tentacool.asm  |  4 +--
 data/pokemon/base_stats/tentacruel.asm |  4 +--
 data/pokemon/base_stats/togepi.asm     |  4 +--
 data/pokemon/base_stats/togetic.asm    |  4 +--
 data/pokemon/base_stats/totodile.asm   |  4 +--
 data/pokemon/base_stats/typhlosion.asm |  4 +--
 data/pokemon/base_stats/tyranitar.asm  |  4 +--
 data/pokemon/base_stats/tyrogue.asm    |  4 +--
 data/pokemon/base_stats/umbreon.asm    |  4 +--
 data/pokemon/base_stats/unown.asm      |  4 +--
 data/pokemon/base_stats/ursaring.asm   |  4 +--
 data/pokemon/base_stats/vaporeon.asm   |  4 +--
 data/pokemon/base_stats/venomoth.asm   |  4 +--
 data/pokemon/base_stats/venonat.asm    |  4 +--
 data/pokemon/base_stats/venusaur.asm   |  4 +--
 data/pokemon/base_stats/victreebel.asm |  4 +--
 data/pokemon/base_stats/vileplume.asm  |  4 +--
 data/pokemon/base_stats/voltorb.asm    |  4 +--
 data/pokemon/base_stats/vulpix.asm     |  4 +--
 data/pokemon/base_stats/wartortle.asm  |  4 +--
 data/pokemon/base_stats/weedle.asm     |  4 +--
 data/pokemon/base_stats/weepinbell.asm |  4 +--
 data/pokemon/base_stats/weezing.asm    |  4 +--
 data/pokemon/base_stats/wigglytuff.asm |  4 +--
 data/pokemon/base_stats/wobbuffet.asm  |  4 +--
 data/pokemon/base_stats/wooper.asm     |  4 +--
 data/pokemon/base_stats/xatu.asm       |  4 +--
 data/pokemon/base_stats/yanma.asm      |  4 +--
 data/pokemon/base_stats/zapdos.asm     |  4 +--
 data/pokemon/base_stats/zubat.asm      |  4 +--
 engine/breeding.asm                    |  4 +--
 254 files changed, 526 insertions(+), 526 deletions(-)

diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index 238f23aa2..038a1c34d 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -37,30 +37,30 @@ GENDERLESS   EQU -1
 ; BaseGrowthRate values
 ; GrowthRates indexes (see data/growth_rates.asm)
 	const_def
-	const MEDIUM_FAST
-	const SLIGHTLY_FAST
-	const SLIGHTLY_SLOW
-	const MEDIUM_SLOW
-	const FAST
-	const SLOW
+	const GROWTH_MEDIUM_FAST
+	const GROWTH_SLIGHTLY_FAST
+	const GROWTH_SLIGHTLY_SLOW
+	const GROWTH_MEDIUM_SLOW
+	const GROWTH_FAST
+	const GROWTH_SLOW
 
 ; BaseEggGroups values
 	const_def 1
-	const MONSTER      ; 1
-	const AMPHIBIAN    ; 2
-	const INSECT       ; 3
-	const AVIAN        ; 4
-	const FIELD        ; 5
-	const FAIRY        ; 6
-	const PLANT        ; 7
-	const HUMANSHAPE   ; 8
-	const INVERTEBRATE ; 9
-	const MINERAL      ; a
-	const AMORPHOUS    ; b
-	const FISH         ; c
-	const POLY         ; d
-	const REPTILE      ; e
-	const NO_EGGS      ; f
+	const EGG_MONSTER      ; 1
+	const EGG_WATER_1      ; 2
+	const EGG_BUG          ; 3
+	const EGG_FLYING       ; 4
+	const EGG_FIELD        ; 5
+	const EGG_FAIRY        ; 6
+	const EGG_GRASS        ; 7
+	const EGG_HUMANLIKE    ; 8
+	const EGG_WATER_3      ; 9
+	const EGG_MINERAL      ; a
+	const EGG_AMORPHOUS    ; b
+	const EGG_WATER_2      ; c
+	const EGG_DITTO        ; d
+	const EGG_DRAGON       ; e
+	const EGG_UNDISCOVERED ; f
 
 
 ; pokedex entries (see data/pokemon/dex_entries.asm)
diff --git a/data/growth_rates.asm b/data/growth_rates.asm
index 4a1564515..84e600139 100644
--- a/data/growth_rates.asm
+++ b/data/growth_rates.asm
@@ -10,7 +10,7 @@ growth_rate: MACRO
 ENDM
 
 GrowthRates: ; 50efa
-; entries correspond to base growth rate constants (see constants/pokemon_data_constants.asm)
+; entries correspond to GROWTH_* (see constants/pokemon_data_constants.asm)
 	growth_rate 1, 1,   0,   0,   0 ; Medium Fast
 	growth_rate 3, 4,  10,   0,  30 ; Slightly Fast
 	growth_rate 3, 4,  20,   0,  70 ; Slightly Slow
diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm
index 687c3a872..9dca824c0 100644
--- a/data/pokemon/base_stats/abra.asm
+++ b/data/pokemon/base_stats/abra.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/abra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH
diff --git a/data/pokemon/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm
index 531c03803..889909fa9 100644
--- a/data/pokemon/base_stats/aerodactyl.asm
+++ b/data/pokemon/base_stats/aerodactyl.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/aerodactyl/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, STEEL_WING, FLY, FLAMETHROWER
diff --git a/data/pokemon/base_stats/aipom.asm b/data/pokemon/base_stats/aipom.asm
index 9da59d7ac..a03372532 100644
--- a/data/pokemon/base_stats/aipom.asm
+++ b/data/pokemon/base_stats/aipom.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/aipom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, STRENGTH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm
index affcd565b..3d5c6672b 100644
--- a/data/pokemon/base_stats/alakazam.asm
+++ b/data/pokemon/base_stats/alakazam.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/alakazam/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH
diff --git a/data/pokemon/base_stats/ampharos.asm b/data/pokemon/base_stats/ampharos.asm
index 90086b7cd..c10d364af 100644
--- a/data/pokemon/base_stats/ampharos.asm
+++ b/data/pokemon/base_stats/ampharos.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ampharos/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm
index 76302d5d5..ece66c976 100644
--- a/data/pokemon/base_stats/arbok.asm
+++ b/data/pokemon/base_stats/arbok.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/arbok/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, REPTILE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, STRENGTH
diff --git a/data/pokemon/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm
index 406199c2d..8bbca643f 100644
--- a/data/pokemon/base_stats/arcanine.asm
+++ b/data/pokemon/base_stats/arcanine.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/arcanine/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER
diff --git a/data/pokemon/base_stats/ariados.asm b/data/pokemon/base_stats/ariados.asm
index 431291ec3..792a87d3f 100644
--- a/data/pokemon/base_stats/ariados.asm
+++ b/data/pokemon/base_stats/ariados.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ariados/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FLASH
diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm
index bd8d1f59f..24b5cd5f8 100644
--- a/data/pokemon/base_stats/articuno.asm
+++ b/data/pokemon/base_stats/articuno.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/articuno/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, STEEL_WING, FLY, ICE_BEAM
diff --git a/data/pokemon/base_stats/azumarill.asm b/data/pokemon/base_stats/azumarill.asm
index 870fbc0f2..30ba90c5a 100644
--- a/data/pokemon/base_stats/azumarill.asm
+++ b/data/pokemon/base_stats/azumarill.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/azumarill/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn AMPHIBIAN, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_WATER_1, EGG_FAIRY ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/bayleef.asm b/data/pokemon/base_stats/bayleef.asm
index ef5b38ab0..3a0720e2e 100644
--- a/data/pokemon/base_stats/bayleef.asm
+++ b/data/pokemon/base_stats/bayleef.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/bayleef/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLASH
diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm
index 074dabd4b..40a52b0e9 100644
--- a/data/pokemon/base_stats/beedrill.asm
+++ b/data/pokemon/base_stats/beedrill.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/beedrill/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, FURY_CUTTER, CUT
diff --git a/data/pokemon/base_stats/bellossom.asm b/data/pokemon/base_stats/bellossom.asm
index 6c2986ba8..8f5405091 100644
--- a/data/pokemon/base_stats/bellossom.asm
+++ b/data/pokemon/base_stats/bellossom.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/bellossom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_GRASS, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, CUT, FLASH
diff --git a/data/pokemon/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm
index 3b40c1783..038692552 100644
--- a/data/pokemon/base_stats/bellsprout.asm
+++ b/data/pokemon/base_stats/bellsprout.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/bellsprout/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_GRASS, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH
diff --git a/data/pokemon/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm
index 86706bfdd..82c282f6a 100644
--- a/data/pokemon/base_stats/blastoise.asm
+++ b/data/pokemon/base_stats/blastoise.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/blastoise/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/blissey.asm b/data/pokemon/base_stats/blissey.asm
index ef7db52de..ef9d1714b 100644
--- a/data/pokemon/base_stats/blissey.asm
+++ b/data/pokemon/base_stats/blissey.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/blissey/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn FAIRY, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_FAIRY, EGG_FAIRY ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm
index 6afca0c97..7e97d62c8 100644
--- a/data/pokemon/base_stats/bulbasaur.asm
+++ b/data/pokemon/base_stats/bulbasaur.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/bulbasaur/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH
diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm
index f1037d971..c943ea07c 100644
--- a/data/pokemon/base_stats/butterfree.asm
+++ b/data/pokemon/base_stats/butterfree.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/butterfree/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, NIGHTMARE, FLASH
diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm
index 045123043..60ff1c018 100644
--- a/data/pokemon/base_stats/caterpie.asm
+++ b/data/pokemon/base_stats/caterpie.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/caterpie/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm
diff --git a/data/pokemon/base_stats/celebi.asm b/data/pokemon/base_stats/celebi.asm
index 757f7ec48..3307591f9 100644
--- a/data/pokemon/base_stats/celebi.asm
+++ b/data/pokemon/base_stats/celebi.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/celebi/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, NIGHTMARE, FLASH
diff --git a/data/pokemon/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm
index 53cd2caed..993150249 100644
--- a/data/pokemon/base_stats/chansey.asm
+++ b/data/pokemon/base_stats/chansey.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/chansey/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn FAIRY, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_FAIRY, EGG_FAIRY ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm
index cffacc93b..631e864d9 100644
--- a/data/pokemon/base_stats/charizard.asm
+++ b/data/pokemon/base_stats/charizard.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/charizard/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, REPTILE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, CUT, FLY, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm
index 667211ee5..b132a0ddf 100644
--- a/data/pokemon/base_stats/charmander.asm
+++ b/data/pokemon/base_stats/charmander.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/charmander/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, REPTILE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm
index b3806de4c..826c5fcf4 100644
--- a/data/pokemon/base_stats/charmeleon.asm
+++ b/data/pokemon/base_stats/charmeleon.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/charmeleon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, REPTILE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/chikorita.asm b/data/pokemon/base_stats/chikorita.asm
index 2876a776f..034d79355 100644
--- a/data/pokemon/base_stats/chikorita.asm
+++ b/data/pokemon/base_stats/chikorita.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/chikorita/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, CUT, FLASH
diff --git a/data/pokemon/base_stats/chinchou.asm b/data/pokemon/base_stats/chinchou.asm
index 508c104be..570135584 100644
--- a/data/pokemon/base_stats/chinchou.asm
+++ b/data/pokemon/base_stats/chinchou.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/chinchou/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FISH, FISH ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_2, EGG_WATER_2 ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm
index 7fcff1bb4..34b332358 100644
--- a/data/pokemon/base_stats/clefable.asm
+++ b/data/pokemon/base_stats/clefable.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/clefable/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn FAIRY, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_FAIRY, EGG_FAIRY ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm
index 59d265359..2ff9c1645 100644
--- a/data/pokemon/base_stats/clefairy.asm
+++ b/data/pokemon/base_stats/clefairy.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/clefairy/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn FAIRY, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_FAIRY, EGG_FAIRY ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/cleffa.asm b/data/pokemon/base_stats/cleffa.asm
index 7a1a74402..5436c661e 100644
--- a/data/pokemon/base_stats/cleffa.asm
+++ b/data/pokemon/base_stats/cleffa.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/cleffa/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, FLASH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm
index 59544abe2..552d9a6fe 100644
--- a/data/pokemon/base_stats/cloyster.asm
+++ b/data/pokemon/base_stats/cloyster.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/cloyster/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn INVERTEBRATE, INVERTEBRATE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/corsola.asm b/data/pokemon/base_stats/corsola.asm
index e06f509cc..16234bbf1 100644
--- a/data/pokemon/base_stats/corsola.asm
+++ b/data/pokemon/base_stats/corsola.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/corsola/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn AMPHIBIAN, INVERTEBRATE ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_WATER_1, EGG_WATER_3 ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/crobat.asm b/data/pokemon/base_stats/crobat.asm
index 0e7bad390..f52866f3b 100644
--- a/data/pokemon/base_stats/crobat.asm
+++ b/data/pokemon/base_stats/crobat.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/crobat/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY
diff --git a/data/pokemon/base_stats/croconaw.asm b/data/pokemon/base_stats/croconaw.asm
index 0afdd1a14..2f08eaecc 100644
--- a/data/pokemon/base_stats/croconaw.asm
+++ b/data/pokemon/base_stats/croconaw.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/croconaw/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm
index 174dcb5a1..55fdf7586 100644
--- a/data/pokemon/base_stats/cubone.asm
+++ b/data/pokemon/base_stats/cubone.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/cubone/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MONSTER, MONSTER ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MONSTER, EGG_MONSTER ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER, ICE_BEAM
diff --git a/data/pokemon/base_stats/cyndaquil.asm b/data/pokemon/base_stats/cyndaquil.asm
index dfd052d5f..9ffb7a562 100644
--- a/data/pokemon/base_stats/cyndaquil.asm
+++ b/data/pokemon/base_stats/cyndaquil.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/cyndaquil/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, CUT, FLAMETHROWER
diff --git a/data/pokemon/base_stats/delibird.asm b/data/pokemon/base_stats/delibird.asm
index 3736e4e00..f00e6fbf6 100644
--- a/data/pokemon/base_stats/delibird.asm
+++ b/data/pokemon/base_stats/delibird.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/delibird/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn AMPHIBIAN, FIELD ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_WATER_1, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, FLY, ICE_BEAM
diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm
index 332597ee8..d90aac1b3 100644
--- a/data/pokemon/base_stats/dewgong.asm
+++ b/data/pokemon/base_stats/dewgong.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/dewgong/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm
index 4079fe063..8c97db59d 100644
--- a/data/pokemon/base_stats/diglett.asm
+++ b/data/pokemon/base_stats/diglett.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/diglett/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT
diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm
index 71a5b4762..06c7f2b4c 100644
--- a/data/pokemon/base_stats/ditto.asm
+++ b/data/pokemon/base_stats/ditto.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ditto/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn POLY, POLY ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_DITTO, EGG_DITTO ; egg groups
 
 	; tm/hm learnset
 	tmhm
diff --git a/data/pokemon/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm
index b26b4f631..c3232e2f1 100644
--- a/data/pokemon/base_stats/dodrio.asm
+++ b/data/pokemon/base_stats/dodrio.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/dodrio/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, THIEF, STEEL_WING, FLY
diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm
index 6e649a9fe..0d503a191 100644
--- a/data/pokemon/base_stats/doduo.asm
+++ b/data/pokemon/base_stats/doduo.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/doduo/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, THIEF, STEEL_WING, FLY
diff --git a/data/pokemon/base_stats/donphan.asm b/data/pokemon/base_stats/donphan.asm
index 8b68360bc..af38c1aee 100644
--- a/data/pokemon/base_stats/donphan.asm
+++ b/data/pokemon/base_stats/donphan.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/donphan/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH
diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm
index f2ca387c7..272310082 100644
--- a/data/pokemon/base_stats/dragonair.asm
+++ b/data/pokemon/base_stats/dragonair.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/dragonair/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn AMPHIBIAN, REPTILE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_1, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, SURF, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm
index a004b0d31..b3698900a 100644
--- a/data/pokemon/base_stats/dragonite.asm
+++ b/data/pokemon/base_stats/dragonite.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/dragonite/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn AMPHIBIAN, REPTILE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_1, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, FLY, SURF, STRENGTH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm
index eb1fc4f61..7cdf68c88 100644
--- a/data/pokemon/base_stats/dratini.asm
+++ b/data/pokemon/base_stats/dratini.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/dratini/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn AMPHIBIAN, REPTILE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_1, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, SURF, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm
index d84a3cb41..9cfad8c45 100644
--- a/data/pokemon/base_stats/drowzee.asm
+++ b/data/pokemon/base_stats/drowzee.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/drowzee/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, FLASH
diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm
index 07c0f1c1e..fe6d0415b 100644
--- a/data/pokemon/base_stats/dugtrio.asm
+++ b/data/pokemon/base_stats/dugtrio.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/dugtrio/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT
diff --git a/data/pokemon/base_stats/dunsparce.asm b/data/pokemon/base_stats/dunsparce.asm
index 407d81820..5118dfd2c 100644
--- a/data/pokemon/base_stats/dunsparce.asm
+++ b/data/pokemon/base_stats/dunsparce.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/dunsparce/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLAMETHROWER, THUNDERBOLT
diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm
index 69d4b4525..8fce2db3f 100644
--- a/data/pokemon/base_stats/eevee.asm
+++ b/data/pokemon/base_stats/eevee.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/eevee/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT
diff --git a/data/pokemon/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm
index 0dbb46384..a0c72af1e 100644
--- a/data/pokemon/base_stats/ekans.asm
+++ b/data/pokemon/base_stats/ekans.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ekans/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, REPTILE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, STRENGTH
diff --git a/data/pokemon/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm
index 1a5e52508..521a23344 100644
--- a/data/pokemon/base_stats/electabuzz.asm
+++ b/data/pokemon/base_stats/electabuzz.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/electabuzz/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm
index f00eed0cc..456bc5797 100644
--- a/data/pokemon/base_stats/electrode.asm
+++ b/data/pokemon/base_stats/electrode.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/electrode/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MINERAL, MINERAL ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/elekid.asm b/data/pokemon/base_stats/elekid.asm
index e60b486de..48eb8ac14 100644
--- a/data/pokemon/base_stats/elekid.asm
+++ b/data/pokemon/base_stats/elekid.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/elekid/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/entei.asm b/data/pokemon/base_stats/entei.asm
index 6e58a9daa..3e0a778c7 100644
--- a/data/pokemon/base_stats/entei.asm
+++ b/data/pokemon/base_stats/entei.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/entei/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, CUT, STRENGTH, FLASH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/espeon.asm b/data/pokemon/base_stats/espeon.asm
index 4e6b93282..502185e9a 100644
--- a/data/pokemon/base_stats/espeon.asm
+++ b/data/pokemon/base_stats/espeon.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/espeon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, CUT, FLASH
diff --git a/data/pokemon/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm
index f6b6c183f..3cc9a8543 100644
--- a/data/pokemon/base_stats/exeggcute.asm
+++ b/data/pokemon/base_stats/exeggcute.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/exeggcute/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_GRASS, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, ROLLOUT, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLASH
diff --git a/data/pokemon/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm
index 6d406897b..3e3e83281 100644
--- a/data/pokemon/base_stats/exeggutor.asm
+++ b/data/pokemon/base_stats/exeggutor.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/exeggutor/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_GRASS, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLASH
diff --git a/data/pokemon/base_stats/farfetch_d.asm b/data/pokemon/base_stats/farfetch_d.asm
index bf5c05921..874f06d69 100644
--- a/data/pokemon/base_stats/farfetch_d.asm
+++ b/data/pokemon/base_stats/farfetch_d.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/farfetch_d/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, CUT, FLY
diff --git a/data/pokemon/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm
index b337a282e..432c9965a 100644
--- a/data/pokemon/base_stats/fearow.asm
+++ b/data/pokemon/base_stats/fearow.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/fearow/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY
diff --git a/data/pokemon/base_stats/feraligatr.asm b/data/pokemon/base_stats/feraligatr.asm
index cee2f4cfb..6cdaa6857 100644
--- a/data/pokemon/base_stats/feraligatr.asm
+++ b/data/pokemon/base_stats/feraligatr.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/feraligatr/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/flaaffy.asm b/data/pokemon/base_stats/flaaffy.asm
index 737210352..01d1fcc77 100644
--- a/data/pokemon/base_stats/flaaffy.asm
+++ b/data/pokemon/base_stats/flaaffy.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/flaaffy/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm
index 5b03e2ac9..d38a9411a 100644
--- a/data/pokemon/base_stats/flareon.asm
+++ b/data/pokemon/base_stats/flareon.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/flareon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, FLAMETHROWER
diff --git a/data/pokemon/base_stats/forretress.asm b/data/pokemon/base_stats/forretress.asm
index 4f486b292..a22389430 100644
--- a/data/pokemon/base_stats/forretress.asm
+++ b/data/pokemon/base_stats/forretress.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/forretress/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH
diff --git a/data/pokemon/base_stats/furret.asm b/data/pokemon/base_stats/furret.asm
index 8fdc6df96..303e301d0 100644
--- a/data/pokemon/base_stats/furret.asm
+++ b/data/pokemon/base_stats/furret.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/furret/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, SURF, STRENGTH
diff --git a/data/pokemon/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm
index 97383ac89..cc399fabf 100644
--- a/data/pokemon/base_stats/gastly.asm
+++ b/data/pokemon/base_stats/gastly.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/gastly/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT
diff --git a/data/pokemon/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm
index 98f3ebf1f..a8b2240a2 100644
--- a/data/pokemon/base_stats/gengar.asm
+++ b/data/pokemon/base_stats/gengar.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/gengar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm
index b3c3603ba..4cfc7ea5b 100644
--- a/data/pokemon/base_stats/geodude.asm
+++ b/data/pokemon/base_stats/geodude.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/geodude/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MINERAL, MINERAL ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/girafarig.asm b/data/pokemon/base_stats/girafarig.asm
index eb159919a..996171792 100644
--- a/data/pokemon/base_stats/girafarig.asm
+++ b/data/pokemon/base_stats/girafarig.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/girafarig/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/gligar.asm b/data/pokemon/base_stats/gligar.asm
index 8bd607656..d0b026f7c 100644
--- a/data/pokemon/base_stats/gligar.asm
+++ b/data/pokemon/base_stats/gligar.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/gligar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH
diff --git a/data/pokemon/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm
index 30f4cbe9c..78ca61d01 100644
--- a/data/pokemon/base_stats/gloom.asm
+++ b/data/pokemon/base_stats/gloom.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/gloom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_GRASS, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH
diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm
index a73d5651f..0928342a3 100644
--- a/data/pokemon/base_stats/golbat.asm
+++ b/data/pokemon/base_stats/golbat.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/golbat/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING
diff --git a/data/pokemon/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm
index 3651e0948..1a598fd28 100644
--- a/data/pokemon/base_stats/goldeen.asm
+++ b/data/pokemon/base_stats/goldeen.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/goldeen/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FISH, FISH ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_2, EGG_WATER_2 ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm
index ea89e9436..53a633c1d 100644
--- a/data/pokemon/base_stats/golduck.asm
+++ b/data/pokemon/base_stats/golduck.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/golduck/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, FURY_CUTTER, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm
index 6de25b590..b484a9f73 100644
--- a/data/pokemon/base_stats/golem.asm
+++ b/data/pokemon/base_stats/golem.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/golem/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MINERAL, MINERAL ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/granbull.asm b/data/pokemon/base_stats/granbull.asm
index f49bf530c..272cb2c04 100644
--- a/data/pokemon/base_stats/granbull.asm
+++ b/data/pokemon/base_stats/granbull.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/granbull/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn FIELD, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_FIELD, EGG_FAIRY ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm
index 98eaef882..216378ea9 100644
--- a/data/pokemon/base_stats/graveler.asm
+++ b/data/pokemon/base_stats/graveler.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/graveler/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MINERAL, MINERAL ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm
index 2aa87d4e2..24a0c6edd 100644
--- a/data/pokemon/base_stats/grimer.asm
+++ b/data/pokemon/base_stats/grimer.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/grimer/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT
diff --git a/data/pokemon/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm
index f61260b55..aaef18154 100644
--- a/data/pokemon/base_stats/growlithe.asm
+++ b/data/pokemon/base_stats/growlithe.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/growlithe/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER
diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm
index 894982327..66916f2d8 100644
--- a/data/pokemon/base_stats/gyarados.asm
+++ b/data/pokemon/base_stats/gyarados.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/gyarados/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FISH, REPTILE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_2, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm
index a5cf1e459..e6268fefa 100644
--- a/data/pokemon/base_stats/haunter.asm
+++ b/data/pokemon/base_stats/haunter.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/haunter/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT
diff --git a/data/pokemon/base_stats/heracross.asm b/data/pokemon/base_stats/heracross.asm
index 762813ac4..b02fb74d8 100644
--- a/data/pokemon/base_stats/heracross.asm
+++ b/data/pokemon/base_stats/heracross.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/heracross/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH
diff --git a/data/pokemon/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm
index e1d3c7c58..0d753ff50 100644
--- a/data/pokemon/base_stats/hitmonchan.asm
+++ b/data/pokemon/base_stats/hitmonchan.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/hitmonchan/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH
diff --git a/data/pokemon/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm
index 3296cbdd9..6fd72dd4e 100644
--- a/data/pokemon/base_stats/hitmonlee.asm
+++ b/data/pokemon/base_stats/hitmonlee.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/hitmonlee/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH
diff --git a/data/pokemon/base_stats/hitmontop.asm b/data/pokemon/base_stats/hitmontop.asm
index c45aa51e6..f7041fbc1 100644
--- a/data/pokemon/base_stats/hitmontop.asm
+++ b/data/pokemon/base_stats/hitmontop.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/hitmontop/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH
diff --git a/data/pokemon/base_stats/ho_oh.asm b/data/pokemon/base_stats/ho_oh.asm
index 20d96bafe..f63bd3a1b 100644
--- a/data/pokemon/base_stats/ho_oh.asm
+++ b/data/pokemon/base_stats/ho_oh.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ho_oh/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, STEEL_WING, NIGHTMARE, FLY, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT
diff --git a/data/pokemon/base_stats/hoothoot.asm b/data/pokemon/base_stats/hoothoot.asm
index 50b2bdf9e..9fcc72dcf 100644
--- a/data/pokemon/base_stats/hoothoot.asm
+++ b/data/pokemon/base_stats/hoothoot.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/hoothoot/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY, FLASH
diff --git a/data/pokemon/base_stats/hoppip.asm b/data/pokemon/base_stats/hoppip.asm
index 32c09f16c..05d378af8 100644
--- a/data/pokemon/base_stats/hoppip.asm
+++ b/data/pokemon/base_stats/hoppip.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/hoppip/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn FAIRY, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_FAIRY, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH
diff --git a/data/pokemon/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm
index 2321b4d66..1869ebacf 100644
--- a/data/pokemon/base_stats/horsea.asm
+++ b/data/pokemon/base_stats/horsea.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/horsea/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, REPTILE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/houndoom.asm b/data/pokemon/base_stats/houndoom.asm
index 25d728edf..7c14cf179 100644
--- a/data/pokemon/base_stats/houndoom.asm
+++ b/data/pokemon/base_stats/houndoom.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/houndoom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/houndour.asm b/data/pokemon/base_stats/houndour.asm
index 010b21928..c212ea227 100644
--- a/data/pokemon/base_stats/houndour.asm
+++ b/data/pokemon/base_stats/houndour.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/houndour/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLAMETHROWER
diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm
index af03aa777..312659af0 100644
--- a/data/pokemon/base_stats/hypno.asm
+++ b/data/pokemon/base_stats/hypno.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/hypno/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, FLASH
diff --git a/data/pokemon/base_stats/igglybuff.asm b/data/pokemon/base_stats/igglybuff.asm
index b8a198d91..73cf2f077 100644
--- a/data/pokemon/base_stats/igglybuff.asm
+++ b/data/pokemon/base_stats/igglybuff.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/igglybuff/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, FLASH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm
index f416b76e3..aa3d60b65 100644
--- a/data/pokemon/base_stats/ivysaur.asm
+++ b/data/pokemon/base_stats/ivysaur.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ivysaur/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH
diff --git a/data/pokemon/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm
index 222c05820..42f9a3e69 100644
--- a/data/pokemon/base_stats/jigglypuff.asm
+++ b/data/pokemon/base_stats/jigglypuff.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/jigglypuff/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn FAIRY, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_FAIRY, EGG_FAIRY ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm
index 311e07b9a..283ce0fd8 100644
--- a/data/pokemon/base_stats/jolteon.asm
+++ b/data/pokemon/base_stats/jolteon.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/jolteon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/jumpluff.asm b/data/pokemon/base_stats/jumpluff.asm
index e20b59e3d..d9ffb165a 100644
--- a/data/pokemon/base_stats/jumpluff.asm
+++ b/data/pokemon/base_stats/jumpluff.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/jumpluff/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn FAIRY, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_FAIRY, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH
diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm
index ec8c47d9c..47fbefdc2 100644
--- a/data/pokemon/base_stats/jynx.asm
+++ b/data/pokemon/base_stats/jynx.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/jynx/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, ICE_BEAM
diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm
index 984e66da7..36089b5a2 100644
--- a/data/pokemon/base_stats/kabuto.asm
+++ b/data/pokemon/base_stats/kabuto.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/kabuto/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, INVERTEBRATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_WATER_3 ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, ICE_BEAM
diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm
index a7e2e521c..4cba3259e 100644
--- a/data/pokemon/base_stats/kabutops.asm
+++ b/data/pokemon/base_stats/kabutops.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/kabutops/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, INVERTEBRATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_WATER_3 ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm
index ece5f8a79..7533d2894 100644
--- a/data/pokemon/base_stats/kadabra.asm
+++ b/data/pokemon/base_stats/kadabra.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/kadabra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH
diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm
index a4f9dd363..5c9902df5 100644
--- a/data/pokemon/base_stats/kakuna.asm
+++ b/data/pokemon/base_stats/kakuna.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/kakuna/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm
diff --git a/data/pokemon/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm
index b2a7d64b1..69f6ba6f9 100644
--- a/data/pokemon/base_stats/kangaskhan.asm
+++ b/data/pokemon/base_stats/kangaskhan.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/kangaskhan/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MONSTER, MONSTER ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MONSTER, EGG_MONSTER ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.asm
index 65993ea25..f64cddccc 100644
--- a/data/pokemon/base_stats/kingdra.asm
+++ b/data/pokemon/base_stats/kingdra.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/kingdra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, REPTILE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm
index 947526dd6..f76ff1a26 100644
--- a/data/pokemon/base_stats/kingler.asm
+++ b/data/pokemon/base_stats/kingler.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/kingler/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INVERTEBRATE, INVERTEBRATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm
index 1e55c5010..593be0a67 100644
--- a/data/pokemon/base_stats/koffing.asm
+++ b/data/pokemon/base_stats/koffing.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/koffing/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, FLAMETHROWER, THUNDERBOLT
diff --git a/data/pokemon/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm
index d386988a5..830908fd5 100644
--- a/data/pokemon/base_stats/krabby.asm
+++ b/data/pokemon/base_stats/krabby.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/krabby/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INVERTEBRATE, INVERTEBRATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/lanturn.asm b/data/pokemon/base_stats/lanturn.asm
index 28fd3aed2..d8e38b369 100644
--- a/data/pokemon/base_stats/lanturn.asm
+++ b/data/pokemon/base_stats/lanturn.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/lanturn/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FISH, FISH ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_2, EGG_WATER_2 ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm
index 9a40f3447..5985e9f68 100644
--- a/data/pokemon/base_stats/lapras.asm
+++ b/data/pokemon/base_stats/lapras.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/lapras/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn MONSTER, AMPHIBIAN ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, STRENGTH, WHIRLPOOL, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/larvitar.asm b/data/pokemon/base_stats/larvitar.asm
index acdfd290f..d40e559c6 100644
--- a/data/pokemon/base_stats/larvitar.asm
+++ b/data/pokemon/base_stats/larvitar.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/larvitar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn MONSTER, MONSTER ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_MONSTER ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DETECT, REST, ATTRACT
diff --git a/data/pokemon/base_stats/ledian.asm b/data/pokemon/base_stats/ledian.asm
index 27a002dcd..e8fcc7db1 100644
--- a/data/pokemon/base_stats/ledian.asm
+++ b/data/pokemon/base_stats/ledian.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ledian/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, REST, ATTRACT, THIEF, FLASH
diff --git a/data/pokemon/base_stats/ledyba.asm b/data/pokemon/base_stats/ledyba.asm
index e65614248..a532862ea 100644
--- a/data/pokemon/base_stats/ledyba.asm
+++ b/data/pokemon/base_stats/ledyba.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ledyba/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, REST, ATTRACT, THIEF, FLASH
diff --git a/data/pokemon/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm
index 3c7c96e40..80c034a8a 100644
--- a/data/pokemon/base_stats/lickitung.asm
+++ b/data/pokemon/base_stats/lickitung.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/lickitung/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MONSTER, MONSTER ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MONSTER, EGG_MONSTER ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, CUT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/lugia.asm b/data/pokemon/base_stats/lugia.asm
index fe7391c04..76678116a 100644
--- a/data/pokemon/base_stats/lugia.asm
+++ b/data/pokemon/base_stats/lugia.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/lugia/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DREAM_EATER, DETECT, REST, STEEL_WING, NIGHTMARE, FLY, SURF, STRENGTH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm
index 1e7a07e5f..67566ee37 100644
--- a/data/pokemon/base_stats/machamp.asm
+++ b/data/pokemon/base_stats/machamp.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/machamp/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm
index 87ceb4549..fa18abc93 100644
--- a/data/pokemon/base_stats/machoke.asm
+++ b/data/pokemon/base_stats/machoke.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/machoke/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm
index 4969a8403..ee81897a0 100644
--- a/data/pokemon/base_stats/machop.asm
+++ b/data/pokemon/base_stats/machop.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/machop/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/magby.asm b/data/pokemon/base_stats/magby.asm
index 37075404b..dcf076627 100644
--- a/data/pokemon/base_stats/magby.asm
+++ b/data/pokemon/base_stats/magby.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/magby/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/magcargo.asm b/data/pokemon/base_stats/magcargo.asm
index d91f72b27..03a8e8147 100644
--- a/data/pokemon/base_stats/magcargo.asm
+++ b/data/pokemon/base_stats/magcargo.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/magcargo/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm
index 220f5ddd9..3398a5291 100644
--- a/data/pokemon/base_stats/magikarp.asm
+++ b/data/pokemon/base_stats/magikarp.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/magikarp/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FISH, REPTILE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_2, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm
diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm
index 8a11e538d..dcef3350c 100644
--- a/data/pokemon/base_stats/magmar.asm
+++ b/data/pokemon/base_stats/magmar.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/magmar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm
index aff31035e..667ca215e 100644
--- a/data/pokemon/base_stats/magnemite.asm
+++ b/data/pokemon/base_stats/magnemite.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/magnemite/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MINERAL, MINERAL ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm
index 0b694fcf6..201ac98c2 100644
--- a/data/pokemon/base_stats/magneton.asm
+++ b/data/pokemon/base_stats/magneton.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/magneton/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MINERAL, MINERAL ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm
index 82c9456ff..4f4c8323c 100644
--- a/data/pokemon/base_stats/mankey.asm
+++ b/data/pokemon/base_stats/mankey.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/mankey/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/mantine.asm b/data/pokemon/base_stats/mantine.asm
index 80f5dde6b..33b674f4e 100644
--- a/data/pokemon/base_stats/mantine.asm
+++ b/data/pokemon/base_stats/mantine.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/mantine/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn AMPHIBIAN, AMPHIBIAN ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_1, EGG_WATER_1 ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/mareep.asm b/data/pokemon/base_stats/mareep.asm
index 8a68d5cf2..dbc7542ab 100644
--- a/data/pokemon/base_stats/mareep.asm
+++ b/data/pokemon/base_stats/mareep.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/mareep/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/marill.asm b/data/pokemon/base_stats/marill.asm
index e190e0d0c..f57d0e577 100644
--- a/data/pokemon/base_stats/marill.asm
+++ b/data/pokemon/base_stats/marill.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/marill/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn AMPHIBIAN, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_WATER_1, EGG_FAIRY ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm
index 453bb9932..b98e344ee 100644
--- a/data/pokemon/base_stats/marowak.asm
+++ b/data/pokemon/base_stats/marowak.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/marowak/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MONSTER, MONSTER ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MONSTER, EGG_MONSTER ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER, ICE_BEAM
diff --git a/data/pokemon/base_stats/meganium.asm b/data/pokemon/base_stats/meganium.asm
index 3e02ced99..41336bf88 100644
--- a/data/pokemon/base_stats/meganium.asm
+++ b/data/pokemon/base_stats/meganium.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/meganium/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLASH
diff --git a/data/pokemon/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm
index feb97df30..4f12a79ff 100644
--- a/data/pokemon/base_stats/meowth.asm
+++ b/data/pokemon/base_stats/meowth.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/meowth/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT
diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm
index 8a4d27220..4f91cbd72 100644
--- a/data/pokemon/base_stats/metapod.asm
+++ b/data/pokemon/base_stats/metapod.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/metapod/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm
diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm
index f09d291a9..ddc70b947 100644
--- a/data/pokemon/base_stats/mew.asm
+++ b/data/pokemon/base_stats/mew.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/mew/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, FLY, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm
index 98ee9e43a..2c1e68497 100644
--- a/data/pokemon/base_stats/mewtwo.asm
+++ b/data/pokemon/base_stats/mewtwo.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/mewtwo/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, THUNDERPUNCH, DREAM_EATER, DETECT, REST, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/miltank.asm b/data/pokemon/base_stats/miltank.asm
index 35642718b..8a28845f7 100644
--- a/data/pokemon/base_stats/miltank.asm
+++ b/data/pokemon/base_stats/miltank.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/miltank/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, SURF, STRENGTH, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/misdreavus.asm b/data/pokemon/base_stats/misdreavus.asm
index ebb2a8160..232fc4bea 100644
--- a/data/pokemon/base_stats/misdreavus.asm
+++ b/data/pokemon/base_stats/misdreavus.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/misdreavus/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm
index 2b02ad1b9..17f90610e 100644
--- a/data/pokemon/base_stats/moltres.asm
+++ b/data/pokemon/base_stats/moltres.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/moltres/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, STEEL_WING, FLY, FLAMETHROWER
diff --git a/data/pokemon/base_stats/mr__mime.asm b/data/pokemon/base_stats/mr__mime.asm
index cf3707f0f..3073f6d6e 100644
--- a/data/pokemon/base_stats/mr__mime.asm
+++ b/data/pokemon/base_stats/mr__mime.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/mr__mime/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm
index 32e326cbe..4f22ac6b1 100644
--- a/data/pokemon/base_stats/muk.asm
+++ b/data/pokemon/base_stats/muk.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/muk/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT
diff --git a/data/pokemon/base_stats/murkrow.asm b/data/pokemon/base_stats/murkrow.asm
index 404a8d8ac..7e49aa5d9 100644
--- a/data/pokemon/base_stats/murkrow.asm
+++ b/data/pokemon/base_stats/murkrow.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/murkrow/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY
diff --git a/data/pokemon/base_stats/natu.asm b/data/pokemon/base_stats/natu.asm
index ae5c9839e..01fe673d3 100644
--- a/data/pokemon/base_stats/natu.asm
+++ b/data/pokemon/base_stats/natu.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/natu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLASH
diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm
index 796d87a93..e06b80f19 100644
--- a/data/pokemon/base_stats/nidoking.asm
+++ b/data/pokemon/base_stats/nidoking.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/nidoking/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm
index 4637b486f..96436233c 100644
--- a/data/pokemon/base_stats/nidoqueen.asm
+++ b/data/pokemon/base_stats/nidoqueen.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/nidoqueen/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/nidoran_f.asm b/data/pokemon/base_stats/nidoran_f.asm
index 0fa3ea2ed..b6d52cbbf 100644
--- a/data/pokemon/base_stats/nidoran_f.asm
+++ b/data/pokemon/base_stats/nidoran_f.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/nidoran_f/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, THUNDERBOLT
diff --git a/data/pokemon/base_stats/nidoran_m.asm b/data/pokemon/base_stats/nidoran_m.asm
index f23405a78..b155aaf52 100644
--- a/data/pokemon/base_stats/nidoran_m.asm
+++ b/data/pokemon/base_stats/nidoran_m.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/nidoran_m/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, THUNDERBOLT
diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm
index 65dfd558e..fb406792c 100644
--- a/data/pokemon/base_stats/nidorina.asm
+++ b/data/pokemon/base_stats/nidorina.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/nidorina/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, STRENGTH, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm
index 7ba686eff..60b0a9f34 100644
--- a/data/pokemon/base_stats/nidorino.asm
+++ b/data/pokemon/base_stats/nidorino.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/nidorino/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, STRENGTH, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm
index 892874071..6f167809e 100644
--- a/data/pokemon/base_stats/ninetales.asm
+++ b/data/pokemon/base_stats/ninetales.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ninetales/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER
diff --git a/data/pokemon/base_stats/noctowl.asm b/data/pokemon/base_stats/noctowl.asm
index 6adcdc976..a0ee3cf39 100644
--- a/data/pokemon/base_stats/noctowl.asm
+++ b/data/pokemon/base_stats/noctowl.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/noctowl/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY, FLASH
diff --git a/data/pokemon/base_stats/octillery.asm b/data/pokemon/base_stats/octillery.asm
index 247b996ca..935e1e649 100644
--- a/data/pokemon/base_stats/octillery.asm
+++ b/data/pokemon/base_stats/octillery.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/octillery/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, FISH ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_WATER_2 ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, FLAMETHROWER, ICE_BEAM
diff --git a/data/pokemon/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm
index a4cba7085..fd7cecbfb 100644
--- a/data/pokemon/base_stats/oddish.asm
+++ b/data/pokemon/base_stats/oddish.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/oddish/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_GRASS, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH
diff --git a/data/pokemon/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm
index a7d9d346d..1d934e51f 100644
--- a/data/pokemon/base_stats/omanyte.asm
+++ b/data/pokemon/base_stats/omanyte.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/omanyte/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, INVERTEBRATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_WATER_3 ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm
index a2d60abf3..446f13bcd 100644
--- a/data/pokemon/base_stats/omastar.asm
+++ b/data/pokemon/base_stats/omastar.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/omastar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, INVERTEBRATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_WATER_3 ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm
index 45e38bb32..e9e1d53ec 100644
--- a/data/pokemon/base_stats/onix.asm
+++ b/data/pokemon/base_stats/onix.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/onix/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MINERAL, MINERAL ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, STRENGTH
diff --git a/data/pokemon/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm
index 8f99631ce..6bea13e23 100644
--- a/data/pokemon/base_stats/paras.asm
+++ b/data/pokemon/base_stats/paras.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/paras/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, PLANT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, FLASH
diff --git a/data/pokemon/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm
index 32b823b83..c2113d8ad 100644
--- a/data/pokemon/base_stats/parasect.asm
+++ b/data/pokemon/base_stats/parasect.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/parasect/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, PLANT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, FLASH
diff --git a/data/pokemon/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm
index eace03a07..5b580bab7 100644
--- a/data/pokemon/base_stats/persian.asm
+++ b/data/pokemon/base_stats/persian.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/persian/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT
diff --git a/data/pokemon/base_stats/phanpy.asm b/data/pokemon/base_stats/phanpy.asm
index 58d3a810d..20bb20668 100644
--- a/data/pokemon/base_stats/phanpy.asm
+++ b/data/pokemon/base_stats/phanpy.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/phanpy/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH
diff --git a/data/pokemon/base_stats/pichu.asm b/data/pokemon/base_stats/pichu.asm
index 08346c338..319f50c62 100644
--- a/data/pokemon/base_stats/pichu.asm
+++ b/data/pokemon/base_stats/pichu.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/pichu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm
index b8270e0b2..398d3aab6 100644
--- a/data/pokemon/base_stats/pidgeot.asm
+++ b/data/pokemon/base_stats/pidgeot.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/pidgeot/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY
diff --git a/data/pokemon/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm
index 1951abc75..cafa3a403 100644
--- a/data/pokemon/base_stats/pidgeotto.asm
+++ b/data/pokemon/base_stats/pidgeotto.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/pidgeotto/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY
diff --git a/data/pokemon/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm
index cd547de53..72f66c923 100644
--- a/data/pokemon/base_stats/pidgey.asm
+++ b/data/pokemon/base_stats/pidgey.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/pidgey/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY
diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm
index 2ac75e086..2edf64ee2 100644
--- a/data/pokemon/base_stats/pikachu.asm
+++ b/data/pokemon/base_stats/pikachu.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/pikachu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FAIRY ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FAIRY ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, STRENGTH, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/piloswine.asm b/data/pokemon/base_stats/piloswine.asm
index ee013c2e4..fe20a92f7 100644
--- a/data/pokemon/base_stats/piloswine.asm
+++ b/data/pokemon/base_stats/piloswine.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/piloswine/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH, ICE_BEAM
diff --git a/data/pokemon/base_stats/pineco.asm b/data/pokemon/base_stats/pineco.asm
index 09eae2319..55cf7d4a4 100644
--- a/data/pokemon/base_stats/pineco.asm
+++ b/data/pokemon/base_stats/pineco.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/pineco/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, STRENGTH
diff --git a/data/pokemon/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm
index 37c3dfced..37f28a030 100644
--- a/data/pokemon/base_stats/pinsir.asm
+++ b/data/pokemon/base_stats/pinsir.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/pinsir/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH
diff --git a/data/pokemon/base_stats/politoed.asm b/data/pokemon/base_stats/politoed.asm
index ba152e9e2..3cf6ec968 100644
--- a/data/pokemon/base_stats/politoed.asm
+++ b/data/pokemon/base_stats/politoed.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/politoed/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AMPHIBIAN, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_WATER_1, EGG_WATER_1 ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm
index a8cddbdeb..119b5f071 100644
--- a/data/pokemon/base_stats/poliwag.asm
+++ b/data/pokemon/base_stats/poliwag.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/poliwag/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AMPHIBIAN, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_WATER_1, EGG_WATER_1 ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm
index e76dd5b4b..6d0347b28 100644
--- a/data/pokemon/base_stats/poliwhirl.asm
+++ b/data/pokemon/base_stats/poliwhirl.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/poliwhirl/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AMPHIBIAN, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_WATER_1, EGG_WATER_1 ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm
index 95c8406e9..fb20eab80 100644
--- a/data/pokemon/base_stats/poliwrath.asm
+++ b/data/pokemon/base_stats/poliwrath.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/poliwrath/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AMPHIBIAN, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_WATER_1, EGG_WATER_1 ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm
index 4a32f9010..f2e8d1276 100644
--- a/data/pokemon/base_stats/ponyta.asm
+++ b/data/pokemon/base_stats/ponyta.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ponyta/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER
diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm
index aee297b9d..b8287bde2 100644
--- a/data/pokemon/base_stats/porygon.asm
+++ b/data/pokemon/base_stats/porygon.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/porygon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MINERAL, MINERAL ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/porygon2.asm b/data/pokemon/base_stats/porygon2.asm
index 8cc3211ef..2f6dd81c7 100644
--- a/data/pokemon/base_stats/porygon2.asm
+++ b/data/pokemon/base_stats/porygon2.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/porygon2/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MINERAL, MINERAL ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm
index 276f8e39a..c02101bcc 100644
--- a/data/pokemon/base_stats/primeape.asm
+++ b/data/pokemon/base_stats/primeape.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/primeape/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm
index 98bd99337..af71eb065 100644
--- a/data/pokemon/base_stats/psyduck.asm
+++ b/data/pokemon/base_stats/psyduck.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/psyduck/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/pupitar.asm b/data/pokemon/base_stats/pupitar.asm
index 80ba55692..59b44d324 100644
--- a/data/pokemon/base_stats/pupitar.asm
+++ b/data/pokemon/base_stats/pupitar.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/pupitar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn MONSTER, MONSTER ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_MONSTER ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DETECT, REST, ATTRACT
diff --git a/data/pokemon/base_stats/quagsire.asm b/data/pokemon/base_stats/quagsire.asm
index 3972a0763..0c583bed0 100644
--- a/data/pokemon/base_stats/quagsire.asm
+++ b/data/pokemon/base_stats/quagsire.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/quagsire/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, FLASH, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/quilava.asm b/data/pokemon/base_stats/quilava.asm
index 13789d3a6..5f687007b 100644
--- a/data/pokemon/base_stats/quilava.asm
+++ b/data/pokemon/base_stats/quilava.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/quilava/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/qwilfish.asm b/data/pokemon/base_stats/qwilfish.asm
index 5dfc6f982..6a2de9a23 100644
--- a/data/pokemon/base_stats/qwilfish.asm
+++ b/data/pokemon/base_stats/qwilfish.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/qwilfish/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FISH, FISH ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_2, EGG_WATER_2 ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm
index a691fecd3..482452179 100644
--- a/data/pokemon/base_stats/raichu.asm
+++ b/data/pokemon/base_stats/raichu.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/raichu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FAIRY ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FAIRY ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, STRENGTH, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/raikou.asm b/data/pokemon/base_stats/raikou.asm
index d8b2a98ed..4a1775245 100644
--- a/data/pokemon/base_stats/raikou.asm
+++ b/data/pokemon/base_stats/raikou.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/raikou/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, CUT, STRENGTH, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm
index 8da61a515..6cc216709 100644
--- a/data/pokemon/base_stats/rapidash.asm
+++ b/data/pokemon/base_stats/rapidash.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/rapidash/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER
diff --git a/data/pokemon/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm
index 31440b27a..96269adb7 100644
--- a/data/pokemon/base_stats/raticate.asm
+++ b/data/pokemon/base_stats/raticate.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/raticate/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, CUT, STRENGTH, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm
index 761e6400b..f1479d2d9 100644
--- a/data/pokemon/base_stats/rattata.asm
+++ b/data/pokemon/base_stats/rattata.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/rattata/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF
diff --git a/data/pokemon/base_stats/remoraid.asm b/data/pokemon/base_stats/remoraid.asm
index c201544ea..a611ffda8 100644
--- a/data/pokemon/base_stats/remoraid.asm
+++ b/data/pokemon/base_stats/remoraid.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/remoraid/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, FISH ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_WATER_2 ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, FLAMETHROWER, ICE_BEAM
diff --git a/data/pokemon/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm
index cd4498a8a..b610aaa52 100644
--- a/data/pokemon/base_stats/rhydon.asm
+++ b/data/pokemon/base_stats/rhydon.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/rhydon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn MONSTER, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm
index f9b0fb693..8127827a2 100644
--- a/data/pokemon/base_stats/rhyhorn.asm
+++ b/data/pokemon/base_stats/rhyhorn.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/rhyhorn/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn MONSTER, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, REST, ATTRACT, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm
index daa6574a3..0132b0fa8 100644
--- a/data/pokemon/base_stats/sandshrew.asm
+++ b/data/pokemon/base_stats/sandshrew.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/sandshrew/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH
diff --git a/data/pokemon/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm
index 8296cc27d..5b7a13467 100644
--- a/data/pokemon/base_stats/sandslash.asm
+++ b/data/pokemon/base_stats/sandslash.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/sandslash/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH
diff --git a/data/pokemon/base_stats/scizor.asm b/data/pokemon/base_stats/scizor.asm
index ced06ee44..6cd870ccd 100644
--- a/data/pokemon/base_stats/scizor.asm
+++ b/data/pokemon/base_stats/scizor.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/scizor/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FURY_CUTTER, CUT, STRENGTH
diff --git a/data/pokemon/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm
index fa1beee7f..0d39fe8ff 100644
--- a/data/pokemon/base_stats/scyther.asm
+++ b/data/pokemon/base_stats/scyther.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/scyther/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FURY_CUTTER, CUT
diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm
index 2f1e38c01..a6f557de5 100644
--- a/data/pokemon/base_stats/seadra.asm
+++ b/data/pokemon/base_stats/seadra.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/seadra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, REPTILE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm
index 4f32ed710..237c9e4ff 100644
--- a/data/pokemon/base_stats/seaking.asm
+++ b/data/pokemon/base_stats/seaking.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/seaking/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FISH, FISH ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_2, EGG_WATER_2 ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm
index b3528b8eb..3776f51a4 100644
--- a/data/pokemon/base_stats/seel.asm
+++ b/data/pokemon/base_stats/seel.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/seel/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/sentret.asm b/data/pokemon/base_stats/sentret.asm
index 15cf518ce..f0cb873e9 100644
--- a/data/pokemon/base_stats/sentret.asm
+++ b/data/pokemon/base_stats/sentret.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/sentret/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, SURF
diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm
index 19e4d9e45..64ed157ae 100644
--- a/data/pokemon/base_stats/shellder.asm
+++ b/data/pokemon/base_stats/shellder.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/shellder/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn INVERTEBRATE, INVERTEBRATE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/shuckle.asm b/data/pokemon/base_stats/shuckle.asm
index 51d02d70c..78e52d9d4 100644
--- a/data/pokemon/base_stats/shuckle.asm
+++ b/data/pokemon/base_stats/shuckle.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/shuckle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH, FLASH
diff --git a/data/pokemon/base_stats/skarmory.asm b/data/pokemon/base_stats/skarmory.asm
index aaeddade7..063c38513 100644
--- a/data/pokemon/base_stats/skarmory.asm
+++ b/data/pokemon/base_stats/skarmory.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/skarmory/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, CUT, FLY
diff --git a/data/pokemon/base_stats/skiploom.asm b/data/pokemon/base_stats/skiploom.asm
index c37c5da1f..585aad5c3 100644
--- a/data/pokemon/base_stats/skiploom.asm
+++ b/data/pokemon/base_stats/skiploom.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/skiploom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn FAIRY, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_FAIRY, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH
diff --git a/data/pokemon/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm
index 5696c8c1e..c4b0ce378 100644
--- a/data/pokemon/base_stats/slowbro.asm
+++ b/data/pokemon/base_stats/slowbro.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/slowbro/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MONSTER, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, FURY_CUTTER, NIGHTMARE, SURF, STRENGTH, FLASH, FLAMETHROWER, ICE_BEAM
diff --git a/data/pokemon/base_stats/slowking.asm b/data/pokemon/base_stats/slowking.asm
index d40beb2f9..4f3f570d5 100644
--- a/data/pokemon/base_stats/slowking.asm
+++ b/data/pokemon/base_stats/slowking.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/slowking/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MONSTER, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, FURY_CUTTER, NIGHTMARE, SURF, STRENGTH, FLASH, WHIRLPOOL, FLAMETHROWER, ICE_BEAM
diff --git a/data/pokemon/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm
index 95ab73a95..b5efaa2ad 100644
--- a/data/pokemon/base_stats/slowpoke.asm
+++ b/data/pokemon/base_stats/slowpoke.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/slowpoke/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MONSTER, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, STRENGTH, FLASH, FLAMETHROWER, ICE_BEAM
diff --git a/data/pokemon/base_stats/slugma.asm b/data/pokemon/base_stats/slugma.asm
index 77bb71573..65d29368a 100644
--- a/data/pokemon/base_stats/slugma.asm
+++ b/data/pokemon/base_stats/slugma.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/slugma/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FLAMETHROWER
diff --git a/data/pokemon/base_stats/smeargle.asm b/data/pokemon/base_stats/smeargle.asm
index 6d7ebe8a7..bd77a4578 100644
--- a/data/pokemon/base_stats/smeargle.asm
+++ b/data/pokemon/base_stats/smeargle.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/smeargle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm
diff --git a/data/pokemon/base_stats/smoochum.asm b/data/pokemon/base_stats/smoochum.asm
index 4739e5269..90f8fb084 100644
--- a/data/pokemon/base_stats/smoochum.asm
+++ b/data/pokemon/base_stats/smoochum.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/smoochum/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SWEET_SCENT, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, ICE_BEAM
diff --git a/data/pokemon/base_stats/sneasel.asm b/data/pokemon/base_stats/sneasel.asm
index a5fbeff57..b092b5540 100644
--- a/data/pokemon/base_stats/sneasel.asm
+++ b/data/pokemon/base_stats/sneasel.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/sneasel/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, NIGHTMARE, CUT, SURF, STRENGTH, ICE_BEAM
diff --git a/data/pokemon/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm
index a5bf72f69..aeb87f428 100644
--- a/data/pokemon/base_stats/snorlax.asm
+++ b/data/pokemon/base_stats/snorlax.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/snorlax/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn MONSTER, MONSTER ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_MONSTER ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/snubbull.asm b/data/pokemon/base_stats/snubbull.asm
index 11d121ec2..1beab40e9 100644
--- a/data/pokemon/base_stats/snubbull.asm
+++ b/data/pokemon/base_stats/snubbull.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/snubbull/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn FIELD, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_FIELD, EGG_FAIRY ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm
index 66e929f65..a8d565733 100644
--- a/data/pokemon/base_stats/spearow.asm
+++ b/data/pokemon/base_stats/spearow.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/spearow/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY
diff --git a/data/pokemon/base_stats/spinarak.asm b/data/pokemon/base_stats/spinarak.asm
index 9c73af7c0..29acb53aa 100644
--- a/data/pokemon/base_stats/spinarak.asm
+++ b/data/pokemon/base_stats/spinarak.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/spinarak/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FLASH
diff --git a/data/pokemon/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm
index 6f6712431..c8c8f8783 100644
--- a/data/pokemon/base_stats/squirtle.asm
+++ b/data/pokemon/base_stats/squirtle.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/squirtle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/stantler.asm b/data/pokemon/base_stats/stantler.asm
index 1a14001a2..91793abdc 100644
--- a/data/pokemon/base_stats/stantler.asm
+++ b/data/pokemon/base_stats/stantler.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/stantler/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLASH
diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm
index bb6f66218..5d0dd82f6 100644
--- a/data/pokemon/base_stats/starmie.asm
+++ b/data/pokemon/base_stats/starmie.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/starmie/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn INVERTEBRATE, INVERTEBRATE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm
index 1b2fd1dc7..cdb4db546 100644
--- a/data/pokemon/base_stats/staryu.asm
+++ b/data/pokemon/base_stats/staryu.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/staryu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn INVERTEBRATE, INVERTEBRATE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/steelix.asm b/data/pokemon/base_stats/steelix.asm
index 2908396fc..2332b5abb 100644
--- a/data/pokemon/base_stats/steelix.asm
+++ b/data/pokemon/base_stats/steelix.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/steelix/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MINERAL, MINERAL ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, CUT, STRENGTH
diff --git a/data/pokemon/base_stats/sudowoodo.asm b/data/pokemon/base_stats/sudowoodo.asm
index 52ff96429..63b1d3349 100644
--- a/data/pokemon/base_stats/sudowoodo.asm
+++ b/data/pokemon/base_stats/sudowoodo.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/sudowoodo/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MINERAL, MINERAL ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH
diff --git a/data/pokemon/base_stats/suicune.asm b/data/pokemon/base_stats/suicune.asm
index 68feb6003..669a85aaa 100644
--- a/data/pokemon/base_stats/suicune.asm
+++ b/data/pokemon/base_stats/suicune.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/suicune/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, CUT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/sunflora.asm b/data/pokemon/base_stats/sunflora.asm
index 04c0ed1d8..96973dc7d 100644
--- a/data/pokemon/base_stats/sunflora.asm
+++ b/data/pokemon/base_stats/sunflora.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/sunflora/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_GRASS, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH
diff --git a/data/pokemon/base_stats/sunkern.asm b/data/pokemon/base_stats/sunkern.asm
index 2a5581ab2..b6305b273 100644
--- a/data/pokemon/base_stats/sunkern.asm
+++ b/data/pokemon/base_stats/sunkern.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/sunkern/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_GRASS, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH
diff --git a/data/pokemon/base_stats/swinub.asm b/data/pokemon/base_stats/swinub.asm
index 800b32f49..9b12a6c6e 100644
--- a/data/pokemon/base_stats/swinub.asm
+++ b/data/pokemon/base_stats/swinub.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/swinub/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH, ICE_BEAM
diff --git a/data/pokemon/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm
index 9a41a16ab..7b8272210 100644
--- a/data/pokemon/base_stats/tangela.asm
+++ b/data/pokemon/base_stats/tangela.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/tangela/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GRASS, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT, FLASH
diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm
index 8d6d0ca93..1b294e951 100644
--- a/data/pokemon/base_stats/tauros.asm
+++ b/data/pokemon/base_stats/tauros.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/tauros/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, REST, ATTRACT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/teddiursa.asm b/data/pokemon/base_stats/teddiursa.asm
index 2283850ab..a88ea6b64 100644
--- a/data/pokemon/base_stats/teddiursa.asm
+++ b/data/pokemon/base_stats/teddiursa.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/teddiursa/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH
diff --git a/data/pokemon/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm
index d036f1401..a11b5e0fe 100644
--- a/data/pokemon/base_stats/tentacool.asm
+++ b/data/pokemon/base_stats/tentacool.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/tentacool/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn INVERTEBRATE, INVERTEBRATE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm
index 2e47041ff..b5e4876a4 100644
--- a/data/pokemon/base_stats/tentacruel.asm
+++ b/data/pokemon/base_stats/tentacruel.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/tentacruel/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn INVERTEBRATE, INVERTEBRATE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/togepi.asm b/data/pokemon/base_stats/togepi.asm
index 14c5cb58b..a660370a6 100644
--- a/data/pokemon/base_stats/togepi.asm
+++ b/data/pokemon/base_stats/togepi.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/togepi/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, FLASH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/togetic.asm b/data/pokemon/base_stats/togetic.asm
index 2c4461836..fb96952f8 100644
--- a/data/pokemon/base_stats/togetic.asm
+++ b/data/pokemon/base_stats/togetic.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/togetic/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn AVIAN, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_FLYING, EGG_FAIRY ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, STEEL_WING, FLY, FLASH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/totodile.asm b/data/pokemon/base_stats/totodile.asm
index 4a81090a1..476ac9614 100644
--- a/data/pokemon/base_stats/totodile.asm
+++ b/data/pokemon/base_stats/totodile.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/totodile/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/typhlosion.asm b/data/pokemon/base_stats/typhlosion.asm
index d52c06ddf..49f518649 100644
--- a/data/pokemon/base_stats/typhlosion.asm
+++ b/data/pokemon/base_stats/typhlosion.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/typhlosion/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/tyranitar.asm b/data/pokemon/base_stats/tyranitar.asm
index e11e39a2a..6ad00c834 100644
--- a/data/pokemon/base_stats/tyranitar.asm
+++ b/data/pokemon/base_stats/tyranitar.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/tyranitar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn MONSTER, MONSTER ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_MONSTER ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DETECT, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/tyrogue.asm b/data/pokemon/base_stats/tyrogue.asm
index 38f5dc913..74d2ae9d6 100644
--- a/data/pokemon/base_stats/tyrogue.asm
+++ b/data/pokemon/base_stats/tyrogue.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/tyrogue/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH
diff --git a/data/pokemon/base_stats/umbreon.asm b/data/pokemon/base_stats/umbreon.asm
index 962cb7a84..4e04da7fb 100644
--- a/data/pokemon/base_stats/umbreon.asm
+++ b/data/pokemon/base_stats/umbreon.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/umbreon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, CUT, FLASH
diff --git a/data/pokemon/base_stats/unown.asm b/data/pokemon/base_stats/unown.asm
index 992d51971..6eef4b84d 100644
--- a/data/pokemon/base_stats/unown.asm
+++ b/data/pokemon/base_stats/unown.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/unown_a/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm
diff --git a/data/pokemon/base_stats/ursaring.asm b/data/pokemon/base_stats/ursaring.asm
index aed338f70..20b47b992 100644
--- a/data/pokemon/base_stats/ursaring.asm
+++ b/data/pokemon/base_stats/ursaring.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ursaring/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH
diff --git a/data/pokemon/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm
index 245179e51..1bb244087 100644
--- a/data/pokemon/base_stats/vaporeon.asm
+++ b/data/pokemon/base_stats/vaporeon.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/vaporeon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm
index 76bcf584b..da5331286 100644
--- a/data/pokemon/base_stats/venomoth.asm
+++ b/data/pokemon/base_stats/venomoth.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/venomoth/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, THIEF, FLASH
diff --git a/data/pokemon/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm
index b55518730..2da97c64f 100644
--- a/data/pokemon/base_stats/venonat.asm
+++ b/data/pokemon/base_stats/venonat.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/venonat/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, THIEF
diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm
index 7fd7895a1..39968701f 100644
--- a/data/pokemon/base_stats/venusaur.asm
+++ b/data/pokemon/base_stats/venusaur.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/venusaur/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH
diff --git a/data/pokemon/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm
index 3969e5f25..95f3b42db 100644
--- a/data/pokemon/base_stats/victreebel.asm
+++ b/data/pokemon/base_stats/victreebel.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/victreebel/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_GRASS, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH
diff --git a/data/pokemon/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm
index 8cbce585a..c0316bfee 100644
--- a/data/pokemon/base_stats/vileplume.asm
+++ b/data/pokemon/base_stats/vileplume.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/vileplume/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_GRASS, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH
diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm
index 0bbcd7275..13ca3fef3 100644
--- a/data/pokemon/base_stats/voltorb.asm
+++ b/data/pokemon/base_stats/voltorb.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/voltorb/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MINERAL, MINERAL ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm
index 50f5406d1..21ca508bc 100644
--- a/data/pokemon/base_stats/vulpix.asm
+++ b/data/pokemon/base_stats/vulpix.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/vulpix/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FIELD, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER
diff --git a/data/pokemon/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm
index a032a60a6..ea7a0bd84 100644
--- a/data/pokemon/base_stats/wartortle.asm
+++ b/data/pokemon/base_stats/wartortle.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/wartortle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm
index 5c8475b8f..da63aa6f4 100644
--- a/data/pokemon/base_stats/weedle.asm
+++ b/data/pokemon/base_stats/weedle.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/weedle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm
diff --git a/data/pokemon/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm
index 4c597e7d7..c55c8234f 100644
--- a/data/pokemon/base_stats/weepinbell.asm
+++ b/data/pokemon/base_stats/weepinbell.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/weepinbell/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_GRASS, EGG_GRASS ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH
diff --git a/data/pokemon/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm
index 25e0e45e9..10270e200 100644
--- a/data/pokemon/base_stats/weezing.asm
+++ b/data/pokemon/base_stats/weezing.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/weezing/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, FLAMETHROWER, THUNDERBOLT
diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm
index 38f0f815d..c8577ff6c 100644
--- a/data/pokemon/base_stats/wigglytuff.asm
+++ b/data/pokemon/base_stats/wigglytuff.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/wigglytuff/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn FAIRY, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_FAIRY, EGG_FAIRY ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/wobbuffet.asm b/data/pokemon/base_stats/wobbuffet.asm
index a94280a8c..c84ac68c4 100644
--- a/data/pokemon/base_stats/wobbuffet.asm
+++ b/data/pokemon/base_stats/wobbuffet.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/wobbuffet/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups
 
 	; tm/hm learnset
 	tmhm
diff --git a/data/pokemon/base_stats/wooper.asm b/data/pokemon/base_stats/wooper.asm
index 0d45b3c34..da5101f9c 100644
--- a/data/pokemon/base_stats/wooper.asm
+++ b/data/pokemon/base_stats/wooper.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/wooper/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/xatu.asm b/data/pokemon/base_stats/xatu.asm
index cf3688b6f..3c58623b8 100644
--- a/data/pokemon/base_stats/xatu.asm
+++ b/data/pokemon/base_stats/xatu.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/xatu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLY, FLASH
diff --git a/data/pokemon/base_stats/yanma.asm b/data/pokemon/base_stats/yanma.asm
index 78f412844..756482591 100644
--- a/data/pokemon/base_stats/yanma.asm
+++ b/data/pokemon/base_stats/yanma.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/yanma/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, FLASH
diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm
index e56172d77..342590f12 100644
--- a/data/pokemon/base_stats/zapdos.asm
+++ b/data/pokemon/base_stats/zapdos.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/zapdos/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, STEEL_WING, FLY, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm
index 84673fef7..abbd6402d 100644
--- a/data/pokemon/base_stats/zubat.asm
+++ b/data/pokemon/base_stats/zubat.asm
@@ -13,8 +13,8 @@
 	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/zubat/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING
diff --git a/engine/breeding.asm b/engine/breeding.asm
index d66616061..f0f69e539 100755
--- a/engine/breeding.asm
+++ b/engine/breeding.asm
@@ -112,14 +112,14 @@ CheckBreedmonCompatibility: ; 16e1d
 	ld [CurSpecies], a
 	call GetBaseData
 	ld a, [BaseEggGroups]
-	cp NO_EGGS * $11
+	cp EGG_UNDISCOVERED * $11
 	jr z, .Incompatible
 
 	ld a, [wBreedMon1Species]
 	ld [CurSpecies], a
 	call GetBaseData
 	ld a, [BaseEggGroups]
-	cp NO_EGGS * $11
+	cp EGG_UNDISCOVERED * $11
 	jr z, .Incompatible
 
 ; Ditto is automatically compatible with everything.

From b04f41da98c9457c1200fdfe1c49ab20af86e3fa Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Wed, 31 Jan 2018 12:21:36 -0500
Subject: [PATCH 083/135] enum_start like const_def

---
 macros/scripts/battle_commands.asm |  3 +--
 macros/scripts/trade_anims.asm     | 14 +++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/macros/scripts/battle_commands.asm b/macros/scripts/battle_commands.asm
index 4ae8dbaf4..33d7dc611 100644
--- a/macros/scripts/battle_commands.asm
+++ b/macros/scripts/battle_commands.asm
@@ -181,7 +181,6 @@ ENDM
 	command startloop               ; ae
 	command curl                    ; af
 
-__enum__ set $fe
-
+	enum_start $fe
 	command endturn                 ; fe
 	command endmove                 ; ff
diff --git a/macros/scripts/trade_anims.asm b/macros/scripts/trade_anims.asm
index 94c9070aa..633047b82 100644
--- a/macros/scripts/trade_anims.asm
+++ b/macros/scripts/trade_anims.asm
@@ -21,7 +21,7 @@ tradeanim_enter_link_tube: MACRO
 	db tradeanim_enter_link_tube_command
 ENDM
 
-__enum__ set $5
+	enum_start $05
 
 	enum tradeanim_exit_link_tube_command ; $05
 tradeanim_exit_link_tube: MACRO
@@ -33,14 +33,14 @@ tradeanim_tube_to_ot: MACRO
 	db tradeanim_tube_to_ot_command
 ENDM
 
-__enum__ set $0e
+	enum_start $0e
 
 	enum tradeanim_tube_to_player_command ; $0e
 tradeanim_tube_to_player: MACRO
 	db tradeanim_tube_to_player_command
 ENDM
 
-__enum__ set $16
+	enum_start $16
 
 	enum tradeanim_sent_to_ot_text_command ; $16
 tradeanim_sent_to_ot_text: MACRO
@@ -92,7 +92,7 @@ tradeanim_scroll_out_right: MACRO
 	db tradeanim_scroll_out_right_command
 ENDM
 
-__enum__ set $21
+	enum_start $21
 
 	enum tradeanim_wait_80_command ; $21
 tradeanim_wait_80: MACRO
@@ -119,7 +119,7 @@ tradeanim_wait_anim: MACRO
 	db tradeanim_wait_anim_command
 ENDM
 
-__enum__ set $27
+	enum_start $27
 
 	enum tradeanim_poof_command ; $27
 tradeanim_poof: MACRO
@@ -185,7 +185,7 @@ mobiletradeanim_sendmon: MACRO
 	db mobiletradeanim_sendmon_command
 ENDM
 
-__enum__ set $05
+	enum_start $05
 
 	enum mobiletradeanim_05_command ; $05
 mobiletradeanim_05: MACRO
@@ -207,7 +207,7 @@ mobiletradeanim_receivemon: MACRO
 	db mobiletradeanim_receivemon_command
 ENDM
 
-__enum__ set $0b
+	enum_start $0b
 
 	enum mobiletradeanim_showgetmon_command ; $0b
 mobiletradeanim_showgetmon: MACRO

From 7d6e82ef1c8c3eccdc630e85af1d687eaa612ad6 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Wed, 31 Jan 2018 21:16:57 -0500
Subject: [PATCH 084/135] NPC trade constants don't all just start with TRADE_

---
 constants.asm                                 |  2 +-
 constants/npc_trade_constants.asm             | 44 ++++++++++++
 constants/npctrade_constants.asm              | 43 -----------
 constants/script_constants.asm                |  1 +
 data/events/npc_trades.asm                    | 14 ++--
 engine/{npctrade.asm => events/npc_trade.asm} | 72 +++++++++----------
 main.asm                                      |  2 +-
 maps/BlackthornEmysHouse.asm                  |  2 +-
 maps/BurnedTower1F.asm                        | 24 +++----
 maps/GoldenrodDeptStore5F.asm                 |  2 +-
 maps/OlivineTimsHouse.asm                     |  2 +-
 maps/PewterPokecenter1F.asm                   |  2 +-
 maps/PowerPlant.asm                           |  2 +-
 maps/Route14.asm                              |  2 +-
 maps/VioletKylesHouse.asm                     |  2 +-
 15 files changed, 109 insertions(+), 107 deletions(-)
 create mode 100644 constants/npc_trade_constants.asm
 delete mode 100644 constants/npctrade_constants.asm
 rename engine/{npctrade.asm => events/npc_trade.asm} (90%)

diff --git a/constants.asm b/constants.asm
index 0fafcb03f..27c425f8e 100644
--- a/constants.asm
+++ b/constants.asm
@@ -33,7 +33,7 @@ INCLUDE "constants/mobile_constants.asm"
 INCLUDE "constants/move_constants.asm"
 INCLUDE "constants/move_effect_constants.asm"
 INCLUDE "constants/music_constants.asm"
-INCLUDE "constants/npctrade_constants.asm"
+INCLUDE "constants/npc_trade_constants.asm"
 INCLUDE "constants/phone_constants.asm"
 INCLUDE "constants/pokemon_constants.asm"
 INCLUDE "constants/pokemon_data_constants.asm"
diff --git a/constants/npc_trade_constants.asm b/constants/npc_trade_constants.asm
new file mode 100644
index 000000000..653ce3555
--- /dev/null
+++ b/constants/npc_trade_constants.asm
@@ -0,0 +1,44 @@
+	; npctrade struct members (see data/events/npc_trades.asm)
+NPCTRADE_DIALOG  EQU  0 ; db
+NPCTRADE_GIVEMON EQU  1 ; db
+NPCTRADE_GETMON  EQU  2 ; db
+NPCTRADE_NICK    EQU  3 ; ds MON_NAME_LENGTH
+NPCTRADE_DVS     EQU 14 ; dw
+NPCTRADE_ITEM    EQU 16 ; db
+NPCTRADE_OT_ID   EQU 17 ; dw
+NPCTRADE_OT_NAME EQU 19 ; ds NAME_LENGTH
+NPCTRADE_GENDER  EQU 30 ; db
+NPCTRADE_PADDING EQU 31 ; db
+
+; NPCTrades indexes (see data/events/npc_trades.asm)
+	const_def
+	const NPC_TRADE_MIKE   ; 0
+	const NPC_TRADE_KYLE   ; 1
+	const NPC_TRADE_TIM    ; 2
+	const NPC_TRADE_EMY    ; 3
+	const NPC_TRADE_CHRIS  ; 4
+	const NPC_TRADE_KIM    ; 5
+	const NPC_TRADE_FOREST ; 6
+
+; trade gender limits
+	const_def
+	const TRADE_GENDER_EITHER
+	const TRADE_GENDER_MALE
+	const TRADE_GENDER_FEMALE
+
+; TradeTexts indexes (see engine/events/npc_trade.asm)
+
+; trade dialogs
+	const_def
+	const TRADE_DIALOG_INTRO
+	const TRADE_DIALOG_CANCEL
+	const TRADE_DIALOG_WRONG
+	const TRADE_DIALOG_COMPLETE
+	const TRADE_DIALOG_AFTER
+
+; trade dialog sets
+	const_def
+	const TRADE_DIALOGSET_COLLECTOR
+	const TRADE_DIALOGSET_HAPPY
+	const TRADE_DIALOGSET_NEWBIE
+	const TRADE_DIALOGSET_GIRL
diff --git a/constants/npctrade_constants.asm b/constants/npctrade_constants.asm
deleted file mode 100644
index cb7508b11..000000000
--- a/constants/npctrade_constants.asm
+++ /dev/null
@@ -1,43 +0,0 @@
-; npctrade struct members (see data/events/npc_trades.asm)
-TRADE_DIALOG  EQU 0
-TRADE_GIVEMON EQU 1
-TRADE_GETMON  EQU 2
-TRADE_NICK    EQU 3
-TRADE_DVS     EQU 14
-TRADE_ITEM    EQU 16
-TRADE_OT_ID   EQU 17
-TRADE_OT_NAME EQU 19
-TRADE_GENDER  EQU 30
-TRADE_PADDING EQU 31
-
-; NPCTrades indexes (see data/events/npc_trades.asm)
-	const_def
-	const NPCTRADE_MIKE   ; 0
-	const NPCTRADE_KYLE   ; 1
-	const NPCTRADE_TIM    ; 2
-	const NPCTRADE_EMY    ; 3
-	const NPCTRADE_CHRIS  ; 4
-	const NPCTRADE_KIM    ; 5
-	const NPCTRADE_FOREST ; 6
-
-; trade gender limits
-TRADE_EITHER_GENDER EQU 0
-TRADE_MALE_ONLY     EQU 1
-TRADE_FEMALE_ONLY   EQU 2
-
-; TradeTexts indexes (see engine/npctrade.asm)
-
-; trade dialogs
-	const_def
-	const TRADE_INTRO
-	const TRADE_CANCEL
-	const TRADE_WRONG
-	const TRADE_COMPLETE
-	const TRADE_AFTER
-
-; trade dialog sets
-	const_def
-	const TRADE_DIALOG_COLLECTOR
-	const TRADE_DIALOG_HAPPY
-	const TRADE_DIALOG_NEWBIE
-	const TRADE_DIALOG_GIRL
diff --git a/constants/script_constants.asm b/constants/script_constants.asm
index 4ffdb6c16..c2de2b04f 100644
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -91,6 +91,7 @@ RETVAR_EXECUTE EQU (2 << 6)
 NUM_PLAYER_EVENTS EQU const_value
 
 
+; bg_event types
 ; TryBGEvent arguments (see engine/events.asm)
 	const_def
 	const BGEVENT_READ
diff --git a/data/events/npc_trades.asm b/data/events/npc_trades.asm
index d16670984..b019baf7a 100644
--- a/data/events/npc_trades.asm
+++ b/data/events/npc_trades.asm
@@ -8,11 +8,11 @@ ENDM
 
 NPCTrades: ; fce58
 ; entries correspond to NPCTRADE_* constants
-	npctrade TRADE_DIALOG_COLLECTOR, ABRA,       MACHOP,     "MUSCLE@@@@@", $37, $66, GOLD_BERRY,   37460, "MIKE@@@@@@@", TRADE_EITHER_GENDER
-	npctrade TRADE_DIALOG_COLLECTOR, BELLSPROUT, ONIX,       "ROCKY@@@@@@", $96, $66, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_EITHER_GENDER
-	npctrade TRADE_DIALOG_HAPPY,     KRABBY,     VOLTORB,    "VOLTY@@@@@@", $98, $88, PRZCUREBERRY, 29189, "TIM@@@@@@@@", TRADE_EITHER_GENDER
-	npctrade TRADE_DIALOG_GIRL,      DRAGONAIR,  DODRIO,     "DORIS@@@@@@", $77, $66, SMOKE_BALL,   00283, "EMY@@@@@@@@", TRADE_FEMALE_ONLY
-	npctrade TRADE_DIALOG_NEWBIE,    HAUNTER,    XATU,       "PAUL@@@@@@@", $96, $86, MYSTERYBERRY, 15616, "CHRIS@@@@@@", TRADE_EITHER_GENDER
-	npctrade TRADE_DIALOG_GIRL,      CHANSEY,    AERODACTYL, "AEROY@@@@@@", $96, $66, GOLD_BERRY,   26491, "KIM@@@@@@@@", TRADE_EITHER_GENDER
-	npctrade TRADE_DIALOG_COLLECTOR, DUGTRIO,    MAGNETON,   "MAGGIE@@@@@", $96, $66, METAL_COAT,   50082, "FOREST@@@@@", TRADE_EITHER_GENDER
+	npctrade TRADE_DIALOGSET_COLLECTOR, ABRA,       MACHOP,     "MUSCLE@@@@@", $37, $66, GOLD_BERRY,   37460, "MIKE@@@@@@@", TRADE_GENDER_EITHER
+	npctrade TRADE_DIALOGSET_COLLECTOR, BELLSPROUT, ONIX,       "ROCKY@@@@@@", $96, $66, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_GENDER_EITHER
+	npctrade TRADE_DIALOGSET_HAPPY,     KRABBY,     VOLTORB,    "VOLTY@@@@@@", $98, $88, PRZCUREBERRY, 29189, "TIM@@@@@@@@", TRADE_GENDER_EITHER
+	npctrade TRADE_DIALOGSET_GIRL,      DRAGONAIR,  DODRIO,     "DORIS@@@@@@", $77, $66, SMOKE_BALL,   00283, "EMY@@@@@@@@", TRADE_GENDER_FEMALE
+	npctrade TRADE_DIALOGSET_NEWBIE,    HAUNTER,    XATU,       "PAUL@@@@@@@", $96, $86, MYSTERYBERRY, 15616, "CHRIS@@@@@@", TRADE_GENDER_EITHER
+	npctrade TRADE_DIALOGSET_GIRL,      CHANSEY,    AERODACTYL, "AEROY@@@@@@", $96, $66, GOLD_BERRY,   26491, "KIM@@@@@@@@", TRADE_GENDER_EITHER
+	npctrade TRADE_DIALOGSET_COLLECTOR, DUGTRIO,    MAGNETON,   "MAGGIE@@@@@", $96, $66, METAL_COAT,   50082, "FOREST@@@@@", TRADE_GENDER_EITHER
 ; fcf38
diff --git a/engine/npctrade.asm b/engine/events/npc_trade.asm
similarity index 90%
rename from engine/npctrade.asm
rename to engine/events/npc_trade.asm
index fa2792934..3adcb4038 100755
--- a/engine/npctrade.asm
+++ b/engine/events/npc_trade.asm
@@ -4,31 +4,31 @@ NPCTrade:: ; fcba8
 	call Trade_GetDialog
 	ld b, CHECK_FLAG
 	call TradeFlagAction
-	ld a, TRADE_AFTER
+	ld a, TRADE_DIALOG_AFTER
 	jr nz, .done
 
-	ld a, TRADE_INTRO
+	ld a, TRADE_DIALOG_INTRO
 	call PrintTradeText
 
 	call YesNoBox
-	ld a, TRADE_CANCEL
+	ld a, TRADE_DIALOG_CANCEL
 	jr c, .done
 
 ; Select givemon from party
 	ld b, PARTYMENUACTION_GIVE_MON
 	farcall SelectTradeOrDayCareMon
-	ld a, TRADE_CANCEL
+	ld a, TRADE_DIALOG_CANCEL
 	jr c, .done
 
-	ld e, TRADE_GIVEMON
+	ld e, NPCTRADE_GIVEMON
 	call GetTradeAttribute
 	ld a, [CurPartySpecies]
 	cp [hl]
-	ld a, TRADE_WRONG
+	ld a, TRADE_DIALOG_WRONG
 	jr nz, .done
 
 	call CheckTradeGender
-	ld a, TRADE_WRONG
+	ld a, TRADE_DIALOG_WRONG
 	jr c, .done
 
 	ld b, SET_FLAG
@@ -46,7 +46,7 @@ NPCTrade:: ; fcba8
 
 	call RestartMapMusic
 
-	ld a, TRADE_COMPLETE
+	ld a, TRADE_DIALOG_COMPLETE
 
 .done
 	call PrintTradeText
@@ -72,14 +72,14 @@ CheckTradeGender: ; fcc23
 	xor a
 	ld [MonType], a
 
-	ld e, TRADE_GENDER
+	ld e, NPCTRADE_GENDER
 	call GetTradeAttribute
 	ld a, [hl]
-	and a ; TRADE_EITHER_GENDER
+	and a ; TRADE_GENDER_EITHER
 	jr z, .matching
-	cp TRADE_MALE_ONLY
+	cp TRADE_GENDER_MALE
 	jr z, .check_male
-
+	; TRADE_GENDER_FEMALE
 	farcall GetGender
 	jr nz, .not_matching
 	jr .matching
@@ -108,7 +108,7 @@ TradeFlagAction: ; fcc4a
 ; fcc59
 
 Trade_GetDialog: ; fcc59
-	ld e, TRADE_DIALOG
+	ld e, NPCTRADE_DIALOG
 	call GetTradeAttribute
 	ld a, [hl]
 	ld [wcf64], a
@@ -116,12 +116,12 @@ Trade_GetDialog: ; fcc59
 ; fcc63
 
 DoNPCTrade: ; fcc63
-	ld e, TRADE_GIVEMON
+	ld e, NPCTRADE_GIVEMON
 	call GetTradeAttribute
 	ld a, [hl]
 	ld [wPlayerTrademonSpecies], a
 
-	ld e, TRADE_GETMON
+	ld e, NPCTRADE_GETMON
 	call GetTradeAttribute
 	ld a, [hl]
 	ld [wOTTrademonSpecies], a
@@ -167,10 +167,10 @@ DoNPCTrade: ; fcc63
 	ld a, c
 	ld [wPlayerTrademonCaughtData], a
 
-	ld e, TRADE_DIALOG
+	ld e, NPCTRADE_DIALOG
 	call GetTradeAttribute
 	ld a, [hl]
-	cp TRADE_DIALOG_GIRL
+	cp TRADE_DIALOGSET_GIRL
 	ld a, CAUGHT_BY_GIRL
 	jr c, .okay
 	ld a, CAUGHT_BY_BOY
@@ -190,17 +190,17 @@ DoNPCTrade: ; fcc63
 	callfar RemoveMonFromPartyOrBox
 	predef TryAddMonToParty
 
-	ld e, TRADE_DIALOG
+	ld e, NPCTRADE_DIALOG
 	call GetTradeAttribute
 	ld a, [hl]
-	cp TRADE_COMPLETE
+	cp TRADE_DIALOG_COMPLETE
 	ld b, RESET_FLAG
 	jr c, .incomplete
 	ld b, SET_FLAG
 .incomplete
 	farcall SetGiftPartyMonCaughtData
 
-	ld e, TRADE_NICK
+	ld e, NPCTRADE_NICK
 	call GetTradeAttribute
 	ld de, wOTTrademonNickname
 	call CopyTradeName
@@ -211,7 +211,7 @@ DoNPCTrade: ; fcc63
 	ld hl, wOTTrademonNickname
 	call CopyTradeName
 
-	ld e, TRADE_OT_NAME
+	ld e, NPCTRADE_OT_NAME
 	call GetTradeAttribute
 	push hl
 	ld de, wOTTrademonOTName
@@ -226,7 +226,7 @@ DoNPCTrade: ; fcc63
 	ld hl, wOTTrademonOTName
 	call CopyTradeName
 
-	ld e, TRADE_DVS
+	ld e, NPCTRADE_DVS
 	call GetTradeAttribute
 	ld de, wOTTrademonDVs
 	call Trade_CopyTwoBytes
@@ -237,7 +237,7 @@ DoNPCTrade: ; fcc63
 	ld hl, wOTTrademonDVs
 	call Trade_CopyTwoBytes
 
-	ld e, TRADE_OT_ID
+	ld e, NPCTRADE_OT_ID
 	call GetTradeAttribute
 	ld de, wOTTrademonID + 1
 	call Trade_CopyTwoBytesReverseEndian
@@ -248,7 +248,7 @@ DoNPCTrade: ; fcc63
 	ld hl, wOTTrademonID
 	call Trade_CopyTwoBytes
 
-	ld e, TRADE_ITEM
+	ld e, NPCTRADE_ITEM
 	call GetTradeAttribute
 	push hl
 	ld hl, PartyMon1Item
@@ -359,7 +359,7 @@ Trade_CopyTwoBytesReverseEndian: ; fce15
 ; fce1b
 
 GetTradeMonNames: ; fce1b
-	ld e, TRADE_GETMON
+	ld e, NPCTRADE_GETMON
 	call GetTradeAttribute
 	ld a, [hl]
 	call GetTradeMonName
@@ -367,7 +367,7 @@ GetTradeMonNames: ; fce1b
 	ld de, StringBuffer2
 	call CopyTradeName
 
-	ld e, TRADE_GIVEMON
+	ld e, NPCTRADE_GIVEMON
 	call GetTradeAttribute
 	ld a, [hl]
 	call GetTradeMonName
@@ -383,16 +383,16 @@ GetTradeMonNames: ; fce1b
 
 	dec hl
 	push hl
-	ld e, TRADE_GENDER
+	ld e, NPCTRADE_GENDER
 	call GetTradeAttribute
 	ld a, [hl]
 	pop hl
-	and a
+	and a ; TRADE_GENDER_EITHER
 	ret z
-
-	cp TRADE_MALE_ONLY
+	cp TRADE_GENDER_MALE
 	ld a, "♂"
 	jr z, .done
+	; TRADE_GENDER_FEMALE
 	ld a, "♀"
 .done
 	ld [hli], a
@@ -423,28 +423,28 @@ PrintTradeText: ; fcf38
 ; fcf53
 
 TradeTexts: ; fcf53
-; entries correspond to TRADE_* × TRADE_DIALOG_* constants
-; TRADE_INTRO
+; entries correspond to TRADE_DIALOG_* × TRADE_DIALOGSET_* constants
+; TRADE_DIALOG_INTRO
 	dw TradeIntroText1
 	dw TradeIntroText2
 	dw TradeIntroText3
 	dw TradeIntroText4
-; TRADE_CANCEL
+; TRADE_DIALOG_CANCEL
 	dw TradeCancelText1
 	dw TradeCancelText2
 	dw TradeCancelText3
 	dw TradeCancelText4
-; TRADE_WRONG
+; TRADE_DIALOG_WRONG
 	dw TradeWrongText1
 	dw TradeWrongText2
 	dw TradeWrongText3
 	dw TradeWrongText4
-; TRADE_COMPLETE
+; TRADE_DIALOG_COMPLETE
 	dw TradeCompleteText1
 	dw TradeCompleteText2
 	dw TradeCompleteText3
 	dw TradeCompleteText4
-; TRADE_AFTER
+; TRADE_DIALOG_AFTER
 	dw TradeAfterText1
 	dw TradeAfterText2
 	dw TradeAfterText3
diff --git a/main.asm b/main.asm
index 50b4c6f0b..724a55492 100644
--- a/main.asm
+++ b/main.asm
@@ -462,7 +462,7 @@ INCLUDE "engine/battle/misc.asm"
 SECTION "bank3F", ROMX
 
 INCLUDE "engine/tileset_anims.asm"
-INCLUDE "engine/npctrade.asm"
+INCLUDE "engine/events/npc_trade.asm"
 INCLUDE "engine/events/mom_phone.asm"
 
 
diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm
index 8e9d9af23..956a8944b 100644
--- a/maps/BlackthornEmysHouse.asm
+++ b/maps/BlackthornEmysHouse.asm
@@ -9,7 +9,7 @@ BlackthornEmysHouse_MapScripts:
 Emy:
 	faceplayer
 	opentext
-	trade NPCTRADE_EMY
+	trade NPC_TRADE_EMY
 	waitbutton
 	closetext
 	end
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index 4c8f5e912..02b959381 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -281,18 +281,18 @@ BurnedTower1F_MapEvents:
 	db 14 ; warp events
 	warp_event 9, 15, 13, ECRUTEAK_CITY
 	warp_event 10, 15, 13, ECRUTEAK_CITY
-	warp_event 10, 9,  1, BURNED_TOWER_B1F
-	warp_event 5, 5,  1, BURNED_TOWER_B1F
-	warp_event 5, 6,  1, BURNED_TOWER_B1F
-	warp_event 4, 6,  1, BURNED_TOWER_B1F
-	warp_event 15, 4,  2, BURNED_TOWER_B1F
-	warp_event 15, 5,  2, BURNED_TOWER_B1F
-	warp_event 10, 7,  3, BURNED_TOWER_B1F
-	warp_event 5, 14,  4, BURNED_TOWER_B1F
-	warp_event 4, 14,  4, BURNED_TOWER_B1F
-	warp_event 14, 14,  5, BURNED_TOWER_B1F
-	warp_event 15, 14,  5, BURNED_TOWER_B1F
-	warp_event 7, 15,  6, BURNED_TOWER_B1F
+	warp_event 10, 9, 1, BURNED_TOWER_B1F
+	warp_event 5, 5, 1, BURNED_TOWER_B1F
+	warp_event 5, 6, 1, BURNED_TOWER_B1F
+	warp_event 4, 6, 1, BURNED_TOWER_B1F
+	warp_event 15, 4, 2, BURNED_TOWER_B1F
+	warp_event 15, 5, 2, BURNED_TOWER_B1F
+	warp_event 10, 7, 3, BURNED_TOWER_B1F
+	warp_event 5, 14, 4, BURNED_TOWER_B1F
+	warp_event 4, 14, 4, BURNED_TOWER_B1F
+	warp_event 14, 14, 5, BURNED_TOWER_B1F
+	warp_event 15, 14, 5, BURNED_TOWER_B1F
+	warp_event 7, 15, 6, BURNED_TOWER_B1F
 
 	db 1 ; coord events
 	coord_event 11, 9, 1, BurnedTowerRivalBattleScript
diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm
index 31f5c0e3f..4572e53a6 100644
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -124,7 +124,7 @@ GoldenrodDeptStore5FLassScript:
 Mike:
 	faceplayer
 	opentext
-	trade NPCTRADE_MIKE
+	trade NPC_TRADE_MIKE
 	waitbutton
 	closetext
 	end
diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm
index 83ce60ddc..0b9381cc0 100644
--- a/maps/OlivineTimsHouse.asm
+++ b/maps/OlivineTimsHouse.asm
@@ -9,7 +9,7 @@ OlivineTimsHouse_MapScripts:
 Tim:
 	faceplayer
 	opentext
-	trade NPCTRADE_TIM
+	trade NPC_TRADE_TIM
 	waitbutton
 	closetext
 	end
diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm
index 83a065116..c3d73a0ab 100644
--- a/maps/PewterPokecenter1F.asm
+++ b/maps/PewterPokecenter1F.asm
@@ -30,7 +30,7 @@ PewterPokecenter1FBugCatcherScript:
 Chris:
 	faceplayer
 	opentext
-	trade NPCTRADE_CHRIS
+	trade NPC_TRADE_CHRIS
 	waitbutton
 	closetext
 	end
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index c5305e61f..1ecdc7656 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -189,7 +189,7 @@ UnknownScript_0x188ec5:
 Forest:
 	faceplayer
 	opentext
-	trade NPCTRADE_FOREST
+	trade NPC_TRADE_FOREST
 	waitbutton
 	closetext
 	end
diff --git a/maps/Route14.asm b/maps/Route14.asm
index ab862d46a..6d04456b0 100644
--- a/maps/Route14.asm
+++ b/maps/Route14.asm
@@ -12,7 +12,7 @@ Route14_MapScripts:
 Kim:
 	faceplayer
 	opentext
-	trade NPCTRADE_KIM
+	trade NPC_TRADE_KIM
 	waitbutton
 	closetext
 	end
diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm
index 288b8cbb2..09078a49f 100644
--- a/maps/VioletKylesHouse.asm
+++ b/maps/VioletKylesHouse.asm
@@ -13,7 +13,7 @@ VioletKylesHousePokefanMScript:
 Kyle:
 	faceplayer
 	opentext
-	trade NPCTRADE_KYLE
+	trade NPC_TRADE_KYLE
 	waitbutton
 	closetext
 	end

From a17623d96b25d6733846f5774fd10bb317862b43 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Wed, 31 Jan 2018 23:16:51 -0500
Subject: [PATCH 085/135] Add scene ID constants (TODO: meaningful names)

---
 constants.asm                                 |   1 +
 constants/scene_constants.asm                 | 388 ++++++++++++++++++
 data/maps/scenes.asm                          |   8 +-
 engine/events/std_scripts.asm                 |   2 +-
 maps/AzaleaTown.asm                           |  16 +-
 maps/BattleTower1F.asm                        |  20 +-
 maps/BattleTowerBattleRoom.asm                |   6 +-
 maps/BattleTowerElevator.asm                  |   6 +-
 maps/BattleTowerHallway.asm                   |   6 +-
 maps/BrunosRoom.asm                           |   6 +-
 maps/BurnedTower1F.asm                        |  12 +-
 maps/BurnedTowerB1F.asm                       |  14 +-
 maps/CeruleanGym.asm                          |  10 +-
 maps/CherrygroveCity.asm                      |  10 +-
 maps/CianwoodCity.asm                         |  10 +-
 maps/Colosseum.asm                            |  12 +-
 maps/DragonShrine.asm                         |   8 +-
 maps/DragonsDenB1F.asm                        |   8 +-
 maps/EcruteakGym.asm                          |   6 +-
 maps/EcruteakPokecenter1F.asm                 |   6 +-
 maps/EcruteakTinTowerEntrance.asm             |  12 +-
 maps/ElmsLab.asm                              |  46 +--
 maps/FastShip1F.asm                           |  20 +-
 maps/FastShipB1F.asm                          |   8 +-
 maps/FastShipCabins_NNW_NNE_NE.asm            |   2 +-
 maps/FastShipCabins_SE_SSE_CaptainsCabin.asm  |   4 +-
 maps/GoldenrodGym.asm                         |  10 +-
 maps/GoldenrodMagnetTrainStation.asm          |   4 +-
 maps/GoldenrodPokecenter1F.asm                |   4 +-
 ...oldenrodUndergroundSwitchRoomEntrances.asm |  14 +-
 maps/HallOfFame.asm                           |   8 +-
 maps/IndigoPlateauPokecenter1F.asm            |  20 +-
 maps/KarensRoom.asm                           |   6 +-
 maps/KogasRoom.asm                            |   6 +-
 maps/KurtsHouse.asm                           |   2 +-
 maps/LakeOfRage.asm                           |   4 +-
 maps/LancesRoom.asm                           |  10 +-
 maps/MahoganyMart1F.asm                       |   6 +-
 maps/MahoganyTown.asm                         |   8 +-
 maps/MobileBattleRoom.asm                     |   8 +-
 maps/MobileTradeRoomMobile.asm                |   8 +-
 maps/MountMoon.asm                            |   6 +-
 maps/MountMoonSquare.asm                      |   6 +-
 maps/MrPokemonsHouse.asm                      |  10 +-
 maps/NewBarkTown.asm                          |   8 +-
 maps/OlivineCity.asm                          |  12 +-
 maps/OlivinePort.asm                          |  10 +-
 maps/PlayersHouse1F.asm                       |  12 +-
 maps/Pokecenter2F.asm                         |  32 +-
 maps/PowerPlant.asm                           |  12 +-
 maps/RadioTower5F.asm                         |  16 +-
 maps/Route16Gate.asm                          |   6 +-
 maps/Route17Route18Gate.asm                   |   6 +-
 maps/Route25.asm                              |  12 +-
 maps/Route27.asm                              |  10 +-
 maps/Route29.asm                              |  16 +-
 maps/Route32.asm                              |  12 +-
 maps/Route35NationalParkGate.asm              |  10 +-
 maps/Route36.asm                              |  12 +-
 maps/Route36NationalParkGate.asm              |  10 +-
 maps/Route42.asm                              |  10 +-
 maps/Route43.asm                              |   4 +-
 maps/Route43Gate.asm                          |  14 +-
 maps/RuinsOfAlphAerodactylChamber.asm         |   8 +-
 maps/RuinsOfAlphHoOhChamber.asm               |   8 +-
 maps/RuinsOfAlphInnerChamber.asm              |   6 +-
 maps/RuinsOfAlphKabutoChamber.asm             |   8 +-
 maps/RuinsOfAlphOmanyteChamber.asm            |   8 +-
 maps/RuinsOfAlphOutside.asm                   |  14 +-
 maps/RuinsOfAlphResearchCenter.asm            |   8 +-
 maps/SaffronMagnetTrainStation.asm            |   4 +-
 maps/SlowpokeWellB1F.asm                      |   2 +-
 maps/SproutTower3F.asm                        |   8 +-
 maps/TeamRocketBaseB1F.asm                    |  46 +--
 maps/TeamRocketBaseB2F.asm                    |  32 +-
 maps/TeamRocketBaseB3F.asm                    |  20 +-
 maps/TimeCapsule.asm                          |   8 +-
 maps/TinTower1F.asm                           |  12 +-
 maps/TradeCenter.asm                          |   8 +-
 maps/TrainerHouseB1F.asm                      |   4 +-
 maps/VermilionPort.asm                        |  10 +-
 maps/VictoryRoad.asm                          |  12 +-
 maps/VictoryRoadGate.asm                      |   8 +-
 maps/VioletGym.asm                            |   2 +-
 maps/VioletPokecenter1F.asm                   |   2 +-
 maps/WillsRoom.asm                            |   6 +-
 maps/WiseTriosRoom.asm                        |   8 +-
 87 files changed, 826 insertions(+), 437 deletions(-)
 create mode 100644 constants/scene_constants.asm

diff --git a/constants.asm b/constants.asm
index 27c425f8e..5dcbc57be 100644
--- a/constants.asm
+++ b/constants.asm
@@ -40,6 +40,7 @@ INCLUDE "constants/pokemon_data_constants.asm"
 INCLUDE "constants/printer_constants.asm"
 INCLUDE "constants/radio_constants.asm"
 INCLUDE "constants/scgb_constants.asm"
+INCLUDE "constants/scene_constants.asm"
 INCLUDE "constants/script_constants.asm"
 INCLUDE "constants/serial_constants.asm"
 INCLUDE "constants/sfx_constants.asm"
diff --git a/constants/scene_constants.asm b/constants/scene_constants.asm
new file mode 100644
index 000000000..1b1e80d28
--- /dev/null
+++ b/constants/scene_constants.asm
@@ -0,0 +1,388 @@
+; wPokecenter2FSceneID
+	const_def
+	const SCENE_POKECENTER2F_0
+	const SCENE_POKECENTER2F_1
+	const SCENE_POKECENTER2F_2
+	const SCENE_POKECENTER2F_3
+	const SCENE_POKECENTER2F_4
+	const SCENE_POKECENTER2F_5
+
+; wTradeCenterSceneID
+	const_def
+	const SCENE_TRADECENTER_0
+	const SCENE_TRADECENTER_1
+
+; wColosseumSceneID
+	const_def
+	const SCENE_COLOSSEUM_0
+	const SCENE_COLOSSEUM_1
+	const SCENE_COLOSSEUM_2
+
+; wTimeCapsuleSceneID
+	const_def
+	const SCENE_TIMECAPSULE_0
+	const SCENE_TIMECAPSULE_1
+
+; wPowerPlantSceneID
+	const_def
+	const SCENE_POWERPLANT_0
+	const SCENE_POWERPLANT_1
+
+; wCeruleanGymSceneID
+	const_def
+	const SCENE_CERULEANGYM_0
+	const SCENE_CERULEANGYM_1
+
+; wRoute25SceneID
+	const_def
+	const SCENE_ROUTE25_0
+	const SCENE_ROUTE25_1
+
+; wTrainerHouseB1FSceneID
+	const_def
+	const SCENE_TRAINERHOUSEB1F_0
+
+; wVictoryRoadGateSceneID
+	const_def
+	const SCENE_VICTORYROADGATE_0
+	const SCENE_VICTORYROADGATE_1
+
+; wSaffronMagnetTrainStationSceneID
+	const_def
+	const SCENE_SAFFRONMAGNETTRAINSTATION_0
+
+; wRoute16GateSceneID
+	const_def
+	const SCENE_ROUTE16GATE_0
+
+; wRoute17Route18GateSceneID
+	const_def
+	const SCENE_ROUTE17ROUTE18GATE_0
+
+; wIndigoPlateauPokecenter1FSceneID
+	const_def
+	const SCENE_INDIGOPLATEAUPOKECENTER1F_0
+
+; wWillsRoomSceneID
+	const_def
+	const SCENE_WILLSROOM_0
+	const SCENE_WILLSROOM_1
+
+; wKogasRoomSceneID
+	const_def
+	const SCENE_KOGASROOM_0
+	const SCENE_KOGASROOM_1
+
+; wBrunosRoomSceneID
+	const_def
+	const SCENE_BRUNOSROOM_0
+	const SCENE_BRUNOSROOM_1
+
+; wKarensRoomSceneID
+	const_def
+	const SCENE_KARENSROOM_0
+	const SCENE_KARENSROOM_1
+
+; wLancesRoomSceneID
+	const_def
+	const SCENE_LANCESROOM_0
+	const SCENE_LANCESROOM_1
+
+; wHallOfFameSceneID
+	const_def
+	const SCENE_HALLOFFAME_0
+	const SCENE_HALLOFFAME_1
+
+; wRoute27SceneID
+	const_def
+	const SCENE_ROUTE27_0
+	const SCENE_ROUTE27_1
+	const SCENE_ROUTE27_2
+
+; wNewBarkTownSceneID
+	const_def
+	const SCENE_NEWBARKTOWN_0
+	const SCENE_NEWBARKTOWN_1
+
+; wElmsLabSceneID
+	const_def
+	const SCENE_ELMSLAB_0
+	const SCENE_ELMSLAB_1
+	const SCENE_ELMSLAB_2
+	const SCENE_ELMSLAB_3
+	const SCENE_ELMSLAB_4
+	const SCENE_ELMSLAB_5
+	const SCENE_ELMSLAB_6
+
+; wPlayersHouse1FSceneID
+	const_def
+	const SCENE_PLAYERSHOUSE1F_0
+	const SCENE_PLAYERSHOUSE1F_1
+
+; wRoute29SceneID
+	const_def
+	const SCENE_ROUTE29_0
+	const SCENE_ROUTE29_1
+
+; wCherrygroveCitySceneID
+	const_def
+	const SCENE_CHERRYGROVECITY_0
+	const SCENE_CHERRYGROVECITY_1
+
+; wMrPokemonsHouseSceneID
+	const_def
+	const SCENE_MRPOKEMONSHOUSE_0
+	const SCENE_MRPOKEMONSHOUSE_1
+
+; wRoute32SceneID
+	const_def
+	const SCENE_ROUTE32_0
+	const SCENE_ROUTE32_1
+	const SCENE_ROUTE32_2
+
+; wRoute35NationalParkGateSceneID
+	const_def
+	const SCENE_ROUTE35NATIONALPARKGATE_0
+	const SCENE_ROUTE35NATIONALPARKGATE_1
+	const SCENE_ROUTE35NATIONALPARKGATE_2
+
+; wRoute36SceneID
+	const_def
+	const SCENE_ROUTE36_0
+	const SCENE_ROUTE36_1
+
+; wRoute36NationalParkGateSceneID
+	const_def
+	const SCENE_ROUTE36NATIONALPARKGATE_0
+	const SCENE_ROUTE36NATIONALPARKGATE_1
+	const SCENE_ROUTE36NATIONALPARKGATE_2
+
+; wAzaleaTownSceneID
+	const_def
+	const SCENE_AZALEATOWN_0
+	const SCENE_AZALEATOWN_1
+	const SCENE_AZALEATOWN_2
+
+; wGoldenrodGymSceneID
+	const_def
+	const SCENE_GOLDENRODGYM_0
+	const SCENE_GOLDENRODGYM_1
+
+; wGoldenrodMagnetTrainStationSceneID
+	const_def
+	const SCENE_GOLDENRODMAGNETTRAINSTATION_0
+
+; wGoldenrodPokecenter1FSceneID
+	const_def
+	const SCENE_GOLDENRODPOKECENTER1F_0
+
+; wOlivineCitySceneID
+	const_def
+	const SCENE_OLIVINECITY_0
+	const SCENE_OLIVINECITY_1
+
+; wEcruteakTinTowerEntranceSceneID
+	const_def
+	const SCENE_ECRUTEAKTINTOWERENTRANCE_0
+	const SCENE_ECRUTEAKTINTOWERENTRANCE_1
+
+; wWiseTriosRoomSceneID
+	const_def
+	const SCENE_WISETRIOSROOM_0
+	const SCENE_WISETRIOSROOM_1
+
+; wEcruteakPokecenter1FSceneID
+	const_def
+	const SCENE_ECRUTEAKPOKECENTER1F_0
+	const SCENE_ECRUTEAKPOKECENTER1F_1
+
+; wEcruteakGymSceneID
+	const_def
+	const SCENE_ECRUTEAKGYM_0
+	const SCENE_ECRUTEAKGYM_1
+
+; wMahoganyTownSceneID
+	const_def
+	const SCENE_MAHOGANYTOWN_0
+	const SCENE_MAHOGANYTOWN_1
+
+; wRoute42SceneID
+	const_def
+	const SCENE_ROUTE42_0
+	const SCENE_ROUTE42_1
+
+; wCianwoodCitySceneID
+	const_def
+	const SCENE_CIANWOODCITY_0
+	const SCENE_CIANWOODCITY_1
+
+; wBattleTower1FSceneID
+	const_def
+	const SCENE_BATTLETOWER1F_0
+	const SCENE_BATTLETOWER1F_1
+
+; wBattleTowerBattleRoomSceneID
+	const_def
+	const SCENE_BATTLETOWERBATTLEROOM_0
+	const SCENE_BATTLETOWERBATTLEROOM_1
+
+; wBattleTowerElevatorSceneID
+	const_def
+	const SCENE_BATTLETOWERELEVATOR_0
+	const SCENE_BATTLETOWERELEVATOR_1
+
+; wBattleTowerHallwaySceneID
+	const_def
+	const SCENE_BATTLETOWERHALLWAY_0
+	const SCENE_BATTLETOWERHALLWAY_1
+
+; wRoute43GateSceneID
+	const_def
+	const SCENE_ROUTE43GATE_0
+	const SCENE_ROUTE43GATE_1
+
+; wMountMoonSceneID
+	const_def
+	const SCENE_MOUNTMOON_0
+	const SCENE_MOUNTMOON_1
+
+; wSproutTower3FSceneID
+	const_def
+	const SCENE_SPROUTTOWER3F_0
+	const SCENE_SPROUTTOWER3F_1
+
+; wTinTower1FSceneID
+	const_def
+	const SCENE_TINTOWER1F_0
+	const SCENE_TINTOWER1F_1
+
+; wBurnedTower1FSceneID
+	const_def
+	const SCENE_BURNEDTOWER1F_0
+	const SCENE_BURNEDTOWER1F_1
+	const SCENE_BURNEDTOWER1F_2
+
+; wBurnedTowerB1FSceneID
+	const_def
+	const SCENE_BURNEDTOWERB1F_0
+	const SCENE_BURNEDTOWERB1F_1
+
+; wRadioTower5FSceneID
+	const_def
+	const SCENE_RADIOTOWER5F_0
+	const SCENE_RADIOTOWER5F_1
+	const SCENE_RADIOTOWER5F_2
+
+; wRuinsOfAlphOutsideSceneID
+	const_def
+	const SCENE_RUINSOFALPHOUTSIDE_0
+	const SCENE_RUINSOFALPHOUTSIDE_1
+
+; wRuinsOfAlphResearchCenterSceneID
+	const_def
+	const SCENE_RUINSOFALPHRESEARCHCENTER_0
+	const SCENE_RUINSOFALPHRESEARCHCENTER_1
+
+; wRuinsOfAlphHoOhChamberSceneID
+	const_def
+	const SCENE_RUINSOFALPHHOOHCHAMBER_0
+	const SCENE_RUINSOFALPHHOOHCHAMBER_1
+
+; wRuinsOfAlphKabutoChamberSceneID
+	const_def
+	const SCENE_RUINSOFALPHKABUTOCHAMBER_0
+	const SCENE_RUINSOFALPHKABUTOCHAMBER_1
+
+; wRuinsOfAlphOmanyteChamberSceneID
+	const_def
+	const SCENE_RUINSOFALPHOMANYTECHAMBER_0
+	const SCENE_RUINSOFALPHOMANYTECHAMBER_1
+
+; wRuinsOfAlphAerodactylChamberSceneID
+	const_def
+	const SCENE_RUINSOFALPHAERODACTYLCHAMBER_0
+	const SCENE_RUINSOFALPHAERODACTYLCHAMBER_1
+
+; wRuinsOfAlphInnerChamberSceneID
+	const_def
+	const SCENE_RUINSOFALPHINNERCHAMBER_0
+	const SCENE_RUINSOFALPHINNERCHAMBER_1
+
+; wMahoganyMart1FSceneID
+	const_def
+	const SCENE_MAHOGANYMART1F_0
+	const SCENE_MAHOGANYMART1F_1
+
+; wTeamRocketBaseB1FSceneID
+	const_def
+	const SCENE_TEAMROCKETBASEB1F_0
+
+; wTeamRocketBaseB2FSceneID
+	const_def
+	const SCENE_TEAMROCKETBASEB2F_0
+	const SCENE_TEAMROCKETBASEB2F_1
+	const SCENE_TEAMROCKETBASEB2F_2
+	const SCENE_TEAMROCKETBASEB2F_3
+
+; wTeamRocketBaseB3FSceneID
+	const_def
+	const SCENE_TEAMROCKETBASEB3F_0
+	const SCENE_TEAMROCKETBASEB3F_1
+	const SCENE_TEAMROCKETBASEB3F_2
+	const SCENE_TEAMROCKETBASEB3F_3
+
+; wGoldenrodUndergroundSwitchRoomEntrancesSceneID
+	const_def
+	const SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_0
+	const SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_1
+
+; wVictoryRoadSceneID
+	const_def
+	const SCENE_VICTORYROAD_0
+	const SCENE_VICTORYROAD_1
+
+; wDragonsDenB1FSceneID
+	const_def
+	const SCENE_DRAGONSDENB1F_0
+	const SCENE_DRAGONSDENB1F_1
+
+; wDragonShrineSceneID
+	const_def
+	const SCENE_DRAGONSHRINE_0
+	const SCENE_DRAGONSHRINE_1
+
+; wOlivinePortSceneID
+	const_def
+	const SCENE_OLIVINEPORT_0
+	const SCENE_OLIVINEPORT_1
+
+; wVermilionPortSceneID
+	const_def
+	const SCENE_VERMILIONPORT_0
+	const SCENE_VERMILIONPORT_1
+
+; wFastShip1FSceneID
+	const_def
+	const SCENE_FASTSHIP1F_0
+	const SCENE_FASTSHIP1F_1
+	const SCENE_FASTSHIP1F_2
+
+; wFastShipB1FSceneID
+	const_def
+	const SCENE_FASTSHIPB1F_0
+	const SCENE_FASTSHIPB1F_1
+
+; wMountMoonSquareSceneID
+	const_def
+	const SCENE_MOUNTMOONSQUARE_0
+	const SCENE_MOUNTMOONSQUARE_1
+
+; wMobileTradeRoomMobileSceneID
+	const_def
+	const SCENE_MOBILETRADEROOMMOBILE_0
+	const SCENE_MOBILETRADEROOMMOBILE_1
+
+; wMobileBattleRoomSceneID
+	const_def
+	const SCENE_MOBILEBATTLEROOM_0
+	const SCENE_MOBILEBATTLEROOM_1
diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm
index 89ec3ad31..c5be2e819 100644
--- a/data/maps/scenes.asm
+++ b/data/maps/scenes.asm
@@ -41,8 +41,8 @@ MapScenes:: ; 4d01e
 	scene_def GOLDENROD_MAGNET_TRAIN_STATION,              wGoldenrodMagnetTrainStationSceneID
 	scene_def GOLDENROD_POKECENTER_1F,                     wGoldenrodPokecenter1FSceneID
 	scene_def OLIVINE_CITY,                                wOlivineCitySceneID
-	scene_def ROUTE_34,                                    wRoute34SceneID
-	scene_def ROUTE_34_ILEX_FOREST_GATE,                   wRoute34IlexForestGateSceneID
+	scene_def ROUTE_34,                                    wRoute34SceneID ; unused
+	scene_def ROUTE_34_ILEX_FOREST_GATE,                   wRoute34IlexForestGateSceneID ; unused
 	scene_def ECRUTEAK_TIN_TOWER_ENTRANCE,                 wEcruteakTinTowerEntranceSceneID
 	scene_def WISE_TRIOS_ROOM,                             wWiseTriosRoomSceneID
 	scene_def ECRUTEAK_POKECENTER_1F,                      wEcruteakPokecenter1FSceneID
@@ -54,7 +54,7 @@ MapScenes:: ; 4d01e
 	scene_def BATTLE_TOWER_BATTLE_ROOM,                    wBattleTowerBattleRoomSceneID
 	scene_def BATTLE_TOWER_ELEVATOR,                       wBattleTowerElevatorSceneID
 	scene_def BATTLE_TOWER_HALLWAY,                        wBattleTowerHallwaySceneID
-	scene_def BATTLE_TOWER_OUTSIDE,                        wBattleTowerOutsideSceneID
+	scene_def BATTLE_TOWER_OUTSIDE,                        wBattleTowerOutsideSceneID ; unused
 	scene_def ROUTE_43_GATE,                               wRoute43GateSceneID
 	scene_def MOUNT_MOON,                                  wMountMoonSceneID
 	scene_def SPROUT_TOWER_3F,                             wSproutTower3FSceneID
@@ -74,7 +74,7 @@ MapScenes:: ; 4d01e
 	scene_def TEAM_ROCKET_BASE_B2F,                        wTeamRocketBaseB2FSceneID
 	scene_def TEAM_ROCKET_BASE_B3F,                        wTeamRocketBaseB3FSceneID
 	scene_def GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, wGoldenrodUndergroundSwitchRoomEntrancesSceneID
-	scene_def SILVER_CAVE_ROOM_3,                          wSilverCaveRoom3SceneID
+	scene_def SILVER_CAVE_ROOM_3,                          wSilverCaveRoom3SceneID ; unused
 	scene_def VICTORY_ROAD,                                wVictoryRoadSceneID
 	scene_def DRAGONS_DEN_B1F,                             wDragonsDenB1FSceneID
 	scene_def DRAGON_SHRINE,                               wDragonShrineSceneID
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
index 47090c1c3..642b44fa8 100644
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -356,7 +356,7 @@ BugContestResults_DidNotLeaveMons
 	waitbutton
 BugContestResults_CleanUp
 	closetext
-	setscene 0
+	setscene SCENE_ROUTE36NATIONALPARKGATE_0
 	setmapscene ROUTE_35_NATIONAL_PARK_GATE, 0
 	setevent EVENT_BUG_CATCHING_CONTESTANT_1A
 	setevent EVENT_BUG_CATCHING_CONTESTANT_2A
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index aba022cad..ef9a68221 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -14,9 +14,9 @@
 
 AzaleaTown_MapScripts:
 	db 3 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
-	scene_script .DummyScene2
+	scene_script .DummyScene0 ; SCENE_AZALEATOWN_0
+	scene_script .DummyScene1 ; SCENE_AZALEATOWN_1
+	scene_script .DummyScene2 ; SCENE_AZALEATOWN_2
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .Flypoint
@@ -100,7 +100,7 @@ AzaleaTownRivalBattleScript:
 	applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement
 	playsound SFX_EXIT_BUILDING
 	disappear AZALEATOWN_SILVER
-	setscene 0
+	setscene SCENE_AZALEATOWN_0
 	waitsfx
 	playmapmusic
 	end
@@ -168,7 +168,7 @@ AzaleaTownCelebiScene:
 	setflag ENGINE_FOREST_IS_RESTLESS
 	clearevent EVENT_ILEX_FOREST_LASS
 	setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
-	setscene 0
+	setscene SCENE_AZALEATOWN_0
 	closetext
 	end
 
@@ -467,9 +467,9 @@ AzaleaTown_MapEvents:
 	warp_event 2, 11, 4, ILEX_FOREST_AZALEA_GATE
 
 	db 3 ; coord events
-	coord_event 5, 10, 1, AzaleaTownRivalBattleScene1
-	coord_event 5, 11, 1, AzaleaTownRivalBattleScene2
-	coord_event 9, 6, 2, AzaleaTownCelebiScene
+	coord_event 5, 10, SCENE_AZALEATOWN_1, AzaleaTownRivalBattleScene1
+	coord_event 5, 11, SCENE_AZALEATOWN_1, AzaleaTownRivalBattleScene2
+	coord_event 9, 6, SCENE_AZALEATOWN_2, AzaleaTownCelebiScene
 
 	db 9 ; bg events
 	bg_event 19, 9, BGEVENT_READ, AzaleaTownSign
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index 8fd6f9f97..16fe01c99 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -7,8 +7,8 @@
 
 BattleTower1F_MapScripts:
 	db 2 ; scene scripts
-	scene_script .Scene0
-	scene_script .Scene1
+	scene_script .Scene0 ; SCENE_BATTLETOWER1F_0
+	scene_script .Scene1 ; SCENE_BATTLETOWER1F_1
 
 	db 0 ; callbacks
 
@@ -36,7 +36,7 @@ BattleTower1F_MapScripts:
 	writebyte BATTLETOWERACTION_06
 	special BattleTowerAction
 .SkipEverything:
-	setscene 1
+	setscene SCENE_BATTLETOWER1F_1
 .Scene1:
 	end
 
@@ -79,10 +79,10 @@ Script_ChooseChallenge: ; 0x9e40f
 	writetext Text_SaveBeforeEnteringBattleRoom
 	yesorno
 	iffalse Script_Menu_ChallengeExplanationCancel
-	setscene 0
+	setscene SCENE_BATTLETOWER1F_0
 	special TryQuickSave
 	iffalse Script_Menu_ChallengeExplanationCancel
-	setscene 1
+	setscene SCENE_BATTLETOWER1F_1
 	writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
 	special BattleTowerAction
 	special BattleTowerRoomMenu
@@ -103,9 +103,9 @@ Script_ResumeBattleTowerChallenge:
 	special BattleTowerAction
 Script_WalkToBattleTowerElevator:
 	musicfadeout MUSIC_NONE, 8
-	setmapscene BATTLE_TOWER_BATTLE_ROOM, 0
-	setmapscene BATTLE_TOWER_ELEVATOR, 0
-	setmapscene BATTLE_TOWER_HALLWAY, 0
+	setmapscene BATTLE_TOWER_BATTLE_ROOM, SCENE_BATTLETOWERBATTLEROOM_0
+	setmapscene BATTLE_TOWER_ELEVATOR, SCENE_BATTLETOWERELEVATOR_0
+	setmapscene BATTLE_TOWER_HALLWAY, SCENE_BATTLETOWERHALLWAY_0
 	follow BATTLETOWER1F_RECEPTIONIST, PLAYER
 	applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator
 	writebyte BATTLETOWERACTION_0A
@@ -206,10 +206,10 @@ continue:
 	writetext Text_SaveBeforeReentry
 	yesorno
 	iffalse Script_Menu_ChallengeExplanationCancel
-	setscene 0
+	setscene SCENE_BATTLETOWER1F_0
 	special TryQuickSave
 	iffalse Script_Menu_ChallengeExplanationCancel
-	setscene 1
+	setscene SCENE_BATTLETOWER1F_1
 	writebyte BATTLETOWERACTION_06
 	special BattleTowerAction
 	writebyte BATTLETOWERACTION_12
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index 06d582ea8..d6d7fb981 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -4,15 +4,15 @@
 
 BattleTowerBattleRoom_MapScripts:
 	db 2 ; scene scripts
-	scene_script .EnterBattleRoom
-	scene_script .DummyScene
+	scene_script .EnterBattleRoom ; SCENE_BATTLETOWERBATTLEROOM_0
+	scene_script .DummyScene ; SCENE_BATTLETOWERBATTLEROOM_1
 
 	db 0 ; callbacks
 
 .EnterBattleRoom: ; 0x9f419
 	disappear BATTLETOWERBATTLEROOM_YOUNGSTER
 	priorityjump Script_BattleRoom
-	setscene 1
+	setscene SCENE_BATTLETOWERBATTLEROOM_1
 .DummyScene:
 	end
 
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
index 4e6912c00..59764d7d9 100644
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -3,14 +3,14 @@
 
 BattleTowerElevator_MapScripts:
 	db 2 ; scene scripts
-	scene_script .Scene0
-	scene_script .Scene1
+	scene_script .Scene0 ; SCENE_BATTLETOWERELEVATOR_0
+	scene_script .Scene1 ; SCENE_BATTLETOWERELEVATOR_1
 
 	db 0 ; callbacks
 
 .Scene0:
 	priorityjump .RideElevator
-	setscene 1
+	setscene SCENE_BATTLETOWERELEVATOR_1
 
 .Scene1:
 	end
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
index 47971c815..4c856457f 100644
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -3,14 +3,14 @@
 
 BattleTowerHallway_MapScripts:
 	db 2 ; scene scripts
-	scene_script .Scene0
-	scene_script .Scene1
+	scene_script .Scene0 ; SCENE_BATTLETOWERHALLWAY_0
+	scene_script .Scene1 ; SCENE_BATTLETOWERHALLWAY_1
 
 	db 0 ; callbacks
 
 .Scene0:
 	priorityjump .ChooseBattleRoom
-	setscene 1
+	setscene SCENE_BATTLETOWERHALLWAY_1
 .Scene1:
 	end
 
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
index 06694dc9c..2de9c0901 100644
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -3,8 +3,8 @@
 
 BrunosRoom_MapScripts:
 	db 2 ; scene scripts
-	scene_script .LockDoor
-	scene_script .DummyScene
+	scene_script .LockDoor ; SCENE_BRUNOSROOM_0
+	scene_script .DummyScene ; SCENE_BRUNOSROOM_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .BrunosRoomDoors
@@ -35,7 +35,7 @@ BrunosRoom_MapScripts:
 	changeblock 4, 14, $2a ; wall
 	reloadmappart
 	closetext
-	setscene 1
+	setscene SCENE_BRUNOSROOM_1
 	setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
 	waitsfx
 	end
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index 02b959381..135f17304 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -7,9 +7,9 @@
 
 BurnedTower1F_MapScripts:
 	db 3 ; scene scripts
-	scene_script .EusineScene
-	scene_script .DummyScene1
-	scene_script .DummyScene2
+	scene_script .EusineScene ; SCENE_BURNEDTOWER1F_0
+	scene_script .DummyScene1 ; SCENE_BURNEDTOWER1F_1
+	scene_script .DummyScene2 ; SCENE_BURNEDTOWER1F_2
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HoleAndLadder
@@ -44,7 +44,7 @@ BurnedTower1F_MapScripts:
 	waitbutton
 	closetext
 	moveobject BURNEDTOWER1F_EUSINE, 9, 14
-	setscene 1
+	setscene SCENE_BURNEDTOWER1F_1
 	end
 
 BurnedTowerRivalBattleScript:
@@ -96,7 +96,7 @@ BurnedTowerRivalBattleScript:
 	writetext BurnedTowerSilver_AfterText1
 	waitbutton
 	closetext
-	setscene 2
+	setscene SCENE_BURNEDTOWER1F_2
 	setevent EVENT_RIVAL_BURNED_TOWER
 	special FadeOutMusic
 	pause 15
@@ -295,7 +295,7 @@ BurnedTower1F_MapEvents:
 	warp_event 7, 15, 6, BURNED_TOWER_B1F
 
 	db 1 ; coord events
-	coord_event 11, 9, 1, BurnedTowerRivalBattleScript
+	coord_event 11, 9, SCENE_BURNEDTOWER1F_1, BurnedTowerRivalBattleScript
 
 	db 2 ; bg events
 	bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index ab4d5f5ce..4c74a156c 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -11,8 +11,8 @@
 
 BurnedTowerB1F_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_BURNEDTOWERB1F_0
+	scene_script .DummyScene1 ; SCENE_BURNEDTOWERB1F_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .LadderCallback
@@ -79,11 +79,11 @@ ReleaseTheBeasts:
 	disappear BURNEDTOWERB1F_SUICUNE1
 	waitsfx
 	special RestartMapMusic
-	setscene 1
+	setscene SCENE_BURNEDTOWERB1F_1
 	setevent EVENT_RELEASED_THE_BEASTS
 	special InitRoamMons
-	setmapscene ECRUTEAK_GYM, 1
-	setmapscene CIANWOOD_CITY, 1
+	setmapscene ECRUTEAK_GYM, SCENE_ECRUTEAKGYM_1
+	setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_1
 	clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
 	setevent EVENT_ECRUTEAK_GYM_GRAMPS
 	clearevent EVENT_ECRUTEAK_CITY_GRAMPS
@@ -94,7 +94,7 @@ ReleaseTheBeasts:
 	changeblock 6, 14, $1b ; ladder
 	reloadmappart
 	closetext
-	setscene 1
+	setscene SCENE_BURNEDTOWERB1F_1
 	end
 
 BurnedTowerB1FEusine:
@@ -245,7 +245,7 @@ BurnedTowerB1F_MapEvents:
 	warp_event 7, 15, 14, BURNED_TOWER_1F
 
 	db 1 ; coord events
-	coord_event 10, 6, 0, ReleaseTheBeasts
+	coord_event 10, 6, SCENE_BURNEDTOWERB1F_0, ReleaseTheBeasts
 
 	db 0 ; bg events
 
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index cc11ce209..39ef30723 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -8,8 +8,8 @@
 
 CeruleanGym_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .GruntRunsOut
+	scene_script .DummyScene0 ; SCENE_CERULEANGYM_0
+	scene_script .GruntRunsOut ; SCENE_CERULEANGYM_1
 
 	db 0 ; callbacks
 
@@ -46,9 +46,9 @@ CeruleanGym_MapScripts:
 	setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
 	clearevent EVENT_ROUTE_24_ROCKET
 	clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND
-	setscene 0
-	setmapscene ROUTE_25, 1
-	setmapscene POWER_PLANT, 0
+	setscene SCENE_CERULEANGYM_0
+	setmapscene ROUTE_25, SCENE_ROUTE25_1
+	setmapscene POWER_PLANT, SCENE_POWERPLANT_0
 	waitsfx
 	special RestartMapMusic
 	pause 15
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index aadb9c98e..889c8af16 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -7,8 +7,8 @@
 
 CherrygroveCity_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_CHERRYGROVECITY_0
+	scene_script .DummyScene1 ; SCENE_CHERRYGROVECITY_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -169,7 +169,7 @@ CherrygroveSilverSceneNorth:
 	spriteface PLAYER, LEFT
 	applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft
 	disappear CHERRYGROVECITY_SILVER
-	setscene 0
+	setscene SCENE_CHERRYGROVECITY_0
 	special HealParty
 	playmapmusic
 	end
@@ -555,8 +555,8 @@ CherrygroveCity_MapEvents:
 	warp_event 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE
 
 	db 2 ; coord events
-	coord_event 33, 6, 1, CherrygroveSilverSceneNorth
-	coord_event 33, 7, 1, CherrygroveSilverSceneSouth
+	coord_event 33, 6, SCENE_CHERRYGROVECITY_1, CherrygroveSilverSceneNorth
+	coord_event 33, 7, SCENE_CHERRYGROVECITY_1, CherrygroveSilverSceneSouth
 
 	db 4 ; bg events
 	bg_event 30, 8, BGEVENT_READ, CherrygroveCitySign
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index 5d0d1c6fc..c364ddb14 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -14,8 +14,8 @@
 
 CianwoodCity_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_CIANWOODCITY_0
+	scene_script .DummyScene1 ; SCENE_CIANWOODCITY_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune
@@ -47,9 +47,9 @@ CianwoodCitySuicuneAndEusine:
 	applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0
 	disappear CIANWOODCITY_SUICUNE
 	pause 10
-	setscene 0
+	setscene SCENE_CIANWOODCITY_0
 	clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42
-	setmapscene ROUTE_42, 1
+	setmapscene ROUTE_42, SCENE_ROUTE42_1
 	checkevent EVENT_FOUGHT_EUSINE
 	iftrue .Done
 	setevent EVENT_FOUGHT_EUSINE
@@ -391,7 +391,7 @@ CianwoodCity_MapEvents:
 	warp_event 5, 17, 1, POKE_SEERS_HOUSE
 
 	db 1 ; coord events
-	coord_event 11, 16, 1, CianwoodCitySuicuneAndEusine
+	coord_event 11, 16, SCENE_CIANWOODCITY_1, CianwoodCitySuicuneAndEusine
 
 	db 8 ; bg events
 	bg_event 20, 34, BGEVENT_READ, CianwoodCitySign
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index ea5a0ba29..150f670c8 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -4,9 +4,9 @@
 
 Colosseum_MapScripts:
 	db 3 ; scene scripts
-	scene_script .InitializeColosseum
-	scene_script .DummyScene1
-	scene_script .DummyScene2
+	scene_script .InitializeColosseum ; SCENE_COLOSSEUM_0
+	scene_script .DummyScene1 ; SCENE_COLOSSEUM_1
+	scene_script .DummyScene2 ; SCENE_COLOSSEUM_2
 
 	db 2 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
@@ -35,12 +35,12 @@ Colosseum_MapScripts:
 	return
 
 .PreparePokecenter2F:
-	setmapscene POKECENTER_2F, 2
+	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_2
 	return
 
 .InitializeAndPreparePokecenter2F:
-	setscene 1
-	setmapscene POKECENTER_2F, 2
+	setscene SCENE_COLOSSEUM_1
+	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_2
 	end
 
 MapColosseumSignpost1Script:
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index 3de5e46cc..2443466ff 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -6,8 +6,8 @@
 
 DragonShrine_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DragonShrineTest
-	scene_script .DummyScene
+	scene_script .DragonShrineTest ; SCENE_DRAGONSHRINE_0
+	scene_script .DummyScene ; SCENE_DRAGONSHRINE_1
 
 	db 0 ; callbacks
 
@@ -163,8 +163,8 @@ DragonShrine_MapScripts:
 	waitsfx
 	special RestartMapMusic
 	specialphonecall SPECIALCALL_MASTERBALL
-	setscene 1
-	setmapscene DRAGONS_DEN_B1F, 1
+	setscene SCENE_DRAGONSHRINE_1
+	setmapscene DRAGONS_DEN_B1F, SCENE_DRAGONSDENB1F_1
 	writetext DragonShrinePlayerReceivedRisingBadgeText
 	buttonsound
 	writetext DragonShrineRisingBadgeExplanationText
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index f9c0809fa..d493fd866 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -11,8 +11,8 @@
 
 DragonsDenB1F_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_DRAGONSDENB1F_0
+	scene_script .DummyScene1 ; SCENE_DRAGONSDENB1F_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckSilver
@@ -78,7 +78,7 @@ DragonsDenB1F_ClairScene:
 	pause 30
 	special RestartMapMusic
 	disappear DRAGONSDENB1F_CLAIR
-	setscene 0
+	setscene SCENE_DRAGONSDENB1F_0
 	end
 
 TrainerCooltrainermDarin:
@@ -412,7 +412,7 @@ DragonsDenB1F_MapEvents:
 	warp_event 19, 29, 1, DRAGON_SHRINE
 
 	db 1 ; coord events
-	coord_event 19, 30, 1, DragonsDenB1F_ClairScene
+	coord_event 19, 30, SCENE_DRAGONSDENB1F_1, DragonsDenB1F_ClairScene
 
 	db 4 ; bg events
 	bg_event 18, 24, BGEVENT_READ, MapDragonsDenB1FSignpost0Script
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index 1c1abddda..313669f86 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -9,8 +9,8 @@
 
 EcruteakGym_MapScripts:
 	db 2 ; scene scripts
-	scene_script .ForcedToLeave
-	scene_script .DummyScene
+	scene_script .ForcedToLeave ; SCENE_ECRUTEAKGYM_0
+	scene_script .DummyScene ; SCENE_ECRUTEAKGYM_1
 
 	db 0 ; callbacks
 
@@ -41,7 +41,7 @@ MortyScript_0x99d58:
 	setflag ENGINE_FOGBADGE
 	checkcode VAR_BADGES
 	scall EcruteakGymActivateRockets
-	setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, 1
+	setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_ECRUTEAKTINTOWERENTRANCE_1
 	setevent EVENT_RANG_CLEAR_BELL_1
 	setevent EVENT_RANG_CLEAR_BELL_2
 .FightDone:
diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm
index 1afaa6ea3..f17d7ae68 100644
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -7,8 +7,8 @@
 
 EcruteakPokecenter1F_MapScripts:
 	db 2 ; scene scripts
-	scene_script .MeetBill
-	scene_script .DummyScene
+	scene_script .MeetBill ; SCENE_ECRUTEAKPOKECENTER1F_0
+	scene_script .DummyScene ; SCENE_ECRUTEAKPOKECENTER1F_1
 
 	db 0 ; callbacks
 
@@ -51,7 +51,7 @@ EcruteakPokecenter1F_MapScripts:
 	disappear ECRUTEAKPOKECENTER1F_BILL
 	clearevent EVENT_MET_BILL
 	setflag ENGINE_TIME_CAPSULE
-	setscene 1
+	setscene SCENE_ECRUTEAKPOKECENTER1F_1
 	waitsfx
 	end
 
diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm
index 184abc16b..ab6c7fe3d 100644
--- a/maps/EcruteakTinTowerEntrance.asm
+++ b/maps/EcruteakTinTowerEntrance.asm
@@ -6,8 +6,8 @@
 
 EcruteakTinTowerEntrance_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_ECRUTEAKTINTOWERENTRANCE_0
+	scene_script .DummyScene1 ; SCENE_ECRUTEAKTINTOWERENTRANCE_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .InitializeSages
@@ -33,7 +33,7 @@ EcruteakTinTowerEntrance_MapScripts:
 	setevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
 	checkitem CLEAR_BELL
 	iftrue .NoClearBell
-	setscene 0
+	setscene SCENE_ECRUTEAKTINTOWERENTRANCE_0
 .NoClearBell:
 	return
 
@@ -98,7 +98,7 @@ SageScript_0x98062:
 	writetext UnknownText_0x98250
 	waitbutton
 	closetext
-	setscene 1
+	setscene SCENE_ECRUTEAKTINTOWERENTRANCE_1
 	setevent EVENT_RANG_CLEAR_BELL_2
 	clearevent EVENT_RANG_CLEAR_BELL_1
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -286,8 +286,8 @@ EcruteakTinTowerEntrance_MapEvents:
 	warp_event 17, 3, 3, WISE_TRIOS_ROOM
 
 	db 2 ; coord events
-	coord_event 4, 7, 0, EcruteakTinTowerEntrance_CoordEvent1
-	coord_event 5, 7, 0, EcruteakTinTowerEntrance_CoordEvent2
+	coord_event 4, 7, SCENE_ECRUTEAKTINTOWERENTRANCE_0, EcruteakTinTowerEntrance_CoordEvent1
+	coord_event 5, 7, SCENE_ECRUTEAKTINTOWERENTRANCE_0, EcruteakTinTowerEntrance_CoordEvent2
 
 	db 0 ; bg events
 
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index a5030a436..748bb70dc 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -8,12 +8,12 @@
 
 ElmsLab_MapScripts:
 	db 6 ; scene scripts
-	scene_script .MeetElm
-	scene_script .DummyScene1
-	scene_script .DummyScene2
-	scene_script .DummyScene3
-	scene_script .DummyScene4
-	scene_script .DummyScene5
+	scene_script .MeetElm ; SCENE_ELMSLAB_0
+	scene_script .DummyScene1 ; SCENE_ELMSLAB_1
+	scene_script .DummyScene2 ; SCENE_ELMSLAB_2
+	scene_script .DummyScene3 ; SCENE_ELMSLAB_3
+	scene_script .DummyScene4 ; SCENE_ELMSLAB_4
+	scene_script .DummyScene5 ; SCENE_ELMSLAB_5
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .MoveElmCallback
@@ -39,7 +39,7 @@ ElmsLab_MapScripts:
 
 .MoveElmCallback:
 	checkscene
-	iftrue .Skip
+	iftrue .Skip ; not SCENE_ELMSLAB_0
 	moveobject ELMSLAB_ELM, 3, 4
 .Skip:
 	return
@@ -82,7 +82,7 @@ ElmsLab_MapScripts:
 	opentext
 	writetext ElmText_ChooseAPokemon
 	waitbutton
-	setscene 1
+	setscene SCENE_ELMSLAB_1
 	closetext
 	end
 
@@ -272,8 +272,8 @@ ElmDirectionsScript:
 	closetext
 	setevent EVENT_GOT_A_POKEMON_FROM_ELM
 	setevent EVENT_RIVAL_CHERRYGROVE_CITY
-	setscene 5
-	setmapscene NEW_BARK_TOWN, 1
+	setscene SCENE_ELMSLAB_5
+	setmapscene NEW_BARK_TOWN, SCENE_NEWBARKTOWN_1
 	end
 
 ElmDescribesMrPokemonScript:
@@ -339,13 +339,13 @@ ElmAfterTheftScript:
 	buttonsound
 	setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
 	setflag ENGINE_BUG_CONTEST_ON
-	setmapscene ROUTE_29, 1
+	setmapscene ROUTE_29, SCENE_ROUTE29_1
 	clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY
 	setevent EVENT_ROUTE_30_BATTLE
 	writetext ElmAfterTheftText6
 	waitbutton
 	closetext
-	setscene 6
+	setscene SCENE_ELMSLAB_6
 	end
 
 ElmStudyingEggScript:
@@ -477,7 +477,7 @@ AideScript_GivePotions:
 	writetext AideText_AlwaysBusy
 	waitbutton
 	closetext
-	setscene 2
+	setscene SCENE_ELMSLAB_2
 	end
 
 AideScript_WalkBalls1:
@@ -505,7 +505,7 @@ AideScript_GiveYouBalls:
 	buttonsound
 	itemnotify
 	closetext
-	setscene 2
+	setscene SCENE_ELMSLAB_2
 	end
 
 AideScript_ReceiveTheBalls:
@@ -560,7 +560,7 @@ CopScript:
 	closetext
 	applymovement ELMSLAB_OFFICER, OfficerLeavesMovement
 	disappear ELMSLAB_OFFICER
-	setscene 2
+	setscene SCENE_ELMSLAB_2
 	end
 
 ElmsLabWindow:
@@ -1376,14 +1376,14 @@ ElmsLab_MapEvents:
 	warp_event 5, 11, 1, NEW_BARK_TOWN
 
 	db 8 ; coord events
-	coord_event 4, 6, 1, LabTryToLeaveScript
-	coord_event 5, 6, 1, LabTryToLeaveScript
-	coord_event 4, 5, 3, MeetCopScript
-	coord_event 5, 5, 3, MeetCopScript2
-	coord_event 4, 8, 5, AideScript_WalkPotions1
-	coord_event 5, 8, 5, AideScript_WalkPotions2
-	coord_event 4, 8, 6, AideScript_WalkBalls1
-	coord_event 5, 8, 6, AideScript_WalkBalls2
+	coord_event 4, 6, SCENE_ELMSLAB_1, LabTryToLeaveScript
+	coord_event 5, 6, SCENE_ELMSLAB_1, LabTryToLeaveScript
+	coord_event 4, 5, SCENE_ELMSLAB_3, MeetCopScript
+	coord_event 5, 5, SCENE_ELMSLAB_3, MeetCopScript2
+	coord_event 4, 8, SCENE_ELMSLAB_5, AideScript_WalkPotions1
+	coord_event 5, 8, SCENE_ELMSLAB_5, AideScript_WalkPotions2
+	coord_event 4, 8, SCENE_ELMSLAB_6, AideScript_WalkBalls1
+	coord_event 5, 8, SCENE_ELMSLAB_6, AideScript_WalkBalls2
 
 	db 16 ; bg events
 	bg_event 2, 1, BGEVENT_READ, ElmsLabHealingMachine
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index 9e20d9d41..a13b40237 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -6,9 +6,9 @@
 
 FastShip1F_MapScripts:
 	db 3 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .EnterFastShip
-	scene_script .DummyScene2
+	scene_script .DummyScene0 ; SCENE_FASTSHIP1F_0
+	scene_script .EnterFastShip ; SCENE_FASTSHIP1F_1
+	scene_script .DummyScene2 ; SCENE_FASTSHIP1F_2
 
 	db 0 ; callbacks
 
@@ -33,11 +33,11 @@ FastShip1F_MapScripts:
 	clearevent EVENT_FAST_SHIP_HAS_ARRIVED
 	checkevent EVENT_FAST_SHIP_FIRST_TIME
 	iftrue .SkipGrandpa
-	setscene 2
+	setscene SCENE_FASTSHIP1F_2
 	end
 
 .SkipGrandpa:
-	setscene 0
+	setscene SCENE_FASTSHIP1F_0
 	end
 
 SailorScript_0x75160:
@@ -69,7 +69,7 @@ SailorScript_0x75160:
 	special FadeOutPalettes
 	waitsfx
 	setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
-	setmapscene VERMILION_PORT, 1
+	setmapscene VERMILION_PORT, SCENE_VERMILIONPORT_1
 	warp VERMILION_PORT, 7, 17
 	end
 
@@ -82,7 +82,7 @@ SailorScript_0x75160:
 	special FadeOutPalettes
 	waitsfx
 	setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
-	setmapscene OLIVINE_PORT, 1
+	setmapscene OLIVINE_PORT, SCENE_OLIVINEPORT_1
 	warp OLIVINE_PORT, 7, 23
 	end
 
@@ -133,7 +133,7 @@ WorriedGrandpaSceneLeft:
 	spriteface PLAYER, RIGHT
 	applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222
 	disappear FASTSHIP1F_GENTLEMAN
-	setscene 0
+	setscene SCENE_FASTSHIP1F_0
 	end
 
 MovementData_0x7520e:
@@ -301,8 +301,8 @@ FastShip1F_MapEvents:
 	warp_event 30, 14, 2, FAST_SHIP_B1F
 
 	db 2 ; coord events
-	coord_event 24, 6, 2, WorriedGrandpaSceneLeft
-	coord_event 25, 6, 2, WorriedGrandpaSceneRight
+	coord_event 24, 6, SCENE_FASTSHIP1F_2, WorriedGrandpaSceneLeft
+	coord_event 25, 6, SCENE_FASTSHIP1F_2, WorriedGrandpaSceneRight
 
 	db 0 ; bg events
 
diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm
index 08d27eef3..b0bfa0acf 100644
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -14,8 +14,8 @@
 
 FastShipB1F_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_FASTSHIPB1F_0
+	scene_script .DummyScene1 ; SCENE_FASTSHIPB1F_1
 
 	db 0 ; callbacks
 
@@ -454,8 +454,8 @@ FastShipB1F_MapEvents:
 	warp_event 31, 13, 12, FAST_SHIP_1F
 
 	db 2 ; coord events
-	coord_event 30, 7, 0, UnknownScript_0x7673c
-	coord_event 31, 7, 0, UnknownScript_0x76751
+	coord_event 30, 7, SCENE_FASTSHIPB1F_0, UnknownScript_0x7673c
+	coord_event 31, 7, SCENE_FASTSHIPB1F_0, UnknownScript_0x76751
 
 	db 1 ; bg events
 	bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan
diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm
index 8d69f3e31..00d3e0d00 100644
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -96,7 +96,7 @@ SailorScript_0x755f1:
 	waitbutton
 	closetext
 	setevent EVENT_FAST_SHIP_LAZY_SAILOR
-	setmapscene FAST_SHIP_B1F, 1
+	setmapscene FAST_SHIP_B1F, SCENE_FASTSHIPB1F_1
 	checkcode VAR_FACING
 	if_equal RIGHT, UnknownScript_0x75629
 	applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index ba9a31fbe..dd80d59fe 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -79,7 +79,7 @@ SSAquaGranddaughterBefore:
 	writetext SSAquaEntertainedGranddaughterText
 	buttonsound
 	setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
-	setmapscene FAST_SHIP_1F, 0
+	setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_0
 	jump SSAquaMetalCoatAndDocking
 
 SSAquaGrandpa:
@@ -92,7 +92,7 @@ SSAquaGrandpa:
 	writetext SSAquaCantFindGranddaughterText
 	waitbutton
 	closetext
-	setmapscene FAST_SHIP_1F, 0
+	setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_0
 	end
 
 SSAquaMetalCoatAndDocking:
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
index 2453afa30..2d686d4d3 100644
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -8,8 +8,8 @@
 
 GoldenrodGym_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_GOLDENRODGYM_0
+	scene_script .DummyScene1 ; SCENE_GOLDENRODGYM_1
 
 	db 0 ; callbacks
 
@@ -33,7 +33,7 @@ WhitneyScript_0x5400c:
 	reloadmapafterbattle
 	setevent EVENT_BEAT_WHITNEY
 	setevent EVENT_MADE_WHITNEY_CRY
-	setscene 1
+	setscene SCENE_GOLDENRODGYM_1
 	setevent EVENT_BEAT_BEAUTY_VICTORIA
 	setevent EVENT_BEAT_BEAUTY_SAMANTHA
 	setevent EVENT_BEAT_LASS_CARRIE
@@ -110,7 +110,7 @@ WhitneyCriesScript:
 	waitbutton
 	closetext
 	applymovement GOLDENRODGYM_LASS2, BridgetWalksAwayMovement
-	setscene 0
+	setscene SCENE_GOLDENRODGYM_0
 	clearevent EVENT_MADE_WHITNEY_CRY
 	end
 
@@ -385,7 +385,7 @@ GoldenrodGym_MapEvents:
 	warp_event 3, 17, 1, GOLDENROD_CITY
 
 	db 1 ; coord events
-	coord_event 8, 5, 1, WhitneyCriesScript
+	coord_event 8, 5, SCENE_GOLDENRODGYM_1, WhitneyCriesScript
 
 	db 2 ; bg events
 	bg_event 1, 15, BGEVENT_READ, GoldenrodGymStatue
diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm
index e678d71e0..fdcc0dcbc 100644
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -4,7 +4,7 @@
 
 GoldenrodMagnetTrainStation_MapScripts:
 	db 1 ; scene scripts
-	scene_script .DummyScene
+	scene_script .DummyScene ; SCENE_GOLDENRODMAGNETTRAINSTATION_0
 
 	db 0 ; callbacks
 
@@ -172,7 +172,7 @@ GoldenrodMagnetTrainStation_MapEvents:
 	warp_event 11, 5, 3, SAFFRON_MAGNET_TRAIN_STATION
 
 	db 1 ; coord events
-	coord_event 11, 6, 0, Script_ArriveFromSaffron
+	coord_event 11, 6, SCENE_GOLDENRODMAGNETTRAINSTATION_0, Script_ArriveFromSaffron
 
 	db 0 ; bg events
 
diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm
index 521cacfe3..1cf168213 100644
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -812,8 +812,8 @@ GoldenrodPokecenter1F_MapEvents:
 	warp_event 0, 7, 1, POKECENTER_2F
 
 	db 2 ; coord events
-	coord_event 3, 7, 0, GoldenrodPokecenter1F_GSBallSceneLeft
-	coord_event 4, 7, 0, GoldenrodPokecenter1F_GSBallSceneRight
+	coord_event 3, 7, SCENE_GOLDENRODPOKECENTER1F_0, GoldenrodPokecenter1F_GSBallSceneLeft
+	coord_event 4, 7, SCENE_GOLDENRODPOKECENTER1F_0, GoldenrodPokecenter1F_GSBallSceneRight
 
 	db 0 ; bg events
 
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index 3ac711ba2..dcb8caa18 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -46,8 +46,8 @@ ENDM
 
 GoldenrodUndergroundSwitchRoomEntrances_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_0
+	scene_script .DummyScene1 ; SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .UpdateDoorPositions
@@ -130,7 +130,7 @@ UndergroundSilverScene1:
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1
 	playsound SFX_EXIT_BUILDING
 	disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
-	setscene 1
+	setscene SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_1
 	waitsfx
 	playmapmusic
 	end
@@ -149,7 +149,7 @@ UndergroundSilverScene2:
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2
 	playsound SFX_EXIT_BUILDING
 	disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
-	setscene 1
+	setscene SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_1
 	waitsfx
 	playmapmusic
 	end
@@ -158,7 +158,7 @@ UndergroundSilverBattleScript:
 	checkevent EVENT_RIVAL_BURNED_TOWER
 	iftrue .Continue
 	setevent EVENT_RIVAL_BURNED_TOWER
-	setmapscene BURNED_TOWER_1F, 1
+	setmapscene BURNED_TOWER_1F, SCENE_BURNEDTOWER1F_1
 .Continue:
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
@@ -943,8 +943,8 @@ GoldenrodUndergroundSwitchRoomEntrances_MapEvents:
 	warp_event 21, 29, 13, GOLDENROD_CITY
 
 	db 2 ; coord events
-	coord_event 19, 4, 0, UndergroundSilverScene1
-	coord_event 19, 5, 0, UndergroundSilverScene2
+	coord_event 19, 4, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_0, UndergroundSilverScene1
+	coord_event 19, 5, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_0, UndergroundSilverScene2
 
 	db 6 ; bg events
 	bg_event 16, 1, BGEVENT_READ, Switch1Script
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index 314628091..da16e431f 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -3,8 +3,8 @@
 
 HallOfFame_MapScripts:
 	db 2 ; scene scripts
-	scene_script .EnterHallOfFame
-	scene_script .DummyScene
+	scene_script .EnterHallOfFame ; SCENE_HALLOFFAME_0
+	scene_script .DummyScene ; SCENE_HALLOFFAME_1
 
 	db 0 ; callbacks
 
@@ -26,7 +26,7 @@ HallOfFame_MapScripts:
 	closetext
 	spriteface HALLOFFAME_LANCE, UP
 	applymovement PLAYER, HallOfFame_SlowlyApproachMachine
-	setscene 1
+	setscene SCENE_HALLOFFAME_1
 	pause 15
 	writebyte HEALMACHINE_HALL_OF_FAME
 	special HealMachineAnim
@@ -36,7 +36,7 @@ HallOfFame_MapScripts:
 	clearevent EVENT_RED_IN_MT_SILVER
 	setevent EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
 	clearevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
-	setmapscene SPROUT_TOWER_3F, 1
+	setmapscene SPROUT_TOWER_3F, SCENE_SPROUTTOWER3F_1
 	special HealParty
 	checkevent EVENT_GOT_SS_TICKET_FROM_ELM
 	iftrue .SkipPhoneCall
diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm
index eb2ef3328..3fd17b697 100644
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -8,7 +8,7 @@
 
 IndigoPlateauPokecenter1F_MapScripts:
 	db 1 ; scene scripts
-	scene_script .DummyScene
+	scene_script .DummyScene ; SCENE_INDIGOPLATEAUPOKECENTER1F_0
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .PrepareElite4
@@ -17,12 +17,12 @@ IndigoPlateauPokecenter1F_MapScripts:
 	end
 
 .PrepareElite4:
-	setmapscene WILLS_ROOM, 0
-	setmapscene KOGAS_ROOM, 0
-	setmapscene BRUNOS_ROOM, 0
-	setmapscene KARENS_ROOM, 0
-	setmapscene LANCES_ROOM, 0
-	setmapscene HALL_OF_FAME, 0
+	setmapscene WILLS_ROOM, SCENE_WILLSROOM_0
+	setmapscene KOGAS_ROOM, SCENE_KOGASROOM_0
+	setmapscene BRUNOS_ROOM, SCENE_BRUNOSROOM_0
+	setmapscene KARENS_ROOM, SCENE_KARENSROOM_0
+	setmapscene LANCES_ROOM, SCENE_LANCESROOM_0
+	setmapscene HALL_OF_FAME, SCENE_HALLOFFAME_0
 	clearevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
 	clearevent EVENT_WILLS_ROOM_EXIT_OPEN
 	clearevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
@@ -128,7 +128,7 @@ PlateauRivalPostBattle:
 	spriteface PLAYER, DOWN
 	applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalLeavesMovement
 	disappear INDIGOPLATEAUPOKECENTER1F_SILVER
-	setscene 0
+	setscene SCENE_INDIGOPLATEAUPOKECENTER1F_0
 	playmapmusic
 	setflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
 PlateauRivalScriptDone:
@@ -310,8 +310,8 @@ IndigoPlateauPokecenter1F_MapEvents:
 	warp_event 14, 3, 1, WILLS_ROOM
 
 	db 2 ; coord events
-	coord_event 16, 4, 0, PlateauRivalBattle1
-	coord_event 17, 4, 0, PlateauRivalBattle2
+	coord_event 16, 4, SCENE_INDIGOPLATEAUPOKECENTER1F_0, PlateauRivalBattle1
+	coord_event 17, 4, SCENE_INDIGOPLATEAUPOKECENTER1F_0, PlateauRivalBattle2
 
 	db 0 ; bg events
 
diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
index 814e9825b..0a6b40ae5 100644
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -3,8 +3,8 @@
 
 KarensRoom_MapScripts:
 	db 2 ; scene scripts
-	scene_script .LockDoor
-	scene_script .DummyScene
+	scene_script .LockDoor ; SCENE_KARENSROOM_0
+	scene_script .DummyScene ; SCENE_KARENSROOM_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .KarensRoomDoors
@@ -35,7 +35,7 @@ KarensRoom_MapScripts:
 	changeblock 4, 14, $2a ; wall
 	reloadmappart
 	closetext
-	setscene 1
+	setscene SCENE_KARENSROOM_1
 	setevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED
 	waitsfx
 	end
diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
index 63726fe91..1e5ea19ba 100644
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -3,8 +3,8 @@
 
 KogasRoom_MapScripts:
 	db 2 ; scene scripts
-	scene_script .LockDoor
-	scene_script .DummyScene
+	scene_script .LockDoor ; SCENE_KOGASROOM_0
+	scene_script .DummyScene ; SCENE_KOGASROOM_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .KogasRoomDoors
@@ -35,7 +35,7 @@ KogasRoom_MapScripts:
 	changeblock 4, 14, $2a ; wall
 	reloadmappart
 	closetext
-	setscene 1
+	setscene SCENE_KOGASROOM_1
 	setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
 	waitsfx
 	end
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index ea462477b..3b3dee548 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -309,7 +309,7 @@ KurtScript_0x18e178:
 	clearevent EVENT_AZALEA_TOWN_KURT
 	waitsfx
 	special RestartMapMusic
-	setmapscene AZALEA_TOWN, 2
+	setmapscene AZALEA_TOWN, SCENE_AZALEATOWN_2
 	end
 
 KurtScript_0x18e3bd:
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm
index a66aa5126..ff8d33b4f 100644
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -60,7 +60,7 @@ UnknownScript_0x70035:
 	disappear LAKEOFRAGE_LANCE
 	clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
 	setevent EVENT_DECIDED_TO_HELP_LANCE
-	setmapscene MAHOGANY_MART_1F, 1
+	setmapscene MAHOGANY_MART_1F, SCENE_MAHOGANYMART1F_1
 	end
 
 UnknownScript_0x7004e:
@@ -99,7 +99,7 @@ UnknownScript_0x7007a:
 	waitsfx
 	itemnotify
 	closetext
-	setscene 0
+	setscene 0 ; Lake of Rage does not have a scene variable
 	appear LAKEOFRAGE_LANCE
 	end
 
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index eae0d03c2..f370538a9 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -5,8 +5,8 @@
 
 LancesRoom_MapScripts:
 	db 2 ; scene scripts
-	scene_script .LockDoor
-	scene_script .DummyScene
+	scene_script .LockDoor ; SCENE_LANCESROOM_0
+	scene_script .DummyScene ; SCENE_LANCESROOM_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .LancesRoomDoors
@@ -37,7 +37,7 @@ LancesRoom_MapScripts:
 	changeblock 4, 22, $34 ; wall
 	reloadmappart
 	closetext
-	setscene 1
+	setscene SCENE_LANCESROOM_1
 	setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
 	end
 
@@ -345,8 +345,8 @@ LancesRoom_MapEvents:
 	warp_event 5, 1, 2, HALL_OF_FAME
 
 	db 2 ; coord events
-	coord_event 4, 5, 1, Script_ApproachLanceFromLeft
-	coord_event 5, 5, 1, Script_ApproachLanceFromRight
+	coord_event 4, 5, SCENE_LANCESROOM_1, Script_ApproachLanceFromLeft
+	coord_event 5, 5, SCENE_LANCESROOM_1, Script_ApproachLanceFromRight
 
 	db 0 ; bg events
 
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index 78ae42318..b7dd2428d 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -7,8 +7,8 @@
 
 MahoganyMart1F_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .LanceUncoversStaircase
+	scene_script .DummyScene0 ; SCENE_MAHOGANYMART1F_0
+	scene_script .LanceUncoversStaircase ; SCENE_MAHOGANYMART1F_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .MahoganyMart1FStaircase
@@ -99,7 +99,7 @@ UnknownScript_0x6c38f:
 	applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c412
 	playsound SFX_EXIT_BUILDING
 	disappear MAHOGANYMART1F_LANCE
-	setscene 0
+	setscene SCENE_MAHOGANYMART1F_0
 	waitsfx
 	end
 
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index eb02ba0d9..c31550afd 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -6,8 +6,8 @@
 
 MahoganyTown_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_MAHOGANYTOWN_0
+	scene_script .DummyScene1 ; SCENE_MAHOGANYTOWN_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -253,8 +253,8 @@ MahoganyTown_MapEvents:
 	warp_event 9, 1, 3, ROUTE_43_MAHOGANY_GATE
 
 	db 2 ; coord events
-	coord_event 19, 8, 0, UnknownScript_0x190013
-	coord_event 19, 9, 0, UnknownScript_0x190013
+	coord_event 19, 8, SCENE_MAHOGANYTOWN_0, UnknownScript_0x190013
+	coord_event 19, 9, SCENE_MAHOGANYTOWN_0, UnknownScript_0x190013
 
 	db 4 ; bg events
 	bg_event 1, 5, BGEVENT_READ, MahoganyTownSign
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index 65bf3a6ad..254a66c02 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -1,7 +1,7 @@
 MobileBattleRoom_MapScripts:
 	db 2 ; scene scripts
-	scene_script .InitializeMobileBattleRoom
-	scene_script .DummyScene
+	scene_script .InitializeMobileBattleRoom ; SCENE_MOBILEBATTLEROOM_0
+	scene_script .DummyScene ; SCENE_MOBILEBATTLEROOM_1
 
 	db 0 ; callbacks
 
@@ -13,8 +13,8 @@ MobileBattleRoom_MapScripts:
 	end
 
 .InitializeAndPreparePokecenter2F:
-	setscene 1
-	setmapscene POKECENTER_2F, 5
+	setscene SCENE_MOBILEBATTLEROOM_1
+	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_5
 	end
 
 MapMobileBattleRoomSignpost0Script:
diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm
index 31fd04201..e5be1a979 100644
--- a/maps/MobileTradeRoomMobile.asm
+++ b/maps/MobileTradeRoomMobile.asm
@@ -1,7 +1,7 @@
 MobileTradeRoomMobile_MapScripts:
 	db 2 ; scene scripts
-	scene_script .InitializeMobileTradeRoomMobile
-	scene_script .DummyScene
+	scene_script .InitializeMobileTradeRoomMobile ; SCENE_MOBILETRADEROOMMOBILE_0
+	scene_script .DummyScene ; SCENE_MOBILETRADEROOMMOBILE_1
 
 	db 0 ; callbacks
 
@@ -13,8 +13,8 @@ MobileTradeRoomMobile_MapScripts:
 	end
 
 .InitializeAndPreparePokecenter2F:
-	setscene 1
-	setmapscene POKECENTER_2F, 4
+	setscene SCENE_MOBILETRADEROOMMOBILE_1
+	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_4
 	end
 
 MapMobileTradeRoomMobileSignpost0Script:
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index 510dc69a0..2ecc3fdd2 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -3,8 +3,8 @@
 
 MountMoon_MapScripts:
 	db 2 ; scene scripts
-	scene_script .RivalEncounter
-	scene_script .DummyScene
+	scene_script .RivalEncounter ; SCENE_MOUNTMOON_0
+	scene_script .DummyScene ; SCENE_MOUNTMOON_1
 
 	db 0 ; callbacks
 
@@ -64,7 +64,7 @@ MountMoon_MapScripts:
 	closetext
 	applymovement MOUNTMOON_SILVER, MountMoonSilverMovementAfter
 	disappear MOUNTMOON_SILVER
-	setscene 1
+	setscene SCENE_MOUNTMOON_1
 	setevent EVENT_BEAT_RIVAL_IN_MT_MOON
 	playmapmusic
 	end
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index 742c169c0..9e6d65dd5 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -8,8 +8,8 @@ MountMoonSquare_MapScripts:
 	scene_script .DummyScene
 
 	db 2 ; callbacks
-	callback MAPCALLBACK_NEWMAP, .DisappearMoonStone
-	callback MAPCALLBACK_OBJECTS, .DisappearRock
+	callback MAPCALLBACK_NEWMAP, .DisappearMoonStone ; SCENE_MOUNTMOONSQUARE_0
+	callback MAPCALLBACK_OBJECTS, .DisappearRock ; SCENE_MOUNTMOONSQUARE_1
 
 .DummyScene:
 	end
@@ -139,7 +139,7 @@ MountMoonSquare_MapEvents:
 	warp_event 13, 7, 1, MOUNT_MOON_GIFT_SHOP
 
 	db 1 ; coord events
-	coord_event 7, 11, 0, ClefairyDance
+	coord_event 7, 11, SCENE_MOUNTMOONSQUARE_0, ClefairyDance
 
 	db 2 ; bg events
 	bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index 5d85b2fbf..6c97a234b 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -4,8 +4,8 @@
 
 MrPokemonsHouse_MapScripts:
 	db 2 ; scene scripts
-	scene_script .MeetMrPokemon
-	scene_script .DummyScene
+	scene_script .MeetMrPokemon ; SCENE_MRPOKEMONSHOUSE_0
+	scene_script .DummyScene ; SCENE_MRPOKEMONSHOUSE_1
 
 	db 0 ; callbacks
 
@@ -123,9 +123,9 @@ MrPokemonsHouse_OakScript:
 	setevent EVENT_RIVAL_NEW_BARK_TOWN
 	setevent EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
 	clearevent EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
-	setscene 1
-	setmapscene CHERRYGROVE_CITY, 1
-	setmapscene ELMS_LAB, 3
+	setscene SCENE_MRPOKEMONSHOUSE_1
+	setmapscene CHERRYGROVE_CITY, SCENE_CHERRYGROVECITY_1
+	setmapscene ELMS_LAB, SCENE_ELMSLAB_3
 	specialphonecall SPECIALCALL_ROBBED
 	clearevent EVENT_COP_IN_ELMS_LAB
 	checkevent EVENT_GOT_TOTODILE_FROM_ELM
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index 82d5364cd..1d70cb9f5 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -5,8 +5,8 @@
 
 NewBarkTown_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_NEWBARKTOWN_0
+	scene_script .DummyScene1 ; SCENE_NEWBARKTOWN_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -289,8 +289,8 @@ NewBarkTown_MapEvents:
 	warp_event 11, 13, 1, ELMS_HOUSE
 
 	db 2 ; coord events
-	coord_event 1, 8, 0, NewBarkTown_TeacherStopsYouScene1
-	coord_event 1, 9, 0, NewBarkTown_TeacherStopsYouScene2
+	coord_event 1, 8, SCENE_NEWBARKTOWN_0, NewBarkTown_TeacherStopsYouScene1
+	coord_event 1, 9, SCENE_NEWBARKTOWN_0, NewBarkTown_TeacherStopsYouScene2
 
 	db 4 ; bg events
 	bg_event 8, 8, BGEVENT_READ, NewBarkTownSign
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index a7ef4f8b6..059de2f67 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -6,8 +6,8 @@
 
 OlivineCity_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_OLIVINECITY_0
+	scene_script .DummyScene1 ; SCENE_OLIVINECITY_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -39,7 +39,7 @@ UnknownScript_0x1a8833:
 	applymovement PLAYER, MovementData_0x1a88f4
 	spriteface PLAYER, RIGHT
 	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88db
-	setscene 1
+	setscene SCENE_OLIVINECITY_1
 	disappear OLIVINECITY_OLIVINE_RIVAL
 	special RestartMapMusic
 	variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
@@ -64,7 +64,7 @@ UnknownScript_0x1a886b:
 	spriteface PLAYER, RIGHT
 	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88e8
 	disappear OLIVINECITY_OLIVINE_RIVAL
-	setscene 1
+	setscene SCENE_OLIVINECITY_1
 	special RestartMapMusic
 	variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
 	special LoadUsedSpritesGFX
@@ -302,8 +302,8 @@ OlivineCity_MapEvents:
 	warp_event 20, 27, 2, OLIVINE_PORT_PASSAGE
 
 	db 2 ; coord events
-	coord_event 13, 12, 0, UnknownScript_0x1a8833
-	coord_event 13, 13, 0, UnknownScript_0x1a886b
+	coord_event 13, 12, SCENE_OLIVINECITY_0, UnknownScript_0x1a8833
+	coord_event 13, 13, SCENE_OLIVINECITY_0, UnknownScript_0x1a886b
 
 	db 7 ; bg events
 	bg_event 17, 11, BGEVENT_READ, OlivineCitySign
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index 399cd2f69..43f5be286 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -9,8 +9,8 @@
 
 OlivinePort_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .LeaveFastShip
+	scene_script .DummyScene0 ; SCENE_OLIVINEPORT_0
+	scene_script .LeaveFastShip ; SCENE_OLIVINEPORT_1
 
 	db 0 ; callbacks
 
@@ -24,7 +24,7 @@ OlivinePort_MapScripts:
 .LeaveFastShipScript:
 	applymovement PLAYER, MovementData_0x74a32
 	appear OLIVINEPORT_SAILOR1
-	setscene 0
+	setscene SCENE_OLIVINEPORT_0
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	blackoutmod OLIVINE_CITY
 	end
@@ -62,7 +62,7 @@ SailorScript_0x748c0:
 UnknownScript_0x7490a:
 	clearevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
 	appear OLIVINEPORT_SAILOR1
-	setmapscene FAST_SHIP_1F, 1
+	setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_1
 	warp FAST_SHIP_1F, 25, 1
 	end
 
@@ -390,7 +390,7 @@ OlivinePort_MapEvents:
 	warp_event 7, 23, 1, FAST_SHIP_1F
 
 	db 1 ; coord events
-	coord_event 7, 15, 0, UnknownScript_0x7491f
+	coord_event 7, 15, SCENE_OLIVINEPORT_0, UnknownScript_0x7491f
 
 	db 1 ; bg events
 	bg_event 1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index 34e53f347..ba421221d 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -7,8 +7,8 @@
 
 PlayersHouse1F_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_PLAYERSHOUSE1F_0
+	scene_script .DummyScene1 ; SCENE_PLAYERSHOUSE1F_1
 
 	db 0 ; callbacks
 
@@ -41,7 +41,7 @@ UnknownScript_0x7a4f6:
 	setflag ENGINE_POKEGEAR
 	setflag ENGINE_PHONE_CARD
 	addcellnum PHONE_MOM
-	setscene 1
+	setscene SCENE_PLAYERSHOUSE1F_1
 	setevent EVENT_PLAYERS_HOUSE_MOM_1
 	clearevent EVENT_PLAYERS_HOUSE_MOM_2
 	writetext UnknownText_0x7a6bd
@@ -114,7 +114,7 @@ MomScript_0x7a582:
 	faceplayer
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	checkscene
-	iffalse UnknownScript_0x7a572
+	iffalse UnknownScript_0x7a572 ; SCENE_PLAYERSHOUSE1F_0
 	opentext
 	checkevent EVENT_FIRST_TIME_BANKING_WITH_MOM
 	iftrue UnknownScript_0x7a5af
@@ -392,8 +392,8 @@ PlayersHouse1F_MapEvents:
 	warp_event 9, 0, 1, PLAYERS_HOUSE_2F
 
 	db 2 ; coord events
-	coord_event 8, 4, 0, UnknownScript_0x7a4d8
-	coord_event 9, 4, 0, UnknownScript_0x7a4db
+	coord_event 8, 4, SCENE_PLAYERSHOUSE1F_0, UnknownScript_0x7a4d8
+	coord_event 9, 4, SCENE_PLAYERSHOUSE1F_0, UnknownScript_0x7a4db
 
 	db 4 ; bg events
 	bg_event 0, 1, BGEVENT_READ, StoveScript
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 8b7eafc61..7bdc6e670 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -6,12 +6,12 @@
 
 Pokecenter2F_MapScripts:
 	db 6 ; scene scripts
-	scene_script .Scene0
-	scene_script .Scene1
-	scene_script .Scene2
-	scene_script .Scene3
-	scene_script .Scene4
-	scene_script .Scene5
+	scene_script .Scene0 ; SCENE_POKECENTER2F_0
+	scene_script .Scene1 ; SCENE_POKECENTER2F_1
+	scene_script .Scene2 ; SCENE_POKECENTER2F_2
+	scene_script .Scene3 ; SCENE_POKECENTER2F_3
+	scene_script .Scene4 ; SCENE_POKECENTER2F_4
+	scene_script .Scene5 ; SCENE_POKECENTER2F_5
 
 	db 0 ; callbacks
 
@@ -374,15 +374,15 @@ LinkReceptionistScript_TimeCapsule:
 Script_LeftCableTradeCenter:
 	special WaitForOtherPlayerToExit
 	scall Script_WalkOutOfLinkTradeRoom
-	setscene 0
-	setmapscene TRADE_CENTER, 0
+	setscene SCENE_POKECENTER2F_0
+	setmapscene TRADE_CENTER, SCENE_TRADECENTER_0
 	end
 
 Script_LeftMobileTradeRoom:
 	special Function101220
 	scall Script_WalkOutOfMobileTradeRoom
-	setscene 0
-	setmapscene MOBILE_TRADE_ROOM_MOBILE, 0
+	setscene SCENE_POKECENTER2F_0
+	setmapscene MOBILE_TRADE_ROOM_MOBILE, SCENE_MOBILETRADEROOMMOBILE_0
 	end
 
 Script_WalkOutOfMobileTradeRoom:
@@ -394,15 +394,15 @@ Script_WalkOutOfMobileTradeRoom:
 Script_LeftCableColosseum:
 	special WaitForOtherPlayerToExit
 	scall Script_WalkOutOfLinkBattleRoom
-	setscene 0
-	setmapscene COLOSSEUM, 0
+	setscene SCENE_POKECENTER2F_0
+	setmapscene COLOSSEUM, SCENE_COLOSSEUM_0
 	end
 
 Script_LeftMobileBattleRoom:
 	special Function101220
 	scall Script_WalkOutOfMobileBattleRoom
-	setscene 0
-	setmapscene MOBILE_BATTLE_ROOM, 0
+	setscene SCENE_POKECENTER2F_0
+	setmapscene MOBILE_BATTLE_ROOM, SCENE_MOBILEBATTLEROOM_0
 	end
 
 Script_WalkOutOfMobileBattleRoom:
@@ -577,8 +577,8 @@ Script_LeftTimeCapsule:
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown
 	applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2
 .Done:
-	setscene 0
-	setmapscene TIME_CAPSULE, 0
+	setscene SCENE_POKECENTER2F_0
+	setmapscene TIME_CAPSULE, SCENE_TIMECAPSULE_0
 	end
 
 MapPokecenter2FSignpost0Script:
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index 1ecdc7656..e52e9f540 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -9,8 +9,8 @@
 
 PowerPlant_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_POWERPLANT_0
+	scene_script .DummyScene1 ; SCENE_POWERPLANT_1
 
 	db 0 ; callbacks
 
@@ -40,7 +40,7 @@ PowerPlantGuardPhoneScript:
 	closetext
 	spriteface PLAYER, DOWN
 	applymovement POWERPLANT_OFFICER1, MovementData_0x188eda
-	setscene 0
+	setscene SCENE_POWERPLANT_0
 	end
 
 OfficerScript_0x188df5:
@@ -146,8 +146,8 @@ PowerPlantManager:
 	setevent EVENT_MET_MANAGER_AT_POWER_PLANT
 	clearevent EVENT_CERULEAN_GYM_ROCKET
 	clearevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM
-	setmapscene CERULEAN_GYM, 1
-	setscene 1
+	setmapscene CERULEAN_GYM, SCENE_CERULEANGYM_1
+	setscene SCENE_POWERPLANT_1
 	end
 
 UnknownScript_0x188e8d:
@@ -394,7 +394,7 @@ PowerPlant_MapEvents:
 	warp_event 3, 17, 2, ROUTE_10_NORTH
 
 	db 1 ; coord events
-	coord_event 5, 12, 1, PowerPlantGuardPhoneScript
+	coord_event 5, 12, SCENE_POWERPLANT_1, PowerPlantGuardPhoneScript
 
 	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, PowerPlantBookshelf
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index 9cf31369e..8f3d47a56 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -7,9 +7,9 @@
 
 RadioTower5F_MapScripts:
 	db 3 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
-	scene_script .DummyScene2
+	scene_script .DummyScene0 ; SCENE_RADIOTOWER5F_0
+	scene_script .DummyScene1 ; SCENE_RADIOTOWER5F_1
+	scene_script .DummyScene2 ; SCENE_RADIOTOWER5F_2
 
 	db 0 ; callbacks
 
@@ -45,7 +45,7 @@ FakeDirectorScript:
 	buttonsound
 	verbosegiveitem BASEMENT_KEY
 	closetext
-	setscene 1
+	setscene SCENE_RADIOTOWER5F_1
 	setevent EVENT_BEAT_ROCKET_EXECUTIVEM_3
 	end
 
@@ -124,8 +124,8 @@ RadioTower5FRocketBossScene:
 	writetext RadioTower5FDirectorDescribeClearBellText
 	waitbutton
 	closetext
-	setscene 2
-	setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, 0
+	setscene SCENE_RADIOTOWER5F_2
+	setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_ECRUTEAKTINTOWERENTRANCE_0
 	setevent EVENT_GOT_CLEAR_BELL
 	setevent EVENT_TEAM_ROCKET_DISBANDED
 	jump .UselessJump
@@ -426,8 +426,8 @@ RadioTower5F_MapEvents:
 	warp_event 12, 0, 3, RADIO_TOWER_4F
 
 	db 2 ; coord events
-	coord_event 0, 3, 0, FakeDirectorScript
-	coord_event 16, 5, 1, RadioTower5FRocketBossScene
+	coord_event 0, 3, SCENE_RADIOTOWER5F_0, FakeDirectorScript
+	coord_event 16, 5, SCENE_RADIOTOWER5F_1, RadioTower5FRocketBossScene
 
 	db 5 ; bg events
 	bg_event 3, 0, BGEVENT_READ, MapRadioTower5FSignpost0Script
diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm
index d2df553f0..741b40f15 100644
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -3,7 +3,7 @@
 
 Route16Gate_MapScripts:
 	db 1 ; scene scripts
-	scene_script .DummyScene
+	scene_script .DummyScene ; SCENE_ROUTE16GATE_0
 
 	db 0 ; callbacks
 
@@ -68,8 +68,8 @@ Route16Gate_MapEvents:
 	warp_event 9, 5, 3, ROUTE_16
 
 	db 2 ; coord events
-	coord_event 5, 4, 0, UnknownScript_0x733ed
-	coord_event 5, 5, 0, UnknownScript_0x733ed
+	coord_event 5, 4, SCENE_ROUTE16GATE_0, UnknownScript_0x733ed
+	coord_event 5, 5, SCENE_ROUTE16GATE_0, UnknownScript_0x733ed
 
 	db 0 ; bg events
 
diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm
index c448d333d..0831a79a1 100644
--- a/maps/Route17Route18Gate.asm
+++ b/maps/Route17Route18Gate.asm
@@ -3,7 +3,7 @@
 
 Route17Route18Gate_MapScripts:
 	db 1 ; scene scripts
-	scene_script .DummyScene
+	scene_script .DummyScene ; SCENE_ROUTE17ROUTE18GATE_0
 
 	db 0 ; callbacks
 
@@ -59,8 +59,8 @@ Route17Route18Gate_MapEvents:
 	warp_event 9, 5, 2, ROUTE_18
 
 	db 2 ; coord events
-	coord_event 5, 4, 0, UnknownScript_0x73611
-	coord_event 5, 5, 0, UnknownScript_0x73611
+	coord_event 5, 4, SCENE_ROUTE17ROUTE18GATE_0, UnknownScript_0x73611
+	coord_event 5, 5, SCENE_ROUTE17ROUTE18GATE_0, UnknownScript_0x73611
 
 	db 0 ; bg events
 
diff --git a/maps/Route25.asm b/maps/Route25.asm
index a67718922..d6cd9ba09 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -13,8 +13,8 @@
 
 Route25_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_ROUTE25_0
+	scene_script .DummyScene1 ; SCENE_ROUTE25_1
 
 	db 0 ; callbacks
 
@@ -46,7 +46,7 @@ Route25MistyDate1Script:
 	applymovement ROUTE25_MISTY, MovementData_0x19f000
 	disappear ROUTE25_MISTY
 	clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
-	setscene 0
+	setscene SCENE_ROUTE25_0
 	special RestartMapMusic
 	end
 
@@ -72,7 +72,7 @@ Route25MistyDate2Script:
 	applymovement ROUTE25_MISTY, MovementData_0x19f000
 	disappear ROUTE25_MISTY
 	clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
-	setscene 0
+	setscene SCENE_ROUTE25_0
 	special RestartMapMusic
 	end
 
@@ -434,8 +434,8 @@ Route25_MapEvents:
 	warp_event 47, 5, 1, BILLS_HOUSE
 
 	db 2 ; coord events
-	coord_event 42, 6, 1, Route25MistyDate1Script
-	coord_event 42, 7, 1, Route25MistyDate2Script
+	coord_event 42, 6, SCENE_ROUTE25_1, Route25MistyDate1Script
+	coord_event 42, 7, SCENE_ROUTE25_1, Route25MistyDate2Script
 
 	db 2 ; bg events
 	bg_event 45, 5, BGEVENT_READ, BillsHouseSign
diff --git a/maps/Route27.asm b/maps/Route27.asm
index bc39ed3cf..366ca5f4d 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -11,8 +11,8 @@
 
 Route27_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_ROUTE27_0
+	scene_script .DummyScene1 ; SCENE_ROUTE27_1
 
 	db 0 ; callbacks
 
@@ -40,7 +40,7 @@ UnknownScript_0x1a088c:
 	writetext Route27FisherText
 	waitbutton
 	closetext
-	setscene 1
+	setscene SCENE_ROUTE27_1
 	end
 
 Route27FisherScript:
@@ -474,8 +474,8 @@ Route27_MapEvents:
 	warp_event 36, 5, 2, TOHJO_FALLS
 
 	db 2 ; coord events
-	coord_event 18, 10, 0, UnknownScript_0x1a0873
-	coord_event 19, 10, 0, UnknownScript_0x1a0881
+	coord_event 18, 10, SCENE_ROUTE27_0, UnknownScript_0x1a0873
+	coord_event 19, 10, SCENE_ROUTE27_0, UnknownScript_0x1a0881
 
 	db 1 ; bg events
 	bg_event 25, 7, BGEVENT_READ, TohjoFallsSign
diff --git a/maps/Route29.asm b/maps/Route29.asm
index 39fc0c960..995e4735d 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -10,8 +10,8 @@
 
 Route29_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_ROUTE29_0
+	scene_script .DummyScene1 ; SCENE_ROUTE29_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .Tuscany
@@ -57,7 +57,7 @@ Route29Tutorial1:
 	writetext CatchingTutorialDebriefText
 	waitbutton
 	closetext
-	setscene 0
+	setscene SCENE_ROUTE29_0
 	setevent EVENT_LEARNED_TO_CATCH_POKEMON
 	end
 
@@ -82,7 +82,7 @@ Route29Tutorial2:
 	writetext CatchingTutorialDebriefText
 	waitbutton
 	closetext
-	setscene 0
+	setscene SCENE_ROUTE29_0
 	setevent EVENT_LEARNED_TO_CATCH_POKEMON
 	end
 
@@ -91,7 +91,7 @@ Script_RefusedTutorial1:
 	waitbutton
 	closetext
 	applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1b
-	setscene 0
+	setscene SCENE_ROUTE29_0
 	end
 
 Script_RefusedTutorial2:
@@ -99,7 +99,7 @@ Script_RefusedTutorial2:
 	waitbutton
 	closetext
 	applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2b
-	setscene 0
+	setscene SCENE_ROUTE29_0
 	end
 
 CatchingTutorialDudeScript:
@@ -420,8 +420,8 @@ Route29_MapEvents:
 	warp_event 27, 1, 3, ROUTE_29_ROUTE_46_GATE
 
 	db 2 ; coord events
-	coord_event 53, 8, 1, Route29Tutorial1
-	coord_event 53, 9, 1, Route29Tutorial2
+	coord_event 53, 8, SCENE_ROUTE29_1, Route29Tutorial1
+	coord_event 53, 9, SCENE_ROUTE29_1, Route29Tutorial2
 
 	db 2 ; bg events
 	bg_event 51, 7, BGEVENT_READ, Route29Sign1
diff --git a/maps/Route32.asm b/maps/Route32.asm
index 6a93d73e3..b7e6b0af1 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -16,9 +16,9 @@
 
 Route32_MapScripts:
 	db 3 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
-	scene_script .DummyScene2
+	scene_script .DummyScene0 ; SCENE_ROUTE32_0
+	scene_script .DummyScene1 ; SCENE_ROUTE32_1
+	scene_script .DummyScene2 ; SCENE_ROUTE32_2
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .Frieda
@@ -125,7 +125,7 @@ Route32WannaBuyASlowpokeTailScript:
 SlowpokeTailSalesmanScript:
 	faceplayer
 _OfferToSellSlowpokeTail:
-	setscene 2
+	setscene SCENE_ROUTE32_2
 	opentext
 	writetext Text_MillionDollarSlowpokeTail
 	yesorno
@@ -936,8 +936,8 @@ Route32_MapEvents:
 	warp_event 6, 79, 4, UNION_CAVE_1F
 
 	db 2 ; coord events
-	coord_event 18, 8, 0, Route32CooltrainerMStopsYouScene
-	coord_event 7, 71, 1, Route32WannaBuyASlowpokeTailScript
+	coord_event 18, 8, SCENE_ROUTE32_0, Route32CooltrainerMStopsYouScene
+	coord_event 7, 71, SCENE_ROUTE32_1, Route32WannaBuyASlowpokeTailScript
 
 	db 6 ; bg events
 	bg_event 13, 5, BGEVENT_READ, Route32Sign
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index 15d5eb5dc..d5f846657 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -5,9 +5,9 @@
 
 Route35NationalParkGate_MapScripts:
 	db 3 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
-	scene_script .LeaveContestEarly
+	scene_script .DummyScene0 ; SCENE_ROUTE35NATIONALPARKGATE_0
+	scene_script .DummyScene1 ; SCENE_ROUTE35NATIONALPARKGATE_1
+	scene_script .LeaveContestEarly ; SCENE_ROUTE35NATIONALPARKGATE_2
 
 	db 2 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning
@@ -26,11 +26,11 @@ Route35NationalParkGate_MapScripts:
 .CheckIfContestRunning:
 	checkflag ENGINE_BUG_CONTEST_TIMER
 	iftrue .BugContestIsRunning
-	setscene 0
+	setscene SCENE_ROUTE35NATIONALPARKGATE_0
 	return
 
 .BugContestIsRunning:
-	setscene 2
+	setscene SCENE_ROUTE35NATIONALPARKGATE_2
 	return
 
 .CheckIfContestAvailable:
diff --git a/maps/Route36.asm b/maps/Route36.asm
index e383cfa6b..5974e4eff 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -11,8 +11,8 @@
 
 Route36_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_ROUTE36_0
+	scene_script .DummyScene1 ; SCENE_ROUTE36_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .ArthurCallback
@@ -42,9 +42,9 @@ Route36SuicuneScript:
 	disappear ROUTE36_SUICUNE
 	spriteface PLAYER, DOWN
 	pause 10
-	setscene 0
+	setscene SCENE_ROUTE36_0
 	clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
-	setmapscene CIANWOOD_CITY, 1
+	setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_1
 	end
 
 SudowoodoScript:
@@ -667,8 +667,8 @@ Route36_MapEvents:
 	warp_event 48, 13, 2, ROUTE_36_RUINS_OF_ALPH_GATE
 
 	db 2 ; coord events
-	coord_event 20, 7, 1, Route36SuicuneScript
-	coord_event 22, 7, 1, Route36SuicuneScript
+	coord_event 20, 7, SCENE_ROUTE36_1, Route36SuicuneScript
+	coord_event 22, 7, SCENE_ROUTE36_1, Route36SuicuneScript
 
 	db 4 ; bg events
 	bg_event 29, 1, BGEVENT_READ, Route36TrainerTips2
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index 6668b2457..fb25caa22 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -14,9 +14,9 @@
 
 Route36NationalParkGate_MapScripts:
 	db 3 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
-	scene_script .LeaveContestEarly
+	scene_script .DummyScene0 ; SCENE_ROUTE36NATIONALPARKGATE_0
+	scene_script .DummyScene1 ; SCENE_ROUTE36NATIONALPARKGATE_1
+	scene_script .LeaveContestEarly ; SCENE_ROUTE36NATIONALPARKGATE_2
 
 	db 2 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning
@@ -35,11 +35,11 @@ Route36NationalParkGate_MapScripts:
 .CheckIfContestRunning:
 	checkflag ENGINE_BUG_CONTEST_TIMER
 	iftrue .BugContestIsRunning
-	setscene 0
+	setscene SCENE_ROUTE36NATIONALPARKGATE_0
 	return
 
 .BugContestIsRunning:
-	setscene 2
+	setscene SCENE_ROUTE36NATIONALPARKGATE_2
 	return
 
 .CheckIfContestAvailable:
diff --git a/maps/Route42.asm b/maps/Route42.asm
index 91590df01..955c266fd 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -11,8 +11,8 @@
 
 Route42_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_ROUTE42_0
+	scene_script .DummyScene1 ; SCENE_ROUTE42_1
 
 	db 0 ; callbacks
 
@@ -29,9 +29,9 @@ Route42SuicuneScript:
 	applymovement ROUTE42_SUICUNE, MovementData_0x1a9356
 	disappear ROUTE42_SUICUNE
 	pause 10
-	setscene 0
+	setscene SCENE_ROUTE42_0
 	clearevent EVENT_SAW_SUICUNE_ON_ROUTE_36
-	setmapscene ROUTE_36, 1
+	setmapscene ROUTE_36, SCENE_ROUTE36_1
 	end
 
 TrainerFisherTully:
@@ -327,7 +327,7 @@ Route42_MapEvents:
 	warp_event 46, 7, 3, MOUNT_MORTAR_1F_OUTSIDE
 
 	db 1 ; coord events
-	coord_event 24, 14, 1, Route42SuicuneScript
+	coord_event 24, 14, SCENE_ROUTE42_1, Route42SuicuneScript
 
 	db 5 ; bg events
 	bg_event 4, 10, BGEVENT_READ, Route42Sign1
diff --git a/maps/Route43.asm b/maps/Route43.asm
index 1860caa49..f12d887c6 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -17,11 +17,11 @@ Route43_MapScripts:
 .CheckIfRockets:
 	checkevent EVENT_CLEARED_ROCKET_HIDEOUT
 	iftrue .NoRockets
-	setmapscene ROUTE_43_GATE, 0
+	setmapscene ROUTE_43_GATE, SCENE_ROUTE43GATE_0
 	return
 
 .NoRockets:
-	setmapscene ROUTE_43_GATE, 1
+	setmapscene ROUTE_43_GATE, SCENE_ROUTE43GATE_1
 	return
 
 TrainerCamperSpencer:
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index 81935c025..eb94c573c 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -7,8 +7,8 @@ ROUTE43GATE_TOLL EQU 1000
 
 Route43Gate_MapScripts:
 	db 2 ; scene scripts
-	scene_script .RocketShakedown
-	scene_script .DummyScene
+	scene_script .RocketShakedown ; SCENE_ROUTE43GATE_0
+	scene_script .DummyScene ; SCENE_ROUTE43GATE_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckIfRockets
@@ -23,11 +23,11 @@ Route43Gate_MapScripts:
 .CheckIfRockets:
 	checkevent EVENT_CLEARED_ROCKET_HIDEOUT
 	iftrue .NoRockets
-	setmapscene ROUTE_43, 0
+	setmapscene ROUTE_43, 0 ; Route 43 does not have a scene variable
 	return
 
 .NoRockets:
-	setmapscene ROUTE_43, 1
+	setmapscene ROUTE_43, 1 ; Route 43 does not have a scene variable
 	return
 
 .RocketTakeover:
@@ -35,7 +35,7 @@ Route43Gate_MapScripts:
 	checkcode VAR_FACING
 	if_equal DOWN, RocketScript_Southbound
 	if_equal UP, RocketScript_Northbound
-	setscene 1
+	setscene SCENE_ROUTE43GATE_1
 	end
 
 RocketScript_Southbound:
@@ -67,7 +67,7 @@ RocketScript_ShakeDownSouth:
 	closetext
 	applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassSouth
 	applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassSouth
-	setscene 1
+	setscene SCENE_ROUTE43GATE_1
 	special RestartMapMusic
 	end
 
@@ -99,7 +99,7 @@ RocketScript_ShakeDownNorth:
 	closetext
 	applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassNorth
 	applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassNorth
-	setscene 1
+	setscene SCENE_ROUTE43GATE_1
 	special RestartMapMusic
 	end
 
diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm
index e1d30e461..8aa6030da 100644
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -1,7 +1,7 @@
 RuinsOfAlphAerodactylChamber_MapScripts:
 	db 2 ; scene scripts
-	scene_script .CheckWall
-	scene_script .DummyScene
+	scene_script .CheckWall ; SCENE_RUINSOFALPHAERODACTYLCHAMBER_0
+	scene_script .DummyScene ; SCENE_RUINSOFALPHAERODACTYLCHAMBER_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
@@ -41,7 +41,7 @@ RuinsOfAlphAerodactylChamber_MapScripts:
 	changeblock 4, 0, $30 ; open wall
 	reloadmappart
 	earthquake 50
-	setscene 1
+	setscene SCENE_RUINSOFALPHAERODACTYLCHAMBER_1
 	closetext
 	end
 
@@ -57,7 +57,7 @@ UnknownScript_0x58df7:
 	setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
 	setevent EVENT_SOLVED_AERODACTYL_PUZZLE
 	setflag ENGINE_UNLOCKED_UNOWNS_S_TO_W
-	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
+	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_1
 	earthquake 30
 	showemote EMOTE_SHOCK, PLAYER, 15
 	changeblock 2, 2, $18 ; left hole
diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm
index 81282300b..23f4df863 100644
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -1,7 +1,7 @@
 RuinsOfAlphHoOhChamber_MapScripts:
 	db 2 ; scene scripts
-	scene_script .CheckWall
-	scene_script .DummyScene
+	scene_script .CheckWall ; SCENE_RUINSOFALPHHOOHCHAMBER_0
+	scene_script .DummyScene ; SCENE_RUINSOFALPHHOOHCHAMBER_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
@@ -42,7 +42,7 @@ RuinsOfAlphHoOhChamber_MapScripts:
 	changeblock 4, 0, $30 ; open wall
 	reloadmappart
 	earthquake 50
-	setscene 1
+	setscene SCENE_RUINSOFALPHHOOHCHAMBER_1
 	closetext
 	end
 
@@ -58,7 +58,7 @@ UnknownScript_0x585ba:
 	setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
 	setevent EVENT_SOLVED_HO_OH_PUZZLE
 	setflag ENGINE_UNLOCKED_UNOWNS_X_TO_Z
-	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
+	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_1
 	earthquake 30
 	showemote EMOTE_SHOCK, PLAYER, 15
 	changeblock 2, 2, $18 ; left hole
diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm
index 445cb36b9..4b5c1574c 100644
--- a/maps/RuinsOfAlphInnerChamber.asm
+++ b/maps/RuinsOfAlphInnerChamber.asm
@@ -5,8 +5,8 @@
 
 RuinsOfAlphInnerChamber_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .UnownAppear
+	scene_script .DummyScene0 ; SCENE_RUINSOFALPHINNERCHAMBER_0
+	scene_script .UnownAppear ; SCENE_RUINSOFALPHINNERCHAMBER_1
 
 	db 0 ; callbacks
 
@@ -22,7 +22,7 @@ RuinsOfAlphInnerChamber_MapScripts:
 	writetext RuinsOfAlphStrangePresenceText
 	waitbutton
 	closetext
-	setscene 0
+	setscene SCENE_RUINSOFALPHINNERCHAMBER_0
 	setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
 	clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
 	end
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index 26743a3df..04d5d121f 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -4,8 +4,8 @@
 
 RuinsOfAlphKabutoChamber_MapScripts:
 	db 2 ; scene scripts
-	scene_script .CheckWall
-	scene_script .DummyScene
+	scene_script .CheckWall ; SCENE_RUINSOFALPHKABUTOCHAMBER_0
+	scene_script .DummyScene ; SCENE_RUINSOFALPHKABUTOCHAMBER_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
@@ -45,7 +45,7 @@ RuinsOfAlphKabutoChamber_MapScripts:
 	changeblock 4, 0, $30 ; open wall
 	reloadmappart
 	earthquake 50
-	setscene 1
+	setscene SCENE_RUINSOFALPHKABUTOCHAMBER_1
 	closetext
 	end
 
@@ -65,7 +65,7 @@ UnknownScript_0x58778:
 	setevent EVENT_SOLVED_KABUTO_PUZZLE
 	setflag ENGINE_UNLOCKED_UNOWNS_A_TO_K
 	setevent EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
-	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
+	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_1
 	earthquake 30
 	showemote EMOTE_SHOCK, PLAYER, 15
 	changeblock 2, 2, $18 ; left hole
diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm
index 490215ea3..9e7bccd0b 100644
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -1,7 +1,7 @@
 RuinsOfAlphOmanyteChamber_MapScripts:
 	db 2 ; scene scripts
-	scene_script .CheckWall
-	scene_script .DummyScene
+	scene_script .CheckWall ; SCENE_RUINSOFALPHOMANYTECHAMBER_0
+	scene_script .DummyScene ; SCENE_RUINSOFALPHOMANYTECHAMBER_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
@@ -42,7 +42,7 @@ RuinsOfAlphOmanyteChamber_MapScripts:
 	changeblock 4, 0, $30 ; open wall
 	reloadmappart
 	earthquake 50
-	setscene 1
+	setscene SCENE_RUINSOFALPHOMANYTECHAMBER_1
 	closetext
 	end
 
@@ -58,7 +58,7 @@ UnknownScript_0x58c36:
 	setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
 	setevent EVENT_SOLVED_OMANYTE_PUZZLE
 	setflag ENGINE_UNLOCKED_UNOWNS_L_TO_R
-	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
+	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_1
 	earthquake 30
 	showemote EMOTE_SHOCK, PLAYER, 15
 	changeblock 2, 2, $18 ; left hole
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index c6197632a..36d377e31 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -7,8 +7,8 @@
 
 RuinsOfAlphOutside_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_RUINSOFALPHOUTSIDE_0
+	scene_script .DummyScene1 ; SCENE_RUINSOFALPHOUTSIDE_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .ScientistCallback
@@ -33,12 +33,12 @@ RuinsOfAlphOutside_MapScripts:
 
 .YesScientist:
 	appear RUINSOFALPHOUTSIDE_SCIENTIST
-	setscene 1
+	setscene SCENE_RUINSOFALPHOUTSIDE_1
 	return
 
 .NoScientist:
 	disappear RUINSOFALPHOUTSIDE_SCIENTIST
-	setscene 0
+	setscene SCENE_RUINSOFALPHOUTSIDE_0
 	return
 
 RuinsOfAlphOutsideScientistScene1:
@@ -64,7 +64,7 @@ UnknownScript_0x58044:
 	disappear RUINSOFALPHOUTSIDE_SCIENTIST
 	stopfollow
 	applymovement PLAYER, MovementData_0x580c5
-	setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, 1
+	setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, SCENE_RUINSOFALPHRESEARCHCENTER_1
 	warpcheck
 	end
 
@@ -295,8 +295,8 @@ RuinsOfAlphOutside_MapEvents:
 	warp_event 13, 21, 2, ROUTE_32_RUINS_OF_ALPH_GATE
 
 	db 2 ; coord events
-	coord_event 11, 14, 1, RuinsOfAlphOutsideScientistScene1
-	coord_event 10, 15, 1, RuinsOfAlphOutsideScientistScene2
+	coord_event 11, 14, SCENE_RUINSOFALPHOUTSIDE_1, RuinsOfAlphOutsideScientistScene1
+	coord_event 10, 15, SCENE_RUINSOFALPHOUTSIDE_1, RuinsOfAlphOutsideScientistScene2
 
 	db 3 ; bg events
 	bg_event 16, 8, BGEVENT_READ, RuinsOfAlphOutsideSignpost0Script
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index f5b1e1564..b30fb41af 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -5,8 +5,8 @@
 
 RuinsOfAlphResearchCenter_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .GetUnownDex
+	scene_script .DummyScene0 ; SCENE_RUINSOFALPHRESEARCHCENTER_0
+	scene_script .GetUnownDex ; SCENE_RUINSOFALPHRESEARCHCENTER_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .ScientistCallback
@@ -20,7 +20,7 @@ RuinsOfAlphResearchCenter_MapScripts:
 
 .ScientistCallback:
 	checkscene
-	if_equal 1, .ShowScientist
+	if_equal SCENE_RUINSOFALPHRESEARCHCENTER_1, .ShowScientist
 	return
 
 .ShowScientist:
@@ -53,7 +53,7 @@ RuinsOfAlphResearchCenter_MapScripts:
 	waitbutton
 	closetext
 	applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59276
-	setscene 0
+	setscene SCENE_RUINSOFALPHRESEARCHCENTER_0
 	special RestartMapMusic
 	end
 
diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm
index 205bad774..c183aeedf 100644
--- a/maps/SaffronMagnetTrainStation.asm
+++ b/maps/SaffronMagnetTrainStation.asm
@@ -6,7 +6,7 @@
 
 SaffronMagnetTrainStation_MapScripts:
 	db 1 ; scene scripts
-	scene_script .DummyScene
+	scene_script .DummyScene ; SCENE_SAFFRONMAGNETTRAINSTATION_0
 
 	db 0 ; callbacks
 
@@ -223,7 +223,7 @@ SaffronMagnetTrainStation_MapEvents:
 	warp_event 11, 5, 3, GOLDENROD_MAGNET_TRAIN_STATION
 
 	db 1 ; coord events
-	coord_event 11, 6, 0, Script_ArriveFromGoldenrod
+	coord_event 11, 6, SCENE_SAFFRONMAGNETTRAINSTATION_0, Script_ArriveFromGoldenrod
 
 	db 0 ; bg events
 
diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm
index 518c20e4b..bf1847a77 100644
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -55,7 +55,7 @@ TrainerGruntM1:
 	closetext
 	setevent EVENT_CLEARED_SLOWPOKE_WELL
 	variablesprite SPRITE_AZALEA_ROCKET, SPRITE_SILVER
-	setmapscene AZALEA_TOWN, 1
+	setmapscene AZALEA_TOWN, SCENE_AZALEATOWN_1
 	clearevent EVENT_ILEX_FOREST_APPRENTICE
 	clearevent EVENT_ILEX_FOREST_FARFETCHD
 	setevent EVENT_CHARCOAL_KILN_FARFETCH_D
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index 74d614246..a75bc7c8b 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -9,8 +9,8 @@
 
 SproutTower3F_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_SPROUTTOWER3F_0
+	scene_script .DummyScene1 ; SCENE_SPROUTTOWER3F_1
 
 	db 0 ; callbacks
 
@@ -57,7 +57,7 @@ UnknownScript_0x184947:
 	disappear SPROUTTOWER3F_SILVER
 	waitsfx
 	special FadeInQuickly
-	setscene 1
+	setscene SCENE_SPROUTTOWER3F_1
 	special RestartMapMusic
 	end
 
@@ -334,7 +334,7 @@ SproutTower3F_MapEvents:
 	warp_event 10, 14, 4, SPROUT_TOWER_2F
 
 	db 1 ; coord events
-	coord_event 11, 9, 0, UnknownScript_0x184947
+	coord_event 11, 9, SCENE_SPROUTTOWER3F_0, UnknownScript_0x184947
 
 	db 6 ; bg events
 	bg_event 8, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index b18d55ce8..67cf4ded8 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -8,7 +8,7 @@
 
 TeamRocketBaseB1F_MapScripts:
 	db 1 ; scene scripts
-	scene_script .DummyScene
+	scene_script .DummyScene ; SCENE_TEAMROCKETBASEB1F_0
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .HideSecurityGrunt
@@ -746,28 +746,28 @@ TeamRocketBaseB1F_MapEvents:
 	coord_event 8, 16, 0, SecurityCamera5
 	; There are spots on the floor that trigger a Pokémon battle.
 	; Each Pokémon (Voltorb, Koffing, Geodude) knows Selfdestruct.
-	coord_event 2, 7, 0, ExplodingTrap1
-	coord_event 3, 7, 0, ExplodingTrap2
-	coord_event 4, 7, 0, ExplodingTrap3
-	coord_event 1, 8, 0, ExplodingTrap4
-	coord_event 3, 8, 0, ExplodingTrap5
-	coord_event 5, 8, 0, ExplodingTrap6
-	coord_event 3, 9, 0, ExplodingTrap7
-	coord_event 4, 9, 0, ExplodingTrap8
-	coord_event 1, 10, 0, ExplodingTrap9
-	coord_event 2, 10, 0, ExplodingTrap10
-	coord_event 3, 10, 0, ExplodingTrap11
-	coord_event 5, 10, 0, ExplodingTrap12
-	coord_event 2, 11, 0, ExplodingTrap13
-	coord_event 4, 11, 0, ExplodingTrap14
-	coord_event 1, 12, 0, ExplodingTrap15
-	coord_event 2, 12, 0, ExplodingTrap16
-	coord_event 4, 12, 0, ExplodingTrap17
-	coord_event 5, 12, 0, ExplodingTrap18
-	coord_event 1, 13, 0, ExplodingTrap19
-	coord_event 3, 13, 0, ExplodingTrap20
-	coord_event 4, 13, 0, ExplodingTrap21
-	coord_event 5, 13, 0, ExplodingTrap22
+	coord_event 2, 7, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap1
+	coord_event 3, 7, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap2
+	coord_event 4, 7, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap3
+	coord_event 1, 8, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap4
+	coord_event 3, 8, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap5
+	coord_event 5, 8, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap6
+	coord_event 3, 9, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap7
+	coord_event 4, 9, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap8
+	coord_event 1, 10, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap9
+	coord_event 2, 10, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap10
+	coord_event 3, 10, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap11
+	coord_event 5, 10, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap12
+	coord_event 2, 11, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap13
+	coord_event 4, 11, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap14
+	coord_event 1, 12, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap15
+	coord_event 2, 12, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap16
+	coord_event 4, 12, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap17
+	coord_event 5, 12, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap18
+	coord_event 1, 13, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap19
+	coord_event 3, 13, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap20
+	coord_event 4, 13, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap21
+	coord_event 5, 13, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap22
 
 	db 9 ; bg events
 	bg_event 19, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost0Script
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 250a11fb8..85102bab5 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -16,10 +16,10 @@
 
 TeamRocketBaseB2F_MapScripts:
 	db 4 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
-	scene_script .DummyScene2
-	scene_script .DummyScene3
+	scene_script .DummyScene0 ; SCENE_TEAMROCKETBASEB2F_0
+	scene_script .DummyScene1 ; SCENE_TEAMROCKETBASEB2F_1
+	scene_script .DummyScene2 ; SCENE_TEAMROCKETBASEB2F_2
+	scene_script .DummyScene3 ; SCENE_TEAMROCKETBASEB2F_3
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .TransmitterDoorCallback
@@ -116,7 +116,7 @@ UnknownScript_0x6cfac:
 	disappear TEAMROCKETBASEB2F_ROCKET4
 	pause 15
 	special FadeInQuickly
-	setscene 2
+	setscene SCENE_TEAMROCKETBASEB2F_2
 	clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE
 	spriteface TEAMROCKETBASEB2F_LANCE, DOWN
 	opentext
@@ -173,7 +173,7 @@ LanceHealsCommon:
 	writetext LanceHealsText2
 	waitbutton
 	closetext
-	setscene 1
+	setscene SCENE_TEAMROCKETBASEB2F_1
 	setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE
 	checkcode VAR_FACING
 	if_equal RIGHT, .FacingRight
@@ -302,7 +302,7 @@ UnknownScript_0x6d184:
 	clearflag ENGINE_ROCKET_SIGNAL_ON_CH20
 	setevent EVENT_ROUTE_43_GATE_ROCKETS
 	setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
-	setscene 3
+	setscene SCENE_TEAMROCKETBASEB2F_3
 	clearevent EVENT_LAKE_OF_RAGE_CIVILIANS
 	setevent EVENT_TURNED_OFF_SECURITY_CAMERAS
 	setevent EVENT_SECURITY_CAMERA_1
@@ -917,15 +917,15 @@ TeamRocketBaseB2F_MapEvents:
 	warp_event 27, 14, 4, TEAM_ROCKET_BASE_B3F
 
 	db 9 ; coord events
-	coord_event 5, 14, 0, LanceHealsScript1
-	coord_event 4, 13, 0, LanceHealsScript2
-	coord_event 14, 11, 1, UnknownScript_0x6cf95
-	coord_event 15, 11, 1, UnknownScript_0x6cf9c
-	coord_event 14, 12, 2, UnknownScript_0x6d075
-	coord_event 15, 12, 2, UnknownScript_0x6d075
-	coord_event 12, 3, 2, UnknownScript_0x6d07a
-	coord_event 12, 10, 2, UnknownScript_0x6d07a
-	coord_event 12, 11, 2, UnknownScript_0x6d07a
+	coord_event 5, 14, SCENE_TEAMROCKETBASEB2F_0, LanceHealsScript1
+	coord_event 4, 13, SCENE_TEAMROCKETBASEB2F_0, LanceHealsScript2
+	coord_event 14, 11, SCENE_TEAMROCKETBASEB2F_1, UnknownScript_0x6cf95
+	coord_event 15, 11, SCENE_TEAMROCKETBASEB2F_1, UnknownScript_0x6cf9c
+	coord_event 14, 12, SCENE_TEAMROCKETBASEB2F_2, UnknownScript_0x6d075
+	coord_event 15, 12, SCENE_TEAMROCKETBASEB2F_2, UnknownScript_0x6d075
+	coord_event 12, 3, SCENE_TEAMROCKETBASEB2F_2, UnknownScript_0x6d07a
+	coord_event 12, 10, SCENE_TEAMROCKETBASEB2F_2, UnknownScript_0x6d07a
+	coord_event 12, 11, SCENE_TEAMROCKETBASEB2F_2, UnknownScript_0x6d07a
 
 	db 23 ; bg events
 	bg_event 14, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index dd491e6f4..176319e87 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -16,10 +16,10 @@
 
 TeamRocketBaseB3F_MapScripts:
 	db 4 ; scene scripts
-	scene_script .LanceGetsPassword
-	scene_script .DummyScene1
-	scene_script .DummyScene2
-	scene_script .DummyScene3
+	scene_script .LanceGetsPassword ; SCENE_TEAMROCKETBASEB3F_0
+	scene_script .DummyScene1 ; SCENE_TEAMROCKETBASEB3F_1
+	scene_script .DummyScene2 ; SCENE_TEAMROCKETBASEB3F_2
+	scene_script .DummyScene3 ; SCENE_TEAMROCKETBASEB3F_3
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .CheckGiovanniDoor
@@ -58,7 +58,7 @@ LanceGetPasswordScript:
 	closetext
 	applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12c
 	disappear TEAMROCKETBASEB3F_LANCE
-	setscene 1
+	setscene SCENE_TEAMROCKETBASEB3F_1
 	end
 
 RocketBaseRival:
@@ -77,7 +77,7 @@ RocketBaseRival:
 	applymovement PLAYER, RocketBaseRivalShovesPlayerMovement
 	applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalLeaveMovement
 	disappear TEAMROCKETBASEB3F_SILVER
-	setscene 2
+	setscene SCENE_TEAMROCKETBASEB3F_2
 	special RestartMapMusic
 	end
 
@@ -114,7 +114,7 @@ UnknownScript_0x6e056:
 	playsound SFX_TACKLE
 	applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e147
 	disappear TEAMROCKETBASEB3F_ROCKET1
-	setscene 3
+	setscene SCENE_TEAMROCKETBASEB3F_3
 	end
 
 RocketBaseMurkrow:
@@ -573,9 +573,9 @@ TeamRocketBaseB3F_MapEvents:
 	warp_event 27, 14, 5, TEAM_ROCKET_BASE_B2F
 
 	db 3 ; coord events
-	coord_event 10, 8, 2, UnknownScript_0x6e04b
-	coord_event 11, 8, 2, UnknownScript_0x6e052
-	coord_event 8, 10, 1, RocketBaseRival
+	coord_event 10, 8, SCENE_TEAMROCKETBASEB3F_2, UnknownScript_0x6e04b
+	coord_event 11, 8, SCENE_TEAMROCKETBASEB3F_2, UnknownScript_0x6e052
+	coord_event 8, 10, SCENE_TEAMROCKETBASEB3F_1, RocketBaseRival
 
 	db 10 ; bg events
 	bg_event 10, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index a0c59f6b3..d297a1988 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -4,8 +4,8 @@
 
 TimeCapsule_MapScripts:
 	db 2 ; scene scripts
-	scene_script .InitializeTimeCapsule
-	scene_script .DummyScene
+	scene_script .InitializeTimeCapsule ; SCENE_TIMECAPSULE_0
+	scene_script .DummyScene ; SCENE_TIMECAPSULE_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
@@ -30,8 +30,8 @@ TimeCapsule_MapScripts:
 	return
 
 .InitializeAndPreparePokecenter2F:
-	setscene 1
-	setmapscene POKECENTER_2F, 3
+	setscene SCENE_TIMECAPSULE_1
+	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_3
 	end
 
 MapTimeCapsuleSignpost1Script:
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index b9ab9a0f3..1f3187b74 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -12,8 +12,8 @@
 
 TinTower1F_MapScripts:
 	db 2 ; scene scripts
-	scene_script .FaceSuicune
-	scene_script .DummyScene
+	scene_script .FaceSuicune ; SCENE_TINTOWER1F_0
+	scene_script .DummyScene ; SCENE_TINTOWER1F_1
 
 	db 2 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .NPCsCallback
@@ -123,12 +123,12 @@ TinTower1F_MapScripts:
 	disappear TINTOWER1F_SUICUNE
 	setevent EVENT_FOUGHT_SUICUNE
 	setevent EVENT_SAW_SUICUNE_ON_ROUTE_42
-	setmapscene ROUTE_42, 0
+	setmapscene ROUTE_42, SCENE_ROUTE42_0
 	setevent EVENT_SAW_SUICUNE_ON_ROUTE_36
-	setmapscene ROUTE_36, 0
+	setmapscene ROUTE_36, SCENE_ROUTE36_0
 	setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
-	setmapscene CIANWOOD_CITY, 0
-	setscene 1
+	setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_0
+	setscene SCENE_TINTOWER1F_1
 	clearevent EVENT_SET_WHEN_FOUGHT_HO_OH
 	reloadmapafterbattle
 	pause 20
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index 0d911108a..406fc06e4 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -4,8 +4,8 @@
 
 TradeCenter_MapScripts:
 	db 2 ; scene scripts
-	scene_script .InitializeTradeCenter
-	scene_script .DummyScene
+	scene_script .InitializeTradeCenter ; SCENE_TRADECENTER_0
+	scene_script .DummyScene ; SCENE_TRADECENTER_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
@@ -30,8 +30,8 @@ TradeCenter_MapScripts:
 	return
 
 .InitializeAndPreparePokecenter2F:
-	setscene 1
-	setmapscene POKECENTER_2F, 1
+	setscene SCENE_TRADECENTER_1
+	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_1
 	end
 
 MapTradeCenterSignpost1Script:
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index 7c6a1262d..1a8a1c6e4 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -4,7 +4,7 @@
 
 TrainerHouseB1F_MapScripts:
 	db 1 ; scene scripts
-	scene_script .DummyScene
+	scene_script .DummyScene ; SCENE_TRAINERHOUSEB1F_0
 
 	db 0 ; callbacks
 
@@ -174,7 +174,7 @@ TrainerHouseB1F_MapEvents:
 	warp_event 9, 4, 3, TRAINER_HOUSE_1F
 
 	db 1 ; coord events
-	coord_event 7, 3, 0, TrainerHouseReceptionistScript
+	coord_event 7, 3, SCENE_TRAINERHOUSEB1F_0, TrainerHouseReceptionistScript
 
 	db 0 ; bg events
 
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index eed1716a2..ada7c2f94 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -5,8 +5,8 @@
 
 VermilionPort_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .LeaveFastShip
+	scene_script .DummyScene0 ; SCENE_VERMILIONPORT_0
+	scene_script .LeaveFastShip ; SCENE_VERMILIONPORT_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -25,7 +25,7 @@ VermilionPort_MapScripts:
 .LeaveFastShipScript:
 	applymovement PLAYER, MovementData_0x74ef3
 	appear VERMILIONPORT_SAILOR1
-	setscene 0
+	setscene SCENE_VERMILIONPORT_0
 	setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
 	setevent EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
 	setevent EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
@@ -66,7 +66,7 @@ SailorScript_0x74dc4:
 	clearevent EVENT_BEAT_SCHOOLBOY_RICKY
 	setevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
 	appear VERMILIONPORT_SAILOR1
-	setmapscene FAST_SHIP_1F, 1
+	setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_1
 	warp FAST_SHIP_1F, 25, 1
 	end
 
@@ -304,7 +304,7 @@ VermilionPort_MapEvents:
 	warp_event 7, 17, 1, FAST_SHIP_1F
 
 	db 1 ; coord events
-	coord_event 7, 11, 0, UnknownScript_0x74e20
+	coord_event 7, 11, SCENE_VERMILIONPORT_0, UnknownScript_0x74e20
 
 	db 1 ; bg events
 	bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index 480a79b9f..f0758fe38 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -8,8 +8,8 @@
 
 VictoryRoad_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_VICTORYROAD_0
+	scene_script .DummyScene1 ; SCENE_VICTORYROAD_1
 
 	db 0 ; callbacks
 
@@ -30,7 +30,7 @@ UnknownScript_0x74492:
 	scall UnknownScript_0x744d4
 	applymovement VICTORYROAD_SILVER, MovementData_0x7454c
 	disappear VICTORYROAD_SILVER
-	setscene 1
+	setscene SCENE_VICTORYROAD_1
 	playmapmusic
 	end
 
@@ -44,7 +44,7 @@ UnknownScript_0x744b5:
 	scall UnknownScript_0x744d4
 	applymovement VICTORYROAD_SILVER, MovementData_0x74555
 	disappear VICTORYROAD_SILVER
-	setscene 1
+	setscene SCENE_VICTORYROAD_1
 	playmapmusic
 	end
 
@@ -252,8 +252,8 @@ VictoryRoad_MapEvents:
 	warp_event 13, 5, 3, ROUTE_23
 
 	db 2 ; coord events
-	coord_event 12, 8, 0, UnknownScript_0x74492
-	coord_event 13, 8, 0, UnknownScript_0x744b5
+	coord_event 12, 8, SCENE_VICTORYROAD_0, UnknownScript_0x74492
+	coord_event 13, 8, SCENE_VICTORYROAD_0, UnknownScript_0x744b5
 
 	db 2 ; bg events
 	bg_event 3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion
diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm
index 4fdbfe5eb..5ddef4221 100644
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -5,8 +5,8 @@
 
 VictoryRoadGate_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_VICTORYROADGATE_0
+	scene_script .DummyScene1 ; SCENE_VICTORYROADGATE_1
 
 	db 0 ; callbacks
 
@@ -38,7 +38,7 @@ VictoryRoadGateBadgeCheckScript:
 	writetext VictoryRoadGateEightBadgesText
 	waitbutton
 	closetext
-	setscene 1
+	setscene SCENE_VICTORYROADGATE_1
 	end
 
 VictoryRoadGateLeftBlackBeltScript:
@@ -109,7 +109,7 @@ VictoryRoadGate_MapEvents:
 	warp_event 2, 7, 2, ROUTE_28
 
 	db 1 ; coord events
-	coord_event 10, 11, 0, VictoryRoadGateBadgeCheckScene
+	coord_event 10, 11, SCENE_VICTORYROADGATE_0, VictoryRoadGateBadgeCheckScene
 
 	db 0 ; bg events
 
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
index c803d7ef1..3c165b39f 100644
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -34,7 +34,7 @@ FalknerScript_0x683c2:
 	iftrue .SpeechAfterTM
 	setevent EVENT_BEAT_BIRD_KEEPER_ROD
 	setevent EVENT_BEAT_BIRD_KEEPER_ABE
-	setmapscene ELMS_LAB, 2
+	setmapscene ELMS_LAB, SCENE_ELMSLAB_2
 	specialphonecall SPECIALCALL_ASSISTANT
 	writetext UnknownText_0x685c8
 	buttonsound
diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm
index d7f6756fa..5aa5118b7 100644
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -30,7 +30,7 @@ VioletPokecenter1F_ElmsAideScript:
 	setevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
 	clearevent EVENT_ELMS_AIDE_IN_LAB
 	clearevent EVENT_TOGEPI_HATCHED
-	setmapscene ROUTE_32, 1
+	setmapscene ROUTE_32, SCENE_ROUTE32_1
 	writetext UnknownText_0x695c5
 	waitbutton
 	closetext
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm
index 17c6fd7ee..83a72c37d 100644
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -3,8 +3,8 @@
 
 WillsRoom_MapScripts:
 	db 2 ; scene scripts
-	scene_script .LockDoor
-	scene_script .DummyScene
+	scene_script .LockDoor ; SCENE_WILLSROOM_0
+	scene_script .DummyScene ; SCENE_WILLSROOM_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .WillsRoomDoors
@@ -35,7 +35,7 @@ WillsRoom_MapScripts:
 	changeblock 4, 14, $2a ; wall
 	reloadmappart
 	closetext
-	setscene 1
+	setscene SCENE_WILLSROOM_1
 	setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
 	waitsfx
 	end
diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm
index 79694c5da..9719a99db 100644
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -8,8 +8,8 @@
 
 WiseTriosRoom_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; SCENE_WISETRIOSROOM_0
+	scene_script .DummyScene1 ; SCENE_WISETRIOSROOM_1
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .WiseTrioCallback
@@ -103,7 +103,7 @@ TrainerSageKoji:
 	applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628
 	spriteface WISETRIOSROOM_SAGE6, UP
 	setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
-	setscene 1
+	setscene SCENE_WISETRIOSROOM_1
 	end
 
 UnknownScript_0x9861b:
@@ -351,7 +351,7 @@ WiseTriosRoom_MapEvents:
 	warp_event 1, 4, 5, ECRUTEAK_TIN_TOWER_ENTRANCE
 
 	db 1 ; coord events
-	coord_event 7, 4, 0, UnknownScript_0x985a3
+	coord_event 7, 4, SCENE_WISETRIOSROOM_0, UnknownScript_0x985a3
 
 	db 0 ; bg events
 

From 936a170e0da19cb5bb2ccc325a43a28690230098 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Wed, 31 Jan 2018 23:21:15 -0500
Subject: [PATCH 086/135] MobileTradeRoom matches MobileBattleRoom

---
 constants/map_constants.asm                   |  2 +-
 constants/scene_constants.asm                 |  6 +++---
 data/maps/blocks.asm                          |  4 ++--
 data/maps/data.asm                            |  2 +-
 data/maps/definitions.asm                     |  2 +-
 data/maps/scenes.asm                          |  2 +-
 data/maps/scripts.asm                         |  2 +-
 ...radeRoomMobile.asm => MobileTradeRoom.asm} | 20 +++++++++----------
 ...radeRoomMobile.blk => MobileTradeRoom.blk} |  0
 maps/Pokecenter2F.asm                         |  4 ++--
 wram.asm                                      |  2 +-
 11 files changed, 23 insertions(+), 23 deletions(-)
 rename maps/{MobileTradeRoomMobile.asm => MobileTradeRoom.asm} (52%)
 rename maps/{MobileTradeRoomMobile.blk => MobileTradeRoom.blk} (100%)

diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 4407bdd7f..c1f7c3b70 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -373,7 +373,7 @@ ENDM
 	mapconst TRADE_CENTER,                                 4,  5 ;  2
 	mapconst COLOSSEUM,                                    4,  5 ;  3
 	mapconst TIME_CAPSULE,                                 4,  5 ;  4
-	mapconst MOBILE_TRADE_ROOM_MOBILE,                     4,  5 ;  5
+	mapconst MOBILE_TRADE_ROOM,                            4,  5 ;  5
 	mapconst MOBILE_BATTLE_ROOM,                           4,  5 ;  6
 
 	newgroup                                                     ; 21
diff --git a/constants/scene_constants.asm b/constants/scene_constants.asm
index 1b1e80d28..d087703fa 100644
--- a/constants/scene_constants.asm
+++ b/constants/scene_constants.asm
@@ -377,10 +377,10 @@
 	const SCENE_MOUNTMOONSQUARE_0
 	const SCENE_MOUNTMOONSQUARE_1
 
-; wMobileTradeRoomMobileSceneID
+; wMobileTradeRoomSceneID
 	const_def
-	const SCENE_MOBILETRADEROOMMOBILE_0
-	const SCENE_MOBILETRADEROOMMOBILE_1
+	const SCENE_MOBILETRADEROOM_0
+	const SCENE_MOBILETRADEROOM_1
 
 ; wMobileBattleRoomSceneID
 	const_def
diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm
index dbfa49b5a..6ee73f3e9 100644
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
@@ -1025,8 +1025,8 @@ BattleTowerBattleRoom_Blocks:
 PokecomCenterAdminRoomMobile_Blocks:
 	INCBIN "maps/PokecomCenterAdminRoomMobile.blk"
 
-MobileTradeRoomMobile_Blocks:
-	INCBIN "maps/MobileTradeRoomMobile.blk"
+MobileTradeRoom_Blocks:
+	INCBIN "maps/MobileTradeRoom.blk"
 
 MobileBattleRoom_Blocks:
 	INCBIN "maps/MobileBattleRoom.blk"
diff --git a/data/maps/data.asm b/data/maps/data.asm
index 2bd2fc553..2dfcfdbf9 100644
--- a/data/maps/data.asm
+++ b/data/maps/data.asm
@@ -584,7 +584,7 @@ ENDM
 	map_data TradeCenter, TRADE_CENTER, $00, 0
 	map_data Colosseum, COLOSSEUM, $00, 0
 	map_data TimeCapsule, TIME_CAPSULE, $00, 0
-	map_data MobileTradeRoomMobile, MOBILE_TRADE_ROOM_MOBILE, $00, 0
+	map_data MobileTradeRoom, MOBILE_TRADE_ROOM, $00, 0
 	map_data MobileBattleRoom, MOBILE_BATTLE_ROOM, $00, 0
 	map_data CeladonDeptStore1F, CELADON_DEPT_STORE_1F, $00, 0
 	map_data CeladonDeptStore2F, CELADON_DEPT_STORE_2F, $00, 0
diff --git a/data/maps/definitions.asm b/data/maps/definitions.asm
index 6772ecc97..b9d13e00c 100644
--- a/data/maps/definitions.asm
+++ b/data/maps/definitions.asm
@@ -375,7 +375,7 @@ MapGroup_CableClub:
 	map_def TradeCenter, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
 	map_def Colosseum, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
 	map_def TimeCapsule, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MobileTradeRoomMobile, TILESET_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def MobileTradeRoom, TILESET_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
 	map_def MobileBattleRoom, TILESET_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
 
 MapGroup_Celadon:
diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm
index c5be2e819..0971208f1 100644
--- a/data/maps/scenes.asm
+++ b/data/maps/scenes.asm
@@ -83,7 +83,7 @@ MapScenes:: ; 4d01e
 	scene_def FAST_SHIP_1F,                                wFastShip1FSceneID
 	scene_def FAST_SHIP_B1F,                               wFastShipB1FSceneID
 	scene_def MOUNT_MOON_SQUARE,                           wMountMoonSquareSceneID
-	scene_def MOBILE_TRADE_ROOM_MOBILE,                    wMobileTradeRoomMobileSceneID
+	scene_def MOBILE_TRADE_ROOM,                           wMobileTradeRoomSceneID
 	scene_def MOBILE_BATTLE_ROOM,                          wMobileBattleRoomSceneID
 	db -1
 ; 4d15b
diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm
index 331418d6c..4d314cd1e 100644
--- a/data/maps/scripts.asm
+++ b/data/maps/scripts.asm
@@ -343,7 +343,7 @@ INCLUDE "maps/Pokecenter2F.asm"
 INCLUDE "maps/TradeCenter.asm"
 INCLUDE "maps/Colosseum.asm"
 INCLUDE "maps/TimeCapsule.asm"
-INCLUDE "maps/MobileTradeRoomMobile.asm"
+INCLUDE "maps/MobileTradeRoom.asm"
 INCLUDE "maps/MobileBattleRoom.asm"
 
 
diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoom.asm
similarity index 52%
rename from maps/MobileTradeRoomMobile.asm
rename to maps/MobileTradeRoom.asm
index e5be1a979..73e40ef82 100644
--- a/maps/MobileTradeRoomMobile.asm
+++ b/maps/MobileTradeRoom.asm
@@ -1,11 +1,11 @@
-MobileTradeRoomMobile_MapScripts:
+MobileTradeRoom_MapScripts:
 	db 2 ; scene scripts
-	scene_script .InitializeMobileTradeRoomMobile ; SCENE_MOBILETRADEROOMMOBILE_0
-	scene_script .DummyScene ; SCENE_MOBILETRADEROOMMOBILE_1
+	scene_script .InitializeMobileTradeRoom ; SCENE_MOBILETRADEROOM_0
+	scene_script .DummyScene ; SCENE_MOBILETRADEROOM_1
 
 	db 0 ; callbacks
 
-.InitializeMobileTradeRoomMobile:
+.InitializeMobileTradeRoom:
 	priorityjump .InitializeAndPreparePokecenter2F
 	end
 
@@ -13,26 +13,26 @@ MobileTradeRoomMobile_MapScripts:
 	end
 
 .InitializeAndPreparePokecenter2F:
-	setscene SCENE_MOBILETRADEROOMMOBILE_1
+	setscene SCENE_MOBILETRADEROOM_1
 	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_4
 	end
 
-MapMobileTradeRoomMobileSignpost0Script:
+MapMobileTradeRoomSignpost0Script:
 	refreshscreen
 	special Function1037c2
-	writetext MobileTradeRoomMobile_EstablishingCommsText
+	writetext MobileTradeRoom_EstablishingCommsText
 	waitbutton
 	reloadmappart
 	special Function101231
 	closetext
 	end
 
-MobileTradeRoomMobile_EstablishingCommsText:
+MobileTradeRoom_EstablishingCommsText:
 	text "Establishing"
 	line "communications…"
 	done
 
-MobileTradeRoomMobile_MapEvents:
+MobileTradeRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
@@ -42,6 +42,6 @@ MobileTradeRoomMobile_MapEvents:
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 4, 2, BGEVENT_UP, MapMobileTradeRoomMobileSignpost0Script
+	bg_event 4, 2, BGEVENT_UP, MapMobileTradeRoomSignpost0Script
 
 	db 0 ; object events
diff --git a/maps/MobileTradeRoomMobile.blk b/maps/MobileTradeRoom.blk
similarity index 100%
rename from maps/MobileTradeRoomMobile.blk
rename to maps/MobileTradeRoom.blk
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 7bdc6e670..204ef2556 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -382,7 +382,7 @@ Script_LeftMobileTradeRoom:
 	special Function101220
 	scall Script_WalkOutOfMobileTradeRoom
 	setscene SCENE_POKECENTER2F_0
-	setmapscene MOBILE_TRADE_ROOM_MOBILE, SCENE_MOBILETRADEROOMMOBILE_0
+	setmapscene MOBILE_TRADE_ROOM, SCENE_MOBILETRADEROOM_0
 	end
 
 Script_WalkOutOfMobileTradeRoom:
@@ -1028,7 +1028,7 @@ Pokecenter2F_MapEvents:
 	warp_event 5, 0, 1, TRADE_CENTER
 	warp_event 9, 0, 1, COLOSSEUM
 	warp_event 13, 2, 1, TIME_CAPSULE
-	warp_event 6, 0, 1, MOBILE_TRADE_ROOM_MOBILE
+	warp_event 6, 0, 1, MOBILE_TRADE_ROOM
 	warp_event 10, 0, 1, MOBILE_BATTLE_ROOM
 
 	db 0 ; coord events
diff --git a/wram.asm b/wram.asm
index c507c2495..8e249f908 100644
--- a/wram.asm
+++ b/wram.asm
@@ -2577,7 +2577,7 @@ wVermilionPortSceneID::                           db ; d9bb
 wFastShip1FSceneID::                              db ; d9bc
 wFastShipB1FSceneID::                             db ; d9bd
 wMountMoonSquareSceneID::                         db ; d9be
-wMobileTradeRoomMobileSceneID::                   db ; d9bf
+wMobileTradeRoomSceneID::                         db ; d9bf
 wMobileBattleRoomSceneID::                        db ; d9c0
 
 	ds 49

From fcfe77bc3db73afd2001c21ec9cc1cfb1beca20e Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Thu, 1 Feb 2018 12:40:58 -0500
Subject: [PATCH 087/135] Meaningful scene constant names (Two common patterns:
 0=default event and 1=nothing; and 0=nothing and 1=some event)

---
 constants/scene_constants.asm                 | 395 +++++++-----------
 engine/events/std_scripts.asm                 |   6 +-
 maps/AzaleaTown.asm                           |  16 +-
 maps/BattleTower1F.asm                        |  20 +-
 maps/BattleTowerBattleRoom.asm                |   6 +-
 maps/BattleTowerElevator.asm                  |   7 +-
 maps/BattleTowerHallway.asm                   |   6 +-
 maps/BrunosRoom.asm                           |   6 +-
 maps/BurnedTower1F.asm                        |  12 +-
 maps/BurnedTowerB1F.asm                       |  14 +-
 maps/CeruleanGym.asm                          |  10 +-
 maps/CherrygroveCity.asm                      |  10 +-
 maps/CianwoodCity.asm                         |  10 +-
 maps/Colosseum.asm                            |  12 +-
 maps/DragonShrine.asm                         |   8 +-
 maps/DragonsDenB1F.asm                        |   8 +-
 maps/EcruteakGym.asm                          |   6 +-
 maps/EcruteakPokecenter1F.asm                 |   6 +-
 maps/EcruteakTinTowerEntrance.asm             |  12 +-
 maps/ElmsLab.asm                              |  60 +--
 maps/FastShip1F.asm                           |  20 +-
 maps/FastShipB1F.asm                          |   8 +-
 maps/FastShipCabins_NNW_NNE_NE.asm            |   2 +-
 maps/FastShipCabins_SE_SSE_CaptainsCabin.asm  |   4 +-
 maps/GoldenrodGym.asm                         |  10 +-
 maps/GoldenrodMagnetTrainStation.asm          |   4 +-
 maps/GoldenrodPokecenter1F.asm                |   4 +-
 ...oldenrodUndergroundSwitchRoomEntrances.asm |  14 +-
 maps/HallOfFame.asm                           |   8 +-
 maps/IndigoPlateauPokecenter1F.asm            |  20 +-
 maps/KarensRoom.asm                           |   6 +-
 maps/KogasRoom.asm                            |   6 +-
 maps/KurtsHouse.asm                           |   2 +-
 maps/LakeOfRage.asm                           |   2 +-
 maps/LancesRoom.asm                           |  10 +-
 maps/MahoganyMart1F.asm                       |   6 +-
 maps/MahoganyTown.asm                         |   8 +-
 maps/MobileBattleRoom.asm                     |   8 +-
 maps/MobileTradeRoom.asm                      |   8 +-
 maps/MountMoon.asm                            |   6 +-
 maps/MountMoonSquare.asm                      |   6 +-
 maps/MrPokemonsHouse.asm                      |  10 +-
 maps/NewBarkTown.asm                          |   8 +-
 maps/OlivineCity.asm                          |  12 +-
 maps/OlivinePort.asm                          |  10 +-
 maps/PlayersHouse1F.asm                       |  12 +-
 maps/Pokecenter2F.asm                         |  32 +-
 maps/PowerPlant.asm                           |  12 +-
 maps/RadioTower5F.asm                         |  16 +-
 maps/Route16Gate.asm                          |   6 +-
 maps/Route17Route18Gate.asm                   |   6 +-
 maps/Route25.asm                              |  12 +-
 maps/Route27.asm                              |  10 +-
 maps/Route29.asm                              |  16 +-
 maps/Route32.asm                              |  12 +-
 maps/Route35NationalParkGate.asm              |  10 +-
 maps/Route36.asm                              |  12 +-
 maps/Route36NationalParkGate.asm              |  10 +-
 maps/Route42.asm                              |  10 +-
 maps/Route43.asm                              |   4 +-
 maps/Route43Gate.asm                          |  10 +-
 maps/RuinsOfAlphAerodactylChamber.asm         |   8 +-
 maps/RuinsOfAlphHoOhChamber.asm               |   8 +-
 maps/RuinsOfAlphInnerChamber.asm              |   6 +-
 maps/RuinsOfAlphKabutoChamber.asm             |   8 +-
 maps/RuinsOfAlphOmanyteChamber.asm            |   8 +-
 maps/RuinsOfAlphOutside.asm                   |  14 +-
 maps/RuinsOfAlphResearchCenter.asm            |   8 +-
 maps/SaffronMagnetTrainStation.asm            |   4 +-
 maps/SlowpokeWellB1F.asm                      |   2 +-
 maps/SproutTower3F.asm                        |   8 +-
 maps/TeamRocketBaseB1F.asm                    |  46 +-
 maps/TeamRocketBaseB2F.asm                    |  32 +-
 maps/TeamRocketBaseB3F.asm                    |  20 +-
 maps/TimeCapsule.asm                          |   8 +-
 maps/TinTower1F.asm                           |  12 +-
 maps/TradeCenter.asm                          |   8 +-
 maps/TrainerHouseB1F.asm                      |   4 +-
 maps/VermilionPort.asm                        |  10 +-
 maps/VictoryRoad.asm                          |  12 +-
 maps/VictoryRoadGate.asm                      |   8 +-
 maps/VioletGym.asm                            |   2 +-
 maps/VioletPokecenter1F.asm                   |   2 +-
 maps/WillsRoom.asm                            |   6 +-
 maps/WiseTriosRoom.asm                        |   8 +-
 85 files changed, 596 insertions(+), 678 deletions(-)

diff --git a/constants/scene_constants.asm b/constants/scene_constants.asm
index d087703fa..be7f444ae 100644
--- a/constants/scene_constants.asm
+++ b/constants/scene_constants.asm
@@ -1,388 +1,307 @@
+SCENE_DEFAULT EQU 0
+
 ; wPokecenter2FSceneID
-	const_def
-	const SCENE_POKECENTER2F_0
-	const SCENE_POKECENTER2F_1
-	const SCENE_POKECENTER2F_2
-	const SCENE_POKECENTER2F_3
-	const SCENE_POKECENTER2F_4
-	const SCENE_POKECENTER2F_5
+	const_def 1
+	const SCENE_POKECENTER2F_LEAVE_TRADE_CENTER       ; 1
+	const SCENE_POKECENTER2F_LEAVE_COLOSSEUM          ; 2
+	const SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE       ; 3
+	const SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM  ; 4
+	const SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM ; 5
 
 ; wTradeCenterSceneID
-	const_def
-	const SCENE_TRADECENTER_0
-	const SCENE_TRADECENTER_1
+	const_def 1
+	const SCENE_TRADECENTER_NOTHING ; 1
 
 ; wColosseumSceneID
-	const_def
-	const SCENE_COLOSSEUM_0
-	const SCENE_COLOSSEUM_1
-	const SCENE_COLOSSEUM_2
+	const_def 1
+	const SCENE_COLOSSEUM_NOTHING ; 1
+	const SCENE_COLOSSEUM_UNUSED  ; 2
 
 ; wTimeCapsuleSceneID
-	const_def
-	const SCENE_TIMECAPSULE_0
-	const SCENE_TIMECAPSULE_1
+	const_def 1
+	const SCENE_TIMECAPSULE_NOTHING ; 1
 
 ; wPowerPlantSceneID
 	const_def
-	const SCENE_POWERPLANT_0
-	const SCENE_POWERPLANT_1
+	const SCENE_POWERPLANT_NOTHING               ; 0
+	const SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL ; 1
 
 ; wCeruleanGymSceneID
 	const_def
-	const SCENE_CERULEANGYM_0
-	const SCENE_CERULEANGYM_1
+	const SCENE_CERULEANGYM_NOTHING        ; 0
+	const SCENE_CERULEANGYM_GRUNT_RUNS_OUT ; 1
 
 ; wRoute25SceneID
 	const_def
-	const SCENE_ROUTE25_0
-	const SCENE_ROUTE25_1
-
-; wTrainerHouseB1FSceneID
-	const_def
-	const SCENE_TRAINERHOUSEB1F_0
+	const SCENE_ROUTE25_NOTHING     ; 0
+	const SCENE_ROUTE25_MISTYS_DATE ; 1
 
 ; wVictoryRoadGateSceneID
-	const_def
-	const SCENE_VICTORYROADGATE_0
-	const SCENE_VICTORYROADGATE_1
-
-; wSaffronMagnetTrainStationSceneID
-	const_def
-	const SCENE_SAFFRONMAGNETTRAINSTATION_0
-
-; wRoute16GateSceneID
-	const_def
-	const SCENE_ROUTE16GATE_0
-
-; wRoute17Route18GateSceneID
-	const_def
-	const SCENE_ROUTE17ROUTE18GATE_0
-
-; wIndigoPlateauPokecenter1FSceneID
-	const_def
-	const SCENE_INDIGOPLATEAUPOKECENTER1F_0
+	const_def 1
+	const SCENE_VICTORYROADGATE_NOTHING ; 1
 
 ; wWillsRoomSceneID
-	const_def
-	const SCENE_WILLSROOM_0
-	const SCENE_WILLSROOM_1
+	const_def 1
+	const SCENE_WILLSROOM_NOTHING ; 1
 
 ; wKogasRoomSceneID
-	const_def
-	const SCENE_KOGASROOM_0
-	const SCENE_KOGASROOM_1
+	const_def 1
+	const SCENE_KOGASROOM_NOTHING ; 1
 
 ; wBrunosRoomSceneID
-	const_def
-	const SCENE_BRUNOSROOM_0
-	const SCENE_BRUNOSROOM_1
+	const_def 1
+	const SCENE_BRUNOSROOM_NOTHING ; 1
 
 ; wKarensRoomSceneID
-	const_def
-	const SCENE_KARENSROOM_0
-	const SCENE_KARENSROOM_1
+	const_def 1
+	const SCENE_KARENSROOM_NOTHING ; 1
 
 ; wLancesRoomSceneID
-	const_def
-	const SCENE_LANCESROOM_0
-	const SCENE_LANCESROOM_1
+	const_def 1
+	const SCENE_LANCESROOM_APPROACH_LANCE ; 1
 
 ; wHallOfFameSceneID
-	const_def
-	const SCENE_HALLOFFAME_0
-	const SCENE_HALLOFFAME_1
+	const_def 1
+	const SCENE_HALLOFFAME_NOTHING ; 1
 
 ; wRoute27SceneID
-	const_def
-	const SCENE_ROUTE27_0
-	const SCENE_ROUTE27_1
-	const SCENE_ROUTE27_2
+	const_def 1
+	const SCENE_ROUTE27_NOTHING ; 1
 
 ; wNewBarkTownSceneID
-	const_def
-	const SCENE_NEWBARKTOWN_0
-	const SCENE_NEWBARKTOWN_1
+	const_def 1
+	const SCENE_NEWBARKTOWN_NOTHING ; 1
 
 ; wElmsLabSceneID
-	const_def
-	const SCENE_ELMSLAB_0
-	const SCENE_ELMSLAB_1
-	const SCENE_ELMSLAB_2
-	const SCENE_ELMSLAB_3
-	const SCENE_ELMSLAB_4
-	const SCENE_ELMSLAB_5
-	const SCENE_ELMSLAB_6
+	const_def 1
+	const SCENE_ELMSLAB_CANT_LEAVE            ; 1
+	const SCENE_ELMSLAB_NOTHING               ; 2
+	const SCENE_ELMSLAB_MEET_OFFICER          ; 3
+	const SCENE_ELMSLAB_UNUSED                ; 4
+	const SCENE_ELMSLAB_AIDE_GIVES_POTION     ; 5
+	const SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS ; 6
 
 ; wPlayersHouse1FSceneID
-	const_def
-	const SCENE_PLAYERSHOUSE1F_0
-	const SCENE_PLAYERSHOUSE1F_1
+	const_def 1
+	const SCENE_PLAYERSHOUSE1F_NOTHING ; 1
 
 ; wRoute29SceneID
 	const_def
-	const SCENE_ROUTE29_0
-	const SCENE_ROUTE29_1
+	const SCENE_ROUTE29_NOTHING        ; 0
+	const SCENE_ROUTE29_CATCH_TUTORIAL ; 1
 
 ; wCherrygroveCitySceneID
 	const_def
-	const SCENE_CHERRYGROVECITY_0
-	const SCENE_CHERRYGROVECITY_1
+	const SCENE_CHERRYGROVECITY_NOTHING    ; 0
+	const SCENE_CHERRYGROVECITY_MEET_RIVAL ; 1
 
 ; wMrPokemonsHouseSceneID
-	const_def
-	const SCENE_MRPOKEMONSHOUSE_0
-	const SCENE_MRPOKEMONSHOUSE_1
+	const_def 1
+	const SCENE_MRPOKEMONSHOUSE_NOTHING ; 1
 
 ; wRoute32SceneID
-	const_def
-	const SCENE_ROUTE32_0
-	const SCENE_ROUTE32_1
-	const SCENE_ROUTE32_2
+	const_def 1
+	const SCENE_ROUTE32_OFFER_SLOWPOKETAIL ; 1
+	const SCENE_ROUTE32_NOTHING            ; 2
 
 ; wRoute35NationalParkGateSceneID
 	const_def
-	const SCENE_ROUTE35NATIONALPARKGATE_0
-	const SCENE_ROUTE35NATIONALPARKGATE_1
-	const SCENE_ROUTE35NATIONALPARKGATE_2
+	const SCENE_ROUTE35NATIONALPARKGATE_NOTHING             ; 0
+	const SCENE_ROUTE35NATIONALPARKGATE_UNUSED              ; 1
+	const SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY ; 2
 
 ; wRoute36SceneID
 	const_def
-	const SCENE_ROUTE36_0
-	const SCENE_ROUTE36_1
+	const SCENE_ROUTE36_NOTHING ; 0
+	const SCENE_ROUTE36_SUICUNE ; 1
 
 ; wRoute36NationalParkGateSceneID
 	const_def
-	const SCENE_ROUTE36NATIONALPARKGATE_0
-	const SCENE_ROUTE36NATIONALPARKGATE_1
-	const SCENE_ROUTE36NATIONALPARKGATE_2
+	const SCENE_ROUTE36NATIONALPARKGATE_NOTHING             ; 0
+	const SCENE_ROUTE36NATIONALPARKGATE_UNUSED              ; 1
+	const SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY ; 2
 
 ; wAzaleaTownSceneID
 	const_def
-	const SCENE_AZALEATOWN_0
-	const SCENE_AZALEATOWN_1
-	const SCENE_AZALEATOWN_2
+	const SCENE_AZALEATOWN_NOTHING              ; 0
+	const SCENE_AZALEATOWN_RIVAL_BATTLE         ; 1
+	const SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL ; 2
 
 ; wGoldenrodGymSceneID
 	const_def
-	const SCENE_GOLDENRODGYM_0
-	const SCENE_GOLDENRODGYM_1
-
-; wGoldenrodMagnetTrainStationSceneID
-	const_def
-	const SCENE_GOLDENRODMAGNETTRAINSTATION_0
-
-; wGoldenrodPokecenter1FSceneID
-	const_def
-	const SCENE_GOLDENRODPOKECENTER1F_0
+	const SCENE_GOLDENRODGYM_NOTHING              ; 0
+	const SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING ; 1
 
 ; wOlivineCitySceneID
-	const_def
-	const SCENE_OLIVINECITY_0
-	const SCENE_OLIVINECITY_1
+	const_def 1
+	const SCENE_OLIVINECITY_NOTHING ; 1
 
 ; wEcruteakTinTowerEntranceSceneID
-	const_def
-	const SCENE_ECRUTEAKTINTOWERENTRANCE_0
-	const SCENE_ECRUTEAKTINTOWERENTRANCE_1
+	const_def 1
+	const SCENE_ECRUTEAKTINTOWERENTRANCE_NOTHING ; 1
 
 ; wWiseTriosRoomSceneID
-	const_def
-	const SCENE_WISETRIOSROOM_0
-	const SCENE_WISETRIOSROOM_1
+	const_def 1
+	const SCENE_WISETRIOSROOM_NOTHING ; 1
 
 ; wEcruteakPokecenter1FSceneID
-	const_def
-	const SCENE_ECRUTEAKPOKECENTER1F_0
-	const SCENE_ECRUTEAKPOKECENTER1F_1
+	const_def 1
+	const SCENE_ECRUTEAKPOKECENTER1F_NOTHING ; 1
 
 ; wEcruteakGymSceneID
-	const_def
-	const SCENE_ECRUTEAKGYM_0
-	const SCENE_ECRUTEAKGYM_1
+	const_def 1
+	const SCENE_ECRUTEAKGYM_NOTHING ; 1
 
 ; wMahoganyTownSceneID
-	const_def
-	const SCENE_MAHOGANYTOWN_0
-	const SCENE_MAHOGANYTOWN_1
+	const_def 1
+	const SCENE_MAHOGANYTOWN_NOTHING ; 1
 
 ; wRoute42SceneID
 	const_def
-	const SCENE_ROUTE42_0
-	const SCENE_ROUTE42_1
+	const SCENE_ROUTE42_NOTHING ; 0
+	const SCENE_ROUTE42_SUICUNE ; 1
 
 ; wCianwoodCitySceneID
 	const_def
-	const SCENE_CIANWOODCITY_0
-	const SCENE_CIANWOODCITY_1
+	const SCENE_CIANWOODCITY_NOTHING            ; 0
+	const SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE ; 1
 
 ; wBattleTower1FSceneID
-	const_def
-	const SCENE_BATTLETOWER1F_0
-	const SCENE_BATTLETOWER1F_1
+	const_def 1
+	const SCENE_BATTLETOWER1F_NOTHING ; 1
 
 ; wBattleTowerBattleRoomSceneID
-	const_def
-	const SCENE_BATTLETOWERBATTLEROOM_0
-	const SCENE_BATTLETOWERBATTLEROOM_1
+	const_def 1
+	const SCENE_BATTLETOWERBATTLEROOM_NOTHING ; 1
 
 ; wBattleTowerElevatorSceneID
-	const_def
-	const SCENE_BATTLETOWERELEVATOR_0
-	const SCENE_BATTLETOWERELEVATOR_1
+	const_def 1
+	const SCENE_BATTLETOWERELEVATOR_NOTHING ; 1
 
 ; wBattleTowerHallwaySceneID
-	const_def
-	const SCENE_BATTLETOWERHALLWAY_0
-	const SCENE_BATTLETOWERHALLWAY_1
+	const_def 1
+	const SCENE_BATTLETOWERHALLWAY_NOTHING ; 1
 
 ; wRoute43GateSceneID
-	const_def
-	const SCENE_ROUTE43GATE_0
-	const SCENE_ROUTE43GATE_1
+	const_def 1
+	const SCENE_ROUTE43GATE_NOTHING ; 1
 
 ; wMountMoonSceneID
-	const_def
-	const SCENE_MOUNTMOON_0
-	const SCENE_MOUNTMOON_1
+	const_def 1
+	const SCENE_MOUNTMOON_NOTHING ; 1
 
 ; wSproutTower3FSceneID
-	const_def
-	const SCENE_SPROUTTOWER3F_0
-	const SCENE_SPROUTTOWER3F_1
+	const_def 1
+	const SCENE_SPROUTTOWER3F_NOTHING ; 1
 
 ; wTinTower1FSceneID
-	const_def
-	const SCENE_TINTOWER1F_0
-	const SCENE_TINTOWER1F_1
+	const_def 1
+	const SCENE_TINTOWER1F_NOTHING ; 1
 
 ; wBurnedTower1FSceneID
-	const_def
-	const SCENE_BURNEDTOWER1F_0
-	const SCENE_BURNEDTOWER1F_1
-	const SCENE_BURNEDTOWER1F_2
+	const_def 1
+	const SCENE_BURNEDTOWER1F_RIVAL_BATTLE ; 1
+	const SCENE_BURNEDTOWER1F_NOTHING      ; 2
 
 ; wBurnedTowerB1FSceneID
-	const_def
-	const SCENE_BURNEDTOWERB1F_0
-	const SCENE_BURNEDTOWERB1F_1
+	const_def 1
+	const SCENE_BURNEDTOWERB1F_NOTHING ; 1
 
 ; wRadioTower5FSceneID
-	const_def
-	const SCENE_RADIOTOWER5F_0
-	const SCENE_RADIOTOWER5F_1
-	const SCENE_RADIOTOWER5F_2
+	const_def 1
+	const SCENE_RADIOTOWER5F_ROCKET_BOSS ; 1
+	const SCENE_RADIOTOWER5F_NOTHING     ; 2
 
 ; wRuinsOfAlphOutsideSceneID
 	const_def
-	const SCENE_RUINSOFALPHOUTSIDE_0
-	const SCENE_RUINSOFALPHOUTSIDE_1
+	const SCENE_RUINSOFALPHOUTSIDE_NOTHING       ; 0
+	const SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX ; 1
 
 ; wRuinsOfAlphResearchCenterSceneID
 	const_def
-	const SCENE_RUINSOFALPHRESEARCHCENTER_0
-	const SCENE_RUINSOFALPHRESEARCHCENTER_1
+	const SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING       ; 0
+	const SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX ; 1
 
 ; wRuinsOfAlphHoOhChamberSceneID
-	const_def
-	const SCENE_RUINSOFALPHHOOHCHAMBER_0
-	const SCENE_RUINSOFALPHHOOHCHAMBER_1
+	const_def 1
+	const SCENE_RUINSOFALPHHOOHCHAMBER_NOTHING ; 1
 
 ; wRuinsOfAlphKabutoChamberSceneID
-	const_def
-	const SCENE_RUINSOFALPHKABUTOCHAMBER_0
-	const SCENE_RUINSOFALPHKABUTOCHAMBER_1
+	const_def 1
+	const SCENE_RUINSOFALPHKABUTOCHAMBER_NOTHING ; 1
 
 ; wRuinsOfAlphOmanyteChamberSceneID
-	const_def
-	const SCENE_RUINSOFALPHOMANYTECHAMBER_0
-	const SCENE_RUINSOFALPHOMANYTECHAMBER_1
+	const_def 1
+	const SCENE_RUINSOFALPHOMANYTECHAMBER_NOTHING ; 1
 
 ; wRuinsOfAlphAerodactylChamberSceneID
-	const_def
-	const SCENE_RUINSOFALPHAERODACTYLCHAMBER_0
-	const SCENE_RUINSOFALPHAERODACTYLCHAMBER_1
+	const_def 1
+	const SCENE_RUINSOFALPHAERODACTYLCHAMBER_NOTHING ; 1
 
 ; wRuinsOfAlphInnerChamberSceneID
 	const_def
-	const SCENE_RUINSOFALPHINNERCHAMBER_0
-	const SCENE_RUINSOFALPHINNERCHAMBER_1
+	const SCENE_RUINSOFALPHINNERCHAMBER_NOTHING          ; 0
+	const SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE ; 1
 
 ; wMahoganyMart1FSceneID
 	const_def
-	const SCENE_MAHOGANYMART1F_0
-	const SCENE_MAHOGANYMART1F_1
-
-; wTeamRocketBaseB1FSceneID
-	const_def
-	const SCENE_TEAMROCKETBASEB1F_0
+	const SCENE_MAHOGANYMART1F_NOTHING               ; 0
+	const SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS ; 1
 
 ; wTeamRocketBaseB2FSceneID
-	const_def
-	const SCENE_TEAMROCKETBASEB2F_0
-	const SCENE_TEAMROCKETBASEB2F_1
-	const SCENE_TEAMROCKETBASEB2F_2
-	const SCENE_TEAMROCKETBASEB2F_3
+	const_def 1
+	const SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS ; 1
+	const SCENE_TEAMROCKETBASEB2F_ELECTRODES  ; 2
+	const SCENE_TEAMROCKETBASEB2F_NOTHING     ; 3
 
 ; wTeamRocketBaseB3FSceneID
-	const_def
-	const SCENE_TEAMROCKETBASEB3F_0
-	const SCENE_TEAMROCKETBASEB3F_1
-	const SCENE_TEAMROCKETBASEB3F_2
-	const SCENE_TEAMROCKETBASEB3F_3
+	const_def 1
+	const SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER ; 1
+	const SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS     ; 2
+	const SCENE_TEAMROCKETBASEB3F_NOTHING         ; 3
 
 ; wGoldenrodUndergroundSwitchRoomEntrancesSceneID
-	const_def
-	const SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_0
-	const SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_1
+	const_def 1
+	const SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOTHING ; 1
 
 ; wVictoryRoadSceneID
-	const_def
-	const SCENE_VICTORYROAD_0
-	const SCENE_VICTORYROAD_1
+	const_def 1
+	const SCENE_VICTORYROAD_NOTHING ; 1
 
 ; wDragonsDenB1FSceneID
 	const_def
-	const SCENE_DRAGONSDENB1F_0
-	const SCENE_DRAGONSDENB1F_1
+	const SCENE_DRAGONSDENB1F_NOTHING        ; 0
+	const SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM ; 1
 
 ; wDragonShrineSceneID
-	const_def
-	const SCENE_DRAGONSHRINE_0
-	const SCENE_DRAGONSHRINE_1
+	const_def 1
+	const SCENE_DRAGONSHRINE_NOTHING ; 1
 
 ; wOlivinePortSceneID
-	const_def
-	const SCENE_OLIVINEPORT_0
-	const SCENE_OLIVINEPORT_1
+	const_def 1
+	const SCENE_OLIVINEPORT_LEAVE_SHIP ; 1
 
 ; wVermilionPortSceneID
-	const_def
-	const SCENE_VERMILIONPORT_0
-	const SCENE_VERMILIONPORT_1
+	const_def 1
+	const SCENE_VERMILIONPORT_LEAVE_SHIP ; 1
 
 ; wFastShip1FSceneID
-	const_def
-	const SCENE_FASTSHIP1F_0
-	const SCENE_FASTSHIP1F_1
-	const SCENE_FASTSHIP1F_2
+	const_def 1
+	const SCENE_FASTSHIP1F_ENTER_SHIP   ; 1
+	const SCENE_FASTSHIP1F_MEET_GRANDPA ; 2
 
 ; wFastShipB1FSceneID
-	const_def
-	const SCENE_FASTSHIPB1F_0
-	const SCENE_FASTSHIPB1F_1
+	const_def 1
+	const SCENE_FASTSHIPB1F_NOTHING ; 1
 
 ; wMountMoonSquareSceneID
-	const_def
-	const SCENE_MOUNTMOONSQUARE_0
-	const SCENE_MOUNTMOONSQUARE_1
+	const_def 1
+	const SCENE_MOUNTMOONSQUARE_UNUSED ; 1
 
 ; wMobileTradeRoomSceneID
-	const_def
-	const SCENE_MOBILETRADEROOM_0
-	const SCENE_MOBILETRADEROOM_1
+	const_def 1
+	const SCENE_MOBILETRADEROOM_NOTHING ; 1
 
 ; wMobileBattleRoomSceneID
-	const_def
-	const SCENE_MOBILEBATTLEROOM_0
-	const SCENE_MOBILEBATTLEROOM_1
+	const_def 1
+	const SCENE_MOBILEBATTLEROOM_NOTHING ; 1
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
index 642b44fa8..f0990cd02 100644
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -298,7 +298,7 @@ RadioTowerRocketsScript:
 	clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
 	setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
 	specialphonecall SPECIALCALL_WEIRDBROADCAST
-	setmapscene MAHOGANY_TOWN, 1
+	setmapscene MAHOGANY_TOWN, SCENE_MAHOGANYTOWN_NOTHING
 	end
 
 BugContestResultsWarpScript:
@@ -356,8 +356,8 @@ BugContestResults_DidNotLeaveMons
 	waitbutton
 BugContestResults_CleanUp
 	closetext
-	setscene SCENE_ROUTE36NATIONALPARKGATE_0
-	setmapscene ROUTE_35_NATIONAL_PARK_GATE, 0
+	setscene SCENE_ROUTE36NATIONALPARKGATE_NOTHING
+	setmapscene ROUTE_35_NATIONAL_PARK_GATE, SCENE_ROUTE35NATIONALPARKGATE_NOTHING
 	setevent EVENT_BUG_CATCHING_CONTESTANT_1A
 	setevent EVENT_BUG_CATCHING_CONTESTANT_2A
 	setevent EVENT_BUG_CATCHING_CONTESTANT_3A
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index ef9a68221..834a4fd1d 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -14,9 +14,9 @@
 
 AzaleaTown_MapScripts:
 	db 3 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_AZALEATOWN_0
-	scene_script .DummyScene1 ; SCENE_AZALEATOWN_1
-	scene_script .DummyScene2 ; SCENE_AZALEATOWN_2
+	scene_script .DummyScene0 ; SCENE_AZALEATOWN_NOTHING
+	scene_script .DummyScene1 ; SCENE_AZALEATOWN_RIVAL_BATTLE
+	scene_script .DummyScene2 ; SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .Flypoint
@@ -100,7 +100,7 @@ AzaleaTownRivalBattleScript:
 	applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement
 	playsound SFX_EXIT_BUILDING
 	disappear AZALEATOWN_SILVER
-	setscene SCENE_AZALEATOWN_0
+	setscene SCENE_AZALEATOWN_NOTHING
 	waitsfx
 	playmapmusic
 	end
@@ -168,7 +168,7 @@ AzaleaTownCelebiScene:
 	setflag ENGINE_FOREST_IS_RESTLESS
 	clearevent EVENT_ILEX_FOREST_LASS
 	setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
-	setscene SCENE_AZALEATOWN_0
+	setscene SCENE_AZALEATOWN_NOTHING
 	closetext
 	end
 
@@ -467,9 +467,9 @@ AzaleaTown_MapEvents:
 	warp_event 2, 11, 4, ILEX_FOREST_AZALEA_GATE
 
 	db 3 ; coord events
-	coord_event 5, 10, SCENE_AZALEATOWN_1, AzaleaTownRivalBattleScene1
-	coord_event 5, 11, SCENE_AZALEATOWN_1, AzaleaTownRivalBattleScene2
-	coord_event 9, 6, SCENE_AZALEATOWN_2, AzaleaTownCelebiScene
+	coord_event 5, 10, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene1
+	coord_event 5, 11, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene2
+	coord_event 9, 6, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL, AzaleaTownCelebiScene
 
 	db 9 ; bg events
 	bg_event 19, 9, BGEVENT_READ, AzaleaTownSign
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index 16fe01c99..0678127ec 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -7,8 +7,8 @@
 
 BattleTower1F_MapScripts:
 	db 2 ; scene scripts
-	scene_script .Scene0 ; SCENE_BATTLETOWER1F_0
-	scene_script .Scene1 ; SCENE_BATTLETOWER1F_1
+	scene_script .Scene0 ; SCENE_DEFAULT
+	scene_script .Scene1 ; SCENE_BATTLETOWER1F_NOTHING
 
 	db 0 ; callbacks
 
@@ -36,7 +36,7 @@ BattleTower1F_MapScripts:
 	writebyte BATTLETOWERACTION_06
 	special BattleTowerAction
 .SkipEverything:
-	setscene SCENE_BATTLETOWER1F_1
+	setscene SCENE_BATTLETOWER1F_NOTHING
 .Scene1:
 	end
 
@@ -79,10 +79,10 @@ Script_ChooseChallenge: ; 0x9e40f
 	writetext Text_SaveBeforeEnteringBattleRoom
 	yesorno
 	iffalse Script_Menu_ChallengeExplanationCancel
-	setscene SCENE_BATTLETOWER1F_0
+	setscene SCENE_DEFAULT
 	special TryQuickSave
 	iffalse Script_Menu_ChallengeExplanationCancel
-	setscene SCENE_BATTLETOWER1F_1
+	setscene SCENE_BATTLETOWER1F_NOTHING
 	writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
 	special BattleTowerAction
 	special BattleTowerRoomMenu
@@ -103,9 +103,9 @@ Script_ResumeBattleTowerChallenge:
 	special BattleTowerAction
 Script_WalkToBattleTowerElevator:
 	musicfadeout MUSIC_NONE, 8
-	setmapscene BATTLE_TOWER_BATTLE_ROOM, SCENE_BATTLETOWERBATTLEROOM_0
-	setmapscene BATTLE_TOWER_ELEVATOR, SCENE_BATTLETOWERELEVATOR_0
-	setmapscene BATTLE_TOWER_HALLWAY, SCENE_BATTLETOWERHALLWAY_0
+	setmapscene BATTLE_TOWER_BATTLE_ROOM, SCENE_DEFAULT
+	setmapscene BATTLE_TOWER_ELEVATOR, SCENE_DEFAULT
+	setmapscene BATTLE_TOWER_HALLWAY, SCENE_DEFAULT
 	follow BATTLETOWER1F_RECEPTIONIST, PLAYER
 	applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator
 	writebyte BATTLETOWERACTION_0A
@@ -206,10 +206,10 @@ continue:
 	writetext Text_SaveBeforeReentry
 	yesorno
 	iffalse Script_Menu_ChallengeExplanationCancel
-	setscene SCENE_BATTLETOWER1F_0
+	setscene SCENE_DEFAULT
 	special TryQuickSave
 	iffalse Script_Menu_ChallengeExplanationCancel
-	setscene SCENE_BATTLETOWER1F_1
+	setscene SCENE_BATTLETOWER1F_NOTHING
 	writebyte BATTLETOWERACTION_06
 	special BattleTowerAction
 	writebyte BATTLETOWERACTION_12
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index d6d7fb981..ab06b1e34 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -4,15 +4,15 @@
 
 BattleTowerBattleRoom_MapScripts:
 	db 2 ; scene scripts
-	scene_script .EnterBattleRoom ; SCENE_BATTLETOWERBATTLEROOM_0
-	scene_script .DummyScene ; SCENE_BATTLETOWERBATTLEROOM_1
+	scene_script .EnterBattleRoom ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_BATTLETOWERBATTLEROOM_NOTHING
 
 	db 0 ; callbacks
 
 .EnterBattleRoom: ; 0x9f419
 	disappear BATTLETOWERBATTLEROOM_YOUNGSTER
 	priorityjump Script_BattleRoom
-	setscene SCENE_BATTLETOWERBATTLEROOM_1
+	setscene SCENE_BATTLETOWERBATTLEROOM_NOTHING
 .DummyScene:
 	end
 
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
index 59764d7d9..d8505b43f 100644
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -3,15 +3,14 @@
 
 BattleTowerElevator_MapScripts:
 	db 2 ; scene scripts
-	scene_script .Scene0 ; SCENE_BATTLETOWERELEVATOR_0
-	scene_script .Scene1 ; SCENE_BATTLETOWERELEVATOR_1
+	scene_script .Scene0 ; SCENE_DEFAULT
+	scene_script .Scene1 ; SCENE_BATTLETOWERELEVATOR_NOTHING
 
 	db 0 ; callbacks
 
 .Scene0:
 	priorityjump .RideElevator
-	setscene SCENE_BATTLETOWERELEVATOR_1
-
+	setscene SCENE_BATTLETOWERELEVATOR_NOTHING
 .Scene1:
 	end
 
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
index 4c856457f..6cd655252 100644
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -3,14 +3,14 @@
 
 BattleTowerHallway_MapScripts:
 	db 2 ; scene scripts
-	scene_script .Scene0 ; SCENE_BATTLETOWERHALLWAY_0
-	scene_script .Scene1 ; SCENE_BATTLETOWERHALLWAY_1
+	scene_script .Scene0 ; SCENE_DEFAULT
+	scene_script .Scene1 ; SCENE_BATTLETOWERHALLWAY_NOTHING
 
 	db 0 ; callbacks
 
 .Scene0:
 	priorityjump .ChooseBattleRoom
-	setscene SCENE_BATTLETOWERHALLWAY_1
+	setscene SCENE_BATTLETOWERHALLWAY_NOTHING
 .Scene1:
 	end
 
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
index 2de9c0901..8404a8a6f 100644
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -3,8 +3,8 @@
 
 BrunosRoom_MapScripts:
 	db 2 ; scene scripts
-	scene_script .LockDoor ; SCENE_BRUNOSROOM_0
-	scene_script .DummyScene ; SCENE_BRUNOSROOM_1
+	scene_script .LockDoor ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_BRUNOSROOM_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .BrunosRoomDoors
@@ -35,7 +35,7 @@ BrunosRoom_MapScripts:
 	changeblock 4, 14, $2a ; wall
 	reloadmappart
 	closetext
-	setscene SCENE_BRUNOSROOM_1
+	setscene SCENE_BRUNOSROOM_NOTHING
 	setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
 	waitsfx
 	end
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index 135f17304..a7f5d66e0 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -7,9 +7,9 @@
 
 BurnedTower1F_MapScripts:
 	db 3 ; scene scripts
-	scene_script .EusineScene ; SCENE_BURNEDTOWER1F_0
-	scene_script .DummyScene1 ; SCENE_BURNEDTOWER1F_1
-	scene_script .DummyScene2 ; SCENE_BURNEDTOWER1F_2
+	scene_script .EusineScene ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_BURNEDTOWER1F_RIVAL_BATTLE
+	scene_script .DummyScene2 ; SCENE_BURNEDTOWER1F_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HoleAndLadder
@@ -44,7 +44,7 @@ BurnedTower1F_MapScripts:
 	waitbutton
 	closetext
 	moveobject BURNEDTOWER1F_EUSINE, 9, 14
-	setscene SCENE_BURNEDTOWER1F_1
+	setscene SCENE_BURNEDTOWER1F_RIVAL_BATTLE
 	end
 
 BurnedTowerRivalBattleScript:
@@ -96,7 +96,7 @@ BurnedTowerRivalBattleScript:
 	writetext BurnedTowerSilver_AfterText1
 	waitbutton
 	closetext
-	setscene SCENE_BURNEDTOWER1F_2
+	setscene SCENE_BURNEDTOWER1F_NOTHING
 	setevent EVENT_RIVAL_BURNED_TOWER
 	special FadeOutMusic
 	pause 15
@@ -295,7 +295,7 @@ BurnedTower1F_MapEvents:
 	warp_event 7, 15, 6, BURNED_TOWER_B1F
 
 	db 1 ; coord events
-	coord_event 11, 9, SCENE_BURNEDTOWER1F_1, BurnedTowerRivalBattleScript
+	coord_event 11, 9, SCENE_BURNEDTOWER1F_RIVAL_BATTLE, BurnedTowerRivalBattleScript
 
 	db 2 ; bg events
 	bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index 4c74a156c..f685780c6 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -11,8 +11,8 @@
 
 BurnedTowerB1F_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_BURNEDTOWERB1F_0
-	scene_script .DummyScene1 ; SCENE_BURNEDTOWERB1F_1
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_BURNEDTOWERB1F_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .LadderCallback
@@ -79,11 +79,11 @@ ReleaseTheBeasts:
 	disappear BURNEDTOWERB1F_SUICUNE1
 	waitsfx
 	special RestartMapMusic
-	setscene SCENE_BURNEDTOWERB1F_1
+	setscene SCENE_BURNEDTOWERB1F_NOTHING
 	setevent EVENT_RELEASED_THE_BEASTS
 	special InitRoamMons
-	setmapscene ECRUTEAK_GYM, SCENE_ECRUTEAKGYM_1
-	setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_1
+	setmapscene ECRUTEAK_GYM, SCENE_ECRUTEAKGYM_NOTHING
+	setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
 	clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
 	setevent EVENT_ECRUTEAK_GYM_GRAMPS
 	clearevent EVENT_ECRUTEAK_CITY_GRAMPS
@@ -94,7 +94,7 @@ ReleaseTheBeasts:
 	changeblock 6, 14, $1b ; ladder
 	reloadmappart
 	closetext
-	setscene SCENE_BURNEDTOWERB1F_1
+	setscene SCENE_BURNEDTOWERB1F_NOTHING
 	end
 
 BurnedTowerB1FEusine:
@@ -245,7 +245,7 @@ BurnedTowerB1F_MapEvents:
 	warp_event 7, 15, 14, BURNED_TOWER_1F
 
 	db 1 ; coord events
-	coord_event 10, 6, SCENE_BURNEDTOWERB1F_0, ReleaseTheBeasts
+	coord_event 10, 6, SCENE_DEFAULT, ReleaseTheBeasts
 
 	db 0 ; bg events
 
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index 39ef30723..89f04bc1d 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -8,8 +8,8 @@
 
 CeruleanGym_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_CERULEANGYM_0
-	scene_script .GruntRunsOut ; SCENE_CERULEANGYM_1
+	scene_script .DummyScene0 ; SCENE_CERULEANGYM_NOTHING
+	scene_script .GruntRunsOut ; SCENE_CERULEANGYM_GRUNT_RUNS_OUT
 
 	db 0 ; callbacks
 
@@ -46,9 +46,9 @@ CeruleanGym_MapScripts:
 	setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
 	clearevent EVENT_ROUTE_24_ROCKET
 	clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND
-	setscene SCENE_CERULEANGYM_0
-	setmapscene ROUTE_25, SCENE_ROUTE25_1
-	setmapscene POWER_PLANT, SCENE_POWERPLANT_0
+	setscene SCENE_CERULEANGYM_NOTHING
+	setmapscene ROUTE_25, SCENE_ROUTE25_MISTYS_DATE
+	setmapscene POWER_PLANT, SCENE_POWERPLANT_NOTHING
 	waitsfx
 	special RestartMapMusic
 	pause 15
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index 889c8af16..09d824cd5 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -7,8 +7,8 @@
 
 CherrygroveCity_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_CHERRYGROVECITY_0
-	scene_script .DummyScene1 ; SCENE_CHERRYGROVECITY_1
+	scene_script .DummyScene0 ; SCENE_CHERRYGROVECITY_NOTHING
+	scene_script .DummyScene1 ; SCENE_CHERRYGROVECITY_MEET_RIVAL
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -169,7 +169,7 @@ CherrygroveSilverSceneNorth:
 	spriteface PLAYER, LEFT
 	applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft
 	disappear CHERRYGROVECITY_SILVER
-	setscene SCENE_CHERRYGROVECITY_0
+	setscene SCENE_CHERRYGROVECITY_NOTHING
 	special HealParty
 	playmapmusic
 	end
@@ -555,8 +555,8 @@ CherrygroveCity_MapEvents:
 	warp_event 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE
 
 	db 2 ; coord events
-	coord_event 33, 6, SCENE_CHERRYGROVECITY_1, CherrygroveSilverSceneNorth
-	coord_event 33, 7, SCENE_CHERRYGROVECITY_1, CherrygroveSilverSceneSouth
+	coord_event 33, 6, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneNorth
+	coord_event 33, 7, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneSouth
 
 	db 4 ; bg events
 	bg_event 30, 8, BGEVENT_READ, CherrygroveCitySign
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index c364ddb14..e88081814 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -14,8 +14,8 @@
 
 CianwoodCity_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_CIANWOODCITY_0
-	scene_script .DummyScene1 ; SCENE_CIANWOODCITY_1
+	scene_script .DummyScene0 ; SCENE_CIANWOODCITY_NOTHING
+	scene_script .DummyScene1 ; SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune
@@ -47,9 +47,9 @@ CianwoodCitySuicuneAndEusine:
 	applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0
 	disappear CIANWOODCITY_SUICUNE
 	pause 10
-	setscene SCENE_CIANWOODCITY_0
+	setscene SCENE_CIANWOODCITY_NOTHING
 	clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42
-	setmapscene ROUTE_42, SCENE_ROUTE42_1
+	setmapscene ROUTE_42, SCENE_ROUTE42_SUICUNE
 	checkevent EVENT_FOUGHT_EUSINE
 	iftrue .Done
 	setevent EVENT_FOUGHT_EUSINE
@@ -391,7 +391,7 @@ CianwoodCity_MapEvents:
 	warp_event 5, 17, 1, POKE_SEERS_HOUSE
 
 	db 1 ; coord events
-	coord_event 11, 16, SCENE_CIANWOODCITY_1, CianwoodCitySuicuneAndEusine
+	coord_event 11, 16, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE, CianwoodCitySuicuneAndEusine
 
 	db 8 ; bg events
 	bg_event 20, 34, BGEVENT_READ, CianwoodCitySign
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index 150f670c8..70e3f33b8 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -4,9 +4,9 @@
 
 Colosseum_MapScripts:
 	db 3 ; scene scripts
-	scene_script .InitializeColosseum ; SCENE_COLOSSEUM_0
-	scene_script .DummyScene1 ; SCENE_COLOSSEUM_1
-	scene_script .DummyScene2 ; SCENE_COLOSSEUM_2
+	scene_script .InitializeColosseum ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_COLOSSEUM_NOTHING
+	scene_script .DummyScene2 ; SCENE_COLOSSEUM_UNUSED
 
 	db 2 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
@@ -35,12 +35,12 @@ Colosseum_MapScripts:
 	return
 
 .PreparePokecenter2F:
-	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_2
+	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
 	return
 
 .InitializeAndPreparePokecenter2F:
-	setscene SCENE_COLOSSEUM_1
-	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_2
+	setscene SCENE_COLOSSEUM_NOTHING
+	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
 	end
 
 MapColosseumSignpost1Script:
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index 2443466ff..c36169a5f 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -6,8 +6,8 @@
 
 DragonShrine_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DragonShrineTest ; SCENE_DRAGONSHRINE_0
-	scene_script .DummyScene ; SCENE_DRAGONSHRINE_1
+	scene_script .DragonShrineTest ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_DRAGONSHRINE_NOTHING
 
 	db 0 ; callbacks
 
@@ -163,8 +163,8 @@ DragonShrine_MapScripts:
 	waitsfx
 	special RestartMapMusic
 	specialphonecall SPECIALCALL_MASTERBALL
-	setscene SCENE_DRAGONSHRINE_1
-	setmapscene DRAGONS_DEN_B1F, SCENE_DRAGONSDENB1F_1
+	setscene SCENE_DRAGONSHRINE_NOTHING
+	setmapscene DRAGONS_DEN_B1F, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM
 	writetext DragonShrinePlayerReceivedRisingBadgeText
 	buttonsound
 	writetext DragonShrineRisingBadgeExplanationText
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index d493fd866..2d0a815c6 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -11,8 +11,8 @@
 
 DragonsDenB1F_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_DRAGONSDENB1F_0
-	scene_script .DummyScene1 ; SCENE_DRAGONSDENB1F_1
+	scene_script .DummyScene0 ; SCENE_DRAGONSDENB1F_NOTHING
+	scene_script .DummyScene1 ; SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckSilver
@@ -78,7 +78,7 @@ DragonsDenB1F_ClairScene:
 	pause 30
 	special RestartMapMusic
 	disappear DRAGONSDENB1F_CLAIR
-	setscene SCENE_DRAGONSDENB1F_0
+	setscene SCENE_DRAGONSDENB1F_NOTHING
 	end
 
 TrainerCooltrainermDarin:
@@ -412,7 +412,7 @@ DragonsDenB1F_MapEvents:
 	warp_event 19, 29, 1, DRAGON_SHRINE
 
 	db 1 ; coord events
-	coord_event 19, 30, SCENE_DRAGONSDENB1F_1, DragonsDenB1F_ClairScene
+	coord_event 19, 30, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM, DragonsDenB1F_ClairScene
 
 	db 4 ; bg events
 	bg_event 18, 24, BGEVENT_READ, MapDragonsDenB1FSignpost0Script
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index 313669f86..dba5c6d24 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -9,8 +9,8 @@
 
 EcruteakGym_MapScripts:
 	db 2 ; scene scripts
-	scene_script .ForcedToLeave ; SCENE_ECRUTEAKGYM_0
-	scene_script .DummyScene ; SCENE_ECRUTEAKGYM_1
+	scene_script .ForcedToLeave ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_ECRUTEAKGYM_NOTHING
 
 	db 0 ; callbacks
 
@@ -41,7 +41,7 @@ MortyScript_0x99d58:
 	setflag ENGINE_FOGBADGE
 	checkcode VAR_BADGES
 	scall EcruteakGymActivateRockets
-	setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_ECRUTEAKTINTOWERENTRANCE_1
+	setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_ECRUTEAKTINTOWERENTRANCE_NOTHING
 	setevent EVENT_RANG_CLEAR_BELL_1
 	setevent EVENT_RANG_CLEAR_BELL_2
 .FightDone:
diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm
index f17d7ae68..cbde1f418 100644
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -7,8 +7,8 @@
 
 EcruteakPokecenter1F_MapScripts:
 	db 2 ; scene scripts
-	scene_script .MeetBill ; SCENE_ECRUTEAKPOKECENTER1F_0
-	scene_script .DummyScene ; SCENE_ECRUTEAKPOKECENTER1F_1
+	scene_script .MeetBill ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_ECRUTEAKPOKECENTER1F_NOTHING
 
 	db 0 ; callbacks
 
@@ -51,7 +51,7 @@ EcruteakPokecenter1F_MapScripts:
 	disappear ECRUTEAKPOKECENTER1F_BILL
 	clearevent EVENT_MET_BILL
 	setflag ENGINE_TIME_CAPSULE
-	setscene SCENE_ECRUTEAKPOKECENTER1F_1
+	setscene SCENE_ECRUTEAKPOKECENTER1F_NOTHING
 	waitsfx
 	end
 
diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm
index ab6c7fe3d..3e98ce398 100644
--- a/maps/EcruteakTinTowerEntrance.asm
+++ b/maps/EcruteakTinTowerEntrance.asm
@@ -6,8 +6,8 @@
 
 EcruteakTinTowerEntrance_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_ECRUTEAKTINTOWERENTRANCE_0
-	scene_script .DummyScene1 ; SCENE_ECRUTEAKTINTOWERENTRANCE_1
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_ECRUTEAKTINTOWERENTRANCE_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .InitializeSages
@@ -33,7 +33,7 @@ EcruteakTinTowerEntrance_MapScripts:
 	setevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
 	checkitem CLEAR_BELL
 	iftrue .NoClearBell
-	setscene SCENE_ECRUTEAKTINTOWERENTRANCE_0
+	setscene SCENE_DEFAULT
 .NoClearBell:
 	return
 
@@ -98,7 +98,7 @@ SageScript_0x98062:
 	writetext UnknownText_0x98250
 	waitbutton
 	closetext
-	setscene SCENE_ECRUTEAKTINTOWERENTRANCE_1
+	setscene SCENE_ECRUTEAKTINTOWERENTRANCE_NOTHING
 	setevent EVENT_RANG_CLEAR_BELL_2
 	clearevent EVENT_RANG_CLEAR_BELL_1
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -286,8 +286,8 @@ EcruteakTinTowerEntrance_MapEvents:
 	warp_event 17, 3, 3, WISE_TRIOS_ROOM
 
 	db 2 ; coord events
-	coord_event 4, 7, SCENE_ECRUTEAKTINTOWERENTRANCE_0, EcruteakTinTowerEntrance_CoordEvent1
-	coord_event 5, 7, SCENE_ECRUTEAKTINTOWERENTRANCE_0, EcruteakTinTowerEntrance_CoordEvent2
+	coord_event 4, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent1
+	coord_event 5, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent2
 
 	db 0 ; bg events
 
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 748bb70dc..32022fd85 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -8,12 +8,12 @@
 
 ElmsLab_MapScripts:
 	db 6 ; scene scripts
-	scene_script .MeetElm ; SCENE_ELMSLAB_0
-	scene_script .DummyScene1 ; SCENE_ELMSLAB_1
-	scene_script .DummyScene2 ; SCENE_ELMSLAB_2
-	scene_script .DummyScene3 ; SCENE_ELMSLAB_3
-	scene_script .DummyScene4 ; SCENE_ELMSLAB_4
-	scene_script .DummyScene5 ; SCENE_ELMSLAB_5
+	scene_script .MeetElm ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_ELMSLAB_CANT_LEAVE
+	scene_script .DummyScene2 ; SCENE_ELMSLAB_NOTHING
+	scene_script .DummyScene3 ; SCENE_ELMSLAB_MEET_OFFICER
+	scene_script .DummyScene4 ; SCENE_ELMSLAB_UNUSED
+	scene_script .DummyScene5 ; SCENE_ELMSLAB_AIDE_GIVES_POTION
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .MoveElmCallback
@@ -39,7 +39,7 @@ ElmsLab_MapScripts:
 
 .MoveElmCallback:
 	checkscene
-	iftrue .Skip ; not SCENE_ELMSLAB_0
+	iftrue .Skip ; not SCENE_DEFAULT
 	moveobject ELMSLAB_ELM, 3, 4
 .Skip:
 	return
@@ -82,7 +82,7 @@ ElmsLab_MapScripts:
 	opentext
 	writetext ElmText_ChooseAPokemon
 	waitbutton
-	setscene SCENE_ELMSLAB_1
+	setscene SCENE_ELMSLAB_CANT_LEAVE
 	closetext
 	end
 
@@ -272,8 +272,8 @@ ElmDirectionsScript:
 	closetext
 	setevent EVENT_GOT_A_POKEMON_FROM_ELM
 	setevent EVENT_RIVAL_CHERRYGROVE_CITY
-	setscene SCENE_ELMSLAB_5
-	setmapscene NEW_BARK_TOWN, SCENE_NEWBARKTOWN_1
+	setscene SCENE_ELMSLAB_AIDE_GIVES_POTION
+	setmapscene NEW_BARK_TOWN, SCENE_NEWBARKTOWN_NOTHING
 	end
 
 ElmDescribesMrPokemonScript:
@@ -339,13 +339,13 @@ ElmAfterTheftScript:
 	buttonsound
 	setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
 	setflag ENGINE_BUG_CONTEST_ON
-	setmapscene ROUTE_29, SCENE_ROUTE29_1
+	setmapscene ROUTE_29, SCENE_ROUTE29_CATCH_TUTORIAL
 	clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY
 	setevent EVENT_ROUTE_30_BATTLE
 	writetext ElmAfterTheftText6
 	waitbutton
 	closetext
-	setscene SCENE_ELMSLAB_6
+	setscene SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS
 	end
 
 ElmStudyingEggScript:
@@ -455,29 +455,29 @@ ElmJumpRightScript:
 	opentext
 	end
 
-AideScript_WalkPotions1:
+AideScript_WalkPotion1:
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksRight1
 	spriteface PLAYER, DOWN
-	scall AideScript_GivePotions
+	scall AideScript_GivePotion
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft1
 	end
 
-AideScript_WalkPotions2:
+AideScript_WalkPotion2:
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksRight2
 	spriteface PLAYER, DOWN
-	scall AideScript_GivePotions
+	scall AideScript_GivePotion
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft2
 	end
 
-AideScript_GivePotions:
+AideScript_GivePotion:
 	opentext
-	writetext AideText_GiveYouPotions
+	writetext AideText_GiveYouPotion
 	buttonsound
 	verbosegiveitem POTION
 	writetext AideText_AlwaysBusy
 	waitbutton
 	closetext
-	setscene SCENE_ELMSLAB_2
+	setscene SCENE_ELMSLAB_NOTHING
 	end
 
 AideScript_WalkBalls1:
@@ -505,7 +505,7 @@ AideScript_GiveYouBalls:
 	buttonsound
 	itemnotify
 	closetext
-	setscene SCENE_ELMSLAB_2
+	setscene SCENE_ELMSLAB_NOTHING
 	end
 
 AideScript_ReceiveTheBalls:
@@ -560,7 +560,7 @@ CopScript:
 	closetext
 	applymovement ELMSLAB_OFFICER, OfficerLeavesMovement
 	disappear ELMSLAB_OFFICER
-	setscene SCENE_ELMSLAB_2
+	setscene SCENE_ELMSLAB_NOTHING
 	end
 
 ElmsLabWindow:
@@ -1215,7 +1215,7 @@ ElmsLabSignpostText_Egg:
 	cont "by PROF.ELM."
 	done
 
-AideText_GiveYouPotions:
+AideText_GiveYouPotion:
 	text ", I want"
 	line "you to have this"
 	cont "for your errand."
@@ -1376,14 +1376,14 @@ ElmsLab_MapEvents:
 	warp_event 5, 11, 1, NEW_BARK_TOWN
 
 	db 8 ; coord events
-	coord_event 4, 6, SCENE_ELMSLAB_1, LabTryToLeaveScript
-	coord_event 5, 6, SCENE_ELMSLAB_1, LabTryToLeaveScript
-	coord_event 4, 5, SCENE_ELMSLAB_3, MeetCopScript
-	coord_event 5, 5, SCENE_ELMSLAB_3, MeetCopScript2
-	coord_event 4, 8, SCENE_ELMSLAB_5, AideScript_WalkPotions1
-	coord_event 5, 8, SCENE_ELMSLAB_5, AideScript_WalkPotions2
-	coord_event 4, 8, SCENE_ELMSLAB_6, AideScript_WalkBalls1
-	coord_event 5, 8, SCENE_ELMSLAB_6, AideScript_WalkBalls2
+	coord_event 4, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript
+	coord_event 5, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript
+	coord_event 4, 5, SCENE_ELMSLAB_MEET_OFFICER, MeetCopScript
+	coord_event 5, 5, SCENE_ELMSLAB_MEET_OFFICER, MeetCopScript2
+	coord_event 4, 8, SCENE_ELMSLAB_AIDE_GIVES_POTION, AideScript_WalkPotion1
+	coord_event 5, 8, SCENE_ELMSLAB_AIDE_GIVES_POTION, AideScript_WalkPotion2
+	coord_event 4, 8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls1
+	coord_event 5, 8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls2
 
 	db 16 ; bg events
 	bg_event 2, 1, BGEVENT_READ, ElmsLabHealingMachine
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index a13b40237..aa0877c63 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -6,9 +6,9 @@
 
 FastShip1F_MapScripts:
 	db 3 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_FASTSHIP1F_0
-	scene_script .EnterFastShip ; SCENE_FASTSHIP1F_1
-	scene_script .DummyScene2 ; SCENE_FASTSHIP1F_2
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .EnterFastShip ; SCENE_FASTSHIP1F_ENTER_SHIP
+	scene_script .DummyScene2 ; SCENE_FASTSHIP1F_MEET_GRANDPA
 
 	db 0 ; callbacks
 
@@ -33,11 +33,11 @@ FastShip1F_MapScripts:
 	clearevent EVENT_FAST_SHIP_HAS_ARRIVED
 	checkevent EVENT_FAST_SHIP_FIRST_TIME
 	iftrue .SkipGrandpa
-	setscene SCENE_FASTSHIP1F_2
+	setscene SCENE_FASTSHIP1F_MEET_GRANDPA
 	end
 
 .SkipGrandpa:
-	setscene SCENE_FASTSHIP1F_0
+	setscene SCENE_DEFAULT
 	end
 
 SailorScript_0x75160:
@@ -69,7 +69,7 @@ SailorScript_0x75160:
 	special FadeOutPalettes
 	waitsfx
 	setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
-	setmapscene VERMILION_PORT, SCENE_VERMILIONPORT_1
+	setmapscene VERMILION_PORT, SCENE_VERMILIONPORT_LEAVE_SHIP
 	warp VERMILION_PORT, 7, 17
 	end
 
@@ -82,7 +82,7 @@ SailorScript_0x75160:
 	special FadeOutPalettes
 	waitsfx
 	setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
-	setmapscene OLIVINE_PORT, SCENE_OLIVINEPORT_1
+	setmapscene OLIVINE_PORT, SCENE_OLIVINEPORT_LEAVE_SHIP
 	warp OLIVINE_PORT, 7, 23
 	end
 
@@ -133,7 +133,7 @@ WorriedGrandpaSceneLeft:
 	spriteface PLAYER, RIGHT
 	applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222
 	disappear FASTSHIP1F_GENTLEMAN
-	setscene SCENE_FASTSHIP1F_0
+	setscene SCENE_DEFAULT
 	end
 
 MovementData_0x7520e:
@@ -301,8 +301,8 @@ FastShip1F_MapEvents:
 	warp_event 30, 14, 2, FAST_SHIP_B1F
 
 	db 2 ; coord events
-	coord_event 24, 6, SCENE_FASTSHIP1F_2, WorriedGrandpaSceneLeft
-	coord_event 25, 6, SCENE_FASTSHIP1F_2, WorriedGrandpaSceneRight
+	coord_event 24, 6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneLeft
+	coord_event 25, 6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneRight
 
 	db 0 ; bg events
 
diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm
index b0bfa0acf..d0e0d2b98 100644
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -14,8 +14,8 @@
 
 FastShipB1F_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_FASTSHIPB1F_0
-	scene_script .DummyScene1 ; SCENE_FASTSHIPB1F_1
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_FASTSHIPB1F_NOTHING
 
 	db 0 ; callbacks
 
@@ -454,8 +454,8 @@ FastShipB1F_MapEvents:
 	warp_event 31, 13, 12, FAST_SHIP_1F
 
 	db 2 ; coord events
-	coord_event 30, 7, SCENE_FASTSHIPB1F_0, UnknownScript_0x7673c
-	coord_event 31, 7, SCENE_FASTSHIPB1F_0, UnknownScript_0x76751
+	coord_event 30, 7, SCENE_DEFAULT, UnknownScript_0x7673c
+	coord_event 31, 7, SCENE_DEFAULT, UnknownScript_0x76751
 
 	db 1 ; bg events
 	bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan
diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm
index 00d3e0d00..b0933477f 100644
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -96,7 +96,7 @@ SailorScript_0x755f1:
 	waitbutton
 	closetext
 	setevent EVENT_FAST_SHIP_LAZY_SAILOR
-	setmapscene FAST_SHIP_B1F, SCENE_FASTSHIPB1F_1
+	setmapscene FAST_SHIP_B1F, SCENE_FASTSHIPB1F_NOTHING
 	checkcode VAR_FACING
 	if_equal RIGHT, UnknownScript_0x75629
 	applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index dd80d59fe..3e68a1494 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -79,7 +79,7 @@ SSAquaGranddaughterBefore:
 	writetext SSAquaEntertainedGranddaughterText
 	buttonsound
 	setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
-	setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_0
+	setmapscene FAST_SHIP_1F, SCENE_DEFAULT
 	jump SSAquaMetalCoatAndDocking
 
 SSAquaGrandpa:
@@ -92,7 +92,7 @@ SSAquaGrandpa:
 	writetext SSAquaCantFindGranddaughterText
 	waitbutton
 	closetext
-	setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_0
+	setmapscene FAST_SHIP_1F, SCENE_DEFAULT
 	end
 
 SSAquaMetalCoatAndDocking:
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
index 2d686d4d3..d02f2a4af 100644
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -8,8 +8,8 @@
 
 GoldenrodGym_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_GOLDENRODGYM_0
-	scene_script .DummyScene1 ; SCENE_GOLDENRODGYM_1
+	scene_script .DummyScene0 ; SCENE_GOLDENRODGYM_NOTHING
+	scene_script .DummyScene1 ; SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING
 
 	db 0 ; callbacks
 
@@ -33,7 +33,7 @@ WhitneyScript_0x5400c:
 	reloadmapafterbattle
 	setevent EVENT_BEAT_WHITNEY
 	setevent EVENT_MADE_WHITNEY_CRY
-	setscene SCENE_GOLDENRODGYM_1
+	setscene SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING
 	setevent EVENT_BEAT_BEAUTY_VICTORIA
 	setevent EVENT_BEAT_BEAUTY_SAMANTHA
 	setevent EVENT_BEAT_LASS_CARRIE
@@ -110,7 +110,7 @@ WhitneyCriesScript:
 	waitbutton
 	closetext
 	applymovement GOLDENRODGYM_LASS2, BridgetWalksAwayMovement
-	setscene SCENE_GOLDENRODGYM_0
+	setscene SCENE_GOLDENRODGYM_NOTHING
 	clearevent EVENT_MADE_WHITNEY_CRY
 	end
 
@@ -385,7 +385,7 @@ GoldenrodGym_MapEvents:
 	warp_event 3, 17, 1, GOLDENROD_CITY
 
 	db 1 ; coord events
-	coord_event 8, 5, SCENE_GOLDENRODGYM_1, WhitneyCriesScript
+	coord_event 8, 5, SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING, WhitneyCriesScript
 
 	db 2 ; bg events
 	bg_event 1, 15, BGEVENT_READ, GoldenrodGymStatue
diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm
index fdcc0dcbc..003925cb2 100644
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -4,7 +4,7 @@
 
 GoldenrodMagnetTrainStation_MapScripts:
 	db 1 ; scene scripts
-	scene_script .DummyScene ; SCENE_GOLDENRODMAGNETTRAINSTATION_0
+	scene_script .DummyScene ; SCENE_DEFAULT
 
 	db 0 ; callbacks
 
@@ -172,7 +172,7 @@ GoldenrodMagnetTrainStation_MapEvents:
 	warp_event 11, 5, 3, SAFFRON_MAGNET_TRAIN_STATION
 
 	db 1 ; coord events
-	coord_event 11, 6, SCENE_GOLDENRODMAGNETTRAINSTATION_0, Script_ArriveFromSaffron
+	coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromSaffron
 
 	db 0 ; bg events
 
diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm
index 1cf168213..2d8b8b484 100644
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -812,8 +812,8 @@ GoldenrodPokecenter1F_MapEvents:
 	warp_event 0, 7, 1, POKECENTER_2F
 
 	db 2 ; coord events
-	coord_event 3, 7, SCENE_GOLDENRODPOKECENTER1F_0, GoldenrodPokecenter1F_GSBallSceneLeft
-	coord_event 4, 7, SCENE_GOLDENRODPOKECENTER1F_0, GoldenrodPokecenter1F_GSBallSceneRight
+	coord_event 3, 7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneLeft
+	coord_event 4, 7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneRight
 
 	db 0 ; bg events
 
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index dcb8caa18..0183c3c96 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -46,8 +46,8 @@ ENDM
 
 GoldenrodUndergroundSwitchRoomEntrances_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_0
-	scene_script .DummyScene1 ; SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_1
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .UpdateDoorPositions
@@ -130,7 +130,7 @@ UndergroundSilverScene1:
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1
 	playsound SFX_EXIT_BUILDING
 	disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
-	setscene SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_1
+	setscene SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOTHING
 	waitsfx
 	playmapmusic
 	end
@@ -149,7 +149,7 @@ UndergroundSilverScene2:
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2
 	playsound SFX_EXIT_BUILDING
 	disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
-	setscene SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_1
+	setscene SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOTHING
 	waitsfx
 	playmapmusic
 	end
@@ -158,7 +158,7 @@ UndergroundSilverBattleScript:
 	checkevent EVENT_RIVAL_BURNED_TOWER
 	iftrue .Continue
 	setevent EVENT_RIVAL_BURNED_TOWER
-	setmapscene BURNED_TOWER_1F, SCENE_BURNEDTOWER1F_1
+	setmapscene BURNED_TOWER_1F, SCENE_BURNEDTOWER1F_RIVAL_BATTLE
 .Continue:
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
@@ -943,8 +943,8 @@ GoldenrodUndergroundSwitchRoomEntrances_MapEvents:
 	warp_event 21, 29, 13, GOLDENROD_CITY
 
 	db 2 ; coord events
-	coord_event 19, 4, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_0, UndergroundSilverScene1
-	coord_event 19, 5, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_0, UndergroundSilverScene2
+	coord_event 19, 4, SCENE_DEFAULT, UndergroundSilverScene1
+	coord_event 19, 5, SCENE_DEFAULT, UndergroundSilverScene2
 
 	db 6 ; bg events
 	bg_event 16, 1, BGEVENT_READ, Switch1Script
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index da16e431f..b0f10f392 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -3,8 +3,8 @@
 
 HallOfFame_MapScripts:
 	db 2 ; scene scripts
-	scene_script .EnterHallOfFame ; SCENE_HALLOFFAME_0
-	scene_script .DummyScene ; SCENE_HALLOFFAME_1
+	scene_script .EnterHallOfFame ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_HALLOFFAME_NOTHING
 
 	db 0 ; callbacks
 
@@ -26,7 +26,7 @@ HallOfFame_MapScripts:
 	closetext
 	spriteface HALLOFFAME_LANCE, UP
 	applymovement PLAYER, HallOfFame_SlowlyApproachMachine
-	setscene SCENE_HALLOFFAME_1
+	setscene SCENE_HALLOFFAME_NOTHING
 	pause 15
 	writebyte HEALMACHINE_HALL_OF_FAME
 	special HealMachineAnim
@@ -36,7 +36,7 @@ HallOfFame_MapScripts:
 	clearevent EVENT_RED_IN_MT_SILVER
 	setevent EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
 	clearevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
-	setmapscene SPROUT_TOWER_3F, SCENE_SPROUTTOWER3F_1
+	setmapscene SPROUT_TOWER_3F, SCENE_SPROUTTOWER3F_NOTHING
 	special HealParty
 	checkevent EVENT_GOT_SS_TICKET_FROM_ELM
 	iftrue .SkipPhoneCall
diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm
index 3fd17b697..7e59b632a 100644
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -8,7 +8,7 @@
 
 IndigoPlateauPokecenter1F_MapScripts:
 	db 1 ; scene scripts
-	scene_script .DummyScene ; SCENE_INDIGOPLATEAUPOKECENTER1F_0
+	scene_script .DummyScene ; SCENE_DEFAULT
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .PrepareElite4
@@ -17,12 +17,12 @@ IndigoPlateauPokecenter1F_MapScripts:
 	end
 
 .PrepareElite4:
-	setmapscene WILLS_ROOM, SCENE_WILLSROOM_0
-	setmapscene KOGAS_ROOM, SCENE_KOGASROOM_0
-	setmapscene BRUNOS_ROOM, SCENE_BRUNOSROOM_0
-	setmapscene KARENS_ROOM, SCENE_KARENSROOM_0
-	setmapscene LANCES_ROOM, SCENE_LANCESROOM_0
-	setmapscene HALL_OF_FAME, SCENE_HALLOFFAME_0
+	setmapscene WILLS_ROOM, SCENE_DEFAULT
+	setmapscene KOGAS_ROOM, SCENE_DEFAULT
+	setmapscene BRUNOS_ROOM, SCENE_DEFAULT
+	setmapscene KARENS_ROOM, SCENE_DEFAULT
+	setmapscene LANCES_ROOM, SCENE_DEFAULT
+	setmapscene HALL_OF_FAME, SCENE_DEFAULT
 	clearevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
 	clearevent EVENT_WILLS_ROOM_EXIT_OPEN
 	clearevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
@@ -128,7 +128,7 @@ PlateauRivalPostBattle:
 	spriteface PLAYER, DOWN
 	applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalLeavesMovement
 	disappear INDIGOPLATEAUPOKECENTER1F_SILVER
-	setscene SCENE_INDIGOPLATEAUPOKECENTER1F_0
+	setscene SCENE_DEFAULT
 	playmapmusic
 	setflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
 PlateauRivalScriptDone:
@@ -310,8 +310,8 @@ IndigoPlateauPokecenter1F_MapEvents:
 	warp_event 14, 3, 1, WILLS_ROOM
 
 	db 2 ; coord events
-	coord_event 16, 4, SCENE_INDIGOPLATEAUPOKECENTER1F_0, PlateauRivalBattle1
-	coord_event 17, 4, SCENE_INDIGOPLATEAUPOKECENTER1F_0, PlateauRivalBattle2
+	coord_event 16, 4, SCENE_DEFAULT, PlateauRivalBattle1
+	coord_event 17, 4, SCENE_DEFAULT, PlateauRivalBattle2
 
 	db 0 ; bg events
 
diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
index 0a6b40ae5..8d7b3ad2e 100644
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -3,8 +3,8 @@
 
 KarensRoom_MapScripts:
 	db 2 ; scene scripts
-	scene_script .LockDoor ; SCENE_KARENSROOM_0
-	scene_script .DummyScene ; SCENE_KARENSROOM_1
+	scene_script .LockDoor ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_KARENSROOM_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .KarensRoomDoors
@@ -35,7 +35,7 @@ KarensRoom_MapScripts:
 	changeblock 4, 14, $2a ; wall
 	reloadmappart
 	closetext
-	setscene SCENE_KARENSROOM_1
+	setscene SCENE_KARENSROOM_NOTHING
 	setevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED
 	waitsfx
 	end
diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
index 1e5ea19ba..d6365532b 100644
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -3,8 +3,8 @@
 
 KogasRoom_MapScripts:
 	db 2 ; scene scripts
-	scene_script .LockDoor ; SCENE_KOGASROOM_0
-	scene_script .DummyScene ; SCENE_KOGASROOM_1
+	scene_script .LockDoor ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_KOGASROOM_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .KogasRoomDoors
@@ -35,7 +35,7 @@ KogasRoom_MapScripts:
 	changeblock 4, 14, $2a ; wall
 	reloadmappart
 	closetext
-	setscene SCENE_KOGASROOM_1
+	setscene SCENE_KOGASROOM_NOTHING
 	setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
 	waitsfx
 	end
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index 3b3dee548..8a11474a8 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -309,7 +309,7 @@ KurtScript_0x18e178:
 	clearevent EVENT_AZALEA_TOWN_KURT
 	waitsfx
 	special RestartMapMusic
-	setmapscene AZALEA_TOWN, SCENE_AZALEATOWN_2
+	setmapscene AZALEA_TOWN, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL
 	end
 
 KurtScript_0x18e3bd:
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm
index ff8d33b4f..5808bb37b 100644
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -60,7 +60,7 @@ UnknownScript_0x70035:
 	disappear LAKEOFRAGE_LANCE
 	clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
 	setevent EVENT_DECIDED_TO_HELP_LANCE
-	setmapscene MAHOGANY_MART_1F, SCENE_MAHOGANYMART1F_1
+	setmapscene MAHOGANY_MART_1F, SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS
 	end
 
 UnknownScript_0x7004e:
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index f370538a9..294321ac8 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -5,8 +5,8 @@
 
 LancesRoom_MapScripts:
 	db 2 ; scene scripts
-	scene_script .LockDoor ; SCENE_LANCESROOM_0
-	scene_script .DummyScene ; SCENE_LANCESROOM_1
+	scene_script .LockDoor ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_LANCESROOM_APPROACH_LANCE
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .LancesRoomDoors
@@ -37,7 +37,7 @@ LancesRoom_MapScripts:
 	changeblock 4, 22, $34 ; wall
 	reloadmappart
 	closetext
-	setscene SCENE_LANCESROOM_1
+	setscene SCENE_LANCESROOM_APPROACH_LANCE
 	setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
 	end
 
@@ -345,8 +345,8 @@ LancesRoom_MapEvents:
 	warp_event 5, 1, 2, HALL_OF_FAME
 
 	db 2 ; coord events
-	coord_event 4, 5, SCENE_LANCESROOM_1, Script_ApproachLanceFromLeft
-	coord_event 5, 5, SCENE_LANCESROOM_1, Script_ApproachLanceFromRight
+	coord_event 4, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromLeft
+	coord_event 5, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromRight
 
 	db 0 ; bg events
 
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index b7dd2428d..cbc4b05e1 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -7,8 +7,8 @@
 
 MahoganyMart1F_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_MAHOGANYMART1F_0
-	scene_script .LanceUncoversStaircase ; SCENE_MAHOGANYMART1F_1
+	scene_script .DummyScene0 ; SCENE_MAHOGANYMART1F_NOTHING
+	scene_script .LanceUncoversStaircase ; SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .MahoganyMart1FStaircase
@@ -99,7 +99,7 @@ UnknownScript_0x6c38f:
 	applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c412
 	playsound SFX_EXIT_BUILDING
 	disappear MAHOGANYMART1F_LANCE
-	setscene SCENE_MAHOGANYMART1F_0
+	setscene SCENE_MAHOGANYMART1F_NOTHING
 	waitsfx
 	end
 
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index c31550afd..91750c4cd 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -6,8 +6,8 @@
 
 MahoganyTown_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_MAHOGANYTOWN_0
-	scene_script .DummyScene1 ; SCENE_MAHOGANYTOWN_1
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_MAHOGANYTOWN_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -253,8 +253,8 @@ MahoganyTown_MapEvents:
 	warp_event 9, 1, 3, ROUTE_43_MAHOGANY_GATE
 
 	db 2 ; coord events
-	coord_event 19, 8, SCENE_MAHOGANYTOWN_0, UnknownScript_0x190013
-	coord_event 19, 9, SCENE_MAHOGANYTOWN_0, UnknownScript_0x190013
+	coord_event 19, 8, SCENE_DEFAULT, UnknownScript_0x190013
+	coord_event 19, 9, SCENE_DEFAULT, UnknownScript_0x190013
 
 	db 4 ; bg events
 	bg_event 1, 5, BGEVENT_READ, MahoganyTownSign
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index 254a66c02..976719891 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -1,7 +1,7 @@
 MobileBattleRoom_MapScripts:
 	db 2 ; scene scripts
-	scene_script .InitializeMobileBattleRoom ; SCENE_MOBILEBATTLEROOM_0
-	scene_script .DummyScene ; SCENE_MOBILEBATTLEROOM_1
+	scene_script .InitializeMobileBattleRoom ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_MOBILEBATTLEROOM_NOTHING
 
 	db 0 ; callbacks
 
@@ -13,8 +13,8 @@ MobileBattleRoom_MapScripts:
 	end
 
 .InitializeAndPreparePokecenter2F:
-	setscene SCENE_MOBILEBATTLEROOM_1
-	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_5
+	setscene SCENE_MOBILEBATTLEROOM_NOTHING
+	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM
 	end
 
 MapMobileBattleRoomSignpost0Script:
diff --git a/maps/MobileTradeRoom.asm b/maps/MobileTradeRoom.asm
index 73e40ef82..1739dfcf5 100644
--- a/maps/MobileTradeRoom.asm
+++ b/maps/MobileTradeRoom.asm
@@ -1,7 +1,7 @@
 MobileTradeRoom_MapScripts:
 	db 2 ; scene scripts
-	scene_script .InitializeMobileTradeRoom ; SCENE_MOBILETRADEROOM_0
-	scene_script .DummyScene ; SCENE_MOBILETRADEROOM_1
+	scene_script .InitializeMobileTradeRoom ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_MOBILETRADEROOM_NOTHING
 
 	db 0 ; callbacks
 
@@ -13,8 +13,8 @@ MobileTradeRoom_MapScripts:
 	end
 
 .InitializeAndPreparePokecenter2F:
-	setscene SCENE_MOBILETRADEROOM_1
-	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_4
+	setscene SCENE_MOBILETRADEROOM_NOTHING
+	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM
 	end
 
 MapMobileTradeRoomSignpost0Script:
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index 2ecc3fdd2..700f6cced 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -3,8 +3,8 @@
 
 MountMoon_MapScripts:
 	db 2 ; scene scripts
-	scene_script .RivalEncounter ; SCENE_MOUNTMOON_0
-	scene_script .DummyScene ; SCENE_MOUNTMOON_1
+	scene_script .RivalEncounter ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_MOUNTMOON_NOTHING
 
 	db 0 ; callbacks
 
@@ -64,7 +64,7 @@ MountMoon_MapScripts:
 	closetext
 	applymovement MOUNTMOON_SILVER, MountMoonSilverMovementAfter
 	disappear MOUNTMOON_SILVER
-	setscene SCENE_MOUNTMOON_1
+	setscene SCENE_MOUNTMOON_NOTHING
 	setevent EVENT_BEAT_RIVAL_IN_MT_MOON
 	playmapmusic
 	end
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index 9e6d65dd5..9defcccd0 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -8,8 +8,8 @@ MountMoonSquare_MapScripts:
 	scene_script .DummyScene
 
 	db 2 ; callbacks
-	callback MAPCALLBACK_NEWMAP, .DisappearMoonStone ; SCENE_MOUNTMOONSQUARE_0
-	callback MAPCALLBACK_OBJECTS, .DisappearRock ; SCENE_MOUNTMOONSQUARE_1
+	callback MAPCALLBACK_NEWMAP, .DisappearMoonStone ; SCENE_DEFAULT
+	callback MAPCALLBACK_OBJECTS, .DisappearRock ; SCENE_MOUNTMOONSQUARE_UNUSED
 
 .DummyScene:
 	end
@@ -139,7 +139,7 @@ MountMoonSquare_MapEvents:
 	warp_event 13, 7, 1, MOUNT_MOON_GIFT_SHOP
 
 	db 1 ; coord events
-	coord_event 7, 11, SCENE_MOUNTMOONSQUARE_0, ClefairyDance
+	coord_event 7, 11, SCENE_DEFAULT, ClefairyDance
 
 	db 2 ; bg events
 	bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index 6c97a234b..d293b716a 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -4,8 +4,8 @@
 
 MrPokemonsHouse_MapScripts:
 	db 2 ; scene scripts
-	scene_script .MeetMrPokemon ; SCENE_MRPOKEMONSHOUSE_0
-	scene_script .DummyScene ; SCENE_MRPOKEMONSHOUSE_1
+	scene_script .MeetMrPokemon ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_MRPOKEMONSHOUSE_NOTHING
 
 	db 0 ; callbacks
 
@@ -123,9 +123,9 @@ MrPokemonsHouse_OakScript:
 	setevent EVENT_RIVAL_NEW_BARK_TOWN
 	setevent EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
 	clearevent EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
-	setscene SCENE_MRPOKEMONSHOUSE_1
-	setmapscene CHERRYGROVE_CITY, SCENE_CHERRYGROVECITY_1
-	setmapscene ELMS_LAB, SCENE_ELMSLAB_3
+	setscene SCENE_MRPOKEMONSHOUSE_NOTHING
+	setmapscene CHERRYGROVE_CITY, SCENE_CHERRYGROVECITY_MEET_RIVAL
+	setmapscene ELMS_LAB, SCENE_ELMSLAB_MEET_OFFICER
 	specialphonecall SPECIALCALL_ROBBED
 	clearevent EVENT_COP_IN_ELMS_LAB
 	checkevent EVENT_GOT_TOTODILE_FROM_ELM
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index 1d70cb9f5..6ac0a5080 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -5,8 +5,8 @@
 
 NewBarkTown_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_NEWBARKTOWN_0
-	scene_script .DummyScene1 ; SCENE_NEWBARKTOWN_1
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_NEWBARKTOWN_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -289,8 +289,8 @@ NewBarkTown_MapEvents:
 	warp_event 11, 13, 1, ELMS_HOUSE
 
 	db 2 ; coord events
-	coord_event 1, 8, SCENE_NEWBARKTOWN_0, NewBarkTown_TeacherStopsYouScene1
-	coord_event 1, 9, SCENE_NEWBARKTOWN_0, NewBarkTown_TeacherStopsYouScene2
+	coord_event 1, 8, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene1
+	coord_event 1, 9, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene2
 
 	db 4 ; bg events
 	bg_event 8, 8, BGEVENT_READ, NewBarkTownSign
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index 059de2f67..f79828e93 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -6,8 +6,8 @@
 
 OlivineCity_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_OLIVINECITY_0
-	scene_script .DummyScene1 ; SCENE_OLIVINECITY_1
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_OLIVINECITY_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -39,7 +39,7 @@ UnknownScript_0x1a8833:
 	applymovement PLAYER, MovementData_0x1a88f4
 	spriteface PLAYER, RIGHT
 	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88db
-	setscene SCENE_OLIVINECITY_1
+	setscene SCENE_OLIVINECITY_NOTHING
 	disappear OLIVINECITY_OLIVINE_RIVAL
 	special RestartMapMusic
 	variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
@@ -64,7 +64,7 @@ UnknownScript_0x1a886b:
 	spriteface PLAYER, RIGHT
 	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88e8
 	disappear OLIVINECITY_OLIVINE_RIVAL
-	setscene SCENE_OLIVINECITY_1
+	setscene SCENE_OLIVINECITY_NOTHING
 	special RestartMapMusic
 	variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
 	special LoadUsedSpritesGFX
@@ -302,8 +302,8 @@ OlivineCity_MapEvents:
 	warp_event 20, 27, 2, OLIVINE_PORT_PASSAGE
 
 	db 2 ; coord events
-	coord_event 13, 12, SCENE_OLIVINECITY_0, UnknownScript_0x1a8833
-	coord_event 13, 13, SCENE_OLIVINECITY_0, UnknownScript_0x1a886b
+	coord_event 13, 12, SCENE_DEFAULT, UnknownScript_0x1a8833
+	coord_event 13, 13, SCENE_DEFAULT, UnknownScript_0x1a886b
 
 	db 7 ; bg events
 	bg_event 17, 11, BGEVENT_READ, OlivineCitySign
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index 43f5be286..7c0f2dd71 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -9,8 +9,8 @@
 
 OlivinePort_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_OLIVINEPORT_0
-	scene_script .LeaveFastShip ; SCENE_OLIVINEPORT_1
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .LeaveFastShip ; SCENE_OLIVINEPORT_LEAVE_SHIP
 
 	db 0 ; callbacks
 
@@ -24,7 +24,7 @@ OlivinePort_MapScripts:
 .LeaveFastShipScript:
 	applymovement PLAYER, MovementData_0x74a32
 	appear OLIVINEPORT_SAILOR1
-	setscene SCENE_OLIVINEPORT_0
+	setscene SCENE_DEFAULT
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	blackoutmod OLIVINE_CITY
 	end
@@ -62,7 +62,7 @@ SailorScript_0x748c0:
 UnknownScript_0x7490a:
 	clearevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
 	appear OLIVINEPORT_SAILOR1
-	setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_1
+	setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_ENTER_SHIP
 	warp FAST_SHIP_1F, 25, 1
 	end
 
@@ -390,7 +390,7 @@ OlivinePort_MapEvents:
 	warp_event 7, 23, 1, FAST_SHIP_1F
 
 	db 1 ; coord events
-	coord_event 7, 15, SCENE_OLIVINEPORT_0, UnknownScript_0x7491f
+	coord_event 7, 15, SCENE_DEFAULT, UnknownScript_0x7491f
 
 	db 1 ; bg events
 	bg_event 1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index ba421221d..362674bc3 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -7,8 +7,8 @@
 
 PlayersHouse1F_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_PLAYERSHOUSE1F_0
-	scene_script .DummyScene1 ; SCENE_PLAYERSHOUSE1F_1
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_PLAYERSHOUSE1F_NOTHING
 
 	db 0 ; callbacks
 
@@ -41,7 +41,7 @@ UnknownScript_0x7a4f6:
 	setflag ENGINE_POKEGEAR
 	setflag ENGINE_PHONE_CARD
 	addcellnum PHONE_MOM
-	setscene SCENE_PLAYERSHOUSE1F_1
+	setscene SCENE_PLAYERSHOUSE1F_NOTHING
 	setevent EVENT_PLAYERS_HOUSE_MOM_1
 	clearevent EVENT_PLAYERS_HOUSE_MOM_2
 	writetext UnknownText_0x7a6bd
@@ -114,7 +114,7 @@ MomScript_0x7a582:
 	faceplayer
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	checkscene
-	iffalse UnknownScript_0x7a572 ; SCENE_PLAYERSHOUSE1F_0
+	iffalse UnknownScript_0x7a572 ; SCENE_DEFAULT
 	opentext
 	checkevent EVENT_FIRST_TIME_BANKING_WITH_MOM
 	iftrue UnknownScript_0x7a5af
@@ -392,8 +392,8 @@ PlayersHouse1F_MapEvents:
 	warp_event 9, 0, 1, PLAYERS_HOUSE_2F
 
 	db 2 ; coord events
-	coord_event 8, 4, SCENE_PLAYERSHOUSE1F_0, UnknownScript_0x7a4d8
-	coord_event 9, 4, SCENE_PLAYERSHOUSE1F_0, UnknownScript_0x7a4db
+	coord_event 8, 4, SCENE_DEFAULT, UnknownScript_0x7a4d8
+	coord_event 9, 4, SCENE_DEFAULT, UnknownScript_0x7a4db
 
 	db 4 ; bg events
 	bg_event 0, 1, BGEVENT_READ, StoveScript
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 204ef2556..6f86921d2 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -6,12 +6,12 @@
 
 Pokecenter2F_MapScripts:
 	db 6 ; scene scripts
-	scene_script .Scene0 ; SCENE_POKECENTER2F_0
-	scene_script .Scene1 ; SCENE_POKECENTER2F_1
-	scene_script .Scene2 ; SCENE_POKECENTER2F_2
-	scene_script .Scene3 ; SCENE_POKECENTER2F_3
-	scene_script .Scene4 ; SCENE_POKECENTER2F_4
-	scene_script .Scene5 ; SCENE_POKECENTER2F_5
+	scene_script .Scene0 ; SCENE_DEFAULT
+	scene_script .Scene1 ; SCENE_POKECENTER2F_LEAVE_TRADE_CENTER
+	scene_script .Scene2 ; SCENE_POKECENTER2F_LEAVE_COLOSSEUM
+	scene_script .Scene3 ; SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE
+	scene_script .Scene4 ; SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM
+	scene_script .Scene5 ; SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM
 
 	db 0 ; callbacks
 
@@ -374,15 +374,15 @@ LinkReceptionistScript_TimeCapsule:
 Script_LeftCableTradeCenter:
 	special WaitForOtherPlayerToExit
 	scall Script_WalkOutOfLinkTradeRoom
-	setscene SCENE_POKECENTER2F_0
-	setmapscene TRADE_CENTER, SCENE_TRADECENTER_0
+	setscene SCENE_DEFAULT
+	setmapscene TRADE_CENTER, SCENE_DEFAULT
 	end
 
 Script_LeftMobileTradeRoom:
 	special Function101220
 	scall Script_WalkOutOfMobileTradeRoom
-	setscene SCENE_POKECENTER2F_0
-	setmapscene MOBILE_TRADE_ROOM, SCENE_MOBILETRADEROOM_0
+	setscene SCENE_DEFAULT
+	setmapscene MOBILE_TRADE_ROOM, SCENE_DEFAULT
 	end
 
 Script_WalkOutOfMobileTradeRoom:
@@ -394,15 +394,15 @@ Script_WalkOutOfMobileTradeRoom:
 Script_LeftCableColosseum:
 	special WaitForOtherPlayerToExit
 	scall Script_WalkOutOfLinkBattleRoom
-	setscene SCENE_POKECENTER2F_0
-	setmapscene COLOSSEUM, SCENE_COLOSSEUM_0
+	setscene SCENE_DEFAULT
+	setmapscene COLOSSEUM, SCENE_DEFAULT
 	end
 
 Script_LeftMobileBattleRoom:
 	special Function101220
 	scall Script_WalkOutOfMobileBattleRoom
-	setscene SCENE_POKECENTER2F_0
-	setmapscene MOBILE_BATTLE_ROOM, SCENE_MOBILEBATTLEROOM_0
+	setscene SCENE_DEFAULT
+	setmapscene MOBILE_BATTLE_ROOM, SCENE_DEFAULT
 	end
 
 Script_WalkOutOfMobileBattleRoom:
@@ -577,8 +577,8 @@ Script_LeftTimeCapsule:
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown
 	applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2
 .Done:
-	setscene SCENE_POKECENTER2F_0
-	setmapscene TIME_CAPSULE, SCENE_TIMECAPSULE_0
+	setscene SCENE_DEFAULT
+	setmapscene TIME_CAPSULE, SCENE_DEFAULT
 	end
 
 MapPokecenter2FSignpost0Script:
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index e52e9f540..1e291b890 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -9,8 +9,8 @@
 
 PowerPlant_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_POWERPLANT_0
-	scene_script .DummyScene1 ; SCENE_POWERPLANT_1
+	scene_script .DummyScene0 ; SCENE_POWERPLANT_NOTHING
+	scene_script .DummyScene1 ; SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL
 
 	db 0 ; callbacks
 
@@ -40,7 +40,7 @@ PowerPlantGuardPhoneScript:
 	closetext
 	spriteface PLAYER, DOWN
 	applymovement POWERPLANT_OFFICER1, MovementData_0x188eda
-	setscene SCENE_POWERPLANT_0
+	setscene SCENE_POWERPLANT_NOTHING
 	end
 
 OfficerScript_0x188df5:
@@ -146,8 +146,8 @@ PowerPlantManager:
 	setevent EVENT_MET_MANAGER_AT_POWER_PLANT
 	clearevent EVENT_CERULEAN_GYM_ROCKET
 	clearevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM
-	setmapscene CERULEAN_GYM, SCENE_CERULEANGYM_1
-	setscene SCENE_POWERPLANT_1
+	setmapscene CERULEAN_GYM, SCENE_CERULEANGYM_GRUNT_RUNS_OUT
+	setscene SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL
 	end
 
 UnknownScript_0x188e8d:
@@ -394,7 +394,7 @@ PowerPlant_MapEvents:
 	warp_event 3, 17, 2, ROUTE_10_NORTH
 
 	db 1 ; coord events
-	coord_event 5, 12, SCENE_POWERPLANT_1, PowerPlantGuardPhoneScript
+	coord_event 5, 12, SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL, PowerPlantGuardPhoneScript
 
 	db 2 ; bg events
 	bg_event 0, 1, BGEVENT_READ, PowerPlantBookshelf
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index 8f3d47a56..85f58fb6a 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -7,9 +7,9 @@
 
 RadioTower5F_MapScripts:
 	db 3 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_RADIOTOWER5F_0
-	scene_script .DummyScene1 ; SCENE_RADIOTOWER5F_1
-	scene_script .DummyScene2 ; SCENE_RADIOTOWER5F_2
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_RADIOTOWER5F_ROCKET_BOSS
+	scene_script .DummyScene2 ; SCENE_RADIOTOWER5F_NOTHING
 
 	db 0 ; callbacks
 
@@ -45,7 +45,7 @@ FakeDirectorScript:
 	buttonsound
 	verbosegiveitem BASEMENT_KEY
 	closetext
-	setscene SCENE_RADIOTOWER5F_1
+	setscene SCENE_RADIOTOWER5F_ROCKET_BOSS
 	setevent EVENT_BEAT_ROCKET_EXECUTIVEM_3
 	end
 
@@ -124,8 +124,8 @@ RadioTower5FRocketBossScene:
 	writetext RadioTower5FDirectorDescribeClearBellText
 	waitbutton
 	closetext
-	setscene SCENE_RADIOTOWER5F_2
-	setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_ECRUTEAKTINTOWERENTRANCE_0
+	setscene SCENE_RADIOTOWER5F_NOTHING
+	setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_DEFAULT
 	setevent EVENT_GOT_CLEAR_BELL
 	setevent EVENT_TEAM_ROCKET_DISBANDED
 	jump .UselessJump
@@ -426,8 +426,8 @@ RadioTower5F_MapEvents:
 	warp_event 12, 0, 3, RADIO_TOWER_4F
 
 	db 2 ; coord events
-	coord_event 0, 3, SCENE_RADIOTOWER5F_0, FakeDirectorScript
-	coord_event 16, 5, SCENE_RADIOTOWER5F_1, RadioTower5FRocketBossScene
+	coord_event 0, 3, SCENE_DEFAULT, FakeDirectorScript
+	coord_event 16, 5, SCENE_RADIOTOWER5F_ROCKET_BOSS, RadioTower5FRocketBossScene
 
 	db 5 ; bg events
 	bg_event 3, 0, BGEVENT_READ, MapRadioTower5FSignpost0Script
diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm
index 741b40f15..28b37ee6f 100644
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -3,7 +3,7 @@
 
 Route16Gate_MapScripts:
 	db 1 ; scene scripts
-	scene_script .DummyScene ; SCENE_ROUTE16GATE_0
+	scene_script .DummyScene ; SCENE_DEFAULT
 
 	db 0 ; callbacks
 
@@ -68,8 +68,8 @@ Route16Gate_MapEvents:
 	warp_event 9, 5, 3, ROUTE_16
 
 	db 2 ; coord events
-	coord_event 5, 4, SCENE_ROUTE16GATE_0, UnknownScript_0x733ed
-	coord_event 5, 5, SCENE_ROUTE16GATE_0, UnknownScript_0x733ed
+	coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x733ed
+	coord_event 5, 5, SCENE_DEFAULT, UnknownScript_0x733ed
 
 	db 0 ; bg events
 
diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm
index 0831a79a1..740770356 100644
--- a/maps/Route17Route18Gate.asm
+++ b/maps/Route17Route18Gate.asm
@@ -3,7 +3,7 @@
 
 Route17Route18Gate_MapScripts:
 	db 1 ; scene scripts
-	scene_script .DummyScene ; SCENE_ROUTE17ROUTE18GATE_0
+	scene_script .DummyScene ; SCENE_DEFAULT
 
 	db 0 ; callbacks
 
@@ -59,8 +59,8 @@ Route17Route18Gate_MapEvents:
 	warp_event 9, 5, 2, ROUTE_18
 
 	db 2 ; coord events
-	coord_event 5, 4, SCENE_ROUTE17ROUTE18GATE_0, UnknownScript_0x73611
-	coord_event 5, 5, SCENE_ROUTE17ROUTE18GATE_0, UnknownScript_0x73611
+	coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x73611
+	coord_event 5, 5, SCENE_DEFAULT, UnknownScript_0x73611
 
 	db 0 ; bg events
 
diff --git a/maps/Route25.asm b/maps/Route25.asm
index d6cd9ba09..7732f06bf 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -13,8 +13,8 @@
 
 Route25_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_ROUTE25_0
-	scene_script .DummyScene1 ; SCENE_ROUTE25_1
+	scene_script .DummyScene0 ; SCENE_ROUTE25_NOTHING
+	scene_script .DummyScene1 ; SCENE_ROUTE25_MISTYS_DATE
 
 	db 0 ; callbacks
 
@@ -46,7 +46,7 @@ Route25MistyDate1Script:
 	applymovement ROUTE25_MISTY, MovementData_0x19f000
 	disappear ROUTE25_MISTY
 	clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
-	setscene SCENE_ROUTE25_0
+	setscene SCENE_ROUTE25_NOTHING
 	special RestartMapMusic
 	end
 
@@ -72,7 +72,7 @@ Route25MistyDate2Script:
 	applymovement ROUTE25_MISTY, MovementData_0x19f000
 	disappear ROUTE25_MISTY
 	clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
-	setscene SCENE_ROUTE25_0
+	setscene SCENE_ROUTE25_NOTHING
 	special RestartMapMusic
 	end
 
@@ -434,8 +434,8 @@ Route25_MapEvents:
 	warp_event 47, 5, 1, BILLS_HOUSE
 
 	db 2 ; coord events
-	coord_event 42, 6, SCENE_ROUTE25_1, Route25MistyDate1Script
-	coord_event 42, 7, SCENE_ROUTE25_1, Route25MistyDate2Script
+	coord_event 42, 6, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate1Script
+	coord_event 42, 7, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate2Script
 
 	db 2 ; bg events
 	bg_event 45, 5, BGEVENT_READ, BillsHouseSign
diff --git a/maps/Route27.asm b/maps/Route27.asm
index 366ca5f4d..c2ed42a72 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -11,8 +11,8 @@
 
 Route27_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_ROUTE27_0
-	scene_script .DummyScene1 ; SCENE_ROUTE27_1
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_ROUTE27_NOTHING
 
 	db 0 ; callbacks
 
@@ -40,7 +40,7 @@ UnknownScript_0x1a088c:
 	writetext Route27FisherText
 	waitbutton
 	closetext
-	setscene SCENE_ROUTE27_1
+	setscene SCENE_ROUTE27_NOTHING
 	end
 
 Route27FisherScript:
@@ -474,8 +474,8 @@ Route27_MapEvents:
 	warp_event 36, 5, 2, TOHJO_FALLS
 
 	db 2 ; coord events
-	coord_event 18, 10, SCENE_ROUTE27_0, UnknownScript_0x1a0873
-	coord_event 19, 10, SCENE_ROUTE27_0, UnknownScript_0x1a0881
+	coord_event 18, 10, SCENE_DEFAULT, UnknownScript_0x1a0873
+	coord_event 19, 10, SCENE_DEFAULT, UnknownScript_0x1a0881
 
 	db 1 ; bg events
 	bg_event 25, 7, BGEVENT_READ, TohjoFallsSign
diff --git a/maps/Route29.asm b/maps/Route29.asm
index 995e4735d..02a71c12f 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -10,8 +10,8 @@
 
 Route29_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_ROUTE29_0
-	scene_script .DummyScene1 ; SCENE_ROUTE29_1
+	scene_script .DummyScene0 ; SCENE_ROUTE29_NOTHING
+	scene_script .DummyScene1 ; SCENE_ROUTE29_CATCH_TUTORIAL
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .Tuscany
@@ -57,7 +57,7 @@ Route29Tutorial1:
 	writetext CatchingTutorialDebriefText
 	waitbutton
 	closetext
-	setscene SCENE_ROUTE29_0
+	setscene SCENE_ROUTE29_NOTHING
 	setevent EVENT_LEARNED_TO_CATCH_POKEMON
 	end
 
@@ -82,7 +82,7 @@ Route29Tutorial2:
 	writetext CatchingTutorialDebriefText
 	waitbutton
 	closetext
-	setscene SCENE_ROUTE29_0
+	setscene SCENE_ROUTE29_NOTHING
 	setevent EVENT_LEARNED_TO_CATCH_POKEMON
 	end
 
@@ -91,7 +91,7 @@ Script_RefusedTutorial1:
 	waitbutton
 	closetext
 	applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1b
-	setscene SCENE_ROUTE29_0
+	setscene SCENE_ROUTE29_NOTHING
 	end
 
 Script_RefusedTutorial2:
@@ -99,7 +99,7 @@ Script_RefusedTutorial2:
 	waitbutton
 	closetext
 	applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2b
-	setscene SCENE_ROUTE29_0
+	setscene SCENE_ROUTE29_NOTHING
 	end
 
 CatchingTutorialDudeScript:
@@ -420,8 +420,8 @@ Route29_MapEvents:
 	warp_event 27, 1, 3, ROUTE_29_ROUTE_46_GATE
 
 	db 2 ; coord events
-	coord_event 53, 8, SCENE_ROUTE29_1, Route29Tutorial1
-	coord_event 53, 9, SCENE_ROUTE29_1, Route29Tutorial2
+	coord_event 53, 8, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial1
+	coord_event 53, 9, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial2
 
 	db 2 ; bg events
 	bg_event 51, 7, BGEVENT_READ, Route29Sign1
diff --git a/maps/Route32.asm b/maps/Route32.asm
index b7e6b0af1..e0f7725d2 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -16,9 +16,9 @@
 
 Route32_MapScripts:
 	db 3 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_ROUTE32_0
-	scene_script .DummyScene1 ; SCENE_ROUTE32_1
-	scene_script .DummyScene2 ; SCENE_ROUTE32_2
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_ROUTE32_OFFER_SLOWPOKETAIL
+	scene_script .DummyScene2 ; SCENE_ROUTE32_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .Frieda
@@ -125,7 +125,7 @@ Route32WannaBuyASlowpokeTailScript:
 SlowpokeTailSalesmanScript:
 	faceplayer
 _OfferToSellSlowpokeTail:
-	setscene SCENE_ROUTE32_2
+	setscene SCENE_ROUTE32_NOTHING
 	opentext
 	writetext Text_MillionDollarSlowpokeTail
 	yesorno
@@ -936,8 +936,8 @@ Route32_MapEvents:
 	warp_event 6, 79, 4, UNION_CAVE_1F
 
 	db 2 ; coord events
-	coord_event 18, 8, SCENE_ROUTE32_0, Route32CooltrainerMStopsYouScene
-	coord_event 7, 71, SCENE_ROUTE32_1, Route32WannaBuyASlowpokeTailScript
+	coord_event 18, 8, SCENE_DEFAULT, Route32CooltrainerMStopsYouScene
+	coord_event 7, 71, SCENE_ROUTE32_OFFER_SLOWPOKETAIL, Route32WannaBuyASlowpokeTailScript
 
 	db 6 ; bg events
 	bg_event 13, 5, BGEVENT_READ, Route32Sign
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index d5f846657..e59a1502d 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -5,9 +5,9 @@
 
 Route35NationalParkGate_MapScripts:
 	db 3 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_ROUTE35NATIONALPARKGATE_0
-	scene_script .DummyScene1 ; SCENE_ROUTE35NATIONALPARKGATE_1
-	scene_script .LeaveContestEarly ; SCENE_ROUTE35NATIONALPARKGATE_2
+	scene_script .DummyScene0 ; SCENE_ROUTE35NATIONALPARKGATE_NOTHING
+	scene_script .DummyScene1 ; SCENE_ROUTE35NATIONALPARKGATE_UNUSED
+	scene_script .LeaveContestEarly ; SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY
 
 	db 2 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning
@@ -26,11 +26,11 @@ Route35NationalParkGate_MapScripts:
 .CheckIfContestRunning:
 	checkflag ENGINE_BUG_CONTEST_TIMER
 	iftrue .BugContestIsRunning
-	setscene SCENE_ROUTE35NATIONALPARKGATE_0
+	setscene SCENE_ROUTE35NATIONALPARKGATE_NOTHING
 	return
 
 .BugContestIsRunning:
-	setscene SCENE_ROUTE35NATIONALPARKGATE_2
+	setscene SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY
 	return
 
 .CheckIfContestAvailable:
diff --git a/maps/Route36.asm b/maps/Route36.asm
index 5974e4eff..2800aa90e 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -11,8 +11,8 @@
 
 Route36_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_ROUTE36_0
-	scene_script .DummyScene1 ; SCENE_ROUTE36_1
+	scene_script .DummyScene0 ; SCENE_ROUTE36_NOTHING
+	scene_script .DummyScene1 ; SCENE_ROUTE36_SUICUNE
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .ArthurCallback
@@ -42,9 +42,9 @@ Route36SuicuneScript:
 	disappear ROUTE36_SUICUNE
 	spriteface PLAYER, DOWN
 	pause 10
-	setscene SCENE_ROUTE36_0
+	setscene SCENE_ROUTE36_NOTHING
 	clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
-	setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_1
+	setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
 	end
 
 SudowoodoScript:
@@ -667,8 +667,8 @@ Route36_MapEvents:
 	warp_event 48, 13, 2, ROUTE_36_RUINS_OF_ALPH_GATE
 
 	db 2 ; coord events
-	coord_event 20, 7, SCENE_ROUTE36_1, Route36SuicuneScript
-	coord_event 22, 7, SCENE_ROUTE36_1, Route36SuicuneScript
+	coord_event 20, 7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript
+	coord_event 22, 7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript
 
 	db 4 ; bg events
 	bg_event 29, 1, BGEVENT_READ, Route36TrainerTips2
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index fb25caa22..bf4978504 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -14,9 +14,9 @@
 
 Route36NationalParkGate_MapScripts:
 	db 3 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_ROUTE36NATIONALPARKGATE_0
-	scene_script .DummyScene1 ; SCENE_ROUTE36NATIONALPARKGATE_1
-	scene_script .LeaveContestEarly ; SCENE_ROUTE36NATIONALPARKGATE_2
+	scene_script .DummyScene0 ; SCENE_ROUTE36NATIONALPARKGATE_NOTHING
+	scene_script .DummyScene1 ; SCENE_ROUTE36NATIONALPARKGATE_UNUSED
+	scene_script .LeaveContestEarly ; SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY
 
 	db 2 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning
@@ -35,11 +35,11 @@ Route36NationalParkGate_MapScripts:
 .CheckIfContestRunning:
 	checkflag ENGINE_BUG_CONTEST_TIMER
 	iftrue .BugContestIsRunning
-	setscene SCENE_ROUTE36NATIONALPARKGATE_0
+	setscene SCENE_ROUTE36NATIONALPARKGATE_NOTHING
 	return
 
 .BugContestIsRunning:
-	setscene SCENE_ROUTE36NATIONALPARKGATE_2
+	setscene SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY
 	return
 
 .CheckIfContestAvailable:
diff --git a/maps/Route42.asm b/maps/Route42.asm
index 955c266fd..69d2b92a6 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -11,8 +11,8 @@
 
 Route42_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_ROUTE42_0
-	scene_script .DummyScene1 ; SCENE_ROUTE42_1
+	scene_script .DummyScene0 ; SCENE_ROUTE42_NOTHING
+	scene_script .DummyScene1 ; SCENE_ROUTE42_SUICUNE
 
 	db 0 ; callbacks
 
@@ -29,9 +29,9 @@ Route42SuicuneScript:
 	applymovement ROUTE42_SUICUNE, MovementData_0x1a9356
 	disappear ROUTE42_SUICUNE
 	pause 10
-	setscene SCENE_ROUTE42_0
+	setscene SCENE_ROUTE42_NOTHING
 	clearevent EVENT_SAW_SUICUNE_ON_ROUTE_36
-	setmapscene ROUTE_36, SCENE_ROUTE36_1
+	setmapscene ROUTE_36, SCENE_ROUTE36_SUICUNE
 	end
 
 TrainerFisherTully:
@@ -327,7 +327,7 @@ Route42_MapEvents:
 	warp_event 46, 7, 3, MOUNT_MORTAR_1F_OUTSIDE
 
 	db 1 ; coord events
-	coord_event 24, 14, SCENE_ROUTE42_1, Route42SuicuneScript
+	coord_event 24, 14, SCENE_ROUTE42_SUICUNE, Route42SuicuneScript
 
 	db 5 ; bg events
 	bg_event 4, 10, BGEVENT_READ, Route42Sign1
diff --git a/maps/Route43.asm b/maps/Route43.asm
index f12d887c6..99150f0b8 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -17,11 +17,11 @@ Route43_MapScripts:
 .CheckIfRockets:
 	checkevent EVENT_CLEARED_ROCKET_HIDEOUT
 	iftrue .NoRockets
-	setmapscene ROUTE_43_GATE, SCENE_ROUTE43GATE_0
+	setmapscene ROUTE_43_GATE, SCENE_DEFAULT
 	return
 
 .NoRockets:
-	setmapscene ROUTE_43_GATE, SCENE_ROUTE43GATE_1
+	setmapscene ROUTE_43_GATE, SCENE_ROUTE43GATE_NOTHING
 	return
 
 TrainerCamperSpencer:
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index eb94c573c..6ee4ad8fe 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -7,8 +7,8 @@ ROUTE43GATE_TOLL EQU 1000
 
 Route43Gate_MapScripts:
 	db 2 ; scene scripts
-	scene_script .RocketShakedown ; SCENE_ROUTE43GATE_0
-	scene_script .DummyScene ; SCENE_ROUTE43GATE_1
+	scene_script .RocketShakedown ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_ROUTE43GATE_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckIfRockets
@@ -35,7 +35,7 @@ Route43Gate_MapScripts:
 	checkcode VAR_FACING
 	if_equal DOWN, RocketScript_Southbound
 	if_equal UP, RocketScript_Northbound
-	setscene SCENE_ROUTE43GATE_1
+	setscene SCENE_ROUTE43GATE_NOTHING
 	end
 
 RocketScript_Southbound:
@@ -67,7 +67,7 @@ RocketScript_ShakeDownSouth:
 	closetext
 	applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassSouth
 	applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassSouth
-	setscene SCENE_ROUTE43GATE_1
+	setscene SCENE_ROUTE43GATE_NOTHING
 	special RestartMapMusic
 	end
 
@@ -99,7 +99,7 @@ RocketScript_ShakeDownNorth:
 	closetext
 	applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassNorth
 	applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassNorth
-	setscene SCENE_ROUTE43GATE_1
+	setscene SCENE_ROUTE43GATE_NOTHING
 	special RestartMapMusic
 	end
 
diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm
index 8aa6030da..c67d625ec 100644
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -1,7 +1,7 @@
 RuinsOfAlphAerodactylChamber_MapScripts:
 	db 2 ; scene scripts
-	scene_script .CheckWall ; SCENE_RUINSOFALPHAERODACTYLCHAMBER_0
-	scene_script .DummyScene ; SCENE_RUINSOFALPHAERODACTYLCHAMBER_1
+	scene_script .CheckWall ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_RUINSOFALPHAERODACTYLCHAMBER_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
@@ -41,7 +41,7 @@ RuinsOfAlphAerodactylChamber_MapScripts:
 	changeblock 4, 0, $30 ; open wall
 	reloadmappart
 	earthquake 50
-	setscene SCENE_RUINSOFALPHAERODACTYLCHAMBER_1
+	setscene SCENE_RUINSOFALPHAERODACTYLCHAMBER_NOTHING
 	closetext
 	end
 
@@ -57,7 +57,7 @@ UnknownScript_0x58df7:
 	setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
 	setevent EVENT_SOLVED_AERODACTYL_PUZZLE
 	setflag ENGINE_UNLOCKED_UNOWNS_S_TO_W
-	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_1
+	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE
 	earthquake 30
 	showemote EMOTE_SHOCK, PLAYER, 15
 	changeblock 2, 2, $18 ; left hole
diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm
index 23f4df863..a763dee5d 100644
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -1,7 +1,7 @@
 RuinsOfAlphHoOhChamber_MapScripts:
 	db 2 ; scene scripts
-	scene_script .CheckWall ; SCENE_RUINSOFALPHHOOHCHAMBER_0
-	scene_script .DummyScene ; SCENE_RUINSOFALPHHOOHCHAMBER_1
+	scene_script .CheckWall ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_RUINSOFALPHHOOHCHAMBER_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
@@ -42,7 +42,7 @@ RuinsOfAlphHoOhChamber_MapScripts:
 	changeblock 4, 0, $30 ; open wall
 	reloadmappart
 	earthquake 50
-	setscene SCENE_RUINSOFALPHHOOHCHAMBER_1
+	setscene SCENE_RUINSOFALPHHOOHCHAMBER_NOTHING
 	closetext
 	end
 
@@ -58,7 +58,7 @@ UnknownScript_0x585ba:
 	setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
 	setevent EVENT_SOLVED_HO_OH_PUZZLE
 	setflag ENGINE_UNLOCKED_UNOWNS_X_TO_Z
-	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_1
+	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE
 	earthquake 30
 	showemote EMOTE_SHOCK, PLAYER, 15
 	changeblock 2, 2, $18 ; left hole
diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm
index 4b5c1574c..b91f95f69 100644
--- a/maps/RuinsOfAlphInnerChamber.asm
+++ b/maps/RuinsOfAlphInnerChamber.asm
@@ -5,8 +5,8 @@
 
 RuinsOfAlphInnerChamber_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_RUINSOFALPHINNERCHAMBER_0
-	scene_script .UnownAppear ; SCENE_RUINSOFALPHINNERCHAMBER_1
+	scene_script .DummyScene0 ; SCENE_RUINSOFALPHINNERCHAMBER_NOTHING
+	scene_script .UnownAppear ; SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE
 
 	db 0 ; callbacks
 
@@ -22,7 +22,7 @@ RuinsOfAlphInnerChamber_MapScripts:
 	writetext RuinsOfAlphStrangePresenceText
 	waitbutton
 	closetext
-	setscene SCENE_RUINSOFALPHINNERCHAMBER_0
+	setscene SCENE_RUINSOFALPHINNERCHAMBER_NOTHING
 	setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
 	clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
 	end
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index 04d5d121f..3abf69755 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -4,8 +4,8 @@
 
 RuinsOfAlphKabutoChamber_MapScripts:
 	db 2 ; scene scripts
-	scene_script .CheckWall ; SCENE_RUINSOFALPHKABUTOCHAMBER_0
-	scene_script .DummyScene ; SCENE_RUINSOFALPHKABUTOCHAMBER_1
+	scene_script .CheckWall ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_RUINSOFALPHKABUTOCHAMBER_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
@@ -45,7 +45,7 @@ RuinsOfAlphKabutoChamber_MapScripts:
 	changeblock 4, 0, $30 ; open wall
 	reloadmappart
 	earthquake 50
-	setscene SCENE_RUINSOFALPHKABUTOCHAMBER_1
+	setscene SCENE_RUINSOFALPHKABUTOCHAMBER_NOTHING
 	closetext
 	end
 
@@ -65,7 +65,7 @@ UnknownScript_0x58778:
 	setevent EVENT_SOLVED_KABUTO_PUZZLE
 	setflag ENGINE_UNLOCKED_UNOWNS_A_TO_K
 	setevent EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
-	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_1
+	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE
 	earthquake 30
 	showemote EMOTE_SHOCK, PLAYER, 15
 	changeblock 2, 2, $18 ; left hole
diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm
index 9e7bccd0b..87cb6d8ad 100644
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -1,7 +1,7 @@
 RuinsOfAlphOmanyteChamber_MapScripts:
 	db 2 ; scene scripts
-	scene_script .CheckWall ; SCENE_RUINSOFALPHOMANYTECHAMBER_0
-	scene_script .DummyScene ; SCENE_RUINSOFALPHOMANYTECHAMBER_1
+	scene_script .CheckWall ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_RUINSOFALPHOMANYTECHAMBER_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
@@ -42,7 +42,7 @@ RuinsOfAlphOmanyteChamber_MapScripts:
 	changeblock 4, 0, $30 ; open wall
 	reloadmappart
 	earthquake 50
-	setscene SCENE_RUINSOFALPHOMANYTECHAMBER_1
+	setscene SCENE_RUINSOFALPHOMANYTECHAMBER_NOTHING
 	closetext
 	end
 
@@ -58,7 +58,7 @@ UnknownScript_0x58c36:
 	setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
 	setevent EVENT_SOLVED_OMANYTE_PUZZLE
 	setflag ENGINE_UNLOCKED_UNOWNS_L_TO_R
-	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_1
+	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE
 	earthquake 30
 	showemote EMOTE_SHOCK, PLAYER, 15
 	changeblock 2, 2, $18 ; left hole
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index 36d377e31..12fb23a57 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -7,8 +7,8 @@
 
 RuinsOfAlphOutside_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_RUINSOFALPHOUTSIDE_0
-	scene_script .DummyScene1 ; SCENE_RUINSOFALPHOUTSIDE_1
+	scene_script .DummyScene0 ; SCENE_RUINSOFALPHOUTSIDE_NOTHING
+	scene_script .DummyScene1 ; SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .ScientistCallback
@@ -33,12 +33,12 @@ RuinsOfAlphOutside_MapScripts:
 
 .YesScientist:
 	appear RUINSOFALPHOUTSIDE_SCIENTIST
-	setscene SCENE_RUINSOFALPHOUTSIDE_1
+	setscene SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX
 	return
 
 .NoScientist:
 	disappear RUINSOFALPHOUTSIDE_SCIENTIST
-	setscene SCENE_RUINSOFALPHOUTSIDE_0
+	setscene SCENE_RUINSOFALPHOUTSIDE_NOTHING
 	return
 
 RuinsOfAlphOutsideScientistScene1:
@@ -64,7 +64,7 @@ UnknownScript_0x58044:
 	disappear RUINSOFALPHOUTSIDE_SCIENTIST
 	stopfollow
 	applymovement PLAYER, MovementData_0x580c5
-	setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, SCENE_RUINSOFALPHRESEARCHCENTER_1
+	setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX
 	warpcheck
 	end
 
@@ -295,8 +295,8 @@ RuinsOfAlphOutside_MapEvents:
 	warp_event 13, 21, 2, ROUTE_32_RUINS_OF_ALPH_GATE
 
 	db 2 ; coord events
-	coord_event 11, 14, SCENE_RUINSOFALPHOUTSIDE_1, RuinsOfAlphOutsideScientistScene1
-	coord_event 10, 15, SCENE_RUINSOFALPHOUTSIDE_1, RuinsOfAlphOutsideScientistScene2
+	coord_event 11, 14, SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX, RuinsOfAlphOutsideScientistScene1
+	coord_event 10, 15, SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX, RuinsOfAlphOutsideScientistScene2
 
 	db 3 ; bg events
 	bg_event 16, 8, BGEVENT_READ, RuinsOfAlphOutsideSignpost0Script
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index b30fb41af..b9d722275 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -5,8 +5,8 @@
 
 RuinsOfAlphResearchCenter_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_RUINSOFALPHRESEARCHCENTER_0
-	scene_script .GetUnownDex ; SCENE_RUINSOFALPHRESEARCHCENTER_1
+	scene_script .DummyScene0 ; SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING
+	scene_script .GetUnownDex ; SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .ScientistCallback
@@ -20,7 +20,7 @@ RuinsOfAlphResearchCenter_MapScripts:
 
 .ScientistCallback:
 	checkscene
-	if_equal SCENE_RUINSOFALPHRESEARCHCENTER_1, .ShowScientist
+	if_equal SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX, .ShowScientist
 	return
 
 .ShowScientist:
@@ -53,7 +53,7 @@ RuinsOfAlphResearchCenter_MapScripts:
 	waitbutton
 	closetext
 	applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59276
-	setscene SCENE_RUINSOFALPHRESEARCHCENTER_0
+	setscene SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING
 	special RestartMapMusic
 	end
 
diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm
index c183aeedf..4b90f69f2 100644
--- a/maps/SaffronMagnetTrainStation.asm
+++ b/maps/SaffronMagnetTrainStation.asm
@@ -6,7 +6,7 @@
 
 SaffronMagnetTrainStation_MapScripts:
 	db 1 ; scene scripts
-	scene_script .DummyScene ; SCENE_SAFFRONMAGNETTRAINSTATION_0
+	scene_script .DummyScene ; SCENE_DEFAULT
 
 	db 0 ; callbacks
 
@@ -223,7 +223,7 @@ SaffronMagnetTrainStation_MapEvents:
 	warp_event 11, 5, 3, GOLDENROD_MAGNET_TRAIN_STATION
 
 	db 1 ; coord events
-	coord_event 11, 6, SCENE_SAFFRONMAGNETTRAINSTATION_0, Script_ArriveFromGoldenrod
+	coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromGoldenrod
 
 	db 0 ; bg events
 
diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm
index bf1847a77..6b4330a2c 100644
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -55,7 +55,7 @@ TrainerGruntM1:
 	closetext
 	setevent EVENT_CLEARED_SLOWPOKE_WELL
 	variablesprite SPRITE_AZALEA_ROCKET, SPRITE_SILVER
-	setmapscene AZALEA_TOWN, SCENE_AZALEATOWN_1
+	setmapscene AZALEA_TOWN, SCENE_AZALEATOWN_RIVAL_BATTLE
 	clearevent EVENT_ILEX_FOREST_APPRENTICE
 	clearevent EVENT_ILEX_FOREST_FARFETCHD
 	setevent EVENT_CHARCOAL_KILN_FARFETCH_D
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index a75bc7c8b..20376095b 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -9,8 +9,8 @@
 
 SproutTower3F_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_SPROUTTOWER3F_0
-	scene_script .DummyScene1 ; SCENE_SPROUTTOWER3F_1
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_SPROUTTOWER3F_NOTHING
 
 	db 0 ; callbacks
 
@@ -57,7 +57,7 @@ UnknownScript_0x184947:
 	disappear SPROUTTOWER3F_SILVER
 	waitsfx
 	special FadeInQuickly
-	setscene SCENE_SPROUTTOWER3F_1
+	setscene SCENE_SPROUTTOWER3F_NOTHING
 	special RestartMapMusic
 	end
 
@@ -334,7 +334,7 @@ SproutTower3F_MapEvents:
 	warp_event 10, 14, 4, SPROUT_TOWER_2F
 
 	db 1 ; coord events
-	coord_event 11, 9, SCENE_SPROUTTOWER3F_0, UnknownScript_0x184947
+	coord_event 11, 9, SCENE_DEFAULT, UnknownScript_0x184947
 
 	db 6 ; bg events
 	bg_event 8, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index 67cf4ded8..9bc3365f8 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -8,7 +8,7 @@
 
 TeamRocketBaseB1F_MapScripts:
 	db 1 ; scene scripts
-	scene_script .DummyScene ; SCENE_TEAMROCKETBASEB1F_0
+	scene_script .DummyScene ; SCENE_DEFAULT
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .HideSecurityGrunt
@@ -746,28 +746,28 @@ TeamRocketBaseB1F_MapEvents:
 	coord_event 8, 16, 0, SecurityCamera5
 	; There are spots on the floor that trigger a Pokémon battle.
 	; Each Pokémon (Voltorb, Koffing, Geodude) knows Selfdestruct.
-	coord_event 2, 7, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap1
-	coord_event 3, 7, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap2
-	coord_event 4, 7, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap3
-	coord_event 1, 8, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap4
-	coord_event 3, 8, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap5
-	coord_event 5, 8, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap6
-	coord_event 3, 9, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap7
-	coord_event 4, 9, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap8
-	coord_event 1, 10, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap9
-	coord_event 2, 10, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap10
-	coord_event 3, 10, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap11
-	coord_event 5, 10, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap12
-	coord_event 2, 11, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap13
-	coord_event 4, 11, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap14
-	coord_event 1, 12, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap15
-	coord_event 2, 12, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap16
-	coord_event 4, 12, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap17
-	coord_event 5, 12, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap18
-	coord_event 1, 13, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap19
-	coord_event 3, 13, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap20
-	coord_event 4, 13, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap21
-	coord_event 5, 13, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap22
+	coord_event 2, 7, SCENE_DEFAULT, ExplodingTrap1
+	coord_event 3, 7, SCENE_DEFAULT, ExplodingTrap2
+	coord_event 4, 7, SCENE_DEFAULT, ExplodingTrap3
+	coord_event 1, 8, SCENE_DEFAULT, ExplodingTrap4
+	coord_event 3, 8, SCENE_DEFAULT, ExplodingTrap5
+	coord_event 5, 8, SCENE_DEFAULT, ExplodingTrap6
+	coord_event 3, 9, SCENE_DEFAULT, ExplodingTrap7
+	coord_event 4, 9, SCENE_DEFAULT, ExplodingTrap8
+	coord_event 1, 10, SCENE_DEFAULT, ExplodingTrap9
+	coord_event 2, 10, SCENE_DEFAULT, ExplodingTrap10
+	coord_event 3, 10, SCENE_DEFAULT, ExplodingTrap11
+	coord_event 5, 10, SCENE_DEFAULT, ExplodingTrap12
+	coord_event 2, 11, SCENE_DEFAULT, ExplodingTrap13
+	coord_event 4, 11, SCENE_DEFAULT, ExplodingTrap14
+	coord_event 1, 12, SCENE_DEFAULT, ExplodingTrap15
+	coord_event 2, 12, SCENE_DEFAULT, ExplodingTrap16
+	coord_event 4, 12, SCENE_DEFAULT, ExplodingTrap17
+	coord_event 5, 12, SCENE_DEFAULT, ExplodingTrap18
+	coord_event 1, 13, SCENE_DEFAULT, ExplodingTrap19
+	coord_event 3, 13, SCENE_DEFAULT, ExplodingTrap20
+	coord_event 4, 13, SCENE_DEFAULT, ExplodingTrap21
+	coord_event 5, 13, SCENE_DEFAULT, ExplodingTrap22
 
 	db 9 ; bg events
 	bg_event 19, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost0Script
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 85102bab5..052077bc3 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -16,10 +16,10 @@
 
 TeamRocketBaseB2F_MapScripts:
 	db 4 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_TEAMROCKETBASEB2F_0
-	scene_script .DummyScene1 ; SCENE_TEAMROCKETBASEB2F_1
-	scene_script .DummyScene2 ; SCENE_TEAMROCKETBASEB2F_2
-	scene_script .DummyScene3 ; SCENE_TEAMROCKETBASEB2F_3
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS
+	scene_script .DummyScene2 ; SCENE_TEAMROCKETBASEB2F_ELECTRODES
+	scene_script .DummyScene3 ; SCENE_TEAMROCKETBASEB2F_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .TransmitterDoorCallback
@@ -116,7 +116,7 @@ UnknownScript_0x6cfac:
 	disappear TEAMROCKETBASEB2F_ROCKET4
 	pause 15
 	special FadeInQuickly
-	setscene SCENE_TEAMROCKETBASEB2F_2
+	setscene SCENE_TEAMROCKETBASEB2F_ELECTRODES
 	clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE
 	spriteface TEAMROCKETBASEB2F_LANCE, DOWN
 	opentext
@@ -173,7 +173,7 @@ LanceHealsCommon:
 	writetext LanceHealsText2
 	waitbutton
 	closetext
-	setscene SCENE_TEAMROCKETBASEB2F_1
+	setscene SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS
 	setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE
 	checkcode VAR_FACING
 	if_equal RIGHT, .FacingRight
@@ -302,7 +302,7 @@ UnknownScript_0x6d184:
 	clearflag ENGINE_ROCKET_SIGNAL_ON_CH20
 	setevent EVENT_ROUTE_43_GATE_ROCKETS
 	setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
-	setscene SCENE_TEAMROCKETBASEB2F_3
+	setscene SCENE_TEAMROCKETBASEB2F_NOTHING
 	clearevent EVENT_LAKE_OF_RAGE_CIVILIANS
 	setevent EVENT_TURNED_OFF_SECURITY_CAMERAS
 	setevent EVENT_SECURITY_CAMERA_1
@@ -917,15 +917,15 @@ TeamRocketBaseB2F_MapEvents:
 	warp_event 27, 14, 4, TEAM_ROCKET_BASE_B3F
 
 	db 9 ; coord events
-	coord_event 5, 14, SCENE_TEAMROCKETBASEB2F_0, LanceHealsScript1
-	coord_event 4, 13, SCENE_TEAMROCKETBASEB2F_0, LanceHealsScript2
-	coord_event 14, 11, SCENE_TEAMROCKETBASEB2F_1, UnknownScript_0x6cf95
-	coord_event 15, 11, SCENE_TEAMROCKETBASEB2F_1, UnknownScript_0x6cf9c
-	coord_event 14, 12, SCENE_TEAMROCKETBASEB2F_2, UnknownScript_0x6d075
-	coord_event 15, 12, SCENE_TEAMROCKETBASEB2F_2, UnknownScript_0x6d075
-	coord_event 12, 3, SCENE_TEAMROCKETBASEB2F_2, UnknownScript_0x6d07a
-	coord_event 12, 10, SCENE_TEAMROCKETBASEB2F_2, UnknownScript_0x6d07a
-	coord_event 12, 11, SCENE_TEAMROCKETBASEB2F_2, UnknownScript_0x6d07a
+	coord_event 5, 14, SCENE_DEFAULT, LanceHealsScript1
+	coord_event 4, 13, SCENE_DEFAULT, LanceHealsScript2
+	coord_event 14, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, UnknownScript_0x6cf95
+	coord_event 15, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, UnknownScript_0x6cf9c
+	coord_event 14, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d075
+	coord_event 15, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d075
+	coord_event 12, 3, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a
+	coord_event 12, 10, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a
+	coord_event 12, 11, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a
 
 	db 23 ; bg events
 	bg_event 14, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index 176319e87..1ba793c5c 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -16,10 +16,10 @@
 
 TeamRocketBaseB3F_MapScripts:
 	db 4 ; scene scripts
-	scene_script .LanceGetsPassword ; SCENE_TEAMROCKETBASEB3F_0
-	scene_script .DummyScene1 ; SCENE_TEAMROCKETBASEB3F_1
-	scene_script .DummyScene2 ; SCENE_TEAMROCKETBASEB3F_2
-	scene_script .DummyScene3 ; SCENE_TEAMROCKETBASEB3F_3
+	scene_script .LanceGetsPassword ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER
+	scene_script .DummyScene2 ; SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS
+	scene_script .DummyScene3 ; SCENE_TEAMROCKETBASEB3F_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .CheckGiovanniDoor
@@ -58,7 +58,7 @@ LanceGetPasswordScript:
 	closetext
 	applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12c
 	disappear TEAMROCKETBASEB3F_LANCE
-	setscene SCENE_TEAMROCKETBASEB3F_1
+	setscene SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER
 	end
 
 RocketBaseRival:
@@ -77,7 +77,7 @@ RocketBaseRival:
 	applymovement PLAYER, RocketBaseRivalShovesPlayerMovement
 	applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalLeaveMovement
 	disappear TEAMROCKETBASEB3F_SILVER
-	setscene SCENE_TEAMROCKETBASEB3F_2
+	setscene SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS
 	special RestartMapMusic
 	end
 
@@ -114,7 +114,7 @@ UnknownScript_0x6e056:
 	playsound SFX_TACKLE
 	applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e147
 	disappear TEAMROCKETBASEB3F_ROCKET1
-	setscene SCENE_TEAMROCKETBASEB3F_3
+	setscene SCENE_TEAMROCKETBASEB3F_NOTHING
 	end
 
 RocketBaseMurkrow:
@@ -573,9 +573,9 @@ TeamRocketBaseB3F_MapEvents:
 	warp_event 27, 14, 5, TEAM_ROCKET_BASE_B2F
 
 	db 3 ; coord events
-	coord_event 10, 8, SCENE_TEAMROCKETBASEB3F_2, UnknownScript_0x6e04b
-	coord_event 11, 8, SCENE_TEAMROCKETBASEB3F_2, UnknownScript_0x6e052
-	coord_event 8, 10, SCENE_TEAMROCKETBASEB3F_1, RocketBaseRival
+	coord_event 10, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e04b
+	coord_event 11, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e052
+	coord_event 8, 10, SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER, RocketBaseRival
 
 	db 10 ; bg events
 	bg_event 10, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index d297a1988..f80cb587d 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -4,8 +4,8 @@
 
 TimeCapsule_MapScripts:
 	db 2 ; scene scripts
-	scene_script .InitializeTimeCapsule ; SCENE_TIMECAPSULE_0
-	scene_script .DummyScene ; SCENE_TIMECAPSULE_1
+	scene_script .InitializeTimeCapsule ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_TIMECAPSULE_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
@@ -30,8 +30,8 @@ TimeCapsule_MapScripts:
 	return
 
 .InitializeAndPreparePokecenter2F:
-	setscene SCENE_TIMECAPSULE_1
-	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_3
+	setscene SCENE_TIMECAPSULE_NOTHING
+	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE
 	end
 
 MapTimeCapsuleSignpost1Script:
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index 1f3187b74..7c9060a05 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -12,8 +12,8 @@
 
 TinTower1F_MapScripts:
 	db 2 ; scene scripts
-	scene_script .FaceSuicune ; SCENE_TINTOWER1F_0
-	scene_script .DummyScene ; SCENE_TINTOWER1F_1
+	scene_script .FaceSuicune ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_TINTOWER1F_NOTHING
 
 	db 2 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .NPCsCallback
@@ -123,12 +123,12 @@ TinTower1F_MapScripts:
 	disappear TINTOWER1F_SUICUNE
 	setevent EVENT_FOUGHT_SUICUNE
 	setevent EVENT_SAW_SUICUNE_ON_ROUTE_42
-	setmapscene ROUTE_42, SCENE_ROUTE42_0
+	setmapscene ROUTE_42, SCENE_ROUTE42_NOTHING
 	setevent EVENT_SAW_SUICUNE_ON_ROUTE_36
-	setmapscene ROUTE_36, SCENE_ROUTE36_0
+	setmapscene ROUTE_36, SCENE_ROUTE36_NOTHING
 	setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
-	setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_0
-	setscene SCENE_TINTOWER1F_1
+	setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_NOTHING
+	setscene SCENE_TINTOWER1F_NOTHING
 	clearevent EVENT_SET_WHEN_FOUGHT_HO_OH
 	reloadmapafterbattle
 	pause 20
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index 406fc06e4..1d8191fc0 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -4,8 +4,8 @@
 
 TradeCenter_MapScripts:
 	db 2 ; scene scripts
-	scene_script .InitializeTradeCenter ; SCENE_TRADECENTER_0
-	scene_script .DummyScene ; SCENE_TRADECENTER_1
+	scene_script .InitializeTradeCenter ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_TRADECENTER_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
@@ -30,8 +30,8 @@ TradeCenter_MapScripts:
 	return
 
 .InitializeAndPreparePokecenter2F:
-	setscene SCENE_TRADECENTER_1
-	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_1
+	setscene SCENE_TRADECENTER_NOTHING
+	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TRADE_CENTER
 	end
 
 MapTradeCenterSignpost1Script:
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index 1a8a1c6e4..06bf4017d 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -4,7 +4,7 @@
 
 TrainerHouseB1F_MapScripts:
 	db 1 ; scene scripts
-	scene_script .DummyScene ; SCENE_TRAINERHOUSEB1F_0
+	scene_script .DummyScene ; SCENE_DEFAULT
 
 	db 0 ; callbacks
 
@@ -174,7 +174,7 @@ TrainerHouseB1F_MapEvents:
 	warp_event 9, 4, 3, TRAINER_HOUSE_1F
 
 	db 1 ; coord events
-	coord_event 7, 3, SCENE_TRAINERHOUSEB1F_0, TrainerHouseReceptionistScript
+	coord_event 7, 3, SCENE_DEFAULT, TrainerHouseReceptionistScript
 
 	db 0 ; bg events
 
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index ada7c2f94..4a30eac99 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -5,8 +5,8 @@
 
 VermilionPort_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_VERMILIONPORT_0
-	scene_script .LeaveFastShip ; SCENE_VERMILIONPORT_1
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .LeaveFastShip ; SCENE_VERMILIONPORT_LEAVE_SHIP
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -25,7 +25,7 @@ VermilionPort_MapScripts:
 .LeaveFastShipScript:
 	applymovement PLAYER, MovementData_0x74ef3
 	appear VERMILIONPORT_SAILOR1
-	setscene SCENE_VERMILIONPORT_0
+	setscene SCENE_DEFAULT
 	setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
 	setevent EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
 	setevent EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
@@ -66,7 +66,7 @@ SailorScript_0x74dc4:
 	clearevent EVENT_BEAT_SCHOOLBOY_RICKY
 	setevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
 	appear VERMILIONPORT_SAILOR1
-	setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_1
+	setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_ENTER_SHIP
 	warp FAST_SHIP_1F, 25, 1
 	end
 
@@ -304,7 +304,7 @@ VermilionPort_MapEvents:
 	warp_event 7, 17, 1, FAST_SHIP_1F
 
 	db 1 ; coord events
-	coord_event 7, 11, SCENE_VERMILIONPORT_0, UnknownScript_0x74e20
+	coord_event 7, 11, SCENE_DEFAULT, UnknownScript_0x74e20
 
 	db 1 ; bg events
 	bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index f0758fe38..832ac412a 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -8,8 +8,8 @@
 
 VictoryRoad_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_VICTORYROAD_0
-	scene_script .DummyScene1 ; SCENE_VICTORYROAD_1
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_VICTORYROAD_NOTHING
 
 	db 0 ; callbacks
 
@@ -30,7 +30,7 @@ UnknownScript_0x74492:
 	scall UnknownScript_0x744d4
 	applymovement VICTORYROAD_SILVER, MovementData_0x7454c
 	disappear VICTORYROAD_SILVER
-	setscene SCENE_VICTORYROAD_1
+	setscene SCENE_VICTORYROAD_NOTHING
 	playmapmusic
 	end
 
@@ -44,7 +44,7 @@ UnknownScript_0x744b5:
 	scall UnknownScript_0x744d4
 	applymovement VICTORYROAD_SILVER, MovementData_0x74555
 	disappear VICTORYROAD_SILVER
-	setscene SCENE_VICTORYROAD_1
+	setscene SCENE_VICTORYROAD_NOTHING
 	playmapmusic
 	end
 
@@ -252,8 +252,8 @@ VictoryRoad_MapEvents:
 	warp_event 13, 5, 3, ROUTE_23
 
 	db 2 ; coord events
-	coord_event 12, 8, SCENE_VICTORYROAD_0, UnknownScript_0x74492
-	coord_event 13, 8, SCENE_VICTORYROAD_0, UnknownScript_0x744b5
+	coord_event 12, 8, SCENE_DEFAULT, UnknownScript_0x74492
+	coord_event 13, 8, SCENE_DEFAULT, UnknownScript_0x744b5
 
 	db 2 ; bg events
 	bg_event 3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion
diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm
index 5ddef4221..51badeb6b 100644
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -5,8 +5,8 @@
 
 VictoryRoadGate_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_VICTORYROADGATE_0
-	scene_script .DummyScene1 ; SCENE_VICTORYROADGATE_1
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_VICTORYROADGATE_NOTHING
 
 	db 0 ; callbacks
 
@@ -38,7 +38,7 @@ VictoryRoadGateBadgeCheckScript:
 	writetext VictoryRoadGateEightBadgesText
 	waitbutton
 	closetext
-	setscene SCENE_VICTORYROADGATE_1
+	setscene SCENE_VICTORYROADGATE_NOTHING
 	end
 
 VictoryRoadGateLeftBlackBeltScript:
@@ -109,7 +109,7 @@ VictoryRoadGate_MapEvents:
 	warp_event 2, 7, 2, ROUTE_28
 
 	db 1 ; coord events
-	coord_event 10, 11, SCENE_VICTORYROADGATE_0, VictoryRoadGateBadgeCheckScene
+	coord_event 10, 11, SCENE_DEFAULT, VictoryRoadGateBadgeCheckScene
 
 	db 0 ; bg events
 
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
index 3c165b39f..184a5783a 100644
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -34,7 +34,7 @@ FalknerScript_0x683c2:
 	iftrue .SpeechAfterTM
 	setevent EVENT_BEAT_BIRD_KEEPER_ROD
 	setevent EVENT_BEAT_BIRD_KEEPER_ABE
-	setmapscene ELMS_LAB, SCENE_ELMSLAB_2
+	setmapscene ELMS_LAB, SCENE_ELMSLAB_NOTHING
 	specialphonecall SPECIALCALL_ASSISTANT
 	writetext UnknownText_0x685c8
 	buttonsound
diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm
index 5aa5118b7..19923c2d7 100644
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -30,7 +30,7 @@ VioletPokecenter1F_ElmsAideScript:
 	setevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
 	clearevent EVENT_ELMS_AIDE_IN_LAB
 	clearevent EVENT_TOGEPI_HATCHED
-	setmapscene ROUTE_32, SCENE_ROUTE32_1
+	setmapscene ROUTE_32, SCENE_ROUTE32_OFFER_SLOWPOKETAIL
 	writetext UnknownText_0x695c5
 	waitbutton
 	closetext
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm
index 83a72c37d..96d1e5287 100644
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -3,8 +3,8 @@
 
 WillsRoom_MapScripts:
 	db 2 ; scene scripts
-	scene_script .LockDoor ; SCENE_WILLSROOM_0
-	scene_script .DummyScene ; SCENE_WILLSROOM_1
+	scene_script .LockDoor ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_WILLSROOM_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .WillsRoomDoors
@@ -35,7 +35,7 @@ WillsRoom_MapScripts:
 	changeblock 4, 14, $2a ; wall
 	reloadmappart
 	closetext
-	setscene SCENE_WILLSROOM_1
+	setscene SCENE_WILLSROOM_NOTHING
 	setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
 	waitsfx
 	end
diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm
index 9719a99db..be0188fd1 100644
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -8,8 +8,8 @@
 
 WiseTriosRoom_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_WISETRIOSROOM_0
-	scene_script .DummyScene1 ; SCENE_WISETRIOSROOM_1
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_WISETRIOSROOM_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .WiseTrioCallback
@@ -103,7 +103,7 @@ TrainerSageKoji:
 	applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628
 	spriteface WISETRIOSROOM_SAGE6, UP
 	setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
-	setscene SCENE_WISETRIOSROOM_1
+	setscene SCENE_WISETRIOSROOM_NOTHING
 	end
 
 UnknownScript_0x9861b:
@@ -351,7 +351,7 @@ WiseTriosRoom_MapEvents:
 	warp_event 1, 4, 5, ECRUTEAK_TIN_TOWER_ENTRANCE
 
 	db 1 ; coord events
-	coord_event 7, 4, SCENE_WISETRIOSROOM_0, UnknownScript_0x985a3
+	coord_event 7, 4, SCENE_DEFAULT, UnknownScript_0x985a3
 
 	db 0 ; bg events
 

From b54a7b779547dca8d6fbf040faf41f36660f0563 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Thu, 1 Feb 2018 13:08:30 -0500
Subject: [PATCH 088/135] Quick scene explanation

---
 constants/scene_constants.asm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/constants/scene_constants.asm b/constants/scene_constants.asm
index be7f444ae..157f84111 100644
--- a/constants/scene_constants.asm
+++ b/constants/scene_constants.asm
@@ -1,3 +1,7 @@
+; See data/maps/scenes.asm for which maps have scene variables.
+; Values default to 0 and can be changed with setscene or setmapscene.
+; Each scene_script and coord_event goes with a single scene ID.
+
 SCENE_DEFAULT EQU 0
 
 ; wPokecenter2FSceneID

From b2970e75f4d1a7a2bc7ac58a656ffd350a80cf0a Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Thu, 1 Feb 2018 15:06:06 -0500
Subject: [PATCH 089/135] SCENE_DEFAULT=0 and SCENE_FINISHED=1 (generic
 constants for a common scene pattern)

---
 constants/scene_constants.asm                 | 166 +-----------------
 engine/events/std_scripts.asm                 |   2 +-
 maps/BattleTower1F.asm                        |   8 +-
 maps/BattleTowerBattleRoom.asm                |   4 +-
 maps/BattleTowerElevator.asm                  |   4 +-
 maps/BattleTowerHallway.asm                   |   4 +-
 maps/BrunosRoom.asm                           |   4 +-
 maps/BurnedTowerB1F.asm                       |   8 +-
 maps/Colosseum.asm                            |   6 +-
 maps/DragonShrine.asm                         |   4 +-
 maps/EcruteakGym.asm                          |   4 +-
 maps/EcruteakPokecenter1F.asm                 |   4 +-
 maps/EcruteakTinTowerEntrance.asm             |   4 +-
 maps/ElmsLab.asm                              |   2 +-
 maps/FastShipB1F.asm                          |   2 +-
 maps/FastShipCabins_NNW_NNE_NE.asm            |   2 +-
 ...oldenrodUndergroundSwitchRoomEntrances.asm |   6 +-
 maps/HallOfFame.asm                           |   6 +-
 maps/KarensRoom.asm                           |   4 +-
 maps/KogasRoom.asm                            |   4 +-
 maps/LakeOfRage.asm                           |   4 +-
 maps/MahoganyTown.asm                         |   2 +-
 maps/MobileBattleRoom.asm                     |   4 +-
 maps/MobileTradeRoom.asm                      |   4 +-
 maps/MountMoon.asm                            |   4 +-
 maps/MountMoonSquare.asm                      |   6 +-
 maps/MrPokemonsHouse.asm                      |   4 +-
 maps/NewBarkTown.asm                          |   2 +-
 maps/OlivineCity.asm                          |   6 +-
 maps/PlayersHouse1F.asm                       |   4 +-
 maps/Route27.asm                              |   4 +-
 maps/Route43.asm                              |   2 +-
 maps/Route43Gate.asm                          |   8 +-
 maps/RuinsOfAlphAerodactylChamber.asm         |   4 +-
 maps/RuinsOfAlphHoOhChamber.asm               |   4 +-
 maps/RuinsOfAlphKabutoChamber.asm             |   4 +-
 maps/RuinsOfAlphOmanyteChamber.asm            |   4 +-
 maps/SproutTower3F.asm                        |   4 +-
 maps/TimeCapsule.asm                          |   4 +-
 maps/TinTower1F.asm                           |   4 +-
 maps/TradeCenter.asm                          |   4 +-
 maps/VictoryRoad.asm                          |   6 +-
 maps/VictoryRoadGate.asm                      |   4 +-
 maps/WillsRoom.asm                            |   4 +-
 maps/WiseTriosRoom.asm                        |   4 +-
 45 files changed, 99 insertions(+), 253 deletions(-)

diff --git a/constants/scene_constants.asm b/constants/scene_constants.asm
index 157f84111..67a0351ce 100644
--- a/constants/scene_constants.asm
+++ b/constants/scene_constants.asm
@@ -1,8 +1,11 @@
 ; See data/maps/scenes.asm for which maps have scene variables.
-; Values default to 0 and can be changed with setscene or setmapscene.
-; Each scene_script and coord_event goes with a single scene ID.
+; Each scene_script and coord_event is associated with a current scene ID.
 
-SCENE_DEFAULT EQU 0
+; Scene variables default to 0.
+SCENE_DEFAULT  EQU 0
+; Often a map will have a one-time default event for scene 0, and switch to a
+; do-nothing scene 1 when the event finishes.
+SCENE_FINISHED EQU 1
 
 ; wPokecenter2FSceneID
 	const_def 1
@@ -12,19 +15,6 @@ SCENE_DEFAULT EQU 0
 	const SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM  ; 4
 	const SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM ; 5
 
-; wTradeCenterSceneID
-	const_def 1
-	const SCENE_TRADECENTER_NOTHING ; 1
-
-; wColosseumSceneID
-	const_def 1
-	const SCENE_COLOSSEUM_NOTHING ; 1
-	const SCENE_COLOSSEUM_UNUSED  ; 2
-
-; wTimeCapsuleSceneID
-	const_def 1
-	const SCENE_TIMECAPSULE_NOTHING ; 1
-
 ; wPowerPlantSceneID
 	const_def
 	const SCENE_POWERPLANT_NOTHING               ; 0
@@ -40,42 +30,10 @@ SCENE_DEFAULT EQU 0
 	const SCENE_ROUTE25_NOTHING     ; 0
 	const SCENE_ROUTE25_MISTYS_DATE ; 1
 
-; wVictoryRoadGateSceneID
-	const_def 1
-	const SCENE_VICTORYROADGATE_NOTHING ; 1
-
-; wWillsRoomSceneID
-	const_def 1
-	const SCENE_WILLSROOM_NOTHING ; 1
-
-; wKogasRoomSceneID
-	const_def 1
-	const SCENE_KOGASROOM_NOTHING ; 1
-
-; wBrunosRoomSceneID
-	const_def 1
-	const SCENE_BRUNOSROOM_NOTHING ; 1
-
-; wKarensRoomSceneID
-	const_def 1
-	const SCENE_KARENSROOM_NOTHING ; 1
-
 ; wLancesRoomSceneID
 	const_def 1
 	const SCENE_LANCESROOM_APPROACH_LANCE ; 1
 
-; wHallOfFameSceneID
-	const_def 1
-	const SCENE_HALLOFFAME_NOTHING ; 1
-
-; wRoute27SceneID
-	const_def 1
-	const SCENE_ROUTE27_NOTHING ; 1
-
-; wNewBarkTownSceneID
-	const_def 1
-	const SCENE_NEWBARKTOWN_NOTHING ; 1
-
 ; wElmsLabSceneID
 	const_def 1
 	const SCENE_ELMSLAB_CANT_LEAVE            ; 1
@@ -85,10 +43,6 @@ SCENE_DEFAULT EQU 0
 	const SCENE_ELMSLAB_AIDE_GIVES_POTION     ; 5
 	const SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS ; 6
 
-; wPlayersHouse1FSceneID
-	const_def 1
-	const SCENE_PLAYERSHOUSE1F_NOTHING ; 1
-
 ; wRoute29SceneID
 	const_def
 	const SCENE_ROUTE29_NOTHING        ; 0
@@ -99,10 +53,6 @@ SCENE_DEFAULT EQU 0
 	const SCENE_CHERRYGROVECITY_NOTHING    ; 0
 	const SCENE_CHERRYGROVECITY_MEET_RIVAL ; 1
 
-; wMrPokemonsHouseSceneID
-	const_def 1
-	const SCENE_MRPOKEMONSHOUSE_NOTHING ; 1
-
 ; wRoute32SceneID
 	const_def 1
 	const SCENE_ROUTE32_OFFER_SLOWPOKETAIL ; 1
@@ -136,30 +86,6 @@ SCENE_DEFAULT EQU 0
 	const SCENE_GOLDENRODGYM_NOTHING              ; 0
 	const SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING ; 1
 
-; wOlivineCitySceneID
-	const_def 1
-	const SCENE_OLIVINECITY_NOTHING ; 1
-
-; wEcruteakTinTowerEntranceSceneID
-	const_def 1
-	const SCENE_ECRUTEAKTINTOWERENTRANCE_NOTHING ; 1
-
-; wWiseTriosRoomSceneID
-	const_def 1
-	const SCENE_WISETRIOSROOM_NOTHING ; 1
-
-; wEcruteakPokecenter1FSceneID
-	const_def 1
-	const SCENE_ECRUTEAKPOKECENTER1F_NOTHING ; 1
-
-; wEcruteakGymSceneID
-	const_def 1
-	const SCENE_ECRUTEAKGYM_NOTHING ; 1
-
-; wMahoganyTownSceneID
-	const_def 1
-	const SCENE_MAHOGANYTOWN_NOTHING ; 1
-
 ; wRoute42SceneID
 	const_def
 	const SCENE_ROUTE42_NOTHING ; 0
@@ -170,47 +96,11 @@ SCENE_DEFAULT EQU 0
 	const SCENE_CIANWOODCITY_NOTHING            ; 0
 	const SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE ; 1
 
-; wBattleTower1FSceneID
-	const_def 1
-	const SCENE_BATTLETOWER1F_NOTHING ; 1
-
-; wBattleTowerBattleRoomSceneID
-	const_def 1
-	const SCENE_BATTLETOWERBATTLEROOM_NOTHING ; 1
-
-; wBattleTowerElevatorSceneID
-	const_def 1
-	const SCENE_BATTLETOWERELEVATOR_NOTHING ; 1
-
-; wBattleTowerHallwaySceneID
-	const_def 1
-	const SCENE_BATTLETOWERHALLWAY_NOTHING ; 1
-
-; wRoute43GateSceneID
-	const_def 1
-	const SCENE_ROUTE43GATE_NOTHING ; 1
-
-; wMountMoonSceneID
-	const_def 1
-	const SCENE_MOUNTMOON_NOTHING ; 1
-
-; wSproutTower3FSceneID
-	const_def 1
-	const SCENE_SPROUTTOWER3F_NOTHING ; 1
-
-; wTinTower1FSceneID
-	const_def 1
-	const SCENE_TINTOWER1F_NOTHING ; 1
-
 ; wBurnedTower1FSceneID
 	const_def 1
 	const SCENE_BURNEDTOWER1F_RIVAL_BATTLE ; 1
 	const SCENE_BURNEDTOWER1F_NOTHING      ; 2
 
-; wBurnedTowerB1FSceneID
-	const_def 1
-	const SCENE_BURNEDTOWERB1F_NOTHING ; 1
-
 ; wRadioTower5FSceneID
 	const_def 1
 	const SCENE_RADIOTOWER5F_ROCKET_BOSS ; 1
@@ -226,22 +116,6 @@ SCENE_DEFAULT EQU 0
 	const SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING       ; 0
 	const SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX ; 1
 
-; wRuinsOfAlphHoOhChamberSceneID
-	const_def 1
-	const SCENE_RUINSOFALPHHOOHCHAMBER_NOTHING ; 1
-
-; wRuinsOfAlphKabutoChamberSceneID
-	const_def 1
-	const SCENE_RUINSOFALPHKABUTOCHAMBER_NOTHING ; 1
-
-; wRuinsOfAlphOmanyteChamberSceneID
-	const_def 1
-	const SCENE_RUINSOFALPHOMANYTECHAMBER_NOTHING ; 1
-
-; wRuinsOfAlphAerodactylChamberSceneID
-	const_def 1
-	const SCENE_RUINSOFALPHAERODACTYLCHAMBER_NOTHING ; 1
-
 ; wRuinsOfAlphInnerChamberSceneID
 	const_def
 	const SCENE_RUINSOFALPHINNERCHAMBER_NOTHING          ; 0
@@ -264,23 +138,11 @@ SCENE_DEFAULT EQU 0
 	const SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS     ; 2
 	const SCENE_TEAMROCKETBASEB3F_NOTHING         ; 3
 
-; wGoldenrodUndergroundSwitchRoomEntrancesSceneID
-	const_def 1
-	const SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOTHING ; 1
-
-; wVictoryRoadSceneID
-	const_def 1
-	const SCENE_VICTORYROAD_NOTHING ; 1
-
 ; wDragonsDenB1FSceneID
 	const_def
 	const SCENE_DRAGONSDENB1F_NOTHING        ; 0
 	const SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM ; 1
 
-; wDragonShrineSceneID
-	const_def 1
-	const SCENE_DRAGONSHRINE_NOTHING ; 1
-
 ; wOlivinePortSceneID
 	const_def 1
 	const SCENE_OLIVINEPORT_LEAVE_SHIP ; 1
@@ -293,19 +155,3 @@ SCENE_DEFAULT EQU 0
 	const_def 1
 	const SCENE_FASTSHIP1F_ENTER_SHIP   ; 1
 	const SCENE_FASTSHIP1F_MEET_GRANDPA ; 2
-
-; wFastShipB1FSceneID
-	const_def 1
-	const SCENE_FASTSHIPB1F_NOTHING ; 1
-
-; wMountMoonSquareSceneID
-	const_def 1
-	const SCENE_MOUNTMOONSQUARE_UNUSED ; 1
-
-; wMobileTradeRoomSceneID
-	const_def 1
-	const SCENE_MOBILETRADEROOM_NOTHING ; 1
-
-; wMobileBattleRoomSceneID
-	const_def 1
-	const SCENE_MOBILEBATTLEROOM_NOTHING ; 1
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
index f0990cd02..a79e9e679 100644
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -298,7 +298,7 @@ RadioTowerRocketsScript:
 	clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
 	setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
 	specialphonecall SPECIALCALL_WEIRDBROADCAST
-	setmapscene MAHOGANY_TOWN, SCENE_MAHOGANYTOWN_NOTHING
+	setmapscene MAHOGANY_TOWN, SCENE_FINISHED
 	end
 
 BugContestResultsWarpScript:
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index 0678127ec..52c10c738 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -8,7 +8,7 @@
 BattleTower1F_MapScripts:
 	db 2 ; scene scripts
 	scene_script .Scene0 ; SCENE_DEFAULT
-	scene_script .Scene1 ; SCENE_BATTLETOWER1F_NOTHING
+	scene_script .Scene1 ; SCENE_FINISHED
 
 	db 0 ; callbacks
 
@@ -36,7 +36,7 @@ BattleTower1F_MapScripts:
 	writebyte BATTLETOWERACTION_06
 	special BattleTowerAction
 .SkipEverything:
-	setscene SCENE_BATTLETOWER1F_NOTHING
+	setscene SCENE_FINISHED
 .Scene1:
 	end
 
@@ -82,7 +82,7 @@ Script_ChooseChallenge: ; 0x9e40f
 	setscene SCENE_DEFAULT
 	special TryQuickSave
 	iffalse Script_Menu_ChallengeExplanationCancel
-	setscene SCENE_BATTLETOWER1F_NOTHING
+	setscene SCENE_FINISHED
 	writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
 	special BattleTowerAction
 	special BattleTowerRoomMenu
@@ -209,7 +209,7 @@ continue:
 	setscene SCENE_DEFAULT
 	special TryQuickSave
 	iffalse Script_Menu_ChallengeExplanationCancel
-	setscene SCENE_BATTLETOWER1F_NOTHING
+	setscene SCENE_FINISHED
 	writebyte BATTLETOWERACTION_06
 	special BattleTowerAction
 	writebyte BATTLETOWERACTION_12
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index ab06b1e34..a63ab95f6 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -5,14 +5,14 @@
 BattleTowerBattleRoom_MapScripts:
 	db 2 ; scene scripts
 	scene_script .EnterBattleRoom ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_BATTLETOWERBATTLEROOM_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 0 ; callbacks
 
 .EnterBattleRoom: ; 0x9f419
 	disappear BATTLETOWERBATTLEROOM_YOUNGSTER
 	priorityjump Script_BattleRoom
-	setscene SCENE_BATTLETOWERBATTLEROOM_NOTHING
+	setscene SCENE_FINISHED
 .DummyScene:
 	end
 
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
index d8505b43f..8d2eeb38a 100644
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -4,13 +4,13 @@
 BattleTowerElevator_MapScripts:
 	db 2 ; scene scripts
 	scene_script .Scene0 ; SCENE_DEFAULT
-	scene_script .Scene1 ; SCENE_BATTLETOWERELEVATOR_NOTHING
+	scene_script .Scene1 ; SCENE_FINISHED
 
 	db 0 ; callbacks
 
 .Scene0:
 	priorityjump .RideElevator
-	setscene SCENE_BATTLETOWERELEVATOR_NOTHING
+	setscene SCENE_FINISHED
 .Scene1:
 	end
 
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
index 6cd655252..90187dca6 100644
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -4,13 +4,13 @@
 BattleTowerHallway_MapScripts:
 	db 2 ; scene scripts
 	scene_script .Scene0 ; SCENE_DEFAULT
-	scene_script .Scene1 ; SCENE_BATTLETOWERHALLWAY_NOTHING
+	scene_script .Scene1 ; SCENE_FINISHED
 
 	db 0 ; callbacks
 
 .Scene0:
 	priorityjump .ChooseBattleRoom
-	setscene SCENE_BATTLETOWERHALLWAY_NOTHING
+	setscene SCENE_FINISHED
 .Scene1:
 	end
 
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
index 8404a8a6f..8633cb27b 100644
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -4,7 +4,7 @@
 BrunosRoom_MapScripts:
 	db 2 ; scene scripts
 	scene_script .LockDoor ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_BRUNOSROOM_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .BrunosRoomDoors
@@ -35,7 +35,7 @@ BrunosRoom_MapScripts:
 	changeblock 4, 14, $2a ; wall
 	reloadmappart
 	closetext
-	setscene SCENE_BRUNOSROOM_NOTHING
+	setscene SCENE_FINISHED
 	setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
 	waitsfx
 	end
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index f685780c6..2f7fb5090 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -12,7 +12,7 @@
 BurnedTowerB1F_MapScripts:
 	db 2 ; scene scripts
 	scene_script .DummyScene0 ; SCENE_DEFAULT
-	scene_script .DummyScene1 ; SCENE_BURNEDTOWERB1F_NOTHING
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .LadderCallback
@@ -79,10 +79,10 @@ ReleaseTheBeasts:
 	disappear BURNEDTOWERB1F_SUICUNE1
 	waitsfx
 	special RestartMapMusic
-	setscene SCENE_BURNEDTOWERB1F_NOTHING
+	setscene SCENE_FINISHED
 	setevent EVENT_RELEASED_THE_BEASTS
 	special InitRoamMons
-	setmapscene ECRUTEAK_GYM, SCENE_ECRUTEAKGYM_NOTHING
+	setmapscene ECRUTEAK_GYM, SCENE_FINISHED
 	setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
 	clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
 	setevent EVENT_ECRUTEAK_GYM_GRAMPS
@@ -94,7 +94,7 @@ ReleaseTheBeasts:
 	changeblock 6, 14, $1b ; ladder
 	reloadmappart
 	closetext
-	setscene SCENE_BURNEDTOWERB1F_NOTHING
+	setscene SCENE_FINISHED
 	end
 
 BurnedTowerB1FEusine:
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index 70e3f33b8..850c14e9f 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -5,8 +5,8 @@
 Colosseum_MapScripts:
 	db 3 ; scene scripts
 	scene_script .InitializeColosseum ; SCENE_DEFAULT
-	scene_script .DummyScene1 ; SCENE_COLOSSEUM_NOTHING
-	scene_script .DummyScene2 ; SCENE_COLOSSEUM_UNUSED
+	scene_script .DummyScene1 ; SCENE_FINISHED
+	scene_script .DummyScene2 ; unused
 
 	db 2 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
@@ -39,7 +39,7 @@ Colosseum_MapScripts:
 	return
 
 .InitializeAndPreparePokecenter2F:
-	setscene SCENE_COLOSSEUM_NOTHING
+	setscene SCENE_FINISHED
 	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
 	end
 
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index c36169a5f..ac6fcf25b 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -7,7 +7,7 @@
 DragonShrine_MapScripts:
 	db 2 ; scene scripts
 	scene_script .DragonShrineTest ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_DRAGONSHRINE_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 0 ; callbacks
 
@@ -163,7 +163,7 @@ DragonShrine_MapScripts:
 	waitsfx
 	special RestartMapMusic
 	specialphonecall SPECIALCALL_MASTERBALL
-	setscene SCENE_DRAGONSHRINE_NOTHING
+	setscene SCENE_FINISHED
 	setmapscene DRAGONS_DEN_B1F, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM
 	writetext DragonShrinePlayerReceivedRisingBadgeText
 	buttonsound
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index dba5c6d24..3ff0a15d1 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -10,7 +10,7 @@
 EcruteakGym_MapScripts:
 	db 2 ; scene scripts
 	scene_script .ForcedToLeave ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_ECRUTEAKGYM_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 0 ; callbacks
 
@@ -41,7 +41,7 @@ MortyScript_0x99d58:
 	setflag ENGINE_FOGBADGE
 	checkcode VAR_BADGES
 	scall EcruteakGymActivateRockets
-	setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_ECRUTEAKTINTOWERENTRANCE_NOTHING
+	setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_FINISHED
 	setevent EVENT_RANG_CLEAR_BELL_1
 	setevent EVENT_RANG_CLEAR_BELL_2
 .FightDone:
diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm
index cbde1f418..00ed64894 100644
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -8,7 +8,7 @@
 EcruteakPokecenter1F_MapScripts:
 	db 2 ; scene scripts
 	scene_script .MeetBill ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_ECRUTEAKPOKECENTER1F_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 0 ; callbacks
 
@@ -51,7 +51,7 @@ EcruteakPokecenter1F_MapScripts:
 	disappear ECRUTEAKPOKECENTER1F_BILL
 	clearevent EVENT_MET_BILL
 	setflag ENGINE_TIME_CAPSULE
-	setscene SCENE_ECRUTEAKPOKECENTER1F_NOTHING
+	setscene SCENE_FINISHED
 	waitsfx
 	end
 
diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm
index 3e98ce398..68e277a7f 100644
--- a/maps/EcruteakTinTowerEntrance.asm
+++ b/maps/EcruteakTinTowerEntrance.asm
@@ -7,7 +7,7 @@
 EcruteakTinTowerEntrance_MapScripts:
 	db 2 ; scene scripts
 	scene_script .DummyScene0 ; SCENE_DEFAULT
-	scene_script .DummyScene1 ; SCENE_ECRUTEAKTINTOWERENTRANCE_NOTHING
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .InitializeSages
@@ -98,7 +98,7 @@ SageScript_0x98062:
 	writetext UnknownText_0x98250
 	waitbutton
 	closetext
-	setscene SCENE_ECRUTEAKTINTOWERENTRANCE_NOTHING
+	setscene SCENE_FINISHED
 	setevent EVENT_RANG_CLEAR_BELL_2
 	clearevent EVENT_RANG_CLEAR_BELL_1
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 32022fd85..47ec5c30a 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -273,7 +273,7 @@ ElmDirectionsScript:
 	setevent EVENT_GOT_A_POKEMON_FROM_ELM
 	setevent EVENT_RIVAL_CHERRYGROVE_CITY
 	setscene SCENE_ELMSLAB_AIDE_GIVES_POTION
-	setmapscene NEW_BARK_TOWN, SCENE_NEWBARKTOWN_NOTHING
+	setmapscene NEW_BARK_TOWN, SCENE_FINISHED
 	end
 
 ElmDescribesMrPokemonScript:
diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm
index d0e0d2b98..4cec05fdc 100644
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -15,7 +15,7 @@
 FastShipB1F_MapScripts:
 	db 2 ; scene scripts
 	scene_script .DummyScene0 ; SCENE_DEFAULT
-	scene_script .DummyScene1 ; SCENE_FASTSHIPB1F_NOTHING
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
 	db 0 ; callbacks
 
diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm
index b0933477f..fa293562f 100644
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -96,7 +96,7 @@ SailorScript_0x755f1:
 	waitbutton
 	closetext
 	setevent EVENT_FAST_SHIP_LAZY_SAILOR
-	setmapscene FAST_SHIP_B1F, SCENE_FASTSHIPB1F_NOTHING
+	setmapscene FAST_SHIP_B1F, SCENE_FINISHED
 	checkcode VAR_FACING
 	if_equal RIGHT, UnknownScript_0x75629
 	applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index 0183c3c96..1c4afb979 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -47,7 +47,7 @@ ENDM
 GoldenrodUndergroundSwitchRoomEntrances_MapScripts:
 	db 2 ; scene scripts
 	scene_script .DummyScene0 ; SCENE_DEFAULT
-	scene_script .DummyScene1 ; SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOTHING
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .UpdateDoorPositions
@@ -130,7 +130,7 @@ UndergroundSilverScene1:
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1
 	playsound SFX_EXIT_BUILDING
 	disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
-	setscene SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOTHING
+	setscene SCENE_FINISHED
 	waitsfx
 	playmapmusic
 	end
@@ -149,7 +149,7 @@ UndergroundSilverScene2:
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2
 	playsound SFX_EXIT_BUILDING
 	disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
-	setscene SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOTHING
+	setscene SCENE_FINISHED
 	waitsfx
 	playmapmusic
 	end
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index b0f10f392..539ff039e 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -4,7 +4,7 @@
 HallOfFame_MapScripts:
 	db 2 ; scene scripts
 	scene_script .EnterHallOfFame ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_HALLOFFAME_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 0 ; callbacks
 
@@ -26,7 +26,7 @@ HallOfFame_MapScripts:
 	closetext
 	spriteface HALLOFFAME_LANCE, UP
 	applymovement PLAYER, HallOfFame_SlowlyApproachMachine
-	setscene SCENE_HALLOFFAME_NOTHING
+	setscene SCENE_FINISHED
 	pause 15
 	writebyte HEALMACHINE_HALL_OF_FAME
 	special HealMachineAnim
@@ -36,7 +36,7 @@ HallOfFame_MapScripts:
 	clearevent EVENT_RED_IN_MT_SILVER
 	setevent EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
 	clearevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
-	setmapscene SPROUT_TOWER_3F, SCENE_SPROUTTOWER3F_NOTHING
+	setmapscene SPROUT_TOWER_3F, SCENE_FINISHED
 	special HealParty
 	checkevent EVENT_GOT_SS_TICKET_FROM_ELM
 	iftrue .SkipPhoneCall
diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
index 8d7b3ad2e..7159965bf 100644
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -4,7 +4,7 @@
 KarensRoom_MapScripts:
 	db 2 ; scene scripts
 	scene_script .LockDoor ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_KARENSROOM_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .KarensRoomDoors
@@ -35,7 +35,7 @@ KarensRoom_MapScripts:
 	changeblock 4, 14, $2a ; wall
 	reloadmappart
 	closetext
-	setscene SCENE_KARENSROOM_NOTHING
+	setscene SCENE_FINISHED
 	setevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED
 	waitsfx
 	end
diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
index d6365532b..089c832f1 100644
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -4,7 +4,7 @@
 KogasRoom_MapScripts:
 	db 2 ; scene scripts
 	scene_script .LockDoor ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_KOGASROOM_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .KogasRoomDoors
@@ -35,7 +35,7 @@ KogasRoom_MapScripts:
 	changeblock 4, 14, $2a ; wall
 	reloadmappart
 	closetext
-	setscene SCENE_KOGASROOM_NOTHING
+	setscene SCENE_FINISHED
 	setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
 	waitsfx
 	end
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm
index 5808bb37b..2ba2691c8 100644
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -14,8 +14,8 @@
 
 LakeOfRage_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	scene_script .DummyScene0 ; unusable
+	scene_script .DummyScene1 ; unusable
 
 	db 2 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index 91750c4cd..c91d9cd2b 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -7,7 +7,7 @@
 MahoganyTown_MapScripts:
 	db 2 ; scene scripts
 	scene_script .DummyScene0 ; SCENE_DEFAULT
-	scene_script .DummyScene1 ; SCENE_MAHOGANYTOWN_NOTHING
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index 976719891..15007ae4a 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -1,7 +1,7 @@
 MobileBattleRoom_MapScripts:
 	db 2 ; scene scripts
 	scene_script .InitializeMobileBattleRoom ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_MOBILEBATTLEROOM_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 0 ; callbacks
 
@@ -13,7 +13,7 @@ MobileBattleRoom_MapScripts:
 	end
 
 .InitializeAndPreparePokecenter2F:
-	setscene SCENE_MOBILEBATTLEROOM_NOTHING
+	setscene SCENE_FINISHED
 	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM
 	end
 
diff --git a/maps/MobileTradeRoom.asm b/maps/MobileTradeRoom.asm
index 1739dfcf5..31ddcbf8a 100644
--- a/maps/MobileTradeRoom.asm
+++ b/maps/MobileTradeRoom.asm
@@ -1,7 +1,7 @@
 MobileTradeRoom_MapScripts:
 	db 2 ; scene scripts
 	scene_script .InitializeMobileTradeRoom ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_MOBILETRADEROOM_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 0 ; callbacks
 
@@ -13,7 +13,7 @@ MobileTradeRoom_MapScripts:
 	end
 
 .InitializeAndPreparePokecenter2F:
-	setscene SCENE_MOBILETRADEROOM_NOTHING
+	setscene SCENE_FINISHED
 	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM
 	end
 
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index 700f6cced..ebe1286bc 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -4,7 +4,7 @@
 MountMoon_MapScripts:
 	db 2 ; scene scripts
 	scene_script .RivalEncounter ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_MOUNTMOON_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 0 ; callbacks
 
@@ -64,7 +64,7 @@ MountMoon_MapScripts:
 	closetext
 	applymovement MOUNTMOON_SILVER, MountMoonSilverMovementAfter
 	disappear MOUNTMOON_SILVER
-	setscene SCENE_MOUNTMOON_NOTHING
+	setscene SCENE_FINISHED
 	setevent EVENT_BEAT_RIVAL_IN_MT_MOON
 	playmapmusic
 	end
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index 9defcccd0..22865f3e5 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -5,11 +5,11 @@
 
 MountMoonSquare_MapScripts:
 	db 1 ; scene scripts
-	scene_script .DummyScene
+	scene_script .DummyScene ; SCENE_DEFAULT
 
 	db 2 ; callbacks
-	callback MAPCALLBACK_NEWMAP, .DisappearMoonStone ; SCENE_DEFAULT
-	callback MAPCALLBACK_OBJECTS, .DisappearRock ; SCENE_MOUNTMOONSQUARE_UNUSED
+	callback MAPCALLBACK_NEWMAP, .DisappearMoonStone
+	callback MAPCALLBACK_OBJECTS, .DisappearRock
 
 .DummyScene:
 	end
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index d293b716a..3a7a6b963 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -5,7 +5,7 @@
 MrPokemonsHouse_MapScripts:
 	db 2 ; scene scripts
 	scene_script .MeetMrPokemon ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_MRPOKEMONSHOUSE_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 0 ; callbacks
 
@@ -123,7 +123,7 @@ MrPokemonsHouse_OakScript:
 	setevent EVENT_RIVAL_NEW_BARK_TOWN
 	setevent EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
 	clearevent EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
-	setscene SCENE_MRPOKEMONSHOUSE_NOTHING
+	setscene SCENE_FINISHED
 	setmapscene CHERRYGROVE_CITY, SCENE_CHERRYGROVECITY_MEET_RIVAL
 	setmapscene ELMS_LAB, SCENE_ELMSLAB_MEET_OFFICER
 	specialphonecall SPECIALCALL_ROBBED
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index 6ac0a5080..83de407d1 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -6,7 +6,7 @@
 NewBarkTown_MapScripts:
 	db 2 ; scene scripts
 	scene_script .DummyScene0 ; SCENE_DEFAULT
-	scene_script .DummyScene1 ; SCENE_NEWBARKTOWN_NOTHING
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index f79828e93..7b575f423 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -7,7 +7,7 @@
 OlivineCity_MapScripts:
 	db 2 ; scene scripts
 	scene_script .DummyScene0 ; SCENE_DEFAULT
-	scene_script .DummyScene1 ; SCENE_OLIVINECITY_NOTHING
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -39,7 +39,7 @@ UnknownScript_0x1a8833:
 	applymovement PLAYER, MovementData_0x1a88f4
 	spriteface PLAYER, RIGHT
 	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88db
-	setscene SCENE_OLIVINECITY_NOTHING
+	setscene SCENE_FINISHED
 	disappear OLIVINECITY_OLIVINE_RIVAL
 	special RestartMapMusic
 	variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
@@ -64,7 +64,7 @@ UnknownScript_0x1a886b:
 	spriteface PLAYER, RIGHT
 	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88e8
 	disappear OLIVINECITY_OLIVINE_RIVAL
-	setscene SCENE_OLIVINECITY_NOTHING
+	setscene SCENE_FINISHED
 	special RestartMapMusic
 	variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
 	special LoadUsedSpritesGFX
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index 362674bc3..4cd4c1ecd 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -8,7 +8,7 @@
 PlayersHouse1F_MapScripts:
 	db 2 ; scene scripts
 	scene_script .DummyScene0 ; SCENE_DEFAULT
-	scene_script .DummyScene1 ; SCENE_PLAYERSHOUSE1F_NOTHING
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
 	db 0 ; callbacks
 
@@ -41,7 +41,7 @@ UnknownScript_0x7a4f6:
 	setflag ENGINE_POKEGEAR
 	setflag ENGINE_PHONE_CARD
 	addcellnum PHONE_MOM
-	setscene SCENE_PLAYERSHOUSE1F_NOTHING
+	setscene SCENE_FINISHED
 	setevent EVENT_PLAYERS_HOUSE_MOM_1
 	clearevent EVENT_PLAYERS_HOUSE_MOM_2
 	writetext UnknownText_0x7a6bd
diff --git a/maps/Route27.asm b/maps/Route27.asm
index c2ed42a72..f31cf8d2b 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -12,7 +12,7 @@
 Route27_MapScripts:
 	db 2 ; scene scripts
 	scene_script .DummyScene0 ; SCENE_DEFAULT
-	scene_script .DummyScene1 ; SCENE_ROUTE27_NOTHING
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
 	db 0 ; callbacks
 
@@ -40,7 +40,7 @@ UnknownScript_0x1a088c:
 	writetext Route27FisherText
 	waitbutton
 	closetext
-	setscene SCENE_ROUTE27_NOTHING
+	setscene SCENE_FINISHED
 	end
 
 Route27FisherScript:
diff --git a/maps/Route43.asm b/maps/Route43.asm
index 99150f0b8..4b222f4a6 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -21,7 +21,7 @@ Route43_MapScripts:
 	return
 
 .NoRockets:
-	setmapscene ROUTE_43_GATE, SCENE_ROUTE43GATE_NOTHING
+	setmapscene ROUTE_43_GATE, SCENE_FINISHED
 	return
 
 TrainerCamperSpencer:
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index 6ee4ad8fe..31d215fd4 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -8,7 +8,7 @@ ROUTE43GATE_TOLL EQU 1000
 Route43Gate_MapScripts:
 	db 2 ; scene scripts
 	scene_script .RocketShakedown ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_ROUTE43GATE_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckIfRockets
@@ -35,7 +35,7 @@ Route43Gate_MapScripts:
 	checkcode VAR_FACING
 	if_equal DOWN, RocketScript_Southbound
 	if_equal UP, RocketScript_Northbound
-	setscene SCENE_ROUTE43GATE_NOTHING
+	setscene SCENE_FINISHED
 	end
 
 RocketScript_Southbound:
@@ -67,7 +67,7 @@ RocketScript_ShakeDownSouth:
 	closetext
 	applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassSouth
 	applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassSouth
-	setscene SCENE_ROUTE43GATE_NOTHING
+	setscene SCENE_FINISHED
 	special RestartMapMusic
 	end
 
@@ -99,7 +99,7 @@ RocketScript_ShakeDownNorth:
 	closetext
 	applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassNorth
 	applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassNorth
-	setscene SCENE_ROUTE43GATE_NOTHING
+	setscene SCENE_FINISHED
 	special RestartMapMusic
 	end
 
diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm
index c67d625ec..39528ad80 100644
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -1,7 +1,7 @@
 RuinsOfAlphAerodactylChamber_MapScripts:
 	db 2 ; scene scripts
 	scene_script .CheckWall ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_RUINSOFALPHAERODACTYLCHAMBER_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
@@ -41,7 +41,7 @@ RuinsOfAlphAerodactylChamber_MapScripts:
 	changeblock 4, 0, $30 ; open wall
 	reloadmappart
 	earthquake 50
-	setscene SCENE_RUINSOFALPHAERODACTYLCHAMBER_NOTHING
+	setscene SCENE_FINISHED
 	closetext
 	end
 
diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm
index a763dee5d..9fccc0089 100644
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -1,7 +1,7 @@
 RuinsOfAlphHoOhChamber_MapScripts:
 	db 2 ; scene scripts
 	scene_script .CheckWall ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_RUINSOFALPHHOOHCHAMBER_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
@@ -42,7 +42,7 @@ RuinsOfAlphHoOhChamber_MapScripts:
 	changeblock 4, 0, $30 ; open wall
 	reloadmappart
 	earthquake 50
-	setscene SCENE_RUINSOFALPHHOOHCHAMBER_NOTHING
+	setscene SCENE_FINISHED
 	closetext
 	end
 
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index 3abf69755..1a0c2f799 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -5,7 +5,7 @@
 RuinsOfAlphKabutoChamber_MapScripts:
 	db 2 ; scene scripts
 	scene_script .CheckWall ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_RUINSOFALPHKABUTOCHAMBER_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
@@ -45,7 +45,7 @@ RuinsOfAlphKabutoChamber_MapScripts:
 	changeblock 4, 0, $30 ; open wall
 	reloadmappart
 	earthquake 50
-	setscene SCENE_RUINSOFALPHKABUTOCHAMBER_NOTHING
+	setscene SCENE_FINISHED
 	closetext
 	end
 
diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm
index 87cb6d8ad..52eb813e5 100644
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -1,7 +1,7 @@
 RuinsOfAlphOmanyteChamber_MapScripts:
 	db 2 ; scene scripts
 	scene_script .CheckWall ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_RUINSOFALPHOMANYTECHAMBER_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
@@ -42,7 +42,7 @@ RuinsOfAlphOmanyteChamber_MapScripts:
 	changeblock 4, 0, $30 ; open wall
 	reloadmappart
 	earthquake 50
-	setscene SCENE_RUINSOFALPHOMANYTECHAMBER_NOTHING
+	setscene SCENE_FINISHED
 	closetext
 	end
 
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index 20376095b..d911fac0f 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -10,7 +10,7 @@
 SproutTower3F_MapScripts:
 	db 2 ; scene scripts
 	scene_script .DummyScene0 ; SCENE_DEFAULT
-	scene_script .DummyScene1 ; SCENE_SPROUTTOWER3F_NOTHING
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
 	db 0 ; callbacks
 
@@ -57,7 +57,7 @@ UnknownScript_0x184947:
 	disappear SPROUTTOWER3F_SILVER
 	waitsfx
 	special FadeInQuickly
-	setscene SCENE_SPROUTTOWER3F_NOTHING
+	setscene SCENE_FINISHED
 	special RestartMapMusic
 	end
 
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index f80cb587d..0cb0748b7 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -5,7 +5,7 @@
 TimeCapsule_MapScripts:
 	db 2 ; scene scripts
 	scene_script .InitializeTimeCapsule ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_TIMECAPSULE_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
@@ -30,7 +30,7 @@ TimeCapsule_MapScripts:
 	return
 
 .InitializeAndPreparePokecenter2F:
-	setscene SCENE_TIMECAPSULE_NOTHING
+	setscene SCENE_FINISHED
 	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE
 	end
 
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index 7c9060a05..7a5c435d4 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -13,7 +13,7 @@
 TinTower1F_MapScripts:
 	db 2 ; scene scripts
 	scene_script .FaceSuicune ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_TINTOWER1F_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 2 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .NPCsCallback
@@ -128,7 +128,7 @@ TinTower1F_MapScripts:
 	setmapscene ROUTE_36, SCENE_ROUTE36_NOTHING
 	setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
 	setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_NOTHING
-	setscene SCENE_TINTOWER1F_NOTHING
+	setscene SCENE_FINISHED
 	clearevent EVENT_SET_WHEN_FOUGHT_HO_OH
 	reloadmapafterbattle
 	pause 20
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index 1d8191fc0..40690c4a3 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -5,7 +5,7 @@
 TradeCenter_MapScripts:
 	db 2 ; scene scripts
 	scene_script .InitializeTradeCenter ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_TRADECENTER_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
@@ -30,7 +30,7 @@ TradeCenter_MapScripts:
 	return
 
 .InitializeAndPreparePokecenter2F:
-	setscene SCENE_TRADECENTER_NOTHING
+	setscene SCENE_FINISHED
 	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TRADE_CENTER
 	end
 
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index 832ac412a..d933b1ff1 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -9,7 +9,7 @@
 VictoryRoad_MapScripts:
 	db 2 ; scene scripts
 	scene_script .DummyScene0 ; SCENE_DEFAULT
-	scene_script .DummyScene1 ; SCENE_VICTORYROAD_NOTHING
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
 	db 0 ; callbacks
 
@@ -30,7 +30,7 @@ UnknownScript_0x74492:
 	scall UnknownScript_0x744d4
 	applymovement VICTORYROAD_SILVER, MovementData_0x7454c
 	disappear VICTORYROAD_SILVER
-	setscene SCENE_VICTORYROAD_NOTHING
+	setscene SCENE_FINISHED
 	playmapmusic
 	end
 
@@ -44,7 +44,7 @@ UnknownScript_0x744b5:
 	scall UnknownScript_0x744d4
 	applymovement VICTORYROAD_SILVER, MovementData_0x74555
 	disappear VICTORYROAD_SILVER
-	setscene SCENE_VICTORYROAD_NOTHING
+	setscene SCENE_FINISHED
 	playmapmusic
 	end
 
diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm
index 51badeb6b..541008e02 100644
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -6,7 +6,7 @@
 VictoryRoadGate_MapScripts:
 	db 2 ; scene scripts
 	scene_script .DummyScene0 ; SCENE_DEFAULT
-	scene_script .DummyScene1 ; SCENE_VICTORYROADGATE_NOTHING
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
 	db 0 ; callbacks
 
@@ -38,7 +38,7 @@ VictoryRoadGateBadgeCheckScript:
 	writetext VictoryRoadGateEightBadgesText
 	waitbutton
 	closetext
-	setscene SCENE_VICTORYROADGATE_NOTHING
+	setscene SCENE_FINISHED
 	end
 
 VictoryRoadGateLeftBlackBeltScript:
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm
index 96d1e5287..546113c3e 100644
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -4,7 +4,7 @@
 WillsRoom_MapScripts:
 	db 2 ; scene scripts
 	scene_script .LockDoor ; SCENE_DEFAULT
-	scene_script .DummyScene ; SCENE_WILLSROOM_NOTHING
+	scene_script .DummyScene ; SCENE_FINISHED
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .WillsRoomDoors
@@ -35,7 +35,7 @@ WillsRoom_MapScripts:
 	changeblock 4, 14, $2a ; wall
 	reloadmappart
 	closetext
-	setscene SCENE_WILLSROOM_NOTHING
+	setscene SCENE_FINISHED
 	setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
 	waitsfx
 	end
diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm
index be0188fd1..10079981f 100644
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -9,7 +9,7 @@
 WiseTriosRoom_MapScripts:
 	db 2 ; scene scripts
 	scene_script .DummyScene0 ; SCENE_DEFAULT
-	scene_script .DummyScene1 ; SCENE_WISETRIOSROOM_NOTHING
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .WiseTrioCallback
@@ -103,7 +103,7 @@ TrainerSageKoji:
 	applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628
 	spriteface WISETRIOSROOM_SAGE6, UP
 	setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
-	setscene SCENE_WISETRIOSROOM_NOTHING
+	setscene SCENE_FINISHED
 	end
 
 UnknownScript_0x9861b:

From 323ef81286c554d928520341fbc13ef21dc1ec79 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Thu, 1 Feb 2018 15:19:27 -0500
Subject: [PATCH 090/135] More comments and macros

---
 constants/map_data_constants.asm |  2 +-
 data/events/pokedex_ratings.asm  | 43 ++++++++++--------
 data/wild/fish.asm               | 76 +++++++++++++++++---------------
 macros/scripts/maps.asm          |  5 ++-
 4 files changed, 69 insertions(+), 57 deletions(-)

diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm
index 6e5c4b23f..0f59f8fd5 100644
--- a/constants/map_data_constants.asm
+++ b/constants/map_data_constants.asm
@@ -35,7 +35,7 @@ NUM_MAPDEF_ATTRIBUTES EQU const_value
 	const PALETTE_MORN
 	const PALETTE_DARK
 
-; fish groups
+; FishGroups indexes (see data/wild/fish.asm)
 	const_def
 	const FISHGROUP_NONE
 	const FISHGROUP_SHORE
diff --git a/data/events/pokedex_ratings.asm b/data/events/pokedex_ratings.asm
index be23c401f..3bc45ead2 100644
--- a/data/events/pokedex_ratings.asm
+++ b/data/events/pokedex_ratings.asm
@@ -1,24 +1,29 @@
+rating: MACRO
+; count, sfx, text
+	dbww \1, \2, \3
+ENDM
+
 OakRatings: ; 0x2667f
 ; if you caught at most this many, play this sound, load this text
 ; (text is defined in engine/events/prof_oaks_pc.asm)
-	dbww   9, SFX_DEX_FANFARE_LESS_THAN_20, OakRating01
-	dbww  19, SFX_DEX_FANFARE_LESS_THAN_20, OakRating02
-	dbww  34, SFX_DEX_FANFARE_20_49,        OakRating03
-	dbww  49, SFX_DEX_FANFARE_20_49,        OakRating04
-	dbww  64, SFX_DEX_FANFARE_50_79,        OakRating05
-	dbww  79, SFX_DEX_FANFARE_50_79,        OakRating06
-	dbww  94, SFX_DEX_FANFARE_80_109,       OakRating07
-	dbww 109, SFX_DEX_FANFARE_80_109,       OakRating08
-	dbww 124, SFX_CAUGHT_MON,               OakRating09
-	dbww 139, SFX_CAUGHT_MON,               OakRating10
-	dbww 154, SFX_DEX_FANFARE_140_169,      OakRating11
-	dbww 169, SFX_DEX_FANFARE_140_169,      OakRating12
-	dbww 184, SFX_DEX_FANFARE_170_199,      OakRating13
-	dbww 199, SFX_DEX_FANFARE_170_199,      OakRating14
-	dbww 214, SFX_DEX_FANFARE_200_229,      OakRating15
-	dbww 229, SFX_DEX_FANFARE_200_229,      OakRating16
-	dbww 239, SFX_DEX_FANFARE_230_PLUS,     OakRating17
-	dbww 248, SFX_DEX_FANFARE_230_PLUS,     OakRating18
-	dbww 255, SFX_DEX_FANFARE_230_PLUS,     OakRating19
+	rating   9, SFX_DEX_FANFARE_LESS_THAN_20, OakRating01
+	rating  19, SFX_DEX_FANFARE_LESS_THAN_20, OakRating02
+	rating  34, SFX_DEX_FANFARE_20_49,        OakRating03
+	rating  49, SFX_DEX_FANFARE_20_49,        OakRating04
+	rating  64, SFX_DEX_FANFARE_50_79,        OakRating05
+	rating  79, SFX_DEX_FANFARE_50_79,        OakRating06
+	rating  94, SFX_DEX_FANFARE_80_109,       OakRating07
+	rating 109, SFX_DEX_FANFARE_80_109,       OakRating08
+	rating 124, SFX_CAUGHT_MON,               OakRating09
+	rating 139, SFX_CAUGHT_MON,               OakRating10
+	rating 154, SFX_DEX_FANFARE_140_169,      OakRating11
+	rating 169, SFX_DEX_FANFARE_140_169,      OakRating12
+	rating 184, SFX_DEX_FANFARE_170_199,      OakRating13
+	rating 199, SFX_DEX_FANFARE_170_199,      OakRating14
+	rating 214, SFX_DEX_FANFARE_200_229,      OakRating15
+	rating 229, SFX_DEX_FANFARE_200_229,      OakRating16
+	rating 239, SFX_DEX_FANFARE_230_PLUS,     OakRating17
+	rating 248, SFX_DEX_FANFARE_230_PLUS,     OakRating18
+	rating 255, SFX_DEX_FANFARE_230_PLUS,     OakRating19
  ; 0x266de
  
\ No newline at end of file
diff --git a/data/wild/fish.asm b/data/wild/fish.asm
index 91a887b53..ee8299ccb 100644
--- a/data/wild/fish.asm
+++ b/data/wild/fish.asm
@@ -1,19 +1,25 @@
 time_group EQUS "0," ; use the nth TimeFishGroups entry
 
+fishgroup: MACRO
+; chance, old rod, good rod, super rod
+	dbwww \1, \2, \3, \4
+ENDM
+
 FishGroups: ; 92488
-	dbwww 50 percent + 1, .Shore_Old,            .Shore_Good,            .Shore_Super
-	dbwww 50 percent + 1, .Ocean_Old,            .Ocean_Good,            .Ocean_Super
-	dbwww 50 percent + 1, .Lake_Old,             .Lake_Good,             .Lake_Super
-	dbwww 50 percent + 1, .Pond_Old,             .Pond_Good,             .Pond_Super
-	dbwww 50 percent + 1, .Dratini_Old,          .Dratini_Good,          .Dratini_Super
-	dbwww 50 percent + 1, .Qwilfish_Swarm_Old,   .Qwilfish_Swarm_Good,   .Qwilfish_Swarm_Super
-	dbwww 50 percent + 1, .Remoraid_Swarm_Old,   .Remoraid_Swarm_Good,   .Remoraid_Swarm_Super
-	dbwww 50 percent + 1, .Gyarados_Old,         .Gyarados_Good,         .Gyarados_Super
-	dbwww 50 percent + 1, .Dratini_2_Old,        .Dratini_2_Good,        .Dratini_2_Super
-	dbwww 50 percent + 1, .WhirlIslands_Old,     .WhirlIslands_Good,     .WhirlIslands_Super
-	dbwww 50 percent + 1, .Qwilfish_Old,         .Qwilfish_Good,         .Qwilfish_Super
-	dbwww 50 percent + 1, .Remoraid_Old,         .Remoraid_Good,         .Remoraid_Super
-	dbwww 50 percent + 1, .Qwilfish_NoSwarm_Old, .Qwilfish_NoSwarm_Good, .Qwilfish_NoSwarm_Super
+; entries correspond to FISHGROUP_* constants
+	fishgroup 50 percent + 1, .Shore_Old,            .Shore_Good,            .Shore_Super
+	fishgroup 50 percent + 1, .Ocean_Old,            .Ocean_Good,            .Ocean_Super
+	fishgroup 50 percent + 1, .Lake_Old,             .Lake_Good,             .Lake_Super
+	fishgroup 50 percent + 1, .Pond_Old,             .Pond_Good,             .Pond_Super
+	fishgroup 50 percent + 1, .Dratini_Old,          .Dratini_Good,          .Dratini_Super
+	fishgroup 50 percent + 1, .Qwilfish_Swarm_Old,   .Qwilfish_Swarm_Good,   .Qwilfish_Swarm_Super
+	fishgroup 50 percent + 1, .Remoraid_Swarm_Old,   .Remoraid_Swarm_Good,   .Remoraid_Swarm_Super
+	fishgroup 50 percent + 1, .Gyarados_Old,         .Gyarados_Good,         .Gyarados_Super
+	fishgroup 50 percent + 1, .Dratini_2_Old,        .Dratini_2_Good,        .Dratini_2_Super
+	fishgroup 50 percent + 1, .WhirlIslands_Old,     .WhirlIslands_Good,     .WhirlIslands_Super
+	fishgroup 50 percent + 1, .Qwilfish_Old,         .Qwilfish_Good,         .Qwilfish_Super
+	fishgroup 50 percent + 1, .Remoraid_Old,         .Remoraid_Good,         .Remoraid_Super
+	fishgroup 50 percent + 1, .Qwilfish_NoSwarm_Old, .Qwilfish_NoSwarm_Good, .Qwilfish_NoSwarm_Super
 
 .Shore_Old: ; 924e3
 	db  70 percent + 1, MAGIKARP,   10
@@ -202,26 +208,26 @@ FishGroups: ; 92488
 
 TimeFishGroups: ; 9266f
 	;  day              nite
-	db CORSOLA,    20,  STARYU,     20
-	db CORSOLA,    40,  STARYU,     40
-	db SHELLDER,   20,  SHELLDER,   20
-	db SHELLDER,   40,  SHELLDER,   40
-	db GOLDEEN,    20,  GOLDEEN,    20
-	db GOLDEEN,    40,  GOLDEEN,    40
-	db POLIWAG,    20,  POLIWAG,    20
-	db POLIWAG,    40,  POLIWAG,    40
-	db DRATINI,    20,  DRATINI,    20
-	db DRATINI,    40,  DRATINI,    40
-	db QWILFISH,   20,  QWILFISH,   20
-	db QWILFISH,   40,  QWILFISH,   40
-	db REMORAID,   20,  REMORAID,   20
-	db REMORAID,   40,  REMORAID,   40
-	db GYARADOS,   20,  GYARADOS,   20
-	db GYARADOS,   40,  GYARADOS,   40
-	db DRATINI,    10,  DRATINI,    10
-	db DRATINI,    10,  DRATINI,    10
-	db HORSEA,     20,  HORSEA,     20
-	db HORSEA,     40,  HORSEA,     40
-	db TENTACOOL,  20,  TENTACOOL,  20
-	db TENTACOOL,  40,  TENTACOOL,  40
+	db CORSOLA,    20,  STARYU,     20 ; 0
+	db CORSOLA,    40,  STARYU,     40 ; 1
+	db SHELLDER,   20,  SHELLDER,   20 ; 2
+	db SHELLDER,   40,  SHELLDER,   40 ; 3
+	db GOLDEEN,    20,  GOLDEEN,    20 ; 4
+	db GOLDEEN,    40,  GOLDEEN,    40 ; 5
+	db POLIWAG,    20,  POLIWAG,    20 ; 6
+	db POLIWAG,    40,  POLIWAG,    40 ; 7
+	db DRATINI,    20,  DRATINI,    20 ; 8
+	db DRATINI,    40,  DRATINI,    40 ; 9
+	db QWILFISH,   20,  QWILFISH,   20 ; 10
+	db QWILFISH,   40,  QWILFISH,   40 ; 11
+	db REMORAID,   20,  REMORAID,   20 ; 12
+	db REMORAID,   40,  REMORAID,   40 ; 13
+	db GYARADOS,   20,  GYARADOS,   20 ; 14
+	db GYARADOS,   40,  GYARADOS,   40 ; 15
+	db DRATINI,    10,  DRATINI,    10 ; 16
+	db DRATINI,    10,  DRATINI,    10 ; 17
+	db HORSEA,     20,  HORSEA,     20 ; 18
+	db HORSEA,     40,  HORSEA,     40 ; 19
+	db TENTACOOL,  20,  TENTACOOL,  20 ; 20
+	db TENTACOOL,  40,  TENTACOOL,  40 ; 21
 ; 926c7
diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm
index 77f29620b..12f1adb8e 100644
--- a/macros/scripts/maps.asm
+++ b/macros/scripts/maps.asm
@@ -6,7 +6,8 @@ ENDM
 
 scene_script: MACRO
 ;\1: script pointer
-	dw \1, 0
+	dw \1
+	dw 0 ; filler
 ENDM
 
 callback: MACRO
@@ -27,7 +28,7 @@ ENDM
 coord_event: MACRO
 ;\1: x: left to right, starts at 0
 ;\2: y: top to bottom, starts at 0
-;\3: scene id: controlled by setscene/setmapscene
+;\3: scene id: a SCENE_* constant; controlled by setscene/setmapscene
 ;\4: script pointer
 	db \3, \2, \1
 	db 0 ; filler

From 3088a77a21fd39b9bfa0850e676ddbbed5fdf52b Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Thu, 1 Feb 2018 21:54:00 -0500
Subject: [PATCH 091/135] warp_event x, y, map, warp_id

---
 docs/map_event_scripts.md                     |  2 +-
 macros/scripts/maps.asm                       |  8 +--
 maps/AzaleaGym.asm                            |  4 +-
 maps/AzaleaMart.asm                           |  4 +-
 maps/AzaleaPokecenter1F.asm                   |  6 +-
 maps/AzaleaTown.asm                           | 16 ++---
 maps/BattleTower1F.asm                        |  6 +-
 maps/BattleTowerBattleRoom.asm                |  4 +-
 maps/BattleTowerElevator.asm                  |  4 +-
 maps/BattleTowerHallway.asm                   | 12 ++--
 maps/BattleTowerOutside.asm                   |  8 +--
 maps/BillsBrothersHouse.asm                   |  4 +-
 maps/BillsFamilysHouse.asm                    |  4 +-
 maps/BillsHouse.asm                           |  4 +-
 maps/BlackthornCity.asm                       | 16 ++---
 maps/BlackthornDragonSpeechHouse.asm          |  4 +-
 maps/BlackthornEmysHouse.asm                  |  4 +-
 maps/BlackthornGym1F.asm                      | 14 ++--
 maps/BlackthornGym2F.asm                      | 10 +--
 maps/BlackthornMart.asm                       |  4 +-
 maps/BlackthornPokecenter1F.asm               |  6 +-
 maps/BluesHouse.asm                           |  4 +-
 maps/BrunosRoom.asm                           |  8 +--
 maps/BurnedTower1F.asm                        | 28 ++++----
 maps/BurnedTowerB1F.asm                       | 12 ++--
 maps/CeladonCafe.asm                          |  4 +-
 maps/CeladonCity.asm                          | 18 ++---
 maps/CeladonDeptStore1F.asm                   |  8 +--
 maps/CeladonDeptStore2F.asm                   |  6 +-
 maps/CeladonDeptStore3F.asm                   |  6 +-
 maps/CeladonDeptStore4F.asm                   |  6 +-
 maps/CeladonDeptStore5F.asm                   |  6 +-
 maps/CeladonDeptStore6F.asm                   |  4 +-
 maps/CeladonDeptStoreElevator.asm             |  4 +-
 maps/CeladonGameCorner.asm                    |  4 +-
 maps/CeladonGameCornerPrizeRoom.asm           |  4 +-
 maps/CeladonGym.asm                           |  4 +-
 maps/CeladonMansion1F.asm                     | 10 +--
 maps/CeladonMansion2F.asm                     |  8 +--
 maps/CeladonMansion3F.asm                     |  8 +--
 maps/CeladonMansionRoof.asm                   |  6 +-
 maps/CeladonMansionRoofHouse.asm              |  4 +-
 maps/CeladonPokecenter1F.asm                  |  6 +-
 maps/CeladonPokecenter2FBeta.asm              |  2 +-
 maps/CeruleanCity.asm                         | 12 ++--
 maps/CeruleanGym.asm                          |  4 +-
 maps/CeruleanGymBadgeSpeechHouse.asm          |  4 +-
 maps/CeruleanMart.asm                         |  4 +-
 maps/CeruleanPokecenter1F.asm                 |  6 +-
 maps/CeruleanPokecenter2FBeta.asm             |  2 +-
 maps/CeruleanPoliceStation.asm                |  4 +-
 maps/CeruleanTradeSpeechHouse.asm             |  4 +-
 maps/CharcoalKiln.asm                         |  4 +-
 maps/CherrygroveCity.asm                      | 10 +--
 maps/CherrygroveEvolutionSpeechHouse.asm      |  4 +-
 maps/CherrygroveGymSpeechHouse.asm            |  4 +-
 maps/CherrygroveMart.asm                      |  4 +-
 maps/CherrygrovePokecenter1F.asm              |  6 +-
 maps/CianwoodCity.asm                         | 14 ++--
 maps/CianwoodGym.asm                          |  4 +-
 maps/CianwoodLugiaSpeechHouse.asm             |  4 +-
 maps/CianwoodPharmacy.asm                     |  4 +-
 maps/CianwoodPhotoStudio.asm                  |  4 +-
 maps/CianwoodPokecenter1F.asm                 |  6 +-
 maps/CinnabarIsland.asm                       |  2 +-
 maps/CinnabarPokecenter1F.asm                 |  6 +-
 maps/CinnabarPokecenter2FBeta.asm             |  2 +-
 maps/Colosseum.asm                            |  4 +-
 maps/CopycatsHouse1F.asm                      |  6 +-
 maps/CopycatsHouse2F.asm                      |  2 +-
 maps/DanceTheatre.asm                         |  4 +-
 maps/DarkCaveBlackthornEntrance.asm           |  4 +-
 maps/DarkCaveVioletEntrance.asm               |  6 +-
 maps/DayCare.asm                              |  8 +--
 maps/DayOfWeekSiblingsHouse.asm               |  4 +-
 maps/DiglettsCave.asm                         | 12 ++--
 maps/DragonShrine.asm                         |  4 +-
 maps/DragonsDen1F.asm                         |  8 +--
 maps/DragonsDenB1F.asm                        |  4 +-
 maps/EarlsPokemonAcademy.asm                  |  4 +-
 maps/EcruteakCity.asm                         | 30 ++++-----
 maps/EcruteakGym.asm                          | 66 +++++++++----------
 maps/EcruteakItemfinderHouse.asm              |  4 +-
 maps/EcruteakLugiaSpeechHouse.asm             |  4 +-
 maps/EcruteakMart.asm                         |  4 +-
 maps/EcruteakPokecenter1F.asm                 |  6 +-
 maps/EcruteakTinTowerEntrance.asm             | 10 +--
 maps/ElmsHouse.asm                            |  4 +-
 maps/ElmsLab.asm                              |  4 +-
 maps/FastShip1F.asm                           | 24 +++----
 maps/FastShipB1F.asm                          |  4 +-
 maps/FastShipCabins_NNW_NNE_NE.asm            |  6 +-
 maps/FastShipCabins_SE_SSE_CaptainsCabin.asm  | 12 ++--
 maps/FastShipCabins_SW_SSW_NW.asm             | 10 +--
 maps/FightingDojo.asm                         |  4 +-
 maps/FuchsiaCity.asm                          | 22 +++----
 maps/FuchsiaGym.asm                           |  4 +-
 maps/FuchsiaMart.asm                          |  4 +-
 maps/FuchsiaPokecenter1F.asm                  |  6 +-
 maps/FuchsiaPokecenter2FBeta.asm              |  2 +-
 maps/GoldenrodBikeShop.asm                    |  4 +-
 maps/GoldenrodCity.asm                        | 30 ++++-----
 maps/GoldenrodDeptStore1F.asm                 |  8 +--
 maps/GoldenrodDeptStore2F.asm                 |  6 +-
 maps/GoldenrodDeptStore3F.asm                 |  6 +-
 maps/GoldenrodDeptStore4F.asm                 |  6 +-
 maps/GoldenrodDeptStore5F.asm                 |  6 +-
 maps/GoldenrodDeptStore6F.asm                 |  6 +-
 maps/GoldenrodDeptStoreB1F.asm                |  6 +-
 maps/GoldenrodDeptStoreElevator.asm           |  4 +-
 maps/GoldenrodDeptStoreRoof.asm               |  2 +-
 maps/GoldenrodFlowerShop.asm                  |  4 +-
 maps/GoldenrodGameCorner.asm                  |  4 +-
 maps/GoldenrodGym.asm                         |  4 +-
 maps/GoldenrodHappinessRater.asm              |  4 +-
 maps/GoldenrodMagnetTrainStation.asm          |  8 +--
 maps/GoldenrodNameRater.asm                   |  4 +-
 maps/GoldenrodPPSpeechHouse.asm               |  4 +-
 maps/GoldenrodPokecenter1F.asm                |  8 +--
 maps/GoldenrodUnderground.asm                 | 12 ++--
 ...oldenrodUndergroundSwitchRoomEntrances.asm | 18 ++---
 maps/GoldenrodUndergroundWarehouse.asm        |  6 +-
 maps/GuideGentsHouse.asm                      |  4 +-
 maps/HallOfFame.asm                           |  4 +-
 maps/IcePath1F.asm                            |  8 +--
 maps/IcePathB1F.asm                           | 16 ++---
 maps/IcePathB2FBlackthornSide.asm             |  4 +-
 maps/IcePathB2FMahoganySide.asm               | 12 ++--
 maps/IcePathB3F.asm                           |  4 +-
 maps/IlexForest.asm                           |  6 +-
 maps/IlexForestAzaleaGate.asm                 |  8 +--
 maps/IndigoPlateauPokecenter1F.asm            |  8 +--
 maps/KarensRoom.asm                           |  8 +--
 maps/KogasRoom.asm                            |  8 +--
 maps/KurtsHouse.asm                           |  4 +-
 maps/LakeOfRage.asm                           |  4 +-
 maps/LakeOfRageHiddenPowerHouse.asm           |  4 +-
 maps/LakeOfRageMagikarpHouse.asm              |  4 +-
 maps/LancesRoom.asm                           |  8 +--
 maps/LavRadioTower1F.asm                      |  4 +-
 maps/LavenderMart.asm                         |  4 +-
 maps/LavenderNameRater.asm                    |  4 +-
 maps/LavenderPokecenter1F.asm                 |  6 +-
 maps/LavenderPokecenter2FBeta.asm             |  2 +-
 maps/LavenderSpeechHouse.asm                  |  4 +-
 maps/LavenderTown.asm                         | 14 ++--
 maps/MahoganyGym.asm                          |  4 +-
 maps/MahoganyMart1F.asm                       |  6 +-
 maps/MahoganyPokecenter1F.asm                 |  6 +-
 maps/MahoganyRedGyaradosSpeechHouse.asm       |  4 +-
 maps/MahoganyTown.asm                         | 10 +--
 maps/ManiasHouse.asm                          |  4 +-
 maps/MobileBattleRoom.asm                     |  4 +-
 maps/MobileTradeRoom.asm                      |  4 +-
 maps/MountMoon.asm                            | 16 ++---
 maps/MountMoonGiftShop.asm                    |  4 +-
 maps/MountMoonSquare.asm                      |  6 +-
 maps/MountMortar1FInside.asm                  | 12 ++--
 maps/MountMortar1FOutside.asm                 | 18 ++---
 maps/MountMortar2FInside.asm                  |  4 +-
 maps/MountMortarB1F.asm                       |  4 +-
 maps/MoveDeletersHouse.asm                    |  4 +-
 maps/MrFujisHouse.asm                         |  4 +-
 maps/MrPokemonsHouse.asm                      |  4 +-
 maps/MrPsychicsHouse.asm                      |  4 +-
 maps/NationalPark.asm                         |  8 +--
 maps/NationalParkBugContest.asm               |  8 +--
 maps/NewBarkTown.asm                          |  8 +--
 maps/OaksLab.asm                              |  4 +-
 maps/OlivineCafe.asm                          |  4 +-
 maps/OlivineCity.asm                          | 22 +++----
 maps/OlivineGoodRodHouse.asm                  |  4 +-
 maps/OlivineGym.asm                           |  4 +-
 maps/OlivineHouseBeta.asm                     |  4 +-
 maps/OlivineLighthouse1F.asm                  | 10 +--
 maps/OlivineLighthouse2F.asm                  | 12 ++--
 maps/OlivineLighthouse3F.asm                  | 18 ++---
 maps/OlivineLighthouse4F.asm                  | 20 +++---
 maps/OlivineLighthouse5F.asm                  | 14 ++--
 maps/OlivineLighthouse6F.asm                  |  6 +-
 maps/OlivineMart.asm                          |  4 +-
 maps/OlivinePokecenter1F.asm                  |  6 +-
 maps/OlivinePort.asm                          |  4 +-
 maps/OlivinePortPassage.asm                   | 10 +--
 maps/OlivinePunishmentSpeechHouse.asm         |  4 +-
 maps/OlivineTimsHouse.asm                     |  4 +-
 maps/PalletTown.asm                           |  6 +-
 maps/PewterCity.asm                           | 10 +--
 maps/PewterGym.asm                            |  4 +-
 maps/PewterMart.asm                           |  4 +-
 maps/PewterNidoranSpeechHouse.asm             |  4 +-
 maps/PewterPokecenter1F.asm                   |  6 +-
 maps/PewterPokecenter2FBeta.asm               |  2 +-
 maps/PewterSnoozeSpeechHouse.asm              |  4 +-
 maps/PlayersHouse1F.asm                       |  6 +-
 maps/PlayersHouse2F.asm                       |  2 +-
 maps/PlayersNeighborsHouse.asm                |  4 +-
 maps/PokeSeersHouse.asm                       |  4 +-
 maps/Pokecenter2F.asm                         | 12 ++--
 maps/PokecomCenterAdminRoomMobile.asm         |  4 +-
 maps/PokemonFanClub.asm                       |  4 +-
 maps/PowerPlant.asm                           |  4 +-
 maps/RadioTower1F.asm                         |  6 +-
 maps/RadioTower2F.asm                         |  4 +-
 maps/RadioTower3F.asm                         |  6 +-
 maps/RadioTower4F.asm                         |  8 +--
 maps/RadioTower5F.asm                         |  4 +-
 maps/RedsHouse1F.asm                          |  6 +-
 maps/RedsHouse2F.asm                          |  2 +-
 maps/RockTunnel1F.asm                         | 12 ++--
 maps/RockTunnelB1F.asm                        |  8 +--
 maps/Route10North.asm                         |  4 +-
 maps/Route10Pokecenter1F.asm                  |  6 +-
 maps/Route10Pokecenter2FBeta.asm              |  2 +-
 maps/Route10South.asm                         |  2 +-
 maps/Route12.asm                              |  2 +-
 maps/Route12SuperRodHouse.asm                 |  4 +-
 maps/Route15.asm                              |  4 +-
 maps/Route15FuchsiaGate.asm                   |  8 +--
 maps/Route16.asm                              | 10 +--
 maps/Route16FuchsiaSpeechHouse.asm            |  4 +-
 maps/Route16Gate.asm                          |  8 +--
 maps/Route17.asm                              |  4 +-
 maps/Route17Route18Gate.asm                   |  8 +--
 maps/Route18.asm                              |  4 +-
 maps/Route19.asm                              |  2 +-
 maps/Route19FuchsiaGate.asm                   |  8 +--
 maps/Route2.asm                               | 10 +--
 maps/Route20.asm                              |  2 +-
 maps/Route22.asm                              |  2 +-
 maps/Route23.asm                              |  8 +--
 maps/Route25.asm                              |  2 +-
 maps/Route26.asm                              |  6 +-
 maps/Route26HealHouse.asm                     |  4 +-
 maps/Route27.asm                              |  6 +-
 maps/Route27SandstormHouse.asm                |  4 +-
 maps/Route28.asm                              |  4 +-
 maps/Route28SteelWingHouse.asm                |  4 +-
 maps/Route29.asm                              |  2 +-
 maps/Route29Route46Gate.asm                   |  8 +--
 maps/Route2Gate.asm                           |  8 +--
 maps/Route2NuggetHouse.asm                    |  4 +-
 maps/Route3.asm                               |  2 +-
 maps/Route30.asm                              |  4 +-
 maps/Route30BerryHouse.asm                    |  4 +-
 maps/Route31.asm                              |  6 +-
 maps/Route31VioletGate.asm                    |  8 +--
 maps/Route32.asm                              |  8 +--
 maps/Route32Pokecenter1F.asm                  |  6 +-
 maps/Route32RuinsOfAlphGate.asm               |  8 +--
 maps/Route33.asm                              |  2 +-
 maps/Route34.asm                              | 10 +--
 maps/Route34IlexForestGate.asm                |  8 +--
 maps/Route35.asm                              |  6 +-
 maps/Route35GoldenrodGate.asm                 |  8 +--
 maps/Route35NationalParkGate.asm              |  8 +--
 maps/Route36.asm                              |  8 +--
 maps/Route36NationalParkGate.asm              |  8 +--
 maps/Route36RuinsOfAlphGate.asm               |  8 +--
 maps/Route38.asm                              |  4 +-
 maps/Route38EcruteakGate.asm                  |  8 +--
 maps/Route39.asm                              |  4 +-
 maps/Route39Barn.asm                          |  4 +-
 maps/Route39Farmhouse.asm                     |  4 +-
 maps/Route4.asm                               |  2 +-
 maps/Route40.asm                              |  2 +-
 maps/Route40BattleTowerGate.asm               |  8 +--
 maps/Route41.asm                              |  8 +--
 maps/Route42.asm                              | 10 +--
 maps/Route42EcruteakGate.asm                  |  8 +--
 maps/Route43.asm                              | 10 +--
 maps/Route43Gate.asm                          |  8 +--
 maps/Route43MahoganyGate.asm                  |  8 +--
 maps/Route44.asm                              |  2 +-
 maps/Route45.asm                              |  2 +-
 maps/Route46.asm                              |  6 +-
 maps/Route5.asm                               |  8 +--
 maps/Route5CleanseTagHouse.asm                |  4 +-
 maps/Route5SaffronGate.asm                    |  8 +--
 maps/Route5UndergroundPathEntrance.asm        |  6 +-
 maps/Route6.asm                               |  4 +-
 maps/Route6SaffronGate.asm                    |  8 +--
 maps/Route6UndergroundPathEntrance.asm        |  6 +-
 maps/Route7.asm                               |  4 +-
 maps/Route7SaffronGate.asm                    |  8 +--
 maps/Route8.asm                               |  4 +-
 maps/Route8SaffronGate.asm                    |  8 +--
 maps/Route9.asm                               |  2 +-
 maps/RuinsOfAlphAerodactylChamber.asm         | 10 +--
 maps/RuinsOfAlphAerodactylItemRoom.asm        |  8 +--
 maps/RuinsOfAlphAerodactylWordRoom.asm        |  6 +-
 maps/RuinsOfAlphHoOhChamber.asm               | 10 +--
 maps/RuinsOfAlphHoOhItemRoom.asm              |  8 +--
 maps/RuinsOfAlphHoOhWordRoom.asm              |  6 +-
 maps/RuinsOfAlphInnerChamber.asm              | 18 ++---
 maps/RuinsOfAlphKabutoChamber.asm             | 10 +--
 maps/RuinsOfAlphKabutoItemRoom.asm            |  8 +--
 maps/RuinsOfAlphKabutoWordRoom.asm            |  6 +-
 maps/RuinsOfAlphOmanyteChamber.asm            | 10 +--
 maps/RuinsOfAlphOmanyteItemRoom.asm           |  8 +--
 maps/RuinsOfAlphOmanyteWordRoom.asm           |  6 +-
 maps/RuinsOfAlphOutside.asm                   | 22 +++----
 maps/RuinsOfAlphResearchCenter.asm            |  4 +-
 maps/SafariZoneBeta.asm                       |  4 +-
 maps/SafariZoneFuchsiaGateBeta.asm            |  8 +--
 maps/SafariZoneMainOffice.asm                 |  4 +-
 maps/SafariZoneWardensHome.asm                |  4 +-
 maps/SaffronCity.asm                          | 30 ++++-----
 maps/SaffronGym.asm                           | 64 +++++++++---------
 maps/SaffronMagnetTrainStation.asm            |  8 +--
 maps/SaffronMart.asm                          |  4 +-
 maps/SaffronPokecenter1F.asm                  |  6 +-
 maps/SaffronPokecenter2FBeta.asm              |  2 +-
 maps/SeafoamGym.asm                           |  2 +-
 maps/SilphCo1F.asm                            |  4 +-
 maps/SilverCaveItemRooms.asm                  |  4 +-
 maps/SilverCaveOutside.asm                    |  4 +-
 maps/SilverCavePokecenter1F.asm               |  6 +-
 maps/SilverCaveRoom1.asm                      |  4 +-
 maps/SilverCaveRoom2.asm                      |  8 +--
 maps/SilverCaveRoom3.asm                      |  2 +-
 maps/SlowpokeWellB1F.asm                      |  4 +-
 maps/SlowpokeWellB2F.asm                      |  2 +-
 maps/SoulHouse.asm                            |  4 +-
 maps/SproutTower1F.asm                        | 10 +--
 maps/SproutTower2F.asm                        |  8 +--
 maps/SproutTower3F.asm                        |  2 +-
 maps/TeamRocketBaseB1F.asm                    |  8 +--
 maps/TeamRocketBaseB2F.asm                    | 10 +--
 maps/TeamRocketBaseB3F.asm                    |  8 +--
 maps/TimeCapsule.asm                          |  4 +-
 maps/TinTower1F.asm                           |  6 +-
 maps/TinTower2F.asm                           |  4 +-
 maps/TinTower3F.asm                           |  4 +-
 maps/TinTower4F.asm                           |  8 +--
 maps/TinTower5F.asm                           |  8 +--
 maps/TinTower6F.asm                           |  4 +-
 maps/TinTower7F.asm                           | 10 +--
 maps/TinTower8F.asm                           | 12 ++--
 maps/TinTower9F.asm                           | 14 ++--
 maps/TinTowerRoof.asm                         |  2 +-
 maps/TohjoFalls.asm                           |  4 +-
 maps/TradeCenter.asm                          |  4 +-
 maps/TrainerHouse1F.asm                       |  6 +-
 maps/TrainerHouseB1F.asm                      |  2 +-
 maps/UndergroundPath.asm                      |  4 +-
 maps/UnionCave1F.asm                          |  8 +--
 maps/UnionCaveB1F.asm                         | 10 +--
 maps/UnionCaveB2F.asm                         |  2 +-
 maps/VermilionCity.asm                        | 20 +++---
 maps/VermilionDiglettsCaveSpeechHouse.asm     |  4 +-
 maps/VermilionFishingSpeechHouse.asm          |  4 +-
 maps/VermilionGym.asm                         |  4 +-
 maps/VermilionMagnetTrainSpeechHouse.asm      |  4 +-
 maps/VermilionMart.asm                        |  4 +-
 maps/VermilionPokecenter1F.asm                |  6 +-
 maps/VermilionPokecenter2FBeta.asm            |  2 +-
 maps/VermilionPort.asm                        |  4 +-
 maps/VermilionPortPassage.asm                 | 10 +--
 maps/VictoryRoad.asm                          | 20 +++---
 maps/VictoryRoadGate.asm                      | 16 ++---
 maps/VioletCity.asm                           | 18 ++---
 maps/VioletGym.asm                            |  4 +-
 maps/VioletKylesHouse.asm                     |  4 +-
 maps/VioletMart.asm                           |  4 +-
 maps/VioletNicknameSpeechHouse.asm            |  4 +-
 maps/VioletPokecenter1F.asm                   |  6 +-
 maps/ViridianCity.asm                         | 10 +--
 maps/ViridianGym.asm                          |  4 +-
 maps/ViridianMart.asm                         |  4 +-
 maps/ViridianNicknameSpeechHouse.asm          |  4 +-
 maps/ViridianPokecenter1F.asm                 |  6 +-
 maps/ViridianPokecenter2FBeta.asm             |  2 +-
 maps/WhirlIslandB1F.asm                       | 18 ++---
 maps/WhirlIslandB2F.asm                       |  8 +--
 maps/WhirlIslandCave.asm                      |  4 +-
 maps/WhirlIslandLugiaChamber.asm              |  2 +-
 maps/WhirlIslandNE.asm                        |  6 +-
 maps/WhirlIslandNW.asm                        |  8 +--
 maps/WhirlIslandSE.asm                        |  4 +-
 maps/WhirlIslandSW.asm                        | 10 +--
 maps/WillsRoom.asm                            |  6 +-
 maps/WiseTriosRoom.asm                        |  6 +-
 383 files changed, 1317 insertions(+), 1317 deletions(-)

diff --git a/docs/map_event_scripts.md b/docs/map_event_scripts.md
index c8edc9dc1..a77f74503 100644
--- a/docs/map_event_scripts.md
+++ b/docs/map_event_scripts.md
@@ -106,7 +106,7 @@
 
 
 	db N ; warp events
-	warp_event x, y, warp_id, map
+	warp_event x, y, map, warp_id
 

 
 
diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm
index 12f1adb8e..7d06a620f 100644
--- a/macros/scripts/maps.asm
+++ b/macros/scripts/maps.asm
@@ -19,10 +19,10 @@ ENDM
 warp_event: MACRO
 ;\1: x: left to right, starts at 0
 ;\2: y: top to bottom, starts at 0
-;\3: warp destination: starts at 1
-;\4: map id: from constants/map_constants.asm
-	db \2, \1, \3
-	map \4
+;\3: map id: from constants/map_constants.asm
+;\4: warp destination: starts at 1
+	db \2, \1, \4
+	map \3
 ENDM
 
 coord_event: MACRO
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
index 7967fed01..3d0ab665b 100644
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -363,8 +363,8 @@ AzaleaGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 15, 5, AZALEA_TOWN
-	warp_event 5, 15, 5, AZALEA_TOWN
+	warp_event 4, 15, AZALEA_TOWN, 5
+	warp_event 5, 15, AZALEA_TOWN, 5
 
 	db 0 ; coord events
 
diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm
index 3d224bb74..4100363d9 100644
--- a/maps/AzaleaMart.asm
+++ b/maps/AzaleaMart.asm
@@ -47,8 +47,8 @@ AzaleaMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 3, AZALEA_TOWN
-	warp_event 3, 7, 3, AZALEA_TOWN
+	warp_event 2, 7, AZALEA_TOWN, 3
+	warp_event 3, 7, AZALEA_TOWN, 3
 
 	db 0 ; coord events
 
diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm
index 84c7a3bae..64ceb7cd4 100644
--- a/maps/AzaleaPokecenter1F.asm
+++ b/maps/AzaleaPokecenter1F.asm
@@ -78,9 +78,9 @@ AzaleaPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 1, AZALEA_TOWN
-	warp_event 4, 7, 1, AZALEA_TOWN
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, AZALEA_TOWN, 1
+	warp_event 4, 7, AZALEA_TOWN, 1
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index 834a4fd1d..61dd4acff 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -457,14 +457,14 @@ AzaleaTown_MapEvents:
 	db 0, 0 ; filler
 
 	db 8 ; warp events
-	warp_event 15, 9, 1, AZALEA_POKECENTER_1F
-	warp_event 21, 13, 1, CHARCOAL_KILN
-	warp_event 21, 5, 2, AZALEA_MART
-	warp_event 9, 5, 1, KURTS_HOUSE
-	warp_event 10, 15, 1, AZALEA_GYM
-	warp_event 31, 7, 1, SLOWPOKE_WELL_B1F
-	warp_event 2, 10, 3, ILEX_FOREST_AZALEA_GATE
-	warp_event 2, 11, 4, ILEX_FOREST_AZALEA_GATE
+	warp_event 15, 9, AZALEA_POKECENTER_1F, 1
+	warp_event 21, 13, CHARCOAL_KILN, 1
+	warp_event 21, 5, AZALEA_MART, 2
+	warp_event 9, 5, KURTS_HOUSE, 1
+	warp_event 10, 15, AZALEA_GYM, 1
+	warp_event 31, 7, SLOWPOKE_WELL_B1F, 1
+	warp_event 2, 10, ILEX_FOREST_AZALEA_GATE, 3
+	warp_event 2, 11, ILEX_FOREST_AZALEA_GATE, 4
 
 	db 3 ; coord events
 	coord_event 5, 10, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene1
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index 52c10c738..9c1357646 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -795,9 +795,9 @@ BattleTower1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 7, 9, 3, BATTLE_TOWER_OUTSIDE
-	warp_event 8, 9, 4, BATTLE_TOWER_OUTSIDE
-	warp_event 7, 0, 1, BATTLE_TOWER_ELEVATOR
+	warp_event 7, 9, BATTLE_TOWER_OUTSIDE, 3
+	warp_event 8, 9, BATTLE_TOWER_OUTSIDE, 4
+	warp_event 7, 0, BATTLE_TOWER_ELEVATOR, 1
 
 	db 0 ; coord events
 
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index a63ab95f6..2d65c076e 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -140,8 +140,8 @@ BattleTowerBattleRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 7, 4, BATTLE_TOWER_HALLWAY
-	warp_event 4, 7, 4, BATTLE_TOWER_HALLWAY
+	warp_event 3, 7, BATTLE_TOWER_HALLWAY, 4
+	warp_event 4, 7, BATTLE_TOWER_HALLWAY, 4
 
 	db 0 ; coord events
 
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
index 8d2eeb38a..439233867 100644
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -45,8 +45,8 @@ BattleTowerElevator_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 1, 3, 1, BATTLE_TOWER_HALLWAY
-	warp_event 2, 3, 1, BATTLE_TOWER_HALLWAY
+	warp_event 1, 3, BATTLE_TOWER_HALLWAY, 1
+	warp_event 2, 3, BATTLE_TOWER_HALLWAY, 1
 
 	db 0 ; coord events
 
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
index 90187dca6..3f046f21d 100644
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -78,12 +78,12 @@ BattleTowerHallway_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 11, 1, 1, BATTLE_TOWER_ELEVATOR
-	warp_event 5, 0, 1, BATTLE_TOWER_BATTLE_ROOM
-	warp_event 7, 0, 1, BATTLE_TOWER_BATTLE_ROOM
-	warp_event 9, 0, 1, BATTLE_TOWER_BATTLE_ROOM
-	warp_event 13, 0, 1, BATTLE_TOWER_BATTLE_ROOM
-	warp_event 15, 0, 1, BATTLE_TOWER_BATTLE_ROOM
+	warp_event 11, 1, BATTLE_TOWER_ELEVATOR, 1
+	warp_event 5, 0, BATTLE_TOWER_BATTLE_ROOM, 1
+	warp_event 7, 0, BATTLE_TOWER_BATTLE_ROOM, 1
+	warp_event 9, 0, BATTLE_TOWER_BATTLE_ROOM, 1
+	warp_event 13, 0, BATTLE_TOWER_BATTLE_ROOM, 1
+	warp_event 15, 0, BATTLE_TOWER_BATTLE_ROOM, 1
 
 	db 0 ; coord events
 
diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm
index 23d265637..4e2a719e2 100644
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -128,10 +128,10 @@ BattleTowerOutside_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 8, 21, 3, ROUTE_40_BATTLE_TOWER_GATE
-	warp_event 9, 21, 4, ROUTE_40_BATTLE_TOWER_GATE
-	warp_event 8, 9, 1, BATTLE_TOWER_1F
-	warp_event 9, 9, 2, BATTLE_TOWER_1F
+	warp_event 8, 21, ROUTE_40_BATTLE_TOWER_GATE, 3
+	warp_event 9, 21, ROUTE_40_BATTLE_TOWER_GATE, 4
+	warp_event 8, 9, BATTLE_TOWER_1F, 1
+	warp_event 9, 9, BATTLE_TOWER_1F, 2
 
 	db 0 ; coord events
 
diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm
index 452b1fdb8..e2681c979 100644
--- a/maps/BillsBrothersHouse.asm
+++ b/maps/BillsBrothersHouse.asm
@@ -29,8 +29,8 @@ BillsBrothersHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 4, FUCHSIA_CITY
-	warp_event 3, 7, 4, FUCHSIA_CITY
+	warp_event 2, 7, FUCHSIA_CITY, 4
+	warp_event 3, 7, FUCHSIA_CITY, 4
 
 	db 0 ; coord events
 
diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm
index a0ce47a75..6357b69de 100644
--- a/maps/BillsFamilysHouse.asm
+++ b/maps/BillsFamilysHouse.asm
@@ -244,8 +244,8 @@ BillsFamilysHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 4, GOLDENROD_CITY
-	warp_event 3, 7, 4, GOLDENROD_CITY
+	warp_event 2, 7, GOLDENROD_CITY, 4
+	warp_event 3, 7, GOLDENROD_CITY, 4
 
 	db 0 ; coord events
 
diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
index 6de4d2bc7..6ce1cbcd2 100644
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -355,8 +355,8 @@ BillsHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 1, ROUTE_25
-	warp_event 3, 7, 1, ROUTE_25
+	warp_event 2, 7, ROUTE_25, 1
+	warp_event 3, 7, ROUTE_25, 1
 
 	db 0 ; coord events
 
diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm
index 0ba92b110..3d9dd2a41 100644
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -314,14 +314,14 @@ BlackthornCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 8 ; warp events
-	warp_event 18, 11, 1, BLACKTHORN_GYM_1F
-	warp_event 13, 21, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE
-	warp_event 29, 23, 1, BLACKTHORN_EMYS_HOUSE
-	warp_event 15, 29, 2, BLACKTHORN_MART
-	warp_event 21, 29, 1, BLACKTHORN_POKECENTER_1F
-	warp_event 9, 31, 1, MOVE_DELETERS_HOUSE
-	warp_event 36, 9, 2, ICE_PATH_1F
-	warp_event 20, 1, 1, DRAGONS_DEN_1F
+	warp_event 18, 11, BLACKTHORN_GYM_1F, 1
+	warp_event 13, 21, BLACKTHORN_DRAGON_SPEECH_HOUSE, 1
+	warp_event 29, 23, BLACKTHORN_EMYS_HOUSE, 1
+	warp_event 15, 29, BLACKTHORN_MART, 2
+	warp_event 21, 29, BLACKTHORN_POKECENTER_1F, 1
+	warp_event 9, 31, MOVE_DELETERS_HOUSE, 1
+	warp_event 36, 9, ICE_PATH_1F, 2
+	warp_event 20, 1, DRAGONS_DEN_1F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm
index d9425f9ed..530421296 100644
--- a/maps/BlackthornDragonSpeechHouse.asm
+++ b/maps/BlackthornDragonSpeechHouse.asm
@@ -49,8 +49,8 @@ BlackthornDragonSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 2, BLACKTHORN_CITY
-	warp_event 3, 7, 2, BLACKTHORN_CITY
+	warp_event 2, 7, BLACKTHORN_CITY, 2
+	warp_event 3, 7, BLACKTHORN_CITY, 2
 
 	db 0 ; coord events
 
diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm
index 956a8944b..2e8853727 100644
--- a/maps/BlackthornEmysHouse.asm
+++ b/maps/BlackthornEmysHouse.asm
@@ -21,8 +21,8 @@ BlackthornEmysHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 3, BLACKTHORN_CITY
-	warp_event 3, 7, 3, BLACKTHORN_CITY
+	warp_event 2, 7, BLACKTHORN_CITY, 3
+	warp_event 3, 7, BLACKTHORN_CITY, 3
 
 	db 0 ; coord events
 
diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm
index 1e9b7fb7e..07af82bcf 100644
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -388,13 +388,13 @@ BlackthornGym1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 7 ; warp events
-	warp_event 4, 17, 1, BLACKTHORN_CITY
-	warp_event 5, 17, 1, BLACKTHORN_CITY
-	warp_event 1, 7, 1, BLACKTHORN_GYM_2F
-	warp_event 7, 9, 2, BLACKTHORN_GYM_2F
-	warp_event 2, 6, 3, BLACKTHORN_GYM_2F
-	warp_event 7, 7, 4, BLACKTHORN_GYM_2F
-	warp_event 7, 6, 5, BLACKTHORN_GYM_2F
+	warp_event 4, 17, BLACKTHORN_CITY, 1
+	warp_event 5, 17, BLACKTHORN_CITY, 1
+	warp_event 1, 7, BLACKTHORN_GYM_2F, 1
+	warp_event 7, 9, BLACKTHORN_GYM_2F, 2
+	warp_event 2, 6, BLACKTHORN_GYM_2F, 3
+	warp_event 7, 7, BLACKTHORN_GYM_2F, 4
+	warp_event 7, 6, BLACKTHORN_GYM_2F, 5
 
 	db 0 ; coord events
 
diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm
index 73cf4bc88..2b41c2775 100644
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -127,11 +127,11 @@ BlackthornGym2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 1, 7, 3, BLACKTHORN_GYM_1F
-	warp_event 7, 9, 4, BLACKTHORN_GYM_1F
-	warp_event 2, 5, 5, BLACKTHORN_GYM_1F ; hole
-	warp_event 8, 7, 6, BLACKTHORN_GYM_1F ; hole
-	warp_event 8, 3, 7, BLACKTHORN_GYM_1F ; hole
+	warp_event 1, 7, BLACKTHORN_GYM_1F, 3
+	warp_event 7, 9, BLACKTHORN_GYM_1F, 4
+	warp_event 2, 5, BLACKTHORN_GYM_1F, 5 ; hole
+	warp_event 8, 7, BLACKTHORN_GYM_1F, 6 ; hole
+	warp_event 8, 3, BLACKTHORN_GYM_1F, 7 ; hole
 
 	db 0 ; coord events
 
diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm
index d0a4e541b..cdc9ec50f 100644
--- a/maps/BlackthornMart.asm
+++ b/maps/BlackthornMart.asm
@@ -48,8 +48,8 @@ BlackthornMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 4, BLACKTHORN_CITY
-	warp_event 3, 7, 4, BLACKTHORN_CITY
+	warp_event 2, 7, BLACKTHORN_CITY, 4
+	warp_event 3, 7, BLACKTHORN_CITY, 4
 
 	db 0 ; coord events
 
diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm
index c39cd68b3..77c47f364 100644
--- a/maps/BlackthornPokecenter1F.asm
+++ b/maps/BlackthornPokecenter1F.asm
@@ -51,9 +51,9 @@ BlackthornPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 5, BLACKTHORN_CITY
-	warp_event 4, 7, 5, BLACKTHORN_CITY
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, BLACKTHORN_CITY, 5
+	warp_event 4, 7, BLACKTHORN_CITY, 5
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
index ebc528bbe..e27c9923f 100644
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -146,8 +146,8 @@ BluesHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 2, PALLET_TOWN
-	warp_event 3, 7, 2, PALLET_TOWN
+	warp_event 2, 7, PALLET_TOWN, 2
+	warp_event 3, 7, PALLET_TOWN, 2
 
 	db 0 ; coord events
 
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
index 8633cb27b..bd4fada98 100644
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -126,10 +126,10 @@ BrunosRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 17, 3, KOGAS_ROOM
-	warp_event 5, 17, 4, KOGAS_ROOM
-	warp_event 4, 2, 1, KARENS_ROOM
-	warp_event 5, 2, 2, KARENS_ROOM
+	warp_event 4, 17, KOGAS_ROOM, 3
+	warp_event 5, 17, KOGAS_ROOM, 4
+	warp_event 4, 2, KARENS_ROOM, 1
+	warp_event 5, 2, KARENS_ROOM, 2
 
 	db 0 ; coord events
 
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index a7f5d66e0..71bab1aa6 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -279,20 +279,20 @@ BurnedTower1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 14 ; warp events
-	warp_event 9, 15, 13, ECRUTEAK_CITY
-	warp_event 10, 15, 13, ECRUTEAK_CITY
-	warp_event 10, 9, 1, BURNED_TOWER_B1F
-	warp_event 5, 5, 1, BURNED_TOWER_B1F
-	warp_event 5, 6, 1, BURNED_TOWER_B1F
-	warp_event 4, 6, 1, BURNED_TOWER_B1F
-	warp_event 15, 4, 2, BURNED_TOWER_B1F
-	warp_event 15, 5, 2, BURNED_TOWER_B1F
-	warp_event 10, 7, 3, BURNED_TOWER_B1F
-	warp_event 5, 14, 4, BURNED_TOWER_B1F
-	warp_event 4, 14, 4, BURNED_TOWER_B1F
-	warp_event 14, 14, 5, BURNED_TOWER_B1F
-	warp_event 15, 14, 5, BURNED_TOWER_B1F
-	warp_event 7, 15, 6, BURNED_TOWER_B1F
+	warp_event 9, 15, ECRUTEAK_CITY, 13
+	warp_event 10, 15, ECRUTEAK_CITY, 13
+	warp_event 10, 9, BURNED_TOWER_B1F, 1
+	warp_event 5, 5, BURNED_TOWER_B1F, 1
+	warp_event 5, 6, BURNED_TOWER_B1F, 1
+	warp_event 4, 6, BURNED_TOWER_B1F, 1
+	warp_event 15, 4, BURNED_TOWER_B1F, 2
+	warp_event 15, 5, BURNED_TOWER_B1F, 2
+	warp_event 10, 7, BURNED_TOWER_B1F, 3
+	warp_event 5, 14, BURNED_TOWER_B1F, 4
+	warp_event 4, 14, BURNED_TOWER_B1F, 4
+	warp_event 14, 14, BURNED_TOWER_B1F, 5
+	warp_event 15, 14, BURNED_TOWER_B1F, 5
+	warp_event 7, 15, BURNED_TOWER_B1F, 6
 
 	db 1 ; coord events
 	coord_event 11, 9, SCENE_BURNEDTOWER1F_RIVAL_BATTLE, BurnedTowerRivalBattleScript
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index 2f7fb5090..f83d4cbdb 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -237,12 +237,12 @@ BurnedTowerB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 10, 9, 3, BURNED_TOWER_1F
-	warp_event 17, 7, 7, BURNED_TOWER_1F
-	warp_event 10, 8, 9, BURNED_TOWER_1F
-	warp_event 3, 13, 10, BURNED_TOWER_1F
-	warp_event 17, 14, 12, BURNED_TOWER_1F
-	warp_event 7, 15, 14, BURNED_TOWER_1F
+	warp_event 10, 9, BURNED_TOWER_1F, 3
+	warp_event 17, 7, BURNED_TOWER_1F, 7
+	warp_event 10, 8, BURNED_TOWER_1F, 9
+	warp_event 3, 13, BURNED_TOWER_1F, 10
+	warp_event 17, 14, BURNED_TOWER_1F, 12
+	warp_event 7, 15, BURNED_TOWER_1F, 14
 
 	db 1 ; coord events
 	coord_event 10, 6, SCENE_DEFAULT, ReleaseTheBeasts
diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm
index 039231283..c4337f9cf 100644
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -209,8 +209,8 @@ CeladonCafe_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 6, 7, 9, CELADON_CITY
-	warp_event 7, 7, 9, CELADON_CITY
+	warp_event 6, 7, CELADON_CITY, 9
+	warp_event 7, 7, CELADON_CITY, 9
 
 	db 0 ; coord events
 
diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm
index 606587906..52695628b 100644
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -236,15 +236,15 @@ CeladonCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 9 ; warp events
-	warp_event 4, 9, 1, CELADON_DEPT_STORE_1F
-	warp_event 16, 9, 1, CELADON_MANSION_1F
-	warp_event 16, 3, 3, CELADON_MANSION_1F
-	warp_event 17, 3, 3, CELADON_MANSION_1F
-	warp_event 29, 9, 1, CELADON_POKECENTER_1F
-	warp_event 18, 19, 1, CELADON_GAME_CORNER
-	warp_event 23, 19, 1, CELADON_GAME_CORNER_PRIZE_ROOM
-	warp_event 10, 29, 1, CELADON_GYM
-	warp_event 25, 29, 1, CELADON_CAFE
+	warp_event 4, 9, CELADON_DEPT_STORE_1F, 1
+	warp_event 16, 9, CELADON_MANSION_1F, 1
+	warp_event 16, 3, CELADON_MANSION_1F, 3
+	warp_event 17, 3, CELADON_MANSION_1F, 3
+	warp_event 29, 9, CELADON_POKECENTER_1F, 1
+	warp_event 18, 19, CELADON_GAME_CORNER, 1
+	warp_event 23, 19, CELADON_GAME_CORNER_PRIZE_ROOM, 1
+	warp_event 10, 29, CELADON_GYM, 1
+	warp_event 25, 29, CELADON_CAFE, 1
 
 	db 0 ; coord events
 
diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm
index 515ab70b0..5aab57ddb 100644
--- a/maps/CeladonDeptStore1F.asm
+++ b/maps/CeladonDeptStore1F.asm
@@ -75,10 +75,10 @@ CeladonDeptStore1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 7, 7, 1, CELADON_CITY
-	warp_event 8, 7, 1, CELADON_CITY
-	warp_event 15, 0, 2, CELADON_DEPT_STORE_2F
-	warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
+	warp_event 7, 7, CELADON_CITY, 1
+	warp_event 8, 7, CELADON_CITY, 1
+	warp_event 15, 0, CELADON_DEPT_STORE_2F, 2
+	warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm
index 6810cf390..09df8440c 100644
--- a/maps/CeladonDeptStore2F.asm
+++ b/maps/CeladonDeptStore2F.asm
@@ -70,9 +70,9 @@ CeladonDeptStore2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 12, 0, 1, CELADON_DEPT_STORE_3F
-	warp_event 15, 0, 3, CELADON_DEPT_STORE_1F
-	warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
+	warp_event 12, 0, CELADON_DEPT_STORE_3F, 1
+	warp_event 15, 0, CELADON_DEPT_STORE_1F, 3
+	warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm
index 2527599c4..733100ab2 100644
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -96,9 +96,9 @@ CeladonDeptStore3F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 12, 0, 1, CELADON_DEPT_STORE_2F
-	warp_event 15, 0, 2, CELADON_DEPT_STORE_4F
-	warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
+	warp_event 12, 0, CELADON_DEPT_STORE_2F, 1
+	warp_event 15, 0, CELADON_DEPT_STORE_4F, 2
+	warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm
index 46532322f..4241a3595 100644
--- a/maps/CeladonDeptStore4F.asm
+++ b/maps/CeladonDeptStore4F.asm
@@ -52,9 +52,9 @@ CeladonDeptStore4F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 12, 0, 1, CELADON_DEPT_STORE_5F
-	warp_event 15, 0, 2, CELADON_DEPT_STORE_3F
-	warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
+	warp_event 12, 0, CELADON_DEPT_STORE_5F, 1
+	warp_event 15, 0, CELADON_DEPT_STORE_3F, 2
+	warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm
index 94fc55de3..ddac9b490 100644
--- a/maps/CeladonDeptStore5F.asm
+++ b/maps/CeladonDeptStore5F.asm
@@ -73,9 +73,9 @@ CeladonDeptStore5F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 12, 0, 1, CELADON_DEPT_STORE_4F
-	warp_event 15, 0, 1, CELADON_DEPT_STORE_6F
-	warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
+	warp_event 12, 0, CELADON_DEPT_STORE_4F, 1
+	warp_event 15, 0, CELADON_DEPT_STORE_6F, 1
+	warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index d85fdda2e..6bbff6bf2 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -147,8 +147,8 @@ CeladonDeptStore6F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 15, 0, 2, CELADON_DEPT_STORE_5F
-	warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
+	warp_event 15, 0, CELADON_DEPT_STORE_5F, 2
+	warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm
index cbf8f1efa..eaa5c927a 100644
--- a/maps/CeladonDeptStoreElevator.asm
+++ b/maps/CeladonDeptStoreElevator.asm
@@ -29,8 +29,8 @@ CeladonDeptStoreElevator_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 1, 3, -1, CELADON_DEPT_STORE_1F
-	warp_event 2, 3, -1, CELADON_DEPT_STORE_1F
+	warp_event 1, 3, CELADON_DEPT_STORE_1F, -1
+	warp_event 2, 3, CELADON_DEPT_STORE_1F, -1
 
 	db 0 ; coord events
 
diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm
index d39f09586..30268f9c7 100644
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -283,8 +283,8 @@ CeladonGameCorner_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 14, 13, 6, CELADON_CITY
-	warp_event 15, 13, 6, CELADON_CITY
+	warp_event 14, 13, CELADON_CITY, 6
+	warp_event 15, 13, CELADON_CITY, 6
 
 	db 0 ; coord events
 
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index 347aa1513..24384a6bf 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -265,8 +265,8 @@ CeladonGameCornerPrizeRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 5, 7, CELADON_CITY
-	warp_event 3, 5, 7, CELADON_CITY
+	warp_event 2, 5, CELADON_CITY, 7
+	warp_event 3, 5, CELADON_CITY, 7
 
 	db 0 ; coord events
 
diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm
index 1d6a23b40..7b3c96781 100644
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -269,8 +269,8 @@ CeladonGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 17, 8, CELADON_CITY
-	warp_event 5, 17, 8, CELADON_CITY
+	warp_event 4, 17, CELADON_CITY, 8
+	warp_event 5, 17, CELADON_CITY, 8
 
 	db 0 ; coord events
 
diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm
index 79c4fbaec..1746ce937 100644
--- a/maps/CeladonMansion1F.asm
+++ b/maps/CeladonMansion1F.asm
@@ -76,11 +76,11 @@ CeladonMansion1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 6, 9, 2, CELADON_CITY
-	warp_event 7, 9, 2, CELADON_CITY
-	warp_event 3, 0, 3, CELADON_CITY
-	warp_event 0, 0, 1, CELADON_MANSION_2F
-	warp_event 7, 0, 4, CELADON_MANSION_2F
+	warp_event 6, 9, CELADON_CITY, 2
+	warp_event 7, 9, CELADON_CITY, 2
+	warp_event 3, 0, CELADON_CITY, 3
+	warp_event 0, 0, CELADON_MANSION_2F, 1
+	warp_event 7, 0, CELADON_MANSION_2F, 4
 
 	db 0 ; coord events
 
diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm
index 231e824c8..cc32da5e5 100644
--- a/maps/CeladonMansion2F.asm
+++ b/maps/CeladonMansion2F.asm
@@ -51,10 +51,10 @@ CeladonMansion2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 0, 4, CELADON_MANSION_1F
-	warp_event 1, 0, 2, CELADON_MANSION_3F
-	warp_event 6, 0, 3, CELADON_MANSION_3F
-	warp_event 7, 0, 5, CELADON_MANSION_1F
+	warp_event 0, 0, CELADON_MANSION_1F, 4
+	warp_event 1, 0, CELADON_MANSION_3F, 2
+	warp_event 6, 0, CELADON_MANSION_3F, 3
+	warp_event 7, 0, CELADON_MANSION_1F, 5
 
 	db 0 ; coord events
 
diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm
index ce7e0c1fc..5d014f28b 100644
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -191,10 +191,10 @@ CeladonMansion3F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 0, 1, CELADON_MANSION_ROOF
-	warp_event 1, 0, 2, CELADON_MANSION_2F
-	warp_event 6, 0, 3, CELADON_MANSION_2F
-	warp_event 7, 0, 2, CELADON_MANSION_ROOF
+	warp_event 0, 0, CELADON_MANSION_ROOF, 1
+	warp_event 1, 0, CELADON_MANSION_2F, 2
+	warp_event 6, 0, CELADON_MANSION_2F, 3
+	warp_event 7, 0, CELADON_MANSION_ROOF, 2
 
 	db 0 ; coord events
 
diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm
index de9bed48f..4af0fa1ab 100644
--- a/maps/CeladonMansionRoof.asm
+++ b/maps/CeladonMansionRoof.asm
@@ -35,9 +35,9 @@ CeladonMansionRoof_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 1, 1, 1, CELADON_MANSION_3F
-	warp_event 6, 1, 4, CELADON_MANSION_3F
-	warp_event 2, 5, 1, CELADON_MANSION_ROOF_HOUSE
+	warp_event 1, 1, CELADON_MANSION_3F, 1
+	warp_event 6, 1, CELADON_MANSION_3F, 4
+	warp_event 2, 5, CELADON_MANSION_ROOF_HOUSE, 1
 
 	db 0 ; coord events
 
diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm
index a818b2875..56e46634b 100644
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -118,8 +118,8 @@ CeladonMansionRoofHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 3, CELADON_MANSION_ROOF
-	warp_event 3, 7, 3, CELADON_MANSION_ROOF
+	warp_event 2, 7, CELADON_MANSION_ROOF, 3
+	warp_event 3, 7, CELADON_MANSION_ROOF, 3
 
 	db 0 ; coord events
 
diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm
index 098d4f9f5..b333618df 100644
--- a/maps/CeladonPokecenter1F.asm
+++ b/maps/CeladonPokecenter1F.asm
@@ -147,9 +147,9 @@ CeladonPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 5, CELADON_CITY
-	warp_event 4, 7, 5, CELADON_CITY
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, CELADON_CITY, 5
+	warp_event 4, 7, CELADON_CITY, 5
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/CeladonPokecenter2FBeta.asm b/maps/CeladonPokecenter2FBeta.asm
index 836369e9a..34391e66d 100644
--- a/maps/CeladonPokecenter2FBeta.asm
+++ b/maps/CeladonPokecenter2FBeta.asm
@@ -7,7 +7,7 @@ CeladonPokecenter2FBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 0, 7, 3, CELADON_POKECENTER_1F
+	warp_event 0, 7, CELADON_POKECENTER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm
index 36495ce7d..3fb95bfca 100644
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -277,12 +277,12 @@ CeruleanCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 7, 15, 1, CERULEAN_GYM_BADGE_SPEECH_HOUSE
-	warp_event 28, 17, 1, CERULEAN_POLICE_STATION
-	warp_event 13, 19, 1, CERULEAN_TRADE_SPEECH_HOUSE
-	warp_event 19, 21, 1, CERULEAN_POKECENTER_1F
-	warp_event 30, 23, 1, CERULEAN_GYM
-	warp_event 25, 29, 2, CERULEAN_MART
+	warp_event 7, 15, CERULEAN_GYM_BADGE_SPEECH_HOUSE, 1
+	warp_event 28, 17, CERULEAN_POLICE_STATION, 1
+	warp_event 13, 19, CERULEAN_TRADE_SPEECH_HOUSE, 1
+	warp_event 19, 21, CERULEAN_POKECENTER_1F, 1
+	warp_event 30, 23, CERULEAN_GYM, 1
+	warp_event 25, 29, CERULEAN_MART, 2
 
 	db 0 ; coord events
 
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index 89f04bc1d..7349fb346 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -364,8 +364,8 @@ CeruleanGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 15, 5, CERULEAN_CITY
-	warp_event 5, 15, 5, CERULEAN_CITY
+	warp_event 4, 15, CERULEAN_CITY, 5
+	warp_event 5, 15, CERULEAN_CITY, 5
 
 	db 0 ; coord events
 
diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm
index 2e15a2d43..5bb9100f5 100644
--- a/maps/CeruleanGymBadgeSpeechHouse.asm
+++ b/maps/CeruleanGymBadgeSpeechHouse.asm
@@ -18,8 +18,8 @@ CeruleanGymBadgeSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 1, CERULEAN_CITY
-	warp_event 3, 7, 1, CERULEAN_CITY
+	warp_event 2, 7, CERULEAN_CITY, 1
+	warp_event 3, 7, CERULEAN_CITY, 1
 
 	db 0 ; coord events
 
diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm
index 4165f1c3e..c72fe7cd7 100644
--- a/maps/CeruleanMart.asm
+++ b/maps/CeruleanMart.asm
@@ -47,8 +47,8 @@ CeruleanMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 6, CERULEAN_CITY
-	warp_event 3, 7, 6, CERULEAN_CITY
+	warp_event 2, 7, CERULEAN_CITY, 6
+	warp_event 3, 7, CERULEAN_CITY, 6
 
 	db 0 ; coord events
 
diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm
index 6a777da4a..0894c9297 100644
--- a/maps/CeruleanPokecenter1F.asm
+++ b/maps/CeruleanPokecenter1F.asm
@@ -64,9 +64,9 @@ CeruleanPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 4, CERULEAN_CITY
-	warp_event 4, 7, 4, CERULEAN_CITY
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, CERULEAN_CITY, 4
+	warp_event 4, 7, CERULEAN_CITY, 4
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/CeruleanPokecenter2FBeta.asm b/maps/CeruleanPokecenter2FBeta.asm
index cbfabf4bf..d07b136c8 100644
--- a/maps/CeruleanPokecenter2FBeta.asm
+++ b/maps/CeruleanPokecenter2FBeta.asm
@@ -7,7 +7,7 @@ CeruleanPokecenter2FBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 0, 7, 1, CERULEAN_POKECENTER_1F
+	warp_event 0, 7, CERULEAN_POKECENTER_1F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm
index a06c81ef7..0e9503786 100644
--- a/maps/CeruleanPoliceStation.asm
+++ b/maps/CeruleanPoliceStation.asm
@@ -45,8 +45,8 @@ CeruleanPoliceStation_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 2, CERULEAN_CITY
-	warp_event 3, 7, 2, CERULEAN_CITY
+	warp_event 2, 7, CERULEAN_CITY, 2
+	warp_event 3, 7, CERULEAN_CITY, 2
 
 	db 0 ; coord events
 
diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm
index 5f6cf03ed..766cbb061 100644
--- a/maps/CeruleanTradeSpeechHouse.asm
+++ b/maps/CeruleanTradeSpeechHouse.asm
@@ -55,8 +55,8 @@ CeruleanTradeSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 3, CERULEAN_CITY
-	warp_event 3, 7, 3, CERULEAN_CITY
+	warp_event 2, 7, CERULEAN_CITY, 3
+	warp_event 3, 7, CERULEAN_CITY, 3
 
 	db 0 ; coord events
 
diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm
index 94b936421..b7407116d 100644
--- a/maps/CharcoalKiln.asm
+++ b/maps/CharcoalKiln.asm
@@ -150,8 +150,8 @@ CharcoalKiln_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 2, AZALEA_TOWN
-	warp_event 3, 7, 2, AZALEA_TOWN
+	warp_event 2, 7, AZALEA_TOWN, 2
+	warp_event 3, 7, AZALEA_TOWN, 2
 
 	db 0 ; coord events
 
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index 09d824cd5..6a403c099 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -548,11 +548,11 @@ CherrygroveCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 23, 3, 2, CHERRYGROVE_MART
-	warp_event 29, 3, 1, CHERRYGROVE_POKECENTER_1F
-	warp_event 17, 7, 1, CHERRYGROVE_GYM_SPEECH_HOUSE
-	warp_event 25, 9, 1, GUIDE_GENTS_HOUSE
-	warp_event 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE
+	warp_event 23, 3, CHERRYGROVE_MART, 2
+	warp_event 29, 3, CHERRYGROVE_POKECENTER_1F, 1
+	warp_event 17, 7, CHERRYGROVE_GYM_SPEECH_HOUSE, 1
+	warp_event 25, 9, GUIDE_GENTS_HOUSE, 1
+	warp_event 31, 11, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 1
 
 	db 2 ; coord events
 	coord_event 33, 6, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneNorth
diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm
index fdda1d4c0..842d125f3 100644
--- a/maps/CherrygroveEvolutionSpeechHouse.asm
+++ b/maps/CherrygroveEvolutionSpeechHouse.asm
@@ -43,8 +43,8 @@ CherrygroveEvolutionSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 5, CHERRYGROVE_CITY
-	warp_event 3, 7, 5, CHERRYGROVE_CITY
+	warp_event 2, 7, CHERRYGROVE_CITY, 5
+	warp_event 3, 7, CHERRYGROVE_CITY, 5
 
 	db 0 ; coord events
 
diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm
index c8ba5248e..3f99a45d7 100644
--- a/maps/CherrygroveGymSpeechHouse.asm
+++ b/maps/CherrygroveGymSpeechHouse.asm
@@ -46,8 +46,8 @@ CherrygroveGymSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 3, CHERRYGROVE_CITY
-	warp_event 3, 7, 3, CHERRYGROVE_CITY
+	warp_event 2, 7, CHERRYGROVE_CITY, 3
+	warp_event 3, 7, CHERRYGROVE_CITY, 3
 
 	db 0 ; coord events
 
diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm
index e05d21749..a4c7421f4 100644
--- a/maps/CherrygroveMart.asm
+++ b/maps/CherrygroveMart.asm
@@ -73,8 +73,8 @@ CherrygroveMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 1, CHERRYGROVE_CITY
-	warp_event 3, 7, 1, CHERRYGROVE_CITY
+	warp_event 2, 7, CHERRYGROVE_CITY, 1
+	warp_event 3, 7, CHERRYGROVE_CITY, 1
 
 	db 0 ; coord events
 
diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm
index 194b48e03..84ff082b3 100644
--- a/maps/CherrygrovePokecenter1F.asm
+++ b/maps/CherrygrovePokecenter1F.asm
@@ -70,9 +70,9 @@ CherrygrovePokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 2, CHERRYGROVE_CITY
-	warp_event 4, 7, 2, CHERRYGROVE_CITY
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, CHERRYGROVE_CITY, 2
+	warp_event 4, 7, CHERRYGROVE_CITY, 2
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index e88081814..4b5c9a380 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -382,13 +382,13 @@ CianwoodCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 7 ; warp events
-	warp_event 17, 41, 1, MANIAS_HOUSE
-	warp_event 8, 43, 1, CIANWOOD_GYM
-	warp_event 23, 43, 1, CIANWOOD_POKECENTER_1F
-	warp_event 15, 47, 1, CIANWOOD_PHARMACY
-	warp_event 9, 31, 1, CIANWOOD_PHOTO_STUDIO
-	warp_event 15, 37, 1, CIANWOOD_LUGIA_SPEECH_HOUSE
-	warp_event 5, 17, 1, POKE_SEERS_HOUSE
+	warp_event 17, 41, MANIAS_HOUSE, 1
+	warp_event 8, 43, CIANWOOD_GYM, 1
+	warp_event 23, 43, CIANWOOD_POKECENTER_1F, 1
+	warp_event 15, 47, CIANWOOD_PHARMACY, 1
+	warp_event 9, 31, CIANWOOD_PHOTO_STUDIO, 1
+	warp_event 15, 37, CIANWOOD_LUGIA_SPEECH_HOUSE, 1
+	warp_event 5, 17, POKE_SEERS_HOUSE, 1
 
 	db 1 ; coord events
 	coord_event 11, 16, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE, CianwoodCitySuicuneAndEusine
diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm
index 4da9613b9..0cb7a3356 100644
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -307,8 +307,8 @@ CianwoodGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 17, 2, CIANWOOD_CITY
-	warp_event 5, 17, 2, CIANWOOD_CITY
+	warp_event 4, 17, CIANWOOD_CITY, 2
+	warp_event 5, 17, CIANWOOD_CITY, 2
 
 	db 0 ; coord events
 
diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm
index 686802ccc..712c50c29 100644
--- a/maps/CianwoodLugiaSpeechHouse.asm
+++ b/maps/CianwoodLugiaSpeechHouse.asm
@@ -63,8 +63,8 @@ CianwoodLugiaSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 6, CIANWOOD_CITY
-	warp_event 3, 7, 6, CIANWOOD_CITY
+	warp_event 2, 7, CIANWOOD_CITY, 6
+	warp_event 3, 7, CIANWOOD_CITY, 6
 
 	db 0 ; coord events
 
diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm
index bc7bffe0d..7a41ce835 100644
--- a/maps/CianwoodPharmacy.asm
+++ b/maps/CianwoodPharmacy.asm
@@ -74,8 +74,8 @@ CianwoodPharmacy_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 4, CIANWOOD_CITY
-	warp_event 3, 7, 4, CIANWOOD_CITY
+	warp_event 2, 7, CIANWOOD_CITY, 4
+	warp_event 3, 7, CIANWOOD_CITY, 4
 
 	db 0 ; coord events
 
diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm
index 6abdd835c..76ba8055c 100644
--- a/maps/CianwoodPhotoStudio.asm
+++ b/maps/CianwoodPhotoStudio.asm
@@ -50,8 +50,8 @@ CianwoodPhotoStudio_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 5, CIANWOOD_CITY
-	warp_event 3, 7, 5, CIANWOOD_CITY
+	warp_event 2, 7, CIANWOOD_CITY, 5
+	warp_event 3, 7, CIANWOOD_CITY, 5
 
 	db 0 ; coord events
 
diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm
index 1a561c517..0c327e687 100644
--- a/maps/CianwoodPokecenter1F.asm
+++ b/maps/CianwoodPokecenter1F.asm
@@ -133,9 +133,9 @@ CianwoodPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 3, CIANWOOD_CITY
-	warp_event 4, 7, 3, CIANWOOD_CITY
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, CIANWOOD_CITY, 3
+	warp_event 4, 7, CIANWOOD_CITY, 3
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm
index 9f559bff3..ef00047e5 100644
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -129,7 +129,7 @@ CinnabarIsland_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 11, 11, 1, CINNABAR_POKECENTER_1F
+	warp_event 11, 11, CINNABAR_POKECENTER_1F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm
index 81610ee64..8811a1ae4 100644
--- a/maps/CinnabarPokecenter1F.asm
+++ b/maps/CinnabarPokecenter1F.asm
@@ -36,9 +36,9 @@ CinnabarPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 1, CINNABAR_ISLAND
-	warp_event 4, 7, 1, CINNABAR_ISLAND
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, CINNABAR_ISLAND, 1
+	warp_event 4, 7, CINNABAR_ISLAND, 1
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/CinnabarPokecenter2FBeta.asm b/maps/CinnabarPokecenter2FBeta.asm
index 559a1425f..0c459ccae 100644
--- a/maps/CinnabarPokecenter2FBeta.asm
+++ b/maps/CinnabarPokecenter2FBeta.asm
@@ -7,7 +7,7 @@ CinnabarPokecenter2FBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 0, 7, 3, CINNABAR_POKECENTER_1F
+	warp_event 0, 7, CINNABAR_POKECENTER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index 850c14e9f..75cd8ec11 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -64,8 +64,8 @@ Colosseum_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 7, 3, POKECENTER_2F
-	warp_event 5, 7, 3, POKECENTER_2F
+	warp_event 4, 7, POKECENTER_2F, 3
+	warp_event 5, 7, POKECENTER_2F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm
index fb5cbd042..e111ae677 100644
--- a/maps/CopycatsHouse1F.asm
+++ b/maps/CopycatsHouse1F.asm
@@ -74,9 +74,9 @@ CopycatsHouse1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 2, 7, 8, SAFFRON_CITY
-	warp_event 3, 7, 8, SAFFRON_CITY
-	warp_event 2, 0, 1, COPYCATS_HOUSE_2F
+	warp_event 2, 7, SAFFRON_CITY, 8
+	warp_event 3, 7, SAFFRON_CITY, 8
+	warp_event 2, 0, COPYCATS_HOUSE_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm
index d385ef0d5..d3b360d8d 100644
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -362,7 +362,7 @@ CopycatsHouse2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 3, 0, 3, COPYCATS_HOUSE_1F
+	warp_event 3, 0, COPYCATS_HOUSE_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm
index ec4a257bb..feb460bb5 100644
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -339,8 +339,8 @@ DanceTheatre_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 5, 13, 8, ECRUTEAK_CITY
-	warp_event 6, 13, 8, ECRUTEAK_CITY
+	warp_event 5, 13, ECRUTEAK_CITY, 8
+	warp_event 6, 13, ECRUTEAK_CITY, 8
 
 	db 0 ; coord events
 
diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm
index 71b160fd9..1380daa84 100644
--- a/maps/DarkCaveBlackthornEntrance.asm
+++ b/maps/DarkCaveBlackthornEntrance.asm
@@ -63,8 +63,8 @@ DarkCaveBlackthornEntrance_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 23, 3, 1, ROUTE_45
-	warp_event 3, 25, 2, DARK_CAVE_VIOLET_ENTRANCE
+	warp_event 23, 3, ROUTE_45, 1
+	warp_event 3, 25, DARK_CAVE_VIOLET_ENTRANCE, 2
 
 	db 0 ; coord events
 
diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm
index eba31b40d..84a368188 100644
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -35,9 +35,9 @@ DarkCaveVioletEntrance_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 15, 3, ROUTE_31
-	warp_event 17, 1, 2, DARK_CAVE_BLACKTHORN_ENTRANCE
-	warp_event 35, 33, 3, ROUTE_46
+	warp_event 3, 15, ROUTE_31, 3
+	warp_event 17, 1, DARK_CAVE_BLACKTHORN_ENTRANCE, 2
+	warp_event 35, 33, ROUTE_46, 3
 
 	db 0 ; coord events
 
diff --git a/maps/DayCare.asm b/maps/DayCare.asm
index ce7e04c21..fbf05fb9b 100644
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -157,10 +157,10 @@ DayCare_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 5, 3, ROUTE_34
-	warp_event 0, 6, 4, ROUTE_34
-	warp_event 2, 7, 5, ROUTE_34
-	warp_event 3, 7, 5, ROUTE_34
+	warp_event 0, 5, ROUTE_34, 3
+	warp_event 0, 6, ROUTE_34, 4
+	warp_event 2, 7, ROUTE_34, 5
+	warp_event 3, 7, ROUTE_34, 5
 
 	db 0 ; coord events
 
diff --git a/maps/DayOfWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm
index 40efae76e..ba2c89015 100644
--- a/maps/DayOfWeekSiblingsHouse.asm
+++ b/maps/DayOfWeekSiblingsHouse.asm
@@ -72,8 +72,8 @@ DayOfWeekSiblingsHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 3, ROUTE_26
-	warp_event 3, 7, 3, ROUTE_26
+	warp_event 2, 7, ROUTE_26, 3
+	warp_event 3, 7, ROUTE_26, 3
 
 	db 0 ; coord events
 
diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm
index 6552e4d57..e3d0c4501 100644
--- a/maps/DiglettsCave.asm
+++ b/maps/DiglettsCave.asm
@@ -24,12 +24,12 @@ DiglettsCave_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 3, 33, 10, VERMILION_CITY
-	warp_event 5, 31, 5, DIGLETTS_CAVE
-	warp_event 15, 5, 5, ROUTE_2
-	warp_event 17, 3, 6, DIGLETTS_CAVE
-	warp_event 17, 33, 2, DIGLETTS_CAVE
-	warp_event 3, 3, 4, DIGLETTS_CAVE
+	warp_event 3, 33, VERMILION_CITY, 10
+	warp_event 5, 31, DIGLETTS_CAVE, 5
+	warp_event 15, 5, ROUTE_2, 5
+	warp_event 17, 3, DIGLETTS_CAVE, 6
+	warp_event 17, 33, DIGLETTS_CAVE, 2
+	warp_event 3, 3, DIGLETTS_CAVE, 4
 
 	db 0 ; coord events
 
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index ac6fcf25b..d4a2aa8ba 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -659,8 +659,8 @@ DragonShrine_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 9, 2, DRAGONS_DEN_B1F
-	warp_event 5, 9, 2, DRAGONS_DEN_B1F
+	warp_event 4, 9, DRAGONS_DEN_B1F, 2
+	warp_event 5, 9, DRAGONS_DEN_B1F, 2
 
 	db 0 ; coord events
 
diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm
index 5d6b27646..4f7a947a1 100644
--- a/maps/DragonsDen1F.asm
+++ b/maps/DragonsDen1F.asm
@@ -7,10 +7,10 @@ DragonsDen1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 3, 5, 8, BLACKTHORN_CITY
-	warp_event 3, 3, 4, DRAGONS_DEN_1F
-	warp_event 5, 15, 1, DRAGONS_DEN_B1F
-	warp_event 5, 13, 2, DRAGONS_DEN_1F
+	warp_event 3, 5, BLACKTHORN_CITY, 8
+	warp_event 3, 3, DRAGONS_DEN_1F, 4
+	warp_event 5, 15, DRAGONS_DEN_B1F, 1
+	warp_event 5, 13, DRAGONS_DEN_1F, 2
 
 	db 0 ; coord events
 
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 2d0a815c6..51f37da71 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -408,8 +408,8 @@ DragonsDenB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 20, 3, 3, DRAGONS_DEN_1F
-	warp_event 19, 29, 1, DRAGON_SHRINE
+	warp_event 20, 3, DRAGONS_DEN_1F, 3
+	warp_event 19, 29, DRAGON_SHRINE, 1
 
 	db 1 ; coord events
 	coord_event 19, 30, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM, DragonsDenB1F_ClairScene
diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm
index b20863fd1..f4f17ea9a 100644
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -413,8 +413,8 @@ EarlsPokemonAcademy_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 15, 3, VIOLET_CITY
-	warp_event 4, 15, 3, VIOLET_CITY
+	warp_event 3, 15, VIOLET_CITY, 3
+	warp_event 4, 15, VIOLET_CITY, 3
 
 	db 0 ; coord events
 
diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm
index 6ba623bab..6a454bb83 100644
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -261,21 +261,21 @@ EcruteakCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 15 ; warp events
-	warp_event 35, 26, 1, ROUTE_42_ECRUTEAK_GATE
-	warp_event 35, 27, 2, ROUTE_42_ECRUTEAK_GATE
-	warp_event 18, 11, 1, ECRUTEAK_TIN_TOWER_ENTRANCE
-	warp_event 20, 2, 1, WISE_TRIOS_ROOM
-	warp_event 20, 3, 2, WISE_TRIOS_ROOM
-	warp_event 23, 27, 1, ECRUTEAK_POKECENTER_1F
-	warp_event 5, 21, 1, ECRUTEAK_LUGIA_SPEECH_HOUSE
-	warp_event 23, 21, 1, DANCE_THEATRE
-	warp_event 29, 21, 2, ECRUTEAK_MART
-	warp_event 6, 27, 1, ECRUTEAK_GYM
-	warp_event 13, 27, 1, ECRUTEAK_ITEMFINDER_HOUSE
-	warp_event 37, 7, 1, TIN_TOWER_1F
-	warp_event 5, 5, 1, BURNED_TOWER_1F
-	warp_event 0, 18, 3, ROUTE_38_ECRUTEAK_GATE
-	warp_event 0, 19, 4, ROUTE_38_ECRUTEAK_GATE
+	warp_event 35, 26, ROUTE_42_ECRUTEAK_GATE, 1
+	warp_event 35, 27, ROUTE_42_ECRUTEAK_GATE, 2
+	warp_event 18, 11, ECRUTEAK_TIN_TOWER_ENTRANCE, 1
+	warp_event 20, 2, WISE_TRIOS_ROOM, 1
+	warp_event 20, 3, WISE_TRIOS_ROOM, 2
+	warp_event 23, 27, ECRUTEAK_POKECENTER_1F, 1
+	warp_event 5, 21, ECRUTEAK_LUGIA_SPEECH_HOUSE, 1
+	warp_event 23, 21, DANCE_THEATRE, 1
+	warp_event 29, 21, ECRUTEAK_MART, 2
+	warp_event 6, 27, ECRUTEAK_GYM, 1
+	warp_event 13, 27, ECRUTEAK_ITEMFINDER_HOUSE, 1
+	warp_event 37, 7, TIN_TOWER_1F, 1
+	warp_event 5, 5, BURNED_TOWER_1F, 1
+	warp_event 0, 18, ROUTE_38_ECRUTEAK_GATE, 3
+	warp_event 0, 19, ROUTE_38_ECRUTEAK_GATE, 4
 
 	db 0 ; coord events
 
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index 3ff0a15d1..fc9e03020 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -388,39 +388,39 @@ EcruteakGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 33 ; warp events
-	warp_event 4, 17, 10, ECRUTEAK_CITY
-	warp_event 5, 17, 10, ECRUTEAK_CITY
-	warp_event 4, 14, 4, ECRUTEAK_GYM
-	warp_event 2, 4, 3, ECRUTEAK_GYM
-	warp_event 3, 4, 3, ECRUTEAK_GYM
-	warp_event 4, 4, 3, ECRUTEAK_GYM
-	warp_event 4, 5, 3, ECRUTEAK_GYM
-	warp_event 6, 7, 3, ECRUTEAK_GYM
-	warp_event 7, 4, 3, ECRUTEAK_GYM
-	warp_event 2, 6, 3, ECRUTEAK_GYM
-	warp_event 3, 6, 3, ECRUTEAK_GYM
-	warp_event 4, 6, 3, ECRUTEAK_GYM
-	warp_event 5, 6, 3, ECRUTEAK_GYM
-	warp_event 7, 6, 3, ECRUTEAK_GYM
-	warp_event 7, 7, 3, ECRUTEAK_GYM
-	warp_event 4, 8, 3, ECRUTEAK_GYM
-	warp_event 5, 8, 3, ECRUTEAK_GYM
-	warp_event 6, 8, 3, ECRUTEAK_GYM
-	warp_event 7, 8, 3, ECRUTEAK_GYM
-	warp_event 2, 8, 3, ECRUTEAK_GYM
-	warp_event 2, 9, 3, ECRUTEAK_GYM
-	warp_event 2, 10, 3, ECRUTEAK_GYM
-	warp_event 2, 11, 3, ECRUTEAK_GYM
-	warp_event 4, 10, 3, ECRUTEAK_GYM
-	warp_event 5, 10, 3, ECRUTEAK_GYM
-	warp_event 2, 12, 3, ECRUTEAK_GYM
-	warp_event 3, 12, 3, ECRUTEAK_GYM
-	warp_event 4, 12, 3, ECRUTEAK_GYM
-	warp_event 5, 12, 3, ECRUTEAK_GYM
-	warp_event 7, 10, 3, ECRUTEAK_GYM
-	warp_event 7, 11, 3, ECRUTEAK_GYM
-	warp_event 7, 12, 3, ECRUTEAK_GYM
-	warp_event 7, 13, 3, ECRUTEAK_GYM
+	warp_event 4, 17, ECRUTEAK_CITY, 10
+	warp_event 5, 17, ECRUTEAK_CITY, 10
+	warp_event 4, 14, ECRUTEAK_GYM, 4
+	warp_event 2, 4, ECRUTEAK_GYM, 3
+	warp_event 3, 4, ECRUTEAK_GYM, 3
+	warp_event 4, 4, ECRUTEAK_GYM, 3
+	warp_event 4, 5, ECRUTEAK_GYM, 3
+	warp_event 6, 7, ECRUTEAK_GYM, 3
+	warp_event 7, 4, ECRUTEAK_GYM, 3
+	warp_event 2, 6, ECRUTEAK_GYM, 3
+	warp_event 3, 6, ECRUTEAK_GYM, 3
+	warp_event 4, 6, ECRUTEAK_GYM, 3
+	warp_event 5, 6, ECRUTEAK_GYM, 3
+	warp_event 7, 6, ECRUTEAK_GYM, 3
+	warp_event 7, 7, ECRUTEAK_GYM, 3
+	warp_event 4, 8, ECRUTEAK_GYM, 3
+	warp_event 5, 8, ECRUTEAK_GYM, 3
+	warp_event 6, 8, ECRUTEAK_GYM, 3
+	warp_event 7, 8, ECRUTEAK_GYM, 3
+	warp_event 2, 8, ECRUTEAK_GYM, 3
+	warp_event 2, 9, ECRUTEAK_GYM, 3
+	warp_event 2, 10, ECRUTEAK_GYM, 3
+	warp_event 2, 11, ECRUTEAK_GYM, 3
+	warp_event 4, 10, ECRUTEAK_GYM, 3
+	warp_event 5, 10, ECRUTEAK_GYM, 3
+	warp_event 2, 12, ECRUTEAK_GYM, 3
+	warp_event 3, 12, ECRUTEAK_GYM, 3
+	warp_event 4, 12, ECRUTEAK_GYM, 3
+	warp_event 5, 12, ECRUTEAK_GYM, 3
+	warp_event 7, 10, ECRUTEAK_GYM, 3
+	warp_event 7, 11, ECRUTEAK_GYM, 3
+	warp_event 7, 12, ECRUTEAK_GYM, 3
+	warp_event 7, 13, ECRUTEAK_GYM, 3
 
 	db 0 ; coord events
 
diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm
index 7ecf9dcb6..f058a6ec9 100644
--- a/maps/EcruteakItemfinderHouse.asm
+++ b/maps/EcruteakItemfinderHouse.asm
@@ -164,8 +164,8 @@ EcruteakItemfinderHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 7, 11, ECRUTEAK_CITY
-	warp_event 4, 7, 11, ECRUTEAK_CITY
+	warp_event 3, 7, ECRUTEAK_CITY, 11
+	warp_event 4, 7, ECRUTEAK_CITY, 11
 
 	db 0 ; coord events
 
diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm
index 47735d27a..4df1e5430 100644
--- a/maps/EcruteakLugiaSpeechHouse.asm
+++ b/maps/EcruteakLugiaSpeechHouse.asm
@@ -46,8 +46,8 @@ EcruteakLugiaSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 7, 7, ECRUTEAK_CITY
-	warp_event 4, 7, 7, ECRUTEAK_CITY
+	warp_event 3, 7, ECRUTEAK_CITY, 7
+	warp_event 4, 7, ECRUTEAK_CITY, 7
 
 	db 0 ; coord events
 
diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm
index 07e680de6..9587e331b 100644
--- a/maps/EcruteakMart.asm
+++ b/maps/EcruteakMart.asm
@@ -47,8 +47,8 @@ EcruteakMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 9, ECRUTEAK_CITY
-	warp_event 3, 7, 9, ECRUTEAK_CITY
+	warp_event 2, 7, ECRUTEAK_CITY, 9
+	warp_event 3, 7, ECRUTEAK_CITY, 9
 
 	db 0 ; coord events
 
diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm
index 00ed64894..a51602588 100644
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -208,9 +208,9 @@ EcruteakPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 6, ECRUTEAK_CITY
-	warp_event 4, 7, 6, ECRUTEAK_CITY
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, ECRUTEAK_CITY, 6
+	warp_event 4, 7, ECRUTEAK_CITY, 6
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm
index 68e277a7f..2a0ebbcbc 100644
--- a/maps/EcruteakTinTowerEntrance.asm
+++ b/maps/EcruteakTinTowerEntrance.asm
@@ -279,11 +279,11 @@ EcruteakTinTowerEntrance_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 4, 17, 3, ECRUTEAK_CITY
-	warp_event 5, 17, 3, ECRUTEAK_CITY
-	warp_event 5, 3, 4, ECRUTEAK_TIN_TOWER_ENTRANCE
-	warp_event 17, 15, 3, ECRUTEAK_TIN_TOWER_ENTRANCE
-	warp_event 17, 3, 3, WISE_TRIOS_ROOM
+	warp_event 4, 17, ECRUTEAK_CITY, 3
+	warp_event 5, 17, ECRUTEAK_CITY, 3
+	warp_event 5, 3, ECRUTEAK_TIN_TOWER_ENTRANCE, 4
+	warp_event 17, 15, ECRUTEAK_TIN_TOWER_ENTRANCE, 3
+	warp_event 17, 3, WISE_TRIOS_ROOM, 3
 
 	db 2 ; coord events
 	coord_event 4, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent1
diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm
index d41cc9ea4..5064bb44f 100644
--- a/maps/ElmsHouse.asm
+++ b/maps/ElmsHouse.asm
@@ -85,8 +85,8 @@ ElmsHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 4, NEW_BARK_TOWN
-	warp_event 3, 7, 4, NEW_BARK_TOWN
+	warp_event 2, 7, NEW_BARK_TOWN, 4
+	warp_event 3, 7, NEW_BARK_TOWN, 4
 
 	db 0 ; coord events
 
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 47ec5c30a..d9ab8f320 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -1372,8 +1372,8 @@ ElmsLab_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 11, 1, NEW_BARK_TOWN
-	warp_event 5, 11, 1, NEW_BARK_TOWN
+	warp_event 4, 11, NEW_BARK_TOWN, 1
+	warp_event 5, 11, NEW_BARK_TOWN, 1
 
 	db 8 ; coord events
 	coord_event 4, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index aa0877c63..405cb8caf 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -287,18 +287,18 @@ FastShip1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 12 ; warp events
-	warp_event 25, 1, -1, FAST_SHIP_1F
-	warp_event 27, 8, 1, FAST_SHIP_CABINS_NNW_NNE_NE
-	warp_event 23, 8, 2, FAST_SHIP_CABINS_NNW_NNE_NE
-	warp_event 19, 8, 3, FAST_SHIP_CABINS_NNW_NNE_NE
-	warp_event 15, 8, 1, FAST_SHIP_CABINS_SW_SSW_NW
-	warp_event 15, 15, 2, FAST_SHIP_CABINS_SW_SSW_NW
-	warp_event 19, 15, 4, FAST_SHIP_CABINS_SW_SSW_NW
-	warp_event 23, 15, 1, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
-	warp_event 27, 15, 3, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
-	warp_event 3, 13, 5, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
-	warp_event 6, 12, 1, FAST_SHIP_B1F
-	warp_event 30, 14, 2, FAST_SHIP_B1F
+	warp_event 25, 1, FAST_SHIP_1F, -1
+	warp_event 27, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 1
+	warp_event 23, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 2
+	warp_event 19, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 3
+	warp_event 15, 8, FAST_SHIP_CABINS_SW_SSW_NW, 1
+	warp_event 15, 15, FAST_SHIP_CABINS_SW_SSW_NW, 2
+	warp_event 19, 15, FAST_SHIP_CABINS_SW_SSW_NW, 4
+	warp_event 23, 15, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 1
+	warp_event 27, 15, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 3
+	warp_event 3, 13, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 5
+	warp_event 6, 12, FAST_SHIP_B1F, 1
+	warp_event 30, 14, FAST_SHIP_B1F, 2
 
 	db 2 ; coord events
 	coord_event 24, 6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneLeft
diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm
index 4cec05fdc..3051ff20d 100644
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -450,8 +450,8 @@ FastShipB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 5, 11, 11, FAST_SHIP_1F
-	warp_event 31, 13, 12, FAST_SHIP_1F
+	warp_event 5, 11, FAST_SHIP_1F, 11
+	warp_event 31, 13, FAST_SHIP_1F, 12
 
 	db 2 ; coord events
 	coord_event 30, 7, SCENE_DEFAULT, UnknownScript_0x7673c
diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm
index fa293562f..cbacb9b74 100644
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -268,9 +268,9 @@ FastShipCabins_NNW_NNE_NE_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 2, 0, 2, FAST_SHIP_1F
-	warp_event 2, 12, 3, FAST_SHIP_1F
-	warp_event 2, 24, 4, FAST_SHIP_1F
+	warp_event 2, 0, FAST_SHIP_1F, 2
+	warp_event 2, 12, FAST_SHIP_1F, 3
+	warp_event 2, 24, FAST_SHIP_1F, 4
 
 	db 0 ; coord events
 
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index 3e68a1494..a1db95fa9 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -464,12 +464,12 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 2, 7, 8, FAST_SHIP_1F
-	warp_event 3, 7, 8, FAST_SHIP_1F
-	warp_event 2, 19, 9, FAST_SHIP_1F
-	warp_event 3, 19, 9, FAST_SHIP_1F
-	warp_event 2, 33, 10, FAST_SHIP_1F
-	warp_event 3, 33, 10, FAST_SHIP_1F
+	warp_event 2, 7, FAST_SHIP_1F, 8
+	warp_event 3, 7, FAST_SHIP_1F, 8
+	warp_event 2, 19, FAST_SHIP_1F, 9
+	warp_event 3, 19, FAST_SHIP_1F, 9
+	warp_event 2, 33, FAST_SHIP_1F, 10
+	warp_event 3, 33, FAST_SHIP_1F, 10
 
 	db 0 ; coord events
 
diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm
index 15daeeae2..15200b33c 100644
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -224,11 +224,11 @@ FastShipCabins_SW_SSW_NW_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 2, 0, 5, FAST_SHIP_1F
-	warp_event 2, 19, 6, FAST_SHIP_1F
-	warp_event 3, 19, 6, FAST_SHIP_1F
-	warp_event 2, 31, 7, FAST_SHIP_1F
-	warp_event 3, 31, 7, FAST_SHIP_1F
+	warp_event 2, 0, FAST_SHIP_1F, 5
+	warp_event 2, 19, FAST_SHIP_1F, 6
+	warp_event 3, 19, FAST_SHIP_1F, 6
+	warp_event 2, 31, FAST_SHIP_1F, 7
+	warp_event 3, 31, FAST_SHIP_1F, 7
 
 	db 0 ; coord events
 
diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm
index 3ec583d79..0a30bdf3c 100644
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -44,8 +44,8 @@ FightingDojo_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 11, 1, SAFFRON_CITY
-	warp_event 5, 11, 1, SAFFRON_CITY
+	warp_event 4, 11, SAFFRON_CITY, 1
+	warp_event 5, 11, SAFFRON_CITY, 1
 
 	db 0 ; coord events
 
diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm
index a576868a7..5fd606422 100644
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -126,17 +126,17 @@ FuchsiaCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 11 ; warp events
-	warp_event 5, 13, 2, FUCHSIA_MART
-	warp_event 22, 13, 1, SAFARI_ZONE_MAIN_OFFICE
-	warp_event 8, 27, 1, FUCHSIA_GYM
-	warp_event 11, 27, 1, BILLS_BROTHERS_HOUSE
-	warp_event 19, 27, 1, FUCHSIA_POKECENTER_1F
-	warp_event 27, 27, 1, SAFARI_ZONE_WARDENS_HOME
-	warp_event 18, 3, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA
-	warp_event 37, 22, 1, ROUTE_15_FUCHSIA_GATE
-	warp_event 37, 23, 2, ROUTE_15_FUCHSIA_GATE
-	warp_event 7, 35, 1, ROUTE_19_FUCHSIA_GATE
-	warp_event 8, 35, 2, ROUTE_19_FUCHSIA_GATE
+	warp_event 5, 13, FUCHSIA_MART, 2
+	warp_event 22, 13, SAFARI_ZONE_MAIN_OFFICE, 1
+	warp_event 8, 27, FUCHSIA_GYM, 1
+	warp_event 11, 27, BILLS_BROTHERS_HOUSE, 1
+	warp_event 19, 27, FUCHSIA_POKECENTER_1F, 1
+	warp_event 27, 27, SAFARI_ZONE_WARDENS_HOME, 1
+	warp_event 18, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3
+	warp_event 37, 22, ROUTE_15_FUCHSIA_GATE, 1
+	warp_event 37, 23, ROUTE_15_FUCHSIA_GATE, 2
+	warp_event 7, 35, ROUTE_19_FUCHSIA_GATE, 1
+	warp_event 8, 35, ROUTE_19_FUCHSIA_GATE, 2
 
 	db 0 ; coord events
 
diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm
index a64dd49e1..0ffcdd0e3 100644
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -382,8 +382,8 @@ FuchsiaGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 17, 3, FUCHSIA_CITY
-	warp_event 5, 17, 3, FUCHSIA_CITY
+	warp_event 4, 17, FUCHSIA_CITY, 3
+	warp_event 5, 17, FUCHSIA_CITY, 3
 
 	db 0 ; coord events
 
diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm
index 98808262f..9bc34b006 100644
--- a/maps/FuchsiaMart.asm
+++ b/maps/FuchsiaMart.asm
@@ -39,8 +39,8 @@ FuchsiaMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 1, FUCHSIA_CITY
-	warp_event 3, 7, 1, FUCHSIA_CITY
+	warp_event 2, 7, FUCHSIA_CITY, 1
+	warp_event 3, 7, FUCHSIA_CITY, 1
 
 	db 0 ; coord events
 
diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm
index 01609dc48..418266485 100644
--- a/maps/FuchsiaPokecenter1F.asm
+++ b/maps/FuchsiaPokecenter1F.asm
@@ -90,9 +90,9 @@ FuchsiaPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 5, FUCHSIA_CITY
-	warp_event 4, 7, 5, FUCHSIA_CITY
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, FUCHSIA_CITY, 5
+	warp_event 4, 7, FUCHSIA_CITY, 5
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/FuchsiaPokecenter2FBeta.asm b/maps/FuchsiaPokecenter2FBeta.asm
index f37dd7e0a..f26304a3e 100644
--- a/maps/FuchsiaPokecenter2FBeta.asm
+++ b/maps/FuchsiaPokecenter2FBeta.asm
@@ -7,7 +7,7 @@ FuchsiaPokecenter2FBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 0, 7, 3, FUCHSIA_POKECENTER_1F
+	warp_event 0, 7, FUCHSIA_POKECENTER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm
index 980b3c940..05bcf0de7 100644
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -104,8 +104,8 @@ GoldenrodBikeShop_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 2, GOLDENROD_CITY
-	warp_event 3, 7, 2, GOLDENROD_CITY
+	warp_event 2, 7, GOLDENROD_CITY, 2
+	warp_event 3, 7, GOLDENROD_CITY, 2
 
 	db 0 ; coord events
 
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 623107e95..1f30a0015 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -553,21 +553,21 @@ GoldenrodCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 15 ; warp events
-	warp_event 24, 7, 1, GOLDENROD_GYM
-	warp_event 29, 29, 1, GOLDENROD_BIKE_SHOP
-	warp_event 31, 21, 1, GOLDENROD_HAPPINESS_RATER
-	warp_event 5, 25, 1, BILLS_FAMILYS_HOUSE
-	warp_event 9, 13, 2, GOLDENROD_MAGNET_TRAIN_STATION
-	warp_event 29, 5, 1, GOLDENROD_FLOWER_SHOP
-	warp_event 33, 9, 1, GOLDENROD_PP_SPEECH_HOUSE
-	warp_event 15, 7, 1, GOLDENROD_NAME_RATER
-	warp_event 24, 27, 1, GOLDENROD_DEPT_STORE_1F
-	warp_event 14, 21, 1, GOLDENROD_GAME_CORNER
-	warp_event 5, 15, 1, RADIO_TOWER_1F
-	warp_event 19, 1, 3, ROUTE_35_GOLDENROD_GATE
-	warp_event 9, 5, 8, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_event 11, 29, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_event 15, 27, 1, GOLDENROD_POKECENTER_1F
+	warp_event 24, 7, GOLDENROD_GYM, 1
+	warp_event 29, 29, GOLDENROD_BIKE_SHOP, 1
+	warp_event 31, 21, GOLDENROD_HAPPINESS_RATER, 1
+	warp_event 5, 25, BILLS_FAMILYS_HOUSE, 1
+	warp_event 9, 13, GOLDENROD_MAGNET_TRAIN_STATION, 2
+	warp_event 29, 5, GOLDENROD_FLOWER_SHOP, 1
+	warp_event 33, 9, GOLDENROD_PP_SPEECH_HOUSE, 1
+	warp_event 15, 7, GOLDENROD_NAME_RATER, 1
+	warp_event 24, 27, GOLDENROD_DEPT_STORE_1F, 1
+	warp_event 14, 21, GOLDENROD_GAME_CORNER, 1
+	warp_event 5, 15, RADIO_TOWER_1F, 1
+	warp_event 19, 1, ROUTE_35_GOLDENROD_GATE, 3
+	warp_event 9, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 8
+	warp_event 11, 29, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 5
+	warp_event 15, 27, GOLDENROD_POKECENTER_1F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm
index b38f5cddd..0a527369c 100644
--- a/maps/GoldenrodDeptStore1F.asm
+++ b/maps/GoldenrodDeptStore1F.asm
@@ -80,10 +80,10 @@ GoldenrodDeptStore1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 7, 7, 9, GOLDENROD_CITY
-	warp_event 8, 7, 9, GOLDENROD_CITY
-	warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_2F
-	warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
+	warp_event 7, 7, GOLDENROD_CITY, 9
+	warp_event 8, 7, GOLDENROD_CITY, 9
+	warp_event 15, 0, GOLDENROD_DEPT_STORE_2F, 2
+	warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm
index 6c6f99124..a759e6559 100644
--- a/maps/GoldenrodDeptStore2F.asm
+++ b/maps/GoldenrodDeptStore2F.asm
@@ -102,9 +102,9 @@ GoldenrodDeptStore2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_3F
-	warp_event 15, 0, 3, GOLDENROD_DEPT_STORE_1F
-	warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
+	warp_event 12, 0, GOLDENROD_DEPT_STORE_3F, 1
+	warp_event 15, 0, GOLDENROD_DEPT_STORE_1F, 3
+	warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm
index 1bd2fecf8..ddd5dcacf 100644
--- a/maps/GoldenrodDeptStore3F.asm
+++ b/maps/GoldenrodDeptStore3F.asm
@@ -58,9 +58,9 @@ GoldenrodDeptStore3F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_2F
-	warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_4F
-	warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
+	warp_event 12, 0, GOLDENROD_DEPT_STORE_2F, 1
+	warp_event 15, 0, GOLDENROD_DEPT_STORE_4F, 2
+	warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm
index 4263957f8..c408120ed 100644
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -79,9 +79,9 @@ GoldenrodDeptStore4F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_5F
-	warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_3F
-	warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
+	warp_event 12, 0, GOLDENROD_DEPT_STORE_5F, 1
+	warp_event 15, 0, GOLDENROD_DEPT_STORE_3F, 2
+	warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm
index 4572e53a6..3d69348f0 100644
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -219,9 +219,9 @@ GoldenrodDeptStore5F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_4F
-	warp_event 15, 0, 1, GOLDENROD_DEPT_STORE_6F
-	warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
+	warp_event 12, 0, GOLDENROD_DEPT_STORE_4F, 1
+	warp_event 15, 0, GOLDENROD_DEPT_STORE_6F, 1
+	warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index 4fb4b9ff9..2703f0405 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -149,9 +149,9 @@ GoldenrodDeptStore6F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_5F
-	warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
-	warp_event 13, 0, 1, GOLDENROD_DEPT_STORE_ROOF
+	warp_event 15, 0, GOLDENROD_DEPT_STORE_5F, 2
+	warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
+	warp_event 13, 0, GOLDENROD_DEPT_STORE_ROOF, 1
 
 	db 0 ; coord events
 
diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm
index d18a191da..1b887fbef 100644
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -111,9 +111,9 @@ GoldenrodDeptStoreB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 17, 2, 3, GOLDENROD_UNDERGROUND_WAREHOUSE
-	warp_event 9, 4, 1, GOLDENROD_DEPT_STORE_ELEVATOR
-	warp_event 10, 4, 2, GOLDENROD_DEPT_STORE_ELEVATOR
+	warp_event 17, 2, GOLDENROD_UNDERGROUND_WAREHOUSE, 3
+	warp_event 9, 4, GOLDENROD_DEPT_STORE_ELEVATOR, 1
+	warp_event 10, 4, GOLDENROD_DEPT_STORE_ELEVATOR, 2
 
 	db 0 ; coord events
 
diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm
index f76c43b62..e7a48865c 100644
--- a/maps/GoldenrodDeptStoreElevator.asm
+++ b/maps/GoldenrodDeptStoreElevator.asm
@@ -56,8 +56,8 @@ GoldenrodDeptStoreElevator_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 1, 3, -1, GOLDENROD_DEPT_STORE_1F
-	warp_event 2, 3, -1, GOLDENROD_DEPT_STORE_1F
+	warp_event 1, 3, GOLDENROD_DEPT_STORE_1F, -1
+	warp_event 2, 3, GOLDENROD_DEPT_STORE_1F, -1
 
 	db 0 ; coord events
 
diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm
index f991bfe9d..30812c3fb 100644
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -213,7 +213,7 @@ GoldenrodDeptStoreRoof_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 13, 1, 3, GOLDENROD_DEPT_STORE_6F
+	warp_event 13, 1, GOLDENROD_DEPT_STORE_6F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm
index 9e182f8d8..05968d8b0 100644
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -161,8 +161,8 @@ GoldenrodFlowerShop_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 6, GOLDENROD_CITY
-	warp_event 3, 7, 6, GOLDENROD_CITY
+	warp_event 2, 7, GOLDENROD_CITY, 6
+	warp_event 3, 7, GOLDENROD_CITY, 6
 
 	db 0 ; coord events
 
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index d435b7e5e..b0bb5549c 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -438,8 +438,8 @@ GoldenrodGameCorner_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 13, 10, GOLDENROD_CITY
-	warp_event 3, 13, 10, GOLDENROD_CITY
+	warp_event 2, 13, GOLDENROD_CITY, 10
+	warp_event 3, 13, GOLDENROD_CITY, 10
 
 	db 0 ; coord events
 
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
index d02f2a4af..31f042f33 100644
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -381,8 +381,8 @@ GoldenrodGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 17, 1, GOLDENROD_CITY
-	warp_event 3, 17, 1, GOLDENROD_CITY
+	warp_event 2, 17, GOLDENROD_CITY, 1
+	warp_event 3, 17, GOLDENROD_CITY, 1
 
 	db 1 ; coord events
 	coord_event 8, 5, SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING, WhitneyCriesScript
diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm
index 2b582347b..d68090ad8 100644
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -138,8 +138,8 @@ GoldenrodHappinessRater_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 3, GOLDENROD_CITY
-	warp_event 3, 7, 3, GOLDENROD_CITY
+	warp_event 2, 7, GOLDENROD_CITY, 3
+	warp_event 3, 7, GOLDENROD_CITY, 3
 
 	db 0 ; coord events
 
diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm
index 003925cb2..4817554a2 100644
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -166,10 +166,10 @@ GoldenrodMagnetTrainStation_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 8, 17, 5, GOLDENROD_CITY
-	warp_event 9, 17, 5, GOLDENROD_CITY
-	warp_event 6, 5, 4, SAFFRON_MAGNET_TRAIN_STATION
-	warp_event 11, 5, 3, SAFFRON_MAGNET_TRAIN_STATION
+	warp_event 8, 17, GOLDENROD_CITY, 5
+	warp_event 9, 17, GOLDENROD_CITY, 5
+	warp_event 6, 5, SAFFRON_MAGNET_TRAIN_STATION, 4
+	warp_event 11, 5, SAFFRON_MAGNET_TRAIN_STATION, 3
 
 	db 1 ; coord events
 	coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromSaffron
diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm
index 40a5d4719..63fbad27b 100644
--- a/maps/GoldenrodNameRater.asm
+++ b/maps/GoldenrodNameRater.asm
@@ -26,8 +26,8 @@ GoldenrodNameRater_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 8, GOLDENROD_CITY
-	warp_event 3, 7, 8, GOLDENROD_CITY
+	warp_event 2, 7, GOLDENROD_CITY, 8
+	warp_event 3, 7, GOLDENROD_CITY, 8
 
 	db 0 ; coord events
 
diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm
index 82d0fc72e..b2d0f77ac 100644
--- a/maps/GoldenrodPPSpeechHouse.asm
+++ b/maps/GoldenrodPPSpeechHouse.asm
@@ -53,8 +53,8 @@ GoldenrodPPSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 7, GOLDENROD_CITY
-	warp_event 3, 7, 7, GOLDENROD_CITY
+	warp_event 2, 7, GOLDENROD_CITY, 7
+	warp_event 3, 7, GOLDENROD_CITY, 7
 
 	db 0 ; coord events
 
diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm
index 2d8b8b484..a8d57f136 100644
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -806,10 +806,10 @@ GoldenrodPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 3, 7, 15, GOLDENROD_CITY
-	warp_event 4, 7, 15, GOLDENROD_CITY
-	warp_event 0, 6, 1, POKECOM_CENTER_ADMIN_ROOM_MOBILE
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, GOLDENROD_CITY, 15
+	warp_event 4, 7, GOLDENROD_CITY, 15
+	warp_event 0, 6, POKECOM_CENTER_ADMIN_ROOM_MOBILE, 1
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 2 ; coord events
 	coord_event 3, 7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneLeft
diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm
index daa35641f..8aae5d872 100644
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -648,12 +648,12 @@ GoldenrodUnderground_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 3, 2, 7, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_event 3, 34, 4, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_event 18, 6, 4, GOLDENROD_UNDERGROUND
-	warp_event 21, 31, 3, GOLDENROD_UNDERGROUND
-	warp_event 22, 31, 3, GOLDENROD_UNDERGROUND
-	warp_event 22, 27, 1, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
+	warp_event 3, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 7
+	warp_event 3, 34, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 4
+	warp_event 18, 6, GOLDENROD_UNDERGROUND, 4
+	warp_event 21, 31, GOLDENROD_UNDERGROUND, 3
+	warp_event 22, 31, GOLDENROD_UNDERGROUND, 3
+	warp_event 22, 27, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 1
 
 	db 0 ; coord events
 
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index 1c4afb979..106413e52 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -932,15 +932,15 @@ GoldenrodUndergroundSwitchRoomEntrances_MapEvents:
 	db 0, 0 ; filler
 
 	db 9 ; warp events
-	warp_event 23, 3, 6, GOLDENROD_UNDERGROUND
-	warp_event 22, 10, 1, GOLDENROD_UNDERGROUND_WAREHOUSE
-	warp_event 23, 10, 2, GOLDENROD_UNDERGROUND_WAREHOUSE
-	warp_event 5, 25, 2, GOLDENROD_UNDERGROUND
-	warp_event 4, 29, 14, GOLDENROD_CITY
-	warp_event 5, 29, 14, GOLDENROD_CITY
-	warp_event 21, 25, 1, GOLDENROD_UNDERGROUND
-	warp_event 20, 29, 13, GOLDENROD_CITY
-	warp_event 21, 29, 13, GOLDENROD_CITY
+	warp_event 23, 3, GOLDENROD_UNDERGROUND, 6
+	warp_event 22, 10, GOLDENROD_UNDERGROUND_WAREHOUSE, 1
+	warp_event 23, 10, GOLDENROD_UNDERGROUND_WAREHOUSE, 2
+	warp_event 5, 25, GOLDENROD_UNDERGROUND, 2
+	warp_event 4, 29, GOLDENROD_CITY, 14
+	warp_event 5, 29, GOLDENROD_CITY, 14
+	warp_event 21, 25, GOLDENROD_UNDERGROUND, 1
+	warp_event 20, 29, GOLDENROD_CITY, 13
+	warp_event 21, 29, GOLDENROD_CITY, 13
 
 	db 2 ; coord events
 	coord_event 19, 4, SCENE_DEFAULT, UndergroundSilverScene1
diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm
index 4227dc7cc..4484d874b 100644
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -212,9 +212,9 @@ GoldenrodUndergroundWarehouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 2, 12, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_event 3, 12, 3, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_event 17, 2, 1, GOLDENROD_DEPT_STORE_B1F
+	warp_event 2, 12, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 2
+	warp_event 3, 12, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 3
+	warp_event 17, 2, GOLDENROD_DEPT_STORE_B1F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm
index 98ac32ada..bd4556397 100644
--- a/maps/GuideGentsHouse.asm
+++ b/maps/GuideGentsHouse.asm
@@ -29,8 +29,8 @@ GuideGentsHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 4, CHERRYGROVE_CITY
-	warp_event 3, 7, 4, CHERRYGROVE_CITY
+	warp_event 2, 7, CHERRYGROVE_CITY, 4
+	warp_event 3, 7, CHERRYGROVE_CITY, 4
 
 	db 0 ; coord events
 
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index 539ff039e..dca5f7625 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -112,8 +112,8 @@ HallOfFame_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 13, 3, LANCES_ROOM
-	warp_event 5, 13, 4, LANCES_ROOM
+	warp_event 4, 13, LANCES_ROOM, 3
+	warp_event 5, 13, LANCES_ROOM, 4
 
 	db 0 ; coord events
 
diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm
index 58edccf9b..aa8529901 100644
--- a/maps/IcePath1F.asm
+++ b/maps/IcePath1F.asm
@@ -21,10 +21,10 @@ IcePath1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 19, 1, ROUTE_44
-	warp_event 36, 27, 7, BLACKTHORN_CITY
-	warp_event 37, 5, 1, ICE_PATH_B1F
-	warp_event 37, 13, 7, ICE_PATH_B1F
+	warp_event 4, 19, ROUTE_44, 1
+	warp_event 36, 27, BLACKTHORN_CITY, 7
+	warp_event 37, 5, ICE_PATH_B1F, 1
+	warp_event 37, 13, ICE_PATH_B1F, 7
 
 	db 0 ; coord events
 
diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm
index 0fa627255..0b3919419 100644
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -77,14 +77,14 @@ IcePathB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 8 ; warp events
-	warp_event 3, 15, 3, ICE_PATH_1F
-	warp_event 17, 3, 1, ICE_PATH_B2F_MAHOGANY_SIDE
-	warp_event 11, 2, 3, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
-	warp_event 4, 7, 4, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
-	warp_event 5, 12, 5, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
-	warp_event 12, 13, 6, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
-	warp_event 5, 25, 4, ICE_PATH_1F
-	warp_event 11, 27, 1, ICE_PATH_B2F_BLACKTHORN_SIDE
+	warp_event 3, 15, ICE_PATH_1F, 3
+	warp_event 17, 3, ICE_PATH_B2F_MAHOGANY_SIDE, 1
+	warp_event 11, 2, ICE_PATH_B2F_MAHOGANY_SIDE, 3 ; hole
+	warp_event 4, 7, ICE_PATH_B2F_MAHOGANY_SIDE, 4 ; hole
+	warp_event 5, 12, ICE_PATH_B2F_MAHOGANY_SIDE, 5 ; hole
+	warp_event 12, 13, ICE_PATH_B2F_MAHOGANY_SIDE, 6 ; hole
+	warp_event 5, 25, ICE_PATH_1F, 4
+	warp_event 11, 27, ICE_PATH_B2F_BLACKTHORN_SIDE, 1
 
 	db 0 ; coord events
 
diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm
index 85d35d7b7..42585eeac 100644
--- a/maps/IcePathB2FBlackthornSide.asm
+++ b/maps/IcePathB2FBlackthornSide.asm
@@ -16,8 +16,8 @@ IcePathB2FBlackthornSide_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 15, 8, ICE_PATH_B1F
-	warp_event 3, 3, 2, ICE_PATH_B3F
+	warp_event 3, 15, ICE_PATH_B1F, 8
+	warp_event 3, 3, ICE_PATH_B3F, 2
 
 	db 0 ; coord events
 
diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm
index cecdd5452..9d4a53fab 100644
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -32,12 +32,12 @@ IcePathB2FMahoganySide_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 17, 1, 2, ICE_PATH_B1F
-	warp_event 9, 11, 1, ICE_PATH_B3F
-	warp_event 11, 4, 3, ICE_PATH_B1F
-	warp_event 4, 6, 4, ICE_PATH_B1F
-	warp_event 4, 12, 5, ICE_PATH_B1F
-	warp_event 12, 12, 6, ICE_PATH_B1F
+	warp_event 17, 1, ICE_PATH_B1F, 2
+	warp_event 9, 11, ICE_PATH_B3F, 1
+	warp_event 11, 4, ICE_PATH_B1F, 3
+	warp_event 4, 6, ICE_PATH_B1F, 4
+	warp_event 4, 12, ICE_PATH_B1F, 5
+	warp_event 12, 12, ICE_PATH_B1F, 6
 
 	db 0 ; coord events
 
diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm
index dbe60aea7..65b22c670 100644
--- a/maps/IcePathB3F.asm
+++ b/maps/IcePathB3F.asm
@@ -17,8 +17,8 @@ IcePathB3F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 5, 2, ICE_PATH_B2F_MAHOGANY_SIDE
-	warp_event 15, 5, 2, ICE_PATH_B2F_BLACKTHORN_SIDE
+	warp_event 3, 5, ICE_PATH_B2F_MAHOGANY_SIDE, 2
+	warp_event 15, 5, ICE_PATH_B2F_BLACKTHORN_SIDE, 2
 
 	db 0 ; coord events
 
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index 0407c97f4..c78d8ef48 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -939,9 +939,9 @@ IlexForest_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 1, 5, 3, ROUTE_34_ILEX_FOREST_GATE
-	warp_event 3, 42, 1, ILEX_FOREST_AZALEA_GATE
-	warp_event 3, 43, 2, ILEX_FOREST_AZALEA_GATE
+	warp_event 1, 5, ROUTE_34_ILEX_FOREST_GATE, 3
+	warp_event 3, 42, ILEX_FOREST_AZALEA_GATE, 1
+	warp_event 3, 43, ILEX_FOREST_AZALEA_GATE, 2
 
 	db 0 ; coord events
 
diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm
index c0dc50d9b..a2193fb8c 100644
--- a/maps/IlexForestAzaleaGate.asm
+++ b/maps/IlexForestAzaleaGate.asm
@@ -32,10 +32,10 @@ IlexForestAzaleaGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, 2, ILEX_FOREST
-	warp_event 0, 5, 3, ILEX_FOREST
-	warp_event 9, 4, 7, AZALEA_TOWN
-	warp_event 9, 5, 8, AZALEA_TOWN
+	warp_event 0, 4, ILEX_FOREST, 2
+	warp_event 0, 5, ILEX_FOREST, 3
+	warp_event 9, 4, AZALEA_TOWN, 7
+	warp_event 9, 5, AZALEA_TOWN, 8
 
 	db 0 ; coord events
 
diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm
index 7e59b632a..4351d1769 100644
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -304,10 +304,10 @@ IndigoPlateauPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 5, 13, 1, ROUTE_23
-	warp_event 6, 13, 2, ROUTE_23
-	warp_event 0, 13, 1, POKECENTER_2F
-	warp_event 14, 3, 1, WILLS_ROOM
+	warp_event 5, 13, ROUTE_23, 1
+	warp_event 6, 13, ROUTE_23, 2
+	warp_event 0, 13, POKECENTER_2F, 1
+	warp_event 14, 3, WILLS_ROOM, 1
 
 	db 2 ; coord events
 	coord_event 16, 4, SCENE_DEFAULT, PlateauRivalBattle1
diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
index 7159965bf..cfc8eeeaa 100644
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -134,10 +134,10 @@ KarensRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 17, 3, BRUNOS_ROOM
-	warp_event 5, 17, 4, BRUNOS_ROOM
-	warp_event 4, 2, 1, LANCES_ROOM
-	warp_event 5, 2, 2, LANCES_ROOM
+	warp_event 4, 17, BRUNOS_ROOM, 3
+	warp_event 5, 17, BRUNOS_ROOM, 4
+	warp_event 4, 2, LANCES_ROOM, 1
+	warp_event 5, 2, LANCES_ROOM, 2
 
 	db 0 ; coord events
 
diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
index 089c832f1..8067776cd 100644
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -131,10 +131,10 @@ KogasRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 17, 2, WILLS_ROOM
-	warp_event 5, 17, 3, WILLS_ROOM
-	warp_event 4, 2, 1, BRUNOS_ROOM
-	warp_event 5, 2, 2, BRUNOS_ROOM
+	warp_event 4, 17, WILLS_ROOM, 2
+	warp_event 5, 17, WILLS_ROOM, 3
+	warp_event 4, 2, BRUNOS_ROOM, 1
+	warp_event 5, 2, BRUNOS_ROOM, 2
 
 	db 0 ; coord events
 
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index 8a11474a8..a28ac52b5 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -678,8 +678,8 @@ KurtsHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 7, 4, AZALEA_TOWN
-	warp_event 4, 7, 4, AZALEA_TOWN
+	warp_event 3, 7, AZALEA_TOWN, 4
+	warp_event 4, 7, AZALEA_TOWN, 4
 
 	db 0 ; coord events
 
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm
index 2ba2691c8..efa8bc4ff 100644
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -495,8 +495,8 @@ LakeOfRage_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 7, 3, 1, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE
-	warp_event 27, 31, 1, LAKE_OF_RAGE_MAGIKARP_HOUSE
+	warp_event 7, 3, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 1
+	warp_event 27, 31, LAKE_OF_RAGE_MAGIKARP_HOUSE, 1
 
 	db 0 ; coord events
 
diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm
index 2c9b3e645..68b299f7c 100644
--- a/maps/LakeOfRageHiddenPowerHouse.asm
+++ b/maps/LakeOfRageHiddenPowerHouse.asm
@@ -69,8 +69,8 @@ LakeOfRageHiddenPowerHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 1, LAKE_OF_RAGE
-	warp_event 3, 7, 1, LAKE_OF_RAGE
+	warp_event 2, 7, LAKE_OF_RAGE, 1
+	warp_event 3, 7, LAKE_OF_RAGE, 1
 
 	db 0 ; coord events
 
diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm
index 4f41b1a4c..a64b87e2a 100644
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -208,8 +208,8 @@ LakeOfRageMagikarpHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 2, LAKE_OF_RAGE
-	warp_event 3, 7, 2, LAKE_OF_RAGE
+	warp_event 2, 7, LAKE_OF_RAGE, 2
+	warp_event 3, 7, LAKE_OF_RAGE, 2
 
 	db 0 ; coord events
 
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index 294321ac8..7cae63c73 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -339,10 +339,10 @@ LancesRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 23, 3, KARENS_ROOM
-	warp_event 5, 23, 4, KARENS_ROOM
-	warp_event 4, 1, 1, HALL_OF_FAME
-	warp_event 5, 1, 2, HALL_OF_FAME
+	warp_event 4, 23, KARENS_ROOM, 3
+	warp_event 5, 23, KARENS_ROOM, 4
+	warp_event 4, 1, HALL_OF_FAME, 1
+	warp_event 5, 1, HALL_OF_FAME, 2
 
 	db 2 ; coord events
 	coord_event 4, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromLeft
diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm
index 30e7871fd..ef84ad348 100644
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -223,8 +223,8 @@ LavRadioTower1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 7, LAVENDER_TOWN
-	warp_event 3, 7, 7, LAVENDER_TOWN
+	warp_event 2, 7, LAVENDER_TOWN, 7
+	warp_event 3, 7, LAVENDER_TOWN, 7
 
 	db 0 ; coord events
 
diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm
index 2f313d3a3..004e22276 100644
--- a/maps/LavenderMart.asm
+++ b/maps/LavenderMart.asm
@@ -49,8 +49,8 @@ LavenderMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 5, LAVENDER_TOWN
-	warp_event 3, 7, 5, LAVENDER_TOWN
+	warp_event 2, 7, LAVENDER_TOWN, 5
+	warp_event 3, 7, LAVENDER_TOWN, 5
 
 	db 0 ; coord events
 
diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm
index 93ab36b9a..c2f102584 100644
--- a/maps/LavenderNameRater.asm
+++ b/maps/LavenderNameRater.asm
@@ -25,8 +25,8 @@ LavenderNameRater_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 4, LAVENDER_TOWN
-	warp_event 3, 7, 4, LAVENDER_TOWN
+	warp_event 2, 7, LAVENDER_TOWN, 4
+	warp_event 3, 7, LAVENDER_TOWN, 4
 
 	db 0 ; coord events
 
diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm
index ec9d41ab4..7305a95fe 100644
--- a/maps/LavenderPokecenter1F.asm
+++ b/maps/LavenderPokecenter1F.asm
@@ -82,9 +82,9 @@ LavenderPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 1, LAVENDER_TOWN
-	warp_event 4, 7, 1, LAVENDER_TOWN
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, LAVENDER_TOWN, 1
+	warp_event 4, 7, LAVENDER_TOWN, 1
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/LavenderPokecenter2FBeta.asm b/maps/LavenderPokecenter2FBeta.asm
index 7f822b3f8..7523c528c 100644
--- a/maps/LavenderPokecenter2FBeta.asm
+++ b/maps/LavenderPokecenter2FBeta.asm
@@ -7,7 +7,7 @@ LavenderPokecenter2FBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 0, 7, 3, LAVENDER_POKECENTER_1F
+	warp_event 0, 7, LAVENDER_POKECENTER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm
index 7891ce23d..c9a265aad 100644
--- a/maps/LavenderSpeechHouse.asm
+++ b/maps/LavenderSpeechHouse.asm
@@ -30,8 +30,8 @@ LavenderSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 3, LAVENDER_TOWN
-	warp_event 3, 7, 3, LAVENDER_TOWN
+	warp_event 2, 7, LAVENDER_TOWN, 3
+	warp_event 3, 7, LAVENDER_TOWN, 3
 
 	db 0 ; coord events
 
diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm
index 8e16f47c7..973271b24 100644
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -107,13 +107,13 @@ LavenderTown_MapEvents:
 	db 0, 0 ; filler
 
 	db 7 ; warp events
-	warp_event 5, 5, 1, LAVENDER_POKECENTER_1F
-	warp_event 5, 9, 1, MR_FUJIS_HOUSE
-	warp_event 3, 13, 1, LAVENDER_SPEECH_HOUSE
-	warp_event 7, 13, 1, LAVENDER_NAME_RATER
-	warp_event 1, 5, 2, LAVENDER_MART
-	warp_event 13, 11, 1, SOUL_HOUSE
-	warp_event 14, 5, 1, LAV_RADIO_TOWER_1F
+	warp_event 5, 5, LAVENDER_POKECENTER_1F, 1
+	warp_event 5, 9, MR_FUJIS_HOUSE, 1
+	warp_event 3, 13, LAVENDER_SPEECH_HOUSE, 1
+	warp_event 7, 13, LAVENDER_NAME_RATER, 1
+	warp_event 1, 5, LAVENDER_MART, 2
+	warp_event 13, 11, SOUL_HOUSE, 1
+	warp_event 14, 5, LAV_RADIO_TOWER_1F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm
index 0828bdf7a..777053a41 100644
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -374,8 +374,8 @@ MahoganyGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 17, 3, MAHOGANY_TOWN
-	warp_event 5, 17, 3, MAHOGANY_TOWN
+	warp_event 4, 17, MAHOGANY_TOWN, 3
+	warp_event 5, 17, MAHOGANY_TOWN, 3
 
 	db 0 ; coord events
 
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index cbc4b05e1..822240911 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -222,9 +222,9 @@ MahoganyMart1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 1, MAHOGANY_TOWN
-	warp_event 4, 7, 1, MAHOGANY_TOWN
-	warp_event 7, 3, 1, TEAM_ROCKET_BASE_B1F
+	warp_event 3, 7, MAHOGANY_TOWN, 1
+	warp_event 4, 7, MAHOGANY_TOWN, 1
+	warp_event 7, 3, TEAM_ROCKET_BASE_B1F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm
index c28a62c67..de968338a 100644
--- a/maps/MahoganyPokecenter1F.asm
+++ b/maps/MahoganyPokecenter1F.asm
@@ -55,9 +55,9 @@ MahoganyPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 4, MAHOGANY_TOWN
-	warp_event 4, 7, 4, MAHOGANY_TOWN
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, MAHOGANY_TOWN, 4
+	warp_event 4, 7, MAHOGANY_TOWN, 4
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm
index 2a657d60f..f0f91a2b2 100644
--- a/maps/MahoganyRedGyaradosSpeechHouse.asm
+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
@@ -62,8 +62,8 @@ MahoganyRedGyaradosSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 2, MAHOGANY_TOWN
-	warp_event 3, 7, 2, MAHOGANY_TOWN
+	warp_event 2, 7, MAHOGANY_TOWN, 2
+	warp_event 3, 7, MAHOGANY_TOWN, 2
 
 	db 0 ; coord events
 
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index c91d9cd2b..1a4ce8f44 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -246,11 +246,11 @@ MahoganyTown_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 11, 7, 1, MAHOGANY_MART_1F
-	warp_event 17, 7, 1, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE
-	warp_event 6, 13, 1, MAHOGANY_GYM
-	warp_event 15, 13, 1, MAHOGANY_POKECENTER_1F
-	warp_event 9, 1, 3, ROUTE_43_MAHOGANY_GATE
+	warp_event 11, 7, MAHOGANY_MART_1F, 1
+	warp_event 17, 7, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, 1
+	warp_event 6, 13, MAHOGANY_GYM, 1
+	warp_event 15, 13, MAHOGANY_POKECENTER_1F, 1
+	warp_event 9, 1, ROUTE_43_MAHOGANY_GATE, 3
 
 	db 2 ; coord events
 	coord_event 19, 8, SCENE_DEFAULT, UnknownScript_0x190013
diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm
index 0bf8a2c20..c69079aba 100644
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -201,8 +201,8 @@ ManiasHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 1, CIANWOOD_CITY
-	warp_event 3, 7, 1, CIANWOOD_CITY
+	warp_event 2, 7, CIANWOOD_CITY, 1
+	warp_event 3, 7, CIANWOOD_CITY, 1
 
 	db 0 ; coord events
 
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index 15007ae4a..ad832b1fb 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -68,8 +68,8 @@ MobileBattleRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 7, 6, POKECENTER_2F
-	warp_event 5, 7, 6, POKECENTER_2F
+	warp_event 4, 7, POKECENTER_2F, 6
+	warp_event 5, 7, POKECENTER_2F, 6
 
 	db 0 ; coord events
 
diff --git a/maps/MobileTradeRoom.asm b/maps/MobileTradeRoom.asm
index 31ddcbf8a..469822afc 100644
--- a/maps/MobileTradeRoom.asm
+++ b/maps/MobileTradeRoom.asm
@@ -36,8 +36,8 @@ MobileTradeRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 7, 5, POKECENTER_2F
-	warp_event 5, 7, 5, POKECENTER_2F
+	warp_event 4, 7, POKECENTER_2F, 5
+	warp_event 5, 7, POKECENTER_2F, 5
 
 	db 0 ; coord events
 
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index ebe1286bc..deffa830d 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -162,14 +162,14 @@ MountMoon_MapEvents:
 	db 0, 0 ; filler
 
 	db 8 ; warp events
-	warp_event 3, 3, 1, ROUTE_3
-	warp_event 15, 15, 1, ROUTE_4
-	warp_event 13, 3, 7, MOUNT_MOON
-	warp_event 15, 11, 8, MOUNT_MOON
-	warp_event 25, 5, 1, MOUNT_MOON_SQUARE
-	warp_event 25, 15, 2, MOUNT_MOON_SQUARE
-	warp_event 25, 3, 3, MOUNT_MOON
-	warp_event 25, 13, 4, MOUNT_MOON
+	warp_event 3, 3, ROUTE_3, 1
+	warp_event 15, 15, ROUTE_4, 1
+	warp_event 13, 3, MOUNT_MOON, 7
+	warp_event 15, 11, MOUNT_MOON, 8
+	warp_event 25, 5, MOUNT_MOON_SQUARE, 1
+	warp_event 25, 15, MOUNT_MOON_SQUARE, 2
+	warp_event 25, 3, MOUNT_MOON, 3
+	warp_event 25, 13, MOUNT_MOON, 4
 
 	db 0 ; coord events
 
diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm
index df3a7aca6..5f260cd5c 100644
--- a/maps/MountMoonGiftShop.asm
+++ b/maps/MountMoonGiftShop.asm
@@ -29,8 +29,8 @@ MountMoonGiftShop_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 7, 3, MOUNT_MOON_SQUARE
-	warp_event 4, 7, 3, MOUNT_MOON_SQUARE
+	warp_event 3, 7, MOUNT_MOON_SQUARE, 3
+	warp_event 4, 7, MOUNT_MOON_SQUARE, 3
 
 	db 0 ; coord events
 
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index 22865f3e5..87139c286 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -134,9 +134,9 @@ MountMoonSquare_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 20, 5, 5, MOUNT_MOON
-	warp_event 22, 11, 6, MOUNT_MOON
-	warp_event 13, 7, 1, MOUNT_MOON_GIFT_SHOP
+	warp_event 20, 5, MOUNT_MOON, 5
+	warp_event 22, 11, MOUNT_MOON, 6
+	warp_event 13, 7, MOUNT_MOON_GIFT_SHOP, 1
 
 	db 1 ; coord events
 	coord_event 7, 11, SCENE_DEFAULT, ClefairyDance
diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm
index 5f9056e29..b8301b907 100644
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -118,12 +118,12 @@ MountMortar1FInside_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 11, 47, 5, MOUNT_MORTAR_1F_OUTSIDE
-	warp_event 29, 47, 6, MOUNT_MORTAR_1F_OUTSIDE
-	warp_event 5, 39, 8, MOUNT_MORTAR_1F_OUTSIDE
-	warp_event 33, 41, 9, MOUNT_MORTAR_1F_OUTSIDE
-	warp_event 3, 19, 1, MOUNT_MORTAR_B1F
-	warp_event 9, 9, 2, MOUNT_MORTAR_2F_INSIDE
+	warp_event 11, 47, MOUNT_MORTAR_1F_OUTSIDE, 5
+	warp_event 29, 47, MOUNT_MORTAR_1F_OUTSIDE, 6
+	warp_event 5, 39, MOUNT_MORTAR_1F_OUTSIDE, 8
+	warp_event 33, 41, MOUNT_MORTAR_1F_OUTSIDE, 9
+	warp_event 3, 19, MOUNT_MORTAR_B1F, 1
+	warp_event 9, 9, MOUNT_MORTAR_2F_INSIDE, 2
 
 	db 0 ; coord events
 
diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm
index c261d1a3b..9bc92ccdf 100644
--- a/maps/MountMortar1FOutside.asm
+++ b/maps/MountMortar1FOutside.asm
@@ -20,15 +20,15 @@ MountMortar1FOutside_MapEvents:
 	db 0, 0 ; filler
 
 	db 9 ; warp events
-	warp_event 3, 33, 3, ROUTE_42
-	warp_event 17, 33, 4, ROUTE_42
-	warp_event 37, 33, 5, ROUTE_42
-	warp_event 17, 5, 1, MOUNT_MORTAR_2F_INSIDE
-	warp_event 11, 21, 1, MOUNT_MORTAR_1F_INSIDE
-	warp_event 29, 21, 2, MOUNT_MORTAR_1F_INSIDE
-	warp_event 17, 29, 2, MOUNT_MORTAR_B1F
-	warp_event 7, 13, 3, MOUNT_MORTAR_1F_INSIDE
-	warp_event 33, 13, 4, MOUNT_MORTAR_1F_INSIDE
+	warp_event 3, 33, ROUTE_42, 3
+	warp_event 17, 33, ROUTE_42, 4
+	warp_event 37, 33, ROUTE_42, 5
+	warp_event 17, 5, MOUNT_MORTAR_2F_INSIDE, 1
+	warp_event 11, 21, MOUNT_MORTAR_1F_INSIDE, 1
+	warp_event 29, 21, MOUNT_MORTAR_1F_INSIDE, 2
+	warp_event 17, 29, MOUNT_MORTAR_B1F, 2
+	warp_event 7, 13, MOUNT_MORTAR_1F_INSIDE, 3
+	warp_event 33, 13, MOUNT_MORTAR_1F_INSIDE, 4
 
 	db 0 ; coord events
 
diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm
index ce6811bca..18d62603b 100644
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -68,8 +68,8 @@ MountMortar2FInside_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 17, 33, 4, MOUNT_MORTAR_1F_OUTSIDE
-	warp_event 3, 5, 6, MOUNT_MORTAR_1F_INSIDE
+	warp_event 17, 33, MOUNT_MORTAR_1F_OUTSIDE, 4
+	warp_event 3, 5, MOUNT_MORTAR_1F_INSIDE, 6
 
 	db 0 ; coord events
 
diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm
index 986e6e928..4eb2eb272 100644
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -136,8 +136,8 @@ MountMortarB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 3, 5, MOUNT_MORTAR_1F_INSIDE
-	warp_event 19, 29, 7, MOUNT_MORTAR_1F_OUTSIDE
+	warp_event 3, 3, MOUNT_MORTAR_1F_INSIDE, 5
+	warp_event 19, 29, MOUNT_MORTAR_1F_OUTSIDE, 7
 
 	db 0 ; coord events
 
diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm
index 0b42fe99e..82dfa9a9f 100644
--- a/maps/MoveDeletersHouse.asm
+++ b/maps/MoveDeletersHouse.asm
@@ -21,8 +21,8 @@ MoveDeletersHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 6, BLACKTHORN_CITY
-	warp_event 3, 7, 6, BLACKTHORN_CITY
+	warp_event 2, 7, BLACKTHORN_CITY, 6
+	warp_event 3, 7, BLACKTHORN_CITY, 6
 
 	db 0 ; coord events
 
diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm
index fc547e2d6..687657967 100644
--- a/maps/MrFujisHouse.asm
+++ b/maps/MrFujisHouse.asm
@@ -81,8 +81,8 @@ MrFujisHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 2, LAVENDER_TOWN
-	warp_event 3, 7, 2, LAVENDER_TOWN
+	warp_event 2, 7, LAVENDER_TOWN, 2
+	warp_event 3, 7, LAVENDER_TOWN, 2
 
 	db 0 ; coord events
 
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index 3a7a6b963..53332cd18 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -374,8 +374,8 @@ MrPokemonsHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 2, ROUTE_30
-	warp_event 3, 7, 2, ROUTE_30
+	warp_event 2, 7, ROUTE_30, 2
+	warp_event 3, 7, ROUTE_30, 2
 
 	db 0 ; coord events
 
diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm
index 610a5e846..67593de2b 100644
--- a/maps/MrPsychicsHouse.asm
+++ b/maps/MrPsychicsHouse.asm
@@ -49,8 +49,8 @@ MrPsychicsHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 5, SAFFRON_CITY
-	warp_event 3, 7, 5, SAFFRON_CITY
+	warp_event 2, 7, SAFFRON_CITY, 5
+	warp_event 3, 7, SAFFRON_CITY, 5
 
 	db 0 ; coord events
 
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index 850c2ab9d..ed6bf6b9a 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -515,10 +515,10 @@ NationalPark_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE
-	warp_event 33, 19, 2, ROUTE_36_NATIONAL_PARK_GATE
-	warp_event 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE
-	warp_event 11, 47, 2, ROUTE_35_NATIONAL_PARK_GATE
+	warp_event 33, 18, ROUTE_36_NATIONAL_PARK_GATE, 1
+	warp_event 33, 19, ROUTE_36_NATIONAL_PARK_GATE, 2
+	warp_event 10, 47, ROUTE_35_NATIONAL_PARK_GATE, 1
+	warp_event 11, 47, ROUTE_35_NATIONAL_PARK_GATE, 2
 
 	db 0 ; coord events
 
diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm
index dd969f477..d6cffadcb 100644
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -222,10 +222,10 @@ NationalParkBugContest_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE
-	warp_event 33, 19, 1, ROUTE_36_NATIONAL_PARK_GATE
-	warp_event 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE
-	warp_event 11, 47, 1, ROUTE_35_NATIONAL_PARK_GATE
+	warp_event 33, 18, ROUTE_36_NATIONAL_PARK_GATE, 1
+	warp_event 33, 19, ROUTE_36_NATIONAL_PARK_GATE, 1
+	warp_event 10, 47, ROUTE_35_NATIONAL_PARK_GATE, 1
+	warp_event 11, 47, ROUTE_35_NATIONAL_PARK_GATE, 1
 
 	db 0 ; coord events
 
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index 83de407d1..c961e1490 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -283,10 +283,10 @@ NewBarkTown_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 6, 3, 1, ELMS_LAB
-	warp_event 13, 5, 1, PLAYERS_HOUSE_1F
-	warp_event 3, 11, 1, PLAYERS_NEIGHBORS_HOUSE
-	warp_event 11, 13, 1, ELMS_HOUSE
+	warp_event 6, 3, ELMS_LAB, 1
+	warp_event 13, 5, PLAYERS_HOUSE_1F, 1
+	warp_event 3, 11, PLAYERS_NEIGHBORS_HOUSE, 1
+	warp_event 11, 13, ELMS_HOUSE, 1
 
 	db 2 ; coord events
 	coord_event 1, 8, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene1
diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm
index f6bae3fd2..370d0fdbd 100644
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -258,8 +258,8 @@ OaksLab_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 11, 3, PALLET_TOWN
-	warp_event 5, 11, 3, PALLET_TOWN
+	warp_event 4, 11, PALLET_TOWN, 3
+	warp_event 5, 11, PALLET_TOWN, 3
 
 	db 0 ; coord events
 
diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm
index 79a7f0540..d036233c1 100644
--- a/maps/OlivineCafe.asm
+++ b/maps/OlivineCafe.asm
@@ -80,8 +80,8 @@ OlivineCafe_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 7, OLIVINE_CITY
-	warp_event 3, 7, 7, OLIVINE_CITY
+	warp_event 2, 7, OLIVINE_CITY, 7
+	warp_event 3, 7, OLIVINE_CITY, 7
 
 	db 0 ; coord events
 
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index 7b575f423..53dbd674f 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -289,17 +289,17 @@ OlivineCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 11 ; warp events
-	warp_event 13, 21, 1, OLIVINE_POKECENTER_1F
-	warp_event 10, 11, 1, OLIVINE_GYM
-	warp_event 25, 11, 1, OLIVINE_TIMS_HOUSE
-	warp_event 0, 0, 1, OLIVINE_HOUSE_BETA
-	warp_event 29, 11, 1, OLIVINE_PUNISHMENT_SPEECH_HOUSE
-	warp_event 13, 15, 1, OLIVINE_GOOD_ROD_HOUSE
-	warp_event 7, 21, 1, OLIVINE_CAFE
-	warp_event 19, 17, 2, OLIVINE_MART
-	warp_event 29, 27, 1, OLIVINE_LIGHTHOUSE_1F
-	warp_event 19, 27, 1, OLIVINE_PORT_PASSAGE
-	warp_event 20, 27, 2, OLIVINE_PORT_PASSAGE
+	warp_event 13, 21, OLIVINE_POKECENTER_1F, 1
+	warp_event 10, 11, OLIVINE_GYM, 1
+	warp_event 25, 11, OLIVINE_TIMS_HOUSE, 1
+	warp_event 0, 0, OLIVINE_HOUSE_BETA, 1
+	warp_event 29, 11, OLIVINE_PUNISHMENT_SPEECH_HOUSE, 1
+	warp_event 13, 15, OLIVINE_GOOD_ROD_HOUSE, 1
+	warp_event 7, 21, OLIVINE_CAFE, 1
+	warp_event 19, 17, OLIVINE_MART, 2
+	warp_event 29, 27, OLIVINE_LIGHTHOUSE_1F, 1
+	warp_event 19, 27, OLIVINE_PORT_PASSAGE, 1
+	warp_event 20, 27, OLIVINE_PORT_PASSAGE, 2
 
 	db 2 ; coord events
 	coord_event 13, 12, SCENE_DEFAULT, UnknownScript_0x1a8833
diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm
index 65e8a773d..585aebd04 100644
--- a/maps/OlivineGoodRodHouse.asm
+++ b/maps/OlivineGoodRodHouse.asm
@@ -84,8 +84,8 @@ OlivineGoodRodHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 6, OLIVINE_CITY
-	warp_event 3, 7, 6, OLIVINE_CITY
+	warp_event 2, 7, OLIVINE_CITY, 6
+	warp_event 3, 7, OLIVINE_CITY, 6
 
 	db 0 ; coord events
 
diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm
index 5c024f015..f146985bd 100644
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -199,8 +199,8 @@ OlivineGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 15, 2, OLIVINE_CITY
-	warp_event 5, 15, 2, OLIVINE_CITY
+	warp_event 4, 15, OLIVINE_CITY, 2
+	warp_event 5, 15, OLIVINE_CITY, 2
 
 	db 0 ; coord events
 
diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm
index 085c67685..3e9065343 100644
--- a/maps/OlivineHouseBeta.asm
+++ b/maps/OlivineHouseBeta.asm
@@ -41,8 +41,8 @@ OlivineHouseBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 4, OLIVINE_CITY
-	warp_event 3, 7, 4, OLIVINE_CITY
+	warp_event 2, 7, OLIVINE_CITY, 4
+	warp_event 3, 7, OLIVINE_CITY, 4
 
 	db 0 ; coord events
 
diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm
index 66d8d89ac..d1300badf 100644
--- a/maps/OlivineLighthouse1F.asm
+++ b/maps/OlivineLighthouse1F.asm
@@ -38,11 +38,11 @@ OlivineLighthouse1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 10, 17, 9, OLIVINE_CITY
-	warp_event 11, 17, 9, OLIVINE_CITY
-	warp_event 3, 11, 1, OLIVINE_LIGHTHOUSE_2F
-	warp_event 16, 13, 3, OLIVINE_LIGHTHOUSE_2F
-	warp_event 17, 13, 4, OLIVINE_LIGHTHOUSE_2F
+	warp_event 10, 17, OLIVINE_CITY, 9
+	warp_event 11, 17, OLIVINE_CITY, 9
+	warp_event 3, 11, OLIVINE_LIGHTHOUSE_2F, 1
+	warp_event 16, 13, OLIVINE_LIGHTHOUSE_2F, 3
+	warp_event 17, 13, OLIVINE_LIGHTHOUSE_2F, 4
 
 	db 0 ; coord events
 
diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm
index bedd5d8c9..c132b9375 100644
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -206,12 +206,12 @@ OlivineLighthouse2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 3, 11, 3, OLIVINE_LIGHTHOUSE_1F
-	warp_event 5, 3, 2, OLIVINE_LIGHTHOUSE_3F
-	warp_event 16, 13, 4, OLIVINE_LIGHTHOUSE_1F
-	warp_event 17, 13, 5, OLIVINE_LIGHTHOUSE_1F
-	warp_event 16, 11, 4, OLIVINE_LIGHTHOUSE_3F
-	warp_event 17, 11, 5, OLIVINE_LIGHTHOUSE_3F
+	warp_event 3, 11, OLIVINE_LIGHTHOUSE_1F, 3
+	warp_event 5, 3, OLIVINE_LIGHTHOUSE_3F, 2
+	warp_event 16, 13, OLIVINE_LIGHTHOUSE_1F, 4
+	warp_event 17, 13, OLIVINE_LIGHTHOUSE_1F, 5
+	warp_event 16, 11, OLIVINE_LIGHTHOUSE_3F, 4
+	warp_event 17, 11, OLIVINE_LIGHTHOUSE_3F, 5
 
 	db 0 ; coord events
 
diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm
index 63f02d6e2..1d07ae2c8 100644
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -114,15 +114,15 @@ OlivineLighthouse3F_MapEvents:
 	db 0, 0 ; filler
 
 	db 9 ; warp events
-	warp_event 13, 3, 1, OLIVINE_LIGHTHOUSE_4F
-	warp_event 5, 3, 2, OLIVINE_LIGHTHOUSE_2F
-	warp_event 9, 5, 4, OLIVINE_LIGHTHOUSE_4F
-	warp_event 16, 11, 5, OLIVINE_LIGHTHOUSE_2F
-	warp_event 17, 11, 6, OLIVINE_LIGHTHOUSE_2F
-	warp_event 16, 9, 5, OLIVINE_LIGHTHOUSE_4F
-	warp_event 17, 9, 6, OLIVINE_LIGHTHOUSE_4F
-	warp_event 8, 3, 7, OLIVINE_LIGHTHOUSE_4F
-	warp_event 9, 3, 8, OLIVINE_LIGHTHOUSE_4F
+	warp_event 13, 3, OLIVINE_LIGHTHOUSE_4F, 1
+	warp_event 5, 3, OLIVINE_LIGHTHOUSE_2F, 2
+	warp_event 9, 5, OLIVINE_LIGHTHOUSE_4F, 4
+	warp_event 16, 11, OLIVINE_LIGHTHOUSE_2F, 5
+	warp_event 17, 11, OLIVINE_LIGHTHOUSE_2F, 6
+	warp_event 16, 9, OLIVINE_LIGHTHOUSE_4F, 5
+	warp_event 17, 9, OLIVINE_LIGHTHOUSE_4F, 6
+	warp_event 8, 3, OLIVINE_LIGHTHOUSE_4F, 7
+	warp_event 9, 3, OLIVINE_LIGHTHOUSE_4F, 8
 
 	db 0 ; coord events
 
diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm
index 51b764d35..cc00a643a 100644
--- a/maps/OlivineLighthouse4F.asm
+++ b/maps/OlivineLighthouse4F.asm
@@ -83,16 +83,16 @@ OlivineLighthouse4F_MapEvents:
 	db 0, 0 ; filler
 
 	db 10 ; warp events
-	warp_event 13, 3, 1, OLIVINE_LIGHTHOUSE_3F
-	warp_event 3, 5, 2, OLIVINE_LIGHTHOUSE_5F
-	warp_event 9, 7, 3, OLIVINE_LIGHTHOUSE_5F
-	warp_event 9, 5, 3, OLIVINE_LIGHTHOUSE_3F
-	warp_event 16, 9, 6, OLIVINE_LIGHTHOUSE_3F
-	warp_event 17, 9, 7, OLIVINE_LIGHTHOUSE_3F
-	warp_event 8, 3, 8, OLIVINE_LIGHTHOUSE_3F
-	warp_event 9, 3, 9, OLIVINE_LIGHTHOUSE_3F
-	warp_event 16, 7, 4, OLIVINE_LIGHTHOUSE_5F
-	warp_event 17, 7, 5, OLIVINE_LIGHTHOUSE_5F
+	warp_event 13, 3, OLIVINE_LIGHTHOUSE_3F, 1
+	warp_event 3, 5, OLIVINE_LIGHTHOUSE_5F, 2
+	warp_event 9, 7, OLIVINE_LIGHTHOUSE_5F, 3
+	warp_event 9, 5, OLIVINE_LIGHTHOUSE_3F, 3
+	warp_event 16, 9, OLIVINE_LIGHTHOUSE_3F, 6
+	warp_event 17, 9, OLIVINE_LIGHTHOUSE_3F, 7
+	warp_event 8, 3, OLIVINE_LIGHTHOUSE_3F, 8
+	warp_event 9, 3, OLIVINE_LIGHTHOUSE_3F, 9
+	warp_event 16, 7, OLIVINE_LIGHTHOUSE_5F, 4
+	warp_event 17, 7, OLIVINE_LIGHTHOUSE_5F, 5
 
 	db 0 ; coord events
 
diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm
index a5219ff17..c69b5e98c 100644
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -92,13 +92,13 @@ OlivineLighthouse5F_MapEvents:
 	db 0, 0 ; filler
 
 	db 7 ; warp events
-	warp_event 9, 15, 1, OLIVINE_LIGHTHOUSE_6F
-	warp_event 3, 5, 2, OLIVINE_LIGHTHOUSE_4F
-	warp_event 9, 7, 3, OLIVINE_LIGHTHOUSE_4F
-	warp_event 16, 7, 9, OLIVINE_LIGHTHOUSE_4F
-	warp_event 17, 7, 10, OLIVINE_LIGHTHOUSE_4F
-	warp_event 16, 5, 2, OLIVINE_LIGHTHOUSE_6F
-	warp_event 17, 5, 3, OLIVINE_LIGHTHOUSE_6F
+	warp_event 9, 15, OLIVINE_LIGHTHOUSE_6F, 1
+	warp_event 3, 5, OLIVINE_LIGHTHOUSE_4F, 2
+	warp_event 9, 7, OLIVINE_LIGHTHOUSE_4F, 3
+	warp_event 16, 7, OLIVINE_LIGHTHOUSE_4F, 9
+	warp_event 17, 7, OLIVINE_LIGHTHOUSE_4F, 10
+	warp_event 16, 5, OLIVINE_LIGHTHOUSE_6F, 2
+	warp_event 17, 5, OLIVINE_LIGHTHOUSE_6F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index 110b25353..381795a79 100644
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -259,9 +259,9 @@ OlivineLighthouse6F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 9, 15, 1, OLIVINE_LIGHTHOUSE_5F
-	warp_event 16, 5, 6, OLIVINE_LIGHTHOUSE_5F
-	warp_event 17, 5, 7, OLIVINE_LIGHTHOUSE_5F
+	warp_event 9, 15, OLIVINE_LIGHTHOUSE_5F, 1
+	warp_event 16, 5, OLIVINE_LIGHTHOUSE_5F, 6
+	warp_event 17, 5, OLIVINE_LIGHTHOUSE_5F, 7
 
 	db 0 ; coord events
 
diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm
index 1356455a1..048bb9785 100644
--- a/maps/OlivineMart.asm
+++ b/maps/OlivineMart.asm
@@ -47,8 +47,8 @@ OlivineMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 8, OLIVINE_CITY
-	warp_event 3, 7, 8, OLIVINE_CITY
+	warp_event 2, 7, OLIVINE_CITY, 8
+	warp_event 3, 7, OLIVINE_CITY, 8
 
 	db 0 ; coord events
 
diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm
index 4e970a2bf..2686f00f1 100644
--- a/maps/OlivinePokecenter1F.asm
+++ b/maps/OlivinePokecenter1F.asm
@@ -49,9 +49,9 @@ OlivinePokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 1, OLIVINE_CITY
-	warp_event 4, 7, 1, OLIVINE_CITY
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, OLIVINE_CITY, 1
+	warp_event 4, 7, OLIVINE_CITY, 1
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index 7c0f2dd71..78940406c 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -386,8 +386,8 @@ OlivinePort_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 11, 7, 5, OLIVINE_PORT_PASSAGE
-	warp_event 7, 23, 1, FAST_SHIP_1F
+	warp_event 11, 7, OLIVINE_PORT_PASSAGE, 5
+	warp_event 7, 23, FAST_SHIP_1F, 1
 
 	db 1 ; coord events
 	coord_event 7, 15, SCENE_DEFAULT, UnknownScript_0x7491f
diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm
index 4e68743a9..74feb52d5 100644
--- a/maps/OlivinePortPassage.asm
+++ b/maps/OlivinePortPassage.asm
@@ -21,11 +21,11 @@ OlivinePortPassage_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 15, 0, 10, OLIVINE_CITY
-	warp_event 16, 0, 11, OLIVINE_CITY
-	warp_event 15, 4, 4, OLIVINE_PORT_PASSAGE
-	warp_event 3, 2, 3, OLIVINE_PORT_PASSAGE
-	warp_event 3, 14, 1, OLIVINE_PORT
+	warp_event 15, 0, OLIVINE_CITY, 10
+	warp_event 16, 0, OLIVINE_CITY, 11
+	warp_event 15, 4, OLIVINE_PORT_PASSAGE, 4
+	warp_event 3, 2, OLIVINE_PORT_PASSAGE, 3
+	warp_event 3, 14, OLIVINE_PORT, 1
 
 	db 0 ; coord events
 
diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm
index a6a436674..8216d53f6 100644
--- a/maps/OlivinePunishmentSpeechHouse.asm
+++ b/maps/OlivinePunishmentSpeechHouse.asm
@@ -41,8 +41,8 @@ OlivinePunishmentSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 5, OLIVINE_CITY
-	warp_event 3, 7, 5, OLIVINE_CITY
+	warp_event 2, 7, OLIVINE_CITY, 5
+	warp_event 3, 7, OLIVINE_CITY, 5
 
 	db 0 ; coord events
 
diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm
index 0b9381cc0..7d59a92e5 100644
--- a/maps/OlivineTimsHouse.asm
+++ b/maps/OlivineTimsHouse.asm
@@ -21,8 +21,8 @@ OlivineTimsHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 3, OLIVINE_CITY
-	warp_event 3, 7, 3, OLIVINE_CITY
+	warp_event 2, 7, OLIVINE_CITY, 3
+	warp_event 3, 7, OLIVINE_CITY, 3
 
 	db 0 ; coord events
 
diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm
index 65cca5e3b..13ea47815 100644
--- a/maps/PalletTown.asm
+++ b/maps/PalletTown.asm
@@ -71,9 +71,9 @@ PalletTown_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 5, 5, 1, REDS_HOUSE_1F
-	warp_event 13, 5, 1, BLUES_HOUSE
-	warp_event 12, 11, 1, OAKS_LAB
+	warp_event 5, 5, REDS_HOUSE_1F, 1
+	warp_event 13, 5, BLUES_HOUSE, 1
+	warp_event 12, 11, OAKS_LAB, 1
 
 	db 0 ; coord events
 
diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm
index 5be0c8087..277f71487 100644
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -154,11 +154,11 @@ PewterCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 29, 13, 1, PEWTER_NIDORAN_SPEECH_HOUSE
-	warp_event 16, 17, 1, PEWTER_GYM
-	warp_event 23, 17, 2, PEWTER_MART
-	warp_event 13, 25, 1, PEWTER_POKECENTER_1F
-	warp_event 7, 29, 1, PEWTER_SNOOZE_SPEECH_HOUSE
+	warp_event 29, 13, PEWTER_NIDORAN_SPEECH_HOUSE, 1
+	warp_event 16, 17, PEWTER_GYM, 1
+	warp_event 23, 17, PEWTER_MART, 2
+	warp_event 13, 25, PEWTER_POKECENTER_1F, 1
+	warp_event 7, 29, PEWTER_SNOOZE_SPEECH_HOUSE, 1
 
 	db 0 ; coord events
 
diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm
index 211d7ac3b..0e73c3657 100644
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -210,8 +210,8 @@ PewterGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 13, 2, PEWTER_CITY
-	warp_event 5, 13, 2, PEWTER_CITY
+	warp_event 4, 13, PEWTER_CITY, 2
+	warp_event 5, 13, PEWTER_CITY, 2
 
 	db 0 ; coord events
 
diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm
index be0b3413f..19e324bca 100644
--- a/maps/PewterMart.asm
+++ b/maps/PewterMart.asm
@@ -47,8 +47,8 @@ PewterMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 3, PEWTER_CITY
-	warp_event 3, 7, 3, PEWTER_CITY
+	warp_event 2, 7, PEWTER_CITY, 3
+	warp_event 3, 7, PEWTER_CITY, 3
 
 	db 0 ; coord events
 
diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm
index 4202f9766..aed4ba69b 100644
--- a/maps/PewterNidoranSpeechHouse.asm
+++ b/maps/PewterNidoranSpeechHouse.asm
@@ -30,8 +30,8 @@ PewterNidoranSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 1, PEWTER_CITY
-	warp_event 3, 7, 1, PEWTER_CITY
+	warp_event 2, 7, PEWTER_CITY, 1
+	warp_event 3, 7, PEWTER_CITY, 1
 
 	db 0 ; coord events
 
diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm
index c3d73a0ab..328b92f79 100644
--- a/maps/PewterPokecenter1F.asm
+++ b/maps/PewterPokecenter1F.asm
@@ -69,9 +69,9 @@ PewterPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 4, PEWTER_CITY
-	warp_event 4, 7, 4, PEWTER_CITY
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, PEWTER_CITY, 4
+	warp_event 4, 7, PEWTER_CITY, 4
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/PewterPokecenter2FBeta.asm b/maps/PewterPokecenter2FBeta.asm
index f01010f7a..49d4deea9 100644
--- a/maps/PewterPokecenter2FBeta.asm
+++ b/maps/PewterPokecenter2FBeta.asm
@@ -7,7 +7,7 @@ PewterPokecenter2FBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 0, 7, 3, PEWTER_POKECENTER_1F
+	warp_event 0, 7, PEWTER_POKECENTER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm
index d7feb63ad..2a7e21c8e 100644
--- a/maps/PewterSnoozeSpeechHouse.asm
+++ b/maps/PewterSnoozeSpeechHouse.asm
@@ -22,8 +22,8 @@ PewterSnoozeSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 5, PEWTER_CITY
-	warp_event 3, 7, 5, PEWTER_CITY
+	warp_event 2, 7, PEWTER_CITY, 5
+	warp_event 3, 7, PEWTER_CITY, 5
 
 	db 0 ; coord events
 
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index 4cd4c1ecd..61c52d7c9 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -387,9 +387,9 @@ PlayersHouse1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 6, 7, 2, NEW_BARK_TOWN
-	warp_event 7, 7, 2, NEW_BARK_TOWN
-	warp_event 9, 0, 1, PLAYERS_HOUSE_2F
+	warp_event 6, 7, NEW_BARK_TOWN, 2
+	warp_event 7, 7, NEW_BARK_TOWN, 2
+	warp_event 9, 0, PLAYERS_HOUSE_2F, 1
 
 	db 2 ; coord events
 	coord_event 8, 4, SCENE_DEFAULT, UnknownScript_0x7a4d8
diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm
index d3748359c..d0fe5dece 100644
--- a/maps/PlayersHouse2F.asm
+++ b/maps/PlayersHouse2F.asm
@@ -117,7 +117,7 @@ PlayersHouse2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 7, 0, 3, PLAYERS_HOUSE_1F
+	warp_event 7, 0, PLAYERS_HOUSE_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm
index e5afd0949..127c0f1ec 100644
--- a/maps/PlayersNeighborsHouse.asm
+++ b/maps/PlayersNeighborsHouse.asm
@@ -100,8 +100,8 @@ PlayersNeighborsHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 3, NEW_BARK_TOWN
-	warp_event 3, 7, 3, NEW_BARK_TOWN
+	warp_event 2, 7, NEW_BARK_TOWN, 3
+	warp_event 3, 7, NEW_BARK_TOWN, 3
 
 	db 0 ; coord events
 
diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm
index 6d0cadefe..a656ffe0e 100644
--- a/maps/PokeSeersHouse.asm
+++ b/maps/PokeSeersHouse.asm
@@ -18,8 +18,8 @@ PokeSeersHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 7, CIANWOOD_CITY
-	warp_event 3, 7, 7, CIANWOOD_CITY
+	warp_event 2, 7, CIANWOOD_CITY, 7
+	warp_event 3, 7, CIANWOOD_CITY, 7
 
 	db 0 ; coord events
 
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 6f86921d2..27a5224f9 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -1024,12 +1024,12 @@ Pokecenter2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 0, 7, -1, POKECENTER_2F
-	warp_event 5, 0, 1, TRADE_CENTER
-	warp_event 9, 0, 1, COLOSSEUM
-	warp_event 13, 2, 1, TIME_CAPSULE
-	warp_event 6, 0, 1, MOBILE_TRADE_ROOM
-	warp_event 10, 0, 1, MOBILE_BATTLE_ROOM
+	warp_event 0, 7, POKECENTER_2F, -1
+	warp_event 5, 0, TRADE_CENTER, 1
+	warp_event 9, 0, COLOSSEUM, 1
+	warp_event 13, 2, TIME_CAPSULE, 1
+	warp_event 6, 0, MOBILE_TRADE_ROOM, 1
+	warp_event 10, 0, MOBILE_BATTLE_ROOM, 1
 
 	db 0 ; coord events
 
diff --git a/maps/PokecomCenterAdminRoomMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm
index 48428ec33..dcde9beaf 100644
--- a/maps/PokecomCenterAdminRoomMobile.asm
+++ b/maps/PokecomCenterAdminRoomMobile.asm
@@ -264,8 +264,8 @@ PokecomCenterAdminRoomMobile_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 0, 31, 3, GOLDENROD_POKECENTER_1F
-	warp_event 1, 31, 3, GOLDENROD_POKECENTER_1F
+	warp_event 0, 31, GOLDENROD_POKECENTER_1F, 3
+	warp_event 1, 31, GOLDENROD_POKECENTER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm
index bba5fff95..7a5260d61 100644
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -298,8 +298,8 @@ PokemonFanClub_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 3, VERMILION_CITY
-	warp_event 3, 7, 3, VERMILION_CITY
+	warp_event 2, 7, VERMILION_CITY, 3
+	warp_event 3, 7, VERMILION_CITY, 3
 
 	db 0 ; coord events
 
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index 1e291b890..6989234e0 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -390,8 +390,8 @@ PowerPlant_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 17, 2, ROUTE_10_NORTH
-	warp_event 3, 17, 2, ROUTE_10_NORTH
+	warp_event 2, 17, ROUTE_10_NORTH, 2
+	warp_event 3, 17, ROUTE_10_NORTH, 2
 
 	db 1 ; coord events
 	coord_event 5, 12, SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL, PowerPlantGuardPhoneScript
diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm
index 655d77a91..f2b537f50 100644
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -474,9 +474,9 @@ RadioTower1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 2, 7, 11, GOLDENROD_CITY
-	warp_event 3, 7, 11, GOLDENROD_CITY
-	warp_event 15, 0, 2, RADIO_TOWER_2F
+	warp_event 2, 7, GOLDENROD_CITY, 11
+	warp_event 3, 7, GOLDENROD_CITY, 11
+	warp_event 15, 0, RADIO_TOWER_2F, 2
 
 	db 0 ; coord events
 
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
index 049c2c596..9343109d5 100644
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -712,8 +712,8 @@ RadioTower2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 0, 0, 1, RADIO_TOWER_3F
-	warp_event 15, 0, 3, RADIO_TOWER_1F
+	warp_event 0, 0, RADIO_TOWER_3F, 1
+	warp_event 15, 0, RADIO_TOWER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm
index 737d19cce..26d5d5a9a 100644
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -330,9 +330,9 @@ RadioTower3F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 0, 0, 1, RADIO_TOWER_2F
-	warp_event 7, 0, 2, RADIO_TOWER_4F
-	warp_event 17, 0, 4, RADIO_TOWER_4F
+	warp_event 0, 0, RADIO_TOWER_2F, 1
+	warp_event 7, 0, RADIO_TOWER_4F, 2
+	warp_event 17, 0, RADIO_TOWER_4F, 4
 
 	db 0 ; coord events
 
diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm
index 8b9adc7d0..b2181228e 100644
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -247,10 +247,10 @@ RadioTower4F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 0, 1, RADIO_TOWER_5F
-	warp_event 9, 0, 2, RADIO_TOWER_3F
-	warp_event 12, 0, 2, RADIO_TOWER_5F
-	warp_event 17, 0, 3, RADIO_TOWER_3F
+	warp_event 0, 0, RADIO_TOWER_5F, 1
+	warp_event 9, 0, RADIO_TOWER_3F, 2
+	warp_event 12, 0, RADIO_TOWER_5F, 2
+	warp_event 17, 0, RADIO_TOWER_3F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index 85f58fb6a..70a97ff65 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -422,8 +422,8 @@ RadioTower5F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 0, 0, 1, RADIO_TOWER_4F
-	warp_event 12, 0, 3, RADIO_TOWER_4F
+	warp_event 0, 0, RADIO_TOWER_4F, 1
+	warp_event 12, 0, RADIO_TOWER_4F, 3
 
 	db 2 ; coord events
 	coord_event 0, 3, SCENE_DEFAULT, FakeDirectorScript
diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm
index eb23329db..e12724bca 100644
--- a/maps/RedsHouse1F.asm
+++ b/maps/RedsHouse1F.asm
@@ -76,9 +76,9 @@ RedsHouse1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 2, 7, 1, PALLET_TOWN
-	warp_event 3, 7, 1, PALLET_TOWN
-	warp_event 7, 0, 1, REDS_HOUSE_2F
+	warp_event 2, 7, PALLET_TOWN, 1
+	warp_event 3, 7, PALLET_TOWN, 1
+	warp_event 7, 0, REDS_HOUSE_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm
index 74445fc3f..db61ec456 100644
--- a/maps/RedsHouse2F.asm
+++ b/maps/RedsHouse2F.asm
@@ -27,7 +27,7 @@ RedsHouse2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 7, 0, 3, REDS_HOUSE_1F
+	warp_event 7, 0, REDS_HOUSE_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm
index 8577d592e..84c285c28 100644
--- a/maps/RockTunnel1F.asm
+++ b/maps/RockTunnel1F.asm
@@ -23,12 +23,12 @@ RockTunnel1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 15, 3, 1, ROUTE_9
-	warp_event 11, 25, 1, ROUTE_10_SOUTH
-	warp_event 5, 3, 3, ROCK_TUNNEL_B1F
-	warp_event 15, 9, 2, ROCK_TUNNEL_B1F
-	warp_event 27, 3, 4, ROCK_TUNNEL_B1F
-	warp_event 27, 13, 1, ROCK_TUNNEL_B1F
+	warp_event 15, 3, ROUTE_9, 1
+	warp_event 11, 25, ROUTE_10_SOUTH, 1
+	warp_event 5, 3, ROCK_TUNNEL_B1F, 3
+	warp_event 15, 9, ROCK_TUNNEL_B1F, 2
+	warp_event 27, 3, ROCK_TUNNEL_B1F, 4
+	warp_event 27, 13, ROCK_TUNNEL_B1F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm
index df9c0db34..ece139cbf 100644
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -24,10 +24,10 @@ RockTunnelB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 3, 3, 6, ROCK_TUNNEL_1F
-	warp_event 17, 9, 4, ROCK_TUNNEL_1F
-	warp_event 23, 3, 3, ROCK_TUNNEL_1F
-	warp_event 25, 23, 5, ROCK_TUNNEL_1F
+	warp_event 3, 3, ROCK_TUNNEL_1F, 6
+	warp_event 17, 9, ROCK_TUNNEL_1F, 4
+	warp_event 23, 3, ROCK_TUNNEL_1F, 3
+	warp_event 25, 23, ROCK_TUNNEL_1F, 5
 
 	db 0 ; coord events
 
diff --git a/maps/Route10North.asm b/maps/Route10North.asm
index 9e16ad2eb..954aeaac9 100644
--- a/maps/Route10North.asm
+++ b/maps/Route10North.asm
@@ -17,8 +17,8 @@ Route10North_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 11, 1, 1, ROUTE_10_POKECENTER_1F
-	warp_event 3, 9, 1, POWER_PLANT
+	warp_event 11, 1, ROUTE_10_POKECENTER_1F, 1
+	warp_event 3, 9, POWER_PLANT, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm
index 7b409c8c9..dc744312c 100644
--- a/maps/Route10Pokecenter1F.asm
+++ b/maps/Route10Pokecenter1F.asm
@@ -82,9 +82,9 @@ Route10Pokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 1, ROUTE_10_NORTH
-	warp_event 4, 7, 1, ROUTE_10_NORTH
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, ROUTE_10_NORTH, 1
+	warp_event 4, 7, ROUTE_10_NORTH, 1
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route10Pokecenter2FBeta.asm b/maps/Route10Pokecenter2FBeta.asm
index 7b528ba13..ab9c80bb0 100644
--- a/maps/Route10Pokecenter2FBeta.asm
+++ b/maps/Route10Pokecenter2FBeta.asm
@@ -7,7 +7,7 @@ Route10Pokecenter2FBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 0, 7, 3, ROUTE_10_POKECENTER_1F
+	warp_event 0, 7, ROUTE_10_POKECENTER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/Route10South.asm b/maps/Route10South.asm
index 655722c21..50c15c257 100644
--- a/maps/Route10South.asm
+++ b/maps/Route10South.asm
@@ -77,7 +77,7 @@ Route10South_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 6, 1, 2, ROCK_TUNNEL_1F
+	warp_event 6, 1, ROCK_TUNNEL_1F, 2
 
 	db 0 ; coord events
 
diff --git a/maps/Route12.asm b/maps/Route12.asm
index 5dc4a81f8..40bed0b3a 100644
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -168,7 +168,7 @@ Route12_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 11, 33, 1, ROUTE_12_SUPER_ROD_HOUSE
+	warp_event 11, 33, ROUTE_12_SUPER_ROD_HOUSE, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm
index 6856f2ab4..36fefbcd1 100644
--- a/maps/Route12SuperRodHouse.asm
+++ b/maps/Route12SuperRodHouse.asm
@@ -81,8 +81,8 @@ Route12SuperRodHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 1, ROUTE_12
-	warp_event 3, 7, 1, ROUTE_12
+	warp_event 2, 7, ROUTE_12, 1
+	warp_event 3, 7, ROUTE_12, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route15.asm b/maps/Route15.asm
index 0f0725262..b539866d1 100644
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -203,8 +203,8 @@ Route15_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 4, 3, ROUTE_15_FUCHSIA_GATE
-	warp_event 2, 5, 4, ROUTE_15_FUCHSIA_GATE
+	warp_event 2, 4, ROUTE_15_FUCHSIA_GATE, 3
+	warp_event 2, 5, ROUTE_15_FUCHSIA_GATE, 4
 
 	db 0 ; coord events
 
diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm
index c1ce3787e..73f40d679 100644
--- a/maps/Route15FuchsiaGate.asm
+++ b/maps/Route15FuchsiaGate.asm
@@ -21,10 +21,10 @@ Route15FuchsiaGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, 8, FUCHSIA_CITY
-	warp_event 0, 5, 9, FUCHSIA_CITY
-	warp_event 9, 4, 1, ROUTE_15
-	warp_event 9, 5, 2, ROUTE_15
+	warp_event 0, 4, FUCHSIA_CITY, 8
+	warp_event 0, 5, FUCHSIA_CITY, 9
+	warp_event 9, 4, ROUTE_15, 1
+	warp_event 9, 5, ROUTE_15, 2
 
 	db 0 ; coord events
 
diff --git a/maps/Route16.asm b/maps/Route16.asm
index a799803fd..760037f92 100644
--- a/maps/Route16.asm
+++ b/maps/Route16.asm
@@ -30,11 +30,11 @@ Route16_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 3, 1, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE
-	warp_event 14, 6, 3, ROUTE_16_GATE
-	warp_event 14, 7, 4, ROUTE_16_GATE
-	warp_event 9, 6, 1, ROUTE_16_GATE
-	warp_event 9, 7, 2, ROUTE_16_GATE
+	warp_event 3, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE, 1
+	warp_event 14, 6, ROUTE_16_GATE, 3
+	warp_event 14, 7, ROUTE_16_GATE, 4
+	warp_event 9, 6, ROUTE_16_GATE, 1
+	warp_event 9, 7, ROUTE_16_GATE, 2
 
 	db 0 ; coord events
 
diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm
index aa2d700c9..1adf4e433 100644
--- a/maps/Route16FuchsiaSpeechHouse.asm
+++ b/maps/Route16FuchsiaSpeechHouse.asm
@@ -24,8 +24,8 @@ Route16FuchsiaSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 1, ROUTE_16
-	warp_event 3, 7, 1, ROUTE_16
+	warp_event 2, 7, ROUTE_16, 1
+	warp_event 3, 7, ROUTE_16, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm
index 28b37ee6f..f31841a1d 100644
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -62,10 +62,10 @@ Route16Gate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, 4, ROUTE_16
-	warp_event 0, 5, 5, ROUTE_16
-	warp_event 9, 4, 2, ROUTE_16
-	warp_event 9, 5, 3, ROUTE_16
+	warp_event 0, 4, ROUTE_16, 4
+	warp_event 0, 5, ROUTE_16, 5
+	warp_event 9, 4, ROUTE_16, 2
+	warp_event 9, 5, ROUTE_16, 3
 
 	db 2 ; coord events
 	coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x733ed
diff --git a/maps/Route17.asm b/maps/Route17.asm
index 4035e1a13..3f639d0ed 100644
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -134,8 +134,8 @@ Route17_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 17, 82, 1, ROUTE_17_ROUTE_18_GATE
-	warp_event 17, 83, 2, ROUTE_17_ROUTE_18_GATE
+	warp_event 17, 82, ROUTE_17_ROUTE_18_GATE, 1
+	warp_event 17, 83, ROUTE_17_ROUTE_18_GATE, 2
 
 	db 0 ; coord events
 
diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm
index 740770356..41cee4f99 100644
--- a/maps/Route17Route18Gate.asm
+++ b/maps/Route17Route18Gate.asm
@@ -53,10 +53,10 @@ Route17Route18Gate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, 1, ROUTE_17
-	warp_event 0, 5, 2, ROUTE_17
-	warp_event 9, 4, 1, ROUTE_18
-	warp_event 9, 5, 2, ROUTE_18
+	warp_event 0, 4, ROUTE_17, 1
+	warp_event 0, 5, ROUTE_17, 2
+	warp_event 9, 4, ROUTE_18, 1
+	warp_event 9, 5, ROUTE_18, 2
 
 	db 2 ; coord events
 	coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x73611
diff --git a/maps/Route18.asm b/maps/Route18.asm
index a30ab3332..2b79ba05a 100644
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -79,8 +79,8 @@ Route18_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 6, 3, ROUTE_17_ROUTE_18_GATE
-	warp_event 2, 7, 4, ROUTE_17_ROUTE_18_GATE
+	warp_event 2, 6, ROUTE_17_ROUTE_18_GATE, 3
+	warp_event 2, 7, ROUTE_17_ROUTE_18_GATE, 4
 
 	db 0 ; coord events
 
diff --git a/maps/Route19.asm b/maps/Route19.asm
index a0b947c7c..a655879ac 100644
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -236,7 +236,7 @@ Route19_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 7, 3, 3, ROUTE_19_FUCHSIA_GATE
+	warp_event 7, 3, ROUTE_19_FUCHSIA_GATE, 3
 
 	db 0 ; coord events
 
diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm
index 04afecfdc..5592bb4bb 100644
--- a/maps/Route19FuchsiaGate.asm
+++ b/maps/Route19FuchsiaGate.asm
@@ -47,10 +47,10 @@ Route19FuchsiaGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, 10, FUCHSIA_CITY
-	warp_event 5, 0, 11, FUCHSIA_CITY
-	warp_event 4, 7, 1, ROUTE_19
-	warp_event 5, 7, 1, ROUTE_19
+	warp_event 4, 0, FUCHSIA_CITY, 10
+	warp_event 5, 0, FUCHSIA_CITY, 11
+	warp_event 4, 7, ROUTE_19, 1
+	warp_event 5, 7, ROUTE_19, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route2.asm b/maps/Route2.asm
index c42ce8d86..b58f330f6 100644
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -148,11 +148,11 @@ Route2_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 15, 15, 1, ROUTE_2_NUGGET_HOUSE
-	warp_event 15, 31, 3, ROUTE_2_GATE
-	warp_event 16, 27, 1, ROUTE_2_GATE
-	warp_event 17, 27, 2, ROUTE_2_GATE
-	warp_event 12, 7, 3, DIGLETTS_CAVE
+	warp_event 15, 15, ROUTE_2_NUGGET_HOUSE, 1
+	warp_event 15, 31, ROUTE_2_GATE, 3
+	warp_event 16, 27, ROUTE_2_GATE, 1
+	warp_event 17, 27, ROUTE_2_GATE, 2
+	warp_event 12, 7, DIGLETTS_CAVE, 3
 
 	db 0 ; coord events
 
diff --git a/maps/Route20.asm b/maps/Route20.asm
index c5aa82140..61a758b84 100644
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -114,7 +114,7 @@ Route20_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 38, 7, 1, SEAFOAM_GYM
+	warp_event 38, 7, SEAFOAM_GYM, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route22.asm b/maps/Route22.asm
index b34daae20..ec59e0c98 100644
--- a/maps/Route22.asm
+++ b/maps/Route22.asm
@@ -17,7 +17,7 @@ Route22_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 13, 5, 1, VICTORY_ROAD_GATE
+	warp_event 13, 5, VICTORY_ROAD_GATE, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route23.asm b/maps/Route23.asm
index a2149e6b9..5bd9b809c 100644
--- a/maps/Route23.asm
+++ b/maps/Route23.asm
@@ -24,10 +24,10 @@ Route23_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 9, 5, 1, INDIGO_PLATEAU_POKECENTER_1F
-	warp_event 10, 5, 2, INDIGO_PLATEAU_POKECENTER_1F
-	warp_event 9, 13, 10, VICTORY_ROAD
-	warp_event 10, 13, 10, VICTORY_ROAD
+	warp_event 9, 5, INDIGO_PLATEAU_POKECENTER_1F, 1
+	warp_event 10, 5, INDIGO_PLATEAU_POKECENTER_1F, 2
+	warp_event 9, 13, VICTORY_ROAD, 10
+	warp_event 10, 13, VICTORY_ROAD, 10
 
 	db 0 ; coord events
 
diff --git a/maps/Route25.asm b/maps/Route25.asm
index 7732f06bf..78caeb418 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -431,7 +431,7 @@ Route25_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 47, 5, 1, BILLS_HOUSE
+	warp_event 47, 5, BILLS_HOUSE, 1
 
 	db 2 ; coord events
 	coord_event 42, 6, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate1Script
diff --git a/maps/Route26.asm b/maps/Route26.asm
index 971729d94..05b20d057 100644
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -414,9 +414,9 @@ Route26_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 7, 5, 3, VICTORY_ROAD_GATE
-	warp_event 15, 57, 1, ROUTE_26_HEAL_HOUSE
-	warp_event 5, 71, 1, DAY_OF_WEEK_SIBLINGS_HOUSE
+	warp_event 7, 5, VICTORY_ROAD_GATE, 3
+	warp_event 15, 57, ROUTE_26_HEAL_HOUSE, 1
+	warp_event 5, 71, DAY_OF_WEEK_SIBLINGS_HOUSE, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm
index 76c5b670b..8a036b76a 100644
--- a/maps/Route26HealHouse.asm
+++ b/maps/Route26HealHouse.asm
@@ -50,8 +50,8 @@ Route26HealHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 2, ROUTE_26
-	warp_event 3, 7, 2, ROUTE_26
+	warp_event 2, 7, ROUTE_26, 2
+	warp_event 3, 7, ROUTE_26, 2
 
 	db 0 ; coord events
 
diff --git a/maps/Route27.asm b/maps/Route27.asm
index f31cf8d2b..9bdc741ee 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -469,9 +469,9 @@ Route27_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 33, 7, 1, ROUTE_27_SANDSTORM_HOUSE
-	warp_event 26, 5, 1, TOHJO_FALLS
-	warp_event 36, 5, 2, TOHJO_FALLS
+	warp_event 33, 7, ROUTE_27_SANDSTORM_HOUSE, 1
+	warp_event 26, 5, TOHJO_FALLS, 1
+	warp_event 36, 5, TOHJO_FALLS, 2
 
 	db 2 ; coord events
 	coord_event 18, 10, SCENE_DEFAULT, UnknownScript_0x1a0873
diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm
index 34afb530f..430a10d73 100644
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -95,8 +95,8 @@ Route27SandstormHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 1, ROUTE_27
-	warp_event 3, 7, 1, ROUTE_27
+	warp_event 2, 7, ROUTE_27, 1
+	warp_event 3, 7, ROUTE_27, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route28.asm b/maps/Route28.asm
index ad729079d..d36717833 100644
--- a/maps/Route28.asm
+++ b/maps/Route28.asm
@@ -17,8 +17,8 @@ Route28_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 7, 3, 1, ROUTE_28_STEEL_WING_HOUSE
-	warp_event 33, 5, 7, VICTORY_ROAD_GATE
+	warp_event 7, 3, ROUTE_28_STEEL_WING_HOUSE, 1
+	warp_event 33, 5, VICTORY_ROAD_GATE, 7
 
 	db 0 ; coord events
 
diff --git a/maps/Route28SteelWingHouse.asm b/maps/Route28SteelWingHouse.asm
index df418b8f7..911c9cf9c 100644
--- a/maps/Route28SteelWingHouse.asm
+++ b/maps/Route28SteelWingHouse.asm
@@ -72,8 +72,8 @@ Route28SteelWingHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 1, ROUTE_28
-	warp_event 3, 7, 1, ROUTE_28
+	warp_event 2, 7, ROUTE_28, 1
+	warp_event 3, 7, ROUTE_28, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route29.asm b/maps/Route29.asm
index 02a71c12f..5edbcf4c5 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -417,7 +417,7 @@ Route29_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 27, 1, 3, ROUTE_29_ROUTE_46_GATE
+	warp_event 27, 1, ROUTE_29_ROUTE_46_GATE, 3
 
 	db 2 ; coord events
 	coord_event 53, 8, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial1
diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm
index 9259074f3..285fa836d 100644
--- a/maps/Route29Route46Gate.asm
+++ b/maps/Route29Route46Gate.asm
@@ -38,10 +38,10 @@ Route29Route46Gate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, 1, ROUTE_46
-	warp_event 5, 0, 2, ROUTE_46
-	warp_event 4, 7, 1, ROUTE_29
-	warp_event 5, 7, 1, ROUTE_29
+	warp_event 4, 0, ROUTE_46, 1
+	warp_event 5, 0, ROUTE_46, 2
+	warp_event 4, 7, ROUTE_29, 1
+	warp_event 5, 7, ROUTE_29, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm
index 9b90d34e4..7a31fc70b 100644
--- a/maps/Route2Gate.asm
+++ b/maps/Route2Gate.asm
@@ -27,10 +27,10 @@ Route2Gate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, 3, ROUTE_2
-	warp_event 5, 0, 4, ROUTE_2
-	warp_event 4, 7, 2, ROUTE_2
-	warp_event 5, 7, 2, ROUTE_2
+	warp_event 4, 0, ROUTE_2, 3
+	warp_event 5, 0, ROUTE_2, 4
+	warp_event 4, 7, ROUTE_2, 2
+	warp_event 5, 7, ROUTE_2, 2
 
 	db 0 ; coord events
 
diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm
index cacd90080..ca5059de9 100644
--- a/maps/Route2NuggetHouse.asm
+++ b/maps/Route2NuggetHouse.asm
@@ -54,8 +54,8 @@ Route2NuggetHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 1, ROUTE_2
-	warp_event 3, 7, 1, ROUTE_2
+	warp_event 2, 7, ROUTE_2, 1
+	warp_event 3, 7, ROUTE_2, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route3.asm b/maps/Route3.asm
index 6821bea8e..9d15d96cc 100644
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -134,7 +134,7 @@ Route3_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 52, 1, 1, MOUNT_MOON
+	warp_event 52, 1, MOUNT_MOON, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route30.asm b/maps/Route30.asm
index 9cf36ad60..0ab3d9cf3 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -408,8 +408,8 @@ Route30_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 7, 39, 1, ROUTE_30_BERRY_HOUSE
-	warp_event 17, 5, 1, MR_POKEMONS_HOUSE
+	warp_event 7, 39, ROUTE_30_BERRY_HOUSE, 1
+	warp_event 17, 5, MR_POKEMONS_HOUSE, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm
index e8403352d..ede2fee7b 100644
--- a/maps/Route30BerryHouse.asm
+++ b/maps/Route30BerryHouse.asm
@@ -48,8 +48,8 @@ Route30BerryHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 1, ROUTE_30
-	warp_event 3, 7, 1, ROUTE_30
+	warp_event 2, 7, ROUTE_30, 1
+	warp_event 3, 7, ROUTE_30, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route31.asm b/maps/Route31.asm
index 3215a83bd..fc4c16fa2 100644
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -419,9 +419,9 @@ Route31_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 4, 6, 3, ROUTE_31_VIOLET_GATE
-	warp_event 4, 7, 4, ROUTE_31_VIOLET_GATE
-	warp_event 34, 5, 1, DARK_CAVE_VIOLET_ENTRANCE
+	warp_event 4, 6, ROUTE_31_VIOLET_GATE, 3
+	warp_event 4, 7, ROUTE_31_VIOLET_GATE, 4
+	warp_event 34, 5, DARK_CAVE_VIOLET_ENTRANCE, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm
index 2d07a5ef3..f0acc8aa8 100644
--- a/maps/Route31VioletGate.asm
+++ b/maps/Route31VioletGate.asm
@@ -29,10 +29,10 @@ Route31VioletGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, 8, VIOLET_CITY
-	warp_event 0, 5, 9, VIOLET_CITY
-	warp_event 9, 4, 1, ROUTE_31
-	warp_event 9, 5, 2, ROUTE_31
+	warp_event 0, 4, VIOLET_CITY, 8
+	warp_event 0, 5, VIOLET_CITY, 9
+	warp_event 9, 4, ROUTE_31, 1
+	warp_event 9, 5, ROUTE_31, 2
 
 	db 0 ; coord events
 
diff --git a/maps/Route32.asm b/maps/Route32.asm
index e0f7725d2..78c5f16ce 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -930,10 +930,10 @@ Route32_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 11, 73, 1, ROUTE_32_POKECENTER_1F
-	warp_event 4, 2, 3, ROUTE_32_RUINS_OF_ALPH_GATE
-	warp_event 4, 3, 4, ROUTE_32_RUINS_OF_ALPH_GATE
-	warp_event 6, 79, 4, UNION_CAVE_1F
+	warp_event 11, 73, ROUTE_32_POKECENTER_1F, 1
+	warp_event 4, 2, ROUTE_32_RUINS_OF_ALPH_GATE, 3
+	warp_event 4, 3, ROUTE_32_RUINS_OF_ALPH_GATE, 4
+	warp_event 6, 79, UNION_CAVE_1F, 4
 
 	db 2 ; coord events
 	coord_event 18, 8, SCENE_DEFAULT, Route32CooltrainerMStopsYouScene
diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm
index 0dbc204b8..0127ebe72 100644
--- a/maps/Route32Pokecenter1F.asm
+++ b/maps/Route32Pokecenter1F.asm
@@ -96,9 +96,9 @@ Route32Pokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 1, ROUTE_32
-	warp_event 4, 7, 1, ROUTE_32
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, ROUTE_32, 1
+	warp_event 4, 7, ROUTE_32, 1
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm
index ebcdb8e83..8481351b4 100644
--- a/maps/Route32RuinsOfAlphGate.asm
+++ b/maps/Route32RuinsOfAlphGate.asm
@@ -48,10 +48,10 @@ Route32RuinsOfAlphGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, 10, RUINS_OF_ALPH_OUTSIDE
-	warp_event 0, 5, 11, RUINS_OF_ALPH_OUTSIDE
-	warp_event 9, 4, 2, ROUTE_32
-	warp_event 9, 5, 3, ROUTE_32
+	warp_event 0, 4, RUINS_OF_ALPH_OUTSIDE, 10
+	warp_event 0, 5, RUINS_OF_ALPH_OUTSIDE, 11
+	warp_event 9, 4, ROUTE_32, 2
+	warp_event 9, 5, ROUTE_32, 3
 
 	db 0 ; coord events
 
diff --git a/maps/Route33.asm b/maps/Route33.asm
index 4aa3fd6f4..dad0a0571 100644
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -196,7 +196,7 @@ Route33_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 11, 9, 3, UNION_CAVE_1F
+	warp_event 11, 9, UNION_CAVE_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/Route34.asm b/maps/Route34.asm
index e20b348b9..3a2832cb9 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -762,11 +762,11 @@ Route34_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 13, 37, 1, ROUTE_34_ILEX_FOREST_GATE
-	warp_event 14, 37, 2, ROUTE_34_ILEX_FOREST_GATE
-	warp_event 11, 14, 1, DAY_CARE
-	warp_event 11, 15, 2, DAY_CARE
-	warp_event 13, 15, 3, DAY_CARE
+	warp_event 13, 37, ROUTE_34_ILEX_FOREST_GATE, 1
+	warp_event 14, 37, ROUTE_34_ILEX_FOREST_GATE, 2
+	warp_event 11, 14, DAY_CARE, 1
+	warp_event 11, 15, DAY_CARE, 2
+	warp_event 13, 15, DAY_CARE, 3
 
 	db 0 ; coord events
 
diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
index 85b0ec3b2..8472ee54b 100644
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -137,10 +137,10 @@ Route34IlexForestGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, 1, ROUTE_34
-	warp_event 5, 0, 2, ROUTE_34
-	warp_event 4, 7, 1, ILEX_FOREST
-	warp_event 5, 7, 1, ILEX_FOREST
+	warp_event 4, 0, ROUTE_34, 1
+	warp_event 5, 0, ROUTE_34, 2
+	warp_event 4, 7, ILEX_FOREST, 1
+	warp_event 5, 7, ILEX_FOREST, 1
 
 	db 1 ; coord events
 	coord_event 4, 7, 0, UnknownScript_0x62d3d
diff --git a/maps/Route35.asm b/maps/Route35.asm
index 52ebe785d..cd3483e12 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -464,9 +464,9 @@ Route35_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 9, 33, 1, ROUTE_35_GOLDENROD_GATE
-	warp_event 10, 33, 2, ROUTE_35_GOLDENROD_GATE
-	warp_event 3, 5, 3, ROUTE_35_NATIONAL_PARK_GATE
+	warp_event 9, 33, ROUTE_35_GOLDENROD_GATE, 1
+	warp_event 10, 33, ROUTE_35_GOLDENROD_GATE, 2
+	warp_event 3, 5, ROUTE_35_NATIONAL_PARK_GATE, 3
 
 	db 0 ; coord events
 
diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm
index 3aeae2ff2..46a2bd9f4 100644
--- a/maps/Route35GoldenrodGate.asm
+++ b/maps/Route35GoldenrodGate.asm
@@ -197,10 +197,10 @@ Route35GoldenrodGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, 1, ROUTE_35
-	warp_event 5, 0, 2, ROUTE_35
-	warp_event 4, 7, 12, GOLDENROD_CITY
-	warp_event 5, 7, 12, GOLDENROD_CITY
+	warp_event 4, 0, ROUTE_35, 1
+	warp_event 5, 0, ROUTE_35, 2
+	warp_event 4, 7, GOLDENROD_CITY, 12
+	warp_event 5, 7, GOLDENROD_CITY, 12
 
 	db 0 ; coord events
 
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index e59a1502d..274ae9414 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -439,10 +439,10 @@ Route35NationalParkGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 3, 0, 3, NATIONAL_PARK
-	warp_event 4, 0, 4, NATIONAL_PARK
-	warp_event 3, 7, 3, ROUTE_35
-	warp_event 4, 7, 3, ROUTE_35
+	warp_event 3, 0, NATIONAL_PARK, 3
+	warp_event 4, 0, NATIONAL_PARK, 4
+	warp_event 3, 7, ROUTE_35, 3
+	warp_event 4, 7, ROUTE_35, 3
 
 	db 0 ; coord events
 
diff --git a/maps/Route36.asm b/maps/Route36.asm
index 2800aa90e..478a8bdff 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -661,10 +661,10 @@ Route36_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 18, 8, 3, ROUTE_36_NATIONAL_PARK_GATE
-	warp_event 18, 9, 4, ROUTE_36_NATIONAL_PARK_GATE
-	warp_event 47, 13, 1, ROUTE_36_RUINS_OF_ALPH_GATE
-	warp_event 48, 13, 2, ROUTE_36_RUINS_OF_ALPH_GATE
+	warp_event 18, 8, ROUTE_36_NATIONAL_PARK_GATE, 3
+	warp_event 18, 9, ROUTE_36_NATIONAL_PARK_GATE, 4
+	warp_event 47, 13, ROUTE_36_RUINS_OF_ALPH_GATE, 1
+	warp_event 48, 13, ROUTE_36_RUINS_OF_ALPH_GATE, 2
 
 	db 2 ; coord events
 	coord_event 20, 7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index bf4978504..062e088b4 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -851,10 +851,10 @@ Route36NationalParkGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, 1, NATIONAL_PARK
-	warp_event 0, 5, 2, NATIONAL_PARK
-	warp_event 9, 4, 1, ROUTE_36
-	warp_event 9, 5, 2, ROUTE_36
+	warp_event 0, 4, NATIONAL_PARK, 1
+	warp_event 0, 5, NATIONAL_PARK, 2
+	warp_event 9, 4, ROUTE_36, 1
+	warp_event 9, 5, ROUTE_36, 2
 
 	db 0 ; coord events
 
diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm
index 077b9debe..e06a71f41 100644
--- a/maps/Route36RuinsOfAlphGate.asm
+++ b/maps/Route36RuinsOfAlphGate.asm
@@ -36,10 +36,10 @@ Route36RuinsOfAlphGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, 3, ROUTE_36
-	warp_event 5, 0, 4, ROUTE_36
-	warp_event 4, 7, 9, RUINS_OF_ALPH_OUTSIDE
-	warp_event 5, 7, 9, RUINS_OF_ALPH_OUTSIDE
+	warp_event 4, 0, ROUTE_36, 3
+	warp_event 5, 0, ROUTE_36, 4
+	warp_event 4, 7, RUINS_OF_ALPH_OUTSIDE, 9
+	warp_event 5, 7, RUINS_OF_ALPH_OUTSIDE, 9
 
 	db 0 ; coord events
 
diff --git a/maps/Route38.asm b/maps/Route38.asm
index 32b9a6feb..a18e69a6d 100644
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -474,8 +474,8 @@ Route38_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 35, 8, 1, ROUTE_38_ECRUTEAK_GATE
-	warp_event 35, 9, 2, ROUTE_38_ECRUTEAK_GATE
+	warp_event 35, 8, ROUTE_38_ECRUTEAK_GATE, 1
+	warp_event 35, 9, ROUTE_38_ECRUTEAK_GATE, 2
 
 	db 0 ; coord events
 
diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm
index f97705b22..358bb0eae 100644
--- a/maps/Route38EcruteakGate.asm
+++ b/maps/Route38EcruteakGate.asm
@@ -26,10 +26,10 @@ Route38EcruteakGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, 1, ROUTE_38
-	warp_event 0, 5, 2, ROUTE_38
-	warp_event 9, 4, 14, ECRUTEAK_CITY
-	warp_event 9, 5, 15, ECRUTEAK_CITY
+	warp_event 0, 4, ROUTE_38, 1
+	warp_event 0, 5, ROUTE_38, 2
+	warp_event 9, 4, ECRUTEAK_CITY, 14
+	warp_event 9, 5, ECRUTEAK_CITY, 15
 
 	db 0 ; coord events
 
diff --git a/maps/Route39.asm b/maps/Route39.asm
index 426eb6449..8d27b9285 100644
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -345,8 +345,8 @@ Route39_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 1, 3, 1, ROUTE_39_BARN
-	warp_event 5, 3, 1, ROUTE_39_FARMHOUSE
+	warp_event 1, 3, ROUTE_39_BARN, 1
+	warp_event 5, 3, ROUTE_39_FARMHOUSE, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm
index 68187ecd5..e3359e1e4 100644
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -190,8 +190,8 @@ Route39Barn_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 7, 1, ROUTE_39
-	warp_event 4, 7, 1, ROUTE_39
+	warp_event 3, 7, ROUTE_39, 1
+	warp_event 4, 7, ROUTE_39, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm
index caf17f96b..a82f8a75c 100644
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -194,8 +194,8 @@ Route39Farmhouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 2, ROUTE_39
-	warp_event 3, 7, 2, ROUTE_39
+	warp_event 2, 7, ROUTE_39, 2
+	warp_event 3, 7, ROUTE_39, 2
 
 	db 0 ; coord events
 
diff --git a/maps/Route4.asm b/maps/Route4.asm
index 371bca62b..3259ebce6 100644
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -122,7 +122,7 @@ Route4_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 2, 5, 2, MOUNT_MOON
+	warp_event 2, 5, MOUNT_MOON, 2
 
 	db 0 ; coord events
 
diff --git a/maps/Route40.asm b/maps/Route40.asm
index 1a3cde94a..2b7081ef3 100644
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -339,7 +339,7 @@ Route40_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 9, 5, 1, ROUTE_40_BATTLE_TOWER_GATE
+	warp_event 9, 5, ROUTE_40_BATTLE_TOWER_GATE, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm
index be048fa04..3bafbd21b 100644
--- a/maps/Route40BattleTowerGate.asm
+++ b/maps/Route40BattleTowerGate.asm
@@ -72,10 +72,10 @@ Route40BattleTowerGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 7, 1, ROUTE_40
-	warp_event 5, 7, 1, ROUTE_40
-	warp_event 4, 0, 1, BATTLE_TOWER_OUTSIDE
-	warp_event 5, 0, 2, BATTLE_TOWER_OUTSIDE
+	warp_event 4, 7, ROUTE_40, 1
+	warp_event 5, 7, ROUTE_40, 1
+	warp_event 4, 0, BATTLE_TOWER_OUTSIDE, 1
+	warp_event 5, 0, BATTLE_TOWER_OUTSIDE, 2
 
 	db 0 ; coord events
 
diff --git a/maps/Route41.asm b/maps/Route41.asm
index b061f469d..8fbfbce85 100644
--- a/maps/Route41.asm
+++ b/maps/Route41.asm
@@ -343,10 +343,10 @@ Route41_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 12, 17, 1, WHIRL_ISLAND_NW
-	warp_event 36, 19, 1, WHIRL_ISLAND_NE
-	warp_event 12, 37, 1, WHIRL_ISLAND_SW
-	warp_event 36, 45, 1, WHIRL_ISLAND_SE
+	warp_event 12, 17, WHIRL_ISLAND_NW, 1
+	warp_event 36, 19, WHIRL_ISLAND_NE, 1
+	warp_event 12, 37, WHIRL_ISLAND_SW, 1
+	warp_event 36, 45, WHIRL_ISLAND_SE, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route42.asm b/maps/Route42.asm
index 69d2b92a6..20a4f856c 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -320,11 +320,11 @@ Route42_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 0, 8, 3, ROUTE_42_ECRUTEAK_GATE
-	warp_event 0, 9, 4, ROUTE_42_ECRUTEAK_GATE
-	warp_event 10, 5, 1, MOUNT_MORTAR_1F_OUTSIDE
-	warp_event 28, 9, 2, MOUNT_MORTAR_1F_OUTSIDE
-	warp_event 46, 7, 3, MOUNT_MORTAR_1F_OUTSIDE
+	warp_event 0, 8, ROUTE_42_ECRUTEAK_GATE, 3
+	warp_event 0, 9, ROUTE_42_ECRUTEAK_GATE, 4
+	warp_event 10, 5, MOUNT_MORTAR_1F_OUTSIDE, 1
+	warp_event 28, 9, MOUNT_MORTAR_1F_OUTSIDE, 2
+	warp_event 46, 7, MOUNT_MORTAR_1F_OUTSIDE, 3
 
 	db 1 ; coord events
 	coord_event 24, 14, SCENE_ROUTE42_SUICUNE, Route42SuicuneScript
diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm
index 4b0196f29..89ef5cd1a 100644
--- a/maps/Route42EcruteakGate.asm
+++ b/maps/Route42EcruteakGate.asm
@@ -21,10 +21,10 @@ Route42EcruteakGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, 1, ECRUTEAK_CITY
-	warp_event 0, 5, 2, ECRUTEAK_CITY
-	warp_event 9, 4, 1, ROUTE_42
-	warp_event 9, 5, 2, ROUTE_42
+	warp_event 0, 4, ECRUTEAK_CITY, 1
+	warp_event 0, 5, ECRUTEAK_CITY, 2
+	warp_event 9, 4, ROUTE_42, 1
+	warp_event 9, 5, ROUTE_42, 2
 
 	db 0 ; coord events
 
diff --git a/maps/Route43.asm b/maps/Route43.asm
index 4b222f4a6..fa8067663 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -502,11 +502,11 @@ Route43_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 9, 51, 1, ROUTE_43_MAHOGANY_GATE
-	warp_event 10, 51, 2, ROUTE_43_MAHOGANY_GATE
-	warp_event 17, 35, 3, ROUTE_43_GATE
-	warp_event 17, 31, 1, ROUTE_43_GATE
-	warp_event 18, 31, 2, ROUTE_43_GATE
+	warp_event 9, 51, ROUTE_43_MAHOGANY_GATE, 1
+	warp_event 10, 51, ROUTE_43_MAHOGANY_GATE, 2
+	warp_event 17, 35, ROUTE_43_GATE, 3
+	warp_event 17, 31, ROUTE_43_GATE, 1
+	warp_event 18, 31, ROUTE_43_GATE, 2
 
 	db 0 ; coord events
 
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index 31d215fd4..a9c1affe5 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -249,10 +249,10 @@ Route43Gate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, 4, ROUTE_43
-	warp_event 5, 0, 5, ROUTE_43
-	warp_event 4, 7, 3, ROUTE_43
-	warp_event 5, 7, 3, ROUTE_43
+	warp_event 4, 0, ROUTE_43, 4
+	warp_event 5, 0, ROUTE_43, 5
+	warp_event 4, 7, ROUTE_43, 3
+	warp_event 5, 7, ROUTE_43, 3
 
 	db 0 ; coord events
 
diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm
index c2641abcd..c5fbca190 100644
--- a/maps/Route43MahoganyGate.asm
+++ b/maps/Route43MahoganyGate.asm
@@ -40,10 +40,10 @@ Route43MahoganyGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, 1, ROUTE_43
-	warp_event 5, 0, 2, ROUTE_43
-	warp_event 4, 7, 5, MAHOGANY_TOWN
-	warp_event 5, 7, 5, MAHOGANY_TOWN
+	warp_event 4, 0, ROUTE_43, 1
+	warp_event 5, 0, ROUTE_43, 2
+	warp_event 4, 7, MAHOGANY_TOWN, 5
+	warp_event 5, 7, MAHOGANY_TOWN, 5
 
 	db 0 ; coord events
 
diff --git a/maps/Route44.asm b/maps/Route44.asm
index 5cb2f9e9e..aad425161 100644
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -508,7 +508,7 @@ Route44_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 56, 7, 1, ICE_PATH_1F
+	warp_event 56, 7, ICE_PATH_1F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route45.asm b/maps/Route45.asm
index 721e3cb4c..ddfaddd26 100644
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -533,7 +533,7 @@ Route45_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 2, 5, 1, DARK_CAVE_BLACKTHORN_ENTRANCE
+	warp_event 2, 5, DARK_CAVE_BLACKTHORN_ENTRANCE, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route46.asm b/maps/Route46.asm
index 86b7b7396..497c2654f 100644
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -252,9 +252,9 @@ Route46_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 7, 33, 1, ROUTE_29_ROUTE_46_GATE
-	warp_event 8, 33, 2, ROUTE_29_ROUTE_46_GATE
-	warp_event 14, 5, 3, DARK_CAVE_VIOLET_ENTRANCE
+	warp_event 7, 33, ROUTE_29_ROUTE_46_GATE, 1
+	warp_event 8, 33, ROUTE_29_ROUTE_46_GATE, 2
+	warp_event 14, 5, DARK_CAVE_VIOLET_ENTRANCE, 3
 
 	db 0 ; coord events
 
diff --git a/maps/Route5.asm b/maps/Route5.asm
index f1d7f0ef4..fcb1d9988 100644
--- a/maps/Route5.asm
+++ b/maps/Route5.asm
@@ -41,10 +41,10 @@ Route5_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
-	warp_event 8, 17, 1, ROUTE_5_SAFFRON_GATE
-	warp_event 9, 17, 2, ROUTE_5_SAFFRON_GATE
-	warp_event 10, 11, 1, ROUTE_5_CLEANSE_TAG_HOUSE
+	warp_event 17, 15, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 1
+	warp_event 8, 17, ROUTE_5_SAFFRON_GATE, 1
+	warp_event 9, 17, ROUTE_5_SAFFRON_GATE, 2
+	warp_event 10, 11, ROUTE_5_CLEANSE_TAG_HOUSE, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm
index 2e268d68d..a99de824f 100644
--- a/maps/Route5CleanseTagHouse.asm
+++ b/maps/Route5CleanseTagHouse.asm
@@ -62,8 +62,8 @@ Route5CleanseTagHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 4, ROUTE_5
-	warp_event 3, 7, 4, ROUTE_5
+	warp_event 2, 7, ROUTE_5, 4
+	warp_event 3, 7, ROUTE_5, 4
 
 	db 0 ; coord events
 
diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm
index 8ab29c1e5..f6f5139db 100644
--- a/maps/Route5SaffronGate.asm
+++ b/maps/Route5SaffronGate.asm
@@ -22,10 +22,10 @@ Route5SaffronGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, 2, ROUTE_5
-	warp_event 5, 0, 3, ROUTE_5
-	warp_event 4, 7, 9, SAFFRON_CITY
-	warp_event 5, 7, 9, SAFFRON_CITY
+	warp_event 4, 0, ROUTE_5, 2
+	warp_event 5, 0, ROUTE_5, 3
+	warp_event 4, 7, SAFFRON_CITY, 9
+	warp_event 5, 7, SAFFRON_CITY, 9
 
 	db 0 ; coord events
 
diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm
index 5ffbee7d0..15d7e9f03 100644
--- a/maps/Route5UndergroundPathEntrance.asm
+++ b/maps/Route5UndergroundPathEntrance.asm
@@ -21,9 +21,9 @@ Route5UndergroundPathEntrance_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 1, ROUTE_5
-	warp_event 4, 7, 1, ROUTE_5
-	warp_event 4, 3, 1, UNDERGROUND_PATH
+	warp_event 3, 7, ROUTE_5, 1
+	warp_event 4, 7, ROUTE_5, 1
+	warp_event 4, 3, UNDERGROUND_PATH, 1
 
 	db 0 ; coord events
 
diff --git a/maps/Route6.asm b/maps/Route6.asm
index 5a42ddc0c..8ba5fc6ef 100644
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -93,8 +93,8 @@ Route6_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 17, 3, 1, ROUTE_6_UNDERGROUND_PATH_ENTRANCE
-	warp_event 6, 1, 3, ROUTE_6_SAFFRON_GATE
+	warp_event 17, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 1
+	warp_event 6, 1, ROUTE_6_SAFFRON_GATE, 3
 
 	db 0 ; coord events
 
diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm
index fb278c277..85f289df0 100644
--- a/maps/Route6SaffronGate.asm
+++ b/maps/Route6SaffronGate.asm
@@ -59,10 +59,10 @@ Route6SaffronGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, 12, SAFFRON_CITY
-	warp_event 5, 0, 13, SAFFRON_CITY
-	warp_event 4, 7, 2, ROUTE_6
-	warp_event 5, 7, 2, ROUTE_6
+	warp_event 4, 0, SAFFRON_CITY, 12
+	warp_event 5, 0, SAFFRON_CITY, 13
+	warp_event 4, 7, ROUTE_6, 2
+	warp_event 5, 7, ROUTE_6, 2
 
 	db 0 ; coord events
 
diff --git a/maps/Route6UndergroundPathEntrance.asm b/maps/Route6UndergroundPathEntrance.asm
index a17861c2b..0f3a2a3ee 100644
--- a/maps/Route6UndergroundPathEntrance.asm
+++ b/maps/Route6UndergroundPathEntrance.asm
@@ -7,9 +7,9 @@ Route6UndergroundPathEntrance_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 1, ROUTE_6
-	warp_event 4, 7, 1, ROUTE_6
-	warp_event 4, 3, 2, UNDERGROUND_PATH
+	warp_event 3, 7, ROUTE_6, 1
+	warp_event 4, 7, ROUTE_6, 1
+	warp_event 4, 3, UNDERGROUND_PATH, 2
 
 	db 0 ; coord events
 
diff --git a/maps/Route7.asm b/maps/Route7.asm
index cea61fd24..70849c693 100644
--- a/maps/Route7.asm
+++ b/maps/Route7.asm
@@ -36,8 +36,8 @@ Route7_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 15, 6, 1, ROUTE_7_SAFFRON_GATE
-	warp_event 15, 7, 2, ROUTE_7_SAFFRON_GATE
+	warp_event 15, 6, ROUTE_7_SAFFRON_GATE, 1
+	warp_event 15, 7, ROUTE_7_SAFFRON_GATE, 2
 
 	db 0 ; coord events
 
diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm
index 566b58123..8b392b591 100644
--- a/maps/Route7SaffronGate.asm
+++ b/maps/Route7SaffronGate.asm
@@ -47,10 +47,10 @@ Route7SaffronGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, 1, ROUTE_7
-	warp_event 0, 5, 2, ROUTE_7
-	warp_event 9, 4, 10, SAFFRON_CITY
-	warp_event 9, 5, 11, SAFFRON_CITY
+	warp_event 0, 4, ROUTE_7, 1
+	warp_event 0, 5, ROUTE_7, 2
+	warp_event 9, 4, SAFFRON_CITY, 10
+	warp_event 9, 5, SAFFRON_CITY, 11
 
 	db 0 ; coord events
 
diff --git a/maps/Route8.asm b/maps/Route8.asm
index a70558e44..809ef1a5c 100644
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -174,8 +174,8 @@ Route8_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 4, 3, ROUTE_8_SAFFRON_GATE
-	warp_event 4, 5, 4, ROUTE_8_SAFFRON_GATE
+	warp_event 4, 4, ROUTE_8_SAFFRON_GATE, 3
+	warp_event 4, 5, ROUTE_8_SAFFRON_GATE, 4
 
 	db 0 ; coord events
 
diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm
index 51c9d8958..9290eefd7 100644
--- a/maps/Route8SaffronGate.asm
+++ b/maps/Route8SaffronGate.asm
@@ -21,10 +21,10 @@ Route8SaffronGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, 14, SAFFRON_CITY
-	warp_event 0, 5, 15, SAFFRON_CITY
-	warp_event 9, 4, 1, ROUTE_8
-	warp_event 9, 5, 2, ROUTE_8
+	warp_event 0, 4, SAFFRON_CITY, 14
+	warp_event 0, 5, SAFFRON_CITY, 15
+	warp_event 9, 4, ROUTE_8, 1
+	warp_event 9, 5, ROUTE_8, 2
 
 	db 0 ; coord events
 
diff --git a/maps/Route9.asm b/maps/Route9.asm
index 984f08413..45c0e6299 100644
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -207,7 +207,7 @@ Route9_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 48, 15, 1, ROCK_TUNNEL_1F
+	warp_event 48, 15, ROCK_TUNNEL_1F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm
index 39528ad80..bc167d872 100644
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -145,11 +145,11 @@ RuinsOfAlphAerodactylChamber_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 3, 9, 4, RUINS_OF_ALPH_OUTSIDE
-	warp_event 4, 9, 4, RUINS_OF_ALPH_OUTSIDE
-	warp_event 3, 3, 8, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_event 4, 3, 9, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_event 4, 0, 1, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
+	warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 4
+	warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 4
+	warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 8
+	warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 9
+	warp_event 4, 0, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 1
 
 	db 0 ; coord events
 
diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm
index 732ac2a16..ce455fab6 100644
--- a/maps/RuinsOfAlphAerodactylItemRoom.asm
+++ b/maps/RuinsOfAlphAerodactylItemRoom.asm
@@ -34,10 +34,10 @@ RuinsOfAlphAerodactylItemRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 3, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER
-	warp_event 4, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER
-	warp_event 3, 1, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM
-	warp_event 4, 1, 2, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM
+	warp_event 3, 9, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5
+	warp_event 4, 9, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5
+	warp_event 3, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 1
+	warp_event 4, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 2
 
 	db 0 ; coord events
 
diff --git a/maps/RuinsOfAlphAerodactylWordRoom.asm b/maps/RuinsOfAlphAerodactylWordRoom.asm
index 2da613f1c..65228a709 100644
--- a/maps/RuinsOfAlphAerodactylWordRoom.asm
+++ b/maps/RuinsOfAlphAerodactylWordRoom.asm
@@ -7,9 +7,9 @@ RuinsOfAlphAerodactylWordRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 9, 5, 3, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
-	warp_event 10, 5, 4, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
-	warp_event 17, 11, 8, RUINS_OF_ALPH_INNER_CHAMBER
+	warp_event 9, 5, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 3
+	warp_event 10, 5, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 4
+	warp_event 17, 11, RUINS_OF_ALPH_INNER_CHAMBER, 8
 
 	db 0 ; coord events
 
diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm
index 9fccc0089..99339f985 100644
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -146,11 +146,11 @@ RuinsOfAlphHoOhChamber_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 3, 9, 1, RUINS_OF_ALPH_OUTSIDE
-	warp_event 4, 9, 1, RUINS_OF_ALPH_OUTSIDE
-	warp_event 3, 3, 2, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_event 4, 3, 3, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_event 4, 0, 1, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
+	warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 1
+	warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 1
+	warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 2
+	warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 3
+	warp_event 4, 0, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 1
 
 	db 0 ; coord events
 
diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm
index 4536e09b6..29a7183ab 100644
--- a/maps/RuinsOfAlphHoOhItemRoom.asm
+++ b/maps/RuinsOfAlphHoOhItemRoom.asm
@@ -34,10 +34,10 @@ RuinsOfAlphHoOhItemRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 3, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER
-	warp_event 4, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER
-	warp_event 3, 1, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM
-	warp_event 4, 1, 2, RUINS_OF_ALPH_HO_OH_WORD_ROOM
+	warp_event 3, 9, RUINS_OF_ALPH_HO_OH_CHAMBER, 5
+	warp_event 4, 9, RUINS_OF_ALPH_HO_OH_CHAMBER, 5
+	warp_event 3, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM, 1
+	warp_event 4, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM, 2
 
 	db 0 ; coord events
 
diff --git a/maps/RuinsOfAlphHoOhWordRoom.asm b/maps/RuinsOfAlphHoOhWordRoom.asm
index 8f66f2f7b..40c282351 100644
--- a/maps/RuinsOfAlphHoOhWordRoom.asm
+++ b/maps/RuinsOfAlphHoOhWordRoom.asm
@@ -7,9 +7,9 @@ RuinsOfAlphHoOhWordRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 9, 9, 3, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
-	warp_event 10, 9, 4, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
-	warp_event 17, 21, 2, RUINS_OF_ALPH_INNER_CHAMBER
+	warp_event 9, 9, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 3
+	warp_event 10, 9, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 4
+	warp_event 17, 21, RUINS_OF_ALPH_INNER_CHAMBER, 2
 
 	db 0 ; coord events
 
diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm
index b91f95f69..352dcf8dc 100644
--- a/maps/RuinsOfAlphInnerChamber.asm
+++ b/maps/RuinsOfAlphInnerChamber.asm
@@ -78,15 +78,15 @@ RuinsOfAlphInnerChamber_MapEvents:
 	db 0, 0 ; filler
 
 	db 9 ; warp events
-	warp_event 10, 13, 5, RUINS_OF_ALPH_OUTSIDE
-	warp_event 3, 15, 3, RUINS_OF_ALPH_HO_OH_CHAMBER
-	warp_event 4, 15, 4, RUINS_OF_ALPH_HO_OH_CHAMBER
-	warp_event 15, 3, 3, RUINS_OF_ALPH_KABUTO_CHAMBER
-	warp_event 16, 3, 4, RUINS_OF_ALPH_KABUTO_CHAMBER
-	warp_event 3, 21, 3, RUINS_OF_ALPH_OMANYTE_CHAMBER
-	warp_event 4, 21, 4, RUINS_OF_ALPH_OMANYTE_CHAMBER
-	warp_event 15, 24, 3, RUINS_OF_ALPH_AERODACTYL_CHAMBER
-	warp_event 16, 24, 4, RUINS_OF_ALPH_AERODACTYL_CHAMBER
+	warp_event 10, 13, RUINS_OF_ALPH_OUTSIDE, 5
+	warp_event 3, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 3
+	warp_event 4, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 4
+	warp_event 15, 3, RUINS_OF_ALPH_KABUTO_CHAMBER, 3
+	warp_event 16, 3, RUINS_OF_ALPH_KABUTO_CHAMBER, 4
+	warp_event 3, 21, RUINS_OF_ALPH_OMANYTE_CHAMBER, 3
+	warp_event 4, 21, RUINS_OF_ALPH_OMANYTE_CHAMBER, 4
+	warp_event 15, 24, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 3
+	warp_event 16, 24, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 4
 
 	db 0 ; coord events
 
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index 1a0c2f799..1b01adee1 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -257,11 +257,11 @@ RuinsOfAlphKabutoChamber_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 3, 9, 2, RUINS_OF_ALPH_OUTSIDE
-	warp_event 4, 9, 2, RUINS_OF_ALPH_OUTSIDE
-	warp_event 3, 3, 4, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_event 4, 3, 5, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_event 4, 0, 1, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
+	warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 2
+	warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 2
+	warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 4
+	warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 5
+	warp_event 4, 0, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 1
 
 	db 0 ; coord events
 
diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm
index 5239b562e..ac9753ca4 100644
--- a/maps/RuinsOfAlphKabutoItemRoom.asm
+++ b/maps/RuinsOfAlphKabutoItemRoom.asm
@@ -34,10 +34,10 @@ RuinsOfAlphKabutoItemRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 3, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER
-	warp_event 4, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER
-	warp_event 3, 1, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM
-	warp_event 4, 1, 2, RUINS_OF_ALPH_KABUTO_WORD_ROOM
+	warp_event 3, 9, RUINS_OF_ALPH_KABUTO_CHAMBER, 5
+	warp_event 4, 9, RUINS_OF_ALPH_KABUTO_CHAMBER, 5
+	warp_event 3, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM, 1
+	warp_event 4, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM, 2
 
 	db 0 ; coord events
 
diff --git a/maps/RuinsOfAlphKabutoWordRoom.asm b/maps/RuinsOfAlphKabutoWordRoom.asm
index 79f8c98b6..9820104eb 100644
--- a/maps/RuinsOfAlphKabutoWordRoom.asm
+++ b/maps/RuinsOfAlphKabutoWordRoom.asm
@@ -7,9 +7,9 @@ RuinsOfAlphKabutoWordRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 9, 5, 3, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
-	warp_event 10, 5, 4, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
-	warp_event 17, 11, 4, RUINS_OF_ALPH_INNER_CHAMBER
+	warp_event 9, 5, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 3
+	warp_event 10, 5, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 4
+	warp_event 17, 11, RUINS_OF_ALPH_INNER_CHAMBER, 4
 
 	db 0 ; coord events
 
diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm
index 52eb813e5..f4074ed72 100644
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -146,11 +146,11 @@ RuinsOfAlphOmanyteChamber_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 3, 9, 3, RUINS_OF_ALPH_OUTSIDE
-	warp_event 4, 9, 3, RUINS_OF_ALPH_OUTSIDE
-	warp_event 3, 3, 6, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_event 4, 3, 7, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_event 4, 0, 1, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
+	warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 3
+	warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 3
+	warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 6
+	warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 7
+	warp_event 4, 0, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 1
 
 	db 0 ; coord events
 
diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm
index a9a0acde5..1a8dcce72 100644
--- a/maps/RuinsOfAlphOmanyteItemRoom.asm
+++ b/maps/RuinsOfAlphOmanyteItemRoom.asm
@@ -34,10 +34,10 @@ RuinsOfAlphOmanyteItemRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 3, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER
-	warp_event 4, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER
-	warp_event 3, 1, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM
-	warp_event 4, 1, 2, RUINS_OF_ALPH_OMANYTE_WORD_ROOM
+	warp_event 3, 9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5
+	warp_event 4, 9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5
+	warp_event 3, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 1
+	warp_event 4, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 2
 
 	db 0 ; coord events
 
diff --git a/maps/RuinsOfAlphOmanyteWordRoom.asm b/maps/RuinsOfAlphOmanyteWordRoom.asm
index c0bc8c777..5c78330bb 100644
--- a/maps/RuinsOfAlphOmanyteWordRoom.asm
+++ b/maps/RuinsOfAlphOmanyteWordRoom.asm
@@ -7,9 +7,9 @@ RuinsOfAlphOmanyteWordRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 9, 7, 3, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
-	warp_event 10, 7, 4, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
-	warp_event 17, 13, 6, RUINS_OF_ALPH_INNER_CHAMBER
+	warp_event 9, 7, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 3
+	warp_event 10, 7, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 4
+	warp_event 17, 13, RUINS_OF_ALPH_INNER_CHAMBER, 6
 
 	db 0 ; coord events
 
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index 12fb23a57..646be0d1c 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -282,17 +282,17 @@ RuinsOfAlphOutside_MapEvents:
 	db 0, 0 ; filler
 
 	db 11 ; warp events
-	warp_event 2, 17, 1, RUINS_OF_ALPH_HO_OH_CHAMBER
-	warp_event 14, 7, 1, RUINS_OF_ALPH_KABUTO_CHAMBER
-	warp_event 2, 29, 1, RUINS_OF_ALPH_OMANYTE_CHAMBER
-	warp_event 16, 33, 1, RUINS_OF_ALPH_AERODACTYL_CHAMBER
-	warp_event 10, 13, 1, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_event 17, 11, 1, RUINS_OF_ALPH_RESEARCH_CENTER
-	warp_event 6, 19, 1, UNION_CAVE_B1F
-	warp_event 6, 27, 2, UNION_CAVE_B1F
-	warp_event 7, 5, 3, ROUTE_36_RUINS_OF_ALPH_GATE
-	warp_event 13, 20, 1, ROUTE_32_RUINS_OF_ALPH_GATE
-	warp_event 13, 21, 2, ROUTE_32_RUINS_OF_ALPH_GATE
+	warp_event 2, 17, RUINS_OF_ALPH_HO_OH_CHAMBER, 1
+	warp_event 14, 7, RUINS_OF_ALPH_KABUTO_CHAMBER, 1
+	warp_event 2, 29, RUINS_OF_ALPH_OMANYTE_CHAMBER, 1
+	warp_event 16, 33, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 1
+	warp_event 10, 13, RUINS_OF_ALPH_INNER_CHAMBER, 1
+	warp_event 17, 11, RUINS_OF_ALPH_RESEARCH_CENTER, 1
+	warp_event 6, 19, UNION_CAVE_B1F, 1
+	warp_event 6, 27, UNION_CAVE_B1F, 2
+	warp_event 7, 5, ROUTE_36_RUINS_OF_ALPH_GATE, 3
+	warp_event 13, 20, ROUTE_32_RUINS_OF_ALPH_GATE, 1
+	warp_event 13, 21, ROUTE_32_RUINS_OF_ALPH_GATE, 2
 
 	db 2 ; coord events
 	coord_event 11, 14, SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX, RuinsOfAlphOutsideScientistScene1
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index b9d722275..d8113b972 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -394,8 +394,8 @@ RuinsOfAlphResearchCenter_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 6, RUINS_OF_ALPH_OUTSIDE
-	warp_event 3, 7, 6, RUINS_OF_ALPH_OUTSIDE
+	warp_event 2, 7, RUINS_OF_ALPH_OUTSIDE, 6
+	warp_event 3, 7, RUINS_OF_ALPH_OUTSIDE, 6
 
 	db 0 ; coord events
 
diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm
index 93c28b0e0..f0fbba12d 100644
--- a/maps/SafariZoneBeta.asm
+++ b/maps/SafariZoneBeta.asm
@@ -7,8 +7,8 @@ SafariZoneBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 9, 23, 1, SAFARI_ZONE_FUCHSIA_GATE_BETA
-	warp_event 10, 23, 2, SAFARI_ZONE_FUCHSIA_GATE_BETA
+	warp_event 9, 23, SAFARI_ZONE_FUCHSIA_GATE_BETA, 1
+	warp_event 10, 23, SAFARI_ZONE_FUCHSIA_GATE_BETA, 2
 
 	db 0 ; coord events
 
diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm
index f0d39e723..f18421f40 100644
--- a/maps/SafariZoneFuchsiaGateBeta.asm
+++ b/maps/SafariZoneFuchsiaGateBeta.asm
@@ -7,10 +7,10 @@ SafariZoneFuchsiaGateBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, 1, SAFARI_ZONE_BETA
-	warp_event 5, 0, 2, SAFARI_ZONE_BETA
-	warp_event 4, 7, 7, FUCHSIA_CITY
-	warp_event 5, 7, 7, FUCHSIA_CITY
+	warp_event 4, 0, SAFARI_ZONE_BETA, 1
+	warp_event 5, 0, SAFARI_ZONE_BETA, 2
+	warp_event 4, 7, FUCHSIA_CITY, 7
+	warp_event 5, 7, FUCHSIA_CITY, 7
 
 	db 0 ; coord events
 
diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm
index 0c2deae10..a44a0387e 100644
--- a/maps/SafariZoneMainOffice.asm
+++ b/maps/SafariZoneMainOffice.asm
@@ -7,8 +7,8 @@ SafariZoneMainOffice_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 2, FUCHSIA_CITY
-	warp_event 3, 7, 2, FUCHSIA_CITY
+	warp_event 2, 7, FUCHSIA_CITY, 2
+	warp_event 3, 7, FUCHSIA_CITY, 2
 
 	db 0 ; coord events
 
diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm
index c0c75f227..afa22d55d 100644
--- a/maps/SafariZoneWardensHome.asm
+++ b/maps/SafariZoneWardensHome.asm
@@ -78,8 +78,8 @@ SafariZoneWardensHome_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 6, FUCHSIA_CITY
-	warp_event 3, 7, 6, FUCHSIA_CITY
+	warp_event 2, 7, FUCHSIA_CITY, 6
+	warp_event 3, 7, FUCHSIA_CITY, 6
 
 	db 0 ; coord events
 
diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm
index 06c7119d7..752dc6d1e 100644
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -267,21 +267,21 @@ SaffronCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 15 ; warp events
-	warp_event 26, 3, 1, FIGHTING_DOJO
-	warp_event 34, 3, 1, SAFFRON_GYM
-	warp_event 25, 11, 2, SAFFRON_MART
-	warp_event 9, 29, 1, SAFFRON_POKECENTER_1F
-	warp_event 27, 29, 1, MR_PSYCHICS_HOUSE
-	warp_event 8, 3, 2, SAFFRON_MAGNET_TRAIN_STATION
-	warp_event 18, 21, 1, SILPH_CO_1F
-	warp_event 9, 11, 1, COPYCATS_HOUSE_1F
-	warp_event 18, 3, 3, ROUTE_5_SAFFRON_GATE
-	warp_event 0, 24, 3, ROUTE_7_SAFFRON_GATE
-	warp_event 0, 25, 4, ROUTE_7_SAFFRON_GATE
-	warp_event 16, 33, 1, ROUTE_6_SAFFRON_GATE
-	warp_event 17, 33, 2, ROUTE_6_SAFFRON_GATE
-	warp_event 39, 22, 1, ROUTE_8_SAFFRON_GATE
-	warp_event 39, 23, 2, ROUTE_8_SAFFRON_GATE
+	warp_event 26, 3, FIGHTING_DOJO, 1
+	warp_event 34, 3, SAFFRON_GYM, 1
+	warp_event 25, 11, SAFFRON_MART, 2
+	warp_event 9, 29, SAFFRON_POKECENTER_1F, 1
+	warp_event 27, 29, MR_PSYCHICS_HOUSE, 1
+	warp_event 8, 3, SAFFRON_MAGNET_TRAIN_STATION, 2
+	warp_event 18, 21, SILPH_CO_1F, 1
+	warp_event 9, 11, COPYCATS_HOUSE_1F, 1
+	warp_event 18, 3, ROUTE_5_SAFFRON_GATE, 3
+	warp_event 0, 24, ROUTE_7_SAFFRON_GATE, 3
+	warp_event 0, 25, ROUTE_7_SAFFRON_GATE, 4
+	warp_event 16, 33, ROUTE_6_SAFFRON_GATE, 1
+	warp_event 17, 33, ROUTE_6_SAFFRON_GATE, 2
+	warp_event 39, 22, ROUTE_8_SAFFRON_GATE, 1
+	warp_event 39, 23, ROUTE_8_SAFFRON_GATE, 2
 
 	db 0 ; coord events
 
diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm
index f6926ddc0..732a75168 100644
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -292,38 +292,38 @@ SaffronGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 32 ; warp events
-	warp_event 8, 17, 2, SAFFRON_CITY
-	warp_event 9, 17, 2, SAFFRON_CITY
-	warp_event 11, 15, 18, SAFFRON_GYM
-	warp_event 19, 15, 19, SAFFRON_GYM
-	warp_event 19, 11, 20, SAFFRON_GYM
-	warp_event 1, 11, 21, SAFFRON_GYM
-	warp_event 5, 3, 22, SAFFRON_GYM
-	warp_event 11, 5, 23, SAFFRON_GYM
-	warp_event 1, 15, 24, SAFFRON_GYM
-	warp_event 19, 3, 25, SAFFRON_GYM
-	warp_event 15, 17, 26, SAFFRON_GYM
-	warp_event 5, 17, 27, SAFFRON_GYM
-	warp_event 5, 9, 28, SAFFRON_GYM
-	warp_event 9, 3, 29, SAFFRON_GYM
-	warp_event 15, 9, 30, SAFFRON_GYM
-	warp_event 15, 5, 31, SAFFRON_GYM
-	warp_event 1, 5, 32, SAFFRON_GYM
-	warp_event 19, 17, 3, SAFFRON_GYM
-	warp_event 19, 9, 4, SAFFRON_GYM
-	warp_event 1, 9, 5, SAFFRON_GYM
-	warp_event 5, 5, 6, SAFFRON_GYM
-	warp_event 11, 3, 7, SAFFRON_GYM
-	warp_event 1, 17, 8, SAFFRON_GYM
-	warp_event 19, 5, 9, SAFFRON_GYM
-	warp_event 15, 15, 10, SAFFRON_GYM
-	warp_event 5, 15, 11, SAFFRON_GYM
-	warp_event 5, 11, 12, SAFFRON_GYM
-	warp_event 9, 5, 13, SAFFRON_GYM
-	warp_event 15, 11, 14, SAFFRON_GYM
-	warp_event 15, 3, 15, SAFFRON_GYM
-	warp_event 1, 3, 16, SAFFRON_GYM
-	warp_event 11, 9, 17, SAFFRON_GYM
+	warp_event 8, 17, SAFFRON_CITY, 2
+	warp_event 9, 17, SAFFRON_CITY, 2
+	warp_event 11, 15, SAFFRON_GYM, 18
+	warp_event 19, 15, SAFFRON_GYM, 19
+	warp_event 19, 11, SAFFRON_GYM, 20
+	warp_event 1, 11, SAFFRON_GYM, 21
+	warp_event 5, 3, SAFFRON_GYM, 22
+	warp_event 11, 5, SAFFRON_GYM, 23
+	warp_event 1, 15, SAFFRON_GYM, 24
+	warp_event 19, 3, SAFFRON_GYM, 25
+	warp_event 15, 17, SAFFRON_GYM, 26
+	warp_event 5, 17, SAFFRON_GYM, 27
+	warp_event 5, 9, SAFFRON_GYM, 28
+	warp_event 9, 3, SAFFRON_GYM, 29
+	warp_event 15, 9, SAFFRON_GYM, 30
+	warp_event 15, 5, SAFFRON_GYM, 31
+	warp_event 1, 5, SAFFRON_GYM, 32
+	warp_event 19, 17, SAFFRON_GYM, 3
+	warp_event 19, 9, SAFFRON_GYM, 4
+	warp_event 1, 9, SAFFRON_GYM, 5
+	warp_event 5, 5, SAFFRON_GYM, 6
+	warp_event 11, 3, SAFFRON_GYM, 7
+	warp_event 1, 17, SAFFRON_GYM, 8
+	warp_event 19, 5, SAFFRON_GYM, 9
+	warp_event 15, 15, SAFFRON_GYM, 10
+	warp_event 5, 15, SAFFRON_GYM, 11
+	warp_event 5, 11, SAFFRON_GYM, 12
+	warp_event 9, 5, SAFFRON_GYM, 13
+	warp_event 15, 11, SAFFRON_GYM, 14
+	warp_event 15, 3, SAFFRON_GYM, 15
+	warp_event 1, 3, SAFFRON_GYM, 16
+	warp_event 11, 9, SAFFRON_GYM, 17
 
 	db 0 ; coord events
 
diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm
index 4b90f69f2..0c57587d8 100644
--- a/maps/SaffronMagnetTrainStation.asm
+++ b/maps/SaffronMagnetTrainStation.asm
@@ -217,10 +217,10 @@ SaffronMagnetTrainStation_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 8, 17, 6, SAFFRON_CITY
-	warp_event 9, 17, 6, SAFFRON_CITY
-	warp_event 6, 5, 4, GOLDENROD_MAGNET_TRAIN_STATION
-	warp_event 11, 5, 3, GOLDENROD_MAGNET_TRAIN_STATION
+	warp_event 8, 17, SAFFRON_CITY, 6
+	warp_event 9, 17, SAFFRON_CITY, 6
+	warp_event 6, 5, GOLDENROD_MAGNET_TRAIN_STATION, 4
+	warp_event 11, 5, GOLDENROD_MAGNET_TRAIN_STATION, 3
 
 	db 1 ; coord events
 	coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromGoldenrod
diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm
index 2d9708c49..3b701ee2f 100644
--- a/maps/SaffronMart.asm
+++ b/maps/SaffronMart.asm
@@ -39,8 +39,8 @@ SaffronMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 3, SAFFRON_CITY
-	warp_event 3, 7, 3, SAFFRON_CITY
+	warp_event 2, 7, SAFFRON_CITY, 3
+	warp_event 3, 7, SAFFRON_CITY, 3
 
 	db 0 ; coord events
 
diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm
index 9680de72f..943582370 100644
--- a/maps/SaffronPokecenter1F.asm
+++ b/maps/SaffronPokecenter1F.asm
@@ -113,9 +113,9 @@ SaffronPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 4, SAFFRON_CITY
-	warp_event 4, 7, 4, SAFFRON_CITY
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, SAFFRON_CITY, 4
+	warp_event 4, 7, SAFFRON_CITY, 4
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/SaffronPokecenter2FBeta.asm b/maps/SaffronPokecenter2FBeta.asm
index 11d07cc3f..9a5196196 100644
--- a/maps/SaffronPokecenter2FBeta.asm
+++ b/maps/SaffronPokecenter2FBeta.asm
@@ -7,7 +7,7 @@ SaffronPokecenter2FBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 0, 7, 3, SAFFRON_POKECENTER_1F
+	warp_event 0, 7, SAFFRON_POKECENTER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm
index 2870ea52a..be63733a0 100644
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -159,7 +159,7 @@ SeafoamGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 5, 5, 1, ROUTE_20
+	warp_event 5, 5, ROUTE_20, 1
 
 	db 0 ; coord events
 
diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm
index a14659571..925fffb0f 100644
--- a/maps/SilphCo1F.asm
+++ b/maps/SilphCo1F.asm
@@ -57,8 +57,8 @@ SilphCo1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 7, SAFFRON_CITY
-	warp_event 3, 7, 7, SAFFRON_CITY
+	warp_event 2, 7, SAFFRON_CITY, 7
+	warp_event 3, 7, SAFFRON_CITY, 7
 
 	db 0 ; coord events
 
diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm
index 3aa1b2ab5..b9f0be206 100644
--- a/maps/SilverCaveItemRooms.asm
+++ b/maps/SilverCaveItemRooms.asm
@@ -17,8 +17,8 @@ SilverCaveItemRooms_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 13, 3, 3, SILVER_CAVE_ROOM_2
-	warp_event 7, 15, 4, SILVER_CAVE_ROOM_2
+	warp_event 13, 3, SILVER_CAVE_ROOM_2, 3
+	warp_event 7, 15, SILVER_CAVE_ROOM_2, 4
 
 	db 0 ; coord events
 
diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm
index 6f1487619..9dec24604 100644
--- a/maps/SilverCaveOutside.asm
+++ b/maps/SilverCaveOutside.asm
@@ -25,8 +25,8 @@ SilverCaveOutside_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 23, 19, 1, SILVER_CAVE_POKECENTER_1F
-	warp_event 18, 11, 1, SILVER_CAVE_ROOM_1
+	warp_event 23, 19, SILVER_CAVE_POKECENTER_1F, 1
+	warp_event 18, 11, SILVER_CAVE_ROOM_1, 1
 
 	db 0 ; coord events
 
diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm
index 326e5bde2..94ac820ce 100644
--- a/maps/SilverCavePokecenter1F.asm
+++ b/maps/SilverCavePokecenter1F.asm
@@ -31,9 +31,9 @@ SilverCavePokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 1, SILVER_CAVE_OUTSIDE
-	warp_event 4, 7, 1, SILVER_CAVE_OUTSIDE
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, SILVER_CAVE_OUTSIDE, 1
+	warp_event 4, 7, SILVER_CAVE_OUTSIDE, 1
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm
index b6dad455c..74518dbeb 100644
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -31,8 +31,8 @@ SilverCaveRoom1_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 9, 33, 2, SILVER_CAVE_OUTSIDE
-	warp_event 15, 1, 1, SILVER_CAVE_ROOM_2
+	warp_event 9, 33, SILVER_CAVE_OUTSIDE, 2
+	warp_event 15, 1, SILVER_CAVE_ROOM_2, 1
 
 	db 0 ; coord events
 
diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm
index 774e105bc..1002acc78 100644
--- a/maps/SilverCaveRoom2.asm
+++ b/maps/SilverCaveRoom2.asm
@@ -24,10 +24,10 @@ SilverCaveRoom2_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 17, 31, 2, SILVER_CAVE_ROOM_1
-	warp_event 11, 5, 1, SILVER_CAVE_ROOM_3
-	warp_event 13, 21, 1, SILVER_CAVE_ITEM_ROOMS
-	warp_event 23, 3, 2, SILVER_CAVE_ITEM_ROOMS
+	warp_event 17, 31, SILVER_CAVE_ROOM_1, 2
+	warp_event 11, 5, SILVER_CAVE_ROOM_3, 1
+	warp_event 13, 21, SILVER_CAVE_ITEM_ROOMS, 1
+	warp_event 23, 3, SILVER_CAVE_ITEM_ROOMS, 2
 
 	db 0 ; coord events
 
diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm
index 4c4e5ef02..4ca196ea1 100644
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -52,7 +52,7 @@ SilverCaveRoom3_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 9, 33, 2, SILVER_CAVE_ROOM_2
+	warp_event 9, 33, SILVER_CAVE_ROOM_2, 2
 
 	db 0 ; coord events
 
diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm
index 6b4330a2c..79d093970 100644
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -322,8 +322,8 @@ SlowpokeWellB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 17, 15, 6, AZALEA_TOWN
-	warp_event 7, 11, 1, SLOWPOKE_WELL_B2F
+	warp_event 17, 15, AZALEA_TOWN, 6
+	warp_event 7, 11, SLOWPOKE_WELL_B2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm
index 195ab560c..e9da7b24e 100644
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -63,7 +63,7 @@ SlowpokeWellB2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 9, 11, 2, SLOWPOKE_WELL_B1F
+	warp_event 9, 11, SLOWPOKE_WELL_B1F, 2
 
 	db 0 ; coord events
 
diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm
index d8bd3951e..dac4aa66e 100644
--- a/maps/SoulHouse.asm
+++ b/maps/SoulHouse.asm
@@ -74,8 +74,8 @@ SoulHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 7, 6, LAVENDER_TOWN
-	warp_event 5, 7, 6, LAVENDER_TOWN
+	warp_event 4, 7, LAVENDER_TOWN, 6
+	warp_event 5, 7, LAVENDER_TOWN, 6
 
 	db 0 ; coord events
 
diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm
index d3d8ff323..cddd2ed4c 100644
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -104,11 +104,11 @@ SproutTower1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 9, 15, 7, VIOLET_CITY
-	warp_event 10, 15, 7, VIOLET_CITY
-	warp_event 6, 4, 1, SPROUT_TOWER_2F
-	warp_event 2, 6, 2, SPROUT_TOWER_2F
-	warp_event 17, 3, 3, SPROUT_TOWER_2F
+	warp_event 9, 15, VIOLET_CITY, 7
+	warp_event 10, 15, VIOLET_CITY, 7
+	warp_event 6, 4, SPROUT_TOWER_2F, 1
+	warp_event 2, 6, SPROUT_TOWER_2F, 2
+	warp_event 17, 3, SPROUT_TOWER_2F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm
index 73cc7bd48..79da8c462 100644
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -86,10 +86,10 @@ SproutTower2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 6, 4, 3, SPROUT_TOWER_1F
-	warp_event 2, 6, 4, SPROUT_TOWER_1F
-	warp_event 17, 3, 5, SPROUT_TOWER_1F
-	warp_event 10, 14, 1, SPROUT_TOWER_3F
+	warp_event 6, 4, SPROUT_TOWER_1F, 3
+	warp_event 2, 6, SPROUT_TOWER_1F, 4
+	warp_event 17, 3, SPROUT_TOWER_1F, 5
+	warp_event 10, 14, SPROUT_TOWER_3F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index d911fac0f..b52459ab5 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -331,7 +331,7 @@ SproutTower3F_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 10, 14, 4, SPROUT_TOWER_2F
+	warp_event 10, 14, SPROUT_TOWER_2F, 4
 
 	db 1 ; coord events
 	coord_event 11, 9, SCENE_DEFAULT, UnknownScript_0x184947
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index 9bc3365f8..dabd5eef4 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -728,10 +728,10 @@ TeamRocketBaseB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 27, 2, 3, MAHOGANY_MART_1F
-	warp_event 3, 14, 1, TEAM_ROCKET_BASE_B2F
-	warp_event 5, 15, 4, TEAM_ROCKET_BASE_B1F
-	warp_event 25, 2, 3, TEAM_ROCKET_BASE_B1F
+	warp_event 27, 2, MAHOGANY_MART_1F, 3
+	warp_event 3, 14, TEAM_ROCKET_BASE_B2F, 1
+	warp_event 5, 15, TEAM_ROCKET_BASE_B1F, 4
+	warp_event 25, 2, TEAM_ROCKET_BASE_B1F, 3
 
 	db 30 ; coord events
 	; There are five security cameras in the base.
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 052077bc3..67130dd45 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -910,11 +910,11 @@ TeamRocketBaseB2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 3, 14, 2, TEAM_ROCKET_BASE_B1F
-	warp_event 3, 2, 1, TEAM_ROCKET_BASE_B3F
-	warp_event 27, 2, 2, TEAM_ROCKET_BASE_B3F
-	warp_event 3, 6, 3, TEAM_ROCKET_BASE_B3F
-	warp_event 27, 14, 4, TEAM_ROCKET_BASE_B3F
+	warp_event 3, 14, TEAM_ROCKET_BASE_B1F, 2
+	warp_event 3, 2, TEAM_ROCKET_BASE_B3F, 1
+	warp_event 27, 2, TEAM_ROCKET_BASE_B3F, 2
+	warp_event 3, 6, TEAM_ROCKET_BASE_B3F, 3
+	warp_event 27, 14, TEAM_ROCKET_BASE_B3F, 4
 
 	db 9 ; coord events
 	coord_event 5, 14, SCENE_DEFAULT, LanceHealsScript1
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index 1ba793c5c..2b72232fa 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -567,10 +567,10 @@ TeamRocketBaseB3F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 3, 2, 2, TEAM_ROCKET_BASE_B2F
-	warp_event 27, 2, 3, TEAM_ROCKET_BASE_B2F
-	warp_event 3, 6, 4, TEAM_ROCKET_BASE_B2F
-	warp_event 27, 14, 5, TEAM_ROCKET_BASE_B2F
+	warp_event 3, 2, TEAM_ROCKET_BASE_B2F, 2
+	warp_event 27, 2, TEAM_ROCKET_BASE_B2F, 3
+	warp_event 3, 6, TEAM_ROCKET_BASE_B2F, 4
+	warp_event 27, 14, TEAM_ROCKET_BASE_B2F, 5
 
 	db 3 ; coord events
 	coord_event 10, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e04b
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index 0cb0748b7..dc56ead92 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -55,8 +55,8 @@ TimeCapsule_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 7, 4, POKECENTER_2F
-	warp_event 5, 7, 4, POKECENTER_2F
+	warp_event 4, 7, POKECENTER_2F, 4
+	warp_event 5, 7, POKECENTER_2F, 4
 
 	db 0 ; coord events
 
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index 7a5c435d4..419173628 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -524,9 +524,9 @@ TinTower1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 9, 15, 12, ECRUTEAK_CITY
-	warp_event 10, 15, 12, ECRUTEAK_CITY
-	warp_event 10, 2, 2, TIN_TOWER_2F
+	warp_event 9, 15, ECRUTEAK_CITY, 12
+	warp_event 10, 15, ECRUTEAK_CITY, 12
+	warp_event 10, 2, TIN_TOWER_2F, 2
 
 	db 0 ; coord events
 
diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm
index a3a9447af..e23ce1e6a 100644
--- a/maps/TinTower2F.asm
+++ b/maps/TinTower2F.asm
@@ -7,8 +7,8 @@ TinTower2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 10, 14, 1, TIN_TOWER_3F
-	warp_event 10, 2, 3, TIN_TOWER_1F
+	warp_event 10, 14, TIN_TOWER_3F, 1
+	warp_event 10, 2, TIN_TOWER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm
index ce81f87c0..61eebad8f 100644
--- a/maps/TinTower3F.asm
+++ b/maps/TinTower3F.asm
@@ -13,8 +13,8 @@ TinTower3F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 10, 14, 1, TIN_TOWER_2F
-	warp_event 16, 2, 2, TIN_TOWER_4F
+	warp_event 10, 14, TIN_TOWER_2F, 1
+	warp_event 16, 2, TIN_TOWER_4F, 2
 
 	db 0 ; coord events
 
diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm
index 6d7a69860..6f5510f9f 100644
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -24,10 +24,10 @@ TinTower4F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 2, 4, 2, TIN_TOWER_5F
-	warp_event 16, 2, 2, TIN_TOWER_3F
-	warp_event 2, 14, 3, TIN_TOWER_5F
-	warp_event 17, 15, 4, TIN_TOWER_5F
+	warp_event 2, 4, TIN_TOWER_5F, 2
+	warp_event 16, 2, TIN_TOWER_3F, 2
+	warp_event 2, 14, TIN_TOWER_5F, 3
+	warp_event 17, 15, TIN_TOWER_5F, 4
 
 	db 0 ; coord events
 
diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm
index 0e199be0b..bcd38389a 100644
--- a/maps/TinTower5F.asm
+++ b/maps/TinTower5F.asm
@@ -19,10 +19,10 @@ TinTower5F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 11, 15, 2, TIN_TOWER_6F
-	warp_event 2, 4, 1, TIN_TOWER_4F
-	warp_event 2, 14, 3, TIN_TOWER_4F
-	warp_event 17, 15, 4, TIN_TOWER_4F
+	warp_event 11, 15, TIN_TOWER_6F, 2
+	warp_event 2, 4, TIN_TOWER_4F, 1
+	warp_event 2, 14, TIN_TOWER_4F, 3
+	warp_event 17, 15, TIN_TOWER_4F, 4
 
 	db 0 ; coord events
 
diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm
index ac4e7adb6..654aa942f 100644
--- a/maps/TinTower6F.asm
+++ b/maps/TinTower6F.asm
@@ -13,8 +13,8 @@ TinTower6F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 9, 1, TIN_TOWER_7F
-	warp_event 11, 15, 1, TIN_TOWER_5F
+	warp_event 3, 9, TIN_TOWER_7F, 1
+	warp_event 11, 15, TIN_TOWER_5F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm
index 323ee7cdd..44868df45 100644
--- a/maps/TinTower7F.asm
+++ b/maps/TinTower7F.asm
@@ -13,11 +13,11 @@ TinTower7F_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 3, 9, 1, TIN_TOWER_6F
-	warp_event 10, 15, 1, TIN_TOWER_8F
-	warp_event 12, 7, 4, TIN_TOWER_7F
-	warp_event 8, 3, 3, TIN_TOWER_7F
-	warp_event 6, 9, 5, TIN_TOWER_9F
+	warp_event 3, 9, TIN_TOWER_6F, 1
+	warp_event 10, 15, TIN_TOWER_8F, 1
+	warp_event 12, 7, TIN_TOWER_7F, 4
+	warp_event 8, 3, TIN_TOWER_7F, 3
+	warp_event 6, 9, TIN_TOWER_9F, 5
 
 	db 0 ; coord events
 
diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm
index af18d7615..fa9968b64 100644
--- a/maps/TinTower8F.asm
+++ b/maps/TinTower8F.asm
@@ -21,12 +21,12 @@ TinTower8F_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 2, 5, 2, TIN_TOWER_7F
-	warp_event 2, 11, 1, TIN_TOWER_9F
-	warp_event 16, 7, 2, TIN_TOWER_9F
-	warp_event 10, 3, 3, TIN_TOWER_9F
-	warp_event 14, 15, 6, TIN_TOWER_9F
-	warp_event 6, 9, 7, TIN_TOWER_9F
+	warp_event 2, 5, TIN_TOWER_7F, 2
+	warp_event 2, 11, TIN_TOWER_9F, 1
+	warp_event 16, 7, TIN_TOWER_9F, 2
+	warp_event 10, 3, TIN_TOWER_9F, 3
+	warp_event 14, 15, TIN_TOWER_9F, 6
+	warp_event 6, 9, TIN_TOWER_9F, 7
 
 	db 0 ; coord events
 
diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm
index 070ced50d..f7a0965e5 100644
--- a/maps/TinTower9F.asm
+++ b/maps/TinTower9F.asm
@@ -23,13 +23,13 @@ TinTower9F_MapEvents:
 	db 0, 0 ; filler
 
 	db 7 ; warp events
-	warp_event 12, 3, 2, TIN_TOWER_8F
-	warp_event 2, 5, 3, TIN_TOWER_8F
-	warp_event 12, 7, 4, TIN_TOWER_8F
-	warp_event 7, 9, 1, TIN_TOWER_ROOF
-	warp_event 16, 7, 5, TIN_TOWER_7F
-	warp_event 6, 13, 5, TIN_TOWER_8F
-	warp_event 8, 13, 6, TIN_TOWER_8F
+	warp_event 12, 3, TIN_TOWER_8F, 2
+	warp_event 2, 5, TIN_TOWER_8F, 3
+	warp_event 12, 7, TIN_TOWER_8F, 4
+	warp_event 7, 9, TIN_TOWER_ROOF, 1
+	warp_event 16, 7, TIN_TOWER_7F, 5
+	warp_event 6, 13, TIN_TOWER_8F, 5
+	warp_event 8, 13, TIN_TOWER_8F, 6
 
 	db 0 ; coord events
 
diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm
index d997c0f03..c03c47c50 100644
--- a/maps/TinTowerRoof.asm
+++ b/maps/TinTowerRoof.asm
@@ -46,7 +46,7 @@ TinTowerRoof_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 9, 13, 4, TIN_TOWER_9F
+	warp_event 9, 13, TIN_TOWER_9F, 4
 
 	db 0 ; coord events
 
diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm
index 6e25876e5..272d4a905 100644
--- a/maps/TohjoFalls.asm
+++ b/maps/TohjoFalls.asm
@@ -13,8 +13,8 @@ TohjoFalls_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 13, 15, 2, ROUTE_27
-	warp_event 25, 15, 3, ROUTE_27
+	warp_event 13, 15, ROUTE_27, 2
+	warp_event 25, 15, ROUTE_27, 3
 
 	db 0 ; coord events
 
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index 40690c4a3..c690a9546 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -55,8 +55,8 @@ TradeCenter_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 7, 2, POKECENTER_2F
-	warp_event 5, 7, 2, POKECENTER_2F
+	warp_event 4, 7, POKECENTER_2F, 2
+	warp_event 5, 7, POKECENTER_2F, 2
 
 	db 0 ; coord events
 
diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm
index 666b795c4..2bcfe9a3d 100644
--- a/maps/TrainerHouse1F.asm
+++ b/maps/TrainerHouse1F.asm
@@ -139,9 +139,9 @@ TrainerHouse1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 2, 13, 3, VIRIDIAN_CITY
-	warp_event 3, 13, 3, VIRIDIAN_CITY
-	warp_event 8, 2, 1, TRAINER_HOUSE_B1F
+	warp_event 2, 13, VIRIDIAN_CITY, 3
+	warp_event 3, 13, VIRIDIAN_CITY, 3
+	warp_event 8, 2, TRAINER_HOUSE_B1F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index 06bf4017d..7d011b7c8 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -171,7 +171,7 @@ TrainerHouseB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 9, 4, 3, TRAINER_HOUSE_1F
+	warp_event 9, 4, TRAINER_HOUSE_1F, 3
 
 	db 1 ; coord events
 	coord_event 7, 3, SCENE_DEFAULT, TrainerHouseReceptionistScript
diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm
index 7ed7f76f4..2bbb50e4b 100644
--- a/maps/UndergroundPath.asm
+++ b/maps/UndergroundPath.asm
@@ -13,8 +13,8 @@ UndergroundPath_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 2, 3, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
-	warp_event 3, 24, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE
+	warp_event 3, 2, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 3
+	warp_event 3, 24, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 3
 
 	db 0 ; coord events
 
diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm
index 84189c9d3..04bae9c63 100644
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -201,10 +201,10 @@ UnionCave1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 5, 19, 3, UNION_CAVE_B1F
-	warp_event 3, 33, 4, UNION_CAVE_B1F
-	warp_event 17, 31, 1, ROUTE_33
-	warp_event 17, 3, 4, ROUTE_32
+	warp_event 5, 19, UNION_CAVE_B1F, 3
+	warp_event 3, 33, UNION_CAVE_B1F, 4
+	warp_event 17, 31, ROUTE_33, 1
+	warp_event 17, 3, ROUTE_32, 4
 
 	db 0 ; coord events
 
diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm
index 6a9d7da72..844e2dd64 100644
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -154,11 +154,11 @@ UnionCaveB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 3, 3, 7, RUINS_OF_ALPH_OUTSIDE
-	warp_event 3, 11, 8, RUINS_OF_ALPH_OUTSIDE
-	warp_event 7, 19, 1, UNION_CAVE_1F
-	warp_event 3, 33, 2, UNION_CAVE_1F
-	warp_event 17, 31, 1, UNION_CAVE_B2F
+	warp_event 3, 3, RUINS_OF_ALPH_OUTSIDE, 7
+	warp_event 3, 11, RUINS_OF_ALPH_OUTSIDE, 8
+	warp_event 7, 19, UNION_CAVE_1F, 1
+	warp_event 3, 33, UNION_CAVE_1F, 2
+	warp_event 17, 31, UNION_CAVE_B2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm
index 0e9be1712..f33251e69 100644
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -143,7 +143,7 @@ UnionCaveB2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 5, 3, 5, UNION_CAVE_B1F
+	warp_event 5, 3, UNION_CAVE_B1F, 5
 
 	db 0 ; coord events
 
diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm
index 55feb54b5..85dd629c6 100644
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -269,16 +269,16 @@ VermilionCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 10 ; warp events
-	warp_event 5, 5, 1, VERMILION_FISHING_SPEECH_HOUSE
-	warp_event 9, 5, 1, VERMILION_POKECENTER_1F
-	warp_event 7, 13, 1, POKEMON_FAN_CLUB
-	warp_event 13, 13, 1, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE
-	warp_event 21, 13, 2, VERMILION_MART
-	warp_event 21, 17, 1, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE
-	warp_event 10, 19, 1, VERMILION_GYM
-	warp_event 19, 31, 1, VERMILION_PORT_PASSAGE
-	warp_event 20, 31, 2, VERMILION_PORT_PASSAGE
-	warp_event 34, 7, 1, DIGLETTS_CAVE
+	warp_event 5, 5, VERMILION_FISHING_SPEECH_HOUSE, 1
+	warp_event 9, 5, VERMILION_POKECENTER_1F, 1
+	warp_event 7, 13, POKEMON_FAN_CLUB, 1
+	warp_event 13, 13, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 1
+	warp_event 21, 13, VERMILION_MART, 2
+	warp_event 21, 17, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE, 1
+	warp_event 10, 19, VERMILION_GYM, 1
+	warp_event 19, 31, VERMILION_PORT_PASSAGE, 1
+	warp_event 20, 31, VERMILION_PORT_PASSAGE, 2
+	warp_event 34, 7, DIGLETTS_CAVE, 1
 
 	db 0 ; coord events
 
diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm
index a7c9c9979..5a78a70af 100644
--- a/maps/VermilionDiglettsCaveSpeechHouse.asm
+++ b/maps/VermilionDiglettsCaveSpeechHouse.asm
@@ -22,8 +22,8 @@ VermilionDiglettsCaveSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 6, VERMILION_CITY
-	warp_event 3, 7, 6, VERMILION_CITY
+	warp_event 2, 7, VERMILION_CITY, 6
+	warp_event 3, 7, VERMILION_CITY, 6
 
 	db 0 ; coord events
 
diff --git a/maps/VermilionFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm
index 84fc0dc04..a733fac23 100644
--- a/maps/VermilionFishingSpeechHouse.asm
+++ b/maps/VermilionFishingSpeechHouse.asm
@@ -52,8 +52,8 @@ VermilionFishingSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 1, VERMILION_CITY
-	warp_event 3, 7, 1, VERMILION_CITY
+	warp_event 2, 7, VERMILION_CITY, 1
+	warp_event 3, 7, VERMILION_CITY, 1
 
 	db 0 ; coord events
 
diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm
index 9da49e767..605cd857e 100644
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -262,8 +262,8 @@ VermilionGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 17, 7, VERMILION_CITY
-	warp_event 5, 17, 7, VERMILION_CITY
+	warp_event 4, 17, VERMILION_CITY, 7
+	warp_event 5, 17, VERMILION_CITY, 7
 
 	db 0 ; coord events
 
diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm
index b88489650..3dda82a2c 100644
--- a/maps/VermilionMagnetTrainSpeechHouse.asm
+++ b/maps/VermilionMagnetTrainSpeechHouse.asm
@@ -35,8 +35,8 @@ VermilionMagnetTrainSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 4, VERMILION_CITY
-	warp_event 3, 7, 4, VERMILION_CITY
+	warp_event 2, 7, VERMILION_CITY, 4
+	warp_event 3, 7, VERMILION_CITY, 4
 
 	db 0 ; coord events
 
diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm
index 8c7fd611b..8e24b1cb7 100644
--- a/maps/VermilionMart.asm
+++ b/maps/VermilionMart.asm
@@ -38,8 +38,8 @@ VermilionMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 5, VERMILION_CITY
-	warp_event 3, 7, 5, VERMILION_CITY
+	warp_event 2, 7, VERMILION_CITY, 5
+	warp_event 3, 7, VERMILION_CITY, 5
 
 	db 0 ; coord events
 
diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm
index 7330b6f31..700352d7a 100644
--- a/maps/VermilionPokecenter1F.asm
+++ b/maps/VermilionPokecenter1F.asm
@@ -78,9 +78,9 @@ VermilionPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 2, VERMILION_CITY
-	warp_event 4, 7, 2, VERMILION_CITY
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, VERMILION_CITY, 2
+	warp_event 4, 7, VERMILION_CITY, 2
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/VermilionPokecenter2FBeta.asm b/maps/VermilionPokecenter2FBeta.asm
index e8ed5dbd1..392c44556 100644
--- a/maps/VermilionPokecenter2FBeta.asm
+++ b/maps/VermilionPokecenter2FBeta.asm
@@ -7,7 +7,7 @@ VermilionPokecenter2FBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 0, 7, 3, VERMILION_POKECENTER_1F
+	warp_event 0, 7, VERMILION_POKECENTER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index 4a30eac99..65dc59834 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -300,8 +300,8 @@ VermilionPort_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 9, 5, 5, VERMILION_PORT_PASSAGE
-	warp_event 7, 17, 1, FAST_SHIP_1F
+	warp_event 9, 5, VERMILION_PORT_PASSAGE, 5
+	warp_event 7, 17, FAST_SHIP_1F, 1
 
 	db 1 ; coord events
 	coord_event 7, 11, SCENE_DEFAULT, UnknownScript_0x74e20
diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm
index e7afefffe..49756b0d0 100644
--- a/maps/VermilionPortPassage.asm
+++ b/maps/VermilionPortPassage.asm
@@ -20,11 +20,11 @@ VermilionPortPassage_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 15, 0, 8, VERMILION_CITY
-	warp_event 16, 0, 9, VERMILION_CITY
-	warp_event 15, 4, 4, VERMILION_PORT_PASSAGE
-	warp_event 3, 2, 3, VERMILION_PORT_PASSAGE
-	warp_event 3, 14, 1, VERMILION_PORT
+	warp_event 15, 0, VERMILION_CITY, 8
+	warp_event 16, 0, VERMILION_CITY, 9
+	warp_event 15, 4, VERMILION_PORT_PASSAGE, 4
+	warp_event 3, 2, VERMILION_PORT_PASSAGE, 3
+	warp_event 3, 14, VERMILION_PORT, 1
 
 	db 0 ; coord events
 
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index d933b1ff1..10582779d 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -240,16 +240,16 @@ VictoryRoad_MapEvents:
 	db 0, 0 ; filler
 
 	db 10 ; warp events
-	warp_event 9, 67, 5, VICTORY_ROAD_GATE
-	warp_event 1, 49, 3, VICTORY_ROAD
-	warp_event 1, 35, 2, VICTORY_ROAD
-	warp_event 13, 31, 5, VICTORY_ROAD
-	warp_event 13, 17, 4, VICTORY_ROAD
-	warp_event 17, 33, 7, VICTORY_ROAD
-	warp_event 17, 19, 6, VICTORY_ROAD
-	warp_event 0, 11, 9, VICTORY_ROAD
-	warp_event 0, 27, 8, VICTORY_ROAD
-	warp_event 13, 5, 3, ROUTE_23
+	warp_event 9, 67, VICTORY_ROAD_GATE, 5
+	warp_event 1, 49, VICTORY_ROAD, 3
+	warp_event 1, 35, VICTORY_ROAD, 2
+	warp_event 13, 31, VICTORY_ROAD, 5
+	warp_event 13, 17, VICTORY_ROAD, 4
+	warp_event 17, 33, VICTORY_ROAD, 7
+	warp_event 17, 19, VICTORY_ROAD, 6
+	warp_event 0, 11, VICTORY_ROAD, 9
+	warp_event 0, 27, VICTORY_ROAD, 8
+	warp_event 13, 5, ROUTE_23, 3
 
 	db 2 ; coord events
 	coord_event 12, 8, SCENE_DEFAULT, UnknownScript_0x74492
diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm
index 541008e02..41dee39ae 100644
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -99,14 +99,14 @@ VictoryRoadGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 8 ; warp events
-	warp_event 17, 7, 1, ROUTE_22
-	warp_event 18, 7, 1, ROUTE_22
-	warp_event 9, 17, 1, ROUTE_26
-	warp_event 10, 17, 1, ROUTE_26
-	warp_event 9, 0, 1, VICTORY_ROAD
-	warp_event 10, 0, 1, VICTORY_ROAD
-	warp_event 1, 7, 2, ROUTE_28
-	warp_event 2, 7, 2, ROUTE_28
+	warp_event 17, 7, ROUTE_22, 1
+	warp_event 18, 7, ROUTE_22, 1
+	warp_event 9, 17, ROUTE_26, 1
+	warp_event 10, 17, ROUTE_26, 1
+	warp_event 9, 0, VICTORY_ROAD, 1
+	warp_event 10, 0, VICTORY_ROAD, 1
+	warp_event 1, 7, ROUTE_28, 2
+	warp_event 2, 7, ROUTE_28, 2
 
 	db 1 ; coord events
 	coord_event 10, 11, SCENE_DEFAULT, VictoryRoadGateBadgeCheckScene
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
index bcbdcb870..e56cd9100 100644
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -280,15 +280,15 @@ VioletCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 9 ; warp events
-	warp_event 9, 17, 2, VIOLET_MART
-	warp_event 18, 17, 1, VIOLET_GYM
-	warp_event 30, 17, 1, EARLS_POKEMON_ACADEMY
-	warp_event 3, 15, 1, VIOLET_NICKNAME_SPEECH_HOUSE
-	warp_event 31, 25, 1, VIOLET_POKECENTER_1F
-	warp_event 21, 29, 1, VIOLET_KYLES_HOUSE
-	warp_event 23, 5, 1, SPROUT_TOWER_1F
-	warp_event 39, 24, 1, ROUTE_31_VIOLET_GATE
-	warp_event 39, 25, 2, ROUTE_31_VIOLET_GATE
+	warp_event 9, 17, VIOLET_MART, 2
+	warp_event 18, 17, VIOLET_GYM, 1
+	warp_event 30, 17, EARLS_POKEMON_ACADEMY, 1
+	warp_event 3, 15, VIOLET_NICKNAME_SPEECH_HOUSE, 1
+	warp_event 31, 25, VIOLET_POKECENTER_1F, 1
+	warp_event 21, 29, VIOLET_KYLES_HOUSE, 1
+	warp_event 23, 5, SPROUT_TOWER_1F, 1
+	warp_event 39, 24, ROUTE_31_VIOLET_GATE, 1
+	warp_event 39, 25, ROUTE_31_VIOLET_GATE, 2
 
 	db 0 ; coord events
 
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
index 184a5783a..a030379f9 100644
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -283,8 +283,8 @@ VioletGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 15, 2, VIOLET_CITY
-	warp_event 5, 15, 2, VIOLET_CITY
+	warp_event 4, 15, VIOLET_CITY, 2
+	warp_event 5, 15, VIOLET_CITY, 2
 
 	db 0 ; coord events
 
diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm
index 09078a49f..2766556dd 100644
--- a/maps/VioletKylesHouse.asm
+++ b/maps/VioletKylesHouse.asm
@@ -34,8 +34,8 @@ VioletKylesHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 7, 6, VIOLET_CITY
-	warp_event 4, 7, 6, VIOLET_CITY
+	warp_event 3, 7, VIOLET_CITY, 6
+	warp_event 4, 7, VIOLET_CITY, 6
 
 	db 0 ; coord events
 
diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm
index fd520e94b..428ae18c9 100644
--- a/maps/VioletMart.asm
+++ b/maps/VioletMart.asm
@@ -50,8 +50,8 @@ VioletMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 1, VIOLET_CITY
-	warp_event 3, 7, 1, VIOLET_CITY
+	warp_event 2, 7, VIOLET_CITY, 1
+	warp_event 3, 7, VIOLET_CITY, 1
 
 	db 0 ; coord events
 
diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm
index 0706369d7..a59c2e6c1 100644
--- a/maps/VioletNicknameSpeechHouse.asm
+++ b/maps/VioletNicknameSpeechHouse.asm
@@ -46,8 +46,8 @@ VioletNicknameSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 7, 4, VIOLET_CITY
-	warp_event 4, 7, 4, VIOLET_CITY
+	warp_event 3, 7, VIOLET_CITY, 4
+	warp_event 4, 7, VIOLET_CITY, 4
 
 	db 0 ; coord events
 
diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm
index 19923c2d7..efa538493 100644
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -217,9 +217,9 @@ VioletPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 5, VIOLET_CITY
-	warp_event 4, 7, 5, VIOLET_CITY
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, VIOLET_CITY, 5
+	warp_event 4, 7, VIOLET_CITY, 5
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm
index 92dabcf8b..222fb0a24 100644
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -217,11 +217,11 @@ ViridianCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 32, 7, 1, VIRIDIAN_GYM
-	warp_event 21, 9, 1, VIRIDIAN_NICKNAME_SPEECH_HOUSE
-	warp_event 23, 15, 1, TRAINER_HOUSE_1F
-	warp_event 29, 19, 2, VIRIDIAN_MART
-	warp_event 23, 25, 1, VIRIDIAN_POKECENTER_1F
+	warp_event 32, 7, VIRIDIAN_GYM, 1
+	warp_event 21, 9, VIRIDIAN_NICKNAME_SPEECH_HOUSE, 1
+	warp_event 23, 15, TRAINER_HOUSE_1F, 1
+	warp_event 29, 19, VIRIDIAN_MART, 2
+	warp_event 23, 25, VIRIDIAN_POKECENTER_1F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm
index 3079b852e..ddc29bf5c 100644
--- a/maps/ViridianGym.asm
+++ b/maps/ViridianGym.asm
@@ -171,8 +171,8 @@ ViridianGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 17, 1, VIRIDIAN_CITY
-	warp_event 5, 17, 1, VIRIDIAN_CITY
+	warp_event 4, 17, VIRIDIAN_CITY, 1
+	warp_event 5, 17, VIRIDIAN_CITY, 1
 
 	db 0 ; coord events
 
diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm
index 7f41f5c73..53720ea89 100644
--- a/maps/ViridianMart.asm
+++ b/maps/ViridianMart.asm
@@ -38,8 +38,8 @@ ViridianMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 4, VIRIDIAN_CITY
-	warp_event 3, 7, 4, VIRIDIAN_CITY
+	warp_event 2, 7, VIRIDIAN_CITY, 4
+	warp_event 3, 7, VIRIDIAN_CITY, 4
 
 	db 0 ; coord events
 
diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm
index 7c186e22d..40431b616 100644
--- a/maps/ViridianNicknameSpeechHouse.asm
+++ b/maps/ViridianNicknameSpeechHouse.asm
@@ -63,8 +63,8 @@ ViridianNicknameSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, 2, VIRIDIAN_CITY
-	warp_event 3, 7, 2, VIRIDIAN_CITY
+	warp_event 2, 7, VIRIDIAN_CITY, 2
+	warp_event 3, 7, VIRIDIAN_CITY, 2
 
 	db 0 ; coord events
 
diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm
index 8fc0749d8..11b3d8b86 100644
--- a/maps/ViridianPokecenter1F.asm
+++ b/maps/ViridianPokecenter1F.asm
@@ -73,9 +73,9 @@ ViridianPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, 5, VIRIDIAN_CITY
-	warp_event 4, 7, 5, VIRIDIAN_CITY
-	warp_event 0, 7, 1, POKECENTER_2F
+	warp_event 3, 7, VIRIDIAN_CITY, 5
+	warp_event 4, 7, VIRIDIAN_CITY, 5
+	warp_event 0, 7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/ViridianPokecenter2FBeta.asm b/maps/ViridianPokecenter2FBeta.asm
index ea714aa9e..7f184eedc 100644
--- a/maps/ViridianPokecenter2FBeta.asm
+++ b/maps/ViridianPokecenter2FBeta.asm
@@ -7,7 +7,7 @@ ViridianPokecenter2FBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 0, 7, 3, VIRIDIAN_POKECENTER_1F
+	warp_event 0, 7, VIRIDIAN_POKECENTER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm
index f5d19b391..1d2eef8df 100644
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -42,15 +42,15 @@ WhirlIslandB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 9 ; warp events
-	warp_event 5, 5, 2, WHIRL_ISLAND_NW
-	warp_event 35, 3, 2, WHIRL_ISLAND_NE
-	warp_event 29, 9, 3, WHIRL_ISLAND_NE
-	warp_event 9, 31, 3, WHIRL_ISLAND_SW
-	warp_event 23, 31, 2, WHIRL_ISLAND_SW
-	warp_event 31, 29, 2, WHIRL_ISLAND_SE
-	warp_event 25, 21, 1, WHIRL_ISLAND_B2F
-	warp_event 13, 27, 2, WHIRL_ISLAND_B2F
-	warp_event 17, 21, 1, WHIRL_ISLAND_CAVE
+	warp_event 5, 5, WHIRL_ISLAND_NW, 2
+	warp_event 35, 3, WHIRL_ISLAND_NE, 2
+	warp_event 29, 9, WHIRL_ISLAND_NE, 3
+	warp_event 9, 31, WHIRL_ISLAND_SW, 3
+	warp_event 23, 31, WHIRL_ISLAND_SW, 2
+	warp_event 31, 29, WHIRL_ISLAND_SE, 2
+	warp_event 25, 21, WHIRL_ISLAND_B2F, 1
+	warp_event 13, 27, WHIRL_ISLAND_B2F, 2
+	warp_event 17, 21, WHIRL_ISLAND_CAVE, 1
 
 	db 0 ; coord events
 
diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm
index 6a8754b6c..3d1ace476 100644
--- a/maps/WhirlIslandB2F.asm
+++ b/maps/WhirlIslandB2F.asm
@@ -21,10 +21,10 @@ WhirlIslandB2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 11, 5, 7, WHIRL_ISLAND_B1F
-	warp_event 7, 11, 8, WHIRL_ISLAND_B1F
-	warp_event 7, 25, 1, WHIRL_ISLAND_LUGIA_CHAMBER
-	warp_event 13, 31, 5, WHIRL_ISLAND_SW
+	warp_event 11, 5, WHIRL_ISLAND_B1F, 7
+	warp_event 7, 11, WHIRL_ISLAND_B1F, 8
+	warp_event 7, 25, WHIRL_ISLAND_LUGIA_CHAMBER, 1
+	warp_event 13, 31, WHIRL_ISLAND_SW, 5
 
 	db 0 ; coord events
 
diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm
index 98312ad5a..83608829d 100644
--- a/maps/WhirlIslandCave.asm
+++ b/maps/WhirlIslandCave.asm
@@ -7,8 +7,8 @@ WhirlIslandCave_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 7, 5, 9, WHIRL_ISLAND_B1F
-	warp_event 3, 13, 4, WHIRL_ISLAND_NW
+	warp_event 7, 5, WHIRL_ISLAND_B1F, 9
+	warp_event 3, 13, WHIRL_ISLAND_NW, 4
 
 	db 0 ; coord events
 
diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm
index cc3138331..f2b9fab6d 100644
--- a/maps/WhirlIslandLugiaChamber.asm
+++ b/maps/WhirlIslandLugiaChamber.asm
@@ -45,7 +45,7 @@ WhirlIslandLugiaChamber_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 9, 13, 3, WHIRL_ISLAND_B2F
+	warp_event 9, 13, WHIRL_ISLAND_B2F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm
index d1a41c13b..10458252e 100644
--- a/maps/WhirlIslandNE.asm
+++ b/maps/WhirlIslandNE.asm
@@ -13,9 +13,9 @@ WhirlIslandNE_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 13, 2, ROUTE_41
-	warp_event 17, 3, 2, WHIRL_ISLAND_B1F
-	warp_event 13, 11, 3, WHIRL_ISLAND_B1F
+	warp_event 3, 13, ROUTE_41, 2
+	warp_event 17, 3, WHIRL_ISLAND_B1F, 2
+	warp_event 13, 11, WHIRL_ISLAND_B1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm
index 38a413e96..6e0f9c4aa 100644
--- a/maps/WhirlIslandNW.asm
+++ b/maps/WhirlIslandNW.asm
@@ -7,10 +7,10 @@ WhirlIslandNW_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 5, 7, 1, ROUTE_41
-	warp_event 5, 3, 1, WHIRL_ISLAND_B1F
-	warp_event 3, 15, 4, WHIRL_ISLAND_SW
-	warp_event 7, 15, 2, WHIRL_ISLAND_CAVE
+	warp_event 5, 7, ROUTE_41, 1
+	warp_event 5, 3, WHIRL_ISLAND_B1F, 1
+	warp_event 3, 15, WHIRL_ISLAND_SW, 4
+	warp_event 7, 15, WHIRL_ISLAND_CAVE, 2
 
 	db 0 ; coord events
 
diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm
index 51b21821a..9dd6fc3bc 100644
--- a/maps/WhirlIslandSE.asm
+++ b/maps/WhirlIslandSE.asm
@@ -7,8 +7,8 @@ WhirlIslandSE_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 5, 13, 4, ROUTE_41
-	warp_event 5, 3, 6, WHIRL_ISLAND_B1F
+	warp_event 5, 13, ROUTE_41, 4
+	warp_event 5, 3, WHIRL_ISLAND_B1F, 6
 
 	db 0 ; coord events
 
diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm
index c2e1d8295..d6ae335b2 100644
--- a/maps/WhirlIslandSW.asm
+++ b/maps/WhirlIslandSW.asm
@@ -13,11 +13,11 @@ WhirlIslandSW_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 5, 7, 3, ROUTE_41
-	warp_event 17, 3, 5, WHIRL_ISLAND_B1F
-	warp_event 3, 3, 4, WHIRL_ISLAND_B1F
-	warp_event 3, 15, 3, WHIRL_ISLAND_NW
-	warp_event 17, 15, 4, WHIRL_ISLAND_B2F
+	warp_event 5, 7, ROUTE_41, 3
+	warp_event 17, 3, WHIRL_ISLAND_B1F, 5
+	warp_event 3, 3, WHIRL_ISLAND_B1F, 4
+	warp_event 3, 15, WHIRL_ISLAND_NW, 3
+	warp_event 17, 15, WHIRL_ISLAND_B2F, 4
 
 	db 0 ; coord events
 
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm
index 546113c3e..470ff38a3 100644
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -130,9 +130,9 @@ WillsRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 5, 17, 4, INDIGO_PLATEAU_POKECENTER_1F
-	warp_event 4, 2, 1, KOGAS_ROOM
-	warp_event 5, 2, 2, KOGAS_ROOM
+	warp_event 5, 17, INDIGO_PLATEAU_POKECENTER_1F, 4
+	warp_event 4, 2, KOGAS_ROOM, 1
+	warp_event 5, 2, KOGAS_ROOM, 2
 
 	db 0 ; coord events
 
diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm
index 10079981f..a98159020 100644
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -346,9 +346,9 @@ WiseTriosRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 7, 4, 4, ECRUTEAK_CITY
-	warp_event 7, 5, 5, ECRUTEAK_CITY
-	warp_event 1, 4, 5, ECRUTEAK_TIN_TOWER_ENTRANCE
+	warp_event 7, 4, ECRUTEAK_CITY, 4
+	warp_event 7, 5, ECRUTEAK_CITY, 5
+	warp_event 1, 4, ECRUTEAK_TIN_TOWER_ENTRANCE, 5
 
 	db 1 ; coord events
 	coord_event 7, 4, SCENE_DEFAULT, UnknownScript_0x985a3

From 48f4f2366e84483f58ad190db649ea2361ed2e01 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Thu, 1 Feb 2018 22:22:07 -0500
Subject: [PATCH 092/135] Align map event coordinate columns

---
 maps/AzaleaGym.asm                            | 22 ++---
 maps/AzaleaMart.asm                           | 10 +--
 maps/AzaleaPokecenter1F.asm                   | 14 ++--
 maps/AzaleaTown.asm                           | 48 +++++------
 maps/BattleTower1F.asm                        | 18 ++--
 maps/BattleTowerBattleRoom.asm                |  8 +-
 maps/BattleTowerElevator.asm                  |  6 +-
 maps/BattleTowerHallway.asm                   | 14 ++--
 maps/BattleTowerOutside.asm                   | 10 +--
 maps/BillsBrothersHouse.asm                   |  8 +-
 maps/BillsFamilysHouse.asm                    | 16 ++--
 maps/BillsHouse.asm                           |  6 +-
 maps/BlackthornCity.asm                       | 18 ++--
 maps/BlackthornDragonSpeechHouse.asm          |  8 +-
 maps/BlackthornEmysHouse.asm                  | 10 +--
 maps/BlackthornGym1F.asm                      | 28 +++----
 maps/BlackthornGym2F.asm                      | 26 +++---
 maps/BlackthornMart.asm                       | 10 +--
 maps/BlackthornPokecenter1F.asm               | 14 ++--
 maps/BluesHouse.asm                           |  6 +-
 maps/BrunosRoom.asm                           | 10 +--
 maps/BurnedTower1F.asm                        | 36 ++++----
 maps/BurnedTowerB1F.asm                       | 28 +++----
 maps/CeladonCafe.asm                          | 18 ++--
 maps/CeladonCity.asm                          | 22 ++---
 maps/CeladonDeptStore1F.asm                   | 18 ++--
 maps/CeladonDeptStore2F.asm                   | 18 ++--
 maps/CeladonDeptStore3F.asm                   | 20 ++---
 maps/CeladonDeptStore4F.asm                   | 16 ++--
 maps/CeladonDeptStore5F.asm                   | 20 ++---
 maps/CeladonDeptStore6F.asm                   | 20 ++---
 maps/CeladonDeptStoreElevator.asm             |  6 +-
 maps/CeladonGameCorner.asm                    | 80 +++++++++---------
 maps/CeladonGameCornerPrizeRoom.asm           | 12 +--
 maps/CeladonGym.asm                           | 20 ++---
 maps/CeladonMansion1F.asm                     | 24 +++---
 maps/CeladonMansion2F.asm                     | 14 ++--
 maps/CeladonMansion3F.asm                     | 24 +++---
 maps/CeladonMansionRoof.asm                   | 10 +--
 maps/CeladonMansionRoofHouse.asm              |  6 +-
 maps/CeladonPokecenter1F.asm                  | 16 ++--
 maps/CeladonPokecenter2FBeta.asm              |  2 +-
 maps/CeruleanCity.asm                         |  8 +-
 maps/CeruleanGym.asm                          | 22 ++---
 maps/CeruleanGymBadgeSpeechHouse.asm          |  6 +-
 maps/CeruleanMart.asm                         | 10 +--
 maps/CeruleanPokecenter1F.asm                 | 12 +--
 maps/CeruleanPokecenter2FBeta.asm             |  2 +-
 maps/CeruleanPoliceStation.asm                | 10 +--
 maps/CeruleanTradeSpeechHouse.asm             | 12 +--
 maps/CharcoalKiln.asm                         | 16 ++--
 maps/CherrygroveCity.asm                      | 28 +++----
 maps/CherrygroveEvolutionSpeechHouse.asm      | 12 +--
 maps/CherrygroveGymSpeechHouse.asm            | 12 +--
 maps/CherrygroveMart.asm                      | 10 +--
 maps/CherrygrovePokecenter1F.asm              | 14 ++--
 maps/CianwoodCity.asm                         | 26 +++---
 maps/CianwoodGym.asm                          | 26 +++---
 maps/CianwoodLugiaSpeechHouse.asm             | 14 ++--
 maps/CianwoodPharmacy.asm                     | 10 +--
 maps/CianwoodPhotoStudio.asm                  |  6 +-
 maps/CianwoodPokecenter1F.asm                 | 14 ++--
 maps/CinnabarIsland.asm                       |  8 +-
 maps/CinnabarPokecenter1F.asm                 | 12 +--
 maps/CinnabarPokecenter2FBeta.asm             |  2 +-
 maps/Colosseum.asm                            | 12 +--
 maps/CopycatsHouse1F.asm                      | 12 +--
 maps/CopycatsHouse2F.asm                      | 18 ++--
 maps/DanceTheatre.asm                         | 24 +++---
 maps/DarkCaveBlackthornEntrance.asm           |  8 +-
 maps/DarkCaveVioletEntrance.asm               | 14 ++--
 maps/DayCare.asm                              | 16 ++--
 maps/DayOfWeekSiblingsHouse.asm               |  6 +-
 maps/DiglettsCave.asm                         | 14 ++--
 maps/DragonShrine.asm                         | 12 +--
 maps/DragonsDen1F.asm                         |  8 +-
 maps/DragonsDenB1F.asm                        | 14 ++--
 maps/EarlsPokemonAcademy.asm                  | 24 +++---
 maps/EcruteakCity.asm                         | 26 +++---
 maps/EcruteakGym.asm                          | 84 +++++++++----------
 maps/EcruteakItemfinderHouse.asm              | 10 +--
 maps/EcruteakLugiaSpeechHouse.asm             | 10 +--
 maps/EcruteakMart.asm                         | 10 +--
 maps/EcruteakPokecenter1F.asm                 | 16 ++--
 maps/EcruteakTinTowerEntrance.asm             | 20 ++---
 maps/ElmsHouse.asm                            | 14 ++--
 maps/ElmsLab.asm                              | 64 +++++++-------
 maps/FastShip1F.asm                           | 24 +++---
 maps/FastShipB1F.asm                          | 28 +++----
 maps/FastShipCabins_NNW_NNE_NE.asm            | 26 +++---
 maps/FastShipCabins_SE_SSE_CaptainsCabin.asm  | 36 ++++----
 maps/FastShipCabins_SW_SSW_NW.asm             | 24 +++---
 maps/FightingDojo.asm                         | 12 +--
 maps/FuchsiaCity.asm                          | 20 ++---
 maps/FuchsiaGym.asm                           | 20 ++---
 maps/FuchsiaMart.asm                          | 10 +--
 maps/FuchsiaPokecenter1F.asm                  | 14 ++--
 maps/FuchsiaPokecenter2FBeta.asm              |  2 +-
 maps/GoldenrodBikeShop.asm                    | 24 +++---
 maps/GoldenrodCity.asm                        | 36 ++++----
 maps/GoldenrodDeptStore1F.asm                 | 20 ++---
 maps/GoldenrodDeptStore2F.asm                 | 20 ++---
 maps/GoldenrodDeptStore3F.asm                 | 16 ++--
 maps/GoldenrodDeptStore4F.asm                 | 18 ++--
 maps/GoldenrodDeptStore5F.asm                 | 22 ++---
 maps/GoldenrodDeptStore6F.asm                 | 22 ++---
 maps/GoldenrodDeptStoreB1F.asm                | 18 ++--
 maps/GoldenrodDeptStoreElevator.asm           |  6 +-
 maps/GoldenrodDeptStoreRoof.asm               | 26 +++---
 maps/GoldenrodFlowerShop.asm                  |  8 +-
 maps/GoldenrodGameCorner.asm                  | 74 ++++++++--------
 maps/GoldenrodGym.asm                         | 22 ++---
 maps/GoldenrodHappinessRater.asm              | 16 ++--
 maps/GoldenrodMagnetTrainStation.asm          | 12 +--
 maps/GoldenrodNameRater.asm                   | 12 +--
 maps/GoldenrodPPSpeechHouse.asm               | 14 ++--
 maps/GoldenrodPokecenter1F.asm                | 22 ++---
 maps/GoldenrodUnderground.asm                 | 34 ++++----
 ...oldenrodUndergroundSwitchRoomEntrances.asm | 40 ++++-----
 maps/GoldenrodUndergroundWarehouse.asm        | 18 ++--
 maps/GuideGentsHouse.asm                      | 10 +--
 maps/HallOfFame.asm                           |  6 +-
 maps/IcePath1F.asm                            |  8 +-
 maps/IcePathB1F.asm                           | 22 ++---
 maps/IcePathB2FBlackthornSide.asm             |  8 +-
 maps/IcePathB2FMahoganySide.asm               | 22 ++---
 maps/IcePathB3F.asm                           |  8 +-
 maps/IlexForest.asm                           | 30 +++----
 maps/IlexForestAzaleaGate.asm                 | 12 +--
 maps/IndigoPlateauPokecenter1F.asm            | 22 ++---
 maps/KarensRoom.asm                           | 10 +--
 maps/KogasRoom.asm                            | 10 +--
 maps/KurtsHouse.asm                           | 28 +++----
 maps/LakeOfRage.asm                           | 16 ++--
 maps/LakeOfRageHiddenPowerHouse.asm           | 10 +--
 maps/LakeOfRageMagikarpHouse.asm              | 10 +--
 maps/LancesRoom.asm                           | 18 ++--
 maps/LavRadioTower1F.asm                      | 18 ++--
 maps/LavenderMart.asm                         | 10 +--
 maps/LavenderNameRater.asm                    |  6 +-
 maps/LavenderPokecenter1F.asm                 | 14 ++--
 maps/LavenderPokecenter2FBeta.asm             |  2 +-
 maps/LavenderSpeechHouse.asm                  | 10 +--
 maps/LavenderTown.asm                         | 28 +++----
 maps/MahoganyGym.asm                          | 22 ++---
 maps/MahoganyMart1F.asm                       | 16 ++--
 maps/MahoganyPokecenter1F.asm                 | 14 ++--
 maps/MahoganyRedGyaradosSpeechHouse.asm       |  8 +-
 maps/MahoganyTown.asm                         | 26 +++---
 maps/ManiasHouse.asm                          |  6 +-
 maps/MobileBattleRoom.asm                     |  6 +-
 maps/MobileTradeRoom.asm                      |  6 +-
 maps/MountMoon.asm                            | 10 +--
 maps/MountMoonGiftShop.asm                    | 12 +--
 maps/MountMoonSquare.asm                      | 16 ++--
 maps/MountMortar1FInside.asm                  |  8 +-
 maps/MountMortar1FOutside.asm                 |  6 +-
 maps/MountMortar2FInside.asm                  | 12 +--
 maps/MountMortarB1F.asm                       | 12 +--
 maps/MoveDeletersHouse.asm                    | 10 +--
 maps/MrFujisHouse.asm                         | 18 ++--
 maps/MrPokemonsHouse.asm                      | 18 ++--
 maps/MrPsychicsHouse.asm                      | 10 +--
 maps/NationalPark.asm                         | 14 ++--
 maps/NationalParkBugContest.asm               | 16 ++--
 maps/NewBarkTown.asm                          | 24 +++---
 maps/OaksLab.asm                              | 44 +++++-----
 maps/OlivineCafe.asm                          | 10 +--
 maps/OlivineCity.asm                          |  8 +-
 maps/OlivineGoodRodHouse.asm                  |  6 +-
 maps/OlivineGym.asm                           | 12 +--
 maps/OlivineHouseBeta.asm                     | 12 +--
 maps/OlivineLighthouse1F.asm                  |  6 +-
 maps/OlivineLighthouse2F.asm                  |  8 +-
 maps/OlivineLighthouse3F.asm                  | 22 ++---
 maps/OlivineLighthouse4F.asm                  | 24 +++---
 maps/OlivineLighthouse5F.asm                  | 24 +++---
 maps/OlivineLighthouse6F.asm                  | 12 +--
 maps/OlivineMart.asm                          | 10 +--
 maps/OlivinePokecenter1F.asm                  | 14 ++--
 maps/OlivinePort.asm                          | 18 ++--
 maps/OlivinePortPassage.asm                   | 12 +--
 maps/OlivinePunishmentSpeechHouse.asm         | 12 +--
 maps/OlivineTimsHouse.asm                     | 10 +--
 maps/PalletTown.asm                           | 12 +--
 maps/PewterCity.asm                           |  8 +-
 maps/PewterGym.asm                            | 14 ++--
 maps/PewterMart.asm                           | 10 +--
 maps/PewterNidoranSpeechHouse.asm             |  8 +-
 maps/PewterPokecenter1F.asm                   | 16 ++--
 maps/PewterPokecenter2FBeta.asm               |  2 +-
 maps/PewterSnoozeSpeechHouse.asm              | 10 +--
 maps/PlayersHouse1F.asm                       | 28 +++----
 maps/PlayersHouse2F.asm                       | 18 ++--
 maps/PlayersNeighborsHouse.asm                | 14 ++--
 maps/PokeSeersHouse.asm                       |  6 +-
 maps/Pokecenter2F.asm                         | 22 ++---
 maps/PokecomCenterAdminRoomMobile.asm         | 16 ++--
 maps/PokemonFanClub.asm                       | 20 ++---
 maps/PowerPlant.asm                           | 22 ++---
 maps/RadioTower1F.asm                         | 22 ++---
 maps/RadioTower2F.asm                         | 38 ++++-----
 maps/RadioTower3F.asm                         | 26 +++---
 maps/RadioTower4F.asm                         | 26 +++---
 maps/RadioTower5F.asm                         | 28 +++----
 maps/RedsHouse1F.asm                          | 14 ++--
 maps/RedsHouse2F.asm                          |  6 +-
 maps/RockTunnel1F.asm                         | 12 +--
 maps/RockTunnelB1F.asm                        | 14 ++--
 maps/Route1.asm                               |  8 +-
 maps/Route10North.asm                         |  8 +-
 maps/Route10Pokecenter1F.asm                  | 14 ++--
 maps/Route10Pokecenter2FBeta.asm              |  2 +-
 maps/Route10South.asm                         |  8 +-
 maps/Route11.asm                              | 12 +--
 maps/Route12.asm                              | 10 +--
 maps/Route12SuperRodHouse.asm                 |  6 +-
 maps/Route13.asm                              |  8 +-
 maps/Route14.asm                              |  4 +-
 maps/Route15.asm                              |  8 +-
 maps/Route15FuchsiaGate.asm                   | 10 +--
 maps/Route16.asm                              | 12 +--
 maps/Route16FuchsiaSpeechHouse.asm            | 10 +--
 maps/Route16Gate.asm                          | 14 ++--
 maps/Route17.asm                              | 12 +--
 maps/Route17Route18Gate.asm                   | 14 ++--
 maps/Route18.asm                              | 10 +--
 maps/Route19.asm                              | 12 +--
 maps/Route19FuchsiaGate.asm                   | 10 +--
 maps/Route2.asm                               | 22 ++---
 maps/Route20.asm                              |  4 +-
 maps/Route21.asm                              |  2 +-
 maps/Route22.asm                              |  4 +-
 maps/Route23.asm                              |  8 +-
 maps/Route24.asm                              |  2 +-
 maps/Route25.asm                              | 26 +++---
 maps/Route26.asm                              | 12 +--
 maps/Route26HealHouse.asm                     | 10 +--
 maps/Route27.asm                              | 16 ++--
 maps/Route27SandstormHouse.asm                | 10 +--
 maps/Route28.asm                              |  8 +-
 maps/Route28SteelWingHouse.asm                | 12 +--
 maps/Route29.asm                              | 18 ++--
 maps/Route29Route46Gate.asm                   | 12 +--
 maps/Route2Gate.asm                           | 10 +--
 maps/Route2NuggetHouse.asm                    |  6 +-
 maps/Route3.asm                               |  8 +-
 maps/Route30.asm                              | 34 ++++----
 maps/Route30BerryHouse.asm                    | 10 +--
 maps/Route31.asm                              | 20 ++---
 maps/Route31VioletGate.asm                    | 12 +--
 maps/Route32.asm                              | 30 +++----
 maps/Route32Pokecenter1F.asm                  | 12 +--
 maps/Route32RuinsOfAlphGate.asm               | 14 ++--
 maps/Route33.asm                              |  4 +-
 maps/Route34.asm                              | 14 ++--
 maps/Route34IlexForestGate.asm                | 18 ++--
 maps/Route35.asm                              | 22 ++---
 maps/Route35GoldenrodGate.asm                 | 14 ++--
 maps/Route35NationalParkGate.asm              | 16 ++--
 maps/Route36.asm                              | 26 +++---
 maps/Route36NationalParkGate.asm              | 34 ++++----
 maps/Route36RuinsOfAlphGate.asm               | 12 +--
 maps/Route37.asm                              | 18 ++--
 maps/Route38.asm                              | 18 ++--
 maps/Route38EcruteakGate.asm                  | 10 +--
 maps/Route39.asm                              | 26 +++---
 maps/Route39Barn.asm                          | 10 +--
 maps/Route39Farmhouse.asm                     | 12 +--
 maps/Route4.asm                               | 14 ++--
 maps/Route40.asm                              | 20 ++---
 maps/Route40BattleTowerGate.asm               | 12 +--
 maps/Route41.asm                              | 10 +--
 maps/Route42.asm                              | 26 +++---
 maps/Route42EcruteakGate.asm                  | 10 +--
 maps/Route43.asm                              | 14 ++--
 maps/Route43Gate.asm                          | 14 ++--
 maps/Route43MahoganyGate.asm                  | 10 +--
 maps/Route44.asm                              | 24 +++---
 maps/Route45.asm                              | 20 ++---
 maps/Route46.asm                              | 18 ++--
 maps/Route5.asm                               |  4 +-
 maps/Route5CleanseTagHouse.asm                | 12 +--
 maps/Route5SaffronGate.asm                    | 10 +--
 maps/Route5UndergroundPathEntrance.asm        |  8 +-
 maps/Route6.asm                               | 10 +--
 maps/Route6SaffronGate.asm                    | 10 +--
 maps/Route6UndergroundPathEntrance.asm        |  6 +-
 maps/Route7.asm                               |  8 +-
 maps/Route7SaffronGate.asm                    | 10 +--
 maps/Route8.asm                               | 16 ++--
 maps/Route8SaffronGate.asm                    | 10 +--
 maps/Route9.asm                               |  8 +-
 maps/RuinsOfAlphAerodactylChamber.asm         | 22 ++---
 maps/RuinsOfAlphAerodactylItemRoom.asm        | 20 ++---
 maps/RuinsOfAlphAerodactylWordRoom.asm        |  4 +-
 maps/RuinsOfAlphHoOhChamber.asm               | 22 ++---
 maps/RuinsOfAlphHoOhItemRoom.asm              | 20 ++---
 maps/RuinsOfAlphHoOhWordRoom.asm              |  4 +-
 maps/RuinsOfAlphInnerChamber.asm              | 52 ++++++------
 maps/RuinsOfAlphKabutoChamber.asm             | 26 +++---
 maps/RuinsOfAlphKabutoItemRoom.asm            | 20 ++---
 maps/RuinsOfAlphKabutoWordRoom.asm            |  4 +-
 maps/RuinsOfAlphOmanyteChamber.asm            | 22 ++---
 maps/RuinsOfAlphOmanyteItemRoom.asm           | 20 ++---
 maps/RuinsOfAlphOmanyteWordRoom.asm           |  4 +-
 maps/RuinsOfAlphOutside.asm                   | 18 ++--
 maps/RuinsOfAlphResearchCenter.asm            | 16 ++--
 maps/SafariZoneBeta.asm                       |  2 +-
 maps/SafariZoneFuchsiaGateBeta.asm            |  8 +-
 maps/SafariZoneMainOffice.asm                 |  4 +-
 maps/SafariZoneWardensHome.asm                | 14 ++--
 maps/SaffronCity.asm                          | 30 +++----
 maps/SaffronGym.asm                           | 62 +++++++-------
 maps/SaffronMagnetTrainStation.asm            | 16 ++--
 maps/SaffronMart.asm                          | 10 +--
 maps/SaffronPokecenter1F.asm                  | 14 ++--
 maps/SaffronPokecenter2FBeta.asm              |  2 +-
 maps/SeafoamGym.asm                           |  6 +-
 maps/SilphCo1F.asm                            |  8 +-
 maps/SilverCaveItemRooms.asm                  |  6 +-
 maps/SilverCaveOutside.asm                    |  2 +-
 maps/SilverCavePokecenter1F.asm               | 10 +--
 maps/SilverCaveRoom1.asm                      | 10 +--
 maps/SilverCaveRoom2.asm                      |  6 +-
 maps/SilverCaveRoom3.asm                      |  4 +-
 maps/SlowpokeWellB1F.asm                      | 18 ++--
 maps/SlowpokeWellB2F.asm                      |  6 +-
 maps/SoulHouse.asm                            | 12 +--
 maps/SproutTower1F.asm                        | 20 ++---
 maps/SproutTower2F.asm                        | 12 +--
 maps/SproutTower3F.asm                        | 24 +++---
 maps/TeamRocketBaseB1F.asm                    | 82 +++++++++---------
 maps/TeamRocketBaseB2F.asm                    | 76 ++++++++---------
 maps/TeamRocketBaseB3F.asm                    | 50 +++++------
 maps/TimeCapsule.asm                          | 12 +--
 maps/TinTower1F.asm                           | 22 ++---
 maps/TinTower2F.asm                           |  2 +-
 maps/TinTower3F.asm                           |  4 +-
 maps/TinTower4F.asm                           | 10 +--
 maps/TinTower5F.asm                           |  8 +-
 maps/TinTower6F.asm                           |  4 +-
 maps/TinTower7F.asm                           | 10 +--
 maps/TinTower8F.asm                           | 16 ++--
 maps/TinTower9F.asm                           | 16 ++--
 maps/TinTowerRoof.asm                         |  4 +-
 maps/TohjoFalls.asm                           |  2 +-
 maps/TradeCenter.asm                          | 12 +--
 maps/TrainerHouse1F.asm                       | 22 ++---
 maps/TrainerHouseB1F.asm                      |  8 +-
 maps/UndergroundPath.asm                      |  8 +-
 maps/UnionCave1F.asm                          | 16 ++--
 maps/UnionCaveB1F.asm                         | 18 ++--
 maps/UnionCaveB2F.asm                         |  8 +-
 maps/VermilionCity.asm                        | 26 +++---
 maps/VermilionDiglettsCaveSpeechHouse.asm     |  6 +-
 maps/VermilionFishingSpeechHouse.asm          |  8 +-
 maps/VermilionGym.asm                         | 48 +++++------
 maps/VermilionMagnetTrainSpeechHouse.asm      | 12 +--
 maps/VermilionMart.asm                        | 10 +--
 maps/VermilionPokecenter1F.asm                | 14 ++--
 maps/VermilionPokecenter2FBeta.asm            |  2 +-
 maps/VermilionPort.asm                        | 10 +--
 maps/VermilionPortPassage.asm                 | 12 +--
 maps/VictoryRoad.asm                          | 24 +++---
 maps/VictoryRoadGate.asm                      | 20 ++---
 maps/VioletCity.asm                           | 14 ++--
 maps/VioletGym.asm                            | 16 ++--
 maps/VioletKylesHouse.asm                     |  8 +-
 maps/VioletMart.asm                           | 10 +--
 maps/VioletNicknameSpeechHouse.asm            | 10 +--
 maps/VioletPokecenter1F.asm                   | 16 ++--
 maps/ViridianCity.asm                         | 14 ++--
 maps/ViridianGym.asm                          | 12 +--
 maps/ViridianMart.asm                         | 10 +--
 maps/ViridianNicknameSpeechHouse.asm          | 12 +--
 maps/ViridianPokecenter1F.asm                 | 14 ++--
 maps/ViridianPokecenter2FBeta.asm             |  2 +-
 maps/WhirlIslandB1F.asm                       | 18 ++--
 maps/WhirlIslandB2F.asm                       | 10 +--
 maps/WhirlIslandCave.asm                      |  4 +-
 maps/WhirlIslandLugiaChamber.asm              |  4 +-
 maps/WhirlIslandNE.asm                        |  4 +-
 maps/WhirlIslandNW.asm                        |  8 +-
 maps/WhirlIslandSE.asm                        |  4 +-
 maps/WhirlIslandSW.asm                        | 10 +--
 maps/WillsRoom.asm                            |  8 +-
 maps/WiseTriosRoom.asm                        | 20 ++---
 388 files changed, 2985 insertions(+), 2985 deletions(-)

diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
index 3d0ab665b..54fbfcea6 100644
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -363,20 +363,20 @@ AzaleaGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 15, AZALEA_TOWN, 5
-	warp_event 5, 15, AZALEA_TOWN, 5
+	warp_event  4, 15, AZALEA_TOWN, 5
+	warp_event  5, 15, AZALEA_TOWN, 5
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 3, 13, BGEVENT_READ, AzaleaGymStatue
-	bg_event 6, 13, BGEVENT_READ, AzaleaGymStatue
+	bg_event  3, 13, BGEVENT_READ, AzaleaGymStatue
+	bg_event  6, 13, BGEVENT_READ, AzaleaGymStatue
 
 	db 7 ; object events
-	object_event 5, 7, SPRITE_BUGSY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1
-	object_event 5, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherBenny, -1
-	object_event 8, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1
-	object_event 0, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherJosh, -1
-	object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1
-	object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1
-	object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1
+	object_event  5,  7, SPRITE_BUGSY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1
+	object_event  5,  3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherBenny, -1
+	object_event  8,  8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1
+	object_event  0,  2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherJosh, -1
+	object_event  4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1
+	object_event  5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1
+	object_event  7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1
diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm
index 4100363d9..c98ff31ac 100644
--- a/maps/AzaleaMart.asm
+++ b/maps/AzaleaMart.asm
@@ -47,14 +47,14 @@ AzaleaMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, AZALEA_TOWN, 3
-	warp_event 3, 7, AZALEA_TOWN, 3
+	warp_event  2,  7, AZALEA_TOWN, 3
+	warp_event  3,  7, AZALEA_TOWN, 3
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1
-	object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1
-	object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1
+	object_event  2,  5, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1
+	object_event  7,  2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1
diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm
index 64ceb7cd4..85725aeba 100644
--- a/maps/AzaleaPokecenter1F.asm
+++ b/maps/AzaleaPokecenter1F.asm
@@ -78,16 +78,16 @@ AzaleaPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, AZALEA_TOWN, 1
-	warp_event 4, 7, AZALEA_TOWN, 1
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, AZALEA_TOWN, 1
+	warp_event  4,  7, AZALEA_TOWN, 1
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1
-	object_event 9, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1
-	object_event 6, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1
-	object_event 1, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FPokefanFScript, -1
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1
+	object_event  9,  6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1
+	object_event  6,  1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1
+	object_event  1,  4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FPokefanFScript, -1
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index 61dd4acff..5bb751a7f 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -457,41 +457,41 @@ AzaleaTown_MapEvents:
 	db 0, 0 ; filler
 
 	db 8 ; warp events
-	warp_event 15, 9, AZALEA_POKECENTER_1F, 1
+	warp_event 15,  9, AZALEA_POKECENTER_1F, 1
 	warp_event 21, 13, CHARCOAL_KILN, 1
-	warp_event 21, 5, AZALEA_MART, 2
-	warp_event 9, 5, KURTS_HOUSE, 1
+	warp_event 21,  5, AZALEA_MART, 2
+	warp_event  9,  5, KURTS_HOUSE, 1
 	warp_event 10, 15, AZALEA_GYM, 1
-	warp_event 31, 7, SLOWPOKE_WELL_B1F, 1
-	warp_event 2, 10, ILEX_FOREST_AZALEA_GATE, 3
-	warp_event 2, 11, ILEX_FOREST_AZALEA_GATE, 4
+	warp_event 31,  7, SLOWPOKE_WELL_B1F, 1
+	warp_event  2, 10, ILEX_FOREST_AZALEA_GATE, 3
+	warp_event  2, 11, ILEX_FOREST_AZALEA_GATE, 4
 
 	db 3 ; coord events
-	coord_event 5, 10, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene1
-	coord_event 5, 11, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene2
-	coord_event 9, 6, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL, AzaleaTownCelebiScene
+	coord_event  5, 10, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene1
+	coord_event  5, 11, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene2
+	coord_event  9,  6, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL, AzaleaTownCelebiScene
 
 	db 9 ; bg events
-	bg_event 19, 9, BGEVENT_READ, AzaleaTownSign
-	bg_event 10, 9, BGEVENT_READ, KurtsHouseSign
+	bg_event 19,  9, BGEVENT_READ, AzaleaTownSign
+	bg_event 10,  9, BGEVENT_READ, KurtsHouseSign
 	bg_event 14, 15, BGEVENT_READ, AzaleaGymSign
-	bg_event 29, 7, BGEVENT_READ, SlowpokeWellSign
+	bg_event 29,  7, BGEVENT_READ, SlowpokeWellSign
 	bg_event 19, 13, BGEVENT_READ, CharcoalKilnSign
-	bg_event 16, 9, BGEVENT_READ, AzaleaTownPokecenterSign
-	bg_event 22, 5, BGEVENT_READ, AzaleaTownMartSign
-	bg_event 3, 9, BGEVENT_READ, AzaleaTownIlextForestSign
-	bg_event 31, 6, BGEVENT_ITEM, AzaleaTownHiddenFullHeal
+	bg_event 16,  9, BGEVENT_READ, AzaleaTownPokecenterSign
+	bg_event 22,  5, BGEVENT_READ, AzaleaTownMartSign
+	bg_event  3,  9, BGEVENT_READ, AzaleaTownIlextForestSign
+	bg_event 31,  6, BGEVENT_ITEM, AzaleaTownHiddenFullHeal
 
 	db 12 ; object events
-	object_event 31, 9, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
-	object_event 21, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1
+	object_event 31,  9, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
+	object_event 21,  9, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1
 	object_event 15, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1
-	object_event 7, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1
-	object_event 8, 17, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
-	object_event 18, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
-	object_event 29, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
+	object_event  7,  9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1
+	object_event  8, 17, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
+	object_event 18,  9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
+	object_event 29,  9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
 	object_event 15, 15, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
-	object_event 8, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhiteApricornTree, -1
+	object_event  8,  2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhiteApricornTree, -1
 	object_event 11, 10, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
 	object_event 10, 16, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket2Script, EVENT_SLOWPOKE_WELL_ROCKETS
-	object_event 6, 5, SPRITE_KURT_OUTSIDE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT
+	object_event  6,  5, SPRITE_KURT_OUTSIDE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index 9c1357646..71415b5d6 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -795,18 +795,18 @@ BattleTower1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 7, 9, BATTLE_TOWER_OUTSIDE, 3
-	warp_event 8, 9, BATTLE_TOWER_OUTSIDE, 4
-	warp_event 7, 0, BATTLE_TOWER_ELEVATOR, 1
+	warp_event  7,  9, BATTLE_TOWER_OUTSIDE, 3
+	warp_event  8,  9, BATTLE_TOWER_OUTSIDE, 4
+	warp_event  7,  0, BATTLE_TOWER_ELEVATOR, 1
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 6, 6, BGEVENT_READ, MapBattleTower1FSignpost0Script
+	bg_event  6,  6, BGEVENT_READ, MapBattleTower1FSignpost0Script
 
 	db 5 ; object events
-	object_event 7, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1
-	object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1
-	object_event 4, 9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1
-	object_event 1, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1
-	object_event 14, 3, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x9e56e, -1
+	object_event  7,  6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1
+	object_event 14,  9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1
+	object_event  4,  9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1
+	object_event  1,  3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1
+	object_event 14,  3, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x9e56e, -1
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index 2d65c076e..dc291855a 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -140,13 +140,13 @@ BattleTowerBattleRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 7, BATTLE_TOWER_HALLWAY, 4
-	warp_event 4, 7, BATTLE_TOWER_HALLWAY, 4
+	warp_event  3,  7, BATTLE_TOWER_HALLWAY, 4
+	warp_event  4,  7, BATTLE_TOWER_HALLWAY, 4
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 4, 0, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
-	object_event 1, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
+	object_event  4,  0, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
+	object_event  1,  6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
index 439233867..f2b3621ba 100644
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -45,12 +45,12 @@ BattleTowerElevator_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 1, 3, BATTLE_TOWER_HALLWAY, 1
-	warp_event 2, 3, BATTLE_TOWER_HALLWAY, 1
+	warp_event  1,  3, BATTLE_TOWER_HALLWAY, 1
+	warp_event  2,  3, BATTLE_TOWER_HALLWAY, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 1, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1
+	object_event  1,  2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
index 3f046f21d..8cf22e2f4 100644
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -78,16 +78,16 @@ BattleTowerHallway_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 11, 1, BATTLE_TOWER_ELEVATOR, 1
-	warp_event 5, 0, BATTLE_TOWER_BATTLE_ROOM, 1
-	warp_event 7, 0, BATTLE_TOWER_BATTLE_ROOM, 1
-	warp_event 9, 0, BATTLE_TOWER_BATTLE_ROOM, 1
-	warp_event 13, 0, BATTLE_TOWER_BATTLE_ROOM, 1
-	warp_event 15, 0, BATTLE_TOWER_BATTLE_ROOM, 1
+	warp_event 11,  1, BATTLE_TOWER_ELEVATOR, 1
+	warp_event  5,  0, BATTLE_TOWER_BATTLE_ROOM, 1
+	warp_event  7,  0, BATTLE_TOWER_BATTLE_ROOM, 1
+	warp_event  9,  0, BATTLE_TOWER_BATTLE_ROOM, 1
+	warp_event 13,  0, BATTLE_TOWER_BATTLE_ROOM, 1
+	warp_event 15,  0, BATTLE_TOWER_BATTLE_ROOM, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEvents, -1
+	object_event 11,  2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEvents, -1
diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm
index 4e2a719e2..6f3e6674c 100644
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -128,10 +128,10 @@ BattleTowerOutside_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 8, 21, ROUTE_40_BATTLE_TOWER_GATE, 3
-	warp_event 9, 21, ROUTE_40_BATTLE_TOWER_GATE, 4
-	warp_event 8, 9, BATTLE_TOWER_1F, 1
-	warp_event 9, 9, BATTLE_TOWER_1F, 2
+	warp_event  8, 21, ROUTE_40_BATTLE_TOWER_GATE, 3
+	warp_event  9, 21, ROUTE_40_BATTLE_TOWER_GATE, 4
+	warp_event  8,  9, BATTLE_TOWER_1F, 1
+	warp_event  9,  9, BATTLE_TOWER_1F, 2
 
 	db 0 ; coord events
 
@@ -139,7 +139,7 @@ BattleTowerOutside_MapEvents:
 	bg_event 10, 10, BGEVENT_READ, MapBattleTowerOutsideSignpost0Script
 
 	db 4 ; object events
-	object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1
+	object_event  6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1
 	object_event 13, 11, SPRITE_BUENA, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1
 	object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
 	object_event 12, 24, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm
index e2681c979..e669586e0 100644
--- a/maps/BillsBrothersHouse.asm
+++ b/maps/BillsBrothersHouse.asm
@@ -29,13 +29,13 @@ BillsBrothersHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, FUCHSIA_CITY, 4
-	warp_event 3, 7, FUCHSIA_CITY, 4
+	warp_event  2,  7, FUCHSIA_CITY, 4
+	warp_event  3,  7, FUCHSIA_CITY, 4
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BillsBrotherScript, -1
-	object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsBrothersHouseYoungsterScript, -1
+	object_event  2,  3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BillsBrotherScript, -1
+	object_event  6,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsBrothersHouseYoungsterScript, -1
diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm
index 6357b69de..5060cc5a0 100644
--- a/maps/BillsFamilysHouse.asm
+++ b/maps/BillsFamilysHouse.asm
@@ -244,17 +244,17 @@ BillsFamilysHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, GOLDENROD_CITY, 4
-	warp_event 3, 7, GOLDENROD_CITY, 4
+	warp_event  2,  7, GOLDENROD_CITY, 4
+	warp_event  3,  7, GOLDENROD_CITY, 4
 
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event 0, 1, BGEVENT_READ, BillsHouseBookshelf2
-	bg_event 1, 1, BGEVENT_READ, BillsHouseBookshelf1
-	bg_event 7, 1, BGEVENT_READ, BillsHouseRadio
+	bg_event  0,  1, BGEVENT_READ, BillsHouseBookshelf2
+	bg_event  1,  1, BGEVENT_READ, BillsHouseBookshelf1
+	bg_event  7,  1, BGEVENT_READ, BillsHouseRadio
 
 	db 3 ; object events
-	object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillScript, EVENT_MET_BILL
-	object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMomScript, -1
-	object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSisterScript, -1
+	object_event  2,  3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillScript, EVENT_MET_BILL
+	object_event  5,  3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMomScript, -1
+	object_event  5,  4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSisterScript, -1
diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
index 6ce1cbcd2..53a803642 100644
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -355,12 +355,12 @@ BillsHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, ROUTE_25, 1
-	warp_event 3, 7, ROUTE_25, 1
+	warp_event  2,  7, ROUTE_25, 1
+	warp_event  3,  7, ROUTE_25, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BillsGrandpa, -1
+	object_event  2,  3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BillsGrandpa, -1
diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm
index 3d9dd2a41..6add75d58 100644
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -319,28 +319,28 @@ BlackthornCity_MapEvents:
 	warp_event 29, 23, BLACKTHORN_EMYS_HOUSE, 1
 	warp_event 15, 29, BLACKTHORN_MART, 2
 	warp_event 21, 29, BLACKTHORN_POKECENTER_1F, 1
-	warp_event 9, 31, MOVE_DELETERS_HOUSE, 1
-	warp_event 36, 9, ICE_PATH_1F, 2
-	warp_event 20, 1, DRAGONS_DEN_1F, 1
+	warp_event  9, 31, MOVE_DELETERS_HOUSE, 1
+	warp_event 36,  9, ICE_PATH_1F, 2
+	warp_event 20,  1, DRAGONS_DEN_1F, 1
 
 	db 0 ; coord events
 
 	db 7 ; bg events
 	bg_event 34, 24, BGEVENT_READ, BlackthornCitySign
 	bg_event 17, 13, BGEVENT_READ, BlackthornGymSign
-	bg_event 7, 31, BGEVENT_READ, MoveDeletersHouseSign
-	bg_event 21, 3, BGEVENT_READ, DragonDensSign
-	bg_event 5, 25, BGEVENT_READ, BlackthornCityTrainerTips
+	bg_event  7, 31, BGEVENT_READ, MoveDeletersHouseSign
+	bg_event 21,  3, BGEVENT_READ, DragonDensSign
+	bg_event  5, 25, BGEVENT_READ, BlackthornCityTrainerTips
 	bg_event 16, 29, BGEVENT_READ, BlackthornCityMartSign
 	bg_event 22, 29, BGEVENT_READ, BlackthornCityPokecenterSign
 
 	db 9 ; object events
 	object_event 18, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
 	object_event 19, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
-	object_event 20, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
-	object_event 21, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps2Script, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
+	object_event 20,  2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
+	object_event 21,  2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps2Script, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
 	object_event 24, 31, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornBlackBeltScript, -1
-	object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1
+	object_event  9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1
 	object_event 13, 15, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornYoungsterScript, -1
 	object_event 22, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
 	object_event 35, 19, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF2Script, -1
diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm
index 530421296..8b4575611 100644
--- a/maps/BlackthornDragonSpeechHouse.asm
+++ b/maps/BlackthornDragonSpeechHouse.asm
@@ -49,13 +49,13 @@ BlackthornDragonSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, BLACKTHORN_CITY, 2
-	warp_event 3, 7, BLACKTHORN_CITY, 2
+	warp_event  2,  7, BLACKTHORN_CITY, 2
+	warp_event  3,  7, BLACKTHORN_CITY, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1
-	object_event 5, 5, SPRITE_EKANS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1
+	object_event  2,  3, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1
+	object_event  5,  5, SPRITE_EKANS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1
diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm
index 2e8853727..01fffb4de 100644
--- a/maps/BlackthornEmysHouse.asm
+++ b/maps/BlackthornEmysHouse.asm
@@ -21,14 +21,14 @@ BlackthornEmysHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, BLACKTHORN_CITY, 3
-	warp_event 3, 7, BLACKTHORN_CITY, 3
+	warp_event  2,  7, BLACKTHORN_CITY, 3
+	warp_event  3,  7, BLACKTHORN_CITY, 3
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, EmysHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, EmysHouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, EmysHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, EmysHouseBookshelf
 
 	db 1 ; object events
-	object_event 2, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Emy, -1
+	object_event  2,  3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Emy, -1
diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm
index 07af82bcf..fd4d241a2 100644
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -388,23 +388,23 @@ BlackthornGym1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 7 ; warp events
-	warp_event 4, 17, BLACKTHORN_CITY, 1
-	warp_event 5, 17, BLACKTHORN_CITY, 1
-	warp_event 1, 7, BLACKTHORN_GYM_2F, 1
-	warp_event 7, 9, BLACKTHORN_GYM_2F, 2
-	warp_event 2, 6, BLACKTHORN_GYM_2F, 3
-	warp_event 7, 7, BLACKTHORN_GYM_2F, 4
-	warp_event 7, 6, BLACKTHORN_GYM_2F, 5
+	warp_event  4, 17, BLACKTHORN_CITY, 1
+	warp_event  5, 17, BLACKTHORN_CITY, 1
+	warp_event  1,  7, BLACKTHORN_GYM_2F, 1
+	warp_event  7,  9, BLACKTHORN_GYM_2F, 2
+	warp_event  2,  6, BLACKTHORN_GYM_2F, 3
+	warp_event  7,  7, BLACKTHORN_GYM_2F, 4
+	warp_event  7,  6, BLACKTHORN_GYM_2F, 5
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 3, 15, BGEVENT_READ, BlackthornGymStatue
-	bg_event 6, 15, BGEVENT_READ, BlackthornGymStatue
+	bg_event  3, 15, BGEVENT_READ, BlackthornGymStatue
+	bg_event  6, 15, BGEVENT_READ, BlackthornGymStatue
 
 	db 5 ; object events
-	object_event 5, 3, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornGymClairScript, -1
-	object_event 6, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermMike, -1
-	object_event 1, 14, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1
-	object_event 9, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1
-	object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1
+	object_event  5,  3, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornGymClairScript, -1
+	object_event  6,  6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermMike, -1
+	object_event  1, 14, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1
+	object_event  9,  2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1
+	object_event  7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1
diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm
index 2b41c2775..ede7029cb 100644
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -127,22 +127,22 @@ BlackthornGym2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 1, 7, BLACKTHORN_GYM_1F, 3
-	warp_event 7, 9, BLACKTHORN_GYM_1F, 4
-	warp_event 2, 5, BLACKTHORN_GYM_1F, 5 ; hole
-	warp_event 8, 7, BLACKTHORN_GYM_1F, 6 ; hole
-	warp_event 8, 3, BLACKTHORN_GYM_1F, 7 ; hole
+	warp_event  1,  7, BLACKTHORN_GYM_1F, 3
+	warp_event  7,  9, BLACKTHORN_GYM_1F, 4
+	warp_event  2,  5, BLACKTHORN_GYM_1F, 5 ; hole
+	warp_event  8,  7, BLACKTHORN_GYM_1F, 6 ; hole
+	warp_event  8,  3, BLACKTHORN_GYM_1F, 7 ; hole
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 8 ; object events
-	object_event 4, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermCody, -1
-	object_event 4, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1
-	object_event 8, 2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
-	object_event 2, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
-	object_event 6, 16, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
-	object_event 3, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
-	object_event 6, 1, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
-	object_event 8, 14, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
+	object_event  4,  1, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermCody, -1
+	object_event  4, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1
+	object_event  8,  2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
+	object_event  2,  3, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
+	object_event  6, 16, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
+	object_event  3,  3, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
+	object_event  6,  1, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
+	object_event  8, 14, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm
index cdc9ec50f..c7a61af05 100644
--- a/maps/BlackthornMart.asm
+++ b/maps/BlackthornMart.asm
@@ -48,14 +48,14 @@ BlackthornMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, BLACKTHORN_CITY, 4
-	warp_event 3, 7, BLACKTHORN_CITY, 4
+	warp_event  2,  7, BLACKTHORN_CITY, 4
+	warp_event  3,  7, BLACKTHORN_CITY, 4
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1
-	object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1
-	object_event 5, 2, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1
+	object_event  7,  6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1
+	object_event  5,  2, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1
diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm
index 77c47f364..a6e44a881 100644
--- a/maps/BlackthornPokecenter1F.asm
+++ b/maps/BlackthornPokecenter1F.asm
@@ -51,16 +51,16 @@ BlackthornPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, BLACKTHORN_CITY, 5
-	warp_event 4, 7, BLACKTHORN_CITY, 5
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, BLACKTHORN_CITY, 5
+	warp_event  4,  7, BLACKTHORN_CITY, 5
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1
-	object_event 5, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1
-	object_event 1, 4, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1
-	object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FCooltrainerMScript, -1
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1
+	object_event  5,  3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1
+	object_event  1,  4, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1
+	object_event  7,  6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FCooltrainerMScript, -1
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
index e27c9923f..47bf02719 100644
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -146,12 +146,12 @@ BluesHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, PALLET_TOWN, 2
-	warp_event 3, 7, PALLET_TOWN, 2
+	warp_event  2,  7, PALLET_TOWN, 2
+	warp_event  3,  7, PALLET_TOWN, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 2, 3, SPRITE_DAISY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1
+	object_event  2,  3, SPRITE_DAISY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
index bd4fada98..5e7c4e247 100644
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -126,14 +126,14 @@ BrunosRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 17, KOGAS_ROOM, 3
-	warp_event 5, 17, KOGAS_ROOM, 4
-	warp_event 4, 2, KARENS_ROOM, 1
-	warp_event 5, 2, KARENS_ROOM, 2
+	warp_event  4, 17, KOGAS_ROOM, 3
+	warp_event  5, 17, KOGAS_ROOM, 4
+	warp_event  4,  2, KARENS_ROOM, 1
+	warp_event  5,  2, KARENS_ROOM, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 5, 7, SPRITE_BRUNO, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1
+	object_event  5,  7, SPRITE_BRUNO, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index 71bab1aa6..9aea9e81f 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -279,31 +279,31 @@ BurnedTower1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 14 ; warp events
-	warp_event 9, 15, ECRUTEAK_CITY, 13
+	warp_event  9, 15, ECRUTEAK_CITY, 13
 	warp_event 10, 15, ECRUTEAK_CITY, 13
-	warp_event 10, 9, BURNED_TOWER_B1F, 1
-	warp_event 5, 5, BURNED_TOWER_B1F, 1
-	warp_event 5, 6, BURNED_TOWER_B1F, 1
-	warp_event 4, 6, BURNED_TOWER_B1F, 1
-	warp_event 15, 4, BURNED_TOWER_B1F, 2
-	warp_event 15, 5, BURNED_TOWER_B1F, 2
-	warp_event 10, 7, BURNED_TOWER_B1F, 3
-	warp_event 5, 14, BURNED_TOWER_B1F, 4
-	warp_event 4, 14, BURNED_TOWER_B1F, 4
-	warp_event 14, 14, BURNED_TOWER_B1F, 5
-	warp_event 15, 14, BURNED_TOWER_B1F, 5
-	warp_event 7, 15, BURNED_TOWER_B1F, 6
+	warp_event 10,  9, BURNED_TOWER_B1F, 1
+	warp_event  5,  5, BURNED_TOWER_B1F, 1 ; inaccessible, left over from G/S
+	warp_event  5,  6, BURNED_TOWER_B1F, 1 ; inaccessible, left over from G/S
+	warp_event  4,  6, BURNED_TOWER_B1F, 1 ; inaccessible, left over from G/S
+	warp_event 15,  4, BURNED_TOWER_B1F, 2 ; inaccessible, left over from G/S
+	warp_event 15,  5, BURNED_TOWER_B1F, 2 ; inaccessible, left over from G/S
+	warp_event 10,  7, BURNED_TOWER_B1F, 3 ; inaccessible, left over from G/S
+	warp_event  5, 14, BURNED_TOWER_B1F, 4 ; inaccessible, left over from G/S
+	warp_event  4, 14, BURNED_TOWER_B1F, 4 ; inaccessible, left over from G/S
+	warp_event 14, 14, BURNED_TOWER_B1F, 5 ; inaccessible, left over from G/S
+	warp_event 15, 14, BURNED_TOWER_B1F, 5 ; inaccessible, left over from G/S
+	warp_event  7, 15, BURNED_TOWER_B1F, 6 ; inaccessible, left over from G/S
 
 	db 1 ; coord events
-	coord_event 11, 9, SCENE_BURNEDTOWER1F_RIVAL_BATTLE, BurnedTowerRivalBattleScript
+	coord_event 11,  9, SCENE_BURNEDTOWER1F_RIVAL_BATTLE, BurnedTowerRivalBattleScript
 
 	db 2 ; bg events
-	bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther
+	bg_event  8,  7, BGEVENT_ITEM, BurnedTower1FHiddenEther
 	bg_event 13, 11, BGEVENT_ITEM, BurnedTower1FHiddenUltraBall
 
 	db 5 ; object events
-	object_event 15, 4, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1
+	object_event 15,  4, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1
 	object_event 12, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE
-	object_event 8, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
+	object_event  8,  9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
 	object_event 14, 14, SPRITE_MORTY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BurnedTower1FMortyScript, EVENT_BURNED_TOWER_MORTY
-	object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP
+	object_event 14,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index f83d4cbdb..afccf06c9 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -237,25 +237,25 @@ BurnedTowerB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 10, 9, BURNED_TOWER_1F, 3
-	warp_event 17, 7, BURNED_TOWER_1F, 7
-	warp_event 10, 8, BURNED_TOWER_1F, 9
-	warp_event 3, 13, BURNED_TOWER_1F, 10
+	warp_event 10,  9, BURNED_TOWER_1F, 3
+	warp_event 17,  7, BURNED_TOWER_1F, 7
+	warp_event 10,  8, BURNED_TOWER_1F, 9
+	warp_event  3, 13, BURNED_TOWER_1F, 10
 	warp_event 17, 14, BURNED_TOWER_1F, 12
-	warp_event 7, 15, BURNED_TOWER_1F, 14
+	warp_event  7, 15, BURNED_TOWER_1F, 14
 
 	db 1 ; coord events
-	coord_event 10, 6, SCENE_DEFAULT, ReleaseTheBeasts
+	coord_event 10,  6, SCENE_DEFAULT, ReleaseTheBeasts
 
 	db 0 ; bg events
 
 	db 9 ; object events
-	object_event 17, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1
-	object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
-	object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
-	object_event 10, 4, SPRITE_SUICUNE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
-	object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
-	object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
-	object_event 10, 4, SPRITE_SUICUNE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
-	object_event 16, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE
+	object_event 17,  8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1
+	object_event  7,  3, SPRITE_RAIKOU, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
+	object_event 12,  3, SPRITE_ENTEI, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
+	object_event 10,  4, SPRITE_SUICUNE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
+	object_event  7,  3, SPRITE_RAIKOU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
+	object_event 12,  3, SPRITE_ENTEI, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
+	object_event 10,  4, SPRITE_SUICUNE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
+	object_event 16,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE
 	object_event 10, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FEusine, EVENT_EUSINE_IN_BURNED_TOWER
diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm
index c4337f9cf..b7a6356dc 100644
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -209,18 +209,18 @@ CeladonCafe_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 6, 7, CELADON_CITY, 9
-	warp_event 7, 7, CELADON_CITY, 9
+	warp_event  6,  7, CELADON_CITY, 9
+	warp_event  7,  7, CELADON_CITY, 9
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 5, 0, BGEVENT_READ, EatathonContestPoster
-	bg_event 7, 1, BGEVENT_READ, CeladonCafeTrashcan
+	bg_event  5,  0, BGEVENT_READ, EatathonContestPoster
+	bg_event  7,  1, BGEVENT_READ, CeladonCafeTrashcan
 
 	db 5 ; object events
-	object_event 9, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCafeChef, -1
-	object_event 4, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher1, -1
-	object_event 1, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher2, -1
-	object_event 1, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher3, -1
-	object_event 4, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeTeacher, -1
+	object_event  9,  3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCafeChef, -1
+	object_event  4,  6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher1, -1
+	object_event  1,  7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher2, -1
+	object_event  1,  2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher3, -1
+	object_event  4,  3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeTeacher, -1
diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm
index 52695628b..16409b219 100644
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -236,11 +236,11 @@ CeladonCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 9 ; warp events
-	warp_event 4, 9, CELADON_DEPT_STORE_1F, 1
-	warp_event 16, 9, CELADON_MANSION_1F, 1
-	warp_event 16, 3, CELADON_MANSION_1F, 3
-	warp_event 17, 3, CELADON_MANSION_1F, 3
-	warp_event 29, 9, CELADON_POKECENTER_1F, 1
+	warp_event  4,  9, CELADON_DEPT_STORE_1F, 1
+	warp_event 16,  9, CELADON_MANSION_1F, 1
+	warp_event 16,  3, CELADON_MANSION_1F, 3
+	warp_event 17,  3, CELADON_MANSION_1F, 3
+	warp_event 29,  9, CELADON_POKECENTER_1F, 1
 	warp_event 18, 19, CELADON_GAME_CORNER, 1
 	warp_event 23, 19, CELADON_GAME_CORNER_PRIZE_ROOM, 1
 	warp_event 10, 29, CELADON_GYM, 1
@@ -251,11 +251,11 @@ CeladonCity_MapEvents:
 	db 8 ; bg events
 	bg_event 23, 21, BGEVENT_READ, CeladonCitySign
 	bg_event 11, 31, BGEVENT_READ, CeladonGymSign
-	bg_event 6, 9, BGEVENT_READ, CeladonCityDeptStoreSign
-	bg_event 13, 9, BGEVENT_READ, CeladonCityMansionSign
+	bg_event  6,  9, BGEVENT_READ, CeladonCityDeptStoreSign
+	bg_event 13,  9, BGEVENT_READ, CeladonCityMansionSign
 	bg_event 19, 21, BGEVENT_READ, CeladonCityGameCornerSign
 	bg_event 29, 21, BGEVENT_READ, CeladonCityTrainerTips
-	bg_event 30, 9, BGEVENT_READ, CeladonCityPokecenterSign
+	bg_event 30,  9, BGEVENT_READ, CeladonCityPokecenterSign
 	bg_event 37, 21, BGEVENT_ITEM, CeladonCityHiddenPpUp
 
 	db 9 ; object events
@@ -263,8 +263,8 @@ CeladonCity_MapEvents:
 	object_event 27, 11, SPRITE_POLIWAG, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1
 	object_event 20, 24, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher1Script, -1
 	object_event 14, 16, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps1Script, -1
-	object_event 8, 31, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps2Script, -1
+	object_event  8, 31, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps2Script, -1
 	object_event 18, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster1Script, -1
 	object_event 24, 33, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster2Script, -1
-	object_event 6, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher2Script, -1
-	object_event 7, 22, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityLassScript, -1
+	object_event  6, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher2Script, -1
+	object_event  7, 22, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityLassScript, -1
diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm
index 5aab57ddb..ba347458a 100644
--- a/maps/CeladonDeptStore1F.asm
+++ b/maps/CeladonDeptStore1F.asm
@@ -75,18 +75,18 @@ CeladonDeptStore1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 7, 7, CELADON_CITY, 1
-	warp_event 8, 7, CELADON_CITY, 1
-	warp_event 15, 0, CELADON_DEPT_STORE_2F, 2
-	warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
+	warp_event  7,  7, CELADON_CITY, 1
+	warp_event  8,  7, CELADON_CITY, 1
+	warp_event 15,  0, CELADON_DEPT_STORE_2F, 2
+	warp_event  2,  0, CELADON_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore1FDirectory
-	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton
+	bg_event 14,  0, BGEVENT_READ, CeladonDeptStore1FDirectory
+	bg_event  3,  0, BGEVENT_READ, CeladonDeptStore1FElevatorButton
 
 	db 3 ; object events
-	object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1
-	object_event 11, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1
-	object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1
+	object_event 10,  1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1
+	object_event 11,  4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1
+	object_event  5,  3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1
diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm
index 09df8440c..39b452fe7 100644
--- a/maps/CeladonDeptStore2F.asm
+++ b/maps/CeladonDeptStore2F.asm
@@ -70,18 +70,18 @@ CeladonDeptStore2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 12, 0, CELADON_DEPT_STORE_3F, 1
-	warp_event 15, 0, CELADON_DEPT_STORE_1F, 3
-	warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
+	warp_event 12,  0, CELADON_DEPT_STORE_3F, 1
+	warp_event 15,  0, CELADON_DEPT_STORE_1F, 3
+	warp_event  2,  0, CELADON_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore2FDirectory
-	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore2FElevatorButton
+	bg_event 14,  0, BGEVENT_READ, CeladonDeptStore2FDirectory
+	bg_event  3,  0, BGEVENT_READ, CeladonDeptStore2FElevatorButton
 
 	db 4 ; object events
-	object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1
-	object_event 14, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1
-	object_event 5, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1
-	object_event 6, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FYoungsterScript, -1
+	object_event 13,  5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1
+	object_event 14,  5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1
+	object_event  5,  2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1
+	object_event  6,  2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FYoungsterScript, -1
diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm
index 733100ab2..119bfcf91 100644
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -96,19 +96,19 @@ CeladonDeptStore3F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 12, 0, CELADON_DEPT_STORE_2F, 1
-	warp_event 15, 0, CELADON_DEPT_STORE_4F, 2
-	warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
+	warp_event 12,  0, CELADON_DEPT_STORE_2F, 1
+	warp_event 15,  0, CELADON_DEPT_STORE_4F, 2
+	warp_event  2,  0, CELADON_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore3FDirectory
-	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore3FElevatorButton
+	bg_event 14,  0, BGEVENT_READ, CeladonDeptStore3FDirectory
+	bg_event  3,  0, BGEVENT_READ, CeladonDeptStore3FElevatorButton
 
 	db 5 ; object events
-	object_event 7, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1
-	object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1
-	object_event 9, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1
-	object_event 10, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1
-	object_event 13, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1
+	object_event  7,  1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1
+	object_event  6,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1
+	object_event  9,  1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1
+	object_event 10,  1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1
+	object_event 13,  4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1
diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm
index 4241a3595..f619e49d8 100644
--- a/maps/CeladonDeptStore4F.asm
+++ b/maps/CeladonDeptStore4F.asm
@@ -52,17 +52,17 @@ CeladonDeptStore4F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 12, 0, CELADON_DEPT_STORE_5F, 1
-	warp_event 15, 0, CELADON_DEPT_STORE_3F, 2
-	warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
+	warp_event 12,  0, CELADON_DEPT_STORE_5F, 1
+	warp_event 15,  0, CELADON_DEPT_STORE_3F, 2
+	warp_event  2,  0, CELADON_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore4FDirectory
-	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore4FElevatorButton
+	bg_event 14,  0, BGEVENT_READ, CeladonDeptStore4FDirectory
+	bg_event  3,  0, BGEVENT_READ, CeladonDeptStore4FElevatorButton
 
 	db 3 ; object events
-	object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1
-	object_event 7, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1
-	object_event 8, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1
+	object_event 13,  5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1
+	object_event  7,  6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1
+	object_event  8,  2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1
diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm
index ddac9b490..c276e1dad 100644
--- a/maps/CeladonDeptStore5F.asm
+++ b/maps/CeladonDeptStore5F.asm
@@ -73,19 +73,19 @@ CeladonDeptStore5F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 12, 0, CELADON_DEPT_STORE_4F, 1
-	warp_event 15, 0, CELADON_DEPT_STORE_6F, 1
-	warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
+	warp_event 12,  0, CELADON_DEPT_STORE_4F, 1
+	warp_event 15,  0, CELADON_DEPT_STORE_6F, 1
+	warp_event  2,  0, CELADON_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore5FDirectory
-	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore5FElevatorButton
+	bg_event 14,  0, BGEVENT_READ, CeladonDeptStore5FDirectory
+	bg_event  3,  0, BGEVENT_READ, CeladonDeptStore5FElevatorButton
 
 	db 5 ; object events
-	object_event 7, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x71004, -1
-	object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1
-	object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1
-	object_event 3, 4, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1
-	object_event 1, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1
+	object_event  7,  5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x71004, -1
+	object_event  8,  5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1
+	object_event 13,  5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1
+	object_event  3,  4, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1
+	object_event  1,  7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index 6bbff6bf2..a42318c2e 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -147,19 +147,19 @@ CeladonDeptStore6F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 15, 0, CELADON_DEPT_STORE_5F, 2
-	warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
+	warp_event 15,  0, CELADON_DEPT_STORE_5F, 2
+	warp_event  2,  0, CELADON_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
 	db 6 ; bg events
-	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore6FDirectory
-	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton
-	bg_event 8, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
-	bg_event 9, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
-	bg_event 10, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
-	bg_event 11, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
+	bg_event 14,  0, BGEVENT_READ, CeladonDeptStore6FDirectory
+	bg_event  3,  0, BGEVENT_READ, CeladonDeptStore1FElevatorButton
+	bg_event  8,  1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
+	bg_event  9,  1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
+	bg_event 10,  1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
+	bg_event 11,  1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
 
 	db 2 ; object events
-	object_event 9, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1
-	object_event 12, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1
+	object_event  9,  2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1
+	object_event 12,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1
diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm
index eaa5c927a..d89efe8ee 100644
--- a/maps/CeladonDeptStoreElevator.asm
+++ b/maps/CeladonDeptStoreElevator.asm
@@ -29,12 +29,12 @@ CeladonDeptStoreElevator_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 1, 3, CELADON_DEPT_STORE_1F, -1
-	warp_event 2, 3, CELADON_DEPT_STORE_1F, -1
+	warp_event  1,  3, CELADON_DEPT_STORE_1F, -1
+	warp_event  2,  3, CELADON_DEPT_STORE_1F, -1
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 3, 0, BGEVENT_READ, CeladonDeptStoreElevatorScript
+	bg_event  3,  0, BGEVENT_READ, CeladonDeptStoreElevatorScript
 
 	db 0 ; object events
diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm
index 30268f9c7..89f8f6e84 100644
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -289,52 +289,52 @@ CeladonGameCorner_MapEvents:
 	db 0 ; coord events
 
 	db 38 ; bg events
-	bg_event 1, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 1, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 1, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 1, 9, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 1, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 1, 11, BGEVENT_LEFT, CeladonGameCornerCardFlipScript
-	bg_event 6, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 6, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 6, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 6, 9, BGEVENT_READ, MapCeladonGameCornerSignpost9Script
-	bg_event 6, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 6, 11, BGEVENT_RIGHT, CeladonGameCornerCardFlipScript
-	bg_event 7, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 7, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 7, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 7, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 7, 10, BGEVENT_READ, CeladonGameCornerSlotMachineScript
-	bg_event 7, 11, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript
-	bg_event 12, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 12, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 12, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 12, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event  1,  6, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event  1,  7, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event  1,  8, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event  1,  9, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event  1, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event  1, 11, BGEVENT_LEFT, CeladonGameCornerCardFlipScript
+	bg_event  6,  6, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event  6,  7, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event  6,  8, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event  6,  9, BGEVENT_READ, MapCeladonGameCornerSignpost9Script
+	bg_event  6, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event  6, 11, BGEVENT_RIGHT, CeladonGameCornerCardFlipScript
+	bg_event  7,  6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event  7,  7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event  7,  8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event  7,  9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event  7, 10, BGEVENT_READ, CeladonGameCornerSlotMachineScript
+	bg_event  7, 11, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript
+	bg_event 12,  6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 12,  7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 12,  8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 12,  9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
 	bg_event 12, 10, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
 	bg_event 12, 11, BGEVENT_RIGHT, CeladonGameCornerLuckySlotMachineScript
-	bg_event 13, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 13, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 13, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 13, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 13,  6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 13,  7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 13,  8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 13,  9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
 	bg_event 13, 10, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
 	bg_event 13, 11, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript
-	bg_event 18, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 18, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 18, 8, BGEVENT_READ, CeladonGameCornerLighterScript
-	bg_event 18, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 18,  6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 18,  7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 18,  8, BGEVENT_READ, CeladonGameCornerLighterScript
+	bg_event 18,  9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
 	bg_event 18, 10, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
 	bg_event 18, 11, BGEVENT_RIGHT, CeladonGameCornerLuckySlotMachineScript
-	bg_event 15, 0, BGEVENT_READ, CeladonGameCornerPoster1Script
-	bg_event 9, 0, BGEVENT_READ, CeladonGameCornerPoster2Script
+	bg_event 15,  0, BGEVENT_READ, CeladonGameCornerPoster1Script
+	bg_event  9,  0, BGEVENT_READ, CeladonGameCornerPoster2Script
 
 	db 9 ; object events
-	object_event 5, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1
-	object_event 3, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1
+	object_event  5,  2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1
+	object_event  3,  2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1
 	object_event 14, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPokefanMScript, -1
-	object_event 17, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerTeacherScript, -1
-	object_event 11, 7, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1
-	object_event 8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1
-	object_event 8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1
-	object_event 11, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGymGuyScript, -1
-	object_event 2, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1
+	object_event 17,  7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerTeacherScript, -1
+	object_event 11,  7, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1
+	object_event  8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1
+	object_event  8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1
+	object_event 11,  3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGymGuyScript, -1
+	object_event  2,  8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index 24384a6bf..4f2750d54 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -265,15 +265,15 @@ CeladonGameCornerPrizeRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 5, CELADON_CITY, 7
-	warp_event 3, 5, CELADON_CITY, 7
+	warp_event  2,  5, CELADON_CITY, 7
+	warp_event  3,  5, CELADON_CITY, 7
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 2, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomTMVendor
-	bg_event 4, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomPokemonVendor
+	bg_event  2,  1, BGEVENT_READ, CeladonGameCornerPrizeRoomTMVendor
+	bg_event  4,  1, BGEVENT_READ, CeladonGameCornerPrizeRoomPokemonVendor
 
 	db 2 ; object events
-	object_event 0, 2, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1
-	object_event 4, 4, SPRITE_PHARMACIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1
+	object_event  0,  2, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1
+	object_event  4,  4, SPRITE_PHARMACIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1
diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm
index 7b3c96781..3d495e622 100644
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -269,19 +269,19 @@ CeladonGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 17, CELADON_CITY, 8
-	warp_event 5, 17, CELADON_CITY, 8
+	warp_event  4, 17, CELADON_CITY, 8
+	warp_event  5, 17, CELADON_CITY, 8
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 3, 15, BGEVENT_READ, CeladonGymStatue
-	bg_event 6, 15, BGEVENT_READ, CeladonGymStatue
+	bg_event  3, 15, BGEVENT_READ, CeladonGymStatue
+	bg_event  6, 15, BGEVENT_READ, CeladonGymStatue
 
 	db 6 ; object events
-	object_event 5, 3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1
-	object_event 7, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1
-	object_event 2, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1
-	object_event 3, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1
-	object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe1, -1
-	object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe2, -1
+	object_event  5,  3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1
+	object_event  7,  8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1
+	object_event  2,  8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1
+	object_event  3,  5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1
+	object_event  4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe1, -1
+	object_event  5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe2, -1
diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm
index 1746ce937..2e856fd79 100644
--- a/maps/CeladonMansion1F.asm
+++ b/maps/CeladonMansion1F.asm
@@ -76,21 +76,21 @@ CeladonMansion1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 6, 9, CELADON_CITY, 2
-	warp_event 7, 9, CELADON_CITY, 2
-	warp_event 3, 0, CELADON_CITY, 3
-	warp_event 0, 0, CELADON_MANSION_2F, 1
-	warp_event 7, 0, CELADON_MANSION_2F, 4
+	warp_event  6,  9, CELADON_CITY, 2
+	warp_event  7,  9, CELADON_CITY, 2
+	warp_event  3,  0, CELADON_CITY, 3
+	warp_event  0,  0, CELADON_MANSION_2F, 1
+	warp_event  7,  0, CELADON_MANSION_2F, 4
 
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event 5, 8, BGEVENT_UP, CeladonMansionManagersSuiteSign
-	bg_event 0, 3, BGEVENT_READ, CeladonMansion1fBookshelf
-	bg_event 2, 3, BGEVENT_READ, CeladonMansion1fBookshelf
+	bg_event  5,  8, BGEVENT_UP, CeladonMansionManagersSuiteSign
+	bg_event  0,  3, BGEVENT_READ, CeladonMansion1fBookshelf
+	bg_event  2,  3, BGEVENT_READ, CeladonMansion1fBookshelf
 
 	db 4 ; object events
-	object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1
-	object_event 2, 6, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1
-	object_event 3, 4, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1
-	object_event 4, 4, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FNidoranF, -1
+	object_event  1,  5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1
+	object_event  2,  6, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1
+	object_event  3,  4, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1
+	object_event  4,  4, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FNidoranF, -1
diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm
index cc32da5e5..f230404de 100644
--- a/maps/CeladonMansion2F.asm
+++ b/maps/CeladonMansion2F.asm
@@ -51,16 +51,16 @@ CeladonMansion2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 0, CELADON_MANSION_1F, 4
-	warp_event 1, 0, CELADON_MANSION_3F, 2
-	warp_event 6, 0, CELADON_MANSION_3F, 3
-	warp_event 7, 0, CELADON_MANSION_1F, 5
+	warp_event  0,  0, CELADON_MANSION_1F, 4
+	warp_event  1,  0, CELADON_MANSION_3F, 2
+	warp_event  6,  0, CELADON_MANSION_3F, 3
+	warp_event  7,  0, CELADON_MANSION_1F, 5
 
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event 0, 3, BGEVENT_READ, CeladonMansion2FComputer
-	bg_event 5, 8, BGEVENT_UP, CeladonMansion2FSign
-	bg_event 2, 3, BGEVENT_READ, CeladonMansion2FBookshelf
+	bg_event  0,  3, BGEVENT_READ, CeladonMansion2FComputer
+	bg_event  5,  8, BGEVENT_UP, CeladonMansion2FSign
+	bg_event  2,  3, BGEVENT_READ, CeladonMansion2FBookshelf
 
 	db 0 ; object events
diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm
index 5d014f28b..3f6b24bea 100644
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -191,21 +191,21 @@ CeladonMansion3F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 0, CELADON_MANSION_ROOF, 1
-	warp_event 1, 0, CELADON_MANSION_2F, 2
-	warp_event 6, 0, CELADON_MANSION_2F, 3
-	warp_event 7, 0, CELADON_MANSION_ROOF, 2
+	warp_event  0,  0, CELADON_MANSION_ROOF, 1
+	warp_event  1,  0, CELADON_MANSION_2F, 2
+	warp_event  6,  0, CELADON_MANSION_2F, 3
+	warp_event  7,  0, CELADON_MANSION_ROOF, 2
 
 	db 0 ; coord events
 
 	db 4 ; bg events
-	bg_event 5, 8, BGEVENT_UP, MapCeladonMansion3FSignpost0Script
-	bg_event 4, 3, BGEVENT_UP, MapCeladonMansion3FSignpost1Script
-	bg_event 1, 6, BGEVENT_UP, MapCeladonMansion3FSignpost2Script
-	bg_event 1, 3, BGEVENT_UP, MapCeladonMansion3FSignpost3Script
+	bg_event  5,  8, BGEVENT_UP, MapCeladonMansion3FSignpost0Script
+	bg_event  4,  3, BGEVENT_UP, MapCeladonMansion3FSignpost1Script
+	bg_event  1,  6, BGEVENT_UP, MapCeladonMansion3FSignpost2Script
+	bg_event  1,  3, BGEVENT_UP, MapCeladonMansion3FSignpost3Script
 
 	db 4 ; object events
-	object_event 3, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1
-	object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1
-	object_event 0, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1
-	object_event 0, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1
+	object_event  3,  6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1
+	object_event  3,  4, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1
+	object_event  0,  7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1
+	object_event  0,  4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1
diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm
index 4af0fa1ab..7c040bdad 100644
--- a/maps/CeladonMansionRoof.asm
+++ b/maps/CeladonMansionRoof.asm
@@ -35,14 +35,14 @@ CeladonMansionRoof_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 1, 1, CELADON_MANSION_3F, 1
-	warp_event 6, 1, CELADON_MANSION_3F, 4
-	warp_event 2, 5, CELADON_MANSION_ROOF_HOUSE, 1
+	warp_event  1,  1, CELADON_MANSION_3F, 1
+	warp_event  6,  1, CELADON_MANSION_3F, 4
+	warp_event  2,  5, CELADON_MANSION_ROOF_HOUSE, 1
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 6, 1, BGEVENT_LEFT, MapCeladonMansionRoofSignpost0Script
+	bg_event  6,  1, BGEVENT_LEFT, MapCeladonMansionRoofSignpost0Script
 
 	db 1 ; object events
-	object_event 7, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1
+	object_event  7,  5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1
diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm
index 56e46634b..3a8bce8d8 100644
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -118,12 +118,12 @@ CeladonMansionRoofHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, CELADON_MANSION_ROOF, 3
-	warp_event 3, 7, CELADON_MANSION_ROOF, 3
+	warp_event  2,  7, CELADON_MANSION_ROOF, 3
+	warp_event  3,  7, CELADON_MANSION_ROOF, 3
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 3, 2, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1
+	object_event  3,  2, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1
diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm
index b333618df..4a61137e3 100644
--- a/maps/CeladonPokecenter1F.asm
+++ b/maps/CeladonPokecenter1F.asm
@@ -147,17 +147,17 @@ CeladonPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, CELADON_CITY, 5
-	warp_event 4, 7, CELADON_CITY, 5
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, CELADON_CITY, 5
+	warp_event  4,  7, CELADON_CITY, 5
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 5 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x71e22, -1
-	object_event 1, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1
-	object_event 0, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1
-	object_event 8, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FCooltrainerFScript, -1
-	object_event 4, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x71e22, -1
+	object_event  1,  5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1
+	object_event  0,  3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1
+	object_event  8,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FCooltrainerFScript, -1
+	object_event  4,  3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH
diff --git a/maps/CeladonPokecenter2FBeta.asm b/maps/CeladonPokecenter2FBeta.asm
index 34391e66d..aec478102 100644
--- a/maps/CeladonPokecenter2FBeta.asm
+++ b/maps/CeladonPokecenter2FBeta.asm
@@ -7,7 +7,7 @@ CeladonPokecenter2FBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 0, 7, CELADON_POKECENTER_1F, 3
+	warp_event  0,  7, CELADON_POKECENTER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm
index 3fb95bfca..314d8f56f 100644
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -277,7 +277,7 @@ CeruleanCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 7, 15, CERULEAN_GYM_BADGE_SPEECH_HOUSE, 1
+	warp_event  7, 15, CERULEAN_GYM_BADGE_SPEECH_HOUSE, 1
 	warp_event 28, 17, CERULEAN_POLICE_STATION, 1
 	warp_event 13, 19, CERULEAN_TRADE_SPEECH_HOUSE, 1
 	warp_event 19, 21, CERULEAN_POKECENTER_1F, 1
@@ -291,11 +291,11 @@ CeruleanCity_MapEvents:
 	bg_event 27, 25, BGEVENT_READ, CeruleanGymSign
 	bg_event 11, 29, BGEVENT_READ, CeruleanBikeShopSign
 	bg_event 25, 17, BGEVENT_READ, CeruleanPoliceSign
-	bg_event 23, 7, BGEVENT_READ, CeruleanCapeSign
+	bg_event 23,  7, BGEVENT_READ, CeruleanCapeSign
 	bg_event 14, 29, BGEVENT_READ, CeruleanLockedDoor
 	bg_event 20, 21, BGEVENT_READ, CeruleanCityPokecenterSign
 	bg_event 26, 29, BGEVENT_READ, CeruleanCityMartSign
-	bg_event 2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene
+	bg_event  2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene
 
 	db 6 ; object events
 	object_event 15, 23, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1
@@ -303,4 +303,4 @@ CeruleanCity_MapEvents:
 	object_event 20, 24, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1
 	object_event 21, 24, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerFScript, -1
 	object_event 30, 26, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityFisherScript, -1
-	object_event 6, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityYoungsterScript, -1
+	object_event  6, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityYoungsterScript, -1
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index 7349fb346..f99369393 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -364,20 +364,20 @@ CeruleanGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 15, CERULEAN_CITY, 5
-	warp_event 5, 15, CERULEAN_CITY, 5
+	warp_event  4, 15, CERULEAN_CITY, 5
+	warp_event  5, 15, CERULEAN_CITY, 5
 
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event 3, 8, BGEVENT_ITEM, CeruleanGymHiddenMachinePart
-	bg_event 2, 13, BGEVENT_READ, CeruleanGymStatue1
-	bg_event 6, 13, BGEVENT_READ, CeruleanGymStatue2
+	bg_event  3,  8, BGEVENT_ITEM, CeruleanGymHiddenMachinePart
+	bg_event  2, 13, BGEVENT_READ, CeruleanGymStatue1
+	bg_event  6, 13, BGEVENT_READ, CeruleanGymStatue2
 
 	db 6 ; object events
-	object_event 4, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
-	object_event 5, 3, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM
-	object_event 4, 6, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM
-	object_event 1, 9, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM
-	object_event 8, 9, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM
-	object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM
+	object_event  4, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
+	object_event  5,  3, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM
+	object_event  4,  6, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM
+	object_event  1,  9, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM
+	object_event  8,  9, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM
+	object_event  7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM
diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm
index 5bb9100f5..6d94bae06 100644
--- a/maps/CeruleanGymBadgeSpeechHouse.asm
+++ b/maps/CeruleanGymBadgeSpeechHouse.asm
@@ -18,12 +18,12 @@ CeruleanGymBadgeSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, CERULEAN_CITY, 1
-	warp_event 3, 7, CERULEAN_CITY, 1
+	warp_event  2,  7, CERULEAN_CITY, 1
+	warp_event  3,  7, CERULEAN_CITY, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1
+	object_event  2,  3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1
diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm
index c72fe7cd7..6fd5c9b87 100644
--- a/maps/CeruleanMart.asm
+++ b/maps/CeruleanMart.asm
@@ -47,14 +47,14 @@ CeruleanMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, CERULEAN_CITY, 6
-	warp_event 3, 7, CERULEAN_CITY, 6
+	warp_event  2,  7, CERULEAN_CITY, 6
+	warp_event  3,  7, CERULEAN_CITY, 6
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1
-	object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1
-	object_event 7, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1
+	object_event  1,  6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1
+	object_event  7,  2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1
diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm
index 0894c9297..d8cfde177 100644
--- a/maps/CeruleanPokecenter1F.asm
+++ b/maps/CeruleanPokecenter1F.asm
@@ -64,15 +64,15 @@ CeruleanPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, CERULEAN_CITY, 4
-	warp_event 4, 7, CERULEAN_CITY, 4
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, CERULEAN_CITY, 4
+	warp_event  4,  7, CERULEAN_CITY, 4
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18820f, -1
-	object_event 8, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1
-	object_event 1, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18820f, -1
+	object_event  8,  4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1
+	object_event  1,  5, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1
diff --git a/maps/CeruleanPokecenter2FBeta.asm b/maps/CeruleanPokecenter2FBeta.asm
index d07b136c8..135d49d36 100644
--- a/maps/CeruleanPokecenter2FBeta.asm
+++ b/maps/CeruleanPokecenter2FBeta.asm
@@ -7,7 +7,7 @@ CeruleanPokecenter2FBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 0, 7, CERULEAN_POKECENTER_1F, 1
+	warp_event  0,  7, CERULEAN_POKECENTER_1F, 1
 
 	db 0 ; coord events
 
diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm
index 0e9503786..1c97dc0e5 100644
--- a/maps/CeruleanPoliceStation.asm
+++ b/maps/CeruleanPoliceStation.asm
@@ -45,14 +45,14 @@ CeruleanPoliceStation_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, CERULEAN_CITY, 2
-	warp_event 3, 7, CERULEAN_CITY, 2
+	warp_event  2,  7, CERULEAN_CITY, 2
+	warp_event  3,  7, CERULEAN_CITY, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 5, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1
-	object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1
-	object_event 3, 5, SPRITE_DIGLETT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanDiglett, -1
+	object_event  5,  1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1
+	object_event  5,  4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1
+	object_event  3,  5, SPRITE_DIGLETT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanDiglett, -1
diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm
index 766cbb061..3181409f4 100644
--- a/maps/CeruleanTradeSpeechHouse.asm
+++ b/maps/CeruleanTradeSpeechHouse.asm
@@ -55,15 +55,15 @@ CeruleanTradeSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, CERULEAN_CITY, 3
-	warp_event 3, 7, CERULEAN_CITY, 3
+	warp_event  2,  7, CERULEAN_CITY, 3
+	warp_event  3,  7, CERULEAN_CITY, 3
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1
-	object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1
-	object_event 5, 2, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x188139, -1
-	object_event 5, 6, SPRITE_ZUBAT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ZubatScript_0x188143, -1
+	object_event  2,  4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1
+	object_event  1,  2, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1
+	object_event  5,  2, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x188139, -1
+	object_event  5,  6, SPRITE_ZUBAT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ZubatScript_0x188143, -1
diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm
index b7407116d..dda289377 100644
--- a/maps/CharcoalKiln.asm
+++ b/maps/CharcoalKiln.asm
@@ -150,17 +150,17 @@ CharcoalKiln_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, AZALEA_TOWN, 2
-	warp_event 3, 7, AZALEA_TOWN, 2
+	warp_event  2,  7, AZALEA_TOWN, 2
+	warp_event  3,  7, AZALEA_TOWN, 2
 
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event 0, 1, BGEVENT_READ, CharcoalKilnBookshelf
-	bg_event 1, 1, BGEVENT_READ, CharcoalKilnBookshelf
-	bg_event 7, 1, BGEVENT_READ, CharcoalKilnRadio
+	bg_event  0,  1, BGEVENT_READ, CharcoalKilnBookshelf
+	bg_event  1,  1, BGEVENT_READ, CharcoalKilnBookshelf
+	bg_event  7,  1, BGEVENT_READ, CharcoalKilnRadio
 
 	db 3 ; object events
-	object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS
-	object_event 5, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE
-	object_event 5, 6, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D
+	object_event  2,  3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS
+	object_event  5,  3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE
+	object_event  5,  6, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index 6a403c099..6e2254979 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -548,25 +548,25 @@ CherrygroveCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 23, 3, CHERRYGROVE_MART, 2
-	warp_event 29, 3, CHERRYGROVE_POKECENTER_1F, 1
-	warp_event 17, 7, CHERRYGROVE_GYM_SPEECH_HOUSE, 1
-	warp_event 25, 9, GUIDE_GENTS_HOUSE, 1
+	warp_event 23,  3, CHERRYGROVE_MART, 2
+	warp_event 29,  3, CHERRYGROVE_POKECENTER_1F, 1
+	warp_event 17,  7, CHERRYGROVE_GYM_SPEECH_HOUSE, 1
+	warp_event 25,  9, GUIDE_GENTS_HOUSE, 1
 	warp_event 31, 11, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 1
 
 	db 2 ; coord events
-	coord_event 33, 6, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneNorth
-	coord_event 33, 7, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneSouth
+	coord_event 33,  6, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneNorth
+	coord_event 33,  7, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneSouth
 
 	db 4 ; bg events
-	bg_event 30, 8, BGEVENT_READ, CherrygroveCitySign
-	bg_event 23, 9, BGEVENT_READ, GuideGentsHouseSign
-	bg_event 24, 3, BGEVENT_READ, CherrygroveCityMartSign
-	bg_event 30, 3, BGEVENT_READ, CherrygroveCityPokecenterSign
+	bg_event 30,  8, BGEVENT_READ, CherrygroveCitySign
+	bg_event 23,  9, BGEVENT_READ, GuideGentsHouseSign
+	bg_event 24,  3, BGEVENT_READ, CherrygroveCityMartSign
+	bg_event 30,  3, BGEVENT_READ, CherrygroveCityPokecenterSign
 
 	db 5 ; object events
-	object_event 32, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
-	object_event 39, 6, SPRITE_SILVER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
+	object_event 32,  6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
+	object_event 39,  6, SPRITE_SILVER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
 	object_event 27, 12, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1
-	object_event 23, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1
-	object_event 7, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MysticWaterGuy, -1
+	object_event 23,  7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1
+	object_event  7, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MysticWaterGuy, -1
diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm
index 842d125f3..f2f1f69b8 100644
--- a/maps/CherrygroveEvolutionSpeechHouse.asm
+++ b/maps/CherrygroveEvolutionSpeechHouse.asm
@@ -43,15 +43,15 @@ CherrygroveEvolutionSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, CHERRYGROVE_CITY, 5
-	warp_event 3, 7, CHERRYGROVE_CITY, 5
+	warp_event  2,  7, CHERRYGROVE_CITY, 5
+	warp_event  3,  7, CHERRYGROVE_CITY, 5
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf
 
 	db 2 ; object events
-	object_event 3, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LassScript_0x196cb9, -1
-	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1
+	object_event  3,  5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LassScript_0x196cb9, -1
+	object_event  2,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1
diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm
index 3f99a45d7..95aa6c91a 100644
--- a/maps/CherrygroveGymSpeechHouse.asm
+++ b/maps/CherrygroveGymSpeechHouse.asm
@@ -46,15 +46,15 @@ CherrygroveGymSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, CHERRYGROVE_CITY, 3
-	warp_event 3, 7, CHERRYGROVE_CITY, 3
+	warp_event  2,  7, CHERRYGROVE_CITY, 3
+	warp_event  3,  7, CHERRYGROVE_CITY, 3
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf
 
 	db 2 ; object events
-	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1
-	object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1
+	object_event  2,  3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1
+	object_event  5,  5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1
diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm
index a4c7421f4..94177e6c8 100644
--- a/maps/CherrygroveMart.asm
+++ b/maps/CherrygroveMart.asm
@@ -73,14 +73,14 @@ CherrygroveMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, CHERRYGROVE_CITY, 1
-	warp_event 3, 7, CHERRYGROVE_CITY, 1
+	warp_event  2,  7, CHERRYGROVE_CITY, 1
+	warp_event  3,  7, CHERRYGROVE_CITY, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1
-	object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1
-	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1
+	object_event  7,  6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1
+	object_event  2,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1
diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm
index 84ff082b3..979f79361 100644
--- a/maps/CherrygrovePokecenter1F.asm
+++ b/maps/CherrygrovePokecenter1F.asm
@@ -70,16 +70,16 @@ CherrygrovePokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, CHERRYGROVE_CITY, 2
-	warp_event 4, 7, CHERRYGROVE_CITY, 2
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, CHERRYGROVE_CITY, 2
+	warp_event  4,  7, CHERRYGROVE_CITY, 2
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19696d, -1
-	object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1
-	object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1
-	object_event 1, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x196976, -1
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19696d, -1
+	object_event  2,  3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1
+	object_event  8,  6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1
+	object_event  1,  6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x196976, -1
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index 4b5c9a380..4e1d1d4d5 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -383,36 +383,36 @@ CianwoodCity_MapEvents:
 
 	db 7 ; warp events
 	warp_event 17, 41, MANIAS_HOUSE, 1
-	warp_event 8, 43, CIANWOOD_GYM, 1
+	warp_event  8, 43, CIANWOOD_GYM, 1
 	warp_event 23, 43, CIANWOOD_POKECENTER_1F, 1
 	warp_event 15, 47, CIANWOOD_PHARMACY, 1
-	warp_event 9, 31, CIANWOOD_PHOTO_STUDIO, 1
+	warp_event  9, 31, CIANWOOD_PHOTO_STUDIO, 1
 	warp_event 15, 37, CIANWOOD_LUGIA_SPEECH_HOUSE, 1
-	warp_event 5, 17, POKE_SEERS_HOUSE, 1
+	warp_event  5, 17, POKE_SEERS_HOUSE, 1
 
 	db 1 ; coord events
 	coord_event 11, 16, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE, CianwoodCitySuicuneAndEusine
 
 	db 8 ; bg events
 	bg_event 20, 34, BGEVENT_READ, CianwoodCitySign
-	bg_event 7, 45, BGEVENT_READ, CianwoodGymSign
+	bg_event  7, 45, BGEVENT_READ, CianwoodGymSign
 	bg_event 24, 43, BGEVENT_READ, CianwoodPokecenterSign
 	bg_event 19, 47, BGEVENT_READ, CianwoodPharmacySign
-	bg_event 8, 32, BGEVENT_READ, CianwoodPhotoStudioSign
-	bg_event 8, 24, BGEVENT_READ, CianwoodPokeSeerSign
-	bg_event 4, 19, BGEVENT_ITEM, CianwoodCityHiddenRevive
-	bg_event 5, 29, BGEVENT_ITEM, CianwoodCityHiddenMaxEther
+	bg_event  8, 32, BGEVENT_READ, CianwoodPhotoStudioSign
+	bg_event  8, 24, BGEVENT_READ, CianwoodPokeSeerSign
+	bg_event  4, 19, BGEVENT_ITEM, CianwoodCityHiddenRevive
+	bg_event  5, 29, BGEVENT_ITEM, CianwoodCityHiddenMaxEther
 
 	db 12 ; object events
 	object_event 21, 37, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodCityYoungster, -1
 	object_event 17, 33, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityPokefanM, -1
 	object_event 14, 42, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityLass, -1
-	object_event 8, 16, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
-	object_event 9, 17, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
-	object_event 4, 25, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
-	object_event 5, 29, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
+	object_event  8, 16, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
+	object_event  9, 17, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
+	object_event  4, 25, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
+	object_event  5, 29, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
 	object_event 10, 27, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
-	object_event 4, 19, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
+	object_event  4, 19, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
 	object_event 10, 46, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityChucksWife, -1
 	object_event 11, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE
 	object_event 10, 14, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm
index 0cb7a3356..ca03da0b1 100644
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -307,22 +307,22 @@ CianwoodGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 17, CIANWOOD_CITY, 2
-	warp_event 5, 17, CIANWOOD_CITY, 2
+	warp_event  4, 17, CIANWOOD_CITY, 2
+	warp_event  5, 17, CIANWOOD_CITY, 2
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 3, 15, BGEVENT_READ, CianwoodGymStatue
-	bg_event 6, 15, BGEVENT_READ, CianwoodGymStatue
+	bg_event  3, 15, BGEVENT_READ, CianwoodGymStatue
+	bg_event  6, 15, BGEVENT_READ, CianwoodGymStatue
 
 	db 9 ; object events
-	object_event 4, 1, SPRITE_CHUCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1
-	object_event 2, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1
-	object_event 7, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltLao, -1
-	object_event 3, 9, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltNob, -1
-	object_event 5, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBlackbeltLung, -1
-	object_event 5, 1, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
-	object_event 3, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
-	object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
-	object_event 5, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
+	object_event  4,  1, SPRITE_CHUCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1
+	object_event  2, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1
+	object_event  7, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltLao, -1
+	object_event  3,  9, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltNob, -1
+	object_event  5,  5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBlackbeltLung, -1
+	object_event  5,  1, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
+	object_event  3,  7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
+	object_event  4,  7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
+	object_event  5,  7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm
index 712c50c29..8eb9bffaf 100644
--- a/maps/CianwoodLugiaSpeechHouse.asm
+++ b/maps/CianwoodLugiaSpeechHouse.asm
@@ -63,16 +63,16 @@ CianwoodLugiaSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, CIANWOOD_CITY, 6
-	warp_event 3, 7, CIANWOOD_CITY, 6
+	warp_event  2,  7, CIANWOOD_CITY, 6
+	warp_event  3,  7, CIANWOOD_CITY, 6
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
 
 	db 3 ; object events
-	object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1
-	object_event 6, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1
-	object_event 0, 2, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1
+	object_event  2,  4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1
+	object_event  6,  5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1
+	object_event  0,  2, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1
diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm
index 7a41ce835..ef00ba49d 100644
--- a/maps/CianwoodPharmacy.asm
+++ b/maps/CianwoodPharmacy.asm
@@ -74,14 +74,14 @@ CianwoodPharmacy_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, CIANWOOD_CITY, 4
-	warp_event 3, 7, CIANWOOD_CITY, 4
+	warp_event  2,  7, CIANWOOD_CITY, 4
+	warp_event  3,  7, CIANWOOD_CITY, 4
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, CianwoodPharmacyBookshelf
-	bg_event 1, 1, BGEVENT_READ, CianwoodPharmacyBookshelf
+	bg_event  0,  1, BGEVENT_READ, CianwoodPharmacyBookshelf
+	bg_event  1,  1, BGEVENT_READ, CianwoodPharmacyBookshelf
 
 	db 1 ; object events
-	object_event 2, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPharmacist, -1
+	object_event  2,  3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPharmacist, -1
diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm
index 76ba8055c..7c8bfcbbb 100644
--- a/maps/CianwoodPhotoStudio.asm
+++ b/maps/CianwoodPhotoStudio.asm
@@ -50,12 +50,12 @@ CianwoodPhotoStudio_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, CIANWOOD_CITY, 5
-	warp_event 3, 7, CIANWOOD_CITY, 5
+	warp_event  2,  7, CIANWOOD_CITY, 5
+	warp_event  3,  7, CIANWOOD_CITY, 5
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1
+	object_event  2,  3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1
diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm
index 0c327e687..52a7e8a7b 100644
--- a/maps/CianwoodPokecenter1F.asm
+++ b/maps/CianwoodPokecenter1F.asm
@@ -133,16 +133,16 @@ CianwoodPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, CIANWOOD_CITY, 3
-	warp_event 4, 7, CIANWOOD_CITY, 3
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, CIANWOOD_CITY, 3
+	warp_event  4,  7, CIANWOOD_CITY, 3
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1
-	object_event 1, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1
-	object_event 5, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1
-	object_event 8, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1
+	object_event  1,  5, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1
+	object_event  5,  3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1
+	object_event  8,  6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1
diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm
index ef00047e5..54656768b 100644
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -135,9 +135,9 @@ CinnabarIsland_MapEvents:
 
 	db 4 ; bg events
 	bg_event 12, 11, BGEVENT_READ, CinnabarIslandPokecenterSign
-	bg_event 9, 11, BGEVENT_READ, CinnabarIslandGymSign
-	bg_event 7, 7, BGEVENT_READ, CinnabarIslandSign
-	bg_event 9, 1, BGEVENT_ITEM, CinnabarIslandHiddenRareCandy
+	bg_event  9, 11, BGEVENT_READ, CinnabarIslandGymSign
+	bg_event  7,  7, BGEVENT_READ, CinnabarIslandSign
+	bg_event  9,  1, BGEVENT_ITEM, CinnabarIslandHiddenRareCandy
 
 	db 1 ; object events
-	object_event 9, 6, SPRITE_BLUE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR
+	object_event  9,  6, SPRITE_BLUE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR
diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm
index 8811a1ae4..16cfb0c51 100644
--- a/maps/CinnabarPokecenter1F.asm
+++ b/maps/CinnabarPokecenter1F.asm
@@ -36,15 +36,15 @@ CinnabarPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, CINNABAR_ISLAND, 1
-	warp_event 4, 7, CINNABAR_ISLAND, 1
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, CINNABAR_ISLAND, 1
+	warp_event  4,  7, CINNABAR_ISLAND, 1
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1
-	object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1
-	object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1
+	object_event  7,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1
+	object_event  2,  4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1
diff --git a/maps/CinnabarPokecenter2FBeta.asm b/maps/CinnabarPokecenter2FBeta.asm
index 0c459ccae..cf100a4a8 100644
--- a/maps/CinnabarPokecenter2FBeta.asm
+++ b/maps/CinnabarPokecenter2FBeta.asm
@@ -7,7 +7,7 @@ CinnabarPokecenter2FBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 0, 7, CINNABAR_POKECENTER_1F, 3
+	warp_event  0,  7, CINNABAR_POKECENTER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index 75cd8ec11..edaa5e0ad 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -64,15 +64,15 @@ Colosseum_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 7, POKECENTER_2F, 3
-	warp_event 5, 7, POKECENTER_2F, 3
+	warp_event  4,  7, POKECENTER_2F, 3
+	warp_event  5,  7, POKECENTER_2F, 3
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 4, 4, BGEVENT_RIGHT, MapColosseumSignpost1Script
-	bg_event 5, 4, BGEVENT_LEFT, MapColosseumSignpost1Script
+	bg_event  4,  4, BGEVENT_RIGHT, MapColosseumSignpost1Script
+	bg_event  5,  4, BGEVENT_LEFT, MapColosseumSignpost1Script
 
 	db 2 ; object events
-	object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
-	object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
+	object_event  3,  4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	object_event  6,  4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm
index e111ae677..7bc264807 100644
--- a/maps/CopycatsHouse1F.asm
+++ b/maps/CopycatsHouse1F.asm
@@ -74,15 +74,15 @@ CopycatsHouse1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 2, 7, SAFFRON_CITY, 8
-	warp_event 3, 7, SAFFRON_CITY, 8
-	warp_event 2, 0, COPYCATS_HOUSE_2F, 1
+	warp_event  2,  7, SAFFRON_CITY, 8
+	warp_event  3,  7, SAFFRON_CITY, 8
+	warp_event  2,  0, COPYCATS_HOUSE_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1
-	object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1
-	object_event 6, 6, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1
+	object_event  2,  3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1
+	object_event  5,  4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1
+	object_event  6,  6, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1
diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm
index d3b360d8d..9d0bbfe65 100644
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -362,18 +362,18 @@ CopycatsHouse2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 3, 0, COPYCATS_HOUSE_1F, 3
+	warp_event  3,  0, COPYCATS_HOUSE_1F, 3
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, CopycatsHouse2FBookshelf
-	bg_event 1, 1, BGEVENT_READ, CopycatsHouse2FBookshelf
+	bg_event  0,  1, BGEVENT_READ, CopycatsHouse2FBookshelf
+	bg_event  1,  1, BGEVENT_READ, CopycatsHouse2FBookshelf
 
 	db 6 ; object events
-	object_event 4, 3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1
-	object_event 6, 4, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CopycatsDodrio, -1
-	object_event 6, 1, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL
-	object_event 2, 1, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1
-	object_event 7, 1, SPRITE_BIRD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1
-	object_event 4, 3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_2
+	object_event  4,  3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1
+	object_event  6,  4, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CopycatsDodrio, -1
+	object_event  6,  1, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL
+	object_event  2,  1, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1
+	object_event  7,  1, SPRITE_BIRD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1
+	object_event  4,  3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_2
diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm
index feb460bb5..e4257922f 100644
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -339,22 +339,22 @@ DanceTheatre_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 5, 13, ECRUTEAK_CITY, 8
-	warp_event 6, 13, ECRUTEAK_CITY, 8
+	warp_event  5, 13, ECRUTEAK_CITY, 8
+	warp_event  6, 13, ECRUTEAK_CITY, 8
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 5, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script
-	bg_event 6, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script
+	bg_event  5,  6, BGEVENT_UP, MapDanceTheatreSignpost1Script
+	bg_event  6,  6, BGEVENT_UP, MapDanceTheatreSignpost1Script
 
 	db 9 ; object events
-	object_event 0, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko2, -1
-	object_event 2, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlSayo, -1
-	object_event 6, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlZuki, -1
-	object_event 9, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlKuni, -1
-	object_event 11, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlMiki, -1
-	object_event 7, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheaterSurfGuy, -1
-	object_event 6, 8, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, DanceTheaterRhydon, -1
+	object_event  0,  2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko2, -1
+	object_event  2,  1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlSayo, -1
+	object_event  6,  2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlZuki, -1
+	object_event  9,  1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlKuni, -1
+	object_event 11,  2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlMiki, -1
+	object_event  7, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheaterSurfGuy, -1
+	object_event  6,  8, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, DanceTheaterRhydon, -1
 	object_event 10, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DanceTheatreCooltrainerMScript, -1
-	object_event 3, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheatreGrannyScript, -1
+	object_event  3,  6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheatreGrannyScript, -1
diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm
index 1380daa84..84daa17de 100644
--- a/maps/DarkCaveBlackthornEntrance.asm
+++ b/maps/DarkCaveBlackthornEntrance.asm
@@ -63,14 +63,14 @@ DarkCaveBlackthornEntrance_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 23, 3, ROUTE_45, 1
-	warp_event 3, 25, DARK_CAVE_VIOLET_ENTRANCE, 2
+	warp_event 23,  3, ROUTE_45, 1
+	warp_event  3, 25, DARK_CAVE_VIOLET_ENTRANCE, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 7, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1
+	object_event  7,  3, SPRITE_PHARMACIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1
 	object_event 21, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE
-	object_event 7, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE
+	object_event  7, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE
diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm
index 84a368188..10bbfb607 100644
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -35,21 +35,21 @@ DarkCaveVioletEntrance_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 15, ROUTE_31, 3
-	warp_event 17, 1, DARK_CAVE_BLACKTHORN_ENTRANCE, 2
+	warp_event  3, 15, ROUTE_31, 3
+	warp_event 17,  1, DARK_CAVE_BLACKTHORN_ENTRANCE, 2
 	warp_event 35, 33, ROUTE_46, 3
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 26, 3, BGEVENT_ITEM, DarkCaveVioletEntranceHiddenElixer
+	bg_event 26,  3, BGEVENT_ITEM, DarkCaveVioletEntranceHiddenElixer
 
 	db 8 ; object events
-	object_event 6, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION
+	object_event  6,  8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION
 	object_event 16, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
-	object_event 27, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
-	object_event 7, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
+	object_event 27,  6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
+	object_event  7, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
 	object_event 36, 31, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
 	object_event 36, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceFullHeal, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL
-	object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceHyperPotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION
+	object_event 35,  9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceHyperPotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION
 	object_event 30, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceDireHit, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT
diff --git a/maps/DayCare.asm b/maps/DayCare.asm
index fbf05fb9b..d14bdc24f 100644
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -157,17 +157,17 @@ DayCare_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 5, ROUTE_34, 3
-	warp_event 0, 6, ROUTE_34, 4
-	warp_event 2, 7, ROUTE_34, 5
-	warp_event 3, 7, ROUTE_34, 5
+	warp_event  0,  5, ROUTE_34, 3
+	warp_event  0,  6, ROUTE_34, 4
+	warp_event  2,  7, ROUTE_34, 5
+	warp_event  3,  7, ROUTE_34, 5
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, DayCareBookshelf
-	bg_event 1, 1, BGEVENT_READ, DayCareBookshelf
+	bg_event  0,  1, BGEVENT_READ, DayCareBookshelf
+	bg_event  1,  1, BGEVENT_READ, DayCareBookshelf
 
 	db 2 ; object events
-	object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE
-	object_event 5, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DayCareLadyScript, -1
+	object_event  2,  3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE
+	object_event  5,  3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DayCareLadyScript, -1
diff --git a/maps/DayOfWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm
index ba2c89015..403e2f165 100644
--- a/maps/DayOfWeekSiblingsHouse.asm
+++ b/maps/DayOfWeekSiblingsHouse.asm
@@ -72,12 +72,12 @@ DayOfWeekSiblingsHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, ROUTE_26, 3
-	warp_event 3, 7, ROUTE_26, 3
+	warp_event  2,  7, ROUTE_26, 3
+	warp_event  3,  7, ROUTE_26, 3
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1
+	object_event  3,  3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1
diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm
index e3d0c4501..8475c1411 100644
--- a/maps/DiglettsCave.asm
+++ b/maps/DiglettsCave.asm
@@ -24,17 +24,17 @@ DiglettsCave_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 3, 33, VERMILION_CITY, 10
-	warp_event 5, 31, DIGLETTS_CAVE, 5
-	warp_event 15, 5, ROUTE_2, 5
-	warp_event 17, 3, DIGLETTS_CAVE, 6
+	warp_event  3, 33, VERMILION_CITY, 10
+	warp_event  5, 31, DIGLETTS_CAVE, 5
+	warp_event 15,  5, ROUTE_2, 5
+	warp_event 17,  3, DIGLETTS_CAVE, 6
 	warp_event 17, 33, DIGLETTS_CAVE, 2
-	warp_event 3, 3, DIGLETTS_CAVE, 4
+	warp_event  3,  3, DIGLETTS_CAVE, 4
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 6, 11, BGEVENT_ITEM, DiglettsCaveHiddenMaxRevive
+	bg_event  6, 11, BGEVENT_ITEM, DiglettsCaveHiddenMaxRevive
 
 	db 1 ; object events
-	object_event 3, 31, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DiglettsCavePokefanMScript, -1
+	object_event  3, 31, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DiglettsCavePokefanMScript, -1
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index d4a2aa8ba..9a45e1482 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -659,15 +659,15 @@ DragonShrine_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 9, DRAGONS_DEN_B1F, 2
-	warp_event 5, 9, DRAGONS_DEN_B1F, 2
+	warp_event  4,  9, DRAGONS_DEN_B1F, 2
+	warp_event  5,  9, DRAGONS_DEN_B1F, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder1Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
-	object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder2Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
-	object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder3Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
-	object_event 4, 8, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR
+	object_event  5,  1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder1Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	object_event  2,  4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder2Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	object_event  7,  4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder3Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	object_event  4,  8, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR
diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm
index 4f7a947a1..2fbc62dfe 100644
--- a/maps/DragonsDen1F.asm
+++ b/maps/DragonsDen1F.asm
@@ -7,10 +7,10 @@ DragonsDen1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 3, 5, BLACKTHORN_CITY, 8
-	warp_event 3, 3, DRAGONS_DEN_1F, 4
-	warp_event 5, 15, DRAGONS_DEN_B1F, 1
-	warp_event 5, 13, DRAGONS_DEN_1F, 2
+	warp_event  3,  5, BLACKTHORN_CITY, 8
+	warp_event  3,  3, DRAGONS_DEN_1F, 4
+	warp_event  5, 15, DRAGONS_DEN_B1F, 1
+	warp_event  5, 13, DRAGONS_DEN_1F, 2
 
 	db 0 ; coord events
 
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 51f37da71..a194a397e 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -408,7 +408,7 @@ DragonsDenB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 20, 3, DRAGONS_DEN_1F, 3
+	warp_event 20,  3, DRAGONS_DEN_1F, 3
 	warp_event 19, 29, DRAGON_SHRINE, 1
 
 	db 1 ; coord events
@@ -424,9 +424,9 @@ DragonsDenB1F_MapEvents:
 	object_event 35, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG
 	object_event 14, 30, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR
 	object_event 20, 23, SPRITE_SILVER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN
-	object_event 20, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermDarin, -1
-	object_event 8, 8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1
-	object_event 4, 17, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1
-	object_event 4, 18, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia2, -1
-	object_event 30, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FCalcium, EVENT_DRAGONS_DEN_B1F_CALCIUM
-	object_event 5, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FMaxElixer, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER
+	object_event 20,  8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermDarin, -1
+	object_event  8,  8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1
+	object_event  4, 17, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1
+	object_event  4, 18, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia2, -1
+	object_event 30,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FCalcium, EVENT_DRAGONS_DEN_B1F_CALCIUM
+	object_event  5, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FMaxElixer, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER
diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm
index f4f17ea9a..84dafb3f2 100644
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -413,21 +413,21 @@ EarlsPokemonAcademy_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 15, VIOLET_CITY, 3
-	warp_event 4, 15, VIOLET_CITY, 3
+	warp_event  3, 15, VIOLET_CITY, 3
+	warp_event  4, 15, VIOLET_CITY, 3
 
 	db 0 ; coord events
 
 	db 4 ; bg events
-	bg_event 0, 1, BGEVENT_READ, AcademyBookshelf
-	bg_event 1, 1, BGEVENT_READ, AcademyBookshelf
-	bg_event 3, 0, BGEVENT_READ, AcademyBlackboard
-	bg_event 4, 0, BGEVENT_READ, AcademyBlackboard
+	bg_event  0,  1, BGEVENT_READ, AcademyBookshelf
+	bg_event  1,  1, BGEVENT_READ, AcademyBookshelf
+	bg_event  3,  0, BGEVENT_READ, AcademyBlackboard
+	bg_event  4,  0, BGEVENT_READ, AcademyBlackboard
 
 	db 6 ; object events
-	object_event 4, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL
-	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1
-	object_event 3, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1
-	object_event 4, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid2Script, -1
-	object_event 4, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster2Script, -1
-	object_event 2, 4, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AcademyNotebook, -1
+	object_event  4,  2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL
+	object_event  2,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1
+	object_event  3, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1
+	object_event  4, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid2Script, -1
+	object_event  4,  7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster2Script, -1
+	object_event  2,  4, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AcademyNotebook, -1
diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm
index 6a454bb83..c8bb4af5f 100644
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -264,27 +264,27 @@ EcruteakCity_MapEvents:
 	warp_event 35, 26, ROUTE_42_ECRUTEAK_GATE, 1
 	warp_event 35, 27, ROUTE_42_ECRUTEAK_GATE, 2
 	warp_event 18, 11, ECRUTEAK_TIN_TOWER_ENTRANCE, 1
-	warp_event 20, 2, WISE_TRIOS_ROOM, 1
-	warp_event 20, 3, WISE_TRIOS_ROOM, 2
+	warp_event 20,  2, WISE_TRIOS_ROOM, 1
+	warp_event 20,  3, WISE_TRIOS_ROOM, 2
 	warp_event 23, 27, ECRUTEAK_POKECENTER_1F, 1
-	warp_event 5, 21, ECRUTEAK_LUGIA_SPEECH_HOUSE, 1
+	warp_event  5, 21, ECRUTEAK_LUGIA_SPEECH_HOUSE, 1
 	warp_event 23, 21, DANCE_THEATRE, 1
 	warp_event 29, 21, ECRUTEAK_MART, 2
-	warp_event 6, 27, ECRUTEAK_GYM, 1
+	warp_event  6, 27, ECRUTEAK_GYM, 1
 	warp_event 13, 27, ECRUTEAK_ITEMFINDER_HOUSE, 1
-	warp_event 37, 7, TIN_TOWER_1F, 1
-	warp_event 5, 5, BURNED_TOWER_1F, 1
-	warp_event 0, 18, ROUTE_38_ECRUTEAK_GATE, 3
-	warp_event 0, 19, ROUTE_38_ECRUTEAK_GATE, 4
+	warp_event 37,  7, TIN_TOWER_1F, 1
+	warp_event  5,  5, BURNED_TOWER_1F, 1
+	warp_event  0, 18, ROUTE_38_ECRUTEAK_GATE, 3
+	warp_event  0, 19, ROUTE_38_ECRUTEAK_GATE, 4
 
 	db 0 ; coord events
 
 	db 8 ; bg events
 	bg_event 15, 21, BGEVENT_READ, EcruteakCitySign
 	bg_event 38, 10, BGEVENT_READ, TinTowerSign
-	bg_event 8, 28, BGEVENT_READ, EcruteakGymSign
+	bg_event  8, 28, BGEVENT_READ, EcruteakGymSign
 	bg_event 21, 21, BGEVENT_READ, EcruteakDanceTheaterSign
-	bg_event 2, 10, BGEVENT_READ, BurnedTowerSign
+	bg_event  2, 10, BGEVENT_READ, BurnedTowerSign
 	bg_event 24, 27, BGEVENT_READ, EcruteakCityPokecenterSign
 	bg_event 30, 21, BGEVENT_READ, EcruteakCityMartSign
 	bg_event 23, 14, BGEVENT_ITEM, EcruteakCityHiddenHyperPotion
@@ -293,7 +293,7 @@ EcruteakCity_MapEvents:
 	object_event 18, 15, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps1Script, -1
 	object_event 20, 21, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps2Script, -1
 	object_event 21, 29, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, EcruteakCityLassScript, -1
-	object_event 3, 9, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1a4015, -1
-	object_event 9, 22, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1
+	object_event  3,  9, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1a4015, -1
+	object_event  9, 22, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1
 	object_event 10, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakCityYoungsterScript, -1
-	object_event 3, 7, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps3Script, EVENT_ECRUTEAK_CITY_GRAMPS
+	object_event  3,  7, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps3Script, EVENT_ECRUTEAK_CITY_GRAMPS
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index fc9e03020..09dfaa5e2 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -388,51 +388,51 @@ EcruteakGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 33 ; warp events
-	warp_event 4, 17, ECRUTEAK_CITY, 10
-	warp_event 5, 17, ECRUTEAK_CITY, 10
-	warp_event 4, 14, ECRUTEAK_GYM, 4
-	warp_event 2, 4, ECRUTEAK_GYM, 3
-	warp_event 3, 4, ECRUTEAK_GYM, 3
-	warp_event 4, 4, ECRUTEAK_GYM, 3
-	warp_event 4, 5, ECRUTEAK_GYM, 3
-	warp_event 6, 7, ECRUTEAK_GYM, 3
-	warp_event 7, 4, ECRUTEAK_GYM, 3
-	warp_event 2, 6, ECRUTEAK_GYM, 3
-	warp_event 3, 6, ECRUTEAK_GYM, 3
-	warp_event 4, 6, ECRUTEAK_GYM, 3
-	warp_event 5, 6, ECRUTEAK_GYM, 3
-	warp_event 7, 6, ECRUTEAK_GYM, 3
-	warp_event 7, 7, ECRUTEAK_GYM, 3
-	warp_event 4, 8, ECRUTEAK_GYM, 3
-	warp_event 5, 8, ECRUTEAK_GYM, 3
-	warp_event 6, 8, ECRUTEAK_GYM, 3
-	warp_event 7, 8, ECRUTEAK_GYM, 3
-	warp_event 2, 8, ECRUTEAK_GYM, 3
-	warp_event 2, 9, ECRUTEAK_GYM, 3
-	warp_event 2, 10, ECRUTEAK_GYM, 3
-	warp_event 2, 11, ECRUTEAK_GYM, 3
-	warp_event 4, 10, ECRUTEAK_GYM, 3
-	warp_event 5, 10, ECRUTEAK_GYM, 3
-	warp_event 2, 12, ECRUTEAK_GYM, 3
-	warp_event 3, 12, ECRUTEAK_GYM, 3
-	warp_event 4, 12, ECRUTEAK_GYM, 3
-	warp_event 5, 12, ECRUTEAK_GYM, 3
-	warp_event 7, 10, ECRUTEAK_GYM, 3
-	warp_event 7, 11, ECRUTEAK_GYM, 3
-	warp_event 7, 12, ECRUTEAK_GYM, 3
-	warp_event 7, 13, ECRUTEAK_GYM, 3
+	warp_event  4, 17, ECRUTEAK_CITY, 10
+	warp_event  5, 17, ECRUTEAK_CITY, 10
+	warp_event  4, 14, ECRUTEAK_GYM, 4
+	warp_event  2,  4, ECRUTEAK_GYM, 3
+	warp_event  3,  4, ECRUTEAK_GYM, 3
+	warp_event  4,  4, ECRUTEAK_GYM, 3
+	warp_event  4,  5, ECRUTEAK_GYM, 3
+	warp_event  6,  7, ECRUTEAK_GYM, 3
+	warp_event  7,  4, ECRUTEAK_GYM, 3
+	warp_event  2,  6, ECRUTEAK_GYM, 3
+	warp_event  3,  6, ECRUTEAK_GYM, 3
+	warp_event  4,  6, ECRUTEAK_GYM, 3
+	warp_event  5,  6, ECRUTEAK_GYM, 3
+	warp_event  7,  6, ECRUTEAK_GYM, 3
+	warp_event  7,  7, ECRUTEAK_GYM, 3
+	warp_event  4,  8, ECRUTEAK_GYM, 3
+	warp_event  5,  8, ECRUTEAK_GYM, 3
+	warp_event  6,  8, ECRUTEAK_GYM, 3
+	warp_event  7,  8, ECRUTEAK_GYM, 3
+	warp_event  2,  8, ECRUTEAK_GYM, 3
+	warp_event  2,  9, ECRUTEAK_GYM, 3
+	warp_event  2, 10, ECRUTEAK_GYM, 3
+	warp_event  2, 11, ECRUTEAK_GYM, 3
+	warp_event  4, 10, ECRUTEAK_GYM, 3
+	warp_event  5, 10, ECRUTEAK_GYM, 3
+	warp_event  2, 12, ECRUTEAK_GYM, 3
+	warp_event  3, 12, ECRUTEAK_GYM, 3
+	warp_event  4, 12, ECRUTEAK_GYM, 3
+	warp_event  5, 12, ECRUTEAK_GYM, 3
+	warp_event  7, 10, ECRUTEAK_GYM, 3
+	warp_event  7, 11, ECRUTEAK_GYM, 3
+	warp_event  7, 12, ECRUTEAK_GYM, 3
+	warp_event  7, 13, ECRUTEAK_GYM, 3
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 3, 15, BGEVENT_READ, EcruteakGymStatue
-	bg_event 6, 15, BGEVENT_READ, EcruteakGymStatue
+	bg_event  3, 15, BGEVENT_READ, EcruteakGymStatue
+	bg_event  6, 15, BGEVENT_READ, EcruteakGymStatue
 
 	db 7 ; object events
-	object_event 5, 1, SPRITE_MORTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MortyScript_0x99d58, -1
-	object_event 2, 7, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1
-	object_event 3, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1
-	object_event 7, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumMartha, -1
-	object_event 7, 9, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumGrace, -1
-	object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakGymGuyScript, -1
-	object_event 4, 14, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS
+	object_event  5,  1, SPRITE_MORTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MortyScript_0x99d58, -1
+	object_event  2,  7, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1
+	object_event  3, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1
+	object_event  7,  5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumMartha, -1
+	object_event  7,  9, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumGrace, -1
+	object_event  7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakGymGuyScript, -1
+	object_event  4, 14, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS
diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm
index f058a6ec9..0ae99bd65 100644
--- a/maps/EcruteakItemfinderHouse.asm
+++ b/maps/EcruteakItemfinderHouse.asm
@@ -164,14 +164,14 @@ EcruteakItemfinderHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 7, ECRUTEAK_CITY, 11
-	warp_event 4, 7, ECRUTEAK_CITY, 11
+	warp_event  3,  7, ECRUTEAK_CITY, 11
+	warp_event  4,  7, ECRUTEAK_CITY, 11
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 2, 1, BGEVENT_READ, ItemFinderHouseRadio
+	bg_event  2,  1, BGEVENT_READ, ItemFinderHouseRadio
 
 	db 2 ; object events
-	object_event 2, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakItemfinderGuy, -1
-	object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHistoryBook, -1
+	object_event  2,  3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakItemfinderGuy, -1
+	object_event  3,  3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHistoryBook, -1
diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm
index 4df1e5430..8b02bd15c 100644
--- a/maps/EcruteakLugiaSpeechHouse.asm
+++ b/maps/EcruteakLugiaSpeechHouse.asm
@@ -46,14 +46,14 @@ EcruteakLugiaSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 7, ECRUTEAK_CITY, 7
-	warp_event 4, 7, ECRUTEAK_CITY, 7
+	warp_event  3,  7, ECRUTEAK_CITY, 7
+	warp_event  4,  7, ECRUTEAK_CITY, 7
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 2, 1, BGEVENT_READ, LugiaSpeechHouseRadio
+	bg_event  2,  1, BGEVENT_READ, LugiaSpeechHouseRadio
 
 	db 2 ; object events
-	object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseGrampsScript, -1
-	object_event 5, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseYoungsterScript, -1
+	object_event  2,  3, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseGrampsScript, -1
+	object_event  5,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseYoungsterScript, -1
diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm
index 9587e331b..2ea3cd494 100644
--- a/maps/EcruteakMart.asm
+++ b/maps/EcruteakMart.asm
@@ -47,14 +47,14 @@ EcruteakMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, ECRUTEAK_CITY, 9
-	warp_event 3, 7, ECRUTEAK_CITY, 9
+	warp_event  2,  7, ECRUTEAK_CITY, 9
+	warp_event  3,  7, ECRUTEAK_CITY, 9
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1
-	object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1
-	object_event 6, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1
+	object_event  5,  2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1
+	object_event  6,  6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1
diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm
index a51602588..e8b12466c 100644
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -208,17 +208,17 @@ EcruteakPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, ECRUTEAK_CITY, 6
-	warp_event 4, 7, ECRUTEAK_CITY, 6
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, ECRUTEAK_CITY, 6
+	warp_event  4,  7, ECRUTEAK_CITY, 6
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 5 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FNurseScript, -1
-	object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FPokefanMScript, -1
-	object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FCooltrainerFScript, -1
-	object_event 7, 1, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FGymGuyScript, -1
-	object_event 0, 7, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FNurseScript, -1
+	object_event  7,  6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FPokefanMScript, -1
+	object_event  1,  4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FCooltrainerFScript, -1
+	object_event  7,  1, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FGymGuyScript, -1
+	object_event  0,  7, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL
diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm
index 2a0ebbcbc..552dbc2a1 100644
--- a/maps/EcruteakTinTowerEntrance.asm
+++ b/maps/EcruteakTinTowerEntrance.asm
@@ -279,20 +279,20 @@ EcruteakTinTowerEntrance_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 4, 17, ECRUTEAK_CITY, 3
-	warp_event 5, 17, ECRUTEAK_CITY, 3
-	warp_event 5, 3, ECRUTEAK_TIN_TOWER_ENTRANCE, 4
+	warp_event  4, 17, ECRUTEAK_CITY, 3
+	warp_event  5, 17, ECRUTEAK_CITY, 3
+	warp_event  5,  3, ECRUTEAK_TIN_TOWER_ENTRANCE, 4
 	warp_event 17, 15, ECRUTEAK_TIN_TOWER_ENTRANCE, 3
-	warp_event 17, 3, WISE_TRIOS_ROOM, 3
+	warp_event 17,  3, WISE_TRIOS_ROOM, 3
 
 	db 2 ; coord events
-	coord_event 4, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent1
-	coord_event 5, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent2
+	coord_event  4,  7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent1
+	coord_event  5,  7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent2
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1
-	object_event 5, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2
-	object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
-	object_event 3, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceGrampsScript, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
+	object_event  4,  6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1
+	object_event  5,  6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2
+	object_event  6,  9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
+	object_event  3, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceGrampsScript, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm
index 5064bb44f..544de62fb 100644
--- a/maps/ElmsHouse.asm
+++ b/maps/ElmsHouse.asm
@@ -85,16 +85,16 @@ ElmsHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, NEW_BARK_TOWN, 4
-	warp_event 3, 7, NEW_BARK_TOWN, 4
+	warp_event  2,  7, NEW_BARK_TOWN, 4
+	warp_event  3,  7, NEW_BARK_TOWN, 4
 
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event 0, 1, BGEVENT_READ, ElmsHousePC
-	bg_event 6, 1, BGEVENT_READ, ElmsHouseBookshelf
-	bg_event 7, 1, BGEVENT_READ, ElmsHouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, ElmsHousePC
+	bg_event  6,  1, BGEVENT_READ, ElmsHouseBookshelf
+	bg_event  7,  1, BGEVENT_READ, ElmsHouseBookshelf
 
 	db 2 ; object events
-	object_event 1, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1
-	object_event 5, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1
+	object_event  1,  5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1
+	object_event  5,  4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index d9ab8f320..7fac1ff13 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -1372,41 +1372,41 @@ ElmsLab_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 11, NEW_BARK_TOWN, 1
-	warp_event 5, 11, NEW_BARK_TOWN, 1
+	warp_event  4, 11, NEW_BARK_TOWN, 1
+	warp_event  5, 11, NEW_BARK_TOWN, 1
 
 	db 8 ; coord events
-	coord_event 4, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript
-	coord_event 5, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript
-	coord_event 4, 5, SCENE_ELMSLAB_MEET_OFFICER, MeetCopScript
-	coord_event 5, 5, SCENE_ELMSLAB_MEET_OFFICER, MeetCopScript2
-	coord_event 4, 8, SCENE_ELMSLAB_AIDE_GIVES_POTION, AideScript_WalkPotion1
-	coord_event 5, 8, SCENE_ELMSLAB_AIDE_GIVES_POTION, AideScript_WalkPotion2
-	coord_event 4, 8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls1
-	coord_event 5, 8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls2
+	coord_event  4,  6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript
+	coord_event  5,  6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript
+	coord_event  4,  5, SCENE_ELMSLAB_MEET_OFFICER, MeetCopScript
+	coord_event  5,  5, SCENE_ELMSLAB_MEET_OFFICER, MeetCopScript2
+	coord_event  4,  8, SCENE_ELMSLAB_AIDE_GIVES_POTION, AideScript_WalkPotion1
+	coord_event  5,  8, SCENE_ELMSLAB_AIDE_GIVES_POTION, AideScript_WalkPotion2
+	coord_event  4,  8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls1
+	coord_event  5,  8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls2
 
 	db 16 ; bg events
-	bg_event 2, 1, BGEVENT_READ, ElmsLabHealingMachine
-	bg_event 6, 1, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 7, 1, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 8, 1, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 9, 1, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 0, 7, BGEVENT_READ, ElmsLabTravelTip1
-	bg_event 1, 7, BGEVENT_READ, ElmsLabTravelTip2
-	bg_event 2, 7, BGEVENT_READ, ElmsLabTravelTip3
-	bg_event 3, 7, BGEVENT_READ, ElmsLabTravelTip4
-	bg_event 6, 7, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 7, 7, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 8, 7, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 9, 7, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 9, 3, BGEVENT_READ, ElmsLabTrashcan
-	bg_event 5, 0, BGEVENT_READ, ElmsLabWindow
-	bg_event 3, 5, BGEVENT_DOWN, ElmsLabPC
+	bg_event  2,  1, BGEVENT_READ, ElmsLabHealingMachine
+	bg_event  6,  1, BGEVENT_READ, ElmsLabBookshelf
+	bg_event  7,  1, BGEVENT_READ, ElmsLabBookshelf
+	bg_event  8,  1, BGEVENT_READ, ElmsLabBookshelf
+	bg_event  9,  1, BGEVENT_READ, ElmsLabBookshelf
+	bg_event  0,  7, BGEVENT_READ, ElmsLabTravelTip1
+	bg_event  1,  7, BGEVENT_READ, ElmsLabTravelTip2
+	bg_event  2,  7, BGEVENT_READ, ElmsLabTravelTip3
+	bg_event  3,  7, BGEVENT_READ, ElmsLabTravelTip4
+	bg_event  6,  7, BGEVENT_READ, ElmsLabBookshelf
+	bg_event  7,  7, BGEVENT_READ, ElmsLabBookshelf
+	bg_event  8,  7, BGEVENT_READ, ElmsLabBookshelf
+	bg_event  9,  7, BGEVENT_READ, ElmsLabBookshelf
+	bg_event  9,  3, BGEVENT_READ, ElmsLabTrashcan
+	bg_event  5,  0, BGEVENT_READ, ElmsLabWindow
+	bg_event  3,  5, BGEVENT_DOWN, ElmsLabPC
 
 	db 6 ; object events
-	object_event 5, 2, SPRITE_ELM, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfElmScript, -1
-	object_event 2, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB
-	object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
-	object_event 7, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB
-	object_event 8, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB
-	object_event 5, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB
+	object_event  5,  2, SPRITE_ELM, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfElmScript, -1
+	object_event  2,  9, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB
+	object_event  6,  3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
+	object_event  7,  3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB
+	object_event  8,  3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB
+	object_event  5,  3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index 405cb8caf..ccd11693e 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -287,27 +287,27 @@ FastShip1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 12 ; warp events
-	warp_event 25, 1, FAST_SHIP_1F, -1
-	warp_event 27, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 1
-	warp_event 23, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 2
-	warp_event 19, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 3
-	warp_event 15, 8, FAST_SHIP_CABINS_SW_SSW_NW, 1
+	warp_event 25,  1, FAST_SHIP_1F, -1
+	warp_event 27,  8, FAST_SHIP_CABINS_NNW_NNE_NE, 1
+	warp_event 23,  8, FAST_SHIP_CABINS_NNW_NNE_NE, 2
+	warp_event 19,  8, FAST_SHIP_CABINS_NNW_NNE_NE, 3
+	warp_event 15,  8, FAST_SHIP_CABINS_SW_SSW_NW, 1
 	warp_event 15, 15, FAST_SHIP_CABINS_SW_SSW_NW, 2
 	warp_event 19, 15, FAST_SHIP_CABINS_SW_SSW_NW, 4
 	warp_event 23, 15, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 1
 	warp_event 27, 15, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 3
-	warp_event 3, 13, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 5
-	warp_event 6, 12, FAST_SHIP_B1F, 1
+	warp_event  3, 13, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 5
+	warp_event  6, 12, FAST_SHIP_B1F, 1
 	warp_event 30, 14, FAST_SHIP_B1F, 2
 
 	db 2 ; coord events
-	coord_event 24, 6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneLeft
-	coord_event 25, 6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneRight
+	coord_event 24,  6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneLeft
+	coord_event 25,  6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneRight
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 25, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x75160, -1
-	object_event 14, 7, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x751d0, -1
+	object_event 25,  2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x75160, -1
+	object_event 14,  7, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x751d0, -1
 	object_event 22, 17, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailorScript, -1
-	object_event 19, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN
+	object_event 19,  6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN
diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm
index 3051ff20d..5737b62b4 100644
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -450,26 +450,26 @@ FastShipB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 5, 11, FAST_SHIP_1F, 11
+	warp_event  5, 11, FAST_SHIP_1F, 11
 	warp_event 31, 13, FAST_SHIP_1F, 12
 
 	db 2 ; coord events
-	coord_event 30, 7, SCENE_DEFAULT, UnknownScript_0x7673c
-	coord_event 31, 7, SCENE_DEFAULT, UnknownScript_0x76751
+	coord_event 30,  7, SCENE_DEFAULT, UnknownScript_0x7673c
+	coord_event 31,  7, SCENE_DEFAULT, UnknownScript_0x76751
 
 	db 1 ; bg events
-	bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan
+	bg_event 27,  9, BGEVENT_READ, FashShipB1FTrashcan
 
 	db 12 ; object events
-	object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT
-	object_event 31, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
-	object_event 9, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event 26, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event 17, 4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event 25, 8, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event 30,  6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT
+	object_event 31,  6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
+	object_event  9, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event  6,  4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event 26,  9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event 17,  4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event 25,  8, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
 	object_event 15, 11, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltWai, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event 23, 4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
-	object_event 9, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
-	object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event 23,  4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event  9, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event 14,  9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
 	object_event 14, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm
index cbacb9b74..39cfa0367 100644
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -268,22 +268,22 @@ FastShipCabins_NNW_NNE_NE_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 2, 0, FAST_SHIP_1F, 2
-	warp_event 2, 12, FAST_SHIP_1F, 3
-	warp_event 2, 24, FAST_SHIP_1F, 4
+	warp_event  2,  0, FAST_SHIP_1F, 2
+	warp_event  2, 12, FAST_SHIP_1F, 3
+	warp_event  2, 24, FAST_SHIP_1F, 4
 
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event 6, 13, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
-	bg_event 7, 19, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
-	bg_event 7, 31, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
+	bg_event  6, 13, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
+	bg_event  7, 19, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
+	bg_event  7, 31, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
 
 	db 7 ; object events
-	object_event 4, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event 1, 5, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event 1, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
-	object_event 4, 17, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event 4, 26, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
-	object_event 7, 30, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event 2, 30, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event  4,  3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event  1,  5, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event  1,  5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event  4, 17, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event  4, 26, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
+	object_event  7, 30, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event  2, 30, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index a1db95fa9..ece89c3ec 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -464,27 +464,27 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 2, 7, FAST_SHIP_1F, 8
-	warp_event 3, 7, FAST_SHIP_1F, 8
-	warp_event 2, 19, FAST_SHIP_1F, 9
-	warp_event 3, 19, FAST_SHIP_1F, 9
-	warp_event 2, 33, FAST_SHIP_1F, 10
-	warp_event 3, 33, FAST_SHIP_1F, 10
+	warp_event  2,  7, FAST_SHIP_1F, 8
+	warp_event  3,  7, FAST_SHIP_1F, 8
+	warp_event  2, 19, FAST_SHIP_1F, 9
+	warp_event  3, 19, FAST_SHIP_1F, 9
+	warp_event  2, 33, FAST_SHIP_1F, 10
+	warp_event  3, 33, FAST_SHIP_1F, 10
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 4, 25, BGEVENT_READ, FastShipCaptainsCabinTrashcan
+	bg_event  4, 25, BGEVENT_READ, FastShipCaptainsCabinTrashcan
 
 	db 11 ; object events
-	object_event 3, 25, SPRITE_CAPTAIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaCaptain, -1
-	object_event 2, 17, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaGrandpa, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
-	object_event 3, 17, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterAfter, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
-	object_event 2, 25, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterBefore, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2
-	object_event 5, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event 2, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event 3, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event 5, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
-	object_event 5, 5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
-	object_event 1, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event  3, 25, SPRITE_CAPTAIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaCaptain, -1
+	object_event  2, 17, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaGrandpa, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
+	object_event  3, 17, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterAfter, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
+	object_event  2, 25, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterBefore, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2
+	object_event  5,  6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event  2,  4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event  3,  4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event  5,  5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event  2,  3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event  5,  5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event  1, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm
index 15200b33c..275fb5db7 100644
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -224,21 +224,21 @@ FastShipCabins_SW_SSW_NW_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 2, 0, FAST_SHIP_1F, 5
-	warp_event 2, 19, FAST_SHIP_1F, 6
-	warp_event 3, 19, FAST_SHIP_1F, 6
-	warp_event 2, 31, FAST_SHIP_1F, 7
-	warp_event 3, 31, FAST_SHIP_1F, 7
+	warp_event  2,  0, FAST_SHIP_1F, 5
+	warp_event  2, 19, FAST_SHIP_1F, 6
+	warp_event  3, 19, FAST_SHIP_1F, 6
+	warp_event  2, 31, FAST_SHIP_1F, 7
+	warp_event  3, 31, FAST_SHIP_1F, 7
 
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event 7, 1, BGEVENT_READ, FastShipBed
-	bg_event 7, 2, BGEVENT_READ, FastShipBed
-	bg_event 7, 7, BGEVENT_READ, FastShipCabinsNorthwestCabinTrashcan
+	bg_event  7,  1, BGEVENT_READ, FastShipBed
+	bg_event  7,  2, BGEVENT_READ, FastShipBed
+	bg_event  7,  7, BGEVENT_READ, FastShipCabinsNorthwestCabinTrashcan
 
 	db 4 ; object events
-	object_event 1, 15, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event 6, 15, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
-	object_event 1, 26, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event 3, 28, SPRITE_ROCKER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event  1, 15, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event  6, 15, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event  1, 26, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event  3, 28, SPRITE_ROCKER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm
index 0a30bdf3c..dde645d75 100644
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -44,15 +44,15 @@ FightingDojo_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 11, SAFFRON_CITY, 1
-	warp_event 5, 11, SAFFRON_CITY, 1
+	warp_event  4, 11, SAFFRON_CITY, 1
+	warp_event  5, 11, SAFFRON_CITY, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 4, 0, BGEVENT_READ, MapFightingDojoSignpost0Script
-	bg_event 5, 0, BGEVENT_READ, MapFightingDojoSignpost1Script
+	bg_event  4,  0, BGEVENT_READ, MapFightingDojoSignpost0Script
+	bg_event  5,  0, BGEVENT_READ, MapFightingDojoSignpost1Script
 
 	db 2 ; object events
-	object_event 4, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1
-	object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND
+	object_event  4,  4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1
+	object_event  3,  1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND
diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm
index 5fd606422..0d44b0e8f 100644
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -126,32 +126,32 @@ FuchsiaCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 11 ; warp events
-	warp_event 5, 13, FUCHSIA_MART, 2
+	warp_event  5, 13, FUCHSIA_MART, 2
 	warp_event 22, 13, SAFARI_ZONE_MAIN_OFFICE, 1
-	warp_event 8, 27, FUCHSIA_GYM, 1
+	warp_event  8, 27, FUCHSIA_GYM, 1
 	warp_event 11, 27, BILLS_BROTHERS_HOUSE, 1
 	warp_event 19, 27, FUCHSIA_POKECENTER_1F, 1
 	warp_event 27, 27, SAFARI_ZONE_WARDENS_HOME, 1
-	warp_event 18, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3
+	warp_event 18,  3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 ; inaccessible
 	warp_event 37, 22, ROUTE_15_FUCHSIA_GATE, 1
 	warp_event 37, 23, ROUTE_15_FUCHSIA_GATE, 2
-	warp_event 7, 35, ROUTE_19_FUCHSIA_GATE, 1
-	warp_event 8, 35, ROUTE_19_FUCHSIA_GATE, 2
+	warp_event  7, 35, ROUTE_19_FUCHSIA_GATE, 1
+	warp_event  8, 35, ROUTE_19_FUCHSIA_GATE, 2
 
 	db 0 ; coord events
 
 	db 8 ; bg events
 	bg_event 21, 15, BGEVENT_READ, FuchsiaCitySign
-	bg_event 5, 29, BGEVENT_READ, FuchsiaGymSign
+	bg_event  5, 29, BGEVENT_READ, FuchsiaGymSign
 	bg_event 25, 15, BGEVENT_READ, SafariZoneOfficeSign
 	bg_event 27, 29, BGEVENT_READ, WardensHomeSign
-	bg_event 17, 5, BGEVENT_READ, SafariZoneClosedSign
+	bg_event 17,  5, BGEVENT_READ, SafariZoneClosedSign
 	bg_event 13, 15, BGEVENT_READ, NoLitteringSign
 	bg_event 20, 27, BGEVENT_READ, FuchsiaCityPokecenterSign
-	bg_event 6, 13, BGEVENT_READ, FuchsiaCityMartSign
+	bg_event  6, 13, BGEVENT_READ, FuchsiaCityMartSign
 
 	db 4 ; object events
 	object_event 23, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1
-	object_event 13, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1
+	object_event 13,  8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1
 	object_event 16, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1
-	object_event 8, 1, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1
+	object_event  8,  1, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1
diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm
index 0ffcdd0e3..715e6b907 100644
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -382,19 +382,19 @@ FuchsiaGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 17, FUCHSIA_CITY, 3
-	warp_event 5, 17, FUCHSIA_CITY, 3
+	warp_event  4, 17, FUCHSIA_CITY, 3
+	warp_event  5, 17, FUCHSIA_CITY, 3
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 3, 15, BGEVENT_READ, FuchsiaGymStatue
-	bg_event 6, 15, BGEVENT_READ, FuchsiaGymStatue
+	bg_event  3, 15, BGEVENT_READ, FuchsiaGymStatue
+	bg_event  6, 15, BGEVENT_READ, FuchsiaGymStatue
 
 	db 6 ; object events
-	object_event 1, 10, SPRITE_JANINE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1
-	object_event 5, 7, SPRITE_FUCHSIA_GYM_1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassAliceScript, -1
-	object_event 5, 11, SPRITE_FUCHSIA_GYM_2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassLindaScript, -1
-	object_event 9, 4, SPRITE_FUCHSIA_GYM_3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PicnickerCindyScript, -1
-	object_event 4, 2, SPRITE_FUCHSIA_GYM_4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CamperBarryScript, -1
-	object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymGuyScript, -1
+	object_event  1, 10, SPRITE_JANINE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1
+	object_event  5,  7, SPRITE_FUCHSIA_GYM_1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassAliceScript, -1
+	object_event  5, 11, SPRITE_FUCHSIA_GYM_2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassLindaScript, -1
+	object_event  9,  4, SPRITE_FUCHSIA_GYM_3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PicnickerCindyScript, -1
+	object_event  4,  2, SPRITE_FUCHSIA_GYM_4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CamperBarryScript, -1
+	object_event  7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymGuyScript, -1
diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm
index 9bc34b006..b2e819917 100644
--- a/maps/FuchsiaMart.asm
+++ b/maps/FuchsiaMart.asm
@@ -39,14 +39,14 @@ FuchsiaMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, FUCHSIA_CITY, 1
-	warp_event 3, 7, FUCHSIA_CITY, 1
+	warp_event  2,  7, FUCHSIA_CITY, 1
+	warp_event  3,  7, FUCHSIA_CITY, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1
-	object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1
-	object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1
+	object_event  3,  2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1
+	object_event  7,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1
diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm
index 418266485..3e05aa719 100644
--- a/maps/FuchsiaPokecenter1F.asm
+++ b/maps/FuchsiaPokecenter1F.asm
@@ -90,16 +90,16 @@ FuchsiaPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, FUCHSIA_CITY, 5
-	warp_event 4, 7, FUCHSIA_CITY, 5
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, FUCHSIA_CITY, 5
+	warp_event  4,  7, FUCHSIA_CITY, 5
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NurseScript_0x196459, -1
-	object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1
-	object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1
-	object_event 5, 3, SPRITE_JANINE_IMPERSONATOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NurseScript_0x196459, -1
+	object_event  8,  4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1
+	object_event  1,  4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1
+	object_event  5,  3, SPRITE_JANINE_IMPERSONATOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1
diff --git a/maps/FuchsiaPokecenter2FBeta.asm b/maps/FuchsiaPokecenter2FBeta.asm
index f26304a3e..bfa6be81e 100644
--- a/maps/FuchsiaPokecenter2FBeta.asm
+++ b/maps/FuchsiaPokecenter2FBeta.asm
@@ -7,7 +7,7 @@ FuchsiaPokecenter2FBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 0, 7, FUCHSIA_POKECENTER_1F, 3
+	warp_event  0,  7, FUCHSIA_POKECENTER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm
index 05bcf0de7..e4bb27a4a 100644
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -104,21 +104,21 @@ GoldenrodBikeShop_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, GOLDENROD_CITY, 2
-	warp_event 3, 7, GOLDENROD_CITY, 2
+	warp_event  2,  7, GOLDENROD_CITY, 2
+	warp_event  3,  7, GOLDENROD_CITY, 2
 
 	db 0 ; coord events
 
 	db 9 ; bg events
-	bg_event 1, 2, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 0, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 1, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 0, 5, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 1, 5, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 0, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 1, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 6, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 7, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
+	bg_event  1,  2, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
+	bg_event  0,  3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
+	bg_event  1,  3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
+	bg_event  0,  5, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
+	bg_event  1,  5, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
+	bg_event  0,  6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
+	bg_event  1,  6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
+	bg_event  6,  6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
+	bg_event  7,  6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
 
 	db 1 ; object events
-	object_event 7, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x54750, -1
+	object_event  7,  2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x54750, -1
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 1f30a0015..642d3143b 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -553,19 +553,19 @@ GoldenrodCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 15 ; warp events
-	warp_event 24, 7, GOLDENROD_GYM, 1
+	warp_event 24,  7, GOLDENROD_GYM, 1
 	warp_event 29, 29, GOLDENROD_BIKE_SHOP, 1
 	warp_event 31, 21, GOLDENROD_HAPPINESS_RATER, 1
-	warp_event 5, 25, BILLS_FAMILYS_HOUSE, 1
-	warp_event 9, 13, GOLDENROD_MAGNET_TRAIN_STATION, 2
-	warp_event 29, 5, GOLDENROD_FLOWER_SHOP, 1
-	warp_event 33, 9, GOLDENROD_PP_SPEECH_HOUSE, 1
-	warp_event 15, 7, GOLDENROD_NAME_RATER, 1
+	warp_event  5, 25, BILLS_FAMILYS_HOUSE, 1
+	warp_event  9, 13, GOLDENROD_MAGNET_TRAIN_STATION, 2
+	warp_event 29,  5, GOLDENROD_FLOWER_SHOP, 1
+	warp_event 33,  9, GOLDENROD_PP_SPEECH_HOUSE, 1
+	warp_event 15,  7, GOLDENROD_NAME_RATER, 1
 	warp_event 24, 27, GOLDENROD_DEPT_STORE_1F, 1
 	warp_event 14, 21, GOLDENROD_GAME_CORNER, 1
-	warp_event 5, 15, RADIO_TOWER_1F, 1
-	warp_event 19, 1, ROUTE_35_GOLDENROD_GATE, 3
-	warp_event 9, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 8
+	warp_event  5, 15, RADIO_TOWER_1F, 1
+	warp_event 19,  1, ROUTE_35_GOLDENROD_GATE, 3
+	warp_event  9,  5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 8
 	warp_event 11, 29, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 5
 	warp_event 15, 27, GOLDENROD_POKECENTER_1F, 1
 
@@ -573,31 +573,31 @@ GoldenrodCity_MapEvents:
 
 	db 12 ; bg events
 	bg_event 10, 14, BGEVENT_READ, GoldenrodCityStationSign
-	bg_event 4, 17, BGEVENT_READ, GoldenrodCityRadioTowerSign
+	bg_event  4, 17, BGEVENT_READ, GoldenrodCityRadioTowerSign
 	bg_event 26, 27, BGEVENT_READ, GoldenrodDeptStoreSign
-	bg_event 26, 9, BGEVENT_READ, GoldenrodGymSign
+	bg_event 26,  9, BGEVENT_READ, GoldenrodGymSign
 	bg_event 22, 18, BGEVENT_READ, GoldenrodCitySign
 	bg_event 28, 30, BGEVENT_READ, GoldenrodCityBikeShopSign
 	bg_event 16, 22, BGEVENT_READ, GoldenrodCityGameCornerSign
-	bg_event 12, 7, BGEVENT_READ, GoldenrodCityNameRaterSign
-	bg_event 8, 6, BGEVENT_READ, GoldenrodCityUndergroundSignNorth
+	bg_event 12,  7, BGEVENT_READ, GoldenrodCityNameRaterSign
+	bg_event  8,  6, BGEVENT_READ, GoldenrodCityUndergroundSignNorth
 	bg_event 12, 30, BGEVENT_READ, GoldenrodCityUndergroundSignSouth
 	bg_event 16, 27, BGEVENT_UP, GoldenrodCityPokecenterSign
-	bg_event 30, 6, BGEVENT_READ, GoldenrodCityFlowerShopSign
+	bg_event 30,  6, BGEVENT_READ, GoldenrodCityFlowerShopSign
 
 	db 15 ; object events
-	object_event 7, 18, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event  7, 18, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS
 	object_event 30, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster1Script, EVENT_GOLDENROD_CITY_CIVILIANS
 	object_event 12, 16, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS
 	object_event 20, 26, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS
 	object_event 19, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster2Script, EVENT_GOLDENROD_CITY_CIVILIANS
 	object_event 17, 10, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodCityLassScript, EVENT_GOLDENROD_CITY_CIVILIANS
 	object_event 11, 27, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityGrampsScript, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event 4, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocketScoutScript, EVENT_GOLDENROD_CITY_ROCKET_SCOUT
+	object_event  4, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocketScoutScript, EVENT_GOLDENROD_CITY_ROCKET_SCOUT
 	object_event 28, 20, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket1Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
-	object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket2Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
+	object_event  8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket2Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
 	object_event 16, 23, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket3Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event 29, 20, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket4Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 29, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 29,  7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event 31, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket6Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event 12, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutorScript, EVENT_GOLDENROD_CITY_MOVE_TUTOR
diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm
index 0a527369c..5877484be 100644
--- a/maps/GoldenrodDeptStore1F.asm
+++ b/maps/GoldenrodDeptStore1F.asm
@@ -80,19 +80,19 @@ GoldenrodDeptStore1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 7, 7, GOLDENROD_CITY, 9
-	warp_event 8, 7, GOLDENROD_CITY, 9
-	warp_event 15, 0, GOLDENROD_DEPT_STORE_2F, 2
-	warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
+	warp_event  7,  7, GOLDENROD_CITY, 9
+	warp_event  8,  7, GOLDENROD_CITY, 9
+	warp_event 15,  0, GOLDENROD_DEPT_STORE_2F, 2
+	warp_event  2,  0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore1FDirectory
-	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore1FElevatorButton
+	bg_event 14,  0, BGEVENT_READ, GoldenrodDeptStore1FDirectory
+	bg_event  3,  0, BGEVENT_READ, GoldenrodDeptStore1FElevatorButton
 
 	db 4 ; object events
-	object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1
-	object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1
-	object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1
-	object_event 11, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FGentlemanScript, -1
+	object_event 10,  1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1
+	object_event  5,  4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1
+	object_event  5,  5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1
+	object_event 11,  5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FGentlemanScript, -1
diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm
index a759e6559..f28ffc240 100644
--- a/maps/GoldenrodDeptStore2F.asm
+++ b/maps/GoldenrodDeptStore2F.asm
@@ -102,19 +102,19 @@ GoldenrodDeptStore2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 12, 0, GOLDENROD_DEPT_STORE_3F, 1
-	warp_event 15, 0, GOLDENROD_DEPT_STORE_1F, 3
-	warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
+	warp_event 12,  0, GOLDENROD_DEPT_STORE_3F, 1
+	warp_event 15,  0, GOLDENROD_DEPT_STORE_1F, 3
+	warp_event  2,  0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore2FDirectory
-	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore2FElevatorButton
+	bg_event 14,  0, BGEVENT_READ, GoldenrodDeptStore2FDirectory
+	bg_event  3,  0, BGEVENT_READ, GoldenrodDeptStore2FElevatorButton
 
 	db 5 ; object events
-	object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1
-	object_event 13, 6, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1
-	object_event 9, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1
-	object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FCooltrainerFScript, -1
-	object_event 2, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FGentlemanScript, -1
+	object_event 13,  5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1
+	object_event 13,  6, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1
+	object_event  9,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1
+	object_event  6,  2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FCooltrainerFScript, -1
+	object_event  2,  6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FGentlemanScript, -1
diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm
index ddd5dcacf..0be5d0a47 100644
--- a/maps/GoldenrodDeptStore3F.asm
+++ b/maps/GoldenrodDeptStore3F.asm
@@ -58,17 +58,17 @@ GoldenrodDeptStore3F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 12, 0, GOLDENROD_DEPT_STORE_2F, 1
-	warp_event 15, 0, GOLDENROD_DEPT_STORE_4F, 2
-	warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
+	warp_event 12,  0, GOLDENROD_DEPT_STORE_2F, 1
+	warp_event 15,  0, GOLDENROD_DEPT_STORE_4F, 2
+	warp_event  2,  0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore3FDirectory
-	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore3FElevatorButton
+	bg_event 14,  0, BGEVENT_READ, GoldenrodDeptStore3FDirectory
+	bg_event  3,  0, BGEVENT_READ, GoldenrodDeptStore3FElevatorButton
 
 	db 3 ; object events
-	object_event 6, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1
-	object_event 12, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1
-	object_event 2, 5, SPRITE_ROCKER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1
+	object_event  6,  1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1
+	object_event 12,  5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1
+	object_event  2,  5, SPRITE_ROCKER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1
diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm
index c408120ed..2ee5f805d 100644
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -79,18 +79,18 @@ GoldenrodDeptStore4F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 12, 0, GOLDENROD_DEPT_STORE_5F, 1
-	warp_event 15, 0, GOLDENROD_DEPT_STORE_3F, 2
-	warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
+	warp_event 12,  0, GOLDENROD_DEPT_STORE_5F, 1
+	warp_event 15,  0, GOLDENROD_DEPT_STORE_3F, 2
+	warp_event  2,  0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore4FDirectory
-	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore4FElevatorButton
+	bg_event 14,  0, BGEVENT_READ, GoldenrodDeptStore4FDirectory
+	bg_event  3,  0, BGEVENT_READ, GoldenrodDeptStore4FElevatorButton
 
 	db 4 ; object events
-	object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1
-	object_event 11, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1
-	object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1
-	object_event 5, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x55ef7, -1
+	object_event 13,  5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1
+	object_event 11,  7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1
+	object_event  7,  2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1
+	object_event  5,  1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x55ef7, -1
diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm
index 3d69348f0..a69e87f64 100644
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -219,20 +219,20 @@ GoldenrodDeptStore5F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 12, 0, GOLDENROD_DEPT_STORE_4F, 1
-	warp_event 15, 0, GOLDENROD_DEPT_STORE_6F, 1
-	warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
+	warp_event 12,  0, GOLDENROD_DEPT_STORE_4F, 1
+	warp_event 15,  0, GOLDENROD_DEPT_STORE_6F, 1
+	warp_event  2,  0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore5FDirectory
-	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore5FElevatorButton
+	bg_event 14,  0, BGEVENT_READ, GoldenrodDeptStore5FDirectory
+	bg_event  3,  0, BGEVENT_READ, GoldenrodDeptStore5FElevatorButton
 
 	db 6 ; object events
-	object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1
-	object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1
-	object_event 6, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Mike, -1
-	object_event 13, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FPokefanMScript, -1
-	object_event 9, 1, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Carrie, -1
-	object_event 7, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY
+	object_event  8,  5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1
+	object_event  3,  6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1
+	object_event  6,  3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Mike, -1
+	object_event 13,  5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FPokefanMScript, -1
+	object_event  9,  1, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Carrie, -1
+	object_event  7,  5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index 2703f0405..37e66862a 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -149,20 +149,20 @@ GoldenrodDeptStore6F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 15, 0, GOLDENROD_DEPT_STORE_5F, 2
-	warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
-	warp_event 13, 0, GOLDENROD_DEPT_STORE_ROOF, 1
+	warp_event 15,  0, GOLDENROD_DEPT_STORE_5F, 2
+	warp_event  2,  0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
+	warp_event 13,  0, GOLDENROD_DEPT_STORE_ROOF, 1
 
 	db 0 ; coord events
 
 	db 6 ; bg events
-	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore6FDirectory
-	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore6FElevatorButton
-	bg_event 8, 1, BGEVENT_UP, GoldenrodVendingMachine
-	bg_event 9, 1, BGEVENT_UP, GoldenrodVendingMachine
-	bg_event 10, 1, BGEVENT_UP, GoldenrodVendingMachine
-	bg_event 11, 1, BGEVENT_UP, GoldenrodVendingMachine
+	bg_event 14,  0, BGEVENT_READ, GoldenrodDeptStore6FDirectory
+	bg_event  3,  0, BGEVENT_READ, GoldenrodDeptStore6FElevatorButton
+	bg_event  8,  1, BGEVENT_UP, GoldenrodVendingMachine
+	bg_event  9,  1, BGEVENT_UP, GoldenrodVendingMachine
+	bg_event 10,  1, BGEVENT_UP, GoldenrodVendingMachine
+	bg_event 11,  1, BGEVENT_UP, GoldenrodVendingMachine
 
 	db 2 ; object events
-	object_event 10, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FLassScript, -1
-	object_event 8, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FSuperNerdScript, -1
+	object_event 10,  2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FLassScript, -1
+	object_event  8,  2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FSuperNerdScript, -1
diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm
index 1b887fbef..3aa8b50c8 100644
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -111,9 +111,9 @@ GoldenrodDeptStoreB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 17, 2, GOLDENROD_UNDERGROUND_WAREHOUSE, 3
-	warp_event 9, 4, GOLDENROD_DEPT_STORE_ELEVATOR, 1
-	warp_event 10, 4, GOLDENROD_DEPT_STORE_ELEVATOR, 2
+	warp_event 17,  2, GOLDENROD_UNDERGROUND_WAREHOUSE, 3
+	warp_event  9,  4, GOLDENROD_DEPT_STORE_ELEVATOR, 1
+	warp_event 10,  4, GOLDENROD_DEPT_STORE_ELEVATOR, 2
 
 	db 0 ; coord events
 
@@ -121,10 +121,10 @@ GoldenrodDeptStoreB1F_MapEvents:
 
 	db 8 ; object events
 	object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER
-	object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN
-	object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL
+	object_event 14,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN
+	object_event  6,  3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL
 	object_event 15, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FUltraBall, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL
-	object_event 9, 10, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt1Script, -1
-	object_event 4, 8, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt2Script, -1
-	object_event 6, 13, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt3Script, -1
-	object_event 7, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MachopScript_0x7d7b9, -1
+	object_event  9, 10, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt1Script, -1
+	object_event  4,  8, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt2Script, -1
+	object_event  6, 13, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt3Script, -1
+	object_event  7,  7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MachopScript_0x7d7b9, -1
diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm
index e7a48865c..80931d9ec 100644
--- a/maps/GoldenrodDeptStoreElevator.asm
+++ b/maps/GoldenrodDeptStoreElevator.asm
@@ -56,12 +56,12 @@ GoldenrodDeptStoreElevator_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 1, 3, GOLDENROD_DEPT_STORE_1F, -1
-	warp_event 2, 3, GOLDENROD_DEPT_STORE_1F, -1
+	warp_event  1,  3, GOLDENROD_DEPT_STORE_1F, -1
+	warp_event  2,  3, GOLDENROD_DEPT_STORE_1F, -1
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 3, 0, BGEVENT_READ, MapGoldenrodDeptStoreElevatorSignpost0Script
+	bg_event  3,  0, BGEVENT_READ, MapGoldenrodDeptStoreElevatorSignpost0Script
 
 	db 0 ; object events
diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm
index 30812c3fb..a3ffb2b1f 100644
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -213,22 +213,22 @@ GoldenrodDeptStoreRoof_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 13, 1, GOLDENROD_DEPT_STORE_6F, 3
+	warp_event 13,  1, GOLDENROD_DEPT_STORE_6F, 3
 
 	db 0 ; coord events
 
 	db 4 ; bg events
-	bg_event 15, 3, BGEVENT_RIGHT, Binoculars1
-	bg_event 15, 5, BGEVENT_RIGHT, Binoculars2
-	bg_event 15, 6, BGEVENT_RIGHT, Binoculars3
-	bg_event 3, 0, BGEVENT_UP, PokeDollVendingMachine
+	bg_event 15,  3, BGEVENT_RIGHT, Binoculars1
+	bg_event 15,  5, BGEVENT_RIGHT, Binoculars2
+	bg_event 15,  6, BGEVENT_RIGHT, Binoculars3
+	bg_event  3,  0, BGEVENT_UP, PokeDollVendingMachine
 
 	db 8 ; object events
-	object_event 1, 4, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF
-	object_event 10, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1
-	object_event 2, 1, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x56749, -1
-	object_event 3, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTwinScript, EVENT_GOLDENROD_SALE_ON
-	object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON
-	object_event 7, 0, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanMScript, EVENT_GOLDENROD_SALE_OFF
-	object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTeacherScript, EVENT_GOLDENROD_SALE_OFF
-	object_event 1, 6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofBugCatcherScript, EVENT_GOLDENROD_SALE_OFF
+	object_event  1,  4, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF
+	object_event 10,  3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1
+	object_event  2,  1, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x56749, -1
+	object_event  3,  4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTwinScript, EVENT_GOLDENROD_SALE_ON
+	object_event 14,  6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON
+	object_event  7,  0, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanMScript, EVENT_GOLDENROD_SALE_OFF
+	object_event  5,  3, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTeacherScript, EVENT_GOLDENROD_SALE_OFF
+	object_event  1,  6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofBugCatcherScript, EVENT_GOLDENROD_SALE_OFF
diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm
index 05968d8b0..a9eb5263a 100644
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -161,13 +161,13 @@ GoldenrodFlowerShop_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, GOLDENROD_CITY, 6
-	warp_event 3, 7, GOLDENROD_CITY, 6
+	warp_event  2,  7, GOLDENROD_CITY, 6
+	warp_event  3,  7, GOLDENROD_CITY, 6
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FlowerShopTeacherScript, -1
-	object_event 5, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP
+	object_event  2,  4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FlowerShopTeacherScript, -1
+	object_event  5,  6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index b0bb5549c..54bd4fd05 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -438,54 +438,54 @@ GoldenrodGameCorner_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 13, GOLDENROD_CITY, 10
-	warp_event 3, 13, GOLDENROD_CITY, 10
+	warp_event  2, 13, GOLDENROD_CITY, 10
+	warp_event  3, 13, GOLDENROD_CITY, 10
 
 	db 0 ; coord events
 
 	db 31 ; bg events
-	bg_event 6, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 6, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 6, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 6, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 6, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 6, 11, BGEVENT_RIGHT, GoldenrodGameCornerSlotsMachineScript
-	bg_event 7, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 7, 7, BGEVENT_READ, GoldenrodGameCornerLuckySlotsMachineScript
-	bg_event 7, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 7, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 7, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 7, 11, BGEVENT_LEFT, GoldenrodGameCornerSlotsMachineScript
-	bg_event 12, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 12, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 12, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 12, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event  6,  6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event  6,  7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event  6,  8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event  6,  9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event  6, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event  6, 11, BGEVENT_RIGHT, GoldenrodGameCornerSlotsMachineScript
+	bg_event  7,  6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event  7,  7, BGEVENT_READ, GoldenrodGameCornerLuckySlotsMachineScript
+	bg_event  7,  8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event  7,  9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event  7, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event  7, 11, BGEVENT_LEFT, GoldenrodGameCornerSlotsMachineScript
+	bg_event 12,  6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event 12,  7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event 12,  8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event 12,  9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
 	bg_event 12, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
 	bg_event 12, 11, BGEVENT_RIGHT, GoldenrodGameCornerSlotsMachineScript
-	bg_event 13, 6, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 13, 7, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 13, 8, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 13, 9, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 13,  6, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 13,  7, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 13,  8, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 13,  9, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
 	bg_event 13, 10, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
 	bg_event 13, 11, BGEVENT_LEFT, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 18, 6, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 18, 7, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 18, 8, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 18, 9, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 18,  6, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 18,  7, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 18,  8, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 18,  9, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
 	bg_event 18, 10, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
 	bg_event 18, 11, BGEVENT_RIGHT, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 12, 1, BGEVENT_LEFT, GoldenrodGameCornerLeftTheirDrinkScript
+	bg_event 12,  1, BGEVENT_LEFT, GoldenrodGameCornerLeftTheirDrinkScript
 
 	db 12 ; object events
-	object_event 3, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1
-	object_event 16, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1
-	object_event 18, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1
-	object_event 8, 7, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1
-	object_event 8, 7, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1
+	object_event  3,  2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1
+	object_event 16,  2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1
+	object_event 18,  2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1
+	object_event  8,  7, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1
+	object_event  8,  7, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1
 	object_event 11, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM1Script, -1
-	object_event 14, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1
-	object_event 17, 6, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1
-	object_event 10, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerFScript, -1
-	object_event 5, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerGentlemanScript, -1
-	object_event 2, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM2Script, -1
+	object_event 14,  8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1
+	object_event 17,  6, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1
+	object_event 10,  3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerFScript, -1
+	object_event  5, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerGentlemanScript, -1
+	object_event  2,  9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM2Script, -1
 	object_event 17, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM3Script, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
index 31f042f33..29be72cd9 100644
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -381,20 +381,20 @@ GoldenrodGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 17, GOLDENROD_CITY, 1
-	warp_event 3, 17, GOLDENROD_CITY, 1
+	warp_event  2, 17, GOLDENROD_CITY, 1
+	warp_event  3, 17, GOLDENROD_CITY, 1
 
 	db 1 ; coord events
-	coord_event 8, 5, SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING, WhitneyCriesScript
+	coord_event  8,  5, SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING, WhitneyCriesScript
 
 	db 2 ; bg events
-	bg_event 1, 15, BGEVENT_READ, GoldenrodGymStatue
-	bg_event 4, 15, BGEVENT_READ, GoldenrodGymStatue
+	bg_event  1, 15, BGEVENT_READ, GoldenrodGymStatue
+	bg_event  4, 15, BGEVENT_READ, GoldenrodGymStatue
 
 	db 6 ; object events
-	object_event 8, 3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1
-	object_event 9, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1
-	object_event 9, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1
-	object_event 0, 2, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyVictoria, -1
-	object_event 19, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautySamantha, -1
-	object_event 5, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1
+	object_event  8,  3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1
+	object_event  9, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1
+	object_event  9,  6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1
+	object_event  0,  2, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyVictoria, -1
+	object_event 19,  5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautySamantha, -1
+	object_event  5, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1
diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm
index d68090ad8..eeab99b9c 100644
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -138,17 +138,17 @@ GoldenrodHappinessRater_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, GOLDENROD_CITY, 3
-	warp_event 3, 7, GOLDENROD_CITY, 3
+	warp_event  2,  7, GOLDENROD_CITY, 3
+	warp_event  3,  7, GOLDENROD_CITY, 3
 
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event 0, 1, BGEVENT_READ, HappinessRatersHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, HappinessRatersHouseBookshelf
-	bg_event 7, 1, BGEVENT_READ, HappinessRatersHouseRadio
+	bg_event  0,  1, BGEVENT_READ, HappinessRatersHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, HappinessRatersHouseBookshelf
+	bg_event  7,  1, BGEVENT_READ, HappinessRatersHouseRadio
 
 	db 3 ; object events
-	object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x54953, -1
-	object_event 5, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1
-	object_event 5, 6, SPRITE_TWIN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1
+	object_event  2,  4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x54953, -1
+	object_event  5,  3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1
+	object_event  5,  6, SPRITE_TWIN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1
diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm
index 4817554a2..b8992f8dd 100644
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -166,16 +166,16 @@ GoldenrodMagnetTrainStation_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 8, 17, GOLDENROD_CITY, 5
-	warp_event 9, 17, GOLDENROD_CITY, 5
-	warp_event 6, 5, SAFFRON_MAGNET_TRAIN_STATION, 4
-	warp_event 11, 5, SAFFRON_MAGNET_TRAIN_STATION, 3
+	warp_event  8, 17, GOLDENROD_CITY, 5
+	warp_event  9, 17, GOLDENROD_CITY, 5
+	warp_event  6,  5, SAFFRON_MAGNET_TRAIN_STATION, 4
+	warp_event 11,  5, SAFFRON_MAGNET_TRAIN_STATION, 3
 
 	db 1 ; coord events
-	coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromSaffron
+	coord_event 11,  6, SCENE_DEFAULT, Script_ArriveFromSaffron
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x550ec, -1
+	object_event  9,  9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x550ec, -1
 	object_event 11, 14, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationGentlemanScript, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm
index 63fbad27b..16ffddb2c 100644
--- a/maps/GoldenrodNameRater.asm
+++ b/maps/GoldenrodNameRater.asm
@@ -26,15 +26,15 @@ GoldenrodNameRater_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, GOLDENROD_CITY, 8
-	warp_event 3, 7, GOLDENROD_CITY, 8
+	warp_event  2,  7, GOLDENROD_CITY, 8
+	warp_event  3,  7, GOLDENROD_CITY, 8
 
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event 0, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf
-	bg_event 1, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf
-	bg_event 7, 1, BGEVENT_READ, GoldenrodNameRaterRadio
+	bg_event  0,  1, BGEVENT_READ, GoldenrodNameRaterBookshelf
+	bg_event  1,  1, BGEVENT_READ, GoldenrodNameRaterBookshelf
+	bg_event  7,  1, BGEVENT_READ, GoldenrodNameRaterRadio
 
 	db 1 ; object events
-	object_event 2, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodNameRater, -1
+	object_event  2,  4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodNameRater, -1
diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm
index b2d0f77ac..2f43993d1 100644
--- a/maps/GoldenrodPPSpeechHouse.asm
+++ b/maps/GoldenrodPPSpeechHouse.asm
@@ -53,16 +53,16 @@ GoldenrodPPSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, GOLDENROD_CITY, 7
-	warp_event 3, 7, GOLDENROD_CITY, 7
+	warp_event  2,  7, GOLDENROD_CITY, 7
+	warp_event  3,  7, GOLDENROD_CITY, 7
 
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event 0, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf1
-	bg_event 1, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf2
-	bg_event 7, 1, BGEVENT_READ, GoldenrodPPSpeechHouseRadio
+	bg_event  0,  1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf1
+	bg_event  1,  1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf2
+	bg_event  7,  1, BGEVENT_READ, GoldenrodPPSpeechHouseRadio
 
 	db 2 ; object events
-	object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1
-	object_event 5, 3, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1
+	object_event  2,  4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1
+	object_event  5,  3, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1
diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm
index a8d57f136..0b5527be2 100644
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -806,20 +806,20 @@ GoldenrodPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 3, 7, GOLDENROD_CITY, 15
-	warp_event 4, 7, GOLDENROD_CITY, 15
-	warp_event 0, 6, POKECOM_CENTER_ADMIN_ROOM_MOBILE, 1
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, GOLDENROD_CITY, 15
+	warp_event  4,  7, GOLDENROD_CITY, 15
+	warp_event  0,  6, POKECOM_CENTER_ADMIN_ROOM_MOBILE, 1
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 2 ; coord events
-	coord_event 3, 7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneLeft
-	coord_event 4, 7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneRight
+	coord_event  3,  7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneLeft
+	coord_event  4,  7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneRight
 
 	db 0 ; bg events
 
 	db 5 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x60f91, -1
-	object_event 16, 8, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
-	object_event 6, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1
-	object_event 1, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FLassScript, -1
-	object_event 7, 5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x61024, -1
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x60f91, -1
+	object_event 16,  8, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
+	object_event  6,  1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1
+	object_event  1,  4, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FLassScript, -1
+	object_event  7,  5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x61024, -1
diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm
index 8aae5d872..85cdcadee 100644
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -648,9 +648,9 @@ GoldenrodUnderground_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 3, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 7
-	warp_event 3, 34, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 4
-	warp_event 18, 6, GOLDENROD_UNDERGROUND, 4
+	warp_event  3,  2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 7
+	warp_event  3, 34, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 4
+	warp_event 18,  6, GOLDENROD_UNDERGROUND, 4
 	warp_event 21, 31, GOLDENROD_UNDERGROUND, 3
 	warp_event 22, 31, GOLDENROD_UNDERGROUND, 3
 	warp_event 22, 27, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 1
@@ -658,19 +658,19 @@ GoldenrodUnderground_MapEvents:
 	db 0 ; coord events
 
 	db 5 ; bg events
-	bg_event 18, 6, BGEVENT_READ, BasementDoorScript
-	bg_event 19, 6, BGEVENT_READ, MapGoldenrodUndergroundSignpost1Script
-	bg_event 6, 13, BGEVENT_ITEM, GoldenrodUndergroundHiddenParlyzHeal
-	bg_event 4, 18, BGEVENT_ITEM, GoldenrodUndergroundHiddenSuperPotion
-	bg_event 17, 8, BGEVENT_ITEM, GoldenrodUndergroundHiddenAntidote
+	bg_event 18,  6, BGEVENT_READ, BasementDoorScript
+	bg_event 19,  6, BGEVENT_READ, MapGoldenrodUndergroundSignpost1Script
+	bg_event  6, 13, BGEVENT_ITEM, GoldenrodUndergroundHiddenParlyzHeal
+	bg_event  4, 18, BGEVENT_ITEM, GoldenrodUndergroundHiddenSuperPotion
+	bg_event 17,  8, BGEVENT_ITEM, GoldenrodUndergroundHiddenAntidote
 
 	db 9 ; object events
-	object_event 5, 31, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdEric, -1
-	object_event 6, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1
-	object_event 3, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1
-	object_event 2, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1
-	object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundCoinCase, EVENT_GOLDENROD_UNDERGROUND_COIN_CASE
-	object_event 7, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_GOLDENROD_UNDERGROUND_GRAMPS
-	object_event 7, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_OLDER_HAIRCUT_BROTHER
-	object_event 7, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_YOUNGER_HAIRCUT_BROTHER
-	object_event 7, 21, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_GOLDENROD_UNDERGROUND_GRANNY
+	object_event  5, 31, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdEric, -1
+	object_event  6,  9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1
+	object_event  3, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1
+	object_event  2,  6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1
+	object_event  7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundCoinCase, EVENT_GOLDENROD_UNDERGROUND_COIN_CASE
+	object_event  7, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_GOLDENROD_UNDERGROUND_GRAMPS
+	object_event  7, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_OLDER_HAIRCUT_BROTHER
+	object_event  7, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_YOUNGER_HAIRCUT_BROTHER
+	object_event  7, 21, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_GOLDENROD_UNDERGROUND_GRANNY
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index 106413e52..980473542 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -932,37 +932,37 @@ GoldenrodUndergroundSwitchRoomEntrances_MapEvents:
 	db 0, 0 ; filler
 
 	db 9 ; warp events
-	warp_event 23, 3, GOLDENROD_UNDERGROUND, 6
+	warp_event 23,  3, GOLDENROD_UNDERGROUND, 6
 	warp_event 22, 10, GOLDENROD_UNDERGROUND_WAREHOUSE, 1
 	warp_event 23, 10, GOLDENROD_UNDERGROUND_WAREHOUSE, 2
-	warp_event 5, 25, GOLDENROD_UNDERGROUND, 2
-	warp_event 4, 29, GOLDENROD_CITY, 14
-	warp_event 5, 29, GOLDENROD_CITY, 14
+	warp_event  5, 25, GOLDENROD_UNDERGROUND, 2
+	warp_event  4, 29, GOLDENROD_CITY, 14
+	warp_event  5, 29, GOLDENROD_CITY, 14
 	warp_event 21, 25, GOLDENROD_UNDERGROUND, 1
 	warp_event 20, 29, GOLDENROD_CITY, 13
 	warp_event 21, 29, GOLDENROD_CITY, 13
 
 	db 2 ; coord events
-	coord_event 19, 4, SCENE_DEFAULT, UndergroundSilverScene1
-	coord_event 19, 5, SCENE_DEFAULT, UndergroundSilverScene2
+	coord_event 19,  4, SCENE_DEFAULT, UndergroundSilverScene1
+	coord_event 19,  5, SCENE_DEFAULT, UndergroundSilverScene2
 
 	db 6 ; bg events
-	bg_event 16, 1, BGEVENT_READ, Switch1Script
-	bg_event 10, 1, BGEVENT_READ, Switch2Script
-	bg_event 2, 1, BGEVENT_READ, Switch3Script
+	bg_event 16,  1, BGEVENT_READ, Switch1Script
+	bg_event 10,  1, BGEVENT_READ, Switch2Script
+	bg_event  2,  1, BGEVENT_READ, Switch3Script
 	bg_event 20, 11, BGEVENT_READ, EmergencySwitchScript
-	bg_event 8, 9, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion
-	bg_event 1, 8, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive
+	bg_event  8,  9, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion
+	bg_event  1,  8, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive
 
 	db 11 ; object events
-	object_event 9, 12, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 4, 8, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 17, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 11, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 3, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  9, 12, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  4,  8, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 17,  2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 11,  2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  3,  2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event 19, 12, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 3, 27, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1
+	object_event  3, 27, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1
 	object_event 19, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7ca7a, -1
-	object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesSmokeBall, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
-	object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesFullHeal, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL
-	object_event 23, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_GOLDENROD_UNDERGROUND
+	object_event  1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesSmokeBall, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
+	object_event 14,  9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesFullHeal, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL
+	object_event 23,  3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_GOLDENROD_UNDERGROUND
diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm
index 4484d874b..a80b075b3 100644
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -212,19 +212,19 @@ GoldenrodUndergroundWarehouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 2, 12, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 2
-	warp_event 3, 12, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 3
-	warp_event 17, 2, GOLDENROD_DEPT_STORE_B1F, 1
+	warp_event  2, 12, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 2
+	warp_event  3, 12, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 3
+	warp_event 17,  2, GOLDENROD_DEPT_STORE_B1F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 7 ; object events
-	object_event 9, 8, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 14, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 12, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  9,  8, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 14,  3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 12,  8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event 18, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseMaxEther, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_MAX_ETHER
-	object_event 13, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseTMSleepTalk, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
-	object_event 2, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseUltraBall, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL
+	object_event 13,  9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseTMSleepTalk, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
+	object_event  2,  1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseUltraBall, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL
diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm
index bd4556397..376aa0d0c 100644
--- a/maps/GuideGentsHouse.asm
+++ b/maps/GuideGentsHouse.asm
@@ -29,14 +29,14 @@ GuideGentsHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, CHERRYGROVE_CITY, 4
-	warp_event 3, 7, CHERRYGROVE_CITY, 4
+	warp_event  2,  7, CHERRYGROVE_CITY, 4
+	warp_event  3,  7, CHERRYGROVE_CITY, 4
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, GuideGentsHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, GuideGentsHouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, GuideGentsHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, GuideGentsHouseBookshelf
 
 	db 1 ; object events
-	object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
+	object_event  2,  3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index dca5f7625..1de0b37b3 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -112,12 +112,12 @@ HallOfFame_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 13, LANCES_ROOM, 3
-	warp_event 5, 13, LANCES_ROOM, 4
+	warp_event  4, 13, LANCES_ROOM, 3
+	warp_event  5, 13, LANCES_ROOM, 4
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 4, 12, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
+	object_event  4, 12, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm
index aa8529901..9650fd346 100644
--- a/maps/IcePath1F.asm
+++ b/maps/IcePath1F.asm
@@ -21,9 +21,9 @@ IcePath1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 19, ROUTE_44, 1
+	warp_event  4, 19, ROUTE_44, 1
 	warp_event 36, 27, BLACKTHORN_CITY, 7
-	warp_event 37, 5, ICE_PATH_B1F, 1
+	warp_event 37,  5, ICE_PATH_B1F, 1
 	warp_event 37, 13, ICE_PATH_B1F, 7
 
 	db 0 ; coord events
@@ -31,6 +31,6 @@ IcePath1F_MapEvents:
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 31, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL
+	object_event 31,  7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL
 	object_event 32, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP
-	object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN
+	object_event 35,  9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN
diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm
index 0b3919419..149328000 100644
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -77,13 +77,13 @@ IcePathB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 8 ; warp events
-	warp_event 3, 15, ICE_PATH_1F, 3
-	warp_event 17, 3, ICE_PATH_B2F_MAHOGANY_SIDE, 1
-	warp_event 11, 2, ICE_PATH_B2F_MAHOGANY_SIDE, 3 ; hole
-	warp_event 4, 7, ICE_PATH_B2F_MAHOGANY_SIDE, 4 ; hole
-	warp_event 5, 12, ICE_PATH_B2F_MAHOGANY_SIDE, 5 ; hole
+	warp_event  3, 15, ICE_PATH_1F, 3
+	warp_event 17,  3, ICE_PATH_B2F_MAHOGANY_SIDE, 1
+	warp_event 11,  2, ICE_PATH_B2F_MAHOGANY_SIDE, 3 ; hole
+	warp_event  4,  7, ICE_PATH_B2F_MAHOGANY_SIDE, 4 ; hole
+	warp_event  5, 12, ICE_PATH_B2F_MAHOGANY_SIDE, 5 ; hole
 	warp_event 12, 13, ICE_PATH_B2F_MAHOGANY_SIDE, 6 ; hole
-	warp_event 5, 25, ICE_PATH_1F, 4
+	warp_event  5, 25, ICE_PATH_1F, 4
 	warp_event 11, 27, ICE_PATH_B2F_BLACKTHORN_SIDE, 1
 
 	db 0 ; coord events
@@ -92,8 +92,8 @@ IcePathB1F_MapEvents:
 	bg_event 17, 30, BGEVENT_ITEM, IcePathB1FHiddenMaxPotion
 
 	db 5 ; object events
-	object_event 11, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1
-	object_event 7, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2
-	object_event 8, 9, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3
-	object_event 17, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4
-	object_event 5, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB1FIron, EVENT_ICE_PATH_B1F_IRON
+	object_event 11,  7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1
+	object_event  7,  8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2
+	object_event  8,  9, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3
+	object_event 17,  7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4
+	object_event  5, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB1FIron, EVENT_ICE_PATH_B1F_IRON
diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm
index 42585eeac..23ba93773 100644
--- a/maps/IcePathB2FBlackthornSide.asm
+++ b/maps/IcePathB2FBlackthornSide.asm
@@ -16,13 +16,13 @@ IcePathB2FBlackthornSide_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 15, ICE_PATH_B1F, 8
-	warp_event 3, 3, ICE_PATH_B3F, 2
+	warp_event  3, 15, ICE_PATH_B1F, 8
+	warp_event  3,  3, ICE_PATH_B3F, 2
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 2, 10, BGEVENT_ITEM, IcePathB2FBlackthornSideHiddenIceHeal
+	bg_event  2, 10, BGEVENT_ITEM, IcePathB2FBlackthornSideHiddenIceHeal
 
 	db 1 ; object events
-	object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST
+	object_event  8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST
diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm
index 9d4a53fab..86a706db8 100644
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -32,22 +32,22 @@ IcePathB2FMahoganySide_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 17, 1, ICE_PATH_B1F, 2
-	warp_event 9, 11, ICE_PATH_B3F, 1
-	warp_event 11, 4, ICE_PATH_B1F, 3
-	warp_event 4, 6, ICE_PATH_B1F, 4
-	warp_event 4, 12, ICE_PATH_B1F, 5
+	warp_event 17,  1, ICE_PATH_B1F, 2
+	warp_event  9, 11, ICE_PATH_B3F, 1
+	warp_event 11,  4, ICE_PATH_B1F, 3
+	warp_event  4,  6, ICE_PATH_B1F, 4
+	warp_event  4, 12, ICE_PATH_B1F, 5
 	warp_event 12, 12, ICE_PATH_B1F, 6
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 0, 17, BGEVENT_ITEM, IcePathB2FMahoganySideHiddenCarbos
+	bg_event  0, 17, BGEVENT_ITEM, IcePathB2FMahoganySideHiddenCarbos
 
 	db 6 ; object events
-	object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_1A
-	object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_2A
-	object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_3A
+	object_event 11,  3, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_1A
+	object_event  4,  7, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_2A
+	object_event  3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_3A
 	object_event 12, 13, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_4A
-	object_event 8, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL
-	object_event 0, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION
+	object_event  8,  9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL
+	object_event  0,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION
diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm
index 65b22c670..1130705af 100644
--- a/maps/IcePathB3F.asm
+++ b/maps/IcePathB3F.asm
@@ -17,13 +17,13 @@ IcePathB3F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 5, ICE_PATH_B2F_MAHOGANY_SIDE, 2
-	warp_event 15, 5, ICE_PATH_B2F_BLACKTHORN_SIDE, 2
+	warp_event  3,  5, ICE_PATH_B2F_MAHOGANY_SIDE, 2
+	warp_event 15,  5, ICE_PATH_B2F_BLACKTHORN_SIDE, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 5, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE
-	object_event 6, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1
+	object_event  5,  7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE
+	object_event  6,  6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index c78d8ef48..efff3bab3 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -939,28 +939,28 @@ IlexForest_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 1, 5, ROUTE_34_ILEX_FOREST_GATE, 3
-	warp_event 3, 42, ILEX_FOREST_AZALEA_GATE, 1
-	warp_event 3, 43, ILEX_FOREST_AZALEA_GATE, 2
+	warp_event  1,  5, ROUTE_34_ILEX_FOREST_GATE, 3
+	warp_event  3, 42, ILEX_FOREST_AZALEA_GATE, 1
+	warp_event  3, 43, ILEX_FOREST_AZALEA_GATE, 2
 
 	db 0 ; coord events
 
 	db 5 ; bg events
-	bg_event 3, 17, BGEVENT_READ, MapIlexForestSignpost0Script
-	bg_event 11, 7, BGEVENT_ITEM, IlexForestHiddenEther
+	bg_event  3, 17, BGEVENT_READ, MapIlexForestSignpost0Script
+	bg_event 11,  7, BGEVENT_ITEM, IlexForestHiddenEther
 	bg_event 22, 14, BGEVENT_ITEM, IlexForestHiddenSuperPotion
-	bg_event 1, 17, BGEVENT_ITEM, IlexForestHiddenFullHeal
-	bg_event 8, 22, BGEVENT_UP, MapIlexForestSignpost4Script
+	bg_event  1, 17, BGEVENT_ITEM, IlexForestHiddenFullHeal
+	bg_event  8, 22, BGEVENT_UP, MapIlexForestSignpost4Script
 
 	db 11 ; object events
 	object_event 14, 31, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestFarfetchdScript, EVENT_ILEX_FOREST_FARFETCHD
-	object_event 7, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE
-	object_event 5, 28, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER
+	object_event  7, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE
+	object_event  5, 28, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER
 	object_event 15, 14, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestHeadbuttGuyScript, -1
 	object_event 20, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestRevive, EVENT_ILEX_FOREST_REVIVE
-	object_event 8, 29, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT
-	object_event 3, 24, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS
-	object_event 12, 1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerBugCatcherWayne, -1
-	object_event 9, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK
-	object_event 17, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE
-	object_event 27, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER
+	object_event  8, 29, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT
+	object_event  3, 24, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS
+	object_event 12,  1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerBugCatcherWayne, -1
+	object_event  9, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK
+	object_event 17,  7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE
+	object_event 27,  1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER
diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm
index a2193fb8c..0e992960b 100644
--- a/maps/IlexForestAzaleaGate.asm
+++ b/maps/IlexForestAzaleaGate.asm
@@ -32,15 +32,15 @@ IlexForestAzaleaGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, ILEX_FOREST, 2
-	warp_event 0, 5, ILEX_FOREST, 3
-	warp_event 9, 4, AZALEA_TOWN, 7
-	warp_event 9, 5, AZALEA_TOWN, 8
+	warp_event  0,  4, ILEX_FOREST, 2
+	warp_event  0,  5, ILEX_FOREST, 3
+	warp_event  9,  4, AZALEA_TOWN, 7
+	warp_event  9,  5, AZALEA_TOWN, 8
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1
-	object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1
+	object_event  1,  3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1
diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm
index 4351d1769..456550685 100644
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -304,21 +304,21 @@ IndigoPlateauPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 5, 13, ROUTE_23, 1
-	warp_event 6, 13, ROUTE_23, 2
-	warp_event 0, 13, POKECENTER_2F, 1
-	warp_event 14, 3, WILLS_ROOM, 1
+	warp_event  5, 13, ROUTE_23, 1
+	warp_event  6, 13, ROUTE_23, 2
+	warp_event  0, 13, POKECENTER_2F, 1
+	warp_event 14,  3, WILLS_ROOM, 1
 
 	db 2 ; coord events
-	coord_event 16, 4, SCENE_DEFAULT, PlateauRivalBattle1
-	coord_event 17, 4, SCENE_DEFAULT, PlateauRivalBattle2
+	coord_event 16,  4, SCENE_DEFAULT, PlateauRivalBattle1
+	coord_event 17,  4, SCENE_DEFAULT, PlateauRivalBattle2
 
 	db 0 ; bg events
 
 	db 6 ; object events
-	object_event 3, 7, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18012c, -1
-	object_event 11, 7, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1
+	object_event  3,  7, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18012c, -1
+	object_event 11,  7, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1
 	object_event 11, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FCooltrainerMScript, -1
-	object_event 16, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
-	object_event 1, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY
-	object_event 0, 9, SPRITE_JYNX, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, AbraScript, EVENT_TELEPORT_GUY
+	object_event 16,  9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
+	object_event  1,  9, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY
+	object_event  0,  9, SPRITE_JYNX, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, AbraScript, EVENT_TELEPORT_GUY
diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
index cfc8eeeaa..3cc096d1d 100644
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -134,14 +134,14 @@ KarensRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 17, BRUNOS_ROOM, 3
-	warp_event 5, 17, BRUNOS_ROOM, 4
-	warp_event 4, 2, LANCES_ROOM, 1
-	warp_event 5, 2, LANCES_ROOM, 2
+	warp_event  4, 17, BRUNOS_ROOM, 3
+	warp_event  5, 17, BRUNOS_ROOM, 4
+	warp_event  4,  2, LANCES_ROOM, 1
+	warp_event  5,  2, LANCES_ROOM, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 5, 7, SPRITE_KAREN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KarenScript_Battle, -1
+	object_event  5,  7, SPRITE_KAREN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KarenScript_Battle, -1
diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
index 8067776cd..34c9f7b5d 100644
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -131,14 +131,14 @@ KogasRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 17, WILLS_ROOM, 2
-	warp_event 5, 17, WILLS_ROOM, 3
-	warp_event 4, 2, BRUNOS_ROOM, 1
-	warp_event 5, 2, BRUNOS_ROOM, 2
+	warp_event  4, 17, WILLS_ROOM, 2
+	warp_event  5, 17, WILLS_ROOM, 3
+	warp_event  4,  2, BRUNOS_ROOM, 1
+	warp_event  5,  2, BRUNOS_ROOM, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 5, 7, SPRITE_KOGA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, KogaScript_Battle, -1
+	object_event  5,  7, SPRITE_KOGA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, KogaScript_Battle, -1
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index a28ac52b5..57d3850b0 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -678,23 +678,23 @@ KurtsHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 7, AZALEA_TOWN, 4
-	warp_event 4, 7, AZALEA_TOWN, 4
+	warp_event  3,  7, AZALEA_TOWN, 4
+	warp_event  4,  7, AZALEA_TOWN, 4
 
 	db 0 ; coord events
 
 	db 7 ; bg events
-	bg_event 6, 1, BGEVENT_READ, KurtsHouseRadio
-	bg_event 8, 0, BGEVENT_READ, KurtsHouseOakPhoto
-	bg_event 9, 0, BGEVENT_READ, KurtsHouseOakPhoto
-	bg_event 5, 1, BGEVENT_READ, KurtsHouseBookshelf
-	bg_event 2, 1, BGEVENT_READ, KurtsHouseBookshelf
-	bg_event 3, 1, BGEVENT_READ, KurtsHouseBookshelf
-	bg_event 4, 1, BGEVENT_READ, KurtsHouseCelebiStatue
+	bg_event  6,  1, BGEVENT_READ, KurtsHouseRadio
+	bg_event  8,  0, BGEVENT_READ, KurtsHouseOakPhoto
+	bg_event  9,  0, BGEVENT_READ, KurtsHouseOakPhoto
+	bg_event  5,  1, BGEVENT_READ, KurtsHouseBookshelf
+	bg_event  2,  1, BGEVENT_READ, KurtsHouseBookshelf
+	bg_event  3,  1, BGEVENT_READ, KurtsHouseBookshelf
+	bg_event  4,  1, BGEVENT_READ, KurtsHouseCelebiStatue
 
 	db 5 ; object events
-	object_event 3, 2, SPRITE_KURT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1
-	object_event 5, 3, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1
-	object_event 6, 3, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE
-	object_event 14, 3, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2
-	object_event 11, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2
+	object_event  3,  2, SPRITE_KURT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1
+	object_event  5,  3, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1
+	object_event  6,  3, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE
+	object_event 14,  3, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2
+	object_event 11,  4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm
index efa8bc4ff..8174da248 100644
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -495,7 +495,7 @@ LakeOfRage_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 7, 3, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 1
+	warp_event  7,  3, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 1
 	warp_event 27, 31, LAKE_OF_RAGE_MAGIKARP_HOUSE, 1
 
 	db 0 ; coord events
@@ -504,8 +504,8 @@ LakeOfRage_MapEvents:
 	bg_event 21, 27, BGEVENT_READ, MapLakeOfRageSignpost0Script
 	bg_event 25, 31, BGEVENT_READ, MapLakeOfRageSignpost1Script
 	bg_event 11, 28, BGEVENT_ITEM, LakeOfRageHiddenFullRestore
-	bg_event 4, 4, BGEVENT_ITEM, LakeOfRageHiddenRareCandy
-	bg_event 35, 5, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion
+	bg_event  4,  4, BGEVENT_ITEM, LakeOfRageHiddenRareCandy
+	bg_event 35,  5, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion
 
 	db 12 ; object events
 	object_event 21, 28, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE
@@ -514,9 +514,9 @@ LakeOfRage_MapEvents:
 	object_event 25, 29, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageCooltrainerFScript, -1
 	object_event 30, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS
 	object_event 24, 26, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS
-	object_event 4, 15, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS
-	object_event 36, 7, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS
+	object_event  4, 15, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS
+	object_event 36,  7, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS
 	object_event 18, 22, SPRITE_GYARADOS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS
-	object_event 4, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY
-	object_event 7, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER
-	object_event 35, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT
+	object_event  4,  4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY
+	object_event  7, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER
+	object_event 35,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT
diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm
index 68b299f7c..177d7ea27 100644
--- a/maps/LakeOfRageHiddenPowerHouse.asm
+++ b/maps/LakeOfRageHiddenPowerHouse.asm
@@ -69,14 +69,14 @@ LakeOfRageHiddenPowerHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, LAKE_OF_RAGE, 1
-	warp_event 3, 7, LAKE_OF_RAGE, 1
+	warp_event  2,  7, LAKE_OF_RAGE, 1
+	warp_event  3,  7, LAKE_OF_RAGE, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, HiddenPowerHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, HiddenPowerHouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, HiddenPowerHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, HiddenPowerHouseBookshelf
 
 	db 1 ; object events
-	object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, HiddenPowerGuy, -1
+	object_event  2,  3, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, HiddenPowerGuy, -1
diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm
index a64b87e2a..2ed82feae 100644
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -208,14 +208,14 @@ LakeOfRageMagikarpHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, LAKE_OF_RAGE, 2
-	warp_event 3, 7, LAKE_OF_RAGE, 2
+	warp_event  2,  7, LAKE_OF_RAGE, 2
+	warp_event  3,  7, LAKE_OF_RAGE, 2
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, MagikarpHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, MagikarpHouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, MagikarpHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, MagikarpHouseBookshelf
 
 	db 1 ; object events
-	object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x19a6ae, -1
+	object_event  2,  3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x19a6ae, -1
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index 7cae63c73..f16dc0dfa 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -339,18 +339,18 @@ LancesRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 23, KARENS_ROOM, 3
-	warp_event 5, 23, KARENS_ROOM, 4
-	warp_event 4, 1, HALL_OF_FAME, 1
-	warp_event 5, 1, HALL_OF_FAME, 2
+	warp_event  4, 23, KARENS_ROOM, 3
+	warp_event  5, 23, KARENS_ROOM, 4
+	warp_event  4,  1, HALL_OF_FAME, 1
+	warp_event  5,  1, HALL_OF_FAME, 2
 
 	db 2 ; coord events
-	coord_event 4, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromLeft
-	coord_event 5, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromRight
+	coord_event  4,  5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromLeft
+	coord_event  5,  5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromRight
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 5, 3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x180e7b, -1
-	object_event 4, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
-	object_event 4, 7, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
+	object_event  5,  3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x180e7b, -1
+	object_event  4,  7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
+	object_event  4,  7, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm
index ef84ad348..073dbb821 100644
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -223,18 +223,18 @@ LavRadioTower1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, LAVENDER_TOWN, 7
-	warp_event 3, 7, LAVENDER_TOWN, 7
+	warp_event  2,  7, LAVENDER_TOWN, 7
+	warp_event  3,  7, LAVENDER_TOWN, 7
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 11, 0, BGEVENT_READ, MapLavRadioTower1FSignpost0Script
-	bg_event 5, 0, BGEVENT_READ, MapLavRadioTower1FSignpost1Script
+	bg_event 11,  0, BGEVENT_READ, MapLavRadioTower1FSignpost0Script
+	bg_event  5,  0, BGEVENT_READ, MapLavRadioTower1FSignpost1Script
 
 	db 5 ; object events
-	object_event 6, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1
-	object_event 15, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1
-	object_event 1, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1
-	object_event 9, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1
-	object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1
+	object_event  6,  6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1
+	object_event 15,  1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1
+	object_event  1,  3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1
+	object_event  9,  1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1
+	object_event 14,  6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1
diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm
index 004e22276..cd97dd8e8 100644
--- a/maps/LavenderMart.asm
+++ b/maps/LavenderMart.asm
@@ -49,14 +49,14 @@ LavenderMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, LAVENDER_TOWN, 5
-	warp_event 3, 7, LAVENDER_TOWN, 5
+	warp_event  2,  7, LAVENDER_TOWN, 5
+	warp_event  3,  7, LAVENDER_TOWN, 5
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1
-	object_event 6, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1
-	object_event 9, 2, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1
+	object_event  6,  6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1
+	object_event  9,  2, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1
diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm
index c2f102584..0fee0798e 100644
--- a/maps/LavenderNameRater.asm
+++ b/maps/LavenderNameRater.asm
@@ -25,12 +25,12 @@ LavenderNameRater_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, LAVENDER_TOWN, 4
-	warp_event 3, 7, LAVENDER_TOWN, 4
+	warp_event  2,  7, LAVENDER_TOWN, 4
+	warp_event  3,  7, LAVENDER_TOWN, 4
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 2, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderNameRater, -1
+	object_event  2,  3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderNameRater, -1
diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm
index 7305a95fe..84d2ec2ea 100644
--- a/maps/LavenderPokecenter1F.asm
+++ b/maps/LavenderPokecenter1F.asm
@@ -82,16 +82,16 @@ LavenderPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, LAVENDER_TOWN, 1
-	warp_event 4, 7, LAVENDER_TOWN, 1
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, LAVENDER_TOWN, 1
+	warp_event  4,  7, LAVENDER_TOWN, 1
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x7e6a0, -1
-	object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1
-	object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1
-	object_event 1, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x7e6a9, -1
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x7e6a0, -1
+	object_event  7,  6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1
+	object_event  5,  3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1
+	object_event  1,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x7e6a9, -1
diff --git a/maps/LavenderPokecenter2FBeta.asm b/maps/LavenderPokecenter2FBeta.asm
index 7523c528c..7157b4735 100644
--- a/maps/LavenderPokecenter2FBeta.asm
+++ b/maps/LavenderPokecenter2FBeta.asm
@@ -7,7 +7,7 @@ LavenderPokecenter2FBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 0, 7, LAVENDER_POKECENTER_1F, 3
+	warp_event  0,  7, LAVENDER_POKECENTER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm
index c9a265aad..dd73aa81f 100644
--- a/maps/LavenderSpeechHouse.asm
+++ b/maps/LavenderSpeechHouse.asm
@@ -30,14 +30,14 @@ LavenderSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, LAVENDER_TOWN, 3
-	warp_event 3, 7, LAVENDER_TOWN, 3
+	warp_event  2,  7, LAVENDER_TOWN, 3
+	warp_event  3,  7, LAVENDER_TOWN, 3
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, LavenderSpeechHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, LavenderSpeechHouseBookshelf
 
 	db 1 ; object events
-	object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderSpeechHousePokefanFScript, -1
+	object_event  2,  3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderSpeechHousePokefanFScript, -1
diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm
index 973271b24..9aeec7ab9 100644
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -107,26 +107,26 @@ LavenderTown_MapEvents:
 	db 0, 0 ; filler
 
 	db 7 ; warp events
-	warp_event 5, 5, LAVENDER_POKECENTER_1F, 1
-	warp_event 5, 9, MR_FUJIS_HOUSE, 1
-	warp_event 3, 13, LAVENDER_SPEECH_HOUSE, 1
-	warp_event 7, 13, LAVENDER_NAME_RATER, 1
-	warp_event 1, 5, LAVENDER_MART, 2
+	warp_event  5,  5, LAVENDER_POKECENTER_1F, 1
+	warp_event  5,  9, MR_FUJIS_HOUSE, 1
+	warp_event  3, 13, LAVENDER_SPEECH_HOUSE, 1
+	warp_event  7, 13, LAVENDER_NAME_RATER, 1
+	warp_event  1,  5, LAVENDER_MART, 2
 	warp_event 13, 11, SOUL_HOUSE, 1
-	warp_event 14, 5, LAV_RADIO_TOWER_1F, 1
+	warp_event 14,  5, LAV_RADIO_TOWER_1F, 1
 
 	db 0 ; coord events
 
 	db 6 ; bg events
-	bg_event 11, 3, BGEVENT_READ, LavenderTownSign
-	bg_event 15, 7, BGEVENT_READ, KantoRadioStationSign
-	bg_event 3, 9, BGEVENT_READ, VolunteerPokemonHouseSign
+	bg_event 11,  3, BGEVENT_READ, LavenderTownSign
+	bg_event 15,  7, BGEVENT_READ, KantoRadioStationSign
+	bg_event  3,  9, BGEVENT_READ, VolunteerPokemonHouseSign
 	bg_event 15, 13, BGEVENT_READ, SoulHouseSign
-	bg_event 6, 5, BGEVENT_READ, LavenderPokecenterSignText
-	bg_event 2, 5, BGEVENT_READ, LavenderMartSignText
+	bg_event  6,  5, BGEVENT_READ, LavenderPokecenterSignText
+	bg_event  2,  5, BGEVENT_READ, LavenderMartSignText
 
 	db 4 ; object events
-	object_event 12, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1
-	object_event 2, 15, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1
+	object_event 12,  7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1
+	object_event  2, 15, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1
 	object_event 14, 12, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderTownGrampsScript, -1
-	object_event 6, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 1, LavenderTownYoungsterScript, -1
+	object_event  6, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 1, LavenderTownYoungsterScript, -1
diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm
index 777053a41..9b56aacd4 100644
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -374,20 +374,20 @@ MahoganyGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 17, MAHOGANY_TOWN, 3
-	warp_event 5, 17, MAHOGANY_TOWN, 3
+	warp_event  4, 17, MAHOGANY_TOWN, 3
+	warp_event  5, 17, MAHOGANY_TOWN, 3
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 3, 15, BGEVENT_READ, MahoganyGymStatue
-	bg_event 6, 15, BGEVENT_READ, MahoganyGymStatue
+	bg_event  3, 15, BGEVENT_READ, MahoganyGymStatue
+	bg_event  6, 15, BGEVENT_READ, MahoganyGymStatue
 
 	db 7 ; object events
-	object_event 5, 3, SPRITE_PRYCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PryceScript_0x199a9e, -1
-	object_event 4, 6, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1
-	object_event 0, 17, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1
-	object_event 9, 17, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierClarissa, -1
-	object_event 5, 9, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderBrad, -1
-	object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderDouglas, -1
-	object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyGymGuyScript, -1
+	object_event  5,  3, SPRITE_PRYCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PryceScript_0x199a9e, -1
+	object_event  4,  6, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1
+	object_event  0, 17, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1
+	object_event  9, 17, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierClarissa, -1
+	object_event  5,  9, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderBrad, -1
+	object_event  2,  4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderDouglas, -1
+	object_event  7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyGymGuyScript, -1
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index 822240911..376298357 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -222,17 +222,17 @@ MahoganyMart1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, MAHOGANY_TOWN, 1
-	warp_event 4, 7, MAHOGANY_TOWN, 1
-	warp_event 7, 3, TEAM_ROCKET_BASE_B1F, 1
+	warp_event  3,  7, MAHOGANY_TOWN, 1
+	warp_event  4,  7, MAHOGANY_TOWN, 1
+	warp_event  7,  3, TEAM_ROCKET_BASE_B1F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 5 ; object events
-	object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event 4, 6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
-	object_event 3, 6, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
-	object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS
+	object_event  4,  3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event  1,  6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event  4,  6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
+	object_event  3,  6, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
+	object_event  1,  3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS
diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm
index de968338a..baced8e5c 100644
--- a/maps/MahoganyPokecenter1F.asm
+++ b/maps/MahoganyPokecenter1F.asm
@@ -55,16 +55,16 @@ MahoganyPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, MAHOGANY_TOWN, 4
-	warp_event 4, 7, MAHOGANY_TOWN, 4
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, MAHOGANY_TOWN, 4
+	warp_event  4,  7, MAHOGANY_TOWN, 4
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19a356, -1
-	object_event 7, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1
-	object_event 1, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1
-	object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FCooltrainerFScript, -1
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19a356, -1
+	object_event  7,  2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1
+	object_event  1,  3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1
+	object_event  2,  3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FCooltrainerFScript, -1
diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm
index f0f91a2b2..53159ea91 100644
--- a/maps/MahoganyRedGyaradosSpeechHouse.asm
+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
@@ -62,13 +62,13 @@ MahoganyRedGyaradosSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, MAHOGANY_TOWN, 2
-	warp_event 3, 7, MAHOGANY_TOWN, 2
+	warp_event  2,  7, MAHOGANY_TOWN, 2
+	warp_event  3,  7, MAHOGANY_TOWN, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1
-	object_event 6, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x199982, -1
+	object_event  2,  3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1
+	object_event  6,  5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x199982, -1
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index 1a4ce8f44..5fc87cd4f 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -246,24 +246,24 @@ MahoganyTown_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 11, 7, MAHOGANY_MART_1F, 1
-	warp_event 17, 7, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, 1
-	warp_event 6, 13, MAHOGANY_GYM, 1
+	warp_event 11,  7, MAHOGANY_MART_1F, 1
+	warp_event 17,  7, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, 1
+	warp_event  6, 13, MAHOGANY_GYM, 1
 	warp_event 15, 13, MAHOGANY_POKECENTER_1F, 1
-	warp_event 9, 1, ROUTE_43_MAHOGANY_GATE, 3
+	warp_event  9,  1, ROUTE_43_MAHOGANY_GATE, 3
 
 	db 2 ; coord events
-	coord_event 19, 8, SCENE_DEFAULT, UnknownScript_0x190013
-	coord_event 19, 9, SCENE_DEFAULT, UnknownScript_0x190013
+	coord_event 19,  8, SCENE_DEFAULT, UnknownScript_0x190013
+	coord_event 19,  9, SCENE_DEFAULT, UnknownScript_0x190013
 
 	db 4 ; bg events
-	bg_event 1, 5, BGEVENT_READ, MahoganyTownSign
-	bg_event 9, 7, BGEVENT_READ, MahoganyTownRagecandybarSign
-	bg_event 3, 13, BGEVENT_READ, MahoganyGymSign
+	bg_event  1,  5, BGEVENT_READ, MahoganyTownSign
+	bg_event  9,  7, BGEVENT_READ, MahoganyTownRagecandybarSign
+	bg_event  3, 13, BGEVENT_READ, MahoganyGymSign
 	bg_event 16, 13, BGEVENT_READ, MahoganyTownPokecenterSign
 
 	db 4 ; object events
-	object_event 19, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
-	object_event 6, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1
-	object_event 6, 14, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
-	object_event 12, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownLassScript, EVENT_MAHOGANY_MART_OWNERS
+	object_event 19,  8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
+	object_event  6,  9, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1
+	object_event  6, 14, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
+	object_event 12,  8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownLassScript, EVENT_MAHOGANY_MART_OWNERS
diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm
index c69079aba..8128007f6 100644
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -201,12 +201,12 @@ ManiasHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, CIANWOOD_CITY, 1
-	warp_event 3, 7, CIANWOOD_CITY, 1
+	warp_event  2,  7, CIANWOOD_CITY, 1
+	warp_event  3,  7, CIANWOOD_CITY, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ManiaScript, -1
+	object_event  2,  4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ManiaScript, -1
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index ad832b1fb..64139989a 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -68,12 +68,12 @@ MobileBattleRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 7, POKECENTER_2F, 6
-	warp_event 5, 7, POKECENTER_2F, 6
+	warp_event  4,  7, POKECENTER_2F, 6
+	warp_event  5,  7, POKECENTER_2F, 6
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 4, 2, BGEVENT_UP, MapMobileBattleRoomSignpost0Script
+	bg_event  4,  2, BGEVENT_UP, MapMobileBattleRoomSignpost0Script
 
 	db 0 ; object events
diff --git a/maps/MobileTradeRoom.asm b/maps/MobileTradeRoom.asm
index 469822afc..e7c1cb476 100644
--- a/maps/MobileTradeRoom.asm
+++ b/maps/MobileTradeRoom.asm
@@ -36,12 +36,12 @@ MobileTradeRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 7, POKECENTER_2F, 5
-	warp_event 5, 7, POKECENTER_2F, 5
+	warp_event  4,  7, POKECENTER_2F, 5
+	warp_event  5,  7, POKECENTER_2F, 5
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 4, 2, BGEVENT_UP, MapMobileTradeRoomSignpost0Script
+	bg_event  4,  2, BGEVENT_UP, MapMobileTradeRoomSignpost0Script
 
 	db 0 ; object events
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index deffa830d..08a9c4c17 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -162,13 +162,13 @@ MountMoon_MapEvents:
 	db 0, 0 ; filler
 
 	db 8 ; warp events
-	warp_event 3, 3, ROUTE_3, 1
+	warp_event  3,  3, ROUTE_3, 1
 	warp_event 15, 15, ROUTE_4, 1
-	warp_event 13, 3, MOUNT_MOON, 7
+	warp_event 13,  3, MOUNT_MOON, 7
 	warp_event 15, 11, MOUNT_MOON, 8
-	warp_event 25, 5, MOUNT_MOON_SQUARE, 1
+	warp_event 25,  5, MOUNT_MOON_SQUARE, 1
 	warp_event 25, 15, MOUNT_MOON_SQUARE, 2
-	warp_event 25, 3, MOUNT_MOON, 3
+	warp_event 25,  3, MOUNT_MOON, 3
 	warp_event 25, 13, MOUNT_MOON, 4
 
 	db 0 ; coord events
@@ -176,4 +176,4 @@ MountMoon_MapEvents:
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 7, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL
+	object_event  7,  3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL
diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm
index 5f260cd5c..54616ea17 100644
--- a/maps/MountMoonGiftShop.asm
+++ b/maps/MountMoonGiftShop.asm
@@ -29,15 +29,15 @@ MountMoonGiftShop_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 7, MOUNT_MOON_SQUARE, 3
-	warp_event 4, 7, MOUNT_MOON_SQUARE, 3
+	warp_event  3,  7, MOUNT_MOON_SQUARE, 3
+	warp_event  4,  7, MOUNT_MOON_SQUARE, 3
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 4, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1
-	object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1
-	object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1
-	object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1
+	object_event  4,  3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1
+	object_event  1,  2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1
+	object_event  1,  6, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1
+	object_event  5,  4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index 87139c286..8d0cc5dfe 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -134,18 +134,18 @@ MountMoonSquare_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 20, 5, MOUNT_MOON, 5
+	warp_event 20,  5, MOUNT_MOON, 5
 	warp_event 22, 11, MOUNT_MOON, 6
-	warp_event 13, 7, MOUNT_MOON_GIFT_SHOP, 1
+	warp_event 13,  7, MOUNT_MOON_GIFT_SHOP, 1
 
 	db 1 ; coord events
-	coord_event 7, 11, SCENE_DEFAULT, ClefairyDance
+	coord_event  7, 11, SCENE_DEFAULT, ClefairyDance
 
 	db 2 ; bg events
-	bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone
-	bg_event 17, 7, BGEVENT_READ, DontLitterSign
+	bg_event  7,  7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone
+	bg_event 17,  7, BGEVENT_READ, DontLitterSign
 
 	db 3 ; object events
-	object_event 6, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
-	object_event 7, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
-	object_event 7, 7, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK
+	object_event  6,  6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
+	object_event  7,  6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
+	object_event  7,  7, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK
diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm
index b8301b907..f574b3563 100644
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -120,10 +120,10 @@ MountMortar1FInside_MapEvents:
 	db 6 ; warp events
 	warp_event 11, 47, MOUNT_MORTAR_1F_OUTSIDE, 5
 	warp_event 29, 47, MOUNT_MORTAR_1F_OUTSIDE, 6
-	warp_event 5, 39, MOUNT_MORTAR_1F_OUTSIDE, 8
+	warp_event  5, 39, MOUNT_MORTAR_1F_OUTSIDE, 8
 	warp_event 33, 41, MOUNT_MORTAR_1F_OUTSIDE, 9
-	warp_event 3, 19, MOUNT_MORTAR_B1F, 1
-	warp_event 9, 9, MOUNT_MORTAR_2F_INSIDE, 2
+	warp_event  3, 19, MOUNT_MORTAR_B1F, 1
+	warp_event  9,  9, MOUNT_MORTAR_2F_INSIDE, 2
 
 	db 0 ; coord events
 
@@ -139,5 +139,5 @@ MountMortar1FInside_MapEvents:
 	object_event 35, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideNugget, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET
 	object_event 33, 43, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacMiller, -1
 	object_event 24, 28, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdMarkus, -1
-	object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideIron, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON
+	object_event  8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideIron, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON
 	object_event 17, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideUltraBall, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL
diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm
index 9bc92ccdf..eded2353c 100644
--- a/maps/MountMortar1FOutside.asm
+++ b/maps/MountMortar1FOutside.asm
@@ -20,14 +20,14 @@ MountMortar1FOutside_MapEvents:
 	db 0, 0 ; filler
 
 	db 9 ; warp events
-	warp_event 3, 33, ROUTE_42, 3
+	warp_event  3, 33, ROUTE_42, 3
 	warp_event 17, 33, ROUTE_42, 4
 	warp_event 37, 33, ROUTE_42, 5
-	warp_event 17, 5, MOUNT_MORTAR_2F_INSIDE, 1
+	warp_event 17,  5, MOUNT_MORTAR_2F_INSIDE, 1
 	warp_event 11, 21, MOUNT_MORTAR_1F_INSIDE, 1
 	warp_event 29, 21, MOUNT_MORTAR_1F_INSIDE, 2
 	warp_event 17, 29, MOUNT_MORTAR_B1F, 2
-	warp_event 7, 13, MOUNT_MORTAR_1F_INSIDE, 3
+	warp_event  7, 13, MOUNT_MORTAR_1F_INSIDE, 3
 	warp_event 33, 13, MOUNT_MORTAR_1F_INSIDE, 4
 
 	db 0 ; coord events
diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm
index 18d62603b..e4c0a0c44 100644
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -69,18 +69,18 @@ MountMortar2FInside_MapEvents:
 
 	db 2 ; warp events
 	warp_event 17, 33, MOUNT_MORTAR_1F_OUTSIDE, 4
-	warp_event 3, 5, MOUNT_MORTAR_1F_INSIDE, 6
+	warp_event  3,  5, MOUNT_MORTAR_1F_INSIDE, 6
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 24, 8, BGEVENT_ITEM, MountMortar2FInsideHiddenFullRestore
+	bg_event 24,  8, BGEVENT_ITEM, MountMortar2FInsideHiddenFullRestore
 
 	db 7 ; object events
 	object_event 28, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION
-	object_event 2, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY
+	object_event  2, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY
 	object_event 19, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL
-	object_event 16, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideDragonScale, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE
-	object_event 9, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideElixer, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER
-	object_event 28, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideEscapeRope, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE
+	object_event 16,  5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideDragonScale, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE
+	object_event  9, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideElixer, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER
+	object_event 28,  5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideEscapeRope, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE
 	object_event 13, 26, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdHugh, -1
diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm
index 4eb2eb272..eb58b48de 100644
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -136,19 +136,19 @@ MountMortarB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 3, MOUNT_MORTAR_1F_INSIDE, 5
+	warp_event  3,  3, MOUNT_MORTAR_1F_INSIDE, 5
 	warp_event 19, 29, MOUNT_MORTAR_1F_OUTSIDE, 7
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 4, 6, BGEVENT_ITEM, MountMortarB1FHiddenMaxRevive
+	bg_event  4,  6, BGEVENT_ITEM, MountMortarB1FHiddenMaxRevive
 
 	db 7 ; object events
 	object_event 29, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
-	object_event 4, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS
-	object_event 9, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1
-	object_event 16, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1
+	object_event  4, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS
+	object_event  9, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1
+	object_event 16,  4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1
 	object_event 34, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FFullRestore, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE
-	object_event 32, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER
+	object_event 32,  3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER
 	object_event 21, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP
diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm
index 82dfa9a9f..e382cf226 100644
--- a/maps/MoveDeletersHouse.asm
+++ b/maps/MoveDeletersHouse.asm
@@ -21,14 +21,14 @@ MoveDeletersHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, BLACKTHORN_CITY, 6
-	warp_event 3, 7, BLACKTHORN_CITY, 6
+	warp_event  2,  7, BLACKTHORN_CITY, 6
+	warp_event  3,  7, BLACKTHORN_CITY, 6
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, MoveDeletersHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, MoveDeletersHouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, MoveDeletersHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, MoveDeletersHouseBookshelf
 
 	db 1 ; object events
-	object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MoveDeleter, -1
+	object_event  2,  3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MoveDeleter, -1
diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm
index 687657967..4396e707d 100644
--- a/maps/MrFujisHouse.asm
+++ b/maps/MrFujisHouse.asm
@@ -81,18 +81,18 @@ MrFujisHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, LAVENDER_TOWN, 2
-	warp_event 3, 7, LAVENDER_TOWN, 2
+	warp_event  2,  7, LAVENDER_TOWN, 2
+	warp_event  3,  7, LAVENDER_TOWN, 2
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, MrFujisHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, MrFujisHouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, MrFujisHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, MrFujisHouseBookshelf
 
 	db 5 ; object events
-	object_event 4, 1, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrFujisHouseSuperNerdScript, -1
-	object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisHouseLassScript, -1
-	object_event 7, 4, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisPsyduck, -1
-	object_event 5, 5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFujisNidorino, -1
-	object_event 1, 3, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MrFujisPidgey, -1
+	object_event  4,  1, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrFujisHouseSuperNerdScript, -1
+	object_event  3,  4, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisHouseLassScript, -1
+	object_event  7,  4, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisPsyduck, -1
+	object_event  5,  5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFujisNidorino, -1
+	object_event  1,  3, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MrFujisPidgey, -1
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index 53332cd18..d79c86d7e 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -374,18 +374,18 @@ MrPokemonsHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, ROUTE_30, 2
-	warp_event 3, 7, ROUTE_30, 2
+	warp_event  2,  7, ROUTE_30, 2
+	warp_event  3,  7, ROUTE_30, 2
 
 	db 0 ; coord events
 
 	db 5 ; bg events
-	bg_event 0, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script
-	bg_event 1, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script
-	bg_event 6, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script
-	bg_event 7, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script
-	bg_event 6, 4, BGEVENT_READ, MapMrPokemonsHouseSignpost4Script
+	bg_event  0,  1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script
+	bg_event  1,  1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script
+	bg_event  6,  1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script
+	bg_event  7,  1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script
+	bg_event  6,  4, BGEVENT_READ, MapMrPokemonsHouseSignpost4Script
 
 	db 2 ; object events
-	object_event 3, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1
-	object_event 6, 5, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK
+	object_event  3,  5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1
+	object_event  6,  5, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK
diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm
index 67593de2b..c5121e247 100644
--- a/maps/MrPsychicsHouse.asm
+++ b/maps/MrPsychicsHouse.asm
@@ -49,14 +49,14 @@ MrPsychicsHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, SAFFRON_CITY, 5
-	warp_event 3, 7, SAFFRON_CITY, 5
+	warp_event  2,  7, SAFFRON_CITY, 5
+	warp_event  3,  7, SAFFRON_CITY, 5
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, MrPsychicsHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, MrPsychicsHouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, MrPsychicsHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, MrPsychicsHouseBookshelf
 
 	db 1 ; object events
-	object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrPsychic, -1
+	object_event  5,  3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrPsychic, -1
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index ed6bf6b9a..df4299cff 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -525,12 +525,12 @@ NationalPark_MapEvents:
 	db 4 ; bg events
 	bg_event 14, 44, BGEVENT_READ, MapNationalParkSignpost0Script
 	bg_event 27, 31, BGEVENT_READ, MapNationalParkSignpost1Script
-	bg_event 6, 47, BGEVENT_ITEM, NationalParkHiddenFullHeal
-	bg_event 12, 4, BGEVENT_READ, MapNationalParkSignpost3Script
+	bg_event  6, 47, BGEVENT_ITEM, NationalParkHiddenFullHeal
+	bg_event 12,  4, BGEVENT_READ, MapNationalParkSignpost3Script
 
 	db 14 ; object events
 	object_event 15, 24, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NationalParkLassScript, -1
-	object_event 14, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1
+	object_event 14,  4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1
 	object_event 27, 40, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5c008, -1
 	object_event 11, 41, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster1Script, -1
 	object_event 10, 41, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster2Script, -1
@@ -538,8 +538,8 @@ NationalPark_MapEvents:
 	object_event 26, 40, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPersian, -1
 	object_event 27, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJack1, -1
 	object_event 18, 29, SPRITE_POKEFAN_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1
-	object_event 16, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1
-	object_event 8, 14, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassKrise, -1
+	object_event 16,  9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1
+	object_event  8, 14, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassKrise, -1
 	object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
-	object_event 26, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1
-	object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG
+	object_event 26,  6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1
+	object_event  1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG
diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm
index d6cffadcb..6c718ff61 100644
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -232,19 +232,19 @@ NationalParkBugContest_MapEvents:
 	db 4 ; bg events
 	bg_event 14, 44, BGEVENT_READ, MapNationalParkBugContestSignpost0Script
 	bg_event 27, 31, BGEVENT_READ, MapNationalParkBugContestSignpost1Script
-	bg_event 6, 47, BGEVENT_ITEM, NationalParkBugContestHiddenFullHeal
-	bg_event 12, 4, BGEVENT_READ, MapNationalParkBugContestSignpost3Script
+	bg_event  6, 47, BGEVENT_ITEM, NationalParkBugContestHiddenFullHeal
+	bg_event 12,  4, BGEVENT_READ, MapNationalParkBugContestSignpost3Script
 
 	db 12 ; object events
 	object_event 19, 29, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A
 	object_event 28, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A
-	object_event 9, 18, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A
-	object_event 7, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A
-	object_event 23, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A
+	object_event  9, 18, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A
+	object_event  7, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A
+	object_event 23,  9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A
 	object_event 27, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c914, EVENT_BUG_CATCHING_CONTESTANT_6A
-	object_event 7, 23, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A
+	object_event  7, 23, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A
 	object_event 11, 27, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A
-	object_event 16, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A
+	object_event 16,  8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A
 	object_event 17, 34, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A
 	object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
-	object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG
+	object_event  1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index c961e1490..c0feedf21 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -283,22 +283,22 @@ NewBarkTown_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 6, 3, ELMS_LAB, 1
-	warp_event 13, 5, PLAYERS_HOUSE_1F, 1
-	warp_event 3, 11, PLAYERS_NEIGHBORS_HOUSE, 1
+	warp_event  6,  3, ELMS_LAB, 1
+	warp_event 13,  5, PLAYERS_HOUSE_1F, 1
+	warp_event  3, 11, PLAYERS_NEIGHBORS_HOUSE, 1
 	warp_event 11, 13, ELMS_HOUSE, 1
 
 	db 2 ; coord events
-	coord_event 1, 8, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene1
-	coord_event 1, 9, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene2
+	coord_event  1,  8, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene1
+	coord_event  1,  9, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene2
 
 	db 4 ; bg events
-	bg_event 8, 8, BGEVENT_READ, NewBarkTownSign
-	bg_event 11, 5, BGEVENT_READ, MapNewBarkTownSignpost1Script
-	bg_event 3, 3, BGEVENT_READ, MapNewBarkTownSignpost2Script
-	bg_event 9, 13, BGEVENT_READ, MapNewBarkTownSignpost3Script
+	bg_event  8,  8, BGEVENT_READ, NewBarkTownSign
+	bg_event 11,  5, BGEVENT_READ, MapNewBarkTownSignpost1Script
+	bg_event  3,  3, BGEVENT_READ, MapNewBarkTownSignpost2Script
+	bg_event  9, 13, BGEVENT_READ, MapNewBarkTownSignpost3Script
 
 	db 3 ; object events
-	object_event 6, 8, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1
-	object_event 12, 9, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1
-	object_event 3, 2, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN
+	object_event  6,  8, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1
+	object_event 12,  9, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1
+	object_event  3,  2, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN
diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm
index 370d0fdbd..4750edf0a 100644
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -258,31 +258,31 @@ OaksLab_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 11, PALLET_TOWN, 3
-	warp_event 5, 11, PALLET_TOWN, 3
+	warp_event  4, 11, PALLET_TOWN, 3
+	warp_event  5, 11, PALLET_TOWN, 3
 
 	db 0 ; coord events
 
 	db 16 ; bg events
-	bg_event 6, 1, BGEVENT_READ, OaksLabBookshelf
-	bg_event 7, 1, BGEVENT_READ, OaksLabBookshelf
-	bg_event 8, 1, BGEVENT_READ, OaksLabBookshelf
-	bg_event 9, 1, BGEVENT_READ, OaksLabBookshelf
-	bg_event 0, 7, BGEVENT_READ, OaksLabBookshelf
-	bg_event 1, 7, BGEVENT_READ, OaksLabBookshelf
-	bg_event 2, 7, BGEVENT_READ, OaksLabBookshelf
-	bg_event 3, 7, BGEVENT_READ, OaksLabBookshelf
-	bg_event 6, 7, BGEVENT_READ, OaksLabBookshelf
-	bg_event 7, 7, BGEVENT_READ, OaksLabBookshelf
-	bg_event 8, 7, BGEVENT_READ, OaksLabBookshelf
-	bg_event 9, 7, BGEVENT_READ, OaksLabBookshelf
-	bg_event 4, 0, BGEVENT_READ, OaksLabPoster1
-	bg_event 5, 0, BGEVENT_READ, OaksLabPoster2
-	bg_event 9, 3, BGEVENT_READ, OaksLabTrashcan
-	bg_event 0, 1, BGEVENT_READ, OaksLabPC
+	bg_event  6,  1, BGEVENT_READ, OaksLabBookshelf
+	bg_event  7,  1, BGEVENT_READ, OaksLabBookshelf
+	bg_event  8,  1, BGEVENT_READ, OaksLabBookshelf
+	bg_event  9,  1, BGEVENT_READ, OaksLabBookshelf
+	bg_event  0,  7, BGEVENT_READ, OaksLabBookshelf
+	bg_event  1,  7, BGEVENT_READ, OaksLabBookshelf
+	bg_event  2,  7, BGEVENT_READ, OaksLabBookshelf
+	bg_event  3,  7, BGEVENT_READ, OaksLabBookshelf
+	bg_event  6,  7, BGEVENT_READ, OaksLabBookshelf
+	bg_event  7,  7, BGEVENT_READ, OaksLabBookshelf
+	bg_event  8,  7, BGEVENT_READ, OaksLabBookshelf
+	bg_event  9,  7, BGEVENT_READ, OaksLabBookshelf
+	bg_event  4,  0, BGEVENT_READ, OaksLabPoster1
+	bg_event  5,  0, BGEVENT_READ, OaksLabPoster2
+	bg_event  9,  3, BGEVENT_READ, OaksLabTrashcan
+	bg_event  0,  1, BGEVENT_READ, OaksLabPC
 
 	db 4 ; object events
-	object_event 4, 2, SPRITE_OAK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Oak, -1
-	object_event 1, 8, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant1Script, -1
-	object_event 8, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant2Script, -1
-	object_event 1, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant3Script, -1
+	object_event  4,  2, SPRITE_OAK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Oak, -1
+	object_event  1,  8, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant1Script, -1
+	object_event  8,  9, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant2Script, -1
+	object_event  1,  4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant3Script, -1
diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm
index d036233c1..6e3ffbe5f 100644
--- a/maps/OlivineCafe.asm
+++ b/maps/OlivineCafe.asm
@@ -80,14 +80,14 @@ OlivineCafe_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, OLIVINE_CITY, 7
-	warp_event 3, 7, OLIVINE_CITY, 7
+	warp_event  2,  7, OLIVINE_CITY, 7
+	warp_event  3,  7, OLIVINE_CITY, 7
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 4, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1
-	object_event 7, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1
-	object_event 6, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1
+	object_event  4,  3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1
+	object_event  7,  3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1
+	object_event  6,  6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index 53dbd674f..181bf2cbf 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -292,10 +292,10 @@ OlivineCity_MapEvents:
 	warp_event 13, 21, OLIVINE_POKECENTER_1F, 1
 	warp_event 10, 11, OLIVINE_GYM, 1
 	warp_event 25, 11, OLIVINE_TIMS_HOUSE, 1
-	warp_event 0, 0, OLIVINE_HOUSE_BETA, 1
+	warp_event  0,  0, OLIVINE_HOUSE_BETA, 1 ; inaccessible
 	warp_event 29, 11, OLIVINE_PUNISHMENT_SPEECH_HOUSE, 1
 	warp_event 13, 15, OLIVINE_GOOD_ROD_HOUSE, 1
-	warp_event 7, 21, OLIVINE_CAFE, 1
+	warp_event  7, 21, OLIVINE_CAFE, 1
 	warp_event 19, 17, OLIVINE_MART, 2
 	warp_event 29, 27, OLIVINE_LIGHTHOUSE_1F, 1
 	warp_event 19, 27, OLIVINE_PORT_PASSAGE, 1
@@ -308,9 +308,9 @@ OlivineCity_MapEvents:
 	db 7 ; bg events
 	bg_event 17, 11, BGEVENT_READ, OlivineCitySign
 	bg_event 20, 24, BGEVENT_READ, OlivineCityPortSign
-	bg_event 7, 11, BGEVENT_READ, OlivineGymSign
+	bg_event  7, 11, BGEVENT_READ, OlivineGymSign
 	bg_event 30, 28, BGEVENT_READ, OlivineLighthouseSign
-	bg_event 3, 23, BGEVENT_READ, OlivineCityBattleTowerSign
+	bg_event  3, 23, BGEVENT_READ, OlivineCityBattleTowerSign
 	bg_event 14, 21, BGEVENT_READ, OlivineCityPokecenterSign
 	bg_event 20, 17, BGEVENT_READ, OlivineCityMartSign
 
diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm
index 585aebd04..67acb021c 100644
--- a/maps/OlivineGoodRodHouse.asm
+++ b/maps/OlivineGoodRodHouse.asm
@@ -84,12 +84,12 @@ OlivineGoodRodHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, OLIVINE_CITY, 6
-	warp_event 3, 7, OLIVINE_CITY, 6
+	warp_event  2,  7, OLIVINE_CITY, 6
+	warp_event  3,  7, OLIVINE_CITY, 6
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoodRodGuru, -1
+	object_event  2,  3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoodRodGuru, -1
diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm
index f146985bd..ab5dd650a 100644
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -199,15 +199,15 @@ OlivineGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 15, OLIVINE_CITY, 2
-	warp_event 5, 15, OLIVINE_CITY, 2
+	warp_event  4, 15, OLIVINE_CITY, 2
+	warp_event  5, 15, OLIVINE_CITY, 2
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 3, 13, BGEVENT_READ, OlivineGymStatue
-	bg_event 6, 13, BGEVENT_READ, OlivineGymStatue
+	bg_event  3, 13, BGEVENT_READ, OlivineGymStatue
+	bg_event  6, 13, BGEVENT_READ, OlivineGymStatue
 
 	db 2 ; object events
-	object_event 5, 3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE
-	object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuyScript, -1
+	object_event  5,  3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE
+	object_event  7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuyScript, -1
diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm
index 3e9065343..ff92907d7 100644
--- a/maps/OlivineHouseBeta.asm
+++ b/maps/OlivineHouseBeta.asm
@@ -41,15 +41,15 @@ OlivineHouseBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, OLIVINE_CITY, 4
-	warp_event 3, 7, OLIVINE_CITY, 4
+	warp_event  2,  7, OLIVINE_CITY, 4
+	warp_event  3,  7, OLIVINE_CITY, 4
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, OlivineHouseBetaBookshelf1
-	bg_event 1, 1, BGEVENT_READ, OlivineHouseBetaBookshelf2
+	bg_event  0,  1, BGEVENT_READ, OlivineHouseBetaBookshelf1
+	bg_event  1,  1, BGEVENT_READ, OlivineHouseBetaBookshelf2
 
 	db 2 ; object events
-	object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1
-	object_event 6, 4, SPRITE_RHYDON, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x9c592, -1
+	object_event  2,  3, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1
+	object_event  6,  4, SPRITE_RHYDON, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x9c592, -1
diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm
index d1300badf..f411731e5 100644
--- a/maps/OlivineLighthouse1F.asm
+++ b/maps/OlivineLighthouse1F.asm
@@ -40,7 +40,7 @@ OlivineLighthouse1F_MapEvents:
 	db 5 ; warp events
 	warp_event 10, 17, OLIVINE_CITY, 9
 	warp_event 11, 17, OLIVINE_CITY, 9
-	warp_event 3, 11, OLIVINE_LIGHTHOUSE_2F, 1
+	warp_event  3, 11, OLIVINE_LIGHTHOUSE_2F, 1
 	warp_event 16, 13, OLIVINE_LIGHTHOUSE_2F, 3
 	warp_event 17, 13, OLIVINE_LIGHTHOUSE_2F, 4
 
@@ -49,5 +49,5 @@ OlivineLighthouse1F_MapEvents:
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 8, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FSailorScript, -1
-	object_event 16, 9, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FPokefanFScript, -1
+	object_event  8,  2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FSailorScript, -1
+	object_event 16,  9, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FPokefanFScript, -1
diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm
index c132b9375..9def30314 100644
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -206,8 +206,8 @@ OlivineLighthouse2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 3, 11, OLIVINE_LIGHTHOUSE_1F, 3
-	warp_event 5, 3, OLIVINE_LIGHTHOUSE_3F, 2
+	warp_event  3, 11, OLIVINE_LIGHTHOUSE_1F, 3
+	warp_event  5,  3, OLIVINE_LIGHTHOUSE_3F, 2
 	warp_event 16, 13, OLIVINE_LIGHTHOUSE_1F, 4
 	warp_event 17, 13, OLIVINE_LIGHTHOUSE_1F, 5
 	warp_event 16, 11, OLIVINE_LIGHTHOUSE_3F, 4
@@ -218,5 +218,5 @@ OlivineLighthouse2F_MapEvents:
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 9, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorHuey1, -1
-	object_event 17, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1
+	object_event  9,  3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorHuey1, -1
+	object_event 17,  8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1
diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm
index 1d07ae2c8..e81f24fb7 100644
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -114,22 +114,22 @@ OlivineLighthouse3F_MapEvents:
 	db 0, 0 ; filler
 
 	db 9 ; warp events
-	warp_event 13, 3, OLIVINE_LIGHTHOUSE_4F, 1
-	warp_event 5, 3, OLIVINE_LIGHTHOUSE_2F, 2
-	warp_event 9, 5, OLIVINE_LIGHTHOUSE_4F, 4
+	warp_event 13,  3, OLIVINE_LIGHTHOUSE_4F, 1
+	warp_event  5,  3, OLIVINE_LIGHTHOUSE_2F, 2
+	warp_event  9,  5, OLIVINE_LIGHTHOUSE_4F, 4
 	warp_event 16, 11, OLIVINE_LIGHTHOUSE_2F, 5
 	warp_event 17, 11, OLIVINE_LIGHTHOUSE_2F, 6
-	warp_event 16, 9, OLIVINE_LIGHTHOUSE_4F, 5
-	warp_event 17, 9, OLIVINE_LIGHTHOUSE_4F, 6
-	warp_event 8, 3, OLIVINE_LIGHTHOUSE_4F, 7
-	warp_event 9, 3, OLIVINE_LIGHTHOUSE_4F, 8
+	warp_event 16,  9, OLIVINE_LIGHTHOUSE_4F, 5
+	warp_event 17,  9, OLIVINE_LIGHTHOUSE_4F, 6
+	warp_event  8,  3, OLIVINE_LIGHTHOUSE_4F, 7
+	warp_event  9,  3, OLIVINE_LIGHTHOUSE_4F, 8
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 9, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1
-	object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1
-	object_event 3, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperTheo, -1
-	object_event 8, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER
+	object_event  9,  2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1
+	object_event 13,  5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1
+	object_event  3,  9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperTheo, -1
+	object_event  8,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER
diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm
index cc00a643a..b240ac39f 100644
--- a/maps/OlivineLighthouse4F.asm
+++ b/maps/OlivineLighthouse4F.asm
@@ -83,21 +83,21 @@ OlivineLighthouse4F_MapEvents:
 	db 0, 0 ; filler
 
 	db 10 ; warp events
-	warp_event 13, 3, OLIVINE_LIGHTHOUSE_3F, 1
-	warp_event 3, 5, OLIVINE_LIGHTHOUSE_5F, 2
-	warp_event 9, 7, OLIVINE_LIGHTHOUSE_5F, 3
-	warp_event 9, 5, OLIVINE_LIGHTHOUSE_3F, 3
-	warp_event 16, 9, OLIVINE_LIGHTHOUSE_3F, 6
-	warp_event 17, 9, OLIVINE_LIGHTHOUSE_3F, 7
-	warp_event 8, 3, OLIVINE_LIGHTHOUSE_3F, 8
-	warp_event 9, 3, OLIVINE_LIGHTHOUSE_3F, 9
-	warp_event 16, 7, OLIVINE_LIGHTHOUSE_5F, 4
-	warp_event 17, 7, OLIVINE_LIGHTHOUSE_5F, 5
+	warp_event 13,  3, OLIVINE_LIGHTHOUSE_3F, 1
+	warp_event  3,  5, OLIVINE_LIGHTHOUSE_5F, 2
+	warp_event  9,  7, OLIVINE_LIGHTHOUSE_5F, 3
+	warp_event  9,  5, OLIVINE_LIGHTHOUSE_3F, 3
+	warp_event 16,  9, OLIVINE_LIGHTHOUSE_3F, 6
+	warp_event 17,  9, OLIVINE_LIGHTHOUSE_3F, 7
+	warp_event  8,  3, OLIVINE_LIGHTHOUSE_3F, 8
+	warp_event  9,  3, OLIVINE_LIGHTHOUSE_3F, 9
+	warp_event 16,  7, OLIVINE_LIGHTHOUSE_5F, 4
+	warp_event 17,  7, OLIVINE_LIGHTHOUSE_5F, 5
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 7, 14, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorKent, -1
-	object_event 11, 2, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassConnie, -1
+	object_event  7, 14, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorKent, -1
+	object_event 11,  2, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassConnie, -1
diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm
index c69b5e98c..bf1fb6717 100644
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -92,22 +92,22 @@ OlivineLighthouse5F_MapEvents:
 	db 0, 0 ; filler
 
 	db 7 ; warp events
-	warp_event 9, 15, OLIVINE_LIGHTHOUSE_6F, 1
-	warp_event 3, 5, OLIVINE_LIGHTHOUSE_4F, 2
-	warp_event 9, 7, OLIVINE_LIGHTHOUSE_4F, 3
-	warp_event 16, 7, OLIVINE_LIGHTHOUSE_4F, 9
-	warp_event 17, 7, OLIVINE_LIGHTHOUSE_4F, 10
-	warp_event 16, 5, OLIVINE_LIGHTHOUSE_6F, 2
-	warp_event 17, 5, OLIVINE_LIGHTHOUSE_6F, 3
+	warp_event  9, 15, OLIVINE_LIGHTHOUSE_6F, 1
+	warp_event  3,  5, OLIVINE_LIGHTHOUSE_4F, 2
+	warp_event  9,  7, OLIVINE_LIGHTHOUSE_4F, 3
+	warp_event 16,  7, OLIVINE_LIGHTHOUSE_4F, 9
+	warp_event 17,  7, OLIVINE_LIGHTHOUSE_4F, 10
+	warp_event 16,  5, OLIVINE_LIGHTHOUSE_6F, 2
+	warp_event 17,  5, OLIVINE_LIGHTHOUSE_6F, 3
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 3, 13, BGEVENT_ITEM, OlivineLighthouse5FHiddenHyperPotion
+	bg_event  3, 13, BGEVENT_ITEM, OlivineLighthouse5FHiddenHyperPotion
 
 	db 5 ; object events
-	object_event 8, 11, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1
-	object_event 8, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBirdKeeperDenis, -1
+	object_event  8, 11, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1
+	object_event  8,  3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBirdKeeperDenis, -1
 	object_event 15, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY
-	object_event 6, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL
-	object_event 2, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER
+	object_event  6, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL
+	object_event  2, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index 381795a79..3aff2dad9 100644
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -259,15 +259,15 @@ OlivineLighthouse6F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 9, 15, OLIVINE_LIGHTHOUSE_5F, 1
-	warp_event 16, 5, OLIVINE_LIGHTHOUSE_5F, 6
-	warp_event 17, 5, OLIVINE_LIGHTHOUSE_5F, 7
+	warp_event  9, 15, OLIVINE_LIGHTHOUSE_5F, 1
+	warp_event 16,  5, OLIVINE_LIGHTHOUSE_5F, 6
+	warp_event 17,  5, OLIVINE_LIGHTHOUSE_5F, 7
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 8, 8, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE
-	object_event 9, 8, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1
-	object_event 3, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION
+	object_event  8,  8, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE
+	object_event  9,  8, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1
+	object_event  3,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION
diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm
index 048bb9785..3bc0774f3 100644
--- a/maps/OlivineMart.asm
+++ b/maps/OlivineMart.asm
@@ -47,14 +47,14 @@ OlivineMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, OLIVINE_CITY, 8
-	warp_event 3, 7, OLIVINE_CITY, 8
+	warp_event  2,  7, OLIVINE_CITY, 8
+	warp_event  3,  7, OLIVINE_CITY, 8
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1
-	object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1
-	object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartLassScript, -1
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1
+	object_event  6,  2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1
+	object_event  1,  6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartLassScript, -1
diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm
index 2686f00f1..173c7a9b4 100644
--- a/maps/OlivinePokecenter1F.asm
+++ b/maps/OlivinePokecenter1F.asm
@@ -49,16 +49,16 @@ OlivinePokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, OLIVINE_CITY, 1
-	warp_event 4, 7, OLIVINE_CITY, 1
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, OLIVINE_CITY, 1
+	warp_event  4,  7, OLIVINE_CITY, 1
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9c002, -1
-	object_event 8, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1
-	object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1
-	object_event 7, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FTeacherScript, -1
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9c002, -1
+	object_event  8,  4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1
+	object_event  2,  3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1
+	object_event  7,  1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FTeacherScript, -1
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index 78940406c..716c79962 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -386,20 +386,20 @@ OlivinePort_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 11, 7, OLIVINE_PORT_PASSAGE, 5
-	warp_event 7, 23, FAST_SHIP_1F, 1
+	warp_event 11,  7, OLIVINE_PORT_PASSAGE, 5
+	warp_event  7, 23, FAST_SHIP_1F, 1
 
 	db 1 ; coord events
-	coord_event 7, 15, SCENE_DEFAULT, UnknownScript_0x7491f
+	coord_event  7, 15, SCENE_DEFAULT, UnknownScript_0x7491f
 
 	db 1 ; bg events
-	bg_event 1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein
+	bg_event  1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein
 
 	db 7 ; object events
-	object_event 7, 23, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
-	object_event 7, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
-	object_event 6, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
-	object_event 4, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
+	object_event  7, 23, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
+	object_event  7, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
+	object_event  6, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
+	object_event  4, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
 	object_event 13, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
-	object_event 4, 15, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
+	object_event  4, 15, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
 	object_event 11, 15, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x74a22, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm
index 74feb52d5..98040307f 100644
--- a/maps/OlivinePortPassage.asm
+++ b/maps/OlivinePortPassage.asm
@@ -21,15 +21,15 @@ OlivinePortPassage_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 15, 0, OLIVINE_CITY, 10
-	warp_event 16, 0, OLIVINE_CITY, 11
-	warp_event 15, 4, OLIVINE_PORT_PASSAGE, 4
-	warp_event 3, 2, OLIVINE_PORT_PASSAGE, 3
-	warp_event 3, 14, OLIVINE_PORT, 1
+	warp_event 15,  0, OLIVINE_CITY, 10
+	warp_event 16,  0, OLIVINE_CITY, 11
+	warp_event 15,  4, OLIVINE_PORT_PASSAGE, 4
+	warp_event  3,  2, OLIVINE_PORT_PASSAGE, 3
+	warp_event  3, 14, OLIVINE_PORT, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 17, 1, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortPassagePokefanMScript, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M
+	object_event 17,  1, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortPassagePokefanMScript, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M
diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm
index 8216d53f6..e590f158d 100644
--- a/maps/OlivinePunishmentSpeechHouse.asm
+++ b/maps/OlivinePunishmentSpeechHouse.asm
@@ -41,15 +41,15 @@ OlivinePunishmentSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, OLIVINE_CITY, 5
-	warp_event 3, 7, OLIVINE_CITY, 5
+	warp_event  2,  7, OLIVINE_CITY, 5
+	warp_event  3,  7, OLIVINE_CITY, 5
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf1
-	bg_event 1, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf2
+	bg_event  0,  1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf1
+	bg_event  1,  1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf2
 
 	db 2 ; object events
-	object_event 1, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDad, -1
-	object_event 5, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDaughter, -1
+	object_event  1,  2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDad, -1
+	object_event  5,  5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDaughter, -1
diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm
index 7d59a92e5..60263cf3c 100644
--- a/maps/OlivineTimsHouse.asm
+++ b/maps/OlivineTimsHouse.asm
@@ -21,14 +21,14 @@ OlivineTimsHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, OLIVINE_CITY, 3
-	warp_event 3, 7, OLIVINE_CITY, 3
+	warp_event  2,  7, OLIVINE_CITY, 3
+	warp_event  3,  7, OLIVINE_CITY, 3
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, TimsHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, TimsHouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, TimsHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, TimsHouseBookshelf
 
 	db 1 ; object events
-	object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Tim, -1
+	object_event  2,  3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Tim, -1
diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm
index 13ea47815..0bc820103 100644
--- a/maps/PalletTown.asm
+++ b/maps/PalletTown.asm
@@ -71,18 +71,18 @@ PalletTown_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 5, 5, REDS_HOUSE_1F, 1
-	warp_event 13, 5, BLUES_HOUSE, 1
+	warp_event  5,  5, REDS_HOUSE_1F, 1
+	warp_event 13,  5, BLUES_HOUSE, 1
 	warp_event 12, 11, OAKS_LAB, 1
 
 	db 0 ; coord events
 
 	db 4 ; bg events
-	bg_event 7, 9, BGEVENT_READ, PalletTownSign
-	bg_event 3, 5, BGEVENT_READ, RedsHouseSign
+	bg_event  7,  9, BGEVENT_READ, PalletTownSign
+	bg_event  3,  5, BGEVENT_READ, RedsHouseSign
 	bg_event 13, 13, BGEVENT_READ, OaksLabSign
-	bg_event 11, 5, BGEVENT_READ, BluesHouseSign
+	bg_event 11,  5, BGEVENT_READ, BluesHouseSign
 
 	db 2 ; object events
-	object_event 3, 8, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PalletTownTeacherScript, -1
+	object_event  3,  8, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PalletTownTeacherScript, -1
 	object_event 12, 14, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PalletTownFisherScript, -1
diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm
index 277f71487..87e918d35 100644
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -158,14 +158,14 @@ PewterCity_MapEvents:
 	warp_event 16, 17, PEWTER_GYM, 1
 	warp_event 23, 17, PEWTER_MART, 2
 	warp_event 13, 25, PEWTER_POKECENTER_1F, 1
-	warp_event 7, 29, PEWTER_SNOOZE_SPEECH_HOUSE, 1
+	warp_event  7, 29, PEWTER_SNOOZE_SPEECH_HOUSE, 1
 
 	db 0 ; coord events
 
 	db 7 ; bg events
 	bg_event 25, 23, BGEVENT_READ, PewterCitySign
 	bg_event 11, 17, BGEVENT_READ, PewterGymSign
-	bg_event 15, 9, BGEVENT_READ, PewterMuseumSign
+	bg_event 15,  9, BGEVENT_READ, PewterMuseumSign
 	bg_event 33, 19, BGEVENT_READ, PewterCityMtMoonGiftShopSign
 	bg_event 19, 29, BGEVENT_READ, PewterCityWelcomeSign
 	bg_event 14, 25, BGEVENT_READ, PewterCityPokecenterSign
@@ -175,5 +175,5 @@ PewterCity_MapEvents:
 	object_event 19, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1
 	object_event 14, 29, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1
 	object_event 29, 17, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1
-	object_event 32, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1
-	object_event 30, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1
+	object_event 32,  3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1
+	object_event 30,  3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1
diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm
index 0e73c3657..1d4da2419 100644
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -210,16 +210,16 @@ PewterGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 13, PEWTER_CITY, 2
-	warp_event 5, 13, PEWTER_CITY, 2
+	warp_event  4, 13, PEWTER_CITY, 2
+	warp_event  5, 13, PEWTER_CITY, 2
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 2, 11, BGEVENT_READ, PewterGymStatue
-	bg_event 7, 11, BGEVENT_READ, PewterGymStatue
+	bg_event  2, 11, BGEVENT_READ, PewterGymStatue
+	bg_event  7, 11, BGEVENT_READ, PewterGymStatue
 
 	db 3 ; object events
-	object_event 5, 1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1
-	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1
-	object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1
+	object_event  5,  1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1
+	object_event  2,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1
+	object_event  6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1
diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm
index 19e324bca..1862f99b1 100644
--- a/maps/PewterMart.asm
+++ b/maps/PewterMart.asm
@@ -47,14 +47,14 @@ PewterMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, PEWTER_CITY, 3
-	warp_event 3, 7, PEWTER_CITY, 3
+	warp_event  2,  7, PEWTER_CITY, 3
+	warp_event  3,  7, PEWTER_CITY, 3
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1
-	object_event 9, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1
-	object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1
+	object_event  9,  2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1
+	object_event  6,  6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1
diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm
index aed4ba69b..cf90488be 100644
--- a/maps/PewterNidoranSpeechHouse.asm
+++ b/maps/PewterNidoranSpeechHouse.asm
@@ -30,13 +30,13 @@ PewterNidoranSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, PEWTER_CITY, 1
-	warp_event 3, 7, PEWTER_CITY, 1
+	warp_event  2,  7, PEWTER_CITY, 1
+	warp_event  3,  7, PEWTER_CITY, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 3, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterNidoranSpeechHouseSuperNerdScript, -1
-	object_event 4, 5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterNidoran, -1
+	object_event  3,  5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterNidoranSpeechHouseSuperNerdScript, -1
+	object_event  4,  5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterNidoran, -1
diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm
index 328b92f79..14f1870c3 100644
--- a/maps/PewterPokecenter1F.asm
+++ b/maps/PewterPokecenter1F.asm
@@ -69,17 +69,17 @@ PewterPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, PEWTER_CITY, 4
-	warp_event 4, 7, PEWTER_CITY, 4
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, PEWTER_CITY, 4
+	warp_event  4,  7, PEWTER_CITY, 4
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 5 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1
-	object_event 8, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1
-	object_event 1, 3, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterJigglypuff, -1
-	object_event 2, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FBugCatcherScript, -1
-	object_event 7, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Chris, -1
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1
+	object_event  8,  6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1
+	object_event  1,  3, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterJigglypuff, -1
+	object_event  2,  3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FBugCatcherScript, -1
+	object_event  7,  2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Chris, -1
diff --git a/maps/PewterPokecenter2FBeta.asm b/maps/PewterPokecenter2FBeta.asm
index 49d4deea9..6e5e6c14a 100644
--- a/maps/PewterPokecenter2FBeta.asm
+++ b/maps/PewterPokecenter2FBeta.asm
@@ -7,7 +7,7 @@ PewterPokecenter2FBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 0, 7, PEWTER_POKECENTER_1F, 3
+	warp_event  0,  7, PEWTER_POKECENTER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm
index 2a7e21c8e..61a96a50f 100644
--- a/maps/PewterSnoozeSpeechHouse.asm
+++ b/maps/PewterSnoozeSpeechHouse.asm
@@ -22,14 +22,14 @@ PewterSnoozeSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, PEWTER_CITY, 5
-	warp_event 3, 7, PEWTER_CITY, 5
+	warp_event  2,  7, PEWTER_CITY, 5
+	warp_event  3,  7, PEWTER_CITY, 5
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf
 
 	db 1 ; object events
-	object_event 5, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterSnoozeSpeechHouseGrampsScript, -1
+	object_event  5,  3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterSnoozeSpeechHouseGrampsScript, -1
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index 61c52d7c9..ad4f5c39d 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -387,23 +387,23 @@ PlayersHouse1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 6, 7, NEW_BARK_TOWN, 2
-	warp_event 7, 7, NEW_BARK_TOWN, 2
-	warp_event 9, 0, PLAYERS_HOUSE_2F, 1
+	warp_event  6,  7, NEW_BARK_TOWN, 2
+	warp_event  7,  7, NEW_BARK_TOWN, 2
+	warp_event  9,  0, PLAYERS_HOUSE_2F, 1
 
 	db 2 ; coord events
-	coord_event 8, 4, SCENE_DEFAULT, UnknownScript_0x7a4d8
-	coord_event 9, 4, SCENE_DEFAULT, UnknownScript_0x7a4db
+	coord_event  8,  4, SCENE_DEFAULT, UnknownScript_0x7a4d8
+	coord_event  9,  4, SCENE_DEFAULT, UnknownScript_0x7a4db
 
 	db 4 ; bg events
-	bg_event 0, 1, BGEVENT_READ, StoveScript
-	bg_event 1, 1, BGEVENT_READ, SinkScript
-	bg_event 2, 1, BGEVENT_READ, FridgeScript
-	bg_event 4, 1, BGEVENT_READ, TVScript
+	bg_event  0,  1, BGEVENT_READ, StoveScript
+	bg_event  1,  1, BGEVENT_READ, SinkScript
+	bg_event  2,  1, BGEVENT_READ, FridgeScript
+	bg_event  4,  1, BGEVENT_READ, TVScript
 
 	db 5 ; object events
-	object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_1
-	object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
-	object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
-	object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
-	object_event 4, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
+	object_event  7,  4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_1
+	object_event  2,  2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
+	object_event  7,  4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
+	object_event  0,  2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
+	object_event  4,  4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm
index d0fe5dece..a5c03a749 100644
--- a/maps/PlayersHouse2F.asm
+++ b/maps/PlayersHouse2F.asm
@@ -117,18 +117,18 @@ PlayersHouse2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 7, 0, PLAYERS_HOUSE_1F, 3
+	warp_event  7,  0, PLAYERS_HOUSE_1F, 3
 
 	db 0 ; coord events
 
 	db 4 ; bg events
-	bg_event 2, 1, BGEVENT_UP, PlayersHousePCScript
-	bg_event 3, 1, BGEVENT_READ, PlayersHouseRadioScript
-	bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelfScript
-	bg_event 6, 0, BGEVENT_IFSET, PlayersHousePosterScript
+	bg_event  2,  1, BGEVENT_UP, PlayersHousePCScript
+	bg_event  3,  1, BGEVENT_READ, PlayersHouseRadioScript
+	bg_event  5,  1, BGEVENT_READ, PlayersHouseBookshelfScript
+	bg_event  6,  0, BGEVENT_IFSET, PlayersHousePosterScript
 
 	db 4 ; object events
-	object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE
-	object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1
-	object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2
-	object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
+	object_event  4,  2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE
+	object_event  4,  4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1
+	object_event  5,  4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2
+	object_event  0,  1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm
index 127c0f1ec..84400b09e 100644
--- a/maps/PlayersNeighborsHouse.asm
+++ b/maps/PlayersNeighborsHouse.asm
@@ -100,16 +100,16 @@ PlayersNeighborsHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, NEW_BARK_TOWN, 3
-	warp_event 3, 7, NEW_BARK_TOWN, 3
+	warp_event  2,  7, NEW_BARK_TOWN, 3
+	warp_event  3,  7, NEW_BARK_TOWN, 3
 
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event 0, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript
-	bg_event 1, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript
-	bg_event 7, 1, BGEVENT_READ, PlayersNeighborsHouseRadioScript
+	bg_event  0,  1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript
+	bg_event  1,  1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript
+	bg_event  7,  1, BGEVENT_READ, PlayersNeighborsHouseRadioScript
 
 	db 2 ; object events
-	object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborsDaughterScript, -1
-	object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborScript, EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
+	object_event  2,  3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborsDaughterScript, -1
+	object_event  5,  3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborScript, EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm
index a656ffe0e..05d2f9779 100644
--- a/maps/PokeSeersHouse.asm
+++ b/maps/PokeSeersHouse.asm
@@ -18,12 +18,12 @@ PokeSeersHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, CIANWOOD_CITY, 7
-	warp_event 3, 7, CIANWOOD_CITY, 7
+	warp_event  2,  7, CIANWOOD_CITY, 7
+	warp_event  3,  7, CIANWOOD_CITY, 7
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SeerScript, -1
+	object_event  2,  3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SeerScript, -1
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 27a5224f9..2f15c0c10 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -1024,20 +1024,20 @@ Pokecenter2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 0, 7, POKECENTER_2F, -1
-	warp_event 5, 0, TRADE_CENTER, 1
-	warp_event 9, 0, COLOSSEUM, 1
-	warp_event 13, 2, TIME_CAPSULE, 1
-	warp_event 6, 0, MOBILE_TRADE_ROOM, 1
-	warp_event 10, 0, MOBILE_BATTLE_ROOM, 1
+	warp_event  0,  7, POKECENTER_2F, -1
+	warp_event  5,  0, TRADE_CENTER, 1
+	warp_event  9,  0, COLOSSEUM, 1
+	warp_event 13,  2, TIME_CAPSULE, 1
+	warp_event  6,  0, MOBILE_TRADE_ROOM, 1
+	warp_event 10,  0, MOBILE_BATTLE_ROOM, 1
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 7, 3, BGEVENT_READ, MapPokecenter2FSignpost0Script
+	bg_event  7,  3, BGEVENT_READ, MapPokecenter2FSignpost0Script
 
 	db 4 ; object events
-	object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1
-	object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1
-	object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1
-	object_event 1, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY
+	object_event  5,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1
+	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1
+	object_event 13,  3, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1
+	object_event  1,  1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY
diff --git a/maps/PokecomCenterAdminRoomMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm
index dcde9beaf..024286f4a 100644
--- a/maps/PokecomCenterAdminRoomMobile.asm
+++ b/maps/PokecomCenterAdminRoomMobile.asm
@@ -264,17 +264,17 @@ PokecomCenterAdminRoomMobile_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 0, 31, GOLDENROD_POKECENTER_1F, 3
-	warp_event 1, 31, GOLDENROD_POKECENTER_1F, 3
+	warp_event  0, 31, GOLDENROD_POKECENTER_1F, 3
+	warp_event  1, 31, GOLDENROD_POKECENTER_1F, 3
 
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost0Script
-	bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost1Script
-	bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost2Script
+	bg_event  6, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost0Script
+	bg_event  6, 28, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost1Script
+	bg_event  3, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost2Script
 
 	db 3 ; object events
-	object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist1Script, -1
-	object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist2Script, -1
-	object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist3Script, -1
+	object_event  4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist1Script, -1
+	object_event  7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist2Script, -1
+	object_event  7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist3Script, -1
diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm
index 7a5260d61..1f54460ba 100644
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -298,19 +298,19 @@ PokemonFanClub_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, VERMILION_CITY, 3
-	warp_event 3, 7, VERMILION_CITY, 3
+	warp_event  2,  7, VERMILION_CITY, 3
+	warp_event  3,  7, VERMILION_CITY, 3
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 7, 0, BGEVENT_READ, MapPokemonFanClubSignpost0Script
-	bg_event 9, 0, BGEVENT_READ, MapPokemonFanClubSignpost1Script
+	bg_event  7,  0, BGEVENT_READ, MapPokemonFanClubSignpost0Script
+	bg_event  9,  0, BGEVENT_READ, MapPokemonFanClubSignpost1Script
 
 	db 6 ; object events
-	object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1
-	object_event 4, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1
-	object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FisherScript_0x191824, -1
-	object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1
-	object_event 2, 4, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyDoll, EVENT_VERMILION_FAN_CLUB_DOLL
-	object_event 7, 3, SPRITE_ODDISH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FanClubBayleef, -1
+	object_event  3,  1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1
+	object_event  4,  1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1
+	object_event  2,  3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FisherScript_0x191824, -1
+	object_event  7,  2, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1
+	object_event  2,  4, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyDoll, EVENT_VERMILION_FAN_CLUB_DOLL
+	object_event  7,  3, SPRITE_ODDISH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FanClubBayleef, -1
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index 6989234e0..4395c12e2 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -390,21 +390,21 @@ PowerPlant_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 17, ROUTE_10_NORTH, 2
-	warp_event 3, 17, ROUTE_10_NORTH, 2
+	warp_event  2, 17, ROUTE_10_NORTH, 2
+	warp_event  3, 17, ROUTE_10_NORTH, 2
 
 	db 1 ; coord events
-	coord_event 5, 12, SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL, PowerPlantGuardPhoneScript
+	coord_event  5, 12, SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL, PowerPlantGuardPhoneScript
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, PowerPlantBookshelf
-	bg_event 1, 1, BGEVENT_READ, PowerPlantBookshelf
+	bg_event  0,  1, BGEVENT_READ, PowerPlantBookshelf
+	bg_event  1,  1, BGEVENT_READ, PowerPlantBookshelf
 
 	db 7 ; object events
-	object_event 4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188df5, -1
-	object_event 2, 9, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e15, -1
-	object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e29, -1
-	object_event 9, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188e3d, -1
-	object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e51, -1
+	object_event  4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188df5, -1
+	object_event  2,  9, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e15, -1
+	object_event  6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e29, -1
+	object_event  9,  3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188e3d, -1
+	object_event  7,  2, SPRITE_GYM_GUY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e51, -1
 	object_event 14, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PowerPlantManager, -1
-	object_event 5, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Forest, -1
+	object_event  5,  5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Forest, -1
diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm
index f2b537f50..32b210b55 100644
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -474,20 +474,20 @@ RadioTower1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 2, 7, GOLDENROD_CITY, 11
-	warp_event 3, 7, GOLDENROD_CITY, 11
-	warp_event 15, 0, RADIO_TOWER_2F, 2
+	warp_event  2,  7, GOLDENROD_CITY, 11
+	warp_event  3,  7, GOLDENROD_CITY, 11
+	warp_event 15,  0, RADIO_TOWER_2F, 2
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 3, 0, BGEVENT_READ, MapRadioTower1FSignpost0Script
-	bg_event 13, 0, BGEVENT_READ, MapRadioTower1FSignpost1Script
+	bg_event  3,  0, BGEVENT_READ, MapRadioTower1FSignpost0Script
+	bg_event 13,  0, BGEVENT_READ, MapRadioTower1FSignpost1Script
 
 	db 6 ; object events
-	object_event 5, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1
-	object_event 16, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event 15, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event 14, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event 12, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event  5,  6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1
+	object_event 16,  4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 15,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 14,  1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  8,  6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 12,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
index 9343109d5..4b3e14794 100644
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -712,28 +712,28 @@ RadioTower2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 0, 0, RADIO_TOWER_3F, 1
-	warp_event 15, 0, RADIO_TOWER_1F, 3
+	warp_event  0,  0, RADIO_TOWER_3F, 1
+	warp_event 15,  0, RADIO_TOWER_1F, 3
 
 	db 0 ; coord events
 
 	db 6 ; bg events
-	bg_event 3, 0, BGEVENT_READ, MapRadioTower2FSignpost0Script
-	bg_event 5, 0, BGEVENT_READ, MapRadioTower2FSignpost1Script
-	bg_event 9, 1, BGEVENT_READ, RadioTower2FBookshelf
-	bg_event 10, 1, BGEVENT_READ, RadioTower2FBookshelf
-	bg_event 11, 1, BGEVENT_READ, RadioTower2FBookshelf
-	bg_event 13, 0, BGEVENT_READ, MapRadioTower2FSignpost5Script
+	bg_event  3,  0, BGEVENT_READ, MapRadioTower2FSignpost0Script
+	bg_event  5,  0, BGEVENT_READ, MapRadioTower2FSignpost1Script
+	bg_event  9,  1, BGEVENT_READ, RadioTower2FBookshelf
+	bg_event 10,  1, BGEVENT_READ, RadioTower2FBookshelf
+	bg_event 11,  1, BGEVENT_READ, RadioTower2FBookshelf
+	bg_event 13,  0, BGEVENT_READ, MapRadioTower2FSignpost5Script
 
 	db 11 ; object events
-	object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event 17, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1
-	object_event 1, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 8, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 4, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 10, 5, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 0, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt1Script, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS
-	object_event 1, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt2Script, EVENT_RADIO_TOWER_CIVILIANS_AFTER
-	object_event 12, 1, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1
-	object_event 14, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Buena, -1
-	object_event 12, 7, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event  6,  6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 17,  2, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1
+	object_event  1,  4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  8,  4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  4,  1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 10,  5, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  0,  1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt1Script, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS
+	object_event  1,  1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt2Script, EVENT_RADIO_TOWER_CIVILIANS_AFTER
+	object_event 12,  1, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1
+	object_event 14,  5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Buena, -1
+	object_event 12,  7, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS
diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm
index 26d5d5a9a..554bb4ace 100644
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -330,22 +330,22 @@ RadioTower3F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 0, 0, RADIO_TOWER_2F, 1
-	warp_event 7, 0, RADIO_TOWER_4F, 2
-	warp_event 17, 0, RADIO_TOWER_4F, 4
+	warp_event  0,  0, RADIO_TOWER_2F, 1
+	warp_event  7,  0, RADIO_TOWER_4F, 2
+	warp_event 17,  0, RADIO_TOWER_4F, 4
 
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event 3, 0, BGEVENT_READ, MapRadioTower3FSignpost0Script
-	bg_event 9, 0, BGEVENT_READ, MapRadioTower3FSignpost1Script
-	bg_event 14, 2, BGEVENT_UP, MapRadioTower3FSignpost2Script
+	bg_event  3,  0, BGEVENT_READ, MapRadioTower3FSignpost0Script
+	bg_event  9,  0, BGEVENT_READ, MapRadioTower3FSignpost1Script
+	bg_event 14,  2, BGEVENT_UP, MapRadioTower3FSignpost2Script
 
 	db 7 ; object events
-	object_event 7, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER
-	object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1
-	object_event 11, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1
-	object_event 5, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 6, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 16, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 9, 6, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  7,  4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER
+	object_event  3,  4, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1
+	object_event 11,  3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1
+	object_event  5,  1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  6,  2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 16,  6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  9,  6, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm
index b2181228e..0db5df152 100644
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -247,22 +247,22 @@ RadioTower4F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 0, RADIO_TOWER_5F, 1
-	warp_event 9, 0, RADIO_TOWER_3F, 2
-	warp_event 12, 0, RADIO_TOWER_5F, 2
-	warp_event 17, 0, RADIO_TOWER_3F, 3
+	warp_event  0,  0, RADIO_TOWER_5F, 1
+	warp_event  9,  0, RADIO_TOWER_3F, 2
+	warp_event 12,  0, RADIO_TOWER_5F, 2
+	warp_event 17,  0, RADIO_TOWER_3F, 3
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 7, 0, BGEVENT_READ, MapRadioTower4FSignpost0Script
-	bg_event 15, 0, BGEVENT_READ, MapRadioTower4FSignpost1Script
+	bg_event  7,  0, BGEVENT_READ, MapRadioTower4FSignpost0Script
+	bg_event 15,  0, BGEVENT_READ, MapRadioTower4FSignpost1Script
 
 	db 7 ; object events
-	object_event 6, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER
-	object_event 14, 6, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1
-	object_event 12, 7, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTowerMeowth, -1
-	object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 14, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 12, 4, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 4, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  6,  4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER
+	object_event 14,  6, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1
+	object_event 12,  7, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTowerMeowth, -1
+	object_event  5,  6, SPRITE_ROCKET, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 14,  1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 12,  4, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  4,  2, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index 70a97ff65..ad8726a2a 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -422,23 +422,23 @@ RadioTower5F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 0, 0, RADIO_TOWER_4F, 1
-	warp_event 12, 0, RADIO_TOWER_4F, 3
+	warp_event  0,  0, RADIO_TOWER_4F, 1
+	warp_event 12,  0, RADIO_TOWER_4F, 3
 
 	db 2 ; coord events
-	coord_event 0, 3, SCENE_DEFAULT, FakeDirectorScript
-	coord_event 16, 5, SCENE_RADIOTOWER5F_ROCKET_BOSS, RadioTower5FRocketBossScene
+	coord_event  0,  3, SCENE_DEFAULT, FakeDirectorScript
+	coord_event 16,  5, SCENE_RADIOTOWER5F_ROCKET_BOSS, RadioTower5FRocketBossScene
 
 	db 5 ; bg events
-	bg_event 3, 0, BGEVENT_READ, MapRadioTower5FSignpost0Script
-	bg_event 11, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script
-	bg_event 15, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script
-	bg_event 16, 1, BGEVENT_READ, RadioTower5FBookshelf
-	bg_event 17, 1, BGEVENT_READ, RadioTower5FBookshelf
+	bg_event  3,  0, BGEVENT_READ, MapRadioTower5FSignpost0Script
+	bg_event 11,  0, BGEVENT_READ, MapRadioTower5FSignpost2Script
+	bg_event 15,  0, BGEVENT_READ, MapRadioTower5FSignpost2Script
+	bg_event 16,  1, BGEVENT_READ, RadioTower5FBookshelf
+	bg_event 17,  1, BGEVENT_READ, RadioTower5FBookshelf
 
 	db 5 ; object events
-	object_event 3, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Director, -1
-	object_event 13, 5, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 17, 2, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 13, 5, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER
-	object_event 8, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RadioTower5FUltraBall, EVENT_RADIO_TOWER_5F_ULTRA_BALL
+	object_event  3,  6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Director, -1
+	object_event 13,  5, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 17,  2, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 13,  5, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER
+	object_event  8,  5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RadioTower5FUltraBall, EVENT_RADIO_TOWER_5F_ULTRA_BALL
diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm
index e12724bca..a07b231a4 100644
--- a/maps/RedsHouse1F.asm
+++ b/maps/RedsHouse1F.asm
@@ -76,16 +76,16 @@ RedsHouse1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 2, 7, PALLET_TOWN, 1
-	warp_event 3, 7, PALLET_TOWN, 1
-	warp_event 7, 0, REDS_HOUSE_2F, 1
+	warp_event  2,  7, PALLET_TOWN, 1
+	warp_event  3,  7, PALLET_TOWN, 1
+	warp_event  7,  0, REDS_HOUSE_2F, 1
 
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event 0, 1, BGEVENT_READ, RedsHouse1FBookshelf
-	bg_event 1, 1, BGEVENT_READ, RedsHouse1FBookshelf
-	bg_event 2, 1, BGEVENT_READ, RedsHouse1FTV
+	bg_event  0,  1, BGEVENT_READ, RedsHouse1FBookshelf
+	bg_event  1,  1, BGEVENT_READ, RedsHouse1FBookshelf
+	bg_event  2,  1, BGEVENT_READ, RedsHouse1FTV
 
 	db 1 ; object events
-	object_event 5, 3, SPRITE_REDS_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RedsMom, -1
+	object_event  5,  3, SPRITE_REDS_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RedsMom, -1
diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm
index db61ec456..6ff76ec80 100644
--- a/maps/RedsHouse2F.asm
+++ b/maps/RedsHouse2F.asm
@@ -27,12 +27,12 @@ RedsHouse2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 7, 0, REDS_HOUSE_1F, 3
+	warp_event  7,  0, REDS_HOUSE_1F, 3
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 3, 5, BGEVENT_READ, RedsHouse2FN64Script
-	bg_event 0, 1, BGEVENT_READ, RedsHouse2FPCScript
+	bg_event  3,  5, BGEVENT_READ, RedsHouse2FN64Script
+	bg_event  0,  1, BGEVENT_READ, RedsHouse2FPCScript
 
 	db 0 ; object events
diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm
index 84c285c28..008f7aec8 100644
--- a/maps/RockTunnel1F.asm
+++ b/maps/RockTunnel1F.asm
@@ -23,19 +23,19 @@ RockTunnel1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 15, 3, ROUTE_9, 1
+	warp_event 15,  3, ROUTE_9, 1
 	warp_event 11, 25, ROUTE_10_SOUTH, 1
-	warp_event 5, 3, ROCK_TUNNEL_B1F, 3
-	warp_event 15, 9, ROCK_TUNNEL_B1F, 2
-	warp_event 27, 3, ROCK_TUNNEL_B1F, 4
+	warp_event  5,  3, ROCK_TUNNEL_B1F, 3
+	warp_event 15,  9, ROCK_TUNNEL_B1F, 2
+	warp_event 27,  3, ROCK_TUNNEL_B1F, 4
 	warp_event 27, 13, ROCK_TUNNEL_B1F, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 24, 4, BGEVENT_ITEM, RockTunnel1FHiddenXAccuracy
+	bg_event 24,  4, BGEVENT_ITEM, RockTunnel1FHiddenXAccuracy
 	bg_event 21, 15, BGEVENT_ITEM, RockTunnel1FHiddenXDefend
 
 	db 2 ; object events
-	object_event 4, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER
+	object_event  4, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER
 	object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING
diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm
index ece139cbf..82cea7924 100644
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -24,17 +24,17 @@ RockTunnelB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 3, 3, ROCK_TUNNEL_1F, 6
-	warp_event 17, 9, ROCK_TUNNEL_1F, 4
-	warp_event 23, 3, ROCK_TUNNEL_1F, 3
+	warp_event  3,  3, ROCK_TUNNEL_1F, 6
+	warp_event 17,  9, ROCK_TUNNEL_1F, 4
+	warp_event 23,  3, ROCK_TUNNEL_1F, 3
 	warp_event 25, 23, ROCK_TUNNEL_1F, 5
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 4, 14, BGEVENT_ITEM, RockTunnelB1FHiddenMaxPotion
+	bg_event  4, 14, BGEVENT_ITEM, RockTunnelB1FHiddenMaxPotion
 
 	db 3 ; object events
-	object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON
-	object_event 6, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP
-	object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE
+	object_event  7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON
+	object_event  6, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP
+	object_event 15,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE
diff --git a/maps/Route1.asm b/maps/Route1.asm
index d3d48d91e..6fd57c25a 100644
--- a/maps/Route1.asm
+++ b/maps/Route1.asm
@@ -86,9 +86,9 @@ Route1_MapEvents:
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 7, 27, BGEVENT_READ, Route1Sign
+	bg_event  7, 27, BGEVENT_READ, Route1Sign
 
 	db 3 ; object events
-	object_event 4, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1
-	object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1
-	object_event 3, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1
+	object_event  4, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1
+	object_event  9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1
+	object_event  3,  7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1
diff --git a/maps/Route10North.asm b/maps/Route10North.asm
index 954aeaac9..e04d646b7 100644
--- a/maps/Route10North.asm
+++ b/maps/Route10North.asm
@@ -17,13 +17,13 @@ Route10North_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 11, 1, ROUTE_10_POKECENTER_1F, 1
-	warp_event 3, 9, POWER_PLANT, 1
+	warp_event 11,  1, ROUTE_10_POKECENTER_1F, 1
+	warp_event  3,  9, POWER_PLANT, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 5, 11, BGEVENT_READ, PowerPlantSign
-	bg_event 12, 1, BGEVENT_READ, Route10PokecenterSign
+	bg_event  5, 11, BGEVENT_READ, PowerPlantSign
+	bg_event 12,  1, BGEVENT_READ, Route10PokecenterSign
 
 	db 0 ; object events
diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm
index dc744312c..ecd56522d 100644
--- a/maps/Route10Pokecenter1F.asm
+++ b/maps/Route10Pokecenter1F.asm
@@ -82,16 +82,16 @@ Route10Pokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, ROUTE_10_NORTH, 1
-	warp_event 4, 7, ROUTE_10_NORTH, 1
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, ROUTE_10_NORTH, 1
+	warp_event  4,  7, ROUTE_10_NORTH, 1
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1
-	object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1
-	object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1
-	object_event 1, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FCooltrainerFScript, -1
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1
+	object_event  7,  6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1
+	object_event  7,  2, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1
+	object_event  1,  3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FCooltrainerFScript, -1
diff --git a/maps/Route10Pokecenter2FBeta.asm b/maps/Route10Pokecenter2FBeta.asm
index ab9c80bb0..86927bb5a 100644
--- a/maps/Route10Pokecenter2FBeta.asm
+++ b/maps/Route10Pokecenter2FBeta.asm
@@ -7,7 +7,7 @@ Route10Pokecenter2FBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 0, 7, ROUTE_10_POKECENTER_1F, 3
+	warp_event  0,  7, ROUTE_10_POKECENTER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/Route10South.asm b/maps/Route10South.asm
index 50c15c257..b48f97b4f 100644
--- a/maps/Route10South.asm
+++ b/maps/Route10South.asm
@@ -77,13 +77,13 @@ Route10South_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 6, 1, ROCK_TUNNEL_1F, 2
+	warp_event  6,  1, ROCK_TUNNEL_1F, 2
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 5, 3, BGEVENT_READ, Route10Sign
+	bg_event  5,  3, BGEVENT_READ, Route10Sign
 
 	db 2 ; object events
-	object_event 17, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerJim, -1
-	object_event 8, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmRobert, -1
+	object_event 17,  3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerJim, -1
+	object_event  8, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmRobert, -1
diff --git a/maps/Route11.asm b/maps/Route11.asm
index 9cb88e091..cc93f5d8f 100644
--- a/maps/Route11.asm
+++ b/maps/Route11.asm
@@ -151,12 +151,12 @@ Route11_MapEvents:
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 3, 7, BGEVENT_READ, Route11Sign
-	bg_event 32, 5, BGEVENT_ITEM, Route11HiddenRevive
+	bg_event  3,  7, BGEVENT_READ, Route11Sign
+	bg_event 32,  5, BGEVENT_ITEM, Route11HiddenRevive
 
 	db 5 ; object events
 	object_event 22, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterOwen, -1
-	object_event 20, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1
-	object_event 28, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1
-	object_event 8, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFidel, -1
-	object_event 32, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1
+	object_event 20,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1
+	object_event 28,  7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1
+	object_event  8,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFidel, -1
+	object_event 32,  2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1
diff --git a/maps/Route12.asm b/maps/Route12.asm
index 40bed0b3a..ab468f2e2 100644
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -174,13 +174,13 @@ Route12_MapEvents:
 
 	db 3 ; bg events
 	bg_event 11, 27, BGEVENT_READ, Route12Sign
-	bg_event 13, 9, BGEVENT_READ, FishingSpotSign
+	bg_event 13,  9, BGEVENT_READ, FishingSpotSign
 	bg_event 14, 13, BGEVENT_ITEM, Route12HiddenElixer
 
 	db 6 ; object events
-	object_event 5, 13, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherMartin, -1
+	object_event  5, 13, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherMartin, -1
 	object_event 14, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherStephen, -1
 	object_event 10, 38, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerFisherBarney, -1
-	object_event 6, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherKyle, -1
-	object_event 5, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Calcium, EVENT_ROUTE_12_CALCIUM
-	object_event 5, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET
+	object_event  6,  7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherKyle, -1
+	object_event  5, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Calcium, EVENT_ROUTE_12_CALCIUM
+	object_event  5, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET
diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm
index 36fefbcd1..fe1161bd4 100644
--- a/maps/Route12SuperRodHouse.asm
+++ b/maps/Route12SuperRodHouse.asm
@@ -81,12 +81,12 @@ Route12SuperRodHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, ROUTE_12, 1
-	warp_event 3, 7, ROUTE_12, 1
+	warp_event  2,  7, ROUTE_12, 1
+	warp_event  3,  7, ROUTE_12, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x7f484, -1
+	object_event  5,  3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x7f484, -1
diff --git a/maps/Route13.asm b/maps/Route13.asm
index 3f466b04e..164cfaaf3 100644
--- a/maps/Route13.asm
+++ b/maps/Route13.asm
@@ -203,8 +203,8 @@ Route13_MapEvents:
 	bg_event 30, 13, BGEVENT_ITEM, Route13HiddenCalcium
 
 	db 5 ; object events
-	object_event 42, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperPerry, -1
-	object_event 43, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperBret, -1
-	object_event 32, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1
+	object_event 42,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperPerry, -1
+	object_event 43,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperBret, -1
+	object_event 32,  8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1
 	object_event 14, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerHikerKenny, -1
-	object_event 25, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmAlex, -1
+	object_event 25,  6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmAlex, -1
diff --git a/maps/Route14.asm b/maps/Route14.asm
index 6d04456b0..1a7670279 100644
--- a/maps/Route14.asm
+++ b/maps/Route14.asm
@@ -125,5 +125,5 @@ Route14_MapEvents:
 	db 4 ; object events
 	object_event 11, 15, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmCarter, -1
 	object_event 11, 27, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRoy, -1
-	object_event 6, 11, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1
-	object_event 7, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 4, Kim, -1
+	object_event  6, 11, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1
+	object_event  7,  5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 4, Kim, -1
diff --git a/maps/Route15.asm b/maps/Route15.asm
index b539866d1..32db439ea 100644
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -203,13 +203,13 @@ Route15_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 4, ROUTE_15_FUCHSIA_GATE, 3
-	warp_event 2, 5, ROUTE_15_FUCHSIA_GATE, 4
+	warp_event  2,  4, ROUTE_15_FUCHSIA_GATE, 3
+	warp_event  2,  5, ROUTE_15_FUCHSIA_GATE, 4
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 19, 9, BGEVENT_READ, Route15Sign
+	bg_event 19,  9, BGEVENT_READ, Route15Sign
 
 	db 7 ; object events
 	object_event 10, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyKipp, -1
@@ -218,4 +218,4 @@ Route15_MapEvents:
 	object_event 27, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyBilly, -1
 	object_event 30, 12, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerTeacherColette, -1
 	object_event 20, 10, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherHillary, -1
-	object_event 12, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP
+	object_event 12,  5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP
diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm
index 73f40d679..002b31348 100644
--- a/maps/Route15FuchsiaGate.asm
+++ b/maps/Route15FuchsiaGate.asm
@@ -21,14 +21,14 @@ Route15FuchsiaGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, FUCHSIA_CITY, 8
-	warp_event 0, 5, FUCHSIA_CITY, 9
-	warp_event 9, 4, ROUTE_15, 1
-	warp_event 9, 5, ROUTE_15, 2
+	warp_event  0,  4, FUCHSIA_CITY, 8
+	warp_event  0,  5, FUCHSIA_CITY, 9
+	warp_event  9,  4, ROUTE_15, 1
+	warp_event  9,  5, ROUTE_15, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1
diff --git a/maps/Route16.asm b/maps/Route16.asm
index 760037f92..40bbbd4e8 100644
--- a/maps/Route16.asm
+++ b/maps/Route16.asm
@@ -30,15 +30,15 @@ Route16_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 3, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE, 1
-	warp_event 14, 6, ROUTE_16_GATE, 3
-	warp_event 14, 7, ROUTE_16_GATE, 4
-	warp_event 9, 6, ROUTE_16_GATE, 1
-	warp_event 9, 7, ROUTE_16_GATE, 2
+	warp_event  3,  1, ROUTE_16_FUCHSIA_SPEECH_HOUSE, 1
+	warp_event 14,  6, ROUTE_16_GATE, 3
+	warp_event 14,  7, ROUTE_16_GATE, 4
+	warp_event  9,  6, ROUTE_16_GATE, 1
+	warp_event  9,  7, ROUTE_16_GATE, 2
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 5, 5, BGEVENT_READ, CyclingRoadSign
+	bg_event  5,  5, BGEVENT_READ, CyclingRoadSign
 
 	db 0 ; object events
diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm
index 1adf4e433..53af80d35 100644
--- a/maps/Route16FuchsiaSpeechHouse.asm
+++ b/maps/Route16FuchsiaSpeechHouse.asm
@@ -24,14 +24,14 @@ Route16FuchsiaSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, ROUTE_16, 1
-	warp_event 3, 7, ROUTE_16, 1
+	warp_event  2,  7, ROUTE_16, 1
+	warp_event  3,  7, ROUTE_16, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf
 
 	db 1 ; object events
-	object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1
+	object_event  2,  3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1
diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm
index f31841a1d..90826b4c9 100644
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -62,16 +62,16 @@ Route16Gate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, ROUTE_16, 4
-	warp_event 0, 5, ROUTE_16, 5
-	warp_event 9, 4, ROUTE_16, 2
-	warp_event 9, 5, ROUTE_16, 3
+	warp_event  0,  4, ROUTE_16, 4
+	warp_event  0,  5, ROUTE_16, 5
+	warp_event  9,  4, ROUTE_16, 2
+	warp_event  9,  5, ROUTE_16, 3
 
 	db 2 ; coord events
-	coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x733ed
-	coord_event 5, 5, SCENE_DEFAULT, UnknownScript_0x733ed
+	coord_event  5,  4, SCENE_DEFAULT, UnknownScript_0x733ed
+	coord_event  5,  5, SCENE_DEFAULT, UnknownScript_0x733ed
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route16GateOfficerScript, -1
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route16GateOfficerScript, -1
diff --git a/maps/Route17.asm b/maps/Route17.asm
index 3f639d0ed..ee9a24e6a 100644
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -140,11 +140,11 @@ Route17_MapEvents:
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 9, 54, BGEVENT_ITEM, Route17HiddenMaxEther
-	bg_event 8, 77, BGEVENT_ITEM, Route17HiddenMaxElixer
+	bg_event  9, 54, BGEVENT_ITEM, Route17HiddenMaxEther
+	bg_event  8, 77, BGEVENT_ITEM, Route17HiddenMaxElixer
 
 	db 4 ; object events
-	object_event 4, 17, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerRiley, -1
-	object_event 9, 68, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBikerJoel, -1
-	object_event 3, 53, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBikerGlenn, -1
-	object_event 6, 80, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerCharles, -1
+	object_event  4, 17, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerRiley, -1
+	object_event  9, 68, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBikerJoel, -1
+	object_event  3, 53, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBikerGlenn, -1
+	object_event  6, 80, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerCharles, -1
diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm
index 41cee4f99..c61a83011 100644
--- a/maps/Route17Route18Gate.asm
+++ b/maps/Route17Route18Gate.asm
@@ -53,16 +53,16 @@ Route17Route18Gate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, ROUTE_17, 1
-	warp_event 0, 5, ROUTE_17, 2
-	warp_event 9, 4, ROUTE_18, 1
-	warp_event 9, 5, ROUTE_18, 2
+	warp_event  0,  4, ROUTE_17, 1
+	warp_event  0,  5, ROUTE_17, 2
+	warp_event  9,  4, ROUTE_18, 1
+	warp_event  9,  5, ROUTE_18, 2
 
 	db 2 ; coord events
-	coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x73611
-	coord_event 5, 5, SCENE_DEFAULT, UnknownScript_0x73611
+	coord_event  5,  4, SCENE_DEFAULT, UnknownScript_0x73611
+	coord_event  5,  5, SCENE_DEFAULT, UnknownScript_0x73611
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route17Route18GateOfficerScript, -1
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route17Route18GateOfficerScript, -1
diff --git a/maps/Route18.asm b/maps/Route18.asm
index 2b79ba05a..76c201e12 100644
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -79,14 +79,14 @@ Route18_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 6, ROUTE_17_ROUTE_18_GATE, 3
-	warp_event 2, 7, ROUTE_17_ROUTE_18_GATE, 4
+	warp_event  2,  6, ROUTE_17_ROUTE_18_GATE, 3
+	warp_event  2,  7, ROUTE_17_ROUTE_18_GATE, 4
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 9, 5, BGEVENT_READ, Route18Sign
+	bg_event  9,  5, BGEVENT_READ, Route18Sign
 
 	db 2 ; object events
-	object_event 9, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1
-	object_event 13, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1
+	object_event  9, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1
+	object_event 13,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1
diff --git a/maps/Route19.asm b/maps/Route19.asm
index a655879ac..dda8e549b 100644
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -236,18 +236,18 @@ Route19_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 7, 3, ROUTE_19_FUCHSIA_GATE, 3
+	warp_event  7,  3, ROUTE_19_FUCHSIA_GATE, 3
 
 	db 0 ; coord events
 
 	db 2 ; bg events
 	bg_event 11, 13, BGEVENT_READ, Route19Sign
-	bg_event 11, 1, BGEVENT_READ, CarefulSwimmingSign
+	bg_event 11,  1, BGEVENT_READ, CarefulSwimmingSign
 
 	db 6 ; object events
-	object_event 9, 23, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1
+	object_event  9, 23, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1
 	object_event 13, 28, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermHarold, -1
 	object_event 11, 17, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermJerome, -1
-	object_event 8, 23, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerSwimmermTucker, -1
-	object_event 9, 5, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea4d, -1
-	object_event 11, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea61, -1
+	object_event  8, 23, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerSwimmermTucker, -1
+	object_event  9,  5, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea4d, -1
+	object_event 11,  5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea61, -1
diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm
index 5592bb4bb..b8f3d02e0 100644
--- a/maps/Route19FuchsiaGate.asm
+++ b/maps/Route19FuchsiaGate.asm
@@ -47,14 +47,14 @@ Route19FuchsiaGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, FUCHSIA_CITY, 10
-	warp_event 5, 0, FUCHSIA_CITY, 11
-	warp_event 4, 7, ROUTE_19, 1
-	warp_event 5, 7, ROUTE_19, 1
+	warp_event  4,  0, FUCHSIA_CITY, 10
+	warp_event  5,  0, FUCHSIA_CITY, 11
+	warp_event  4,  7, ROUTE_19, 1
+	warp_event  5,  7, ROUTE_19, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1ab3f6, -1
+	object_event  0,  4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1ab3f6, -1
diff --git a/maps/Route2.asm b/maps/Route2.asm
index b58f330f6..9cf002f92 100644
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -152,24 +152,24 @@ Route2_MapEvents:
 	warp_event 15, 31, ROUTE_2_GATE, 3
 	warp_event 16, 27, ROUTE_2_GATE, 1
 	warp_event 17, 27, ROUTE_2_GATE, 2
-	warp_event 12, 7, DIGLETTS_CAVE, 3
+	warp_event 12,  7, DIGLETTS_CAVE, 3
 
 	db 0 ; coord events
 
 	db 6 ; bg events
-	bg_event 7, 51, BGEVENT_READ, Route2Sign
-	bg_event 11, 9, BGEVENT_READ, MapRoute2Signpost1Script
-	bg_event 7, 23, BGEVENT_ITEM, Route2HiddenMaxEther
-	bg_event 4, 14, BGEVENT_ITEM, Route2HiddenFullHeal
-	bg_event 4, 27, BGEVENT_ITEM, Route2HiddenFullRestore
+	bg_event  7, 51, BGEVENT_READ, Route2Sign
+	bg_event 11,  9, BGEVENT_READ, MapRoute2Signpost1Script
+	bg_event  7, 23, BGEVENT_ITEM, Route2HiddenMaxEther
+	bg_event  4, 14, BGEVENT_ITEM, Route2HiddenFullHeal
+	bg_event  4, 27, BGEVENT_ITEM, Route2HiddenFullRestore
 	bg_event 11, 30, BGEVENT_ITEM, Route2HiddenRevive
 
 	db 8 ; object events
 	object_event 10, 45, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherRob, -1
-	object_event 6, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1
-	object_event 0, 40, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1
-	object_event 0, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT
-	object_event 2, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION
-	object_event 19, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS
+	object_event  6,  4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1
+	object_event  0, 40, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1
+	object_event  0, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT
+	object_event  2, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION
+	object_event 19,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS
 	object_event 14, 50, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER
 	object_event 10, 14, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1
diff --git a/maps/Route20.asm b/maps/Route20.asm
index 61a758b84..8dd8a8a8c 100644
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -114,7 +114,7 @@ Route20_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 38, 7, SEAFOAM_GYM, 1
+	warp_event 38,  7, SEAFOAM_GYM, 1
 
 	db 0 ; coord events
 
@@ -122,6 +122,6 @@ Route20_MapEvents:
 	bg_event 37, 11, BGEVENT_READ, CinnabarGymSign
 
 	db 3 ; object events
-	object_event 52, 8, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1
+	object_event 52,  8, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1
 	object_event 45, 13, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfLori, -1
 	object_event 12, 13, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCameron, -1
diff --git a/maps/Route21.asm b/maps/Route21.asm
index 54612a7ef..a291752fc 100644
--- a/maps/Route21.asm
+++ b/maps/Route21.asm
@@ -98,5 +98,5 @@ Route21_MapEvents:
 
 	db 3 ; object events
 	object_event 11, 16, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNikki, -1
-	object_event 2, 30, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSeth, -1
+	object_event  2, 30, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSeth, -1
 	object_event 14, 22, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherArnold, -1
diff --git a/maps/Route22.asm b/maps/Route22.asm
index ec59e0c98..8402f5e4c 100644
--- a/maps/Route22.asm
+++ b/maps/Route22.asm
@@ -17,11 +17,11 @@ Route22_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 13, 5, VICTORY_ROAD_GATE, 1
+	warp_event 13,  5, VICTORY_ROAD_GATE, 1
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 15, 7, BGEVENT_READ, VictoryRoadEntranceSign
+	bg_event 15,  7, BGEVENT_READ, VictoryRoadEntranceSign
 
 	db 0 ; object events
diff --git a/maps/Route23.asm b/maps/Route23.asm
index 5bd9b809c..86e5935f3 100644
--- a/maps/Route23.asm
+++ b/maps/Route23.asm
@@ -24,14 +24,14 @@ Route23_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 9, 5, INDIGO_PLATEAU_POKECENTER_1F, 1
-	warp_event 10, 5, INDIGO_PLATEAU_POKECENTER_1F, 2
-	warp_event 9, 13, VICTORY_ROAD, 10
+	warp_event  9,  5, INDIGO_PLATEAU_POKECENTER_1F, 1
+	warp_event 10,  5, INDIGO_PLATEAU_POKECENTER_1F, 2
+	warp_event  9, 13, VICTORY_ROAD, 10
 	warp_event 10, 13, VICTORY_ROAD, 10
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 11, 7, BGEVENT_READ, IndigoPlateauSign
+	bg_event 11,  7, BGEVENT_READ, IndigoPlateauSign
 
 	db 0 ; object events
diff --git a/maps/Route24.asm b/maps/Route24.asm
index 173be8f99..042353bb6 100644
--- a/maps/Route24.asm
+++ b/maps/Route24.asm
@@ -126,4 +126,4 @@ Route24_MapEvents:
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 8, 7, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET
+	object_event  8,  7, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET
diff --git a/maps/Route25.asm b/maps/Route25.asm
index 78caeb418..bc907c9cd 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -431,25 +431,25 @@ Route25_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 47, 5, BILLS_HOUSE, 1
+	warp_event 47,  5, BILLS_HOUSE, 1
 
 	db 2 ; coord events
-	coord_event 42, 6, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate1Script
-	coord_event 42, 7, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate2Script
+	coord_event 42,  6, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate1Script
+	coord_event 42,  7, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate2Script
 
 	db 2 ; bg events
-	bg_event 45, 5, BGEVENT_READ, BillsHouseSign
-	bg_event 4, 5, BGEVENT_ITEM, Route25HiddenPotion
+	bg_event 45,  5, BGEVENT_READ, BillsHouseSign
+	bg_event  4,  5, BGEVENT_ITEM, Route25HiddenPotion
 
 	db 11 ; object events
-	object_event 46, 9, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
+	object_event 46,  9, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
 	object_event 46, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
-	object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1
+	object_event 12,  8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1
 	object_event 16, 11, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassEllen, -1
-	object_event 21, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyJoe, -1
-	object_event 22, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassLaura, -1
-	object_event 25, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperLloyd, -1
+	object_event 21,  8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyJoe, -1
+	object_event 22,  6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassLaura, -1
+	object_event 25,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperLloyd, -1
 	object_event 28, 11, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassShannon, -1
-	object_event 31, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerSupernerdPat, -1
-	object_event 37, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerCooltrainermKevin, -1
-	object_event 32, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN
+	object_event 31,  7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerSupernerdPat, -1
+	object_event 37,  8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerCooltrainermKevin, -1
+	object_event 32,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN
diff --git a/maps/Route26.asm b/maps/Route26.asm
index 05b20d057..1d79bc50a 100644
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -414,21 +414,21 @@ Route26_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 7, 5, VICTORY_ROAD_GATE, 3
+	warp_event  7,  5, VICTORY_ROAD_GATE, 3
 	warp_event 15, 57, ROUTE_26_HEAL_HOUSE, 1
-	warp_event 5, 71, DAY_OF_WEEK_SIBLINGS_HOUSE, 1
+	warp_event  5, 71, DAY_OF_WEEK_SIBLINGS_HOUSE, 1
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 8, 6, BGEVENT_READ, Route26Sign
+	bg_event  8,  6, BGEVENT_READ, Route26Sign
 
 	db 8 ; object events
 	object_event 14, 24, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermJake, -1
-	object_event 9, 38, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1
+	object_event  9, 38, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1
 	object_event 10, 56, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJoyce, -1
-	object_event 5, 8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfBeth1, -1
+	object_event  5,  8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfBeth1, -1
 	object_event 13, 79, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicRichard, -1
 	object_event 10, 92, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherScott, -1
 	object_event 14, 54, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a4ec2, -1
-	object_event 9, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER
+	object_event  9, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER
diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm
index 8a036b76a..536154500 100644
--- a/maps/Route26HealHouse.asm
+++ b/maps/Route26HealHouse.asm
@@ -50,14 +50,14 @@ Route26HealHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, ROUTE_26, 2
-	warp_event 3, 7, ROUTE_26, 2
+	warp_event  2,  7, ROUTE_26, 2
+	warp_event  3,  7, ROUTE_26, 2
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, Route26HealHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, Route26HealHouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, Route26HealHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, Route26HealHouseBookshelf
 
 	db 1 ; object events
-	object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1
+	object_event  2,  3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1
diff --git a/maps/Route27.asm b/maps/Route27.asm
index 9bdc741ee..9b53429c6 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -469,23 +469,23 @@ Route27_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 33, 7, ROUTE_27_SANDSTORM_HOUSE, 1
-	warp_event 26, 5, TOHJO_FALLS, 1
-	warp_event 36, 5, TOHJO_FALLS, 2
+	warp_event 33,  7, ROUTE_27_SANDSTORM_HOUSE, 1
+	warp_event 26,  5, TOHJO_FALLS, 1
+	warp_event 36,  5, TOHJO_FALLS, 2
 
 	db 2 ; coord events
 	coord_event 18, 10, SCENE_DEFAULT, UnknownScript_0x1a0873
 	coord_event 19, 10, SCENE_DEFAULT, UnknownScript_0x1a0881
 
 	db 1 ; bg events
-	bg_event 25, 7, BGEVENT_READ, TohjoFallsSign
+	bg_event 25,  7, BGEVENT_READ, TohjoFallsSign
 
 	db 9 ; object events
-	object_event 48, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1
-	object_event 58, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermBrian, -1
+	object_event 48,  7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1
+	object_event 58,  6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermBrian, -1
 	object_event 72, 10, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfReena, -1
-	object_event 37, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1
-	object_event 65, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicGilbert, -1
+	object_event 37,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1
+	object_event 65,  7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicGilbert, -1
 	object_event 58, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperJose2, -1
 	object_event 60, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM
 	object_event 53, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY
diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm
index 430a10d73..9396b42c5 100644
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -95,14 +95,14 @@ Route27SandstormHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, ROUTE_27, 1
-	warp_event 3, 7, ROUTE_27, 1
+	warp_event  2,  7, ROUTE_27, 1
+	warp_event  3,  7, ROUTE_27, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, SandstormHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, SandstormHouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, SandstormHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, SandstormHouseBookshelf
 
 	db 1 ; object events
-	object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SandstormHouseWoman, -1
+	object_event  2,  4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SandstormHouseWoman, -1
diff --git a/maps/Route28.asm b/maps/Route28.asm
index d36717833..af41de7c5 100644
--- a/maps/Route28.asm
+++ b/maps/Route28.asm
@@ -17,13 +17,13 @@ Route28_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 7, 3, ROUTE_28_STEEL_WING_HOUSE, 1
-	warp_event 33, 5, VICTORY_ROAD_GATE, 7
+	warp_event  7,  3, ROUTE_28_STEEL_WING_HOUSE, 1
+	warp_event 33,  5, VICTORY_ROAD_GATE, 7
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 31, 5, BGEVENT_READ, Route28Sign
-	bg_event 25, 2, BGEVENT_ITEM, Route28HiddenRareCandy
+	bg_event 31,  5, BGEVENT_READ, Route28Sign
+	bg_event 25,  2, BGEVENT_ITEM, Route28HiddenRareCandy
 
 	db 0 ; object events
diff --git a/maps/Route28SteelWingHouse.asm b/maps/Route28SteelWingHouse.asm
index 911c9cf9c..a62f94d52 100644
--- a/maps/Route28SteelWingHouse.asm
+++ b/maps/Route28SteelWingHouse.asm
@@ -72,15 +72,15 @@ Route28SteelWingHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, ROUTE_28, 1
-	warp_event 3, 7, ROUTE_28, 1
+	warp_event  2,  7, ROUTE_28, 1
+	warp_event  3,  7, ROUTE_28, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, CelebrityHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, CelebrityHouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, CelebrityHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, CelebrityHouseBookshelf
 
 	db 2 ; object events
-	object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Celebrity, -1
-	object_event 6, 5, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CelebritysFearow, -1
+	object_event  2,  3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Celebrity, -1
+	object_event  6,  5, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CelebritysFearow, -1
diff --git a/maps/Route29.asm b/maps/Route29.asm
index 5edbcf4c5..3059f8546 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -417,22 +417,22 @@ Route29_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 27, 1, ROUTE_29_ROUTE_46_GATE, 3
+	warp_event 27,  1, ROUTE_29_ROUTE_46_GATE, 3
 
 	db 2 ; coord events
-	coord_event 53, 8, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial1
-	coord_event 53, 9, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial2
+	coord_event 53,  8, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial1
+	coord_event 53,  9, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial2
 
 	db 2 ; bg events
-	bg_event 51, 7, BGEVENT_READ, Route29Sign1
-	bg_event 3, 5, BGEVENT_READ, Route29Sign2
+	bg_event 51,  7, BGEVENT_READ, Route29Sign1
+	bg_event  3,  5, BGEVENT_READ, Route29Sign2
 
 	db 8 ; object events
 	object_event 50, 12, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CatchingTutorialDudeScript, -1
 	object_event 27, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29YoungsterScript, -1
 	object_event 15, 11, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29TeacherScript, -1
-	object_event 12, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route29FruitTree, -1
-	object_event 25, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route29FisherScript, -1
-	object_event 13, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1
+	object_event 12,  2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route29FruitTree, -1
+	object_event 25,  3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route29FisherScript, -1
+	object_event 13,  4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1
 	object_event 29, 12, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY
-	object_event 48, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION
+	object_event 48,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION
diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm
index 285fa836d..f575df1ca 100644
--- a/maps/Route29Route46Gate.asm
+++ b/maps/Route29Route46Gate.asm
@@ -38,15 +38,15 @@ Route29Route46Gate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, ROUTE_46, 1
-	warp_event 5, 0, ROUTE_46, 2
-	warp_event 4, 7, ROUTE_29, 1
-	warp_event 5, 7, ROUTE_29, 1
+	warp_event  4,  0, ROUTE_46, 1
+	warp_event  5,  0, ROUTE_46, 2
+	warp_event  4,  7, ROUTE_29, 1
+	warp_event  5,  7, ROUTE_29, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route29Route46GateOfficerScript, -1
-	object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29Route46GateYoungsterScript, -1
+	object_event  0,  4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route29Route46GateOfficerScript, -1
+	object_event  6,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29Route46GateYoungsterScript, -1
diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm
index 7a31fc70b..1b665799f 100644
--- a/maps/Route2Gate.asm
+++ b/maps/Route2Gate.asm
@@ -27,14 +27,14 @@ Route2Gate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, ROUTE_2, 3
-	warp_event 5, 0, ROUTE_2, 4
-	warp_event 4, 7, ROUTE_2, 2
-	warp_event 5, 7, ROUTE_2, 2
+	warp_event  4,  0, ROUTE_2, 3
+	warp_event  5,  0, ROUTE_2, 4
+	warp_event  4,  7, ROUTE_2, 2
+	warp_event  5,  7, ROUTE_2, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 6, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2GateScientistScript, -1
+	object_event  6,  4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2GateScientistScript, -1
diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm
index ca5059de9..a8a560b79 100644
--- a/maps/Route2NuggetHouse.asm
+++ b/maps/Route2NuggetHouse.asm
@@ -54,12 +54,12 @@ Route2NuggetHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, ROUTE_2, 1
-	warp_event 3, 7, ROUTE_2, 1
+	warp_event  2,  7, ROUTE_2, 1
+	warp_event  3,  7, ROUTE_2, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x9b847, -1
+	object_event  2,  4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x9b847, -1
diff --git a/maps/Route3.asm b/maps/Route3.asm
index 9d15d96cc..a0631c58c 100644
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -134,7 +134,7 @@ Route3_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 52, 1, MOUNT_MOON, 1
+	warp_event 52,  1, MOUNT_MOON, 1
 
 	db 0 ; coord events
 
@@ -143,6 +143,6 @@ Route3_MapEvents:
 
 	db 4 ; object events
 	object_event 26, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1
-	object_event 10, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterWarren, -1
-	object_event 16, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1
-	object_event 49, 5, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerFirebreatherBurt, -1
+	object_event 10,  7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterWarren, -1
+	object_event 16,  3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1
+	object_event 49,  5, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerFirebreatherBurt, -1
diff --git a/maps/Route30.asm b/maps/Route30.asm
index 0ab3d9cf3..dde0384ea 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -408,27 +408,27 @@ Route30_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 7, 39, ROUTE_30_BERRY_HOUSE, 1
-	warp_event 17, 5, MR_POKEMONS_HOUSE, 1
+	warp_event  7, 39, ROUTE_30_BERRY_HOUSE, 1
+	warp_event 17,  5, MR_POKEMONS_HOUSE, 1
 
 	db 0 ; coord events
 
 	db 5 ; bg events
-	bg_event 9, 43, BGEVENT_READ, Route30Sign
+	bg_event  9, 43, BGEVENT_READ, Route30Sign
 	bg_event 13, 29, BGEVENT_READ, MrPokemonsHouseDirectionsSign
-	bg_event 15, 5, BGEVENT_READ, MrPokemonsHouseSign
-	bg_event 3, 21, BGEVENT_READ, Route30TrainerTips
-	bg_event 14, 9, BGEVENT_ITEM, Route30HiddenPotion
+	bg_event 15,  5, BGEVENT_READ, MrPokemonsHouseSign
+	bg_event  3, 21, BGEVENT_READ, Route30TrainerTips
+	bg_event 14,  9, BGEVENT_ITEM, Route30HiddenPotion
 
 	db 11 ; object events
-	object_event 5, 26, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE
-	object_event 2, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY
-	object_event 5, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1
-	object_event 1, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDon, -1
-	object_event 7, 30, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route30YoungsterScript, -1
-	object_event 5, 24, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
-	object_event 5, 25, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
-	object_event 5, 39, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree1, -1
-	object_event 11, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree2, -1
-	object_event 2, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30CooltrainerFScript, -1
-	object_event 8, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE
+	object_event  5, 26, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE
+	object_event  2, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY
+	object_event  5, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1
+	object_event  1,  7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDon, -1
+	object_event  7, 30, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route30YoungsterScript, -1
+	object_event  5, 24, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
+	object_event  5, 25, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
+	object_event  5, 39, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree1, -1
+	object_event 11,  5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree2, -1
+	object_event  2, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30CooltrainerFScript, -1
+	object_event  8, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE
diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm
index ede2fee7b..829ea271f 100644
--- a/maps/Route30BerryHouse.asm
+++ b/maps/Route30BerryHouse.asm
@@ -48,14 +48,14 @@ Route30BerryHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, ROUTE_30, 1
-	warp_event 3, 7, ROUTE_30, 1
+	warp_event  2,  7, ROUTE_30, 1
+	warp_event  3,  7, ROUTE_30, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, Route30BerryHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, Route30BerryHouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, Route30BerryHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, Route30BerryHouseBookshelf
 
 	db 1 ; object events
-	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1
+	object_event  2,  3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1
diff --git a/maps/Route31.asm b/maps/Route31.asm
index fc4c16fa2..e39dfb539 100644
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -419,21 +419,21 @@ Route31_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 4, 6, ROUTE_31_VIOLET_GATE, 3
-	warp_event 4, 7, ROUTE_31_VIOLET_GATE, 4
-	warp_event 34, 5, DARK_CAVE_VIOLET_ENTRANCE, 1
+	warp_event  4,  6, ROUTE_31_VIOLET_GATE, 3
+	warp_event  4,  7, ROUTE_31_VIOLET_GATE, 4
+	warp_event 34,  5, DARK_CAVE_VIOLET_ENTRANCE, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 7, 5, BGEVENT_READ, Route31Sign
-	bg_event 31, 5, BGEVENT_READ, DarkCaveSign
+	bg_event  7,  5, BGEVENT_READ, Route31Sign
+	bg_event 31,  5, BGEVENT_READ, DarkCaveSign
 
 	db 7 ; object events
-	object_event 17, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31MailRecipientScript, -1
-	object_event 9, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31YoungsterScript, -1
+	object_event 17,  7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31MailRecipientScript, -1
+	object_event  9,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31YoungsterScript, -1
 	object_event 21, 13, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherWade1, -1
-	object_event 33, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31CooltrainerMScript, -1
-	object_event 16, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31FruitTree, -1
-	object_event 29, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION
+	object_event 33,  8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31CooltrainerMScript, -1
+	object_event 16,  7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31FruitTree, -1
+	object_event 29,  5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION
 	object_event 19, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31PokeBall, EVENT_ROUTE_31_POKE_BALL
diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm
index f0acc8aa8..7e08b226c 100644
--- a/maps/Route31VioletGate.asm
+++ b/maps/Route31VioletGate.asm
@@ -29,15 +29,15 @@ Route31VioletGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, VIOLET_CITY, 8
-	warp_event 0, 5, VIOLET_CITY, 9
-	warp_event 9, 4, ROUTE_31, 1
-	warp_event 9, 5, ROUTE_31, 2
+	warp_event  0,  4, VIOLET_CITY, 8
+	warp_event  0,  5, VIOLET_CITY, 9
+	warp_event  9,  4, ROUTE_31, 1
+	warp_event  9,  5, ROUTE_31, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1
-	object_event 1, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1
+	object_event  1,  2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1
diff --git a/maps/Route32.asm b/maps/Route32.asm
index 78c5f16ce..0617ebfdd 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -931,34 +931,34 @@ Route32_MapEvents:
 
 	db 4 ; warp events
 	warp_event 11, 73, ROUTE_32_POKECENTER_1F, 1
-	warp_event 4, 2, ROUTE_32_RUINS_OF_ALPH_GATE, 3
-	warp_event 4, 3, ROUTE_32_RUINS_OF_ALPH_GATE, 4
-	warp_event 6, 79, UNION_CAVE_1F, 4
+	warp_event  4,  2, ROUTE_32_RUINS_OF_ALPH_GATE, 3
+	warp_event  4,  3, ROUTE_32_RUINS_OF_ALPH_GATE, 4
+	warp_event  6, 79, UNION_CAVE_1F, 4
 
 	db 2 ; coord events
-	coord_event 18, 8, SCENE_DEFAULT, Route32CooltrainerMStopsYouScene
-	coord_event 7, 71, SCENE_ROUTE32_OFFER_SLOWPOKETAIL, Route32WannaBuyASlowpokeTailScript
+	coord_event 18,  8, SCENE_DEFAULT, Route32CooltrainerMStopsYouScene
+	coord_event  7, 71, SCENE_ROUTE32_OFFER_SLOWPOKETAIL, Route32WannaBuyASlowpokeTailScript
 
 	db 6 ; bg events
-	bg_event 13, 5, BGEVENT_READ, Route32Sign
-	bg_event 9, 1, BGEVENT_READ, Route32RuinsSign
+	bg_event 13,  5, BGEVENT_READ, Route32Sign
+	bg_event  9,  1, BGEVENT_READ, Route32RuinsSign
 	bg_event 10, 84, BGEVENT_READ, Route32UnionCaveSign
 	bg_event 12, 73, BGEVENT_READ, Route32PokecenterSign
 	bg_event 12, 67, BGEVENT_ITEM, Route32HiddenGreatBall
 	bg_event 11, 40, BGEVENT_ITEM, Route32HiddenSuperPotion
 
 	db 14 ; object events
-	object_event 8, 49, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherJustin, -1
+	object_event  8, 49, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherJustin, -1
 	object_event 12, 56, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherRalph1, -1
-	object_event 6, 48, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherHenry, -1
+	object_event  6, 48, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherHenry, -1
 	object_event 12, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterAlbert, -1
-	object_event 4, 63, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterGordon, -1
-	object_event 3, 45, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperRoland, -1
+	object_event  4, 63, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterGordon, -1
+	object_event  3, 45, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperRoland, -1
 	object_event 10, 30, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerLiz1, -1
-	object_event 19, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1
+	object_event 19,  8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1
 	object_event 11, 82, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperPeter, -1
-	object_event 7, 70, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS
-	object_event 6, 53, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL
+	object_event  7, 70, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS
+	object_event  6, 53, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL
 	object_event 15, 13, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32RoarTMGuyScript, -1
 	object_event 12, 67, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY
-	object_event 3, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL
+	object_event  3, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL
diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm
index 0127ebe72..7d4571668 100644
--- a/maps/Route32Pokecenter1F.asm
+++ b/maps/Route32Pokecenter1F.asm
@@ -96,15 +96,15 @@ Route32Pokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, ROUTE_32, 1
-	warp_event 4, 7, ROUTE_32, 1
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, ROUTE_32, 1
+	warp_event  4,  7, ROUTE_32, 1
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x69b52, -1
-	object_event 1, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1
-	object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x69b52, -1
+	object_event  1,  4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1
+	object_event  6,  2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1
diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm
index 8481351b4..3329d54f5 100644
--- a/maps/Route32RuinsOfAlphGate.asm
+++ b/maps/Route32RuinsOfAlphGate.asm
@@ -48,16 +48,16 @@ Route32RuinsOfAlphGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, RUINS_OF_ALPH_OUTSIDE, 10
-	warp_event 0, 5, RUINS_OF_ALPH_OUTSIDE, 11
-	warp_event 9, 4, ROUTE_32, 2
-	warp_event 9, 5, ROUTE_32, 3
+	warp_event  0,  4, RUINS_OF_ALPH_OUTSIDE, 10
+	warp_event  0,  5, RUINS_OF_ALPH_OUTSIDE, 11
+	warp_event  9,  4, ROUTE_32, 2
+	warp_event  9,  5, ROUTE_32, 3
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1
-	object_event 8, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1
-	object_event 1, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1
+	object_event  8,  2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1
+	object_event  1,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1
diff --git a/maps/Route33.asm b/maps/Route33.asm
index dad0a0571..f5b877d24 100644
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -196,7 +196,7 @@ Route33_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 11, 9, UNION_CAVE_1F, 3
+	warp_event 11,  9, UNION_CAVE_1F, 3
 
 	db 0 ; coord events
 
@@ -204,6 +204,6 @@ Route33_MapEvents:
 	bg_event 11, 11, BGEVENT_READ, Route33Sign
 
 	db 3 ; object events
-	object_event 6, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1
+	object_event  6, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1
 	object_event 13, 16, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route33LassScript, -1
 	object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTreeScript, -1
diff --git a/maps/Route34.asm b/maps/Route34.asm
index 3a2832cb9..29a48e21e 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -771,23 +771,23 @@ Route34_MapEvents:
 	db 0 ; coord events
 
 	db 5 ; bg events
-	bg_event 12, 6, BGEVENT_READ, Route34Sign
+	bg_event 12,  6, BGEVENT_READ, Route34Sign
 	bg_event 13, 33, BGEVENT_READ, Route34TrainerTips
 	bg_event 10, 13, BGEVENT_READ, DayCareSign
-	bg_event 8, 32, BGEVENT_ITEM, Route34HiddenRareCandy
+	bg_event  8, 32, BGEVENT_ITEM, Route34HiddenRareCandy
 	bg_event 17, 19, BGEVENT_ITEM, Route34HiddenSuperPotion
 
 	db 13 ; object events
-	object_event 13, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperTodd1, -1
+	object_event 13,  7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperTodd1, -1
 	object_event 15, 32, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterSamuel, -1
 	object_event 11, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterIan, -1
 	object_event 10, 26, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerGina1, -1
-	object_event 9, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerKeithScript, -1
+	object_event  9, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerKeithScript, -1
 	object_event 18, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmBrandon, -1
 	object_event 15, 16, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Outside, EVENT_DAY_CARE_MAN_ON_ROUTE_34
 	object_event 14, 18, SPRITE_DAY_CARE_MON_1, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareMon1Script, EVENT_DAY_CARE_MON_1
 	object_event 17, 19, SPRITE_DAY_CARE_MON_2, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareMon2Script, EVENT_DAY_CARE_MON_2
 	object_event 11, 48, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfIrene, -1
-	object_event 3, 48, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1
-	object_event 6, 51, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1
-	object_event 7, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET
+	object_event  3, 48, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1
+	object_event  6, 51, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1
+	object_event  7, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET
diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
index 8472ee54b..73a1dec20 100644
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -137,18 +137,18 @@ Route34IlexForestGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, ROUTE_34, 1
-	warp_event 5, 0, ROUTE_34, 2
-	warp_event 4, 7, ILEX_FOREST, 1
-	warp_event 5, 7, ILEX_FOREST, 1
+	warp_event  4,  0, ROUTE_34, 1
+	warp_event  5,  0, ROUTE_34, 2
+	warp_event  4,  7, ILEX_FOREST, 1
+	warp_event  5,  7, ILEX_FOREST, 1
 
 	db 1 ; coord events
-	coord_event 4, 7, 0, UnknownScript_0x62d3d
+	coord_event  4,  7, 0, UnknownScript_0x62d3d
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 9, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER
-	object_event 9, 4, SPRITE_BUTTERFREE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexGateButterfree, -1
-	object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
-	object_event 5, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY
+	object_event  9,  3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER
+	object_event  9,  4, SPRITE_BUTTERFREE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexGateButterfree, -1
+	object_event  3,  4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
+	object_event  5,  7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY
diff --git a/maps/Route35.asm b/maps/Route35.asm
index cd3483e12..86ddb2756 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -464,25 +464,25 @@ Route35_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 9, 33, ROUTE_35_GOLDENROD_GATE, 1
+	warp_event  9, 33, ROUTE_35_GOLDENROD_GATE, 1
 	warp_event 10, 33, ROUTE_35_GOLDENROD_GATE, 2
-	warp_event 3, 5, ROUTE_35_NATIONAL_PARK_GATE, 3
+	warp_event  3,  5, ROUTE_35_NATIONAL_PARK_GATE, 3
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 1, 7, BGEVENT_READ, Route35Sign
+	bg_event  1,  7, BGEVENT_READ, Route35Sign
 	bg_event 11, 31, BGEVENT_READ, Route35Sign
 
 	db 11 ; object events
-	object_event 4, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperIvan, -1
-	object_event 8, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperElliot, -1
-	object_event 7, 20, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1
+	object_event  4, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperIvan, -1
+	object_event  8, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperElliot, -1
+	object_event  7, 20, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1
 	object_event 10, 26, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerKim, -1
 	object_event 14, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerBirdKeeperBryan, -1
-	object_event 2, 10, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1
-	object_event 16, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherArnie, -1
-	object_event 5, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerJugglerIrwin, -1
-	object_event 5, 6, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TrainerOfficerDirk, -1
-	object_event 2, 25, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1
+	object_event  2, 10, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1
+	object_event 16,  7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherArnie, -1
+	object_event  5, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerJugglerIrwin, -1
+	object_event  5,  6, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TrainerOfficerDirk, -1
+	object_event  2, 25, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1
 	object_event 13, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT
diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm
index 46a2bd9f4..b1adedc86 100644
--- a/maps/Route35GoldenrodGate.asm
+++ b/maps/Route35GoldenrodGate.asm
@@ -197,16 +197,16 @@ Route35GoldenrodGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, ROUTE_35, 1
-	warp_event 5, 0, ROUTE_35, 2
-	warp_event 4, 7, GOLDENROD_CITY, 12
-	warp_event 5, 7, GOLDENROD_CITY, 12
+	warp_event  4,  0, ROUTE_35, 1
+	warp_event  5,  0, ROUTE_35, 2
+	warp_event  4,  7, GOLDENROD_CITY, 12
+	warp_event  5,  7, GOLDENROD_CITY, 12
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1
-	object_event 6, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1
-	object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1
+	object_event  0,  4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1
+	object_event  6,  4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1
+	object_event  3,  2, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index 274ae9414..b7b564de4 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -439,17 +439,17 @@ Route35NationalParkGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 3, 0, NATIONAL_PARK, 3
-	warp_event 4, 0, NATIONAL_PARK, 4
-	warp_event 3, 7, ROUTE_35, 3
-	warp_event 4, 7, ROUTE_35, 3
+	warp_event  3,  0, NATIONAL_PARK, 3
+	warp_event  4,  0, NATIONAL_PARK, 4
+	warp_event  3,  7, ROUTE_35, 3
+	warp_event  4,  7, ROUTE_35, 3
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 5, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script
+	bg_event  5,  0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script
 
 	db 3 ; object events
-	object_event 2, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
-	object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER
-	object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
+	object_event  2,  1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
+	object_event  6,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER
+	object_event  0,  3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
diff --git a/maps/Route36.asm b/maps/Route36.asm
index 478a8bdff..00729cb16 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -661,28 +661,28 @@ Route36_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 18, 8, ROUTE_36_NATIONAL_PARK_GATE, 3
-	warp_event 18, 9, ROUTE_36_NATIONAL_PARK_GATE, 4
+	warp_event 18,  8, ROUTE_36_NATIONAL_PARK_GATE, 3
+	warp_event 18,  9, ROUTE_36_NATIONAL_PARK_GATE, 4
 	warp_event 47, 13, ROUTE_36_RUINS_OF_ALPH_GATE, 1
 	warp_event 48, 13, ROUTE_36_RUINS_OF_ALPH_GATE, 2
 
 	db 2 ; coord events
-	coord_event 20, 7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript
-	coord_event 22, 7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript
+	coord_event 20,  7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript
+	coord_event 22,  7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript
 
 	db 4 ; bg events
-	bg_event 29, 1, BGEVENT_READ, Route36TrainerTips2
+	bg_event 29,  1, BGEVENT_READ, Route36TrainerTips2
 	bg_event 45, 11, BGEVENT_READ, RuinsOfAlphNorthSign
-	bg_event 55, 7, BGEVENT_READ, Route36Sign
-	bg_event 21, 7, BGEVENT_READ, Route36TrainerTips1
+	bg_event 55,  7, BGEVENT_READ, Route36Sign
+	bg_event 21,  7, BGEVENT_READ, Route36TrainerTips1
 
 	db 9 ; object events
 	object_event 20, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicMark, -1
 	object_event 31, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1
-	object_event 35, 9, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO
-	object_event 51, 8, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1940e0, -1
-	object_event 44, 9, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1
-	object_event 21, 4, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36FruitTree, -1
-	object_event 46, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY
+	object_event 35,  9, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO
+	object_event 51,  8, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1940e0, -1
+	object_event 44,  9, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1
+	object_event 21,  4, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36FruitTree, -1
+	object_event 46,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY
 	object_event 33, 12, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route36FloriaScript, EVENT_FLORIA_AT_SUDOWOODO
-	object_event 21, 6, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36
+	object_event 21,  6, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index 062e088b4..616e6e03b 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -851,26 +851,26 @@ Route36NationalParkGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, NATIONAL_PARK, 1
-	warp_event 0, 5, NATIONAL_PARK, 2
-	warp_event 9, 4, ROUTE_36, 1
-	warp_event 9, 5, ROUTE_36, 2
+	warp_event  0,  4, NATIONAL_PARK, 1
+	warp_event  0,  5, NATIONAL_PARK, 2
+	warp_event  9,  4, ROUTE_36, 1
+	warp_event  9,  5, ROUTE_36, 2
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 6, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script
+	bg_event  6,  0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script
 
 	db 12 ; object events
-	object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
-	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B
-	object_event 4, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B
-	object_event 2, 6, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B
-	object_event 6, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B
-	object_event 2, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B
-	object_event 5, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B
-	object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B
-	object_event 4, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B
-	object_event 6, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B
-	object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B
-	object_event 3, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
+	object_event  0,  3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
+	object_event  2,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B
+	object_event  4,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B
+	object_event  2,  6, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B
+	object_event  6,  5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B
+	object_event  2,  7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B
+	object_event  5,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B
+	object_event  3,  6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B
+	object_event  4,  7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B
+	object_event  6,  7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B
+	object_event  6,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B
+	object_event  3,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm
index e06a71f41..ed894445d 100644
--- a/maps/Route36RuinsOfAlphGate.asm
+++ b/maps/Route36RuinsOfAlphGate.asm
@@ -36,15 +36,15 @@ Route36RuinsOfAlphGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, ROUTE_36, 3
-	warp_event 5, 0, ROUTE_36, 4
-	warp_event 4, 7, RUINS_OF_ALPH_OUTSIDE, 9
-	warp_event 5, 7, RUINS_OF_ALPH_OUTSIDE, 9
+	warp_event  4,  0, ROUTE_36, 3
+	warp_event  5,  0, ROUTE_36, 4
+	warp_event  4,  7, RUINS_OF_ALPH_OUTSIDE, 9
+	warp_event  5,  7, RUINS_OF_ALPH_OUTSIDE, 9
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateOfficerScript, -1
-	object_event 7, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateGrampsScript, -1
+	object_event  0,  4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateOfficerScript, -1
+	object_event  7,  5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateGrampsScript, -1
diff --git a/maps/Route37.asm b/maps/Route37.asm
index 7b0cdbe74..0e9532c67 100644
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -243,14 +243,14 @@ Route37_MapEvents:
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 5, 3, BGEVENT_READ, Route37Sign
-	bg_event 4, 2, BGEVENT_ITEM, Route37HiddenEther
+	bg_event  5,  3, BGEVENT_READ, Route37Sign
+	bg_event  4,  2, BGEVENT_ITEM, Route37HiddenEther
 
 	db 7 ; object events
-	object_event 6, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1
-	object_event 7, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1
-	object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicGreg, -1
-	object_event 13, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e09, -1
-	object_event 16, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY
-	object_event 16, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0b, -1
-	object_event 15, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0d, -1
+	object_event  6, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1
+	object_event  7, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1
+	object_event  6,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicGreg, -1
+	object_event 13,  5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e09, -1
+	object_event 16,  8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY
+	object_event 16,  5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0b, -1
+	object_event 15,  7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0d, -1
diff --git a/maps/Route38.asm b/maps/Route38.asm
index a18e69a6d..001cdbddf 100644
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -474,20 +474,20 @@ Route38_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 35, 8, ROUTE_38_ECRUTEAK_GATE, 1
-	warp_event 35, 9, ROUTE_38_ECRUTEAK_GATE, 2
+	warp_event 35,  8, ROUTE_38_ECRUTEAK_GATE, 1
+	warp_event 35,  9, ROUTE_38_ECRUTEAK_GATE, 2
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 33, 7, BGEVENT_READ, Route38Sign
-	bg_event 5, 13, BGEVENT_READ, Route38TrainerTips
+	bg_event 33,  7, BGEVENT_READ, Route38Sign
+	bg_event  5, 13, BGEVENT_READ, Route38TrainerTips
 
 	db 7 ; object events
-	object_event 4, 1, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1
-	object_event 15, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1
+	object_event  4,  1, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1
+	object_event 15,  3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1
 	object_event 12, 15, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBirdKeeperToby, -1
-	object_event 19, 9, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1
-	object_event 24, 5, SPRITE_SAILOR, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorHarry, -1
+	object_event 19,  9, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1
+	object_event 24,  5, SPRITE_SAILOR, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorHarry, -1
 	object_event 12, 10, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a1f33, -1
-	object_event 5, 8, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyOlivia, -1
+	object_event  5,  8, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyOlivia, -1
diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm
index 358bb0eae..2277c3a1d 100644
--- a/maps/Route38EcruteakGate.asm
+++ b/maps/Route38EcruteakGate.asm
@@ -26,14 +26,14 @@ Route38EcruteakGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, ROUTE_38, 1
-	warp_event 0, 5, ROUTE_38, 2
-	warp_event 9, 4, ECRUTEAK_CITY, 14
-	warp_event 9, 5, ECRUTEAK_CITY, 15
+	warp_event  0,  4, ROUTE_38, 1
+	warp_event  0,  5, ROUTE_38, 2
+	warp_event  9,  4, ECRUTEAK_CITY, 14
+	warp_event  9,  5, ECRUTEAK_CITY, 15
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route38EcruteakGateOfficerScript, -1
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route38EcruteakGateOfficerScript, -1
diff --git a/maps/Route39.asm b/maps/Route39.asm
index 8d27b9285..0b8134acf 100644
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -345,25 +345,25 @@ Route39_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 1, 3, ROUTE_39_BARN, 1
-	warp_event 5, 3, ROUTE_39_FARMHOUSE, 1
+	warp_event  1,  3, ROUTE_39_BARN, 1
+	warp_event  5,  3, ROUTE_39_FARMHOUSE, 1
 
 	db 0 ; coord events
 
 	db 4 ; bg events
-	bg_event 5, 31, BGEVENT_READ, Route39TrainerTips
-	bg_event 9, 5, BGEVENT_READ, MoomooFarmSign
-	bg_event 15, 7, BGEVENT_READ, Route39Sign
-	bg_event 5, 13, BGEVENT_ITEM, Route39HiddenNugget
+	bg_event  5, 31, BGEVENT_READ, Route39TrainerTips
+	bg_event  9,  5, BGEVENT_READ, MoomooFarmSign
+	bg_event 15,  7, BGEVENT_READ, Route39Sign
+	bg_event  5, 13, BGEVENT_ITEM, Route39HiddenNugget
 
 	db 10 ; object events
 	object_event 13, 29, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSailorEugene, -1
 	object_event 10, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmDerek, -1
 	object_event 11, 19, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanfRuth, -1
-	object_event 3, 12, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
-	object_event 6, 11, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
-	object_event 4, 15, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
-	object_event 8, 13, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
-	object_event 13, 7, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicNorman, -1
-	object_event 9, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1
-	object_event 4, 22, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerPokefanfJaime, -1
+	object_event  3, 12, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
+	object_event  6, 11, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
+	object_event  4, 15, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
+	object_event  8, 13, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
+	object_event 13,  7, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicNorman, -1
+	object_event  9,  3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1
+	object_event  4, 22, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerPokefanfJaime, -1
diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm
index e3359e1e4..3180fe903 100644
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -190,14 +190,14 @@ Route39Barn_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 7, ROUTE_39, 1
-	warp_event 4, 7, ROUTE_39, 1
+	warp_event  3,  7, ROUTE_39, 1
+	warp_event  4,  7, ROUTE_39, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 2, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc76, -1
-	object_event 4, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1
-	object_event 3, 3, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MooMoo, -1
+	object_event  2,  3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc76, -1
+	object_event  4,  3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1
+	object_event  3,  3, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MooMoo, -1
diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm
index a82f8a75c..ba8284d04 100644
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -194,15 +194,15 @@ Route39Farmhouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, ROUTE_39, 2
-	warp_event 3, 7, ROUTE_39, 2
+	warp_event  2,  7, ROUTE_39, 2
+	warp_event  3,  7, ROUTE_39, 2
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, FarmhouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, FarmhouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, FarmhouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, FarmhouseBookshelf
 
 	db 2 ; object events
-	object_event 3, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1
-	object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1
+	object_event  3,  2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1
+	object_event  5,  4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1
diff --git a/maps/Route4.asm b/maps/Route4.asm
index 3259ebce6..b0f2927c9 100644
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -122,16 +122,16 @@ Route4_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 2, 5, MOUNT_MOON, 2
+	warp_event  2,  5, MOUNT_MOON, 2
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 3, 7, BGEVENT_READ, MtMoonSquareSign
-	bg_event 10, 3, BGEVENT_ITEM, Route4HiddenUltraBall
+	bg_event  3,  7, BGEVENT_READ, MtMoonSquareSign
+	bg_event 10,  3, BGEVENT_ITEM, Route4HiddenUltraBall
 
 	db 4 ; object events
-	object_event 17, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1
-	object_event 9, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1
-	object_event 21, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1
-	object_event 26, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP
+	object_event 17,  9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1
+	object_event  9,  8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1
+	object_event 21,  6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1
+	object_event 26,  3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP
diff --git a/maps/Route40.asm b/maps/Route40.asm
index 2b7081ef3..e8b7d6946 100644
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -339,24 +339,24 @@ Route40_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 9, 5, ROUTE_40_BATTLE_TOWER_GATE, 1
+	warp_event  9,  5, ROUTE_40_BATTLE_TOWER_GATE, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
 	bg_event 14, 10, BGEVENT_READ, Route40Sign
-	bg_event 7, 8, BGEVENT_ITEM, Route40HiddenHyperPotion
+	bg_event  7,  8, BGEVENT_ITEM, Route40HiddenHyperPotion
 
 	db 12 ; object events
 	object_event 14, 15, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSimon, -1
 	object_event 18, 30, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerSwimmermRandall, -1
-	object_event 3, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1
+	object_event  3, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1
 	object_event 10, 25, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfPaula, -1
-	object_event 7, 11, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
-	object_event 6, 9, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
-	object_event 7, 8, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
+	object_event  7, 11, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
+	object_event  6,  9, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
+	object_event  7,  8, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
 	object_event 11, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Lass1Script, -1
-	object_event 8, 10, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY
-	object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x1a61c7, -1
-	object_event 13, 4, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40Lass2Script, -1
-	object_event 16, 9, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
+	object_event  8, 10, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY
+	object_event  7,  6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x1a61c7, -1
+	object_event 13,  4, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40Lass2Script, -1
+	object_event 16,  9, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm
index 3bafbd21b..9678e9aa3 100644
--- a/maps/Route40BattleTowerGate.asm
+++ b/maps/Route40BattleTowerGate.asm
@@ -72,15 +72,15 @@ Route40BattleTowerGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 7, ROUTE_40, 1
-	warp_event 5, 7, ROUTE_40, 1
-	warp_event 4, 0, BATTLE_TOWER_OUTSIDE, 1
-	warp_event 5, 0, BATTLE_TOWER_OUTSIDE, 2
+	warp_event  4,  7, ROUTE_40, 1
+	warp_event  5,  7, ROUTE_40, 1
+	warp_event  4,  0, BATTLE_TOWER_OUTSIDE, 1
+	warp_event  5,  0, BATTLE_TOWER_OUTSIDE, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 3, 3, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
-	object_event 7, 5, SPRITE_TWIN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateTwinScript, -1
+	object_event  3,  3, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
+	object_event  7,  5, SPRITE_TWIN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateTwinScript, -1
diff --git a/maps/Route41.asm b/maps/Route41.asm
index 8fbfbce85..79d99d925 100644
--- a/maps/Route41.asm
+++ b/maps/Route41.asm
@@ -351,16 +351,16 @@ Route41_MapEvents:
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 9, 35, BGEVENT_ITEM, Route41HiddenMaxEther
+	bg_event  9, 35, BGEVENT_ITEM, Route41HiddenMaxEther
 
 	db 10 ; object events
-	object_event 32, 6, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1
-	object_event 46, 8, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1
+	object_event 32,  6, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1
+	object_event 46,  8, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1
 	object_event 20, 26, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermBerke, -1
 	object_event 32, 30, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermKirk, -1
 	object_event 19, 46, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermMathew, -1
-	object_event 17, 4, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfKaylee, -1
+	object_event 17,  4, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfKaylee, -1
 	object_event 23, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfSusie, -1
 	object_event 27, 34, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDenise, -1
 	object_event 44, 28, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfKara, -1
-	object_event 9, 50, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerSwimmerfWendy, -1
+	object_event  9, 50, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerSwimmerfWendy, -1
diff --git a/maps/Route42.asm b/maps/Route42.asm
index 20a4f856c..06e83b5c3 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -320,29 +320,29 @@ Route42_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 0, 8, ROUTE_42_ECRUTEAK_GATE, 3
-	warp_event 0, 9, ROUTE_42_ECRUTEAK_GATE, 4
-	warp_event 10, 5, MOUNT_MORTAR_1F_OUTSIDE, 1
-	warp_event 28, 9, MOUNT_MORTAR_1F_OUTSIDE, 2
-	warp_event 46, 7, MOUNT_MORTAR_1F_OUTSIDE, 3
+	warp_event  0,  8, ROUTE_42_ECRUTEAK_GATE, 3
+	warp_event  0,  9, ROUTE_42_ECRUTEAK_GATE, 4
+	warp_event 10,  5, MOUNT_MORTAR_1F_OUTSIDE, 1
+	warp_event 28,  9, MOUNT_MORTAR_1F_OUTSIDE, 2
+	warp_event 46,  7, MOUNT_MORTAR_1F_OUTSIDE, 3
 
 	db 1 ; coord events
 	coord_event 24, 14, SCENE_ROUTE42_SUICUNE, Route42SuicuneScript
 
 	db 5 ; bg events
-	bg_event 4, 10, BGEVENT_READ, Route42Sign1
-	bg_event 7, 5, BGEVENT_READ, MtMortarSign1
-	bg_event 45, 9, BGEVENT_READ, MtMortarSign2
-	bg_event 54, 8, BGEVENT_READ, Route42Sign2
+	bg_event  4, 10, BGEVENT_READ, Route42Sign1
+	bg_event  7,  5, BGEVENT_READ, MtMortarSign1
+	bg_event 45,  9, BGEVENT_READ, MtMortarSign2
+	bg_event 54,  8, BGEVENT_READ, Route42Sign2
 	bg_event 16, 11, BGEVENT_ITEM, Route42HiddenMaxPotion
 
 	db 9 ; object events
 	object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully, -1
-	object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1
-	object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1
+	object_event 51,  9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1
+	object_event 47,  8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1
 	object_event 27, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1
 	object_event 28, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1
 	object_event 29, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1
-	object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL
-	object_event 33, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION
+	object_event  6,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL
+	object_event 33,  8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION
 	object_event 26, 16, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42
diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm
index 89ef5cd1a..c6f702452 100644
--- a/maps/Route42EcruteakGate.asm
+++ b/maps/Route42EcruteakGate.asm
@@ -21,14 +21,14 @@ Route42EcruteakGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, ECRUTEAK_CITY, 1
-	warp_event 0, 5, ECRUTEAK_CITY, 2
-	warp_event 9, 4, ROUTE_42, 1
-	warp_event 9, 5, ROUTE_42, 2
+	warp_event  0,  4, ECRUTEAK_CITY, 1
+	warp_event  0,  5, ECRUTEAK_CITY, 2
+	warp_event  9,  4, ROUTE_42, 1
+	warp_event  9,  5, ROUTE_42, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route42EcruteakGateOfficerScript, -1
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route42EcruteakGateOfficerScript, -1
diff --git a/maps/Route43.asm b/maps/Route43.asm
index fa8067663..1eeda343a 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -502,7 +502,7 @@ Route43_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 9, 51, ROUTE_43_MAHOGANY_GATE, 1
+	warp_event  9, 51, ROUTE_43_MAHOGANY_GATE, 1
 	warp_event 10, 51, ROUTE_43_MAHOGANY_GATE, 2
 	warp_event 17, 35, ROUTE_43_GATE, 3
 	warp_event 17, 31, ROUTE_43_GATE, 1
@@ -511,16 +511,16 @@ Route43_MapEvents:
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event 13, 3, BGEVENT_READ, Route43Sign1
+	bg_event 13,  3, BGEVENT_READ, Route43Sign1
 	bg_event 11, 49, BGEVENT_READ, Route43Sign2
 	bg_event 16, 38, BGEVENT_READ, Route43TrainerTips
 
 	db 8 ; object events
-	object_event 13, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacBen, -1
+	object_event 13,  5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacBen, -1
 	object_event 13, 20, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacBrent, -1
-	object_event 14, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacRon, -1
-	object_event 4, 16, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerFisherMarvin, -1
-	object_event 9, 25, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTiffany, -1
+	object_event 14,  7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacRon, -1
+	object_event  4, 16, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerFisherMarvin, -1
+	object_event  9, 25, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTiffany, -1
 	object_event 13, 40, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperSpencer, -1
-	object_event 1, 26, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1
+	object_event  1, 26, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1
 	object_event 12, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index a9c1affe5..d0e6ee201 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -249,16 +249,16 @@ Route43Gate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, ROUTE_43, 4
-	warp_event 5, 0, ROUTE_43, 5
-	warp_event 4, 7, ROUTE_43, 3
-	warp_event 5, 7, ROUTE_43, 3
+	warp_event  4,  0, ROUTE_43, 4
+	warp_event  5,  0, ROUTE_43, 5
+	warp_event  4,  7, ROUTE_43, 3
+	warp_event  5,  7, ROUTE_43, 3
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS
-	object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS
-	object_event 7, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS
+	object_event  0,  4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS
+	object_event  2,  4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS
+	object_event  7,  4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS
diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm
index c5fbca190..6af688f1a 100644
--- a/maps/Route43MahoganyGate.asm
+++ b/maps/Route43MahoganyGate.asm
@@ -40,14 +40,14 @@ Route43MahoganyGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, ROUTE_43, 1
-	warp_event 5, 0, ROUTE_43, 2
-	warp_event 4, 7, MAHOGANY_TOWN, 5
-	warp_event 5, 7, MAHOGANY_TOWN, 5
+	warp_event  4,  0, ROUTE_43, 1
+	warp_event  5,  0, ROUTE_43, 2
+	warp_event  4,  7, MAHOGANY_TOWN, 5
+	warp_event  5,  7, MAHOGANY_TOWN, 5
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route43MahoganyGateOfficer, -1
+	object_event  0,  4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route43MahoganyGateOfficer, -1
diff --git a/maps/Route44.asm b/maps/Route44.asm
index aad425161..1719b8432 100644
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -508,24 +508,24 @@ Route44_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 56, 7, ICE_PATH_1F, 1
+	warp_event 56,  7, ICE_PATH_1F, 1
 
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event 53, 7, BGEVENT_READ, Route44Sign1
-	bg_event 6, 10, BGEVENT_READ, Route44Sign2
-	bg_event 32, 9, BGEVENT_ITEM, Route44HiddenElixer
+	bg_event 53,  7, BGEVENT_READ, Route44Sign1
+	bg_event  6, 10, BGEVENT_READ, Route44Sign2
+	bg_event 32,  9, BGEVENT_ITEM, Route44HiddenElixer
 
 	db 11 ; object events
-	object_event 35, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherWilton1, -1
+	object_event 35,  3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherWilton1, -1
 	object_event 19, 13, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherEdgar, -1
-	object_event 10, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicPhil, -1
-	object_event 43, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacZach, -1
-	object_event 51, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperVance1, -1
+	object_event 10,  9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicPhil, -1
+	object_event 43,  2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacZach, -1
+	object_event 51,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperVance1, -1
 	object_event 41, 15, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainermAllen, -1
 	object_event 31, 14, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfCybil, -1
-	object_event 9, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1
-	object_event 30, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE
-	object_event 45, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL
-	object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRepel, EVENT_ROUTE_44_MAX_REPEL
+	object_event  9,  5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1
+	object_event 30,  8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE
+	object_event 45,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL
+	object_event 14,  9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRepel, EVENT_ROUTE_44_MAX_REPEL
diff --git a/maps/Route45.asm b/maps/Route45.asm
index ddfaddd26..991181530 100644
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -533,25 +533,25 @@ Route45_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 2, 5, DARK_CAVE_BLACKTHORN_ENTRANCE, 1
+	warp_event  2,  5, DARK_CAVE_BLACKTHORN_ENTRANCE, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 10, 4, BGEVENT_READ, Route45Sign
+	bg_event 10,  4, BGEVENT_READ, Route45Sign
 	bg_event 13, 80, BGEVENT_ITEM, Route45HiddenPpUp
 
 	db 13 ; object events
 	object_event 10, 16, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerErik, -1
 	object_event 15, 65, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerMichael, -1
-	object_event 5, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerParry, -1
-	object_event 9, 65, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerTimothy, -1
+	object_event  5, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerParry, -1
+	object_event  9, 65, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerTimothy, -1
 	object_event 11, 50, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltKenji, -1
 	object_event 17, 18, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermRyan, -1
-	object_event 5, 36, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1
+	object_event  5, 36, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1
 	object_event 16, 82, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19e294, -1
-	object_event 6, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET
-	object_event 5, 66, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE
-	object_event 6, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER
-	object_event 7, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION
-	object_event 4, 70, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerCamperQuentin, -1
+	object_event  6, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET
+	object_event  5, 66, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE
+	object_event  6, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER
+	object_event  7, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION
+	object_event  4, 70, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerCamperQuentin, -1
diff --git a/maps/Route46.asm b/maps/Route46.asm
index 497c2654f..cdfb81234 100644
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -252,19 +252,19 @@ Route46_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 7, 33, ROUTE_29_ROUTE_46_GATE, 1
-	warp_event 8, 33, ROUTE_29_ROUTE_46_GATE, 2
-	warp_event 14, 5, DARK_CAVE_VIOLET_ENTRANCE, 3
+	warp_event  7, 33, ROUTE_29_ROUTE_46_GATE, 1
+	warp_event  8, 33, ROUTE_29_ROUTE_46_GATE, 2
+	warp_event 14,  5, DARK_CAVE_VIOLET_ENTRANCE, 3
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 9, 27, BGEVENT_READ, Route46Sign
+	bg_event  9, 27, BGEVENT_READ, Route46Sign
 
 	db 6 ; object events
 	object_event 12, 19, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerBailey, -1
-	object_event 4, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1
-	object_event 2, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1
-	object_event 7, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1
-	object_event 8, 6, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1
-	object_event 1, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED
+	object_event  4, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1
+	object_event  2, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1
+	object_event  7,  5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1
+	object_event  8,  6, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1
+	object_event  1, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED
diff --git a/maps/Route5.asm b/maps/Route5.asm
index fcb1d9988..103c17d56 100644
--- a/maps/Route5.asm
+++ b/maps/Route5.asm
@@ -42,8 +42,8 @@ Route5_MapEvents:
 
 	db 4 ; warp events
 	warp_event 17, 15, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 1
-	warp_event 8, 17, ROUTE_5_SAFFRON_GATE, 1
-	warp_event 9, 17, ROUTE_5_SAFFRON_GATE, 2
+	warp_event  8, 17, ROUTE_5_SAFFRON_GATE, 1
+	warp_event  9, 17, ROUTE_5_SAFFRON_GATE, 2
 	warp_event 10, 11, ROUTE_5_CLEANSE_TAG_HOUSE, 1
 
 	db 0 ; coord events
diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm
index a99de824f..4fc1d0446 100644
--- a/maps/Route5CleanseTagHouse.asm
+++ b/maps/Route5CleanseTagHouse.asm
@@ -62,15 +62,15 @@ Route5CleanseTagHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, ROUTE_5, 4
-	warp_event 3, 7, ROUTE_5, 4
+	warp_event  2,  7, ROUTE_5, 4
+	warp_event  3,  7, ROUTE_5, 4
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, HouseForSaleBookshelf
-	bg_event 1, 1, BGEVENT_READ, HouseForSaleBookshelf
+	bg_event  0,  1, BGEVENT_READ, HouseForSaleBookshelf
+	bg_event  1,  1, BGEVENT_READ, HouseForSaleBookshelf
 
 	db 2 ; object events
-	object_event 2, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseGrannyScript, -1
-	object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseTeacherScript, -1
+	object_event  2,  5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseGrannyScript, -1
+	object_event  5,  3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseTeacherScript, -1
diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm
index f6f5139db..3a0161af3 100644
--- a/maps/Route5SaffronGate.asm
+++ b/maps/Route5SaffronGate.asm
@@ -22,14 +22,14 @@ Route5SaffronGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, ROUTE_5, 2
-	warp_event 5, 0, ROUTE_5, 3
-	warp_event 4, 7, SAFFRON_CITY, 9
-	warp_event 5, 7, SAFFRON_CITY, 9
+	warp_event  4,  0, ROUTE_5, 2
+	warp_event  5,  0, ROUTE_5, 3
+	warp_event  4,  7, SAFFRON_CITY, 9
+	warp_event  5,  7, SAFFRON_CITY, 9
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronGateOfficerScript, -1
+	object_event  0,  4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronGateOfficerScript, -1
diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm
index 15d7e9f03..d62a042b9 100644
--- a/maps/Route5UndergroundPathEntrance.asm
+++ b/maps/Route5UndergroundPathEntrance.asm
@@ -21,13 +21,13 @@ Route5UndergroundPathEntrance_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, ROUTE_5, 1
-	warp_event 4, 7, ROUTE_5, 1
-	warp_event 4, 3, UNDERGROUND_PATH, 1
+	warp_event  3,  7, ROUTE_5, 1
+	warp_event  4,  7, ROUTE_5, 1
+	warp_event  4,  3, UNDERGROUND_PATH, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 2, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route5UndergroundPathEntranceTeacherScript, -1
+	object_event  2,  2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route5UndergroundPathEntranceTeacherScript, -1
diff --git a/maps/Route6.asm b/maps/Route6.asm
index 8ba5fc6ef..a949881e4 100644
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -93,15 +93,15 @@ Route6_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 17, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 1
-	warp_event 6, 1, ROUTE_6_SAFFRON_GATE, 3
+	warp_event 17,  3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 1
+	warp_event  6,  1, ROUTE_6_SAFFRON_GATE, 3
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 19, 5, BGEVENT_READ, Route6UndergroundPathSign
+	bg_event 19,  5, BGEVENT_READ, Route6UndergroundPathSign
 
 	db 3 ; object events
-	object_event 17, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
-	object_event 9, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmRex, -1
+	object_event 17,  4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
+	object_event  9, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmRex, -1
 	object_event 10, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmAllan, -1
diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm
index 85f289df0..c0de7ff54 100644
--- a/maps/Route6SaffronGate.asm
+++ b/maps/Route6SaffronGate.asm
@@ -59,14 +59,14 @@ Route6SaffronGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, SAFFRON_CITY, 12
-	warp_event 5, 0, SAFFRON_CITY, 13
-	warp_event 4, 7, ROUTE_6, 2
-	warp_event 5, 7, ROUTE_6, 2
+	warp_event  4,  0, SAFFRON_CITY, 12
+	warp_event  5,  0, SAFFRON_CITY, 13
+	warp_event  4,  7, ROUTE_6, 2
+	warp_event  5,  7, ROUTE_6, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route6SaffronGuardScript, -1
+	object_event  0,  4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route6SaffronGuardScript, -1
diff --git a/maps/Route6UndergroundPathEntrance.asm b/maps/Route6UndergroundPathEntrance.asm
index 0f3a2a3ee..7e04b3fb1 100644
--- a/maps/Route6UndergroundPathEntrance.asm
+++ b/maps/Route6UndergroundPathEntrance.asm
@@ -7,9 +7,9 @@ Route6UndergroundPathEntrance_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, ROUTE_6, 1
-	warp_event 4, 7, ROUTE_6, 1
-	warp_event 4, 3, UNDERGROUND_PATH, 2
+	warp_event  3,  7, ROUTE_6, 1
+	warp_event  4,  7, ROUTE_6, 1
+	warp_event  4,  3, UNDERGROUND_PATH, 2
 
 	db 0 ; coord events
 
diff --git a/maps/Route7.asm b/maps/Route7.asm
index 70849c693..6f1c5251f 100644
--- a/maps/Route7.asm
+++ b/maps/Route7.asm
@@ -36,13 +36,13 @@ Route7_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 15, 6, ROUTE_7_SAFFRON_GATE, 1
-	warp_event 15, 7, ROUTE_7_SAFFRON_GATE, 2
+	warp_event 15,  6, ROUTE_7_SAFFRON_GATE, 1
+	warp_event 15,  7, ROUTE_7_SAFFRON_GATE, 2
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 5, 11, BGEVENT_READ, Route7UndergroundPathSign
-	bg_event 6, 9, BGEVENT_READ, Route7LockedDoor
+	bg_event  5, 11, BGEVENT_READ, Route7UndergroundPathSign
+	bg_event  6,  9, BGEVENT_READ, Route7LockedDoor
 
 	db 0 ; object events
diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm
index 8b392b591..67a8c6813 100644
--- a/maps/Route7SaffronGate.asm
+++ b/maps/Route7SaffronGate.asm
@@ -47,14 +47,14 @@ Route7SaffronGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, ROUTE_7, 1
-	warp_event 0, 5, ROUTE_7, 2
-	warp_event 9, 4, SAFFRON_CITY, 10
-	warp_event 9, 5, SAFFRON_CITY, 11
+	warp_event  0,  4, ROUTE_7, 1
+	warp_event  0,  5, ROUTE_7, 2
+	warp_event  9,  4, SAFFRON_CITY, 10
+	warp_event  9,  5, SAFFRON_CITY, 11
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route7SaffronGuardScript, -1
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route7SaffronGuardScript, -1
diff --git a/maps/Route8.asm b/maps/Route8.asm
index 809ef1a5c..0a9a96aed 100644
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -174,19 +174,19 @@ Route8_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 4, ROUTE_8_SAFFRON_GATE, 3
-	warp_event 4, 5, ROUTE_8_SAFFRON_GATE, 4
+	warp_event  4,  4, ROUTE_8_SAFFRON_GATE, 3
+	warp_event  4,  5, ROUTE_8_SAFFRON_GATE, 4
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 11, 7, BGEVENT_READ, Route8UndergroundPathSign
-	bg_event 10, 5, BGEVENT_READ, Route8LockedDoor
+	bg_event 11,  7, BGEVENT_READ, Route8UndergroundPathSign
+	bg_event 10,  5, BGEVENT_READ, Route8LockedDoor
 
 	db 6 ; object events
-	object_event 10, 8, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerBikerDwayne, -1
-	object_event 10, 9, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerBikerHarris, -1
+	object_event 10,  8, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerBikerDwayne, -1
+	object_event 10,  9, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerBikerHarris, -1
 	object_event 10, 10, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerBikerZeke, -1
-	object_event 23, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdSam, -1
+	object_event 23,  2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdSam, -1
 	object_event 31, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSupernerdTom, -1
-	object_event 33, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x6c06c, -1
+	object_event 33,  5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x6c06c, -1
diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm
index 9290eefd7..bcaf7f02c 100644
--- a/maps/Route8SaffronGate.asm
+++ b/maps/Route8SaffronGate.asm
@@ -21,14 +21,14 @@ Route8SaffronGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 0, 4, SAFFRON_CITY, 14
-	warp_event 0, 5, SAFFRON_CITY, 15
-	warp_event 9, 4, ROUTE_8, 1
-	warp_event 9, 5, ROUTE_8, 2
+	warp_event  0,  4, SAFFRON_CITY, 14
+	warp_event  0,  5, SAFFRON_CITY, 15
+	warp_event  9,  4, ROUTE_8, 1
+	warp_event  9,  5, ROUTE_8, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route8SaffronGateOfficerScript, -1
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route8SaffronGateOfficerScript, -1
diff --git a/maps/Route9.asm b/maps/Route9.asm
index 45c0e6299..5a3d934fd 100644
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -212,13 +212,13 @@ Route9_MapEvents:
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 15, 7, BGEVENT_READ, Route9Sign
+	bg_event 15,  7, BGEVENT_READ, Route9Sign
 	bg_event 41, 15, BGEVENT_ITEM, Route9HiddenEther
 
 	db 6 ; object events
 	object_event 23, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperDean, -1
-	object_event 39, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1
-	object_event 11, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperSid, -1
+	object_event 39,  8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1
+	object_event 11,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperSid, -1
 	object_event 12, 15, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerEdna, -1
-	object_event 28, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerTim, -1
+	object_event 28,  3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerTim, -1
 	object_event 36, 15, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerHikerSidney, -1
diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm
index bc167d872..747c2d40d 100644
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -145,20 +145,20 @@ RuinsOfAlphAerodactylChamber_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 4
-	warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 4
-	warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 8
-	warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 9
-	warp_event 4, 0, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 1
+	warp_event  3,  9, RUINS_OF_ALPH_OUTSIDE, 4
+	warp_event  4,  9, RUINS_OF_ALPH_OUTSIDE, 4
+	warp_event  3,  3, RUINS_OF_ALPH_INNER_CHAMBER, 8
+	warp_event  4,  3, RUINS_OF_ALPH_INNER_CHAMBER, 9
+	warp_event  4,  0, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 1
 
 	db 0 ; coord events
 
 	db 6 ; bg events
-	bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script
-	bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script
-	bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost2Script
-	bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost3Script
-	bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost4Script
-	bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost5Script
+	bg_event  2,  3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script
+	bg_event  5,  3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script
+	bg_event  3,  2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost2Script
+	bg_event  4,  2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost3Script
+	bg_event  3,  0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost4Script
+	bg_event  4,  0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost5Script
 
 	db 0 ; object events
diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm
index ce455fab6..5e323f795 100644
--- a/maps/RuinsOfAlphAerodactylItemRoom.asm
+++ b/maps/RuinsOfAlphAerodactylItemRoom.asm
@@ -34,19 +34,19 @@ RuinsOfAlphAerodactylItemRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 3, 9, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5
-	warp_event 4, 9, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5
-	warp_event 3, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 1
-	warp_event 4, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 2
+	warp_event  3,  9, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5
+	warp_event  4,  9, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5
+	warp_event  3,  1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 1
+	warp_event  4,  1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 2
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script
-	bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script
+	bg_event  2,  1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script
+	bg_event  5,  1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script
 
 	db 4 ; object events
-	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM
-	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM
-	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM
-	object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM
+	object_event  2,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM
+	object_event  5,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM
+	object_event  2,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM
+	object_event  5,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM
diff --git a/maps/RuinsOfAlphAerodactylWordRoom.asm b/maps/RuinsOfAlphAerodactylWordRoom.asm
index 65228a709..96dc3eaef 100644
--- a/maps/RuinsOfAlphAerodactylWordRoom.asm
+++ b/maps/RuinsOfAlphAerodactylWordRoom.asm
@@ -7,8 +7,8 @@ RuinsOfAlphAerodactylWordRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 9, 5, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 3
-	warp_event 10, 5, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 4
+	warp_event  9,  5, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 3
+	warp_event 10,  5, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 4
 	warp_event 17, 11, RUINS_OF_ALPH_INNER_CHAMBER, 8
 
 	db 0 ; coord events
diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm
index 99339f985..e4df9dbe0 100644
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -146,20 +146,20 @@ RuinsOfAlphHoOhChamber_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 1
-	warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 1
-	warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 2
-	warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 3
-	warp_event 4, 0, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 1
+	warp_event  3,  9, RUINS_OF_ALPH_OUTSIDE, 1
+	warp_event  4,  9, RUINS_OF_ALPH_OUTSIDE, 1
+	warp_event  3,  3, RUINS_OF_ALPH_INNER_CHAMBER, 2
+	warp_event  4,  3, RUINS_OF_ALPH_INNER_CHAMBER, 3
+	warp_event  4,  0, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 1
 
 	db 0 ; coord events
 
 	db 6 ; bg events
-	bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script
-	bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script
-	bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost2Script
-	bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost3Script
-	bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost4Script
-	bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost5Script
+	bg_event  2,  3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script
+	bg_event  5,  3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script
+	bg_event  3,  2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost2Script
+	bg_event  4,  2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost3Script
+	bg_event  3,  0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost4Script
+	bg_event  4,  0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost5Script
 
 	db 0 ; object events
diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm
index 29a7183ab..1c70076f6 100644
--- a/maps/RuinsOfAlphHoOhItemRoom.asm
+++ b/maps/RuinsOfAlphHoOhItemRoom.asm
@@ -34,19 +34,19 @@ RuinsOfAlphHoOhItemRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 3, 9, RUINS_OF_ALPH_HO_OH_CHAMBER, 5
-	warp_event 4, 9, RUINS_OF_ALPH_HO_OH_CHAMBER, 5
-	warp_event 3, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM, 1
-	warp_event 4, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM, 2
+	warp_event  3,  9, RUINS_OF_ALPH_HO_OH_CHAMBER, 5
+	warp_event  4,  9, RUINS_OF_ALPH_HO_OH_CHAMBER, 5
+	warp_event  3,  1, RUINS_OF_ALPH_HO_OH_WORD_ROOM, 1
+	warp_event  4,  1, RUINS_OF_ALPH_HO_OH_WORD_ROOM, 2
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
-	bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
+	bg_event  2,  1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
+	bg_event  5,  1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
 
 	db 4 ; object events
-	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
-	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
-	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM
-	object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM
+	object_event  2,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
+	object_event  5,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
+	object_event  2,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM
+	object_event  5,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM
diff --git a/maps/RuinsOfAlphHoOhWordRoom.asm b/maps/RuinsOfAlphHoOhWordRoom.asm
index 40c282351..d5492dbf9 100644
--- a/maps/RuinsOfAlphHoOhWordRoom.asm
+++ b/maps/RuinsOfAlphHoOhWordRoom.asm
@@ -7,8 +7,8 @@ RuinsOfAlphHoOhWordRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 9, 9, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 3
-	warp_event 10, 9, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 4
+	warp_event  9,  9, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 3
+	warp_event 10,  9, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 4
 	warp_event 17, 21, RUINS_OF_ALPH_INNER_CHAMBER, 2
 
 	db 0 ; coord events
diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm
index 352dcf8dc..7f5348633 100644
--- a/maps/RuinsOfAlphInnerChamber.asm
+++ b/maps/RuinsOfAlphInnerChamber.asm
@@ -79,46 +79,46 @@ RuinsOfAlphInnerChamber_MapEvents:
 
 	db 9 ; warp events
 	warp_event 10, 13, RUINS_OF_ALPH_OUTSIDE, 5
-	warp_event 3, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 3
-	warp_event 4, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 4
-	warp_event 15, 3, RUINS_OF_ALPH_KABUTO_CHAMBER, 3
-	warp_event 16, 3, RUINS_OF_ALPH_KABUTO_CHAMBER, 4
-	warp_event 3, 21, RUINS_OF_ALPH_OMANYTE_CHAMBER, 3
-	warp_event 4, 21, RUINS_OF_ALPH_OMANYTE_CHAMBER, 4
+	warp_event  3, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 3
+	warp_event  4, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 4
+	warp_event 15,  3, RUINS_OF_ALPH_KABUTO_CHAMBER, 3
+	warp_event 16,  3, RUINS_OF_ALPH_KABUTO_CHAMBER, 4
+	warp_event  3, 21, RUINS_OF_ALPH_OMANYTE_CHAMBER, 3
+	warp_event  4, 21, RUINS_OF_ALPH_OMANYTE_CHAMBER, 4
 	warp_event 15, 24, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 3
 	warp_event 16, 24, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 4
 
 	db 0 ; coord events
 
 	db 26 ; bg events
-	bg_event 2, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 5, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 8, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 11, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 14, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 17, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 2, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 5, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 8, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 11, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 14, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 17, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 2, 13, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  2,  3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  5,  3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  8,  3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 11,  3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 14,  3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 17,  3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  2,  8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  5,  8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  8,  8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 11,  8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 14,  8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 17,  8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  2, 13, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 	bg_event 17, 13, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 2, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 5, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 8, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  2, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  5, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  8, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 	bg_event 11, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 	bg_event 14, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 	bg_event 17, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 2, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 5, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 8, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  2, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  5, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  8, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 	bg_event 11, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 	bg_event 14, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 	bg_event 17, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 
 	db 3 ; object events
-	object_event 3, 7, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
+	object_event  3,  7, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
 	object_event 14, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberTeacherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
 	object_event 11, 19, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberGrampsScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index 1b01adee1..bb0977a21 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -257,22 +257,22 @@ RuinsOfAlphKabutoChamber_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 2
-	warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 2
-	warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 4
-	warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 5
-	warp_event 4, 0, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 1
+	warp_event  3,  9, RUINS_OF_ALPH_OUTSIDE, 2
+	warp_event  4,  9, RUINS_OF_ALPH_OUTSIDE, 2
+	warp_event  3,  3, RUINS_OF_ALPH_INNER_CHAMBER, 4
+	warp_event  4,  3, RUINS_OF_ALPH_INNER_CHAMBER, 5
+	warp_event  4,  0, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 1
 
 	db 0 ; coord events
 
 	db 6 ; bg events
-	bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script
-	bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script
-	bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost2Script
-	bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost3Script
-	bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost4Script
-	bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost5Script
+	bg_event  2,  3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script
+	bg_event  5,  3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script
+	bg_event  3,  2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost2Script
+	bg_event  4,  2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost3Script
+	bg_event  3,  0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost4Script
+	bg_event  4,  0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost5Script
 
 	db 2 ; object events
-	object_event 5, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
-	object_event 3, 1, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1
+	object_event  5,  5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
+	object_event  3,  1, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1
diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm
index ac9753ca4..d40e1dcf2 100644
--- a/maps/RuinsOfAlphKabutoItemRoom.asm
+++ b/maps/RuinsOfAlphKabutoItemRoom.asm
@@ -34,19 +34,19 @@ RuinsOfAlphKabutoItemRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 3, 9, RUINS_OF_ALPH_KABUTO_CHAMBER, 5
-	warp_event 4, 9, RUINS_OF_ALPH_KABUTO_CHAMBER, 5
-	warp_event 3, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM, 1
-	warp_event 4, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM, 2
+	warp_event  3,  9, RUINS_OF_ALPH_KABUTO_CHAMBER, 5
+	warp_event  4,  9, RUINS_OF_ALPH_KABUTO_CHAMBER, 5
+	warp_event  3,  1, RUINS_OF_ALPH_KABUTO_WORD_ROOM, 1
+	warp_event  4,  1, RUINS_OF_ALPH_KABUTO_WORD_ROOM, 2
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script
-	bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script
+	bg_event  2,  1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script
+	bg_event  5,  1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script
 
 	db 4 ; object events
-	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM
-	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM
-	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM
-	object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM
+	object_event  2,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM
+	object_event  5,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM
+	object_event  2,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM
+	object_event  5,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM
diff --git a/maps/RuinsOfAlphKabutoWordRoom.asm b/maps/RuinsOfAlphKabutoWordRoom.asm
index 9820104eb..086ae4c2d 100644
--- a/maps/RuinsOfAlphKabutoWordRoom.asm
+++ b/maps/RuinsOfAlphKabutoWordRoom.asm
@@ -7,8 +7,8 @@ RuinsOfAlphKabutoWordRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 9, 5, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 3
-	warp_event 10, 5, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 4
+	warp_event  9,  5, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 3
+	warp_event 10,  5, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 4
 	warp_event 17, 11, RUINS_OF_ALPH_INNER_CHAMBER, 4
 
 	db 0 ; coord events
diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm
index f4074ed72..6f166a416 100644
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -146,20 +146,20 @@ RuinsOfAlphOmanyteChamber_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 3
-	warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 3
-	warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 6
-	warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 7
-	warp_event 4, 0, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 1
+	warp_event  3,  9, RUINS_OF_ALPH_OUTSIDE, 3
+	warp_event  4,  9, RUINS_OF_ALPH_OUTSIDE, 3
+	warp_event  3,  3, RUINS_OF_ALPH_INNER_CHAMBER, 6
+	warp_event  4,  3, RUINS_OF_ALPH_INNER_CHAMBER, 7
+	warp_event  4,  0, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 1
 
 	db 0 ; coord events
 
 	db 6 ; bg events
-	bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script
-	bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script
-	bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost2Script
-	bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost3Script
-	bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost4Script
-	bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost5Script
+	bg_event  2,  3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script
+	bg_event  5,  3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script
+	bg_event  3,  2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost2Script
+	bg_event  4,  2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost3Script
+	bg_event  3,  0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost4Script
+	bg_event  4,  0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost5Script
 
 	db 0 ; object events
diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm
index 1a8dcce72..4013ed19d 100644
--- a/maps/RuinsOfAlphOmanyteItemRoom.asm
+++ b/maps/RuinsOfAlphOmanyteItemRoom.asm
@@ -34,19 +34,19 @@ RuinsOfAlphOmanyteItemRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 3, 9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5
-	warp_event 4, 9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5
-	warp_event 3, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 1
-	warp_event 4, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 2
+	warp_event  3,  9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5
+	warp_event  4,  9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5
+	warp_event  3,  1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 1
+	warp_event  4,  1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 2
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script
-	bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script
+	bg_event  2,  1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script
+	bg_event  5,  1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script
 
 	db 4 ; object events
-	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM
-	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM
-	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM
-	object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM
+	object_event  2,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM
+	object_event  5,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM
+	object_event  2,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM
+	object_event  5,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM
diff --git a/maps/RuinsOfAlphOmanyteWordRoom.asm b/maps/RuinsOfAlphOmanyteWordRoom.asm
index 5c78330bb..b5e0f4d2e 100644
--- a/maps/RuinsOfAlphOmanyteWordRoom.asm
+++ b/maps/RuinsOfAlphOmanyteWordRoom.asm
@@ -7,8 +7,8 @@ RuinsOfAlphOmanyteWordRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 9, 7, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 3
-	warp_event 10, 7, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 4
+	warp_event  9,  7, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 3
+	warp_event 10,  7, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 4
 	warp_event 17, 13, RUINS_OF_ALPH_INNER_CHAMBER, 6
 
 	db 0 ; coord events
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index 646be0d1c..8ab4b8f5d 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -282,15 +282,15 @@ RuinsOfAlphOutside_MapEvents:
 	db 0, 0 ; filler
 
 	db 11 ; warp events
-	warp_event 2, 17, RUINS_OF_ALPH_HO_OH_CHAMBER, 1
-	warp_event 14, 7, RUINS_OF_ALPH_KABUTO_CHAMBER, 1
-	warp_event 2, 29, RUINS_OF_ALPH_OMANYTE_CHAMBER, 1
+	warp_event  2, 17, RUINS_OF_ALPH_HO_OH_CHAMBER, 1
+	warp_event 14,  7, RUINS_OF_ALPH_KABUTO_CHAMBER, 1
+	warp_event  2, 29, RUINS_OF_ALPH_OMANYTE_CHAMBER, 1
 	warp_event 16, 33, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 1
 	warp_event 10, 13, RUINS_OF_ALPH_INNER_CHAMBER, 1
 	warp_event 17, 11, RUINS_OF_ALPH_RESEARCH_CENTER, 1
-	warp_event 6, 19, UNION_CAVE_B1F, 1
-	warp_event 6, 27, UNION_CAVE_B1F, 2
-	warp_event 7, 5, ROUTE_36_RUINS_OF_ALPH_GATE, 3
+	warp_event  6, 19, UNION_CAVE_B1F, 1
+	warp_event  6, 27, UNION_CAVE_B1F, 2
+	warp_event  7,  5, ROUTE_36_RUINS_OF_ALPH_GATE, 3
 	warp_event 13, 20, ROUTE_32_RUINS_OF_ALPH_GATE, 1
 	warp_event 13, 21, ROUTE_32_RUINS_OF_ALPH_GATE, 2
 
@@ -299,13 +299,13 @@ RuinsOfAlphOutside_MapEvents:
 	coord_event 10, 15, SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX, RuinsOfAlphOutsideScientistScene2
 
 	db 3 ; bg events
-	bg_event 16, 8, BGEVENT_READ, RuinsOfAlphOutsideSignpost0Script
+	bg_event 16,  8, BGEVENT_READ, RuinsOfAlphOutsideSignpost0Script
 	bg_event 12, 16, BGEVENT_READ, RuinsOfAlphOutsideSignpost1Script
 	bg_event 18, 12, BGEVENT_READ, RuinsOfAlphOutsideSignpost2Script
 
 	db 5 ; object events
-	object_event 4, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPsychicNathan, -1
+	object_event  4, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPsychicNathan, -1
 	object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST
 	object_event 13, 17, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
 	object_event 14, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x58076, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
-	object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
+	object_event 12,  8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index d8113b972..38ead4614 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -394,17 +394,17 @@ RuinsOfAlphResearchCenter_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, RUINS_OF_ALPH_OUTSIDE, 6
-	warp_event 3, 7, RUINS_OF_ALPH_OUTSIDE, 6
+	warp_event  2,  7, RUINS_OF_ALPH_OUTSIDE, 6
+	warp_event  3,  7, RUINS_OF_ALPH_OUTSIDE, 6
 
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event 6, 5, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost0Script
-	bg_event 3, 4, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost1Script
-	bg_event 7, 1, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost2Script
+	bg_event  6,  5, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost0Script
+	bg_event  3,  4, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost1Script
+	bg_event  7,  1, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost2Script
 
 	db 3 ; object events
-	object_event 4, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1
-	object_event 5, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x59214, -1
-	object_event 2, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
+	object_event  4,  5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1
+	object_event  5,  2, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x59214, -1
+	object_event  2,  5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm
index f0fbba12d..32627af69 100644
--- a/maps/SafariZoneBeta.asm
+++ b/maps/SafariZoneBeta.asm
@@ -7,7 +7,7 @@ SafariZoneBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 9, 23, SAFARI_ZONE_FUCHSIA_GATE_BETA, 1
+	warp_event  9, 23, SAFARI_ZONE_FUCHSIA_GATE_BETA, 1
 	warp_event 10, 23, SAFARI_ZONE_FUCHSIA_GATE_BETA, 2
 
 	db 0 ; coord events
diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm
index f18421f40..547ed5bd2 100644
--- a/maps/SafariZoneFuchsiaGateBeta.asm
+++ b/maps/SafariZoneFuchsiaGateBeta.asm
@@ -7,10 +7,10 @@ SafariZoneFuchsiaGateBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 4, 0, SAFARI_ZONE_BETA, 1
-	warp_event 5, 0, SAFARI_ZONE_BETA, 2
-	warp_event 4, 7, FUCHSIA_CITY, 7
-	warp_event 5, 7, FUCHSIA_CITY, 7
+	warp_event  4,  0, SAFARI_ZONE_BETA, 1
+	warp_event  5,  0, SAFARI_ZONE_BETA, 2
+	warp_event  4,  7, FUCHSIA_CITY, 7
+	warp_event  5,  7, FUCHSIA_CITY, 7
 
 	db 0 ; coord events
 
diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm
index a44a0387e..270fc0267 100644
--- a/maps/SafariZoneMainOffice.asm
+++ b/maps/SafariZoneMainOffice.asm
@@ -7,8 +7,8 @@ SafariZoneMainOffice_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, FUCHSIA_CITY, 2
-	warp_event 3, 7, FUCHSIA_CITY, 2
+	warp_event  2,  7, FUCHSIA_CITY, 2
+	warp_event  3,  7, FUCHSIA_CITY, 2
 
 	db 0 ; coord events
 
diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm
index afa22d55d..41a2db11d 100644
--- a/maps/SafariZoneWardensHome.asm
+++ b/maps/SafariZoneWardensHome.asm
@@ -78,16 +78,16 @@ SafariZoneWardensHome_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, FUCHSIA_CITY, 6
-	warp_event 3, 7, FUCHSIA_CITY, 6
+	warp_event  2,  7, FUCHSIA_CITY, 6
+	warp_event  3,  7, FUCHSIA_CITY, 6
 
 	db 0 ; coord events
 
 	db 4 ; bg events
-	bg_event 0, 1, BGEVENT_READ, WardensHomeBookshelf
-	bg_event 1, 1, BGEVENT_READ, WardensHomeBookshelf
-	bg_event 7, 0, BGEVENT_READ, WardenPhoto
-	bg_event 9, 0, BGEVENT_READ, SafariZonePhoto
+	bg_event  0,  1, BGEVENT_READ, WardensHomeBookshelf
+	bg_event  1,  1, BGEVENT_READ, WardensHomeBookshelf
+	bg_event  7,  0, BGEVENT_READ, WardenPhoto
+	bg_event  9,  0, BGEVENT_READ, SafariZonePhoto
 
 	db 1 ; object events
-	object_event 2, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, WardensGranddaughter, -1
+	object_event  2,  4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, WardensGranddaughter, -1
diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm
index 752dc6d1e..6d1ddbebc 100644
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -267,17 +267,17 @@ SaffronCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 15 ; warp events
-	warp_event 26, 3, FIGHTING_DOJO, 1
-	warp_event 34, 3, SAFFRON_GYM, 1
+	warp_event 26,  3, FIGHTING_DOJO, 1
+	warp_event 34,  3, SAFFRON_GYM, 1
 	warp_event 25, 11, SAFFRON_MART, 2
-	warp_event 9, 29, SAFFRON_POKECENTER_1F, 1
+	warp_event  9, 29, SAFFRON_POKECENTER_1F, 1
 	warp_event 27, 29, MR_PSYCHICS_HOUSE, 1
-	warp_event 8, 3, SAFFRON_MAGNET_TRAIN_STATION, 2
+	warp_event  8,  3, SAFFRON_MAGNET_TRAIN_STATION, 2
 	warp_event 18, 21, SILPH_CO_1F, 1
-	warp_event 9, 11, COPYCATS_HOUSE_1F, 1
-	warp_event 18, 3, ROUTE_5_SAFFRON_GATE, 3
-	warp_event 0, 24, ROUTE_7_SAFFRON_GATE, 3
-	warp_event 0, 25, ROUTE_7_SAFFRON_GATE, 4
+	warp_event  9, 11, COPYCATS_HOUSE_1F, 1
+	warp_event 18,  3, ROUTE_5_SAFFRON_GATE, 3
+	warp_event  0, 24, ROUTE_7_SAFFRON_GATE, 3
+	warp_event  0, 25, ROUTE_7_SAFFRON_GATE, 4
 	warp_event 16, 33, ROUTE_6_SAFFRON_GATE, 1
 	warp_event 17, 33, ROUTE_6_SAFFRON_GATE, 2
 	warp_event 39, 22, ROUTE_8_SAFFRON_GATE, 1
@@ -286,21 +286,21 @@ SaffronCity_MapEvents:
 	db 0 ; coord events
 
 	db 8 ; bg events
-	bg_event 21, 5, BGEVENT_READ, SaffronCitySign
-	bg_event 33, 5, BGEVENT_READ, SaffronGymSign
-	bg_event 25, 5, BGEVENT_READ, FightingDojoSign
+	bg_event 21,  5, BGEVENT_READ, SaffronCitySign
+	bg_event 33,  5, BGEVENT_READ, SaffronGymSign
+	bg_event 25,  5, BGEVENT_READ, FightingDojoSign
 	bg_event 15, 21, BGEVENT_READ, SilphCoSign
 	bg_event 25, 29, BGEVENT_READ, MrPsychicsHouseSign
-	bg_event 11, 5, BGEVENT_READ, SaffronCityMagnetTrainStationSign
+	bg_event 11,  5, BGEVENT_READ, SaffronCityMagnetTrainStationSign
 	bg_event 10, 29, BGEVENT_READ, SaffronCityPokecenterSign
 	bg_event 26, 11, BGEVENT_READ, SaffronCityMartSign
 
 	db 8 ; object events
-	object_event 7, 14, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LassScript_0x19932a, -1
+	object_event  7, 14, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LassScript_0x19932a, -1
 	object_event 19, 30, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19933e, -1
-	object_event 32, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1
+	object_event 32,  7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1
 	object_event 20, 24, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerFScript, -1
 	object_event 27, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x199358, -1
 	object_event 15, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronCityYoungster1Script, -1
 	object_event 35, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityYoungster2Script, -1
-	object_event 19, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityLassScript, -1
+	object_event 19,  8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityLassScript, -1
diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm
index 732a75168..466c12af8 100644
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -292,48 +292,48 @@ SaffronGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 32 ; warp events
-	warp_event 8, 17, SAFFRON_CITY, 2
-	warp_event 9, 17, SAFFRON_CITY, 2
+	warp_event  8, 17, SAFFRON_CITY, 2
+	warp_event  9, 17, SAFFRON_CITY, 2
 	warp_event 11, 15, SAFFRON_GYM, 18
 	warp_event 19, 15, SAFFRON_GYM, 19
 	warp_event 19, 11, SAFFRON_GYM, 20
-	warp_event 1, 11, SAFFRON_GYM, 21
-	warp_event 5, 3, SAFFRON_GYM, 22
-	warp_event 11, 5, SAFFRON_GYM, 23
-	warp_event 1, 15, SAFFRON_GYM, 24
-	warp_event 19, 3, SAFFRON_GYM, 25
+	warp_event  1, 11, SAFFRON_GYM, 21
+	warp_event  5,  3, SAFFRON_GYM, 22
+	warp_event 11,  5, SAFFRON_GYM, 23
+	warp_event  1, 15, SAFFRON_GYM, 24
+	warp_event 19,  3, SAFFRON_GYM, 25
 	warp_event 15, 17, SAFFRON_GYM, 26
-	warp_event 5, 17, SAFFRON_GYM, 27
-	warp_event 5, 9, SAFFRON_GYM, 28
-	warp_event 9, 3, SAFFRON_GYM, 29
-	warp_event 15, 9, SAFFRON_GYM, 30
-	warp_event 15, 5, SAFFRON_GYM, 31
-	warp_event 1, 5, SAFFRON_GYM, 32
+	warp_event  5, 17, SAFFRON_GYM, 27
+	warp_event  5,  9, SAFFRON_GYM, 28
+	warp_event  9,  3, SAFFRON_GYM, 29
+	warp_event 15,  9, SAFFRON_GYM, 30
+	warp_event 15,  5, SAFFRON_GYM, 31
+	warp_event  1,  5, SAFFRON_GYM, 32
 	warp_event 19, 17, SAFFRON_GYM, 3
-	warp_event 19, 9, SAFFRON_GYM, 4
-	warp_event 1, 9, SAFFRON_GYM, 5
-	warp_event 5, 5, SAFFRON_GYM, 6
-	warp_event 11, 3, SAFFRON_GYM, 7
-	warp_event 1, 17, SAFFRON_GYM, 8
-	warp_event 19, 5, SAFFRON_GYM, 9
+	warp_event 19,  9, SAFFRON_GYM, 4
+	warp_event  1,  9, SAFFRON_GYM, 5
+	warp_event  5,  5, SAFFRON_GYM, 6
+	warp_event 11,  3, SAFFRON_GYM, 7
+	warp_event  1, 17, SAFFRON_GYM, 8
+	warp_event 19,  5, SAFFRON_GYM, 9
 	warp_event 15, 15, SAFFRON_GYM, 10
-	warp_event 5, 15, SAFFRON_GYM, 11
-	warp_event 5, 11, SAFFRON_GYM, 12
-	warp_event 9, 5, SAFFRON_GYM, 13
+	warp_event  5, 15, SAFFRON_GYM, 11
+	warp_event  5, 11, SAFFRON_GYM, 12
+	warp_event  9,  5, SAFFRON_GYM, 13
 	warp_event 15, 11, SAFFRON_GYM, 14
-	warp_event 15, 3, SAFFRON_GYM, 15
-	warp_event 1, 3, SAFFRON_GYM, 16
-	warp_event 11, 9, SAFFRON_GYM, 17
+	warp_event 15,  3, SAFFRON_GYM, 15
+	warp_event  1,  3, SAFFRON_GYM, 16
+	warp_event 11,  9, SAFFRON_GYM, 17
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 8, 15, BGEVENT_READ, SaffronGymStatue
+	bg_event  8, 15, BGEVENT_READ, SaffronGymStatue
 
 	db 6 ; object events
-	object_event 9, 8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1
+	object_event  9,  8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1
 	object_event 17, 16, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerMediumRebecca, -1
-	object_event 3, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1
-	object_event 3, 4, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumDoris, -1
-	object_event 17, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicJared, -1
-	object_event 9, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronGymGuyScript, -1
+	object_event  3, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1
+	object_event  3,  4, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumDoris, -1
+	object_event 17,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicJared, -1
+	object_event  9, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronGymGuyScript, -1
diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm
index 0c57587d8..c6e6d2645 100644
--- a/maps/SaffronMagnetTrainStation.asm
+++ b/maps/SaffronMagnetTrainStation.asm
@@ -217,18 +217,18 @@ SaffronMagnetTrainStation_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 8, 17, SAFFRON_CITY, 6
-	warp_event 9, 17, SAFFRON_CITY, 6
-	warp_event 6, 5, GOLDENROD_MAGNET_TRAIN_STATION, 4
-	warp_event 11, 5, GOLDENROD_MAGNET_TRAIN_STATION, 3
+	warp_event  8, 17, SAFFRON_CITY, 6
+	warp_event  9, 17, SAFFRON_CITY, 6
+	warp_event  6,  5, GOLDENROD_MAGNET_TRAIN_STATION, 4
+	warp_event 11,  5, GOLDENROD_MAGNET_TRAIN_STATION, 3
 
 	db 1 ; coord events
-	coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromGoldenrod
+	coord_event 11,  6, SCENE_DEFAULT, Script_ArriveFromGoldenrod
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1
+	object_event  9,  9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1
 	object_event 10, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1
-	object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
-	object_event 6, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
+	object_event  6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
+	object_event  6, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm
index 3b701ee2f..b86655188 100644
--- a/maps/SaffronMart.asm
+++ b/maps/SaffronMart.asm
@@ -39,14 +39,14 @@ SaffronMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, SAFFRON_CITY, 3
-	warp_event 3, 7, SAFFRON_CITY, 3
+	warp_event  2,  7, SAFFRON_CITY, 3
+	warp_event  3,  7, SAFFRON_CITY, 3
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1
-	object_event 7, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1
-	object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1
+	object_event  7,  2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1
+	object_event  7,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1
diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm
index 943582370..91f2f9ba1 100644
--- a/maps/SaffronPokecenter1F.asm
+++ b/maps/SaffronPokecenter1F.asm
@@ -113,16 +113,16 @@ SaffronPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, SAFFRON_CITY, 4
-	warp_event 4, 7, SAFFRON_CITY, 4
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, SAFFRON_CITY, 4
+	warp_event  4,  7, SAFFRON_CITY, 4
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1
-	object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1
-	object_event 8, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1
-	object_event 1, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FYoungsterScript, -1
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1
+	object_event  7,  2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1
+	object_event  8,  6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1
+	object_event  1,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FYoungsterScript, -1
diff --git a/maps/SaffronPokecenter2FBeta.asm b/maps/SaffronPokecenter2FBeta.asm
index 9a5196196..912f1281a 100644
--- a/maps/SaffronPokecenter2FBeta.asm
+++ b/maps/SaffronPokecenter2FBeta.asm
@@ -7,7 +7,7 @@ SaffronPokecenter2FBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 0, 7, SAFFRON_POKECENTER_1F, 3
+	warp_event  0,  7, SAFFRON_POKECENTER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm
index be63733a0..4a912f39f 100644
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -159,12 +159,12 @@ SeafoamGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 5, 5, ROUTE_20, 1
+	warp_event  5,  5, ROUTE_20, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 5, 2, SPRITE_BLAINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlaineScript_0x1ab4fb, -1
-	object_event 6, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY
+	object_event  5,  2, SPRITE_BLAINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlaineScript_0x1ab4fb, -1
+	object_event  6,  5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY
diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm
index 925fffb0f..662084b25 100644
--- a/maps/SilphCo1F.asm
+++ b/maps/SilphCo1F.asm
@@ -57,13 +57,13 @@ SilphCo1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, SAFFRON_CITY, 7
-	warp_event 3, 7, SAFFRON_CITY, 7
+	warp_event  2,  7, SAFFRON_CITY, 7
+	warp_event  3,  7, SAFFRON_CITY, 7
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 4, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionist, -1
-	object_event 13, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1
+	object_event  4,  2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionist, -1
+	object_event 13,  1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1
diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm
index b9f0be206..e2f48638d 100644
--- a/maps/SilverCaveItemRooms.asm
+++ b/maps/SilverCaveItemRooms.asm
@@ -17,13 +17,13 @@ SilverCaveItemRooms_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 13, 3, SILVER_CAVE_ROOM_2, 3
-	warp_event 7, 15, SILVER_CAVE_ROOM_2, 4
+	warp_event 13,  3, SILVER_CAVE_ROOM_2, 3
+	warp_event  7, 15, SILVER_CAVE_ROOM_2, 4
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE
+	object_event  6,  3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE
 	object_event 15, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE
diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm
index 9dec24604..fea256208 100644
--- a/maps/SilverCaveOutside.asm
+++ b/maps/SilverCaveOutside.asm
@@ -33,6 +33,6 @@ SilverCaveOutside_MapEvents:
 	db 3 ; bg events
 	bg_event 24, 19, BGEVENT_READ, MtSilverPokecenterSign
 	bg_event 17, 13, BGEVENT_READ, MtSilverSign
-	bg_event 9, 25, BGEVENT_ITEM, SilverCaveOutsideHiddenFullRestore
+	bg_event  9, 25, BGEVENT_ITEM, SilverCaveOutsideHiddenFullRestore
 
 	db 0 ; object events
diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm
index 94ac820ce..de066c65e 100644
--- a/maps/SilverCavePokecenter1F.asm
+++ b/maps/SilverCavePokecenter1F.asm
@@ -31,14 +31,14 @@ SilverCavePokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, SILVER_CAVE_OUTSIDE, 1
-	warp_event 4, 7, SILVER_CAVE_OUTSIDE, 1
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, SILVER_CAVE_OUTSIDE, 1
+	warp_event  4,  7, SILVER_CAVE_OUTSIDE, 1
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ae59a, -1
-	object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ae59a, -1
+	object_event  1,  5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1
diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm
index 74518dbeb..1fe5df55d 100644
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -31,8 +31,8 @@ SilverCaveRoom1_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 9, 33, SILVER_CAVE_OUTSIDE, 2
-	warp_event 15, 1, SILVER_CAVE_ROOM_2, 1
+	warp_event  9, 33, SILVER_CAVE_OUTSIDE, 2
+	warp_event 15,  1, SILVER_CAVE_ROOM_2, 1
 
 	db 0 ; coord events
 
@@ -41,7 +41,7 @@ SilverCaveRoom1_MapEvents:
 	bg_event 17, 12, BGEVENT_ITEM, SilverCaveRoom1HiddenUltraBall
 
 	db 4 ; object events
-	object_event 4, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER
+	object_event  4,  9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER
 	object_event 15, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN
-	object_event 5, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE
-	object_event 7, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1UltraBall, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL
+	object_event  5, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE
+	object_event  7, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1UltraBall, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL
diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm
index 1002acc78..7a7f9250d 100644
--- a/maps/SilverCaveRoom2.asm
+++ b/maps/SilverCaveRoom2.asm
@@ -25,9 +25,9 @@ SilverCaveRoom2_MapEvents:
 
 	db 4 ; warp events
 	warp_event 17, 31, SILVER_CAVE_ROOM_1, 2
-	warp_event 11, 5, SILVER_CAVE_ROOM_3, 1
+	warp_event 11,  5, SILVER_CAVE_ROOM_3, 1
 	warp_event 13, 21, SILVER_CAVE_ITEM_ROOMS, 1
-	warp_event 23, 3, SILVER_CAVE_ITEM_ROOMS, 2
+	warp_event 23,  3, SILVER_CAVE_ITEM_ROOMS, 2
 
 	db 0 ; coord events
 
@@ -37,4 +37,4 @@ SilverCaveRoom2_MapEvents:
 	db 3 ; object events
 	object_event 24, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM
 	object_event 22, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL
-	object_event 4, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP
+	object_event  4, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP
diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm
index 4ca196ea1..3efd76434 100644
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -52,11 +52,11 @@ SilverCaveRoom3_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 9, 33, SILVER_CAVE_ROOM_2, 2
+	warp_event  9, 33, SILVER_CAVE_ROOM_2, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 9, 10, SPRITE_RED, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER
+	object_event  9, 10, SPRITE_RED, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER
diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm
index 79d093970..1a7a1e408 100644
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -323,19 +323,19 @@ SlowpokeWellB1F_MapEvents:
 
 	db 2 ; warp events
 	warp_event 17, 15, AZALEA_TOWN, 6
-	warp_event 7, 11, SLOWPOKE_WELL_B2F, 1
+	warp_event  7, 11, SLOWPOKE_WELL_B2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 9 ; object events
-	object_event 15, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS
-	object_event 5, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS
-	object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS
-	object_event 10, 4, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS
-	object_event 7, 4, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FSlowpokeWithMailScript, EVENT_SLOWPOKE_WELL_SLOWPOKES
-	object_event 6, 2, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FTaillessSlowpokeScript, EVENT_SLOWPOKE_WELL_SLOWPOKES
+	object_event 15,  7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS
+	object_event  5,  2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS
+	object_event  5,  6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS
+	object_event 10,  4, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS
+	object_event  7,  4, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FSlowpokeWithMailScript, EVENT_SLOWPOKE_WELL_SLOWPOKES
+	object_event  6,  2, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FTaillessSlowpokeScript, EVENT_SLOWPOKE_WELL_SLOWPOKES
 	object_event 16, 14, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FKurtScript, EVENT_SLOWPOKE_WELL_KURT
-	object_event 3, 2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1
-	object_event 10, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION
+	object_event  3,  2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1
+	object_event 10,  3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION
diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm
index e9da7b24e..21a8f73e4 100644
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -63,12 +63,12 @@ SlowpokeWellB2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 9, 11, SLOWPOKE_WELL_B1F, 2
+	warp_event  9, 11, SLOWPOKE_WELL_B1F, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 5, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1
-	object_event 15, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE
+	object_event  5,  4, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1
+	object_event 15,  5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE
diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm
index dac4aa66e..8c6a86128 100644
--- a/maps/SoulHouse.asm
+++ b/maps/SoulHouse.asm
@@ -74,15 +74,15 @@ SoulHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 7, LAVENDER_TOWN, 6
-	warp_event 5, 7, LAVENDER_TOWN, 6
+	warp_event  4,  7, LAVENDER_TOWN, 6
+	warp_event  5,  7, LAVENDER_TOWN, 6
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 4, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFuji, -1
-	object_event 7, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1
-	object_event 2, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseLassScript, -1
-	object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseGrannyScript, -1
+	object_event  4,  2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFuji, -1
+	object_event  7,  3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1
+	object_event  2,  5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseLassScript, -1
+	object_event  1,  3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseGrannyScript, -1
diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm
index cddd2ed4c..89bf9e562 100644
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -104,22 +104,22 @@ SproutTower1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 9, 15, VIOLET_CITY, 7
+	warp_event  9, 15, VIOLET_CITY, 7
 	warp_event 10, 15, VIOLET_CITY, 7
-	warp_event 6, 4, SPROUT_TOWER_2F, 1
-	warp_event 2, 6, SPROUT_TOWER_2F, 2
-	warp_event 17, 3, SPROUT_TOWER_2F, 3
+	warp_event  6,  4, SPROUT_TOWER_2F, 1
+	warp_event  2,  6, SPROUT_TOWER_2F, 2
+	warp_event 17,  3, SPROUT_TOWER_2F, 3
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 7, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script
+	bg_event  7, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script
 	bg_event 12, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script
 
 	db 6 ; object events
-	object_event 7, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1
-	object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1
+	object_event  7,  4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1
+	object_event  6,  7, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1
 	object_event 11, 12, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FGrannyScript, -1
-	object_event 9, 9, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FTeacherScript, -1
-	object_event 3, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageChow, -1
-	object_event 16, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL
+	object_event  9,  9, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FTeacherScript, -1
+	object_event  3,  5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageChow, -1
+	object_event 16,  7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL
diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm
index 79da8c462..4bc2a6d1d 100644
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -86,9 +86,9 @@ SproutTower2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 6, 4, SPROUT_TOWER_1F, 3
-	warp_event 2, 6, SPROUT_TOWER_1F, 4
-	warp_event 17, 3, SPROUT_TOWER_1F, 5
+	warp_event  6,  4, SPROUT_TOWER_1F, 3
+	warp_event  2,  6, SPROUT_TOWER_1F, 4
+	warp_event 17,  3, SPROUT_TOWER_1F, 5
 	warp_event 10, 14, SPROUT_TOWER_3F, 1
 
 	db 0 ; coord events
@@ -97,6 +97,6 @@ SproutTower2F_MapEvents:
 	bg_event 12, 15, BGEVENT_READ, MapSproutTower2FSignpost0Script
 
 	db 3 ; object events
-	object_event 12, 3, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1
-	object_event 9, 14, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSageEdmond, -1
-	object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY
+	object_event 12,  3, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1
+	object_event  9, 14, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSageEdmond, -1
+	object_event  3,  1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index b52459ab5..8a366c103 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -334,21 +334,21 @@ SproutTower3F_MapEvents:
 	warp_event 10, 14, SPROUT_TOWER_2F, 4
 
 	db 1 ; coord events
-	coord_event 11, 9, SCENE_DEFAULT, UnknownScript_0x184947
+	coord_event 11,  9, SCENE_DEFAULT, UnknownScript_0x184947
 
 	db 6 ; bg events
-	bg_event 8, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script
-	bg_event 11, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script
-	bg_event 9, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script
-	bg_event 10, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script
-	bg_event 5, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script
+	bg_event  8,  1, BGEVENT_READ, MapSproutTower3FSignpost5Script
+	bg_event 11,  1, BGEVENT_READ, MapSproutTower3FSignpost5Script
+	bg_event  9,  0, BGEVENT_READ, MapSproutTower3FSignpost3Script
+	bg_event 10,  0, BGEVENT_READ, MapSproutTower3FSignpost3Script
+	bg_event  5, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script
 	bg_event 14, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script
 
 	db 7 ; object events
-	object_event 8, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1
-	object_event 8, 8, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1
-	object_event 10, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1
+	object_event  8, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1
+	object_event  8,  8, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1
+	object_event 10,  2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1
 	object_event 11, 11, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageNeal, -1
-	object_event 6, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION
-	object_event 14, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE
-	object_event 10, 4, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER
+	object_event  6, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION
+	object_event 14,  1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE
+	object_event 10,  4, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index dabd5eef4..c82fcb37c 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -728,62 +728,62 @@ TeamRocketBaseB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 27, 2, MAHOGANY_MART_1F, 3
-	warp_event 3, 14, TEAM_ROCKET_BASE_B2F, 1
-	warp_event 5, 15, TEAM_ROCKET_BASE_B1F, 4
-	warp_event 25, 2, TEAM_ROCKET_BASE_B1F, 3
+	warp_event 27,  2, MAHOGANY_MART_1F, 3
+	warp_event  3, 14, TEAM_ROCKET_BASE_B2F, 1
+	warp_event  5, 15, TEAM_ROCKET_BASE_B1F, 4
+	warp_event 25,  2, TEAM_ROCKET_BASE_B1F, 3
 
 	db 30 ; coord events
 	; There are five security cameras in the base.
 	; Walking in front of one triggers two Rocket Grunts.
-	coord_event 24, 2, 0, SecurityCamera1a
-	coord_event 24, 3, 0, SecurityCamera1b
-	coord_event 6, 2, 0, SecurityCamera2a
-	coord_event 6, 3, 0, SecurityCamera2b
-	coord_event 24, 6, 0, SecurityCamera3a
-	coord_event 24, 7, 0, SecurityCamera3b
+	coord_event 24,  2, 0, SecurityCamera1a
+	coord_event 24,  3, 0, SecurityCamera1b
+	coord_event  6,  2, 0, SecurityCamera2a
+	coord_event  6,  3, 0, SecurityCamera2b
+	coord_event 24,  6, 0, SecurityCamera3a
+	coord_event 24,  7, 0, SecurityCamera3b
 	coord_event 22, 16, 0, SecurityCamera4
-	coord_event 8, 16, 0, SecurityCamera5
+	coord_event  8, 16, 0, SecurityCamera5
 	; There are spots on the floor that trigger a Pokémon battle.
 	; Each Pokémon (Voltorb, Koffing, Geodude) knows Selfdestruct.
-	coord_event 2, 7, SCENE_DEFAULT, ExplodingTrap1
-	coord_event 3, 7, SCENE_DEFAULT, ExplodingTrap2
-	coord_event 4, 7, SCENE_DEFAULT, ExplodingTrap3
-	coord_event 1, 8, SCENE_DEFAULT, ExplodingTrap4
-	coord_event 3, 8, SCENE_DEFAULT, ExplodingTrap5
-	coord_event 5, 8, SCENE_DEFAULT, ExplodingTrap6
-	coord_event 3, 9, SCENE_DEFAULT, ExplodingTrap7
-	coord_event 4, 9, SCENE_DEFAULT, ExplodingTrap8
-	coord_event 1, 10, SCENE_DEFAULT, ExplodingTrap9
-	coord_event 2, 10, SCENE_DEFAULT, ExplodingTrap10
-	coord_event 3, 10, SCENE_DEFAULT, ExplodingTrap11
-	coord_event 5, 10, SCENE_DEFAULT, ExplodingTrap12
-	coord_event 2, 11, SCENE_DEFAULT, ExplodingTrap13
-	coord_event 4, 11, SCENE_DEFAULT, ExplodingTrap14
-	coord_event 1, 12, SCENE_DEFAULT, ExplodingTrap15
-	coord_event 2, 12, SCENE_DEFAULT, ExplodingTrap16
-	coord_event 4, 12, SCENE_DEFAULT, ExplodingTrap17
-	coord_event 5, 12, SCENE_DEFAULT, ExplodingTrap18
-	coord_event 1, 13, SCENE_DEFAULT, ExplodingTrap19
-	coord_event 3, 13, SCENE_DEFAULT, ExplodingTrap20
-	coord_event 4, 13, SCENE_DEFAULT, ExplodingTrap21
-	coord_event 5, 13, SCENE_DEFAULT, ExplodingTrap22
+	coord_event  2,  7, SCENE_DEFAULT, ExplodingTrap1
+	coord_event  3,  7, SCENE_DEFAULT, ExplodingTrap2
+	coord_event  4,  7, SCENE_DEFAULT, ExplodingTrap3
+	coord_event  1,  8, SCENE_DEFAULT, ExplodingTrap4
+	coord_event  3,  8, SCENE_DEFAULT, ExplodingTrap5
+	coord_event  5,  8, SCENE_DEFAULT, ExplodingTrap6
+	coord_event  3,  9, SCENE_DEFAULT, ExplodingTrap7
+	coord_event  4,  9, SCENE_DEFAULT, ExplodingTrap8
+	coord_event  1, 10, SCENE_DEFAULT, ExplodingTrap9
+	coord_event  2, 10, SCENE_DEFAULT, ExplodingTrap10
+	coord_event  3, 10, SCENE_DEFAULT, ExplodingTrap11
+	coord_event  5, 10, SCENE_DEFAULT, ExplodingTrap12
+	coord_event  2, 11, SCENE_DEFAULT, ExplodingTrap13
+	coord_event  4, 11, SCENE_DEFAULT, ExplodingTrap14
+	coord_event  1, 12, SCENE_DEFAULT, ExplodingTrap15
+	coord_event  2, 12, SCENE_DEFAULT, ExplodingTrap16
+	coord_event  4, 12, SCENE_DEFAULT, ExplodingTrap17
+	coord_event  5, 12, SCENE_DEFAULT, ExplodingTrap18
+	coord_event  1, 13, SCENE_DEFAULT, ExplodingTrap19
+	coord_event  3, 13, SCENE_DEFAULT, ExplodingTrap20
+	coord_event  4, 13, SCENE_DEFAULT, ExplodingTrap21
+	coord_event  5, 13, SCENE_DEFAULT, ExplodingTrap22
 
 	db 9 ; bg events
 	bg_event 19, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost0Script
-	bg_event 24, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
-	bg_event 6, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
-	bg_event 8, 15, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
+	bg_event 24,  1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
+	bg_event  6,  1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
+	bg_event  8, 15, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
 	bg_event 22, 15, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
-	bg_event 24, 5, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
+	bg_event 24,  5, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
 	bg_event 20, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script
 	bg_event 21, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script
-	bg_event 3, 11, BGEVENT_ITEM, TeamRocketBaseB1FHiddenRevive
+	bg_event  3, 11, BGEVENT_ITEM, TeamRocketBaseB1FHiddenRevive
 
 	db 6 ; object events
-	object_event 0, 0, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS
-	object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event  0,  0, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS
+	object_event  2,  4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION
 	object_event 18, 12, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event 27, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FHyperPotion, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION
+	object_event 27,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FHyperPotion, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION
 	object_event 14, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FNugget, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET
 	object_event 21, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FGuardSpec, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 67130dd45..1b3d536f6 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -910,60 +910,60 @@ TeamRocketBaseB2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 3, 14, TEAM_ROCKET_BASE_B1F, 2
-	warp_event 3, 2, TEAM_ROCKET_BASE_B3F, 1
-	warp_event 27, 2, TEAM_ROCKET_BASE_B3F, 2
-	warp_event 3, 6, TEAM_ROCKET_BASE_B3F, 3
+	warp_event  3, 14, TEAM_ROCKET_BASE_B1F, 2
+	warp_event  3,  2, TEAM_ROCKET_BASE_B3F, 1
+	warp_event 27,  2, TEAM_ROCKET_BASE_B3F, 2
+	warp_event  3,  6, TEAM_ROCKET_BASE_B3F, 3
 	warp_event 27, 14, TEAM_ROCKET_BASE_B3F, 4
 
 	db 9 ; coord events
-	coord_event 5, 14, SCENE_DEFAULT, LanceHealsScript1
-	coord_event 4, 13, SCENE_DEFAULT, LanceHealsScript2
+	coord_event  5, 14, SCENE_DEFAULT, LanceHealsScript1
+	coord_event  4, 13, SCENE_DEFAULT, LanceHealsScript2
 	coord_event 14, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, UnknownScript_0x6cf95
 	coord_event 15, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, UnknownScript_0x6cf9c
 	coord_event 14, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d075
 	coord_event 15, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d075
-	coord_event 12, 3, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a
+	coord_event 12,  3, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a
 	coord_event 12, 10, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a
 	coord_event 12, 11, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a
 
 	db 23 ; bg events
 	bg_event 14, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
 	bg_event 15, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
-	bg_event 17, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 16, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 15, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 14, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 13, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 12, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 12, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 12, 7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 12, 6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 12, 5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 12, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 13, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 14, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 15, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 16, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 17, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 17, 5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 17, 6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 17, 7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 17, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 26, 7, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal
+	bg_event 17,  9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 16,  9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 15,  9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 14,  9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 13,  9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 12,  9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 12,  8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 12,  7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 12,  6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 12,  5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 12,  4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 13,  4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 14,  4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 15,  4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 16,  4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 17,  4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 17,  5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 17,  6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 17,  7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 17,  8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 26,  7, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal
 
 	db 14 ; object events
 	object_event 20, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE
 	object_event 20, 16, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE
-	object_event 5, 13, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE
-	object_event 9, 13, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE
-	object_event 7, 5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode1, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
-	object_event 7, 7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode2, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
-	object_event 7, 9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode3, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
-	object_event 22, 5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
-	object_event 22, 7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
-	object_event 22, 9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
+	object_event  5, 13, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE
+	object_event  9, 13, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE
+	object_event  7,  5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode1, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
+	object_event  7,  7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode2, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
+	object_event  7,  9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode3, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
+	object_event 22,  5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
+	object_event 22,  7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
+	object_event 22,  9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
 	object_event 25, 13, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event 4, 1, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event  4,  1, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION
 	object_event 21, 14, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event 3, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB2FTMThief, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF
+	object_event  3, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB2FTMThief, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index 2b72232fa..86b42908a 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -567,40 +567,40 @@ TeamRocketBaseB3F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 3, 2, TEAM_ROCKET_BASE_B2F, 2
-	warp_event 27, 2, TEAM_ROCKET_BASE_B2F, 3
-	warp_event 3, 6, TEAM_ROCKET_BASE_B2F, 4
+	warp_event  3,  2, TEAM_ROCKET_BASE_B2F, 2
+	warp_event 27,  2, TEAM_ROCKET_BASE_B2F, 3
+	warp_event  3,  6, TEAM_ROCKET_BASE_B2F, 4
 	warp_event 27, 14, TEAM_ROCKET_BASE_B2F, 5
 
 	db 3 ; coord events
-	coord_event 10, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e04b
-	coord_event 11, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e052
-	coord_event 8, 10, SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER, RocketBaseRival
+	coord_event 10,  8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e04b
+	coord_event 11,  8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e052
+	coord_event  8, 10, SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER, RocketBaseRival
 
 	db 10 ; bg events
-	bg_event 10, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor
-	bg_event 11, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor
-	bg_event 10, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 11, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 12, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 13, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 4, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 5, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 6, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 7, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event 10,  9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor
+	bg_event 11,  9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor
+	bg_event 10,  1, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event 11,  1, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event 12,  1, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event 13,  1, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event  4, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event  5, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event  6, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event  7, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
 
 	db 14 ; object events
 	object_event 25, 14, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceGetPasswordScript, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS
-	object_event 8, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE
-	object_event 7, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event 21, 7, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, SlowpokeTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event 5, 14, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, RaticateTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event  8,  3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE
+	object_event  7,  2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event 21,  7, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, SlowpokeTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event  5, 14, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, RaticateTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION
 	object_event 23, 11, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION
 	object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION
 	object_event 24, 14, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeamRocketBaseB3FRocketScript, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event 4, 5, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE
-	object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN
-	object_event 3, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL
-	object_event 28, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FFullHeal, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL
-	object_event 17, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FIceHeal, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL
+	object_event  4,  5, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE
+	object_event  1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN
+	object_event  3, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL
+	object_event 28,  9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FFullHeal, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL
+	object_event 17,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FIceHeal, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL
 	object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FUltraBall, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index dc56ead92..c346ab10a 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -55,15 +55,15 @@ TimeCapsule_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 7, POKECENTER_2F, 4
-	warp_event 5, 7, POKECENTER_2F, 4
+	warp_event  4,  7, POKECENTER_2F, 4
+	warp_event  5,  7, POKECENTER_2F, 4
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 4, 4, BGEVENT_RIGHT, MapTimeCapsuleSignpost1Script
-	bg_event 5, 4, BGEVENT_LEFT, MapTimeCapsuleSignpost1Script
+	bg_event  4,  4, BGEVENT_RIGHT, MapTimeCapsuleSignpost1Script
+	bg_event  5,  4, BGEVENT_LEFT, MapTimeCapsuleSignpost1Script
 
 	db 2 ; object events
-	object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
-	object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
+	object_event  3,  4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	object_event  6,  4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index 419173628..e161ac071 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -524,22 +524,22 @@ TinTower1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 9, 15, ECRUTEAK_CITY, 12
+	warp_event  9, 15, ECRUTEAK_CITY, 12
 	warp_event 10, 15, ECRUTEAK_CITY, 12
-	warp_event 10, 2, TIN_TOWER_2F, 2
+	warp_event 10,  2, TIN_TOWER_2F, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 10 ; object events
-	object_event 9, 9, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE
-	object_event 7, 9, SPRITE_RAIKOU, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU
-	object_event 12, 9, SPRITE_ENTEI, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI
-	object_event 8, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE
-	object_event 5, 9, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage1Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
+	object_event  9,  9, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE
+	object_event  7,  9, SPRITE_RAIKOU, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU
+	object_event 12,  9, SPRITE_ENTEI, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI
+	object_event  8,  3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE
+	object_event  5,  9, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage1Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
 	object_event 11, 11, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage2Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
-	object_event 14, 6, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage3Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
-	object_event 4, 2, SPRITE_SAGE, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage4Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2
-	object_event 9, 1, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage5Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2
-	object_event 14, 2, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage6Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2
+	object_event 14,  6, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage3Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
+	object_event  4,  2, SPRITE_SAGE, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage4Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2
+	object_event  9,  1, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage5Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2
+	object_event 14,  2, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage6Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2
diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm
index e23ce1e6a..280ab059c 100644
--- a/maps/TinTower2F.asm
+++ b/maps/TinTower2F.asm
@@ -8,7 +8,7 @@ TinTower2F_MapEvents:
 
 	db 2 ; warp events
 	warp_event 10, 14, TIN_TOWER_3F, 1
-	warp_event 10, 2, TIN_TOWER_1F, 3
+	warp_event 10,  2, TIN_TOWER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm
index 61eebad8f..c089d8124 100644
--- a/maps/TinTower3F.asm
+++ b/maps/TinTower3F.asm
@@ -14,11 +14,11 @@ TinTower3F_MapEvents:
 
 	db 2 ; warp events
 	warp_event 10, 14, TIN_TOWER_2F, 1
-	warp_event 16, 2, TIN_TOWER_4F, 2
+	warp_event 16,  2, TIN_TOWER_4F, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 3, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL
+	object_event  3, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL
diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm
index 6f5510f9f..c36365543 100644
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -24,17 +24,17 @@ TinTower4F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 2, 4, TIN_TOWER_5F, 2
-	warp_event 16, 2, TIN_TOWER_3F, 2
-	warp_event 2, 14, TIN_TOWER_5F, 3
+	warp_event  2,  4, TIN_TOWER_5F, 2
+	warp_event 16,  2, TIN_TOWER_3F, 2
+	warp_event  2, 14, TIN_TOWER_5F, 3
 	warp_event 17, 15, TIN_TOWER_5F, 4
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 11, 6, BGEVENT_ITEM, TinTower4FHiddenMaxPotion
+	bg_event 11,  6, BGEVENT_ITEM, TinTower4FHiddenMaxPotion
 
 	db 3 ; object events
 	object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL
 	object_event 17, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP
-	object_event 2, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE
+	object_event  2, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE
diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm
index bcd38389a..cff375b3d 100644
--- a/maps/TinTower5F.asm
+++ b/maps/TinTower5F.asm
@@ -20,15 +20,15 @@ TinTower5F_MapEvents:
 
 	db 4 ; warp events
 	warp_event 11, 15, TIN_TOWER_6F, 2
-	warp_event 2, 4, TIN_TOWER_4F, 1
-	warp_event 2, 14, TIN_TOWER_4F, 3
+	warp_event  2,  4, TIN_TOWER_4F, 1
+	warp_event  2, 14, TIN_TOWER_4F, 3
 	warp_event 17, 15, TIN_TOWER_4F, 4
 
 	db 0 ; coord events
 
 	db 2 ; bg events
 	bg_event 16, 14, BGEVENT_ITEM, TinTower5FHiddenFullRestore
-	bg_event 3, 15, BGEVENT_ITEM, TinTower5FHiddenCarbos
+	bg_event  3, 15, BGEVENT_ITEM, TinTower5FHiddenCarbos
 
 	db 1 ; object events
-	object_event 9, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY
+	object_event  9,  9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY
diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm
index 654aa942f..9fa17a0a2 100644
--- a/maps/TinTower6F.asm
+++ b/maps/TinTower6F.asm
@@ -13,7 +13,7 @@ TinTower6F_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 9, TIN_TOWER_7F, 1
+	warp_event  3,  9, TIN_TOWER_7F, 1
 	warp_event 11, 15, TIN_TOWER_5F, 1
 
 	db 0 ; coord events
@@ -21,4 +21,4 @@ TinTower6F_MapEvents:
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 8, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION
+	object_event  8,  8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION
diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm
index 44868df45..5025fbbe9 100644
--- a/maps/TinTower7F.asm
+++ b/maps/TinTower7F.asm
@@ -13,15 +13,15 @@ TinTower7F_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 3, 9, TIN_TOWER_6F, 1
+	warp_event  3,  9, TIN_TOWER_6F, 1
 	warp_event 10, 15, TIN_TOWER_8F, 1
-	warp_event 12, 7, TIN_TOWER_7F, 4
-	warp_event 8, 3, TIN_TOWER_7F, 3
-	warp_event 6, 9, TIN_TOWER_9F, 5
+	warp_event 12,  7, TIN_TOWER_7F, 4
+	warp_event  8,  3, TIN_TOWER_7F, 3
+	warp_event  6,  9, TIN_TOWER_9F, 5
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 16, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE
+	object_event 16,  1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE
diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm
index fa9968b64..c39f118eb 100644
--- a/maps/TinTower8F.asm
+++ b/maps/TinTower8F.asm
@@ -21,18 +21,18 @@ TinTower8F_MapEvents:
 	db 0, 0 ; filler
 
 	db 6 ; warp events
-	warp_event 2, 5, TIN_TOWER_7F, 2
-	warp_event 2, 11, TIN_TOWER_9F, 1
-	warp_event 16, 7, TIN_TOWER_9F, 2
-	warp_event 10, 3, TIN_TOWER_9F, 3
+	warp_event  2,  5, TIN_TOWER_7F, 2
+	warp_event  2, 11, TIN_TOWER_9F, 1
+	warp_event 16,  7, TIN_TOWER_9F, 2
+	warp_event 10,  3, TIN_TOWER_9F, 3
 	warp_event 14, 15, TIN_TOWER_9F, 6
-	warp_event 6, 9, TIN_TOWER_9F, 7
+	warp_event  6,  9, TIN_TOWER_9F, 7
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET
-	object_event 11, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER
-	object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE
+	object_event  7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET
+	object_event 11,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER
+	object_event  3,  1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE
diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm
index f7a0965e5..9de6a607d 100644
--- a/maps/TinTower9F.asm
+++ b/maps/TinTower9F.asm
@@ -23,17 +23,17 @@ TinTower9F_MapEvents:
 	db 0, 0 ; filler
 
 	db 7 ; warp events
-	warp_event 12, 3, TIN_TOWER_8F, 2
-	warp_event 2, 5, TIN_TOWER_8F, 3
-	warp_event 12, 7, TIN_TOWER_8F, 4
-	warp_event 7, 9, TIN_TOWER_ROOF, 1
-	warp_event 16, 7, TIN_TOWER_7F, 5
-	warp_event 6, 13, TIN_TOWER_8F, 5
-	warp_event 8, 13, TIN_TOWER_8F, 6
+	warp_event 12,  3, TIN_TOWER_8F, 2
+	warp_event  2,  5, TIN_TOWER_8F, 3
+	warp_event 12,  7, TIN_TOWER_8F, 4
+	warp_event  7,  9, TIN_TOWER_ROOF, 1
+	warp_event 16,  7, TIN_TOWER_7F, 5
+	warp_event  6, 13, TIN_TOWER_8F, 5
+	warp_event  8, 13, TIN_TOWER_8F, 6
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 9, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP
+	object_event  9,  1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP
diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm
index c03c47c50..33971dd1d 100644
--- a/maps/TinTowerRoof.asm
+++ b/maps/TinTowerRoof.asm
@@ -46,11 +46,11 @@ TinTowerRoof_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 9, 13, TIN_TOWER_9F, 4
+	warp_event  9, 13, TIN_TOWER_9F, 4
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 9, 5, SPRITE_HO_OH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH
+	object_event  9,  5, SPRITE_HO_OH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH
diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm
index 272d4a905..4a57e3d2a 100644
--- a/maps/TohjoFalls.asm
+++ b/maps/TohjoFalls.asm
@@ -21,4 +21,4 @@ TohjoFalls_MapEvents:
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE
+	object_event  2,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index c690a9546..eff2e414a 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -55,15 +55,15 @@ TradeCenter_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 7, POKECENTER_2F, 2
-	warp_event 5, 7, POKECENTER_2F, 2
+	warp_event  4,  7, POKECENTER_2F, 2
+	warp_event  5,  7, POKECENTER_2F, 2
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 4, 4, BGEVENT_RIGHT, MapTradeCenterSignpost1Script
-	bg_event 5, 4, BGEVENT_LEFT, MapTradeCenterSignpost1Script
+	bg_event  4,  4, BGEVENT_RIGHT, MapTradeCenterSignpost1Script
+	bg_event  5,  4, BGEVENT_LEFT, MapTradeCenterSignpost1Script
 
 	db 2 ; object events
-	object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
-	object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
+	object_event  3,  4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	object_event  6,  4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm
index 2bcfe9a3d..93aa852a4 100644
--- a/maps/TrainerHouse1F.asm
+++ b/maps/TrainerHouse1F.asm
@@ -139,20 +139,20 @@ TrainerHouse1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 2, 13, VIRIDIAN_CITY, 3
-	warp_event 3, 13, VIRIDIAN_CITY, 3
-	warp_event 8, 2, TRAINER_HOUSE_B1F, 1
+	warp_event  2, 13, VIRIDIAN_CITY, 3
+	warp_event  3, 13, VIRIDIAN_CITY, 3
+	warp_event  8,  2, TRAINER_HOUSE_B1F, 1
 
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event 5, 0, BGEVENT_READ, MapTrainerHouse1FSignpost0Script
-	bg_event 7, 0, BGEVENT_READ, MapTrainerHouse1FSignpost1Script
-	bg_event 7, 10, BGEVENT_READ, MapTrainerHouse1FSignpost2Script
+	bg_event  5,  0, BGEVENT_READ, MapTrainerHouse1FSignpost0Script
+	bg_event  7,  0, BGEVENT_READ, MapTrainerHouse1FSignpost1Script
+	bg_event  7, 10, BGEVENT_READ, MapTrainerHouse1FSignpost2Script
 
 	db 5 ; object events
-	object_event 0, 11, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1
-	object_event 7, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1
-	object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1
-	object_event 4, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FYoungsterScript, -1
-	object_event 2, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FGentlemanScript, -1
+	object_event  0, 11, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1
+	object_event  7, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1
+	object_event  6,  2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1
+	object_event  4,  8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FYoungsterScript, -1
+	object_event  2,  4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FGentlemanScript, -1
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index 7d011b7c8..1f654edcd 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -171,13 +171,13 @@ TrainerHouseB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 9, 4, TRAINER_HOUSE_1F, 3
+	warp_event  9,  4, TRAINER_HOUSE_1F, 3
 
 	db 1 ; coord events
-	coord_event 7, 3, SCENE_DEFAULT, TrainerHouseReceptionistScript
+	coord_event  7,  3, SCENE_DEFAULT, TrainerHouseReceptionistScript
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 7, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
-	object_event 6, 11, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
+	object_event  7,  1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
+	object_event  6, 11, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm
index 2bbb50e4b..72e8cd749 100644
--- a/maps/UndergroundPath.asm
+++ b/maps/UndergroundPath.asm
@@ -13,13 +13,13 @@ UndergroundPath_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 2, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 3
-	warp_event 3, 24, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 3
+	warp_event  3,  2, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 3
+	warp_event  3, 24, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 3
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 3, 9, BGEVENT_ITEM, UndergroundPathHiddenFullRestore
-	bg_event 1, 19, BGEVENT_ITEM, UndergroundPathHiddenXSpecial
+	bg_event  3,  9, BGEVENT_ITEM, UndergroundPathHiddenFullRestore
+	bg_event  1, 19, BGEVENT_ITEM, UndergroundPathHiddenXSpecial
 
 	db 0 ; object events
diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm
index 04bae9c63..cafc30144 100644
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -201,22 +201,22 @@ UnionCave1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 5, 19, UNION_CAVE_B1F, 3
-	warp_event 3, 33, UNION_CAVE_B1F, 4
+	warp_event  5, 19, UNION_CAVE_B1F, 3
+	warp_event  3, 33, UNION_CAVE_B1F, 4
 	warp_event 17, 31, ROUTE_33, 1
-	warp_event 17, 3, ROUTE_32, 4
+	warp_event 17,  3, ROUTE_32, 4
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 9 ; object events
-	object_event 3, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerDaniel, -1
-	object_event 4, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacLarry, -1
-	object_event 11, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerRussell, -1
+	object_event  3,  6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerDaniel, -1
+	object_event  4, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacLarry, -1
+	object_event 11,  8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerRussell, -1
 	object_event 15, 27, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerFirebreatherRay, -1
 	object_event 14, 19, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerFirebreatherBill, -1
 	object_event 17, 21, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FGreatBall, EVENT_UNION_CAVE_1F_GREAT_BALL
-	object_event 4, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK
-	object_event 4, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION
+	object_event  4,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK
+	object_event  4, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION
 	object_event 12, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FAwakening, EVENT_UNION_CAVE_1F_AWAKENING
diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm
index 844e2dd64..2a737c315 100644
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -154,10 +154,10 @@ UnionCaveB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 3, 3, RUINS_OF_ALPH_OUTSIDE, 7
-	warp_event 3, 11, RUINS_OF_ALPH_OUTSIDE, 8
-	warp_event 7, 19, UNION_CAVE_1F, 1
-	warp_event 3, 33, UNION_CAVE_1F, 2
+	warp_event  3,  3, RUINS_OF_ALPH_OUTSIDE, 7
+	warp_event  3, 11, RUINS_OF_ALPH_OUTSIDE, 8
+	warp_event  7, 19, UNION_CAVE_1F, 1
+	warp_event  3, 33, UNION_CAVE_1F, 2
 	warp_event 17, 31, UNION_CAVE_B2F, 1
 
 	db 0 ; coord events
@@ -165,10 +165,10 @@ UnionCaveB1F_MapEvents:
 	db 0 ; bg events
 
 	db 7 ; object events
-	object_event 9, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerPhillip, -1
-	object_event 16, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerLeonard, -1
-	object_event 5, 32, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1
+	object_event  9,  4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerPhillip, -1
+	object_event 16,  7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerLeonard, -1
+	object_event  5, 32, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1
 	object_event 17, 30, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacCalvin, -1
-	object_event 2, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FTMSwift, EVENT_UNION_CAVE_B1F_TM_SWIFT
-	object_event 7, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, UnionCaveB1FBoulder, -1
+	object_event  2, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FTMSwift, EVENT_UNION_CAVE_B1F_TM_SWIFT
+	object_event  7, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, UnionCaveB1FBoulder, -1
 	object_event 17, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FXDefend, EVENT_UNION_CAVE_B1F_X_DEFEND
diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm
index f33251e69..1aee3f499 100644
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -143,7 +143,7 @@ UnionCaveB2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 5, 3, UNION_CAVE_B1F, 5
+	warp_event  5,  3, UNION_CAVE_B1F, 5
 
 	db 0 ; coord events
 
@@ -151,8 +151,8 @@ UnionCaveB2F_MapEvents:
 
 	db 6 ; object events
 	object_event 15, 19, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermNick, -1
-	object_event 5, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1
-	object_event 3, 30, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1
-	object_event 16, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER
+	object_event  5, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1
+	object_event  3, 30, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1
+	object_event 16,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER
 	object_event 12, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION
 	object_event 11, 31, SPRITE_SURF, SPRITEMOVEDATA_SWIM_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS
diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm
index 85dd629c6..781bf2ad1 100644
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -269,33 +269,33 @@ VermilionCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 10 ; warp events
-	warp_event 5, 5, VERMILION_FISHING_SPEECH_HOUSE, 1
-	warp_event 9, 5, VERMILION_POKECENTER_1F, 1
-	warp_event 7, 13, POKEMON_FAN_CLUB, 1
+	warp_event  5,  5, VERMILION_FISHING_SPEECH_HOUSE, 1
+	warp_event  9,  5, VERMILION_POKECENTER_1F, 1
+	warp_event  7, 13, POKEMON_FAN_CLUB, 1
 	warp_event 13, 13, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 1
 	warp_event 21, 13, VERMILION_MART, 2
 	warp_event 21, 17, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE, 1
 	warp_event 10, 19, VERMILION_GYM, 1
 	warp_event 19, 31, VERMILION_PORT_PASSAGE, 1
 	warp_event 20, 31, VERMILION_PORT_PASSAGE, 2
-	warp_event 34, 7, DIGLETTS_CAVE, 1
+	warp_event 34,  7, DIGLETTS_CAVE, 1
 
 	db 0 ; coord events
 
 	db 8 ; bg events
-	bg_event 25, 3, BGEVENT_READ, VermilionCitySign
-	bg_event 5, 19, BGEVENT_READ, VermilionGymSign
-	bg_event 5, 13, BGEVENT_READ, PokemonFanClubSign
-	bg_event 33, 9, BGEVENT_READ, VermilionCityDiglettsCaveSign
+	bg_event 25,  3, BGEVENT_READ, VermilionCitySign
+	bg_event  5, 19, BGEVENT_READ, VermilionGymSign
+	bg_event  5, 13, BGEVENT_READ, PokemonFanClubSign
+	bg_event 33,  9, BGEVENT_READ, VermilionCityDiglettsCaveSign
 	bg_event 27, 15, BGEVENT_READ, VermilionCityPortSign
-	bg_event 10, 5, BGEVENT_READ, VermilionCityPokecenterSign
+	bg_event 10,  5, BGEVENT_READ, VermilionCityPokecenterSign
 	bg_event 22, 13, BGEVENT_READ, VermilionCityMartSign
 	bg_event 12, 19, BGEVENT_ITEM, VermilionCityHiddenFullHeal
 
 	db 6 ; object events
-	object_event 18, 9, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1
-	object_event 23, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1
-	object_event 26, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1
+	object_event 18,  9, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1
+	object_event 23,  6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1
+	object_event 26,  7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1
 	object_event 14, 16, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionCitySuperNerdScript, -1
-	object_event 34, 8, SPRITE_BIG_SNORLAX, SPRITEMOVEDATA_BIGDOLLSYM, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX
+	object_event 34,  8, SPRITE_BIG_SNORLAX, SPRITEMOVEDATA_BIGDOLLSYM, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX
 	object_event 31, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionGymBadgeGuy, -1
diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm
index 5a78a70af..e6225afa5 100644
--- a/maps/VermilionDiglettsCaveSpeechHouse.asm
+++ b/maps/VermilionDiglettsCaveSpeechHouse.asm
@@ -22,12 +22,12 @@ VermilionDiglettsCaveSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, VERMILION_CITY, 6
-	warp_event 3, 7, VERMILION_CITY, 6
+	warp_event  2,  7, VERMILION_CITY, 6
+	warp_event  3,  7, VERMILION_CITY, 6
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 1, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionDiglettsCaveSpeechHouseGentlemanScript, -1
+	object_event  1,  3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionDiglettsCaveSpeechHouseGentlemanScript, -1
diff --git a/maps/VermilionFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm
index a733fac23..dd333af75 100644
--- a/maps/VermilionFishingSpeechHouse.asm
+++ b/maps/VermilionFishingSpeechHouse.asm
@@ -52,13 +52,13 @@ VermilionFishingSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, VERMILION_CITY, 1
-	warp_event 3, 7, VERMILION_CITY, 1
+	warp_event  2,  7, VERMILION_CITY, 1
+	warp_event  3,  7, VERMILION_CITY, 1
 
 	db 0 ; coord events
 
 	db 1 ; bg events
-	bg_event 3, 0, BGEVENT_READ, FishingDudesHousePhoto
+	bg_event  3,  0, BGEVENT_READ, FishingDudesHousePhoto
 
 	db 1 ; object events
-	object_event 2, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingDude, -1
+	object_event  2,  4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingDude, -1
diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm
index 605cd857e..0dc1dace3 100644
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -262,33 +262,33 @@ VermilionGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 17, VERMILION_CITY, 7
-	warp_event 5, 17, VERMILION_CITY, 7
+	warp_event  4, 17, VERMILION_CITY, 7
+	warp_event  5, 17, VERMILION_CITY, 7
 
 	db 0 ; coord events
 
 	db 17 ; bg events
-	bg_event 1, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 3, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 5, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 7, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 9, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 1, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 3, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 5, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 7, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 9, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 1, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 3, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 5, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 7, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 9, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 3, 15, BGEVENT_READ, VermilionGymStatue
-	bg_event 6, 15, BGEVENT_READ, VermilionGymStatue
+	bg_event  1,  7, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event  3,  7, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event  5,  7, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event  7,  7, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event  9,  7, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event  1,  9, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event  3,  9, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event  5,  9, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event  7,  9, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event  9,  9, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event  1, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event  3, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event  5, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event  7, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event  9, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
+	bg_event  3, 15, BGEVENT_READ, VermilionGymStatue
+	bg_event  6, 15, BGEVENT_READ, VermilionGymStatue
 
 	db 5 ; object events
-	object_event 5, 2, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1
-	object_event 8, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1
-	object_event 4, 7, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 3, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1
-	object_event 0, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerJugglerHorton, -1
-	object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, VermilionGymGuyScript, -1
+	object_event  5,  2, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1
+	object_event  8,  8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1
+	object_event  4,  7, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 3, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1
+	object_event  0, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerJugglerHorton, -1
+	object_event  7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, VermilionGymGuyScript, -1
diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm
index 3dda82a2c..db7f34db7 100644
--- a/maps/VermilionMagnetTrainSpeechHouse.asm
+++ b/maps/VermilionMagnetTrainSpeechHouse.asm
@@ -35,15 +35,15 @@ VermilionMagnetTrainSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, VERMILION_CITY, 4
-	warp_event 3, 7, VERMILION_CITY, 4
+	warp_event  2,  7, VERMILION_CITY, 4
+	warp_event  3,  7, VERMILION_CITY, 4
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 0, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf
+	bg_event  0,  1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf
 
 	db 2 ; object events
-	object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHousePokefanFScript, -1
-	object_event 0, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHouseYoungsterScript, -1
+	object_event  2,  3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHousePokefanFScript, -1
+	object_event  0,  3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHouseYoungsterScript, -1
diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm
index 8e24b1cb7..16a20d380 100644
--- a/maps/VermilionMart.asm
+++ b/maps/VermilionMart.asm
@@ -38,14 +38,14 @@ VermilionMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, VERMILION_CITY, 5
-	warp_event 3, 7, VERMILION_CITY, 5
+	warp_event  2,  7, VERMILION_CITY, 5
+	warp_event  3,  7, VERMILION_CITY, 5
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1
-	object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1
-	object_event 8, 6, SPRITE_BUENA, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1
+	object_event  5,  2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1
+	object_event  8,  6, SPRITE_BUENA, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1
diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm
index 700352d7a..a157028c0 100644
--- a/maps/VermilionPokecenter1F.asm
+++ b/maps/VermilionPokecenter1F.asm
@@ -78,16 +78,16 @@ VermilionPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, VERMILION_CITY, 2
-	warp_event 4, 7, VERMILION_CITY, 2
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, VERMILION_CITY, 2
+	warp_event  4,  7, VERMILION_CITY, 2
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x191603, -1
-	object_event 7, 2, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1
-	object_event 6, 5, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1
-	object_event 1, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FBugCatcherScript, -1
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x191603, -1
+	object_event  7,  2, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1
+	object_event  6,  5, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1
+	object_event  1,  5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FBugCatcherScript, -1
diff --git a/maps/VermilionPokecenter2FBeta.asm b/maps/VermilionPokecenter2FBeta.asm
index 392c44556..6bca09fd0 100644
--- a/maps/VermilionPokecenter2FBeta.asm
+++ b/maps/VermilionPokecenter2FBeta.asm
@@ -7,7 +7,7 @@ VermilionPokecenter2FBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 0, 7, VERMILION_POKECENTER_1F, 3
+	warp_event  0,  7, VERMILION_POKECENTER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index 65dc59834..47a266a46 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -300,16 +300,16 @@ VermilionPort_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 9, 5, VERMILION_PORT_PASSAGE, 5
-	warp_event 7, 17, FAST_SHIP_1F, 1
+	warp_event  9,  5, VERMILION_PORT_PASSAGE, 5
+	warp_event  7, 17, FAST_SHIP_1F, 1
 
 	db 1 ; coord events
-	coord_event 7, 11, SCENE_DEFAULT, UnknownScript_0x74e20
+	coord_event  7, 11, SCENE_DEFAULT, UnknownScript_0x74e20
 
 	db 1 ; bg events
 	bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron
 
 	db 3 ; object events
-	object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
-	object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1
+	object_event  7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
+	object_event  6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1
 	object_event 11, 11, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x74ee6, -1
diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm
index 49756b0d0..1ea12457a 100644
--- a/maps/VermilionPortPassage.asm
+++ b/maps/VermilionPortPassage.asm
@@ -20,15 +20,15 @@ VermilionPortPassage_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 15, 0, VERMILION_CITY, 8
-	warp_event 16, 0, VERMILION_CITY, 9
-	warp_event 15, 4, VERMILION_PORT_PASSAGE, 4
-	warp_event 3, 2, VERMILION_PORT_PASSAGE, 3
-	warp_event 3, 14, VERMILION_PORT, 1
+	warp_event 15,  0, VERMILION_CITY, 8
+	warp_event 16,  0, VERMILION_CITY, 9
+	warp_event 15,  4, VERMILION_PORT_PASSAGE, 4
+	warp_event  3,  2, VERMILION_PORT_PASSAGE, 3
+	warp_event  3, 14, VERMILION_PORT, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 17, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1
+	object_event 17,  1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index 10582779d..80e9f0d2c 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -240,29 +240,29 @@ VictoryRoad_MapEvents:
 	db 0, 0 ; filler
 
 	db 10 ; warp events
-	warp_event 9, 67, VICTORY_ROAD_GATE, 5
-	warp_event 1, 49, VICTORY_ROAD, 3
-	warp_event 1, 35, VICTORY_ROAD, 2
+	warp_event  9, 67, VICTORY_ROAD_GATE, 5
+	warp_event  1, 49, VICTORY_ROAD, 3
+	warp_event  1, 35, VICTORY_ROAD, 2
 	warp_event 13, 31, VICTORY_ROAD, 5
 	warp_event 13, 17, VICTORY_ROAD, 4
 	warp_event 17, 33, VICTORY_ROAD, 7
 	warp_event 17, 19, VICTORY_ROAD, 6
-	warp_event 0, 11, VICTORY_ROAD, 9
-	warp_event 0, 27, VICTORY_ROAD, 8
-	warp_event 13, 5, ROUTE_23, 3
+	warp_event  0, 11, VICTORY_ROAD, 9
+	warp_event  0, 27, VICTORY_ROAD, 8
+	warp_event 13,  5, ROUTE_23, 3
 
 	db 2 ; coord events
-	coord_event 12, 8, SCENE_DEFAULT, UnknownScript_0x74492
-	coord_event 13, 8, SCENE_DEFAULT, UnknownScript_0x744b5
+	coord_event 12,  8, SCENE_DEFAULT, UnknownScript_0x74492
+	coord_event 13,  8, SCENE_DEFAULT, UnknownScript_0x744b5
 
 	db 2 ; bg events
-	bg_event 3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion
-	bg_event 3, 65, BGEVENT_ITEM, VictoryRoadHiddenFullHeal
+	bg_event  3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion
+	bg_event  3, 65, BGEVENT_ITEM, VictoryRoadHiddenFullHeal
 
 	db 6 ; object events
 	object_event 18, 13, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD
-	object_event 3, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE
+	object_event  3, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE
 	object_event 12, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE
 	object_event 18, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullRestore, EVENT_VICTORY_ROAD_FULL_RESTORE
 	object_event 15, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullHeal, EVENT_VICTORY_ROAD_FULL_HEAL
-	object_event 7, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP
+	object_event  7, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP
diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm
index 41dee39ae..9f5c72ef5 100644
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -99,14 +99,14 @@ VictoryRoadGate_MapEvents:
 	db 0, 0 ; filler
 
 	db 8 ; warp events
-	warp_event 17, 7, ROUTE_22, 1
-	warp_event 18, 7, ROUTE_22, 1
-	warp_event 9, 17, ROUTE_26, 1
+	warp_event 17,  7, ROUTE_22, 1
+	warp_event 18,  7, ROUTE_22, 1
+	warp_event  9, 17, ROUTE_26, 1
 	warp_event 10, 17, ROUTE_26, 1
-	warp_event 9, 0, VICTORY_ROAD, 1
-	warp_event 10, 0, VICTORY_ROAD, 1
-	warp_event 1, 7, ROUTE_28, 2
-	warp_event 2, 7, ROUTE_28, 2
+	warp_event  9,  0, VICTORY_ROAD, 1
+	warp_event 10,  0, VICTORY_ROAD, 1
+	warp_event  1,  7, ROUTE_28, 2
+	warp_event  2,  7, ROUTE_28, 2
 
 	db 1 ; coord events
 	coord_event 10, 11, SCENE_DEFAULT, VictoryRoadGateBadgeCheckScene
@@ -114,6 +114,6 @@ VictoryRoadGate_MapEvents:
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 8, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1
-	object_event 7, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER
-	object_event 12, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX
+	object_event  8, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1
+	object_event  7,  5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER
+	object_event 12,  5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
index e56cd9100..7ef3f82b7 100644
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -280,13 +280,13 @@ VioletCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 9 ; warp events
-	warp_event 9, 17, VIOLET_MART, 2
+	warp_event  9, 17, VIOLET_MART, 2
 	warp_event 18, 17, VIOLET_GYM, 1
 	warp_event 30, 17, EARLS_POKEMON_ACADEMY, 1
-	warp_event 3, 15, VIOLET_NICKNAME_SPEECH_HOUSE, 1
+	warp_event  3, 15, VIOLET_NICKNAME_SPEECH_HOUSE, 1
 	warp_event 31, 25, VIOLET_POKECENTER_1F, 1
 	warp_event 21, 29, VIOLET_KYLES_HOUSE, 1
-	warp_event 23, 5, SPROUT_TOWER_1F, 1
+	warp_event 23,  5, SPROUT_TOWER_1F, 1
 	warp_event 39, 24, ROUTE_31_VIOLET_GATE, 1
 	warp_event 39, 25, ROUTE_31_VIOLET_GATE, 2
 
@@ -295,7 +295,7 @@ VioletCity_MapEvents:
 	db 7 ; bg events
 	bg_event 24, 20, BGEVENT_READ, VioletCitySign
 	bg_event 15, 17, BGEVENT_READ, VioletGymSign
-	bg_event 24, 8, BGEVENT_READ, SproutTowerSign
+	bg_event 24,  8, BGEVENT_READ, SproutTowerSign
 	bg_event 27, 17, BGEVENT_READ, EarlsPokemonAcademySign
 	bg_event 32, 25, BGEVENT_READ, VioletCityPokecenterSign
 	bg_event 10, 17, BGEVENT_READ, VioletCityMartSign
@@ -306,7 +306,7 @@ VioletCity_MapEvents:
 	object_event 28, 28, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityLassScript, -1
 	object_event 24, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1
 	object_event 17, 20, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityGrampsScript, -1
-	object_event 5, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1
+	object_event  5, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1
 	object_event 14, 29, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityFruitTreeScript, -1
-	object_event 4, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP
-	object_event 35, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY
+	object_event  4,  1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP
+	object_event 35,  5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
index a030379f9..174ff61a3 100644
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -283,17 +283,17 @@ VioletGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 15, VIOLET_CITY, 2
-	warp_event 5, 15, VIOLET_CITY, 2
+	warp_event  4, 15, VIOLET_CITY, 2
+	warp_event  5, 15, VIOLET_CITY, 2
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 3, 13, BGEVENT_READ, VioletGymStatue
-	bg_event 6, 13, BGEVENT_READ, VioletGymStatue
+	bg_event  3, 13, BGEVENT_READ, VioletGymStatue
+	bg_event  6, 13, BGEVENT_READ, VioletGymStatue
 
 	db 4 ; object events
-	object_event 5, 1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1
-	object_event 7, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1
-	object_event 2, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1
-	object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1
+	object_event  5,  1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1
+	object_event  7,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1
+	object_event  2, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1
+	object_event  7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1
diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm
index 2766556dd..eb9062708 100644
--- a/maps/VioletKylesHouse.asm
+++ b/maps/VioletKylesHouse.asm
@@ -34,13 +34,13 @@ VioletKylesHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 7, VIOLET_CITY, 6
-	warp_event 4, 7, VIOLET_CITY, 6
+	warp_event  3,  7, VIOLET_CITY, 6
+	warp_event  4,  7, VIOLET_CITY, 6
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 2 ; object events
-	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1
-	object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Kyle, -1
+	object_event  2,  3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1
+	object_event  6,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Kyle, -1
diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm
index 428ae18c9..80b7507c8 100644
--- a/maps/VioletMart.asm
+++ b/maps/VioletMart.asm
@@ -50,14 +50,14 @@ VioletMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, VIOLET_CITY, 1
-	warp_event 3, 7, VIOLET_CITY, 1
+	warp_event  2,  7, VIOLET_CITY, 1
+	warp_event  3,  7, VIOLET_CITY, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x68295, -1
-	object_event 7, 6, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartGrannyScript, -1
-	object_event 5, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x68295, -1
+	object_event  7,  6, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartGrannyScript, -1
+	object_event  5,  2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1
diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm
index a59c2e6c1..2054d9da3 100644
--- a/maps/VioletNicknameSpeechHouse.asm
+++ b/maps/VioletNicknameSpeechHouse.asm
@@ -46,14 +46,14 @@ VioletNicknameSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 3, 7, VIOLET_CITY, 4
-	warp_event 4, 7, VIOLET_CITY, 4
+	warp_event  3,  7, VIOLET_CITY, 4
+	warp_event  4,  7, VIOLET_CITY, 4
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1
-	object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1
-	object_event 5, 2, SPRITE_BIRD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BirdScript_0x693ef, -1
+	object_event  2,  3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1
+	object_event  6,  4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1
+	object_event  5,  2, SPRITE_BIRD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BirdScript_0x693ef, -1
diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm
index efa538493..3452c3a7d 100644
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -217,17 +217,17 @@ VioletPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, VIOLET_CITY, 5
-	warp_event 4, 7, VIOLET_CITY, 5
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, VIOLET_CITY, 5
+	warp_event  4,  7, VIOLET_CITY, 5
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 5 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenterNurse, -1
-	object_event 7, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1
-	object_event 1, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1
-	object_event 8, 1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FYoungsterScript, -1
-	object_event 4, 3, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenterNurse, -1
+	object_event  7,  6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1
+	object_event  1,  4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1
+	object_event  8,  1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FYoungsterScript, -1
+	object_event  4,  3, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER
diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm
index 222fb0a24..70c0b8ced 100644
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -217,8 +217,8 @@ ViridianCity_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 32, 7, VIRIDIAN_GYM, 1
-	warp_event 21, 9, VIRIDIAN_NICKNAME_SPEECH_HOUSE, 1
+	warp_event 32,  7, VIRIDIAN_GYM, 1
+	warp_event 21,  9, VIRIDIAN_NICKNAME_SPEECH_HOUSE, 1
 	warp_event 23, 15, TRAINER_HOUSE_1F, 1
 	warp_event 29, 19, VIRIDIAN_MART, 2
 	warp_event 23, 25, VIRIDIAN_POKECENTER_1F, 1
@@ -227,14 +227,14 @@ ViridianCity_MapEvents:
 
 	db 6 ; bg events
 	bg_event 17, 17, BGEVENT_READ, ViridianCitySign
-	bg_event 27, 7, BGEVENT_READ, ViridianGymSign
-	bg_event 19, 1, BGEVENT_READ, ViridianCityWelcomeSign
+	bg_event 27,  7, BGEVENT_READ, ViridianGymSign
+	bg_event 19,  1, BGEVENT_READ, ViridianCityWelcomeSign
 	bg_event 21, 15, BGEVENT_READ, TrainerHouseSign
 	bg_event 24, 25, BGEVENT_READ, ViridianCityPokecenterSign
 	bg_event 30, 19, BGEVENT_READ, ViridianCityMartSign
 
 	db 4 ; object events
-	object_event 18, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianCityCoffeeGramps, -1
-	object_event 30, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianCityGrampsNearGym, -1
-	object_event 6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianCityDreamEaterFisher, -1
+	object_event 18,  5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianCityCoffeeGramps, -1
+	object_event 30,  8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianCityGrampsNearGym, -1
+	object_event  6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianCityDreamEaterFisher, -1
 	object_event 17, 21, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianCityYoungsterScript, -1
diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm
index ddc29bf5c..ac0003fd5 100644
--- a/maps/ViridianGym.asm
+++ b/maps/ViridianGym.asm
@@ -171,15 +171,15 @@ ViridianGym_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 4, 17, VIRIDIAN_CITY, 1
-	warp_event 5, 17, VIRIDIAN_CITY, 1
+	warp_event  4, 17, VIRIDIAN_CITY, 1
+	warp_event  5, 17, VIRIDIAN_CITY, 1
 
 	db 0 ; coord events
 
 	db 2 ; bg events
-	bg_event 3, 13, BGEVENT_READ, ViridianGymStatue
-	bg_event 6, 13, BGEVENT_READ, ViridianGymStatue
+	bg_event  3, 13, BGEVENT_READ, ViridianGymStatue
+	bg_event  6, 13, BGEVENT_READ, ViridianGymStatue
 
 	db 2 ; object events
-	object_event 5, 3, SPRITE_BLUE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE
-	object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE
+	object_event  5,  3, SPRITE_BLUE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE
+	object_event  7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE
diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm
index 53720ea89..29c73dbaf 100644
--- a/maps/ViridianMart.asm
+++ b/maps/ViridianMart.asm
@@ -38,14 +38,14 @@ ViridianMart_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, VIRIDIAN_CITY, 4
-	warp_event 3, 7, VIRIDIAN_CITY, 4
+	warp_event  2,  7, VIRIDIAN_CITY, 4
+	warp_event  3,  7, VIRIDIAN_CITY, 4
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 3 ; object events
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1
-	object_event 7, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1
-	object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1
+	object_event  7,  2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1
+	object_event  1,  6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1
diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm
index 40431b616..8fd12eb25 100644
--- a/maps/ViridianNicknameSpeechHouse.asm
+++ b/maps/ViridianNicknameSpeechHouse.asm
@@ -63,15 +63,15 @@ ViridianNicknameSpeechHouse_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 2, 7, VIRIDIAN_CITY, 2
-	warp_event 3, 7, VIRIDIAN_CITY, 2
+	warp_event  2,  7, VIRIDIAN_CITY, 2
+	warp_event  3,  7, VIRIDIAN_CITY, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 2, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1
-	object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1
-	object_event 5, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Speary, -1
-	object_event 6, 3, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Rattey, -1
+	object_event  2,  4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1
+	object_event  5,  4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1
+	object_event  5,  2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Speary, -1
+	object_event  6,  3, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Rattey, -1
diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm
index 11b3d8b86..de6288ed3 100644
--- a/maps/ViridianPokecenter1F.asm
+++ b/maps/ViridianPokecenter1F.asm
@@ -73,16 +73,16 @@ ViridianPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 7, VIRIDIAN_CITY, 5
-	warp_event 4, 7, VIRIDIAN_CITY, 5
-	warp_event 0, 7, POKECENTER_2F, 1
+	warp_event  3,  7, VIRIDIAN_CITY, 5
+	warp_event  4,  7, VIRIDIAN_CITY, 5
+	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 4 ; object events
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9b690, -1
-	object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1
-	object_event 5, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1
-	object_event 1, 6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FBugCatcherScript, -1
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9b690, -1
+	object_event  8,  4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1
+	object_event  5,  3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1
+	object_event  1,  6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FBugCatcherScript, -1
diff --git a/maps/ViridianPokecenter2FBeta.asm b/maps/ViridianPokecenter2FBeta.asm
index 7f184eedc..1c22d7dd1 100644
--- a/maps/ViridianPokecenter2FBeta.asm
+++ b/maps/ViridianPokecenter2FBeta.asm
@@ -7,7 +7,7 @@ ViridianPokecenter2FBeta_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 0, 7, VIRIDIAN_POKECENTER_1F, 3
+	warp_event  0,  7, VIRIDIAN_POKECENTER_1F, 3
 
 	db 0 ; coord events
 
diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm
index 1d2eef8df..a38e53a1d 100644
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -42,10 +42,10 @@ WhirlIslandB1F_MapEvents:
 	db 0, 0 ; filler
 
 	db 9 ; warp events
-	warp_event 5, 5, WHIRL_ISLAND_NW, 2
-	warp_event 35, 3, WHIRL_ISLAND_NE, 2
-	warp_event 29, 9, WHIRL_ISLAND_NE, 3
-	warp_event 9, 31, WHIRL_ISLAND_SW, 3
+	warp_event  5,  5, WHIRL_ISLAND_NW, 2
+	warp_event 35,  3, WHIRL_ISLAND_NE, 2
+	warp_event 29,  9, WHIRL_ISLAND_NE, 3
+	warp_event  9, 31, WHIRL_ISLAND_SW, 3
 	warp_event 23, 31, WHIRL_ISLAND_SW, 2
 	warp_event 31, 29, WHIRL_ISLAND_SE, 2
 	warp_event 25, 21, WHIRL_ISLAND_B2F, 1
@@ -55,14 +55,14 @@ WhirlIslandB1F_MapEvents:
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event 30, 4, BGEVENT_ITEM, WhirlIslandB1FHiddenRareCandy
+	bg_event 30,  4, BGEVENT_ITEM, WhirlIslandB1FHiddenRareCandy
 	bg_event 36, 18, BGEVENT_ITEM, WhirlIslandB1FHiddenUltraBall
-	bg_event 2, 23, BGEVENT_ITEM, WhirlIslandB1FHiddenFullRestore
+	bg_event  2, 23, BGEVENT_ITEM, WhirlIslandB1FHiddenFullRestore
 
 	db 6 ; object events
-	object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE
-	object_event 2, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS
+	object_event  7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE
+	object_event  2, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS
 	object_event 33, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM
-	object_event 17, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET
+	object_event 17,  8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET
 	object_event 19, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FEscapeRope, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE
 	object_event 23, 26, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhirlIslandB1FBoulder, -1
diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm
index 3d1ace476..acee9670a 100644
--- a/maps/WhirlIslandB2F.asm
+++ b/maps/WhirlIslandB2F.asm
@@ -21,9 +21,9 @@ WhirlIslandB2F_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 11, 5, WHIRL_ISLAND_B1F, 7
-	warp_event 7, 11, WHIRL_ISLAND_B1F, 8
-	warp_event 7, 25, WHIRL_ISLAND_LUGIA_CHAMBER, 1
+	warp_event 11,  5, WHIRL_ISLAND_B1F, 7
+	warp_event  7, 11, WHIRL_ISLAND_B1F, 8
+	warp_event  7, 25, WHIRL_ISLAND_LUGIA_CHAMBER, 1
 	warp_event 13, 31, WHIRL_ISLAND_SW, 5
 
 	db 0 ; coord events
@@ -32,5 +32,5 @@ WhirlIslandB2F_MapEvents:
 
 	db 3 ; object events
 	object_event 10, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE
-	object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE
-	object_event 5, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER
+	object_event  6,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE
+	object_event  5, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER
diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm
index 83608829d..35e726b5c 100644
--- a/maps/WhirlIslandCave.asm
+++ b/maps/WhirlIslandCave.asm
@@ -7,8 +7,8 @@ WhirlIslandCave_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 7, 5, WHIRL_ISLAND_B1F, 9
-	warp_event 3, 13, WHIRL_ISLAND_NW, 4
+	warp_event  7,  5, WHIRL_ISLAND_B1F, 9
+	warp_event  3, 13, WHIRL_ISLAND_NW, 4
 
 	db 0 ; coord events
 
diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm
index f2b9fab6d..4381a3636 100644
--- a/maps/WhirlIslandLugiaChamber.asm
+++ b/maps/WhirlIslandLugiaChamber.asm
@@ -45,11 +45,11 @@ WhirlIslandLugiaChamber_MapEvents:
 	db 0, 0 ; filler
 
 	db 1 ; warp events
-	warp_event 9, 13, WHIRL_ISLAND_B2F, 3
+	warp_event  9, 13, WHIRL_ISLAND_B2F, 3
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 9, 5, SPRITE_LUGIA, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA
+	object_event  9,  5, SPRITE_LUGIA, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA
diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm
index 10458252e..c13cd7a93 100644
--- a/maps/WhirlIslandNE.asm
+++ b/maps/WhirlIslandNE.asm
@@ -13,8 +13,8 @@ WhirlIslandNE_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 3, 13, ROUTE_41, 2
-	warp_event 17, 3, WHIRL_ISLAND_B1F, 2
+	warp_event  3, 13, ROUTE_41, 2
+	warp_event 17,  3, WHIRL_ISLAND_B1F, 2
 	warp_event 13, 11, WHIRL_ISLAND_B1F, 3
 
 	db 0 ; coord events
diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm
index 6e0f9c4aa..55e4f2d0b 100644
--- a/maps/WhirlIslandNW.asm
+++ b/maps/WhirlIslandNW.asm
@@ -7,10 +7,10 @@ WhirlIslandNW_MapEvents:
 	db 0, 0 ; filler
 
 	db 4 ; warp events
-	warp_event 5, 7, ROUTE_41, 1
-	warp_event 5, 3, WHIRL_ISLAND_B1F, 1
-	warp_event 3, 15, WHIRL_ISLAND_SW, 4
-	warp_event 7, 15, WHIRL_ISLAND_CAVE, 2
+	warp_event  5,  7, ROUTE_41, 1
+	warp_event  5,  3, WHIRL_ISLAND_B1F, 1
+	warp_event  3, 15, WHIRL_ISLAND_SW, 4
+	warp_event  7, 15, WHIRL_ISLAND_CAVE, 2
 
 	db 0 ; coord events
 
diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm
index 9dd6fc3bc..be43871ce 100644
--- a/maps/WhirlIslandSE.asm
+++ b/maps/WhirlIslandSE.asm
@@ -7,8 +7,8 @@ WhirlIslandSE_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
-	warp_event 5, 13, ROUTE_41, 4
-	warp_event 5, 3, WHIRL_ISLAND_B1F, 6
+	warp_event  5, 13, ROUTE_41, 4
+	warp_event  5,  3, WHIRL_ISLAND_B1F, 6
 
 	db 0 ; coord events
 
diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm
index d6ae335b2..66c3fff23 100644
--- a/maps/WhirlIslandSW.asm
+++ b/maps/WhirlIslandSW.asm
@@ -13,10 +13,10 @@ WhirlIslandSW_MapEvents:
 	db 0, 0 ; filler
 
 	db 5 ; warp events
-	warp_event 5, 7, ROUTE_41, 3
-	warp_event 17, 3, WHIRL_ISLAND_B1F, 5
-	warp_event 3, 3, WHIRL_ISLAND_B1F, 4
-	warp_event 3, 15, WHIRL_ISLAND_NW, 3
+	warp_event  5,  7, ROUTE_41, 3
+	warp_event 17,  3, WHIRL_ISLAND_B1F, 5
+	warp_event  3,  3, WHIRL_ISLAND_B1F, 4
+	warp_event  3, 15, WHIRL_ISLAND_NW, 3
 	warp_event 17, 15, WHIRL_ISLAND_B2F, 4
 
 	db 0 ; coord events
@@ -24,4 +24,4 @@ WhirlIslandSW_MapEvents:
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL
+	object_event 15,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm
index 470ff38a3..af3c5091f 100644
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -130,13 +130,13 @@ WillsRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 5, 17, INDIGO_PLATEAU_POKECENTER_1F, 4
-	warp_event 4, 2, KOGAS_ROOM, 1
-	warp_event 5, 2, KOGAS_ROOM, 2
+	warp_event  5, 17, INDIGO_PLATEAU_POKECENTER_1F, 4
+	warp_event  4,  2, KOGAS_ROOM, 1
+	warp_event  5,  2, KOGAS_ROOM, 2
 
 	db 0 ; coord events
 
 	db 0 ; bg events
 
 	db 1 ; object events
-	object_event 5, 7, SPRITE_WILL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WillScript_Battle, -1
+	object_event  5,  7, SPRITE_WILL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WillScript_Battle, -1
diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm
index a98159020..83a8f8f9e 100644
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -346,19 +346,19 @@ WiseTriosRoom_MapEvents:
 	db 0, 0 ; filler
 
 	db 3 ; warp events
-	warp_event 7, 4, ECRUTEAK_CITY, 4
-	warp_event 7, 5, ECRUTEAK_CITY, 5
-	warp_event 1, 4, ECRUTEAK_TIN_TOWER_ENTRANCE, 5
+	warp_event  7,  4, ECRUTEAK_CITY, 4
+	warp_event  7,  5, ECRUTEAK_CITY, 5
+	warp_event  1,  4, ECRUTEAK_TIN_TOWER_ENTRANCE, 5
 
 	db 1 ; coord events
-	coord_event 7, 4, SCENE_DEFAULT, UnknownScript_0x985a3
+	coord_event  7,  4, SCENE_DEFAULT, UnknownScript_0x985a3
 
 	db 0 ; bg events
 
 	db 6 ; object events
-	object_event 6, 2, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
-	object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
-	object_event 7, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
-	object_event 4, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
-	object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
-	object_event 6, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
+	object_event  6,  2, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
+	object_event  6,  7, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
+	object_event  7,  5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
+	object_event  4,  2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
+	object_event  4,  6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
+	object_event  6,  4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2

From 7a532435bf5782d89d09f2f4e0985cf3e90d890f Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Thu, 1 Feb 2018 23:35:28 -0500
Subject: [PATCH 093/135] Missed some SCENE constants

---
 maps/Route34IlexForestGate.asm |  2 +-
 maps/TeamRocketBaseB1F.asm     | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
index 73a1dec20..8d600639e 100644
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -143,7 +143,7 @@ Route34IlexForestGate_MapEvents:
 	warp_event  5,  7, ILEX_FOREST, 1
 
 	db 1 ; coord events
-	coord_event  4,  7, 0, UnknownScript_0x62d3d
+	coord_event  4,  7, SCENE_DEFAULT, UnknownScript_0x62d3d
 
 	db 0 ; bg events
 
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index c82fcb37c..bac4c2b94 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -736,14 +736,14 @@ TeamRocketBaseB1F_MapEvents:
 	db 30 ; coord events
 	; There are five security cameras in the base.
 	; Walking in front of one triggers two Rocket Grunts.
-	coord_event 24,  2, 0, SecurityCamera1a
-	coord_event 24,  3, 0, SecurityCamera1b
-	coord_event  6,  2, 0, SecurityCamera2a
-	coord_event  6,  3, 0, SecurityCamera2b
-	coord_event 24,  6, 0, SecurityCamera3a
-	coord_event 24,  7, 0, SecurityCamera3b
-	coord_event 22, 16, 0, SecurityCamera4
-	coord_event  8, 16, 0, SecurityCamera5
+	coord_event 24,  2, SCENE_DEFAULT, SecurityCamera1a
+	coord_event 24,  3, SCENE_DEFAULT, SecurityCamera1b
+	coord_event  6,  2, SCENE_DEFAULT, SecurityCamera2a
+	coord_event  6,  3, SCENE_DEFAULT, SecurityCamera2b
+	coord_event 24,  6, SCENE_DEFAULT, SecurityCamera3a
+	coord_event 24,  7, SCENE_DEFAULT, SecurityCamera3b
+	coord_event 22, 16, SCENE_DEFAULT, SecurityCamera4
+	coord_event  8, 16, SCENE_DEFAULT, SecurityCamera5
 	; There are spots on the floor that trigger a Pokémon battle.
 	; Each Pokémon (Voltorb, Koffing, Geodude) knows Selfdestruct.
 	coord_event  2,  7, SCENE_DEFAULT, ExplodingTrap1

From b7e44124d31c66cb7de4f8f609a48dd1dba78c96 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Fri, 2 Feb 2018 12:29:42 -0500
Subject: [PATCH 094/135] Fix confusing label

---
 engine/item_effects.asm | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/engine/item_effects.asm b/engine/item_effects.asm
index c2bdd1f61..75ccae6e1 100644
--- a/engine/item_effects.asm
+++ b/engine/item_effects.asm
@@ -355,33 +355,25 @@ ParkBall: ; e8a2
 	ld a, $ff
 .max_1
 
+	; BUG: farcall overwrites a, and GetItemHeldEffect takes b anyway.
+	; This is probably the reason the HELD_CATCH_CHANCE effect is never used.
+	; Uncomment the line below to fix.
 	ld d, a
 	push de
-
-	; BUG: farcall overwrites a,
-	; and GetItemHeldEffect takes b anyway.
-
-	; This is probably the reason
-	; the HELD_CATCH_CHANCE effect
-	; is never used.
-
-	; Uncomment the line below to fix.
-
 	ld a, [BattleMonItem]
 ;	ld b, a
 	farcall GetItemHeldEffect
 	ld a, b
 	cp HELD_CATCH_CHANCE
-
 	pop de
 	ld a, d
-
-	jr nz, .skip_hp_calc
+	jr nz, .max_2
 	add c
-	jr nc, .skip_hp_calc
+	jr nc, .max_2
 	ld a, $ff
-.skip_hp_calc
+.max_2
 
+.skip_hp_calc
 	ld b, a
 	ld [Buffer1], a
 	call Random

From 68d855c21312f871115984ccc932ce28861cf787 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Fri, 2 Feb 2018 21:09:17 -0500
Subject: [PATCH 095/135] Script commands don't have underscores

---
 docs/event_commands.md                        |  16 +-
 engine/events.asm                             |   4 +-
 engine/events/forced_movement.asm             |   8 +-
 engine/events/overworld.asm                   |   4 +-
 engine/events/std_scripts.asm                 | 430 +++++++++---------
 engine/events/whiteout.asm                    |   2 +-
 engine/phone/buenas_password.asm              |  38 +-
 engine/phone/generic_calls.asm                | 388 ++++++++--------
 engine/phone/phone_callers.asm                | 286 ++++++------
 engine/phone/phone_gossip.asm                 |  92 ++--
 engine/phone/phone_scripts.asm                | 282 ++++++------
 engine/scripting.asm                          |  38 +-
 macros/scripts/events.asm                     |  64 +--
 maps/AzaleaGym.asm                            |  14 +-
 maps/BattleTower1F.asm                        |  36 +-
 maps/BattleTowerBattleRoom.asm                |   4 +-
 maps/BattleTowerHallway.asm                   |  16 +-
 maps/BillsFamilysHouse.asm                    |   6 +-
 maps/BillsHouse.asm                           |  12 +-
 maps/BlackthornCity.asm                       |   4 +-
 maps/BlackthornGym1F.asm                      |   6 +-
 maps/BlackthornGym2F.asm                      |   4 +-
 maps/BluesHouse.asm                           |   6 +-
 maps/BurnedTowerB1F.asm                       |   2 +-
 maps/CeladonDeptStore6F.asm                   |  12 +-
 maps/CeladonGameCorner.asm                    |   4 +-
 maps/CeladonGameCornerPrizeRoom.asm           |  30 +-
 maps/CeladonGym.asm                           |  10 +-
 maps/CeladonMansion3F.asm                     |   2 +-
 maps/CeladonPokecenter1F.asm                  |   2 +-
 maps/CeruleanGym.asm                          |   6 +-
 maps/CianwoodGym.asm                          |  12 +-
 maps/DanceTheatre.asm                         |  10 +-
 maps/DayCare.asm                              |   2 +-
 maps/DragonShrine.asm                         |  32 +-
 maps/DragonsDenB1F.asm                        |  12 +-
 maps/EarlsPokemonAcademy.asm                  |  10 +-
 maps/EcruteakGym.asm                          |  12 +-
 maps/ElmsLab.asm                              |  18 +-
 maps/FastShip1F.asm                           |   2 +-
 maps/FastShipB1F.asm                          |  20 +-
 maps/FastShipCabins_NNW_NNE_NE.asm            |  14 +-
 maps/FastShipCabins_SE_SSE_CaptainsCabin.asm  |  14 +-
 maps/FastShipCabins_SW_SSW_NW.asm             |   8 +-
 maps/GoldenrodCity.asm                        |  20 +-
 maps/GoldenrodDeptStore5F.asm                 |  10 +-
 maps/GoldenrodDeptStore6F.asm                 |  12 +-
 maps/GoldenrodGameCorner.asm                  |  36 +-
 maps/GoldenrodGym.asm                         |  12 +-
 maps/GoldenrodHappinessRater.asm              |  10 +-
 maps/GoldenrodPokecenter1F.asm                |   4 +-
 maps/GoldenrodUnderground.asm                 |  58 +--
 ...oldenrodUndergroundSwitchRoomEntrances.asm |  28 +-
 maps/GoldenrodUndergroundWarehouse.asm        |   6 +-
 maps/IlexForest.asm                           |  70 +--
 maps/IndigoPlateauPokecenter1F.asm            |  20 +-
 maps/KurtsHouse.asm                           |  18 +-
 maps/LakeOfRage.asm                           |  14 +-
 maps/LakeOfRageMagikarpHouse.asm              |   6 +-
 maps/MahoganyGym.asm                          |  14 +-
 maps/MahoganyTown.asm                         |   2 +-
 maps/ManiasHouse.asm                          |   8 +-
 maps/MobileBattleRoom.asm                     |   6 +-
 maps/MountMoonSquare.asm                      |   2 +-
 maps/MountMortar1FInside.asm                  |   4 +-
 maps/MountMortar2FInside.asm                  |   2 +-
 maps/MountMortarB1F.asm                       |   2 +-
 maps/NationalPark.asm                         |  26 +-
 maps/OaksLab.asm                              |   4 +-
 maps/OlivineCity.asm                          |   2 +-
 maps/OlivineGym.asm                           |   4 +-
 maps/OlivineLighthouse2F.asm                  |  16 +-
 maps/OlivineLighthouse3F.asm                  |   6 +-
 maps/OlivineLighthouse4F.asm                  |   4 +-
 maps/OlivineLighthouse5F.asm                  |   4 +-
 maps/OlivineLighthouse6F.asm                  |   4 +-
 maps/OlivinePort.asm                          |  22 +-
 maps/PewterGym.asm                            |   2 +-
 maps/Pokecenter2F.asm                         |  28 +-
 maps/PokecomCenterAdminRoomMobile.asm         |   8 +-
 maps/RadioTower1F.asm                         |   8 +-
 maps/RadioTower2F.asm                         |  20 +-
 maps/RadioTower3F.asm                         |   8 +-
 maps/RadioTower4F.asm                         |   8 +-
 maps/RadioTower5F.asm                         |   2 +-
 maps/Route1.asm                               |   4 +-
 maps/Route10South.asm                         |   4 +-
 maps/Route11.asm                              |   8 +-
 maps/Route12.asm                              |   8 +-
 maps/Route13.asm                              |  10 +-
 maps/Route14.asm                              |   6 +-
 maps/Route15.asm                              |  12 +-
 maps/Route16.asm                              |   4 +-
 maps/Route17.asm                              |   8 +-
 maps/Route18.asm                              |   4 +-
 maps/Route19.asm                              |   8 +-
 maps/Route2.asm                               |   6 +-
 maps/Route20.asm                              |   6 +-
 maps/Route21.asm                              |   6 +-
 maps/Route25.asm                              |  14 +-
 maps/Route26.asm                              |  32 +-
 maps/Route27.asm                              |  32 +-
 maps/Route27SandstormHouse.asm                |   2 +-
 maps/Route29.asm                              |   6 +-
 maps/Route3.asm                               |   8 +-
 maps/Route30.asm                              |  20 +-
 maps/Route31.asm                              |  24 +-
 maps/Route32.asm                              |  48 +-
 maps/Route33.asm                              |  16 +-
 maps/Route34.asm                              |  48 +-
 maps/Route35.asm                              |  34 +-
 maps/Route35GoldenrodGate.asm                 |   2 +-
 maps/Route35NationalParkGate.asm              |  24 +-
 maps/Route36.asm                              |  26 +-
 maps/Route36NationalParkGate.asm              |  22 +-
 maps/Route37.asm                              |  10 +-
 maps/Route38.asm                              |  40 +-
 maps/Route39.asm                              |  12 +-
 maps/Route39Barn.asm                          |   6 +-
 maps/Route39Farmhouse.asm                     |   2 +-
 maps/Route4.asm                               |   6 +-
 maps/Route40.asm                              |  12 +-
 maps/Route41.asm                              |  20 +-
 maps/Route42.asm                              |  18 +-
 maps/Route43.asm                              |  36 +-
 maps/Route43Gate.asm                          |   8 +-
 maps/Route44.asm                              |  34 +-
 maps/Route45.asm                              |  30 +-
 maps/Route46.asm                              |  16 +-
 maps/Route6.asm                               |   4 +-
 maps/Route8.asm                               |  10 +-
 maps/Route9.asm                               |  12 +-
 maps/RuinsOfAlphKabutoChamber.asm             |   2 +-
 maps/RuinsOfAlphOutside.asm                   |   6 +-
 maps/RuinsOfAlphResearchCenter.asm            |  12 +-
 maps/SaffronGym.asm                           |   8 +-
 maps/SlowpokeWellB1F.asm                      |   6 +-
 maps/SproutTower1F.asm                        |   2 +-
 maps/SproutTower2F.asm                        |   4 +-
 maps/SproutTower3F.asm                        |   6 +-
 maps/TeamRocketBaseB1F.asm                    |  36 +-
 maps/TeamRocketBaseB2F.asm                    |   8 +-
 maps/TeamRocketBaseB3F.asm                    |   8 +-
 maps/UnionCave1F.asm                          |  10 +-
 maps/UnionCaveB1F.asm                         |   8 +-
 maps/UnionCaveB2F.asm                         |   8 +-
 maps/VermilionCity.asm                        |   6 +-
 maps/VermilionGym.asm                         |   6 +-
 maps/VermilionPort.asm                        |  20 +-
 maps/VictoryRoadGate.asm                      |   2 +-
 maps/VioletGym.asm                            |   8 +-
 maps/VioletPokecenter1F.asm                   |   4 +-
 152 files changed, 1716 insertions(+), 1716 deletions(-)

diff --git a/docs/event_commands.md b/docs/event_commands.md
index 8c6d96481..5a0422474 100644
--- a/docs/event_commands.md
+++ b/docs/event_commands.md
@@ -17,17 +17,17 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
 
 ## `$05`: ptjump script
 
-## `$06`: if_equal byte, script
+## `$06`: ifequal byte, script
 
-## `$07`: if_not_equal byte, script
+## `$07`: ifnotequal byte, script
 
 ## `$08`: iffalse script
 
 ## `$09`: iftrue script
 
-## `$0A`: if_greater_than byte, script
+## `$0A`: ifgreater byte, script
 
-## `$0B`: if_less_than byte, script
+## `$0B`: ifless byte, script
 
 ## `$0C`: jumpstd std_script
 
@@ -213,9 +213,9 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
 
 ## `$65`: `scripttalkafter`
 
-## `$66`: `end_if_just_battled`
+## `$66`: `endifjustbattled`
 
-## `$67`: `check_just_battled`
+## `$67`: `checkjustbattled`
 
 ## `$68`: setlasttalked object_id
 
@@ -303,7 +303,7 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
 
 ## `$92`: reloadandreturn which_method
 
-## `$93`: `end_all`
+## `$93`: `endall`
 
 ## `$94`: pokemart dialog_id, mart_id
 
@@ -347,4 +347,4 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
 
 ## `$A8`: wait duration
 
-## `$A9`: `check_save`
+## `$A9`: `checksave`
diff --git a/engine/events.asm b/engine/events.asm
index fd355744a..a5cb21a63 100644
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -914,8 +914,8 @@ SelectMenuScript: ; 96b5f
 StartMenuCallback:
 SelectMenuCallback: ; 96b66
 	copybytetovar hMenuReturn
-	if_equal HMENURETURN_SCRIPT, .Script
-	if_equal HMENURETURN_ASM, .Asm
+	ifequal HMENURETURN_SCRIPT, .Script
+	ifequal HMENURETURN_ASM, .Asm
 	end
 ; 96b72
 
diff --git a/engine/events/forced_movement.asm b/engine/events/forced_movement.asm
index 136698501..2d03659ff 100755
--- a/engine/events/forced_movement.asm
+++ b/engine/events/forced_movement.asm
@@ -1,9 +1,9 @@
 Script_ForcedMovement:: ; 0x1253d
 	checkcode VAR_FACING
-	if_equal DOWN, .down
-	if_equal UP, .up
-	if_equal LEFT, .left
-	if_equal RIGHT, .right
+	ifequal DOWN, .down
+	ifequal UP, .up
+	ifequal LEFT, .left
+	ifequal RIGHT, .right
 	end
 ; 0x12550
 
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index 713457b68..ac057a750 100755
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -1044,7 +1044,7 @@ Script_UsedStrength: ; 0xcd2d
 AskStrengthScript:
 	callasm TryStrengthOW
 	iffalse .AskStrength
-	if_equal $1, .DontMeetRequirements
+	ifequal $1, .DontMeetRequirements
 	jump .AlreadyUsedStrength
 
 .DontMeetRequirements: ; 0xcd59
@@ -1413,7 +1413,7 @@ UnknownText_0xcf58: ; 0xcf58
 
 AskRockSmashScript: ; 0xcf5d
 	callasm HasRockSmash
-	if_equal 1, .no
+	ifequal 1, .no
 
 	opentext
 	writetext UnknownText_0xcf77
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
index a79e9e679..f075aced4 100644
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -245,12 +245,12 @@ MartSignScript
 
 DayToTextScript:
 	checkcode VAR_WEEKDAY
-	if_equal MONDAY, .Monday
-	if_equal TUESDAY, .Tuesday
-	if_equal WEDNESDAY, .Wednesday
-	if_equal THURSDAY, .Thursday
-	if_equal FRIDAY, .Friday
-	if_equal SATURDAY, .Saturday
+	ifequal MONDAY, .Monday
+	ifequal TUESDAY, .Tuesday
+	ifequal WEDNESDAY, .Wednesday
+	ifequal THURSDAY, .Thursday
+	ifequal FRIDAY, .Friday
+	ifequal SATURDAY, .Saturday
 	stringtotext .SundayText, MEM_BUFFER_0
 	end
 .Monday:
@@ -322,9 +322,9 @@ BugContestResultsScript:
 	waitbutton
 	special BugContestJudging
 	vartomem MEM_BUFFER_0
-	if_equal 1, BugContestResults_FirstPlace
-	if_equal 2, BugContestResults_SecondPlace
-	if_equal 3, BugContestResults_ThirdPlace
+	ifequal 1, BugContestResults_FirstPlace
+	ifequal 2, BugContestResults_SecondPlace
+	ifequal 3, BugContestResults_ThirdPlace
 	farwritetext ContestResults_ConsolationPrizeText
 	buttonsound
 	waitsfx
@@ -349,8 +349,8 @@ BugContestResults_FinishUp
 	special ContestReturnMons
 BugContestResults_DidNotLeaveMons
 	special CheckPartyFullAfterContest
-	if_equal BUGCONTEST_CAUGHT_MON, BugContestResults_CleanUp
-	if_equal BUGCONTEST_NO_CATCH, BugContestResults_CleanUp
+	ifequal BUGCONTEST_CAUGHT_MON, BugContestResults_CleanUp
+	ifequal BUGCONTEST_NO_CATCH, BugContestResults_CleanUp
 	; BUGCONTEST_BOXED_MON
 	farwritetext ContestResults_PartyFullText
 	waitbutton
@@ -624,26 +624,26 @@ InitializeEventsScript:
 AskNumber1MScript:
 	special RandomPhoneMon
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext JackAskNumber1Text
@@ -709,26 +709,26 @@ AskNumber1MScript:
 AskNumber2MScript:
 	special RandomPhoneMon
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext JackAskNumber2Text
@@ -800,26 +800,26 @@ RegisteredNumberMScript:
 
 NumberAcceptedMScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext JackNumberAcceptedText
@@ -924,26 +924,26 @@ NumberAcceptedMScript:
 
 NumberDeclinedMScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext JackNumberDeclinedText
@@ -1048,26 +1048,26 @@ NumberDeclinedMScript:
 
 PhoneFullMScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext JackPhoneFullText
@@ -1172,23 +1172,23 @@ PhoneFullMScript:
 
 RematchMScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext JackRematchText
@@ -1278,13 +1278,13 @@ RematchMScript:
 
 GiftMScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
 
 .Jose:
 	farwritetext JoseGiftText
@@ -1317,17 +1317,17 @@ GiftMScript:
 
 PackFullMScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Huey:
 	farwritetext HueyPackFullText
@@ -1388,10 +1388,10 @@ PackFullMScript:
 RematchGiftMScript:
 	opentext
 	checkcode VAR_CALLERID
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Huey:
 	farwritetext HueyRematchGiftText
@@ -1412,14 +1412,14 @@ RematchGiftMScript:
 
 AskNumber1FScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext BeverlyAskNumber1Text
@@ -1448,14 +1448,14 @@ AskNumber1FScript:
 
 AskNumber2FScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext BeverlyAskNumber2Text
@@ -1491,14 +1491,14 @@ RegisteredNumberFScript:
 
 NumberAcceptedFScript: ; 0xbcbd3
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext BeverlyNumberAcceptedText
@@ -1543,14 +1543,14 @@ NumberAcceptedFScript: ; 0xbcbd3
 
 NumberDeclinedFScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext BeverlyNumberDeclinedText
@@ -1595,14 +1595,14 @@ NumberDeclinedFScript:
 
 PhoneFullFScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext BeverlyPhoneFullText
@@ -1647,13 +1647,13 @@ PhoneFullFScript:
 
 RematchFScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beth:
 	farwritetext BethRematchText
@@ -1693,10 +1693,10 @@ RematchFScript:
 
 GiftFScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
 
 .Beverly:
 	farwritetext BeverlyGiftText
@@ -1717,11 +1717,11 @@ GiftFScript:
 
 PackFullFScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext BeverlyPackFullText
@@ -1751,7 +1751,7 @@ PackFullFScript:
 
 RematchGiftFScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Erin:
 	opentext
@@ -1814,16 +1814,16 @@ CoinVendor_IntroScript: ; 0xbcde0
 	loadmenuheader .MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .Buy50
-	if_equal 2, .Buy500
+	ifequal 1, .Buy50
+	ifequal 2, .Buy500
 	jump .Cancel
 ; 0xbcdf7
 
 .Buy50: ; 0xbcdf7
 	checkcoins MAX_COINS - 50
-	if_equal HAVE_MORE, .CoinCaseFull
+	ifequal HAVE_MORE, .CoinCaseFull
 	checkmoney YOUR_MONEY, 1000
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	givecoins 50
 	takemoney YOUR_MONEY, 1000
 	waitsfx
@@ -1835,9 +1835,9 @@ CoinVendor_IntroScript: ; 0xbcde0
 
 .Buy500: ; 0xbce1b
 	checkcoins MAX_COINS - 500
-	if_equal HAVE_MORE, .CoinCaseFull
+	ifequal HAVE_MORE, .CoinCaseFull
 	checkmoney YOUR_MONEY, 10000
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	givecoins 500
 	takemoney YOUR_MONEY, 10000
 	waitsfx
@@ -1888,8 +1888,8 @@ HappinessCheckScript:
 	faceplayer
 	opentext
 	special GetFirstPokemonHappiness
-	if_less_than 50, .Unhappy
-	if_less_than 150, .KindaHappy
+	ifless 50, .Unhappy
+	ifless 150, .KindaHappy
 	farwritetext HappinessText3
 	waitbutton
 	closetext
diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm
index 9175bbb73..4fb002f95 100755
--- a/engine/events/whiteout.asm
+++ b/engine/events/whiteout.asm
@@ -20,7 +20,7 @@ Script_Whiteout: ; 0x124ce
 	farscall Script_AbortBugContest
 	special WarpToSpawnPoint
 	newloadmap MAPSETUP_WARP
-	end_all
+	endall
 
 .bug_contest
 	jumpstd bugcontestresultswarp
diff --git a/engine/phone/buenas_password.asm b/engine/phone/buenas_password.asm
index 0d144afa6..38fee974c 100644
--- a/engine/phone/buenas_password.asm
+++ b/engine/phone/buenas_password.asm
@@ -2,7 +2,7 @@ BuenaPhoneScript1:
 	checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
 	iftrue BuenaPhoneScript_Rocket
 	checkcode VAR_HOUR
-	if_greater_than 17, BuenaPhoneScript_AfterMidnight1
+	ifgreater 17, BuenaPhoneScript_AfterMidnight1
 	scall BuenaPhoneScript_CheckTimeOfDay1
 	jump BuenaPhoneScript_Random1
 
@@ -37,7 +37,7 @@ BuenaPhoneScript_AfterMidnight1:
 
 BuenaPhoneScript_CheckTimeOfDay2:
 	checkcode VAR_HOUR
-	if_greater_than 17, BuenaPhoneScript_AfterMidnight2
+	ifgreater 17, BuenaPhoneScript_AfterMidnight2
 	checkmorn
 	iftrue .morn
 	checkday
@@ -75,20 +75,20 @@ BuenaPhoneScript_Random2:
 	random 14
 
 .Jumptable:
-	if_equal 0, .zero
-	if_equal 1, .one
-	if_equal 2, .two
-	if_equal 3, .three
-	if_equal 4, .four
-	if_equal 5, .five
-	if_equal 6, .six
-	if_equal 7, .seven
-	if_equal 8, .eight
-	if_equal 9, .nine
-	if_equal 10, .ten
-	if_equal 11, .eleven
-	if_equal 12, .twelve
-	if_equal 13, .thirteen
+	ifequal 0, .zero
+	ifequal 1, .one
+	ifequal 2, .two
+	ifequal 3, .three
+	ifequal 4, .four
+	ifequal 5, .five
+	ifequal 6, .six
+	ifequal 7, .seven
+	ifequal 8, .eight
+	ifequal 9, .nine
+	ifequal 10, .ten
+	ifequal 11, .eleven
+	ifequal 12, .twelve
+	ifequal 13, .thirteen
 
 .zero
 	writetext UnknownText_0xa0efb
@@ -150,9 +150,9 @@ BuenaPhoneScript_Random2:
 
 BuenaPhoneScript_Random1:
 	random 3
-	if_equal 0, .zero
-	if_equal 1, .one
-	if_equal 2, .two
+	ifequal 0, .zero
+	ifequal 1, .one
+	ifequal 2, .two
 
 .zero
 	writetext UnknownText_0xa1c88
diff --git a/engine/phone/generic_calls.asm b/engine/phone/generic_calls.asm
index e1b53a950..2c036de24 100644
--- a/engine/phone/generic_calls.asm
+++ b/engine/phone/generic_calls.asm
@@ -24,26 +24,26 @@ PhoneScript_AnswerPhone_Male:
 	checknite
 	iftrue PhoneScript_AnswerPhone_Male_Nite
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext UnknownText_0x1b4dc5
@@ -147,26 +147,26 @@ PhoneScript_AnswerPhone_Male:
 
 PhoneScript_AnswerPhone_Male_Day:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext UnknownText_0x1b4ded
@@ -270,26 +270,26 @@ PhoneScript_AnswerPhone_Male_Day:
 
 PhoneScript_AnswerPhone_Male_Nite:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext UnknownText_0x1b4e16
@@ -397,14 +397,14 @@ PhoneScript_AnswerPhone_Female:
 	checknite
 	iftrue PhoneScript_AnswerPhone_Female_Nite
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x1b4f21
@@ -448,14 +448,14 @@ PhoneScript_AnswerPhone_Female:
 
 PhoneScript_AnswerPhone_Female_Day:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x1b4f4d
@@ -499,14 +499,14 @@ PhoneScript_AnswerPhone_Female_Day:
 
 PhoneScript_AnswerPhone_Female_Nite:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x1b4f75
@@ -554,26 +554,26 @@ PhoneScript_GreetPhone_Male:
 	checknite
 	iftrue PhoneScript_GreetPhone_Male_Nite
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext UnknownText_0x1b4e3e
@@ -677,26 +677,26 @@ PhoneScript_GreetPhone_Male:
 
 PhoneScript_GreetPhone_Male_Day:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext UnknownText_0x1b4e72
@@ -800,26 +800,26 @@ PhoneScript_GreetPhone_Male_Day:
 
 PhoneScript_GreetPhone_Male_Nite:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext UnknownText_0x1b4e9e
@@ -927,14 +927,14 @@ PhoneScript_GreetPhone_Female:
 	checknite
 	iftrue PhoneScript_GreetPhone_Female_Nite
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x1b4fa1
@@ -978,14 +978,14 @@ PhoneScript_GreetPhone_Female:
 
 PhoneScript_GreetPhone_Female_Day:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x1b4fda
@@ -1029,14 +1029,14 @@ PhoneScript_GreetPhone_Female_Day:
 
 PhoneScript_GreetPhone_Female_Nite:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x1b5004
@@ -1080,23 +1080,23 @@ PhoneScript_GreetPhone_Female_Nite:
 
 PhoneScript_Generic_Male:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext UnknownText_0x1b4ecd
@@ -1190,14 +1190,14 @@ PhoneScript_Generic_Male:
 
 PhoneScript_Generic_Female:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x1b502b
@@ -1242,7 +1242,7 @@ PhoneScript_Generic_Female:
 PhoneScript_MonFlavorText:
 	special RandomPhoneMon
 	farscall PhoneScript_Random2
-	if_equal $0, .TooEnergetic
+	ifequal $0, .TooEnergetic
 	farwritetext UnknownText_0x1b518b
 	buttonsound
 	farjump PhoneScript_HangupText_Male
diff --git a/engine/phone/phone_callers.asm b/engine/phone/phone_callers.asm
index c90448d33..a929ba1d8 100644
--- a/engine/phone/phone_callers.asm
+++ b/engine/phone/phone_callers.asm
@@ -1,7 +1,7 @@
 Phone_GenericCall_Male:
 	special RandomPhoneMon
 	farscall PhoneScript_Random2
-	if_equal 0, .Bragging
+	ifequal 0, .Bragging
 	farscall PhoneScript_Generic_Male
 	farjump Phone_FoundAMon_Male
 
@@ -11,7 +11,7 @@ Phone_GenericCall_Male:
 Phone_GenericCall_Female:
 	special RandomPhoneMon
 	farscall PhoneScript_Random2
-	if_equal 0, .Bragging
+	ifequal 0, .Bragging
 	farscall PhoneScript_Generic_Female
 	farjump Phone_FoundAMon_Female
 
@@ -29,7 +29,7 @@ Phone_BraggingCall_Female:
 Phone_FoundAMon_Male:
 	special RandomPhoneWildMon
 	farscall PhoneScript_Random2
-	if_equal 0, .GotAway
+	ifequal 0, .GotAway
 	farscall Phone_WhoDefeatedMon_Male
 	farjump PhoneScript_HangupText_Male
 
@@ -39,7 +39,7 @@ Phone_FoundAMon_Male:
 Phone_FoundAMon_Female:
 	special RandomPhoneWildMon
 	farscall PhoneScript_Random2
-	if_equal 0, .GotAway
+	ifequal 0, .GotAway
 	farscall Phone_WhoDefeatedMon_Female
 	farjump PhoneScript_HangupText_Female
 
@@ -56,23 +56,23 @@ Phone_GotAwayCall_Female:
 
 Phone_WhosBragging_Male:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext JackIntelligenceText
@@ -161,14 +161,14 @@ Phone_WhosBragging_Male:
 
 Phone_WhosBragging_Female:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x174688
@@ -212,23 +212,23 @@ Phone_WhosBragging_Female:
 
 Phone_WhoDefeatedMon_Male:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext JackDefeatedMonText
@@ -317,14 +317,14 @@ Phone_WhoDefeatedMon_Male:
 
 Phone_WhoDefeatedMon_Female:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x1746c3
@@ -368,23 +368,23 @@ Phone_WhoDefeatedMon_Female:
 
 Phone_WhoLostAMon_Male:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext UnknownText_0x174165
@@ -473,14 +473,14 @@ Phone_WhoLostAMon_Male:
 
 Phone_WhoLostAMon_Female:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x174734
@@ -532,23 +532,23 @@ PhoneScript_WantsToBattle_Female:
 
 PhoneScript_RematchText_Male:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext UnknownText_0x1741e1
@@ -637,13 +637,13 @@ PhoneScript_RematchText_Male:
 
 PhoneScript_RematchText_Female:
 	checkcode VAR_CALLERID
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beth:
 	farwritetext UnknownText_0x174e4e
@@ -690,26 +690,26 @@ TiffanyItsAwful:
 
 PhoneScript_HangupText_Male:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext UnknownText_0x174251
@@ -793,14 +793,14 @@ PhoneScript_HangupText_Male:
 
 PhoneScript_HangupText_Female:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x1747ac
@@ -856,8 +856,8 @@ PhoneScriptRareWildMon:
 
 PhoneScript_BugCatchingContest:
 	checkcode VAR_CALLERID
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_POKEFANM_DEREK, .Derek
 
 .Wade:
 	farwritetext WadeBugCatchingContestText
@@ -896,12 +896,12 @@ UnknownScript_0xa05de:
 
 PhoneScript_FoundItem_Male:
 	checkcode VAR_CALLERID
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_FISHER_WILTON, .Wilton
 
 .Jose:
 	farwritetext JoseFoundSomethingText
@@ -929,10 +929,10 @@ PhoneScript_FoundItem_Male:
 
 PhoneScript_FoundItem_Female:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
 
 .Beverly:
 	farwritetext BeverlyFoundNuggetText
diff --git a/engine/phone/phone_gossip.asm b/engine/phone/phone_gossip.asm
index 8f45c8807..a17b49933 100644
--- a/engine/phone/phone_gossip.asm
+++ b/engine/phone/phone_gossip.asm
@@ -1,16 +1,16 @@
 JackTriviaScript:
 	random 11
-	if_equal  0, .Thunder
-	if_equal  1, .Rollout
-	if_equal  2, .Solarbeam
-	if_equal  3, .Stomp
-	if_equal  4, .Gust
-	if_equal  5, .Twister
-	if_equal  6, .Earthquake
-	if_equal  7, .Magnitude
-	if_equal  8, .Sandstorm
-	if_equal  9, .SunnyDay
-	if_equal 10, .RainDance
+	ifequal  0, .Thunder
+	ifequal  1, .Rollout
+	ifequal  2, .Solarbeam
+	ifequal  3, .Stomp
+	ifequal  4, .Gust
+	ifequal  5, .Twister
+	ifequal  6, .Earthquake
+	ifequal  7, .Magnitude
+	ifequal  8, .Sandstorm
+	ifequal  9, .SunnyDay
+	ifequal 10, .RainDance
 
 .Thunder:
 	farwritetext JackThunderTriviaText
@@ -69,16 +69,16 @@ JackTriviaScript:
 
 UnknownScript_0xa06da:
 	random 10
-	if_equal 0, .RuinsOfAlph
-	if_equal 1, .Falkner
-	if_equal 2, .Earl
-	if_equal 3, .SurfPikachu
-	if_equal 4, .MooMooMilk
-	if_equal 5, .Salon
-	if_equal 6, .Whitney
-	if_equal 7, .BugCatchingContest
-	if_equal 8, .BeautifulMon
-	if_equal 9, .Forgot
+	ifequal 0, .RuinsOfAlph
+	ifequal 1, .Falkner
+	ifequal 2, .Earl
+	ifequal 3, .SurfPikachu
+	ifequal 4, .MooMooMilk
+	ifequal 5, .Salon
+	ifequal 6, .Whitney
+	ifequal 7, .BugCatchingContest
+	ifequal 8, .BeautifulMon
+	ifequal 9, .Forgot
 
 .RuinsOfAlph:
 	farwritetext UnknownText_0x176223
@@ -132,16 +132,16 @@ UnknownScript_0xa06da:
 
 ChadOakGossipScript:
 	random 10
-	if_equal 0, .Blue
-	if_equal 1, .Daisy
-	if_equal 2, .ProfElm
-	if_equal 3, .Dream
-	if_equal 4, .Kurt
-	if_equal 5, .League
-	if_equal 6, .RadioShow
-	if_equal 7, .Battling
-	if_equal 8, .DaisyTea
-	if_equal 9, .Traveled
+	ifequal 0, .Blue
+	ifequal 1, .Daisy
+	ifequal 2, .ProfElm
+	ifequal 3, .Dream
+	ifequal 4, .Kurt
+	ifequal 5, .League
+	ifequal 6, .RadioShow
+	ifequal 7, .Battling
+	ifequal 8, .DaisyTea
+	ifequal 9, .Traveled
 
 .Blue:
 	farwritetext ChadBlueGossipText
@@ -195,16 +195,16 @@ ChadOakGossipScript:
 
 BrentBillTriviaScript:
 	random 10
-	if_equal 0, .Father
-	if_equal 1, .Grandpa
-	if_equal 2, .Goldenrod
-	if_equal 3, .Route25
-	if_equal 4, .Abra
-	if_equal 5, .Sister
-	if_equal 6, .Milk
-	if_equal 7, .Battling
-	if_equal 8, .FlowerShop
-	if_equal 9, .KimonoGirl
+	ifequal 0, .Father
+	ifequal 1, .Grandpa
+	ifequal 2, .Goldenrod
+	ifequal 3, .Route25
+	ifequal 4, .Abra
+	ifequal 5, .Sister
+	ifequal 6, .Milk
+	ifequal 7, .Battling
+	ifequal 8, .FlowerShop
+	ifequal 9, .KimonoGirl
 
 .Father:
 	farwritetext UnknownText_0x662bc
@@ -477,9 +477,9 @@ ErinWorkingHardScript:
 
 UnknownScript_0xa09c8:
 	random 3
-	if_equal 0, UnknownScript_0xa09d6
-	if_equal 1, UnknownScript_0xa09de
-	if_equal 2, UnknownScript_0xa09e6
+	ifequal 0, UnknownScript_0xa09d6
+	ifequal 1, UnknownScript_0xa09de
+	ifequal 2, UnknownScript_0xa09e6
 
 UnknownScript_0xa09d6:
 	farwritetext UnknownText_0x64846
@@ -498,8 +498,8 @@ UnknownScript_0xa09e6:
 
 KenjiAnswerPhoneScript:
 	checkcode VAR_KENJI_BREAK
-	if_equal 2, .Training
-	if_equal 1, .OnBreak
+	ifequal 2, .Training
+	ifequal 1, .OnBreak
 	farwritetext UnknownText_0x66e17
 	buttonsound
 	jump PhoneScript_HangupText_Male
diff --git a/engine/phone/phone_scripts.asm b/engine/phone/phone_scripts.asm
index 3cbd60f51..0bf3dda4f 100644
--- a/engine/phone/phone_scripts.asm
+++ b/engine/phone/phone_scripts.asm
@@ -22,8 +22,8 @@ MomPhoneScript: ; 0xbceaa
 	buttonsound
 	mapnametotext MEM_BUFFER_0
 	checkcode VAR_ROOFPALETTE
-	if_equal 1, MomPhonePalette1
-	if_equal 2, MomPhonePalette2
+	ifequal 1, MomPhonePalette1
+	ifequal 2, MomPhonePalette2
 	jump MomPhoneOther
 
 MomPhoneLandmark: ; 0xbcedf
@@ -33,11 +33,11 @@ MomPhoneLandmark: ; 0xbcedf
 
 MomPhonePalette1: ; 0xbcee7
 	checkcode VAR_MAPGROUP
-	if_equal GROUP_NEW_BARK_TOWN, .newbark
-	if_equal GROUP_CHERRYGROVE_CITY, .cherrygrove
-	if_equal GROUP_VIOLET_CITY, .violet
-	if_equal GROUP_AZALEA_TOWN, .azalea
-	if_equal GROUP_GOLDENROD_CITY, .goldenrod
+	ifequal GROUP_NEW_BARK_TOWN, .newbark
+	ifequal GROUP_CHERRYGROVE_CITY, .cherrygrove
+	ifequal GROUP_VIOLET_CITY, .violet
+	ifequal GROUP_AZALEA_TOWN, .azalea
+	ifequal GROUP_GOLDENROD_CITY, .goldenrod
 	farwritetext MomPhoneGenericAreaText
 	buttonsound
 	jump MomSavingMoney
@@ -76,12 +76,12 @@ MomSavingMoney: ; 0xbcf37
 	checkflag ENGINE_MOM_SAVING_MONEY
 	iffalse MomIsNotSaving
 	checkmoney MOMS_MONEY, 0
-	if_equal HAVE_MORE, MomSavingHasMoney
+	ifequal HAVE_MORE, MomSavingHasMoney
 	jump MomSavingButBroke
 
 MomIsNotSaving: ; 0xbcf49
 	checkmoney MOMS_MONEY, 0
-	if_equal HAVE_MORE, MomHasMoney
+	ifequal HAVE_MORE, MomHasMoney
 	jump MomHasNoMoney
 
 MomSavingHasMoney: ; 0xbcf55
@@ -173,8 +173,8 @@ BillPhoneScript1: ; 0xbcfc5
 	buttonsound
 	checkcode VAR_BOXSPACE
 	vartomem MEM_BUFFER_0
-	if_equal 0, .full
-	if_less_than PARTY_LENGTH, .nearlyfull
+	ifequal 0, .full
+	ifless PARTY_LENGTH, .nearlyfull
 	farwritetext BillPhoneNotFullText
 	end
 
@@ -195,7 +195,7 @@ BillPhoneScript2: ; 0xbd007
 
 ElmPhoneScript1: ; 0xbd00d
 	checkcode VAR_SPECIALPHONECALL
-	if_equal SPECIALCALL_POKERUS, .pokerus
+	ifequal SPECIALCALL_POKERUS, .pokerus
 	checkevent EVENT_SHOWED_TOGEPI_TO_ELM
 	iftrue .discovery
 	checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
@@ -243,7 +243,7 @@ ElmPhoneScript1: ; 0xbd00d
 
 .discovery ; 0xbd069
 	random 2
-	if_equal 0, .nextdiscovery
+	ifequal 0, .nextdiscovery
 	farwritetext ElmPhoneDiscovery1Text
 	end
 
@@ -258,11 +258,11 @@ ElmPhoneScript1: ; 0xbd00d
 
 ElmPhoneScript2: ; 0xbd081
 	checkcode VAR_SPECIALPHONECALL
-	if_equal SPECIALCALL_ROBBED, .disaster
-	if_equal SPECIALCALL_ASSISTANT, .assistant
-	if_equal SPECIALCALL_WEIRDBROADCAST, .rocket
-	if_equal SPECIALCALL_SSTICKET, .gift
-	if_equal SPECIALCALL_MASTERBALL, .gift
+	ifequal SPECIALCALL_ROBBED, .disaster
+	ifequal SPECIALCALL_ASSISTANT, .assistant
+	ifequal SPECIALCALL_WEIRDBROADCAST, .rocket
+	ifequal SPECIALCALL_SSTICKET, .gift
+	ifequal SPECIALCALL_MASTERBALL, .gift
 	farwritetext ElmPhonePokerusText
 	specialphonecall SPECIALCALL_NONE
 	end
@@ -306,7 +306,7 @@ JackPhoneScript1:
 	checkflag ENGINE_JACK_MONDAY_MORNING
 	iftrue .NotMonday
 	checkcode VAR_WEEKDAY
-	if_not_equal MONDAY, .NotMonday
+	ifnotequal MONDAY, .NotMonday
 	checkmorn
 	iftrue JackMondayMorning
 
@@ -321,17 +321,17 @@ JackPhoneScript2:
 	trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0
 	farscall PhoneScript_GreetPhone_Male
 	farscall PhoneScript_Random2
-	if_equal 0, JackBattleTrivia
+	ifequal 0, JackBattleTrivia
 	checkflag ENGINE_JACK
 	iftrue .WaitingForBattle
 	checkflag ENGINE_JACK_MONDAY_MORNING
 	iftrue .WaitingForBattle
 	farscall PhoneScript_Random2
-	if_equal 0, JackWantsToBattle
+	ifequal 0, JackWantsToBattle
 
 .WaitingForBattle:
 	farscall PhoneScript_Random3
-	if_equal 0, JackFindsRare
+	ifequal 0, JackFindsRare
 	farjump Phone_GenericCall_Male
 
 JackMondayMorning:
@@ -367,7 +367,7 @@ BeverlyPhoneScript2:
 	checkflag ENGINE_BEVERLY_HAS_NUGGET
 	iftrue .HasNugget
 	farscall PhoneScript_Random4
-	if_equal 0, .FoundNugget
+	ifequal 0, .FoundNugget
 
 .HasNugget:
 	farjump Phone_GenericCall_Female
@@ -387,7 +387,7 @@ HueyPhoneScript1:
 	checkflag ENGINE_HUEY_WEDNESDAY_NIGHT
 	iftrue .NotWednesday
 	checkcode VAR_WEEKDAY
-	if_not_equal WEDNESDAY, .NotWednesday
+	ifnotequal WEDNESDAY, .NotWednesday
 	checknite
 	iftrue HueyWednesdayNight
 
@@ -407,8 +407,8 @@ HueyPhoneScript2:
 	checkflag ENGINE_HUEY_WEDNESDAY_NIGHT
 	iftrue .Flavor
 	farscall PhoneScript_Random3
-	if_equal 0, HueyWantsBattle
-	if_equal 1, HueyWantsBattle
+	ifequal 0, HueyWantsBattle
+	ifequal 1, HueyWantsBattle
 
 .Flavor:
 	farjump PhoneScript_MonFlavorText
@@ -431,7 +431,7 @@ GavenPhoneScript1:
 	checkflag ENGINE_GAVEN_THURSDAY_MORNING
 	iftrue .NotThursday
 	checkcode VAR_WEEKDAY
-	if_not_equal THURSDAY, .NotThursday
+	ifnotequal THURSDAY, .NotThursday
 	checkmorn
 	iftrue GavenThursdayMorning
 
@@ -450,11 +450,11 @@ GavenPhoneScript2:
 	checkflag ENGINE_GAVEN_THURSDAY_MORNING
 	iftrue .WaitingForBattle
 	farscall PhoneScript_Random2
-	if_equal 0, GavenWantsRematch
+	ifequal 0, GavenWantsRematch
 
 .WaitingForBattle:
 	farscall PhoneScript_Random3
-	if_equal 0, GavenFoundRare
+	ifequal 0, GavenFoundRare
 	farjump Phone_GenericCall_Male
 
 GavenThursdayMorning:
@@ -478,7 +478,7 @@ BethPhoneScript1:
 	checkflag ENGINE_BETH_FRIDAY_AFTERNOON
 	iftrue .NotFriday
 	checkcode VAR_WEEKDAY
-	if_not_equal FRIDAY, .NotFriday
+	ifnotequal FRIDAY, .NotFriday
 	checkday
 	iftrue BethFridayAfternoon
 
@@ -497,7 +497,7 @@ BethPhoneScript2:
 	checkflag ENGINE_BETH_FRIDAY_AFTERNOON
 	iftrue .Generic
 	farscall PhoneScript_Random2
-	if_equal 0, BethWantsBattle
+	ifequal 0, BethWantsBattle
 
 .Generic:
 	farjump Phone_GenericCall_Female
@@ -522,7 +522,7 @@ JosePhoneScript1:
 	checkflag ENGINE_JOSE_HAS_STAR_PIECE
 	iftrue .HasItem
 	checkcode VAR_WEEKDAY
-	if_not_equal SATURDAY, .NotSaturday
+	ifnotequal SATURDAY, .NotSaturday
 	checknite
 	iftrue JoseSaturdayNight
 
@@ -547,13 +547,13 @@ JosePhoneScript2:
 	checkflag ENGINE_JOSE_HAS_STAR_PIECE
 	iftrue .Generic
 	farscall PhoneScript_Random3
-	if_equal 0, JoseWantsBattle
+	ifequal 0, JoseWantsBattle
 	farscall PhoneScript_Random3
-	if_equal 0, JoseHasStarPiece
+	ifequal 0, JoseHasStarPiece
 
 .Generic:
 	farscall PhoneScript_Random3
-	if_equal 0, JoseFoundRare
+	ifequal 0, JoseFoundRare
 	farjump Phone_GenericCall_Male
 
 JoseSaturdayNight:
@@ -582,7 +582,7 @@ ReenaPhoneScript1:
 	checkflag ENGINE_REENA_SUNDAY_MORNING
 	iftrue .NotSunday
 	checkcode VAR_WEEKDAY
-	if_not_equal SUNDAY, .NotSunday
+	ifnotequal SUNDAY, .NotSunday
 	checkmorn
 	iftrue ReenaSundayMorning
 
@@ -601,7 +601,7 @@ ReenaPhoneScript2:
 	checkflag ENGINE_REENA_SUNDAY_MORNING
 	iftrue .Generic
 	farscall PhoneScript_Random2
-	if_equal 0, ReenaWantsBattle
+	ifequal 0, ReenaWantsBattle
 
 .Generic:
 	farjump Phone_GenericCall_Female
@@ -624,7 +624,7 @@ JoeyPhoneScript1:
 	checkflag ENGINE_JOEY_MONDAY_AFTERNOON
 	iftrue .NotMonday
 	checkcode VAR_WEEKDAY
-	if_not_equal MONDAY, .NotMonday
+	ifnotequal MONDAY, .NotMonday
 	checkday
 	iftrue JoeyMondayAfternoon
 
@@ -644,8 +644,8 @@ JoeyPhoneScript2:
 	checkflag ENGINE_JOEY_MONDAY_AFTERNOON
 	iftrue .Generic
 	farscall PhoneScript_Random3
-	if_equal 0, JoeyWantsBattle
-	if_equal 1, JoeyWantsBattle
+	ifequal 0, JoeyWantsBattle
+	ifequal 1, JoeyWantsBattle
 
 .Generic:
 	farjump Phone_GenericCall_Male
@@ -670,19 +670,19 @@ WadePhoneScript1:
 	checkflag ENGINE_WADE_HAS_ITEM
 	iftrue WadeHasItem
 	checkcode VAR_WEEKDAY
-	if_not_equal TUESDAY, .NotTuesday
+	ifnotequal TUESDAY, .NotTuesday
 	checknite
 	iftrue WadeTuesdayNight
 
 .NotTuesday:
 	farscall PhoneScript_Random2
-	if_equal 0, .NoContest
+	ifequal 0, .NoContest
 	checkflag ENGINE_DAILY_BUG_CONTEST
 	iftrue .NoContest
 	checkcode VAR_WEEKDAY
-	if_equal TUESDAY, WadeContestToday
-	if_equal THURSDAY, WadeContestToday
-	if_equal SATURDAY, WadeContestToday
+	ifequal TUESDAY, WadeContestToday
+	ifequal THURSDAY, WadeContestToday
+	ifequal SATURDAY, WadeContestToday
 
 .NoContest:
 	farjump UnknownScript_0xa0938
@@ -702,13 +702,13 @@ WadePhoneScript2:
 	trainertotext BUG_CATCHER, WADE1, MEM_BUFFER_0
 	farscall PhoneScript_GreetPhone_Male
 	farscall PhoneScript_Random2
-	if_equal 0, .NoContest
+	ifequal 0, .NoContest
 	checkflag ENGINE_DAILY_BUG_CONTEST
 	iftrue .NoContest
 	checkcode VAR_WEEKDAY
-	if_equal TUESDAY, Wade_ContestToday
-	if_equal THURSDAY, Wade_ContestToday
-	if_equal SATURDAY, Wade_ContestToday
+	ifequal TUESDAY, Wade_ContestToday
+	ifequal THURSDAY, Wade_ContestToday
+	ifequal SATURDAY, Wade_ContestToday
 
 .NoContest:
 	checkflag ENGINE_WADE
@@ -718,15 +718,15 @@ WadePhoneScript2:
 	checkflag ENGINE_WADE_HAS_ITEM
 	iftrue .next
 	farscall PhoneScript_Random2
-	if_equal 0, WadeHasItem2
+	ifequal 0, WadeHasItem2
 	checkflag ENGINE_FLYPOINT_GOLDENROD
 	iffalse .next
 	farscall PhoneScript_Random2
-	if_equal 0, WadeWantsBattle2
+	ifequal 0, WadeWantsBattle2
 
 .next:
 	farscall PhoneScript_Random3
-	if_equal 0, WadeFoundRare
+	ifequal 0, WadeFoundRare
 	farjump Phone_GenericCall_Male
 
 Wade_ContestToday:
@@ -751,10 +751,10 @@ WadeHasItem2:
 	clearevent EVENT_WADE_HAS_PRZCUREBERRY
 	clearevent EVENT_WADE_HAS_BITTER_BERRY
 	random 4
-	if_equal 0, .Berry
-	if_equal 1, .PsnCureBerry
-	if_equal 2, .PrzCureBerry
-	if_equal 3, .Bitterberry
+	ifequal 0, .Berry
+	ifequal 1, .PsnCureBerry
+	ifequal 2, .PrzCureBerry
+	ifequal 3, .Bitterberry
 
 .Berry:
 	setevent EVENT_WADE_HAS_BERRY
@@ -784,7 +784,7 @@ RalphPhoneScript1:
 	checkflag ENGINE_RALPH_WEDNESDAY_MORNING
 	iftrue Ralph_CheckSwarm
 	checkcode VAR_WEEKDAY
-	if_not_equal WEDNESDAY, Ralph_CheckSwarm
+	ifnotequal WEDNESDAY, Ralph_CheckSwarm
 	checkmorn
 	iftrue Ralph_WednesdayMorning
 Ralph_CheckSwarm:
@@ -810,10 +810,10 @@ RalphPhoneScript2:
 	checkflag ENGINE_RALPH_WEDNESDAY_MORNING
 	iftrue Ralph_CheckSwarm2
 	farscall PhoneScript_Random2
-	if_equal 0, Ralph_FightMe
+	ifequal 0, Ralph_FightMe
 Ralph_CheckSwarm2:
 	farscall PhoneScript_Random5
-	if_equal 0, Ralph_SetUpSwarm
+	ifequal 0, Ralph_SetUpSwarm
 	farjump Phone_GenericCall_Male
 
 Ralph_WednesdayMorning:
@@ -846,7 +846,7 @@ LizPhoneScript1:
 	checkflag ENGINE_LIZ_THURSDAY_AFTERNOON
 	iftrue .NotThursday
 	checkcode VAR_WEEKDAY
-	if_not_equal THURSDAY, .NotThursday
+	ifnotequal THURSDAY, .NotThursday
 	checkday
 	iftrue LizThursdayAfternoon
 
@@ -861,7 +861,7 @@ LizPhoneScript1:
 LizPhoneScript2:
 	trainertotext PICNICKER, LIZ1, MEM_BUFFER_0
 	farscall PhoneScript_Random4
-	if_equal 0, LizWrongNumber
+	ifequal 0, LizWrongNumber
 	farscall PhoneScript_GreetPhone_Female
 	checkflag ENGINE_LIZ
 	iftrue .next
@@ -870,11 +870,11 @@ LizPhoneScript2:
 
 .next:
 	farscall PhoneScript_Random2
-	if_equal 0, LizGossip
+	ifequal 0, LizGossip
 	checkflag ENGINE_FLYPOINT_GOLDENROD
 	iffalse .Generic
 	farscall PhoneScript_Random2
-	if_equal 0, LizWantsBattle
+	ifequal 0, LizWantsBattle
 
 .Generic:
 	farjump Phone_GenericCall_Female
@@ -892,15 +892,15 @@ LizWrongNumber:
 
 LizGossip:
 	random 9
-	if_equal 0, .CoolTrainerM
-	if_equal 1, .Beauty
-	if_equal 2, .Grunt
-	if_equal 3, .Teacher
-	if_equal 4, .SwimmerF
-	if_equal 5, .KimonoGirl
-	if_equal 6, .Skier
-	if_equal 7, .Medium
-	if_equal 8, .PokefanM
+	ifequal 0, .CoolTrainerM
+	ifequal 1, .Beauty
+	ifequal 2, .Grunt
+	ifequal 3, .Teacher
+	ifequal 4, .SwimmerF
+	ifequal 5, .KimonoGirl
+	ifequal 6, .Skier
+	ifequal 7, .Medium
+	ifequal 8, .PokefanM
 
 .CoolTrainerM:
 	trainerclassname COOLTRAINERM, NICK
@@ -951,7 +951,7 @@ AnthonyPhoneScript1:
 	checkflag ENGINE_ANTHONY_FRIDAY_NIGHT
 	iftrue .NotFriday
 	checkcode VAR_WEEKDAY
-	if_not_equal FRIDAY, .NotFriday
+	ifnotequal FRIDAY, .NotFriday
 	checknite
 	iftrue AnthonyFridayNight
 
@@ -978,11 +978,11 @@ AnthonyPhoneScript2:
 	checkflag ENGINE_ANTHONY_FRIDAY_NIGHT
 	iftrue .TriesSwarm
 	farscall PhoneScript_Random2
-	if_equal 0, AnthonyWantsBattle
+	ifequal 0, AnthonyWantsBattle
 
 .TriesSwarm:
 	farscall PhoneScript_Random5
-	if_equal 0, AnthonyTriesDunsparceSwarm
+	ifequal 0, AnthonyTriesDunsparceSwarm
 	farjump Phone_GenericCall_Male
 
 AnthonyFridayNight:
@@ -1015,7 +1015,7 @@ ToddPhoneScript1:
 	checkflag ENGINE_TODD_SATURDAY_MORNING
 	iftrue .NotSaturday
 	checkcode VAR_WEEKDAY
-	if_not_equal SATURDAY, .NotSaturday
+	ifnotequal SATURDAY, .NotSaturday
 	checkmorn
 	iftrue ToddSaturdayMorning
 
@@ -1041,15 +1041,15 @@ ToddPhoneScript2:
 	checkflag ENGINE_FLYPOINT_GOLDENROD
 	iffalse ToddNoGoldenrod
 	farscall PhoneScript_Random2
-	if_equal 0, ToddWantsBattle
+	ifequal 0, ToddWantsBattle
 
 .TryForSale:
 	farscall PhoneScript_Random2
-	if_equal 0, ToddDeptStoreSale
+	ifequal 0, ToddDeptStoreSale
 
 ToddNoGoldenrod:
 	farscall PhoneScript_Random3
-	if_equal 0, ToddFoundRare
+	ifequal 0, ToddFoundRare
 	farjump Phone_GenericCall_Male
 
 ToddSaturdayMorning:
@@ -1079,7 +1079,7 @@ GinaPhoneScript1:
 	checkflag ENGINE_GINA_HAS_LEAF_STONE
 	iftrue .HasLeafStone
 	checkcode VAR_WEEKDAY
-	if_not_equal SUNDAY, .NotSunday
+	ifnotequal SUNDAY, .NotSunday
 	checkday
 	iftrue GinaSundayDay
 
@@ -1113,15 +1113,15 @@ GinaPhoneScript2:
 	checkevent EVENT_GINA_GAVE_LEAF_STONE
 	iftrue .GaveLeafStone
 	farscall PhoneScript_Random2
-	if_equal 0, GinaHasLeafStone
+	ifequal 0, GinaHasLeafStone
 
 .GaveLeafStone:
 	farscall PhoneScript_Random11
-	if_equal 0, GinaHasLeafStone
+	ifequal 0, GinaHasLeafStone
 	checkflag ENGINE_FLYPOINT_GOLDENROD
 	iffalse .Generic
 	farscall PhoneScript_Random3
-	if_equal 0, GinaWantsBattle
+	ifequal 0, GinaWantsBattle
 
 .Generic:
 	farjump Phone_GenericCall_Female
@@ -1174,7 +1174,7 @@ ArniePhoneScript1:
 	checkflag ENGINE_ARNIE_TUESDAY_MORNING
 	iftrue .NotTuesday
 	checkcode VAR_WEEKDAY
-	if_not_equal TUESDAY, .NotTuesday
+	ifnotequal TUESDAY, .NotTuesday
 	checkmorn
 	iftrue ArnieTuesdayMorning
 
@@ -1199,13 +1199,13 @@ ArniePhoneScript2:
 	checkflag ENGINE_ARNIE_TUESDAY_MORNING
 	iftrue .Swarm
 	farscall PhoneScript_Random2
-	if_equal 0, ArnieWantsBattle
+	ifequal 0, ArnieWantsBattle
 
 .Swarm:
 	farscall PhoneScript_Random5
-	if_equal 0, ArnieYanmaSwarm
+	ifequal 0, ArnieYanmaSwarm
 	farscall PhoneScript_Random3
-	if_equal 0, ArnieFoundRare
+	ifequal 0, ArnieFoundRare
 	farjump Phone_GenericCall_Male
 
 ArnieTuesdayMorning:
@@ -1243,7 +1243,7 @@ AlanPhoneScript1:
 	checkflag ENGINE_ALAN_HAS_FIRE_STONE
 	iftrue .FireStone
 	checkcode VAR_WEEKDAY
-	if_not_equal WEDNESDAY, .NotWednesday
+	ifnotequal WEDNESDAY, .NotWednesday
 	checkday
 	iftrue AlanWednesdayDay
 
@@ -1268,15 +1268,15 @@ AlanPhoneScript2:
 	checkflag ENGINE_ALAN_HAS_FIRE_STONE
 	iftrue AlanGenericCall
 	farscall PhoneScript_Random3
-	if_equal 0, AlanWantsBattle
+	ifequal 0, AlanWantsBattle
 	checkevent EVENT_ALAN_GAVE_FIRE_STONE
 	iftrue .FireStone
 	farscall PhoneScript_Random2
-	if_equal 0, AlanHasFireStone
+	ifequal 0, AlanHasFireStone
 
 .FireStone:
 	farscall PhoneScript_Random11
-	if_equal 0, AlanHasFireStone
+	ifequal 0, AlanHasFireStone
 
 AlanGenericCall:
 	farjump Phone_GenericCall_Male
@@ -1306,7 +1306,7 @@ DanaPhoneScript1:
 	checkflag ENGINE_DANA_HAS_THUNDERSTONE
 	iftrue .HasThunderstone
 	checkcode VAR_WEEKDAY
-	if_not_equal THURSDAY, .NotThursday
+	ifnotequal THURSDAY, .NotThursday
 	checknite
 	iftrue DanaThursdayNight
 
@@ -1331,19 +1331,19 @@ DanaPhoneScript2:
 	checkflag ENGINE_DANA_HAS_THUNDERSTONE
 	iftrue .Generic
 	farscall PhoneScript_Random3
-	if_equal 0, DanaWantsBattle
+	ifequal 0, DanaWantsBattle
 	checkevent EVENT_DANA_GAVE_THUNDERSTONE
 	iftrue .Thunderstone
 	farscall PhoneScript_Random2
-	if_equal 0, DanaHasThunderstone
+	ifequal 0, DanaHasThunderstone
 
 .Thunderstone:
 	farscall PhoneScript_Random11
-	if_equal 0, DanaHasThunderstone
+	ifequal 0, DanaHasThunderstone
 
 .Generic:
 	farscall PhoneScript_Random3
-	if_equal 0, DanaFoundRare
+	ifequal 0, DanaFoundRare
 	farjump Phone_GenericCall_Female
 
 DanaThursdayNight:
@@ -1372,7 +1372,7 @@ ChadPhoneScript1:
 	checkflag ENGINE_CHAD_FRIDAY_MORNING
 	iftrue .NotFriday
 	checkcode VAR_WEEKDAY
-	if_not_equal FRIDAY, .NotFriday
+	ifnotequal FRIDAY, .NotFriday
 	checkmorn
 	iftrue ChadFridayMorning
 
@@ -1387,17 +1387,17 @@ ChadPhoneScript2:
 	trainertotext SCHOOLBOY, CHAD1, MEM_BUFFER_0
 	farscall PhoneScript_GreetPhone_Male
 	farscall PhoneScript_Random2
-	if_equal 0, ChadOakGossip
+	ifequal 0, ChadOakGossip
 	checkflag ENGINE_CHAD
 	iftrue .Generic
 	checkflag ENGINE_CHAD_FRIDAY_MORNING
 	iftrue .Generic
 	farscall PhoneScript_Random2
-	if_equal 0, ChadWantsBattle
+	ifequal 0, ChadWantsBattle
 
 .Generic:
 	farscall PhoneScript_Random3
-	if_equal 0, ChadFoundRare
+	ifequal 0, ChadFoundRare
 	farjump Phone_GenericCall_Male
 
 ChadFridayMorning:
@@ -1420,13 +1420,13 @@ DerekPhoneScript1:
 	checkflag ENGINE_DEREK_HAS_NUGGET
 	iftrue .Nugget
 	farscall PhoneScript_Random2
-	if_equal 0, .NoContest
+	ifequal 0, .NoContest
 	checkflag ENGINE_DAILY_BUG_CONTEST
 	iftrue .NoContest
 	checkcode VAR_WEEKDAY
-	if_equal TUESDAY, .ContestToday
-	if_equal THURSDAY, .ContestToday
-	if_equal SATURDAY, .ContestToday
+	ifequal TUESDAY, .ContestToday
+	ifequal THURSDAY, .ContestToday
+	ifequal SATURDAY, .ContestToday
 
 .NoContest:
 	farjump UnknownScript_0xa0988
@@ -1442,17 +1442,17 @@ DerekPhoneScript2:
 	trainertotext POKEFANM, DEREK1, MEM_BUFFER_0
 	farscall PhoneScript_GreetPhone_Male
 	farscall PhoneScript_Random2
-	if_equal 0, .NoContest
+	ifequal 0, .NoContest
 	checkflag ENGINE_DAILY_BUG_CONTEST
 	iftrue .NoContest
 	checkcode VAR_WEEKDAY
-	if_equal TUESDAY, .ContestToday
-	if_equal THURSDAY, .ContestToday
-	if_equal SATURDAY, .ContestToday
+	ifequal TUESDAY, .ContestToday
+	ifequal THURSDAY, .ContestToday
+	ifequal SATURDAY, .ContestToday
 
 .NoContest:
 	farscall PhoneScript_Random4
-	if_equal 0, .Nugget
+	ifequal 0, .Nugget
 	farjump Phone_GenericCall_Male
 
 .ContestToday:
@@ -1473,7 +1473,7 @@ TullyPhoneScript1:
 	checkflag ENGINE_TULLY_HAS_WATER_STONE
 	iftrue TullyHasWaterStone
 	checkcode VAR_WEEKDAY
-	if_not_equal SUNDAY, .NotSunday
+	ifnotequal SUNDAY, .NotSunday
 	checknite
 	iftrue TullySundayNight
 
@@ -1498,15 +1498,15 @@ TullyPhoneScript2:
 	checkflag ENGINE_TULLY_HAS_WATER_STONE
 	iftrue .Generic
 	farscall PhoneScript_Random3
-	if_equal 0, TullyWantsBattle
+	ifequal 0, TullyWantsBattle
 	checkevent EVENT_TULLY_GAVE_WATER_STONE
 	iftrue .WaterStone
 	farscall PhoneScript_Random2
-	if_equal 0, TullyFoundWaterStone
+	ifequal 0, TullyFoundWaterStone
 
 .WaterStone:
 	farscall PhoneScript_Random11
-	if_equal 0, TullyFoundWaterStone
+	ifequal 0, TullyFoundWaterStone
 
 .Generic:
 	farjump Phone_GenericCall_Male
@@ -1532,7 +1532,7 @@ BrentPhoneScript1:
 	checkflag ENGINE_BRENT_MONDAY_MORNING
 	iftrue .NotMonday
 	checkcode VAR_WEEKDAY
-	if_not_equal MONDAY, .NotMonday
+	ifnotequal MONDAY, .NotMonday
 	checkmorn
 	iftrue BrentMondayMorning
 
@@ -1547,13 +1547,13 @@ BrentPhoneScript2:
 	trainertotext POKEMANIAC, BRENT1, MEM_BUFFER_0
 	farscall PhoneScript_GreetPhone_Male
 	farscall PhoneScript_Random2
-	if_equal 0, BrentBillTrivia
+	ifequal 0, BrentBillTrivia
 	checkflag ENGINE_BRENT
 	iftrue .Generic
 	checkflag ENGINE_BRENT_MONDAY_MORNING
 	iftrue .Generic
 	farscall PhoneScript_Random2
-	if_equal 0, BrentWantsBattle
+	ifequal 0, BrentWantsBattle
 
 .Generic:
 	farjump Phone_GenericCall_Male
@@ -1579,7 +1579,7 @@ TiffanyPhoneScript1:
 	checkflag ENGINE_TIFFANY_HAS_PINK_BOW
 	iftrue .HasItem
 	checkcode VAR_WEEKDAY
-	if_not_equal TUESDAY, .NotTuesday
+	ifnotequal TUESDAY, .NotTuesday
 	checkday
 	iftrue TiffanyTuesdayAfternoon
 
@@ -1597,7 +1597,7 @@ TiffanyPhoneScript1:
 TiffanyPhoneScript2:
 	trainertotext PICNICKER, TIFFANY3, MEM_BUFFER_0
 	farscall PhoneScript_Random4
-	if_equal 0, TiffanysFamilyMembers
+	ifequal 0, TiffanysFamilyMembers
 	farscall PhoneScript_GreetPhone_Female
 	checkflag ENGINE_TIFFANY
 	iftrue TiffanyGenericCall
@@ -1606,15 +1606,15 @@ TiffanyPhoneScript2:
 	checkflag ENGINE_TIFFANY_HAS_PINK_BOW
 	iftrue TiffanyGenericCall
 	farscall PhoneScript_Random3
-	if_equal 0, TiffanyWantsBattle
+	ifequal 0, TiffanyWantsBattle
 	checkevent EVENT_TIFFANY_GAVE_PINK_BOW
 	iftrue .PinkBow
 	farscall PhoneScript_Random2
-	if_equal 0, TiffanyHasPinkBow
+	ifequal 0, TiffanyHasPinkBow
 
 .PinkBow:
 	farscall PhoneScript_Random11
-	if_equal 0, TiffanyHasPinkBow
+	ifequal 0, TiffanyHasPinkBow
 
 TiffanyGenericCall:
 	farjump Phone_GenericCall_Female
@@ -1629,12 +1629,12 @@ TiffanyWantsBattle:
 
 TiffanysFamilyMembers:
 	random 6
-	if_equal 0, .Grandma
-	if_equal 1, .Grandpa
-	if_equal 2, .Mom
-	if_equal 3, .Dad
-	if_equal 4, .Sister
-	if_equal 5, .Brother
+	ifequal 0, .Grandma
+	ifequal 1, .Grandpa
+	ifequal 2, .Mom
+	ifequal 3, .Dad
+	ifequal 4, .Sister
+	ifequal 5, .Brother
 
 .Grandma:
 	stringtotext GrandmaString, MEM_BUFFER_1
@@ -1678,7 +1678,7 @@ VancePhoneScript1:
 	checkflag ENGINE_VANCE_WEDNESDAY_NIGHT
 	iftrue .NotWednesday
 	checkcode VAR_WEEKDAY
-	if_not_equal WEDNESDAY, .NotWednesday
+	ifnotequal WEDNESDAY, .NotWednesday
 	checknite
 	iftrue VanceWednesdayNight
 
@@ -1697,8 +1697,8 @@ VancePhoneScript2:
 	checkflag ENGINE_VANCE_WEDNESDAY_NIGHT
 	iftrue .WantsBattle
 	farscall PhoneScript_Random3
-	if_equal 0, VanceWantsRematch
-	if_equal 1, VanceWantsRematch
+	ifequal 0, VanceWantsRematch
+	ifequal 1, VanceWantsRematch
 
 .WantsBattle:
 	farjump Phone_GenericCall_Male
@@ -1721,7 +1721,7 @@ WiltonPhoneScript1:
 	checkflag ENGINE_WILTON_HAS_ITEM
 	iftrue .HasItem
 	checkcode VAR_WEEKDAY
-	if_not_equal THURSDAY, .NotThursday
+	ifnotequal THURSDAY, .NotThursday
 	checkmorn
 	iftrue WiltonThursdayMorning
 
@@ -1746,9 +1746,9 @@ WiltonPhoneScript2:
 	checkflag ENGINE_WILTON_HAS_ITEM
 	iftrue .GenericCall
 	farscall PhoneScript_Random2
-	if_equal 0, WiltonWantsBattle
+	ifequal 0, WiltonWantsBattle
 	farscall PhoneScript_Random2
-	if_equal 0, WiltonHasItem
+	ifequal 0, WiltonHasItem
 
 .GenericCall:
 	farjump Phone_GenericCall_Male
@@ -1768,9 +1768,9 @@ WiltonHasItem:
 	clearevent EVENT_WILTON_HAS_GREAT_BALL
 	clearevent EVENT_WILTON_HAS_POKE_BALL
 	random 5
-	if_equal 0, .UltraBall
+	ifequal 0, .UltraBall
 	random 3
-	if_equal 0, .GreatBall
+	ifequal 0, .GreatBall
 	jump .PokeBall
 
 .UltraBall:
@@ -1809,7 +1809,7 @@ ParryPhoneScript1:
 	checkflag ENGINE_PARRY_FRIDAY_AFTERNOON
 	iftrue .WantsRematch
 	checkcode VAR_WEEKDAY
-	if_not_equal FRIDAY, .WantsRematch
+	ifnotequal FRIDAY, .WantsRematch
 	checkday
 	iftrue ParryFridayDay
 
@@ -1828,8 +1828,8 @@ ParryPhoneScript2:
 	checkflag ENGINE_PARRY_FRIDAY_AFTERNOON
 	iftrue .GenericCall
 	farscall PhoneScript_Random2
-	if_equal 0, ParryWantsBattle
-	if_equal 1, ParryWantsBattle
+	ifequal 0, ParryWantsBattle
+	ifequal 1, ParryWantsBattle
 
 .GenericCall:
 	farjump Phone_GenericCall_Male
@@ -1852,7 +1852,7 @@ ErinPhoneScript1:
 	checkflag ENGINE_ERIN_SATURDAY_NIGHT
 	iftrue .NotSaturday
 	checkcode VAR_WEEKDAY
-	if_not_equal SATURDAY, .NotSaturday
+	ifnotequal SATURDAY, .NotSaturday
 	checknite
 	iftrue ErinSaturdayNight
 
@@ -1871,8 +1871,8 @@ ErinPhoneScript2:
 	checkflag ENGINE_ERIN_SATURDAY_NIGHT
 	iftrue .GenericCall
 	farscall PhoneScript_Random3
-	if_equal 0, ErinWantsBattle
-	if_equal 1, ErinWantsBattle
+	ifequal 0, ErinWantsBattle
+	ifequal 1, ErinWantsBattle
 
 .GenericCall:
 	farjump Phone_GenericCall_Female
diff --git a/engine/scripting.asm b/engine/scripting.asm
index 8ffdb9fcd..ae6ce75c8 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -71,12 +71,12 @@ ScriptCommandTable:
 	dw Script_jump                       ; 03
 	dw Script_farjump                    ; 04
 	dw Script_ptjump                     ; 05
-	dw Script_if_equal                   ; 06
-	dw Script_if_not_equal               ; 07
+	dw Script_ifequal                    ; 06
+	dw Script_ifnotequal                 ; 07
 	dw Script_iffalse                    ; 08
 	dw Script_iftrue                     ; 09
-	dw Script_if_greater_than            ; 0a
-	dw Script_if_less_than               ; 0b
+	dw Script_ifgreater                  ; 0a
+	dw Script_ifless                     ; 0b
 	dw Script_jumpstd                    ; 0c
 	dw Script_callstd                    ; 0d
 	dw Script_callasm                    ; 0e
@@ -136,7 +136,7 @@ ScriptCommandTable:
 	dw Script_stringtotext               ; 44
 	dw Script_itemnotify                 ; 45
 	dw Script_pocketisfull               ; 46
-	dw Script_textbox                    ; 47
+	dw Script_opentext                   ; 47
 	dw Script_refreshscreen              ; 48
 	dw Script_closetext                  ; 49
 	dw Script_loadbytec2cf               ; 4a
@@ -169,8 +169,8 @@ endc
 	dw Script_trainerflagaction          ; 63
 	dw Script_winlosstext                ; 64
 	dw Script_scripttalkafter            ; 65
-	dw Script_end_if_just_battled        ; 66
-	dw Script_check_just_battled         ; 67
+	dw Script_endifjustbattled           ; 66
+	dw Script_checkjustbattled           ; 67
 	dw Script_setlasttalked              ; 68
 	dw Script_applymovement              ; 69
 	dw Script_applymovement2             ; 6a
@@ -214,7 +214,7 @@ endc
 	dw Script_return                     ; 90
 	dw Script_end                        ; 91
 	dw Script_reloadandreturn            ; 92
-	dw Script_end_all                    ; 93
+	dw Script_endall                     ; 93
 	dw Script_pokemart                   ; 94
 	dw Script_elevator                   ; 95
 	dw Script_trade                      ; 96
@@ -236,7 +236,7 @@ endc
 	dw Script_trainerclassname           ; a6
 	dw Script_name                       ; a7
 	dw Script_wait                       ; a8
-	dw Script_check_save                 ; a9
+	dw Script_checksave                  ; a9
 
 StartScript:
 	ld hl, ScriptFlags
@@ -839,7 +839,7 @@ Script_winlosstext:
 	ld [hli], a
 	ret
 
-Script_end_if_just_battled:
+Script_endifjustbattled:
 ; script command 0x66
 
 	ld a, [wRunningTrainerBattleScript]
@@ -847,7 +847,7 @@ Script_end_if_just_battled:
 	ret z
 	jp Script_end
 
-Script_check_just_battled:
+Script_checkjustbattled:
 ; script command 0x67
 
 	ld a, TRUE
@@ -1561,7 +1561,7 @@ Script_iftrue:
 	jp nz, Script_jump
 	jp SkipTwoScriptBytes
 
-Script_if_equal:
+Script_ifequal:
 ; script command 0x6
 ; parameters: byte, pointer
 
@@ -1571,7 +1571,7 @@ Script_if_equal:
 	jr z, Script_jump
 	jr SkipTwoScriptBytes
 
-Script_if_not_equal:
+Script_ifnotequal:
 ; script command 0x7
 ; parameters: byte, pointer
 
@@ -1581,7 +1581,7 @@ Script_if_not_equal:
 	jr nz, Script_jump
 	jr SkipTwoScriptBytes
 
-Script_if_greater_than:
+Script_ifgreater:
 ; script command 0xa
 ; parameters: byte, pointer
 
@@ -1592,7 +1592,7 @@ Script_if_greater_than:
 	jr c, Script_jump
 	jr SkipTwoScriptBytes
 
-Script_if_less_than:
+Script_ifless:
 ; script command 0xb
 ; parameters: byte, pointer
 
@@ -2646,7 +2646,7 @@ Script_reloadandreturn:
 	call Script_newloadmap
 	jp Script_end
 
-Script_textbox:
+Script_opentext:
 ; script command 0x47
 
 	call OpenText
@@ -2787,7 +2787,7 @@ ExitScriptSubroutine:
 	scf
 	ret
 
-Script_end_all:
+Script_endall:
 ; script command 0x93
 
 	xor a
@@ -2817,7 +2817,7 @@ Script_credits:
 
 	farcall RedCredits
 ReturnFromCredits:
-	call Script_end_all
+	call Script_endall
 	ld a, $3
 	call LoadMapStatus
 	call StopScript
@@ -2839,7 +2839,7 @@ Script_wait:
 	pop bc
 	ret
 
-Script_check_save:
+Script_checksave:
 ; script command 0xa9
 
 	farcall CheckSave
diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm
index 6b17f5d94..7cf0ac032 100644
--- a/macros/scripts/events.asm
+++ b/macros/scripts/events.asm
@@ -37,16 +37,16 @@ ptjump: MACRO
 	dw \1 ; pointer
 ENDM
 
-	enum if_equal_command ; $06
-if_equal: MACRO
-	db if_equal_command
+	enum ifequal_command ; $06
+ifequal: MACRO
+	db ifequal_command
 	db \1 ; byte
 	dw \2 ; pointer
 ENDM
 
-	enum if_not_equal_command ; $07
-if_not_equal: MACRO
-	db if_not_equal_command
+	enum ifnotequal_command ; $07
+ifnotequal: MACRO
+	db ifnotequal_command
 	db \1 ; byte
 	dw \2 ; pointer
 ENDM
@@ -63,16 +63,16 @@ iftrue: MACRO
 	dw \1 ; pointer
 ENDM
 
-	enum if_greater_than_command ; $0a
-if_greater_than: MACRO
-	db if_greater_than_command
+	enum ifgreater_command ; $0a
+ifgreater: MACRO
+	db ifgreater_command
 	db \1 ; byte
 	dw \2 ; pointer
 ENDM
 
-	enum if_less_than_command ; $0b
-if_less_than: MACRO
-	db if_less_than_command
+	enum ifless_command ; $0b
+ifless: MACRO
+	db ifless_command
 	db \1 ; byte
 	dw \2 ; pointer
 ENDM
@@ -298,20 +298,20 @@ givepoke: MACRO
 	db givepoke_command
 	db \1 ; pokemon
 	db \2 ; level
-	if _NARG >= 3
+if _NARG >= 3
 	db \3 ; item
-	if _NARG >= 4
+if _NARG >= 4
 	db \4 ; trainer
-	if \4
+if \4
 	dw \5 ; trainer_name_pointer
 	dw \6 ; pkmn_nickname
-	endc
-	else
+endc
+else
 	db 0
-	endc
-	else
+endc
+else
 	db 0, 0
-	endc
+endc
 ENDM
 
 	enum giveegg_command ; $2e
@@ -651,14 +651,14 @@ scripttalkafter: MACRO
 	db scripttalkafter_command
 ENDM
 
-	enum end_if_just_battled_command ; $66
-end_if_just_battled: MACRO
-	db end_if_just_battled_command
+	enum endifjustbattled_command ; $66
+endifjustbattled: MACRO
+	db endifjustbattled_command
 ENDM
 
-	enum check_just_battled_command ; $67
-check_just_battled: MACRO
-	db check_just_battled_command
+	enum checkjustbattled_command ; $67
+checkjustbattled: MACRO
+	db checkjustbattled_command
 ENDM
 
 	enum setlasttalked_command ; $68
@@ -920,9 +920,9 @@ reloadandreturn: MACRO
 	db \1 ; which_method
 ENDM
 
-	enum end_all_command ; $93
-end_all: MACRO
-	db end_all_command
+	enum endall_command ; $93
+endall: MACRO
+	db endall_command
 ENDM
 
 	enum pokemart_command ; $94
@@ -1062,7 +1062,7 @@ wait: MACRO
 	db \1 ; duration
 ENDM
 
-	enum check_save_command ; $a9
-check_save: MACRO
-	db check_save_command
+	enum checksave_command ; $a9
+checksave: MACRO
+	db checksave_command
 ENDM
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
index 54fbfcea6..f8cd6d4b7 100644
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -57,8 +57,8 @@ AzaleaGymBugsyScript:
 	end
 
 AzaleaGymActivateRockets:
-	if_equal 7, .RadioTowerRockets
-	if_equal 6, .GoldenrodRockets
+	ifequal 7, .RadioTowerRockets
+	ifequal 6, .GoldenrodRockets
 	end
 
 .GoldenrodRockets:
@@ -71,7 +71,7 @@ TrainerTwinsAmyandmay1:
 	trainer TWINS, AMYANDMAY1, EVENT_BEAT_TWINS_AMY_AND_MAY, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript
 
 .AfterScript:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TwinsAmyandmay1AfterBattleText
 	waitbutton
@@ -82,7 +82,7 @@ TrainerTwinsAmyandmay2:
 	trainer TWINS, AMYANDMAY2, EVENT_BEAT_TWINS_AMY_AND_MAY, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, 0, .AfterScript
 
 .AfterScript:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TwinsAmyandmay2AfterBattleText
 	waitbutton
@@ -93,7 +93,7 @@ TrainerBugCatcherBenny:
 	trainer BUG_CATCHER, BUG_CATCHER_BENNY, EVENT_BEAT_BUG_CATCHER_BENNY, BugCatcherBennySeenText, BugCatcherBennyBeatenText, 0, .AfterScript
 
 .AfterScript:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BugCatcherBennyAfterBattleText
 	waitbutton
@@ -104,7 +104,7 @@ TrainerBugCatcherAl:
 	trainer BUG_CATCHER, AL, EVENT_BEAT_BUG_CATCHER_AL, BugCatcherAlSeenText, BugCatcherAlBeatenText, 0, .AfterScript
 
 .AfterScript:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BugCatcherAlAfterBattleText
 	waitbutton
@@ -115,7 +115,7 @@ TrainerBugCatcherJosh:
 	trainer BUG_CATCHER, JOSH, EVENT_BEAT_BUG_CATCHER_JOSH, BugCatcherJoshSeenText, BugCatcherJoshBeatenText, 0, .AfterScript
 
 .AfterScript:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BugCatcherJoshAfterBattleText
 	waitbutton
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index 71415b5d6..be4f3c2ee 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -18,10 +18,10 @@ BattleTower1F_MapScripts:
 	iffalse .SkipEverything
 	writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
 	special BattleTowerAction
-	if_equal $0, .SkipEverything
-	if_equal $2, .priorityjump1
-	if_equal $3, .SkipEverything
-	if_equal $4, .SkipEverything
+	ifequal $0, .SkipEverything
+	ifequal $2, .priorityjump1
+	ifequal $3, .SkipEverything
+	ifequal $4, .SkipEverything
 	opentext
 	writetext Text_WeveBeenWaitingForYou
 	waitbutton
@@ -54,28 +54,28 @@ UnknownScript_0x9e3e0:
 ReceptionistScript_0x9e3e2:
 	writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
 	special BattleTowerAction
-	if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
+	ifequal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
 	opentext
 	writetext Text_BattleTowerWelcomesYou
 	buttonsound
 	writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags]
 	special BattleTowerAction
-	if_not_equal $0, Script_Menu_ChallengeExplanationCancel
+	ifnotequal $0, Script_Menu_ChallengeExplanationCancel
 	jump Script_BattleTowerIntroductionYesNo
 
 Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc
 	writetext Text_WantToGoIntoABattleRoom
 	writebyte TRUE
 	special Menu_ChallengeExplanationCancel
-	if_equal 1, Script_ChooseChallenge
-	if_equal 2, Script_BattleTowerExplanation
+	ifequal 1, Script_ChooseChallenge
+	ifequal 2, Script_BattleTowerExplanation
 	jump Script_BattleTowerHopeToServeYouAgain
 
 Script_ChooseChallenge: ; 0x9e40f
 	writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM
 	special BattleTowerAction
 	special CheckForBattleTowerRules
-	if_not_equal FALSE, Script_WaitButton
+	ifnotequal FALSE, Script_WaitButton
 	writetext Text_SaveBeforeEnteringBattleRoom
 	yesorno
 	iffalse Script_Menu_ChallengeExplanationCancel
@@ -86,8 +86,8 @@ Script_ChooseChallenge: ; 0x9e40f
 	writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
 	special BattleTowerAction
 	special BattleTowerRoomMenu
-	if_equal $a, Script_Menu_ChallengeExplanationCancel
-	if_not_equal $0, Script_MobileError
+	ifequal $a, Script_Menu_ChallengeExplanationCancel
+	ifnotequal $0, Script_MobileError
 	writebyte BATTLETOWERACTION_11
 	special BattleTowerAction
 	writetext Text_RightThisWayToYourBattleRoom
@@ -122,7 +122,7 @@ Script_GivePlayerHisPrize: ; 0x9e47a
 	special BattleTowerAction
 	writebyte BATTLETOWERACTION_GIVEREWARD
 	special BattleTowerAction
-	if_equal POTION, Script_YourPackIsStuffedFull
+	ifequal POTION, Script_YourPackIsStuffedFull
 	itemtotext USE_SCRIPT_VAR, MEM_BUFFER_1
 	giveitem ITEM_FROM_MEM, 5
 	writetext Text_PlayerGotFive
@@ -173,8 +173,8 @@ UnreferencedScript_0x9e4be:
 	writebyte BATTLETOWERACTION_SET_EXPLANATION_READ
 	special BattleTowerAction
 	special Function1700ba
-	if_equal $a, Script_Menu_ChallengeExplanationCancel
-	if_not_equal $0, Script_MobileError
+	ifequal $a, Script_Menu_ChallengeExplanationCancel
+	ifnotequal $0, Script_MobileError
 	writetext Text_ReceivedAListOfLeadersOnTheHonorRoll
 	spriteface BATTLETOWER1F_RECEPTIONIST, LEFT
 	writetext Text_PleaseConfirmOnThisMonitor
@@ -186,15 +186,15 @@ UnreferencedScript_0x9e4be:
 UnreferencedScript_0x9e4ea:
 	writebyte BATTLETOWERACTION_LEVEL_CHECK
 	special BattleTowerAction
-	if_not_equal $0, Script_APkmnLevelExceeds
+	ifnotequal $0, Script_APkmnLevelExceeds
 	writebyte BATTLETOWERACTION_UBERS_CHECK
 	special BattleTowerAction
-	if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70
+	ifnotequal $0, Script_MayNotEnterABattleRoomUnderL70
 	special CheckForBattleTowerRules
-	if_not_equal FALSE, Script_WaitButton
+	ifnotequal FALSE, Script_WaitButton
 	writebyte BATTLETOWERACTION_05
 	special BattleTowerAction
-	if_equal $0, .zero
+	ifequal $0, .zero
 	writetext Text_CantBeRegistered_PreviousRecordDeleted
 	jump continue
 
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index dc291855a..d4dc279ac 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -33,9 +33,9 @@ Script_BattleRoomLoop: ; 0x9f425
 	special BattleTowerBattle ; calls predef startbattle
 	special FadeOutPalettes
 	reloadmap
-	if_not_equal $0, Script_FailedBattleTowerChallenge
+	ifnotequal $0, Script_FailedBattleTowerChallenge
 	copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64
-	if_equal BATTLETOWER_STREAK_LENGTH, Script_BeatenAllTrainers
+	ifequal BATTLETOWER_STREAK_LENGTH, Script_BeatenAllTrainers
 	applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksOut
 	warpsound
 	disappear BATTLETOWERBATTLEROOM_YOUNGSTER
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
index 8cf22e2f4..cf24725c9 100644
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -36,14 +36,14 @@ BattleTowerHallway_MapScripts:
 ; at least it should look like that
 ; because all warps lead to the same room
 .WalkToChosenBattleRoom: ; 0x9f5dc
-	if_equal 3, .L30L40
-	if_equal 4, .L30L40
-	if_equal 5, .L50L60
-	if_equal 6, .L50L60
-	if_equal 7, .L70L80
-	if_equal 8, .L70L80
-	if_equal 9, .L90L100
-	if_equal 10, .L90L100
+	ifequal 3, .L30L40
+	ifequal 4, .L30L40
+	ifequal 5, .L50L60
+	ifequal 6, .L50L60
+	ifequal 7, .L70L80
+	ifequal 8, .L70L80
+	ifequal 9, .L90L100
+	ifequal 10, .L90L100
 	applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo1020Room
 	jump .EnterBattleRoom
 
diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm
index 5060cc5a0..baf09246d 100644
--- a/maps/BillsFamilysHouse.asm
+++ b/maps/BillsFamilysHouse.asm
@@ -20,7 +20,7 @@ BillScript:
 	buttonsound
 	waitsfx
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, UnknownScript_0x54c13
+	ifequal PARTY_LENGTH, UnknownScript_0x54c13
 	writetext UnknownText_0x54dae
 	playsound SFX_CAUGHT_MON
 	waitsfx
@@ -72,8 +72,8 @@ BillsSisterScript:
 	iftrue UnknownScript_0x54c58
 	writetext UnknownText_0x54f9e
 	askforphonenumber PHONE_BILL
-	if_equal PHONE_CONTACTS_FULL, UnknownScript_0x54c64
-	if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x54c5e
+	ifequal PHONE_CONTACTS_FULL, UnknownScript_0x54c64
+	ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x54c5e
 	waitsfx
 	addcellnum PHONE_BILL
 	writetext UnknownText_0x54fd9
diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
index 53a803642..76f268f5a 100644
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -37,7 +37,7 @@ BillsGrandpa:
 	scall .ExcitedToSee
 	special BillsGrandfather
 	iffalse .SaidNo
-	if_not_equal LICKITUNG, .WrongPokemon
+	ifnotequal LICKITUNG, .WrongPokemon
 	scall .CorrectPokemon
 	setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
 	jump .ShowedLickitung
@@ -51,7 +51,7 @@ BillsGrandpa:
 	scall .ExcitedToSee
 	special BillsGrandfather
 	iffalse .SaidNo
-	if_not_equal ODDISH, .WrongPokemon
+	ifnotequal ODDISH, .WrongPokemon
 	scall .CorrectPokemon
 	setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA
 	jump .ShowedOddish
@@ -65,7 +65,7 @@ BillsGrandpa:
 	scall .ExcitedToSee
 	special BillsGrandfather
 	iffalse .SaidNo
-	if_not_equal STARYU, .WrongPokemon
+	ifnotequal STARYU, .WrongPokemon
 	scall .CorrectPokemon
 	setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
 	jump .ShowedStaryu
@@ -81,7 +81,7 @@ BillsGrandpa:
 	scall .ExcitedToSee
 	special BillsGrandfather
 	iffalse .SaidNo
-	if_not_equal GROWLITHE, .WrongPokemon
+	ifnotequal GROWLITHE, .WrongPokemon
 	scall .CorrectPokemon
 	setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
 	jump .ShowedGrowlitheVulpix
@@ -95,7 +95,7 @@ BillsGrandpa:
 	scall .ExcitedToSee
 	special BillsGrandfather
 	iffalse .SaidNo
-	if_not_equal VULPIX, .WrongPokemon
+	ifnotequal VULPIX, .WrongPokemon
 	scall .CorrectPokemon
 	setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
 	jump .ShowedGrowlitheVulpix
@@ -109,7 +109,7 @@ BillsGrandpa:
 	scall .ExcitedToSee
 	special BillsGrandfather
 	iffalse .SaidNo
-	if_not_equal PICHU, .WrongPokemon
+	ifnotequal PICHU, .WrongPokemon
 	scall .CorrectPokemon
 	setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
 	jump .ShowedPichu
diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm
index 6add75d58..538f325c6 100644
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -22,7 +22,7 @@ BlackthornCity_MapScripts:
 
 .Santos:
 	checkcode VAR_WEEKDAY
-	if_equal SATURDAY, .SantosAppears
+	ifequal SATURDAY, .SantosAppears
 	disappear BLACKTHORNCITY_SANTOS
 	return
 
@@ -91,7 +91,7 @@ SantosScript:
 	checkevent EVENT_GOT_SPELL_TAG_FROM_SANTOS
 	iftrue .Saturday
 	checkcode VAR_WEEKDAY
-	if_not_equal SATURDAY, .NotSaturday
+	ifnotequal SATURDAY, .NotSaturday
 	checkevent EVENT_MET_SANTOS_OF_SATURDAY
 	iftrue .MetSantos
 	writetext MeetSantosText
diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm
index fd4d241a2..4627e807b 100644
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -94,7 +94,7 @@ TrainerCooltrainermPaul:
 	trainer COOLTRAINERM, PAUL, EVENT_BEAT_COOLTRAINERM_PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermPaulAfterBattleText
 	waitbutton
@@ -105,7 +105,7 @@ TrainerCooltrainermMike:
 	trainer COOLTRAINERM, MIKE, EVENT_BEAT_COOLTRAINERM_MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermMikeAfterBattleText
 	waitbutton
@@ -116,7 +116,7 @@ TrainerCooltrainerfLola:
 	trainer COOLTRAINERF, LOLA, EVENT_BEAT_COOLTRAINERF_LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfLolaAfterBattleText
 	waitbutton
diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm
index ede7029cb..195e937e3 100644
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -60,7 +60,7 @@ TrainerCooltrainermCody:
 	trainer COOLTRAINERM, CODY, EVENT_BEAT_COOLTRAINERM_CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermCodyAfterBattleText
 	waitbutton
@@ -71,7 +71,7 @@ TrainerCooltrainerfFran:
 	trainer COOLTRAINERF, FRAN, EVENT_BEAT_COOLTRAINERF_FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfFranAfterBattleText
 	waitbutton
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
index 47bf02719..c101b788b 100644
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -10,7 +10,7 @@ DaisyScript:
 	faceplayer
 	opentext
 	checkcode VAR_HOUR
-	if_equal 15, .ThreePM
+	ifequal 15, .ThreePM
 	writetext DaisyHelloText
 	waitbutton
 	closetext
@@ -25,8 +25,8 @@ DaisyScript:
 	writetext DaisyWhichMonText
 	waitbutton
 	special DaisysGrooming
-	if_equal $0, .Refused
-	if_equal $1, .CantGroomEgg
+	ifequal $0, .Refused
+	ifequal $1, .CantGroomEgg
 	setflag ENGINE_DAISYS_GROOMING
 	writetext DaisyAlrightText
 	waitbutton
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index afccf06c9..be6bdd72e 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -104,7 +104,7 @@ BurnedTowerB1FEusine:
 	waitbutton
 	closetext
 	checkcode VAR_FACING
-	if_equal UP, .Movement
+	ifequal UP, .Movement
 	applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement1
 	jump UnknownScript_0x18622a
 
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index a42318c2e..f57308593 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -26,15 +26,15 @@ CeladonDeptStore6FVendingMachine:
 	loadmenuheader .MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .FreshWater
-	if_equal 2, .SodaPop
-	if_equal 3, .Lemonade
+	ifequal 1, .FreshWater
+	ifequal 2, .SodaPop
+	ifequal 3, .Lemonade
 	closetext
 	end
 
 .FreshWater:
 	checkmoney YOUR_MONEY, 200
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	giveitem FRESH_WATER
 	iffalse .NotEnoughSpace
 	takemoney YOUR_MONEY, 200
@@ -43,7 +43,7 @@ CeladonDeptStore6FVendingMachine:
 
 .SodaPop:
 	checkmoney YOUR_MONEY, 300
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	giveitem SODA_POP
 	iffalse .NotEnoughSpace
 	takemoney YOUR_MONEY, 300
@@ -52,7 +52,7 @@ CeladonDeptStore6FVendingMachine:
 
 .Lemonade:
 	checkmoney YOUR_MONEY, 350
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	giveitem LEMONADE
 	iffalse .NotEnoughSpace
 	takemoney YOUR_MONEY, 350
diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm
index 89f8f6e84..31229d335 100644
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -57,7 +57,7 @@ CeladonGameCornerFisherScript:
 	checkitem COIN_CASE
 	iffalse .NoCoinCase
 	checkcoins MAX_COINS - 1
-	if_equal HAVE_MORE, .FullCoinCase
+	ifequal HAVE_MORE, .FullCoinCase
 	stringtotext .coinname, MEM_BUFFER_1
 	scall .GiveCoins
 	givecoins 18
@@ -110,7 +110,7 @@ CeladonGameCornerPoster2Script:
 
 CeladonGameCornerLuckySlotMachineScript:
 	random 6
-	if_equal 0, CeladonGameCornerSlotMachineScript
+	ifequal 0, CeladonGameCornerSlotMachineScript
 	refreshscreen
 	writebyte FALSE
 	special SlotMachine
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index 4f2750d54..01e2229ae 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -26,14 +26,14 @@ CeladonPrizeRoom_tmcounterloop:
 	loadmenuheader CeladonPrizeRoom_TMMenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .doubleteam
-	if_equal 2, .psychic
-	if_equal 3, .hyperbeam
+	ifequal 1, .doubleteam
+	ifequal 2, .psychic
+	ifequal 3, .hyperbeam
 	jump CeladonPrizeRoom_cancel
 
 .doubleteam
 	checkcoins 1500
-	if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
+	ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
 	itemtotext TM_DOUBLE_TEAM, MEM_BUFFER_0
 	scall CeladonPrizeRoom_askbuy
 	iffalse CeladonPrizeRoom_cancel
@@ -44,7 +44,7 @@ CeladonPrizeRoom_tmcounterloop:
 
 .psychic
 	checkcoins 3500
-	if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
+	ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
 	itemtotext TM_PSYCHIC_M, MEM_BUFFER_0
 	scall CeladonPrizeRoom_askbuy
 	iffalse CeladonPrizeRoom_cancel
@@ -55,7 +55,7 @@ CeladonPrizeRoom_tmcounterloop:
 
 .hyperbeam
 	checkcoins 7500
-	if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
+	ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
 	itemtotext TM_HYPER_BEAM, MEM_BUFFER_0
 	scall CeladonPrizeRoom_askbuy
 	iffalse CeladonPrizeRoom_cancel
@@ -127,16 +127,16 @@ CeladonGameCornerPrizeRoomPokemonVendor:
 	loadmenuheader .MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .pikachu
-	if_equal 2, .porygon
-	if_equal 3, .larvitar
+	ifequal 1, .pikachu
+	ifequal 2, .porygon
+	ifequal 3, .larvitar
 	jump CeladonPrizeRoom_cancel
 
 .pikachu
 	checkcoins 2222
-	if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
+	ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
+	ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
 	pokenamemem PIKACHU, MEM_BUFFER_0
 	scall CeladonPrizeRoom_askbuy
 	iffalse CeladonPrizeRoom_cancel
@@ -152,9 +152,9 @@ CeladonGameCornerPrizeRoomPokemonVendor:
 
 .porygon
 	checkcoins 5555
-	if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
+	ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
+	ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
 	pokenamemem PORYGON, MEM_BUFFER_0
 	scall CeladonPrizeRoom_askbuy
 	iffalse CeladonPrizeRoom_cancel
@@ -170,9 +170,9 @@ CeladonGameCornerPrizeRoomPokemonVendor:
 
 .larvitar
 	checkcoins 8888
-	if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
+	ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
+	ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
 	pokenamemem LARVITAR, MEM_BUFFER_0
 	scall CeladonPrizeRoom_askbuy
 	iffalse CeladonPrizeRoom_cancel
diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm
index 3d495e622..246b30a39 100644
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -51,7 +51,7 @@ TrainerLassMichelle:
 	trainer LASS, MICHELLE, EVENT_BEAT_LASS_MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext LassMichelleAfterBattleText
 	waitbutton
@@ -62,7 +62,7 @@ TrainerPicnickerTanya:
 	trainer PICNICKER, TANYA, EVENT_BEAT_PICNICKER_TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PicnickerTanyaAfterBattleText
 	waitbutton
@@ -73,7 +73,7 @@ TrainerBeautyJulia:
 	trainer BEAUTY, JULIA, EVENT_BEAT_BEAUTY_JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BeautyJuliaAfterBattleText
 	waitbutton
@@ -84,7 +84,7 @@ TrainerTwinsJoandzoe1:
 	trainer TWINS, JOANDZOE1, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TwinsJoandzoe1AfterBattleText
 	waitbutton
@@ -95,7 +95,7 @@ TrainerTwinsJoandzoe2:
 	trainer TWINS, JOANDZOE2, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TwinsJoandzoe2AfterBattleText
 	waitbutton
diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm
index 3f6b24bea..a2f187409 100644
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -14,7 +14,7 @@ CooltrainerMScript_0x71670:
 	opentext
 	writetext UnknownText_0x716ce
 	checkcode VAR_DEXCAUGHT
-	if_greater_than NUM_POKEMON - 2 - 1, UnknownScript_0x7167e ; ignore Mew and Celebi
+	ifgreater NUM_POKEMON - 2 - 1, UnknownScript_0x7167e ; ignore Mew and Celebi
 	waitbutton
 	closetext
 	end
diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm
index 4a61137e3..0fbe53d52 100644
--- a/maps/CeladonPokecenter1F.asm
+++ b/maps/CeladonPokecenter1F.asm
@@ -43,7 +43,7 @@ CeladonEusine:
 	waitbutton
 	closetext
 	checkcode VAR_FACING
-	if_equal UP, .Location1
+	ifequal UP, .Location1
 	applymovement CELADONPOKECENTER1F_EUSINE, .Movement1
 	jump .Continue
 
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index f99369393..8c50ce1bf 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -87,7 +87,7 @@ TrainerSwimmerfDiana:
 	trainer SWIMMERF, DIANA, EVENT_BEAT_SWIMMERF_DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfDianaAfterBattleText
 	waitbutton
@@ -98,7 +98,7 @@ TrainerSwimmerfBriana:
 	trainer SWIMMERF, BRIANA, EVENT_BEAT_SWIMMERF_BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfBrianaAfterBattleText
 	waitbutton
@@ -109,7 +109,7 @@ TrainerSwimmermParker:
 	trainer SWIMMERM, PARKER, EVENT_BEAT_SWIMMERM_PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermParkerAfterBattleText
 	waitbutton
diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm
index ca03da0b1..b7045c826 100644
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -74,8 +74,8 @@ ChuckScript_0x9d60f:
 	end
 
 CianwoodGymActivateRockets:
-	if_equal 7, .RadioTowerRockets
-	if_equal 6, .GoldenrodRockets
+	ifequal 7, .RadioTowerRockets
+	ifequal 6, .GoldenrodRockets
 	end
 
 .GoldenrodRockets:
@@ -88,7 +88,7 @@ TrainerBlackbeltYoshi:
 	trainer BLACKBELT_T, YOSHI, EVENT_BEAT_BLACKBELT_YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BlackbeltYoshiAfterText
 	waitbutton
@@ -99,7 +99,7 @@ TrainerBlackbeltLao:
 	trainer BLACKBELT_T, LAO, EVENT_BEAT_BLACKBELT_LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BlackbeltLaoAfterText
 	waitbutton
@@ -110,7 +110,7 @@ TrainerBlackbeltNob:
 	trainer BLACKBELT_T, NOB, EVENT_BEAT_BLACKBELT_NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BlackbeltNobAfterText
 	waitbutton
@@ -121,7 +121,7 @@ TrainerBlackbeltLung:
 	trainer BLACKBELT_T, LUNG, EVENT_BEAT_BLACKBELT_LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BlackbeltLungAfterText
 	waitbutton
diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm
index e4257922f..1e700ba7d 100644
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -18,7 +18,7 @@ TrainerKimonoGirlNaoko2:
 	trainer KIMONO_GIRL, NAOKO2, EVENT_BEAT_KIMONO_GIRL_NAOKO, KimonoGirlNaoko2SeenText, KimonoGirlNaoko2BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext KimonoGirlNaoko2AfterBattleText
 	waitbutton
@@ -29,7 +29,7 @@ TrainerKimonoGirlSayo:
 	trainer KIMONO_GIRL, SAYO, EVENT_BEAT_KIMONO_GIRL_SAYO, KimonoGirlSayoSeenText, KimonoGirlSayoBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext KimonoGirlSayoAfterBattleText
 	waitbutton
@@ -40,7 +40,7 @@ TrainerKimonoGirlZuki:
 	trainer KIMONO_GIRL, ZUKI, EVENT_BEAT_KIMONO_GIRL_ZUKI, KimonoGirlZukiSeenText, KimonoGirlZukiBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext KimonoGirlZukiAfterBattleText
 	waitbutton
@@ -51,7 +51,7 @@ TrainerKimonoGirlKuni:
 	trainer KIMONO_GIRL, KUNI, EVENT_BEAT_KIMONO_GIRL_KUNI, KimonoGirlKuniSeenText, KimonoGirlKuniBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext KimonoGirlKuniAfterBattleText
 	waitbutton
@@ -62,7 +62,7 @@ TrainerKimonoGirlMiki:
 	trainer KIMONO_GIRL, MIKI, EVENT_BEAT_KIMONO_GIRL_MIKI, KimonoGirlMikiSeenText, KimonoGirlMikiBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext KimonoGirlMikiAfterBattleText
 	waitbutton
diff --git a/maps/DayCare.asm b/maps/DayCare.asm
index d14bdc24f..7d085ede3 100644
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -29,7 +29,7 @@ DayCareManScript_Inside:
 	buttonsound
 	closetext
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, .PartyFull
+	ifequal PARTY_LENGTH, .PartyFull
 	special GiveOddEgg
 	opentext
 	writetext DayCareText_GotOddEgg
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index 9a45e1482..f98dc7df9 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -31,9 +31,9 @@ DragonShrine_MapScripts:
 	loadmenuheader DragonShrineQuestion1_MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .RightAnswer
-	if_equal 2, .WrongAnswer
-	if_equal 3, .RightAnswer
+	ifequal 1, .RightAnswer
+	ifequal 2, .WrongAnswer
+	ifequal 3, .RightAnswer
 	end
 
 .Question2:
@@ -43,9 +43,9 @@ DragonShrine_MapScripts:
 	loadmenuheader DragonShrineQuestion2_MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .RightAnswer
-	if_equal 2, .RightAnswer
-	if_equal 3, .WrongAnswer
+	ifequal 1, .RightAnswer
+	ifequal 2, .RightAnswer
+	ifequal 3, .WrongAnswer
 .Question3:
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4
 	writetext DragonShrineQuestion3Text
@@ -53,9 +53,9 @@ DragonShrine_MapScripts:
 	loadmenuheader DragonShrineQuestion3_MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .WrongAnswer
-	if_equal 2, .RightAnswer
-	if_equal 3, .RightAnswer
+	ifequal 1, .WrongAnswer
+	ifequal 2, .RightAnswer
+	ifequal 3, .RightAnswer
 .Question4:
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5
 	writetext DragonShrineQuestion4Text
@@ -63,9 +63,9 @@ DragonShrine_MapScripts:
 	loadmenuheader DragonShrineQuestion4_MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .RightAnswer
-	if_equal 2, .WrongAnswer
-	if_equal 3, .RightAnswer
+	ifequal 1, .RightAnswer
+	ifequal 2, .WrongAnswer
+	ifequal 3, .RightAnswer
 .Question5:
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6
 	writetext DragonShrineQuestion5Text
@@ -73,9 +73,9 @@ DragonShrine_MapScripts:
 	loadmenuheader DragonShrineQuestion5_MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .WrongAnswer
-	if_equal 2, .RightAnswer
-	if_equal 3, .WrongAnswer
+	ifequal 1, .WrongAnswer
+	ifequal 2, .RightAnswer
+	ifequal 3, .WrongAnswer
 .RightAnswer:
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6
 	iftrue .PassedTheTest
@@ -209,7 +209,7 @@ DragonShrineElder1Script:
 	writetext DragonShrineTakeThisDratiniText
 	waitbutton
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, .PartyFull
+	ifequal PARTY_LENGTH, .PartyFull
 	writetext DragonShrinePlayerReceivedDratiniText
 	playsound SFX_CAUGHT_MON
 	waitsfx
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index a194a397e..9c6bca29c 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -31,8 +31,8 @@ DragonsDenB1F_MapScripts:
 
 .CheckDay:
 	checkcode VAR_WEEKDAY
-	if_equal TUESDAY, .AppearSilver
-	if_equal THURSDAY, .AppearSilver
+	ifequal TUESDAY, .AppearSilver
+	ifequal THURSDAY, .AppearSilver
 	disappear DRAGONSDENB1F_SILVER
 	return
 
@@ -85,7 +85,7 @@ TrainerCooltrainermDarin:
 	trainer COOLTRAINERM, DARIN, EVENT_BEAT_COOLTRAINERM_DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermDarinAfterBattleText
 	waitbutton
@@ -96,7 +96,7 @@ TrainerCooltrainerfCara:
 	trainer COOLTRAINERF, CARA, EVENT_BEAT_COOLTRAINERF_CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfCaraAfterBattleText
 	waitbutton
@@ -107,7 +107,7 @@ TrainerTwinsLeaandpia1:
 	trainer TWINS, LEAANDPIA1, EVENT_BEAT_TWINS_LEA_AND_PIA, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TwinsLeaandpia1AfterBattleText
 	waitbutton
@@ -118,7 +118,7 @@ TrainerTwinsLeaandpia2:
 	trainer TWINS, LEAANDPIA1, EVENT_BEAT_TWINS_LEA_AND_PIA, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TwinsLeaandpia2AfterBattleText
 	waitbutton
diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm
index 84dafb3f2..55eeed805 100644
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -67,11 +67,11 @@ AcademyBlackboard:
 	loadmenuheader .BlackboardMenuHeader
 	_2dmenu
 	closewindow
-	if_equal 1, .Poison
-	if_equal 2, .Paralysis
-	if_equal 3, .Sleep
-	if_equal 4, .Burn
-	if_equal 5, .Freeze
+	ifequal 1, .Poison
+	ifequal 2, .Paralysis
+	ifequal 3, .Sleep
+	ifequal 4, .Burn
+	ifequal 5, .Freeze
 	closetext
 	end
 
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index 09dfaa5e2..7969dad16 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -69,8 +69,8 @@ MortyScript_0x99d58:
 	end
 
 EcruteakGymActivateRockets:
-	if_equal 7, .RadioTowerRockets
-	if_equal 6, .GoldenrodRockets
+	ifequal 7, .RadioTowerRockets
+	ifequal 6, .GoldenrodRockets
 	end
 
 .GoldenrodRockets:
@@ -99,7 +99,7 @@ TrainerSageJeffrey:
 	trainer SAGE, JEFFREY, EVENT_BEAT_SAGE_JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SageJeffreyAfterBattleText
 	waitbutton
@@ -110,7 +110,7 @@ TrainerSagePing:
 	trainer SAGE, PING, EVENT_BEAT_SAGE_PING, SagePingSeenText, SagePingBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SagePingAfterBattleText
 	waitbutton
@@ -121,7 +121,7 @@ TrainerMediumMartha:
 	trainer MEDIUM, MARTHA, EVENT_BEAT_MEDIUM_MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext MediumMarthaAfterBattleText
 	waitbutton
@@ -132,7 +132,7 @@ TrainerMediumGrace:
 	trainer MEDIUM, GRACE, EVENT_BEAT_MEDIUM_GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext MediumGraceAfterBattleText
 	waitbutton
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 7fac1ff13..625e139b1 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -181,7 +181,7 @@ CyndaquilPokeBallScript:
 	givepoke CYNDAQUIL, 5, BERRY
 	closetext
 	checkcode VAR_FACING
-	if_equal RIGHT, ElmDirectionsScript
+	ifequal RIGHT, ElmDirectionsScript
 	applymovement PLAYER, AfterCyndaquilMovement
 	jump ElmDirectionsScript
 
@@ -420,19 +420,19 @@ ElmGiveTicketScript:
 ElmJumpBackScript1:
 	closetext
 	checkcode VAR_FACING
-	if_equal DOWN, ElmJumpDownScript
-	if_equal UP, ElmJumpUpScript
-	if_equal LEFT, ElmJumpLeftScript
-	if_equal RIGHT, ElmJumpRightScript
+	ifequal DOWN, ElmJumpDownScript
+	ifequal UP, ElmJumpUpScript
+	ifequal LEFT, ElmJumpLeftScript
+	ifequal RIGHT, ElmJumpRightScript
 	end
 
 ElmJumpBackScript2:
 	closetext
 	checkcode VAR_FACING
-	if_equal DOWN, ElmJumpUpScript
-	if_equal UP, ElmJumpDownScript
-	if_equal LEFT, ElmJumpRightScript
-	if_equal RIGHT, ElmJumpLeftScript
+	ifequal DOWN, ElmJumpUpScript
+	ifequal UP, ElmJumpDownScript
+	ifequal LEFT, ElmJumpRightScript
+	ifequal RIGHT, ElmJumpLeftScript
 	end
 
 ElmJumpUpScript:
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index ccd11693e..bc062251e 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -88,7 +88,7 @@ SailorScript_0x75160:
 
 .LetThePlayerOut:
 	checkcode VAR_FACING
-	if_equal RIGHT, .YouAreFacingRight
+	ifequal RIGHT, .YouAreFacingRight
 	applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e
 	applymovement PLAYER, MovementData_0x75235
 	end
diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm
index 5737b62b4..3984274cc 100644
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -95,7 +95,7 @@ TrainerSailorJeff:
 	trainer SAILOR, JEFF, EVENT_BEAT_SAILOR_JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SailorJeffAfterBattleText
 	waitbutton
@@ -106,7 +106,7 @@ TrainerPicnickerDebra:
 	trainer PICNICKER, DEBRA, EVENT_BEAT_PICNICKER_DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PicnickerDebraAfterBattleText
 	waitbutton
@@ -117,7 +117,7 @@ TrainerJugglerFritz:
 	trainer JUGGLER, FRITZ, EVENT_BEAT_JUGGLER_FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext JugglerFritzAfterBattleText
 	waitbutton
@@ -128,7 +128,7 @@ TrainerSailorGarrett:
 	trainer SAILOR, GARRETT, EVENT_BEAT_SAILOR_GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SailorGarrettAfterBattleText
 	waitbutton
@@ -139,7 +139,7 @@ TrainerFisherJonah:
 	trainer FISHER, JONAH, EVENT_BEAT_FISHER_JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherJonahAfterBattleText
 	waitbutton
@@ -150,7 +150,7 @@ TrainerBlackbeltWai:
 	trainer BLACKBELT_T, WAI, EVENT_BEAT_BLACKBELT_WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BlackbeltWaiAfterBattleText
 	waitbutton
@@ -161,7 +161,7 @@ TrainerSailorKenneth:
 	trainer SAILOR, KENNETH, EVENT_BEAT_SAILOR_KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SailorKennethAfterBattleText
 	waitbutton
@@ -172,7 +172,7 @@ TrainerTeacherShirley:
 	trainer TEACHER, SHIRLEY, EVENT_BEAT_TEACHER_SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TeacherShirleyAfterBattleText
 	waitbutton
@@ -183,7 +183,7 @@ TrainerSchoolboyNate:
 	trainer SCHOOLBOY, NATE, EVENT_BEAT_SCHOOLBOY_NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SchoolboyNateAfterBattleText
 	waitbutton
@@ -194,7 +194,7 @@ TrainerSchoolboyRicky:
 	trainer SCHOOLBOY, RICKY, EVENT_BEAT_SCHOOLBOY_RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SchoolboyRickyAfterBattleText
 	waitbutton
diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm
index 39cfa0367..8bc91d408 100644
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -16,7 +16,7 @@ TrainerCooltrainermSean:
 	trainer COOLTRAINERM, SEAN, EVENT_BEAT_COOLTRAINERM_SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermSeanAfterBattleText
 	waitbutton
@@ -27,7 +27,7 @@ TrainerCooltrainerfCarol:
 	trainer COOLTRAINERF, CAROL, EVENT_BEAT_COOLTRAINERF_CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfCarolAfterBattleText
 	waitbutton
@@ -38,7 +38,7 @@ TrainerPokemaniacEthan:
 	trainer POKEMANIAC, ETHAN, EVENT_BEAT_POKEMANIAC_ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacEthanAfterBattleText
 	waitbutton
@@ -49,7 +49,7 @@ TrainerHikerNoland:
 	trainer HIKER, NOLAND, EVENT_BEAT_HIKER_NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerNolandAfterBattleText
 	waitbutton
@@ -60,7 +60,7 @@ TrainerGentlemanEdward:
 	trainer GENTLEMAN, EDWARD, EVENT_BEAT_GENTLEMAN_EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GentlemanEdwardAfterBattleText
 	waitbutton
@@ -71,7 +71,7 @@ TrainerBurglarCorey:
 	trainer BURGLAR, COREY, EVENT_BEAT_BURGLAR_COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BurglarCoreyAfterBattleText
 	waitbutton
@@ -98,7 +98,7 @@ SailorScript_0x755f1:
 	setevent EVENT_FAST_SHIP_LAZY_SAILOR
 	setmapscene FAST_SHIP_B1F, SCENE_FINISHED
 	checkcode VAR_FACING
-	if_equal RIGHT, UnknownScript_0x75629
+	ifequal RIGHT, UnknownScript_0x75629
 	applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637
 	playsound SFX_EXIT_BUILDING
 	disappear FASTSHIPCABINS_NNW_NNE_NE_SAILOR
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index ece89c3ec..cca6db346 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -142,7 +142,7 @@ TrainerPokefanmColin:
 	trainer POKEFANM, COLIN, EVENT_BEAT_POKEFANM_COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmColinAfterBattleText
 	waitbutton
@@ -153,7 +153,7 @@ TrainerTwinsMegandpeg1:
 	trainer TWINS, MEGANDPEG1, EVENT_BEAT_TWINS_MEG_AND_PEG, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TwinsMegandpeg1AfterBattleText
 	waitbutton
@@ -164,7 +164,7 @@ TrainerTwinsMegandpeg2:
 	trainer TWINS, MEGANDPEG2, EVENT_BEAT_TWINS_MEG_AND_PEG, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TwinsMegandpeg2AfterBattleText
 	waitbutton
@@ -175,7 +175,7 @@ TrainerPsychicRodney:
 	trainer PSYCHIC_T, RODNEY, EVENT_BEAT_PSYCHIC_RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicRodneyAfterBattleText
 	waitbutton
@@ -186,7 +186,7 @@ TrainerPokefanmJeremy:
 	trainer POKEFANM, JEREMY, EVENT_BEAT_POKEFANM_JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmJeremyAfterBattleText
 	waitbutton
@@ -197,7 +197,7 @@ TrainerPokefanfGeorgia:
 	trainer POKEFANF, GEORGIA, EVENT_BEAT_POKEFANF_GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanfGeorgiaAfterBattleText
 	waitbutton
@@ -208,7 +208,7 @@ TrainerSupernerdShawn:
 	trainer SUPER_NERD, SHAWN, EVENT_BEAT_SUPER_NERD_SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SupernerdShawnAfterBattleText
 	waitbutton
diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm
index 275fb5db7..e9146447b 100644
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -13,7 +13,7 @@ TrainerFirebreatherLyle:
 	trainer FIREBREATHER, LYLE, EVENT_BEAT_FIREBREATHER_LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FirebreatherLyleAfterBattleText
 	waitbutton
@@ -24,7 +24,7 @@ TrainerBugCatcherKen:
 	trainer BUG_CATCHER, KEN, EVENT_BEAT_BUG_CATCHER_KEN, BugCatcherKenSeenText, BugCatcherKenBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BugCatcherKenAfterBattleText
 	waitbutton
@@ -35,7 +35,7 @@ TrainerBeautyCassie:
 	trainer BEAUTY, CASSIE, EVENT_BEAT_BEAUTY_CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BeautyCassieAfterBattleText
 	waitbutton
@@ -46,7 +46,7 @@ TrainerGuitaristClyde:
 	trainer GUITARIST, CLYDE, EVENT_BEAT_GUITARIST_CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	special Mobile_DummyReturnFalse
 	iftrue .mobile
 	opentext
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 642d3143b..7c6382392 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -37,8 +37,8 @@ GoldenrodCity_MapScripts:
 	checkitem COIN_CASE
 	iffalse .MoveTutorDisappear
 	checkcode VAR_WEEKDAY
-	if_equal WEDNESDAY, .MoveTutorAppear
-	if_equal SATURDAY, .MoveTutorAppear
+	ifequal WEDNESDAY, .MoveTutorAppear
+	ifequal SATURDAY, .MoveTutorAppear
 .MoveTutorDisappear:
 	disappear GOLDENRODCITY_POKEFAN_M2
 	return
@@ -61,35 +61,35 @@ MoveTutorScript:
 	yesorno
 	iffalse .Refused2
 	checkcoins 4000
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	writetext UnknownText_0x1990ce
 	loadmenuheader .MoveMenuHeader
 	verticalmenu
 	closewindow
-	if_equal MOVETUTOR_FLAMETHROWER, .Flamethrower
-	if_equal MOVETUTOR_THUNDERBOLT, .Thunderbolt
-	if_equal MOVETUTOR_ICE_BEAM, .IceBeam
+	ifequal MOVETUTOR_FLAMETHROWER, .Flamethrower
+	ifequal MOVETUTOR_THUNDERBOLT, .Thunderbolt
+	ifequal MOVETUTOR_ICE_BEAM, .IceBeam
 	jump .Incompatible
 
 .Flamethrower:
 	writebyte MOVETUTOR_FLAMETHROWER
 	writetext UnknownText_0x1991cf
 	special MoveTutor
-	if_equal FALSE, .TeachMove
+	ifequal FALSE, .TeachMove
 	jump .Incompatible
 
 .Thunderbolt:
 	writebyte MOVETUTOR_THUNDERBOLT
 	writetext UnknownText_0x1991cf
 	special MoveTutor
-	if_equal FALSE, .TeachMove
+	ifequal FALSE, .TeachMove
 	jump .Incompatible
 
 .IceBeam:
 	writebyte MOVETUTOR_ICE_BEAM
 	writetext UnknownText_0x1991cf
 	special MoveTutor
-	if_equal FALSE, .TeachMove
+	ifequal FALSE, .TeachMove
 	jump .Incompatible
 
 .MoveMenuHeader:
@@ -129,7 +129,7 @@ MoveTutorScript:
 	waitbutton
 	closetext
 	checkcode VAR_FACING
-	if_equal LEFT, .WalkAroundPlayer
+	ifequal LEFT, .WalkAroundPlayer
 	applymovement GOLDENRODCITY_POKEFAN_M2, MovementData_0x198a5f
 	jump .GoInside
 
diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm
index a69e87f64..4eccdfdbd 100644
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -14,7 +14,7 @@ GoldenrodDeptStore5F_MapScripts:
 
 .CheckIfSunday:
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, .yes
+	ifequal SUNDAY, .yes
 	disappear GOLDENRODDEPTSTORE5F_RECEPTIONIST
 	return
 
@@ -60,14 +60,14 @@ ReceptionistScript_0x560ce:
 	faceplayer
 	opentext
 	checkcode VAR_WEEKDAY
-	if_not_equal SUNDAY, .EventIsOver
+	ifnotequal SUNDAY, .EventIsOver
 	checkflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN
 	iftrue .EventIsOver
 	special GetFirstPokemonHappiness
 	writetext UnknownText_0x56143
 	buttonsound
-	if_greater_than 150 - 1, .VeryHappy
-	if_greater_than 50 - 1, .SomewhatHappy
+	ifgreater 150 - 1, .VeryHappy
+	ifgreater 50 - 1, .SomewhatHappy
 	jump .NotVeryHappy
 
 .VeryHappy:
@@ -105,7 +105,7 @@ Carrie:
 	faceplayer
 	opentext
 	special GameboyCheck
-	if_not_equal GBCHECK_CGB, .NotGBC ; This is a dummy check from Gold/Silver
+	ifnotequal GBCHECK_CGB, .NotGBC ; This is a dummy check from Gold/Silver
 	writetext UnknownText_0x56241
 	waitbutton
 	closetext
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index 37e66862a..207b28191 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -15,15 +15,15 @@ GoldenrodVendingMachine:
 	loadmenuheader .MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .FreshWater
-	if_equal 2, .SodaPop
-	if_equal 3, .Lemonade
+	ifequal 1, .FreshWater
+	ifequal 2, .SodaPop
+	ifequal 3, .Lemonade
 	closetext
 	end
 
 .FreshWater:
 	checkmoney YOUR_MONEY, 200
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	giveitem FRESH_WATER
 	iffalse .NotEnoughSpace
 	takemoney YOUR_MONEY, 200
@@ -32,7 +32,7 @@ GoldenrodVendingMachine:
 
 .SodaPop:
 	checkmoney YOUR_MONEY, 300
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	giveitem SODA_POP
 	iffalse .NotEnoughSpace
 	takemoney YOUR_MONEY, 300
@@ -41,7 +41,7 @@ GoldenrodVendingMachine:
 
 .Lemonade:
 	checkmoney YOUR_MONEY, 350
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	giveitem LEMONADE
 	iffalse .NotEnoughSpace
 	takemoney YOUR_MONEY, 350
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index 54bd4fd05..8a5e9e70e 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -24,8 +24,8 @@ GoldenrodGameCorner_MapScripts:
 	checkitem COIN_CASE
 	iffalse .move_tutor_inside
 	checkcode VAR_WEEKDAY
-	if_equal WEDNESDAY, .move_tutor_outside
-	if_equal SATURDAY, .move_tutor_outside
+	ifequal WEDNESDAY, .move_tutor_outside
+	ifequal SATURDAY, .move_tutor_outside
 .move_tutor_inside
 	appear GOLDENRODGAMECORNER_POKEFAN_M3
 	return
@@ -62,14 +62,14 @@ GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36
 	loadmenuheader GoldenrodGameCornerTMVendorMenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .Thunder
-	if_equal 2, .Blizzard
-	if_equal 3, .FireBlast
+	ifequal 1, .Thunder
+	ifequal 2, .Blizzard
+	ifequal 3, .FireBlast
 	jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
 
 .Thunder:
 	checkcoins 5500
-	if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
+	ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
 	itemtotext TM_THUNDER, MEM_BUFFER_0
 	scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
 	iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
@@ -80,7 +80,7 @@ GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36
 
 .Blizzard:
 	checkcoins 5500
-	if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
+	ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
 	itemtotext TM_BLIZZARD, MEM_BUFFER_0
 	scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
 	iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
@@ -91,7 +91,7 @@ GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36
 
 .FireBlast:
 	checkcoins 5500
-	if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
+	ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
 	itemtotext TM_FIRE_BLAST, MEM_BUFFER_0
 	scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
 	iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
@@ -163,16 +163,16 @@ GoldenrodGameCornerPrizeMonVendorScript:
 	loadmenuheader .MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .abra
-	if_equal 2, .cubone
-	if_equal 3, .wobbuffet
+	ifequal 1, .abra
+	ifequal 2, .cubone
+	ifequal 3, .wobbuffet
 	jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
 
 .abra
 	checkcoins 100
-	if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
+	ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
+	ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
 	pokenamemem ABRA, MEM_BUFFER_0
 	scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
 	iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
@@ -188,9 +188,9 @@ GoldenrodGameCornerPrizeMonVendorScript:
 
 .cubone
 	checkcoins 800
-	if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
+	ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
+	ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
 	pokenamemem CUBONE, MEM_BUFFER_0
 	scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
 	iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
@@ -206,9 +206,9 @@ GoldenrodGameCornerPrizeMonVendorScript:
 
 .wobbuffet
 	checkcoins 1500
-	if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
+	ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
+	ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
 	pokenamemem WOBBUFFET, MEM_BUFFER_0
 	scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
 	iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
@@ -292,7 +292,7 @@ GoldenrodGameCornerLeftTheirDrinkScript:
 
 GoldenrodGameCornerSlotsMachineScript:
 	random 6
-	if_equal 0, GoldenrodGameCornerLuckySlotsMachineScript
+	ifequal 0, GoldenrodGameCornerLuckySlotsMachineScript
 	refreshscreen
 	writebyte FALSE
 	special SlotMachine
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
index 29be72cd9..8fac674b4 100644
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -80,8 +80,8 @@ UnknownScript_0x5407b:
 	end
 
 GoldenrodGymActivateRockets:
-	if_equal 7, .RadioTowerRockets
-	if_equal 6, .GoldenrodRockets
+	ifequal 7, .RadioTowerRockets
+	ifequal 6, .GoldenrodRockets
 	end
 
 .GoldenrodRockets:
@@ -94,7 +94,7 @@ TrainerLassCarrie:
 	trainer LASS, CARRIE, EVENT_BEAT_LASS_CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext LassCarrieAfterBattleText
 	waitbutton
@@ -118,7 +118,7 @@ TrainerLassBridget:
 	trainer LASS, BRIDGET, EVENT_BEAT_LASS_BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext LassBridgetAfterBattleText
 	waitbutton
@@ -129,7 +129,7 @@ TrainerBeautyVictoria:
 	trainer BEAUTY, VICTORIA, EVENT_BEAT_BEAUTY_VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BeautyVictoriaAfterBattleText
 	waitbutton
@@ -140,7 +140,7 @@ TrainerBeautySamantha:
 	trainer BEAUTY, SAMANTHA, EVENT_BEAT_BEAUTY_SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BeautySamanthaAfterBattleText
 	waitbutton
diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm
index eeab99b9c..59bdeb1ba 100644
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -14,11 +14,11 @@ TeacherScript_0x54953:
 	special GetFirstPokemonHappiness
 	writetext UnknownText_0x549a3
 	buttonsound
-	if_greater_than 250 - 1, UnknownScript_0x54973
-	if_greater_than 200 - 1, UnknownScript_0x54979
-	if_greater_than 150 - 1, UnknownScript_0x5497f
-	if_greater_than 100 - 1, UnknownScript_0x54985
-	if_greater_than  50 - 1, UnknownScript_0x5498b
+	ifgreater 250 - 1, UnknownScript_0x54973
+	ifgreater 200 - 1, UnknownScript_0x54979
+	ifgreater 150 - 1, UnknownScript_0x5497f
+	ifgreater 100 - 1, UnknownScript_0x54985
+	ifgreater  50 - 1, UnknownScript_0x5498b
 	jump UnknownScript_0x54991
 
 UnknownScript_0x54973:
diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm
index 0b5527be2..44d7cb492 100644
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -16,7 +16,7 @@ NurseScript_0x60f91:
 GoldenrodPokecenter1F_GSBallSceneLeft:
 	writebyte BATTLETOWERACTION_CHECKMOBILEEVENT
 	special BattleTowerAction
-	if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
+	ifequal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
 	end
 
 .gsball
@@ -48,7 +48,7 @@ GoldenrodPokecenter1F_GSBallSceneLeft:
 GoldenrodPokecenter1F_GSBallSceneRight:
 	writebyte BATTLETOWERACTION_CHECKMOBILEEVENT
 	special BattleTowerAction
-	if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
+	ifequal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
 	end
 
 .gsball
diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm
index 85cdcadee..f67282ae0 100644
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -48,12 +48,12 @@ GoldenrodUnderground_MapScripts:
 
 .CheckDayOfWeek:
 	checkcode VAR_WEEKDAY
-	if_equal MONDAY, .Monday
-	if_equal TUESDAY, .Tuesday
-	if_equal WEDNESDAY, .Wednesday
-	if_equal THURSDAY, .Thursday
-	if_equal FRIDAY, .Friday
-	if_equal SATURDAY, .Saturday
+	ifequal MONDAY, .Monday
+	ifequal TUESDAY, .Tuesday
+	ifequal WEDNESDAY, .Wednesday
+	ifequal THURSDAY, .Thursday
+	ifequal FRIDAY, .Friday
+	ifequal SATURDAY, .Saturday
 
 .Sunday:
 	disappear GOLDENRODUNDERGROUND_GRAMPS
@@ -112,7 +112,7 @@ TrainerSupernerdEric:
 	trainer SUPER_NERD, ERIC, EVENT_BEAT_SUPER_NERD_ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SupernerdEricAfterBattleText
 	waitbutton
@@ -123,7 +123,7 @@ TrainerSupernerdTeru:
 	trainer SUPER_NERD, TERU, EVENT_BEAT_SUPER_NERD_TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SupernerdTeruAfterBattleText
 	waitbutton
@@ -134,7 +134,7 @@ TrainerPokemaniacIssac:
 	trainer POKEMANIAC, ISSAC, EVENT_BEAT_POKEMANIAC_ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacIssacAfterBattleText
 	waitbutton
@@ -145,7 +145,7 @@ TrainerPokemaniacDonald:
 	trainer POKEMANIAC, DONALD, EVENT_BEAT_POKEMANIAC_DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacDonaldAfterBattleText
 	waitbutton
@@ -155,8 +155,8 @@ TrainerPokemaniacDonald:
 GrannyScript_0x7c132:
 	opentext
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, .Open
-	if_equal SATURDAY, .Open
+	ifequal SUNDAY, .Open
+	ifequal SATURDAY, .Open
 	jump GoldenrodUndergroundScript_ShopClosed
 
 .Open:
@@ -169,7 +169,7 @@ GrampsScript_0x7c146:
 	checkflag ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED
 	iftrue GoldenrodUndergroundScript_ShopClosed
 	checkcode VAR_WEEKDAY
-	if_equal MONDAY, .CheckMorn
+	ifequal MONDAY, .CheckMorn
 	jump GoldenrodUndergroundScript_ShopClosed
 
 .CheckMorn:
@@ -182,9 +182,9 @@ GrampsScript_0x7c146:
 OlderHaircutBrotherScript:
 	opentext
 	checkcode VAR_WEEKDAY
-	if_equal TUESDAY, .DoHaircut
-	if_equal THURSDAY, .DoHaircut
-	if_equal SATURDAY, .DoHaircut
+	ifequal TUESDAY, .DoHaircut
+	ifequal THURSDAY, .DoHaircut
+	ifequal SATURDAY, .DoHaircut
 	jump GoldenrodUndergroundScript_ShopClosed
 
 .DoHaircut:
@@ -195,15 +195,15 @@ OlderHaircutBrotherScript:
 	yesorno
 	iffalse .Refused
 	checkmoney YOUR_MONEY, 500
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	writetext UnknownText_0x7c69a
 	buttonsound
 	special YoungerHaircutBrother
-	if_equal $0, .Refused
-	if_equal $1, .Refused
+	ifequal $0, .Refused
+	ifequal $1, .Refused
 	setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
-	if_equal $2, .two
-	if_equal $3, .three
+	ifequal $2, .two
+	ifequal $3, .three
 	jump .else
 
 .two
@@ -265,9 +265,9 @@ OlderHaircutBrotherScript:
 YoungerHaircutBrotherScript:
 	opentext
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, .DoHaircut
-	if_equal WEDNESDAY, .DoHaircut
-	if_equal FRIDAY, .DoHaircut
+	ifequal SUNDAY, .DoHaircut
+	ifequal WEDNESDAY, .DoHaircut
+	ifequal FRIDAY, .DoHaircut
 	jump GoldenrodUndergroundScript_ShopClosed
 
 .DoHaircut:
@@ -278,15 +278,15 @@ YoungerHaircutBrotherScript:
 	yesorno
 	iffalse .Refused
 	checkmoney YOUR_MONEY, 300
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	writetext UnknownText_0x7c7f1
 	buttonsound
 	special OlderHaircutBrother
-	if_equal $0, .Refused
-	if_equal $1, .Refused
+	ifequal $0, .Refused
+	ifequal $1, .Refused
 	setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
-	if_equal $2, .two
-	if_equal $3, .three
+	ifequal $2, .two
+	ifequal $3, .three
 	jump .else
 
 .two
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index 980473542..0969b2e83 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -208,7 +208,7 @@ TrainerGruntM11:
 	trainer GRUNTM, GRUNTM_11, EVENT_BEAT_ROCKET_GRUNTM_11, GruntM11SeenText, GruntM11BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM11AfterBattleText
 	waitbutton
@@ -219,7 +219,7 @@ TrainerGruntM25:
 	trainer GRUNTM, GRUNTM_25, EVENT_BEAT_ROCKET_GRUNTM_25, GruntM25SeenText, GruntM25BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM25AfterBattleText
 	waitbutton
@@ -230,7 +230,7 @@ TrainerBurglarDuncan:
 	trainer BURGLAR, DUNCAN, EVENT_BEAT_BURGLAR_DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BurglarDuncanAfterBattleText
 	waitbutton
@@ -241,7 +241,7 @@ TrainerBurglarEddie:
 	trainer BURGLAR, EDDIE, EVENT_BEAT_BURGLAR_EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BurglarEddieAfterBattleText
 	waitbutton
@@ -252,7 +252,7 @@ TrainerGruntM13:
 	trainer GRUNTM, GRUNTM_13, EVENT_BEAT_ROCKET_GRUNTM_13, GruntM13SeenText, GruntM13BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM13AfterBattleText
 	waitbutton
@@ -263,7 +263,7 @@ TrainerGruntF3:
 	trainer GRUNTF, GRUNTF_3, EVENT_BEAT_ROCKET_GRUNTF_3, GruntF3SeenText, GruntF3BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntF3AfterBattleText
 	waitbutton
@@ -380,14 +380,14 @@ GoldenrodUndergroundSwitchRoomEntrances_DontToggle:
 
 GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
 	copybytetovar UndergroundSwitchPositions
-	if_equal 0, .Position0
-	if_equal 1, .Position1
-	if_equal 2, .Position2
-	if_equal 3, .Position3
-	if_equal 4, .Position4
-	if_equal 5, .Position5
-	if_equal 6, .Position6
-	if_equal 7, .EmergencyPosition
+	ifequal 0, .Position0
+	ifequal 1, .Position1
+	ifequal 2, .Position2
+	ifequal 3, .Position3
+	ifequal 4, .Position4
+	ifequal 5, .Position5
+	ifequal 6, .Position6
+	ifequal 7, .EmergencyPosition
 .Position0:
 	playsound SFX_ENTER_DOOR
 	scall .Clear4
diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm
index a80b075b3..ba7b0a9a0 100644
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -37,7 +37,7 @@ TrainerGruntM24:
 	trainer GRUNTM, GRUNTM_24, EVENT_BEAT_ROCKET_GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM24AfterBattleText
 	waitbutton
@@ -48,7 +48,7 @@ TrainerGruntM14:
 	trainer GRUNTM, GRUNTM_14, EVENT_BEAT_ROCKET_GRUNTM_14, GruntM14SeenText, GruntM14BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM14AfterBattleText
 	waitbutton
@@ -59,7 +59,7 @@ TrainerGruntM15:
 	trainer GRUNTM, GRUNTM_15, EVENT_BEAT_ROCKET_GRUNTM_15, GruntM15SeenText, GruntM15BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM15AfterBattleText
 	waitbutton
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index efff3bab3..bb4f47151 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -21,16 +21,16 @@ IlexForest_MapScripts:
 	checkevent EVENT_GOT_HM01_CUT
 	iftrue .Static
 	copybytetovar FarfetchdPosition
-	if_equal  1, .PositionOne
-	if_equal  2, .PositionTwo
-	if_equal  3, .PositionThree
-	if_equal  4, .PositionFour
-	if_equal  5, .PositionFive
-	if_equal  6, .PositionSix
-	if_equal  7, .PositionSeven
-	if_equal  8, .PositionEight
-	if_equal  9, .PositionNine
-	if_equal 10, .PositionTen
+	ifequal  1, .PositionOne
+	ifequal  2, .PositionTwo
+	ifequal  3, .PositionThree
+	ifequal  4, .PositionFour
+	ifequal  5, .PositionFive
+	ifequal  6, .PositionSix
+	ifequal  7, .PositionSeven
+	ifequal  8, .PositionEight
+	ifequal  9, .PositionNine
+	ifequal 10, .PositionTen
 .Static:
 	return
 
@@ -102,16 +102,16 @@ IlexForestCharcoalApprenticeScript:
 
 IlexForestFarfetchdScript:
 	copybytetovar FarfetchdPosition
-	if_equal  1, .Position1
-	if_equal  2, .Position2
-	if_equal  3, .Position3
-	if_equal  4, .Position4
-	if_equal  5, .Position5
-	if_equal  6, .Position6
-	if_equal  7, .Position7
-	if_equal  8, .Position8
-	if_equal  9, .Position9
-	if_equal 10, .Position10
+	ifequal  1, .Position1
+	ifequal  2, .Position2
+	ifequal  3, .Position3
+	ifequal  4, .Position4
+	ifequal  5, .Position5
+	ifequal  6, .Position6
+	ifequal  7, .Position7
+	ifequal  8, .Position8
+	ifequal  9, .Position9
+	ifequal 10, .Position10
 
 .Position1:
 	faceplayer
@@ -131,7 +131,7 @@ IlexForestFarfetchdScript:
 
 .Position2:
 	scall .CryAndCheckFacing
-	if_equal DOWN, .Position2_Down
+	ifequal DOWN, .Position2_Down
 	applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos2_Pos3
 	moveobject ILEXFOREST_FARFETCHD, 20, 24
 	disappear ILEXFOREST_FARFETCHD
@@ -149,7 +149,7 @@ IlexForestFarfetchdScript:
 
 .Position3:
 	scall .CryAndCheckFacing
-	if_equal LEFT, .Position3_Left
+	ifequal LEFT, .Position3_Left
 	applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos3_Pos4
 	moveobject ILEXFOREST_FARFETCHD, 29, 22
 	disappear ILEXFOREST_FARFETCHD
@@ -167,7 +167,7 @@ IlexForestFarfetchdScript:
 
 .Position4:
 	scall .CryAndCheckFacing
-	if_equal UP, .Position4_Up
+	ifequal UP, .Position4_Up
 	applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos4_Pos5
 	moveobject ILEXFOREST_FARFETCHD, 28, 31
 	disappear ILEXFOREST_FARFETCHD
@@ -185,9 +185,9 @@ IlexForestFarfetchdScript:
 
 .Position5:
 	scall .CryAndCheckFacing
-	if_equal UP, .Position5_Up
-	if_equal LEFT, .Position5_Left
-	if_equal RIGHT, .Position5_Right
+	ifequal UP, .Position5_Up
+	ifequal LEFT, .Position5_Left
+	ifequal RIGHT, .Position5_Right
 	applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos5_Pos6
 	moveobject ILEXFOREST_FARFETCHD, 24, 35
 	disappear ILEXFOREST_FARFETCHD
@@ -221,7 +221,7 @@ IlexForestFarfetchdScript:
 
 .Position6:
 	scall .CryAndCheckFacing
-	if_equal RIGHT, .Position6_Right
+	ifequal RIGHT, .Position6_Right
 	applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos6_Pos7
 	moveobject ILEXFOREST_FARFETCHD, 22, 31
 	disappear ILEXFOREST_FARFETCHD
@@ -239,8 +239,8 @@ IlexForestFarfetchdScript:
 
 .Position7:
 	scall .CryAndCheckFacing
-	if_equal DOWN, .Position7_Down
-	if_equal LEFT, .Position7_Left
+	ifequal DOWN, .Position7_Down
+	ifequal LEFT, .Position7_Left
 	applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos7_Pos8
 	moveobject ILEXFOREST_FARFETCHD, 15, 29
 	disappear ILEXFOREST_FARFETCHD
@@ -266,9 +266,9 @@ IlexForestFarfetchdScript:
 
 .Position8:
 	scall .CryAndCheckFacing
-	if_equal UP, .Position8_Up
-	if_equal LEFT, .Position8_Left
-	if_equal RIGHT, .Position8_Right
+	ifequal UP, .Position8_Up
+	ifequal LEFT, .Position8_Left
+	ifequal RIGHT, .Position8_Right
 	applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos8_Pos9
 	moveobject ILEXFOREST_FARFETCHD, 10, 35
 	disappear ILEXFOREST_FARFETCHD
@@ -295,8 +295,8 @@ IlexForestFarfetchdScript:
 
 .Position9:
 	scall .CryAndCheckFacing
-	if_equal DOWN, .Position9_Down
-	if_equal RIGHT, .Position9_Right
+	ifequal DOWN, .Position9_Down
+	ifequal RIGHT, .Position9_Right
 	applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos9_Pos10
 	moveobject ILEXFOREST_FARFETCHD, 6, 28
 	disappear ILEXFOREST_FARFETCHD
@@ -389,7 +389,7 @@ TrainerBugCatcherWayne:
 	trainer BUG_CATCHER, WAYNE, EVENT_BEAT_BUG_CATCHER_WAYNE, BugCatcherWayneSeenText, BugCatcherWayneBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BugCatcherWayneAfterBattleText
 	waitbutton
diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm
index 456550685..3f12b3926 100644
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -47,11 +47,11 @@ PlateauRivalBattle1:
 	checkflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
 	iftrue PlateauRivalScriptDone
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, PlateauRivalScriptDone
-	if_equal TUESDAY, PlateauRivalScriptDone
-	if_equal THURSDAY, PlateauRivalScriptDone
-	if_equal FRIDAY, PlateauRivalScriptDone
-	if_equal SATURDAY, PlateauRivalScriptDone
+	ifequal SUNDAY, PlateauRivalScriptDone
+	ifequal TUESDAY, PlateauRivalScriptDone
+	ifequal THURSDAY, PlateauRivalScriptDone
+	ifequal FRIDAY, PlateauRivalScriptDone
+	ifequal SATURDAY, PlateauRivalScriptDone
 	moveobject INDIGOPLATEAUPOKECENTER1F_SILVER, 17, 9
 	appear INDIGOPLATEAUPOKECENTER1F_SILVER
 	spriteface PLAYER, DOWN
@@ -69,11 +69,11 @@ PlateauRivalBattle2:
 	checkflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
 	iftrue PlateauRivalScriptDone
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, PlateauRivalScriptDone
-	if_equal TUESDAY, PlateauRivalScriptDone
-	if_equal THURSDAY, PlateauRivalScriptDone
-	if_equal FRIDAY, PlateauRivalScriptDone
-	if_equal SATURDAY, PlateauRivalScriptDone
+	ifequal SUNDAY, PlateauRivalScriptDone
+	ifequal TUESDAY, PlateauRivalScriptDone
+	ifequal THURSDAY, PlateauRivalScriptDone
+	ifequal FRIDAY, PlateauRivalScriptDone
+	ifequal SATURDAY, PlateauRivalScriptDone
 	appear INDIGOPLATEAUPOKECENTER1F_SILVER
 	spriteface PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index 57d3850b0..65085577d 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -45,7 +45,7 @@ KurtScript_0x18e178:
 	special FadeOutMusic
 	setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
 	checkcode VAR_FACING
-	if_equal UP, .RunAround
+	ifequal UP, .RunAround
 	spriteface PLAYER, DOWN
 	playsound SFX_FLY
 	applymovement KURTSHOUSE_KURT1, MovementData_0x18e466
@@ -130,13 +130,13 @@ KurtScript_0x18e178:
 	buttonsound
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
 	special SelectApricornForKurt
-	if_equal FALSE, .Cancel
-	if_equal BLU_APRICORN, .Blu
-	if_equal YLW_APRICORN, .Ylw
-	if_equal GRN_APRICORN, .Grn
-	if_equal WHT_APRICORN, .Wht
-	if_equal BLK_APRICORN, .Blk
-	if_equal PNK_APRICORN, .Pnk
+	ifequal FALSE, .Cancel
+	ifequal BLU_APRICORN, .Blu
+	ifequal YLW_APRICORN, .Ylw
+	ifequal GRN_APRICORN, .Grn
+	ifequal WHT_APRICORN, .Wht
+	ifequal BLK_APRICORN, .Blk
+	ifequal PNK_APRICORN, .Pnk
 ; .Red
 	setevent EVENT_GAVE_KURT_RED_APRICORN
 	jump .GaveKurtApricorns
@@ -293,7 +293,7 @@ KurtScript_0x18e178:
 	pause 20
 	showemote EMOTE_SHOCK, KURTSHOUSE_KURT1, 30
 	checkcode VAR_FACING
-	if_equal UP, .GSBallRunAround
+	ifequal UP, .GSBallRunAround
 	spriteface PLAYER, DOWN
 	playsound SFX_FLY
 	applymovement KURTSHOUSE_KURT1, MovementData_0x18e466
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm
index 8174da248..01b5560a5 100644
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -33,7 +33,7 @@ LakeOfRage_MapScripts:
 
 .Wesley:
 	checkcode VAR_WEEKDAY
-	if_equal WEDNESDAY, .WesleyAppears
+	ifequal WEDNESDAY, .WesleyAppears
 	disappear LAKEOFRAGE_WESLEY
 	return
 
@@ -87,7 +87,7 @@ GyaradosScript_0x70063:
 	loadwildmon GYARADOS, 30
 	writecode VAR_BATTLETYPE, BATTLETYPE_SHINY
 	startbattle
-	if_equal $1, UnknownScript_0x7007a
+	ifequal $1, UnknownScript_0x7007a
 	disappear LAKEOFRAGE_GYARADOS
 UnknownScript_0x7007a:
 	reloadmapafterbattle
@@ -147,7 +147,7 @@ TrainerFisherAndre:
 	trainer FISHER, ANDRE, EVENT_BEAT_FISHER_ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherAndreAfterBattleText
 	waitbutton
@@ -158,7 +158,7 @@ TrainerFisherRaymond:
 	trainer FISHER, RAYMOND, EVENT_BEAT_FISHER_RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherRaymondAfterBattleText
 	waitbutton
@@ -169,7 +169,7 @@ TrainerCooltrainermAaron:
 	trainer COOLTRAINERM, AARON, EVENT_BEAT_COOLTRAINERM_AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermAaronAfterBattleText
 	waitbutton
@@ -180,7 +180,7 @@ TrainerCooltrainerfLois:
 	trainer COOLTRAINERF, LOIS, EVENT_BEAT_COOLTRAINERF_LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfLoisAfterBattleText
 	waitbutton
@@ -193,7 +193,7 @@ WesleyScript:
 	checkevent EVENT_GOT_BLACKBELT_FROM_WESLEY
 	iftrue WesleyWednesdayScript
 	checkcode VAR_WEEKDAY
-	if_not_equal WEDNESDAY, WesleyNotWednesdayScript
+	ifnotequal WEDNESDAY, WesleyNotWednesdayScript
 	checkevent EVENT_MET_WESLEY_OF_WEDNESDAY
 	iftrue .MetWesley
 	writetext MeetWesleyText
diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm
index 2ed82feae..ee58b0b02 100644
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -43,9 +43,9 @@ UnknownScript_0x19a6e0:
 	writetext UnknownText_0x19a93e
 	waitbutton
 	special CheckMagikarpLength
-	if_equal MAGIKARPLENGTH_NOT_MAGIKARP, UnknownScript_0x19a71c
-	if_equal MAGIKARPLENGTH_REFUSED, UnknownScript_0x19a722
-	if_equal MAGIKARPLENGTH_TOO_SHORT, UnknownScript_0x19a716
+	ifequal MAGIKARPLENGTH_NOT_MAGIKARP, UnknownScript_0x19a71c
+	ifequal MAGIKARPLENGTH_REFUSED, UnknownScript_0x19a722
+	ifequal MAGIKARPLENGTH_TOO_SHORT, UnknownScript_0x19a716
 	; MAGIKARPLENGTH_BEAT_RECORD
 	jump UnknownScript_0x19a6fe
 
diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm
index 9b56aacd4..de735549e 100644
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -58,8 +58,8 @@ MahoganyGym_NoRoomForIcyWind:
 	end
 
 MahoganyGymActivateRockets:
-	if_equal 7, .RadioTowerRockets
-	if_equal 6, .GoldenrodRockets
+	ifequal 7, .RadioTowerRockets
+	ifequal 6, .GoldenrodRockets
 	end
 
 .GoldenrodRockets:
@@ -72,7 +72,7 @@ TrainerSkierRoxanne:
 	trainer SKIER, ROXANNE, EVENT_BEAT_SKIER_ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SkierRoxanneAfterBattleText
 	waitbutton
@@ -83,7 +83,7 @@ TrainerSkierClarissa:
 	trainer SKIER, CLARISSA, EVENT_BEAT_SKIER_CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SkierClarissaAfterBattleText
 	waitbutton
@@ -94,7 +94,7 @@ TrainerBoarderRonald:
 	trainer BOARDER, RONALD, EVENT_BEAT_BOARDER_RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BoarderRonaldAfterBattleText
 	waitbutton
@@ -105,7 +105,7 @@ TrainerBoarderBrad:
 	trainer BOARDER, BRAD, EVENT_BEAT_BOARDER_BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BoarderBradAfterBattleText
 	waitbutton
@@ -116,7 +116,7 @@ TrainerBoarderDouglas:
 	trainer BOARDER, DOUGLAS, EVENT_BEAT_BOARDER_DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BoarderDouglasAfterBattleText
 	waitbutton
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index 5fc87cd4f..fbde2035d 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -55,7 +55,7 @@ UnknownScript_0x190040:
 	yesorno
 	iffalse UnknownScript_0x190072
 	checkmoney YOUR_MONEY, 300
-	if_equal HAVE_LESS, UnknownScript_0x19006c
+	ifequal HAVE_LESS, UnknownScript_0x19006c
 	giveitem RAGECANDYBAR
 	iffalse UnknownScript_0x190078
 	waitsfx
diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm
index 8128007f6..fab7873ca 100644
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -53,10 +53,10 @@ ManiaScript:
 	yesorno
 	iffalse .refused
 	special ReturnShuckle
-	if_equal SHUCKIE_WRONG_MON, .wrong
-	if_equal SHUCKIE_REFUSED, .refused
-	if_equal SHUCKIE_HAPPY, .superhappy
-	if_equal SHUCKIE_FAINTED, .default_postevent
+	ifequal SHUCKIE_WRONG_MON, .wrong
+	ifequal SHUCKIE_REFUSED, .refused
+	ifequal SHUCKIE_HAPPY, .superhappy
+	ifequal SHUCKIE_FAINTED, .default_postevent
 	; SHUCKIE_RETURNED
 	writetext ManiaText_ThankYou
 	waitbutton
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index 64139989a..8a8cd518d 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -20,11 +20,11 @@ MobileBattleRoom_MapScripts:
 MapMobileBattleRoomSignpost0Script:
 	refreshscreen
 	special Function1037c2
-	if_equal $1, .one
+	ifequal $1, .one
 	special Function1037eb
 	iffalse .false
-	if_equal $1, .one_
-	if_equal $2, .two_
+	ifequal $1, .one_
+	ifequal $2, .two_
 	jump .false
 
 .one_
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index 8d0cc5dfe..6ecc722a7 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -26,7 +26,7 @@ ClefairyDance:
 	checkflag ENGINE_MT_MOON_SQUARE_CLEFAIRY
 	iftrue .NoDancing
 	checkcode VAR_WEEKDAY
-	if_not_equal MONDAY, .NoDancing
+	ifnotequal MONDAY, .NoDancing
 	checknite
 	iffalse .NoDancing
 	appear MOUNTMOONSQUARE_FAIRY1
diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm
index f574b3563..05b39101e 100644
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -19,7 +19,7 @@ TrainerPokemaniacMiller:
 	trainer POKEMANIAC, MILLER, EVENT_BEAT_POKEMANIAC_MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacMillerAfterBattleText
 	waitbutton
@@ -30,7 +30,7 @@ TrainerSupernerdMarkus:
 	trainer SUPER_NERD, MARKUS, EVENT_BEAT_SUPER_NERD_MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SupernerdMarkusAfterBattleText
 	waitbutton
diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm
index e4c0a0c44..a81f77697 100644
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -16,7 +16,7 @@ TrainerSupernerdHugh:
 	trainer SUPER_NERD, HUGH, EVENT_BEAT_SUPER_NERD_HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SupernerdHughAfterBattleText
 	waitbutton
diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm
index eb58b48de..23937e60d 100644
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -33,7 +33,7 @@ UnknownScript_0x7e217:
 	buttonsound
 	waitsfx
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, UnknownScript_0x7e237
+	ifequal PARTY_LENGTH, UnknownScript_0x7e237
 	writetext UnknownText_0x7e355
 	playsound SFX_CAUGHT_MON
 	waitsfx
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index df4299cff..6bda6753b 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -74,7 +74,7 @@ TrainerSchoolboyJack1:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_SCHOOLBOY_JACK
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_JACK
 	iftrue UnknownScript_0x5c088
@@ -92,8 +92,8 @@ UnknownScript_0x5c071:
 	scall UnknownScript_0x5c100
 UnknownScript_0x5c074:
 	askforphonenumber PHONE_SCHOOLBOY_JACK
-	if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5c110
-	if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5c10c
+	ifequal PHONE_CONTACTS_FULL, UnknownScript_0x5c110
+	ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x5c10c
 	trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0
 	scall UnknownScript_0x5c104
 	jump UnknownScript_0x5c108
@@ -102,11 +102,11 @@ UnknownScript_0x5c088:
 	scall UnknownScript_0x5c114
 	winlosstext SchoolboyJack1BeatenText, 0
 	copybytetovar wJackFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight4
@@ -190,7 +190,7 @@ TrainerPokefanmWilliam:
 	trainer POKEFANM, WILLIAM, EVENT_BEAT_POKEFANM_WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmWilliamAfterBattleText
 	waitbutton
@@ -202,7 +202,7 @@ TrainerPokefanfBeverly1:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_POKEFAN_BEVERLY
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_BEVERLY_HAS_NUGGET
 	iftrue UnknownScript_0x5c177
@@ -222,8 +222,8 @@ UnknownScript_0x5c160:
 	scall UnknownScript_0x5c193
 UnknownScript_0x5c163:
 	askforphonenumber PHONE_POKEFAN_BEVERLY
-	if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5c1a3
-	if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5c19f
+	ifequal PHONE_CONTACTS_FULL, UnknownScript_0x5c1a3
+	ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x5c19f
 	trainertotext POKEFANF, BEVERLY1, MEM_BUFFER_0
 	scall UnknownScript_0x5c197
 	jump UnknownScript_0x5c19b
@@ -280,7 +280,7 @@ TrainerLassKrise:
 	trainer LASS, KRISE, EVENT_BEAT_LASS_KRISE, LassKriseSeenText, LassKriseBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext LassKriseAfterBattleText
 	waitbutton
diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm
index 4750edf0a..1931747e5 100644
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -24,8 +24,8 @@ Oak:
 	setevent EVENT_TALKED_TO_OAK_IN_KANTO
 .CheckBadges:
 	checkcode VAR_BADGES
-	if_equal NUM_BADGES, .OpenMtSilver
-	if_equal NUM_JOHTO_BADGES, .Complain
+	ifequal NUM_BADGES, .OpenMtSilver
+	ifequal NUM_JOHTO_BADGES, .Complain
 	jump .AhGood
 
 .CheckPokedex:
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index 181bf2cbf..438654141 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -77,7 +77,7 @@ StandingYoungsterScript_0x1a88a6:
 	faceplayer
 	opentext
 	random 2
-	if_equal 0, UnknownScript_0x1a88b4
+	ifequal 0, UnknownScript_0x1a88b4
 	writetext UnknownText_0x1a8b04
 	waitbutton
 	closetext
diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm
index ab5dd650a..27133cc36 100644
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -48,8 +48,8 @@ JasmineScript_0x9c12f:
 	end
 
 OlivineGymActivateRockets:
-	if_equal 7, .RadioTowerRockets
-	if_equal 6, .GoldenrodRockets
+	ifequal 7, .RadioTowerRockets
+	ifequal 6, .GoldenrodRockets
 	end
 
 .GoldenrodRockets:
diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm
index 9def30314..21c19b8fb 100644
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -11,7 +11,7 @@ TrainerGentlemanAlfred:
 	trainer GENTLEMAN, ALFRED, EVENT_BEAT_GENTLEMAN_ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GentlemanAlfredAfterBattleText
 	waitbutton
@@ -23,7 +23,7 @@ TrainerSailorHuey1:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_SAILOR_HUEY
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_HUEY
 	iftrue UnknownScript_0x5afc7
@@ -39,8 +39,8 @@ UnknownScript_0x5afb0:
 	scall UnknownScript_0x5b057
 UnknownScript_0x5afb3:
 	askforphonenumber PHONE_SAILOR_HUEY
-	if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5b067
-	if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5b063
+	ifequal PHONE_CONTACTS_FULL, UnknownScript_0x5b067
+	ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x5b063
 	trainertotext SAILOR, HUEY1, MEM_BUFFER_0
 	scall UnknownScript_0x5b05b
 	jump UnknownScript_0x5b05f
@@ -49,10 +49,10 @@ UnknownScript_0x5afc7:
 	scall UnknownScript_0x5b06b
 	winlosstext SailorHuey1BeatenText, 0
 	copybytetovar wHueyFightCount
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight3:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight3
diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm
index e81f24fb7..53b2c5914 100644
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -13,7 +13,7 @@ TrainerBirdKeeperTheo:
 	trainer BIRD_KEEPER, THEO, EVENT_BEAT_BIRD_KEEPER_THEO, BirdKeeperTheoSeenText, BirdKeeperTheoBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperTheoAfterBattleText
 	waitbutton
@@ -24,7 +24,7 @@ TrainerGentlemanPreston:
 	trainer GENTLEMAN, PRESTON, EVENT_BEAT_GENTLEMAN_PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GentlemanPrestonAfterBattleText
 	waitbutton
@@ -35,7 +35,7 @@ TrainerSailorTerrell:
 	trainer SAILOR, TERRELL, EVENT_BEAT_SAILOR_TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SailorTerrellAfterBattleText
 	waitbutton
diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm
index b240ac39f..50a4d17fc 100644
--- a/maps/OlivineLighthouse4F.asm
+++ b/maps/OlivineLighthouse4F.asm
@@ -11,7 +11,7 @@ TrainerLassConnie:
 	trainer LASS, CONNIE1, EVENT_BEAT_LASS_CONNIE, LassConnie1SeenText, LassConnie1BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext LassConnie1AfterBattleText
 	waitbutton
@@ -22,7 +22,7 @@ TrainerSailorKent:
 	trainer SAILOR, KENT, EVENT_BEAT_SAILOR_KENT, SailorKentSeenText, SailorKentBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SailorKentAfterBattleText
 	waitbutton
diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm
index bf1fb6717..84e5948b6 100644
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -14,7 +14,7 @@ TrainerBirdKeeperDenis:
 	trainer BIRD_KEEPER, DENIS, EVENT_BEAT_BIRD_KEEPER_DENIS, BirdKeeperDenisSeenText, BirdKeeperDenisBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperDenisAfterBattleText
 	waitbutton
@@ -25,7 +25,7 @@ TrainerSailorErnest:
 	trainer SAILOR, ERNEST, EVENT_BEAT_SAILOR_ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SailorErnestAfterBattleText
 	waitbutton
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index 3aff2dad9..5c50aeb95 100644
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -68,8 +68,8 @@ UnknownScript_0x60bab:
 	setevent EVENT_JASMINE_RETURNED_TO_GYM
 	clearevent EVENT_OLIVINE_GYM_JASMINE
 	checkcode VAR_FACING
-	if_equal DOWN, UnknownScript_0x60c17
-	if_equal RIGHT, UnknownScript_0x60c1e
+	ifequal DOWN, UnknownScript_0x60c17
+	ifequal RIGHT, UnknownScript_0x60c1e
 	applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c68
 	disappear OLIVINELIGHTHOUSE6F_JASMINE
 	end
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index 716c79962..c47b0fc3c 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -83,11 +83,11 @@ UnknownScript_0x7491f:
 	checkevent EVENT_FAST_SHIP_FIRST_TIME
 	iffalse UnknownScript_0x7494e
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, UnknownScript_0x74977
-	if_equal SATURDAY, UnknownScript_0x74977
-	if_equal TUESDAY, UnknownScript_0x74981
-	if_equal WEDNESDAY, UnknownScript_0x74981
-	if_equal THURSDAY, UnknownScript_0x74981
+	ifequal SUNDAY, UnknownScript_0x74977
+	ifequal SATURDAY, UnknownScript_0x74977
+	ifequal TUESDAY, UnknownScript_0x74981
+	ifequal WEDNESDAY, UnknownScript_0x74981
+	ifequal THURSDAY, UnknownScript_0x74981
 UnknownScript_0x7494e:
 	writetext UnknownText_0x74a9c
 	yesorno
@@ -148,11 +148,11 @@ SailorScript_0x7499c:
 	checkevent EVENT_FAST_SHIP_FIRST_TIME
 	iffalse UnknownScript_0x749c0
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, UnknownScript_0x749f2
-	if_equal SATURDAY, UnknownScript_0x749f2
-	if_equal TUESDAY, UnknownScript_0x749f8
-	if_equal WEDNESDAY, UnknownScript_0x749f8
-	if_equal THURSDAY, UnknownScript_0x749f8
+	ifequal SUNDAY, UnknownScript_0x749f2
+	ifequal SATURDAY, UnknownScript_0x749f2
+	ifequal TUESDAY, UnknownScript_0x749f8
+	ifequal WEDNESDAY, UnknownScript_0x749f8
+	ifequal THURSDAY, UnknownScript_0x749f8
 UnknownScript_0x749c0:
 	writetext UnknownText_0x74a9c
 	yesorno
@@ -166,7 +166,7 @@ UnknownScript_0x749c0:
 	closetext
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	checkcode VAR_FACING
-	if_equal RIGHT, UnknownScript_0x749e5
+	ifequal RIGHT, UnknownScript_0x749e5
 	applymovement PLAYER, MovementData_0x74a3f
 	jump SailorScript_0x748c0
 
diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm
index 1d4da2419..d6a0f3998 100644
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -42,7 +42,7 @@ TrainerCamperJerry:
 	trainer CAMPER, JERRY, EVENT_BEAT_CAMPER_JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CamperJerryAfterBattleText
 	waitbutton
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 2f15c0c10..9bdb399d4 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -17,7 +17,7 @@ Pokecenter2F_MapScripts:
 
 .Scene0:
 	special CheckMysteryGift
-	if_equal $0, .Scene0Done
+	ifequal $0, .Scene0Done
 	clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	iftrue .Scene0Done
@@ -79,7 +79,7 @@ LinkReceptionistScript_Trade:
 	writetext Text_TradeReceptionistMobile
 	special AskMobileOrCable
 	iffalse .Cancel
-	if_equal $1, .Mobile
+	ifequal $1, .Mobile
 .NoMobile:
 	special SetBitsForLinkTradeRequest
 	writetext Text_PleaseWait
@@ -181,7 +181,7 @@ LinkReceptionistScript_Battle:
 	writetext Text_BattleReceptionistMobile
 	special AskMobileOrCable
 	iffalse .Cancel
-	if_equal $1, .Mobile
+	ifequal $1, .Mobile
 .NoMobile:
 	special SetBitsForBattleRequest
 	writetext Text_PleaseWait
@@ -271,9 +271,9 @@ LinkReceptionistScript_Battle:
 .SelectThreeMons:
 	special Mobile_SelectThreeMons
 	iffalse .Mobile_DidNotSelect
-	if_equal $1, .Mobile_OK
-	if_equal $2, .Mobile_OK
-	if_equal $3, .Mobile_InvalidParty
+	ifequal $1, .Mobile_OK
+	ifequal $2, .Mobile_OK
+	ifequal $3, .Mobile_InvalidParty
 	jump .Mobile_DidNotSelect
 
 .Mobile_InvalidParty:
@@ -308,9 +308,9 @@ LinkReceptionistScript_TimeCapsule:
 	yesorno
 	iffalse .Cancel
 	special CheckTimeCapsuleCompatibility
-	if_equal $1, .MonTooNew
-	if_equal $2, .MonMoveTooNew
-	if_equal $3, .MonHasMail
+	ifequal $1, .MonTooNew
+	ifequal $2, .MonMoveTooNew
+	ifequal $3, .MonHasMail
 	writetext Text_PleaseWait
 	special WaitForLinkedFriend
 	iffalse .FriendNotReady
@@ -494,8 +494,8 @@ TimeCapsuleScript_CheckPlayerGender:
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .Female
 	checkcode VAR_FACING
-	if_equal LEFT, .MaleFacingLeft
-	if_equal RIGHT, .MaleFacingRight
+	ifequal LEFT, .MaleFacingLeft
+	ifequal RIGHT, .MaleFacingRight
 	applymovement2 Pokecenter2FMovementData_ReceptionistStepsLeftLooksDown
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsUp_2
 	end
@@ -512,8 +512,8 @@ TimeCapsuleScript_CheckPlayerGender:
 
 .Female:
 	checkcode VAR_FACING
-	if_equal RIGHT, .FemaleFacingRight
-	if_equal LEFT, .FemaleFacingLeft
+	ifequal RIGHT, .FemaleFacingRight
+	ifequal LEFT, .FemaleFacingLeft
 	applymovement2 Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight_2
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepUp_2
 	jump .FemaleContinue
@@ -532,7 +532,7 @@ TimeCapsuleScript_CheckPlayerGender:
 	waitbutton
 	closetext
 	checkcode VAR_FACING
-	if_not_equal UP, .FemaleChangeApperance
+	ifnotequal UP, .FemaleChangeApperance
 	spriteface PLAYER, LEFT
 .FemaleChangeApperance:
 	opentext
diff --git a/maps/PokecomCenterAdminRoomMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm
index 024286f4a..96d319cc2 100644
--- a/maps/PokecomCenterAdminRoomMobile.asm
+++ b/maps/PokecomCenterAdminRoomMobile.asm
@@ -26,8 +26,8 @@ UnknownScript_0x625df:
 	loadmenuheader MenuHeader_0x62602
 	verticalmenu
 	closewindow
-	if_equal 1, UnknownScript_0x625f0
-	if_equal 2, UnknownScript_0x625f8
+	ifequal 1, UnknownScript_0x625f0
+	ifequal 2, UnknownScript_0x625f8
 	jump UnknownScript_0x62600
 
 UnknownScript_0x625f0:
@@ -68,8 +68,8 @@ UnknownScript_0x62629:
 	loadmenuheader MenuHeader_0x6264c
 	verticalmenu
 	closewindow
-	if_equal 1, UnknownScript_0x6263a
-	if_equal 2, UnknownScript_0x62642
+	ifequal 1, UnknownScript_0x6263a
+	ifequal 2, UnknownScript_0x62642
 	jump UnknownScript_0x6264a
 
 UnknownScript_0x6263a:
diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm
index 32b210b55..b39c01d7d 100644
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -55,9 +55,9 @@ GentlemanScript_0x5cd3d:
 	closetext
 	applymovement RADIOTOWER1F_GENTLEMAN, MovementData_0x5ce74
 	opentext
-	if_equal 1, .FirstPlace
-	if_equal 2, .SecondPlace
-	if_equal 3, .ThirdPlace
+	ifequal 1, .FirstPlace
+	ifequal 2, .SecondPlace
+	ifequal 3, .ThirdPlace
 	jump .NoPrize
 
 .GameOver:
@@ -187,7 +187,7 @@ TrainerGruntM3:
 	trainer GRUNTM, GRUNTM_3, EVENT_BEAT_ROCKET_GRUNTM_3, GruntM3SeenText, GruntM3BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM3AfterBattleText
 	waitbutton
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
index 4b3e14794..27ee7d7ac 100644
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -56,7 +56,7 @@ TrainerGruntM4:
 	trainer GRUNTM, GRUNTM_4, EVENT_BEAT_ROCKET_GRUNTM_4, GruntM4SeenText, GruntM4BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM4AfterBattleText
 	waitbutton
@@ -67,7 +67,7 @@ TrainerGruntM5:
 	trainer GRUNTM, GRUNTM_5, EVENT_BEAT_ROCKET_GRUNTM_5, GruntM5SeenText, GruntM5BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM5AfterBattleText
 	waitbutton
@@ -78,7 +78,7 @@ TrainerGruntM6:
 	trainer GRUNTM, GRUNTM_6, EVENT_BEAT_ROCKET_GRUNTM_6, GruntM6SeenText, GruntM6BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM6AfterBattleText
 	waitbutton
@@ -89,7 +89,7 @@ TrainerGruntF2:
 	trainer GRUNTF, GRUNTF_2, EVENT_BEAT_ROCKET_GRUNTF_2, GruntF2SeenText, GruntF2BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntF2AfterBattleText
 	waitbutton
@@ -106,13 +106,13 @@ Buena:
 	checkflag ENGINE_BUENAS_PASSWORD_2
 	iftrue UnknownScript_0x5d82f
 	checkcode VAR_HOUR
-	if_less_than 18, UnknownScript_0x5d893
+	ifless 18, UnknownScript_0x5d893
 	checkflag ENGINE_BUENAS_PASSWORD
 	iffalse UnknownScript_0x5d80a
 	checkitem BLUE_CARD
 	iffalse UnknownScript_0x5d86b
 	checkcode VAR_BLUECARDBALANCE
-	if_equal 30, UnknownScript_0x5d87f
+	ifequal 30, UnknownScript_0x5d87f
 	playmusic MUSIC_BUENAS_PASSWORD
 	writetext UnknownText_0x5de35
 	special AskRememberPassword
@@ -122,7 +122,7 @@ Buena:
 	closetext
 	spriteface RADIOTOWER2F_BUENA, RIGHT
 	checkcode VAR_FACING
-	if_not_equal RIGHT, UnknownScript_0x5d7be
+	ifnotequal RIGHT, UnknownScript_0x5d7be
 	applymovement PLAYER, MovementData_0x5d921
 UnknownScript_0x5d7be:
 	spriteface PLAYER, RIGHT
@@ -155,7 +155,7 @@ UnknownScript_0x5d7be:
 	pause 20
 	special RestartMapMusic
 	checkcode VAR_BLUECARDBALANCE
-	if_equal 30, UnknownScript_0x5d8a4
+	ifequal 30, UnknownScript_0x5d8a4
 	end
 
 UnknownScript_0x5d800:
@@ -279,8 +279,8 @@ UnknownScript_0x5d8cc:
 	writetext UnknownText_0x5e2bf
 UnknownScript_0x5d8d0:
 	askforphonenumber PHONE_BUENA
-	if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5d8f6
-	if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5d8ed
+	ifequal PHONE_CONTACTS_FULL, UnknownScript_0x5d8f6
+	ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x5d8ed
 	writetext UnknownText_0x5e2f3
 	playsound SFX_REGISTER_PHONE_NUMBER
 	waitsfx
diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm
index 554bb4ace..b409066dc 100644
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -84,7 +84,7 @@ TrainerGruntM7:
 	trainer GRUNTM, GRUNTM_7, EVENT_BEAT_ROCKET_GRUNTM_7, GruntM7SeenText, GruntM7BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM7AfterBattleText
 	waitbutton
@@ -95,7 +95,7 @@ TrainerGruntM8:
 	trainer GRUNTM, GRUNTM_8, EVENT_BEAT_ROCKET_GRUNTM_8, GruntM8SeenText, GruntM8BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM8AfterBattleText
 	waitbutton
@@ -106,7 +106,7 @@ TrainerGruntM9:
 	trainer GRUNTM, GRUNTM_9, EVENT_BEAT_ROCKET_GRUNTM_9, GruntM9SeenText, GruntM9BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM9AfterBattleText
 	waitbutton
@@ -117,7 +117,7 @@ TrainerScientistMarc:
 	trainer SCIENTIST, MARC, EVENT_BEAT_SCIENTIST_MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext ScientistMarcAfterBattleText
 	waitbutton
diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm
index 0db5df152..b2fe23c64 100644
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -57,7 +57,7 @@ TrainerGruntM10:
 	trainer GRUNTM, GRUNTM_10, EVENT_BEAT_ROCKET_GRUNTM_10, GruntM10SeenText, GruntM10BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM10AfterBattleText
 	waitbutton
@@ -68,7 +68,7 @@ TrainerExecutivem2:
 	trainer EXECUTIVEM, EXECUTIVEM_2, EVENT_BEAT_ROCKET_EXECUTIVEM_2, Executivem2SeenText, Executivem2BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext Executivem2AfterBattleText
 	waitbutton
@@ -79,7 +79,7 @@ TrainerGruntF4:
 	trainer GRUNTF, GRUNTF_4, EVENT_BEAT_ROCKET_GRUNTF_4, GruntF4SeenText, GruntF4BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntF4AfterBattleText
 	waitbutton
@@ -90,7 +90,7 @@ TrainerScientistRich:
 	trainer SCIENTIST, RICH, EVENT_BEAT_SCIENTIST_RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext ScientistRichAfterBattleText
 	waitbutton
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index ad8726a2a..0a21e6952 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -69,7 +69,7 @@ TrainerExecutivef1:
 	trainer EXECUTIVEF, EXECUTIVEF_1, EVENT_BEAT_ROCKET_EXECUTIVEF_1, Executivef1SeenText, Executivef1BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext Executivef1AfterBattleText
 	waitbutton
diff --git a/maps/Route1.asm b/maps/Route1.asm
index 6fd57c25a..7f7cf828b 100644
--- a/maps/Route1.asm
+++ b/maps/Route1.asm
@@ -12,7 +12,7 @@ TrainerSchoolboyDanny:
 	trainer SCHOOLBOY, DANNY, EVENT_BEAT_SCHOOLBOY_DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SchoolboyDannyAfterBattleText
 	waitbutton
@@ -23,7 +23,7 @@ TrainerCooltrainerfQuinn:
 	trainer COOLTRAINERF, QUINN, EVENT_BEAT_COOLTRAINERF_QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfQuinnAfterBattleText
 	waitbutton
diff --git a/maps/Route10South.asm b/maps/Route10South.asm
index b48f97b4f..6161995df 100644
--- a/maps/Route10South.asm
+++ b/maps/Route10South.asm
@@ -11,7 +11,7 @@ TrainerHikerJim:
 	trainer HIKER, JIM, EVENT_BEAT_HIKER_JIM, HikerJimSeenText, HikerJimBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerJimAfterBattleText
 	waitbutton
@@ -22,7 +22,7 @@ TrainerPokefanmRobert:
 	trainer POKEFANM, ROBERT, EVENT_BEAT_POKEFANM_ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmRobertAfterBattleText
 	waitbutton
diff --git a/maps/Route11.asm b/maps/Route11.asm
index cc93f5d8f..e8f630af4 100644
--- a/maps/Route11.asm
+++ b/maps/Route11.asm
@@ -14,7 +14,7 @@ TrainerYoungsterOwen:
 	trainer YOUNGSTER, OWEN, EVENT_BEAT_YOUNGSTER_OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext YoungsterOwenAfterBattleText
 	waitbutton
@@ -25,7 +25,7 @@ TrainerYoungsterJason:
 	trainer YOUNGSTER, JASON, EVENT_BEAT_YOUNGSTER_JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext YoungsterJasonAfterBattleText
 	waitbutton
@@ -36,7 +36,7 @@ TrainerPsychicHerman:
 	trainer PSYCHIC_T, HERMAN, EVENT_BEAT_PSYCHIC_HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicHermanAfterBattleText
 	waitbutton
@@ -47,7 +47,7 @@ TrainerPsychicFidel:
 	trainer PSYCHIC_T, FIDEL, EVENT_BEAT_PSYCHIC_FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicFidelAfterBattleText
 	waitbutton
diff --git a/maps/Route12.asm b/maps/Route12.asm
index ab468f2e2..607ed498b 100644
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -15,7 +15,7 @@ TrainerFisherKyle:
 	trainer FISHER, KYLE, EVENT_BEAT_FISHER_KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherKyleAfterBattleText
 	waitbutton
@@ -26,7 +26,7 @@ TrainerFisherMartin:
 	trainer FISHER, MARTIN, EVENT_BEAT_FISHER_MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherMartinAfterBattleText
 	waitbutton
@@ -37,7 +37,7 @@ TrainerFisherStephen:
 	trainer FISHER, STEPHEN, EVENT_BEAT_FISHER_STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherStephenAfterBattleText
 	waitbutton
@@ -48,7 +48,7 @@ TrainerFisherBarney:
 	trainer FISHER, BARNEY, EVENT_BEAT_FISHER_BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherBarneyAfterBattleText
 	waitbutton
diff --git a/maps/Route13.asm b/maps/Route13.asm
index 164cfaaf3..295f8c5e7 100644
--- a/maps/Route13.asm
+++ b/maps/Route13.asm
@@ -14,7 +14,7 @@ TrainerPokefanmAlex:
 	trainer POKEFANM, ALEX, EVENT_BEAT_POKEFANM_ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmAlexAfterBattleText
 	waitbutton
@@ -25,7 +25,7 @@ TrainerPokefanmJoshua:
 	trainer POKEFANM, JOSHUA, EVENT_BEAT_POKEFANM_JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmJoshuaAfterBattleText
 	waitbutton
@@ -36,7 +36,7 @@ TrainerBirdKeeperPerry:
 	trainer BIRD_KEEPER, PERRY, EVENT_BEAT_BIRD_KEEPER_PERRY, BirdKeeperPerrySeenText, BirdKeeperPerryBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperPerryAfterBattleText
 	waitbutton
@@ -47,7 +47,7 @@ TrainerBirdKeeperBret:
 	trainer BIRD_KEEPER, BRET, EVENT_BEAT_BIRD_KEEPER_BRET, BirdKeeperBretSeenText, BirdKeeperBretBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperBretAfterBattleText
 	waitbutton
@@ -58,7 +58,7 @@ TrainerHikerKenny:
 	trainer HIKER, KENNY, EVENT_BEAT_HIKER_KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerKennyAfterBattleText
 	waitbutton
diff --git a/maps/Route14.asm b/maps/Route14.asm
index 1a7670279..939cbfd20 100644
--- a/maps/Route14.asm
+++ b/maps/Route14.asm
@@ -21,7 +21,7 @@ TrainerPokefanmCarter:
 	trainer POKEFANM, CARTER, EVENT_BEAT_POKEFANM_CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmCarterAfterBattleText
 	waitbutton
@@ -32,7 +32,7 @@ TrainerBirdKeeperRoy:
 	trainer BIRD_KEEPER, ROY, EVENT_BEAT_BIRD_KEEPER_ROY, BirdKeeperRoySeenText, BirdKeeperRoyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperRoyAfterBattleText
 	waitbutton
@@ -43,7 +43,7 @@ TrainerPokefanmTrevor:
 	trainer POKEFANM, TREVOR, EVENT_BEAT_POKEFANM_TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmTrevorAfterBattleText
 	waitbutton
diff --git a/maps/Route15.asm b/maps/Route15.asm
index 32db439ea..3364a224b 100644
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -16,7 +16,7 @@ TrainerTeacherColette:
 	trainer TEACHER, COLETTE, EVENT_BEAT_TEACHER_COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TeacherColetteAfterBattleText
 	waitbutton
@@ -27,7 +27,7 @@ TrainerTeacherHillary:
 	trainer TEACHER, HILLARY, EVENT_BEAT_TEACHER_HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TeacherHillaryAfterBattleText
 	waitbutton
@@ -38,7 +38,7 @@ TrainerSchoolboyKipp:
 	trainer SCHOOLBOY, KIPP, EVENT_BEAT_SCHOOLBOY_KIP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SchoolboyKippAfterBattleText
 	waitbutton
@@ -49,7 +49,7 @@ TrainerSchoolboyTommy:
 	trainer SCHOOLBOY, TOMMY, EVENT_BEAT_SCHOOLBOY_TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SchoolboyTommyAfterBattleText
 	waitbutton
@@ -60,7 +60,7 @@ TrainerSchoolboyJohnny:
 	trainer SCHOOLBOY, JOHNNY, EVENT_BEAT_SCHOOLBOY_JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SchoolboyJohnnyAfterBattleText
 	waitbutton
@@ -71,7 +71,7 @@ TrainerSchoolboyBilly:
 	trainer SCHOOLBOY, BILLY, EVENT_BEAT_SCHOOLBOY_BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SchoolboyBillyAfterBattleText
 	waitbutton
diff --git a/maps/Route16.asm b/maps/Route16.asm
index 40bbbd4e8..327b90a85 100644
--- a/maps/Route16.asm
+++ b/maps/Route16.asm
@@ -6,9 +6,9 @@ Route16_MapScripts:
 
 .AlwaysOnBike:
 	checkcode VAR_YCOORD
-	if_less_than 5, .CanWalk
+	ifless 5, .CanWalk
 	checkcode VAR_XCOORD
-	if_greater_than 13, .CanWalk
+	ifgreater 13, .CanWalk
 	setflag ENGINE_ALWAYS_ON_BIKE
 	return
 
diff --git a/maps/Route17.asm b/maps/Route17.asm
index ee9a24e6a..a913835e0 100644
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -19,7 +19,7 @@ TrainerBikerCharles:
 	trainer BIKER, CHARLES, EVENT_BEAT_BIKER_CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BikerCharlesAfterBattleText
 	waitbutton
@@ -30,7 +30,7 @@ TrainerBikerRiley:
 	trainer BIKER, RILEY, EVENT_BEAT_BIKER_RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BikerRileyAfterBattleText
 	waitbutton
@@ -41,7 +41,7 @@ TrainerBikerJoel:
 	trainer BIKER, JOEL, EVENT_BEAT_BIKER_JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BikerJoelAfterBattleText
 	waitbutton
@@ -52,7 +52,7 @@ TrainerBikerGlenn:
 	trainer BIKER, GLENN, EVENT_BEAT_BIKER_GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BikerGlennAfterBattleText
 	waitbutton
diff --git a/maps/Route18.asm b/maps/Route18.asm
index 76c201e12..23d6cb4ed 100644
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -11,7 +11,7 @@ TrainerBirdKeeperBoris:
 	trainer BIRD_KEEPER, BORIS, EVENT_BEAT_BIRD_KEEPER_BORIS, BirdKeeperBorisSeenText, BirdKeeperBorisBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperBorisAfterBattleText
 	waitbutton
@@ -22,7 +22,7 @@ TrainerBirdKeeperBob:
 	trainer BIRD_KEEPER, BOB, EVENT_BEAT_BIRD_KEEPER_BOB, BirdKeeperBobSeenText, BirdKeeperBobBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperBobAfterBattleText
 	waitbutton
diff --git a/maps/Route19.asm b/maps/Route19.asm
index dda8e549b..a032c5e69 100644
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -28,7 +28,7 @@ TrainerSwimmerfDawn:
 	trainer SWIMMERF, DAWN, EVENT_BEAT_SWIMMERF_DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfDawnAfterBattleText
 	waitbutton
@@ -39,7 +39,7 @@ TrainerSwimmermHarold:
 	trainer SWIMMERM, HAROLD, EVENT_BEAT_SWIMMERM_HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermHaroldAfterBattleText
 	waitbutton
@@ -50,7 +50,7 @@ TrainerSwimmermJerome:
 	trainer SWIMMERM, JEROME, EVENT_BEAT_SWIMMERM_JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermJeromeAfterBattleText
 	waitbutton
@@ -61,7 +61,7 @@ TrainerSwimmermTucker:
 	trainer SWIMMERM, TUCKER, EVENT_BEAT_SWIMMERM_TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermTuckerAfterBattleText
 	waitbutton
diff --git a/maps/Route2.asm b/maps/Route2.asm
index 9cf002f92..36de9dc5f 100644
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -17,7 +17,7 @@ TrainerBugCatcherRob:
 	trainer BUG_CATCHER, ROB, EVENT_BEAT_BUG_CATCHER_ROB, BugCatcherRobSeenText, BugCatcherRobBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BugCatcherRobAfterBattleText
 	waitbutton
@@ -28,7 +28,7 @@ TrainerBugCatcherEd:
 	trainer BUG_CATCHER, ED, EVENT_BEAT_BUG_CATCHER_ED, BugCatcherEdSeenText, BugCatcherEdBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BugCatcherEdAfterBattleText
 	waitbutton
@@ -39,7 +39,7 @@ TrainerBugCatcherDoug:
 	trainer BUG_CATCHER, DOUG, EVENT_BEAT_BUG_CATCHER_DOUG, BugCatcherDougSeenText, BugCatcherDougBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BugCatcherDougAfterBattleText
 	waitbutton
diff --git a/maps/Route20.asm b/maps/Route20.asm
index 8dd8a8a8c..8339bb5d0 100644
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -17,7 +17,7 @@ TrainerSwimmerfNicole:
 	trainer SWIMMERF, NICOLE, EVENT_BEAT_SWIMMERF_NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfNicoleAfterBattleText
 	waitbutton
@@ -28,7 +28,7 @@ TrainerSwimmerfLori:
 	trainer SWIMMERF, LORI, EVENT_BEAT_SWIMMERF_LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfLoriAfterBattleText
 	waitbutton
@@ -39,7 +39,7 @@ TrainerSwimmermCameron:
 	trainer SWIMMERM, CAMERON, EVENT_BEAT_SWIMMERM_CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermCameronAfterBattleText
 	waitbutton
diff --git a/maps/Route21.asm b/maps/Route21.asm
index a291752fc..68c15c526 100644
--- a/maps/Route21.asm
+++ b/maps/Route21.asm
@@ -12,7 +12,7 @@ TrainerSwimmermSeth:
 	trainer SWIMMERM, SETH, EVENT_BEAT_SWIMMERM_SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermSethAfterBattleText
 	waitbutton
@@ -23,7 +23,7 @@ TrainerSwimmerfNikki:
 	trainer SWIMMERF, NIKKI, EVENT_BEAT_SWIMMERF_NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfNikkiAfterBattleText
 	waitbutton
@@ -34,7 +34,7 @@ TrainerFisherArnold:
 	trainer FISHER, ARNOLD, EVENT_BEAT_FISHER_ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherArnoldAfterBattleText
 	waitbutton
diff --git a/maps/Route25.asm b/maps/Route25.asm
index bc907c9cd..749603f55 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -80,7 +80,7 @@ TrainerSchoolboyDudley:
 	trainer SCHOOLBOY, DUDLEY, EVENT_BEAT_SCHOOLBOY_DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SchoolboyDudleyAfterBattleText
 	waitbutton
@@ -91,7 +91,7 @@ TrainerLassEllen:
 	trainer LASS, ELLEN, EVENT_BEAT_LASS_ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext LassEllenAfterBattleText
 	waitbutton
@@ -102,7 +102,7 @@ TrainerSchoolboyJoe:
 	trainer SCHOOLBOY, JOE, EVENT_BEAT_SCHOOLBOY_JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SchoolboyJoeAfterBattleText
 	waitbutton
@@ -113,7 +113,7 @@ TrainerLassLaura:
 	trainer LASS, LAURA, EVENT_BEAT_LASS_LAURA, LassLauraSeenText, LassLauraBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext LassLauraAfterBattleText
 	waitbutton
@@ -124,7 +124,7 @@ TrainerCamperLloyd:
 	trainer CAMPER, LLOYD, EVENT_BEAT_CAMPER_LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CamperLloydAfterBattleText
 	waitbutton
@@ -135,7 +135,7 @@ TrainerLassShannon:
 	trainer LASS, SHANNON, EVENT_BEAT_LASS_SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext LassShannonAfterBattleText
 	waitbutton
@@ -146,7 +146,7 @@ TrainerSupernerdPat:
 	trainer SUPER_NERD, PAT, EVENT_BEAT_SUPER_NERD_PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SupernerdPatAfterBattleText
 	waitbutton
diff --git a/maps/Route26.asm b/maps/Route26.asm
index 1d79bc50a..9e298d597 100644
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -17,7 +17,7 @@ TrainerCooltrainermJake:
 	trainer COOLTRAINERM, JAKE, EVENT_BEAT_COOLTRAINERM_JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermJakeAfterBattleText
 	waitbutton
@@ -29,7 +29,7 @@ TrainerCooltrainermGaven3:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_GAVEN
 	iftrue .WantsBattle
@@ -47,8 +47,8 @@ TrainerCooltrainermGaven3:
 	scall .AskNumber2
 .AskForNumber:
 	askforphonenumber PHONE_COOLTRAINERM_GAVEN
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext COOLTRAINERM, GAVEN3, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -57,9 +57,9 @@ TrainerCooltrainermGaven3:
 	scall .Rematch
 	winlosstext CooltrainermGaven3BeatenText, 0
 	copybytetovar wGavenFightCount
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight2:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight2
@@ -121,7 +121,7 @@ TrainerCooltrainerfJoyce:
 	trainer COOLTRAINERF, JOYCE, EVENT_BEAT_COOLTRAINERF_JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfJoyceAfterBattleText
 	waitbutton
@@ -133,7 +133,7 @@ TrainerCooltrainerfBeth1:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_COOLTRAINERF_BETH
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_BETH
 	iftrue .WantsBattle
@@ -151,8 +151,8 @@ TrainerCooltrainerfBeth1:
 	scall .AskNumber2
 .AskForNumber:
 	askforphonenumber PHONE_COOLTRAINERF_BETH
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext COOLTRAINERF, BETH1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -161,9 +161,9 @@ TrainerCooltrainerfBeth1:
 	scall .Rematch
 	winlosstext CooltrainerfBeth1BeatenText, 0
 	copybytetovar wBethFightCount
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight2:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight2
@@ -225,7 +225,7 @@ TrainerPsychicRichard:
 	trainer PSYCHIC_T, RICHARD, EVENT_BEAT_PSYCHIC_RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicRichardAfterBattleText
 	waitbutton
@@ -236,7 +236,7 @@ TrainerFisherScott:
 	trainer FISHER, SCOTT, EVENT_BEAT_FISHER_SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherScottAfterBattleText
 	waitbutton
diff --git a/maps/Route27.asm b/maps/Route27.asm
index 9b53429c6..1fabf3395 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -50,7 +50,7 @@ TrainerPsychicGilbert:
 	trainer PSYCHIC_T, GILBERT, EVENT_BEAT_PSYCHIC_GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicGilbertAfterBattleText
 	waitbutton
@@ -62,7 +62,7 @@ TrainerBirdKeeperJose2:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_JOSE
 	iftrue .WantsBattle
@@ -82,8 +82,8 @@ TrainerBirdKeeperJose2:
 	scall .AskNumber2
 .AskForNumber:
 	askforphonenumber PHONE_BIRDKEEPER_JOSE
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext BIRD_KEEPER, JOSE2, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -92,9 +92,9 @@ TrainerBirdKeeperJose2:
 	scall .Rematch
 	winlosstext BirdKeeperJose2BeatenText, 0
 	copybytetovar wJoseFightCount
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight2:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight2
@@ -174,7 +174,7 @@ TrainerCooltrainermBlake:
 	trainer COOLTRAINERM, BLAKE, EVENT_BEAT_COOLTRAINERM_BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermBlakeAfterBattleText
 	waitbutton
@@ -185,7 +185,7 @@ TrainerCooltrainermBrian:
 	trainer COOLTRAINERM, BRIAN, EVENT_BEAT_COOLTRAINERM_BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermBrianAfterBattleText
 	waitbutton
@@ -197,7 +197,7 @@ TrainerCooltrainerfReena:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_COOLTRAINERF_REENA
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_REENA
 	iftrue .WantsBattle
@@ -215,8 +215,8 @@ TrainerCooltrainerfReena:
 	scall .AskNumber2
 .AskForNumber:
 	askforphonenumber PHONE_COOLTRAINERF_REENA
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext COOLTRAINERF, REENA1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -225,9 +225,9 @@ TrainerCooltrainerfReena:
 	scall .Rematch
 	winlosstext CooltrainerfReenaBeatenText, 0
 	copybytetovar wReenaFightCount
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight2:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight2
@@ -289,7 +289,7 @@ TrainerCooltrainerfMegan:
 	trainer COOLTRAINERF, MEGAN, EVENT_BEAT_COOLTRAINERF_MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfMeganAfterBattleText
 	waitbutton
diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm
index 9396b42c5..886e7aa26 100644
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -14,7 +14,7 @@ SandstormHouseWoman:
 	special GetFirstPokemonHappiness
 	writetext SandstormHouseWomanText1
 	buttonsound
-	if_greater_than 150 - 1, .Loyal
+	ifgreater 150 - 1, .Loyal
 	jump .Disloyal
 
 .Loyal:
diff --git a/maps/Route29.asm b/maps/Route29.asm
index 3059f8546..9541e6f85 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -32,7 +32,7 @@ Route29_MapScripts:
 
 .DoesTuscanyAppear:
 	checkcode VAR_WEEKDAY
-	if_not_equal TUESDAY, .TuscanyDisappears
+	ifnotequal TUESDAY, .TuscanyDisappears
 	appear ROUTE29_TUSCANY
 	return
 
@@ -106,7 +106,7 @@ CatchingTutorialDudeScript:
 	faceplayer
 	opentext
 	checkcode VAR_BOXSPACE
-	if_equal 0, .BoxFull
+	ifequal 0, .BoxFull
 	checkevent EVENT_LEARNED_TO_CATCH_POKEMON
 	iftrue .BoxFull
 	checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
@@ -170,7 +170,7 @@ TuscanyScript:
 	checkevent EVENT_GOT_PINK_BOW_FROM_TUSCANY
 	iftrue TuscanyTuesdayScript
 	checkcode VAR_WEEKDAY
-	if_not_equal TUESDAY, TuscanyNotTuesdayScript
+	ifnotequal TUESDAY, TuscanyNotTuesdayScript
 	checkevent EVENT_MET_TUSCANY_OF_TUESDAY
 	iftrue .MetTuscany
 	writetext MeetTuscanyText
diff --git a/maps/Route3.asm b/maps/Route3.asm
index a0631c58c..5390bba97 100644
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -13,7 +13,7 @@ TrainerFirebreatherOtis:
 	trainer FIREBREATHER, OTIS, EVENT_BEAT_FIREBREATHER_OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FirebreatherOtisAfterBattleText
 	waitbutton
@@ -24,7 +24,7 @@ TrainerYoungsterWarren:
 	trainer YOUNGSTER, WARREN, EVENT_BEAT_YOUNGSTER_WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext YoungsterWarrenAfterBattleText
 	waitbutton
@@ -35,7 +35,7 @@ TrainerYoungsterJimmy:
 	trainer YOUNGSTER, JIMMY, EVENT_BEAT_YOUNGSTER_JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext YoungsterJimmyAfterBattleText
 	waitbutton
@@ -46,7 +46,7 @@ TrainerFirebreatherBurt:
 	trainer FIREBREATHER, BURT, EVENT_BEAT_FIREBREATHER_BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FirebreatherBurtAfterBattleText
 	waitbutton
diff --git a/maps/Route30.asm b/maps/Route30.asm
index dde0384ea..a96ac9be5 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -41,7 +41,7 @@ TrainerYoungsterJoey:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_YOUNGSTER_JOEY
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_JOEY
 	iftrue .Rematch
@@ -59,8 +59,8 @@ TrainerYoungsterJoey:
 	scall .AskNumber2
 .RequestNumber:
 	askforphonenumber PHONE_YOUNGSTER_JOEY
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext YOUNGSTER, JOEY1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -69,11 +69,11 @@ TrainerYoungsterJoey:
 	scall .RematchStd
 	winlosstext YoungsterJoey1BeatenText, 0
 	copybytetovar wJoeyFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_BEAT_ELITE_FOUR
 	iftrue .LoadFight4
@@ -187,7 +187,7 @@ TrainerYoungsterMikey:
 	trainer YOUNGSTER, MIKEY, EVENT_BEAT_YOUNGSTER_MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext YoungsterMikeyAfterText
 	waitbutton
@@ -198,7 +198,7 @@ TrainerBugCatcherDon:
 	trainer BUG_CATCHER, DON, EVENT_BEAT_BUG_CATCHER_DON, BugCatcherDonSeenText, BugCatcherDonBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BugCatcherDonAfterText
 	waitbutton
diff --git a/maps/Route31.asm b/maps/Route31.asm
index e39dfb539..36bf98412 100644
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -27,7 +27,7 @@ TrainerBugCatcherWade1:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_BUG_CATCHER_WADE
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_WADE
 	iftrue .WadeRematch
@@ -47,8 +47,8 @@ TrainerBugCatcherWade1:
 	scall .AskAgainSTD
 .Continue:
 	askforphonenumber PHONE_BUG_CATCHER_WADE
-	if_equal PHONE_CONTACTS_FULL, .PhoneFullSTD
-	if_equal PHONE_CONTACT_REFUSED, .DeclinedNumberSTD
+	ifequal PHONE_CONTACTS_FULL, .PhoneFullSTD
+	ifequal PHONE_CONTACT_REFUSED, .DeclinedNumberSTD
 	trainertotext BUG_CATCHER, WADE1, MEM_BUFFER_0
 	scall .RegisterNumberSTD
 	jump .AcceptedNumberSTD
@@ -57,11 +57,11 @@ TrainerBugCatcherWade1:
 	scall .RematchSTD
 	winlosstext BugCatcherWade1BeatenText, 0
 	copybytetovar wWadeFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_BEAT_ELITE_FOUR
 	iftrue .LoadFight4
@@ -196,10 +196,10 @@ Route31MailRecipientScript:
 	writetext Text_Route31SleepyManGotMail
 	buttonsound
 	checkpokeitem ReceivedSpearowMailText
-	if_equal POKEMAIL_WRONG_MAIL, .WrongMail
-	if_equal POKEMAIL_REFUSED, .Refused
-	if_equal POKEMAIL_NO_MAIL, .NoMail
-	if_equal POKEMAIL_LAST_MON, .LastMon
+	ifequal POKEMAIL_WRONG_MAIL, .WrongMail
+	ifequal POKEMAIL_REFUSED, .Refused
+	ifequal POKEMAIL_NO_MAIL, .NoMail
+	ifequal POKEMAIL_LAST_MON, .LastMon
 	; POKEMAIL_CORRECT
 	writetext Text_Route31HandOverMailMon
 	buttonsound
diff --git a/maps/Route32.asm b/maps/Route32.asm
index 0617ebfdd..f5eb5b345 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -34,7 +34,7 @@ Route32_MapScripts:
 
 .Frieda:
 	checkcode VAR_WEEKDAY
-	if_equal FRIDAY, .FriedaAppears
+	ifequal FRIDAY, .FriedaAppears
 	disappear ROUTE32_FRIEDA
 	return
 
@@ -145,7 +145,7 @@ TrainerCamperRoland:
 	trainer CAMPER, ROLAND, EVENT_BEAT_CAMPER_ROLAND, CamperRolandSeenText, CamperRolandBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CamperRolandAfterText
 	waitbutton
@@ -156,7 +156,7 @@ TrainerFisherJustin:
 	trainer FISHER, JUSTIN, EVENT_BEAT_FISHER_JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherJustinAfterText
 	waitbutton
@@ -168,7 +168,7 @@ TrainerFisherRalph1:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_FISHER_RALPH
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_RALPH
 	iftrue .Rematch
@@ -188,8 +188,8 @@ TrainerFisherRalph1:
 	scall .AskNumber2
 .AskForNumber:
 	askforphonenumber PHONE_FISHER_RALPH
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext FISHER, RALPH1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -198,11 +198,11 @@ TrainerFisherRalph1:
 	scall .RematchStd
 	winlosstext FisherRalph1BeatenText, 0
 	copybytetovar wRalphFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight4
@@ -292,7 +292,7 @@ TrainerFisherHenry:
 	trainer FISHER, HENRY, EVENT_BEAT_FISHER_HENRY, FisherHenrySeenText, FisherHenryBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherHenryAfterText
 	waitbutton
@@ -304,7 +304,7 @@ TrainerPicnickerLiz1:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_PICNICKER_LIZ
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_LIZ
 	iftrue .Rematch
@@ -322,8 +322,8 @@ TrainerPicnickerLiz1:
 	scall .AskNumber2
 .AskForNumber:
 	askforphonenumber PHONE_PICNICKER_LIZ
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext PICNICKER, LIZ1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -332,11 +332,11 @@ TrainerPicnickerLiz1:
 	scall .RematchStd
 	winlosstext PicnickerLiz1BeatenText, 0
 	copybytetovar wLizFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_BEAT_ELITE_FOUR
 	iftrue .LoadFight4
@@ -420,7 +420,7 @@ TrainerYoungsterAlbert:
 	trainer YOUNGSTER, ALBERT, EVENT_BEAT_YOUNGSTER_ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext YoungsterAlbertAfterText
 	waitbutton
@@ -431,7 +431,7 @@ TrainerYoungsterGordon:
 	trainer YOUNGSTER, GORDON, EVENT_BEAT_YOUNGSTER_GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext YoungsterGordonAfterText
 	waitbutton
@@ -442,7 +442,7 @@ TrainerBirdKeeperPeter:
 	trainer BIRD_KEEPER, PETER, EVENT_BEAT_BIRD_KEEPER_PETER, BirdKeeperPeterSeenText, BirdKeeperPeterBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperPeterAfterText
 	waitbutton
@@ -455,7 +455,7 @@ FriedaScript:
 	checkevent EVENT_GOT_POISON_BARB_FROM_FRIEDA
 	iftrue .Friday
 	checkcode VAR_WEEKDAY
-	if_not_equal FRIDAY, .NotFriday
+	ifnotequal FRIDAY, .NotFriday
 	checkevent EVENT_MET_FRIEDA_OF_FRIDAY
 	iftrue .MetFrieda
 	writetext MeetFriedaText
diff --git a/maps/Route33.asm b/maps/Route33.asm
index f5b877d24..9fbecb775 100644
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -16,7 +16,7 @@ TrainerHikerAnthony:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_HIKER_ANTHONY
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_ANTHONY
 	iftrue .Rematch
@@ -36,8 +36,8 @@ TrainerHikerAnthony:
 	scall .AskNumber2
 .AskForPhoneNumber:
 	askforphonenumber PHONE_HIKER_ANTHONY
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext HIKER, ANTHONY2, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -46,11 +46,11 @@ TrainerHikerAnthony:
 	scall .RematchStd
 	winlosstext HikerAnthony2BeatenText, 0
 	copybytetovar wAnthonyFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight4
diff --git a/maps/Route34.asm b/maps/Route34.asm
index 29a48e21e..82cb27cd4 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -57,10 +57,10 @@ DayCareManScript_Outside:
 	special DayCareManOutside
 	waitbutton
 	closetext
-	if_equal TRUE, .end_fail
+	ifequal TRUE, .end_fail
 	clearflag ENGINE_DAY_CARE_MAN_HAS_EGG
 	checkcode VAR_FACING
-	if_equal RIGHT, .walk_around_player
+	ifequal RIGHT, .walk_around_player
 	applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside
 	playsound SFX_ENTER_DOOR
 	disappear ROUTE34_GRAMPS
@@ -90,7 +90,7 @@ TrainerCamperTodd1:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_CAMPER_TODD
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_TODD
 	iftrue .Rematch
@@ -110,8 +110,8 @@ TrainerCamperTodd1:
 	scall .AskNumber2
 .FinishAsk:
 	askforphonenumber PHONE_CAMPER_TODD
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext CAMPER, TODD1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -120,11 +120,11 @@ TrainerCamperTodd1:
 	scall .RematchStd
 	winlosstext CamperTodd1BeatenText, 0
 	copybytetovar wToddFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight4
@@ -215,7 +215,7 @@ TrainerPicnickerGina1:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_PICNICKER_GINA
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_GINA
 	iftrue .Rematch
@@ -235,8 +235,8 @@ TrainerPicnickerGina1:
 	scall .AskNumber2
 .FinishAsk:
 	askforphonenumber PHONE_PICNICKER_GINA
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext PICNICKER, GINA1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -245,11 +245,11 @@ TrainerPicnickerGina1:
 	scall .RematchStd
 	winlosstext PicnickerGina1BeatenText, 0
 	copybytetovar wGinaFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight4
@@ -383,7 +383,7 @@ TrainerYoungsterSamuel:
 	trainer YOUNGSTER, SAMUEL, EVENT_BEAT_YOUNGSTER_SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext YoungsterSamuelAfterText
 	waitbutton
@@ -394,7 +394,7 @@ TrainerYoungsterIan:
 	trainer YOUNGSTER, IAN, EVENT_BEAT_YOUNGSTER_IAN, YoungsterIanSeenText, YoungsterIanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext YoungsterIanAfterText
 	waitbutton
@@ -405,7 +405,7 @@ TrainerPokefanmBrandon:
 	trainer POKEFANM, BRANDON, EVENT_BEAT_POKEFANM_BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmBrandonAfterText
 	waitbutton
@@ -416,7 +416,7 @@ TrainerCooltrainerfIrene:
 	trainer COOLTRAINERF, IRENE, EVENT_BEAT_COOLTRAINERF_IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkevent EVENT_GOT_SOFT_SAND_FROM_KATE
 	iftrue .GotSoftSand
@@ -435,7 +435,7 @@ TrainerCooltrainerfJenn:
 	trainer COOLTRAINERF, JENN, EVENT_BEAT_COOLTRAINERF_JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkevent EVENT_GOT_SOFT_SAND_FROM_KATE
 	iftrue .GotSoftSand
@@ -454,7 +454,7 @@ TrainerCooltrainerfKate:
 	trainer COOLTRAINERF, KATE, EVENT_BEAT_COOLTRAINERF_KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkevent EVENT_GOT_SOFT_SAND_FROM_KATE
 	iftrue .GotSoftSand
diff --git a/maps/Route35.asm b/maps/Route35.asm
index 86ddb2756..d79be43e9 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -20,7 +20,7 @@ TrainerBirdKeeperBryan:
 	trainer BIRD_KEEPER, BRYAN, EVENT_BEAT_BIRD_KEEPER_BRYAN, BirdKeeperBryanSeenText, BirdKeeperBryanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperBryanAfterBattleText
 	waitbutton
@@ -32,7 +32,7 @@ TrainerJugglerIrwin:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_JUGGLER_IRWIN
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkcellnum PHONE_JUGGLER_IRWIN
 	iftrue Route35NumberAcceptedM
@@ -48,8 +48,8 @@ TrainerJugglerIrwin:
 	scall Route35AskNumber2M
 .AskForNumber:
 	askforphonenumber PHONE_JUGGLER_IRWIN
-	if_equal PHONE_CONTACTS_FULL, Route35PhoneFullM
-	if_equal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM
+	ifequal PHONE_CONTACTS_FULL, Route35PhoneFullM
+	ifequal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM
 	trainertotext JUGGLER, IRWIN1, MEM_BUFFER_0
 	scall Route35RegisteredNumberM
 	jump Route35NumberAcceptedM
@@ -86,7 +86,7 @@ TrainerCamperIvan:
 	trainer CAMPER, IVAN, EVENT_BEAT_CAMPER_IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CamperIvanAfterBattleText
 	waitbutton
@@ -97,7 +97,7 @@ TrainerCamperElliot:
 	trainer CAMPER, ELLIOT, EVENT_BEAT_CAMPER_ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CamperElliotAfterBattleText
 	waitbutton
@@ -108,7 +108,7 @@ TrainerPicnickerBrooke:
 	trainer PICNICKER, BROOKE, EVENT_BEAT_PICNICKER_BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PicnickerBrookeAfterBattleText
 	waitbutton
@@ -119,7 +119,7 @@ TrainerPicnickerKim:
 	trainer PICNICKER, KIM, EVENT_BEAT_PICNICKER_KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PicnickerKimAfterBattleText
 	waitbutton
@@ -131,7 +131,7 @@ TrainerBugCatcherArnie:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_ARNIE
 	iftrue .WantsBattle
@@ -151,8 +151,8 @@ TrainerBugCatcherArnie:
 	scall Route35AskNumber2M
 .AskForNumber:
 	askforphonenumber PHONE_BUG_CATCHER_ARNIE
-	if_equal PHONE_CONTACTS_FULL, Route35PhoneFullM
-	if_equal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM
+	ifequal PHONE_CONTACTS_FULL, Route35PhoneFullM
+	ifequal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM
 	trainertotext BUG_CATCHER, ARNIE1, MEM_BUFFER_0
 	scall Route35RegisteredNumberM
 	jump Route35NumberAcceptedM
@@ -161,11 +161,11 @@ TrainerBugCatcherArnie:
 	scall Route35RematchM
 	winlosstext BugCatcherArnieBeatenText, 0
 	copybytetovar wArnieFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight4
@@ -227,7 +227,7 @@ TrainerFirebreatherWalt:
 	trainer FIREBREATHER, WALT, EVENT_BEAT_FIREBREATHER_WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FirebreatherWaltAfterBattleText
 	waitbutton
diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm
index b1adedc86..3bd8ec0ae 100644
--- a/maps/Route35GoldenrodGate.asm
+++ b/maps/Route35GoldenrodGate.asm
@@ -24,7 +24,7 @@ OfficerScript_0x69d37:
 	buttonsound
 	waitsfx
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, .partyfull
+	ifequal PARTY_LENGTH, .partyfull
 	writetext UnknownText_0x69eb8
 	playsound SFX_KEY_ITEM
 	waitsfx
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index b7b564de4..981fd5cb6 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -35,9 +35,9 @@ Route35NationalParkGate_MapScripts:
 
 .CheckIfContestAvailable:
 	checkcode VAR_WEEKDAY
-	if_equal TUESDAY, .SetContestOfficer
-	if_equal THURSDAY, .SetContestOfficer
-	if_equal SATURDAY, .SetContestOfficer
+	ifequal TUESDAY, .SetContestOfficer
+	ifequal THURSDAY, .SetContestOfficer
+	ifequal SATURDAY, .SetContestOfficer
 	checkflag ENGINE_BUG_CONTEST_TIMER
 	iftrue .BugContestIsRunning
 	disappear ROUTE35NATIONALPARKGATE_OFFICER1
@@ -79,10 +79,10 @@ Route35NationalParkGate_MapScripts:
 
 OfficerScript_0x6a204:
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, Route35NationalParkGate_NoContestToday
-	if_equal MONDAY, Route35NationalParkGate_NoContestToday
-	if_equal WEDNESDAY, Route35NationalParkGate_NoContestToday
-	if_equal FRIDAY, Route35NationalParkGate_NoContestToday
+	ifequal SUNDAY, Route35NationalParkGate_NoContestToday
+	ifequal MONDAY, Route35NationalParkGate_NoContestToday
+	ifequal WEDNESDAY, Route35NationalParkGate_NoContestToday
+	ifequal FRIDAY, Route35NationalParkGate_NoContestToday
 	faceplayer
 	opentext
 	checkflag ENGINE_DAILY_BUG_CONTEST
@@ -92,7 +92,7 @@ OfficerScript_0x6a204:
 	yesorno
 	iffalse Route35NationalParkGate_DeclinedToParticipate
 	checkcode VAR_PARTYCOUNT
-	if_greater_than 1, Route35NationalParkGate_LeaveTheRestBehind
+	ifgreater 1, Route35NationalParkGate_LeaveTheRestBehind
 	special ContestDropOffMons
 	clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
 Route35NationalParkGate_OkayToProceed:
@@ -117,7 +117,7 @@ Route35NationalParkGate_OkayToProceed:
 
 Route35NationalParkGate_EnterContest:
 	checkcode VAR_FACING
-	if_equal LEFT, Route35NationalParkGate_FacingLeft
+	ifequal LEFT, Route35NationalParkGate_FacingLeft
 	applymovement PLAYER, MovementData_0x6a2e5
 	end
 
@@ -127,13 +127,13 @@ Route35NationalParkGate_FacingLeft:
 
 Route35NationalParkGate_LeaveTheRestBehind:
 	checkcode VAR_PARTYCOUNT
-	if_less_than PARTY_LENGTH, Route35NationalParkGate_LessThanFullParty
+	ifless PARTY_LENGTH, Route35NationalParkGate_LessThanFullParty
 	checkcode VAR_BOXSPACE
-	if_equal 0, Route35NationalParkGate_NoRoomInBox
+	ifequal 0, Route35NationalParkGate_NoRoomInBox
 
 Route35NationalParkGate_LessThanFullParty: ; 6a27d
 	special CheckFirstMonIsEgg
-	if_equal TRUE, Route35NationalParkGate_FirstMonIsEgg
+	ifequal TRUE, Route35NationalParkGate_FirstMonIsEgg
 	writetext UnknownText_0x6a4c6
 	yesorno
 	iffalse Route35NationalParkGate_DeclinedToLeaveMonsBehind
diff --git a/maps/Route36.asm b/maps/Route36.asm
index 00729cb16..032394ff9 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -25,7 +25,7 @@ Route36_MapScripts:
 
 .ArthurCallback:
 	checkcode VAR_WEEKDAY
-	if_equal THURSDAY, .ArthurAppears
+	ifequal THURSDAY, .ArthurAppears
 	disappear ROUTE36_ARTHUR
 	return
 
@@ -77,7 +77,7 @@ WateredWeirdTreeScript:: ; export (for when you use Squirtbottle from pack)
 	loadwildmon SUDOWOODO, 20
 	startbattle
 	setevent EVENT_FOUGHT_SUDOWOODO
-	if_equal $2, DidntCatchSudowoodo
+	ifequal $2, DidntCatchSudowoodo
 	disappear ROUTE36_WEIRD_TREE
 	variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
 	reloadmapafterbattle
@@ -107,7 +107,7 @@ Route36FloriaScript:
 	closetext
 	clearevent EVENT_FLORIA_AT_FLOWER_SHOP
 	checkcode VAR_FACING
-	if_equal UP, .Up
+	ifequal UP, .Up
 	applymovement ROUTE36_FLORIA, FloriaMovement1
 	disappear ROUTE36_FLORIA
 	end
@@ -169,7 +169,7 @@ TrainerSchoolboyAlan1:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_SCHOOLBOY_ALAN
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_ALAN
 	iftrue .ChooseRematch
@@ -189,8 +189,8 @@ TrainerSchoolboyAlan1:
 	scall .AskNumber2
 .ContinueAskForPhoneNumber:
 	askforphonenumber PHONE_SCHOOLBOY_ALAN
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext SCHOOLBOY, ALAN1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -199,11 +199,11 @@ TrainerSchoolboyAlan1:
 	scall .Rematch
 	winlosstext SchoolboyAlan1BeatenText, 0
 	copybytetovar wAlanFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight4
@@ -306,7 +306,7 @@ TrainerPsychicMark:
 	trainer PSYCHIC_T, MARK, EVENT_BEAT_PSYCHIC_MARK, PsychicMarkSeenText, PsychicMarkBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicMarkAfterBattleText
 	waitbutton
@@ -319,7 +319,7 @@ ArthurScript:
 	checkevent EVENT_GOT_HARD_STONE_FROM_ARTHUR
 	iftrue .AlreadyGotStone
 	checkcode VAR_WEEKDAY
-	if_not_equal THURSDAY, ArthurNotThursdayScript
+	ifnotequal THURSDAY, ArthurNotThursdayScript
 	checkevent EVENT_MET_ARTHUR_OF_THURSDAY
 	iftrue .MetArthur
 	writetext MeetArthurText
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index 616e6e03b..3d9b1c58e 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -46,9 +46,9 @@ Route36NationalParkGate_MapScripts:
 	checkevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
 	iftrue .Return
 	checkcode VAR_WEEKDAY
-	if_equal TUESDAY, .SetContestOfficer
-	if_equal THURSDAY, .SetContestOfficer
-	if_equal SATURDAY, .SetContestOfficer
+	ifequal TUESDAY, .SetContestOfficer
+	ifequal THURSDAY, .SetContestOfficer
+	ifequal SATURDAY, .SetContestOfficer
 	checkflag ENGINE_BUG_CONTEST_TIMER
 	iftrue .SetContestOfficer
 	disappear ROUTE36NATIONALPARKGATE_OFFICER1
@@ -140,10 +140,10 @@ Route36NationalParkGate_MapScripts:
 
 Route36OfficerScriptContest:
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, _ContestNotOn
-	if_equal MONDAY, _ContestNotOn
-	if_equal WEDNESDAY, _ContestNotOn
-	if_equal FRIDAY, _ContestNotOn
+	ifequal SUNDAY, _ContestNotOn
+	ifequal MONDAY, _ContestNotOn
+	ifequal WEDNESDAY, _ContestNotOn
+	ifequal FRIDAY, _ContestNotOn
 	faceplayer
 	opentext
 	checkflag ENGINE_DAILY_BUG_CONTEST
@@ -153,7 +153,7 @@ Route36OfficerScriptContest:
 	yesorno
 	iffalse .DecidedNotToJoinContest
 	checkcode VAR_PARTYCOUNT
-	if_greater_than 1, .LeaveMonsWithOfficer
+	ifgreater 1, .LeaveMonsWithOfficer
 	special ContestDropOffMons
 	clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
 .ResumeStartingContest:
@@ -180,12 +180,12 @@ Route36OfficerScriptContest:
 
 .LeaveMonsWithOfficer:
 	checkcode VAR_PARTYCOUNT
-	if_less_than PARTY_LENGTH, .ContinueLeavingMons
+	ifless PARTY_LENGTH, .ContinueLeavingMons
 	checkcode VAR_BOXSPACE
-	if_equal 0, .BoxFull
+	ifequal 0, .BoxFull
 .ContinueLeavingMons:
 	special CheckFirstMonIsEgg
-	if_equal TRUE, .FirstMonIsEgg
+	ifequal TRUE, .FirstMonIsEgg
 	writetext UnknownText_0x6afb0
 	yesorno
 	iffalse .RefusedToLeaveMons
diff --git a/maps/Route37.asm b/maps/Route37.asm
index 0e9532c67..8a5a2b8a5 100644
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -15,7 +15,7 @@ Route37_MapScripts:
 
 .Sunny:
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, .SunnyAppears
+	ifequal SUNDAY, .SunnyAppears
 	disappear ROUTE37_SUNNY
 	return
 
@@ -27,7 +27,7 @@ TrainerTwinsAnnandanne1:
 	trainer TWINS, ANNANDANNE1, EVENT_BEAT_TWINS_ANN_AND_ANNE, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TwinsAnnandanne1AfterBattleText
 	waitbutton
@@ -38,7 +38,7 @@ TrainerTwinsAnnandanne2:
 	trainer TWINS, ANNANDANNE2, EVENT_BEAT_TWINS_ANN_AND_ANNE, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TwinsAnnandanne2AfterBattleText
 	waitbutton
@@ -49,7 +49,7 @@ TrainerPsychicGreg:
 	trainer PSYCHIC_T, GREG, EVENT_BEAT_PSYCHIC_GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicGregAfterBattleText
 	waitbutton
@@ -62,7 +62,7 @@ SunnyScript:
 	checkevent EVENT_GOT_MAGNET_FROM_SUNNY
 	iftrue SunnySundayScript
 	checkcode VAR_WEEKDAY
-	if_not_equal SUNDAY, SunnyNotSundayScript
+	ifnotequal SUNDAY, SunnyNotSundayScript
 	checkevent EVENT_MET_SUNNY_OF_SUNDAY
 	iftrue .MetSunny
 	writetext MeetSunnyText
diff --git a/maps/Route38.asm b/maps/Route38.asm
index 001cdbddf..67fff4f30 100644
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -16,7 +16,7 @@ TrainerBirdKeeperToby:
 	trainer BIRD_KEEPER, TOBY, EVENT_BEAT_BIRD_KEEPER_TOBY, BirdKeeperTobySeenText, BirdKeeperTobyBeatenText, 0, .Script
 
 .Script
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperTobyAfterBattleText
 	waitbutton
@@ -27,7 +27,7 @@ TrainerSailorHarry:
 	trainer SAILOR, HARRY, EVENT_BEAT_SAILOR_HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .Script
 
 .Script
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SailorHarryAfterBattleText
 	waitbutton
@@ -39,7 +39,7 @@ TrainerLassDana1:
 
 .Script
 	writecode VAR_CALLERID, PHONE_LASS_DANA
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_DANA
 	iftrue .DanaRematch
@@ -59,8 +59,8 @@ TrainerLassDana1:
 	scall .AskNumber2F
 .AskForPhoneNumber:
 	askforphonenumber PHONE_LASS_DANA
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .DeclinedPhoneNumber
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .DeclinedPhoneNumber
 	trainertotext LASS, DANA1, MEM_BUFFER_0
 	scall .RegisteredPhoneNumber
 	jump .NumberAccepted
@@ -69,11 +69,11 @@ TrainerLassDana1:
 	scall .Rematch
 	winlosstext LassDana1BeatenText, 0
 	copybytetovar wDanaFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight4
@@ -177,7 +177,7 @@ TrainerSchoolboyChad1:
 
 .Script
 	writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_CHAD
 	iftrue .ChadRematch
@@ -195,8 +195,8 @@ TrainerSchoolboyChad1:
 	scall .AskPhoneNumber2
 .AskToRegisterNumber:
 	askforphonenumber PHONE_SCHOOLBOY_CHAD
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .SaidNo
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .SaidNo
 	trainertotext SCHOOLBOY, CHAD1, MEM_BUFFER_0
 	scall .RegisteredChad
 	jump .HaveChadsNumber
@@ -205,11 +205,11 @@ TrainerSchoolboyChad1:
 	scall .Rematch
 	winlosstext SchoolboyChad1BeatenText, 0
 	copybytetovar wChadFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight4
@@ -293,7 +293,7 @@ TrainerBeautyValerie:
 	trainer BEAUTY, VALERIE, EVENT_BEAT_BEAUTY_VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .Script
 
 .Script
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BeautyValerieAfterBattleText
 	waitbutton
@@ -304,7 +304,7 @@ TrainerBeautyOlivia:
 	trainer BEAUTY, OLIVIA, EVENT_BEAT_BEAUTY_OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .Script
 
 .Script
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BeautyOliviaAfterBattleText
 	waitbutton
diff --git a/maps/Route39.asm b/maps/Route39.asm
index 0b8134acf..31ac512d2 100644
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -28,7 +28,7 @@ TrainerPokefanmDerek:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_POKEFANM_DEREK
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_DEREK_HAS_NUGGET
 	iftrue .HasNugget
@@ -48,8 +48,8 @@ TrainerPokefanmDerek:
 	scall .AskNumber2
 .AskForNumber:
 	askforphonenumber PHONE_POKEFANM_DEREK
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext POKEFANM, DEREK1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -106,7 +106,7 @@ TrainerPokefanfRuth:
 	trainer POKEFANF, RUTH, EVENT_BEAT_POKEFANF_RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanfRuthAfterBattleText
 	waitbutton
@@ -117,7 +117,7 @@ TrainerSailorEugene:
 	trainer SAILOR, EUGENE, EVENT_BEAT_SAILOR_EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SailorEugeneAfterBattleText
 	waitbutton
@@ -128,7 +128,7 @@ TrainerPsychicNorman:
 	trainer PSYCHIC_T, NORMAN, EVENT_BEAT_PSYCHIC_NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicNormanAfterBattleText
 	waitbutton
diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm
index 3180fe903..71d6745ce 100644
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -70,9 +70,9 @@ MooMoo:
 	copybytetovar MooMooBerries
 	addvar 1
 	copyvartobyte MooMooBerries
-	if_equal 3, .ThreeBerries
-	if_equal 5, .FiveBerries
-	if_equal 7, .SevenBerries
+	ifequal 3, .ThreeBerries
+	ifequal 5, .FiveBerries
+	ifequal 7, .SevenBerries
 	writetext Text_GaveBerry
 	waitbutton
 	closetext
diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm
index ba8284d04..510d6e5d5 100644
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -26,7 +26,7 @@ FarmerMScript_SellMilk:
 	yesorno
 	iffalse FarmerMScript_NoSale
 	checkmoney YOUR_MONEY, 500
-	if_equal HAVE_LESS, FarmerMScript_NoMoney
+	ifequal HAVE_LESS, FarmerMScript_NoMoney
 	giveitem MOOMOO_MILK
 	iffalse FarmerMScript_NoRoom
 	takemoney YOUR_MONEY, 500
diff --git a/maps/Route4.asm b/maps/Route4.asm
index b0f2927c9..c7722e3a9 100644
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -13,7 +13,7 @@ TrainerBirdKeeperHank:
 	trainer BIRD_KEEPER, HANK, EVENT_BEAT_BIRD_KEEPER_HANK, BirdKeeperHankSeenText, BirdKeeperHankBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperHankAfterBattleText
 	waitbutton
@@ -24,7 +24,7 @@ TrainerPicnickerHope:
 	trainer PICNICKER, HOPE, EVENT_BEAT_PICNICKER_HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PicnickerHopeAfterBattleText
 	waitbutton
@@ -35,7 +35,7 @@ TrainerPicnickerSharon:
 	trainer PICNICKER, SHARON, EVENT_BEAT_PICNICKER_SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PicnickerSharonAfterBattleText
 	waitbutton
diff --git a/maps/Route40.asm b/maps/Route40.asm
index e8b7d6946..5e37a7bf5 100644
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -21,7 +21,7 @@ Route40_MapScripts:
 .MonicaCallback:
 	clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
 	checkcode VAR_WEEKDAY
-	if_equal MONDAY, .MonicaAppears
+	ifequal MONDAY, .MonicaAppears
 	disappear ROUTE40_MONICA
 	return
 
@@ -33,7 +33,7 @@ TrainerSwimmerfElaine:
 	trainer SWIMMERF, ELAINE, EVENT_BEAT_SWIMMERF_ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfElaineAfterBattleText
 	waitbutton
@@ -44,7 +44,7 @@ TrainerSwimmerfPaula:
 	trainer SWIMMERF, PAULA, EVENT_BEAT_SWIMMERF_PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfPaulaAfterBattleText
 	waitbutton
@@ -55,7 +55,7 @@ TrainerSwimmermSimon:
 	trainer SWIMMERM, SIMON, EVENT_BEAT_SWIMMERM_SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermSimonAfterBattleText
 	waitbutton
@@ -66,7 +66,7 @@ TrainerSwimmermRandall:
 	trainer SWIMMERM, RANDALL, EVENT_BEAT_SWIMMERM_RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermRandallAfterBattleText
 	waitbutton
@@ -96,7 +96,7 @@ MonicaScript:
 	checkevent EVENT_GOT_SHARP_BEAK_FROM_MONICA
 	iftrue .Monday
 	checkcode VAR_WEEKDAY
-	if_not_equal MONDAY, .NotMonday
+	ifnotequal MONDAY, .NotMonday
 	checkevent EVENT_MET_MONICA_OF_MONDAY
 	iftrue .MetMonica
 	writetext MeetMonicaText
diff --git a/maps/Route41.asm b/maps/Route41.asm
index 79d99d925..d851a41e5 100644
--- a/maps/Route41.asm
+++ b/maps/Route41.asm
@@ -19,7 +19,7 @@ TrainerSwimmerfKaylee:
 	trainer SWIMMERF, KAYLEE, EVENT_BEAT_SWIMMERF_KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfKayleeAfterBattleText
 	waitbutton
@@ -30,7 +30,7 @@ TrainerSwimmerfSusie:
 	trainer SWIMMERF, SUSIE, EVENT_BEAT_SWIMMERF_SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfSusieAfterBattleText
 	waitbutton
@@ -41,7 +41,7 @@ TrainerSwimmerfDenise:
 	trainer SWIMMERF, DENISE, EVENT_BEAT_SWIMMERF_DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfDeniseAfterBattleText
 	waitbutton
@@ -52,7 +52,7 @@ TrainerSwimmerfKara:
 	trainer SWIMMERF, KARA, EVENT_BEAT_SWIMMERF_KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfKaraAfterBattleText
 	waitbutton
@@ -63,7 +63,7 @@ TrainerSwimmerfWendy:
 	trainer SWIMMERF, WENDY, EVENT_BEAT_SWIMMERF_WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfWendyAfterBattleText
 	waitbutton
@@ -74,7 +74,7 @@ TrainerSwimmermCharlie:
 	trainer SWIMMERM, CHARLIE, EVENT_BEAT_SWIMMERM_CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermCharlieAfterBattleText
 	waitbutton
@@ -85,7 +85,7 @@ TrainerSwimmermGeorge:
 	trainer SWIMMERM, GEORGE, EVENT_BEAT_SWIMMERM_GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermGeorgeAfterBattleText
 	waitbutton
@@ -96,7 +96,7 @@ TrainerSwimmermBerke:
 	trainer SWIMMERM, BERKE, EVENT_BEAT_SWIMMERM_BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermBerkeAfterBattleText
 	waitbutton
@@ -107,7 +107,7 @@ TrainerSwimmermKirk:
 	trainer SWIMMERM, KIRK, EVENT_BEAT_SWIMMERM_KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermKirkAfterBattleText
 	waitbutton
@@ -118,7 +118,7 @@ TrainerSwimmermMathew:
 	trainer SWIMMERM, MATHEW, EVENT_BEAT_SWIMMERM_MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermMathewAfterBattleText
 	waitbutton
diff --git a/maps/Route42.asm b/maps/Route42.asm
index 06e83b5c3..b38bb0344 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -39,7 +39,7 @@ TrainerFisherTully:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_FISHER_TULLY
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_TULLY
 	iftrue .WantsBattle
@@ -59,8 +59,8 @@ TrainerFisherTully:
 	scall .AskNumber2
 .AskForNumber:
 	askforphonenumber PHONE_FISHER_TULLY
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext FISHER, TULLY1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -69,10 +69,10 @@ TrainerFisherTully:
 	scall .Rematch
 	winlosstext FisherTullyBeatenText, 0
 	copybytetovar wTullyFightCount
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight3:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight3
@@ -164,7 +164,7 @@ TrainerPokemaniacShane:
 	trainer POKEMANIAC, SHANE, EVENT_BEAT_POKEMANIAC_SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacShaneAfterBattleText
 	waitbutton
@@ -175,7 +175,7 @@ TrainerHikerBenjamin:
 	trainer HIKER, BENJAMIN, EVENT_BEAT_HIKER_BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerBenjaminAfterBattleText
 	waitbutton
diff --git a/maps/Route43.asm b/maps/Route43.asm
index 1eeda343a..00be8c258 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -28,7 +28,7 @@ TrainerCamperSpencer:
 	trainer CAMPER, SPENCER, EVENT_BEAT_CAMPER_SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CamperSpencerAfterBattleText
 	waitbutton
@@ -39,7 +39,7 @@ TrainerPokemaniacBen:
 	trainer POKEMANIAC, BEN, EVENT_BEAT_POKEMANIAC_BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacBenAfterBattleText
 	waitbutton
@@ -51,7 +51,7 @@ TrainerPokemaniacBrent:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_BRENT
 	iftrue .WantsBattle
@@ -69,8 +69,8 @@ TrainerPokemaniacBrent:
 	scall .AskNumber2
 .AskForNumber:
 	askforphonenumber PHONE_POKEMANIAC_BRENT
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext POKEMANIAC, BRENT1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -79,10 +79,10 @@ TrainerPokemaniacBrent:
 	scall .Rematch
 	winlosstext PokemaniacBrentBeatenText, 0
 	copybytetovar wBrentFightCount
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight3:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight3
@@ -155,7 +155,7 @@ TrainerPokemaniacRon:
 	trainer POKEMANIAC, RON, EVENT_BEAT_POKEMANIAC_RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacRonAfterBattleText
 	waitbutton
@@ -166,7 +166,7 @@ TrainerFisherMarvin:
 	trainer FISHER, MARVIN, EVENT_BEAT_FISHER_MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherMarvinAfterBattleText
 	waitbutton
@@ -178,7 +178,7 @@ TrainerPicnickerTiffany:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_TIFFANY
 	iftrue .WantsBattle
@@ -200,8 +200,8 @@ TrainerPicnickerTiffany:
 	scall .AskNumber2
 .AskForNumber:
 	askforphonenumber PHONE_PICNICKER_TIFFANY
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext PICNICKER, TIFFANY3, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -210,10 +210,10 @@ TrainerPicnickerTiffany:
 	scall .Rematch
 	winlosstext PicnickerTiffanyBeatenText, 0
 	copybytetovar wTiffanyFightCount
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight3:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight3
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index d0e6ee201..6d0795642 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -33,8 +33,8 @@ Route43Gate_MapScripts:
 .RocketTakeover:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	checkcode VAR_FACING
-	if_equal DOWN, RocketScript_Southbound
-	if_equal UP, RocketScript_Northbound
+	ifequal DOWN, RocketScript_Southbound
+	ifequal UP, RocketScript_Northbound
 	setscene SCENE_FINISHED
 	end
 
@@ -49,7 +49,7 @@ RocketScript_Southbound:
 	writetext RocketText_TollFee
 	buttonsound
 	checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1
-	if_equal HAVE_MORE, RocketScript_TollSouth
+	ifequal HAVE_MORE, RocketScript_TollSouth
 	jump RocketScript_YoureBrokeSouth
 
 RocketScript_TollSouth:
@@ -81,7 +81,7 @@ RocketScript_Northbound:
 	writetext RocketText_TollFee
 	buttonsound
 	checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1
-	if_equal HAVE_MORE, RocketScript_TollNorth
+	ifequal HAVE_MORE, RocketScript_TollNorth
 	jump RocketScript_YoureBrokeNorth
 
 RocketScript_TollNorth:
diff --git a/maps/Route44.asm b/maps/Route44.asm
index 1719b8432..6e8146bc3 100644
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -21,7 +21,7 @@ TrainerBirdKeeperVance1:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_VANCE
 	iftrue .WantsBattle
@@ -39,8 +39,8 @@ TrainerBirdKeeperVance1:
 	scall Route44AskNumber2M
 .AskForNumber:
 	askforphonenumber PHONE_BIRDKEEPER_VANCE
-	if_equal PHONE_CONTACTS_FULL, Route44PhoneFullM
-	if_equal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM
+	ifequal PHONE_CONTACTS_FULL, Route44PhoneFullM
+	ifequal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM
 	trainertotext BIRD_KEEPER, VANCE1, MEM_BUFFER_0
 	scall Route44RegisteredNumberM
 	jump Route44NumberAcceptedM
@@ -49,9 +49,9 @@ TrainerBirdKeeperVance1:
 	scall Route44RematchM
 	winlosstext BirdKeeperVance1BeatenText, 0
 	copybytetovar wVanceFightCount
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight2:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight2
@@ -151,7 +151,7 @@ TrainerPsychicPhil:
 	trainer PSYCHIC_T, PHIL, EVENT_BEAT_PSYCHIC_PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicPhilAfterBattleText
 	waitbutton
@@ -163,7 +163,7 @@ TrainerFisherWilton1:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_FISHER_WILTON
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_WILTON
 	iftrue .WantsBattle
@@ -183,8 +183,8 @@ TrainerFisherWilton1:
 	scall Route44AskNumber2M
 .AskForNumber:
 	askforphonenumber PHONE_FISHER_WILTON
-	if_equal PHONE_CONTACTS_FULL, Route44PhoneFullM
-	if_equal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM
+	ifequal PHONE_CONTACTS_FULL, Route44PhoneFullM
+	ifequal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM
 	trainertotext FISHER, WILTON1, MEM_BUFFER_0
 	scall Route44RegisteredNumberM
 	jump Route44NumberAcceptedM
@@ -193,9 +193,9 @@ TrainerFisherWilton1:
 	scall Route44RematchM
 	winlosstext FisherWilton1BeatenText, 0
 	copybytetovar wWiltonFightCount
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight2:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight2
@@ -257,7 +257,7 @@ TrainerFisherEdgar:
 	trainer FISHER, EDGAR, EVENT_BEAT_FISHER_EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherEdgarAfterBattleText
 	waitbutton
@@ -268,7 +268,7 @@ TrainerCooltrainerfCybil:
 	trainer COOLTRAINERF, CYBIL, EVENT_BEAT_COOLTRAINERF_CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfCybilAfterBattleText
 	waitbutton
@@ -279,7 +279,7 @@ TrainerPokemaniacZach:
 	trainer POKEMANIAC, ZACH, EVENT_BEAT_POKEMANIAC_ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacZachAfterBattleText
 	waitbutton
@@ -290,7 +290,7 @@ TrainerCooltrainermAllen:
 	trainer COOLTRAINERM, ALLEN, EVENT_BEAT_COOLTRAINERM_ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermAllenAfterBattleText
 	waitbutton
diff --git a/maps/Route45.asm b/maps/Route45.asm
index 991181530..9a3c873c2 100644
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -23,7 +23,7 @@ TrainerBlackbeltKenji:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_BLACKBELT_KENJI
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkcellnum PHONE_BLACKBELT_KENJI
 	iftrue .Registered
@@ -40,15 +40,15 @@ TrainerBlackbeltKenji:
 	scall Route45AskNumber2M
 .AskForNumber:
 	askforphonenumber PHONE_BLACKBELT_KENJI
-	if_equal PHONE_CONTACTS_FULL, Route45PhoneFullM
-	if_equal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM
+	ifequal PHONE_CONTACTS_FULL, Route45PhoneFullM
+	ifequal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM
 	trainertotext BLACKBELT_T, KENJI3, MEM_BUFFER_0
 	scall Route45RegisteredNumberM
 	jump Route45NumberAcceptedM
 
 .Registered:
 	checkcode VAR_KENJI_BREAK
-	if_not_equal 1, Route45NumberAcceptedM
+	ifnotequal 1, Route45NumberAcceptedM
 	checkmorn
 	iftrue .Morning
 	checknite
@@ -126,7 +126,7 @@ TrainerHikerErik:
 	trainer HIKER, ERIK, EVENT_BEAT_HIKER_ERIK, HikerErikSeenText, HikerErikBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerErikAfterBattleText
 	waitbutton
@@ -137,7 +137,7 @@ TrainerHikerMichael:
 	trainer HIKER, MICHAEL, EVENT_BEAT_HIKER_MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerMichaelAfterBattleText
 	waitbutton
@@ -149,7 +149,7 @@ TrainerHikerParry:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_HIKER_PARRY
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_PARRY
 	iftrue .WantsBattle
@@ -167,8 +167,8 @@ TrainerHikerParry:
 	scall Route45AskNumber2M
 .AskForNumber:
 	askforphonenumber PHONE_HIKER_PARRY
-	if_equal PHONE_CONTACTS_FULL, Route45PhoneFullM
-	if_equal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM
+	ifequal PHONE_CONTACTS_FULL, Route45PhoneFullM
+	ifequal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM
 	trainertotext HIKER, PARRY1, MEM_BUFFER_0
 	scall Route45RegisteredNumberM
 	jump Route45NumberAcceptedM
@@ -177,9 +177,9 @@ TrainerHikerParry:
 	scall Route45RematchM
 	winlosstext HikerParry3BeatenText, 0
 	copybytetovar wParryFightCount
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight2:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight2
@@ -234,7 +234,7 @@ TrainerHikerTimothy:
 	trainer HIKER, TIMOTHY, EVENT_BEAT_HIKER_TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerTimothyAfterBattleText
 	waitbutton
@@ -245,7 +245,7 @@ TrainerCooltrainermRyan:
 	trainer COOLTRAINERM, RYAN, EVENT_BEAT_COOLTRAINERM_RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermRyanAfterBattleText
 	waitbutton
@@ -256,7 +256,7 @@ TrainerCooltrainerfKelly:
 	trainer COOLTRAINERF, KELLY, EVENT_BEAT_COOLTRAINERF_KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfKellyAfterBattleText
 	waitbutton
diff --git a/maps/Route46.asm b/maps/Route46.asm
index cdfb81234..b11ee0b1a 100644
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -15,7 +15,7 @@ TrainerCamperTed:
 	trainer CAMPER, TED, EVENT_BEAT_CAMPER_TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CamperTedAfterBattleText
 	waitbutton
@@ -27,7 +27,7 @@ TrainerPicnickerErin1:
 
 .Script:
 	writecode VAR_CALLERID, PHONE_PICNICKER_ERIN
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_ERIN
 	iftrue .WantsBattle
@@ -45,8 +45,8 @@ TrainerPicnickerErin1:
 	scall Route46AskNumber2F
 .AskForNumber:
 	askforphonenumber PHONE_PICNICKER_ERIN
-	if_equal PHONE_CONTACTS_FULL, Route46PhoneFullF
-	if_equal PHONE_CONTACT_REFUSED, Route46NumberDeclinedF
+	ifequal PHONE_CONTACTS_FULL, Route46PhoneFullF
+	ifequal PHONE_CONTACT_REFUSED, Route46NumberDeclinedF
 	trainertotext PICNICKER, ERIN1, MEM_BUFFER_0
 	scall Route46RegisteredNumberF
 	jump Route46NumberAcceptedF
@@ -55,9 +55,9 @@ TrainerPicnickerErin1:
 	scall Route46RematchF
 	winlosstext PicnickerErin1BeatenText, 0
 	copybytetovar wErinFightCount
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight2:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight2
@@ -149,7 +149,7 @@ TrainerHikerBailey:
 	trainer HIKER, BAILEY, EVENT_BEAT_HIKER_BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerBaileyAfterBattleText
 	waitbutton
diff --git a/maps/Route6.asm b/maps/Route6.asm
index a949881e4..8576e1b04 100644
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -12,7 +12,7 @@ TrainerPokefanmRex:
 	trainer POKEFANM, REX, EVENT_BEAT_POKEFANM_REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmRexAfterBattleText
 	waitbutton
@@ -23,7 +23,7 @@ TrainerPokefanmAllan:
 	trainer POKEFANM, ALLAN, EVENT_BEAT_POKEFANM_ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmAllanAfterBattleText
 	waitbutton
diff --git a/maps/Route8.asm b/maps/Route8.asm
index 0a9a96aed..7454c9604 100644
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -15,7 +15,7 @@ TrainerBikerDwayne:
 	trainer BIKER, DWAYNE, EVENT_BEAT_BIKER_DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BikerDwayneAfterBattleText
 	waitbutton
@@ -26,7 +26,7 @@ TrainerBikerHarris:
 	trainer BIKER, HARRIS, EVENT_BEAT_BIKER_HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BikerHarrisAfterBattleText
 	waitbutton
@@ -37,7 +37,7 @@ TrainerBikerZeke:
 	trainer BIKER, ZEKE, EVENT_BEAT_BIKER_ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BikerZekeAfterBattleText
 	waitbutton
@@ -48,7 +48,7 @@ TrainerSupernerdSam:
 	trainer SUPER_NERD, SAM, EVENT_BEAT_SUPER_NERD_SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SupernerdSamAfterBattleText
 	waitbutton
@@ -59,7 +59,7 @@ TrainerSupernerdTom:
 	trainer SUPER_NERD, TOM, EVENT_BEAT_SUPER_NERD_TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SupernerdTomAfterBattleText
 	waitbutton
diff --git a/maps/Route9.asm b/maps/Route9.asm
index 5a3d934fd..fa3d07313 100644
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -15,7 +15,7 @@ TrainerCamperDean:
 	trainer CAMPER, DEAN, EVENT_BEAT_CAMPER_DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CamperDeanAfterBattleText
 	waitbutton
@@ -26,7 +26,7 @@ TrainerPicnickerHeidi:
 	trainer PICNICKER, HEIDI, EVENT_BEAT_PICNICKER_HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PicnickerHeidiAfterBattleText
 	waitbutton
@@ -37,7 +37,7 @@ TrainerCamperSid:
 	trainer CAMPER, SID, EVENT_BEAT_CAMPER_SID, CamperSidSeenText, CamperSidBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CamperSidAfterBattleText
 	waitbutton
@@ -48,7 +48,7 @@ TrainerPicnickerEdna:
 	trainer PICNICKER, EDNA, EVENT_BEAT_PICNICKER_EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PicnickerEdnaAfterBattleText
 	waitbutton
@@ -59,7 +59,7 @@ TrainerHikerTim:
 	trainer HIKER, TIM, EVENT_BEAT_HIKER_TIM, HikerTimSeenText, HikerTimBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerTimAfterBattleText
 	waitbutton
@@ -70,7 +70,7 @@ TrainerHikerSidney:
 	trainer HIKER, SIDNEY, EVENT_BEAT_HIKER_SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerSidneyAfterBattleText
 	waitbutton
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index bb0977a21..98cef9d68 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -84,7 +84,7 @@ ScientistScript_0x587a8:
 	faceplayer
 	opentext
 	checkcode VAR_UNOWNCOUNT
-	if_equal NUM_UNOWN, UnknownScript_0x587cf
+	ifequal NUM_UNOWN, UnknownScript_0x587cf
 	checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
 	iftrue UnknownScript_0x587c9
 	checkevent EVENT_SOLVED_KABUTO_PUZZLE
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index 8ab4b8f5d..f9d1b6f7b 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -28,7 +28,7 @@ RuinsOfAlphOutside_MapScripts:
 
 .MaybeScientist:
 	checkcode VAR_UNOWNCOUNT
-	if_greater_than 2, .YesScientist
+	ifgreater 2, .YesScientist
 	jump .NoScientist
 
 .YesScientist:
@@ -103,7 +103,7 @@ TrainerPsychicNathan:
 	trainer PSYCHIC_T, NATHAN, EVENT_BEAT_PSYCHIC_NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicNathanAfterBattleText
 	waitbutton
@@ -114,7 +114,7 @@ TrainerSuperNerdStan:
 	trainer SUPER_NERD, STAN, EVENT_BEAT_SUPER_NERD_STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SuperNerdStanAfterBattleText
 	waitbutton
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index 38ead4614..8b2c8430d 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -20,7 +20,7 @@ RuinsOfAlphResearchCenter_MapScripts:
 
 .ScientistCallback:
 	checkscene
-	if_equal SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX, .ShowScientist
+	ifequal SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX, .ShowScientist
 	return
 
 .ShowScientist:
@@ -61,7 +61,7 @@ ScientistScript_0x591d1:
 	faceplayer
 	opentext
 	checkcode VAR_UNOWNCOUNT
-	if_equal NUM_UNOWN, UnknownScript_0x591df
+	ifequal NUM_UNOWN, UnknownScript_0x591df
 	writetext UnknownText_0x59311
 	waitbutton
 	closetext
@@ -77,7 +77,7 @@ ScientistScript_0x591e5:
 	faceplayer
 	opentext
 	checkcode VAR_UNOWNCOUNT
-	if_equal NUM_UNOWN, UnknownScript_0x5920b
+	ifequal NUM_UNOWN, UnknownScript_0x5920b
 	checkflag ENGINE_UNOWN_DEX
 	iftrue UnknownScript_0x59205
 	checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
@@ -110,7 +110,7 @@ ScientistScript_0x59214:
 	faceplayer
 	opentext
 	checkcode VAR_UNOWNCOUNT
-	if_equal NUM_UNOWN, UnknownScript_0x5922e
+	ifequal NUM_UNOWN, UnknownScript_0x5922e
 	checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
 	iftrue UnknownScript_0x59228
 	writetext UnknownText_0x5954f
@@ -135,7 +135,7 @@ MapRuinsOfAlphResearchCenterSignpost1Script:
 	checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
 	iftrue UnknownScript_0x59241
 	checkcode VAR_UNOWNCOUNT
-	if_equal NUM_UNOWN, UnknownScript_0x59247
+	ifequal NUM_UNOWN, UnknownScript_0x59247
 UnknownScript_0x59241:
 	writetext UnknownText_0x597b6
 	waitbutton
@@ -153,7 +153,7 @@ MapRuinsOfAlphResearchCenterSignpost2Script:
 	checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
 	iftrue UnknownScript_0x5925a
 	checkcode VAR_UNOWNCOUNT
-	if_equal NUM_UNOWN, UnknownScript_0x59260
+	ifequal NUM_UNOWN, UnknownScript_0x59260
 UnknownScript_0x5925a:
 	writetext UnknownText_0x5980e
 	waitbutton
diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm
index 466c12af8..5f70785d2 100644
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -48,7 +48,7 @@ TrainerMediumRebecca:
 	trainer MEDIUM, REBECCA, EVENT_BEAT_MEDIUM_REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext MediumRebeccaAfterBattleText
 	waitbutton
@@ -59,7 +59,7 @@ TrainerPsychicFranklin:
 	trainer PSYCHIC_T, FRANKLIN, EVENT_BEAT_PSYCHIC_FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicFranklinAfterBattleText
 	waitbutton
@@ -70,7 +70,7 @@ TrainerMediumDoris:
 	trainer MEDIUM, DORIS, EVENT_BEAT_MEDIUM_DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext MediumDorisAfterBattleText
 	waitbutton
@@ -81,7 +81,7 @@ TrainerPsychicJared:
 	trainer PSYCHIC_T, JARED, EVENT_BEAT_PSYCHIC_JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicJaredAfterBattleText
 	waitbutton
diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm
index 1a7a1e408..986f9badf 100644
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -21,7 +21,7 @@ TrainerGruntM29:
 	trainer GRUNTM, GRUNTM_29, EVENT_BEAT_ROCKET_GRUNTM_29, GruntM29SeenText, GruntM29BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM29AfterBattleText
 	waitbutton
@@ -75,7 +75,7 @@ TrainerGruntM2:
 	trainer GRUNTM, GRUNTM_2, EVENT_BEAT_ROCKET_GRUNTM_2, GruntM2SeenText, GruntM2BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM2AfterBattleText
 	waitbutton
@@ -86,7 +86,7 @@ TrainerGruntF1:
 	trainer GRUNTF, GRUNTF_1, EVENT_BEAT_ROCKET_GRUNTF_1, GruntF1SeenText, GruntF1BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntF1AfterBattleText
 	waitbutton
diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm
index 89bf9e562..42a2c74ea 100644
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -27,7 +27,7 @@ TrainerSageChow:
 	trainer SAGE, CHOW, EVENT_BEAT_SAGE_CHOW, SageChowSeenText, SageChowBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SageChowAfterBattleText
 	waitbutton
diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm
index 4bc2a6d1d..7606c3227 100644
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -12,7 +12,7 @@ TrainerSageNico:
 	trainer SAGE, NICO, EVENT_BEAT_SAGE_NICO, SageNicoSeenText, SageNicoBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SageNicoAfterBattleText
 	waitbutton
@@ -23,7 +23,7 @@ TrainerSageEdmond:
 	trainer SAGE, EDMOND, EVENT_BEAT_SAGE_EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SageEdmondAfterBattleText
 	waitbutton
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index 8a366c103..3df7ac4ed 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -94,7 +94,7 @@ TrainerSageJin:
 	trainer SAGE, JIN, EVENT_BEAT_SAGE_JIN, SageJinSeenText, SageJinBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SageJinAfterBattleText
 	waitbutton
@@ -105,7 +105,7 @@ TrainerSageTroy:
 	trainer SAGE, TROY, EVENT_BEAT_SAGE_TROY, SageTroySeenText, SageTroyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SageTroyAfterBattleText
 	waitbutton
@@ -116,7 +116,7 @@ TrainerSageNeal:
 	trainer SAGE, NEAL, EVENT_BEAT_SAGE_NEAL, SageNealSeenText, SageNealBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SageNealAfterBattleText
 	waitbutton
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index bac4c2b94..5b3874680 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -33,7 +33,7 @@ SecurityCamera1a:
 	spriteface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
@@ -41,7 +41,7 @@ SecurityCamera1a:
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt2
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	setevent EVENT_SECURITY_CAMERA_1
 	end
 
@@ -58,7 +58,7 @@ SecurityCamera1b:
 	spriteface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
@@ -66,7 +66,7 @@ SecurityCamera1b:
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt2
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	setevent EVENT_SECURITY_CAMERA_1
 	end
 
@@ -83,7 +83,7 @@ SecurityCamera2a:
 	spriteface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement2
 	scall TrainerCameraGrunt1
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
@@ -92,7 +92,7 @@ SecurityCamera2a:
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement3
 	scall TrainerCameraGrunt2
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	setevent EVENT_SECURITY_CAMERA_2
 	end
 
@@ -109,7 +109,7 @@ SecurityCamera2b:
 	spriteface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement4
 	scall TrainerCameraGrunt1
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
@@ -118,7 +118,7 @@ SecurityCamera2b:
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement5
 	scall TrainerCameraGrunt2
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	setevent EVENT_SECURITY_CAMERA_2
 	end
 
@@ -135,7 +135,7 @@ SecurityCamera3a:
 	spriteface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
@@ -144,7 +144,7 @@ SecurityCamera3a:
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement6
 	scall TrainerCameraGrunt2
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	setevent EVENT_SECURITY_CAMERA_3
 	end
 
@@ -161,7 +161,7 @@ SecurityCamera3b:
 	spriteface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
@@ -170,7 +170,7 @@ SecurityCamera3b:
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement7
 	scall TrainerCameraGrunt2
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	setevent EVENT_SECURITY_CAMERA_3
 	end
 
@@ -187,7 +187,7 @@ SecurityCamera4:
 	spriteface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
@@ -196,7 +196,7 @@ SecurityCamera4:
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement8
 	scall TrainerCameraGrunt2
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	setevent EVENT_SECURITY_CAMERA_4
 	end
 
@@ -213,7 +213,7 @@ SecurityCamera5:
 	spriteface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
@@ -222,7 +222,7 @@ SecurityCamera5:
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement9
 	scall TrainerCameraGrunt2
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	setevent EVENT_SECURITY_CAMERA_5
 	end
 
@@ -482,7 +482,7 @@ TrainerScientistJed:
 	trainer SCIENTIST, JED, EVENT_BEAT_SCIENTIST_JED, ScientistJedSeenText, ScientistJedBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext ScientistJedAfterBattleText
 	waitbutton
@@ -493,7 +493,7 @@ TrainerGruntM16:
 	trainer GRUNTM, GRUNTM_16, EVENT_BEAT_ROCKET_GRUNTM_16, GruntM16SeenText, GruntM16BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM16AfterBattleText
 	waitbutton
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 1b3d536f6..8c673b755 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -176,7 +176,7 @@ LanceHealsCommon:
 	setscene SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS
 	setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE
 	checkcode VAR_FACING
-	if_equal RIGHT, .FacingRight
+	ifequal RIGHT, .FacingRight
 	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d212
 	disappear TEAMROCKETBASEB2F_LANCE
 	end
@@ -190,7 +190,7 @@ TrainerGruntM17:
 	trainer GRUNTM, GRUNTM_17, EVENT_BEAT_ROCKET_GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM17AfterBattleText
 	waitbutton
@@ -201,7 +201,7 @@ TrainerGruntM18:
 	trainer GRUNTM, GRUNTM_18, EVENT_BEAT_ROCKET_GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM18AfterBattleText
 	waitbutton
@@ -212,7 +212,7 @@ TrainerGruntM19:
 	trainer GRUNTM, GRUNTM_19, EVENT_BEAT_ROCKET_GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM19AfterBattleText
 	waitbutton
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index 86b42908a..2ac2c8cf6 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -129,7 +129,7 @@ SlowpokeTailGrunt:
 	trainer GRUNTF, GRUNTF_5, EVENT_BEAT_ROCKET_GRUNTF_5, GruntF5SeenText, GruntF5BeatenText, 0, GruntF5Script
 
 GruntF5Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntF5AfterBattleText
 	waitbutton
@@ -141,7 +141,7 @@ RaticateTailGrunt:
 	trainer GRUNTM, GRUNTM_28, EVENT_BEAT_ROCKET_GRUNTM_28, GruntM28SeenText, GruntM28BeatenText, 0, GruntM28Script
 
 GruntM28Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM28AfterBattleText
 	waitbutton
@@ -153,7 +153,7 @@ TrainerScientistRoss:
 	trainer SCIENTIST, ROSS, EVENT_BEAT_SCIENTIST_ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext ScientistRossAfterBattleText
 	waitbutton
@@ -164,7 +164,7 @@ TrainerScientistMitch:
 	trainer SCIENTIST, MITCH, EVENT_BEAT_SCIENTIST_MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext ScientistMitchAfterBattleText
 	waitbutton
diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm
index cafc30144..bd11dd551 100644
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -18,7 +18,7 @@ TrainerPokemaniacLarry:
 	trainer POKEMANIAC, LARRY, EVENT_BEAT_POKEMANIAC_LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacLarryAfterBattleText
 	waitbutton
@@ -29,7 +29,7 @@ TrainerHikerRussell:
 	trainer HIKER, RUSSELL, EVENT_BEAT_HIKER_RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerRussellAfterBattleText
 	waitbutton
@@ -40,7 +40,7 @@ TrainerHikerDaniel:
 	trainer HIKER, DANIEL, EVENT_BEAT_HIKER_DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerDanielAfterBattleText
 	waitbutton
@@ -51,7 +51,7 @@ TrainerFirebreatherBill:
 	trainer FIREBREATHER, BILL, EVENT_BEAT_FIREBREATHER_BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FirebreatherBillAfterBattleText
 	waitbutton
@@ -62,7 +62,7 @@ TrainerFirebreatherRay:
 	trainer FIREBREATHER, RAY, EVENT_BEAT_FIREBREATHER_RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FirebreatherRayAfterBattleText
 	waitbutton
diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm
index 2a737c315..10ed31e30 100644
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -16,7 +16,7 @@ TrainerPokemaniacAndrew:
 	trainer POKEMANIAC, ANDREW, EVENT_BEAT_POKEMANIAC_ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacAndrewAfterBattleText
 	waitbutton
@@ -27,7 +27,7 @@ TrainerPokemaniacCalvin:
 	trainer POKEMANIAC, CALVIN, EVENT_BEAT_POKEMANIAC_CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacCalvinAfterBattleText
 	waitbutton
@@ -38,7 +38,7 @@ TrainerHikerPhillip:
 	trainer HIKER, PHILLIP, EVENT_BEAT_HIKER_PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerPhillipAfterBattleText
 	waitbutton
@@ -49,7 +49,7 @@ TrainerHikerLeonard:
 	trainer HIKER, LEONARD, EVENT_BEAT_HIKER_LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerLeonardAfterBattleText
 	waitbutton
diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm
index 1aee3f499..2c3b63973 100644
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -16,7 +16,7 @@ UnionCaveB2F_MapScripts:
 	checkflag ENGINE_UNION_CAVE_LAPRAS
 	iftrue .NoAppear
 	checkcode VAR_WEEKDAY
-	if_equal FRIDAY, .Appear
+	ifequal FRIDAY, .Appear
 .NoAppear:
 	disappear UNIONCAVEB2F_LAPRAS
 	return
@@ -39,7 +39,7 @@ TrainerCooltrainermNick:
 	trainer COOLTRAINERM, NICK, EVENT_BEAT_COOLTRAINERM_NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermNickAfterBattleText
 	waitbutton
@@ -50,7 +50,7 @@ TrainerCooltrainerfGwen:
 	trainer COOLTRAINERF, GWEN, EVENT_BEAT_COOLTRAINERF_GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfGwenAfterBattleText
 	waitbutton
@@ -61,7 +61,7 @@ TrainerCooltrainerfEmma:
 	trainer COOLTRAINERF, EMMA, EVENT_BEAT_COOLTRAINERF_EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfEmmaAfterBattleText
 	waitbutton
diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm
index 781bf2ad1..ecbbf2f1e 100644
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -66,9 +66,9 @@ VermilionGymBadgeGuy:
 	checkevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY
 	iftrue .AlreadyGotItem
 	checkcode VAR_BADGES
-	if_equal NUM_BADGES, .AllBadges
-	if_greater_than 13, .MostBadges
-	if_greater_than 9, .SomeBadges
+	ifequal NUM_BADGES, .AllBadges
+	ifgreater 13, .MostBadges
+	ifgreater 9, .SomeBadges
 	writetext UnknownText_0x1aabc8
 	waitbutton
 	closetext
diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm
index 0dc1dace3..42622e2a8 100644
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -46,7 +46,7 @@ TrainerGentlemanGregory:
 	trainer GENTLEMAN, GREGORY, EVENT_BEAT_GENTLEMAN_GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GentlemanGregoryAfterBattleText
 	waitbutton
@@ -57,7 +57,7 @@ TrainerGuitaristVincent:
 	trainer GUITARIST, VINCENT, EVENT_BEAT_GUITARIST_VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GuitaristVincentAfterBattleText
 	waitbutton
@@ -68,7 +68,7 @@ TrainerJugglerHorton:
 	trainer JUGGLER, HORTON, EVENT_BEAT_JUGGLER_HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext JugglerHortonAfterBattleText
 	waitbutton
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index 47a266a46..550608746 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -85,11 +85,11 @@ UnknownScript_0x74e20:
 	spriteface PLAYER, LEFT
 	opentext
 	checkcode VAR_WEEKDAY
-	if_equal MONDAY, UnknownScript_0x74e72
-	if_equal TUESDAY, UnknownScript_0x74e72
-	if_equal THURSDAY, UnknownScript_0x74e7c
-	if_equal FRIDAY, UnknownScript_0x74e7c
-	if_equal SATURDAY, UnknownScript_0x74e7c
+	ifequal MONDAY, UnknownScript_0x74e72
+	ifequal TUESDAY, UnknownScript_0x74e72
+	ifequal THURSDAY, UnknownScript_0x74e7c
+	ifequal FRIDAY, UnknownScript_0x74e7c
+	ifequal SATURDAY, UnknownScript_0x74e7c
 	writetext UnknownText_0x74f4d
 	yesorno
 	iffalse UnknownScript_0x74e8d
@@ -147,11 +147,11 @@ SailorScript_0x74e97:
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	iftrue UnknownScript_0x74e1a
 	checkcode VAR_WEEKDAY
-	if_equal MONDAY, .NextShipWednesday
-	if_equal TUESDAY, .NextShipWednesday
-	if_equal THURSDAY, .NextShipSunday
-	if_equal FRIDAY, .NextShipSunday
-	if_equal SATURDAY, .NextShipSunday
+	ifequal MONDAY, .NextShipWednesday
+	ifequal TUESDAY, .NextShipWednesday
+	ifequal THURSDAY, .NextShipSunday
+	ifequal FRIDAY, .NextShipSunday
+	ifequal SATURDAY, .NextShipSunday
 	writetext UnknownText_0x74f4d
 	yesorno
 	iffalse UnknownScript_0x74e87
diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm
index 9f5c72ef5..4d2caa9e2 100644
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -27,7 +27,7 @@ VictoryRoadGateBadgeCheckScript:
 	writetext VictoryRoadGateOfficerText
 	buttonsound
 	checkcode VAR_BADGES
-	if_greater_than NUM_JOHTO_BADGES - 1, .AllEightBadges
+	ifgreater NUM_JOHTO_BADGES - 1, .AllEightBadges
 	writetext VictoryRoadGateNotEnoughBadgesText
 	waitbutton
 	closetext
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
index 174ff61a3..1e32e338a 100644
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -54,8 +54,8 @@ FalknerScript_0x683c2:
 	end
 
 VioletGymActivateRockets:
-	if_equal 7, .RadioTowerRockets
-	if_equal 6, .GoldenrodRockets
+	ifequal 7, .RadioTowerRockets
+	ifequal 6, .GoldenrodRockets
 	end
 
 .GoldenrodRockets:
@@ -68,7 +68,7 @@ TrainerBirdKeeperRod:
 	trainer BIRD_KEEPER, ROD, EVENT_BEAT_BIRD_KEEPER_ROD, BirdKeeperRodSeenText, BirdKeeperRodBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperRodAfterBattleText
 	waitbutton
@@ -79,7 +79,7 @@ TrainerBirdKeeperAbe:
 	trainer BIRD_KEEPER, ABE, EVENT_BEAT_BIRD_KEEPER_ABE, BirdKeeperAbeSeenText, BirdKeeperAbeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperAbeAfterBattleText
 	waitbutton
diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm
index 3452c3a7d..ecec3c2d6 100644
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -23,7 +23,7 @@ VioletPokecenter1F_ElmsAideScript:
 	yesorno
 	iffalse .RefusedEgg
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, .PartyFull
+	ifequal PARTY_LENGTH, .PartyFull
 	giveegg TOGEPI, 5
 	stringtotext .eggname, MEM_BUFFER_1
 	scall .AideGivesEgg
@@ -35,7 +35,7 @@ VioletPokecenter1F_ElmsAideScript:
 	waitbutton
 	closetext
 	checkcode VAR_FACING
-	if_equal UP, .AideWalksAroundPlayer
+	ifequal UP, .AideWalksAroundPlayer
 	spriteface PLAYER, DOWN
 	applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksStraightOutOfPokecenter
 	playsound SFX_EXIT_BUILDING

From 2a53d758079e461e5cd45c2d9a81f9b70b603815 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Fri, 2 Feb 2018 21:15:15 -0500
Subject: [PATCH 096/135] Similar formatting for similar WRAM areas

---
 home/text.asm  |  2 +-
 macros/rst.asm |  4 ----
 wram.asm       | 14 +++++++-------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/home/text.asm b/home/text.asm
index ef8832857..62df59717 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -568,7 +568,7 @@ ContText:: ; 1345
 
 
 PlaceDexEnd:: ; 1356
-; Legacy: ends a Pokédex entry (Red).
+; Ends a Pokédex entry in Gen 1.
 ; Dex entries are now regular strings.
 	ld [hl], "."
 	pop hl
diff --git a/macros/rst.asm b/macros/rst.asm
index 58f54d5e8..00505e123 100644
--- a/macros/rst.asm
+++ b/macros/rst.asm
@@ -14,10 +14,6 @@ callfar: MACRO ; address, bank
 	rst FarCall
 ENDM
 
-; legacy support for pre-2018 pokecrystal
-callba EQUS "farcall"
-callab EQUS "callfar"
-
 homecall: MACRO
 	ld a, [hROMBank]
 	push af
diff --git a/wram.asm b/wram.asm
index 8e249f908..e430fe7a5 100644
--- a/wram.asm
+++ b/wram.asm
@@ -940,9 +940,9 @@ wLinkDataEnd::
 NEXTU ; c800
 ; link data members
 wLinkPlayerName:: ds NAME_LENGTH
-wLinkPartyCount:: db
+wLinkPartyCount::   db
 wLinkPartySpecies:: ds PARTY_LENGTH
-wLinkPartySpeciesEnd:: db ; legacy scripts don't check PartyCount
+wLinkPartyEnd::     db ; Gen 1 scripts don't check PartyCount
 
 UNION ; c813
 ; time capsule party data
@@ -2198,11 +2198,11 @@ NEXTU ; d26b
 OTPlayerName:: ds NAME_LENGTH ; d26b
 ENDU ; d276
 
-OTPlayerID:: ds 2 ; d276
+OTPlayerID:: dw ; d276
 	ds 8
-OTPartyCount::   ds 1 ; d280
+OTPartyCount::   db ; d280
 OTPartySpecies:: ds PARTY_LENGTH ; d281
-OTPartyEnd::     ds 1 ; legacy scripts don't check PartyCount
+OTPartyEnd::     db ; Gen 1 scripts don't check PartyCount
 
 UNION ; d288
 ; ot party mons
@@ -2767,9 +2767,9 @@ SECTION "Party", WRAMX
 
 wPokemonData::
 
-PartyCount:: db ; dcd7 ; number of Pokémon in party
+PartyCount::   db ; dcd7 ; number of Pokémon in party
 PartySpecies:: ds PARTY_LENGTH ; dcd8 ; species of each Pokémon in party
-PartyEnd:: db ; dcde ; legacy scripts don't check PartyCount
+PartyEnd::     db ; dcde ; Gen 1 scripts don't check PartyCount
 
 PartyMons::
 PartyMon1:: party_struct PartyMon1 ; dcdf

From aa8db1632c8826ead8c8d246c8be265839374f7b Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Fri, 2 Feb 2018 21:20:13 -0500
Subject: [PATCH 097/135] Remove checkmorn/checkday/checknite macros

---
 docs/event_commands.md           |  4 ---
 engine/events/std_scripts.asm    |  6 ++--
 engine/phone/buenas_password.asm |  8 ++---
 engine/phone/generic_calls.asm   | 16 +++++-----
 engine/phone/phone_gossip.asm    |  4 +--
 engine/phone/phone_scripts.asm   | 52 ++++++++++++++++----------------
 macros/scripts/events.asm        |  4 ---
 maps/CeladonMansionRoofHouse.asm |  2 +-
 maps/GoldenrodUnderground.asm    |  4 +--
 maps/MountMoonSquare.asm         |  2 +-
 maps/PlayersHouse1F.asm          |  6 ++--
 maps/Route29.asm                 |  4 +--
 maps/Route34.asm                 |  2 +-
 maps/Route35.asm                 |  2 +-
 maps/Route39.asm                 |  2 +-
 maps/Route45.asm                 |  4 +--
 16 files changed, 57 insertions(+), 65 deletions(-)

diff --git a/docs/event_commands.md b/docs/event_commands.md
index 5a0422474..d1781752f 100644
--- a/docs/event_commands.md
+++ b/docs/event_commands.md
@@ -93,10 +93,6 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
 
 ## `$2B`: checktime time
 
-- **`checkmorn`:** `checktime MORN`
-- **`checkday`:** `checktime DAY`
-- **`checknite`:** `checktime NITE`
-
 ## `$2C`: checkpoke mon_id
 
 ## `$2D`: givepoke mon_id, level[, item=0[, trainer=0, ot_name, nickname]]
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
index f075aced4..d075b5a6b 100644
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -57,11 +57,11 @@ PokecenterNurseScript:
 ; EVENT_WELCOMED_TO_POKECOM_CENTER is never set
 
 	opentext
-	checkmorn
+	checktime MORN
 	iftrue .morn
-	checkday
+	checktime DAY
 	iftrue .day
-	checknite
+	checktime NITE
 	iftrue .nite
 	jump .ok
 
diff --git a/engine/phone/buenas_password.asm b/engine/phone/buenas_password.asm
index 38fee974c..82a696648 100644
--- a/engine/phone/buenas_password.asm
+++ b/engine/phone/buenas_password.asm
@@ -13,9 +13,9 @@ BuenaPhoneScript2:
 	jump BuenaPhoneScript_Random2
 
 BuenaPhoneScript_CheckTimeOfDay1:
-	checkmorn
+	checktime MORN
 	iftrue .morn
-	checkday
+	checktime DAY
 	iftrue .day
 	writetext UnknownText_0xa0d42
 	buttonsound
@@ -38,9 +38,9 @@ BuenaPhoneScript_AfterMidnight1:
 BuenaPhoneScript_CheckTimeOfDay2:
 	checkcode VAR_HOUR
 	ifgreater 17, BuenaPhoneScript_AfterMidnight2
-	checkmorn
+	checktime MORN
 	iftrue .morn
-	checkday
+	checktime DAY
 	iftrue .day
 	writetext UnknownText_0xa0e29
 	buttonsound
diff --git a/engine/phone/generic_calls.asm b/engine/phone/generic_calls.asm
index 2c036de24..b3b3eb56a 100644
--- a/engine/phone/generic_calls.asm
+++ b/engine/phone/generic_calls.asm
@@ -19,9 +19,9 @@ PhoneScript_Random11:
 	end
 
 PhoneScript_AnswerPhone_Male:
-	checkday
+	checktime DAY
 	iftrue PhoneScript_AnswerPhone_Male_Day
-	checknite
+	checktime NITE
 	iftrue PhoneScript_AnswerPhone_Male_Nite
 	checkcode VAR_CALLERID
 	ifequal PHONE_SCHOOLBOY_JACK, .Jack
@@ -392,9 +392,9 @@ PhoneScript_AnswerPhone_Male_Nite:
 	end
 
 PhoneScript_AnswerPhone_Female:
-	checkday
+	checktime DAY
 	iftrue PhoneScript_AnswerPhone_Female_Day
-	checknite
+	checktime NITE
 	iftrue PhoneScript_AnswerPhone_Female_Nite
 	checkcode VAR_CALLERID
 	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
@@ -549,9 +549,9 @@ PhoneScript_AnswerPhone_Female_Nite:
 	end
 
 PhoneScript_GreetPhone_Male:
-	checkday
+	checktime DAY
 	iftrue PhoneScript_GreetPhone_Male_Day
-	checknite
+	checktime NITE
 	iftrue PhoneScript_GreetPhone_Male_Nite
 	checkcode VAR_CALLERID
 	ifequal PHONE_SCHOOLBOY_JACK, .Jack
@@ -922,9 +922,9 @@ PhoneScript_GreetPhone_Male_Nite:
 	end
 
 PhoneScript_GreetPhone_Female:
-	checkday
+	checktime DAY
 	iftrue PhoneScript_GreetPhone_Female_Day
-	checknite
+	checktime NITE
 	iftrue PhoneScript_GreetPhone_Female_Nite
 	checkcode VAR_CALLERID
 	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
diff --git a/engine/phone/phone_gossip.asm b/engine/phone/phone_gossip.asm
index a17b49933..9a37c72cf 100644
--- a/engine/phone/phone_gossip.asm
+++ b/engine/phone/phone_gossip.asm
@@ -510,9 +510,9 @@ KenjiAnswerPhoneScript:
 	jump PhoneScript_HangupText_Male
 
 .OnBreak:
-	checkmorn
+	checktime MORN
 	iftrue .Morning
-	checknite
+	checktime NITE
 	iftrue .Night
 	setevent EVENT_KENJI_ON_BREAK
 	farwritetext KenjiBreakText
diff --git a/engine/phone/phone_scripts.asm b/engine/phone/phone_scripts.asm
index 0bf3dda4f..87bc227b3 100644
--- a/engine/phone/phone_scripts.asm
+++ b/engine/phone/phone_scripts.asm
@@ -150,9 +150,9 @@ MomPhoneLectureScript: ; 0xbcfb1
 ; Bill
 
 BillPhoneScript1: ; 0xbcfc5
-	checkday
+	checktime DAY
 	iftrue .daygreet
-	checknite
+	checktime NITE
 	iftrue .nitegreet
 	farwritetext BillPhoneMornGreetingText
 	buttonsound
@@ -307,7 +307,7 @@ JackPhoneScript1:
 	iftrue .NotMonday
 	checkcode VAR_WEEKDAY
 	ifnotequal MONDAY, .NotMonday
-	checkmorn
+	checktime MORN
 	iftrue JackMondayMorning
 
 .NotMonday:
@@ -388,7 +388,7 @@ HueyPhoneScript1:
 	iftrue .NotWednesday
 	checkcode VAR_WEEKDAY
 	ifnotequal WEDNESDAY, .NotWednesday
-	checknite
+	checktime NITE
 	iftrue HueyWednesdayNight
 
 .NotWednesday:
@@ -432,7 +432,7 @@ GavenPhoneScript1:
 	iftrue .NotThursday
 	checkcode VAR_WEEKDAY
 	ifnotequal THURSDAY, .NotThursday
-	checkmorn
+	checktime MORN
 	iftrue GavenThursdayMorning
 
 .NotThursday:
@@ -479,7 +479,7 @@ BethPhoneScript1:
 	iftrue .NotFriday
 	checkcode VAR_WEEKDAY
 	ifnotequal FRIDAY, .NotFriday
-	checkday
+	checktime DAY
 	iftrue BethFridayAfternoon
 
 .NotFriday:
@@ -523,7 +523,7 @@ JosePhoneScript1:
 	iftrue .HasItem
 	checkcode VAR_WEEKDAY
 	ifnotequal SATURDAY, .NotSaturday
-	checknite
+	checktime NITE
 	iftrue JoseSaturdayNight
 
 .NotSaturday:
@@ -583,7 +583,7 @@ ReenaPhoneScript1:
 	iftrue .NotSunday
 	checkcode VAR_WEEKDAY
 	ifnotequal SUNDAY, .NotSunday
-	checkmorn
+	checktime MORN
 	iftrue ReenaSundayMorning
 
 .NotSunday:
@@ -625,7 +625,7 @@ JoeyPhoneScript1:
 	iftrue .NotMonday
 	checkcode VAR_WEEKDAY
 	ifnotequal MONDAY, .NotMonday
-	checkday
+	checktime DAY
 	iftrue JoeyMondayAfternoon
 
 .NotMonday:
@@ -671,7 +671,7 @@ WadePhoneScript1:
 	iftrue WadeHasItem
 	checkcode VAR_WEEKDAY
 	ifnotequal TUESDAY, .NotTuesday
-	checknite
+	checktime NITE
 	iftrue WadeTuesdayNight
 
 .NotTuesday:
@@ -785,7 +785,7 @@ RalphPhoneScript1:
 	iftrue Ralph_CheckSwarm
 	checkcode VAR_WEEKDAY
 	ifnotequal WEDNESDAY, Ralph_CheckSwarm
-	checkmorn
+	checktime MORN
 	iftrue Ralph_WednesdayMorning
 Ralph_CheckSwarm:
 	checkflag ENGINE_FISH_SWARM
@@ -847,7 +847,7 @@ LizPhoneScript1:
 	iftrue .NotThursday
 	checkcode VAR_WEEKDAY
 	ifnotequal THURSDAY, .NotThursday
-	checkday
+	checktime DAY
 	iftrue LizThursdayAfternoon
 
 .NotThursday:
@@ -952,7 +952,7 @@ AnthonyPhoneScript1:
 	iftrue .NotFriday
 	checkcode VAR_WEEKDAY
 	ifnotequal FRIDAY, .NotFriday
-	checknite
+	checktime NITE
 	iftrue AnthonyFridayNight
 
 .NotFriday:
@@ -1016,7 +1016,7 @@ ToddPhoneScript1:
 	iftrue .NotSaturday
 	checkcode VAR_WEEKDAY
 	ifnotequal SATURDAY, .NotSaturday
-	checkmorn
+	checktime MORN
 	iftrue ToddSaturdayMorning
 
 .NotSaturday:
@@ -1080,7 +1080,7 @@ GinaPhoneScript1:
 	iftrue .HasLeafStone
 	checkcode VAR_WEEKDAY
 	ifnotequal SUNDAY, .NotSunday
-	checkday
+	checktime DAY
 	iftrue GinaSundayDay
 
 .NotSunday:
@@ -1175,7 +1175,7 @@ ArniePhoneScript1:
 	iftrue .NotTuesday
 	checkcode VAR_WEEKDAY
 	ifnotequal TUESDAY, .NotTuesday
-	checkmorn
+	checktime MORN
 	iftrue ArnieTuesdayMorning
 
 .NotTuesday:
@@ -1244,7 +1244,7 @@ AlanPhoneScript1:
 	iftrue .FireStone
 	checkcode VAR_WEEKDAY
 	ifnotequal WEDNESDAY, .NotWednesday
-	checkday
+	checktime DAY
 	iftrue AlanWednesdayDay
 
 .NotWednesday:
@@ -1307,7 +1307,7 @@ DanaPhoneScript1:
 	iftrue .HasThunderstone
 	checkcode VAR_WEEKDAY
 	ifnotequal THURSDAY, .NotThursday
-	checknite
+	checktime NITE
 	iftrue DanaThursdayNight
 
 .NotThursday:
@@ -1373,7 +1373,7 @@ ChadPhoneScript1:
 	iftrue .NotFriday
 	checkcode VAR_WEEKDAY
 	ifnotequal FRIDAY, .NotFriday
-	checkmorn
+	checktime MORN
 	iftrue ChadFridayMorning
 
 .NotFriday:
@@ -1474,7 +1474,7 @@ TullyPhoneScript1:
 	iftrue TullyHasWaterStone
 	checkcode VAR_WEEKDAY
 	ifnotequal SUNDAY, .NotSunday
-	checknite
+	checktime NITE
 	iftrue TullySundayNight
 
 .NotSunday:
@@ -1533,7 +1533,7 @@ BrentPhoneScript1:
 	iftrue .NotMonday
 	checkcode VAR_WEEKDAY
 	ifnotequal MONDAY, .NotMonday
-	checkmorn
+	checktime MORN
 	iftrue BrentMondayMorning
 
 .NotMonday:
@@ -1580,7 +1580,7 @@ TiffanyPhoneScript1:
 	iftrue .HasItem
 	checkcode VAR_WEEKDAY
 	ifnotequal TUESDAY, .NotTuesday
-	checkday
+	checktime DAY
 	iftrue TiffanyTuesdayAfternoon
 
 .NotTuesday:
@@ -1679,7 +1679,7 @@ VancePhoneScript1:
 	iftrue .NotWednesday
 	checkcode VAR_WEEKDAY
 	ifnotequal WEDNESDAY, .NotWednesday
-	checknite
+	checktime NITE
 	iftrue VanceWednesdayNight
 
 .NotWednesday:
@@ -1722,7 +1722,7 @@ WiltonPhoneScript1:
 	iftrue .HasItem
 	checkcode VAR_WEEKDAY
 	ifnotequal THURSDAY, .NotThursday
-	checkmorn
+	checktime MORN
 	iftrue WiltonThursdayMorning
 
 .NotThursday:
@@ -1810,7 +1810,7 @@ ParryPhoneScript1:
 	iftrue .WantsRematch
 	checkcode VAR_WEEKDAY
 	ifnotequal FRIDAY, .WantsRematch
-	checkday
+	checktime DAY
 	iftrue ParryFridayDay
 
 .WantsRematch:
@@ -1853,7 +1853,7 @@ ErinPhoneScript1:
 	iftrue .NotSaturday
 	checkcode VAR_WEEKDAY
 	ifnotequal SATURDAY, .NotSaturday
-	checknite
+	checktime NITE
 	iftrue ErinSaturdayNight
 
 .NotSaturday:
diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm
index 7cf0ac032..c9ab40676 100644
--- a/macros/scripts/events.asm
+++ b/macros/scripts/events.asm
@@ -283,10 +283,6 @@ checktime: MACRO
 	db \1 ; time
 ENDM
 
-checkmorn EQUS "checktime MORN"
-checkday  EQUS "checktime DAY"
-checknite EQUS "checktime NITE"
-
 	enum checkpoke_command ; $2c
 checkpoke: MACRO
 	db checkpoke_command
diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm
index 3a8bce8d8..61157e619 100644
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -13,7 +13,7 @@ PharmacistScript_0x71afd:
 	iftrue UnknownScript_0x71b21
 	writetext UnknownText_0x71b27
 	buttonsound
-	checknite
+	checktime NITE
 	iftrue UnknownScript_0x71b14
 	writetext UnknownText_0x71b4a
 	waitbutton
diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm
index f67282ae0..017d7b23a 100644
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -64,7 +64,7 @@ GoldenrodUnderground_MapScripts:
 
 .Monday:
 	disappear GOLDENRODUNDERGROUND_GRAMPS
-	checkmorn
+	checktime MORN
 	iffalse .NotMondayMorning
 	appear GOLDENRODUNDERGROUND_GRAMPS
 .NotMondayMorning:
@@ -173,7 +173,7 @@ GrampsScript_0x7c146:
 	jump GoldenrodUndergroundScript_ShopClosed
 
 .CheckMorn:
-	checkmorn
+	checktime MORN
 	iffalse GoldenrodUndergroundScript_ShopClosed
 	pokemart MARTTYPE_BARGAIN, 0
 	closetext
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index 6ecc722a7..e8c82c961 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -27,7 +27,7 @@ ClefairyDance:
 	iftrue .NoDancing
 	checkcode VAR_WEEKDAY
 	ifnotequal MONDAY, .NoDancing
-	checknite
+	checktime NITE
 	iffalse .NoDancing
 	appear MOUNTMOONSQUARE_FAIRY1
 	appear MOUNTMOONSQUARE_FAIRY2
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index ad4f5c39d..163bed162 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -153,11 +153,11 @@ UnknownScript_0x7a5b8:
 NeighborScript:
 	faceplayer
 	opentext
-	checkmorn
+	checktime MORN
 	iftrue .MornScript
-	checkday
+	checktime DAY
 	iftrue .DayScript
-	checknite
+	checktime NITE
 	iftrue .NiteScript
 
 .MornScript:
diff --git a/maps/Route29.asm b/maps/Route29.asm
index 9541e6f85..e3ef95169 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -148,9 +148,9 @@ Route29FisherScript:
 CooltrainerMScript_0x1a1031:
 	faceplayer
 	opentext
-	checkday
+	checktime DAY
 	iftrue .day_morn
-	checknite
+	checktime NITE
 	iftrue .nite
 .day_morn
 	writetext Text_WaitingForNight
diff --git a/maps/Route34.asm b/maps/Route34.asm
index 82cb27cd4..33ac3ceed 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -351,7 +351,7 @@ TrainerPicnickerGina1:
 OfficerKeithScript:
 	faceplayer
 	opentext
-	checknite
+	checktime NITE
 	iffalse .NoFight
 	checkevent EVENT_BEAT_OFFICER_KEITH
 	iftrue .AfterScript
diff --git a/maps/Route35.asm b/maps/Route35.asm
index d79be43e9..0b471f25f 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -237,7 +237,7 @@ TrainerFirebreatherWalt:
 TrainerOfficerDirk:
 	faceplayer
 	opentext
-	checknite
+	checktime NITE
 	iffalse .NotNight
 	checkevent EVENT_BEAT_OFFICER_DIRK
 	iftrue .AfterBattle
diff --git a/maps/Route39.asm b/maps/Route39.asm
index 31ac512d2..2321a7fb1 100644
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -138,7 +138,7 @@ TrainerPsychicNorman:
 TrainerPokefanfJaime:
 	faceplayer
 	opentext
-	checknite
+	checktime NITE
 	iffalse .NotNight
 	checkevent EVENT_BEAT_POKEFANF_JAIME
 	iftrue .Beaten
diff --git a/maps/Route45.asm b/maps/Route45.asm
index 9a3c873c2..73e392ea2 100644
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -49,9 +49,9 @@ TrainerBlackbeltKenji:
 .Registered:
 	checkcode VAR_KENJI_BREAK
 	ifnotequal 1, Route45NumberAcceptedM
-	checkmorn
+	checktime MORN
 	iftrue .Morning
-	checknite
+	checktime NITE
 	iftrue .Night
 	checkevent EVENT_KENJI_ON_BREAK
 	iffalse Route45NumberAcceptedM

From c834bdadf2f3e38d684f798dfa67d7cd751a6a65 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Fri, 2 Feb 2018 21:50:43 -0500
Subject: [PATCH 098/135] =?UTF-8?q?spriteface=20=E2=86=92=20objectface,=20?=
 =?UTF-8?q?consistent=20with=20the=20other=20script=20commands?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/event_commands.md                        |  2 +-
 engine/events/std_scripts.asm                 |  8 ++---
 engine/scripting.asm                          |  4 +--
 macros/scripts/events.asm                     |  6 ++--
 maps/AzaleaTown.asm                           | 16 ++++-----
 maps/BattleTower1F.asm                        |  6 ++--
 maps/BurnedTower1F.asm                        |  4 +--
 maps/BurnedTowerB1F.asm                       | 18 +++++-----
 maps/CeladonCafe.asm                          | 12 +++----
 maps/CeladonDeptStore3F.asm                   |  4 +--
 maps/CeladonGameCorner.asm                    | 14 ++++----
 maps/CeruleanCity.asm                         |  4 +--
 maps/CeruleanGym.asm                          |  2 +-
 maps/CherrygroveCity.asm                      | 20 +++++------
 maps/CianwoodCity.asm                         |  4 +--
 maps/CianwoodGym.asm                          |  2 +-
 maps/DragonShrine.asm                         | 18 +++++-----
 maps/DragonsDenB1F.asm                        |  2 +-
 maps/EarlsPokemonAcademy.asm                  |  4 +--
 maps/EcruteakPokecenter1F.asm                 | 12 +++----
 maps/ElmsLab.asm                              | 34 +++++++++----------
 maps/FastShip1F.asm                           |  2 +-
 maps/FastShipCabins_SE_SSE_CaptainsCabin.asm  | 12 +++----
 maps/GoldenrodCity.asm                        |  2 +-
 maps/GoldenrodDeptStore4F.asm                 |  2 +-
 maps/GoldenrodDeptStoreRoof.asm               |  6 ++--
 maps/GoldenrodFlowerShop.asm                  |  2 +-
 maps/GoldenrodGameCorner.asm                  | 12 +++----
 maps/GoldenrodGym.asm                         |  2 +-
 maps/GoldenrodPokecenter1F.asm                |  4 +--
 ...oldenrodUndergroundSwitchRoomEntrances.asm |  8 ++---
 maps/HallOfFame.asm                           |  4 +--
 maps/IlexForest.asm                           |  2 +-
 maps/IndigoPlateauPokecenter1F.asm            | 10 +++---
 maps/KurtsHouse.asm                           | 18 +++++-----
 maps/LancesRoom.asm                           | 18 +++++-----
 maps/MahoganyMart1F.asm                       |  2 +-
 maps/MahoganyTown.asm                         |  2 +-
 maps/MountMoon.asm                            |  2 +-
 maps/MountMoonSquare.asm                      |  6 ++--
 maps/MrPokemonsHouse.asm                      | 14 ++++----
 maps/NationalPark.asm                         |  2 +-
 maps/NewBarkTown.asm                          | 14 ++++----
 maps/OlivineCity.asm                          |  8 ++---
 maps/OlivineLighthouse6F.asm                  | 16 ++++-----
 maps/OlivinePort.asm                          | 14 ++++----
 maps/PlayersHouse1F.asm                       |  6 ++--
 maps/Pokecenter2F.asm                         |  4 +--
 maps/PowerPlant.asm                           | 10 +++---
 maps/RadioTower2F.asm                         | 32 ++++++++---------
 maps/RadioTower5F.asm                         |  6 ++--
 maps/Route16Gate.asm                          |  2 +-
 maps/Route17Route18Gate.asm                   |  2 +-
 maps/Route25.asm                              | 16 ++++-----
 maps/Route27.asm                              |  6 ++--
 maps/Route29.asm                              | 12 +++----
 maps/Route30.asm                              |  2 +-
 maps/Route32.asm                              | 10 +++---
 maps/Route34IlexForestGate.asm                |  6 ++--
 maps/Route35NationalParkGate.asm              |  2 +-
 maps/Route36.asm                              |  4 +--
 maps/Route36NationalParkGate.asm              |  6 ++--
 maps/Route39Barn.asm                          |  8 ++---
 maps/Route43Gate.asm                          |  4 +--
 maps/RuinsOfAlphKabutoChamber.asm             |  2 +-
 maps/RuinsOfAlphOutside.asm                   | 10 +++---
 maps/RuinsOfAlphResearchCenter.asm            |  2 +-
 maps/SlowpokeWellB1F.asm                      |  2 +-
 maps/SproutTower3F.asm                        |  6 ++--
 maps/TeamRocketBaseB1F.asm                    | 28 +++++++--------
 maps/TeamRocketBaseB2F.asm                    | 26 +++++++-------
 maps/TeamRocketBaseB3F.asm                    | 10 +++---
 maps/TinTower1F.asm                           | 10 +++---
 maps/TrainerHouseB1F.asm                      |  2 +-
 maps/VermilionPort.asm                        |  6 ++--
 maps/VictoryRoad.asm                          |  6 ++--
 maps/VictoryRoadGate.asm                      |  2 +-
 maps/VioletCity.asm                           |  2 +-
 maps/VioletPokecenter1F.asm                   |  4 +--
 maps/WiseTriosRoom.asm                        | 10 +++---
 80 files changed, 323 insertions(+), 323 deletions(-)

diff --git a/docs/event_commands.md b/docs/event_commands.md
index d1781752f..fdf611cbf 100644
--- a/docs/event_commands.md
+++ b/docs/event_commands.md
@@ -241,7 +241,7 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
 
 ## `$75`: showemote emote_id, object_id, length
 
-## `$76`: spriteface object_id, facing
+## `$76`: objectface object_id, facing
 
 ## `$77`: follownotexact object2, object1
 
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
index d075b5a6b..e3dbd92df 100644
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -109,7 +109,7 @@ PokecenterNurseScript:
 	farwritetext NurseTakePokemonText
 	pause 20
 	special StubbedTrainerRankings_Healings
-	spriteface LAST_TALKED, LEFT
+	objectface LAST_TALKED, LEFT
 	pause 10
 	special HealParty
 	playmusic MUSIC_NONE
@@ -117,7 +117,7 @@ PokecenterNurseScript:
 	special HealMachineAnim
 	pause 30
 	special RestartMapMusic
-	spriteface LAST_TALKED, DOWN
+	objectface LAST_TALKED, DOWN
 	pause 10
 
 	checkphonecall ; elm already called about pokerus
@@ -134,9 +134,9 @@ PokecenterNurseScript:
 .done
 	farwritetext NurseGoodbyeText
 
-	spriteface LAST_TALKED, UP
+	objectface LAST_TALKED, UP
 	pause 10
-	spriteface LAST_TALKED, DOWN
+	objectface LAST_TALKED, DOWN
 	pause 10
 
 	waitbutton
diff --git a/engine/scripting.asm b/engine/scripting.asm
index ae6ce75c8..86719ac23 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -185,7 +185,7 @@ endc
 	dw Script_writeobjectxy              ; 73
 	dw Script_loademote                  ; 74
 	dw Script_showemote                  ; 75
-	dw Script_spriteface                 ; 76
+	dw Script_objectface                 ; 76
 	dw Script_follownotexact             ; 77
 	dw Script_earthquake                 ; 78
 	dw Script_changemap                  ; 79
@@ -1052,7 +1052,7 @@ Script_faceobject:
 	call ApplyObjectFacing
 	ret
 
-Script_spriteface:
+Script_objectface:
 ; script command 0x76
 ; parameters: object_id, facing
 
diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm
index c9ab40676..593d5e6ba 100644
--- a/macros/scripts/events.asm
+++ b/macros/scripts/events.asm
@@ -747,9 +747,9 @@ showemote: MACRO
 	db \3 ; time
 ENDM
 
-	enum spriteface_command ; $76
-spriteface: MACRO
-	db spriteface_command
+	enum objectface_command ; $76
+objectface: MACRO
+	db objectface_command
 	db \1 ; object id
 	db \2 ; facing
 ENDM
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index 5bb751a7f..cbfe8b425 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -36,23 +36,23 @@ AzaleaTown_MapScripts:
 
 AzaleaTownRivalBattleScene1:
 	moveobject AZALEATOWN_SILVER, 11, 11
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
 	appear AZALEATOWN_SILVER
 	applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement1
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	jump AzaleaTownRivalBattleScript
 
 AzaleaTownRivalBattleScene2:
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
 	appear AZALEATOWN_SILVER
 	applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement2
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 AzaleaTownRivalBattleScript:
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
@@ -96,7 +96,7 @@ AzaleaTownRivalBattleScript:
 	writetext AzaleaTownRivalAfterText
 	waitbutton
 	closetext
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement
 	playsound SFX_EXIT_BUILDING
 	disappear AZALEATOWN_SILVER
@@ -158,13 +158,13 @@ AzaleaTownCelebiScene:
 	opentext
 	writetext AzaleaTownKurtText1
 	buttonsound
-	spriteface AZALEATOWN_KURT_OUTSIDE, RIGHT
+	objectface AZALEATOWN_KURT_OUTSIDE, RIGHT
 	writetext AzaleaTownKurtText2
 	buttonsound
 	writetext AzaleaTownKurtText3
 	waitbutton
 	verbosegiveitem GS_BALL
-	spriteface AZALEATOWN_KURT_OUTSIDE, LEFT
+	objectface AZALEATOWN_KURT_OUTSIDE, LEFT
 	setflag ENGINE_FOREST_IS_RESTLESS
 	clearevent EVENT_ILEX_FOREST_LASS
 	setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
@@ -177,7 +177,7 @@ AzaleaTownKurtScript:
 	opentext
 	writetext AzaleaTownKurtText3
 	waitbutton
-	spriteface AZALEATOWN_KURT_OUTSIDE, LEFT
+	objectface AZALEATOWN_KURT_OUTSIDE, LEFT
 	closetext
 	end
 
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index be4f3c2ee..ceb4da590 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -176,10 +176,10 @@ UnreferencedScript_0x9e4be:
 	ifequal $a, Script_Menu_ChallengeExplanationCancel
 	ifnotequal $0, Script_MobileError
 	writetext Text_ReceivedAListOfLeadersOnTheHonorRoll
-	spriteface BATTLETOWER1F_RECEPTIONIST, LEFT
+	objectface BATTLETOWER1F_RECEPTIONIST, LEFT
 	writetext Text_PleaseConfirmOnThisMonitor
 	waitbutton
-	spriteface BATTLETOWER1F_RECEPTIONIST, DOWN
+	objectface BATTLETOWER1F_RECEPTIONIST, DOWN
 	closetext
 	end
 
@@ -250,7 +250,7 @@ YoungsterScript_0x9e55d:
 	writetext Text_BattleTowerYoungster
 	waitbutton
 	closetext
-	spriteface BATTLETOWER1F_YOUNGSTER, RIGHT
+	objectface BATTLETOWER1F_YOUNGSTER, RIGHT
 	end
 
 CooltrainerFScript_0x9e568:
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index 9aea9e81f..b0df5c97f 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -36,7 +36,7 @@ BurnedTower1F_MapScripts:
 	return
 
 .MeetEusine:
-	spriteface BURNEDTOWER1F_EUSINE, DOWN
+	objectface BURNEDTOWER1F_EUSINE, DOWN
 	showemote EMOTE_SHOCK, BURNEDTOWER1F_EUSINE, 15
 	applymovement BURNEDTOWER1F_EUSINE, BurnedTower1FEusineMovement
 	opentext
@@ -51,7 +51,7 @@ BurnedTowerRivalBattleScript:
 	showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 15
 	special FadeOutMusic
 	pause 15
-	spriteface BURNEDTOWER1F_SILVER, RIGHT
+	objectface BURNEDTOWER1F_SILVER, RIGHT
 	pause 15
 	applymovement PLAYER, BurnedTowerMovement_PlayerWalksToSilver
 	applymovement BURNEDTOWER1F_SILVER, BurnedTowerMovement_SilverWalksToPlayer
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index be6bdd72e..17c3bc1e3 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -34,48 +34,48 @@ ReleaseTheBeasts:
 	playmusic MUSIC_NONE
 	pause 30
 	appear BURNEDTOWERB1F_RAIKOU1
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	pause 5
 	disappear BURNEDTOWERB1F_RAIKOU2
 	pause 15
 	cry RAIKOU
 	appear BURNEDTOWERB1F_ENTEI1
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	pause 5
 	disappear BURNEDTOWERB1F_ENTEI2
 	pause 15
 	cry ENTEI
 	appear BURNEDTOWERB1F_SUICUNE1
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	pause 5
 	disappear BURNEDTOWERB1F_SUICUNE2
 	pause 15
 	cry SUICUNE
 	pause 15
 	playsound SFX_WARP_FROM
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement BURNEDTOWERB1F_RAIKOU1, BurnedTowerRaikouMovement
 	disappear BURNEDTOWERB1F_RAIKOU1
 	waitsfx
 	playsound SFX_WARP_FROM
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	applymovement BURNEDTOWERB1F_ENTEI1, BurnedTowerEnteiMovement
 	disappear BURNEDTOWERB1F_ENTEI1
 	waitsfx
 	pause 15
 	playsound SFX_WARP_FROM
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement1
 	playsound SFX_WARP_FROM
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement2
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	pause 20
 	cry SUICUNE
 	pause 30
 	playsound SFX_WARP_FROM
 	applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement3
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	disappear BURNEDTOWERB1F_SUICUNE1
 	waitsfx
 	special RestartMapMusic
diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm
index b7a6356dc..62fdbb61e 100644
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -28,7 +28,7 @@ CeladonCafeFisher1:
 	writetext Fisher1Text_Concentration
 	waitbutton
 	closetext
-	spriteface CELADONCAFE_FISHER1, LEFT
+	objectface CELADONCAFE_FISHER1, LEFT
 	end
 
 CeladonCafeFisher2:
@@ -41,7 +41,7 @@ CeladonCafeFisher2:
 	writetext Fisher2Text_Quantity
 	waitbutton
 	closetext
-	spriteface CELADONCAFE_FISHER2, RIGHT
+	objectface CELADONCAFE_FISHER2, RIGHT
 	end
 
 CeladonCafeFisher3:
@@ -54,7 +54,7 @@ CeladonCafeFisher3:
 	writetext Fisher3Text_GoldenrodIsBest
 	waitbutton
 	closetext
-	spriteface CELADONCAFE_FISHER3, RIGHT
+	objectface CELADONCAFE_FISHER3, RIGHT
 	end
 
 CeladonCafeTeacher:
@@ -69,7 +69,7 @@ CeladonCafeTeacher:
 	writetext TeacherText_NoCoinCase
 	waitbutton
 	closetext
-	spriteface CELADONCAFE_TEACHER, LEFT
+	objectface CELADONCAFE_TEACHER, LEFT
 	end
 
 .HasCoinCase:
@@ -77,12 +77,12 @@ CeladonCafeTeacher:
 	writetext TeacherText_KeepEating
 	waitbutton
 	closetext
-	spriteface CELADONCAFE_TEACHER, RIGHT
+	objectface CELADONCAFE_TEACHER, RIGHT
 	opentext
 	writetext TeacherText_MoreChef
 	waitbutton
 	closetext
-	spriteface CELADONCAFE_TEACHER, LEFT
+	objectface CELADONCAFE_TEACHER, LEFT
 	end
 
 EatathonContestPoster:
diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm
index 119bfcf91..eafcc6382 100644
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -26,7 +26,7 @@ CeladonDeptStore3FGameboyKid1Script:
 	writetext CeladonDeptStore3FGameboyKid1Text
 	waitbutton
 	closetext
-	spriteface CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN
+	objectface CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN
 	end
 
 CeladonDeptStore3FGameboyKid2Script:
@@ -35,7 +35,7 @@ CeladonDeptStore3FGameboyKid2Script:
 	writetext CeladonDeptStore3FGameboyKid2Text
 	waitbutton
 	closetext
-	spriteface CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN
+	objectface CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN
 	end
 
 CeladonDeptStore3FSuperNerdScript:
diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm
index 31229d335..5bbcb42ef 100644
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -26,7 +26,7 @@ CeladonGameCornerPokefanMScript:
 	writetext CeladonGameCornerPokefanMText
 	waitbutton
 	closetext
-	spriteface CELADONGAMECORNER_POKEFAN_M, LEFT
+	objectface CELADONGAMECORNER_POKEFAN_M, LEFT
 	end
 
 CeladonGameCornerTeacherScript:
@@ -35,7 +35,7 @@ CeladonGameCornerTeacherScript:
 	writetext CeladonGameCornerTeacherText
 	waitbutton
 	closetext
-	spriteface CELADONGAMECORNER_TEACHER, RIGHT
+	objectface CELADONGAMECORNER_TEACHER, RIGHT
 	end
 
 CeladonGameCornerFishingGuruScript:
@@ -44,7 +44,7 @@ CeladonGameCornerFishingGuruScript:
 	writetext CeladonGameCornerFishingGuruText
 	waitbutton
 	closetext
-	spriteface CELADONGAMECORNER_FISHING_GURU, RIGHT
+	objectface CELADONGAMECORNER_FISHING_GURU, RIGHT
 	end
 
 CeladonGameCornerFisherScript:
@@ -66,7 +66,7 @@ CeladonGameCornerFisherScript:
 	writetext CeladonGameCornerFisherText2
 	waitbutton
 	closetext
-	spriteface LAST_TALKED, LEFT
+	objectface LAST_TALKED, LEFT
 	end
 
 .GiveCoins:
@@ -80,14 +80,14 @@ CeladonGameCornerFisherScript:
 	writetext CeladonGameCornerFisherNoCoinCaseText
 	waitbutton
 	closetext
-	spriteface LAST_TALKED, LEFT
+	objectface LAST_TALKED, LEFT
 	end
 
 .FullCoinCase:
 	writetext CeladonGameCornerFisherFullCoinCaseText
 	waitbutton
 	closetext
-	spriteface LAST_TALKED, LEFT
+	objectface LAST_TALKED, LEFT
 	end
 
 CeladonGymGuyScript:
@@ -99,7 +99,7 @@ CeladonGameCornerGrampsScript:
 	writetext CeladonGameCornerGrampsText
 	waitbutton
 	closetext
-	spriteface CELADONGAMECORNER_GRAMPS, LEFT
+	objectface CELADONGAMECORNER_GRAMPS, LEFT
 	end
 
 CeladonGameCornerPoster1Script:
diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm
index 314d8f56f..34727e077 100644
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -49,7 +49,7 @@ CeruleanCityCooltrainerFScript:
 	writetext CeruleanCityCooltrainerFText1
 	waitbutton
 	closetext
-	spriteface CERULEANCITY_COOLTRAINER_F, LEFT
+	objectface CERULEANCITY_COOLTRAINER_F, LEFT
 	opentext
 	writetext CeruleanCityCooltrainerFText2
 	waitbutton
@@ -113,7 +113,7 @@ CeruleanCityYoungsterScript:
 	playsound SFX_TRANSACTION
 	waitsfx
 	showemote EMOTE_SHOCK, CERULEANCITY_YOUNGSTER, 15
-	spriteface CERULEANCITY_YOUNGSTER, LEFT
+	objectface CERULEANCITY_YOUNGSTER, LEFT
 	opentext
 	writetext CeruleanCityYoungsterText2
 	waitbutton
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index 8c50ce1bf..a7e81fea5 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -52,7 +52,7 @@ CeruleanGym_MapScripts:
 	waitsfx
 	special RestartMapMusic
 	pause 15
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	pause 15
 	end
 
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index 6e2254979..3fc6df5b8 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -42,28 +42,28 @@ CherrygroveCityGuideGent:
 	waitbutton
 	closetext
 	applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement2
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext GuideGentMartText
 	waitbutton
 	closetext
 	applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement3
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext GuideGentRoute30Text
 	waitbutton
 	closetext
 	applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement4
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	opentext
 	writetext GuideGentSeaText
 	waitbutton
 	closetext
 	applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement5
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	pause 60
-	spriteface CHERRYGROVECITY_GRAMPS, LEFT
-	spriteface PLAYER, RIGHT
+	objectface CHERRYGROVECITY_GRAMPS, LEFT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext GuideGentGiftText
 	buttonsound
@@ -77,7 +77,7 @@ CherrygroveCityGuideGent:
 	closetext
 	stopfollow
 	special RestartMapMusic
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement6
 	playsound SFX_ENTER_DOOR
 	disappear CHERRYGROVECITY_GRAMPS
@@ -101,13 +101,13 @@ CherrygroveCityGuideGent:
 CherrygroveSilverSceneSouth:
 	moveobject CHERRYGROVECITY_SILVER, 39, 7
 CherrygroveSilverSceneNorth:
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
 	appear CHERRYGROVECITY_SILVER
 	applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalWalksToYou
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
 	writetext UnknownText_0x19c4e2
@@ -166,7 +166,7 @@ CherrygroveSilverSceneNorth:
 .FinishRival:
 	playsound SFX_TACKLE
 	applymovement PLAYER, CherrygroveCity_RivalPushesYouOutOfTheWay
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft
 	disappear CHERRYGROVECITY_SILVER
 	setscene SCENE_CHERRYGROVECITY_NOTHING
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index 4e1d1d4d5..38b6982e2 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -36,12 +36,12 @@ CianwoodCity_MapScripts:
 	return
 
 CianwoodCitySuicuneAndEusine:
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	showemote EMOTE_SHOCK, PLAYER, 15
 	pause 15
 	playsound SFX_WARP_FROM
 	applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00da
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	pause 15
 	playsound SFX_WARP_FROM
 	applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0
diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm
index b7045c826..4e76b7385 100644
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -22,7 +22,7 @@ ChuckScript_0x9d60f:
 	writetext ChuckIntroText1
 	waitbutton
 	closetext
-	spriteface CIANWOODGYM_CHUCK, RIGHT
+	objectface CIANWOODGYM_CHUCK, RIGHT
 	opentext
 	writetext ChuckIntroText2
 	waitbutton
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index f98dc7df9..ccff4b538 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -91,12 +91,12 @@ DragonShrine_MapScripts:
 	iftrue .Question2
 .WrongAnswer:
 	closetext
-	spriteface DRAGONSHRINE_ELDER1, LEFT
+	objectface DRAGONSHRINE_ELDER1, LEFT
 	opentext
 	writetext DragonShrineWrongAnswerText1
 	waitbutton
 	closetext
-	spriteface DRAGONSHRINE_ELDER1, DOWN
+	objectface DRAGONSHRINE_ELDER1, DOWN
 	opentext
 	writetext DragonShrineWrongAnswerText2
 	waitbutton
@@ -122,12 +122,12 @@ DragonShrine_MapScripts:
 	playmusic MUSIC_CLAIR
 	appear DRAGONSHRINE_CLAIR
 	waitsfx
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	pause 30
 	applymovement DRAGONSHRINE_CLAIR, DragonShrineClairWalkInMovement
-	spriteface DRAGONSHRINE_CLAIR, RIGHT
-	spriteface PLAYER, LEFT
-	spriteface DRAGONSHRINE_ELDER1, LEFT
+	objectface DRAGONSHRINE_CLAIR, RIGHT
+	objectface PLAYER, LEFT
+	objectface DRAGONSHRINE_ELDER1, LEFT
 	opentext
 	writetext DragonShrineClairYouPassedText
 	waitbutton
@@ -144,7 +144,7 @@ DragonShrine_MapScripts:
 	waitbutton
 	closetext
 	applymovement DRAGONSHRINE_ELDER1, DragonShrineElderWalkToClairMovement
-	spriteface DRAGONSHRINE_CLAIR, UP
+	objectface DRAGONSHRINE_CLAIR, UP
 	opentext
 	writetext DragonShrineMustIInformLanceText
 	waitbutton
@@ -171,9 +171,9 @@ DragonShrine_MapScripts:
 	waitbutton
 	closetext
 	applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2ce
-	spriteface DRAGONSHRINE_CLAIR, UP
+	objectface DRAGONSHRINE_CLAIR, UP
 	applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2d1
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext DragonShrineElderScoldsClairText
 	waitbutton
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 9c6bca29c..8f765a333 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -47,7 +47,7 @@ DragonsDenB1F_ClairScene:
 	pause 30
 	closetext
 	showemote EMOTE_SHOCK, PLAYER, 15
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	playmusic MUSIC_CLAIR
 	applymovement DRAGONSDENB1F_CLAIR, MovementDragonsDen_ClairWalksToYou
 	opentext
diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm
index 55eeed805..9fa76633d 100644
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -45,7 +45,7 @@ EarlsPokemonAcademyGameboyKid1Script:
 	writetext EarlsPokemonAcademyGameboyKid1Text
 	waitbutton
 	closetext
-	spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN
+	objectface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN
 	end
 
 EarlsPokemonAcademyGameboyKid2Script:
@@ -54,7 +54,7 @@ EarlsPokemonAcademyGameboyKid2Script:
 	writetext EarlsPokemonAcademyGameboyKid2Text
 	waitbutton
 	closetext
-	spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN
+	objectface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN
 	end
 
 EarlsPokemonAcademyYoungster2Script:
diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm
index e8b12466c..3456e6577 100644
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -26,15 +26,15 @@ EcruteakPokecenter1F_MapScripts:
 	waitsfx
 	applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokecenter1FBillMovement1
 	applymovement PLAYER, EcruteakPokecenter1FPlayerMovement1
-	spriteface ECRUTEAKPOKECENTER1F_NURSE, UP
+	objectface ECRUTEAKPOKECENTER1F_NURSE, UP
 	pause 10
-	spriteface ECRUTEAKPOKECENTER1F_NURSE, DOWN
+	objectface ECRUTEAKPOKECENTER1F_NURSE, DOWN
 	pause 30
-	spriteface ECRUTEAKPOKECENTER1F_NURSE, UP
+	objectface ECRUTEAKPOKECENTER1F_NURSE, UP
 	pause 10
-	spriteface ECRUTEAKPOKECENTER1F_NURSE, DOWN
+	objectface ECRUTEAKPOKECENTER1F_NURSE, DOWN
 	pause 20
-	spriteface ECRUTEAKPOKECENTER1F_BILL, DOWN
+	objectface ECRUTEAKPOKECENTER1F_BILL, DOWN
 	pause 10
 	opentext
 	writetext EcruteakPokecenter1F_BillText1
@@ -45,7 +45,7 @@ EcruteakPokecenter1F_MapScripts:
 	writetext EcruteakPokecenter1F_BillText2
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokecenter1FBillMovement2
 	playsound SFX_EXIT_BUILDING
 	disappear ECRUTEAKPOKECENTER1F_BILL
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 625e139b1..6a3cb640d 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -47,7 +47,7 @@ ElmsLab_MapScripts:
 .WalkUpToElm:
 	applymovement PLAYER, ElmsLab_WalkUpToElmMovement
 	showemote EMOTE_SHOCK, ELMSLAB_ELM, 15
-	spriteface ELMSLAB_ELM, RIGHT
+	objectface ELMSLAB_ELM, RIGHT
 	opentext
 	writetext ElmText_Intro
 .MustSayYes:
@@ -65,20 +65,20 @@ ElmsLab_MapScripts:
 	playsound SFX_GLASS_TING
 	pause 30
 	showemote EMOTE_SHOCK, ELMSLAB_ELM, 10
-	spriteface ELMSLAB_ELM, DOWN
+	objectface ELMSLAB_ELM, DOWN
 	opentext
 	writetext ElmText_GotAnEmail
 	waitbutton
 	closetext
 	opentext
-	spriteface ELMSLAB_ELM, RIGHT
+	objectface ELMSLAB_ELM, RIGHT
 	writetext ElmText_MissionFromMrPokemon
 	waitbutton
 	closetext
 	applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement1
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement2
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext ElmText_ChooseAPokemon
 	waitbutton
@@ -147,7 +147,7 @@ ElmCheckGotEggAgain:
 	end
 
 LabTryToLeaveScript:
-	spriteface ELMSLAB_ELM, DOWN
+	objectface ELMSLAB_ELM, DOWN
 	opentext
 	writetext LabWhereGoingText
 	waitbutton
@@ -158,7 +158,7 @@ LabTryToLeaveScript:
 CyndaquilPokeBallScript:
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
 	iftrue LookAtElmPokeBallScript
-	spriteface ELMSLAB_ELM, DOWN
+	objectface ELMSLAB_ELM, DOWN
 	refreshscreen
 	pokepic CYNDAQUIL
 	cry CYNDAQUIL
@@ -188,7 +188,7 @@ CyndaquilPokeBallScript:
 TotodilePokeBallScript:
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
 	iftrue LookAtElmPokeBallScript
-	spriteface ELMSLAB_ELM, DOWN
+	objectface ELMSLAB_ELM, DOWN
 	refreshscreen
 	pokepic TOTODILE
 	cry TOTODILE
@@ -216,7 +216,7 @@ TotodilePokeBallScript:
 ChikoritaPokeBallScript:
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
 	iftrue LookAtElmPokeBallScript
-	spriteface ELMSLAB_ELM, DOWN
+	objectface ELMSLAB_ELM, DOWN
 	refreshscreen
 	pokepic CHIKORITA
 	cry CHIKORITA
@@ -248,7 +248,7 @@ DidntChooseStarterScript:
 	end
 
 ElmDirectionsScript:
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext ElmDirectionsText1
 	waitbutton
@@ -260,12 +260,12 @@ ElmDirectionsScript:
 	waitsfx
 	waitbutton
 	closetext
-	spriteface ELMSLAB_ELM, LEFT
+	objectface ELMSLAB_ELM, LEFT
 	opentext
 	writetext ElmDirectionsText2
 	waitbutton
 	closetext
-	spriteface ELMSLAB_ELM, DOWN
+	objectface ELMSLAB_ELM, DOWN
 	opentext
 	writetext ElmDirectionsText3
 	waitbutton
@@ -457,14 +457,14 @@ ElmJumpRightScript:
 
 AideScript_WalkPotion1:
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksRight1
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	scall AideScript_GivePotion
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft1
 	end
 
 AideScript_WalkPotion2:
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksRight2
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	scall AideScript_GivePotion
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft2
 	end
@@ -482,14 +482,14 @@ AideScript_GivePotion:
 
 AideScript_WalkBalls1:
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksRight1
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	scall AideScript_GiveYouBalls
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft1
 	end
 
 AideScript_WalkBalls2:
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksRight2
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	scall AideScript_GiveYouBalls
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft2
 	end
@@ -550,7 +550,7 @@ MeetCopScript2:
 MeetCopScript:
 	applymovement PLAYER, MeetCopScript_WalkUp
 CopScript:
-	spriteface ELMSLAB_OFFICER, LEFT
+	objectface ELMSLAB_OFFICER, LEFT
 	opentext
 	writetext ElmsLabOfficerText1
 	buttonsound
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index bc062251e..9d880cfa2 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -130,7 +130,7 @@ WorriedGrandpaSceneLeft:
 	writetext UnknownText_0x75412
 	waitbutton
 	closetext
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222
 	disappear FASTSHIP1F_GENTLEMAN
 	setscene SCENE_DEFAULT
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index cca6db346..67109ec4c 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -36,7 +36,7 @@ SSAquaCaptain:
 	end
 
 SSAquaGranddaughterBefore:
-	spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, RIGHT
+	objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, RIGHT
 	opentext
 	writetext SSAquaGranddaughterCaptainPlayWithMeText
 	waitbutton
@@ -52,13 +52,13 @@ SSAquaGranddaughterBefore:
 	applymovement PLAYER, MovementData_0x76004
 	moveobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, 3, 19
 	appear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1
-	spriteface PLAYER, UP
-	spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP
+	objectface PLAYER, UP
+	objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP
 	special FadeInQuickly
-	spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN
+	objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN
 	showemote EMOTE_SHOCK, FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, 15
 	applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, MovementData_0x7600c
-	spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, RIGHT
+	objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, RIGHT
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .PlayerIsFemale
 	opentext
@@ -73,7 +73,7 @@ SSAquaGranddaughterBefore:
 	waitbutton
 	closetext
 .cont:
-	spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN
+	objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN
 	applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, MovementData_0x76010
 	opentext
 	writetext SSAquaEntertainedGranddaughterText
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 7c6382392..5474b85e7 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -210,7 +210,7 @@ GoldenrodCityRocketScoutScript:
 	writetext GoldenrodCityRocketScoutText2
 	waitbutton
 	closetext
-	spriteface GOLDENRODCITY_ROCKETSCOUT, UP
+	objectface GOLDENRODCITY_ROCKETSCOUT, UP
 	end
 
 GoldenrodCityRocket1Script:
diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm
index 2ee5f805d..1f9a6a92d 100644
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -28,7 +28,7 @@ GameboyKidScript_0x55ef7:
 	writetext UnknownText_0x55f74
 	waitbutton
 	closetext
-	spriteface GOLDENRODDEPTSTORE4F_GAMEBOY_KID, DOWN
+	objectface GOLDENRODDEPTSTORE4F_GAMEBOY_KID, DOWN
 	end
 
 GoldenrodDeptStore4FDirectory:
diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm
index a3ffb2b1f..cd6162349 100644
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -52,7 +52,7 @@ FisherScript_0x56749:
 	writetext UnknownText_0x567d2
 	waitbutton
 	closetext
-	spriteface GOLDENRODDEPTSTOREROOF_FISHER, UP
+	objectface GOLDENRODDEPTSTOREROOF_FISHER, UP
 	end
 
 GoldenrodDeptStoreRoofTwinScript:
@@ -63,12 +63,12 @@ SuperNerdScript_0x56757:
 	writetext UnknownText_0x56867
 	waitbutton
 	closetext
-	spriteface GOLDENRODDEPTSTOREROOF_SUPER_NERD, UP
+	objectface GOLDENRODDEPTSTOREROOF_SUPER_NERD, UP
 	opentext
 	writetext UnknownText_0x56871
 	waitbutton
 	closetext
-	spriteface GOLDENRODDEPTSTOREROOF_SUPER_NERD, RIGHT
+	objectface GOLDENRODDEPTSTOREROOF_SUPER_NERD, RIGHT
 	end
 
 GoldenrodDeptStoreRoofPokefanMScript:
diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm
index a9eb5263a..6c73499b6 100644
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -30,7 +30,7 @@ FlowerShopTeacherScript:
 	end
 
 .Lalala:
-	spriteface GOLDENRODFLOWERSHOP_TEACHER, LEFT
+	objectface GOLDENRODFLOWERSHOP_TEACHER, LEFT
 	opentext
 	writetext UnknownText_0x5552e
 	waitbutton
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index 8a5e9e70e..674d161c9 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -43,7 +43,7 @@ GoldenrodGameCornerPokefanM3Script:
 	writetext GoldenrodGameCornerPokefanM3Text
 	waitbutton
 	closetext
-	spriteface GOLDENRODGAMECORNER_POKEFAN_M3, RIGHT
+	objectface GOLDENRODGAMECORNER_POKEFAN_M3, RIGHT
 	end
 
 GoldenrodGmeCornerCoinVendorScript:
@@ -242,7 +242,7 @@ GoldenrodGameCornerPharmacistScript:
 	writetext GoldenrodGameCornerPharmacistText
 	waitbutton
 	closetext
-	spriteface LAST_TALKED, LEFT
+	objectface LAST_TALKED, LEFT
 	end
 
 GoldenrodGameCornerPokefanM1Script:
@@ -251,7 +251,7 @@ GoldenrodGameCornerPokefanM1Script:
 	writetext GoldenrodGameCornerPokefanM1Text
 	waitbutton
 	closetext
-	spriteface GOLDENRODGAMECORNER_POKEFAN_M1, RIGHT
+	objectface GOLDENRODGAMECORNER_POKEFAN_M1, RIGHT
 	end
 
 GoldenrodGameCornerCooltrainerMScript:
@@ -260,7 +260,7 @@ GoldenrodGameCornerCooltrainerMScript:
 	writetext GoldenrodGameCornerCooltrainerMText
 	waitbutton
 	closetext
-	spriteface GOLDENRODGAMECORNER_COOLTRAINER_M, LEFT
+	objectface GOLDENRODGAMECORNER_COOLTRAINER_M, LEFT
 	end
 
 GoldenrodGameCornerPokefanFScript:
@@ -269,7 +269,7 @@ GoldenrodGameCornerPokefanFScript:
 	writetext GoldenrodGameCornerPokefanFText
 	waitbutton
 	closetext
-	spriteface GOLDENRODGAMECORNER_POKEFAN_F, RIGHT
+	objectface GOLDENRODGAMECORNER_POKEFAN_F, RIGHT
 	end
 
 GoldenrodGameCornerCooltrainerFScript:
@@ -281,7 +281,7 @@ GoldenrodGameCornerGentlemanScript:
 	writetext GoldenrodGameCornerGentlemanText
 	waitbutton
 	closetext
-	spriteface GOLDENRODGAMECORNER_GENTLEMAN, RIGHT
+	objectface GOLDENRODGAMECORNER_GENTLEMAN, RIGHT
 	end
 
 GoldenrodGameCornerPokefanM2Script:
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
index 8fac674b4..9f9524596 100644
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -104,7 +104,7 @@ TrainerLassCarrie:
 WhitneyCriesScript:
 	showemote EMOTE_SHOCK, GOLDENRODGYM_LASS2, 15
 	applymovement GOLDENRODGYM_LASS2, BridgetWalksUpMovement
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	opentext
 	writetext BridgetWhitneyCriesText
 	waitbutton
diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm
index 44d7cb492..a7f0ed977 100644
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -28,7 +28,7 @@ GoldenrodPokecenter1F_GSBallSceneLeft:
 	appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
 	playmusic MUSIC_SHOW_ME_AROUND
 	applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x6105a
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext UnknownText_0x622f0
 	waitbutton
@@ -60,7 +60,7 @@ GoldenrodPokecenter1F_GSBallSceneRight:
 	appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
 	playmusic MUSIC_SHOW_ME_AROUND
 	applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x61065
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext UnknownText_0x622f0
 	waitbutton
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index 0969b2e83..88cdcc085 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -117,7 +117,7 @@ TeacherScript_0x7ca7d:
 	jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_TeacherText
 
 UndergroundSilverScene1:
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
@@ -125,7 +125,7 @@ UndergroundSilverScene1:
 	appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
 	waitsfx
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement1
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	scall UndergroundSilverBattleScript
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1
 	playsound SFX_EXIT_BUILDING
@@ -136,7 +136,7 @@ UndergroundSilverScene1:
 	end
 
 UndergroundSilverScene2:
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
@@ -144,7 +144,7 @@ UndergroundSilverScene2:
 	appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
 	waitsfx
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement2
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	scall UndergroundSilverBattleScript
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2
 	playsound SFX_EXIT_BUILDING
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index 1de0b37b3..e3541bbd3 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -19,12 +19,12 @@ HallOfFame_MapScripts:
 	follow HALLOFFAME_LANCE, PLAYER
 	applymovement HALLOFFAME_LANCE, HallOfFame_WalkUpWithLance
 	stopfollow
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext HallOfFame_LanceText
 	waitbutton
 	closetext
-	spriteface HALLOFFAME_LANCE, UP
+	objectface HALLOFFAME_LANCE, UP
 	applymovement PLAYER, HallOfFame_SlowlyApproachMachine
 	setscene SCENE_FINISHED
 	pause 15
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index bb4f47151..b3dcf841f 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -460,7 +460,7 @@ MapIlexForestSignpost4Script:
 	special FadeOutMusic
 	applymovement PLAYER, MovementData_0x6ef58
 	pause 30
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	pause 20
 	clearflag ENGINE_FOREST_IS_RESTLESS
 	special CelebiShrineEvent
diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm
index 3f12b3926..ce5a3b782 100644
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -54,13 +54,13 @@ PlateauRivalBattle1:
 	ifequal SATURDAY, PlateauRivalScriptDone
 	moveobject INDIGOPLATEAUPOKECENTER1F_SILVER, 17, 9
 	appear INDIGOPLATEAUPOKECENTER1F_SILVER
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
 	applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement1
 	playmusic MUSIC_RIVAL_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	jump PlateauRivalBattleCommon
 
 PlateauRivalBattle2:
@@ -75,13 +75,13 @@ PlateauRivalBattle2:
 	ifequal FRIDAY, PlateauRivalScriptDone
 	ifequal SATURDAY, PlateauRivalScriptDone
 	appear INDIGOPLATEAUPOKECENTER1F_SILVER
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
 	applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement2
 	playmusic MUSIC_RIVAL_ENCOUNTER
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 PlateauRivalBattleCommon:
 	opentext
 	writetext PlateauRivalText1
@@ -125,7 +125,7 @@ PlateauRivalPostBattle:
 	writetext PlateauRivalText2
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalLeavesMovement
 	disappear INDIGOPLATEAUPOKECENTER1F_SILVER
 	setscene SCENE_DEFAULT
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index 65085577d..97e2d5ebe 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -46,7 +46,7 @@ KurtScript_0x18e178:
 	setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
 	checkcode VAR_FACING
 	ifequal UP, .RunAround
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	playsound SFX_FLY
 	applymovement KURTSHOUSE_KURT1, MovementData_0x18e466
 	playsound SFX_EXIT_BUILDING
@@ -56,7 +56,7 @@ KurtScript_0x18e178:
 	end
 
 .RunAround:
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	playsound SFX_FLY
 	applymovement KURTSHOUSE_KURT1, MovementData_0x18e46c
 	playsound SFX_EXIT_BUILDING
@@ -294,13 +294,13 @@ KurtScript_0x18e178:
 	showemote EMOTE_SHOCK, KURTSHOUSE_KURT1, 30
 	checkcode VAR_FACING
 	ifequal UP, .GSBallRunAround
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	playsound SFX_FLY
 	applymovement KURTSHOUSE_KURT1, MovementData_0x18e466
 	jump .KurtHasLeftTheBuilding
 
 .GSBallRunAround:
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	playsound SFX_FLY
 	applymovement KURTSHOUSE_KURT1, MovementData_0x18e46c
 .KurtHasLeftTheBuilding:
@@ -323,21 +323,21 @@ KurtMakingBallsScript:
 	writetext UnknownText_0x18e7d8
 	waitbutton
 	closetext
-	spriteface KURTSHOUSE_KURT2, UP
+	objectface KURTSHOUSE_KURT2, UP
 	end
 
 Script_FirstTimeBuggingKurt:
 	writetext UnknownText_0x18e863
 	waitbutton
 	closetext
-	spriteface KURTSHOUSE_KURT2, UP
+	objectface KURTSHOUSE_KURT2, UP
 	setevent EVENT_BUGGING_KURT_TOO_MUCH
 	end
 
 KurtScript_ImCheckingItNow:
 	writetext UnknownText_0x18e934
 	waitbutton
-	spriteface KURTSHOUSE_KURT2, UP
+	objectface KURTSHOUSE_KURT2, UP
 	writetext UnknownText_0x18e949
 	waitbutton
 	closetext
@@ -393,14 +393,14 @@ KurtsGranddaughter2Subscript:
 	writetext KurtsGranddaughterHelpText
 	waitbutton
 	closetext
-	spriteface KURTSHOUSE_TWIN2, RIGHT
+	objectface KURTSHOUSE_TWIN2, RIGHT
 	end
 
 .GSBall:
 	writetext KurtsGranddaughterGSBallText
 	waitbutton
 	closetext
-	spriteface KURTSHOUSE_TWIN2, RIGHT
+	objectface KURTSHOUSE_TWIN2, RIGHT
 	end
 
 KurtsGranddaughterFunScript:
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index f16dc0dfa..5e60b2718 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -50,7 +50,7 @@ Script_ApproachLanceFromRight:
 	special FadeOutMusic
 	applymovement PLAYER, MovementData_ApproachLanceFromRight
 LanceScript_0x180e7b:
-	spriteface LANCESROOM_LANCE, LEFT
+	objectface LANCESROOM_LANCE, LEFT
 	opentext
 	writetext LanceBattleIntroText
 	waitbutton
@@ -74,9 +74,9 @@ LanceScript_0x180e7b:
 	musicfadeout MUSIC_BEAUTY_ENCOUNTER, 16
 	pause 30
 	showemote EMOTE_SHOCK, LANCESROOM_LANCE, 15
-	spriteface LANCESROOM_LANCE, DOWN
+	objectface LANCESROOM_LANCE, DOWN
 	pause 10
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	appear LANCESROOM_MARY
 	applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRushesIn
 	opentext
@@ -88,27 +88,27 @@ LanceScript_0x180e7b:
 	follow LANCESROOM_MARY, LANCESROOM_OAK
 	applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryYieldsToOak
 	stopfollow
-	spriteface LANCESROOM_OAK, UP
-	spriteface LANCESROOM_LANCE, LEFT
+	objectface LANCESROOM_OAK, UP
+	objectface LANCESROOM_LANCE, LEFT
 	opentext
 	writetext UnknownText_0x18121b
 	waitbutton
 	closetext
 	applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryInterviewChampion
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	opentext
 	writetext UnknownText_0x18134b
 	waitbutton
 	closetext
 	applymovement LANCESROOM_LANCE, LancesRoomMovementData_LancePositionsSelfToGuidePlayerAway
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext UnknownText_0x18137b
 	waitbutton
 	closetext
 	follow LANCESROOM_LANCE, PLAYER
-	spriteface LANCESROOM_MARY, UP
-	spriteface LANCESROOM_OAK, UP
+	objectface LANCESROOM_MARY, UP
+	objectface LANCESROOM_OAK, UP
 	applymovement LANCESROOM_LANCE, LancesRoomMovementData_LanceLeadsPlayerToHallOfFame
 	stopfollow
 	playsound SFX_EXIT_BUILDING
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index 376298357..3976a4968 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -91,7 +91,7 @@ UnknownScript_0x6c38f:
 	reloadmappart
 	closetext
 	setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
-	spriteface MAHOGANYMART1F_LANCE, LEFT
+	objectface MAHOGANYMART1F_LANCE, LEFT
 	opentext
 	writetext UnknownText_0x6c5ba
 	waitbutton
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index fbde2035d..6677679e7 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -28,7 +28,7 @@ UnknownScript_0x190013:
 	follow PLAYER, MAHOGANYTOWN_POKEFAN_M
 	applymovement PLAYER, MovementData_0x1900a7
 	stopfollow
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	scall UnknownScript_0x19002f
 	applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x1900ad
 	end
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index 08a9c4c17..829dcf1d9 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -16,7 +16,7 @@ MountMoon_MapScripts:
 	end
 
 .RivalBattle:
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index e8c82c961..502c752d3 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -34,7 +34,7 @@ ClefairyDance:
 	applymovement PLAYER, PlayerWalksUpToDancingClefairies
 	pause 15
 	appear MOUNTMOONSQUARE_ROCK
-	spriteface MOUNTMOONSQUARE_FAIRY1, RIGHT
+	objectface MOUNTMOONSQUARE_FAIRY1, RIGHT
 	cry CLEFAIRY
 	waitsfx
 	pause 30
@@ -54,10 +54,10 @@ ClefairyDance:
 	follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2
 	applymovement MOUNTMOONSQUARE_FAIRY1, ClefairyDanceStep7
 	stopfollow
-	spriteface MOUNTMOONSQUARE_FAIRY1, DOWN
+	objectface MOUNTMOONSQUARE_FAIRY1, DOWN
 	pause 10
 	showemote EMOTE_SHOCK, MOUNTMOONSQUARE_FAIRY1, 15
-	spriteface MOUNTMOONSQUARE_FAIRY1, DOWN
+	objectface MOUNTMOONSQUARE_FAIRY1, DOWN
 	cry CLEFAIRY
 	pause 15
 	follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index d79c86d7e..53358e632 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -18,7 +18,7 @@ MrPokemonsHouse_MapScripts:
 
 .MrPokemonEvent:
 	showemote EMOTE_SHOCK, MRPOKEMONSHOUSE_GENTLEMAN, 15
-	spriteface MRPOKEMONSHOUSE_GENTLEMAN, DOWN
+	objectface MRPOKEMONSHOUSE_GENTLEMAN, DOWN
 	opentext
 	writetext MrPokemonIntroText1
 	waitbutton
@@ -37,11 +37,11 @@ MrPokemonsHouse_MapScripts:
 	blackoutmod CHERRYGROVE_CITY
 	writetext MrPokemonIntroText3
 	buttonsound
-	spriteface MRPOKEMONSHOUSE_GENTLEMAN, RIGHT
+	objectface MRPOKEMONSHOUSE_GENTLEMAN, RIGHT
 	writetext MrPokemonIntroText4
 	buttonsound
-	spriteface MRPOKEMONSHOUSE_GENTLEMAN, DOWN
-	spriteface MRPOKEMONSHOUSE_OAK, LEFT
+	objectface MRPOKEMONSHOUSE_GENTLEMAN, DOWN
+	objectface MRPOKEMONSHOUSE_OAK, LEFT
 	writetext MrPokemonIntroText5
 	waitbutton
 	closetext
@@ -84,7 +84,7 @@ MrPokemonsHouse_MrPokemonScript:
 MrPokemonsHouse_OakScript:
 	playmusic MUSIC_PROF_OAK
 	applymovement MRPOKEMONSHOUSE_OAK, MrPokemonsHouse_OakWalksToPlayer
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext MrPokemonsHouse_OakText1
 	buttonsound
@@ -96,14 +96,14 @@ MrPokemonsHouse_OakScript:
 	writetext MrPokemonsHouse_OakText2
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	applymovement MRPOKEMONSHOUSE_OAK, MrPokemonsHouse_OakExits
 	playsound SFX_EXIT_BUILDING
 	disappear MRPOKEMONSHOUSE_OAK
 	waitsfx
 	special RestartMapMusic
 	pause 15
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext MrPokemonsHouse_MrPokemonHealText
 	waitbutton
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index 6bda6753b..d28654bdd 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -66,7 +66,7 @@ GameboyKidScript_0x5c037:
 	writetext UnknownText_0x5c42a
 	waitbutton
 	closetext
-	spriteface NATIONALPARK_GAMEBOY_KID, DOWN
+	objectface NATIONALPARK_GAMEBOY_KID, DOWN
 	end
 
 TrainerSchoolboyJack1:
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index c0feedf21..d4ae92d48 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -24,12 +24,12 @@ NewBarkTown_MapScripts:
 
 NewBarkTown_TeacherStopsYouScene1:
 	playmusic MUSIC_MOM
-	spriteface NEWBARKTOWN_TEACHER, LEFT
+	objectface NEWBARKTOWN_TEACHER, LEFT
 	opentext
 	writetext Text_WaitPlayer
 	waitbutton
 	closetext
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	applymovement NEWBARKTOWN_TEACHER, Movement_TeacherRunsToYou1_NBT
 	opentext
 	writetext Text_WhatDoYouThinkYoureDoing
@@ -47,14 +47,14 @@ NewBarkTown_TeacherStopsYouScene1:
 
 NewBarkTown_TeacherStopsYouScene2:
 	playmusic MUSIC_MOM
-	spriteface NEWBARKTOWN_TEACHER, LEFT
+	objectface NEWBARKTOWN_TEACHER, LEFT
 	opentext
 	writetext Text_WaitPlayer
 	waitbutton
 	closetext
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	applymovement NEWBARKTOWN_TEACHER, Movement_TeacherRunsToYou2_NBT
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext Text_WhatDoYouThinkYoureDoing
 	waitbutton
@@ -109,7 +109,7 @@ NewBarkTownSilverScript:
 	writetext NewBarkTownRivalText1
 	waitbutton
 	closetext
-	spriteface NEWBARKTOWN_SILVER, LEFT
+	objectface NEWBARKTOWN_SILVER, LEFT
 	opentext
 	writetext NewBarkTownRivalText2
 	waitbutton
@@ -118,7 +118,7 @@ NewBarkTownSilverScript:
 	applymovement PLAYER, Movement_SilverPushesYouAway_NBT
 	stopfollow
 	pause 5
-	spriteface NEWBARKTOWN_SILVER, DOWN
+	objectface NEWBARKTOWN_SILVER, DOWN
 	pause 5
 	playsound SFX_TACKLE
 	applymovement PLAYER, Movement_SilverShovesYouOut_NBT
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index 438654141..053001a47 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -23,7 +23,7 @@ OlivineCity_MapScripts:
 	return
 
 UnknownScript_0x1a8833:
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
@@ -37,7 +37,7 @@ UnknownScript_0x1a8833:
 	waitbutton
 	closetext
 	applymovement PLAYER, MovementData_0x1a88f4
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88db
 	setscene SCENE_FINISHED
 	disappear OLIVINECITY_OLIVINE_RIVAL
@@ -47,7 +47,7 @@ UnknownScript_0x1a8833:
 	end
 
 UnknownScript_0x1a886b:
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
@@ -61,7 +61,7 @@ UnknownScript_0x1a886b:
 	waitbutton
 	closetext
 	applymovement PLAYER, MovementData_0x1a88f7
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88e8
 	disappear OLIVINECITY_OLIVINE_RIVAL
 	setscene SCENE_FINISHED
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index 5c50aeb95..8023a6a3c 100644
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -34,9 +34,9 @@ UnknownScript_0x60bab:
 	writetext UnknownText_0x60dea
 	waitbutton
 	closetext
-	spriteface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
+	objectface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
 	pause 15
-	spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
+	objectface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
 	opentext
 	playmusic MUSIC_HEAL
 	writetext UnknownText_0x60e44
@@ -52,13 +52,13 @@ UnknownScript_0x60bab:
 	writetext UnknownText_0x60f3d
 	waitbutton
 	closetext
-	spriteface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
+	objectface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
 	pause 10
-	spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
+	objectface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
 	pause 10
-	spriteface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
+	objectface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
 	pause 10
-	spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
+	objectface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
 	pause 10
 	faceplayer
 	opentext
@@ -88,9 +88,9 @@ UnknownScript_0x60c25:
 	writetext UnknownText_0x60edf
 	waitbutton
 	closetext
-	spriteface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
+	objectface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
 	pause 15
-	spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
+	objectface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
 	opentext
 	writetext UnknownText_0x60ef1
 	waitbutton
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index c47b0fc3c..fec26c331 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -37,7 +37,7 @@ SailorScript_0x748c0:
 	writetext UnknownText_0x74a55
 	waitbutton
 	closetext
-	spriteface OLIVINEPORT_SAILOR1, DOWN
+	objectface OLIVINEPORT_SAILOR1, DOWN
 	pause 10
 	playsound SFX_EXIT_BUILDING
 	disappear OLIVINEPORT_SAILOR1
@@ -73,12 +73,12 @@ UnknownScript_0x74919:
 	end
 
 UnknownScript_0x7491f:
-	spriteface OLIVINEPORT_SAILOR3, RIGHT
+	objectface OLIVINEPORT_SAILOR3, RIGHT
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	iftrue UnknownScript_0x7498b
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	iftrue UnknownScript_0x7498b
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	opentext
 	checkevent EVENT_FAST_SHIP_FIRST_TIME
 	iffalse UnknownScript_0x7494e
@@ -201,7 +201,7 @@ FishingGuruScript_0x74a01:
 	writetext UnknownText_0x74bf4
 	waitbutton
 	closetext
-	spriteface OLIVINEPORT_FISHING_GURU1, UP
+	objectface OLIVINEPORT_FISHING_GURU1, UP
 	end
 
 FishingGuruScript_0x74a0c:
@@ -210,7 +210,7 @@ FishingGuruScript_0x74a0c:
 	writetext UnknownText_0x74c35
 	waitbutton
 	closetext
-	spriteface OLIVINEPORT_FISHING_GURU2, UP
+	objectface OLIVINEPORT_FISHING_GURU2, UP
 	end
 
 YoungsterScript_0x74a17:
@@ -219,7 +219,7 @@ YoungsterScript_0x74a17:
 	writetext UnknownText_0x74c76
 	waitbutton
 	closetext
-	spriteface OLIVINEPORT_YOUNGSTER, DOWN
+	objectface OLIVINEPORT_YOUNGSTER, DOWN
 	end
 
 CooltrainerFScript_0x74a22:
@@ -228,7 +228,7 @@ CooltrainerFScript_0x74a22:
 	writetext UnknownText_0x74ca2
 	waitbutton
 	closetext
-	spriteface OLIVINEPORT_COOLTRAINER_F, DOWN
+	objectface OLIVINEPORT_COOLTRAINER_F, DOWN
 	end
 
 OlivinePortHiddenProtein:
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index 163bed162..1e9f368d4 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -24,7 +24,7 @@ UnknownScript_0x7a4d8:
 UnknownScript_0x7a4db:
 	playmusic MUSIC_MOM
 	showemote EMOTE_SHOCK, PLAYERSHOUSE1F_MOM1, 15
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	iffalse UnknownScript_0x7a4f2
 	applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fc
@@ -96,7 +96,7 @@ UnknownScript_0x7a564:
 
 UnknownScript_0x7a56b:
 	special RestartMapMusic
-	spriteface PLAYERSHOUSE1F_MOM1, LEFT
+	objectface PLAYERSHOUSE1F_MOM1, LEFT
 	end
 
 UnknownScript_0x7a572:
@@ -179,7 +179,7 @@ NeighborScript:
 	writetext NeighborText
 	waitbutton
 	closetext
-	spriteface PLAYERSHOUSE1F_POKEFAN_F, RIGHT
+	objectface PLAYERSHOUSE1F_POKEFAN_F, RIGHT
 	end
 
 TVScript:
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 9bdb399d4..de2047d37 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -426,7 +426,7 @@ Pokecenter2F_CheckGender:
 	waitbutton
 	closetext
 	applymovement2 Pokecenter2FMovementData_ReceptionistLooksRight
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	opentext
 	writetext Text_ChangeTheLook
 	waitbutton
@@ -533,7 +533,7 @@ TimeCapsuleScript_CheckPlayerGender:
 	closetext
 	checkcode VAR_FACING
 	ifnotequal UP, .FemaleChangeApperance
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 .FemaleChangeApperance:
 	opentext
 	writetext Text_ChangeTheLook
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index 4395c12e2..89ec341b2 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -26,19 +26,19 @@ PowerPlantGuardPhoneScript:
 	waitsfx
 	pause 30
 	applymovement POWERPLANT_OFFICER1, MovementData_0x188ed5
-	spriteface POWERPLANT_GYM_GUY1, DOWN
-	spriteface POWERPLANT_GYM_GUY2, DOWN
+	objectface POWERPLANT_GYM_GUY1, DOWN
+	objectface POWERPLANT_GYM_GUY2, DOWN
 	opentext
 	writetext UnknownText_0x188f22
 	waitbutton
 	closetext
-	spriteface POWERPLANT_OFFICER1, LEFT
-	spriteface PLAYER, RIGHT
+	objectface POWERPLANT_OFFICER1, LEFT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext UnknownText_0x188f7f
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	applymovement POWERPLANT_OFFICER1, MovementData_0x188eda
 	setscene SCENE_POWERPLANT_NOTHING
 	end
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
index 27ee7d7ac..0c992176d 100644
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -120,17 +120,17 @@ Buena:
 	writetext UnknownText_0x5de84
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface RADIOTOWER2F_BUENA, RIGHT
 	checkcode VAR_FACING
 	ifnotequal RIGHT, UnknownScript_0x5d7be
 	applymovement PLAYER, MovementData_0x5d921
 UnknownScript_0x5d7be:
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext UnknownText_0x5dedd
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, DOWN
+	objectface RADIOTOWER2F_BUENA, DOWN
 	refreshscreen
 	special BuenasPassword
 	closetext
@@ -146,7 +146,7 @@ UnknownScript_0x5d7be:
 	playsound SFX_TRANSACTION
 	setflag ENGINE_BUENAS_PASSWORD_2
 	pause 20
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface RADIOTOWER2F_BUENA, RIGHT
 	opentext
 	writetext UnknownText_0x5e054
 	waitbutton
@@ -172,14 +172,14 @@ UnknownScript_0x5d80a:
 	checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
 	iftrue UnknownScript_0x5d8cc
 UnknownScript_0x5d81a:
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface RADIOTOWER2F_BUENA, RIGHT
 	end
 
 UnknownScript_0x5d81e:
 	writetext UnknownText_0x5df29
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface RADIOTOWER2F_BUENA, RIGHT
 	special FadeOutMusic
 	pause 20
 	special RestartMapMusic
@@ -194,7 +194,7 @@ UnknownScript_0x5d82f:
 	checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
 	iftrue UnknownScript_0x5d8cc
 UnknownScript_0x5d83f:
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface RADIOTOWER2F_BUENA, RIGHT
 	pause 10
 	end
 
@@ -204,13 +204,13 @@ UnknownScript_0x5d845:
 	writetext UnknownText_0x5e01c
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface RADIOTOWER2F_BUENA, RIGHT
 	pause 20
 	opentext
 	writetext UnknownText_0x5e054
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface RADIOTOWER2F_BUENA, RIGHT
 	special FadeOutMusic
 	pause 20
 	special RestartMapMusic
@@ -231,7 +231,7 @@ UnknownScript_0x5d86b:
 	checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
 	iftrue UnknownScript_0x5d8cc
 UnknownScript_0x5d87b:
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface RADIOTOWER2F_BUENA, RIGHT
 	end
 
 UnknownScript_0x5d87f:
@@ -243,7 +243,7 @@ UnknownScript_0x5d87f:
 	checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
 	iftrue UnknownScript_0x5d8cc
 UnknownScript_0x5d88f:
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface RADIOTOWER2F_BUENA, RIGHT
 	end
 
 UnknownScript_0x5d893:
@@ -261,9 +261,9 @@ UnknownScript_0x5d8a4:
 	checkcellnum PHONE_BUENA
 	iftrue UnknownScript_0x5d8fe
 	pause 20
-	spriteface RADIOTOWER2F_BUENA, DOWN
+	objectface RADIOTOWER2F_BUENA, DOWN
 	pause 15
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	pause 15
 	checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
 	iftrue UnknownScript_0x5d8cc
@@ -288,7 +288,7 @@ UnknownScript_0x5d8d0:
 	writetext UnknownText_0x5e310
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface RADIOTOWER2F_BUENA, RIGHT
 	addcellnum PHONE_BUENA
 	end
 
@@ -296,14 +296,14 @@ UnknownScript_0x5d8ed:
 	writetext UnknownText_0x5e33c
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface RADIOTOWER2F_BUENA, RIGHT
 	end
 
 UnknownScript_0x5d8f6:
 	writetext UnknownText_0x5e35e
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface RADIOTOWER2F_BUENA, RIGHT
 UnknownScript_0x5d8fe:
 	end
 
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index 0a21e6952..ceeb94cde 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -23,7 +23,7 @@ RadioTower5F_MapScripts:
 	end
 
 FakeDirectorScript:
-	spriteface RADIOTOWER5F_DIRECTOR, UP
+	objectface RADIOTOWER5F_DIRECTOR, UP
 	showemote EMOTE_SHOCK, RADIOTOWER5F_DIRECTOR, 15
 	opentext
 	writetext FakeDirectorTextBefore1
@@ -79,7 +79,7 @@ TrainerExecutivef1:
 RadioTower5FRocketBossScene:
 	applymovement PLAYER, MovementData_0x60125
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface RADIOTOWER5F_ROCKET, RIGHT
+	objectface RADIOTOWER5F_ROCKET, RIGHT
 	opentext
 	writetext RadioTower5FRocketBossBeforeText
 	waitbutton
@@ -116,7 +116,7 @@ RadioTower5FRocketBossScene:
 	moveobject RADIOTOWER5F_DIRECTOR, 12, 0
 	appear RADIOTOWER5F_DIRECTOR
 	applymovement RADIOTOWER5F_DIRECTOR, RadioTower5FDirectorWalksIn
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext RadioTower5FDirectorThankYouText
 	buttonsound
diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm
index 90826b4c9..0eb121e05 100644
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -20,7 +20,7 @@ UnknownScript_0x733ed:
 
 UnknownScript_0x733f3:
 	showemote EMOTE_SHOCK, ROUTE16GATE_OFFICER, 15
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext UnknownText_0x73496
 	waitbutton
diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm
index c61a83011..dcf24da14 100644
--- a/maps/Route17Route18Gate.asm
+++ b/maps/Route17Route18Gate.asm
@@ -20,7 +20,7 @@ UnknownScript_0x73611:
 
 UnknownScript_0x73617:
 	showemote EMOTE_SHOCK, ROUTE17ROUTE18GATE_OFFICER, 15
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext UnknownText_0x7364d
 	waitbutton
diff --git a/maps/Route25.asm b/maps/Route25.asm
index 749603f55..62e247756 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -28,21 +28,21 @@ Route25MistyDate1Script:
 	showemote EMOTE_HEART, ROUTE25_MISTY, 15
 	pause 30
 	showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10
-	spriteface ROUTE25_MISTY, DOWN
+	objectface ROUTE25_MISTY, DOWN
 	applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x19efe8
 	disappear ROUTE25_COOLTRAINER_M1
 	pause 15
 	playmusic MUSIC_BEAUTY_ENCOUNTER
-	spriteface ROUTE25_MISTY, UP
+	objectface ROUTE25_MISTY, UP
 	pause 10
 	applymovement ROUTE25_MISTY, MovementData_0x19efed
 	opentext
 	writetext Route25MistyDateText
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	applymovement ROUTE25_MISTY, MovementData_0x19effa
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement ROUTE25_MISTY, MovementData_0x19f000
 	disappear ROUTE25_MISTY
 	clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
@@ -54,21 +54,21 @@ Route25MistyDate2Script:
 	showemote EMOTE_HEART, ROUTE25_MISTY, 15
 	pause 30
 	showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10
-	spriteface ROUTE25_MISTY, DOWN
+	objectface ROUTE25_MISTY, DOWN
 	applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x19efea
 	disappear ROUTE25_COOLTRAINER_M1
 	pause 15
 	playmusic MUSIC_BEAUTY_ENCOUNTER
-	spriteface ROUTE25_MISTY, UP
+	objectface ROUTE25_MISTY, UP
 	pause 10
 	applymovement ROUTE25_MISTY, MovementData_0x19eff4
 	opentext
 	writetext Route25MistyDateText
 	waitbutton
 	closetext
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	applymovement ROUTE25_MISTY, MovementData_0x19effd
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement ROUTE25_MISTY, MovementData_0x19f000
 	disappear ROUTE25_MISTY
 	clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
diff --git a/maps/Route27.asm b/maps/Route27.asm
index 1fabf3395..f19acf508 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -23,17 +23,17 @@ Route27_MapScripts:
 	end
 
 UnknownScript_0x1a0873:
-	spriteface ROUTE27_FISHER, LEFT
+	objectface ROUTE27_FISHER, LEFT
 	showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
 	applymovement ROUTE27_FISHER, MovementData_0x1a0a66
 	jump UnknownScript_0x1a088c
 
 UnknownScript_0x1a0881:
-	spriteface ROUTE27_FISHER, LEFT
+	objectface ROUTE27_FISHER, LEFT
 	showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
 	applymovement ROUTE27_FISHER, MovementData_0x1a0a69
 UnknownScript_0x1a088c:
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext Route27FisherHeyText
 	buttonsound
diff --git a/maps/Route29.asm b/maps/Route29.asm
index e3ef95169..e8fc8878a 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -37,10 +37,10 @@ Route29_MapScripts:
 	return
 
 Route29Tutorial1:
-	spriteface ROUTE29_COOLTRAINER_M1, UP
+	objectface ROUTE29_COOLTRAINER_M1, UP
 	showemote EMOTE_SHOCK, ROUTE29_COOLTRAINER_M1, 15
 	applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1a
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	setevent EVENT_DUDE_TALKED_TO_YOU
 	opentext
 	writetext CatchingTutorialIntroText
@@ -52,7 +52,7 @@ Route29Tutorial1:
 	stopfollow
 	loadwildmon RATTATA, 5
 	catchtutorial BATTLETYPE_TUTORIAL
-	spriteface ROUTE29_COOLTRAINER_M1, UP
+	objectface ROUTE29_COOLTRAINER_M1, UP
 	opentext
 	writetext CatchingTutorialDebriefText
 	waitbutton
@@ -62,10 +62,10 @@ Route29Tutorial1:
 	end
 
 Route29Tutorial2:
-	spriteface ROUTE29_COOLTRAINER_M1, UP
+	objectface ROUTE29_COOLTRAINER_M1, UP
 	showemote EMOTE_SHOCK, ROUTE29_COOLTRAINER_M1, 15
 	applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2a
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	setevent EVENT_DUDE_TALKED_TO_YOU
 	opentext
 	writetext CatchingTutorialIntroText
@@ -77,7 +77,7 @@ Route29Tutorial2:
 	stopfollow
 	loadwildmon RATTATA, 5
 	catchtutorial BATTLETYPE_TUTORIAL
-	spriteface ROUTE29_COOLTRAINER_M1, UP
+	objectface ROUTE29_COOLTRAINER_M1, UP
 	opentext
 	writetext CatchingTutorialDebriefText
 	waitbutton
diff --git a/maps/Route30.asm b/maps/Route30.asm
index a96ac9be5..5f20a239d 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -29,7 +29,7 @@ YoungsterJoey_ImportantBattleScript:
 	faceplayer
 	writetext Text_ThisIsABigBattle
 	waitbutton
-	spriteface ROUTE30_YOUNGSTER1, UP
+	objectface ROUTE30_YOUNGSTER1, UP
 	closetext
 	playsound SFX_TACKLE
 	applymovement ROUTE30_MONSTER1, Route30_MikeysRattataAttacksMovement
diff --git a/maps/Route32.asm b/maps/Route32.asm
index f5eb5b345..cbfe311cd 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -85,8 +85,8 @@ Route32CooltrainerMContinueScene:
 	end
 
 Route32CooltrainerMStopsYouScene:
-	spriteface ROUTE32_COOLTRAINER_M, LEFT
-	spriteface PLAYER, RIGHT
+	objectface ROUTE32_COOLTRAINER_M, LEFT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext Route32CooltrainerMText_WhatsTheHurry
 	waitbutton
@@ -94,7 +94,7 @@ Route32CooltrainerMStopsYouScene:
 	follow PLAYER, ROUTE32_COOLTRAINER_M
 	applymovement PLAYER, Movement_Route32CooltrainerMPushesYouBackToViolet
 	stopfollow
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	scall Route32CooltrainerMContinueScene
 	applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset1
 	applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset2
@@ -118,8 +118,8 @@ Route32RoarTMGuyScript:
 	end
 
 Route32WannaBuyASlowpokeTailScript:
-	spriteface ROUTE32_FISHER4, DOWN
-	spriteface PLAYER, UP
+	objectface ROUTE32_FISHER4, DOWN
+	objectface PLAYER, UP
 	jump _OfferToSellSlowpokeTail
 
 SlowpokeTailSalesmanScript:
diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
index 8d600639e..19291b412 100644
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -26,12 +26,12 @@ UnknownScript_0x62d3d:
 	checkevent EVENT_FOREST_IS_RESTLESS
 	iffalse UnknownScript_0x62d62
 	showemote EMOTE_SHOCK, ROUTE34ILEXFORESTGATE_TEACHER2, 20
-	spriteface ROUTE34ILEXFORESTGATE_TEACHER2, LEFT
-	spriteface PLAYER, RIGHT
+	objectface ROUTE34ILEXFORESTGATE_TEACHER2, LEFT
+	objectface PLAYER, RIGHT
 	follow PLAYER, ROUTE34ILEXFORESTGATE_TEACHER2
 	applymovement PLAYER, MovementData_0x62d97
 	stopfollow
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	opentext
 	writetext UnknownText_0x62e41
 	waitbutton
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index 981fd5cb6..01f4dcaf2 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -53,7 +53,7 @@ Route35NationalParkGate_MapScripts:
 
 .LeavingContestEarly:
 	applymovement PLAYER, MovementData_0x6a2e2
-	spriteface ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT
+	objectface ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT
 	opentext
 	checkcode VAR_CONTESTMINUTES
 	addvar 1
diff --git a/maps/Route36.asm b/maps/Route36.asm
index 032394ff9..0a46f1ca7 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -37,10 +37,10 @@ Route36SuicuneScript:
 	showemote EMOTE_SHOCK, PLAYER, 15
 	pause 15
 	playsound SFX_WARP_FROM
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	applymovement ROUTE36_SUICUNE, Route36SuicuneMovement
 	disappear ROUTE36_SUICUNE
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	pause 10
 	setscene SCENE_ROUTE36_NOTHING
 	clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index 3d9b1c58e..bf53bf964 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -62,7 +62,7 @@ Route36NationalParkGate_MapScripts:
 	return
 
 .LeavingContestEarly:
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	checkcode VAR_CONTESTMINUTES
 	addvar 1
@@ -87,7 +87,7 @@ Route36NationalParkGate_MapScripts:
 	writetext UnknownText_0x6b300
 	waitbutton
 	closetext
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	playsound SFX_EXIT_BUILDING
 	special FadeOutPalettes
 	waitsfx
@@ -170,7 +170,7 @@ Route36OfficerScriptContest:
 	closetext
 	setflag ENGINE_BUG_CONTEST_TIMER
 	special GiveParkBalls
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	playsound SFX_EXIT_BUILDING
 	special FadeOutPalettes
 	waitsfx
diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm
index 71d6745ce..9c3f2af8c 100644
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -16,14 +16,14 @@ TwinScript_0x9cc76:
 	writetext Text_MoomooIsSick
 	waitbutton
 	closetext
-	spriteface ROUTE39BARN_TWIN1, RIGHT
+	objectface ROUTE39BARN_TWIN1, RIGHT
 	end
 
 .FeedingMooMoo:
 	writetext Text_WereFeedingMoomoo
 	waitbutton
 	closetext
-	spriteface ROUTE39BARN_TWIN1, RIGHT
+	objectface ROUTE39BARN_TWIN1, RIGHT
 	end
 
 TwinScript_0x9cc90:
@@ -34,14 +34,14 @@ TwinScript_0x9cc90:
 	writetext Text_MoomooIsSick
 	waitbutton
 	closetext
-	spriteface ROUTE39BARN_TWIN2, LEFT
+	objectface ROUTE39BARN_TWIN2, LEFT
 	end
 
 .FeedingMooMoo:
 	writetext Text_WereFeedingMoomoo
 	waitbutton
 	closetext
-	spriteface ROUTE39BARN_TWIN2, LEFT
+	objectface ROUTE39BARN_TWIN2, LEFT
 	end
 
 MooMoo:
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index 6d0795642..9b24aaf25 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -42,7 +42,7 @@ RocketScript_Southbound:
 	applymovement PLAYER, PlayerStepsIn
 	showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET2, 15
 	applymovement ROUTE43GATE_ROCKET2, Rocket2Script_BlocksYouSouth
-	spriteface ROUTE43GATE_ROCKET1, UP
+	objectface ROUTE43GATE_ROCKET1, UP
 	showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET1, 15
 	applymovement ROUTE43GATE_ROCKET1, Rocket1Script_BlocksYouSouth
 	opentext
@@ -74,7 +74,7 @@ RocketScript_ShakeDownSouth:
 RocketScript_Northbound:
 	showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET1, 15
 	applymovement ROUTE43GATE_ROCKET1, Rocket1Script_BlocksYouNorth
-	spriteface ROUTE43GATE_ROCKET2, DOWN
+	objectface ROUTE43GATE_ROCKET2, DOWN
 	showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET2, 15
 	applymovement ROUTE43GATE_ROCKET2, Rocket2Script_BlocksYouNorth
 	opentext
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index 98cef9d68..fed2ca1f5 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -95,7 +95,7 @@ UnknownScript_0x587c0:
 	writetext UnknownText_0x588f5
 	waitbutton
 	closetext
-	spriteface RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP
+	objectface RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP
 	end
 
 UnknownScript_0x587c9:
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index f9d1b6f7b..9c6c3da41 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -42,13 +42,13 @@ RuinsOfAlphOutside_MapScripts:
 	return
 
 RuinsOfAlphOutsideScientistScene1:
-	spriteface RUINSOFALPHOUTSIDE_SCIENTIST, UP
-	spriteface PLAYER, DOWN
+	objectface RUINSOFALPHOUTSIDE_SCIENTIST, UP
+	objectface PLAYER, DOWN
 	jump UnknownScript_0x58044
 
 RuinsOfAlphOutsideScientistScene2:
-	spriteface RUINSOFALPHOUTSIDE_SCIENTIST, LEFT
-	spriteface PLAYER, RIGHT
+	objectface RUINSOFALPHOUTSIDE_SCIENTIST, LEFT
+	objectface PLAYER, RIGHT
 	jump UnknownScript_0x58044
 
 ScientistScript_0x58043:
@@ -96,7 +96,7 @@ YoungsterScript_0x5807e:
 	writetext UnknownText_0x5848e
 	waitbutton
 	closetext
-	spriteface RUINSOFALPHOUTSIDE_YOUNGSTER3, UP
+	objectface RUINSOFALPHOUTSIDE_YOUNGSTER3, UP
 	end
 
 TrainerPsychicNathan:
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index 8b2c8430d..0b136853f 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -38,7 +38,7 @@ RuinsOfAlphResearchCenter_MapScripts:
 	pause 30
 	playsound SFX_TRANSACTION
 	pause 30
-	spriteface RUINSOFALPHRESEARCHCENTER_SCIENTIST3, DOWN
+	objectface RUINSOFALPHRESEARCHCENTER_SCIENTIST3, DOWN
 	opentext
 	writetext UnknownText_0x59278
 	waitbutton
diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm
index 986f9badf..d5ad15387 100644
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -48,7 +48,7 @@ TrainerGruntM1:
 	moveobject SLOWPOKEWELLB1F_KURT, 11, 6
 	appear SLOWPOKEWELLB1F_KURT
 	applymovement SLOWPOKEWELLB1F_KURT, KurtSlowpokeWellVictoryMovementData
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext KurtLeaveSlowpokeWellText
 	waitbutton
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index 3df7ac4ed..78c58eca0 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -21,7 +21,7 @@ SproutTower3F_MapScripts:
 	end
 
 UnknownScript_0x184947:
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	playsound SFX_TACKLE
@@ -38,7 +38,7 @@ UnknownScript_0x184947:
 	waitbutton
 	closetext
 	showemote EMOTE_SHOCK, SPROUTTOWER3F_SILVER, 15
-	spriteface SPROUTTOWER3F_SILVER, DOWN
+	objectface SPROUTTOWER3F_SILVER, DOWN
 	pause 15
 	applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a24
 	playmusic MUSIC_RIVAL_ENCOUNTER
@@ -46,7 +46,7 @@ UnknownScript_0x184947:
 	writetext UnknownText_0x184aec
 	waitbutton
 	closetext
-	spriteface SPROUTTOWER3F_SILVER, UP
+	objectface SPROUTTOWER3F_SILVER, UP
 	opentext
 	writetext UnknownText_0x184bc8
 	pause 15
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index 5b3874680..4aad71817 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -30,7 +30,7 @@ SecurityCamera1a:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 2
 	appear TEAMROCKETBASEB1F_ROCKET1
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
@@ -55,7 +55,7 @@ SecurityCamera1b:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 3
 	appear TEAMROCKETBASEB1F_ROCKET1
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
@@ -80,14 +80,14 @@ SecurityCamera2a:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 4, 7
 	appear TEAMROCKETBASEB1F_ROCKET1
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement2
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 12, 5
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement3
@@ -106,14 +106,14 @@ SecurityCamera2b:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 4, 8
 	appear TEAMROCKETBASEB1F_ROCKET1
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement4
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 12, 5
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement5
@@ -132,14 +132,14 @@ SecurityCamera3a:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 6
 	appear TEAMROCKETBASEB1F_ROCKET1
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 11
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement6
@@ -158,14 +158,14 @@ SecurityCamera3b:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 7
 	appear TEAMROCKETBASEB1F_ROCKET1
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 12
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement7
@@ -184,14 +184,14 @@ SecurityCamera4:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 17, 16
 	appear TEAMROCKETBASEB1F_ROCKET1
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 11
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement8
@@ -210,14 +210,14 @@ SecurityCamera5:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 3, 16
 	appear TEAMROCKETBASEB1F_ROCKET1
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 14, 16
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement9
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 8c673b755..511a79bd8 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -61,20 +61,20 @@ UnknownScript_0x6cfac:
 	writetext UnknownText_0x6d2ad
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
 	applymovement PLAYER, MovementData_0x6d21f
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d224
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d22f
 	opentext
 	writetext UnknownText_0x6d2c3
 	waitbutton
 	closetext
 	cry DRAGONITE
-	spriteface TEAMROCKETBASEB2F_ROCKET_GIRL, LEFT
-	spriteface PLAYER, LEFT
+	objectface TEAMROCKETBASEB2F_ROCKET_GIRL, LEFT
+	objectface PLAYER, LEFT
 	appear TEAMROCKETBASEB2F_DRAGON
 	applymovement TEAMROCKETBASEB2F_DRAGON, MovementData_0x6d236
 	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d23b
@@ -85,7 +85,7 @@ UnknownScript_0x6cfac:
 	writetext UnknownText_0x6d38c
 	waitbutton
 	closetext
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d241
 	opentext
 	writetext UnknownText_0x6d3bd
@@ -118,13 +118,13 @@ UnknownScript_0x6cfac:
 	special FadeInQuickly
 	setscene SCENE_TEAMROCKETBASEB2F_ELECTRODES
 	clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE
-	spriteface TEAMROCKETBASEB2F_LANCE, DOWN
+	objectface TEAMROCKETBASEB2F_LANCE, DOWN
 	opentext
 	writetext UnknownText_0x6d5d8
 	waitbutton
 	closetext
 	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d250
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext UnknownText_0x6d64e
 	waitbutton
@@ -153,12 +153,12 @@ UnknownScript_0x6d07a:
 	end
 
 LanceHealsScript1:
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	jump LanceHealsCommon
 
 LanceHealsScript2:
-	spriteface PLAYER, RIGHT
-	spriteface TEAMROCKETBASEB2F_LANCE, LEFT
+	objectface PLAYER, RIGHT
+	objectface TEAMROCKETBASEB2F_LANCE, LEFT
 LanceHealsCommon:
 	opentext
 	writetext LanceHealsText1
@@ -281,7 +281,7 @@ UnknownScript_0x6d184:
 	moveobject TEAMROCKETBASEB2F_LANCE, 18, 6
 	appear TEAMROCKETBASEB2F_LANCE
 	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext UnknownText_0x6d809
 	buttonsound
@@ -290,12 +290,12 @@ UnknownScript_0x6d184:
 	writetext UnknownText_0x6d8f8
 	waitbutton
 	closetext
-	spriteface TEAMROCKETBASEB2F_LANCE, DOWN
+	objectface TEAMROCKETBASEB2F_LANCE, DOWN
 	opentext
 	writetext UnknownText_0x6d994
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d283
 	disappear TEAMROCKETBASEB2F_LANCE
 	setevent EVENT_CLEARED_ROCKET_HIDEOUT
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index 2ac2c8cf6..db2b7dcf8 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -47,9 +47,9 @@ TeamRocketBaseB3F_MapScripts:
 	return
 
 LanceGetPasswordScript:
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	pause 5
-	spriteface TEAMROCKETBASEB3F_MOLTRES, RIGHT
+	objectface TEAMROCKETBASEB3F_MOLTRES, RIGHT
 	pause 20
 	applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12a
 	opentext
@@ -62,12 +62,12 @@ LanceGetPasswordScript:
 	end
 
 RocketBaseRival:
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	appear TEAMROCKETBASEB3F_SILVER
 	applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalEnterMovement
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
 	writetext RocketBaseRivalText
@@ -94,7 +94,7 @@ UnknownScript_0x6e056:
 	pause 30
 	showemote EMOTE_SHOCK, TEAMROCKETBASEB3F_ROCKET1, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface TEAMROCKETBASEB3F_ROCKET1, DOWN
+	objectface TEAMROCKETBASEB3F_ROCKET1, DOWN
 	opentext
 	writetext UnknownText_0x6e400
 	waitbutton
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index e161ac071..77fa5b83e 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -88,7 +88,7 @@ TinTower1F_MapScripts:
 	special MonCheck
 	iftrue .Next1 ; if player caught Raikou, he doesn't appear in Tin Tower
 	applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement1
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	cry RAIKOU
 	pause 10
 	playsound SFX_WARP_FROM
@@ -101,7 +101,7 @@ TinTower1F_MapScripts:
 	special MonCheck
 	iftrue .Next2 ; if player caught Entei, he doesn't appear in Tin Tower
 	applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement1
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	cry ENTEI
 	pause 10
 	playsound SFX_WARP_FROM
@@ -110,7 +110,7 @@ TinTower1F_MapScripts:
 	playsound SFX_EXIT_BUILDING
 	waitsfx
 .Next2:
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	pause 10
 	applymovement PLAYER, TinTowerPlayerMovement2
 	applymovement TINTOWER1F_SUICUNE, TinTowerSuicuneMovement
@@ -132,7 +132,7 @@ TinTower1F_MapScripts:
 	clearevent EVENT_SET_WHEN_FOUGHT_HO_OH
 	reloadmapafterbattle
 	pause 20
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	playmusic MUSIC_MYSTICALMAN_ENCOUNTER
 	playsound SFX_ENTER_DOOR
 	moveobject TINTOWER1F_EUSINE, 10, 15
@@ -153,7 +153,7 @@ TinTower1F_MapScripts:
 	moveobject TINTOWER1F_SAGE1, 7, 13
 	moveobject TINTOWER1F_SAGE2, 9, 13
 	moveobject TINTOWER1F_SAGE3, 11, 13
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext TinTowerEusineSuicuneText
 	waitbutton
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index 1f654edcd..e3dd6f3b3 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -12,7 +12,7 @@ TrainerHouseB1F_MapScripts:
 	end
 
 TrainerHouseReceptionistScript:
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	checkflag ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY
 	iftrue .FoughtTooManyTimes
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index 550608746..2a7d6a5f9 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -43,7 +43,7 @@ SailorScript_0x74dc4:
 	writetext UnknownText_0x74f06
 	waitbutton
 	closetext
-	spriteface VERMILIONPORT_SAILOR1, DOWN
+	objectface VERMILIONPORT_SAILOR1, DOWN
 	pause 10
 	playsound SFX_EXIT_BUILDING
 	disappear VERMILIONPORT_SAILOR1
@@ -77,12 +77,12 @@ UnknownScript_0x74e1a:
 	end
 
 UnknownScript_0x74e20:
-	spriteface VERMILIONPORT_SAILOR2, RIGHT
+	objectface VERMILIONPORT_SAILOR2, RIGHT
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	iftrue UnknownScript_0x74e86
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	iftrue UnknownScript_0x74e86
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	opentext
 	checkcode VAR_WEEKDAY
 	ifequal MONDAY, UnknownScript_0x74e72
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index 80e9f0d2c..46fb6d892 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -21,7 +21,7 @@ VictoryRoad_MapScripts:
 
 UnknownScript_0x74492:
 	moveobject VICTORYROAD_SILVER, 18, 11
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
@@ -35,7 +35,7 @@ UnknownScript_0x74492:
 	end
 
 UnknownScript_0x744b5:
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
@@ -49,7 +49,7 @@ UnknownScript_0x744b5:
 	end
 
 UnknownScript_0x744d4:
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
 	writetext UnknownText_0x7455f
diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm
index 4d2caa9e2..124905729 100644
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -17,7 +17,7 @@ VictoryRoadGate_MapScripts:
 	end
 
 VictoryRoadGateBadgeCheckScene:
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	jump VictoryRoadGateBadgeCheckScript
 
 VictoryRoadGateOfficerScript:
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
index 7ef3f82b7..d4ece46fb 100644
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -40,7 +40,7 @@ VioletCityEarlScript:
 	playmusic MUSIC_SHOW_ME_AROUND
 	follow VIOLETCITY_EARL, PLAYER
 	applymovement VIOLETCITY_EARL, VioletCityFollowEarl_MovementData
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	applymovement VIOLETCITY_EARL, VioletCitySpinningEarl_MovementData
 	stopfollow
 	special RestartMapMusic
diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm
index ecec3c2d6..5795f1591 100644
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -36,7 +36,7 @@ VioletPokecenter1F_ElmsAideScript:
 	closetext
 	checkcode VAR_FACING
 	ifequal UP, .AideWalksAroundPlayer
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksStraightOutOfPokecenter
 	playsound SFX_EXIT_BUILDING
 	disappear VIOLETPOKECENTER1F_SCIENTIST
@@ -45,7 +45,7 @@ VioletPokecenter1F_ElmsAideScript:
 
 .AideWalksAroundPlayer:
 	applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksLeftToExitPokecenter
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideFinishesLeavingPokecenter
 	playsound SFX_EXIT_BUILDING
 	disappear VIOLETPOKECENTER1F_SCIENTIST
diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm
index 83a8f8f9e..46dc964f2 100644
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -51,19 +51,19 @@ WiseTriosRoomSage3Script:
 	jumptextfaceplayer WiseTriosRoomSage3Text
 
 UnknownScript_0x985a3:
-	spriteface WISETRIOSROOM_SAGE3, UP
-	spriteface PLAYER, DOWN
+	objectface WISETRIOSROOM_SAGE3, UP
+	objectface PLAYER, DOWN
 	showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE3, 20
 	follow PLAYER, WISETRIOSROOM_SAGE3
 	applymovement PLAYER, MovementData_0x98622
 	stopfollow
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext UnknownText_0x98712
 	waitbutton
 	closetext
 	applymovement WISETRIOSROOM_SAGE3, MovementData_0x98625
-	spriteface WISETRIOSROOM_SAGE3, LEFT
+	objectface WISETRIOSROOM_SAGE3, LEFT
 	end
 
 TrainerSageGaku:
@@ -101,7 +101,7 @@ TrainerSageKoji:
 	waitbutton
 	closetext
 	applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628
-	spriteface WISETRIOSROOM_SAGE6, UP
+	objectface WISETRIOSROOM_SAGE6, UP
 	setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
 	setscene SCENE_FINISHED
 	end

From 07fddb180362d4a03d4084b4a6fd26f8d24adf42 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Fri, 2 Feb 2018 22:24:50 -0500
Subject: [PATCH 099/135] Legacy support macros

---
 macros.asm        |   2 +-
 macros/data.asm   |   5 ++
 macros/legacy.asm | 159 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 165 insertions(+), 1 deletion(-)
 create mode 100644 macros/legacy.asm

diff --git a/macros.asm b/macros.asm
index 76cbe790d..1018eeb1f 100644
--- a/macros.asm
+++ b/macros.asm
@@ -16,4 +16,4 @@ INCLUDE "macros/scripts/battle_anims.asm"
 INCLUDE "macros/scripts/trade_anims.asm"
 INCLUDE "macros/scripts/gfx_anims.asm"
 
-percent EQUS "* $ff / 100"
+INCLUDE "macros/legacy.asm"
diff --git a/macros/data.asm b/macros/data.asm
index 8345a2523..d0e93d73f 100644
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -1,3 +1,8 @@
+; Value macros
+
+percent EQUS "* $ff / 100"
+
+
 ; Constant data (db, dw, dl) macros
 
 dwb: MACRO
diff --git a/macros/legacy.asm b/macros/legacy.asm
new file mode 100644
index 000000000..20d3256bd
--- /dev/null
+++ b/macros/legacy.asm
@@ -0,0 +1,159 @@
+; Legacy support for pre-2018 pokecrystal.
+; Allows porting scripts with as few edits as possible.
+
+; macros/rst.asm
+callba EQUS "farcall"
+callab EQUS "callfar"
+
+; macros/scripts/audio.asm
+unknownmusic0xde EQUS "sound_duty"
+
+
+; macros/scripts/events.asm
+
+checkmorn EQUS "checktime MORN"
+checkday  EQUS "checktime DAY"
+checknite EQUS "checktime NITE"
+
+if_equal        EQUS "ifequal"
+if_not_equal    EQUS "ifnotequal"
+if_greater_than EQUS "ifgreater"
+if_less_than    EQUS "ifless"
+end_all         EQUS "endall"
+
+checkmaptriggers EQUS "checkmapscene"
+domaptrigger     EQUS "setmapscene"
+checktriggers    EQUS "checkscene"
+dotrigger        EQUS "setscene"
+faceperson       EQUS "faceobject"
+moveperson       EQUS "moveobject"
+writepersonxy    EQUS "writeobjectxy"
+spriteface       EQUS "objectface"
+
+RAM2MEM           EQUS "vartomem"
+loadfont          EQUS "opentext"
+loadmenudata      EQUS "loadmenuheader"
+writebackup       EQUS "closewindow"
+interpretmenu     EQUS "_2dmenu"
+interpretmenu2    EQUS "verticalmenu"
+battlecheck       EQUS "randomwildmon"
+loadtrainerdata   EQUS "loadmemtrainer"
+loadpokedata      EQUS "loadwildmon"
+returnafterbattle EQUS "reloadmapafterbattle"
+trainerstatus     EQUS "trainerflagaction"
+talkaftercancel   EQUS "endifjustbattled"
+talkaftercheck    EQUS "checkjustbattled"
+playrammusic      EQUS "encountermusic"
+reloadmapmusic    EQUS "dontrestartmapmusic"
+resetfuncs        EQUS "endall"
+storetext         EQUS "battletowertext"
+displaylocation   EQUS "landmarktotext"
+
+
+; macros/scripts/maps.asm
+
+maptrigger EQUS "scene_script"
+
+warp_def: MACRO
+	warp_event \2, \1, \4, \3
+ENDM
+
+xy_trigger: MACRO
+	coord_event \3, \2, \1, \5
+ENDM
+
+signpost: MACRO
+	bg_event \2, \1, \3, \4
+ENDM
+
+person_event: MACRO
+;	object_event \3, \2, \1, \4, \5, \6, \7, \8, \9, \10, \11, \12, \13
+	db \1, \2 + 4, \3 + 4, \4
+	dn \6, \5
+	db \7, \8
+	shift
+	dn \8, \9
+	shift
+	db \9
+	shift
+	dw \9
+	shift
+	dw \9
+ENDM
+
+PERSONTYPE_SCRIPT   EQUS "OBJECTTYPE_SCRIPT"
+PERSONTYPE_ITEMBALL EQUS "OBJECTTYPE_ITEMBALL"
+PERSONTYPE_TRAINER  EQUS "OBJECTTYPE_TRAINER"
+
+
+; macros/scripts/movement.asm
+
+show_person   EQUS "show_object"
+hide_person   EQUS "hide_person"
+remove_person EQUS "remove_object"
+
+turn_head_down        EQUS "turn_head DOWN"
+turn_head_up          EQUS "turn_head UP"
+turn_head_left        EQUS "turn_head LEFT"
+turn_head_right       EQUS "turn_head RIGHT"
+turn_step_down        EQUS "turn_step DOWN"
+turn_step_up          EQUS "turn_step UP"
+turn_step_left        EQUS "turn_step LEFT"
+turn_step_right       EQUS "turn_step RIGHT"
+slow_step_down        EQUS "slow_step DOWN"
+slow_step_up          EQUS "slow_step UP"
+slow_step_left        EQUS "slow_step LEFT"
+slow_step_right       EQUS "slow_step RIGHT"
+step_down             EQUS "step DOWN"
+step_up               EQUS "step UP"
+step_left             EQUS "step LEFT"
+step_right            EQUS "step RIGHT"
+big_step_down         EQUS "big_step DOWN"
+big_step_up           EQUS "big_step UP"
+big_step_left         EQUS "big_step LEFT"
+big_step_right        EQUS "big_step RIGHT"
+slow_slide_step_down  EQUS "slow_slide_step DOWN"
+slow_slide_step_up    EQUS "slow_slide_step UP"
+slow_slide_step_left  EQUS "slow_slide_step LEFT"
+slow_slide_step_right EQUS "slow_slide_step RIGHT"
+slide_step_down       EQUS "slide_step DOWN"
+slide_step_up         EQUS "slide_step UP"
+slide_step_left       EQUS "slide_step LEFT"
+slide_step_right      EQUS "slide_step RIGHT"
+fast_slide_step_down  EQUS "fast_slide_step DOWN"
+fast_slide_step_up    EQUS "fast_slide_step UP"
+fast_slide_step_left  EQUS "fast_slide_step LEFT"
+fast_slide_step_right EQUS "fast_slide_step RIGHT"
+turn_away_down        EQUS "turn_away DOWN"
+turn_away_up          EQUS "turn_away UP"
+turn_away_left        EQUS "turn_away LEFT"
+turn_away_right       EQUS "turn_away RIGHT"
+turn_in_down          EQUS "turn_in DOWN"
+turn_in_up            EQUS "turn_in UP"
+turn_in_left          EQUS "turn_in LEFT"
+turn_in_right         EQUS "turn_in RIGHT"
+turn_waterfall_down   EQUS "turn_waterfall DOWN"
+turn_waterfall_up     EQUS "turn_waterfall UP"
+turn_waterfall_left   EQUS "turn_waterfall LEFT"
+turn_waterfall_right  EQUS "turn_waterfall RIGHT"
+slow_jump_step_down   EQUS "slow_jump_step DOWN"
+slow_jump_step_up     EQUS "slow_jump_step UP"
+slow_jump_step_left   EQUS "slow_jump_step LEFT"
+slow_jump_step_right  EQUS "slow_jump_step RIGHT"
+jump_step_down        EQUS "jump_step DOWN"
+jump_step_up          EQUS "jump_step UP"
+jump_step_left        EQUS "jump_step LEFT"
+jump_step_right       EQUS "jump_step RIGHT"
+fast_jump_step_down   EQUS "fast_jump_step DOWN"
+fast_jump_step_up     EQUS "fast_jump_step UP"
+fast_jump_step_left   EQUS "fast_jump_step LEFT"
+fast_jump_step_right  EQUS "fast_jump_step RIGHT"
+
+step_sleep_1 EQUS "step_sleep 1"
+step_sleep_2 EQUS "step_sleep 2"
+step_sleep_3 EQUS "step_sleep 3"
+step_sleep_4 EQUS "step_sleep 4"
+step_sleep_5 EQUS "step_sleep 5"
+step_sleep_6 EQUS "step_sleep 6"
+step_sleep_7 EQUS "step_sleep 7"
+step_sleep_8 EQUS "step_sleep 8"

From f258ff8a417ba44a3cc0679c59f1a278ea108ed2 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Fri, 2 Feb 2018 22:28:29 -0500
Subject: [PATCH 100/135] oops

---
 macros/legacy.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macros/legacy.asm b/macros/legacy.asm
index 20d3256bd..a8a89829a 100644
--- a/macros/legacy.asm
+++ b/macros/legacy.asm
@@ -89,7 +89,7 @@ PERSONTYPE_TRAINER  EQUS "OBJECTTYPE_TRAINER"
 ; macros/scripts/movement.asm
 
 show_person   EQUS "show_object"
-hide_person   EQUS "hide_person"
+hide_person   EQUS "hide_object"
 remove_person EQUS "remove_object"
 
 turn_head_down        EQUS "turn_head DOWN"

From 45373ec601e5af5bc2be7a72b8556e4311efdc05 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Fri, 2 Feb 2018 22:45:42 -0500
Subject: [PATCH 101/135] sine_wave macro parameterizes table size, not
 frequency ("amplitude" was an incorrect comment)

---
 engine/battle/battle_transition.asm |  2 +-
 engine/battle_anims/functions.asm   |  2 +-
 engine/events/celebi.asm            |  2 +-
 engine/routines/sine.asm            |  2 +-
 engine/sprites.asm                  |  2 +-
 macros/data.asm                     | 34 ++++++++++++++---------------
 6 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm
index 452339e81..0c2f7e8cc 100644
--- a/engine/battle/battle_transition.asm
+++ b/engine/battle/battle_transition.asm
@@ -789,7 +789,7 @@ StartTrainerBattle_DrawSineWave: ; 8c6f7 (23:46f7)
 ; 8c728 (23:4728)
 
 .sinewave ; 8c728
-	sine_wave $100
+	sine_wave 32
 ; 8c768
 
 StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768)
diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm
index 817df4967..25d1a50c4 100755
--- a/engine/battle_anims/functions.asm
+++ b/engine/battle_anims/functions.asm
@@ -4157,5 +4157,5 @@ BattleAnim_AbsCosinePrecise: ; ce778
 
 ; ce77f
 BattleAnimSineWave: ; ce77f
-	sine_wave $100
+	sine_wave 32
 ; ce7bf
diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm
index 4d60a7d99..f6cedd074 100755
--- a/engine/events/celebi.asm
+++ b/engine/events/celebi.asm
@@ -281,7 +281,7 @@ CelebiEvent_Cosine: ; 49b3b (12:5b3b)
 ; 49b6e (12:5b6e)
 
 .sinewave ; 49b6e
-	sine_wave $100
+	sine_wave 32
 ; 49bae
 
 GetCelebiSpriteTile: ; 49bae
diff --git a/engine/routines/sine.asm b/engine/routines/sine.asm
index 5f56a10a8..8c5ec6347 100755
--- a/engine/routines/sine.asm
+++ b/engine/routines/sine.asm
@@ -45,4 +45,4 @@ _Sine:: ; 84d9
 .sinewave ; 850b
 ; A $20-word table representing a sine wave.
 ; 90 degrees is index $10 at a base amplitude of $100.
-	sine_wave $100
+	sine_wave 32
diff --git a/engine/sprites.asm b/engine/sprites.asm
index 09f6ae89a..60efe1b13 100755
--- a/engine/sprites.asm
+++ b/engine/sprites.asm
@@ -620,7 +620,7 @@ Sprites_Sine: ; 8e72c
 ; 8e75d
 
 .sinewave ; 8e75d
-	sine_wave $100
+	sine_wave 32
 
 
 AnimateEndOfExpBar: ; 8e79d
diff --git a/macros/data.asm b/macros/data.asm
index d0e93d73f..1806f5f59 100644
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -31,29 +31,29 @@ dbwww: MACRO
 ENDM
 
 dn: MACRO ; nybbles
-	rept _NARG / 2
+rept _NARG / 2
 	db ((\1) << 4) | (\2)
 	shift
 	shift
-	endr
+endr
 ENDM
 
 dc: MACRO ; "crumbs"
-	rept _NARG / 4
+rept _NARG / 4
 	db ((\1) << 6) | ((\2) << 4) | ((\3) << 2) | (\4)
 	shift
 	shift
 	shift
 	shift
-	endr
+endr
 ENDM
 
 dx: MACRO
 x = 8 * ((\1) - 1)
-	rept \1
+rept \1
 	db ((\2) >> x) & $ff
 x = x + -8
-	endr
+endr
 ENDM
 
 dt: MACRO ; three-byte (big-endian)
@@ -69,17 +69,17 @@ bigdw: MACRO ; big-endian word
 ENDM
 
 dba: MACRO ; dbw bank, address
-	rept _NARG
+rept _NARG
 	dbw BANK(\1), \1
 	shift
-	endr
+endr
 ENDM
 
 dab: MACRO ; dwb address, bank
-	rept _NARG
+rept _NARG
 	dwb \1, BANK(\1)
 	shift
-	endr
+endr
 ENDM
 
 dba_pic: MACRO ; dbw bank, address
@@ -112,19 +112,17 @@ ENDM
 
 
 sine_wave: MACRO
-; \1: amplitude
 x = 0
-	rept $20
-	; Round up.
-	dw (sin(x) + (sin(x) & $ff)) >> 8
-x = x + (\1) * $40000
-	endr
+rept \1
+	dw (sin(x) + (sin(x) & $ff)) >> 8 ; round up
+x = x + (32768.0 / \1) ; a circle has 65536.0 "degrees"
+endr
 ENDM
 
 
 bcd: MACRO
-	rept _NARG
+rept _NARG
 	dn ((\1) % 100) / 10, (\1) % 10
 	shift
-	endr
+endr
 ENDM

From e32e5212af3783f530af884852570d8003e69486 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Fri, 2 Feb 2018 22:55:38 -0500
Subject: [PATCH 102/135] use "x + -1" not "x +- 1" (TODO: use "x - 1" once
 rgbds allows it)

---
 audio/engine.asm                            | 4 ++--
 constants/deco_constants.asm                | 3 +--
 constants/item_constants.asm                | 2 +-
 constants/pokemon_constants.asm             | 4 ++--
 constants/pokemon_data_constants.asm        | 2 +-
 constants/script_constants.asm              | 2 +-
 data/wild/roammon_maps.asm                  | 2 +-
 docs/bugs_and_glitches.md                   | 4 ++--
 engine/battle_anims/anim_commands.asm       | 2 +-
 engine/billspc.asm                          | 4 ++--
 engine/events/battle_tower/battle_tower.asm | 4 ++--
 engine/events/bug_contest/judging.asm       | 2 +-
 engine/events/celebi.asm                    | 2 +-
 engine/events/field_moves.asm               | 2 +-
 engine/events/print_unown_2.asm             | 4 ++--
 engine/evolution_animation.asm              | 2 +-
 engine/options_menu.asm                     | 2 +-
 engine/pic_animation.asm                    | 2 +-
 engine/search.asm                           | 2 +-
 engine/slot_machine.asm                     | 2 +-
 engine/stats_screen.asm                     | 2 +-
 engine/title.asm                            | 2 +-
 gfx/tilesets/palette_maps.asm               | 2 +-
 macros/data.asm                             | 2 +-
 macros/scripts/gfx_anims.asm                | 2 +-
 macros/wram.asm                             | 8 ++++----
 mobile/fixed_words.asm                      | 2 +-
 27 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/audio/engine.asm b/audio/engine.asm
index b097648c2..21a99f149 100644
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -1320,7 +1320,7 @@ GetNoiseSample: ; e86c5
 ; load ptr to sample header in NoiseSampleAddress
 	; are we on the last channel?
 	ld a, [CurChannel]
-	and NUM_MUSIC_CHANS +- 1
+	and NUM_MUSIC_CHANS + -1
 	cp CHAN4
 	; ret if not
 	ret nz
@@ -2102,7 +2102,7 @@ Music_Volume: ; e89d2
 ; e89e1
 
 Music_TempoRelative: ; e89e1
-; set global tempo to current channel tempo +- param
+; set global tempo to current channel tempo +/- param
 ; params: 1 signed
 	call GetMusicByte
 	ld e, a
diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm
index 84fcdb94d..3b0230965 100644
--- a/constants/deco_constants.asm
+++ b/constants/deco_constants.asm
@@ -121,8 +121,7 @@ __enum__ = 0
 	deco  GEODUDE_DOLL
 	deco  MACHOP_DOLL
 	deco  TENTACOOL_DOLL
+NUM_NON_TROPHY_DECOS = __enum__
 	deco  GOLD_TROPHY_DOLL
 	deco  SILVER_TROPHY_DOLL
-
 NUM_DECOS = __enum__
-NUM_NON_TROPHY_DECOS = NUM_DECOS +- 2
diff --git a/constants/item_constants.asm b/constants/item_constants.asm
index 0914e7ab6..455af6d12 100644
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -288,7 +288,7 @@ NUM_HMS = const_value - HM01
 	add_mt FLAMETHROWER
 	add_mt THUNDERBOLT
 	add_mt ICE_BEAM
-NUM_TM_HM_TUTOR = __enum__ +- 1
+NUM_TM_HM_TUTOR = __enum__ + -1
 
 USE_SCRIPT_VAR EQU $00
 ITEM_FROM_MEM  EQU $ff
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index a72145c54..939ac72f2 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -271,7 +271,7 @@ JOHTO_POKEMON EQU const_value
 	const LUGIA      ; f9
 	const HO_OH      ; fa
 	const CELEBI     ; fb
-NUM_POKEMON EQU const_value +- 1
+NUM_POKEMON EQU const_value + -1
 	const MON_FC     ; fc
 	const EGG        ; fd
 	const MON_FE     ; fe
@@ -311,4 +311,4 @@ NUM_POKEMON EQU const_value +- 1
 	const UNOWN_X ; 24
 	const UNOWN_Y ; 25
 	const UNOWN_Z ; 26
-NUM_UNOWN EQU const_value +- 1 ; 26
+NUM_UNOWN EQU const_value + -1 ; 26
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index 038a1c34d..66a273eaa 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -125,7 +125,7 @@ MONS_PER_BOX EQU 20
 NUM_BOXES    EQU 14
 
 ; hall of fame
-HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH +- 1) ; species, id, dvs, level, nick
+HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH + -1) ; species, id, dvs, level, nick
 HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator
 NUM_HOF_TEAMS = 30
 
diff --git a/constants/script_constants.asm b/constants/script_constants.asm
index c2de2b04f..e610c25f6 100644
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -200,7 +200,7 @@ EMOTE_MEM EQU -1
 	const FRUITTREE_PEWTER_CITY_1 ; 1c
 	const FRUITTREE_PEWTER_CITY_2 ; 1d
 	const FRUITTREE_FUCHSIA_CITY  ; 1e
-NUM_FRUIT_TREES EQU const_value +- 1
+NUM_FRUIT_TREES EQU const_value + -1
 
 ; describedecoration arguments
 ; DescribeDecoration.JumpTable indexes (see engine/decorations.asm)
diff --git a/data/wild/roammon_maps.asm b/data/wild/roammon_maps.asm
index c94ebfce0..b82ca016f 100644
--- a/data/wild/roammon_maps.asm
+++ b/data/wild/roammon_maps.asm
@@ -4,7 +4,7 @@
 roam_map: MACRO
 	map \1
 	db _NARG - 1
-rept _NARG +- 1
+rept _NARG + -1
 	map \2
 	shift
 endr
diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index abd5bf3bf..d79f386a8 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -1110,7 +1110,7 @@ In [engine/search.asm](/engine/search.asm):
 
 	ld hl, PlayerName
 
-rept NAME_LENGTH_JAPANESE +- 2 ; should be PLAYER_NAME_LENGTH +- 2
+rept NAME_LENGTH_JAPANESE + -2 ; should be PLAYER_NAME_LENGTH + -2
 	ld a, [de]
 	cp [hl]
 	jr nz, .notfound
@@ -1132,7 +1132,7 @@ endr
 	ret
 ```
 
-**Fix:** Change `rept NAME_LENGTH_JAPANESE +- 2` to `rept PLAYER_NAME_LENGTH +- 2`.
+**Fix:** Change `rept NAME_LENGTH_JAPANESE + -2` to `rept PLAYER_NAME_LENGTH + -2`.
 
 
 ## Catching a Transformed Pokémon always catches a Ditto
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm
index 0bbedf909..707fcfd71 100644
--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@@ -263,7 +263,7 @@ BattleAnim_ClearCGB_OAMFlags: ; cc23d
 	ld a, [hl]
 	and $f0
 	ld [hli], a
-rept SPRITEOAMSTRUCT_LENGTH +- 1
+rept SPRITEOAMSTRUCT_LENGTH + -1
 	inc hl
 endr
 	dec c
diff --git a/engine/billspc.asm b/engine/billspc.asm
index 53f2c176e..f9c6a4c5f 100755
--- a/engine/billspc.asm
+++ b/engine/billspc.asm
@@ -1510,7 +1510,7 @@ BillsPC_UpdateSelectionCursor: ; e2e01 (38:6e01)
 	inc hl
 	ld [de], a ; y
 	inc de
-rept SPRITEOAMSTRUCT_LENGTH +- 1
+rept SPRITEOAMSTRUCT_LENGTH + -1
 	ld a, [hli]
 	ld [de], a
 	inc de
@@ -1560,7 +1560,7 @@ BillsPC_UpdateInsertCursor: ; e2e8c
 	inc hl
 	ld [de], a ; y
 	inc de
-rept SPRITEOAMSTRUCT_LENGTH +- 1
+rept SPRITEOAMSTRUCT_LENGTH + -1
 	ld a, [hli]
 	ld [de], a
 	inc de
diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm
index 887457e2c..befc49a9a 100755
--- a/engine/events/battle_tower/battle_tower.asm
+++ b/engine/events/battle_tower/battle_tower.asm
@@ -408,10 +408,10 @@ ValidateBTParty: ; 170394
 	ld a, [hl]
 	and a
 x = $ff
-rept ($ff +- NUM_POKEMON)
+rept ($ff + -NUM_POKEMON)
 	jr z, .invalid
 	cp x
-x = x +- 1
+x = x + -1
 endr
 	jr nz, .valid
 
diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm
index 6c8d7e82d..d8e46100b 100755
--- a/engine/events/bug_contest/judging.asm
+++ b/engine/events/bug_contest/judging.asm
@@ -229,7 +229,7 @@ DetermineContestWinners: ; 1383e
 CopyTempContestant: ; 138a0
 ; Could've just called CopyBytes.
 	ld de, wBugContestTempWinnerID
-rept BUG_CONTESTANT_SIZE +- 1
+rept BUG_CONTESTANT_SIZE + -1
 	ld a, [de]
 	inc de
 	ld [hli], a
diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm
index f6cedd074..3fc1dd145 100755
--- a/engine/events/celebi.asm
+++ b/engine/events/celebi.asm
@@ -57,7 +57,7 @@ CelebiShrineEvent: ; 4989a
 	ld c, 4
 .OAMloop:
 	ld [hli], a ; tile id
-rept SPRITEOAMSTRUCT_LENGTH +- 1
+rept SPRITEOAMSTRUCT_LENGTH + -1
 	inc hl
 endr
 	inc a
diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm
index 6b840a25a..b094b5260 100755
--- a/engine/events/field_moves.asm
+++ b/engine/events/field_moves.asm
@@ -398,7 +398,7 @@ FlyToAnim: ; 8cb33
 	ld c, 4
 .OAMloop
 	ld [hli], a ; tile id
-rept SPRITEOAMSTRUCT_LENGTH +- 1
+rept SPRITEOAMSTRUCT_LENGTH + -1
 	inc hl
 endr
 	inc a
diff --git a/engine/events/print_unown_2.asm b/engine/events/print_unown_2.asm
index 1e0b90fc5..5cdc21146 100644
--- a/engine/events/print_unown_2.asm
+++ b/engine/events/print_unown_2.asm
@@ -98,10 +98,10 @@ RotateUnownFrontpic: ; e0000
 overworldmaprect: MACRO
 y = 0
 rept \1
-x = \1 * (\2 +- 1) + y
+x = \1 * (\2 + -1) + y
 rept \2
 	dw OverworldMap tile x
-x = x +- \2
+x = x + -\2
 endr
 y = y + 1
 endr
diff --git a/engine/evolution_animation.asm b/engine/evolution_animation.asm
index 2e6e82e25..e9f51b1cc 100755
--- a/engine/evolution_animation.asm
+++ b/engine/evolution_animation.asm
@@ -352,7 +352,7 @@ EvolutionAnimation: ; 4e5e1
 	ld a, [hl]
 	or b
 	ld [hli], a ; attributes
-rept SPRITEOAMSTRUCT_LENGTH +- 1
+rept SPRITEOAMSTRUCT_LENGTH + -1
 	inc hl
 endr
 	dec c
diff --git a/engine/options_menu.asm b/engine/options_menu.asm
index 4ab215282..ad2990539 100755
--- a/engine/options_menu.asm
+++ b/engine/options_menu.asm
@@ -120,7 +120,7 @@ Options_TextSpeed: ; e42f5
 	ld a, c ; right pressed
 	cp OPT_TEXT_SPEED_SLOW
 	jr c, .Increase
-	ld c, OPT_TEXT_SPEED_FAST +- 1
+	ld c, OPT_TEXT_SPEED_FAST + -1
 
 .Increase:
 	inc c
diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm
index 4317d96f8..e4ddb403a 100644
--- a/engine/pic_animation.asm
+++ b/engine/pic_animation.asm
@@ -579,7 +579,7 @@ PokeAnim_CopyBitmaskToBuffer: ; d033b
 poke_anim_box: MACRO
 y = 7
 rept \1
-x = 7 +- \1
+x = 7 + -\1
 rept \1
 	db x + y
 x = x + 1
diff --git a/engine/search.asm b/engine/search.asm
index 0d4a8dc3c..e7f6a639f 100755
--- a/engine/search.asm
+++ b/engine/search.asm
@@ -219,7 +219,7 @@ CheckOwnMon: ; 0x4a7ba
 
 	ld hl, PlayerName
 
-rept NAME_LENGTH_JAPANESE +- 2 ; should be PLAYER_NAME_LENGTH +- 2
+rept NAME_LENGTH_JAPANESE + -2 ; should be PLAYER_NAME_LENGTH + -2
 	ld a, [de]
 	cp [hl]
 	jr nz, .notfound
diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm
index 68df631e4..7c2fbd352 100755
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -267,7 +267,7 @@ Unreferenced_Function9282c: ; 9282c
 	ld a, [hl]
 	xor %00100000
 	ld [hli], a ; tile id
-rept SPRITEOAMSTRUCT_LENGTH +- 1
+rept SPRITEOAMSTRUCT_LENGTH + -1
 	inc hl
 endr
 	dec c
diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm
index 8079088d9..e710f4cad 100755
--- a/engine/stats_screen.asm
+++ b/engine/stats_screen.asm
@@ -2,7 +2,7 @@
 	const PINK_PAGE  ; 1
 	const GREEN_PAGE ; 2
 	const BLUE_PAGE  ; 3
-NUM_STAT_PAGES EQU const_value +- 1
+NUM_STAT_PAGES EQU const_value + -1
 
 BattleStatsScreenInit: ; 4dc7b (13:5c7b)
 	ld a, [wLinkMode]
diff --git a/engine/title.asm b/engine/title.asm
index 55ba145bf..9b51ee878 100644
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -377,7 +377,7 @@ AnimateTitleCrystal: ; 10ef32
 	ld a, [hl]
 	add 2
 	ld [hli], a ; y
-rept SPRITEOAMSTRUCT_LENGTH +- 1
+rept SPRITEOAMSTRUCT_LENGTH + -1
 	inc hl
 endr
 	dec c
diff --git a/gfx/tilesets/palette_maps.asm b/gfx/tilesets/palette_maps.asm
index 5e8f9f4eb..b3b2f5b98 100644
--- a/gfx/tilesets/palette_maps.asm
+++ b/gfx/tilesets/palette_maps.asm
@@ -2,7 +2,7 @@ tilepal: MACRO
 ; used in gfx/tilesets/*_palette_map.asm
 ; vram bank, pals
 x = \1 << OAM_TILE_BANK
-rept (_NARG +- 1) / 2
+rept (_NARG + -1) / 2
 	dn (x | PAL_BG_\3), (x | PAL_BG_\2)
 	shift
 	shift
diff --git a/macros/data.asm b/macros/data.asm
index 1806f5f59..0c9ef91f0 100644
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -112,7 +112,7 @@ ENDM
 
 
 sine_wave: MACRO
-x = 0
+x = 0.0
 rept \1
 	dw (sin(x) + (sin(x) & $ff)) >> 8 ; round up
 x = x + (32768.0 / \1) ; a circle has 65536.0 "degrees"
diff --git a/macros/scripts/gfx_anims.asm b/macros/scripts/gfx_anims.asm
index 943a000a9..8f33512ec 100644
--- a/macros/scripts/gfx_anims.asm
+++ b/macros/scripts/gfx_anims.asm
@@ -4,7 +4,7 @@ frame: MACRO
 	db \1
 x = \2
 if _NARG > 2
-rept _NARG +- 2
+rept _NARG + -2
 x = x | (1 << (\3 + 1))
 	shift
 endr
diff --git a/macros/wram.asm b/macros/wram.asm
index 830b5680d..66aab34fe 100755
--- a/macros/wram.asm
+++ b/macros/wram.asm
@@ -107,7 +107,7 @@ box: MACRO
 \1Species::         ds MONS_PER_BOX + 1
 \1Mons::
 \1Mon1::            box_struct \1Mon1
-\1Mon2::            ds BOXMON_STRUCT_LENGTH * (MONS_PER_BOX +- 1)
+\1Mon2::            ds BOXMON_STRUCT_LENGTH * (MONS_PER_BOX + -1)
 \1MonOT::           ds NAME_LENGTH * MONS_PER_BOX
 \1MonNicknames::    ds MON_NAME_LENGTH * MONS_PER_BOX
 \1MonNicknamesEnd::
@@ -175,7 +175,7 @@ channel_struct: MACRO
 ENDM
 
 battle_tower_struct: MACRO
-\1Name:: ds NAME_LENGTH +- 1
+\1Name:: ds NAME_LENGTH + -1
 \1TrainerClass:: ds 1
 \1Pkmn1:: party_struct \1Pkmn1
 \1Pkmn1Name:: ds MON_NAME_LENGTH
@@ -221,7 +221,7 @@ hof_mon: MACRO
 \1ID::       dw
 \1DVs::      dw
 \1Level::    db
-\1Nickname:: ds MON_NAME_LENGTH +- 1
+\1Nickname:: ds MON_NAME_LENGTH + -1
 \1End::
 ENDM
 
@@ -237,7 +237,7 @@ hall_of_fame: MACRO
 ENDM
 
 link_battle_record: MACRO
-\1Name::   ds NAME_LENGTH +- 1
+\1Name::   ds NAME_LENGTH + -1
 \1ID::     dw
 \1Wins::   dw
 \1Losses:: dw
diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm
index de6eaef8c..71474f236 100755
--- a/mobile/fixed_words.asm
+++ b/mobile/fixed_words.asm
@@ -4120,7 +4120,7 @@ macro_11f220: MACRO
 ; 12 words per page (0-based indexing)
 x = \1 / 12
 if \1 % 12 == 0
-x = x +- 1
+x = x + -1
 endc
 	db x
 ENDM

From d11cac9e833a9c2188415cfeb6de7d4687336c2f Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sat, 3 Feb 2018 01:55:22 -0500
Subject: [PATCH 103/135] can't achieve this with rgbds 0.3.5

---
 macros/data.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macros/data.asm b/macros/data.asm
index 0c9ef91f0..1543e601d 100644
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -115,7 +115,7 @@ sine_wave: MACRO
 x = 0.0
 rept \1
 	dw (sin(x) + (sin(x) & $ff)) >> 8 ; round up
-x = x + (32768.0 / \1) ; a circle has 65536.0 "degrees"
+x = x + 1024.0 ; a circle has 65536.0 "degrees"
 endr
 ENDM
 

From b0d84c64a696b2525ba6aac846989eae661b1d67 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sat, 3 Feb 2018 13:26:34 -0500
Subject: [PATCH 104/135] Use fixed-point DIV function for a generalized
 sine_wave table macro

---
 macros/code.asm | 4 ++--
 macros/data.asm | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/macros/code.asm b/macros/code.asm
index 799c27d45..0b36f6c11 100644
--- a/macros/code.asm
+++ b/macros/code.asm
@@ -41,8 +41,8 @@ maskbits: MACRO
 ; example usage in rejection sampling:
 ; .loop
 ; 	call Random
-; 	maskbits 30
-; 	cp 30
+; 	maskbits 26
+; 	cp 26
 ; 	jr nc, .loop
 x = 1
 rept 8
diff --git a/macros/data.asm b/macros/data.asm
index 1543e601d..8adb33005 100644
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -112,10 +112,11 @@ ENDM
 
 
 sine_wave: MACRO
-x = 0.0
+; \1 samples of sin(x) from x=0 to x<32768 (pi radians)
+x = 0
 rept \1
 	dw (sin(x) + (sin(x) & $ff)) >> 8 ; round up
-x = x + 1024.0 ; a circle has 65536.0 "degrees"
+x = x + DIV(32768, \1) ; a circle has 65536 "degrees"
 endr
 ENDM
 

From bf138d94d42ba0d092d5028e40a85260c250a4ee Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sat, 3 Feb 2018 16:20:19 -0500
Subject: [PATCH 105/135] =?UTF-8?q?scene=5Fdef=20=E2=86=92=20scene=5Fvar?=
 =?UTF-8?q?=20(for=20"variable",=20like=20loadvar,=20copybytetovar,=20etc)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/maps/scenes.asm | 163 +++++++++++++++++++++----------------------
 1 file changed, 81 insertions(+), 82 deletions(-)

diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm
index 0971208f1..e66b61a99 100644
--- a/data/maps/scenes.asm
+++ b/data/maps/scenes.asm
@@ -1,89 +1,88 @@
-scene_def: MACRO
-; db group, map
-; dw address
+scene_var: MACRO
+; map, variable
 	map \1
 	dw \2
 ENDM
 
 MapScenes:: ; 4d01e
-	scene_def POKECENTER_2F,                               wPokecenter2FSceneID
-	scene_def TRADE_CENTER,                                wTradeCenterSceneID
-	scene_def COLOSSEUM,                                   wColosseumSceneID
-	scene_def TIME_CAPSULE,                                wTimeCapsuleSceneID
-	scene_def POWER_PLANT,                                 wPowerPlantSceneID
-	scene_def CERULEAN_GYM,                                wCeruleanGymSceneID
-	scene_def ROUTE_25,                                    wRoute25SceneID
-	scene_def TRAINER_HOUSE_B1F,                           wTrainerHouseB1FSceneID
-	scene_def VICTORY_ROAD_GATE,                           wVictoryRoadGateSceneID
-	scene_def SAFFRON_MAGNET_TRAIN_STATION,                wSaffronMagnetTrainStationSceneID
-	scene_def ROUTE_16_GATE,                               wRoute16GateSceneID
-	scene_def ROUTE_17_ROUTE_18_GATE,                      wRoute17Route18GateSceneID
-	scene_def INDIGO_PLATEAU_POKECENTER_1F,                wIndigoPlateauPokecenter1FSceneID
-	scene_def WILLS_ROOM,                                  wWillsRoomSceneID
-	scene_def KOGAS_ROOM,                                  wKogasRoomSceneID
-	scene_def BRUNOS_ROOM,                                 wBrunosRoomSceneID
-	scene_def KARENS_ROOM,                                 wKarensRoomSceneID
-	scene_def LANCES_ROOM,                                 wLancesRoomSceneID
-	scene_def HALL_OF_FAME,                                wHallOfFameSceneID
-	scene_def ROUTE_27,                                    wRoute27SceneID
-	scene_def NEW_BARK_TOWN,                               wNewBarkTownSceneID
-	scene_def ELMS_LAB,                                    wElmsLabSceneID
-	scene_def PLAYERS_HOUSE_1F,                            wPlayersHouse1FSceneID
-	scene_def ROUTE_29,                                    wRoute29SceneID
-	scene_def CHERRYGROVE_CITY,                            wCherrygroveCitySceneID
-	scene_def MR_POKEMONS_HOUSE,                           wMrPokemonsHouseSceneID
-	scene_def ROUTE_32,                                    wRoute32SceneID
-	scene_def ROUTE_35_NATIONAL_PARK_GATE,                 wRoute35NationalParkGateSceneID
-	scene_def ROUTE_36,                                    wRoute36SceneID
-	scene_def ROUTE_36_NATIONAL_PARK_GATE,                 wRoute36NationalParkGateSceneID
-	scene_def AZALEA_TOWN,                                 wAzaleaTownSceneID
-	scene_def GOLDENROD_GYM,                               wGoldenrodGymSceneID
-	scene_def GOLDENROD_MAGNET_TRAIN_STATION,              wGoldenrodMagnetTrainStationSceneID
-	scene_def GOLDENROD_POKECENTER_1F,                     wGoldenrodPokecenter1FSceneID
-	scene_def OLIVINE_CITY,                                wOlivineCitySceneID
-	scene_def ROUTE_34,                                    wRoute34SceneID ; unused
-	scene_def ROUTE_34_ILEX_FOREST_GATE,                   wRoute34IlexForestGateSceneID ; unused
-	scene_def ECRUTEAK_TIN_TOWER_ENTRANCE,                 wEcruteakTinTowerEntranceSceneID
-	scene_def WISE_TRIOS_ROOM,                             wWiseTriosRoomSceneID
-	scene_def ECRUTEAK_POKECENTER_1F,                      wEcruteakPokecenter1FSceneID
-	scene_def ECRUTEAK_GYM,                                wEcruteakGymSceneID
-	scene_def MAHOGANY_TOWN,                               wMahoganyTownSceneID
-	scene_def ROUTE_42,                                    wRoute42SceneID
-	scene_def CIANWOOD_CITY,                               wCianwoodCitySceneID
-	scene_def BATTLE_TOWER_1F,                             wBattleTower1FSceneID
-	scene_def BATTLE_TOWER_BATTLE_ROOM,                    wBattleTowerBattleRoomSceneID
-	scene_def BATTLE_TOWER_ELEVATOR,                       wBattleTowerElevatorSceneID
-	scene_def BATTLE_TOWER_HALLWAY,                        wBattleTowerHallwaySceneID
-	scene_def BATTLE_TOWER_OUTSIDE,                        wBattleTowerOutsideSceneID ; unused
-	scene_def ROUTE_43_GATE,                               wRoute43GateSceneID
-	scene_def MOUNT_MOON,                                  wMountMoonSceneID
-	scene_def SPROUT_TOWER_3F,                             wSproutTower3FSceneID
-	scene_def TIN_TOWER_1F,                                wTinTower1FSceneID
-	scene_def BURNED_TOWER_1F,                             wBurnedTower1FSceneID
-	scene_def BURNED_TOWER_B1F,                            wBurnedTowerB1FSceneID
-	scene_def RADIO_TOWER_5F,                              wRadioTower5FSceneID
-	scene_def RUINS_OF_ALPH_OUTSIDE,                       wRuinsOfAlphOutsideSceneID
-	scene_def RUINS_OF_ALPH_RESEARCH_CENTER,               wRuinsOfAlphResearchCenterSceneID
-	scene_def RUINS_OF_ALPH_HO_OH_CHAMBER,                 wRuinsOfAlphHoOhChamberSceneID
-	scene_def RUINS_OF_ALPH_KABUTO_CHAMBER,                wRuinsOfAlphKabutoChamberSceneID
-	scene_def RUINS_OF_ALPH_OMANYTE_CHAMBER,               wRuinsOfAlphOmanyteChamberSceneID
-	scene_def RUINS_OF_ALPH_AERODACTYL_CHAMBER,            wRuinsOfAlphAerodactylChamberSceneID
-	scene_def RUINS_OF_ALPH_INNER_CHAMBER,                 wRuinsOfAlphInnerChamberSceneID
-	scene_def MAHOGANY_MART_1F,                            wMahoganyMart1FSceneID
-	scene_def TEAM_ROCKET_BASE_B1F,                        wTeamRocketBaseB1FSceneID
-	scene_def TEAM_ROCKET_BASE_B2F,                        wTeamRocketBaseB2FSceneID
-	scene_def TEAM_ROCKET_BASE_B3F,                        wTeamRocketBaseB3FSceneID
-	scene_def GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, wGoldenrodUndergroundSwitchRoomEntrancesSceneID
-	scene_def SILVER_CAVE_ROOM_3,                          wSilverCaveRoom3SceneID ; unused
-	scene_def VICTORY_ROAD,                                wVictoryRoadSceneID
-	scene_def DRAGONS_DEN_B1F,                             wDragonsDenB1FSceneID
-	scene_def DRAGON_SHRINE,                               wDragonShrineSceneID
-	scene_def OLIVINE_PORT,                                wOlivinePortSceneID
-	scene_def VERMILION_PORT,                              wVermilionPortSceneID
-	scene_def FAST_SHIP_1F,                                wFastShip1FSceneID
-	scene_def FAST_SHIP_B1F,                               wFastShipB1FSceneID
-	scene_def MOUNT_MOON_SQUARE,                           wMountMoonSquareSceneID
-	scene_def MOBILE_TRADE_ROOM,                           wMobileTradeRoomSceneID
-	scene_def MOBILE_BATTLE_ROOM,                          wMobileBattleRoomSceneID
+	scene_var POKECENTER_2F,                               wPokecenter2FSceneID
+	scene_var TRADE_CENTER,                                wTradeCenterSceneID
+	scene_var COLOSSEUM,                                   wColosseumSceneID
+	scene_var TIME_CAPSULE,                                wTimeCapsuleSceneID
+	scene_var POWER_PLANT,                                 wPowerPlantSceneID
+	scene_var CERULEAN_GYM,                                wCeruleanGymSceneID
+	scene_var ROUTE_25,                                    wRoute25SceneID
+	scene_var TRAINER_HOUSE_B1F,                           wTrainerHouseB1FSceneID
+	scene_var VICTORY_ROAD_GATE,                           wVictoryRoadGateSceneID
+	scene_var SAFFRON_MAGNET_TRAIN_STATION,                wSaffronMagnetTrainStationSceneID
+	scene_var ROUTE_16_GATE,                               wRoute16GateSceneID
+	scene_var ROUTE_17_ROUTE_18_GATE,                      wRoute17Route18GateSceneID
+	scene_var INDIGO_PLATEAU_POKECENTER_1F,                wIndigoPlateauPokecenter1FSceneID
+	scene_var WILLS_ROOM,                                  wWillsRoomSceneID
+	scene_var KOGAS_ROOM,                                  wKogasRoomSceneID
+	scene_var BRUNOS_ROOM,                                 wBrunosRoomSceneID
+	scene_var KARENS_ROOM,                                 wKarensRoomSceneID
+	scene_var LANCES_ROOM,                                 wLancesRoomSceneID
+	scene_var HALL_OF_FAME,                                wHallOfFameSceneID
+	scene_var ROUTE_27,                                    wRoute27SceneID
+	scene_var NEW_BARK_TOWN,                               wNewBarkTownSceneID
+	scene_var ELMS_LAB,                                    wElmsLabSceneID
+	scene_var PLAYERS_HOUSE_1F,                            wPlayersHouse1FSceneID
+	scene_var ROUTE_29,                                    wRoute29SceneID
+	scene_var CHERRYGROVE_CITY,                            wCherrygroveCitySceneID
+	scene_var MR_POKEMONS_HOUSE,                           wMrPokemonsHouseSceneID
+	scene_var ROUTE_32,                                    wRoute32SceneID
+	scene_var ROUTE_35_NATIONAL_PARK_GATE,                 wRoute35NationalParkGateSceneID
+	scene_var ROUTE_36,                                    wRoute36SceneID
+	scene_var ROUTE_36_NATIONAL_PARK_GATE,                 wRoute36NationalParkGateSceneID
+	scene_var AZALEA_TOWN,                                 wAzaleaTownSceneID
+	scene_var GOLDENROD_GYM,                               wGoldenrodGymSceneID
+	scene_var GOLDENROD_MAGNET_TRAIN_STATION,              wGoldenrodMagnetTrainStationSceneID
+	scene_var GOLDENROD_POKECENTER_1F,                     wGoldenrodPokecenter1FSceneID
+	scene_var OLIVINE_CITY,                                wOlivineCitySceneID
+	scene_var ROUTE_34,                                    wRoute34SceneID ; unused
+	scene_var ROUTE_34_ILEX_FOREST_GATE,                   wRoute34IlexForestGateSceneID ; unused
+	scene_var ECRUTEAK_TIN_TOWER_ENTRANCE,                 wEcruteakTinTowerEntranceSceneID
+	scene_var WISE_TRIOS_ROOM,                             wWiseTriosRoomSceneID
+	scene_var ECRUTEAK_POKECENTER_1F,                      wEcruteakPokecenter1FSceneID
+	scene_var ECRUTEAK_GYM,                                wEcruteakGymSceneID
+	scene_var MAHOGANY_TOWN,                               wMahoganyTownSceneID
+	scene_var ROUTE_42,                                    wRoute42SceneID
+	scene_var CIANWOOD_CITY,                               wCianwoodCitySceneID
+	scene_var BATTLE_TOWER_1F,                             wBattleTower1FSceneID
+	scene_var BATTLE_TOWER_BATTLE_ROOM,                    wBattleTowerBattleRoomSceneID
+	scene_var BATTLE_TOWER_ELEVATOR,                       wBattleTowerElevatorSceneID
+	scene_var BATTLE_TOWER_HALLWAY,                        wBattleTowerHallwaySceneID
+	scene_var BATTLE_TOWER_OUTSIDE,                        wBattleTowerOutsideSceneID ; unused
+	scene_var ROUTE_43_GATE,                               wRoute43GateSceneID
+	scene_var MOUNT_MOON,                                  wMountMoonSceneID
+	scene_var SPROUT_TOWER_3F,                             wSproutTower3FSceneID
+	scene_var TIN_TOWER_1F,                                wTinTower1FSceneID
+	scene_var BURNED_TOWER_1F,                             wBurnedTower1FSceneID
+	scene_var BURNED_TOWER_B1F,                            wBurnedTowerB1FSceneID
+	scene_var RADIO_TOWER_5F,                              wRadioTower5FSceneID
+	scene_var RUINS_OF_ALPH_OUTSIDE,                       wRuinsOfAlphOutsideSceneID
+	scene_var RUINS_OF_ALPH_RESEARCH_CENTER,               wRuinsOfAlphResearchCenterSceneID
+	scene_var RUINS_OF_ALPH_HO_OH_CHAMBER,                 wRuinsOfAlphHoOhChamberSceneID
+	scene_var RUINS_OF_ALPH_KABUTO_CHAMBER,                wRuinsOfAlphKabutoChamberSceneID
+	scene_var RUINS_OF_ALPH_OMANYTE_CHAMBER,               wRuinsOfAlphOmanyteChamberSceneID
+	scene_var RUINS_OF_ALPH_AERODACTYL_CHAMBER,            wRuinsOfAlphAerodactylChamberSceneID
+	scene_var RUINS_OF_ALPH_INNER_CHAMBER,                 wRuinsOfAlphInnerChamberSceneID
+	scene_var MAHOGANY_MART_1F,                            wMahoganyMart1FSceneID
+	scene_var TEAM_ROCKET_BASE_B1F,                        wTeamRocketBaseB1FSceneID
+	scene_var TEAM_ROCKET_BASE_B2F,                        wTeamRocketBaseB2FSceneID
+	scene_var TEAM_ROCKET_BASE_B3F,                        wTeamRocketBaseB3FSceneID
+	scene_var GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, wGoldenrodUndergroundSwitchRoomEntrancesSceneID
+	scene_var SILVER_CAVE_ROOM_3,                          wSilverCaveRoom3SceneID ; unused
+	scene_var VICTORY_ROAD,                                wVictoryRoadSceneID
+	scene_var DRAGONS_DEN_B1F,                             wDragonsDenB1FSceneID
+	scene_var DRAGON_SHRINE,                               wDragonShrineSceneID
+	scene_var OLIVINE_PORT,                                wOlivinePortSceneID
+	scene_var VERMILION_PORT,                              wVermilionPortSceneID
+	scene_var FAST_SHIP_1F,                                wFastShip1FSceneID
+	scene_var FAST_SHIP_B1F,                               wFastShipB1FSceneID
+	scene_var MOUNT_MOON_SQUARE,                           wMountMoonSquareSceneID
+	scene_var MOBILE_TRADE_ROOM,                           wMobileTradeRoomSceneID
+	scene_var MOBILE_BATTLE_ROOM,                          wMobileBattleRoomSceneID
 	db -1
 ; 4d15b

From 6ff2cb20e67db2054486fc5dc48eb9263298d4ad Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sat, 3 Feb 2018 16:58:49 -0500
Subject: [PATCH 106/135] =?UTF-8?q?map=20=E2=86=92=20map=5Fid;=20map=5Fdef?=
 =?UTF-8?q?=20=E2=86=92=20map;=20map=5Fdata=20=E2=86=92=20map=5Fattributes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile                             |   2 +-
 constants/map_data_constants.asm     |  21 +-
 constants/map_setup_constants.asm    |   4 +-
 data/maps/attributes.asm             | 663 +++++++++++++++++++++++++++
 data/maps/data.asm                   | 663 ---------------------------
 data/maps/definitions.asm            | 485 --------------------
 data/maps/map_data.asm               |  12 +
 data/maps/maps.asm                   | 485 +++++++++++++++++++-
 data/maps/scenes.asm                 |   2 +-
 data/maps/setup_scripts.asm          |  10 +-
 data/maps/spawn_points.asm           |   2 +-
 data/phone/phone_contacts.asm        |   2 +-
 data/radio/oaks_pkmn_talk_routes.asm |  30 +-
 data/radio/pnp_hidden_places.asm     |  18 +-
 data/wild/johto_grass.asm            | 122 ++---
 data/wild/johto_water.asm            |  76 +--
 data/wild/kanto_grass.asm            |  60 +--
 data/wild/kanto_water.asm            |  48 +-
 data/wild/roammon_maps.asm           |   4 +-
 data/wild/swarm_grass.asm            |   4 +-
 data/wild/treemon_maps.asm           |   2 +-
 engine/events/unown_walls.asm        |  18 +-
 home/map.asm                         | 112 ++---
 macros/scripts/events.asm            |  14 +-
 macros/scripts/maps.asm              |   6 +-
 mobile/mobile_22_2.asm               |   2 +-
 wram.asm                             |  12 +-
 27 files changed, 1439 insertions(+), 1440 deletions(-)
 create mode 100644 data/maps/attributes.asm
 delete mode 100644 data/maps/data.asm
 delete mode 100644 data/maps/definitions.asm
 create mode 100644 data/maps/map_data.asm

diff --git a/Makefile b/Makefile
index 6dadfcb44..11766205f 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ home.o \
 main.o \
 wram.o \
 data/text/common.o \
-data/maps/maps.o \
+data/maps/map_data.o \
 data/pokemon/dex_entries.o \
 data/pokemon/egg_moves.o \
 data/pokemon/evos_attacks.o \
diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm
index 0f59f8fd5..ed0e2fbc6 100644
--- a/constants/map_data_constants.asm
+++ b/constants/map_data_constants.asm
@@ -4,18 +4,17 @@ GROUP_NONE EQU 0
 MAP_NONE   EQU 0
 
 
-; map_def struct members (see data/maps/definitions.asm)
+; map struct members (see data/maps/maps.asm)
 	const_def
-	const MAPDEF_MAPDATA_BANK ; 0
-	const MAPDEF_TILESET      ; 1
-	const MAPDEF_ENVIRONMENT  ; 2
-	const MAPDEF_MAPDATA      ; 3
-	const MAPDEF_MAPDATA_HI   ; 4
-	const MAPDEF_LOCATION     ; 5
-	const MAPDEF_MUSIC        ; 6
-	const MAPDEF_PALETTE      ; 7
-	const MAPDEF_FISHGROUP    ; 8
-NUM_MAPDEF_ATTRIBUTES EQU const_value
+	const MAP_MAPATTRIBUTES_BANK ; 0
+	const MAP_TILESET            ; 1
+	const MAP_ENVIRONMENT        ; 2
+	const MAP_MAPATTRIBUTES      ; 3
+	const MAP_MAPATTRIBUTES_HI   ; 4
+	const MAP_LOCATION           ; 5
+	const MAP_MUSIC              ; 6
+	const MAP_PALETTE            ; 7
+	const MAP_FISHGROUP          ; 8
 
 ; map environments (wEnvironment)
 	const_def 1
diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm
index a281c8813..9c6164169 100644
--- a/constants/map_setup_constants.asm
+++ b/constants/map_setup_constants.asm
@@ -44,8 +44,8 @@
 	const map_load_spawn          ; 17
 	const map_load_connection     ; 18
 	const map_load_warp           ; 19
-	const map_attributes          ; 1a
-	const map_attributes_2        ; 1b
+	const map_load_attributes     ; 1a
+	const map_load_attributes_2   ; 1b
 	const map_clear_bg_palettes   ; 1c
 	const map_fade_out_palettes   ; 1d
 	const map_fade_in_palettes    ; 1e
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
new file mode 100644
index 000000000..31e13d64c
--- /dev/null
+++ b/data/maps/attributes.asm
@@ -0,0 +1,663 @@
+map_attributes: MACRO
+;\1: map name
+;\2: map id
+;\3: border block
+;\4: connections: combo of NORTH, SOUTH, WEST, and/or EAST, or 0 for none
+CURRENT_MAP_WIDTH = \2_WIDTH
+CURRENT_MAP_HEIGHT = \2_HEIGHT
+\1_MapAttributes::
+	db \3
+	db CURRENT_MAP_HEIGHT, CURRENT_MAP_WIDTH
+	db BANK(\1_Blocks)
+	dw \1_Blocks
+	db BANK(\1_MapScripts) ; BANK(\1_MapEvents)
+	dw \1_MapScripts
+	dw \1_MapEvents
+	db \4
+ENDM
+
+connection: MACRO
+;\1: direction
+;\2: map name
+;\3: map id
+;\4: x offset for east/west, y offset for north/south
+;\5: distance offset?
+;\6: strip length
+if "\1" == "north"
+	map_id \3
+	dw \2_Blocks + \3_WIDTH * (\3_HEIGHT - 3) + \5
+	dw OverworldMap + \4 + 3
+	db \6
+	db \3_WIDTH
+	db \3_HEIGHT * 2 - 1
+	db (\4 - \5) * -2
+	dw OverworldMap + \3_HEIGHT * (\3_WIDTH + 6) + 1
+elif "\1" == "south"
+	map_id \3
+	dw \2_Blocks + \5
+	dw OverworldMap + (CURRENT_MAP_HEIGHT + 3) * (CURRENT_MAP_WIDTH + 6) + \4 + 3
+	db \6
+	db \3_WIDTH
+	db 0
+	db (\4 - \5) * -2
+	dw OverworldMap + \3_WIDTH + 7
+elif "\1" == "west"
+	map_id \3
+	dw \2_Blocks + (\3_WIDTH * \5) + \3_WIDTH - 3
+	dw OverworldMap + (CURRENT_MAP_WIDTH + 6) * (\4 + 3)
+	db \6
+	db \3_WIDTH
+	db (\4 - \5) * -2
+	db \3_WIDTH * 2 - 1
+	dw OverworldMap + \3_WIDTH * 2 + 6
+elif "\1" == "east"
+	map_id \3
+	dw \2_Blocks + (\3_WIDTH * \5)
+	dw OverworldMap + (CURRENT_MAP_WIDTH + 6) * (\4 + 3 + 1) - 3
+	db \6
+	db \3_WIDTH
+	db (\4 - \5) * -2
+	db 0
+	dw OverworldMap + \3_WIDTH + 7
+endc
+ENDM
+
+
+	map_attributes NewBarkTown, NEW_BARK_TOWN, $05, WEST | EAST
+	connection west, Route29, ROUTE_29, 0, 0, 9
+	connection east, Route27, ROUTE_27, 0, 0, 9
+
+	map_attributes CherrygroveCity, CHERRYGROVE_CITY, $35, NORTH | EAST
+	connection north, Route30, ROUTE_30, 5, 0, 10
+	connection east, Route29, ROUTE_29, 0, 0, 9
+
+	map_attributes VioletCity, VIOLET_CITY, $05, SOUTH | WEST | EAST
+	connection south, Route32, ROUTE_32, 0, 0, 10
+	connection west, Route36, ROUTE_36, 0, 0, 9
+	connection east, Route31, ROUTE_31, 9, 0, 9
+
+	map_attributes AzaleaTown, AZALEA_TOWN, $05, WEST | EAST
+	connection west, Route34, ROUTE_34, -3, 15, 12
+	connection east, Route33, ROUTE_33, 0, 0, 9
+
+	map_attributes CianwoodCity, CIANWOOD_CITY, $35, EAST
+	connection east, Route41, ROUTE_41, 0, 0, 27
+
+	map_attributes GoldenrodCity, GOLDENROD_CITY, $35, NORTH | SOUTH
+	connection north, Route35, ROUTE_35, 5, 0, 10
+	connection south, Route34, ROUTE_34, 5, 0, 10
+
+	map_attributes OlivineCity, OLIVINE_CITY, $35, NORTH | WEST
+	connection north, Route39, ROUTE_39, 5, 0, 10
+	connection west, Route40, ROUTE_40, 9, 0, 12
+
+	map_attributes EcruteakCity, ECRUTEAK_CITY, $05, SOUTH | WEST | EAST
+	connection south, Route37, ROUTE_37, 5, 0, 10
+	connection west, Route38, ROUTE_38, 5, 0, 9
+	connection east, Route42, ROUTE_42, 9, 0, 9
+
+	map_attributes MahoganyTown, MAHOGANY_TOWN, $71, NORTH | WEST | EAST
+	connection north, Route43, ROUTE_43, 0, 0, 10
+	connection west, Route42, ROUTE_42, 0, 0, 9
+	connection east, Route44, ROUTE_44, 0, 0, 9
+
+	map_attributes LakeOfRage, LAKE_OF_RAGE, $05, SOUTH
+	connection south, Route43, ROUTE_43, 5, 0, 10
+
+	map_attributes BlackthornCity, BLACKTHORN_CITY, $71, SOUTH | WEST
+	connection south, Route45, ROUTE_45, 0, 0, 10
+	connection west, Route44, ROUTE_44, 9, 0, 9
+
+	map_attributes SilverCaveOutside, SILVER_CAVE_OUTSIDE, $2c, EAST
+	connection east, Route28, ROUTE_28, 9, 0, 9
+
+	map_attributes Route26, ROUTE_26, $05, WEST
+	connection west, Route27, ROUTE_27, 45, 0, 9
+
+	map_attributes Route27, ROUTE_27, $35, WEST | EAST
+	connection west, NewBarkTown, NEW_BARK_TOWN, 0, 0, 9
+	connection east, Route26, ROUTE_26, -3, 42, 12
+
+	map_attributes Route28, ROUTE_28, $2c, WEST
+	connection west, SilverCaveOutside, SILVER_CAVE_OUTSIDE, -3, 6, 12
+
+	map_attributes Route29, ROUTE_29, $05, NORTH | WEST | EAST
+	connection north, Route46, ROUTE_46, 10, 0, 10
+	connection west, CherrygroveCity, CHERRYGROVE_CITY, 0, 0, 9
+	connection east, NewBarkTown, NEW_BARK_TOWN, 0, 0, 9
+
+	map_attributes Route30, ROUTE_30, $05, NORTH | SOUTH
+	connection north, Route31, ROUTE_31, -3, 7, 13
+	connection south, CherrygroveCity, CHERRYGROVE_CITY, -3, 2, 16
+
+	map_attributes Route31, ROUTE_31, $05, SOUTH | WEST
+	connection south, Route30, ROUTE_30, 10, 0, 10
+	connection west, VioletCity, VIOLET_CITY, -3, 6, 12
+
+	map_attributes Route32, ROUTE_32, $05, NORTH | SOUTH
+	connection north, VioletCity, VIOLET_CITY, 0, 0, 13
+	connection south, Route33, ROUTE_33, 0, 0, 10
+
+	map_attributes Route33, ROUTE_33, $05, NORTH | WEST
+	connection north, Route32, ROUTE_32, 0, 0, 10
+	connection west, AzaleaTown, AZALEA_TOWN, 0, 0, 9
+
+	map_attributes Route34, ROUTE_34, $05, NORTH | EAST
+	connection north, GoldenrodCity, GOLDENROD_CITY, -3, 2, 16
+	connection east, AzaleaTown, AZALEA_TOWN, 18, 0, 9
+
+	map_attributes Route35, ROUTE_35, $05, NORTH | SOUTH
+	connection north, Route36, ROUTE_36, 0, 0, 13
+	connection south, GoldenrodCity, GOLDENROD_CITY, -3, 2, 16
+
+	map_attributes Route36, ROUTE_36, $05, NORTH | SOUTH | EAST
+	connection north, Route37, ROUTE_37, 10, 0, 10
+	connection south, Route35, ROUTE_35, 0, 0, 10
+	connection east, VioletCity, VIOLET_CITY, 0, 0, 12
+
+	map_attributes Route37, ROUTE_37, $05, NORTH | SOUTH
+	connection north, EcruteakCity, ECRUTEAK_CITY, -3, 2, 16
+	connection south, Route36, ROUTE_36, -3, 7, 16
+
+	map_attributes Route38, ROUTE_38, $05, WEST | EAST
+	connection west, Route39, ROUTE_39, 0, 0, 12
+	connection east, EcruteakCity, ECRUTEAK_CITY, -3, 2, 15
+
+	map_attributes Route39, ROUTE_39, $05, SOUTH | EAST
+	connection south, OlivineCity, OLIVINE_CITY, -3, 2, 16
+	connection east, Route38, ROUTE_38, 0, 0, 9
+
+	map_attributes Route40, ROUTE_40, $35, SOUTH | EAST
+	connection south, Route41, ROUTE_41, -3, 12, 13
+	connection east, OlivineCity, OLIVINE_CITY, -3, 6, 12
+
+	map_attributes Route41, ROUTE_41, $35, NORTH | WEST
+	connection north, Route40, ROUTE_40, 15, 0, 10
+	connection west, CianwoodCity, CIANWOOD_CITY, 0, 0, 27
+
+	map_attributes Route42, ROUTE_42, $05, WEST | EAST
+	connection west, EcruteakCity, ECRUTEAK_CITY, -3, 6, 12
+	connection east, MahoganyTown, MAHOGANY_TOWN, 0, 0, 9
+
+	map_attributes Route43, ROUTE_43, $05, NORTH | SOUTH
+	connection north, LakeOfRage, LAKE_OF_RAGE, -3, 2, 16
+	connection south, MahoganyTown, MAHOGANY_TOWN, 0, 0, 10
+
+	map_attributes Route44, ROUTE_44, $71, WEST | EAST
+	connection west, MahoganyTown, MAHOGANY_TOWN, 0, 0, 9
+	connection east, BlackthornCity, BLACKTHORN_CITY, -3, 6, 12
+
+	map_attributes Route45, ROUTE_45, $71, NORTH | WEST
+	connection north, BlackthornCity, BLACKTHORN_CITY, 0, 0, 13
+	connection west, Route46, ROUTE_46, 36, 0, 12
+
+	map_attributes Route46, ROUTE_46, $05, SOUTH | EAST
+	connection south, Route29, ROUTE_29, -3, 7, 16
+	connection east, Route45, ROUTE_45, -3, 33, 12
+
+	map_attributes PewterCity, PEWTER_CITY, $0f, SOUTH | EAST
+	connection south, Route2, ROUTE_2, 5, 0, 10
+	connection east, Route3, ROUTE_3, 5, 0, 9
+
+	map_attributes Route2, ROUTE_2, $0f, NORTH | SOUTH
+	connection north, PewterCity, PEWTER_CITY, -3, 2, 16
+	connection south, ViridianCity, VIRIDIAN_CITY, -3, 2, 16
+
+	map_attributes ViridianCity, VIRIDIAN_CITY, $0f, NORTH | SOUTH | WEST
+	connection north, Route2, ROUTE_2, 5, 0, 10
+	connection south, Route1, ROUTE_1, 10, 0, 10
+	connection west, Route22, ROUTE_22, 4, 0, 9
+
+	map_attributes Route22, ROUTE_22, $2c, EAST
+	connection east, ViridianCity, VIRIDIAN_CITY, -3, 1, 15
+
+	map_attributes Route1, ROUTE_1, $0f, NORTH | SOUTH
+	connection north, ViridianCity, VIRIDIAN_CITY, -3, 7, 13
+	connection south, PalletTown, PALLET_TOWN, 0, 0, 10
+
+	map_attributes PalletTown, PALLET_TOWN, $0f, NORTH | SOUTH
+	connection north, Route1, ROUTE_1, 0, 0, 10
+	connection south, Route21, ROUTE_21, 0, 0, 10
+
+	map_attributes Route21, ROUTE_21, $43, NORTH | SOUTH
+	connection north, PalletTown, PALLET_TOWN, 0, 0, 10
+	connection south, CinnabarIsland, CINNABAR_ISLAND, 0, 0, 10
+
+	map_attributes CinnabarIsland, CINNABAR_ISLAND, $43, NORTH | EAST
+	connection north, Route21, ROUTE_21, 0, 0, 10
+	connection east, Route20, ROUTE_20, 0, 0, 9
+
+	map_attributes Route20, ROUTE_20, $43, WEST | EAST
+	connection west, CinnabarIsland, CINNABAR_ISLAND, 0, 0, 9
+	connection east, Route19, ROUTE_19, -3, 6, 12
+
+	map_attributes Route19, ROUTE_19, $43, NORTH | WEST
+	connection north, FuchsiaCity, FUCHSIA_CITY, 0, 0, 13
+	connection west, Route20, ROUTE_20, 9, 0, 9
+
+	map_attributes FuchsiaCity, FUCHSIA_CITY, $0f, SOUTH | WEST | EAST
+	connection south, Route19, ROUTE_19, 0, 0, 10
+	connection west, Route18, ROUTE_18, 7, 0, 9
+	connection east, Route15, ROUTE_15, 9, 0, 9
+
+	map_attributes Route18, ROUTE_18, $43, WEST | EAST
+	connection west, Route17, ROUTE_17, -3, 35, 10
+	connection east, FuchsiaCity, FUCHSIA_CITY, -3, 4, 14
+
+	map_attributes Route17, ROUTE_17, $43, NORTH | EAST
+	connection north, Route16, ROUTE_16, 0, 0, 10
+	connection east, Route18, ROUTE_18, 38, 0, 9
+
+	map_attributes Route16, ROUTE_16, $0f, SOUTH | EAST
+	connection south, Route17, ROUTE_17, 0, 0, 10
+	connection east, CeladonCity, CELADON_CITY, -3, 6, 12
+
+	map_attributes CeladonCity, CELADON_CITY, $0f, WEST | EAST
+	connection west, Route16, ROUTE_16, 9, 0, 9
+	connection east, Route7, ROUTE_7, 5, 0, 9
+
+	map_attributes Route7, ROUTE_7, $0f, WEST | EAST
+	connection west, CeladonCity, CELADON_CITY, -3, 2, 15
+	connection east, SaffronCity, SAFFRON_CITY, -3, 6, 12
+
+	map_attributes Route15, ROUTE_15, $0f, WEST | EAST
+	connection west, FuchsiaCity, FUCHSIA_CITY, -3, 6, 12
+	connection east, Route14, ROUTE_14, -3, 6, 12
+
+	map_attributes Route14, ROUTE_14, $43, NORTH | WEST
+	connection north, Route13, ROUTE_13, 0, 0, 13
+	connection west, Route15, ROUTE_15, 9, 0, 9
+
+	map_attributes Route13, ROUTE_13, $43, NORTH | SOUTH
+	connection north, Route12, ROUTE_12, 20, 0, 10
+	connection south, Route14, ROUTE_14, 0, 0, 10
+
+	map_attributes Route12, ROUTE_12, $43, NORTH | SOUTH | WEST
+	connection north, LavenderTown, LAVENDER_TOWN, 0, 0, 10
+	connection south, Route13, ROUTE_13, -3, 17, 13
+	connection west, Route11, ROUTE_11, 9, 0, 9
+
+	map_attributes Route11, ROUTE_11, $0f, WEST | EAST
+	connection west, VermilionCity, VERMILION_CITY, 0, 0, 12
+	connection east, Route12, ROUTE_12, -3, 6, 15
+
+	map_attributes LavenderTown, LAVENDER_TOWN, $2c, NORTH | SOUTH | WEST
+	connection north, Route10South, ROUTE_10_SOUTH, 0, 0, 10
+	connection south, Route12, ROUTE_12, 0, 0, 10
+	connection west, Route8, ROUTE_8, 0, 0, 9
+
+	map_attributes VermilionCity, VERMILION_CITY, $43, NORTH | EAST
+	connection north, Route6, ROUTE_6, 5, 0, 10
+	connection east, Route11, ROUTE_11, 0, 0, 9
+
+	map_attributes Route6, ROUTE_6, $0f, NORTH | SOUTH
+	connection north, SaffronCity, SAFFRON_CITY, -3, 2, 16
+	connection south, VermilionCity, VERMILION_CITY, -3, 2, 16
+
+	map_attributes SaffronCity, SAFFRON_CITY, $0f, NORTH | SOUTH | WEST | EAST
+	connection north, Route5, ROUTE_5, 5, 0, 10
+	connection south, Route6, ROUTE_6, 5, 0, 10
+	connection west, Route7, ROUTE_7, 9, 0, 9
+	connection east, Route8, ROUTE_8, 9, 0, 9
+
+	map_attributes Route5, ROUTE_5, $0f, NORTH | SOUTH
+	connection north, CeruleanCity, CERULEAN_CITY, -3, 2, 16
+	connection south, SaffronCity, SAFFRON_CITY, -3, 2, 16
+
+	map_attributes CeruleanCity, CERULEAN_CITY, $0f, NORTH | SOUTH | WEST | EAST
+	connection north, Route24, ROUTE_24, 6, 0, 10
+	connection south, Route5, ROUTE_5, 5, 0, 10
+	connection west, Route4, ROUTE_4, 5, 0, 9
+	connection east, Route9, ROUTE_9, 9, 0, 9
+
+	map_attributes Route9, ROUTE_9, $2c, SOUTH | WEST
+	connection south, Route10North, ROUTE_10_NORTH, 20, 0, 10
+	connection west, CeruleanCity, CERULEAN_CITY, -3, 6, 12
+
+	map_attributes Route24, ROUTE_24, $2c, NORTH | SOUTH
+	connection north, Route25, ROUTE_25, 0, 0, 13
+	connection south, CeruleanCity, CERULEAN_CITY, -3, 3, 16
+
+	map_attributes Route25, ROUTE_25, $2c, SOUTH
+	connection south, Route24, ROUTE_24, 0, 0, 10
+
+	map_attributes Route3, ROUTE_3, $2c, WEST | EAST
+	connection west, PewterCity, PEWTER_CITY, -3, 2, 15
+	connection east, Route4, ROUTE_4, 0, 0, 9
+
+	map_attributes Route4, ROUTE_4, $2c, WEST | EAST
+	connection west, Route3, ROUTE_3, 0, 0, 9
+	connection east, CeruleanCity, CERULEAN_CITY, -3, 2, 15
+
+	map_attributes Route8, ROUTE_8, $2c, WEST | EAST
+	connection west, SaffronCity, SAFFRON_CITY, -3, 6, 12
+	connection east, LavenderTown, LAVENDER_TOWN, 0, 0, 9
+
+	map_attributes Route10North, ROUTE_10_NORTH, $2c, NORTH | SOUTH
+	connection north, Route9, ROUTE_9, -3, 17, 13
+	connection south, Route10South, ROUTE_10_SOUTH, 0, 0, 10
+
+	map_attributes Route10South, ROUTE_10_SOUTH, $2c, NORTH | SOUTH
+	connection north, Route10North, ROUTE_10_NORTH, 0, 0, 10
+	connection south, LavenderTown, LAVENDER_TOWN, 0, 0, 10
+
+	map_attributes Route23, ROUTE_23, $0f, 0
+	map_attributes SproutTower1F, SPROUT_TOWER_1F, $00, 0
+	map_attributes SproutTower2F, SPROUT_TOWER_2F, $00, 0
+	map_attributes SproutTower3F, SPROUT_TOWER_3F, $00, 0
+	map_attributes TinTower1F, TIN_TOWER_1F, $00, 0
+	map_attributes TinTower2F, TIN_TOWER_2F, $00, 0
+	map_attributes TinTower3F, TIN_TOWER_3F, $00, 0
+	map_attributes TinTower4F, TIN_TOWER_4F, $00, 0
+	map_attributes TinTower5F, TIN_TOWER_5F, $00, 0
+	map_attributes TinTower6F, TIN_TOWER_6F, $00, 0
+	map_attributes TinTower7F, TIN_TOWER_7F, $00, 0
+	map_attributes TinTower8F, TIN_TOWER_8F, $00, 0
+	map_attributes TinTower9F, TIN_TOWER_9F, $00, 0
+	map_attributes BurnedTower1F, BURNED_TOWER_1F, $00, 0
+	map_attributes BurnedTowerB1F, BURNED_TOWER_B1F, $09, 0
+	map_attributes NationalPark, NATIONAL_PARK, $00, 0
+	map_attributes NationalParkBugContest, NATIONAL_PARK_BUG_CONTEST, $00, 0
+	map_attributes RadioTower1F, RADIO_TOWER_1F, $00, 0
+	map_attributes RadioTower2F, RADIO_TOWER_2F, $00, 0
+	map_attributes RadioTower3F, RADIO_TOWER_3F, $00, 0
+	map_attributes RadioTower4F, RADIO_TOWER_4F, $00, 0
+	map_attributes RadioTower5F, RADIO_TOWER_5F, $00, 0
+	map_attributes RuinsOfAlphOutside, RUINS_OF_ALPH_OUTSIDE, $05, 0
+	map_attributes RuinsOfAlphHoOhChamber, RUINS_OF_ALPH_HO_OH_CHAMBER, $00, 0
+	map_attributes RuinsOfAlphKabutoChamber, RUINS_OF_ALPH_KABUTO_CHAMBER, $00, 0
+	map_attributes RuinsOfAlphOmanyteChamber, RUINS_OF_ALPH_OMANYTE_CHAMBER, $00, 0
+	map_attributes RuinsOfAlphAerodactylChamber, RUINS_OF_ALPH_AERODACTYL_CHAMBER, $00, 0
+	map_attributes RuinsOfAlphInnerChamber, RUINS_OF_ALPH_INNER_CHAMBER, $00, 0
+	map_attributes RuinsOfAlphResearchCenter, RUINS_OF_ALPH_RESEARCH_CENTER, $00, 0
+	map_attributes RuinsOfAlphHoOhItemRoom, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, $00, 0
+	map_attributes RuinsOfAlphKabutoItemRoom, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, $00, 0
+	map_attributes RuinsOfAlphOmanyteItemRoom, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, $00, 0
+	map_attributes RuinsOfAlphAerodactylItemRoom, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, $00, 0
+	map_attributes RuinsOfAlphHoOhWordRoom, RUINS_OF_ALPH_HO_OH_WORD_ROOM, $00, 0
+	map_attributes RuinsOfAlphKabutoWordRoom, RUINS_OF_ALPH_KABUTO_WORD_ROOM, $00, 0
+	map_attributes RuinsOfAlphOmanyteWordRoom, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, $00, 0
+	map_attributes RuinsOfAlphAerodactylWordRoom, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, $00, 0
+	map_attributes UnionCave1F, UNION_CAVE_1F, $09, 0
+	map_attributes UnionCaveB1F, UNION_CAVE_B1F, $09, 0
+	map_attributes UnionCaveB2F, UNION_CAVE_B2F, $09, 0
+	map_attributes SlowpokeWellB1F, SLOWPOKE_WELL_B1F, $09, 0
+	map_attributes SlowpokeWellB2F, SLOWPOKE_WELL_B2F, $09, 0
+	map_attributes OlivineLighthouse1F, OLIVINE_LIGHTHOUSE_1F, $00, 0
+	map_attributes OlivineLighthouse2F, OLIVINE_LIGHTHOUSE_2F, $00, 0
+	map_attributes OlivineLighthouse3F, OLIVINE_LIGHTHOUSE_3F, $00, 0
+	map_attributes OlivineLighthouse4F, OLIVINE_LIGHTHOUSE_4F, $00, 0
+	map_attributes OlivineLighthouse5F, OLIVINE_LIGHTHOUSE_5F, $00, 0
+	map_attributes OlivineLighthouse6F, OLIVINE_LIGHTHOUSE_6F, $00, 0
+	map_attributes MahoganyMart1F, MAHOGANY_MART_1F, $00, 0
+	map_attributes TeamRocketBaseB1F, TEAM_ROCKET_BASE_B1F, $00, 0
+	map_attributes TeamRocketBaseB2F, TEAM_ROCKET_BASE_B2F, $00, 0
+	map_attributes TeamRocketBaseB3F, TEAM_ROCKET_BASE_B3F, $00, 0
+	map_attributes IlexForest, ILEX_FOREST, $05, 0
+	map_attributes GoldenrodUnderground, GOLDENROD_UNDERGROUND, $00, 0
+	map_attributes GoldenrodUndergroundSwitchRoomEntrances, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, $00, 0
+	map_attributes GoldenrodDeptStoreB1F, GOLDENROD_DEPT_STORE_B1F, $00, 0
+	map_attributes GoldenrodUndergroundWarehouse, GOLDENROD_UNDERGROUND_WAREHOUSE, $00, 0
+	map_attributes MountMortar1FOutside, MOUNT_MORTAR_1F_OUTSIDE, $09, 0
+	map_attributes MountMortar1FInside, MOUNT_MORTAR_1F_INSIDE, $09, 0
+	map_attributes MountMortar2FInside, MOUNT_MORTAR_2F_INSIDE, $09, 0
+	map_attributes MountMortarB1F, MOUNT_MORTAR_B1F, $09, 0
+	map_attributes IcePath1F, ICE_PATH_1F, $09, 0
+	map_attributes IcePathB1F, ICE_PATH_B1F, $19, 0
+	map_attributes IcePathB2FMahoganySide, ICE_PATH_B2F_MAHOGANY_SIDE, $19, 0
+	map_attributes IcePathB2FBlackthornSide, ICE_PATH_B2F_BLACKTHORN_SIDE, $19, 0
+	map_attributes IcePathB3F, ICE_PATH_B3F, $19, 0
+	map_attributes WhirlIslandNW, WHIRL_ISLAND_NW, $09, 0
+	map_attributes WhirlIslandNE, WHIRL_ISLAND_NE, $09, 0
+	map_attributes WhirlIslandSW, WHIRL_ISLAND_SW, $09, 0
+	map_attributes WhirlIslandCave, WHIRL_ISLAND_CAVE, $09, 0
+	map_attributes WhirlIslandSE, WHIRL_ISLAND_SE, $0f, 0
+	map_attributes WhirlIslandB1F, WHIRL_ISLAND_B1F, $09, 0
+	map_attributes WhirlIslandB2F, WHIRL_ISLAND_B2F, $2e, 0
+	map_attributes WhirlIslandLugiaChamber, WHIRL_ISLAND_LUGIA_CHAMBER, $0f, 0
+	map_attributes SilverCaveRoom1, SILVER_CAVE_ROOM_1, $09, 0
+	map_attributes SilverCaveRoom2, SILVER_CAVE_ROOM_2, $09, 0
+	map_attributes SilverCaveRoom3, SILVER_CAVE_ROOM_3, $09, 0
+	map_attributes SilverCaveItemRooms, SILVER_CAVE_ITEM_ROOMS, $09, 0
+	map_attributes DarkCaveVioletEntrance, DARK_CAVE_VIOLET_ENTRANCE, $09, 0
+	map_attributes DarkCaveBlackthornEntrance, DARK_CAVE_BLACKTHORN_ENTRANCE, $09, 0
+	map_attributes DragonsDen1F, DRAGONS_DEN_1F, $09, 0
+	map_attributes DragonsDenB1F, DRAGONS_DEN_B1F, $71, 0
+	map_attributes DragonShrine, DRAGON_SHRINE, $00, 0
+	map_attributes TohjoFalls, TOHJO_FALLS, $09, 0
+	map_attributes OlivinePokecenter1F, OLIVINE_POKECENTER_1F, $00, 0
+	map_attributes OlivineGym, OLIVINE_GYM, $00, 0
+	map_attributes OlivineTimsHouse, OLIVINE_TIMS_HOUSE, $00, 0
+	map_attributes OlivineHouseBeta, OLIVINE_HOUSE_BETA, $00, 0
+	map_attributes OlivinePunishmentSpeechHouse, OLIVINE_PUNISHMENT_SPEECH_HOUSE, $00, 0
+	map_attributes OlivineGoodRodHouse, OLIVINE_GOOD_ROD_HOUSE, $00, 0
+	map_attributes OlivineCafe, OLIVINE_CAFE, $00, 0
+	map_attributes OlivineMart, OLIVINE_MART, $00, 0
+	map_attributes Route38EcruteakGate, ROUTE_38_ECRUTEAK_GATE, $00, 0
+	map_attributes Route39Barn, ROUTE_39_BARN, $00, 0
+	map_attributes Route39Farmhouse, ROUTE_39_FARMHOUSE, $00, 0
+	map_attributes MahoganyRedGyaradosSpeechHouse, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, $00, 0
+	map_attributes MahoganyGym, MAHOGANY_GYM, $00, 0
+	map_attributes MahoganyPokecenter1F, MAHOGANY_POKECENTER_1F, $00, 0
+	map_attributes Route42EcruteakGate, ROUTE_42_ECRUTEAK_GATE, $00, 0
+	map_attributes DiglettsCave, DIGLETTS_CAVE, $09, 0
+	map_attributes MountMoon, MOUNT_MOON, $09, 0
+	map_attributes UndergroundPath, UNDERGROUND_PATH, $00, 0
+	map_attributes RockTunnel1F, ROCK_TUNNEL_1F, $09, 0
+	map_attributes RockTunnelB1F, ROCK_TUNNEL_B1F, $09, 0
+	map_attributes SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $00, 0
+	map_attributes SafariZoneBeta, SAFARI_ZONE_BETA, $13, 0
+	map_attributes VictoryRoad, VICTORY_ROAD, $1d, 0
+	map_attributes EcruteakTinTowerEntrance, ECRUTEAK_TIN_TOWER_ENTRANCE, $00, 0
+	map_attributes WiseTriosRoom, WISE_TRIOS_ROOM, $00, 0
+	map_attributes EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $00, 0
+	map_attributes EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $00, 0
+	map_attributes DanceTheatre, DANCE_THEATRE, $00, 0
+	map_attributes EcruteakMart, ECRUTEAK_MART, $00, 0
+	map_attributes EcruteakGym, ECRUTEAK_GYM, $00, 0
+	map_attributes EcruteakItemfinderHouse, ECRUTEAK_ITEMFINDER_HOUSE, $00, 0
+	map_attributes BlackthornGym1F, BLACKTHORN_GYM_1F, $00, 0
+	map_attributes BlackthornGym2F, BLACKTHORN_GYM_2F, $00, 0
+	map_attributes BlackthornDragonSpeechHouse, BLACKTHORN_DRAGON_SPEECH_HOUSE, $00, 0
+	map_attributes BlackthornEmysHouse, BLACKTHORN_EMYS_HOUSE, $00, 0
+	map_attributes BlackthornMart, BLACKTHORN_MART, $00, 0
+	map_attributes BlackthornPokecenter1F, BLACKTHORN_POKECENTER_1F, $00, 0
+	map_attributes MoveDeletersHouse, MOVE_DELETERS_HOUSE, $00, 0
+	map_attributes CinnabarPokecenter1F, CINNABAR_POKECENTER_1F, $00, 0
+	map_attributes CinnabarPokecenter2FBeta, CINNABAR_POKECENTER_2F_BETA, $00, 0
+	map_attributes Route19FuchsiaGate, ROUTE_19_FUCHSIA_GATE, $00, 0
+	map_attributes SeafoamGym, SEAFOAM_GYM, $09, 0
+	map_attributes CeruleanGymBadgeSpeechHouse, CERULEAN_GYM_BADGE_SPEECH_HOUSE, $00, 0
+	map_attributes CeruleanPoliceStation, CERULEAN_POLICE_STATION, $00, 0
+	map_attributes CeruleanTradeSpeechHouse, CERULEAN_TRADE_SPEECH_HOUSE, $00, 0
+	map_attributes CeruleanPokecenter1F, CERULEAN_POKECENTER_1F, $00, 0
+	map_attributes CeruleanPokecenter2FBeta, CERULEAN_POKECENTER_2F_BETA, $00, 0
+	map_attributes CeruleanGym, CERULEAN_GYM, $00, 0
+	map_attributes CeruleanMart, CERULEAN_MART, $00, 0
+	map_attributes Route10Pokecenter1F, ROUTE_10_POKECENTER_1F, $00, 0
+	map_attributes Route10Pokecenter2FBeta, ROUTE_10_POKECENTER_2F_BETA, $00, 0
+	map_attributes PowerPlant, POWER_PLANT, $00, 0
+	map_attributes BillsHouse, BILLS_HOUSE, $00, 0
+	map_attributes AzaleaPokecenter1F, AZALEA_POKECENTER_1F, $00, 0
+	map_attributes CharcoalKiln, CHARCOAL_KILN, $00, 0
+	map_attributes AzaleaMart, AZALEA_MART, $00, 0
+	map_attributes KurtsHouse, KURTS_HOUSE, $00, 0
+	map_attributes AzaleaGym, AZALEA_GYM, $00, 0
+	map_attributes LakeOfRageHiddenPowerHouse, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, $00, 0
+	map_attributes LakeOfRageMagikarpHouse, LAKE_OF_RAGE_MAGIKARP_HOUSE, $00, 0
+	map_attributes Route43MahoganyGate, ROUTE_43_MAHOGANY_GATE, $00, 0
+	map_attributes Route43Gate, ROUTE_43_GATE, $00, 0
+	map_attributes VioletMart, VIOLET_MART, $00, 0
+	map_attributes VioletGym, VIOLET_GYM, $00, 0
+	map_attributes EarlsPokemonAcademy, EARLS_POKEMON_ACADEMY, $00, 0
+	map_attributes VioletNicknameSpeechHouse, VIOLET_NICKNAME_SPEECH_HOUSE, $00, 0
+	map_attributes VioletPokecenter1F, VIOLET_POKECENTER_1F, $00, 0
+	map_attributes VioletKylesHouse, VIOLET_KYLES_HOUSE, $00, 0
+	map_attributes Route32RuinsOfAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $00, 0
+	map_attributes Route32Pokecenter1F, ROUTE_32_POKECENTER_1F, $00, 0
+	map_attributes Route35GoldenrodGate, ROUTE_35_GOLDENROD_GATE, $00, 0
+	map_attributes Route35NationalParkGate, ROUTE_35_NATIONAL_PARK_GATE, $00, 0
+	map_attributes Route36RuinsOfAlphGate, ROUTE_36_RUINS_OF_ALPH_GATE, $00, 0
+	map_attributes Route36NationalParkGate, ROUTE_36_NATIONAL_PARK_GATE, $00, 0
+	map_attributes GoldenrodGym, GOLDENROD_GYM, $00, 0
+	map_attributes GoldenrodBikeShop, GOLDENROD_BIKE_SHOP, $00, 0
+	map_attributes GoldenrodHappinessRater, GOLDENROD_HAPPINESS_RATER, $00, 0
+	map_attributes BillsFamilysHouse, BILLS_FAMILYS_HOUSE, $00, 0
+	map_attributes GoldenrodMagnetTrainStation, GOLDENROD_MAGNET_TRAIN_STATION, $00, 0
+	map_attributes GoldenrodFlowerShop, GOLDENROD_FLOWER_SHOP, $00, 0
+	map_attributes GoldenrodPPSpeechHouse, GOLDENROD_PP_SPEECH_HOUSE, $00, 0
+	map_attributes GoldenrodNameRater, GOLDENROD_NAME_RATER, $00, 0
+	map_attributes GoldenrodDeptStore1F, GOLDENROD_DEPT_STORE_1F, $00, 0
+	map_attributes GoldenrodDeptStore2F, GOLDENROD_DEPT_STORE_2F, $00, 0
+	map_attributes GoldenrodDeptStore3F, GOLDENROD_DEPT_STORE_3F, $00, 0
+	map_attributes GoldenrodDeptStore4F, GOLDENROD_DEPT_STORE_4F, $00, 0
+	map_attributes GoldenrodDeptStore5F, GOLDENROD_DEPT_STORE_5F, $00, 0
+	map_attributes GoldenrodDeptStore6F, GOLDENROD_DEPT_STORE_6F, $00, 0
+	map_attributes GoldenrodDeptStoreElevator, GOLDENROD_DEPT_STORE_ELEVATOR, $00, 0
+	map_attributes GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0
+	map_attributes GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $00, 0
+	map_attributes GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $00, 0
+	map_attributes PokecomCenterAdminRoomMobile, POKECOM_CENTER_ADMIN_ROOM_MOBILE, $00, 0
+	map_attributes IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $00, 0
+	map_attributes Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $00, 0
+	map_attributes DayCare, DAY_CARE, $00, 0
+	map_attributes VermilionFishingSpeechHouse, VERMILION_FISHING_SPEECH_HOUSE, $00, 0
+	map_attributes VermilionPokecenter1F, VERMILION_POKECENTER_1F, $00, 0
+	map_attributes VermilionPokecenter2FBeta, VERMILION_POKECENTER_2F_BETA, $00, 0
+	map_attributes PokemonFanClub, POKEMON_FAN_CLUB, $00, 0
+	map_attributes VermilionMagnetTrainSpeechHouse, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, $00, 0
+	map_attributes VermilionMart, VERMILION_MART, $00, 0
+	map_attributes VermilionDiglettsCaveSpeechHouse, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE, $00, 0
+	map_attributes VermilionGym, VERMILION_GYM, $00, 0
+	map_attributes Route6SaffronGate, ROUTE_6_SAFFRON_GATE, $00, 0
+	map_attributes Route6UndergroundPathEntrance, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, $00, 0
+	map_attributes RedsHouse1F, REDS_HOUSE_1F, $00, 0
+	map_attributes RedsHouse2F, REDS_HOUSE_2F, $00, 0
+	map_attributes BluesHouse, BLUES_HOUSE, $00, 0
+	map_attributes OaksLab, OAKS_LAB, $00, 0
+	map_attributes PewterNidoranSpeechHouse, PEWTER_NIDORAN_SPEECH_HOUSE, $00, 0
+	map_attributes PewterGym, PEWTER_GYM, $00, 0
+	map_attributes PewterMart, PEWTER_MART, $00, 0
+	map_attributes PewterPokecenter1F, PEWTER_POKECENTER_1F, $00, 0
+	map_attributes PewterPokecenter2FBeta, PEWTER_POKECENTER_2F_BETA, $00, 0
+	map_attributes PewterSnoozeSpeechHouse, PEWTER_SNOOZE_SPEECH_HOUSE, $00, 0
+	map_attributes OlivinePort, OLIVINE_PORT, $0a, 0
+	map_attributes VermilionPort, VERMILION_PORT, $0a, 0
+	map_attributes FastShip1F, FAST_SHIP_1F, $00, 0
+	map_attributes FastShipCabins_NNW_NNE_NE, FAST_SHIP_CABINS_NNW_NNE_NE, $00, 0
+	map_attributes FastShipCabins_SW_SSW_NW, FAST_SHIP_CABINS_SW_SSW_NW, $00, 0
+	map_attributes FastShipCabins_SE_SSE_CaptainsCabin, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, $00, 0
+	map_attributes FastShipB1F, FAST_SHIP_B1F, $00, 0
+	map_attributes OlivinePortPassage, OLIVINE_PORT_PASSAGE, $00, 0
+	map_attributes VermilionPortPassage, VERMILION_PORT_PASSAGE, $00, 0
+	map_attributes MountMoonSquare, MOUNT_MOON_SQUARE, $2d, 0
+	map_attributes MountMoonGiftShop, MOUNT_MOON_GIFT_SHOP, $00, 0
+	map_attributes TinTowerRoof, TIN_TOWER_ROOF, $00, 0
+	map_attributes IndigoPlateauPokecenter1F, INDIGO_PLATEAU_POKECENTER_1F, $00, 0
+	map_attributes WillsRoom, WILLS_ROOM, $00, 0
+	map_attributes KogasRoom, KOGAS_ROOM, $00, 0
+	map_attributes BrunosRoom, BRUNOS_ROOM, $00, 0
+	map_attributes KarensRoom, KARENS_ROOM, $00, 0
+	map_attributes LancesRoom, LANCES_ROOM, $00, 0
+	map_attributes HallOfFame, HALL_OF_FAME, $00, 0
+	map_attributes FuchsiaMart, FUCHSIA_MART, $00, 0
+	map_attributes SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $00, 0
+	map_attributes FuchsiaGym, FUCHSIA_GYM, $00, 0
+	map_attributes BillsBrothersHouse, BILLS_BROTHERS_HOUSE, $00, 0
+	map_attributes FuchsiaPokecenter1F, FUCHSIA_POKECENTER_1F, $00, 0
+	map_attributes FuchsiaPokecenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $00, 0
+	map_attributes SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $00, 0
+	map_attributes Route15FuchsiaGate, ROUTE_15_FUCHSIA_GATE, $00, 0
+	map_attributes LavenderPokecenter1F, LAVENDER_POKECENTER_1F, $00, 0
+	map_attributes LavenderPokecenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $00, 0
+	map_attributes MrFujisHouse, MR_FUJIS_HOUSE, $00, 0
+	map_attributes LavenderSpeechHouse, LAVENDER_SPEECH_HOUSE, $00, 0
+	map_attributes LavenderNameRater, LAVENDER_NAME_RATER, $00, 0
+	map_attributes LavenderMart, LAVENDER_MART, $00, 0
+	map_attributes SoulHouse, SOUL_HOUSE, $00, 0
+	map_attributes LavRadioTower1F, LAV_RADIO_TOWER_1F, $00, 0
+	map_attributes Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $00, 0
+	map_attributes Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, $00, 0
+	map_attributes SilverCavePokecenter1F, SILVER_CAVE_POKECENTER_1F, $00, 0
+	map_attributes Route28SteelWingHouse, ROUTE_28_STEEL_WING_HOUSE, $00, 0
+	map_attributes Pokecenter2F, POKECENTER_2F, $00, 0
+	map_attributes TradeCenter, TRADE_CENTER, $00, 0
+	map_attributes Colosseum, COLOSSEUM, $00, 0
+	map_attributes TimeCapsule, TIME_CAPSULE, $00, 0
+	map_attributes MobileTradeRoom, MOBILE_TRADE_ROOM, $00, 0
+	map_attributes MobileBattleRoom, MOBILE_BATTLE_ROOM, $00, 0
+	map_attributes CeladonDeptStore1F, CELADON_DEPT_STORE_1F, $00, 0
+	map_attributes CeladonDeptStore2F, CELADON_DEPT_STORE_2F, $00, 0
+	map_attributes CeladonDeptStore3F, CELADON_DEPT_STORE_3F, $00, 0
+	map_attributes CeladonDeptStore4F, CELADON_DEPT_STORE_4F, $00, 0
+	map_attributes CeladonDeptStore5F, CELADON_DEPT_STORE_5F, $00, 0
+	map_attributes CeladonDeptStore6F, CELADON_DEPT_STORE_6F, $00, 0
+	map_attributes CeladonDeptStoreElevator, CELADON_DEPT_STORE_ELEVATOR, $00, 0
+	map_attributes CeladonMansion1F, CELADON_MANSION_1F, $00, 0
+	map_attributes CeladonMansion2F, CELADON_MANSION_2F, $00, 0
+	map_attributes CeladonMansion3F, CELADON_MANSION_3F, $00, 0
+	map_attributes CeladonMansionRoof, CELADON_MANSION_ROOF, $01, 0
+	map_attributes CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, $00, 0
+	map_attributes CeladonPokecenter1F, CELADON_POKECENTER_1F, $00, 0
+	map_attributes CeladonPokecenter2FBeta, CELADON_POKECENTER_2F_BETA, $00, 0
+	map_attributes CeladonGameCorner, CELADON_GAME_CORNER, $00, 0
+	map_attributes CeladonGameCornerPrizeRoom, CELADON_GAME_CORNER_PRIZE_ROOM, $00, 0
+	map_attributes CeladonGym, CELADON_GYM, $00, 0
+	map_attributes CeladonCafe, CELADON_CAFE, $00, 0
+	map_attributes Route16FuchsiaSpeechHouse, ROUTE_16_FUCHSIA_SPEECH_HOUSE, $00, 0
+	map_attributes Route16Gate, ROUTE_16_GATE, $00, 0
+	map_attributes Route7SaffronGate, ROUTE_7_SAFFRON_GATE, $00, 0
+	map_attributes Route17Route18Gate, ROUTE_17_ROUTE_18_GATE, $00, 0
+	map_attributes ManiasHouse, MANIAS_HOUSE, $00, 0
+	map_attributes CianwoodGym, CIANWOOD_GYM, $00, 0
+	map_attributes CianwoodPokecenter1F, CIANWOOD_POKECENTER_1F, $00, 0
+	map_attributes CianwoodPharmacy, CIANWOOD_PHARMACY, $00, 0
+	map_attributes CianwoodPhotoStudio, CIANWOOD_PHOTO_STUDIO, $00, 0
+	map_attributes CianwoodLugiaSpeechHouse, CIANWOOD_LUGIA_SPEECH_HOUSE, $00, 0
+	map_attributes PokeSeersHouse, POKE_SEERS_HOUSE, $00, 0
+	map_attributes BattleTower1F, BATTLE_TOWER_1F, $00, 0
+	map_attributes BattleTowerBattleRoom, BATTLE_TOWER_BATTLE_ROOM, $00, 0
+	map_attributes BattleTowerElevator, BATTLE_TOWER_ELEVATOR, $00, 0
+	map_attributes BattleTowerHallway, BATTLE_TOWER_HALLWAY, $00, 0
+	map_attributes Route40BattleTowerGate, ROUTE_40_BATTLE_TOWER_GATE, $00, 0
+	map_attributes BattleTowerOutside, BATTLE_TOWER_OUTSIDE, $05, 0
+	map_attributes ViridianGym, VIRIDIAN_GYM, $00, 0
+	map_attributes ViridianNicknameSpeechHouse, VIRIDIAN_NICKNAME_SPEECH_HOUSE, $00, 0
+	map_attributes TrainerHouse1F, TRAINER_HOUSE_1F, $00, 0
+	map_attributes TrainerHouseB1F, TRAINER_HOUSE_B1F, $00, 0
+	map_attributes ViridianMart, VIRIDIAN_MART, $00, 0
+	map_attributes ViridianPokecenter1F, VIRIDIAN_POKECENTER_1F, $00, 0
+	map_attributes ViridianPokecenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $00, 0
+	map_attributes Route2NuggetHouse, ROUTE_2_NUGGET_HOUSE, $00, 0
+	map_attributes Route2Gate, ROUTE_2_GATE, $00, 0
+	map_attributes VictoryRoadGate, VICTORY_ROAD_GATE, $00, 0
+	map_attributes ElmsLab, ELMS_LAB, $00, 0
+	map_attributes PlayersHouse1F, PLAYERS_HOUSE_1F, $00, 0
+	map_attributes PlayersHouse2F, PLAYERS_HOUSE_2F, $00, 0
+	map_attributes PlayersNeighborsHouse, PLAYERS_NEIGHBORS_HOUSE, $00, 0
+	map_attributes ElmsHouse, ELMS_HOUSE, $00, 0
+	map_attributes Route26HealHouse, ROUTE_26_HEAL_HOUSE, $00, 0
+	map_attributes DayOfWeekSiblingsHouse, DAY_OF_WEEK_SIBLINGS_HOUSE, $00, 0
+	map_attributes Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $00, 0
+	map_attributes Route29Route46Gate, ROUTE_29_ROUTE_46_GATE, $00, 0
+	map_attributes FightingDojo, FIGHTING_DOJO, $00, 0
+	map_attributes SaffronGym, SAFFRON_GYM, $00, 0
+	map_attributes SaffronMart, SAFFRON_MART, $00, 0
+	map_attributes SaffronPokecenter1F, SAFFRON_POKECENTER_1F, $00, 0
+	map_attributes SaffronPokecenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $00, 0
+	map_attributes MrPsychicsHouse, MR_PSYCHICS_HOUSE, $00, 0
+	map_attributes SaffronMagnetTrainStation, SAFFRON_MAGNET_TRAIN_STATION, $00, 0
+	map_attributes SilphCo1F, SILPH_CO_1F, $00, 0
+	map_attributes CopycatsHouse1F, COPYCATS_HOUSE_1F, $00, 0
+	map_attributes CopycatsHouse2F, COPYCATS_HOUSE_2F, $00, 0
+	map_attributes Route5UndergroundPathEntrance, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, $00, 0
+	map_attributes Route5SaffronGate, ROUTE_5_SAFFRON_GATE, $00, 0
+	map_attributes Route5CleanseTagHouse, ROUTE_5_CLEANSE_TAG_HOUSE, $00, 0
+	map_attributes CherrygroveMart, CHERRYGROVE_MART, $00, 0
+	map_attributes CherrygrovePokecenter1F, CHERRYGROVE_POKECENTER_1F, $00, 0
+	map_attributes CherrygroveGymSpeechHouse, CHERRYGROVE_GYM_SPEECH_HOUSE, $00, 0
+	map_attributes GuideGentsHouse, GUIDE_GENTS_HOUSE, $00, 0
+	map_attributes CherrygroveEvolutionSpeechHouse, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, $00, 0
+	map_attributes Route30BerryHouse, ROUTE_30_BERRY_HOUSE, $00, 0
+	map_attributes MrPokemonsHouse, MR_POKEMONS_HOUSE, $00, 0
+	map_attributes Route31VioletGate, ROUTE_31_VIOLET_GATE, $00, 0
diff --git a/data/maps/data.asm b/data/maps/data.asm
deleted file mode 100644
index 2dfcfdbf9..000000000
--- a/data/maps/data.asm
+++ /dev/null
@@ -1,663 +0,0 @@
-map_data: MACRO
-;\1: map name
-;\2: map id
-;\3: border block
-;\4: connections: combo of NORTH, SOUTH, WEST, and/or EAST, or 0 for none
-CURRENT_MAP_WIDTH = \2_WIDTH
-CURRENT_MAP_HEIGHT = \2_HEIGHT
-\1_MapData::
-	db \3
-	db CURRENT_MAP_HEIGHT, CURRENT_MAP_WIDTH
-	db BANK(\1_Blocks)
-	dw \1_Blocks
-	db BANK(\1_MapScripts) ; BANK(\1_MapEvents)
-	dw \1_MapScripts
-	dw \1_MapEvents
-	db \4
-ENDM
-
-connection: MACRO
-;\1: direction
-;\2: map name
-;\3: map id
-;\4: x offset for east/west, y offset for north/south
-;\5: distance offset?
-;\6: strip length
-if "\1" == "north"
-	map \3
-	dw \2_Blocks + \3_WIDTH * (\3_HEIGHT - 3) + \5
-	dw OverworldMap + \4 + 3
-	db \6
-	db \3_WIDTH
-	db \3_HEIGHT * 2 - 1
-	db (\4 - \5) * -2
-	dw OverworldMap + \3_HEIGHT * (\3_WIDTH + 6) + 1
-elif "\1" == "south"
-	map \3
-	dw \2_Blocks + \5
-	dw OverworldMap + (CURRENT_MAP_HEIGHT + 3) * (CURRENT_MAP_WIDTH + 6) + \4 + 3
-	db \6
-	db \3_WIDTH
-	db 0
-	db (\4 - \5) * -2
-	dw OverworldMap + \3_WIDTH + 7
-elif "\1" == "west"
-	map \3
-	dw \2_Blocks + (\3_WIDTH * \5) + \3_WIDTH - 3
-	dw OverworldMap + (CURRENT_MAP_WIDTH + 6) * (\4 + 3)
-	db \6
-	db \3_WIDTH
-	db (\4 - \5) * -2
-	db \3_WIDTH * 2 - 1
-	dw OverworldMap + \3_WIDTH * 2 + 6
-elif "\1" == "east"
-	map \3
-	dw \2_Blocks + (\3_WIDTH * \5)
-	dw OverworldMap + (CURRENT_MAP_WIDTH + 6) * (\4 + 3 + 1) - 3
-	db \6
-	db \3_WIDTH
-	db (\4 - \5) * -2
-	db 0
-	dw OverworldMap + \3_WIDTH + 7
-endc
-ENDM
-
-
-	map_data NewBarkTown, NEW_BARK_TOWN, $05, WEST | EAST
-	connection west, Route29, ROUTE_29, 0, 0, 9
-	connection east, Route27, ROUTE_27, 0, 0, 9
-
-	map_data CherrygroveCity, CHERRYGROVE_CITY, $35, NORTH | EAST
-	connection north, Route30, ROUTE_30, 5, 0, 10
-	connection east, Route29, ROUTE_29, 0, 0, 9
-
-	map_data VioletCity, VIOLET_CITY, $05, SOUTH | WEST | EAST
-	connection south, Route32, ROUTE_32, 0, 0, 10
-	connection west, Route36, ROUTE_36, 0, 0, 9
-	connection east, Route31, ROUTE_31, 9, 0, 9
-
-	map_data AzaleaTown, AZALEA_TOWN, $05, WEST | EAST
-	connection west, Route34, ROUTE_34, -3, 15, 12
-	connection east, Route33, ROUTE_33, 0, 0, 9
-
-	map_data CianwoodCity, CIANWOOD_CITY, $35, EAST
-	connection east, Route41, ROUTE_41, 0, 0, 27
-
-	map_data GoldenrodCity, GOLDENROD_CITY, $35, NORTH | SOUTH
-	connection north, Route35, ROUTE_35, 5, 0, 10
-	connection south, Route34, ROUTE_34, 5, 0, 10
-
-	map_data OlivineCity, OLIVINE_CITY, $35, NORTH | WEST
-	connection north, Route39, ROUTE_39, 5, 0, 10
-	connection west, Route40, ROUTE_40, 9, 0, 12
-
-	map_data EcruteakCity, ECRUTEAK_CITY, $05, SOUTH | WEST | EAST
-	connection south, Route37, ROUTE_37, 5, 0, 10
-	connection west, Route38, ROUTE_38, 5, 0, 9
-	connection east, Route42, ROUTE_42, 9, 0, 9
-
-	map_data MahoganyTown, MAHOGANY_TOWN, $71, NORTH | WEST | EAST
-	connection north, Route43, ROUTE_43, 0, 0, 10
-	connection west, Route42, ROUTE_42, 0, 0, 9
-	connection east, Route44, ROUTE_44, 0, 0, 9
-
-	map_data LakeOfRage, LAKE_OF_RAGE, $05, SOUTH
-	connection south, Route43, ROUTE_43, 5, 0, 10
-
-	map_data BlackthornCity, BLACKTHORN_CITY, $71, SOUTH | WEST
-	connection south, Route45, ROUTE_45, 0, 0, 10
-	connection west, Route44, ROUTE_44, 9, 0, 9
-
-	map_data SilverCaveOutside, SILVER_CAVE_OUTSIDE, $2c, EAST
-	connection east, Route28, ROUTE_28, 9, 0, 9
-
-	map_data Route26, ROUTE_26, $05, WEST
-	connection west, Route27, ROUTE_27, 45, 0, 9
-
-	map_data Route27, ROUTE_27, $35, WEST | EAST
-	connection west, NewBarkTown, NEW_BARK_TOWN, 0, 0, 9
-	connection east, Route26, ROUTE_26, -3, 42, 12
-
-	map_data Route28, ROUTE_28, $2c, WEST
-	connection west, SilverCaveOutside, SILVER_CAVE_OUTSIDE, -3, 6, 12
-
-	map_data Route29, ROUTE_29, $05, NORTH | WEST | EAST
-	connection north, Route46, ROUTE_46, 10, 0, 10
-	connection west, CherrygroveCity, CHERRYGROVE_CITY, 0, 0, 9
-	connection east, NewBarkTown, NEW_BARK_TOWN, 0, 0, 9
-
-	map_data Route30, ROUTE_30, $05, NORTH | SOUTH
-	connection north, Route31, ROUTE_31, -3, 7, 13
-	connection south, CherrygroveCity, CHERRYGROVE_CITY, -3, 2, 16
-
-	map_data Route31, ROUTE_31, $05, SOUTH | WEST
-	connection south, Route30, ROUTE_30, 10, 0, 10
-	connection west, VioletCity, VIOLET_CITY, -3, 6, 12
-
-	map_data Route32, ROUTE_32, $05, NORTH | SOUTH
-	connection north, VioletCity, VIOLET_CITY, 0, 0, 13
-	connection south, Route33, ROUTE_33, 0, 0, 10
-
-	map_data Route33, ROUTE_33, $05, NORTH | WEST
-	connection north, Route32, ROUTE_32, 0, 0, 10
-	connection west, AzaleaTown, AZALEA_TOWN, 0, 0, 9
-
-	map_data Route34, ROUTE_34, $05, NORTH | EAST
-	connection north, GoldenrodCity, GOLDENROD_CITY, -3, 2, 16
-	connection east, AzaleaTown, AZALEA_TOWN, 18, 0, 9
-
-	map_data Route35, ROUTE_35, $05, NORTH | SOUTH
-	connection north, Route36, ROUTE_36, 0, 0, 13
-	connection south, GoldenrodCity, GOLDENROD_CITY, -3, 2, 16
-
-	map_data Route36, ROUTE_36, $05, NORTH | SOUTH | EAST
-	connection north, Route37, ROUTE_37, 10, 0, 10
-	connection south, Route35, ROUTE_35, 0, 0, 10
-	connection east, VioletCity, VIOLET_CITY, 0, 0, 12
-
-	map_data Route37, ROUTE_37, $05, NORTH | SOUTH
-	connection north, EcruteakCity, ECRUTEAK_CITY, -3, 2, 16
-	connection south, Route36, ROUTE_36, -3, 7, 16
-
-	map_data Route38, ROUTE_38, $05, WEST | EAST
-	connection west, Route39, ROUTE_39, 0, 0, 12
-	connection east, EcruteakCity, ECRUTEAK_CITY, -3, 2, 15
-
-	map_data Route39, ROUTE_39, $05, SOUTH | EAST
-	connection south, OlivineCity, OLIVINE_CITY, -3, 2, 16
-	connection east, Route38, ROUTE_38, 0, 0, 9
-
-	map_data Route40, ROUTE_40, $35, SOUTH | EAST
-	connection south, Route41, ROUTE_41, -3, 12, 13
-	connection east, OlivineCity, OLIVINE_CITY, -3, 6, 12
-
-	map_data Route41, ROUTE_41, $35, NORTH | WEST
-	connection north, Route40, ROUTE_40, 15, 0, 10
-	connection west, CianwoodCity, CIANWOOD_CITY, 0, 0, 27
-
-	map_data Route42, ROUTE_42, $05, WEST | EAST
-	connection west, EcruteakCity, ECRUTEAK_CITY, -3, 6, 12
-	connection east, MahoganyTown, MAHOGANY_TOWN, 0, 0, 9
-
-	map_data Route43, ROUTE_43, $05, NORTH | SOUTH
-	connection north, LakeOfRage, LAKE_OF_RAGE, -3, 2, 16
-	connection south, MahoganyTown, MAHOGANY_TOWN, 0, 0, 10
-
-	map_data Route44, ROUTE_44, $71, WEST | EAST
-	connection west, MahoganyTown, MAHOGANY_TOWN, 0, 0, 9
-	connection east, BlackthornCity, BLACKTHORN_CITY, -3, 6, 12
-
-	map_data Route45, ROUTE_45, $71, NORTH | WEST
-	connection north, BlackthornCity, BLACKTHORN_CITY, 0, 0, 13
-	connection west, Route46, ROUTE_46, 36, 0, 12
-
-	map_data Route46, ROUTE_46, $05, SOUTH | EAST
-	connection south, Route29, ROUTE_29, -3, 7, 16
-	connection east, Route45, ROUTE_45, -3, 33, 12
-
-	map_data PewterCity, PEWTER_CITY, $0f, SOUTH | EAST
-	connection south, Route2, ROUTE_2, 5, 0, 10
-	connection east, Route3, ROUTE_3, 5, 0, 9
-
-	map_data Route2, ROUTE_2, $0f, NORTH | SOUTH
-	connection north, PewterCity, PEWTER_CITY, -3, 2, 16
-	connection south, ViridianCity, VIRIDIAN_CITY, -3, 2, 16
-
-	map_data ViridianCity, VIRIDIAN_CITY, $0f, NORTH | SOUTH | WEST
-	connection north, Route2, ROUTE_2, 5, 0, 10
-	connection south, Route1, ROUTE_1, 10, 0, 10
-	connection west, Route22, ROUTE_22, 4, 0, 9
-
-	map_data Route22, ROUTE_22, $2c, EAST
-	connection east, ViridianCity, VIRIDIAN_CITY, -3, 1, 15
-
-	map_data Route1, ROUTE_1, $0f, NORTH | SOUTH
-	connection north, ViridianCity, VIRIDIAN_CITY, -3, 7, 13
-	connection south, PalletTown, PALLET_TOWN, 0, 0, 10
-
-	map_data PalletTown, PALLET_TOWN, $0f, NORTH | SOUTH
-	connection north, Route1, ROUTE_1, 0, 0, 10
-	connection south, Route21, ROUTE_21, 0, 0, 10
-
-	map_data Route21, ROUTE_21, $43, NORTH | SOUTH
-	connection north, PalletTown, PALLET_TOWN, 0, 0, 10
-	connection south, CinnabarIsland, CINNABAR_ISLAND, 0, 0, 10
-
-	map_data CinnabarIsland, CINNABAR_ISLAND, $43, NORTH | EAST
-	connection north, Route21, ROUTE_21, 0, 0, 10
-	connection east, Route20, ROUTE_20, 0, 0, 9
-
-	map_data Route20, ROUTE_20, $43, WEST | EAST
-	connection west, CinnabarIsland, CINNABAR_ISLAND, 0, 0, 9
-	connection east, Route19, ROUTE_19, -3, 6, 12
-
-	map_data Route19, ROUTE_19, $43, NORTH | WEST
-	connection north, FuchsiaCity, FUCHSIA_CITY, 0, 0, 13
-	connection west, Route20, ROUTE_20, 9, 0, 9
-
-	map_data FuchsiaCity, FUCHSIA_CITY, $0f, SOUTH | WEST | EAST
-	connection south, Route19, ROUTE_19, 0, 0, 10
-	connection west, Route18, ROUTE_18, 7, 0, 9
-	connection east, Route15, ROUTE_15, 9, 0, 9
-
-	map_data Route18, ROUTE_18, $43, WEST | EAST
-	connection west, Route17, ROUTE_17, -3, 35, 10
-	connection east, FuchsiaCity, FUCHSIA_CITY, -3, 4, 14
-
-	map_data Route17, ROUTE_17, $43, NORTH | EAST
-	connection north, Route16, ROUTE_16, 0, 0, 10
-	connection east, Route18, ROUTE_18, 38, 0, 9
-
-	map_data Route16, ROUTE_16, $0f, SOUTH | EAST
-	connection south, Route17, ROUTE_17, 0, 0, 10
-	connection east, CeladonCity, CELADON_CITY, -3, 6, 12
-
-	map_data CeladonCity, CELADON_CITY, $0f, WEST | EAST
-	connection west, Route16, ROUTE_16, 9, 0, 9
-	connection east, Route7, ROUTE_7, 5, 0, 9
-
-	map_data Route7, ROUTE_7, $0f, WEST | EAST
-	connection west, CeladonCity, CELADON_CITY, -3, 2, 15
-	connection east, SaffronCity, SAFFRON_CITY, -3, 6, 12
-
-	map_data Route15, ROUTE_15, $0f, WEST | EAST
-	connection west, FuchsiaCity, FUCHSIA_CITY, -3, 6, 12
-	connection east, Route14, ROUTE_14, -3, 6, 12
-
-	map_data Route14, ROUTE_14, $43, NORTH | WEST
-	connection north, Route13, ROUTE_13, 0, 0, 13
-	connection west, Route15, ROUTE_15, 9, 0, 9
-
-	map_data Route13, ROUTE_13, $43, NORTH | SOUTH
-	connection north, Route12, ROUTE_12, 20, 0, 10
-	connection south, Route14, ROUTE_14, 0, 0, 10
-
-	map_data Route12, ROUTE_12, $43, NORTH | SOUTH | WEST
-	connection north, LavenderTown, LAVENDER_TOWN, 0, 0, 10
-	connection south, Route13, ROUTE_13, -3, 17, 13
-	connection west, Route11, ROUTE_11, 9, 0, 9
-
-	map_data Route11, ROUTE_11, $0f, WEST | EAST
-	connection west, VermilionCity, VERMILION_CITY, 0, 0, 12
-	connection east, Route12, ROUTE_12, -3, 6, 15
-
-	map_data LavenderTown, LAVENDER_TOWN, $2c, NORTH | SOUTH | WEST
-	connection north, Route10South, ROUTE_10_SOUTH, 0, 0, 10
-	connection south, Route12, ROUTE_12, 0, 0, 10
-	connection west, Route8, ROUTE_8, 0, 0, 9
-
-	map_data VermilionCity, VERMILION_CITY, $43, NORTH | EAST
-	connection north, Route6, ROUTE_6, 5, 0, 10
-	connection east, Route11, ROUTE_11, 0, 0, 9
-
-	map_data Route6, ROUTE_6, $0f, NORTH | SOUTH
-	connection north, SaffronCity, SAFFRON_CITY, -3, 2, 16
-	connection south, VermilionCity, VERMILION_CITY, -3, 2, 16
-
-	map_data SaffronCity, SAFFRON_CITY, $0f, NORTH | SOUTH | WEST | EAST
-	connection north, Route5, ROUTE_5, 5, 0, 10
-	connection south, Route6, ROUTE_6, 5, 0, 10
-	connection west, Route7, ROUTE_7, 9, 0, 9
-	connection east, Route8, ROUTE_8, 9, 0, 9
-
-	map_data Route5, ROUTE_5, $0f, NORTH | SOUTH
-	connection north, CeruleanCity, CERULEAN_CITY, -3, 2, 16
-	connection south, SaffronCity, SAFFRON_CITY, -3, 2, 16
-
-	map_data CeruleanCity, CERULEAN_CITY, $0f, NORTH | SOUTH | WEST | EAST
-	connection north, Route24, ROUTE_24, 6, 0, 10
-	connection south, Route5, ROUTE_5, 5, 0, 10
-	connection west, Route4, ROUTE_4, 5, 0, 9
-	connection east, Route9, ROUTE_9, 9, 0, 9
-
-	map_data Route9, ROUTE_9, $2c, SOUTH | WEST
-	connection south, Route10North, ROUTE_10_NORTH, 20, 0, 10
-	connection west, CeruleanCity, CERULEAN_CITY, -3, 6, 12
-
-	map_data Route24, ROUTE_24, $2c, NORTH | SOUTH
-	connection north, Route25, ROUTE_25, 0, 0, 13
-	connection south, CeruleanCity, CERULEAN_CITY, -3, 3, 16
-
-	map_data Route25, ROUTE_25, $2c, SOUTH
-	connection south, Route24, ROUTE_24, 0, 0, 10
-
-	map_data Route3, ROUTE_3, $2c, WEST | EAST
-	connection west, PewterCity, PEWTER_CITY, -3, 2, 15
-	connection east, Route4, ROUTE_4, 0, 0, 9
-
-	map_data Route4, ROUTE_4, $2c, WEST | EAST
-	connection west, Route3, ROUTE_3, 0, 0, 9
-	connection east, CeruleanCity, CERULEAN_CITY, -3, 2, 15
-
-	map_data Route8, ROUTE_8, $2c, WEST | EAST
-	connection west, SaffronCity, SAFFRON_CITY, -3, 6, 12
-	connection east, LavenderTown, LAVENDER_TOWN, 0, 0, 9
-
-	map_data Route10North, ROUTE_10_NORTH, $2c, NORTH | SOUTH
-	connection north, Route9, ROUTE_9, -3, 17, 13
-	connection south, Route10South, ROUTE_10_SOUTH, 0, 0, 10
-
-	map_data Route10South, ROUTE_10_SOUTH, $2c, NORTH | SOUTH
-	connection north, Route10North, ROUTE_10_NORTH, 0, 0, 10
-	connection south, LavenderTown, LAVENDER_TOWN, 0, 0, 10
-
-	map_data Route23, ROUTE_23, $0f, 0
-	map_data SproutTower1F, SPROUT_TOWER_1F, $00, 0
-	map_data SproutTower2F, SPROUT_TOWER_2F, $00, 0
-	map_data SproutTower3F, SPROUT_TOWER_3F, $00, 0
-	map_data TinTower1F, TIN_TOWER_1F, $00, 0
-	map_data TinTower2F, TIN_TOWER_2F, $00, 0
-	map_data TinTower3F, TIN_TOWER_3F, $00, 0
-	map_data TinTower4F, TIN_TOWER_4F, $00, 0
-	map_data TinTower5F, TIN_TOWER_5F, $00, 0
-	map_data TinTower6F, TIN_TOWER_6F, $00, 0
-	map_data TinTower7F, TIN_TOWER_7F, $00, 0
-	map_data TinTower8F, TIN_TOWER_8F, $00, 0
-	map_data TinTower9F, TIN_TOWER_9F, $00, 0
-	map_data BurnedTower1F, BURNED_TOWER_1F, $00, 0
-	map_data BurnedTowerB1F, BURNED_TOWER_B1F, $09, 0
-	map_data NationalPark, NATIONAL_PARK, $00, 0
-	map_data NationalParkBugContest, NATIONAL_PARK_BUG_CONTEST, $00, 0
-	map_data RadioTower1F, RADIO_TOWER_1F, $00, 0
-	map_data RadioTower2F, RADIO_TOWER_2F, $00, 0
-	map_data RadioTower3F, RADIO_TOWER_3F, $00, 0
-	map_data RadioTower4F, RADIO_TOWER_4F, $00, 0
-	map_data RadioTower5F, RADIO_TOWER_5F, $00, 0
-	map_data RuinsOfAlphOutside, RUINS_OF_ALPH_OUTSIDE, $05, 0
-	map_data RuinsOfAlphHoOhChamber, RUINS_OF_ALPH_HO_OH_CHAMBER, $00, 0
-	map_data RuinsOfAlphKabutoChamber, RUINS_OF_ALPH_KABUTO_CHAMBER, $00, 0
-	map_data RuinsOfAlphOmanyteChamber, RUINS_OF_ALPH_OMANYTE_CHAMBER, $00, 0
-	map_data RuinsOfAlphAerodactylChamber, RUINS_OF_ALPH_AERODACTYL_CHAMBER, $00, 0
-	map_data RuinsOfAlphInnerChamber, RUINS_OF_ALPH_INNER_CHAMBER, $00, 0
-	map_data RuinsOfAlphResearchCenter, RUINS_OF_ALPH_RESEARCH_CENTER, $00, 0
-	map_data RuinsOfAlphHoOhItemRoom, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, $00, 0
-	map_data RuinsOfAlphKabutoItemRoom, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, $00, 0
-	map_data RuinsOfAlphOmanyteItemRoom, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, $00, 0
-	map_data RuinsOfAlphAerodactylItemRoom, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, $00, 0
-	map_data RuinsOfAlphHoOhWordRoom, RUINS_OF_ALPH_HO_OH_WORD_ROOM, $00, 0
-	map_data RuinsOfAlphKabutoWordRoom, RUINS_OF_ALPH_KABUTO_WORD_ROOM, $00, 0
-	map_data RuinsOfAlphOmanyteWordRoom, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, $00, 0
-	map_data RuinsOfAlphAerodactylWordRoom, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, $00, 0
-	map_data UnionCave1F, UNION_CAVE_1F, $09, 0
-	map_data UnionCaveB1F, UNION_CAVE_B1F, $09, 0
-	map_data UnionCaveB2F, UNION_CAVE_B2F, $09, 0
-	map_data SlowpokeWellB1F, SLOWPOKE_WELL_B1F, $09, 0
-	map_data SlowpokeWellB2F, SLOWPOKE_WELL_B2F, $09, 0
-	map_data OlivineLighthouse1F, OLIVINE_LIGHTHOUSE_1F, $00, 0
-	map_data OlivineLighthouse2F, OLIVINE_LIGHTHOUSE_2F, $00, 0
-	map_data OlivineLighthouse3F, OLIVINE_LIGHTHOUSE_3F, $00, 0
-	map_data OlivineLighthouse4F, OLIVINE_LIGHTHOUSE_4F, $00, 0
-	map_data OlivineLighthouse5F, OLIVINE_LIGHTHOUSE_5F, $00, 0
-	map_data OlivineLighthouse6F, OLIVINE_LIGHTHOUSE_6F, $00, 0
-	map_data MahoganyMart1F, MAHOGANY_MART_1F, $00, 0
-	map_data TeamRocketBaseB1F, TEAM_ROCKET_BASE_B1F, $00, 0
-	map_data TeamRocketBaseB2F, TEAM_ROCKET_BASE_B2F, $00, 0
-	map_data TeamRocketBaseB3F, TEAM_ROCKET_BASE_B3F, $00, 0
-	map_data IlexForest, ILEX_FOREST, $05, 0
-	map_data GoldenrodUnderground, GOLDENROD_UNDERGROUND, $00, 0
-	map_data GoldenrodUndergroundSwitchRoomEntrances, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, $00, 0
-	map_data GoldenrodDeptStoreB1F, GOLDENROD_DEPT_STORE_B1F, $00, 0
-	map_data GoldenrodUndergroundWarehouse, GOLDENROD_UNDERGROUND_WAREHOUSE, $00, 0
-	map_data MountMortar1FOutside, MOUNT_MORTAR_1F_OUTSIDE, $09, 0
-	map_data MountMortar1FInside, MOUNT_MORTAR_1F_INSIDE, $09, 0
-	map_data MountMortar2FInside, MOUNT_MORTAR_2F_INSIDE, $09, 0
-	map_data MountMortarB1F, MOUNT_MORTAR_B1F, $09, 0
-	map_data IcePath1F, ICE_PATH_1F, $09, 0
-	map_data IcePathB1F, ICE_PATH_B1F, $19, 0
-	map_data IcePathB2FMahoganySide, ICE_PATH_B2F_MAHOGANY_SIDE, $19, 0
-	map_data IcePathB2FBlackthornSide, ICE_PATH_B2F_BLACKTHORN_SIDE, $19, 0
-	map_data IcePathB3F, ICE_PATH_B3F, $19, 0
-	map_data WhirlIslandNW, WHIRL_ISLAND_NW, $09, 0
-	map_data WhirlIslandNE, WHIRL_ISLAND_NE, $09, 0
-	map_data WhirlIslandSW, WHIRL_ISLAND_SW, $09, 0
-	map_data WhirlIslandCave, WHIRL_ISLAND_CAVE, $09, 0
-	map_data WhirlIslandSE, WHIRL_ISLAND_SE, $0f, 0
-	map_data WhirlIslandB1F, WHIRL_ISLAND_B1F, $09, 0
-	map_data WhirlIslandB2F, WHIRL_ISLAND_B2F, $2e, 0
-	map_data WhirlIslandLugiaChamber, WHIRL_ISLAND_LUGIA_CHAMBER, $0f, 0
-	map_data SilverCaveRoom1, SILVER_CAVE_ROOM_1, $09, 0
-	map_data SilverCaveRoom2, SILVER_CAVE_ROOM_2, $09, 0
-	map_data SilverCaveRoom3, SILVER_CAVE_ROOM_3, $09, 0
-	map_data SilverCaveItemRooms, SILVER_CAVE_ITEM_ROOMS, $09, 0
-	map_data DarkCaveVioletEntrance, DARK_CAVE_VIOLET_ENTRANCE, $09, 0
-	map_data DarkCaveBlackthornEntrance, DARK_CAVE_BLACKTHORN_ENTRANCE, $09, 0
-	map_data DragonsDen1F, DRAGONS_DEN_1F, $09, 0
-	map_data DragonsDenB1F, DRAGONS_DEN_B1F, $71, 0
-	map_data DragonShrine, DRAGON_SHRINE, $00, 0
-	map_data TohjoFalls, TOHJO_FALLS, $09, 0
-	map_data OlivinePokecenter1F, OLIVINE_POKECENTER_1F, $00, 0
-	map_data OlivineGym, OLIVINE_GYM, $00, 0
-	map_data OlivineTimsHouse, OLIVINE_TIMS_HOUSE, $00, 0
-	map_data OlivineHouseBeta, OLIVINE_HOUSE_BETA, $00, 0
-	map_data OlivinePunishmentSpeechHouse, OLIVINE_PUNISHMENT_SPEECH_HOUSE, $00, 0
-	map_data OlivineGoodRodHouse, OLIVINE_GOOD_ROD_HOUSE, $00, 0
-	map_data OlivineCafe, OLIVINE_CAFE, $00, 0
-	map_data OlivineMart, OLIVINE_MART, $00, 0
-	map_data Route38EcruteakGate, ROUTE_38_ECRUTEAK_GATE, $00, 0
-	map_data Route39Barn, ROUTE_39_BARN, $00, 0
-	map_data Route39Farmhouse, ROUTE_39_FARMHOUSE, $00, 0
-	map_data MahoganyRedGyaradosSpeechHouse, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, $00, 0
-	map_data MahoganyGym, MAHOGANY_GYM, $00, 0
-	map_data MahoganyPokecenter1F, MAHOGANY_POKECENTER_1F, $00, 0
-	map_data Route42EcruteakGate, ROUTE_42_ECRUTEAK_GATE, $00, 0
-	map_data DiglettsCave, DIGLETTS_CAVE, $09, 0
-	map_data MountMoon, MOUNT_MOON, $09, 0
-	map_data UndergroundPath, UNDERGROUND_PATH, $00, 0
-	map_data RockTunnel1F, ROCK_TUNNEL_1F, $09, 0
-	map_data RockTunnelB1F, ROCK_TUNNEL_B1F, $09, 0
-	map_data SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $00, 0
-	map_data SafariZoneBeta, SAFARI_ZONE_BETA, $13, 0
-	map_data VictoryRoad, VICTORY_ROAD, $1d, 0
-	map_data EcruteakTinTowerEntrance, ECRUTEAK_TIN_TOWER_ENTRANCE, $00, 0
-	map_data WiseTriosRoom, WISE_TRIOS_ROOM, $00, 0
-	map_data EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $00, 0
-	map_data EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $00, 0
-	map_data DanceTheatre, DANCE_THEATRE, $00, 0
-	map_data EcruteakMart, ECRUTEAK_MART, $00, 0
-	map_data EcruteakGym, ECRUTEAK_GYM, $00, 0
-	map_data EcruteakItemfinderHouse, ECRUTEAK_ITEMFINDER_HOUSE, $00, 0
-	map_data BlackthornGym1F, BLACKTHORN_GYM_1F, $00, 0
-	map_data BlackthornGym2F, BLACKTHORN_GYM_2F, $00, 0
-	map_data BlackthornDragonSpeechHouse, BLACKTHORN_DRAGON_SPEECH_HOUSE, $00, 0
-	map_data BlackthornEmysHouse, BLACKTHORN_EMYS_HOUSE, $00, 0
-	map_data BlackthornMart, BLACKTHORN_MART, $00, 0
-	map_data BlackthornPokecenter1F, BLACKTHORN_POKECENTER_1F, $00, 0
-	map_data MoveDeletersHouse, MOVE_DELETERS_HOUSE, $00, 0
-	map_data CinnabarPokecenter1F, CINNABAR_POKECENTER_1F, $00, 0
-	map_data CinnabarPokecenter2FBeta, CINNABAR_POKECENTER_2F_BETA, $00, 0
-	map_data Route19FuchsiaGate, ROUTE_19_FUCHSIA_GATE, $00, 0
-	map_data SeafoamGym, SEAFOAM_GYM, $09, 0
-	map_data CeruleanGymBadgeSpeechHouse, CERULEAN_GYM_BADGE_SPEECH_HOUSE, $00, 0
-	map_data CeruleanPoliceStation, CERULEAN_POLICE_STATION, $00, 0
-	map_data CeruleanTradeSpeechHouse, CERULEAN_TRADE_SPEECH_HOUSE, $00, 0
-	map_data CeruleanPokecenter1F, CERULEAN_POKECENTER_1F, $00, 0
-	map_data CeruleanPokecenter2FBeta, CERULEAN_POKECENTER_2F_BETA, $00, 0
-	map_data CeruleanGym, CERULEAN_GYM, $00, 0
-	map_data CeruleanMart, CERULEAN_MART, $00, 0
-	map_data Route10Pokecenter1F, ROUTE_10_POKECENTER_1F, $00, 0
-	map_data Route10Pokecenter2FBeta, ROUTE_10_POKECENTER_2F_BETA, $00, 0
-	map_data PowerPlant, POWER_PLANT, $00, 0
-	map_data BillsHouse, BILLS_HOUSE, $00, 0
-	map_data AzaleaPokecenter1F, AZALEA_POKECENTER_1F, $00, 0
-	map_data CharcoalKiln, CHARCOAL_KILN, $00, 0
-	map_data AzaleaMart, AZALEA_MART, $00, 0
-	map_data KurtsHouse, KURTS_HOUSE, $00, 0
-	map_data AzaleaGym, AZALEA_GYM, $00, 0
-	map_data LakeOfRageHiddenPowerHouse, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, $00, 0
-	map_data LakeOfRageMagikarpHouse, LAKE_OF_RAGE_MAGIKARP_HOUSE, $00, 0
-	map_data Route43MahoganyGate, ROUTE_43_MAHOGANY_GATE, $00, 0
-	map_data Route43Gate, ROUTE_43_GATE, $00, 0
-	map_data VioletMart, VIOLET_MART, $00, 0
-	map_data VioletGym, VIOLET_GYM, $00, 0
-	map_data EarlsPokemonAcademy, EARLS_POKEMON_ACADEMY, $00, 0
-	map_data VioletNicknameSpeechHouse, VIOLET_NICKNAME_SPEECH_HOUSE, $00, 0
-	map_data VioletPokecenter1F, VIOLET_POKECENTER_1F, $00, 0
-	map_data VioletKylesHouse, VIOLET_KYLES_HOUSE, $00, 0
-	map_data Route32RuinsOfAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $00, 0
-	map_data Route32Pokecenter1F, ROUTE_32_POKECENTER_1F, $00, 0
-	map_data Route35GoldenrodGate, ROUTE_35_GOLDENROD_GATE, $00, 0
-	map_data Route35NationalParkGate, ROUTE_35_NATIONAL_PARK_GATE, $00, 0
-	map_data Route36RuinsOfAlphGate, ROUTE_36_RUINS_OF_ALPH_GATE, $00, 0
-	map_data Route36NationalParkGate, ROUTE_36_NATIONAL_PARK_GATE, $00, 0
-	map_data GoldenrodGym, GOLDENROD_GYM, $00, 0
-	map_data GoldenrodBikeShop, GOLDENROD_BIKE_SHOP, $00, 0
-	map_data GoldenrodHappinessRater, GOLDENROD_HAPPINESS_RATER, $00, 0
-	map_data BillsFamilysHouse, BILLS_FAMILYS_HOUSE, $00, 0
-	map_data GoldenrodMagnetTrainStation, GOLDENROD_MAGNET_TRAIN_STATION, $00, 0
-	map_data GoldenrodFlowerShop, GOLDENROD_FLOWER_SHOP, $00, 0
-	map_data GoldenrodPPSpeechHouse, GOLDENROD_PP_SPEECH_HOUSE, $00, 0
-	map_data GoldenrodNameRater, GOLDENROD_NAME_RATER, $00, 0
-	map_data GoldenrodDeptStore1F, GOLDENROD_DEPT_STORE_1F, $00, 0
-	map_data GoldenrodDeptStore2F, GOLDENROD_DEPT_STORE_2F, $00, 0
-	map_data GoldenrodDeptStore3F, GOLDENROD_DEPT_STORE_3F, $00, 0
-	map_data GoldenrodDeptStore4F, GOLDENROD_DEPT_STORE_4F, $00, 0
-	map_data GoldenrodDeptStore5F, GOLDENROD_DEPT_STORE_5F, $00, 0
-	map_data GoldenrodDeptStore6F, GOLDENROD_DEPT_STORE_6F, $00, 0
-	map_data GoldenrodDeptStoreElevator, GOLDENROD_DEPT_STORE_ELEVATOR, $00, 0
-	map_data GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0
-	map_data GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $00, 0
-	map_data GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $00, 0
-	map_data PokecomCenterAdminRoomMobile, POKECOM_CENTER_ADMIN_ROOM_MOBILE, $00, 0
-	map_data IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $00, 0
-	map_data Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $00, 0
-	map_data DayCare, DAY_CARE, $00, 0
-	map_data VermilionFishingSpeechHouse, VERMILION_FISHING_SPEECH_HOUSE, $00, 0
-	map_data VermilionPokecenter1F, VERMILION_POKECENTER_1F, $00, 0
-	map_data VermilionPokecenter2FBeta, VERMILION_POKECENTER_2F_BETA, $00, 0
-	map_data PokemonFanClub, POKEMON_FAN_CLUB, $00, 0
-	map_data VermilionMagnetTrainSpeechHouse, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, $00, 0
-	map_data VermilionMart, VERMILION_MART, $00, 0
-	map_data VermilionDiglettsCaveSpeechHouse, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE, $00, 0
-	map_data VermilionGym, VERMILION_GYM, $00, 0
-	map_data Route6SaffronGate, ROUTE_6_SAFFRON_GATE, $00, 0
-	map_data Route6UndergroundPathEntrance, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, $00, 0
-	map_data RedsHouse1F, REDS_HOUSE_1F, $00, 0
-	map_data RedsHouse2F, REDS_HOUSE_2F, $00, 0
-	map_data BluesHouse, BLUES_HOUSE, $00, 0
-	map_data OaksLab, OAKS_LAB, $00, 0
-	map_data PewterNidoranSpeechHouse, PEWTER_NIDORAN_SPEECH_HOUSE, $00, 0
-	map_data PewterGym, PEWTER_GYM, $00, 0
-	map_data PewterMart, PEWTER_MART, $00, 0
-	map_data PewterPokecenter1F, PEWTER_POKECENTER_1F, $00, 0
-	map_data PewterPokecenter2FBeta, PEWTER_POKECENTER_2F_BETA, $00, 0
-	map_data PewterSnoozeSpeechHouse, PEWTER_SNOOZE_SPEECH_HOUSE, $00, 0
-	map_data OlivinePort, OLIVINE_PORT, $0a, 0
-	map_data VermilionPort, VERMILION_PORT, $0a, 0
-	map_data FastShip1F, FAST_SHIP_1F, $00, 0
-	map_data FastShipCabins_NNW_NNE_NE, FAST_SHIP_CABINS_NNW_NNE_NE, $00, 0
-	map_data FastShipCabins_SW_SSW_NW, FAST_SHIP_CABINS_SW_SSW_NW, $00, 0
-	map_data FastShipCabins_SE_SSE_CaptainsCabin, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, $00, 0
-	map_data FastShipB1F, FAST_SHIP_B1F, $00, 0
-	map_data OlivinePortPassage, OLIVINE_PORT_PASSAGE, $00, 0
-	map_data VermilionPortPassage, VERMILION_PORT_PASSAGE, $00, 0
-	map_data MountMoonSquare, MOUNT_MOON_SQUARE, $2d, 0
-	map_data MountMoonGiftShop, MOUNT_MOON_GIFT_SHOP, $00, 0
-	map_data TinTowerRoof, TIN_TOWER_ROOF, $00, 0
-	map_data IndigoPlateauPokecenter1F, INDIGO_PLATEAU_POKECENTER_1F, $00, 0
-	map_data WillsRoom, WILLS_ROOM, $00, 0
-	map_data KogasRoom, KOGAS_ROOM, $00, 0
-	map_data BrunosRoom, BRUNOS_ROOM, $00, 0
-	map_data KarensRoom, KARENS_ROOM, $00, 0
-	map_data LancesRoom, LANCES_ROOM, $00, 0
-	map_data HallOfFame, HALL_OF_FAME, $00, 0
-	map_data FuchsiaMart, FUCHSIA_MART, $00, 0
-	map_data SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $00, 0
-	map_data FuchsiaGym, FUCHSIA_GYM, $00, 0
-	map_data BillsBrothersHouse, BILLS_BROTHERS_HOUSE, $00, 0
-	map_data FuchsiaPokecenter1F, FUCHSIA_POKECENTER_1F, $00, 0
-	map_data FuchsiaPokecenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $00, 0
-	map_data SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $00, 0
-	map_data Route15FuchsiaGate, ROUTE_15_FUCHSIA_GATE, $00, 0
-	map_data LavenderPokecenter1F, LAVENDER_POKECENTER_1F, $00, 0
-	map_data LavenderPokecenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $00, 0
-	map_data MrFujisHouse, MR_FUJIS_HOUSE, $00, 0
-	map_data LavenderSpeechHouse, LAVENDER_SPEECH_HOUSE, $00, 0
-	map_data LavenderNameRater, LAVENDER_NAME_RATER, $00, 0
-	map_data LavenderMart, LAVENDER_MART, $00, 0
-	map_data SoulHouse, SOUL_HOUSE, $00, 0
-	map_data LavRadioTower1F, LAV_RADIO_TOWER_1F, $00, 0
-	map_data Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $00, 0
-	map_data Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, $00, 0
-	map_data SilverCavePokecenter1F, SILVER_CAVE_POKECENTER_1F, $00, 0
-	map_data Route28SteelWingHouse, ROUTE_28_STEEL_WING_HOUSE, $00, 0
-	map_data Pokecenter2F, POKECENTER_2F, $00, 0
-	map_data TradeCenter, TRADE_CENTER, $00, 0
-	map_data Colosseum, COLOSSEUM, $00, 0
-	map_data TimeCapsule, TIME_CAPSULE, $00, 0
-	map_data MobileTradeRoom, MOBILE_TRADE_ROOM, $00, 0
-	map_data MobileBattleRoom, MOBILE_BATTLE_ROOM, $00, 0
-	map_data CeladonDeptStore1F, CELADON_DEPT_STORE_1F, $00, 0
-	map_data CeladonDeptStore2F, CELADON_DEPT_STORE_2F, $00, 0
-	map_data CeladonDeptStore3F, CELADON_DEPT_STORE_3F, $00, 0
-	map_data CeladonDeptStore4F, CELADON_DEPT_STORE_4F, $00, 0
-	map_data CeladonDeptStore5F, CELADON_DEPT_STORE_5F, $00, 0
-	map_data CeladonDeptStore6F, CELADON_DEPT_STORE_6F, $00, 0
-	map_data CeladonDeptStoreElevator, CELADON_DEPT_STORE_ELEVATOR, $00, 0
-	map_data CeladonMansion1F, CELADON_MANSION_1F, $00, 0
-	map_data CeladonMansion2F, CELADON_MANSION_2F, $00, 0
-	map_data CeladonMansion3F, CELADON_MANSION_3F, $00, 0
-	map_data CeladonMansionRoof, CELADON_MANSION_ROOF, $01, 0
-	map_data CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, $00, 0
-	map_data CeladonPokecenter1F, CELADON_POKECENTER_1F, $00, 0
-	map_data CeladonPokecenter2FBeta, CELADON_POKECENTER_2F_BETA, $00, 0
-	map_data CeladonGameCorner, CELADON_GAME_CORNER, $00, 0
-	map_data CeladonGameCornerPrizeRoom, CELADON_GAME_CORNER_PRIZE_ROOM, $00, 0
-	map_data CeladonGym, CELADON_GYM, $00, 0
-	map_data CeladonCafe, CELADON_CAFE, $00, 0
-	map_data Route16FuchsiaSpeechHouse, ROUTE_16_FUCHSIA_SPEECH_HOUSE, $00, 0
-	map_data Route16Gate, ROUTE_16_GATE, $00, 0
-	map_data Route7SaffronGate, ROUTE_7_SAFFRON_GATE, $00, 0
-	map_data Route17Route18Gate, ROUTE_17_ROUTE_18_GATE, $00, 0
-	map_data ManiasHouse, MANIAS_HOUSE, $00, 0
-	map_data CianwoodGym, CIANWOOD_GYM, $00, 0
-	map_data CianwoodPokecenter1F, CIANWOOD_POKECENTER_1F, $00, 0
-	map_data CianwoodPharmacy, CIANWOOD_PHARMACY, $00, 0
-	map_data CianwoodPhotoStudio, CIANWOOD_PHOTO_STUDIO, $00, 0
-	map_data CianwoodLugiaSpeechHouse, CIANWOOD_LUGIA_SPEECH_HOUSE, $00, 0
-	map_data PokeSeersHouse, POKE_SEERS_HOUSE, $00, 0
-	map_data BattleTower1F, BATTLE_TOWER_1F, $00, 0
-	map_data BattleTowerBattleRoom, BATTLE_TOWER_BATTLE_ROOM, $00, 0
-	map_data BattleTowerElevator, BATTLE_TOWER_ELEVATOR, $00, 0
-	map_data BattleTowerHallway, BATTLE_TOWER_HALLWAY, $00, 0
-	map_data Route40BattleTowerGate, ROUTE_40_BATTLE_TOWER_GATE, $00, 0
-	map_data BattleTowerOutside, BATTLE_TOWER_OUTSIDE, $05, 0
-	map_data ViridianGym, VIRIDIAN_GYM, $00, 0
-	map_data ViridianNicknameSpeechHouse, VIRIDIAN_NICKNAME_SPEECH_HOUSE, $00, 0
-	map_data TrainerHouse1F, TRAINER_HOUSE_1F, $00, 0
-	map_data TrainerHouseB1F, TRAINER_HOUSE_B1F, $00, 0
-	map_data ViridianMart, VIRIDIAN_MART, $00, 0
-	map_data ViridianPokecenter1F, VIRIDIAN_POKECENTER_1F, $00, 0
-	map_data ViridianPokecenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $00, 0
-	map_data Route2NuggetHouse, ROUTE_2_NUGGET_HOUSE, $00, 0
-	map_data Route2Gate, ROUTE_2_GATE, $00, 0
-	map_data VictoryRoadGate, VICTORY_ROAD_GATE, $00, 0
-	map_data ElmsLab, ELMS_LAB, $00, 0
-	map_data PlayersHouse1F, PLAYERS_HOUSE_1F, $00, 0
-	map_data PlayersHouse2F, PLAYERS_HOUSE_2F, $00, 0
-	map_data PlayersNeighborsHouse, PLAYERS_NEIGHBORS_HOUSE, $00, 0
-	map_data ElmsHouse, ELMS_HOUSE, $00, 0
-	map_data Route26HealHouse, ROUTE_26_HEAL_HOUSE, $00, 0
-	map_data DayOfWeekSiblingsHouse, DAY_OF_WEEK_SIBLINGS_HOUSE, $00, 0
-	map_data Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $00, 0
-	map_data Route29Route46Gate, ROUTE_29_ROUTE_46_GATE, $00, 0
-	map_data FightingDojo, FIGHTING_DOJO, $00, 0
-	map_data SaffronGym, SAFFRON_GYM, $00, 0
-	map_data SaffronMart, SAFFRON_MART, $00, 0
-	map_data SaffronPokecenter1F, SAFFRON_POKECENTER_1F, $00, 0
-	map_data SaffronPokecenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $00, 0
-	map_data MrPsychicsHouse, MR_PSYCHICS_HOUSE, $00, 0
-	map_data SaffronMagnetTrainStation, SAFFRON_MAGNET_TRAIN_STATION, $00, 0
-	map_data SilphCo1F, SILPH_CO_1F, $00, 0
-	map_data CopycatsHouse1F, COPYCATS_HOUSE_1F, $00, 0
-	map_data CopycatsHouse2F, COPYCATS_HOUSE_2F, $00, 0
-	map_data Route5UndergroundPathEntrance, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, $00, 0
-	map_data Route5SaffronGate, ROUTE_5_SAFFRON_GATE, $00, 0
-	map_data Route5CleanseTagHouse, ROUTE_5_CLEANSE_TAG_HOUSE, $00, 0
-	map_data CherrygroveMart, CHERRYGROVE_MART, $00, 0
-	map_data CherrygrovePokecenter1F, CHERRYGROVE_POKECENTER_1F, $00, 0
-	map_data CherrygroveGymSpeechHouse, CHERRYGROVE_GYM_SPEECH_HOUSE, $00, 0
-	map_data GuideGentsHouse, GUIDE_GENTS_HOUSE, $00, 0
-	map_data CherrygroveEvolutionSpeechHouse, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, $00, 0
-	map_data Route30BerryHouse, ROUTE_30_BERRY_HOUSE, $00, 0
-	map_data MrPokemonsHouse, MR_POKEMONS_HOUSE, $00, 0
-	map_data Route31VioletGate, ROUTE_31_VIOLET_GATE, $00, 0
diff --git a/data/maps/definitions.asm b/data/maps/definitions.asm
deleted file mode 100644
index b9d13e00c..000000000
--- a/data/maps/definitions.asm
+++ /dev/null
@@ -1,485 +0,0 @@
-map_def: MACRO
-;\1: map name: for the MapData pointer (see data/maps/data.asm)
-;\2: tileset: a TILESET_* constant
-;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON
-;\4: location: from constants/landmark_constants.asm
-;\5: music: a MUSIC_* constant
-;\6: phone service flag: TRUE to prevent phone calls
-;\7: time of day: a PALETTE_* constant
-;\8: fishing group: a FISHGROUP_* constant
-	db BANK(\1_MapData), \2, \3
-	dw \1_MapData
-	db \4, \5
-	dn \6, \7
-	db \8
-ENDM
-
-MapGroupPointers::
-; pointers to the first map_def of each map group
-	dw MapGroup_Olivine     ;  1
-	dw MapGroup_Mahogany    ;  2
-	dw MapGroup_Dungeons    ;  3
-	dw MapGroup_Ecruteak    ;  4
-	dw MapGroup_Blackthorn  ;  5
-	dw MapGroup_Cinnabar    ;  6
-	dw MapGroup_Cerulean    ;  7
-	dw MapGroup_Azalea      ;  8
-	dw MapGroup_LakeOfRage  ;  9
-	dw MapGroup_Violet      ; 10
-	dw MapGroup_Goldenrod   ; 11
-	dw MapGroup_Vermilion   ; 12
-	dw MapGroup_Pallet      ; 13
-	dw MapGroup_Pewter      ; 14
-	dw MapGroup_FastShip    ; 15
-	dw MapGroup_Indigo      ; 16
-	dw MapGroup_Fuchsia     ; 17
-	dw MapGroup_Lavender    ; 18
-	dw MapGroup_Silver      ; 19
-	dw MapGroup_CableClub   ; 20
-	dw MapGroup_Celadon     ; 21
-	dw MapGroup_Cianwood    ; 22
-	dw MapGroup_Viridian    ; 23
-	dw MapGroup_NewBark     ; 24
-	dw MapGroup_Saffron     ; 25
-	dw MapGroup_Cherrygrove ; 26
-
-
-MapGroup_Olivine:
-	map_def OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineGym, TILESET_CHAMPIONS_ROOM, INDOOR, OLIVINE_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineTimsHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineHouseBeta, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivinePunishmentSpeechHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineGoodRodHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineCafe, TILESET_GAME_CORNER, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineMart, TILESET_MART, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route38EcruteakGate, TILESET_GATE, GATE, ROUTE_38, MUSIC_ROUTE_37, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route39Barn, TILESET_TRADITIONAL_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route39Farmhouse, TILESET_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route38, TILESET_JOHTO, ROUTE, ROUTE_38, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def Route39, TILESET_JOHTO, ROUTE, ROUTE_39, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def OlivineCity, TILESET_JOHTO, TOWN, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-
-MapGroup_Mahogany:
-	map_def MahoganyRedGyaradosSpeechHouse, TILESET_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MahoganyGym, TILESET_ELITE_FOUR_ROOM, INDOOR, MAHOGANY_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MahoganyPokecenter1F, TILESET_POKECENTER, INDOOR, MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route42EcruteakGate, TILESET_GATE, GATE, ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route42, TILESET_JOHTO, ROUTE, ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
-	map_def Route44, TILESET_JOHTO, ROUTE, ROUTE_44, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def MahoganyTown, TILESET_JOHTO, TOWN, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-
-MapGroup_Dungeons:
-	map_def SproutTower1F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SproutTower2F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SproutTower3F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TinTower1F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TinTower2F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TinTower3F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TinTower4F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TinTower5F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TinTower6F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TinTower7F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TinTower8F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TinTower9F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BurnedTower1F, TILESET_TOWER, DUNGEON, BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-	map_def BurnedTowerB1F, TILESET_CAVE, CAVE, BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-	map_def NationalPark, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_NATIONAL_PARK, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def NationalParkBugContest, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_BUG_CATCHING_CONTEST, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def RadioTower1F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RadioTower2F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RadioTower3F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RadioTower4F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RadioTower5F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphOutside, TILESET_JOHTO, ROUTE, RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def RuinsOfAlphHoOhChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphKabutoChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphOmanyteChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphAerodactylChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphInnerChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_RUINS_OF_ALPH_INTERIOR, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphResearchCenter, TILESET_FACILITY, INDOOR, RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphHoOhItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphKabutoItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphOmanyteItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphAerodactylItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphHoOhWordRoom, TILESET_HO_OH_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphKabutoWordRoom, TILESET_KABUTO_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphOmanyteWordRoom, TILESET_OMANYTE_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphAerodactylWordRoom, TILESET_AERODACTYL_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def UnionCave1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def UnionCaveB1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def UnionCaveB2F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-	map_def SlowpokeWellB1F, TILESET_CAVE, CAVE, SLOWPOKE_WELL, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def SlowpokeWellB2F, TILESET_CAVE, CAVE, SLOWPOKE_WELL, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def OlivineLighthouse1F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineLighthouse2F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineLighthouse3F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineLighthouse4F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineLighthouse5F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineLighthouse6F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MahoganyMart1F, TILESET_TRADITIONAL_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_MAHOGANY_MART, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TeamRocketBaseB1F, TILESET_UNDERGROUND, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TeamRocketBaseB2F, TILESET_FACILITY, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TeamRocketBaseB3F, TILESET_FACILITY, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def IlexForest, TILESET_FOREST, CAVE, ILEX_FOREST, MUSIC_UNION_CAVE, FALSE, PALETTE_NITE, FISHGROUP_POND
-	map_def GoldenrodUnderground, TILESET_GATE, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodUndergroundSwitchRoomEntrances, TILESET_ELITE_FOUR_ROOM, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodDeptStoreB1F, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodUndergroundWarehouse, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MountMortar1FOutside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def MountMortar1FInside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def MountMortar2FInside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def MountMortarB1F, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def IcePath1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_def IcePathB1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_def IcePathB2FMahoganySide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_def IcePathB2FBlackthornSide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_def IcePathB3F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_def WhirlIslandNW, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_def WhirlIslandNE, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_def WhirlIslandSW, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_def WhirlIslandCave, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_def WhirlIslandSE, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_def WhirlIslandB1F, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_def WhirlIslandB2F, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_def WhirlIslandLugiaChamber, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_def SilverCaveRoom1, TILESET_DARK_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_DARK, FISHGROUP_LAKE
-	map_def SilverCaveRoom2, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def SilverCaveRoom3, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_DAY, FISHGROUP_LAKE
-	map_def SilverCaveItemRooms, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def DarkCaveVioletEntrance, TILESET_DARK_CAVE, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, TRUE, PALETTE_DARK, FISHGROUP_LAKE
-	map_def DarkCaveBlackthornEntrance, TILESET_DARK_CAVE, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, TRUE, PALETTE_DARK, FISHGROUP_LAKE
-	map_def DragonsDen1F, TILESET_CAVE, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_def DragonsDenB1F, TILESET_JOHTO, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_def DragonShrine, TILESET_LAB, INDOOR, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-	map_def TohjoFalls, TILESET_CAVE, CAVE, TOHJO_FALLS, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def DiglettsCave, TILESET_CAVE, CAVE, DIGLETTS_CAVE, MUSIC_MT_MOON, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-	map_def MountMoon, TILESET_CAVE, CAVE, MT_MOON, MUSIC_MT_MOON, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-	map_def UndergroundPath, TILESET_UNDERGROUND, GATE, UNDERGROUND_PATH, MUSIC_MT_MOON, FALSE, PALETTE_NITE, FISHGROUP_SHORE
-	map_def RockTunnel1F, TILESET_DARK_CAVE, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE
-	map_def RockTunnelB1F, TILESET_DARK_CAVE, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE
-	map_def SafariZoneFuchsiaGateBeta, TILESET_GATE, INDOOR, FUCHSIA_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SafariZoneBeta, TILESET_PARK, CAVE, FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def VictoryRoad, TILESET_CAVE, CAVE, VICTORY_ROAD, MUSIC_VICTORY_ROAD, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-
-MapGroup_Ecruteak:
-	map_def EcruteakTinTowerEntrance, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def WiseTriosRoom, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def EcruteakLugiaSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def DanceTheatre, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def EcruteakMart, TILESET_MART, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def EcruteakGym, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def EcruteakItemfinderHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def EcruteakCity, TILESET_JOHTO, TOWN, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
-
-MapGroup_Blackthorn:
-	map_def BlackthornGym1F, TILESET_ELITE_FOUR_ROOM, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BlackthornGym2F, TILESET_ELITE_FOUR_ROOM, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BlackthornDragonSpeechHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BlackthornEmysHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BlackthornMart, TILESET_MART, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BlackthornPokecenter1F, TILESET_POKECENTER, INDOOR, BLACKTHORN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MoveDeletersHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route45, TILESET_JOHTO, ROUTE, ROUTE_45, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI_2
-	map_def Route46, TILESET_JOHTO, ROUTE, ROUTE_46, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def BlackthornCity, TILESET_JOHTO, TOWN, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_POND
-
-MapGroup_Cinnabar:
-	map_def CinnabarPokecenter1F, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CinnabarPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route19FuchsiaGate, TILESET_GATE, GATE, ROUTE_19, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SeafoamGym, TILESET_CAVE, INDOOR, SEAFOAM_ISLANDS, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route19, TILESET_KANTO, ROUTE, ROUTE_19, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def Route20, TILESET_KANTO, ROUTE, ROUTE_20, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_def Route21, TILESET_KANTO, ROUTE, ROUTE_21, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_def CinnabarIsland, TILESET_KANTO, TOWN, CINNABAR_ISLAND, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-
-MapGroup_Cerulean:
-	map_def CeruleanGymBadgeSpeechHouse, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeruleanPoliceStation, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeruleanTradeSpeechHouse, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeruleanPokecenter1F, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeruleanPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeruleanGym, TILESET_PORT, INDOOR, CERULEAN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_NONE
-	map_def CeruleanMart, TILESET_MART, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route10Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route10Pokecenter2FBeta, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def PowerPlant, TILESET_FACILITY, INDOOR, POWER_PLANT, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BillsHouse, TILESET_HOUSE, INDOOR, ROUTE_25, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route4, TILESET_KANTO, ROUTE, ROUTE_4, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_NONE
-	map_def Route9, TILESET_KANTO, ROUTE, ROUTE_9, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
-	map_def Route10North, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
-	map_def Route24, TILESET_KANTO, ROUTE, ROUTE_24, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
-	map_def Route25, TILESET_KANTO, ROUTE, ROUTE_25, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
-	map_def CeruleanCity, TILESET_KANTO, TOWN, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_NONE
-
-MapGroup_Azalea:
-	map_def AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CharcoalKiln, TILESET_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def AzaleaMart, TILESET_MART, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def KurtsHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def AzaleaGym, TILESET_ELITE_FOUR_ROOM, INDOOR, AZALEA_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route33, TILESET_JOHTO_MODERN, ROUTE, ROUTE_33, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def AzaleaTown, TILESET_JOHTO_MODERN, TOWN, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-
-MapGroup_LakeOfRage:
-	map_def LakeOfRageHiddenPowerHouse, TILESET_HOUSE, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def LakeOfRageMagikarpHouse, TILESET_HOUSE, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route43MahoganyGate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route43Gate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route43, TILESET_JOHTO, ROUTE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def LakeOfRage, TILESET_JOHTO, TOWN, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS
-
-MapGroup_Violet:
-	map_def Route32, TILESET_JOHTO, ROUTE, ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH
-	map_def Route35, TILESET_JOHTO, ROUTE, ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def Route36, TILESET_JOHTO, ROUTE, ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def Route37, TILESET_JOHTO, ROUTE, ROUTE_37, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def VioletCity, TILESET_JOHTO, TOWN, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def VioletMart, TILESET_MART, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VioletGym, TILESET_ELITE_FOUR_ROOM, INDOOR, VIOLET_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VioletNicknameSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VioletPokecenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VioletKylesHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route32Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route35NationalParkGate, TILESET_GATE, INDOOR, ROUTE_35, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route36RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route36NationalParkGate, TILESET_GATE, INDOOR, ROUTE_36, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Goldenrod:
-	map_def Route34, TILESET_JOHTO_MODERN, ROUTE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def GoldenrodCity, TILESET_JOHTO_MODERN, TOWN, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def GoldenrodGym, TILESET_ELITE_FOUR_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodBikeShop, TILESET_CHAMPIONS_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodHappinessRater, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BillsFamilysHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodFlowerShop, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodPPSpeechHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodNameRater, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodDeptStore1F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodDeptStore2F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodDeptStore3F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodDeptStore4F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodDeptStore5F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodDeptStore6F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodDeptStoreElevator, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def PokecomCenterAdminRoomMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def DayCare, TILESET_HOUSE, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Vermilion:
-	map_def Route6, TILESET_KANTO, ROUTE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def Route11, TILESET_KANTO, ROUTE, ROUTE_11, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def VermilionCity, TILESET_KANTO, TOWN, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_def VermilionFishingSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VermilionPokecenter1F, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VermilionPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def PokemonFanClub, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VermilionMagnetTrainSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VermilionMart, TILESET_MART, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VermilionDiglettsCaveSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VermilionGym, TILESET_GAME_CORNER, INDOOR, VERMILION_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route6SaffronGate, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route6UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Pallet:
-	map_def Route1, TILESET_KANTO, ROUTE, ROUTE_1, MUSIC_ROUTE_1, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def PalletTown, TILESET_KANTO, TOWN, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_def RedsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RedsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BluesHouse, TILESET_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OaksLab, TILESET_LAB, INDOOR, PALLET_TOWN, MUSIC_POKEMON_TALK, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Pewter:
-	map_def Route3, TILESET_KANTO, ROUTE, ROUTE_3, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def PewterCity, TILESET_KANTO, TOWN, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def PewterNidoranSpeechHouse, TILESET_HOUSE, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def PewterGym, TILESET_TOWER, INDOOR, PEWTER_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def PewterMart, TILESET_MART, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def PewterPokecenter1F, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def PewterPokecenter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def PewterSnoozeSpeechHouse, TILESET_HOUSE, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_FastShip:
-	map_def OlivinePort, TILESET_PORT, ROUTE, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_def VermilionPort, TILESET_PORT, ROUTE, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_def FastShip1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def FastShipCabins_NNW_NNE_NE, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def FastShipCabins_SW_SSW_NW, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def FastShipCabins_SE_SSE_CaptainsCabin, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def FastShipB1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivinePortPassage, TILESET_UNDERGROUND, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VermilionPortPassage, TILESET_UNDERGROUND, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MountMoonSquare, TILESET_KANTO, ROUTE, MT_MOON, MUSIC_MT_MOON_SQUARE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def MountMoonGiftShop, TILESET_TRADITIONAL_HOUSE, INDOOR, MT_MOON, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TinTowerRoof, TILESET_TOWER, ROUTE, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-
-MapGroup_Indigo:
-	map_def Route23, TILESET_KANTO, TOWN, ROUTE_23, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def IndigoPlateauPokecenter1F, TILESET_POKECENTER, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def WillsRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def KogasRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BrunosRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def KarensRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def LancesRoom, TILESET_CHAMPIONS_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def HallOfFame, TILESET_ICE_PATH, INDOOR, INDIGO_PLATEAU, MUSIC_NEW_BARK_TOWN, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Fuchsia:
-	map_def Route13, TILESET_KANTO, ROUTE, ROUTE_13, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM
-	map_def Route14, TILESET_KANTO, ROUTE, ROUTE_14, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def Route15, TILESET_KANTO, ROUTE, ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def Route18, TILESET_KANTO, ROUTE, ROUTE_18, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def FuchsiaCity, TILESET_KANTO, TOWN, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS
-	map_def FuchsiaMart, TILESET_MART, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def FuchsiaGym, TILESET_LAB, INDOOR, FUCHSIA_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BillsBrothersHouse, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def FuchsiaPokecenter1F, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def FuchsiaPokecenter2FBeta, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SafariZoneWardensHome, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route15FuchsiaGate, TILESET_GATE, GATE, ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Lavender:
-	map_def Route8, TILESET_KANTO, ROUTE, ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def Route12, TILESET_KANTO, ROUTE, ROUTE_12, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM
-	map_def Route10South, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
-	map_def LavenderTown, TILESET_KANTO, TOWN, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def LavenderPokecenter1F, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def LavenderPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MrFujisHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def LavenderSpeechHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def LavenderNameRater, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def LavenderMart, TILESET_MART, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SoulHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def LavRadioTower1F, TILESET_RADIO_TOWER, INDOOR, LAV_RADIO_TOWER, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route8SaffronGate, TILESET_GATE, GATE, ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route12SuperRodHouse, TILESET_HOUSE, INDOOR, ROUTE_12, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Silver:
-	map_def Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route28SteelWingHouse, TILESET_HOUSE, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_CableClub:
-	map_def Pokecenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TradeCenter, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Colosseum, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TimeCapsule, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MobileTradeRoom, TILESET_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MobileBattleRoom, TILESET_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Celadon:
-	map_def Route7, TILESET_KANTO, ROUTE, ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def Route16, TILESET_KANTO, ROUTE, ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def Route17, TILESET_KANTO, ROUTE, ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_NONE
-	map_def CeladonCity, TILESET_KANTO, TOWN, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_AUTO, FISHGROUP_NONE
-	map_def CeladonDeptStore1F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonDeptStore2F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonDeptStore3F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonDeptStore4F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonDeptStore5F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonDeptStore6F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonDeptStoreElevator, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonMansion1F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonMansion2F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonMansion3F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonMansionRoof, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonMansionRoofHouse, TILESET_HOUSE, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonPokecenter1F, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonGameCorner, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonGameCornerPrizeRoom, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonGym, TILESET_TRAIN_STATION, INDOOR, CELADON_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonCafe, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route16FuchsiaSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_16, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route16Gate, TILESET_GATE, GATE, ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route7SaffronGate, TILESET_GATE, GATE, ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route17Route18Gate, TILESET_GATE, GATE, ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Cianwood:
-	map_def Route40, TILESET_JOHTO, ROUTE, ROUTE_40, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def Route41, TILESET_JOHTO, ROUTE, ROUTE_41, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_def CianwoodCity, TILESET_JOHTO, TOWN, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def ManiasHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CianwoodGym, TILESET_TOWER, INDOOR, CIANWOOD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CianwoodPokecenter1F, TILESET_POKECENTER, INDOOR, CIANWOOD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CianwoodPharmacy, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CianwoodPhotoStudio, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CianwoodLugiaSpeechHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def PokeSeersHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BattleTowerBattleRoom, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BattleTowerElevator, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BattleTowerHallway, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route40BattleTowerGate, TILESET_GATE, GATE, BATTLE_TOWER, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-
-MapGroup_Viridian:
-	map_def Route2, TILESET_KANTO, ROUTE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def Route22, TILESET_KANTO, ROUTE, ROUTE_22, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def ViridianCity, TILESET_KANTO, TOWN, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def ViridianGym, TILESET_TRAIN_STATION, INDOOR, VIRIDIAN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def ViridianNicknameSpeechHouse, TILESET_HOUSE, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TrainerHouse1F, TILESET_HOUSE, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TrainerHouseB1F, TILESET_FACILITY, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def ViridianMart, TILESET_MART, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def ViridianPokecenter1F, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def ViridianPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route2NuggetHouse, TILESET_HOUSE, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route2Gate, TILESET_GATE, GATE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VictoryRoadGate, TILESET_GATE, GATE, ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_NewBark:
-	map_def Route26, TILESET_JOHTO, ROUTE, ROUTE_26, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_def Route27, TILESET_JOHTO, ROUTE, ROUTE_27, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_def Route29, TILESET_JOHTO, ROUTE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def NewBarkTown, TILESET_JOHTO, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_def ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def PlayersHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def PlayersHouse2F, TILESET_PLAYERS_ROOM, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def PlayersNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route26HealHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def DayOfWeekSiblingsHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route27SandstormHouse, TILESET_HOUSE, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route29Route46Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Saffron:
-	map_def Route5, TILESET_KANTO, ROUTE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def SaffronCity, TILESET_KANTO, TOWN, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def FightingDojo, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SaffronGym, TILESET_UNDERGROUND, INDOOR, SAFFRON_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SaffronMart, TILESET_MART, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SaffronPokecenter1F, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SaffronPokecenter2FBeta, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MrPsychicsHouse, TILESET_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SaffronMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SilphCo1F, TILESET_FACILITY, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CopycatsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route5UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route5SaffronGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route5CleanseTagHouse, TILESET_HOUSE, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Cherrygrove:
-	map_def Route30, TILESET_JOHTO, ROUTE, ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def Route31, TILESET_JOHTO, ROUTE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def CherrygroveCity, TILESET_JOHTO, TOWN, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def CherrygroveMart, TILESET_MART, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CherrygrovePokecenter1F, TILESET_POKECENTER, INDOOR, CHERRYGROVE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CherrygroveGymSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GuideGentsHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CherrygroveEvolutionSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route30BerryHouse, TILESET_HOUSE, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MrPokemonsHouse, TILESET_FACILITY, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route31VioletGate, TILESET_GATE, GATE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE
diff --git a/data/maps/map_data.asm b/data/maps/map_data.asm
new file mode 100644
index 000000000..2e1b7c618
--- /dev/null
+++ b/data/maps/map_data.asm
@@ -0,0 +1,12 @@
+INCLUDE "constants.asm"
+
+
+SECTION "Maps", ROMX
+
+INCLUDE "data/maps/maps.asm"
+INCLUDE "data/maps/attributes.asm"
+
+
+INCLUDE "data/maps/blocks.asm"
+
+INCLUDE "data/maps/scripts.asm"
diff --git a/data/maps/maps.asm b/data/maps/maps.asm
index 56958ccfc..471884825 100644
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@@ -1,12 +1,485 @@
-INCLUDE "constants.asm"
+map: MACRO
+;\1: map name: for the MapAttributes pointer (see data/maps/attributes.asm)
+;\2: tileset: a TILESET_* constant
+;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON
+;\4: location: from constants/landmark_constants.asm
+;\5: music: a MUSIC_* constant
+;\6: phone service flag: TRUE to prevent phone calls
+;\7: time of day: a PALETTE_* constant
+;\8: fishing group: a FISHGROUP_* constant
+	db BANK(\1_MapAttributes), \2, \3
+	dw \1_MapAttributes
+	db \4, \5
+	dn \6, \7
+	db \8
+ENDM
+
+MapGroupPointers::
+; pointers to the first map of each map group
+	dw MapGroup_Olivine     ;  1
+	dw MapGroup_Mahogany    ;  2
+	dw MapGroup_Dungeons    ;  3
+	dw MapGroup_Ecruteak    ;  4
+	dw MapGroup_Blackthorn  ;  5
+	dw MapGroup_Cinnabar    ;  6
+	dw MapGroup_Cerulean    ;  7
+	dw MapGroup_Azalea      ;  8
+	dw MapGroup_LakeOfRage  ;  9
+	dw MapGroup_Violet      ; 10
+	dw MapGroup_Goldenrod   ; 11
+	dw MapGroup_Vermilion   ; 12
+	dw MapGroup_Pallet      ; 13
+	dw MapGroup_Pewter      ; 14
+	dw MapGroup_FastShip    ; 15
+	dw MapGroup_Indigo      ; 16
+	dw MapGroup_Fuchsia     ; 17
+	dw MapGroup_Lavender    ; 18
+	dw MapGroup_Silver      ; 19
+	dw MapGroup_CableClub   ; 20
+	dw MapGroup_Celadon     ; 21
+	dw MapGroup_Cianwood    ; 22
+	dw MapGroup_Viridian    ; 23
+	dw MapGroup_NewBark     ; 24
+	dw MapGroup_Saffron     ; 25
+	dw MapGroup_Cherrygrove ; 26
 
 
-SECTION "Maps", ROMX
+MapGroup_Olivine:
+	map OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineGym, TILESET_CHAMPIONS_ROOM, INDOOR, OLIVINE_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineTimsHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineHouseBeta, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivinePunishmentSpeechHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineGoodRodHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineCafe, TILESET_GAME_CORNER, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineMart, TILESET_MART, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route38EcruteakGate, TILESET_GATE, GATE, ROUTE_38, MUSIC_ROUTE_37, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route39Barn, TILESET_TRADITIONAL_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route39Farmhouse, TILESET_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route38, TILESET_JOHTO, ROUTE, ROUTE_38, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map Route39, TILESET_JOHTO, ROUTE, ROUTE_39, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map OlivineCity, TILESET_JOHTO, TOWN, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 
-INCLUDE "data/maps/definitions.asm"
-INCLUDE "data/maps/data.asm"
+MapGroup_Mahogany:
+	map MahoganyRedGyaradosSpeechHouse, TILESET_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map MahoganyGym, TILESET_ELITE_FOUR_ROOM, INDOOR, MAHOGANY_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map MahoganyPokecenter1F, TILESET_POKECENTER, INDOOR, MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route42EcruteakGate, TILESET_GATE, GATE, ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route42, TILESET_JOHTO, ROUTE, ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
+	map Route44, TILESET_JOHTO, ROUTE, ROUTE_44, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map MahoganyTown, TILESET_JOHTO, TOWN, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 
+MapGroup_Dungeons:
+	map SproutTower1F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SproutTower2F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SproutTower3F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TinTower1F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TinTower2F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TinTower3F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TinTower4F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TinTower5F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TinTower6F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TinTower7F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TinTower8F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TinTower9F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map BurnedTower1F, TILESET_TOWER, DUNGEON, BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE
+	map BurnedTowerB1F, TILESET_CAVE, CAVE, BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE
+	map NationalPark, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_NATIONAL_PARK, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map NationalParkBugContest, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_BUG_CATCHING_CONTEST, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map RadioTower1F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RadioTower2F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RadioTower3F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RadioTower4F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RadioTower5F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphOutside, TILESET_JOHTO, ROUTE, RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map RuinsOfAlphHoOhChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphKabutoChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphOmanyteChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphAerodactylChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphInnerChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_RUINS_OF_ALPH_INTERIOR, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphResearchCenter, TILESET_FACILITY, INDOOR, RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphHoOhItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphKabutoItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphOmanyteItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphAerodactylItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphHoOhWordRoom, TILESET_HO_OH_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphKabutoWordRoom, TILESET_KABUTO_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphOmanyteWordRoom, TILESET_OMANYTE_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphAerodactylWordRoom, TILESET_AERODACTYL_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map UnionCave1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map UnionCaveB1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map UnionCaveB2F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_SHORE
+	map SlowpokeWellB1F, TILESET_CAVE, CAVE, SLOWPOKE_WELL, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map SlowpokeWellB2F, TILESET_CAVE, CAVE, SLOWPOKE_WELL, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map OlivineLighthouse1F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineLighthouse2F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineLighthouse3F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineLighthouse4F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineLighthouse5F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineLighthouse6F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map MahoganyMart1F, TILESET_TRADITIONAL_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_MAHOGANY_MART, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map TeamRocketBaseB1F, TILESET_UNDERGROUND, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map TeamRocketBaseB2F, TILESET_FACILITY, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map TeamRocketBaseB3F, TILESET_FACILITY, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map IlexForest, TILESET_FOREST, CAVE, ILEX_FOREST, MUSIC_UNION_CAVE, FALSE, PALETTE_NITE, FISHGROUP_POND
+	map GoldenrodUnderground, TILESET_GATE, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodUndergroundSwitchRoomEntrances, TILESET_ELITE_FOUR_ROOM, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodDeptStoreB1F, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodUndergroundWarehouse, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map MountMortar1FOutside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map MountMortar1FInside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map MountMortar2FInside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map MountMortarB1F, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map IcePath1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map IcePathB1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map IcePathB2FMahoganySide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map IcePathB2FBlackthornSide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map IcePathB3F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map WhirlIslandNW, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map WhirlIslandNE, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map WhirlIslandSW, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map WhirlIslandCave, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map WhirlIslandSE, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map WhirlIslandB1F, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map WhirlIslandB2F, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map WhirlIslandLugiaChamber, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map SilverCaveRoom1, TILESET_DARK_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_DARK, FISHGROUP_LAKE
+	map SilverCaveRoom2, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map SilverCaveRoom3, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_DAY, FISHGROUP_LAKE
+	map SilverCaveItemRooms, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map DarkCaveVioletEntrance, TILESET_DARK_CAVE, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, TRUE, PALETTE_DARK, FISHGROUP_LAKE
+	map DarkCaveBlackthornEntrance, TILESET_DARK_CAVE, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, TRUE, PALETTE_DARK, FISHGROUP_LAKE
+	map DragonsDen1F, TILESET_CAVE, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map DragonsDenB1F, TILESET_JOHTO, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map DragonShrine, TILESET_LAB, INDOOR, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_SHORE
+	map TohjoFalls, TILESET_CAVE, CAVE, TOHJO_FALLS, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map DiglettsCave, TILESET_CAVE, CAVE, DIGLETTS_CAVE, MUSIC_MT_MOON, TRUE, PALETTE_NITE, FISHGROUP_SHORE
+	map MountMoon, TILESET_CAVE, CAVE, MT_MOON, MUSIC_MT_MOON, TRUE, PALETTE_NITE, FISHGROUP_SHORE
+	map UndergroundPath, TILESET_UNDERGROUND, GATE, UNDERGROUND_PATH, MUSIC_MT_MOON, FALSE, PALETTE_NITE, FISHGROUP_SHORE
+	map RockTunnel1F, TILESET_DARK_CAVE, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE
+	map RockTunnelB1F, TILESET_DARK_CAVE, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE
+	map SafariZoneFuchsiaGateBeta, TILESET_GATE, INDOOR, FUCHSIA_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SafariZoneBeta, TILESET_PARK, CAVE, FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map VictoryRoad, TILESET_CAVE, CAVE, VICTORY_ROAD, MUSIC_VICTORY_ROAD, TRUE, PALETTE_NITE, FISHGROUP_SHORE
 
-INCLUDE "data/maps/blocks.asm"
+MapGroup_Ecruteak:
+	map EcruteakTinTowerEntrance, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map WiseTriosRoom, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map EcruteakLugiaSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map DanceTheatre, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map EcruteakMart, TILESET_MART, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map EcruteakGym, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map EcruteakItemfinderHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map EcruteakCity, TILESET_JOHTO, TOWN, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
 
-INCLUDE "data/maps/scripts.asm"
+MapGroup_Blackthorn:
+	map BlackthornGym1F, TILESET_ELITE_FOUR_ROOM, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map BlackthornGym2F, TILESET_ELITE_FOUR_ROOM, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map BlackthornDragonSpeechHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map BlackthornEmysHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map BlackthornMart, TILESET_MART, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map BlackthornPokecenter1F, TILESET_POKECENTER, INDOOR, BLACKTHORN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map MoveDeletersHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route45, TILESET_JOHTO, ROUTE, ROUTE_45, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI_2
+	map Route46, TILESET_JOHTO, ROUTE, ROUTE_46, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map BlackthornCity, TILESET_JOHTO, TOWN, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_POND
+
+MapGroup_Cinnabar:
+	map CinnabarPokecenter1F, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CinnabarPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route19FuchsiaGate, TILESET_GATE, GATE, ROUTE_19, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SeafoamGym, TILESET_CAVE, INDOOR, SEAFOAM_ISLANDS, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route19, TILESET_KANTO, ROUTE, ROUTE_19, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map Route20, TILESET_KANTO, ROUTE, ROUTE_20, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map Route21, TILESET_KANTO, ROUTE, ROUTE_21, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map CinnabarIsland, TILESET_KANTO, TOWN, CINNABAR_ISLAND, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+
+MapGroup_Cerulean:
+	map CeruleanGymBadgeSpeechHouse, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeruleanPoliceStation, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeruleanTradeSpeechHouse, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeruleanPokecenter1F, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeruleanPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeruleanGym, TILESET_PORT, INDOOR, CERULEAN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_NONE
+	map CeruleanMart, TILESET_MART, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route10Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route10Pokecenter2FBeta, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PowerPlant, TILESET_FACILITY, INDOOR, POWER_PLANT, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map BillsHouse, TILESET_HOUSE, INDOOR, ROUTE_25, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route4, TILESET_KANTO, ROUTE, ROUTE_4, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_NONE
+	map Route9, TILESET_KANTO, ROUTE, ROUTE_9, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
+	map Route10North, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
+	map Route24, TILESET_KANTO, ROUTE, ROUTE_24, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
+	map Route25, TILESET_KANTO, ROUTE, ROUTE_25, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
+	map CeruleanCity, TILESET_KANTO, TOWN, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_NONE
+
+MapGroup_Azalea:
+	map AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CharcoalKiln, TILESET_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map AzaleaMart, TILESET_MART, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map KurtsHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map AzaleaGym, TILESET_ELITE_FOUR_ROOM, INDOOR, AZALEA_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route33, TILESET_JOHTO_MODERN, ROUTE, ROUTE_33, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map AzaleaTown, TILESET_JOHTO_MODERN, TOWN, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+
+MapGroup_LakeOfRage:
+	map LakeOfRageHiddenPowerHouse, TILESET_HOUSE, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map LakeOfRageMagikarpHouse, TILESET_HOUSE, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route43MahoganyGate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route43Gate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route43, TILESET_JOHTO, ROUTE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map LakeOfRage, TILESET_JOHTO, TOWN, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS
+
+MapGroup_Violet:
+	map Route32, TILESET_JOHTO, ROUTE, ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH
+	map Route35, TILESET_JOHTO, ROUTE, ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map Route36, TILESET_JOHTO, ROUTE, ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map Route37, TILESET_JOHTO, ROUTE, ROUTE_37, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map VioletCity, TILESET_JOHTO, TOWN, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map VioletMart, TILESET_MART, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VioletGym, TILESET_ELITE_FOUR_ROOM, INDOOR, VIOLET_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VioletNicknameSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VioletPokecenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VioletKylesHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route32Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route35NationalParkGate, TILESET_GATE, INDOOR, ROUTE_35, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route36RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route36NationalParkGate, TILESET_GATE, INDOOR, ROUTE_36, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Goldenrod:
+	map Route34, TILESET_JOHTO_MODERN, ROUTE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map GoldenrodCity, TILESET_JOHTO_MODERN, TOWN, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map GoldenrodGym, TILESET_ELITE_FOUR_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodBikeShop, TILESET_CHAMPIONS_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodHappinessRater, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map BillsFamilysHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodFlowerShop, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodPPSpeechHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodNameRater, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodDeptStore1F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodDeptStore2F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodDeptStore3F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodDeptStore4F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodDeptStore5F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodDeptStore6F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodDeptStoreElevator, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PokecomCenterAdminRoomMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map DayCare, TILESET_HOUSE, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Vermilion:
+	map Route6, TILESET_KANTO, ROUTE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map Route11, TILESET_KANTO, ROUTE, ROUTE_11, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map VermilionCity, TILESET_KANTO, TOWN, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map VermilionFishingSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VermilionPokecenter1F, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VermilionPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PokemonFanClub, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VermilionMagnetTrainSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VermilionMart, TILESET_MART, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VermilionDiglettsCaveSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VermilionGym, TILESET_GAME_CORNER, INDOOR, VERMILION_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route6SaffronGate, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route6UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Pallet:
+	map Route1, TILESET_KANTO, ROUTE, ROUTE_1, MUSIC_ROUTE_1, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map PalletTown, TILESET_KANTO, TOWN, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map RedsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map RedsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map BluesHouse, TILESET_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OaksLab, TILESET_LAB, INDOOR, PALLET_TOWN, MUSIC_POKEMON_TALK, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Pewter:
+	map Route3, TILESET_KANTO, ROUTE, ROUTE_3, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map PewterCity, TILESET_KANTO, TOWN, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map PewterNidoranSpeechHouse, TILESET_HOUSE, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PewterGym, TILESET_TOWER, INDOOR, PEWTER_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map PewterMart, TILESET_MART, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PewterPokecenter1F, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PewterPokecenter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PewterSnoozeSpeechHouse, TILESET_HOUSE, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_FastShip:
+	map OlivinePort, TILESET_PORT, ROUTE, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map VermilionPort, TILESET_PORT, ROUTE, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map FastShip1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map FastShipCabins_NNW_NNE_NE, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map FastShipCabins_SW_SSW_NW, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map FastShipCabins_SE_SSE_CaptainsCabin, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map FastShipB1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivinePortPassage, TILESET_UNDERGROUND, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VermilionPortPassage, TILESET_UNDERGROUND, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map MountMoonSquare, TILESET_KANTO, ROUTE, MT_MOON, MUSIC_MT_MOON_SQUARE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map MountMoonGiftShop, TILESET_TRADITIONAL_HOUSE, INDOOR, MT_MOON, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TinTowerRoof, TILESET_TOWER, ROUTE, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+
+MapGroup_Indigo:
+	map Route23, TILESET_KANTO, TOWN, ROUTE_23, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map IndigoPlateauPokecenter1F, TILESET_POKECENTER, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map WillsRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map KogasRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map BrunosRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map KarensRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map LancesRoom, TILESET_CHAMPIONS_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map HallOfFame, TILESET_ICE_PATH, INDOOR, INDIGO_PLATEAU, MUSIC_NEW_BARK_TOWN, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Fuchsia:
+	map Route13, TILESET_KANTO, ROUTE, ROUTE_13, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM
+	map Route14, TILESET_KANTO, ROUTE, ROUTE_14, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map Route15, TILESET_KANTO, ROUTE, ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map Route18, TILESET_KANTO, ROUTE, ROUTE_18, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map FuchsiaCity, TILESET_KANTO, TOWN, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS
+	map FuchsiaMart, TILESET_MART, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map FuchsiaGym, TILESET_LAB, INDOOR, FUCHSIA_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map BillsBrothersHouse, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map FuchsiaPokecenter1F, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map FuchsiaPokecenter2FBeta, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SafariZoneWardensHome, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route15FuchsiaGate, TILESET_GATE, GATE, ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Lavender:
+	map Route8, TILESET_KANTO, ROUTE, ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map Route12, TILESET_KANTO, ROUTE, ROUTE_12, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM
+	map Route10South, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
+	map LavenderTown, TILESET_KANTO, TOWN, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map LavenderPokecenter1F, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map LavenderPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map MrFujisHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map LavenderSpeechHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map LavenderNameRater, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map LavenderMart, TILESET_MART, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SoulHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map LavRadioTower1F, TILESET_RADIO_TOWER, INDOOR, LAV_RADIO_TOWER, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route8SaffronGate, TILESET_GATE, GATE, ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route12SuperRodHouse, TILESET_HOUSE, INDOOR, ROUTE_12, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Silver:
+	map Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route28SteelWingHouse, TILESET_HOUSE, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_CableClub:
+	map Pokecenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map TradeCenter, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map Colosseum, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map TimeCapsule, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map MobileTradeRoom, TILESET_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map MobileBattleRoom, TILESET_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Celadon:
+	map Route7, TILESET_KANTO, ROUTE, ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map Route16, TILESET_KANTO, ROUTE, ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map Route17, TILESET_KANTO, ROUTE, ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_NONE
+	map CeladonCity, TILESET_KANTO, TOWN, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_AUTO, FISHGROUP_NONE
+	map CeladonDeptStore1F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonDeptStore2F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonDeptStore3F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonDeptStore4F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonDeptStore5F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonDeptStore6F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonDeptStoreElevator, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonMansion1F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonMansion2F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonMansion3F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonMansionRoof, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonMansionRoofHouse, TILESET_HOUSE, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonPokecenter1F, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonGameCorner, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonGameCornerPrizeRoom, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonGym, TILESET_TRAIN_STATION, INDOOR, CELADON_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonCafe, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route16FuchsiaSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_16, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route16Gate, TILESET_GATE, GATE, ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route7SaffronGate, TILESET_GATE, GATE, ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route17Route18Gate, TILESET_GATE, GATE, ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Cianwood:
+	map Route40, TILESET_JOHTO, ROUTE, ROUTE_40, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map Route41, TILESET_JOHTO, ROUTE, ROUTE_41, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map CianwoodCity, TILESET_JOHTO, TOWN, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map ManiasHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CianwoodGym, TILESET_TOWER, INDOOR, CIANWOOD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map CianwoodPokecenter1F, TILESET_POKECENTER, INDOOR, CIANWOOD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CianwoodPharmacy, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CianwoodPhotoStudio, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CianwoodLugiaSpeechHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PokeSeersHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map BattleTowerBattleRoom, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map BattleTowerElevator, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map BattleTowerHallway, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route40BattleTowerGate, TILESET_GATE, GATE, BATTLE_TOWER, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+
+MapGroup_Viridian:
+	map Route2, TILESET_KANTO, ROUTE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map Route22, TILESET_KANTO, ROUTE, ROUTE_22, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map ViridianCity, TILESET_KANTO, TOWN, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map ViridianGym, TILESET_TRAIN_STATION, INDOOR, VIRIDIAN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map ViridianNicknameSpeechHouse, TILESET_HOUSE, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TrainerHouse1F, TILESET_HOUSE, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TrainerHouseB1F, TILESET_FACILITY, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map ViridianMart, TILESET_MART, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map ViridianPokecenter1F, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map ViridianPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route2NuggetHouse, TILESET_HOUSE, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route2Gate, TILESET_GATE, GATE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VictoryRoadGate, TILESET_GATE, GATE, ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_NewBark:
+	map Route26, TILESET_JOHTO, ROUTE, ROUTE_26, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map Route27, TILESET_JOHTO, ROUTE, ROUTE_27, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map Route29, TILESET_JOHTO, ROUTE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map NewBarkTown, TILESET_JOHTO, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PlayersHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PlayersHouse2F, TILESET_PLAYERS_ROOM, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PlayersNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route26HealHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map DayOfWeekSiblingsHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route27SandstormHouse, TILESET_HOUSE, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route29Route46Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Saffron:
+	map Route5, TILESET_KANTO, ROUTE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map SaffronCity, TILESET_KANTO, TOWN, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map FightingDojo, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SaffronGym, TILESET_UNDERGROUND, INDOOR, SAFFRON_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map SaffronMart, TILESET_MART, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SaffronPokecenter1F, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SaffronPokecenter2FBeta, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map MrPsychicsHouse, TILESET_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SaffronMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SilphCo1F, TILESET_FACILITY, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CopycatsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route5UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route5SaffronGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route5CleanseTagHouse, TILESET_HOUSE, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Cherrygrove:
+	map Route30, TILESET_JOHTO, ROUTE, ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map Route31, TILESET_JOHTO, ROUTE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map CherrygroveCity, TILESET_JOHTO, TOWN, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map CherrygroveMart, TILESET_MART, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CherrygrovePokecenter1F, TILESET_POKECENTER, INDOOR, CHERRYGROVE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CherrygroveGymSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GuideGentsHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CherrygroveEvolutionSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route30BerryHouse, TILESET_HOUSE, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map MrPokemonsHouse, TILESET_FACILITY, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route31VioletGate, TILESET_GATE, GATE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE
diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm
index e66b61a99..9e11f3590 100644
--- a/data/maps/scenes.asm
+++ b/data/maps/scenes.asm
@@ -1,6 +1,6 @@
 scene_var: MACRO
 ; map, variable
-	map \1
+	map_id \1
 	dw \2
 ENDM
 
diff --git a/data/maps/setup_scripts.asm b/data/maps/setup_scripts.asm
index 47895b609..00b059865 100644
--- a/data/maps/setup_scripts.asm
+++ b/data/maps/setup_scripts.asm
@@ -23,7 +23,7 @@ MapSetupScript_Warp: ; 15392
 	db map_lcd_off
 	db map_sound_off
 	db map_load_spawn
-	db map_attributes
+	db map_load_attributes
 	db map_change_callback
 	db map_spawn_coord
 	db map_player_coord
@@ -46,7 +46,7 @@ MapSetupScript_Warp: ; 15392
 
 MapSetupScript_BadWarp: ; 153a9
 	db map_load_spawn
-	db map_attributes
+	db map_load_attributes
 	db map_change_callback
 	db map_spawn_coord
 	db map_player_coord
@@ -71,7 +71,7 @@ MapSetupScript_BadWarp: ; 153a9
 MapSetupScript_Connection: ; 153bf
 	db map_animations_off
 	db map_load_connection
-	db map_attributes
+	db map_load_attributes
 	db map_change_callback
 	db map_player_coord
 	db map_load_blocks
@@ -93,7 +93,7 @@ MapSetupScript_Door: ; 153d1
 	db map_fade_out_palettes
 MapSetupScript_Train: ; 153d2
 	db map_load_warp
-	db map_attributes
+	db map_load_attributes
 	db map_warp_face
 	db map_change_callback
 	db map_player_coord
@@ -154,7 +154,7 @@ MapSetupScript_LinkReturn: ; 153f7
 MapSetupScript_Continue: ; 15408
 	db map_lcd_off
 	db map_sound_off
-	db map_attributes_2
+	db map_load_attributes_2
 	db map_anchor_screen
 	db map_start_callback
 	db map_load_blocks
diff --git a/data/maps/spawn_points.asm b/data/maps/spawn_points.asm
index 51e32d855..b00a2ac1e 100644
--- a/data/maps/spawn_points.asm
+++ b/data/maps/spawn_points.asm
@@ -1,6 +1,6 @@
 spawn: MACRO
 ; map, x, y
-	map \1
+	map_id \1
 	db \2, \3
 ENDM
 
diff --git a/data/phone/phone_contacts.asm b/data/phone/phone_contacts.asm
index 488a54f06..349fa2e02 100644
--- a/data/phone/phone_contacts.asm
+++ b/data/phone/phone_contacts.asm
@@ -1,7 +1,7 @@
 phone: MACRO
 ; trainer class, trainer id, map, time 1, script 1, time 2, script 2
 	db \1, \2
-	map \3
+	map_id \3
 	db \4
 	dba \5
 	db \6
diff --git a/data/radio/oaks_pkmn_talk_routes.asm b/data/radio/oaks_pkmn_talk_routes.asm
index 419c4ec79..ad2c5bcc0 100644
--- a/data/radio/oaks_pkmn_talk_routes.asm
+++ b/data/radio/oaks_pkmn_talk_routes.asm
@@ -1,19 +1,19 @@
 ; Oak's Pokémon Talk will list wild Pokémon on these maps.
 
 OaksPkmnTalkRoutes:
-	map ROUTE_29
-	map ROUTE_46
-	map ROUTE_30
-	map ROUTE_32
-	map ROUTE_34
-	map ROUTE_35
-	map ROUTE_37
-	map ROUTE_38
-	map ROUTE_39
-	map ROUTE_42
-	map ROUTE_43
-	map ROUTE_44
-	map ROUTE_45
-	map ROUTE_36
-	map ROUTE_31
+	map_id ROUTE_29
+	map_id ROUTE_46
+	map_id ROUTE_30
+	map_id ROUTE_32
+	map_id ROUTE_34
+	map_id ROUTE_35
+	map_id ROUTE_37
+	map_id ROUTE_38
+	map_id ROUTE_39
+	map_id ROUTE_42
+	map_id ROUTE_43
+	map_id ROUTE_44
+	map_id ROUTE_45
+	map_id ROUTE_36
+	map_id ROUTE_31
 .End
diff --git a/data/radio/pnp_hidden_places.asm b/data/radio/pnp_hidden_places.asm
index 3314976f5..a43dfd252 100644
--- a/data/radio/pnp_hidden_places.asm
+++ b/data/radio/pnp_hidden_places.asm
@@ -1,13 +1,13 @@
 ; Places and People will not describe these maps.
 
 PnP_HiddenPlaces:
-	map PALLET_TOWN
-	map ROUTE_22
-	map PEWTER_CITY
-	map CERULEAN_POLICE_STATION
-	map ROUTE_12
-	map ROUTE_11
-	map ROUTE_16
-	map ROUTE_14
-	map CINNABAR_POKECENTER_2F_BETA
+	map_id PALLET_TOWN
+	map_id ROUTE_22
+	map_id PEWTER_CITY
+	map_id CERULEAN_POLICE_STATION
+	map_id ROUTE_12
+	map_id ROUTE_11
+	map_id ROUTE_16
+	map_id ROUTE_14
+	map_id CINNABAR_POKECENTER_2F_BETA
 .End
diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm
index be435b048..c48de0408 100644
--- a/data/wild/johto_grass.asm
+++ b/data/wild/johto_grass.asm
@@ -2,7 +2,7 @@
 
 JohtoGrassWildMons: ; 0x2a5e9
 
-	map SPROUT_TOWER_2F
+	map_id SPROUT_TOWER_2F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, RATTATA
@@ -29,7 +29,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 5, RATTATA
 	db 5, RATTATA
 
-	map SPROUT_TOWER_3F
+	map_id SPROUT_TOWER_3F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, RATTATA
@@ -56,7 +56,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 5, RATTATA
 	db 5, RATTATA
 
-	map TIN_TOWER_2F
+	map_id TIN_TOWER_2F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -83,7 +83,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, RATTATA
 	db 24, RATTATA
 
-	map TIN_TOWER_3F
+	map_id TIN_TOWER_3F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -110,7 +110,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, RATTATA
 	db 24, RATTATA
 
-	map TIN_TOWER_4F
+	map_id TIN_TOWER_4F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -137,7 +137,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, RATTATA
 	db 24, RATTATA
 
-	map TIN_TOWER_5F
+	map_id TIN_TOWER_5F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -164,7 +164,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, RATTATA
 	db 24, RATTATA
 
-	map TIN_TOWER_6F
+	map_id TIN_TOWER_6F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -191,7 +191,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, RATTATA
 	db 24, RATTATA
 
-	map TIN_TOWER_7F
+	map_id TIN_TOWER_7F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -218,7 +218,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, RATTATA
 	db 24, RATTATA
 
-	map TIN_TOWER_8F
+	map_id TIN_TOWER_8F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -245,7 +245,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, RATTATA
 	db 24, RATTATA
 
-	map TIN_TOWER_9F
+	map_id TIN_TOWER_9F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -272,7 +272,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, RATTATA
 	db 24, RATTATA
 
-	map BURNED_TOWER_1F
+	map_id BURNED_TOWER_1F
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	db 13, RATTATA
@@ -299,7 +299,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 15, RATICATE
 	db 15, RATICATE
 
-	map BURNED_TOWER_B1F
+	map_id BURNED_TOWER_B1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 14, RATTATA
@@ -326,7 +326,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 16, KOFFING
 	db 16, WEEZING
 
-	map NATIONAL_PARK
+	map_id NATIONAL_PARK
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 12, NIDORAN_M
@@ -353,7 +353,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 12, VENONAT
 	db 12, VENONAT
 
-	map RUINS_OF_ALPH_OUTSIDE
+	map_id RUINS_OF_ALPH_OUTSIDE
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, NATU
@@ -380,7 +380,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 22, QUAGSIRE
 	db 22, QUAGSIRE
 
-	map RUINS_OF_ALPH_INNER_CHAMBER
+	map_id RUINS_OF_ALPH_INNER_CHAMBER
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 5, UNOWN
@@ -407,7 +407,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 5, UNOWN
 	db 5, UNOWN
 
-	map UNION_CAVE_1F
+	map_id UNION_CAVE_1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 6, GEODUDE
@@ -434,7 +434,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 6, ONIX
 	db 6, ONIX
 
-	map UNION_CAVE_B1F
+	map_id UNION_CAVE_B1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 8, GEODUDE
@@ -461,7 +461,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 8, RATTATA
 	db 8, RATTATA
 
-	map UNION_CAVE_B2F
+	map_id UNION_CAVE_B2F
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, ZUBAT
@@ -488,7 +488,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 23, ONIX
 	db 23, ONIX
 
-	map SLOWPOKE_WELL_B1F
+	map_id SLOWPOKE_WELL_B1F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 5, ZUBAT
@@ -515,7 +515,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 8, SLOWPOKE
 	db 8, SLOWPOKE
 
-	map SLOWPOKE_WELL_B2F
+	map_id SLOWPOKE_WELL_B2F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 21, ZUBAT
@@ -542,7 +542,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 23, SLOWPOKE
 	db 23, SLOWPOKE
 
-	map ILEX_FOREST
+	map_id ILEX_FOREST
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	db 5, CATERPIE
@@ -569,7 +569,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 6, PARAS
 	db 6, PARAS
 
-	map MOUNT_MORTAR_1F_OUTSIDE
+	map_id MOUNT_MORTAR_1F_OUTSIDE
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 14, RATTATA
@@ -596,7 +596,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 16, RATICATE
 	db 16, RATICATE
 
-	map MOUNT_MORTAR_1F_INSIDE
+	map_id MOUNT_MORTAR_1F_INSIDE
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 13, GEODUDE
@@ -623,7 +623,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 15, GOLBAT
 	db 15, GOLBAT
 
-	map MOUNT_MORTAR_2F_INSIDE
+	map_id MOUNT_MORTAR_2F_INSIDE
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 31, GRAVELER
@@ -650,7 +650,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 32, GOLBAT
 	db 32, GOLBAT
 
-	map MOUNT_MORTAR_B1F
+	map_id MOUNT_MORTAR_B1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 15, ZUBAT
@@ -677,7 +677,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 18, RATICATE
 	db 18, RATICATE
 
-	map ICE_PATH_1F
+	map_id ICE_PATH_1F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 21, SWINUB
@@ -704,7 +704,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 22, GOLBAT
 	db 22, GOLBAT
 
-	map ICE_PATH_B1F
+	map_id ICE_PATH_B1F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, SWINUB
@@ -731,7 +731,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 23, GOLBAT
 	db 22, SNEASEL
 
-	map ICE_PATH_B2F_MAHOGANY_SIDE
+	map_id ICE_PATH_B2F_MAHOGANY_SIDE
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 23, SWINUB
@@ -758,7 +758,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 22, SNEASEL
 	db 24, SNEASEL
 
-	map ICE_PATH_B2F_BLACKTHORN_SIDE
+	map_id ICE_PATH_B2F_BLACKTHORN_SIDE
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 23, SWINUB
@@ -785,7 +785,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 22, SNEASEL
 	db 24, SNEASEL
 
-	map ICE_PATH_B3F
+	map_id ICE_PATH_B3F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 24, SWINUB
@@ -812,7 +812,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, SNEASEL
 	db 26, SNEASEL
 
-	map WHIRL_ISLAND_NW
+	map_id WHIRL_ISLAND_NW
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, KRABBY
@@ -839,7 +839,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, GOLBAT
 	db 24, GOLBAT
 
-	map WHIRL_ISLAND_NE
+	map_id WHIRL_ISLAND_NE
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, KRABBY
@@ -866,7 +866,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, GOLBAT
 	db 24, GOLBAT
 
-	map WHIRL_ISLAND_SW
+	map_id WHIRL_ISLAND_SW
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, KRABBY
@@ -893,7 +893,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, GOLBAT
 	db 24, GOLBAT
 
-	map WHIRL_ISLAND_CAVE
+	map_id WHIRL_ISLAND_CAVE
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, KRABBY
@@ -920,7 +920,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, GOLBAT
 	db 24, GOLBAT
 
-	map WHIRL_ISLAND_SE
+	map_id WHIRL_ISLAND_SE
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, KRABBY
@@ -947,7 +947,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, GOLBAT
 	db 24, GOLBAT
 
-	map WHIRL_ISLAND_B1F
+	map_id WHIRL_ISLAND_B1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 23, KRABBY
@@ -974,7 +974,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 25, GOLBAT
 	db 25, GOLBAT
 
-	map WHIRL_ISLAND_B2F
+	map_id WHIRL_ISLAND_B2F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 24, KRABBY
@@ -1001,7 +1001,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 26, GOLBAT
 	db 26, GOLBAT
 
-	map WHIRL_ISLAND_LUGIA_CHAMBER
+	map_id WHIRL_ISLAND_LUGIA_CHAMBER
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 25, KRABBY
@@ -1028,7 +1028,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 27, GOLBAT
 	db 27, GOLBAT
 
-	map SILVER_CAVE_ROOM_1
+	map_id SILVER_CAVE_ROOM_1
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 43, GRAVELER
@@ -1055,7 +1055,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 46, GOLBAT
 	db 46, GOLBAT
 
-	map SILVER_CAVE_ROOM_2
+	map_id SILVER_CAVE_ROOM_2
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 48, GOLBAT
@@ -1082,7 +1082,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 45, MISDREAVUS
 	db 45, MISDREAVUS
 
-	map SILVER_CAVE_ROOM_3
+	map_id SILVER_CAVE_ROOM_3
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 51, GOLBAT
@@ -1109,7 +1109,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 53, GOLBAT
 	db 53, GOLBAT
 
-	map SILVER_CAVE_ITEM_ROOMS
+	map_id SILVER_CAVE_ITEM_ROOMS
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 48, GOLBAT
@@ -1136,7 +1136,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 50, PARASECT
 	db 52, PARASECT
 
-	map DARK_CAVE_VIOLET_ENTRANCE
+	map_id DARK_CAVE_VIOLET_ENTRANCE
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, GEODUDE
@@ -1163,7 +1163,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 4, ZUBAT
 	db 4, DUNSPARCE
 
-	map DARK_CAVE_BLACKTHORN_ENTRANCE
+	map_id DARK_CAVE_BLACKTHORN_ENTRANCE
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	db 23, GEODUDE
@@ -1190,7 +1190,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 23, GOLBAT
 	db 23, GOLBAT
 
-	map ROUTE_29
+	map_id ROUTE_29
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 2, PIDGEY
@@ -1217,7 +1217,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 3, HOOTHOOT
 	db 3, HOOTHOOT
 
-	map ROUTE_30
+	map_id ROUTE_30
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, LEDYBA
@@ -1244,7 +1244,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 4, HOOTHOOT
 	db 4, HOOTHOOT
 
-	map ROUTE_31
+	map_id ROUTE_31
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 4, LEDYBA
@@ -1271,7 +1271,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 5, GASTLY
 	db 5, GASTLY
 
-	map ROUTE_32
+	map_id ROUTE_32
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 4, EKANS
@@ -1298,7 +1298,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 7, GASTLY
 	db 7, GASTLY
 
-	map ROUTE_33
+	map_id ROUTE_33
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 6, RATTATA
@@ -1325,7 +1325,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 7, RATTATA
 	db 7, RATTATA
 
-	map ROUTE_34
+	map_id ROUTE_34
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 10, SNUBBULL
@@ -1352,7 +1352,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 10, DITTO
 	db 10, DITTO
 
-	map ROUTE_35
+	map_id ROUTE_35
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 12, SNUBBULL
@@ -1379,7 +1379,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 10, DITTO
 	db 12, YANMA
 
-	map ROUTE_36
+	map_id ROUTE_36
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 4, LEDYBA
@@ -1406,7 +1406,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 5, GASTLY
 	db 5, GASTLY
 
-	map ROUTE_37
+	map_id ROUTE_37
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 13, LEDYBA
@@ -1433,7 +1433,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 15, ARIADOS
 	db 15, ARIADOS
 
-	map ROUTE_38
+	map_id ROUTE_38
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 16, RATTATA
@@ -1460,7 +1460,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 16, MEOWTH
 	db 16, MEOWTH
 
-	map ROUTE_39
+	map_id ROUTE_39
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 16, RATTATA
@@ -1487,7 +1487,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 18, MEOWTH
 	db 18, MEOWTH
 
-	map ROUTE_42
+	map_id ROUTE_42
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 13, EKANS
@@ -1514,7 +1514,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 16, GOLBAT
 	db 16, GOLBAT
 
-	map ROUTE_43
+	map_id ROUTE_43
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 15, SENTRET
@@ -1541,7 +1541,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 17, VENOMOTH
 	db 17, VENOMOTH
 
-	map ROUTE_44
+	map_id ROUTE_44
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 23, TANGELA
@@ -1568,7 +1568,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 26, POLIWHIRL
 	db 26, POLIWHIRL
 
-	map ROUTE_45
+	map_id ROUTE_45
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 23, GEODUDE
@@ -1595,7 +1595,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 27, GRAVELER
 	db 27, GRAVELER
 
-	map ROUTE_46
+	map_id ROUTE_46
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 2, GEODUDE
@@ -1622,7 +1622,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 2, RATTATA
 	db 2, RATTATA
 
-	map SILVER_CAVE_OUTSIDE
+	map_id SILVER_CAVE_OUTSIDE
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 41, TANGELA
diff --git a/data/wild/johto_water.asm b/data/wild/johto_water.asm
index d6e11c3a0..778d5f409 100644
--- a/data/wild/johto_water.asm
+++ b/data/wild/johto_water.asm
@@ -2,229 +2,229 @@
 
 JohtoWaterWildMons: ; 0x2b11d
 
-	map RUINS_OF_ALPH_OUTSIDE
+	map_id RUINS_OF_ALPH_OUTSIDE
 	db 2 percent ; encounter rate
 	db 15, WOOPER
 	db 20, QUAGSIRE
 	db 15, QUAGSIRE
 
-	map UNION_CAVE_1F
+	map_id UNION_CAVE_1F
 	db 2 percent ; encounter rate
 	db 15, WOOPER
 	db 20, QUAGSIRE
 	db 15, QUAGSIRE
 
-	map UNION_CAVE_B1F
+	map_id UNION_CAVE_B1F
 	db 2 percent ; encounter rate
 	db 15, WOOPER
 	db 20, QUAGSIRE
 	db 15, QUAGSIRE
 
-	map UNION_CAVE_B2F
+	map_id UNION_CAVE_B2F
 	db 4 percent ; encounter rate
 	db 15, TENTACOOL
 	db 20, QUAGSIRE
 	db 20, TENTACRUEL
 
-	map SLOWPOKE_WELL_B1F
+	map_id SLOWPOKE_WELL_B1F
 	db 2 percent ; encounter rate
 	db 15, SLOWPOKE
 	db 20, SLOWPOKE
 	db 10, SLOWPOKE
 
-	map SLOWPOKE_WELL_B2F
+	map_id SLOWPOKE_WELL_B2F
 	db 2 percent ; encounter rate
 	db 15, SLOWPOKE
 	db 20, SLOWPOKE
 	db 20, SLOWBRO
 
-	map ILEX_FOREST
+	map_id ILEX_FOREST
 	db 2 percent ; encounter rate
 	db 15, PSYDUCK
 	db 10, PSYDUCK
 	db 15, GOLDUCK
 
-	map MOUNT_MORTAR_1F_OUTSIDE
+	map_id MOUNT_MORTAR_1F_OUTSIDE
 	db 4 percent ; encounter rate
 	db 15, GOLDEEN
 	db 20, MARILL
 	db 20, SEAKING
 
-	map MOUNT_MORTAR_2F_INSIDE
+	map_id MOUNT_MORTAR_2F_INSIDE
 	db 2 percent ; encounter rate
 	db 20, GOLDEEN
 	db 25, MARILL
 	db 25, SEAKING
 
-	map MOUNT_MORTAR_B1F
+	map_id MOUNT_MORTAR_B1F
 	db 2 percent ; encounter rate
 	db 15, GOLDEEN
 	db 20, MARILL
 	db 20, SEAKING
 
-	map WHIRL_ISLAND_SW
+	map_id WHIRL_ISLAND_SW
 	db 4 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, HORSEA
 	db 20, TENTACRUEL
 
-	map WHIRL_ISLAND_B2F
+	map_id WHIRL_ISLAND_B2F
 	db 4 percent ; encounter rate
 	db 15, HORSEA
 	db 20, HORSEA
 	db 20, TENTACRUEL
 
-	map WHIRL_ISLAND_LUGIA_CHAMBER
+	map_id WHIRL_ISLAND_LUGIA_CHAMBER
 	db 4 percent ; encounter rate
 	db 20, HORSEA
 	db 20, TENTACRUEL
 	db 20, SEADRA
 
-	map SILVER_CAVE_ROOM_2
+	map_id SILVER_CAVE_ROOM_2
 	db 2 percent ; encounter rate
 	db 35, SEAKING
 	db 35, GOLDUCK
 	db 35, GOLDEEN
 
-	map DARK_CAVE_VIOLET_ENTRANCE
+	map_id DARK_CAVE_VIOLET_ENTRANCE
 	db 2 percent ; encounter rate
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 	db 5, MAGIKARP
 
-	map DARK_CAVE_BLACKTHORN_ENTRANCE
+	map_id DARK_CAVE_BLACKTHORN_ENTRANCE
 	db 2 percent ; encounter rate
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 	db 5, MAGIKARP
 
-	map DRAGONS_DEN_B1F
+	map_id DRAGONS_DEN_B1F
 	db 4 percent ; encounter rate
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 	db 10, DRATINI
 
-	map OLIVINE_PORT
+	map_id OLIVINE_PORT
 	db 2 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map ROUTE_30
+	map_id ROUTE_30
 	db 2 percent ; encounter rate
 	db 20, POLIWAG
 	db 15, POLIWAG
 	db 20, POLIWHIRL
 
-	map ROUTE_31
+	map_id ROUTE_31
 	db 2 percent ; encounter rate
 	db 20, POLIWAG
 	db 15, POLIWAG
 	db 20, POLIWHIRL
 
-	map ROUTE_32
+	map_id ROUTE_32
 	db 6 percent ; encounter rate
 	db 15, TENTACOOL
 	db 20, QUAGSIRE
 	db 20, TENTACRUEL
 
-	map ROUTE_34
+	map_id ROUTE_34
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map ROUTE_35
+	map_id ROUTE_35
 	db 4 percent ; encounter rate
 	db 20, PSYDUCK
 	db 15, PSYDUCK
 	db 20, GOLDUCK
 
-	map ROUTE_40
+	map_id ROUTE_40
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map ROUTE_41
+	map_id ROUTE_41
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 20, TENTACRUEL
 	db 20, MANTINE
 
-	map ROUTE_42
+	map_id ROUTE_42
 	db 4 percent ; encounter rate
 	db 20, GOLDEEN
 	db 15, GOLDEEN
 	db 20, SEAKING
 
-	map ROUTE_43
+	map_id ROUTE_43
 	db 2 percent ; encounter rate
 	db 20, MAGIKARP
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 
-	map ROUTE_44
+	map_id ROUTE_44
 	db 2 percent ; encounter rate
 	db 25, POLIWAG
 	db 20, POLIWAG
 	db 25, POLIWHIRL
 
-	map ROUTE_45
+	map_id ROUTE_45
 	db 2 percent ; encounter rate
 	db 20, MAGIKARP
 	db 15, MAGIKARP
 	db 5, MAGIKARP
 
-	map NEW_BARK_TOWN
+	map_id NEW_BARK_TOWN
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map CHERRYGROVE_CITY
+	map_id CHERRYGROVE_CITY
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map VIOLET_CITY
+	map_id VIOLET_CITY
 	db 2 percent ; encounter rate
 	db 20, POLIWAG
 	db 15, POLIWAG
 	db 20, POLIWHIRL
 
-	map CIANWOOD_CITY
+	map_id CIANWOOD_CITY
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map OLIVINE_CITY
+	map_id OLIVINE_CITY
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map ECRUTEAK_CITY
+	map_id ECRUTEAK_CITY
 	db 2 percent ; encounter rate
 	db 20, POLIWAG
 	db 15, POLIWAG
 	db 20, POLIWHIRL
 
-	map LAKE_OF_RAGE
+	map_id LAKE_OF_RAGE
 	db 6 percent ; encounter rate
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 	db 15, GYARADOS
 
-	map BLACKTHORN_CITY
+	map_id BLACKTHORN_CITY
 	db 4 percent ; encounter rate
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 	db 5, MAGIKARP
 
-	map SILVER_CAVE_OUTSIDE
+	map_id SILVER_CAVE_OUTSIDE
 	db 2 percent ; encounter rate
 	db 35, POLIWHIRL
 	db 40, POLIWHIRL
diff --git a/data/wild/kanto_grass.asm b/data/wild/kanto_grass.asm
index 415514748..bc9e2cae9 100644
--- a/data/wild/kanto_grass.asm
+++ b/data/wild/kanto_grass.asm
@@ -2,7 +2,7 @@
 
 KantoGrassWildMons: ; 0x2b274
 
-	map DIGLETTS_CAVE
+	map_id DIGLETTS_CAVE
 	db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, DIGLETT
@@ -29,7 +29,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 32, DUGTRIO
 	db 32, DUGTRIO
 
-	map MOUNT_MOON
+	map_id MOUNT_MOON
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 6, ZUBAT
@@ -56,7 +56,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 12, CLEFAIRY
 	db 12, CLEFAIRY
 
-	map ROCK_TUNNEL_1F
+	map_id ROCK_TUNNEL_1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 10, CUBONE
@@ -83,7 +83,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 15, ZUBAT
 	db 15, ZUBAT
 
-	map ROCK_TUNNEL_B1F
+	map_id ROCK_TUNNEL_B1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 12, CUBONE
@@ -110,7 +110,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 15, GOLBAT
 	db 15, GOLBAT
 
-	map VICTORY_ROAD
+	map_id VICTORY_ROAD
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 34, GRAVELER
@@ -137,7 +137,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 40, GRAVELER
 	db 40, GRAVELER
 
-	map TOHJO_FALLS
+	map_id TOHJO_FALLS
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, ZUBAT
@@ -164,7 +164,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 23, SLOWPOKE
 	db 23, SLOWPOKE
 
-	map ROUTE_1
+	map_id ROUTE_1
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 2, PIDGEY
@@ -191,7 +191,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 4, HOOTHOOT
 	db 4, HOOTHOOT
 
-	map ROUTE_2
+	map_id ROUTE_2
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, CATERPIE
@@ -218,7 +218,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 4, NOCTOWL
 	db 4, NOCTOWL
 
-	map ROUTE_3
+	map_id ROUTE_3
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 5, SPEAROW
@@ -245,7 +245,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 6, CLEFAIRY
 	db 6, CLEFAIRY
 
-	map ROUTE_4
+	map_id ROUTE_4
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 5, SPEAROW
@@ -272,7 +272,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 6, CLEFAIRY
 	db 6, CLEFAIRY
 
-	map ROUTE_5
+	map_id ROUTE_5
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 13, PIDGEY
@@ -299,7 +299,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 14, ABRA
 	db 14, ABRA
 
-	map ROUTE_6
+	map_id ROUTE_6
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 13, RATTATA
@@ -326,7 +326,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 15, RATICATE
 	db 15, RATICATE
 
-	map ROUTE_7
+	map_id ROUTE_7
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 17, RATTATA
@@ -353,7 +353,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 16, ABRA
 	db 16, ABRA
 
-	map ROUTE_8
+	map_id ROUTE_8
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 17, SNUBBULL
@@ -380,7 +380,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 18, KADABRA
 	db 18, KADABRA
 
-	map ROUTE_9
+	map_id ROUTE_9
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 15, RATTATA
@@ -407,7 +407,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 18, RATICATE
 	db 18, RATICATE
 
-	map ROUTE_10_NORTH
+	map_id ROUTE_10_NORTH
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 15, SPEAROW
@@ -434,7 +434,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 16, ELECTABUZZ
 	db 16, ELECTABUZZ
 
-	map ROUTE_11
+	map_id ROUTE_11
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 14, HOPPIP
@@ -461,7 +461,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 16, HYPNO
 	db 16, HYPNO
 
-	map ROUTE_13
+	map_id ROUTE_13
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 23, NIDORINO
@@ -488,7 +488,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 25, QUAGSIRE
 	db 25, CHANSEY
 
-	map ROUTE_14
+	map_id ROUTE_14
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 26, NIDORINO
@@ -515,7 +515,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 28, QUAGSIRE
 	db 28, CHANSEY
 
-	map ROUTE_15
+	map_id ROUTE_15
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 23, NIDORINO
@@ -542,7 +542,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 25, QUAGSIRE
 	db 25, CHANSEY
 
-	map ROUTE_16
+	map_id ROUTE_16
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 26, GRIMER
@@ -569,7 +569,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 30, MUK
 	db 30, MUK
 
-	map ROUTE_17
+	map_id ROUTE_17
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 30, FEAROW
@@ -596,7 +596,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 33, MUK
 	db 33, MUK
 
-	map ROUTE_18
+	map_id ROUTE_18
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 26, GRIMER
@@ -623,7 +623,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 30, MUK
 	db 30, MUK
 
-	map ROUTE_21
+	map_id ROUTE_21
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 30, TANGELA
@@ -650,7 +650,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 28, TANGELA
 	db 28, TANGELA
 
-	map ROUTE_22
+	map_id ROUTE_22
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, RATTATA
@@ -677,7 +677,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 7, RATTATA
 	db 7, RATTATA
 
-	map ROUTE_24
+	map_id ROUTE_24
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 8, CATERPIE
@@ -704,7 +704,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 14, GLOOM
 	db 14, GLOOM
 
-	map ROUTE_25
+	map_id ROUTE_25
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 10, CATERPIE
@@ -731,7 +731,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 14, NOCTOWL
 	db 14, NOCTOWL
 
-	map ROUTE_26
+	map_id ROUTE_26
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 28, DODUO
@@ -758,7 +758,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 30, QUAGSIRE
 	db 30, QUAGSIRE
 
-	map ROUTE_27
+	map_id ROUTE_27
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 28, DODUO
@@ -785,7 +785,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 32, NOCTOWL
 	db 32, NOCTOWL
 
-	map ROUTE_28
+	map_id ROUTE_28
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 39, TANGELA
diff --git a/data/wild/kanto_water.asm b/data/wild/kanto_water.asm
index 71fab48fb..1cbd473a0 100644
--- a/data/wild/kanto_water.asm
+++ b/data/wild/kanto_water.asm
@@ -2,145 +2,145 @@
 
 KantoWaterWildMons: ; 0x2b7f7
 
-	map TOHJO_FALLS
+	map_id TOHJO_FALLS
 	db 4 percent ; encounter rate
 	db 20, GOLDEEN
 	db 20, SLOWPOKE
 	db 20, SEAKING
 
-	map VERMILION_PORT
+	map_id VERMILION_PORT
 	db 2 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
 	db 35, TENTACRUEL
 
-	map ROUTE_4
+	map_id ROUTE_4
 	db 4 percent ; encounter rate
 	db 10, GOLDEEN
 	db 5, GOLDEEN
 	db 10, SEAKING
 
-	map ROUTE_6
+	map_id ROUTE_6
 	db 2 percent ; encounter rate
 	db 10, PSYDUCK
 	db 5, PSYDUCK
 	db 10, GOLDUCK
 
-	map ROUTE_9
+	map_id ROUTE_9
 	db 4 percent ; encounter rate
 	db 15, GOLDEEN
 	db 10, GOLDEEN
 	db 15, SEAKING
 
-	map ROUTE_10_NORTH
+	map_id ROUTE_10_NORTH
 	db 4 percent ; encounter rate
 	db 15, GOLDEEN
 	db 10, GOLDEEN
 	db 15, SEAKING
 
-	map ROUTE_12
+	map_id ROUTE_12
 	db 6 percent ; encounter rate
 	db 25, TENTACOOL
 	db 25, QUAGSIRE
 	db 25, TENTACRUEL
 
-	map ROUTE_13
+	map_id ROUTE_13
 	db 6 percent ; encounter rate
 	db 25, TENTACOOL
 	db 25, QUAGSIRE
 	db 25, TENTACRUEL
 
-	map ROUTE_19
+	map_id ROUTE_19
 	db 6 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
 	db 35, TENTACRUEL
 
-	map ROUTE_20
+	map_id ROUTE_20
 	db 6 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
 	db 35, TENTACRUEL
 
-	map ROUTE_21
+	map_id ROUTE_21
 	db 6 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
 	db 35, TENTACRUEL
 
-	map ROUTE_22
+	map_id ROUTE_22
 	db 2 percent ; encounter rate
 	db 10, POLIWAG
 	db 5, POLIWAG
 	db 10, POLIWHIRL
 
-	map ROUTE_24
+	map_id ROUTE_24
 	db 4 percent ; encounter rate
 	db 10, GOLDEEN
 	db 5, GOLDEEN
 	db 10, SEAKING
 
-	map ROUTE_25
+	map_id ROUTE_25
 	db 4 percent ; encounter rate
 	db 10, GOLDEEN
 	db 5, GOLDEEN
 	db 10, SEAKING
 
-	map ROUTE_26
+	map_id ROUTE_26
 	db 6 percent ; encounter rate
 	db 30, TENTACOOL
 	db 25, TENTACOOL
 	db 30, TENTACRUEL
 
-	map ROUTE_27
+	map_id ROUTE_27
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map ROUTE_28
+	map_id ROUTE_28
 	db 2 percent ; encounter rate
 	db 40, POLIWAG
 	db 35, POLIWAG
 	db 40, POLIWHIRL
 
-	map PALLET_TOWN
+	map_id PALLET_TOWN
 	db 6 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
 	db 35, TENTACRUEL
 
-	map VIRIDIAN_CITY
+	map_id VIRIDIAN_CITY
 	db 2 percent ; encounter rate
 	db 10, POLIWAG
 	db 5, POLIWAG
 	db 10, POLIWHIRL
 
-	map CERULEAN_CITY
+	map_id CERULEAN_CITY
 	db 4 percent ; encounter rate
 	db 10, GOLDEEN
 	db 5, GOLDEEN
 	db 10, SEAKING
 
-	map VERMILION_CITY
+	map_id VERMILION_CITY
 	db 6 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
 	db 35, TENTACRUEL
 
-	map CELADON_CITY
+	map_id CELADON_CITY
 	db 2 percent ; encounter rate
 	db 20, GRIMER
 	db 15, GRIMER
 	db 15, MUK
 
-	map FUCHSIA_CITY
+	map_id FUCHSIA_CITY
 	db 2 percent ; encounter rate
 	db 20, MAGIKARP
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 
-	map CINNABAR_ISLAND
+	map_id CINNABAR_ISLAND
 	db 6 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
diff --git a/data/wild/roammon_maps.asm b/data/wild/roammon_maps.asm
index b82ca016f..a57f561b2 100644
--- a/data/wild/roammon_maps.asm
+++ b/data/wild/roammon_maps.asm
@@ -2,10 +2,10 @@
 ; Notably missing are Route 40 and Route 41, which are water routes.
 
 roam_map: MACRO
-	map \1
+	map_id \1
 	db _NARG - 1
 rept _NARG + -1
-	map \2
+	map_id \2
 	shift
 endr
 	db 0
diff --git a/data/wild/swarm_grass.asm b/data/wild/swarm_grass.asm
index a26417f64..408a0157e 100644
--- a/data/wild/swarm_grass.asm
+++ b/data/wild/swarm_grass.asm
@@ -3,7 +3,7 @@
 SwarmGrassWildMons: ; 0x2b8d0
 
 ; Dunsparce swarm
-	map DARK_CAVE_VIOLET_ENTRANCE
+	map_id DARK_CAVE_VIOLET_ENTRANCE
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, GEODUDE
@@ -31,7 +31,7 @@ SwarmGrassWildMons: ; 0x2b8d0
 	db 4, DUNSPARCE
 
 ; Yanma swarm
-	map ROUTE_35
+	map_id ROUTE_35
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 12, NIDORAN_M
diff --git a/data/wild/treemon_maps.asm b/data/wild/treemon_maps.asm
index 4e30a51a5..59eba43cc 100644
--- a/data/wild/treemon_maps.asm
+++ b/data/wild/treemon_maps.asm
@@ -1,5 +1,5 @@
 treemon_map: MACRO
-	map \1
+	map_id \1
 	db  \2 ; treemon set
 ENDM
 
diff --git a/engine/events/unown_walls.asm b/engine/events/unown_walls.asm
index 91b1d11f3..b867a8d50 100644
--- a/engine/events/unown_walls.asm
+++ b/engine/events/unown_walls.asm
@@ -3,7 +3,7 @@ HoOhChamber: ; 0x8addb
 	ld a, [hl]
 	cp HO_OH ; is Ho-oh the first Pokémon in the party?
 	jr nz, .done ; if not, we're done
-	call GetMapDataPointer ; pointless?
+	call GetMapAttributesPointer ; pointless?
 	ld de, EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
 	ld b, SET_FLAG
 	call EventFlagAction
@@ -12,7 +12,7 @@ HoOhChamber: ; 0x8addb
 ; 0x8adef
 
 OmanyteChamber: ; 8adef
-	call GetMapDataPointer ; pointless?
+	call GetMapAttributesPointer ; pointless?
 	ld de, EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
 	ld b, CHECK_FLAG
 	call EventFlagAction
@@ -44,7 +44,7 @@ OmanyteChamber: ; 8adef
 	jr nz, .loop
 
 .open
-	call GetMapDataPointer ; pointless?
+	call GetMapAttributesPointer ; pointless?
 	ld de, EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
 	ld b, SET_FLAG
 	call EventFlagAction
@@ -57,12 +57,12 @@ SpecialAerodactylChamber: ; 8ae30
 	push de
 	push bc
 
-	call GetMapDataPointer
+	call GetMapAttributesPointer
 	ld a, h
-	cp HIGH(RuinsOfAlphAerodactylChamber_MapData)
+	cp HIGH(RuinsOfAlphAerodactylChamber_MapAttributes)
 	jr nz, .nope
 	ld a, l
-	cp LOW(RuinsOfAlphAerodactylChamber_MapData)
+	cp LOW(RuinsOfAlphAerodactylChamber_MapAttributes)
 	jr nz, .nope
 
 	ld de, EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
@@ -85,12 +85,12 @@ SpecialKabutoChamber: ; 8ae4e
 	push hl
 	push de
 
-	call GetMapDataPointer
+	call GetMapAttributesPointer
 	ld a, h
-	cp HIGH(RuinsOfAlphKabutoChamber_MapData)
+	cp HIGH(RuinsOfAlphKabutoChamber_MapAttributes)
 	jr nz, .done
 	ld a, l
-	cp LOW(RuinsOfAlphKabutoChamber_MapData)
+	cp LOW(RuinsOfAlphKabutoChamber_MapAttributes)
 	jr nz, .done
 
 	ld de, EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
diff --git a/home/map.asm b/home/map.asm
index 9c81d8034..434cb9d72 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -394,7 +394,7 @@ CheckIndoorMap:: ; 22f4
 ; 2309
 
 LoadMapAttributes:: ; 2309
-	call CopyMapDefAndData
+	call CopyMapPartialAndAttributes
 	call SwitchToMapScriptsBank
 	call ReadMapScripts
 	xor a ; do not skip object_events
@@ -403,7 +403,7 @@ LoadMapAttributes:: ; 2309
 ; 2317
 
 LoadMapAttributes_SkipPeople:: ; 2317
-	call CopyMapDefAndData
+	call CopyMapPartialAndAttributes
 	call SwitchToMapScriptsBank
 	call ReadMapScripts
 	ld a, TRUE ; skip object events
@@ -411,11 +411,11 @@ LoadMapAttributes_SkipPeople:: ; 2317
 	ret
 ; 2326
 
-CopyMapDefAndData:: ; 2326
-	call PartialCopyMapDef
-	call SwitchToMapDataBank
-	call GetMapDataPointer
-	call CopyMapData
+CopyMapPartialAndAttributes:: ; 2326
+	call CopyMapPartial
+	call SwitchToMapAttributesBank
+	call GetMapAttributesPointer
+	call CopyMapAttributes
 	call GetMapConnections
 	ret
 ; 2336
@@ -450,9 +450,9 @@ ReadMapScripts:: ; 234f
 	ret
 ; 235c
 
-CopyMapData:: ; 235c
-	ld de, wMapData
-	ld c, wMapDataEnd - wMapData
+CopyMapAttributes:: ; 235c
+	ld de, wMapAttributes
+	ld c, wMapAttributesEnd - wMapAttributes
 .loop
 	ld a, [hli]
 	ld [de], a
@@ -2052,7 +2052,7 @@ ReloadTilesetAndPalettes:: ; 2bae
 	ld b, a
 	ld a, [MapNumber]
 	ld c, a
-	call SwitchToAnyMapDataBank
+	call SwitchToAnyMapAttributesBank
 	farcall UpdateTimeOfDayPal
 	call OverworldTextModeSwitch
 	call LoadTilesetGFX
@@ -2065,12 +2065,12 @@ ReloadTilesetAndPalettes:: ; 2bae
 	ret
 ; 2be5
 
-GetMapDefPointer:: ; 2be5
+GetMapPointer:: ; 2be5
 	ld a, [MapGroup]
 	ld b, a
 	ld a, [MapNumber]
 	ld c, a
-GetAnyMapDefPointer:: ; 0x2bed
+GetAnyMapPointer:: ; 0x2bed
 ; Prior to calling this function, you must have switched banks so that
 ; MapGroupPointers is visible.
 
@@ -2078,7 +2078,7 @@ GetAnyMapDefPointer:: ; 0x2bed
 ; b = map group, c = map number
 
 ; outputs:
-; hl points to the map_def
+; hl points to the map within its group
 	push bc ; save map number for later
 
 	; get pointer to map group
@@ -2094,7 +2094,7 @@ GetAnyMapDefPointer:: ; 0x2bed
 	ld l, a
 	pop bc ; restore map number
 
-	; find the cth map_def
+	; find the cth map within the group
 	dec c
 	ld b, 0
 	ld a, 9
@@ -2102,28 +2102,28 @@ GetAnyMapDefPointer:: ; 0x2bed
 	ret
 ; 0x2c04
 
-GetMapDefField:: ; 0x2c04
-; Extract data from the current map's map_def.
+GetMapField:: ; 0x2c04
+; Extract data from the current map's group entry.
 
 ; inputs:
-; de = offset of desired data within the map_def (a MAPDEF_* constant)
+; de = offset of desired data within the map (a MAP_* constant)
 
 ; outputs:
-; bc = data from the current map's map_def
-; (e.g., de = MAPDEF_TILESET would return a pointer to the tileset id)
+; bc = data from the current map's field
+; (e.g., de = MAP_TILESET would return a pointer to the tileset id)
 
 	ld a, [MapGroup]
 	ld b, a
 	ld a, [MapNumber]
 	ld c, a
-GetAnyMapDefField:: ; 0x2c0c
+GetAnyMapField:: ; 0x2c0c
 	; bankswitch
 	ld a, [hROMBank]
 	push af
 	ld a, BANK(MapGroupPointers)
 	rst Bankswitch
 
-	call GetAnyMapDefPointer
+	call GetAnyMapPointer
 	add hl, de
 	ld c, [hl]
 	inc hl
@@ -2135,44 +2135,44 @@ GetAnyMapDefField:: ; 0x2c0c
 	ret
 ; 0x2c1c
 
-SwitchToMapDataBank:: ; 2c1c
+SwitchToMapAttributesBank:: ; 2c1c
 	ld a, [MapGroup]
 	ld b, a
 	ld a, [MapNumber]
 	ld c, a
-SwitchToAnyMapDataBank:: ; 2c24
-	call GetAnyMapDataBank
+SwitchToAnyMapAttributesBank:: ; 2c24
+	call GetAnyMapAttributesBank
 	rst Bankswitch
 	ret
 ; 2c29
 
-GetMapDataBank:: ; 2c29
+GetMapAttributesBank:: ; 2c29
 	ld a, [MapGroup]
 	ld b, a
 	ld a, [MapNumber]
 	ld c, a
-GetAnyMapDataBank:: ; 2c31
+GetAnyMapAttributesBank:: ; 2c31
 	push hl
 	push de
-	ld de, MAPDEF_MAPDATA_BANK
-	call GetAnyMapDefField
+	ld de, MAP_MAPATTRIBUTES_BANK
+	call GetAnyMapField
 	ld a, c
 	pop de
 	pop hl
 	ret
 ; 2c3d
 
-PartialCopyMapDef:: ; 2c3d
+CopyMapPartial:: ; 2c3d
 ; Copy map data bank, tileset, environment, and map data address
-; from the current map's map_def.
+; from the current map's entry within its group.
 	ld a, [hROMBank]
 	push af
 	ld a, BANK(MapGroupPointers)
 	rst Bankswitch
 
-	call GetMapDefPointer
-	ld de, wPartialMapDef
-	ld bc, wPartialMapDefEnd - wPartialMapDef
+	call GetMapPointer
+	ld de, wMapPartial
+	ld bc, wMapPartialEnd - wMapPartial
 	call CopyBytes
 
 	pop af
@@ -2198,18 +2198,18 @@ GetAnyMapBlocksBank:: ; 2c5b
 	push bc
 
 	push bc
-	ld de, MAPDEF_MAPDATA
-	call GetAnyMapDefField
+	ld de, MAP_MAPATTRIBUTES
+	call GetAnyMapField
 	ld l, c
 	ld h, b
 	pop bc
 
 	push hl
-	ld de, MAPDEF_MAPDATA_BANK
-	call GetAnyMapDefField
+	ld de, MAP_MAPATTRIBUTES_BANK
+	call GetAnyMapField
 	pop hl
 
-	ld de, MAPDEF_MAPDATA ; blockdata bank
+	ld de, MAP_MAPATTRIBUTES ; blockdata bank
 	add hl, de
 	ld a, c
 	call GetFarByte
@@ -2221,12 +2221,12 @@ GetAnyMapBlocksBank:: ; 2c5b
 	ret
 ; 2c7d
 
-GetMapDataPointer:: ; 0x2c7d
+GetMapAttributesPointer:: ; 0x2c7d
 ; returns the current map's data pointer in hl.
 	push bc
 	push de
-	ld de, MAPDEF_MAPDATA
-	call GetMapDefField
+	ld de, MAP_MAPATTRIBUTES
+	call GetMapField
 	ld l, c
 	ld h, b
 	pop de
@@ -2238,8 +2238,8 @@ GetMapEnvironment:: ; 2c8a
 	push hl
 	push de
 	push bc
-	ld de, MAPDEF_ENVIRONMENT
-	call GetMapDefField
+	ld de, MAP_ENVIRONMENT
+	call GetMapField
 	ld a, c
 	pop bc
 	pop de
@@ -2254,8 +2254,8 @@ GetAnyMapEnvironment:: ; 2c99
 	push hl
 	push de
 	push bc
-	ld de, MAPDEF_ENVIRONMENT
-	call GetAnyMapDefField
+	ld de, MAP_ENVIRONMENT
+	call GetAnyMapField
 	ld a, c
 	pop bc
 	pop de
@@ -2264,8 +2264,8 @@ GetAnyMapEnvironment:: ; 2c99
 ; 2ca7
 
 GetAnyMapTileset:: ; 2ca7
-	ld de, MAPDEF_TILESET
-	call GetAnyMapDefField
+	ld de, MAP_TILESET
+	call GetAnyMapField
 	ld a, c
 	ret
 ; 2caf
@@ -2276,8 +2276,8 @@ GetWorldMapLocation:: ; 0x2caf
 	push de
 	push bc
 
-	ld de, MAPDEF_LOCATION
-	call GetAnyMapDefField
+	ld de, MAP_LOCATION
+	call GetAnyMapField
 	ld a, c
 
 	pop bc
@@ -2289,8 +2289,8 @@ GetWorldMapLocation:: ; 0x2caf
 GetMapMusic:: ; 2cbd
 	push hl
 	push bc
-	ld de, MAPDEF_MUSIC
-	call GetMapDefField
+	ld de, MAP_MUSIC
+	call GetMapField
 	ld a, c
 	cp MUSIC_MAHOGANY_MART
 	jr z, .mahoganymart
@@ -2348,8 +2348,8 @@ GetPhoneServiceTimeOfDayByte:: ; 2d0d
 	push hl
 	push bc
 
-	ld de, MAPDEF_PALETTE
-	call GetMapDefField
+	ld de, MAP_PALETTE
+	call GetMapField
 	ld a, c
 
 	pop bc
@@ -2362,8 +2362,8 @@ GetFishingGroup:: ; 2d19
 	push hl
 	push bc
 
-	ld de, MAPDEF_FISHGROUP
-	call GetMapDefField
+	ld de, MAP_FISHGROUP
+	call GetMapField
 	ld a, c
 
 	pop bc
diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm
index 593d5e6ba..6f6d1992d 100644
--- a/macros/scripts/events.asm
+++ b/macros/scripts/events.asm
@@ -110,13 +110,13 @@ ENDM
 	enum checkmapscene_command ; $11
 checkmapscene: MACRO
 	db checkmapscene_command
-	map \1 ; map
+	map_id \1 ; map
 ENDM
 
 	enum setmapscene_command ; $12
 setmapscene: MACRO
 	db setmapscene_command
-	map \1 ; map
+	map_id \1 ; map
 	db \2 ; scene_id
 ENDM
 
@@ -385,19 +385,19 @@ ENDM
 warpmod: MACRO
 	db warpmod_command
 	db \1 ; warp_id
-	map \2 ; map
+	map_id \2 ; map
 ENDM
 
 	enum blackoutmod_command ; $3b
 blackoutmod: MACRO
 	db blackoutmod_command
-	map \1 ; map
+	map_id \1 ; map
 ENDM
 
 	enum warp_command ; $3c
 warp: MACRO
 	db warp_command
-	map \1 ; map
+	map_id \1 ; map
 	db \2 ; x
 	db \3 ; y
 ENDM
@@ -1002,7 +1002,7 @@ ENDM
 swarm: MACRO
 	db swarm_command
 	db \1 ; flag
-	map \2 ; map
+	map_id \2 ; map
 ENDM
 
 	enum halloffame_command ; $a1
@@ -1019,7 +1019,7 @@ ENDM
 warpfacing: MACRO
 	db warpfacing_command
 	db \1 ; facing
-	map \2 ; map
+	map_id \2 ; map
 	db \3 ; x
 	db \4 ; y
 ENDM
diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm
index 7d06a620f..3be893a6f 100644
--- a/macros/scripts/maps.asm
+++ b/macros/scripts/maps.asm
@@ -1,4 +1,4 @@
-map: MACRO
+map_id: MACRO
 ;\1: map id
 	db GROUP_\1, MAP_\1
 ENDM
@@ -22,7 +22,7 @@ warp_event: MACRO
 ;\3: map id: from constants/map_constants.asm
 ;\4: warp destination: starts at 1
 	db \2, \1, \4
-	map \3
+	map_id \3
 ENDM
 
 coord_event: MACRO
@@ -110,7 +110,7 @@ elevfloor: MACRO
 ;\2: warp destination: starts at 1
 ;\3: map id
 	db \1, \2
-	map \3
+	map_id \3
 ENDM
 
 conditional_event: MACRO
diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm
index 059a0b405..c6ee2b243 100644
--- a/mobile/mobile_22_2.asm
+++ b/mobile/mobile_22_2.asm
@@ -2,7 +2,7 @@ Function8b342:: ; 8b342
 ; Loads the map data pointer, then runs through a
 ; dw with three dummy functions. Spends a lot of energy
 ; doing pretty much nothing.
-	call GetMapDataPointer
+	call GetMapAttributesPointer
 	ld d, h
 	ld e, l
 
diff --git a/wram.asm b/wram.asm
index e430fe7a5..1372378ee 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1992,14 +1992,14 @@ wOverworldMapAnchor:: dw ; d194
 wMetatileStandingY:: db ; d196
 wMetatileStandingX:: db ; d197
 
-wPartialMapDef::
-wMapDataBank:: db ; d198
+wMapPartial::
+wMapAttributesBank:: db ; d198
 wTileset:: db ; d199
 wEnvironment:: db ; d19a
-wMapDataPointer:: dw ; d19b
-wPartialMapDefEnd::
+wMapAttributesPointer:: dw ; d19b
+wMapPartialEnd::
 
-wMapData:: ; d19d
+wMapAttributes:: ; d19d
 MapBorderBlock:: db ; d19d
 ; width/height are in blocks (2x2 walkable tiles, 4x4 graphics tiles)
 MapHeight:: db ; d19e
@@ -2011,7 +2011,7 @@ MapScriptsPointer:: dw ; d1a4
 MapEventsPointer:: dw ; d1a6
 ; bit set
 MapConnections:: db ; d1a8
-wMapDataEnd::
+wMapAttributesEnd::
 
 NorthMapConnection:: map_connection_struct North ; d1a9
 SouthMapConnection:: map_connection_struct South ; d1b5

From 271aa20b73f699819351e787c58d0d14694eb135 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sat, 3 Feb 2018 20:40:21 -0500
Subject: [PATCH 107/135] Keep documentation in sync with new WRAM labels

---
 docs/bugs_and_glitches.md         | 266 ++++++++--------
 docs/design_flaws.md              | 504 ++++++++++++++++++++++--------
 engine/battle/anim_hp_bar.asm     |   5 +-
 engine/battle/effect_commands.asm |   4 +-
 engine/battle_anims/functions.asm |  44 ++-
 engine/breeding.asm               |   2 -
 engine/item_effects.asm           |   6 +-
 engine/load_pics.asm              |   3 -
 engine/pokedex/pokedex_2.asm      |   2 +-
 engine/radio.asm                  |   2 +-
 engine/routines/sine.asm          |   4 +-
 11 files changed, 557 insertions(+), 285 deletions(-)

diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index d79f386a8..61fc4d63c 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -164,12 +164,12 @@ BattleCommand_BellyDrum: ; 37c1a
 ; before checking that it has enough HP to use the move.
 ; Swap the order of these two blocks to fix.
 	call BattleCommand_AttackUp2
-	ld a, [AttackMissed]
+	ld a, [wAttackMissed]
 	and a
 	jr nz, .failed
 
-	callab GetHalfMaxHP
-	callab CheckUserHasEnoughHP
+	callfar GetHalfMaxHP
+	callfar CheckUserHasEnoughHP
 	jr nc, .failed
 ```
 
@@ -178,12 +178,12 @@ BattleCommand_BellyDrum: ; 37c1a
 ```asm
 BattleCommand_BellyDrum: ; 37c1a
 ; bellydrum
-	callab GetHalfMaxHP
-	callab CheckUserHasEnoughHP
+	callfar GetHalfMaxHP
+	callfar CheckUserHasEnoughHP
 	jr nc, .failed
 
 	call BattleCommand_AttackUp2
-	ld a, [AttackMissed]
+	ld a, [wAttackMissed]
 	and a
 	jr nz, .failed
 ```
@@ -256,8 +256,7 @@ This is a bug with `CheckPlayerHasUsableMoves` in [engine/battle/core.asm](/engi
 ```asm
 .done
 	; Bug: this will result in a move with PP Up confusing the game.
-	; Replace with "and $3f" to fix.
-	and a
+	and a ; should be "and PP_MASK"
 	ret nz
 
 .force_struggle
@@ -269,7 +268,7 @@ This is a bug with `CheckPlayerHasUsableMoves` in [engine/battle/core.asm](/engi
 	ret
 ```
 
-**Fix:** Change `and a` to `and $3f`.
+**Fix:** Change `and a` to `and PP_MASK`.
 
 
 ## A Pokémon that fainted from Pursuit will have its old status condition when revived
@@ -312,7 +311,7 @@ This is a bug with `BattleCommand_BeatUp` in [engine/battle/move_effects/beat_up
 ```asm
 .got_mon
 	ld a, [wd002]
-	ld hl, PartyMonNicknames
+	ld hl, wPartyMonNicknames
 	call GetNick
 	ld a, MON_HP
 	call GetBeatupMonLocation
@@ -321,11 +320,11 @@ This is a bug with `BattleCommand_BeatUp` in [engine/battle/move_effects/beat_up
 	jp z, .beatup_fail ; fainted
 	ld a, [wd002]
 	ld c, a
-	ld a, [CurBattleMon]
+	ld a, [wCurBattleMon]
 	; BUG: this can desynchronize link battles
 	; Change "cp [hl]" to "cp c" to fix
 	cp [hl]
-	ld hl, BattleMonStatus
+	ld hl, wBattleMonStatus
 	jr z, .active_mon
 	ld a, MON_STATUS
 	call GetBeatupMonLocation
@@ -391,13 +390,13 @@ This is a bug with `AI_Smart_MeanLook` in [engine/battle/ai/scoring.asm](/engine
 
 ```asm
 ; 80% chance to greatly encourage this move if the enemy is badly poisoned (buggy).
-; Should check PlayerSubStatus5 instead.
-	ld a, [EnemySubStatus5]
+; Should check wPlayerSubStatus5 instead.
+	ld a, [wEnemySubStatus5]
 	bit SUBSTATUS_TOXIC, a
 	jr nz, .asm_38e26
 ```
 
-**Fix:** Change `EnemySubStatus5` to `PlayerSubStatus5`.
+**Fix:** Change `wEnemySubStatus5` to `wPlayerSubStatus5`.
 
 
 ## AI makes a false assumption about `CheckTypeMatchup`
@@ -406,11 +405,11 @@ In [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm):
 
 ```asm
 BattleCheckTypeMatchup: ; 347c8
-	ld hl, EnemyMonType1
+	ld hl, wEnemyMonType1
 	ld a, [hBattleTurn]
 	and a
 	jr z, CheckTypeMatchup
-	ld hl, BattleMonType1
+	ld hl, wBattleMonType1
 CheckTypeMatchup: ; 347d3
 ; There is an incorrect assumption about this function made in the AI related code: when
 ; the AI calls CheckTypeMatchup (not BattleCheckTypeMatchup), it assumes that placing the
@@ -437,24 +436,24 @@ This is a bug with `AI_HealStatus` in [engine/battle/ai/items.asm](/engine/battl
 
 ```asm
 AI_HealStatus: ; 384e0
-	ld a, [CurOTMon]
-	ld hl, OTPartyMon1Status
+	ld a, [wCurOTMon]
+	ld hl, wOTPartyMon1Status
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	xor a
 	ld [hl], a
-	ld [EnemyMonStatus], a
+	ld [wEnemyMonStatus], a
 	; Bug: this should reset SUBSTATUS_NIGHTMARE too
 	; Uncomment the lines below to fix
-	; ld hl, EnemySubStatus1
+	; ld hl, wEnemySubStatus1
 	; res SUBSTATUS_NIGHTMARE, [hl]
-	ld hl, EnemySubStatus5
+	ld hl, wEnemySubStatus5
 	res SUBSTATUS_TOXIC, [hl]
 	ret
 ; 384f7
 ```
 
-**Fix:** Uncomment `ld hl, EnemySubStatus1` and `res SUBSTATUS_NIGHTMARE, [hl]`.
+**Fix:** Uncomment `ld hl, wEnemySubStatus1` and `res SUBSTATUS_NIGHTMARE, [hl]`.
 
 
 ## HP bar animation is slow for high HP
@@ -493,11 +492,12 @@ This is a bug with `ShortHPBar_CalcPixelFrame` in [engine/anim_hp_bar.asm](/engi
 
 ```asm
 	ld b, 0
-; This routine is buggy. If [wCurHPAnimMaxHP] * [wCurHPBarPixels] is divisible
-; by 48, the loop runs one extra time. To fix, uncomment the line below.
+; This routine is buggy. If [wCurHPAnimMaxHP] * [wCurHPBarPixels] is
+; divisible by HP_BAR_LENGTH_PX, the loop runs one extra time.
+; To fix, uncomment the line below.
 .loop
 	ld a, l
-	sub 6 * 8
+	sub HP_BAR_LENGTH_PX
 	ld l, a
 	ld a, h
 	sbc $0
@@ -517,12 +517,12 @@ This is a bug with `ShortHPBar_CalcPixelFrame` in [engine/anim_hp_bar.asm](/engi
 
 This can bring Pokémon straight from level 1 to 100 by gaining just a few experience points.
 
-This is a bug with `CalcExpAtLevel` in [main.asm](/main.asm):
+This is a bug with `CalcExpAtLevel` in [engine/experience.asm](/engine/experience.asm):
 
 ```asm
 CalcExpAtLevel: ; 50e47
 ; (a/b)*n**3 + c*n**2 + d*n - e
-	ld a, [BaseGrowthRate]
+	ld a, [wBaseGrowthRate]
 	add a
 	add a
 	ld c, a
@@ -549,7 +549,7 @@ CalcExpAtLevel: ; 50e47
 	ret
 
 .UseExpFormula
-	ld a, [BaseGrowthRate]
+	ld a, [wBaseGrowthRate]
 	add a
 	add a
 	ld c, a
@@ -563,45 +563,44 @@ CalcExpAtLevel: ; 50e47
 
 ([Video](https://www.youtube.com/watch?v=o54VjpAEoO8))
 
-This is a bug with `Text_ABoostedStringBuffer2ExpPoints` and `Text_StringBuffer2ExpPoints` in [text/common_2.asm](/text/common_2.asm):
+This is a bug with `Text_ABoostedStringBuffer2ExpPoints` and `Text_StringBuffer2ExpPoints` in [data/text/common_2.asm](/data/text/common_2.asm):
 
 ```asm
 Text_ABoostedStringBuffer2ExpPoints::
 	text_start
 	line "a boosted"
 	cont "@"
-	deciram StringBuffer2, 2, 4
+	deciram wStringBuffer2, 2, 4
 	text " EXP. Points!"
 	prompt
 
 Text_StringBuffer2ExpPoints::
 	text_start
 	line "@"
-	deciram StringBuffer2, 2, 4
+	deciram wStringBuffer2, 2, 4
 	text " EXP. Points!"
 	prompt
 ```
 
-**Fix:** Change both `deciram StringBuffer2, 2, 4` to `deciram StringBuffer2, 2, 5`.
+**Fix:** Change both `deciram wStringBuffer2, 2, 4` to `deciram wStringBuffer2, 2, 5`.
 
 
 ## BRN/PSN/PAR do not affect catch rate
 
-This is a bug with `PokeBall` in [items/item_effects.asm](/items/item_effects.asm):
+This is a bug with `PokeBall` in [engine/item_effects.asm](/engine/item_effects.asm):
 
 ```asm
-.statuscheck
 ; This routine is buggy. It was intended that SLP and FRZ provide a higher
 ; catch rate than BRN/PSN/PAR, which in turn provide a higher catch rate than
 ; no status effect at all. But instead, it makes BRN/PSN/PAR provide no
 ; benefit.
 ; Uncomment the line below to fix this.
 	ld b, a
-	ld a, [EnemyMonStatus]
+	ld a, [wEnemyMonStatus]
 	and 1 << FRZ | SLP
 	ld c, 10
 	jr nz, .addstatus
-	; ld a, [EnemyMonStatus]
+	; ld a, [wEnemyMonStatus]
 	and a
 	ld c, 5
 	jr nz, .addstatus
@@ -614,7 +613,7 @@ This is a bug with `PokeBall` in [items/item_effects.asm](/items/item_effects.as
 .max_1
 ```
 
-**Fix:** Uncomment `ld a, [EnemyMonStatus]`.
+**Fix:** Uncomment `ld a, [wEnemyMonStatus]`.
 
 
 ## Moon Ball does not boost catch rate
@@ -695,7 +694,7 @@ FastBallMultiplier:
 
 *Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
 
-This is a bug with `ItemAttributes` in [items/attributes.asm](/items/attributes.asm):
+This is a bug with `ItemAttributes` in [data/items/attributes.asm](/data/items/attributes.asm):
 
 ```asm
 ; DRAGON FANG
@@ -733,7 +732,7 @@ This is a bug with `HaircutOrGrooming` in [engine/events/special.asm](/engine/ev
 .ok
 	inc hl
 	ld a, [hli]
-	ld [ScriptVar], a
+	ld [wScriptVar], a
 	ld c, [hl]
 	call ChangeHappiness
 	ret
@@ -743,8 +742,8 @@ This is a bug with `HaircutOrGrooming` in [engine/events/special.asm](/engine/ev
 INCLUDE "data/events/happiness_chances.asm"
 
 CopyPokemonName_Buffer1_Buffer3: ; 746e
-	ld hl, StringBuffer1
-	ld de, StringBuffer3
+	ld hl, wStringBuffer1
+	ld de, wStringBuffer3
 	ld bc, MON_NAME_LENGTH
 	jp CopyBytes
 ```
@@ -771,19 +770,23 @@ This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [engine/battle/core.asm](
 
 ```asm
 .CheckMagikarpArea:
-; The z checks are supposed to be nz
-; Instead, all maps in GROUP_LAKE_OF_RAGE (mahogany area)
-; and routes 20 and 44 are treated as Lake of Rage
+; The "jr z" checks are supposed to be "jr nz".
+
+; Instead, all maps in GROUP_LAKE_OF_RAGE (Mahogany area)
+; and Routes 20 and 44 are treated as Lake of Rage.
 
 ; This also means Lake of Rage Magikarp can be smaller than ones
-; caught elsewhere rather than the other way around
+; caught elsewhere rather than the other way around.
 
-; Intended behavior enforces a minimum size at Lake of Rage
-; The real behavior prevents size flooring in the Lake of Rage area
-	ld a, [MapGroup]
+; Intended behavior enforces a minimum size at Lake of Rage.
+; The real behavior prevents a minimum size in the Lake of Rage area.
+
+; Moreover, due to the check not being translated to feet+inches, all Magikarp
+; smaller than 4'0" may be caught by the filter, a lot more than intended.
+	ld a, [wMapGroup]
 	cp GROUP_LAKE_OF_RAGE
 	jr z, .Happiness
-	ld a, [MapNumber]
+	ld a, [wMapNumber]
 	cp MAP_LAKE_OF_RAGE
 	jr z, .Happiness
 ```
@@ -797,31 +800,31 @@ This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [engine/battle/core.asm](
 
 ```asm
 ; Get Magikarp's length
-	ld de, EnemyMonDVs
-	ld bc, PlayerID
+	ld de, wEnemyMonDVs
+	ld bc, wPlayerID
 	callfar CalcMagikarpLength
 
-; No reason to keep going if length > 1536 (i.e. if length / 256 != 6)
+; No reason to keep going if length > 1536 mm (i.e. if HIGH(length) > 6 feet)
 	ld a, [wMagikarpLength]
-	cp HIGH(1536) ; this compares to 6'0'', should be cp 5
+	cp HIGH(1536) ; should be "cp 5", since 1536 mm = 5'0", but HIGH(1536) = 6
 	jr nz, .CheckMagikarpArea
 
 ; 5% chance of skipping both size checks
 	call Random
 	cp 5 percent
 	jr c, .CheckMagikarpArea
-; Try again if length > 1615
+; Try again if length >= 1616 mm (i.e. if LOW(length) >= 3 inches)
 	ld a, [wMagikarpLength + 1]
-	cp LOW(1616) ; this compares to 6'80'', should be cp 3
+	cp LOW(1616) ; should be "cp 3", since 1616 mm = 5'3", but LOW(1616) = 80
 	jr nc, .GenerateDVs
 
 ; 20% chance of skipping this check
 	call Random
 	cp 20 percent - 1
 	jr c, .CheckMagikarpArea
-; Try again if length > 1599
+; Try again if length >= 1600 mm (i.e. if LOW(length) >= 2 inches)
 	ld a, [wMagikarpLength + 1]
-	cp LOW(1600) ; this compares to 6'64'', should be cp 2
+	cp LOW(1600) ; should be "cp 2", since 1600 mm = 5'2", but LOW(1600) = 64
 	jr nc, .GenerateDVs
 ```
 
@@ -853,18 +856,18 @@ This is a bug with `CalcMagikarpLength.BCLessThanDE` in [engine/events/magikarp.
 
 ([Video](https://www.youtube.com/watch?v=eij_1060SMc))
 
-This is a bug with `StartTrainerBattle_DetermineWhichAnimation` in [engine/battle_start.asm](/engine/battle_start.asm):
+This is a bug with `StartTrainerBattle_DetermineWhichAnimation` in [engine/battle/battle_transition.asm](/engine/battle/battle_transition.asm):
 
 ```asm
 StartTrainerBattle_DetermineWhichAnimation: ; 8c365 (23:4365)
 ; The screen flashes a different number of times depending on the level of
 ; your lead Pokemon relative to the opponent's.
-; BUG: BattleMonLevel and EnemyMonLevel are not set at this point, so whatever
+; BUG: wBattleMonLevel and wEnemyMonLevel are not set at this point, so whatever
 ; values happen to be there will determine the animation.
 	ld de, 0
-	ld a, [BattleMonLevel]
+	ld a, [wBattleMonLevel]
 	add 3
-	ld hl, EnemyMonLevel
+	ld hl, wEnemyMonLevel
 	cp [hl]
 	jr nc, .okay
 	set 0, e
@@ -905,7 +908,7 @@ This is a bug with `Slots_PayoutAnim` in [engine/slot_machine.asm](/engine/slot_
 	ld [hl], e
 	dec hl
 	ld [hl], d
-	ld a, [wcf64]
+	ld a, [wSlotsDelay]
 	and $7
 	ret z ; ret nz would be more appropriate
 	ld de, SFX_GET_COIN_FROM_SLOTS
@@ -918,10 +921,10 @@ This is a bug with `Slots_PayoutAnim` in [engine/slot_machine.asm](/engine/slot_
 
 ## Team Rocket battle music is not used for Executives or Scientists
 
-This is a bug with `PlayBattleMusic` in [main.asm](/main.asm):
+This is a bug with `PlayBattleMusic` in [engine/battle/start_battle.asm](/engine/battle/start_battle.asm):
 
 ```asm
-	; really, they should have included admins and scientists here too...
+	; They should have included EXECUTIVEM, EXECUTIVEF, and SCIENTIST too...
 	ld de, MUSIC_ROCKET_BATTLE
 	cp GRUNTM
 	jr z, .done
@@ -956,20 +959,20 @@ This is a bug with `DoPlayerMovement.CheckWarp` in [engine/player_movement.asm](
 ; This causes wd041 to be nonzero when standing on tile $3e,
 ; making bumps silent.
 
-	ld a, [WalkingDirection]
+	ld a, [wWalkingDirection]
 	; cp STANDING
 	; jr z, .not_warp
 	ld e, a
 	ld d, 0
 	ld hl, .EdgeWarps
 	add hl, de
-	ld a, [PlayerStandingTile]
+	ld a, [wPlayerStandingTile]
 	cp [hl]
 	jr nz, .not_warp
 
 	ld a, 1
 	ld [wd041], a
-	ld a, [WalkingDirection]
+	ld a, [wWalkingDirection]
 	; This is in the wrong place.
 	cp STANDING
 	jr z, .not_warp
@@ -978,20 +981,20 @@ This is a bug with `DoPlayerMovement.CheckWarp` in [engine/player_movement.asm](
 **Fix:**
 
 ```asm
-	ld a, [WalkingDirection]
+	ld a, [wWalkingDirection]
 	cp STANDING
 	jr z, .not_warp
 	ld e, a
 	ld d, 0
 	ld hl, .EdgeWarps
 	add hl, de
-	ld a, [PlayerStandingTile]
+	ld a, [wPlayerStandingTile]
 	cp [hl]
 	jr nz, .not_warp
 
 	ld a, 1
 	ld [wd041], a
-	ld a, [WalkingDirection]
+	ld a, [wWalkingDirection]
 ```
 
 
@@ -1051,7 +1054,7 @@ This bug prevents you from using blocksets with more than 128 blocks.
 In [home/map.asm](/home/map.asm):
 
 ```asm
-	; Set hl to the address of the current metatile data ([TilesetBlocksAddress] + (a) tiles).
+	; Set hl to the address of the current metatile data ([wTilesetBlocksAddress] + (a) tiles).
 	; This is buggy; it wraps around past 128 blocks.
 	; To fix, uncomment the line below.
 	add a ; Comment or delete this line to fix the above bug.
@@ -1061,10 +1064,10 @@ In [home/map.asm](/home/map.asm):
 	add hl, hl
 	add hl, hl
 	add hl, hl
-	ld a, [TilesetBlocksAddress]
+	ld a, [wTilesetBlocksAddress]
 	add l
 	ld l, a
-	ld a, [TilesetBlocksAddress + 1]
+	ld a, [wTilesetBlocksAddress + 1]
 	adc h
 	ld h, a
 ```
@@ -1081,7 +1084,7 @@ In [home/map.asm](/home/map.asm):
 
 ## `Function6ec1` does not correctly limit object movement
 
-This bug is why the Lapras in Union Cave, which uses `SPRITEMOVEDATA_SWIM_WANDER`, is not restricted by its `1, 1` movement radius.
+This bug is why the Lapras in [maps/UnionCaveB2F.asm](/maps/UnionCaveB2F.asm), which uses `SPRITEMOVEDATA_SWIM_WANDER`, is not restricted by its `1, 1` movement radius.
 
 In [engine/npc_movement.asm](/engine/npc_movement.asm):
 
@@ -1108,7 +1111,7 @@ In [engine/search.asm](/engine/search.asm):
 ; This only checks five characters, which is fine for the Japanese version,
 ; but in the English version the player name is 7 characters, so this is wrong.
 
-	ld hl, PlayerName
+	ld hl, wPlayerName
 
 rept NAME_LENGTH_JAPANESE + -2 ; should be PLAYER_NAME_LENGTH + -2
 	ld a, [de]
@@ -1123,13 +1126,6 @@ endr
 	ld a, [de]
 	cp [hl]
 	jr z, .found
-
-.notfound
-	pop de
-	pop hl
-	pop bc
-	and a
-	ret
 ```
 
 **Fix:** Change `rept NAME_LENGTH_JAPANESE + -2` to `rept PLAYER_NAME_LENGTH + -2`.
@@ -1139,49 +1135,49 @@ endr
 
 This bug can affect Mew or Pokémon other than Ditto that used Transform via Mirror Move or Sketch.
 
-This is a bug with `PokeBall` in [items/item_effects.asm](/items/item_effects.asm):
+This is a bug with `PokeBall` in [engine/item_effects.asm](/engine/item_effects.asm):
 
 ```asm
-	ld hl, EnemySubStatus5
+	ld hl, wEnemySubStatus5
 	ld a, [hl]
 	push af
 	set SUBSTATUS_TRANSFORMED, [hl]
 
 ; This code is buggy. Any wild Pokémon that has Transformed will be
 ; caught as a Ditto, even if it was something else like Mew.
-; To fix, do not set [TempEnemyMonSpecies] to DITTO.
+; To fix, do not set [wTempEnemyMonSpecies] to DITTO.
 	bit SUBSTATUS_TRANSFORMED, a
 	jr nz, .ditto
 	jr .not_ditto
 
 .ditto
 	ld a, DITTO
-	ld [TempEnemyMonSpecies], a
+	ld [wTempEnemyMonSpecies], a
 	jr .load_data
 
 .not_ditto
 	set SUBSTATUS_TRANSFORMED, [hl]
 	ld hl, wEnemyBackupDVs
-	ld a, [EnemyMonDVs]
+	ld a, [wEnemyMonDVs]
 	ld [hli], a
-	ld a, [EnemyMonDVs + 1]
+	ld a, [wEnemyMonDVs + 1]
 	ld [hl], a
 
 .load_data
-	ld a, [TempEnemyMonSpecies]
-	ld [CurPartySpecies], a
-	ld a, [EnemyMonLevel]
-	ld [CurPartyLevel], a
-	callba LoadEnemyMon
+	ld a, [wTempEnemyMonSpecies]
+	ld [wCurPartySpecies], a
+	ld a, [wEnemyMonLevel]
+	ld [wCurPartyLevel], a
+	farcall LoadEnemyMon
 
 	pop af
-	ld [EnemySubStatus5], a
+	ld [wEnemySubStatus5], a
 ```
 
 **Fix:** 
 
 ```asm
-	ld hl, EnemySubStatus5
+	ld hl, wEnemySubStatus5
 	ld a, [hl]
 	push af
 	set SUBSTATUS_TRANSFORMED, [hl]
@@ -1190,20 +1186,20 @@ This is a bug with `PokeBall` in [items/item_effects.asm](/items/item_effects.as
 	jr nz, .load_data
 
 	ld hl, wEnemyBackupDVs
-	ld a, [EnemyMonDVs]
+	ld a, [wEnemyMonDVs]
 	ld [hli], a
-	ld a, [EnemyMonDVs + 1]
+	ld a, [wEnemyMonDVs + 1]
 	ld [hl], a
 
 .load_data
-	ld a, [TempEnemyMonSpecies]
-	ld [CurPartySpecies], a
-	ld a, [EnemyMonLevel]
-	ld [CurPartyLevel], a
-	callba LoadEnemyMon
+	ld a, [wTempEnemyMonSpecies]
+	ld [wCurPartySpecies], a
+	ld a, [wEnemyMonLevel]
+	ld [wCurPartyLevel], a
+	farcall LoadEnemyMon
 
 	pop af
-	ld [EnemySubStatus5], a
+	ld [wEnemySubStatus5], a
 ```
 
 
@@ -1211,13 +1207,13 @@ This is a bug with `PokeBall` in [items/item_effects.asm](/items/item_effects.as
 
 ([Video](https://www.youtube.com/watch?v=v1ErZdLCIyU))
 
-This is a bug with `ParkBall` in [items/item_effects.asm](/items/item_effects.asm):
+This is a bug with `ParkBall` in [engine/item_effects.asm](/engine/item_effects.asm):
 
 ```asm
 .room_in_party
 	xor a
 	ld [wWildMon], a
-	ld a, [CurItem]
+	ld a, [wCurItem]
 	cp PARK_BALL
 	call nz, ReturnToBattle_UseBall
 ```
@@ -1228,7 +1224,7 @@ This is a bug with `ParkBall` in [items/item_effects.asm](/items/item_effects.as
 .room_in_party
 	xor a
 	ld [wWildMon], a
-	ld a, [BattleType]
+	ld a, [wBattleType]
 	cp BATTLETYPE_CONTEST
 	call nz, ReturnToBattle_UseBall
 ```
@@ -1236,23 +1232,26 @@ This is a bug with `ParkBall` in [items/item_effects.asm](/items/item_effects.as
 
 ## `HELD_CATCH_CHANCE` has no effect
 
-This is a bug with `PokeBall` in [items/item_effects.asm](/items/item_effects.asm):
+This is a bug with `PokeBall` in [engine/item_effects.asm](/engine/item_effects.asm):
 
 ```asm
-	; BUG: callba overwrites a,
-	; and GetItemHeldEffect takes b anyway.
-
-	; This is probably the reason
-	; the HELD_CATCH_CHANCE effect
-	; is never used.
-
+	; BUG: farcall overwrites a, and GetItemHeldEffect takes b anyway.
+	; This is probably the reason the HELD_CATCH_CHANCE effect is never used.
 	; Uncomment the line below to fix.
-
-	ld a, [BattleMonItem]
-;	ld b, a
-	callba GetItemHeldEffect
+	ld d, a
+	push de
+	ld a, [wBattleMonItem]
+	; ld b, a
+	farcall GetItemHeldEffect
 	ld a, b
 	cp HELD_CATCH_CHANCE
+	pop de
+	ld a, d
+	jr nz, .max_2
+	add c
+	jr nc, .max_2
+	ld a, $ff
+.max_2
 ```
 
 **Fix:** Uncomment `ld b, a`.
@@ -1264,21 +1263,21 @@ This is a bug with `PlacePartyMonEvoStoneCompatibility.DetermineCompatibility` i
 
 ```asm
 .DetermineCompatibility: ; 50268
-	ld de, StringBuffer1
+	ld de, wStringBuffer1
 	ld a, BANK(EvosAttacksPointers)
 	ld bc, 2
 	call FarCopyBytes
-	ld hl, StringBuffer1
+	ld hl, wStringBuffer1
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld de, StringBuffer1
+	ld de, wStringBuffer1
 	ld a, BANK(EvosAttacks)
 	ld bc, 10
 	call FarCopyBytes
 ```
 
-**Fix:** Change `ld bc, 10` to `ld bc, StringBuffer2 - StringBuffer1` to support up to six Stone entries.
+**Fix:** Change `ld bc, 10` to `ld bc, wStringBuffer2 - wStringBuffer1` to support up to six Stone entries.
 
 
 ## `ScriptCall` can overflow `wScriptStack` and crash
@@ -1290,7 +1289,7 @@ ScriptCall:
 ; Bug: The script stack has a capacity of 5 scripts, yet there is
 ; nothing to stop you from pushing a sixth script.  The high part
 ; of the script address can then be overwritten by modifications
-; to ScriptDelay, causing the script to return to the rst/interrupt
+; to wScriptDelay, causing the script to return to the rst/interrupt
 ; space.
 
 	push de
@@ -1303,18 +1302,18 @@ ScriptCall:
 	add hl, de
 	add hl, de
 	pop de
-	ld a, [ScriptBank]
+	ld a, [wScriptBank]
 	ld [hli], a
-	ld a, [ScriptPos]
+	ld a, [wScriptPos]
 	ld [hli], a
-	ld a, [ScriptPos + 1]
+	ld a, [wScriptPos + 1]
 	ld [hl], a
 	ld a, b
-	ld [ScriptBank], a
+	ld [wScriptBank], a
 	ld a, e
-	ld [ScriptPos], a
+	ld [wScriptPos], a
 	ld a, d
-	ld [ScriptPos + 1], a
+	ld [wScriptPos + 1], a
 	ret
 ```
 
@@ -1330,7 +1329,7 @@ LoadSpriteGFX: ; 14306
 ; Bug: b is not preserved, so it's useless as a next count.
 ; Uncomment the lines below to fix.
 
-	ld hl, UsedSprites
+	ld hl, wUsedSprites
 	ld b, SPRITE_GFX_LIST_CAPACITY
 .loop
 	ld a, [hli]
@@ -1365,9 +1364,8 @@ In [engine/wildmons.asm](/engine/wildmons.asm):
 ```asm
 ChooseWildEncounter: ; 2a14f
 ...
-
 	ld a, b
-	ld [CurPartyLevel], a
+	ld [wCurPartyLevel], a
 	ld b, [hl]
 	; ld a, b
 	call ValidateTempWildMonSpecies
@@ -1387,7 +1385,7 @@ ValidateTempWildMonSpecies: ; 2a4a0
 
 ```asm
 	ld a, b
-	ld [CurPartyLevel], a
+	ld [wCurPartyLevel], a
 	ld b, [hl]
 	ld a, b
 	call ValidateTempWildMonSpecies
diff --git a/docs/design_flaws.md b/docs/design_flaws.md
index 7dc4d13db..613f90b0c 100644
--- a/docs/design_flaws.md
+++ b/docs/design_flaws.md
@@ -8,8 +8,9 @@ These are parts of the code that do not work *incorrectly*, like [bugs and glitc
 - [Pic banks are offset by `PICS_FIX`](#pic-banks-are-offset-by-pics_fix)
 - [`PokemonPicPointers` and `UnownPicPointers` are assumed to start at the same address](#pokemonpicpointers-and-unownpicpointers-are-assumed-to-start-at-the-same-address)
 - [Footprints are split into top and bottom halves](#footprints-are-split-into-top-and-bottom-halves)
-- [Pokédex entry banks are derived from their species IDs](#pokédex-entry-banks-are-derived-from-their-species-ids)
 - [`ITEM_C3` and `ITEM_DC` break up the continuous sequence of TM items](#item_c3-and-item_dc-break-up-the-continuous-sequence-of-tm-items)
+- [Pokédex entry banks are derived from their species IDs](#pokédex-entry-banks-are-derived-from-their-species-ids)
+- [Identical sine wave code and data is repeated five times](#identical-sine-wave-code-and-data-is-repeated-five-times)
 - [`GetForestTreeFrame` works, but it's still bad](#getforesttreeframe-works-but-its-still-bad)
 
 
@@ -109,15 +110,15 @@ ROMX $49
 Two routines in [engine/load_pics.asm](/engine/load_pics.asm) make this assumption; `GetFrontpicPointer`:
 
 ```asm
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	cp UNOWN
 	jr z, .unown
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	ld d, BANK(PokemonPicPointers)
 	jr .ok
 
 .unown
-	ld a, [UnownLetter]
+	ld a, [wUnownLetter]
 	ld d, BANK(UnownPicPointers)
 
 .ok
@@ -130,9 +131,7 @@ Two routines in [engine/load_pics.asm](/engine/load_pics.asm) make this assumpti
 And `GetMonBackpic`:
 
 ```asm
-	; These are assumed to be at the same
-	; address in their respective banks.
-	GLOBAL PokemonPicPointers,  UnownPicPointers
+	; These are assumed to be at the same address in their respective banks.
 	ld hl, PokemonPicPointers ; UnownPicPointers
 	ld a, b
 	ld d, BANK(PokemonPicPointers)
@@ -153,16 +152,16 @@ Don't enforce `org $4000` in pokecrystal.link.
 Modify `GetFrontpicPointer`:
 
 ```asm
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	cp UNOWN
 	jr z, .unown
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	ld hl, PokemonPicPointers
 	ld d, BANK(PokemonPicPointers)
 	jr .ok
 
 .unown
-	ld a, [UnownLetter]
+	ld a, [wUnownLetter]
 	ld hl, UnownPicPointers
 	ld d, BANK(UnownPicPointers)
 
@@ -175,7 +174,6 @@ Modify `GetFrontpicPointer`:
 And `GetMonBackpic`:
 
 ```asm
-	GLOBAL PokemonPicPointers, UnownPicPointers
 	ld a, b
 	ld hl, PokemonPicPointers
 	ld d, BANK(PokemonPicPointers)
@@ -234,7 +232,7 @@ INCBIN "gfx/footprints/wartortle.1bpp",  footprint_bottom
 	push hl
 	ld e, l
 	ld d, h
-	ld hl, VTiles2 tile $62
+	ld hl, vTiles2 tile $62
 	lb bc, BANK(Footprints), 2
 	call Request1bpp
 	pop hl
@@ -246,7 +244,7 @@ INCBIN "gfx/footprints/wartortle.1bpp",  footprint_bottom
 
 	ld e, l
 	ld d, h
-	ld hl, VTiles2 tile $64
+	ld hl, vTiles2 tile $64
 	lb bc, BANK(Footprints), 2
 	call Request1bpp
 ```
@@ -272,136 +270,28 @@ Modify `Pokedex_LoadAnyFootprint`:
 ```asm
 	ld e, l
 	ld d, h
-	ld hl, VTiles2 tile $62
+	ld hl, vTiles2 tile $62
 	lb bc, BANK(Footprints), 4
 	call Request1bpp
 ```
 
 
-## Pokédex entry banks are derived from their species IDs
-
-`PokedexDataPointerTable` in [data/pokemon/dex_entry_pointers.asm](/data/pokemon/dex_entry_pointers.asm) is a table of `dw`, not `dba`, yet there are four banks used for Pokédex entries. The correct bank is derived from the species ID at the beginning of each Pokémon's base stats. (This is the only use the base stat species ID has.)
-
-Three separate routines do the same derivation; `GetDexEntryPointer` in [engine/pokedex/pokedex_2.asm](/engine/pokedex/pokedex_2.asm):
-
-```asm
-GetDexEntryPointer: ; 44333
-; return dex entry pointer b:de
-	push hl
-	ld hl, PokedexDataPointerTable
-	ld a, b
-	dec a
-	ld d, 0
-	ld e, a
-	add hl, de
-	add hl, de
-	ld e, [hl]
-	inc hl
-	ld d, [hl]
-	push de
-	rlca
-	rlca
-	and $3
-	ld hl, .PokedexEntryBanks
-	ld d, 0
-	ld e, a
-	add hl, de
-	ld b, [hl]
-	pop de
-	pop hl
-	ret
-
-.PokedexEntryBanks: ; 44351
-
-GLOBAL PokedexEntries1
-GLOBAL PokedexEntries2
-GLOBAL PokedexEntries3
-GLOBAL PokedexEntries4
-
-	db BANK(PokedexEntries1)
-	db BANK(PokedexEntries2)
-	db BANK(PokedexEntries3)
-	db BANK(PokedexEntries4)
-```
-
-`GetPokedexEntryBank` in [engine/item_effects.asm](/engine/item_effects.asm):
-
-```asm
-GetPokedexEntryBank:
-	push hl
-	push de
-	ld a, [EnemyMonSpecies]
-	rlca
-	rlca
-	and 3
-	ld hl, .PokedexEntryBanks
-	ld d, 0
-	ld e, a
-	add hl, de
-	ld a, [hl]
-	pop de
-	pop hl
-	ret
-
-.PokedexEntryBanks:
-
-GLOBAL PokedexEntries1
-GLOBAL PokedexEntries2
-GLOBAL PokedexEntries3
-GLOBAL PokedexEntries4
-
-	db BANK(PokedexEntries1)
-	db BANK(PokedexEntries2)
-	db BANK(PokedexEntries3)
-	db BANK(PokedexEntries4)
-```
-
-And `PokedexShow_GetDexEntryBank` in [engine/radio.asm](/engine/radio.asm):
-
-```asm
-PokedexShow_GetDexEntryBank:
-	push hl
-	push de
-	ld a, [CurPartySpecies]
-	dec a
-	rlca
-	rlca
-	and 3
-	ld hl, .pokedexbanks
-	ld d, 0
-	ld e, a
-	add hl, de
-	ld a, [hl]
-	pop de
-	pop hl
-	ret
-
-.pokedexbanks
-	db BANK(PokedexEntries1)
-	db BANK(PokedexEntries2)
-	db BANK(PokedexEntries3)
-	db BANK(PokedexEntries4)
-```
-
-**Fix:** Use `dba` instead of `dw` in `PokedexDataPointerTable`, and modify the code that accesses it to match.
-
-
 ## `ITEM_C3` and `ITEM_DC` break up the continuous sequence of TM items
 
 [constants/item_constants.asm](/constants/item_constants.asm) defined the 50 TMs in order with `add_tm`, but `ITEM_C3` and `ITEM_DC` break up that sequence.
 
 ```asm
-	add_tm DYNAMICPUNCH ; $BF
+	add_tm DYNAMICPUNCH ; bf
 	...
-	add_tm ROLLOUT      ; $C2
-	const ITEM_C3       ; $C3
-	add_tm ROAR         ; $C4
+	add_tm ROLLOUT      ; c2
+	const ITEM_C3       ; c3
+	add_tm ROAR         ; c4
 	...
-	add_tm DIG          ; $DB
-	const ITEM_DC       ; $DC
-	add_tm PSYCHIC_M    ; $DD
+	add_tm DIG          ; db
+	const ITEM_DC       ; dc
+	add_tm PSYCHIC_M    ; dd
 	...
-	add_tm NIGHTMARE    ; $F2
+	add_tm NIGHTMARE    ; f2
 NUM_TMS = const_value - TM01 - 2 ; discount ITEM_C3 and ITEM_DC
 ```
 
@@ -469,6 +359,360 @@ GetNumberedTMHM: ; d417
 ```
 
 
+## Pokédex entry banks are derived from their species IDs
+
+`PokedexDataPointerTable` in [data/pokemon/dex_entry_pointers.asm](/data/pokemon/dex_entry_pointers.asm) is a table of `dw`, not `dba`, yet there are four banks used for Pokédex entries. The correct bank is derived from the species ID at the beginning of each Pokémon's base stats. (This is the only use the base stat species ID has.)
+
+Three separate routines do the same derivation; `GetDexEntryPointer` in [engine/pokedex/pokedex_2.asm](/engine/pokedex/pokedex_2.asm):
+
+```asm
+GetDexEntryPointer: ; 44333
+; return dex entry pointer b:de
+	push hl
+	ld hl, PokedexDataPointerTable
+	ld a, b
+	dec a
+	ld d, 0
+	ld e, a
+	add hl, de
+	add hl, de
+	ld e, [hl]
+	inc hl
+	ld d, [hl]
+	push de
+	rlca
+	rlca
+	maskbits NUM_DEX_ENTRY_BANKS
+	ld hl, .PokedexEntryBanks
+	ld d, 0
+	ld e, a
+	add hl, de
+	ld b, [hl]
+	pop de
+	pop hl
+	ret
+
+.PokedexEntryBanks:
+	db BANK(PokedexEntries1)
+	db BANK(PokedexEntries2)
+	db BANK(PokedexEntries3)
+	db BANK(PokedexEntries4)
+```
+
+`GetPokedexEntryBank` in [engine/item_effects.asm](/engine/item_effects.asm):
+
+```asm
+GetPokedexEntryBank:
+	push hl
+	push de
+	ld a, [wEnemyMonSpecies]
+	rlca
+	rlca
+	maskbits NUM_DEX_ENTRY_BANKS
+	ld hl, .PokedexEntryBanks
+	ld d, 0
+	ld e, a
+	add hl, de
+	ld a, [hl]
+	pop de
+	pop hl
+	ret
+
+.PokedexEntryBanks:
+	db BANK(PokedexEntries1)
+	db BANK(PokedexEntries2)
+	db BANK(PokedexEntries3)
+	db BANK(PokedexEntries4)
+```
+
+And `PokedexShow_GetDexEntryBank` in [engine/radio.asm](/engine/radio.asm):
+
+```asm
+PokedexShow_GetDexEntryBank:
+	push hl
+	push de
+	ld a, [wCurPartySpecies]
+	dec a
+	rlca
+	rlca
+	maskbits NUM_DEX_ENTRY_BANKS
+	ld hl, .PokedexEntryBanks
+	ld d, 0
+	ld e, a
+	add hl, de
+	ld a, [hl]
+	pop de
+	pop hl
+	ret
+
+.PokedexEntryBanks:
+	db BANK(PokedexEntries1)
+	db BANK(PokedexEntries2)
+	db BANK(PokedexEntries3)
+	db BANK(PokedexEntries4)
+```
+
+**Fix:** Use `dba` instead of `dw` in `PokedexDataPointerTable`, and modify the code that accesses it to match.
+
+
+## Identical sine wave code and data is repeated five times
+
+`_Sine` in [engine/routines/sine.asm](/engine/routines/sine.asm):
+
+```asm
+_Sine:: ; 84d9
+; A simple sine function.
+; Return d * sin(e) in hl.
+
+; e is a signed 6-bit value.
+	ld a, e
+	and %111111
+	cp  %100000
+	jr nc, .negative
+	call .ApplySineWave
+	ld a, h
+	ret
+
+.negative
+	and %011111
+	call .ApplySineWave
+	ld a, h
+	xor $ff
+	inc a
+	ret
+
+.ApplySineWave: ; 84ef
+	ld e, a
+	ld a, d
+	ld d, 0
+	ld hl, .sinewave
+	add hl, de
+	add hl, de
+	ld e, [hl]
+	inc hl
+	ld d, [hl]
+	ld hl, 0
+; Factor amplitude
+.multiply
+	srl a
+	jr nc, .even
+	add hl, de
+.even
+	sla e
+	rl d
+	and a
+	jr nz, .multiply
+	ret
+
+.sinewave ; 850b
+; A 32-word table representing a sine wave.
+; sin(90 degrees) is index $10 with an amplitude of $100.
+	sine_wave 32
+```
+
+`Sprites_Cosine` and `Sprites_Sine` in [engine/sprites.asm](/engine/sprites.asm):
+
+```asm
+Sprites_Cosine: ; 8e72a
+; a = d * cos(a * pi/32)
+	add %010000
+Sprites_Sine: ; 8e72c
+; a = d * sin(a * pi/32)
+	and %111111
+	cp %100000
+	jr nc, .negative
+	call .ApplySineWave
+	ld a, h
+	ret
+
+.negative
+	and %011111
+	call .ApplySineWave
+	ld a, h
+	xor $ff
+	inc a
+	ret
+; 8e741
+
+.ApplySineWave: ; 8e741
+	ld e, a
+	ld a, d
+	ld d, 0
+	ld hl, .sinewave
+	add hl, de
+	add hl, de
+	ld e, [hl]
+	inc hl
+	ld d, [hl]
+	ld hl, 0
+.multiply
+	srl a
+	jr nc, .even
+	add hl, de
+.even
+	sla e
+	rl d
+	and a
+	jr nz, .multiply
+	ret
+; 8e75d
+
+.sinewave ; 8e75d
+	sine_wave 32
+```
+
+`BattleAnim_Cosine` and `BattleAnim_Sine` in [engine/battle_anims/functions.asm](/engine/battle_anims/functions.asm):
+
+```asm
+BattleAnim_Cosine: ; ce732 (33:6732)
+; a = d * cos(a * pi/32)
+	add %010000
+BattleAnim_Sine: ; ce734 (33:6734)
+; a = d * sin(a * pi/32)
+	and %111111
+	cp %100000
+	jr nc, .negative
+	call .ApplySineWave
+	ld a, h
+	ret
+
+.negative
+	and %011111
+	call .ApplySineWave
+	ld a, h
+	xor $ff
+	inc a
+	ret
+
+.ApplySineWave:
+	ld e, a
+	ld a, d
+	ld d, 0
+	ld hl, BattleAnimSineWave
+	add hl, de
+	add hl, de
+	ld e, [hl]
+	inc hl
+	ld d, [hl]
+	ld hl, 0
+.multiply
+	srl a
+	jr nc, .even
+	add hl, de
+.even
+	sla e
+	rl d
+	and a
+	jr nz, .multiply
+	ret
+
+...
+
+BattleAnimSineWave: ; ce77f
+	sine_wave 32
+; ce7bf
+```
+
+`StartTrainerBattle_DrawSineWave` in [engine/battle/battle_transition.asm](/engine/battle/battle_transition.asm):
+
+```asm
+StartTrainerBattle_DrawSineWave: ; 8c6f7 (23:46f7)
+; a = d * sin(a * pi/32)
+	and %111111
+	cp %100000
+	jr nc, .negative
+	call .ApplySineWave
+	ld a, h
+	ret
+
+.negative
+	and %011111
+	call .ApplySineWave
+	ld a, h
+	xor $ff
+	inc a
+	ret
+
+.ApplySineWave: ; 8c70c (23:470c)
+	ld e, a
+	ld a, d
+	ld d, 0
+	ld hl, .sinewave
+	add hl, de
+	add hl, de
+	ld e, [hl]
+	inc hl
+	ld d, [hl]
+	ld hl, 0
+.multiply
+	srl a
+	jr nc, .even
+	add hl, de
+.even
+	sla e
+	rl d
+	and a
+	jr nz, .multiply
+	ret
+; 8c728 (23:4728)
+
+.sinewave ; 8c728
+	sine_wave 32
+; 8c768
+```
+
+And `CelebiEvent_Cosine` in [engine/events/celebi.asm](/engine/events/celebi.asm):
+
+```asm
+CelebiEvent_Cosine: ; 49b3b (12:5b3b)
+; a = d * cos(a * pi/32)
+	add %010000
+	and %111111
+	cp %100000
+	jr nc, .negative
+	call .ApplySineWave
+	ld a, h
+	ret
+
+.negative
+	and %011111
+	call .ApplySineWave
+	ld a, h
+	xor $ff
+	inc a
+	ret
+
+.ApplySineWave: ; 49b52 (12:5b52)
+	ld e, a
+	ld a, d
+	ld d, 0
+	ld hl, .sinewave
+	add hl, de
+	add hl, de
+	ld e, [hl]
+	inc hl
+	ld d, [hl]
+	ld hl, 0
+.multiply
+	srl a
+	jr nc, .even
+	add hl, de
+.even
+	sla e
+	rl d
+	and a
+	jr nz, .multiply
+	ret
+; 49b6e (12:5b6e)
+
+.sinewave ; 49b6e
+	sine_wave 32
+; 49bae
+```
+
+**Fix:** Call a single shared copy of the (co)sine code in bank 0.
+
+
 ## `GetForestTreeFrame` works, but it's still bad
 
 In [engine/tileset_anims.asm](/engine/tileset_anims.asm):
diff --git a/engine/battle/anim_hp_bar.asm b/engine/battle/anim_hp_bar.asm
index 7d51a8629..5c453d0ff 100755
--- a/engine/battle/anim_hp_bar.asm
+++ b/engine/battle/anim_hp_bar.asm
@@ -384,8 +384,9 @@ ShortHPBar_CalcPixelFrame: ; d839
 	call AddNTimes
 
 	ld b, 0
-; This routine is buggy. If [wCurHPAnimMaxHP] * [wCurHPBarPixels] is divisible
-; by 48, the loop runs one extra time. To fix, uncomment the line below.
+; This routine is buggy. If [wCurHPAnimMaxHP] * [wCurHPBarPixels] is
+; divisible by HP_BAR_LENGTH_PX, the loop runs one extra time.
+; To fix, uncomment the line below.
 .loop
 	ld a, l
 	sub HP_BAR_LENGTH_PX
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm
index e19bdaacc..d4a3c9446 100644
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -1504,8 +1504,8 @@ BattleCheckTypeMatchup: ; 347c8
 	ld hl, wBattleMonType1
 CheckTypeMatchup: ; 347d3
 ; There is an incorrect assumption about this function made in the AI related code: when
-; the AI calls CheckTypeMatchup (not BattleCheckTypeMatchup), it assumes that placing
-; the offensive type in a will make this function do the right thing. Since a is overwritten,
+; the AI calls CheckTypeMatchup (not BattleCheckTypeMatchup), it assumes that placing the
+; offensive type in a will make this function do the right thing. Since a is overwritten,
 ; this assumption is incorrect. A simple fix would be to load the move type for the
 ; current move into a in BattleCheckTypeMatchup, before falling through, which is
 ; consistent with how the rest of the code assumes this code works like.
diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm
index 0e0561b58..28612e636 100755
--- a/engine/battle_anims/functions.asm
+++ b/engine/battle_anims/functions.asm
@@ -1219,6 +1219,7 @@ BattleAnimFunction_0E: ; cd6e3 (33:56e3)
 .anon_dw
 	dw Functioncd6ea
 	dw Functioncd6f7
+
 Functioncd6ea: ; cd6ea (33:56ea)
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
@@ -1226,6 +1227,7 @@ Functioncd6ea: ; cd6ea (33:56ea)
 	ld a, BATTLEANIMFRAMESET_24
 	add [hl] ; offset
 	call ReinitBattleAnimFrameset
+
 Functioncd6f7: ; cd6f7 (33:56f7)
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
@@ -1256,6 +1258,7 @@ BattleAnimFunction_0F: ; cd71a (33:571a)
 	dw Functioncd728
 	dw Functioncd763
 	dw Functioncd776
+
 Functioncd725: ; cd725 (33:5725)
 	call BattleAnim_IncAnonJumptableIndex
 Functioncd728: ; cd728 (33:5728)
@@ -1345,6 +1348,7 @@ BattleAnimFunction_14: ; cd7a4 (33:57a4)
 .anon_dw
 	dw Functioncd7ab
 	dw Functioncd7d2
+
 Functioncd7ab: ; cd7ab (33:57ab)
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
@@ -1414,6 +1418,7 @@ BattleAnimFunction_15: ; cd80c (33:580c)
 	dw Functioncd817
 	dw Functioncd81f
 	dw Functioncd820
+
 Functioncd817: ; cd817 (33:5817)
 	call BattleAnim_IncAnonJumptableIndex
 	ld a, BATTLEANIMFRAMESET_35
@@ -1435,6 +1440,7 @@ BattleAnimFunction_16: ; cd824 (33:5824)
 	dw Functioncd88f
 	dw Functioncd88f
 	dw Functioncd893
+
 Functioncd835: ; cd835 (33:5835)
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
@@ -1513,6 +1519,7 @@ BattleAnimFunction_17: ; cd89a (33:589a)
 	dw Functioncd8f5
 	dw Functioncd8f5
 	dw Functioncd8f9
+
 Functioncd8ab: ; cd8ab (33:58ab)
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
@@ -1534,6 +1541,7 @@ Functioncd8ab: ; cd8ab (33:58ab)
 	ld a, [hl]
 	and $7f
 	ld [hl], a
+
 Functioncd8cc: ; cd8cc (33:58cc)
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
@@ -1561,6 +1569,7 @@ Functioncd8cc: ; cd8cc (33:58cc)
 	ld a, [hl]
 	and $1f
 	ret nz
+
 Functioncd8f5: ; cd8f5 (33:58f5)
 	call BattleAnim_IncAnonJumptableIndex
 	ret
@@ -1576,6 +1585,7 @@ BattleAnimFunction_18: ; cd900 (33:5900)
 .anon_dw
 	dw Functioncd907
 	dw Functioncd913
+
 Functioncd907: ; cd907 (33:5907)
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
@@ -1635,6 +1645,7 @@ BattleAnimFunction_19: ; cd954 (33:5954)
 	dw Functioncd96e
 	dw Functioncd96a
 	dw Functioncd97b
+
 Functioncd961: ; cd961 (33:5961)
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
@@ -1785,6 +1796,7 @@ BattleAnimFunction_1F: ; cda31 (33:5a31)
 	dw Functioncda4c
 	dw Functioncda3a
 	dw Functioncda4c
+
 Functioncda3a: ; cda3a (33:5a3a)
 	ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
@@ -1898,6 +1910,7 @@ BattleAnimFunction_3F: ; cdad6 (33:5ad6)
 	dw Functioncdadf
 	dw Functioncdae9
 	dw Functioncdaf9
+
 Functioncdadf: ; cdadf (33:5adf)
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_10
@@ -1936,6 +1949,7 @@ BattleAnimFunction_1B: ; cdb06 (33:5b06)
 	dw Functioncdb28
 	dw Functioncdb50
 	dw Functioncdb65
+
 Functioncdb13: ; cdb13 (33:5b13)
 	ret
 
@@ -2027,6 +2041,7 @@ BattleAnimFunction_1D: ; cdb80 (33:5b80)
 	dw Functioncdc48
 	dw Functioncdc57
 	dw Functioncdc74
+
 Functioncdb9f: ; cdb9f (33:5b9f)
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
@@ -2239,6 +2254,7 @@ BattleAnimFunction_21: ; cdcc3 (33:5cc3)
 .anon_dw
 	dw Functioncdcca
 	dw Functioncdced
+
 Functioncdcca: ; cdcca (33:5cca)
 	ld a, [hBattleTurn]
 	and a
@@ -2313,6 +2329,7 @@ BattleAnimFunction_22: ; cdd2a (33:5d2a)
 .anon_dw
 	dw Functioncdd31
 	dw Functioncdd4f
+
 Functioncdd31: ; cdd31 (33:5d31)
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
@@ -2380,6 +2397,7 @@ BattleAnimFunction_23: ; cdd90 (33:5d90)
 .anon_dw
 	dw Functioncdd97
 	dw Functioncddbc
+
 Functioncdd97: ; cdd97 (33:5d97)
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
@@ -2449,6 +2467,7 @@ BattleAnimFunction_24: ; cddf9 (33:5df9)
 	dw Functioncde02
 	dw Functioncde20
 	dw Functioncde21
+
 Functioncde02: ; cde02 (33:5e02)
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
@@ -2528,6 +2547,7 @@ BattleAnimFunction_27: ; cde6b (33:5e6b)
 .anon_dw
 	dw Functioncde72
 	dw Functioncde88
+
 Functioncde72: ; cde72 (33:5e72)
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
@@ -2549,6 +2569,7 @@ BattleAnimFunction_28: ; cde89 (33:5e89)
 .anon_dw
 	dw Functioncde90
 	dw Functioncdebf
+
 Functioncde90: ; cde90 (33:5e90)
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
@@ -2692,6 +2713,7 @@ BattleAnimFunction_PoisonGas: ; cdf59 (33:5f59)
 .anon_dw
 	dw Functioncdf60
 	dw BattleAnimFunction_SpiralDescent
+
 Functioncdf60: ; cdf60 (33:5f60)
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
@@ -2813,6 +2835,7 @@ BattleAnimFunction_35: ; ce00b (33:600b)
 	dw Functionce014
 	dw Functionce023
 	dw Functionce05f
+
 Functionce014: ; ce014 (33:6014)
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
@@ -2936,6 +2959,7 @@ BattleAnimFunction_2C: ; ce0c5 (33:60c5)
 	dw Functionce0ce
 	dw Functionce0f8
 	dw Functionce0dd
+
 Functionce0ce: ; ce0ce (33:60ce)
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
@@ -2985,6 +3009,7 @@ BattleAnimFunction_2E: ; ce10e (33:610e)
 .anon_dw
 	dw Functionce115
 	dw Functionce12a
+
 Functionce115: ; ce115 (33:6115)
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
@@ -3133,6 +3158,7 @@ BattleAnimFunction_30: ; ce1e7 (33:61e7)
 .anon_dw
 	dw Functionce1ee
 	dw Functionce1fb
+
 Functionce1ee: ; ce1ee (33:61ee)
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_YCOORD
@@ -3172,6 +3198,7 @@ BattleAnimFunction_31: ; ce226 (33:6226)
 .anon_dw
 	dw Functionce22d
 	dw Functionce254
+
 Functionce22d: ; ce22d (33:622d)
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
@@ -3203,6 +3230,7 @@ BattleAnimFunction_32: ; ce255 (33:6255)
 	dw Functionce274
 	dw Functionce278
 	dw Functionce289
+
 Functionce260: ; ce260 (33:6260)
 	call BattleAnim_IncAnonJumptableIndex
 	ld a, [hBattleTurn]
@@ -3318,6 +3346,7 @@ BattleAnimFunction_36: ; ce2fd (33:62fd)
 	dw Functionce306
 	dw Functionce330
 	dw Functionce34c
+
 Functionce306: ; ce306 (33:6306)
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
@@ -3389,6 +3418,7 @@ BattleAnimFunction_37: ; ce35f (33:635f)
 .anon_dw
 	dw Functionce366
 	dw Functionce375
+
 Functionce366: ; ce366 (33:6366)
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
@@ -3419,6 +3449,7 @@ BattleAnimFunction_38: ; ce389 (33:6389)
 	dw Functionce392
 	dw Functionce39c
 	dw Functionce3ae
+
 Functionce392: ; ce392 (33:6392)
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
@@ -3500,6 +3531,7 @@ BattleAnimFunction_3B: ; ce3ff (33:63ff)
 .anon_dw
 	dw Functionce406
 	dw Functionce412
+
 Functionce406: ; ce406 (33:6406)
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
@@ -3544,6 +3576,7 @@ BattleAnimFunction_3E: ; ce43a (33:643a)
 	dw Functionce443
 	dw Functionce465
 	dw Functionce490
+
 Functionce443: ; ce443 (33:6443)
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
@@ -3607,6 +3640,7 @@ BattleAnimFunction_40: ; ce49c (33:649c)
 .anon_dw
 	dw Functionce4a3
 	dw Functionce4b0
+
 Functionce4a3: ; ce4a3 (33:64a3)
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
@@ -3739,6 +3773,7 @@ BattleAnimFunction_45: ; ce55b (33:655b)
 	dw Functionce564
 	dw Functionce56e
 	dw Functionce577
+
 Functionce564: ; ce564 (33:6564)
 	ld d, $18
 	ld hl, BATTLEANIMSTRUCT_0B
@@ -3779,6 +3814,7 @@ BattleAnimFunction_46: ; ce593 (33:6593)
 .anon_dw
 	dw Functionce5b3
 	dw Functionce59a
+
 Functionce59a: ; ce59a (33:659a)
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
@@ -3850,6 +3886,7 @@ BattleAnimFunction_49: ; ce5ee (33:65ee)
 	dw Functionce60a
 	dw Functionce622
 	dw Functionce618
+
 Functionce5f9: ; ce5f9 (33:65f9)
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
@@ -3898,6 +3935,7 @@ BattleAnimFunction_4A: ; ce62f (33:662f)
 	dw Functionce648
 	dw Functionce65c
 	dw Functionce672
+
 Functionce63a: ; ce63a (33:663a)
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
@@ -4138,24 +4176,24 @@ BattleAnim_Cosine_e: ; ce76b (33:676b)
 	call BattleAnim_Cosine
 	ld e, a
 	ret
-
 ; ce771 (33:6771)
+
 BattleAnim_AbsSinePrecise: ; ce771
 	ld a, e
 	call BattleAnim_Sine
 	ld e, l
 	ld d, h
 	ret
-
 ; ce778
+
 BattleAnim_AbsCosinePrecise: ; ce778
 	ld a, e
 	call BattleAnim_Cosine
 	ld e, l
 	ld d, h
 	ret
-
 ; ce77f
+
 BattleAnimSineWave: ; ce77f
 	sine_wave 32
 ; ce7bf
diff --git a/engine/breeding.asm b/engine/breeding.asm
index c71387eee..ee8bbbb31 100755
--- a/engine/breeding.asm
+++ b/engine/breeding.asm
@@ -434,8 +434,6 @@ InitEggMoves: ; 170bf
 ; 170e4
 
 GetEggMove: ; 170e4
-GLOBAL EggMoves
-
 	push bc
 	ld a, [wEggMonSpecies]
 	dec a
diff --git a/engine/item_effects.asm b/engine/item_effects.asm
index 4302b3ba1..e37d84b88 100644
--- a/engine/item_effects.asm
+++ b/engine/item_effects.asm
@@ -361,7 +361,7 @@ ParkBall: ; e8a2
 	ld d, a
 	push de
 	ld a, [wBattleMonItem]
-;	ld b, a
+	; ld b, a
 	farcall GetItemHeldEffect
 	ld a, b
 	cp HELD_CATCH_CHANCE
@@ -905,10 +905,6 @@ MoonBallMultiplier:
 ; This function is buggy.
 ; Intent:  multiply catch rate by 4 if mon evolves with moon stone
 ; Reality: no boost
-
-GLOBAL EvosAttacks
-GLOBAL EvosAttacksPointers
-
 	push bc
 	ld a, [wTempEnemyMonSpecies]
 	dec a
diff --git a/engine/load_pics.asm b/engine/load_pics.asm
index 0558fb7f7..b533ee56b 100755
--- a/engine/load_pics.asm
+++ b/engine/load_pics.asm
@@ -103,8 +103,6 @@ _GetFrontpic: ; 510a5
 	ret
 
 GetFrontpicPointer: ; 510d7
-GLOBAL PokemonPicPointers, UnownPicPointers
-
 	ld a, [wCurPartySpecies]
 	cp UNOWN
 	jr z, .unown
@@ -211,7 +209,6 @@ GetMonBackpic: ; 5116c
 	push de
 
 	; These are assumed to be at the same address in their respective banks.
-	GLOBAL PokemonPicPointers,  UnownPicPointers
 	ld hl, PokemonPicPointers ; UnownPicPointers
 	ld a, b
 	ld d, BANK(PokemonPicPointers)
diff --git a/engine/pokedex/pokedex_2.asm b/engine/pokedex/pokedex_2.asm
index a467fe02c..f8f5a34c5 100644
--- a/engine/pokedex/pokedex_2.asm
+++ b/engine/pokedex/pokedex_2.asm
@@ -240,7 +240,7 @@ GetDexEntryPointer: ; 44333
 	pop hl
 	ret
 
-.PokedexEntryBanks: ; 44351
+.PokedexEntryBanks:
 	db BANK(PokedexEntries1)
 	db BANK(PokedexEntries2)
 	db BANK(PokedexEntries3)
diff --git a/engine/radio.asm b/engine/radio.asm
index 5277b12cd..2a8218e4c 100644
--- a/engine/radio.asm
+++ b/engine/radio.asm
@@ -702,7 +702,7 @@ PokedexShow_GetDexEntryBank:
 	pop hl
 	ret
 
-.PokedexEntryBanks
+.PokedexEntryBanks:
 	db BANK(PokedexEntries1)
 	db BANK(PokedexEntries2)
 	db BANK(PokedexEntries3)
diff --git a/engine/routines/sine.asm b/engine/routines/sine.asm
index 8c5ec6347..1b2b8f2f3 100755
--- a/engine/routines/sine.asm
+++ b/engine/routines/sine.asm
@@ -43,6 +43,6 @@ _Sine:: ; 84d9
 	ret
 
 .sinewave ; 850b
-; A $20-word table representing a sine wave.
-; 90 degrees is index $10 at a base amplitude of $100.
+; A 32-word table representing a sine wave.
+; sin(90 degrees) is index $10 with an amplitude of $100.
 	sine_wave 32

From 73ea7c6326f16f84de1cf74193705328d1664645 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sat, 3 Feb 2018 21:11:55 -0500
Subject: [PATCH 108/135] Macro factors out sine code, just like sine data,
 since it's used 5 times

---
 docs/design_flaws.md                | 242 +++++++---------------------
 engine/battle/battle_transition.asm |  42 +----
 engine/battle_anims/functions.asm   |  42 +----
 engine/events/celebi.asm            |  43 +----
 engine/routines/sine.asm            |  48 +-----
 engine/sprites.asm                  |  45 +-----
 home/sine.asm                       |  11 +-
 macros/code.asm                     |  47 ++++++
 macros/data.asm                     |  18 +--
 9 files changed, 127 insertions(+), 411 deletions(-)

diff --git a/docs/design_flaws.md b/docs/design_flaws.md
index 613f90b0c..20b70cac1 100644
--- a/docs/design_flaws.md
+++ b/docs/design_flaws.md
@@ -461,53 +461,9 @@ PokedexShow_GetDexEntryBank:
 
 ```asm
 _Sine:: ; 84d9
-; A simple sine function.
-; Return d * sin(e) in hl.
-
-; e is a signed 6-bit value.
+; a = d * sin(e * pi/32)
 	ld a, e
-	and %111111
-	cp  %100000
-	jr nc, .negative
-	call .ApplySineWave
-	ld a, h
-	ret
-
-.negative
-	and %011111
-	call .ApplySineWave
-	ld a, h
-	xor $ff
-	inc a
-	ret
-
-.ApplySineWave: ; 84ef
-	ld e, a
-	ld a, d
-	ld d, 0
-	ld hl, .sinewave
-	add hl, de
-	add hl, de
-	ld e, [hl]
-	inc hl
-	ld d, [hl]
-	ld hl, 0
-; Factor amplitude
-.multiply
-	srl a
-	jr nc, .even
-	add hl, de
-.even
-	sla e
-	rl d
-	and a
-	jr nz, .multiply
-	ret
-
-.sinewave ; 850b
-; A 32-word table representing a sine wave.
-; sin(90 degrees) is index $10 with an amplitude of $100.
-	sine_wave 32
+	calc_sine_wave
 ```
 
 `Sprites_Cosine` and `Sprites_Sine` in [engine/sprites.asm](/engine/sprites.asm):
@@ -515,50 +471,11 @@ _Sine:: ; 84d9
 ```asm
 Sprites_Cosine: ; 8e72a
 ; a = d * cos(a * pi/32)
-	add %010000
+	add %010000 ; cos(x) = sin(x + pi/2)
+	; fallthrough
 Sprites_Sine: ; 8e72c
 ; a = d * sin(a * pi/32)
-	and %111111
-	cp %100000
-	jr nc, .negative
-	call .ApplySineWave
-	ld a, h
-	ret
-
-.negative
-	and %011111
-	call .ApplySineWave
-	ld a, h
-	xor $ff
-	inc a
-	ret
-; 8e741
-
-.ApplySineWave: ; 8e741
-	ld e, a
-	ld a, d
-	ld d, 0
-	ld hl, .sinewave
-	add hl, de
-	add hl, de
-	ld e, [hl]
-	inc hl
-	ld d, [hl]
-	ld hl, 0
-.multiply
-	srl a
-	jr nc, .even
-	add hl, de
-.even
-	sla e
-	rl d
-	and a
-	jr nz, .multiply
-	ret
-; 8e75d
-
-.sinewave ; 8e75d
-	sine_wave 32
+	calc_sine_wave
 ```
 
 `BattleAnim_Cosine` and `BattleAnim_Sine` in [engine/battle_anims/functions.asm](/engine/battle_anims/functions.asm):
@@ -566,50 +483,16 @@ Sprites_Sine: ; 8e72c
 ```asm
 BattleAnim_Cosine: ; ce732 (33:6732)
 ; a = d * cos(a * pi/32)
-	add %010000
+	add %010000 ; cos(x) = sin(x + pi/2)
+	; fallthrough
 BattleAnim_Sine: ; ce734 (33:6734)
 ; a = d * sin(a * pi/32)
-	and %111111
-	cp %100000
-	jr nc, .negative
-	call .ApplySineWave
-	ld a, h
-	ret
-
-.negative
-	and %011111
-	call .ApplySineWave
-	ld a, h
-	xor $ff
-	inc a
-	ret
-
-.ApplySineWave:
-	ld e, a
-	ld a, d
-	ld d, 0
-	ld hl, BattleAnimSineWave
-	add hl, de
-	add hl, de
-	ld e, [hl]
-	inc hl
-	ld d, [hl]
-	ld hl, 0
-.multiply
-	srl a
-	jr nc, .even
-	add hl, de
-.even
-	sla e
-	rl d
-	and a
-	jr nz, .multiply
-	ret
+	calc_sine_wave BattleAnimSineWave
 
 ...
 
 BattleAnimSineWave: ; ce77f
-	sine_wave 32
+	sine_table 32
 ; ce7bf
 ```
 
@@ -617,47 +500,7 @@ BattleAnimSineWave: ; ce77f
 
 ```asm
 StartTrainerBattle_DrawSineWave: ; 8c6f7 (23:46f7)
-; a = d * sin(a * pi/32)
-	and %111111
-	cp %100000
-	jr nc, .negative
-	call .ApplySineWave
-	ld a, h
-	ret
-
-.negative
-	and %011111
-	call .ApplySineWave
-	ld a, h
-	xor $ff
-	inc a
-	ret
-
-.ApplySineWave: ; 8c70c (23:470c)
-	ld e, a
-	ld a, d
-	ld d, 0
-	ld hl, .sinewave
-	add hl, de
-	add hl, de
-	ld e, [hl]
-	inc hl
-	ld d, [hl]
-	ld hl, 0
-.multiply
-	srl a
-	jr nc, .even
-	add hl, de
-.even
-	sla e
-	rl d
-	and a
-	jr nz, .multiply
-	ret
-; 8c728 (23:4728)
-
-.sinewave ; 8c728
-	sine_wave 32
+	calc_sine_wave
 ; 8c768
 ```
 
@@ -666,51 +509,76 @@ And `CelebiEvent_Cosine` in [engine/events/celebi.asm](/engine/events/celebi.asm
 ```asm
 CelebiEvent_Cosine: ; 49b3b (12:5b3b)
 ; a = d * cos(a * pi/32)
-	add %010000
+	add %010000 ; cos(x) = sin(x + pi/2)
+	calc_sine_wave
+; 49bae
+```
+
+They all rely on `calc_sine_wave` in [macros/code.asm](/macros/code.asm):
+
+```asm
+calc_sine_wave: MACRO
+; input: a = a signed 6-bit value
+; output: a = d * sin(a * pi/32)
 	and %111111
-	cp %100000
-	jr nc, .negative
-	call .ApplySineWave
+	cp  %100000
+	jr nc, .negative\@
+	call .apply\@
 	ld a, h
 	ret
-
-.negative
+.negative\@
 	and %011111
-	call .ApplySineWave
+	call .apply\@
 	ld a, h
 	xor $ff
 	inc a
 	ret
-
-.ApplySineWave: ; 49b52 (12:5b52)
+.apply\@
 	ld e, a
 	ld a, d
 	ld d, 0
-	ld hl, .sinewave
+if _NARG == 1
+	ld hl, \1
+else
+	ld hl, .sinetable\@
+endc
 	add hl, de
 	add hl, de
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
 	ld hl, 0
-.multiply
+.multiply\@ ; factor amplitude
 	srl a
-	jr nc, .even
+	jr nc, .even\@
 	add hl, de
-.even
+.even\@
 	sla e
 	rl d
 	and a
-	jr nz, .multiply
+	jr nz, .multiply\@
 	ret
-; 49b6e (12:5b6e)
-
-.sinewave ; 49b6e
-	sine_wave 32
-; 49bae
+if _NARG == 0
+.sinetable\@
+	sine_table 32
+endc
+ENDM
 ```
 
-**Fix:** Call a single shared copy of the (co)sine code in bank 0.
+And on `sine_table` in [macros/data.asm](/macros/data.asm):
+
+```asm
+sine_table: MACRO
+; \1 samples of sin(x) from x=0 to x<32768 (pi radians)
+x = 0
+rept \1
+	dw (sin(x) + (sin(x) & $ff)) >> 8 ; round up
+x = x + DIV(32768, \1) ; a circle has 65536 "degrees"
+endr
+ENDM
+```
+
+**Fix:** Edit [home/sine.asm](/home/sine.asm) to contain a single copy of the (co)sine code in bank 0, and call it from those five sites.
 
 
 ## `GetForestTreeFrame` works, but it's still bad
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm
index e331cf3ee..1de84421d 100644
--- a/engine/battle/battle_transition.asm
+++ b/engine/battle/battle_transition.asm
@@ -749,47 +749,7 @@ WipeLYOverrides: ; 8c6d8
 
 
 StartTrainerBattle_DrawSineWave: ; 8c6f7 (23:46f7)
-; a = d * sin(a * pi/32)
-	and %111111
-	cp %100000
-	jr nc, .negative
-	call .ApplySineWave
-	ld a, h
-	ret
-
-.negative
-	and %011111
-	call .ApplySineWave
-	ld a, h
-	xor $ff
-	inc a
-	ret
-
-.ApplySineWave: ; 8c70c (23:470c)
-	ld e, a
-	ld a, d
-	ld d, 0
-	ld hl, .sinewave
-	add hl, de
-	add hl, de
-	ld e, [hl]
-	inc hl
-	ld d, [hl]
-	ld hl, 0
-.multiply
-	srl a
-	jr nc, .even
-	add hl, de
-.even
-	sla e
-	rl d
-	and a
-	jr nz, .multiply
-	ret
-; 8c728 (23:4728)
-
-.sinewave ; 8c728
-	sine_wave 32
+	calc_sine_wave
 ; 8c768
 
 StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768)
diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm
index 28612e636..e0eedec86 100755
--- a/engine/battle_anims/functions.asm
+++ b/engine/battle_anims/functions.asm
@@ -4125,45 +4125,11 @@ BattleAnim_IncAnonJumptableIndex: ; ce72c (33:672c)
 
 BattleAnim_Cosine: ; ce732 (33:6732)
 ; a = d * cos(a * pi/32)
-	add %010000
+	add %010000 ; cos(x) = sin(x + pi/2)
+	; fallthrough
 BattleAnim_Sine: ; ce734 (33:6734)
 ; a = d * sin(a * pi/32)
-	and %111111
-	cp %100000
-	jr nc, .negative
-	call .ApplySineWave
-	ld a, h
-	ret
-
-.negative
-	and %011111
-	call .ApplySineWave
-	ld a, h
-	xor $ff
-	inc a
-	ret
-
-.ApplySineWave:
-	ld e, a
-	ld a, d
-	ld d, 0
-	ld hl, BattleAnimSineWave
-	add hl, de
-	add hl, de
-	ld e, [hl]
-	inc hl
-	ld d, [hl]
-	ld hl, 0
-.multiply
-	srl a
-	jr nc, .even
-	add hl, de
-.even
-	sla e
-	rl d
-	and a
-	jr nz, .multiply
-	ret
+	calc_sine_wave BattleAnimSineWave
 
 BattleAnim_Sine_e: ; ce765 (33:6765)
 	ld a, e
@@ -4195,5 +4161,5 @@ BattleAnim_AbsCosinePrecise: ; ce778
 ; ce77f
 
 BattleAnimSineWave: ; ce77f
-	sine_wave 32
+	sine_table 32
 ; ce7bf
diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm
index 87876f1cb..99c22f49f 100755
--- a/engine/events/celebi.asm
+++ b/engine/events/celebi.asm
@@ -241,47 +241,8 @@ UpdateCelebiPosition: ; 49aa2 (12:5aa2)
 
 CelebiEvent_Cosine: ; 49b3b (12:5b3b)
 ; a = d * cos(a * pi/32)
-	add %010000
-	and %111111
-	cp %100000
-	jr nc, .negative
-	call .ApplySineWave
-	ld a, h
-	ret
-
-.negative
-	and %011111
-	call .ApplySineWave
-	ld a, h
-	xor $ff
-	inc a
-	ret
-
-.ApplySineWave: ; 49b52 (12:5b52)
-	ld e, a
-	ld a, d
-	ld d, 0
-	ld hl, .sinewave
-	add hl, de
-	add hl, de
-	ld e, [hl]
-	inc hl
-	ld d, [hl]
-	ld hl, 0
-.multiply
-	srl a
-	jr nc, .even
-	add hl, de
-.even
-	sla e
-	rl d
-	and a
-	jr nz, .multiply
-	ret
-; 49b6e (12:5b6e)
-
-.sinewave ; 49b6e
-	sine_wave 32
+	add %010000 ; cos(x) = sin(x + pi/2)
+	calc_sine_wave
 ; 49bae
 
 GetCelebiSpriteTile: ; 49bae
diff --git a/engine/routines/sine.asm b/engine/routines/sine.asm
index 1b2b8f2f3..23e86c015 100755
--- a/engine/routines/sine.asm
+++ b/engine/routines/sine.asm
@@ -1,48 +1,4 @@
 _Sine:: ; 84d9
-; A simple sine function.
-; Return d * sin(e) in hl.
-
-; e is a signed 6-bit value.
+; a = d * sin(e * pi/32)
 	ld a, e
-	and %111111
-	cp  %100000
-	jr nc, .negative
-	call .ApplySineWave
-	ld a, h
-	ret
-
-.negative
-	and %011111
-	call .ApplySineWave
-	ld a, h
-	xor $ff
-	inc a
-	ret
-
-.ApplySineWave: ; 84ef
-	ld e, a
-	ld a, d
-	ld d, 0
-	ld hl, .sinewave
-	add hl, de
-	add hl, de
-	ld e, [hl]
-	inc hl
-	ld d, [hl]
-	ld hl, 0
-; Factor amplitude
-.multiply
-	srl a
-	jr nc, .even
-	add hl, de
-.even
-	sla e
-	rl d
-	and a
-	jr nz, .multiply
-	ret
-
-.sinewave ; 850b
-; A 32-word table representing a sine wave.
-; sin(90 degrees) is index $10 with an amplitude of $100.
-	sine_wave 32
+	calc_sine_wave
diff --git a/engine/sprites.asm b/engine/sprites.asm
index e39fa615d..97ac13559 100755
--- a/engine/sprites.asm
+++ b/engine/sprites.asm
@@ -577,50 +577,11 @@ endr
 
 Sprites_Cosine: ; 8e72a
 ; a = d * cos(a * pi/32)
-	add %010000
+	add %010000 ; cos(x) = sin(x + pi/2)
+	; fallthrough
 Sprites_Sine: ; 8e72c
 ; a = d * sin(a * pi/32)
-	and %111111
-	cp %100000
-	jr nc, .negative
-	call .ApplySineWave
-	ld a, h
-	ret
-
-.negative
-	and %011111
-	call .ApplySineWave
-	ld a, h
-	xor $ff
-	inc a
-	ret
-; 8e741
-
-.ApplySineWave: ; 8e741
-	ld e, a
-	ld a, d
-	ld d, 0
-	ld hl, .sinewave
-	add hl, de
-	add hl, de
-	ld e, [hl]
-	inc hl
-	ld d, [hl]
-	ld hl, 0
-.multiply
-	srl a
-	jr nc, .even
-	add hl, de
-.even
-	sla e
-	rl d
-	and a
-	jr nz, .multiply
-	ret
-; 8e75d
-
-.sinewave ; 8e75d
-	sine_wave 32
+	calc_sine_wave
 
 
 AnimateEndOfExpBar: ; 8e79d
diff --git a/home/sine.asm b/home/sine.asm
index eff5ed299..a32a31612 100644
--- a/home/sine.asm
+++ b/home/sine.asm
@@ -1,13 +1,10 @@
 Cosine:: ; 1b0f
-; Return d * cos(a) in hl
-	add %010000 ; 90 degrees
-
+; a = d * cos(a * pi/32)
+	add %010000 ; cos(x) = sin(x + pi/2)
+	; fallthrough
 Sine:: ; 1b11
-; Return d * sin(a) in hl
-; a is a signed 6-bit value.
-
+; a = d * sin(a * pi/32)
 	ld e, a
-
 	homecall _Sine
 	ret
 ; 1b1e
diff --git a/macros/code.asm b/macros/code.asm
index 0b36f6c11..a02a33380 100644
--- a/macros/code.asm
+++ b/macros/code.asm
@@ -52,3 +52,50 @@ endc
 endr
 	and x
 ENDM
+
+calc_sine_wave: MACRO
+; input: a = a signed 6-bit value
+; output: a = d * sin(a * pi/32)
+	and %111111
+	cp  %100000
+	jr nc, .negative\@
+	call .apply\@
+	ld a, h
+	ret
+.negative\@
+	and %011111
+	call .apply\@
+	ld a, h
+	xor $ff
+	inc a
+	ret
+.apply\@
+	ld e, a
+	ld a, d
+	ld d, 0
+if _NARG == 1
+	ld hl, \1
+else
+	ld hl, .sinetable\@
+endc
+	add hl, de
+	add hl, de
+	ld e, [hl]
+	inc hl
+	ld d, [hl]
+	ld hl, 0
+.multiply\@ ; factor amplitude
+	srl a
+	jr nc, .even\@
+	add hl, de
+.even\@
+	sla e
+	rl d
+	and a
+	jr nz, .multiply\@
+	ret
+if _NARG == 0
+.sinetable\@
+	sine_table 32
+endc
+ENDM
diff --git a/macros/data.asm b/macros/data.asm
index 8adb33005..ad2d9b8ef 100644
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -111,7 +111,15 @@ menu_coords: MACRO
 ENDM
 
 
-sine_wave: MACRO
+bcd: MACRO
+rept _NARG
+	dn ((\1) % 100) / 10, (\1) % 10
+	shift
+endr
+ENDM
+
+
+sine_table: MACRO
 ; \1 samples of sin(x) from x=0 to x<32768 (pi radians)
 x = 0
 rept \1
@@ -119,11 +127,3 @@ rept \1
 x = x + DIV(32768, \1) ; a circle has 65536 "degrees"
 endr
 ENDM
-
-
-bcd: MACRO
-rept _NARG
-	dn ((\1) % 100) / 10, (\1) % 10
-	shift
-endr
-ENDM

From 79849a7e40faf2b44a5d56c555fe83a9f8a9d0d9 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sat, 3 Feb 2018 21:22:06 -0500
Subject: [PATCH 109/135] db/dw, and keep unused space away from labels

---
 wram.asm | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/wram.asm b/wram.asm
index 6b806cb41..10c91d5f0 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1226,7 +1226,7 @@ wcd72:: ds 1
 wcd73:: ds 1
 wcd74:: ds 1
 
-wOTMonSelection:: ds 2 ; ds 3
+wOTMonSelection:: ds 2 ; ds BATTLETOWER_PARTY_LENGTH
 wcd77:: ds 1
 
 wMobileCrashCheckPointer:: dw
@@ -1621,12 +1621,12 @@ wMartItemBCDEnd::
 
 NEXTU ; d002
 ; town map data
-wTownMapPlayerIconLandmark:: ds 1
+wTownMapPlayerIconLandmark:: db
 UNION
-wTownMapCursorLandmark:: ds 1
-wTownMapCursorObjectPointer:: ds 2
+wTownMapCursorLandmark:: db
+wTownMapCursorObjectPointer:: dw
 NEXTU
-wTownMapCursorCoordinates:: ds 2
+wTownMapCursorCoordinates:: dw
 ENDU
 
 NEXTU ; d002
@@ -1903,7 +1903,7 @@ wCurMessageScrollPosition:: db
 wCurMessageIndex:: db
 wMailboxCount:: db
 wMailboxItems:: ds MAILBOX_CAPACITY
-wMailboxEnd:: ds 1 ; d0fe
+wMailboxEnd:: ; d0fe
 ENDU ; d100
 
 wListPointer:: dw ; d100
@@ -2026,7 +2026,7 @@ wTilesetBlocksAddress:: dw ; d1dd
 wTilesetCollisionBank:: db ; d1df
 wTilesetCollisionAddress:: dw ; d1e0
 wTilesetAnim:: dw ; bank 3f ; d1e2
-	ds 2  ; unused ; d1e4
+	ds 2 ; unused ; d1e4
 wTilesetPalettes:: dw ; bank 3f ; d1e6
 wTilesetEnd::
 
@@ -2300,7 +2300,9 @@ wReceiveCallDelay_StartTime:: ds 3 ; d466
 wBugContestMinsRemaining:: db ; d46c
 wBugContestSecsRemaining:: db ; d46d
 	ds 2
-wMapStatusEnd:: ds 2 ; d470
+wMapStatusEnd:: ; d470
+
+	ds 2
 
 wCrystalData::
 wPlayerGender:: ; d472
@@ -2638,7 +2640,7 @@ wBikeFlags:: ; dbf5
 ; bit 1: always on bike
 ; bit 2: downhill
 	db
-	ds 1 ; also cleared by ResetBikeFlags
+	ds 1 ; cleared along with wBikeFlags by ResetBikeFlags
 
 wCurrMapSceneScriptPointer:: dw ; dbf7
 

From ac15415949b741258fbb67a7ad5eb7020e8e745c Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sat, 3 Feb 2018 22:57:57 -0500
Subject: [PATCH 110/135] Sync _

---
 docs/bugs_and_glitches.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index 61fc4d63c..8e066469e 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -697,16 +697,16 @@ FastBallMultiplier:
 This is a bug with `ItemAttributes` in [data/items/attributes.asm](/data/items/attributes.asm):
 
 ```asm
-; DRAGON FANG
+; DRAGON_FANG
 	item_attribute 100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 
 ...
 
-; DRAGON SCALE
+; DRAGON_SCALE
 	item_attribute 2100, HELD_DRAGON_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ```
 
-**Fix:** Move `HELD_DRAGON_BOOST` to the `DRAGON FANG` attributes and `0` to `DRAGON SCALE`.
+**Fix:** Move `HELD_DRAGON_BOOST` to the `DRAGON_FANG` attributes and `0` to `DRAGON_SCALE`.
 
 
 ## Daisy's grooming doesn't always increase happiness

From 885080f21354f17ba7a45628a7c262d54dc346b9 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sun, 4 Feb 2018 11:46:53 -0500
Subject: [PATCH 111/135] =?UTF-8?q?"chances"=20=E2=86=92=20"probabilities"?=
 =?UTF-8?q?,=20since=20other=20files=20use=20that=20term=20and=20"changes"?=
 =?UTF-8?q?=20exists=20right=20next=20to=20it?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{happiness_chances.asm => happiness_probabilities.asm}    | 0
 docs/bugs_and_glitches.md                                     | 4 ++--
 engine/events/special.asm                                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename data/events/{happiness_chances.asm => happiness_probabilities.asm} (100%)

diff --git a/data/events/happiness_chances.asm b/data/events/happiness_probabilities.asm
similarity index 100%
rename from data/events/happiness_chances.asm
rename to data/events/happiness_probabilities.asm
diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index 8e066469e..792c08888 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -739,7 +739,7 @@ This is a bug with `HaircutOrGrooming` in [engine/events/special.asm](/engine/ev
 
 ...
 
-INCLUDE "data/events/happiness_chances.asm"
+INCLUDE "data/events/happiness_probabilities.asm"
 
 CopyPokemonName_Buffer1_Buffer3: ; 746e
 	ld hl, wStringBuffer1
@@ -748,7 +748,7 @@ CopyPokemonName_Buffer1_Buffer3: ; 746e
 	jp CopyBytes
 ```
 
-In [data/events/happiness_chances.asm](/data/events/happiness_chances.asm):
+In [data/events/happiness_probabilities.asm](/data/events/happiness_probabilities.asm):
 
 ```asm
 HappinessData_DaisysGrooming: ; 746b
diff --git a/engine/events/special.asm b/engine/events/special.asm
index 62955c3e9..ab1f35515 100755
--- a/engine/events/special.asm
+++ b/engine/events/special.asm
@@ -213,7 +213,7 @@ HaircutOrGrooming: ; 7420
 	ld [wScriptVar], a
 	ret
 
-INCLUDE "data/events/happiness_chances.asm"
+INCLUDE "data/events/happiness_probabilities.asm"
 
 CopyPokemonName_Buffer1_Buffer3: ; 746e
 	ld hl, wStringBuffer1

From 6c405e38598309bd090bb325a45f135e08b47a6f Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sun, 4 Feb 2018 12:03:31 -0500
Subject: [PATCH 112/135] Keep specials files together

---
 docs/bugs_and_glitches.md                     | 2 +-
 engine/{ => events}/specials.asm              | 0
 engine/events/{special.asm => specials_2.asm} | 0
 main.asm                                      | 4 ++--
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename engine/{ => events}/specials.asm (100%)
 rename engine/events/{special.asm => specials_2.asm} (100%)

diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index 792c08888..382848fb9 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -711,7 +711,7 @@ This is a bug with `ItemAttributes` in [data/items/attributes.asm](/data/items/a
 
 ## Daisy's grooming doesn't always increase happiness
 
-This is a bug with `HaircutOrGrooming` in [engine/events/special.asm](/engine/events/special.asm):
+This is a bug with `HaircutOrGrooming` in [engine/events/specials_2.asm](/engine/events/specials_2.asm):
 
 ```asm
 ; Bug: Subtracting $ff from $ff fails to set c.
diff --git a/engine/specials.asm b/engine/events/specials.asm
similarity index 100%
rename from engine/specials.asm
rename to engine/events/specials.asm
diff --git a/engine/events/special.asm b/engine/events/specials_2.asm
similarity index 100%
rename from engine/events/special.asm
rename to engine/events/specials_2.asm
diff --git a/main.asm b/main.asm
index 724a55492..7a5ddca9d 100644
--- a/main.asm
+++ b/main.asm
@@ -14,7 +14,7 @@ INCLUDE "engine/math.asm"
 INCLUDE "data/items/attributes.asm"
 INCLUDE "engine/npc_movement.asm"
 INCLUDE "engine/events/happiness_egg.asm"
-INCLUDE "engine/events/special.asm"
+INCLUDE "engine/events/specials_2.asm"
 
 
 SECTION "bank2", ROMX
@@ -28,7 +28,7 @@ INCLUDE "engine/color.asm"
 SECTION "bank3", ROMX
 
 INCLUDE "engine/routines/checktime.asm"
-INCLUDE "engine/specials.asm"
+INCLUDE "engine/events/specials.asm"
 INCLUDE "engine/printnum.asm"
 INCLUDE "engine/health.asm"
 INCLUDE "engine/events/overworld.asm"

From d6b00d0cc177b3a94b477735fd165232614a6cee Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sun, 4 Feb 2018 13:16:40 -0500
Subject: [PATCH 113/135] Sync code with wiki

---
 engine/battle/core.asm            |  2 +-
 engine/battle/effect_commands.asm | 12 ++++++------
 engine/dma_transfer.asm           |  2 +-
 engine/events/map_name_sign.asm   |  2 +-
 engine/map_palettes.asm           |  8 ++++----
 engine/mystery_gift.asm           |  4 ++--
 lib/mobile/main.asm               | 16 ++++++++--------
 mobile/mobile_12.asm              |  2 +-
 mobile/mobile_46.asm              |  2 +-
 9 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 11016b8af..419129e10 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -4431,7 +4431,7 @@ HandleHPHealingItem: ; 3dd2f
 	ld c, a
 	dec de
 	ld a, [de]
-	adc $0
+	adc 0
 	ld [wBuffer6], a
 	ld b, a
 	ld a, [hld]
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm
index d4a3c9446..5a0c130bd 100644
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -4011,25 +4011,25 @@ BattleCommand_Poison: ; 35f2c
 
 	ld a, [hBattleTurn]
 	and a
-	jr z, .mimic_random
+	jr z, .dont_sample_failure
 
 	ld a, [wLinkMode]
 	and a
-	jr nz, .mimic_random
+	jr nz, .dont_sample_failure
 
 	ld a, [wInBattleTowerBattle]
 	and a
-	jr nz, .mimic_random
+	jr nz, .dont_sample_failure
 
 	ld a, [wPlayerSubStatus5]
 	bit SUBSTATUS_LOCK_ON, a
-	jr nz, .mimic_random
+	jr nz, .dont_sample_failure
 
 	call BattleRandom
 	cp 25 percent + 1 ; 25% chance AI fails
 	jr c, .failed
 
-.mimic_random
+.dont_sample_failure
 	call CheckSubstituteOpp
 	jr nz, .failed
 	ld a, [wAttackMissed]
@@ -6364,7 +6364,7 @@ BattleCommand_Paralyze: ; 36dc7
 	jr nz, .dont_sample_failure
 
 	call BattleRandom
-	cp 1 + 25 percent
+	cp 25 percent + 1 ; 25% chance AI fails
 	jr c, .failed
 
 .dont_sample_failure
diff --git a/engine/dma_transfer.asm b/engine/dma_transfer.asm
index b4a500545..e22adf69a 100755
--- a/engine/dma_transfer.asm
+++ b/engine/dma_transfer.asm
@@ -618,7 +618,7 @@ HDMATransfer_OnlyTopFourRows: ; 104303
 	add BG_MAP_WIDTH - SCREEN_WIDTH
 	ld l, a
 	ld a, h
-	adc $0
+	adc 0
 	ld h, a
 	dec b
 	jr nz, .outer_loop
diff --git a/engine/events/map_name_sign.asm b/engine/events/map_name_sign.asm
index b97d40798..385ddf802 100644
--- a/engine/events/map_name_sign.asm
+++ b/engine/events/map_name_sign.asm
@@ -85,7 +85,7 @@ ReturnFromMapSetupScript:: ; b8000
 	ret z
 	cp POWER_PLANT
 	ret z
-	ld a, $1
+	ld a, 1
 	and a
 	ret
 ; b8089
diff --git a/engine/map_palettes.asm b/engine/map_palettes.asm
index f8e23e058..a9d2b382f 100644
--- a/engine/map_palettes.asm
+++ b/engine/map_palettes.asm
@@ -14,7 +14,7 @@ SwapTextboxPalettes:: ; 4c000
 	add [hl]
 	ld l, a
 	ld a, [wTilesetPalettes + 1]
-	adc $0
+	adc 0
 	ld h, a
 	ld a, [hl]
 	and $f
@@ -25,7 +25,7 @@ SwapTextboxPalettes:: ; 4c000
 	add [hl]
 	ld l, a
 	ld a, [wTilesetPalettes + 1]
-	adc $0
+	adc 0
 	ld h, a
 	ld a, [hl]
 	swap a
@@ -58,7 +58,7 @@ ScrollBGMapPalettes:: ; 4c03f
 	add [hl]
 	ld l, a
 	ld a, [wTilesetPalettes + 1]
-	adc $0
+	adc 0
 	ld h, a
 	ld a, [hl]
 	and $f
@@ -69,7 +69,7 @@ ScrollBGMapPalettes:: ; 4c03f
 	add [hl]
 	ld l, a
 	ld a, [wTilesetPalettes + 1]
-	adc $0
+	adc 0
 	ld h, a
 	ld a, [hl]
 	swap a
diff --git a/engine/mystery_gift.asm b/engine/mystery_gift.asm
index 62332da05..9ffe1aa0e 100755
--- a/engine/mystery_gift.asm
+++ b/engine/mystery_gift.asm
@@ -867,7 +867,7 @@ Function104ed6: ; 104ed6 (41:4ed6)
 	add e
 	ld [hPrintNum5], a
 	ld a, [hPrintNum6]
-	adc $0
+	adc 0
 	ld [hPrintNum6], a
 .asm_104f02
 	xor a
@@ -1045,7 +1045,7 @@ Function104faf: ; 104faf (41:4faf)
 	add e
 	ld [hPrintNum5], a
 	ld a, [hPrintNum6]
-	adc $0
+	adc 0
 	ld [hPrintNum6], a
 	jr .asm_104fd2
 .asm_10501a
diff --git a/lib/mobile/main.asm b/lib/mobile/main.asm
index ef0b0edf3..a2ac008ca 100644
--- a/lib/mobile/main.asm
+++ b/lib/mobile/main.asm
@@ -60,7 +60,7 @@ Function11000f: ; 11000f
 	add c
 	ld c, a
 	ld a, b
-	adc $0
+	adc 0
 	ld b, a
 	ret
 ; 110029
@@ -1667,7 +1667,7 @@ Function110af4: ; 110af4
 	add c
 	ld [hli], a
 	ld a, b
-	adc $0
+	adc 0
 	ld [hl], a
 	xor a
 	ld [$c993], a
@@ -1708,8 +1708,8 @@ Function110af4: ; 110af4
 	ld a, [$c993]
 	add e
 	ld [hli], a
-	ld a, $0
-	adc $0
+	ld a, 0
+	adc 0
 	ld [hl], a
 	xor a
 	ld [$c993], a
@@ -2495,8 +2495,8 @@ Function111044: ; 111044
 	ld a, [$c991]
 	add e
 	ld [hli], a
-	ld a, $0
-	adc $0
+	ld a, 0
+	adc 0
 	ld [hl], a
 	xor a
 	ld [$c991], a
@@ -6829,7 +6829,7 @@ Function112bec: ; 112bec
 	add c
 	ld [$c82d], a
 	ld a, [$c82e]
-	adc $0
+	adc 0
 	ld [$c82e], a
 	ld hl, $c829
 	ld a, e
@@ -7549,7 +7549,7 @@ Function113095: ; 113095
 	add b
 	ld [hli], a
 	ld a, [hl]
-	adc $0
+	adc 0
 	ld [hl], a
 	ld c, b
 	pop hl
diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm
index c9f4f56e0..9e2e35dec 100755
--- a/mobile/mobile_12.asm
+++ b/mobile/mobile_12.asm
@@ -1798,7 +1798,7 @@ Function48d4a: ; 48d4a (12:4d4a)
 	add e
 	ld c, a
 	ld a, b
-	adc $0
+	adc 0
 	ld b, a
 	ld a, c
 	ld [hld], a
diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm
index e8a69a7de..03f0a2380 100755
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -7714,7 +7714,7 @@ Function11b879: ; 11b879
 	ld e, a
 	ld a, h
 	cpl
-	adc $0
+	adc 0
 	ld d, a
 	pop hl
 	add hl, de

From bc3cc697494d1212b8fed9273d72f0448f24b1d5 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sun, 4 Feb 2018 21:21:34 -0500
Subject: [PATCH 114/135] Consistent "X percent [+/- Y]" order

---
 engine/battle/ai/items.asm        | 32 +++++++++++++++----------------
 engine/battle/core.asm            | 14 +++++++-------
 engine/battle/effect_commands.asm |  4 ++--
 engine/events/daycare.asm         |  2 +-
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm
index 4d1eea2e8..060c53ad6 100644
--- a/engine/battle/ai/items.asm
+++ b/engine/battle/ai/items.asm
@@ -52,7 +52,7 @@ SwitchOften: ; 38045
 	cp $10
 	jr nz, .not_10
 	call Random
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	jr c, .switch
 	jp DontSwitch
 .not_10
@@ -60,7 +60,7 @@ SwitchOften: ; 38045
 	cp $20
 	jr nz, .not_20
 	call Random
-	cp -1 + 79 percent
+	cp 79 percent - 1
 	jr c, .switch
 	jp DontSwitch
 .not_20
@@ -103,7 +103,7 @@ SwitchRarely: ; 38083
 
 	; $30
 	call Random
-	cp -1 + 79 percent
+	cp 79 percent - 1
 	jp c, DontSwitch
 
 .switch
@@ -123,7 +123,7 @@ SwitchSometimes: ; 380c1
 	cp $10
 	jr nz, .not_10
 	call Random
-	cp -1 + 20 percent
+	cp 20 percent - 1
 	jr c, .switch
 	jp DontSwitch
 .not_10
@@ -131,14 +131,14 @@ SwitchSometimes: ; 380c1
 	cp $20
 	jr nz, .not_20
 	call Random
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	jr c, .switch
 	jp DontSwitch
 .not_20
 
 	; $30
 	call Random
-	cp -1 + 20 percent
+	cp 20 percent - 1
 	jp c, DontSwitch
 
 .switch
@@ -313,7 +313,7 @@ AI_Items: ; 39196
 	bit ALWAYS_USE_F, a
 	jp nz, .Use
 	call Random
-	cp -1 + 20 percent
+	cp 20 percent - 1
 	jp c, .Use
 	jp .DontUse
 
@@ -325,7 +325,7 @@ AI_Items: ; 39196
 	cp 4
 	jr c, .FailToxicCheck
 	call Random
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	jp c, .Use
 .FailToxicCheck:
 	ld a, [wEnemyMonStatus]
@@ -366,7 +366,7 @@ AI_Items: ; 39196
 	callfar AICheckEnemyQuarterHP
 	jp nc, .UseHealItem
 	call Random
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	jp c, .UseHealItem
 	jp .DontUse
 
@@ -374,7 +374,7 @@ AI_Items: ; 39196
 	callfar AICheckEnemyQuarterHP
 	jp c, .DontUse
 	call Random
-	cp -1 + 20 percent
+	cp 20 percent - 1
 	jp c, .DontUse
 	jr .UseHealItem
 
@@ -384,7 +384,7 @@ AI_Items: ; 39196
 	callfar AICheckEnemyQuarterHP
 	jp nc, .UseHealItem
 	call Random
-	cp -1 + 20 percent
+	cp 20 percent - 1
 	jp nc, .DontUse
 
 .UseHealItem: ; 38281 (e:4281)
@@ -442,7 +442,7 @@ AI_Items: ; 39196
 	bit UNKNOWN_USE_F, a
 	jp z, .Use
 	call Random
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	jp c, .Use
 
 .dont_use
@@ -454,7 +454,7 @@ AI_Items: ; 39196
 	bit UNKNOWN_USE_F, a
 	jp z, .DontUse
 	call Random
-	cp 1 + 39 percent
+	cp 39 percent + 1
 	jp c, .Use
 	jp .DontUse
 ; 382f9
@@ -516,13 +516,13 @@ AI_Items: ; 39196
 	bit ALWAYS_USE_F, a
 	jp nz, .Use
 	call Random
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	jp c, .DontUse
 	ld a, [bc]
 	bit CONTEXT_USE_F, a
 	jp nz, .Use
 	call Random
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	jp c, .DontUse
 	jp .Use
 .notfirstturnout
@@ -530,7 +530,7 @@ AI_Items: ; 39196
 	bit ALWAYS_USE_F, a
 	jp z, .DontUse
 	call Random
-	cp -1 + 20 percent
+	cp 20 percent - 1
 	jp nc, .DontUse
 	jp .Use
 
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 419129e10..a1ccc0340 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -463,13 +463,13 @@ DetermineMoveOrder: ; 3c314
 	jr z, .player_2
 
 	call BattleRandom
-	cp 1 + (50 percent)
+	cp 50 percent + 1
 	jp c, .player_first
 	jp .enemy_first
 
 .player_2
 	call BattleRandom
-	cp 1 + (50 percent)
+	cp 50 percent + 1
 	jp c, .enemy_first
 	jp .player_first
 
@@ -549,13 +549,13 @@ DetermineMoveOrder: ; 3c314
 	cp USING_INTERNAL_CLOCK
 	jr z, .player_2c
 	call BattleRandom
-	cp 1 + (50 percent)
+	cp 50 percent + 1
 	jp c, .player_first
 	jp .enemy_first
 
 .player_2c
 	call BattleRandom
-	cp 1 + (50 percent)
+	cp 50 percent + 1
 	jp c, .enemy_first
 .player_first
 	scf
@@ -791,7 +791,7 @@ TryEnemyFlee: ; 3c543
 
 	call BattleRandom
 	ld b, a
-	cp 1 + (50 percent)
+	cp 50 percent + 1
 	jr nc, .Stay
 
 	push bc
@@ -803,7 +803,7 @@ TryEnemyFlee: ; 3c543
 	jr c, .Flee
 
 	ld a, b
-	cp 1 + (10 percent)
+	cp 10 percent + 1
 	jr nc, .Stay
 
 	ld a, [wTempEnemyMonSpecies]
@@ -6177,7 +6177,7 @@ LoadEnemyMon: ; 3e8eb
 
 ; 25% chance of getting an item
 	call BattleRandom
-	cp 1 + (75 percent)
+	cp 75 percent + 1
 	ld a, NO_ITEM
 	jr c, .UpdateItem
 
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm
index 5a0c130bd..376624e44 100644
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -532,7 +532,7 @@ CheckEnemyTurn: ; 3421f
 
 	; 50% chance of hitting itself
 	call BattleRandom
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	jr nc, .not_confused
 
 	; clear confusion-dependent substatus
@@ -578,7 +578,7 @@ CheckEnemyTurn: ; 3421f
 
 	; 50% chance of infatuation
 	call BattleRandom
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	jr c, .not_infatuated
 
 	ld hl, InfatuationText
diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm
index 7da559e75..ddfa5b89c 100755
--- a/engine/events/daycare.asm
+++ b/engine/events/daycare.asm
@@ -665,7 +665,7 @@ DayCare_InitBreeding: ; 16a3b
 	cp NIDORAN_F
 	jr nz, .GotEggSpecies
 	call Random
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	ld a, NIDORAN_F
 	jr c, .GotEggSpecies
 	ld a, NIDORAN_M

From f8f32941306615879b42b2af8894e65d82ee4a16 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sun, 4 Feb 2018 21:39:46 -0500
Subject: [PATCH 115/135] Add ROOF_ constants

---
 data/maps/environment_colors.asm |  2 +-
 data/maps/roofs.asm              | 63 ++++++++++++++++++--------------
 gfx/tilesets/bg_tiles.pal        | 12 +-----
 3 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/data/maps/environment_colors.asm b/data/maps/environment_colors.asm
index aeddb83bc..3497b2b93 100644
--- a/data/maps/environment_colors.asm
+++ b/data/maps/environment_colors.asm
@@ -9,7 +9,7 @@ EnvironmentColorsPointers:
 	dw .IndoorColors  ; GATE
 	dw .DungeonColors ; DUNGEON
 
-; Valid indices: $00 - $29
+; Valid indices: $00 - $29 (see gfx/tilesets/bg_tiles.pal)
 .OutdoorColors:
 	db $00, $01, $02, $28, $04, $05, $06, $07 ; morn
 	db $08, $09, $0a, $28, $0c, $0d, $0e, $0f ; day
diff --git a/data/maps/roofs.asm b/data/maps/roofs.asm
index 2a1b8d3eb..8765cfa6a 100644
--- a/data/maps/roofs.asm
+++ b/data/maps/roofs.asm
@@ -1,36 +1,45 @@
+; MapGroupRoofs values; Roofs indexes
+	const_def
+	const ROOF_NEW_BARK  ; 0
+	const ROOF_VIOLET    ; 1
+	const ROOF_AZALEA    ; 2
+	const ROOF_OLIVINE   ; 3
+	const ROOF_GOLDENROD ; 4
+
 MapGroupRoofs: ; 1c021i
 ; entries correspond to map groups
 ; values are indexes for Roofs (see below)
-	db -1 ; group 0 (unused)
-	db  3 ; group 1 (Olivine)
-	db  2 ; group 2 (Mahogany)
-	db -1 ; group 3
-	db  1 ; group 4 (Ecruteak)
-	db  2 ; group 5 (Blackthorn)
-	db -1 ; group 6
-	db -1 ; group 7
-	db  2 ; group 8 (Azalea)
-	db  2 ; group 9 (Lake of Rage)
-	db  1 ; group 10 (Violet)
-	db  4 ; group 11 (Goldenrod)
-	db -1 ; group 12
-	db -1 ; group 13
-	db -1 ; group 14
-	db -1 ; group 15
-	db -1 ; group 16
-	db -1 ; group 17
-	db -1 ; group 18
-	db  0 ; group 19 (Silver Cave)
-	db -1 ; group 20
-	db -1 ; group 21
-	db  3 ; group 22 (Cianwood)
-	db -1 ; group 23
-	db  0 ; group 24 (New Bark)
-	db -1 ; group 25
-	db  0 ; group 26 (Cherrygrove)
+	db -1             ;  0
+	db ROOF_OLIVINE   ;  1 (Olivine)
+	db ROOF_AZALEA    ;  2 (Mahogany)
+	db -1             ;  3
+	db ROOF_VIOLET    ;  4 (Ecruteak)
+	db ROOF_AZALEA    ;  5 (Blackthorn)
+	db -1             ;  6
+	db -1             ;  7
+	db ROOF_AZALEA    ;  8 (Azalea)
+	db ROOF_AZALEA    ;  9 (Lake of Rage)
+	db ROOF_VIOLET    ; 10 (Violet)
+	db ROOF_GOLDENROD ; 11 (Goldenrod)
+	db -1             ; 12
+	db -1             ; 13
+	db -1             ; 14
+	db -1             ; 15
+	db -1             ; 16
+	db -1             ; 17
+	db -1             ; 18
+	db ROOF_NEW_BARK  ; 19 (Silver Cave)
+	db -1             ; 20
+	db -1             ; 21
+	db ROOF_OLIVINE   ; 22 (Cianwood)
+	db -1             ; 23
+	db ROOF_NEW_BARK  ; 24 (New Bark)
+	db -1             ; 25
+	db ROOF_NEW_BARK  ; 26 (Cherrygrove)
 ; 1c03c
 
 Roofs: ; 1c03c
+; entries correspond to ROOF_* constants
 INCBIN "gfx/tilesets/roofs/0.2bpp"
 INCBIN "gfx/tilesets/roofs/1.2bpp"
 INCBIN "gfx/tilesets/roofs/2.2bpp"
diff --git a/gfx/tilesets/bg_tiles.pal b/gfx/tilesets/bg_tiles.pal
index e21561c74..3605e2184 100644
--- a/gfx/tilesets/bg_tiles.pal
+++ b/gfx/tilesets/bg_tiles.pal
@@ -49,13 +49,5 @@
 	RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text
 
 ; overworld water
-; morn/day
-	RGB 23, 23, 31
-	RGB 18, 19, 31
-	RGB 13, 12, 31
-	RGB 07, 07, 07
-; nite
-	RGB 15, 13, 27
-	RGB 10, 09, 20
-	RGB 04, 03, 18
-	RGB 00, 00, 00
+	RGB 23,23,31, 18,19,31, 13,12,31, 07,07,07 ; morn/day
+	RGB 15,13,27, 10,09,20, 04,03,18, 00,00,00 ; nite

From 96c058f0a7c6864924a3aac7eed667a450c1dd71 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Mon, 5 Feb 2018 13:03:05 -0500
Subject: [PATCH 116/135] No redundant item effect labels

---
 data/items/attributes.asm   |   2 +-
 data/items/descriptions.asm |   1 +
 docs/bugs_and_glitches.md   |   8 +-
 engine/item_effects.asm     | 579 ++++++++++++++----------------------
 4 files changed, 225 insertions(+), 365 deletions(-)

diff --git a/data/items/attributes.asm b/data/items/attributes.asm
index 5212be6d2..d92c161aa 100644
--- a/data/items/attributes.asm
+++ b/data/items/attributes.asm
@@ -6,7 +6,7 @@ item_attribute: MACRO
 ENDM
 
 ItemAttributes: ; 67c1
-; entries correspond to constants/item_constants.asm
+; entries correspond to item ids
 ; MASTER_BALL
 	item_attribute 0, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; ULTRA_BALL
diff --git a/data/items/descriptions.asm b/data/items/descriptions.asm
index 20542b9e0..e0f009047 100644
--- a/data/items/descriptions.asm
+++ b/data/items/descriptions.asm
@@ -1,4 +1,5 @@
 ItemDescriptions:
+; entries correspond to item ids
 	dw MasterBallDesc
 	dw UltraBallDesc
 	dw BrightpowderDesc
diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index 382848fb9..4d60b81af 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -587,7 +587,7 @@ Text_StringBuffer2ExpPoints::
 
 ## BRN/PSN/PAR do not affect catch rate
 
-This is a bug with `PokeBall` in [engine/item_effects.asm](/engine/item_effects.asm):
+This is a bug with `PokeBallEffect` in [engine/item_effects.asm](/engine/item_effects.asm):
 
 ```asm
 ; This routine is buggy. It was intended that SLP and FRZ provide a higher
@@ -1135,7 +1135,7 @@ endr
 
 This bug can affect Mew or Pokémon other than Ditto that used Transform via Mirror Move or Sketch.
 
-This is a bug with `PokeBall` in [engine/item_effects.asm](/engine/item_effects.asm):
+This is a bug with `PokeBallEffect` in [engine/item_effects.asm](/engine/item_effects.asm):
 
 ```asm
 	ld hl, wEnemySubStatus5
@@ -1207,7 +1207,7 @@ This is a bug with `PokeBall` in [engine/item_effects.asm](/engine/item_effects.
 
 ([Video](https://www.youtube.com/watch?v=v1ErZdLCIyU))
 
-This is a bug with `ParkBall` in [engine/item_effects.asm](/engine/item_effects.asm):
+This is a bug with `PokeBallEffect` in [engine/item_effects.asm](/engine/item_effects.asm):
 
 ```asm
 .room_in_party
@@ -1232,7 +1232,7 @@ This is a bug with `ParkBall` in [engine/item_effects.asm](/engine/item_effects.
 
 ## `HELD_CATCH_CHANCE` has no effect
 
-This is a bug with `PokeBall` in [engine/item_effects.asm](/engine/item_effects.asm):
+This is a bug with `PokeBallEffect` in [engine/item_effects.asm](/engine/item_effects.asm):
 
 ```asm
 	; BUG: farcall overwrites a, and GetItemHeldEffect takes b anyway.
diff --git a/engine/item_effects.asm b/engine/item_effects.asm
index e37d84b88..d92694ae7 100644
--- a/engine/item_effects.asm
+++ b/engine/item_effects.asm
@@ -14,201 +14,190 @@ _DoItemEffect:: ; e722
 
 
 ItemEffects: ; e73c
-; entries correspond to item ids (see constants/item_constants.asm)
-	dw MasterBall
-	dw UltraBall
-	dw Brightpowder
-	dw GreatBall
-	dw PokeBall
-	dw TownMap
-	dw Bicycle
-	dw MoonStone
-	dw Antidote
-	dw BurnHeal
-	dw IceHeal
-	dw Awakening
-	dw ParlyzHeal
-	dw FullRestore
-	dw MaxPotion
-	dw HyperPotion
-	dw SuperPotion
-	dw Potion
-	dw EscapeRope
-	dw Repel
-	dw MaxElixer
-	dw FireStone
-	dw Thunderstone
-	dw WaterStone
-	dw Item19
-	dw HPUp
-	dw Protein
-	dw Iron
-	dw Carbos
-	dw LuckyPunch
-	dw Calcium
-	dw RareCandy
-	dw XAccuracy
-	dw LeafStone
-	dw MetalPowder
-	dw Nugget
-	dw PokeDoll
-	dw FullHeal
-	dw Revive
-	dw MaxRevive
-	dw GuardSpec
-	dw SuperRepel
-	dw MaxRepel
-	dw DireHit
-	dw Item2D
-	dw FreshWater
-	dw SodaPop
-	dw Lemonade
-	dw XAttack
-	dw Item32
-	dw XDefend
-	dw XSpeed
-	dw XSpecial
-	dw CoinCase
-	dw Itemfinder
-	dw PokeFlute
-	dw ExpShare
-	dw OldRod
-	dw GoodRod
-	dw SilverLeaf
-	dw SuperRod
-	dw PPUp
-	dw Ether
-	dw MaxEther
-	dw Elixer
-	dw RedScale
-	dw Secretpotion
-	dw SSTicket
-	dw MysteryEgg
-	dw ClearBell
-	dw SilverWing
-	dw MoomooMilk
-	dw QuickClaw
-	dw Psncureberry
-	dw GoldLeaf
-	dw SoftSand
-	dw SharpBeak
-	dw Przcureberry
-	dw BurntBerry
-	dw IceBerry
-	dw PoisonBarb
-	dw KingsRock
-	dw BitterBerry
-	dw MintBerry
-	dw RedApricorn
-	dw Tinymushroom
-	dw BigMushroom
-	dw Silverpowder
-	dw BluApricorn
-	dw Item5A
-	dw AmuletCoin
-	dw YlwApricorn
-	dw GrnApricorn
-	dw CleanseTag
-	dw MysticWater
-	dw Twistedspoon
-	dw WhtApricorn
-	dw Blackbelt
-	dw BlkApricorn
-	dw Item64
-	dw PnkApricorn
-	dw Blackglasses
-	dw Slowpoketail
-	dw PinkBow
-	dw Stick
-	dw SmokeBall
-	dw Nevermeltice
-	dw Magnet
-	dw Miracleberry
-	dw Pearl
-	dw BigPearl
-	dw Everstone
-	dw SpellTag
-	dw Ragecandybar
-	dw GsBall
-	dw BlueCard
-	dw MiracleSeed
-	dw ThickClub
-	dw FocusBand
-	dw Item78
-	dw Energypowder
-	dw EnergyRoot
-	dw HealPowder
-	dw RevivalHerb
-	dw HardStone
-	dw LuckyEgg
-	dw CardKey
-	dw MachinePart
-	dw EggTicket
-	dw LostItem
-	dw Stardust
-	dw StarPiece
-	dw BasementKey
-	dw Pass
-	dw Item87
-	dw Item88
-	dw Item89
-	dw Charcoal
-	dw BerryJuice
-	dw ScopeLens
-	dw Item8D
-	dw Item8E
-	dw MetalCoat
-	dw DragonFang
-	dw Item91
-	dw Leftovers
-	dw Item93
-	dw Item94
-	dw Item95
-	dw Mysteryberry
-	dw DragonScale
-	dw BerserkGene
-	dw Item99
-	dw Item9A
-	dw Item9B
-	dw SacredAsh
-	dw HeavyBall
-	dw FlowerMail
-	dw LevelBall
-	dw LureBall
-	dw FastBall
-	dw ItemA2
-	dw LightBall
-	dw FriendBall
-	dw MoonBall
-	dw LoveBall
-	dw NormalBox
-	dw GorgeousBox
-	dw SunStone
-	dw PolkadotBow
-	dw ItemAB
-	dw UpGrade
-	dw Berry
-	dw GoldBerry
-	dw Squirtbottle
-	dw ItemB0
-	dw ParkBall
-	dw RainbowWing
-	dw ItemB3
+; entries correspond to item ids
+	dw PokeBallEffect        ; NO_ITEM
+	dw PokeBallEffect        ; MASTER_BALL
+	dw ItemDoesNothingEffect ; ULTRA_BALL
+	dw PokeBallEffect        ; BRIGHTPOWDER
+	dw PokeBallEffect        ; GREAT_BALL
+	dw TownMapEffect         ; POKE_BALL
+	dw BicycleEffect         ; TOWN_MAP
+	dw EvoStoneEffect        ; BICYCLE
+	dw StatusHealingEffect   ; MOON_STONE
+	dw StatusHealingEffect   ; ANTIDOTE
+	dw StatusHealingEffect   ; BURN_HEAL
+	dw StatusHealingEffect   ; ICE_HEAL
+	dw StatusHealingEffect   ; AWAKENING
+	dw FullRestoreEffect     ; PARLYZ_HEAL
+	dw RestoreHPEffect       ; FULL_RESTORE
+	dw RestoreHPEffect       ; MAX_POTION
+	dw RestoreHPEffect       ; HYPER_POTION
+	dw RestoreHPEffect       ; SUPER_POTION
+	dw EscapeRopeEffect      ; POTION
+	dw RepelEffect           ; ESCAPE_ROPE
+	dw RestorePPEffect       ; REPEL
+	dw EvoStoneEffect        ; MAX_ELIXER
+	dw EvoStoneEffect        ; FIRE_STONE
+	dw EvoStoneEffect        ; THUNDERSTONE
+	dw ItemDoesNothingEffect ; WATER_STONE
+	dw VitaminEffect         ; ITEM_19
+	dw VitaminEffect         ; HP_UP
+	dw VitaminEffect         ; PROTEIN
+	dw VitaminEffect         ; IRON
+	dw ItemDoesNothingEffect ; CARBOS
+	dw VitaminEffect         ; LUCKY_PUNCH
+	dw RareCandyEffect       ; CALCIUM
+	dw XAccuracyEffect       ; RARE_CANDY
+	dw EvoStoneEffect        ; X_ACCURACY
+	dw ItemDoesNothingEffect ; LEAF_STONE
+	dw ItemDoesNothingEffect ; METAL_POWDER
+	dw PokeDollEffect        ; NUGGET
+	dw StatusHealingEffect   ; POKE_DOLL
+	dw ReviveEffect          ; FULL_HEAL
+	dw ReviveEffect          ; REVIVE
+	dw GuardSpecEffect       ; MAX_REVIVE
+	dw SuperRepelEffect      ; GUARD_SPEC
+	dw MaxRepelEffect        ; SUPER_REPEL
+	dw DireHitEffect         ; MAX_REPEL
+	dw ItemDoesNothingEffect ; DIRE_HIT
+	dw RestoreHPEffect       ; ITEM_2D
+	dw RestoreHPEffect       ; FRESH_WATER
+	dw RestoreHPEffect       ; SODA_POP
+	dw XItemEffect           ; LEMONADE
+	dw ItemDoesNothingEffect ; X_ATTACK
+	dw XItemEffect           ; ITEM_32
+	dw XItemEffect           ; X_DEFEND
+	dw XItemEffect           ; X_SPEED
+	dw CoinCaseEffect        ; X_SPECIAL
+	dw ItemfinderEffect      ; COIN_CASE
+	dw PokeFluteEffect       ; ITEMFINDER
+	dw ItemDoesNothingEffect ; POKE_FLUTE
+	dw OldRodEffect          ; EXP_SHARE
+	dw GoodRodEffect         ; OLD_ROD
+	dw ItemDoesNothingEffect ; GOOD_ROD
+	dw SuperRodEffect        ; SILVER_LEAF
+	dw RestorePPEffect       ; SUPER_ROD
+	dw RestorePPEffect       ; PP_UP
+	dw RestorePPEffect       ; ETHER
+	dw RestorePPEffect       ; MAX_ETHER
+	dw ItemDoesNothingEffect ; ELIXER
+	dw ItemDoesNothingEffect ; RED_SCALE
+	dw ItemDoesNothingEffect ; SECRETPOTION
+	dw ItemDoesNothingEffect ; S_S_TICKET
+	dw ItemDoesNothingEffect ; MYSTERY_EGG
+	dw ItemDoesNothingEffect ; CLEAR_BELL
+	dw RestoreHPEffect       ; SILVER_WING
+	dw ItemDoesNothingEffect ; MOOMOO_MILK
+	dw StatusHealingEffect   ; QUICK_CLAW
+	dw ItemDoesNothingEffect ; PSNCUREBERRY
+	dw ItemDoesNothingEffect ; GOLD_LEAF
+	dw ItemDoesNothingEffect ; SOFT_SAND
+	dw StatusHealingEffect   ; SHARP_BEAK
+	dw StatusHealingEffect   ; PRZCUREBERRY
+	dw StatusHealingEffect   ; BURNT_BERRY
+	dw ItemDoesNothingEffect ; ICE_BERRY
+	dw ItemDoesNothingEffect ; POISON_BARB
+	dw BitterBerryEffect     ; KINGS_ROCK
+	dw StatusHealingEffect   ; BITTER_BERRY
+	dw ItemDoesNothingEffect ; MINT_BERRY
+	dw ItemDoesNothingEffect ; RED_APRICORN
+	dw ItemDoesNothingEffect ; TINYMUSHROOM
+	dw ItemDoesNothingEffect ; BIG_MUSHROOM
+	dw ItemDoesNothingEffect ; SILVERPOWDER
+	dw ItemDoesNothingEffect ; BLU_APRICORN
+	dw ItemDoesNothingEffect ; ITEM_5A
+	dw ItemDoesNothingEffect ; AMULET_COIN
+	dw ItemDoesNothingEffect ; YLW_APRICORN
+	dw ItemDoesNothingEffect ; GRN_APRICORN
+	dw ItemDoesNothingEffect ; CLEANSE_TAG
+	dw ItemDoesNothingEffect ; MYSTIC_WATER
+	dw ItemDoesNothingEffect ; TWISTEDSPOON
+	dw ItemDoesNothingEffect ; WHT_APRICORN
+	dw ItemDoesNothingEffect ; BLACKBELT
+	dw ItemDoesNothingEffect ; BLK_APRICORN
+	dw ItemDoesNothingEffect ; ITEM_64
+	dw ItemDoesNothingEffect ; PNK_APRICORN
+	dw ItemDoesNothingEffect ; BLACKGLASSES
+	dw ItemDoesNothingEffect ; SLOWPOKETAIL
+	dw ItemDoesNothingEffect ; PINK_BOW
+	dw ItemDoesNothingEffect ; STICK
+	dw ItemDoesNothingEffect ; SMOKE_BALL
+	dw ItemDoesNothingEffect ; NEVERMELTICE
+	dw StatusHealingEffect   ; MAGNET
+	dw ItemDoesNothingEffect ; MIRACLEBERRY
+	dw ItemDoesNothingEffect ; PEARL
+	dw ItemDoesNothingEffect ; BIG_PEARL
+	dw ItemDoesNothingEffect ; EVERSTONE
+	dw RestoreHPEffect       ; SPELL_TAG
+	dw ItemDoesNothingEffect ; RAGECANDYBAR
+	dw BlueCardEffect        ; GS_BALL
+	dw ItemDoesNothingEffect ; BLUE_CARD
+	dw ItemDoesNothingEffect ; MIRACLE_SEED
+	dw ItemDoesNothingEffect ; THICK_CLUB
+	dw ItemDoesNothingEffect ; FOCUS_BAND
+	dw EnergypowderEffect    ; ITEM_78
+	dw EnergyRootEffect      ; ENERGYPOWDER
+	dw HealPowderEffect      ; ENERGY_ROOT
+	dw RevivalHerbEffect     ; HEAL_POWDER
+	dw ItemDoesNothingEffect ; REVIVAL_HERB
+	dw ItemDoesNothingEffect ; HARD_STONE
+	dw CardKeyEffect         ; LUCKY_EGG
+	dw ItemDoesNothingEffect ; CARD_KEY
+	dw ItemDoesNothingEffect ; MACHINE_PART
+	dw ItemDoesNothingEffect ; EGG_TICKET
+	dw ItemDoesNothingEffect ; LOST_ITEM
+	dw ItemDoesNothingEffect ; STARDUST
+	dw BasementKeyEffect     ; STAR_PIECE
+	dw ItemDoesNothingEffect ; BASEMENT_KEY
+	dw ItemDoesNothingEffect ; PASS
+	dw ItemDoesNothingEffect ; ITEM_87
+	dw ItemDoesNothingEffect ; ITEM_88
+	dw ItemDoesNothingEffect ; ITEM_89
+	dw RestoreHPEffect       ; CHARCOAL
+	dw ItemDoesNothingEffect ; BERRY_JUICE
+	dw ItemDoesNothingEffect ; SCOPE_LENS
+	dw ItemDoesNothingEffect ; ITEM_8D
+	dw ItemDoesNothingEffect ; ITEM_8E
+	dw ItemDoesNothingEffect ; METAL_COAT
+	dw ItemDoesNothingEffect ; DRAGON_FANG
+	dw ItemDoesNothingEffect ; ITEM_91
+	dw ItemDoesNothingEffect ; LEFTOVERS
+	dw ItemDoesNothingEffect ; ITEM_93
+	dw ItemDoesNothingEffect ; ITEM_94
+	dw RestorePPEffect       ; ITEM_95
+	dw ItemDoesNothingEffect ; MYSTERYBERRY
+	dw ItemDoesNothingEffect ; DRAGON_SCALE
+	dw ItemDoesNothingEffect ; BERSERK_GENE
+	dw ItemDoesNothingEffect ; ITEM_99
+	dw ItemDoesNothingEffect ; ITEM_9A
+	dw SacredAshEffect       ; ITEM_9B
+	dw PokeBallEffect        ; SACRED_ASH
+	dw ItemDoesNothingEffect ; HEAVY_BALL
+	dw PokeBallEffect        ; FLOWER_MAIL
+	dw PokeBallEffect        ; LEVEL_BALL
+	dw PokeBallEffect        ; LURE_BALL
+	dw ItemDoesNothingEffect ; FAST_BALL
+	dw ItemDoesNothingEffect ; ITEM_A2
+	dw PokeBallEffect        ; LIGHT_BALL
+	dw PokeBallEffect        ; FRIEND_BALL
+	dw PokeBallEffect        ; MOON_BALL
+	dw NormalBoxEffect       ; LOVE_BALL
+	dw GorgeousBoxEffect     ; NORMAL_BOX
+	dw EvoStoneEffect        ; GORGEOUS_BOX
+	dw ItemDoesNothingEffect ; SUN_STONE
+	dw ItemDoesNothingEffect ; POLKADOT_BOW
+	dw ItemDoesNothingEffect ; ITEM_AB
+	dw RestoreHPEffect       ; UP_GRADE
+	dw RestoreHPEffect       ; BERRY
+	dw SquirtbottleEffect    ; GOLD_BERRY
+	dw ItemDoesNothingEffect ; SQUIRTBOTTLE
+	dw PokeBallEffect        ; ITEM_B0
+	dw ItemDoesNothingEffect ; PARK_BALL
+	dw ItemDoesNothingEffect ; RAINBOW_WING
 ; e8a2
 
 
-MasterBall:
-UltraBall:
-GreatBall:
-PokeBall:
-HeavyBall:
-LevelBall:
-LureBall:
-FastBall:
-FriendBall:
-MoonBall:
-LoveBall:
-ParkBall: ; e8a2
+PokeBallEffect: ; e8a2
 	ld a, [wBattleMode]
 	dec a
 	jp nz, UseBallInTrainerBattle
@@ -1158,24 +1147,19 @@ ReturnToBattle_UseBall: ; edfa (3:6dfa)
 	farcall _ReturnToBattle_UseBall
 	ret
 
-TownMap: ; ee01
+TownMapEffect: ; ee01
 	farcall PokegearMap
 	ret
 ; ee08
 
 
-Bicycle: ; ee08
+BicycleEffect: ; ee08
 	farcall BikeFunction
 	ret
 ; ee0f
 
 
-MoonStone:
-FireStone:
-Thunderstone:
-WaterStone:
-LeafStone:
-SunStone: ; ee0f
+EvoStoneEffect: ; ee0f
 	ld b, PARTYMENUACTION_EVO_STONE
 	call UseItem_SelectMon
 
@@ -1208,11 +1192,7 @@ SunStone: ; ee0f
 ; ee3d
 
 
-HPUp:
-Protein:
-Iron:
-Carbos:
-Calcium: ; ee3d
+VitaminEffect: ; ee3d
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 
@@ -1345,7 +1325,7 @@ RareCandy_StatBooster_GetParameters: ; eef5
 ; 0xef14
 
 
-RareCandy: ; ef14
+RareCandyEffect: ; ef14
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 
@@ -1437,7 +1417,7 @@ RareCandy: ; ef14
 ; efad
 
 
-HealPowder: ; efad
+HealPowderEffect: ; efad
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 
@@ -1459,18 +1439,7 @@ HealPowder: ; efad
 ; efcc
 
 
-Antidote:
-BurnHeal:
-IceHeal:
-Awakening:
-ParlyzHeal:
-FullHeal:
-Psncureberry:
-Przcureberry:
-BurntBerry:
-IceBerry:
-MintBerry:
-Miracleberry: ; efcc
+StatusHealingEffect: ; efcc
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 	jp c, StatusHealer_ExitMenu
@@ -1590,7 +1559,7 @@ StatusHealer_Jumptable: ; f09e (3:709e)
 	dw StatusHealer_ExitMenu
 
 
-RevivalHerb: ; f0a9
+RevivalHerbEffect: ; f0a9
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 	jp c, StatusHealer_ExitMenu
@@ -1609,8 +1578,7 @@ RevivalHerb: ; f0a9
 ; f0c8
 
 
-Revive:
-MaxRevive: ; f0c8
+ReviveEffect: ; f0c8
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 	jp c, StatusHealer_ExitMenu
@@ -1668,7 +1636,7 @@ RevivePokemon: ; f0d6
 ; f128
 
 
-FullRestore: ; f128
+FullRestoreEffect: ; f128
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 	jp c, StatusHealer_ExitMenu
@@ -1708,7 +1676,7 @@ FullRestore: ; f128
 ; f16a
 
 
-BitterBerry: ; f16a
+BitterBerryEffect: ; f16a
 	ld hl, wPlayerSubStatus3
 	bit SUBSTATUS_CONFUSED, [hl]
 	ld a, 1
@@ -1729,29 +1697,18 @@ BitterBerry: ; f16a
 ; f186
 
 
-MaxPotion:
-HyperPotion:
-SuperPotion:
-Potion:
-FreshWater:
-SodaPop:
-Lemonade:
-MoomooMilk:
-Ragecandybar:
-BerryJuice:
-Berry:
-GoldBerry: ; f186
+RestoreHPEffect: ; f186
 	call ItemRestoreHP
 	jp StatusHealer_Jumptable
 ; f18c
 
 
-Energypowder: ; f18c
+EnergypowderEffect: ; f18c
 	ld c, HAPPINESS_BITTERPOWDER
 	jr EnergypowderEnergyRootCommon
 ; f190
 
-EnergyRoot: ; f190
+EnergyRootEffect: ; f190
 	ld c, HAPPINESS_ENERGYROOT
 ; f192
 
@@ -2179,7 +2136,7 @@ Softboiled_MilkDrinkFunction: ; f3df (3:73df)
 ; 0xf44f
 
 
-EscapeRope: ; f44f
+EscapeRopeEffect: ; f44f
 	xor a
 	ld [wItemEffectSucceeded], a
 	farcall EscapeRopeFunction
@@ -2191,17 +2148,17 @@ EscapeRope: ; f44f
 ; f462
 
 
-SuperRepel: ; f462
+SuperRepelEffect: ; f462
 	ld b, 200
 	jr UseRepel
 ; f466
 
-MaxRepel: ; f466
+MaxRepelEffect: ; f466
 	ld b, 250
 	jr UseRepel
 ; f466
 
-Repel: ; f46a
+RepelEffect: ; f46a
 	ld b, 100
 ; f46c
 
@@ -2223,7 +2180,7 @@ TextJump_RepelUsedEarlierIsStillInEffect: ; 0xf47d
 ; 0xf482
 
 
-XAccuracy: ; f482
+XAccuracyEffect: ; f482
 	ld hl, wPlayerSubStatus4
 	bit SUBSTATUS_X_ACCURACY, [hl]
 	jp nz, WontHaveAnyEffect_NotUsedMessage
@@ -2232,7 +2189,7 @@ XAccuracy: ; f482
 ; f48f
 
 
-PokeDoll: ; f48f
+PokeDollEffect: ; f48f
 	ld a, [wBattleMode]
 	dec a
 	jr nz, .asm_f4a6
@@ -2251,7 +2208,7 @@ PokeDoll: ; f48f
 ; f4ab
 
 
-GuardSpec: ; f4ab
+GuardSpecEffect: ; f4ab
 	ld hl, wPlayerSubStatus4
 	bit SUBSTATUS_MIST, [hl]
 	jp nz, WontHaveAnyEffect_NotUsedMessage
@@ -2260,7 +2217,7 @@ GuardSpec: ; f4ab
 ; f4b8
 
 
-DireHit: ; f4b8
+DireHitEffect: ; f4b8
 	ld hl, wPlayerSubStatus4
 	bit SUBSTATUS_FOCUS_ENERGY, [hl]
 	jp nz, WontHaveAnyEffect_NotUsedMessage
@@ -2269,10 +2226,7 @@ DireHit: ; f4b8
 ; f4c5
 
 
-XAttack:
-XDefend:
-XSpeed:
-XSpecial: ; f4c5
+XItemEffect: ; f4c5
 	call UseItemText
 
 	ld a, [wCurItem]
@@ -2308,7 +2262,7 @@ XSpecial: ; f4c5
 INCLUDE "data/items/x_stats.asm"
 
 
-PokeFlute: ; f50c
+PokeFluteEffect: ; f50c
 	ld a, [wBattleMode]
 	and a
 	jr nz, .dummy
@@ -2406,7 +2360,7 @@ PokeFlute: ; f50c
 ; f58f
 
 
-BlueCard: ; f58f
+BlueCardEffect: ; f58f
 	ld hl, .bluecardtext
 	jp MenuTextBoxWaitButton
 
@@ -2416,7 +2370,7 @@ BlueCard: ; f58f
 ; f59a
 
 
-CoinCase: ; f59a
+CoinCaseEffect: ; f59a
 	ld hl, .coincasetext
 	jp MenuTextBoxWaitButton
 
@@ -2426,17 +2380,17 @@ CoinCase: ; f59a
 ; f5a5
 
 
-OldRod: ; f5a5
+OldRodEffect: ; f5a5
 	ld e, $0
 	jr UseRod
 ; f5a9
 
-GoodRod: ; f5a9
+GoodRodEffect: ; f5a9
 	ld e, $1
 	jr UseRod
 ; f5ad
 
-SuperRod: ; f5ad
+SuperRodEffect: ; f5ad
 	ld e, $2
 	jr UseRod
 ; f5b1
@@ -2447,18 +2401,13 @@ UseRod: ; f5b1
 ; f5b8
 
 
-Itemfinder: ; f5b8
+ItemfinderEffect: ; f5b8
 	farcall ItemFinder
 	ret
 ; f5bf
 
 
-MaxElixer:
-PPUp:
-Ether:
-MaxEther:
-Elixer:
-Mysteryberry: ; f5bf
+RestorePPEffect: ; f5bf
 	ld a, [wCurItem]
 	ld [wd002], a
 
@@ -2724,25 +2673,25 @@ UnknownText_0xf739: ; 0xf739
 ; 0xf73e
 
 
-Squirtbottle: ; f73e
+SquirtbottleEffect: ; f73e
 	farcall _Squirtbottle
 	ret
 ; f745
 
 
-CardKey: ; f745
+CardKeyEffect: ; f745
 	farcall _CardKey
 	ret
 ; f74c
 
 
-BasementKey: ; f74c
+BasementKeyEffect: ; f74c
 	farcall _BasementKey
 	ret
 ; f753
 
 
-SacredAsh: ; f753
+SacredAshEffect: ; f753
 	farcall _SacredAsh
 	ld a, [wItemEffectSucceeded]
 	cp $1
@@ -2752,12 +2701,12 @@ SacredAsh: ; f753
 ; f763
 
 
-NormalBox: ; f763
+NormalBoxEffect: ; f763
 	ld c, DECOFLAG_SILVER_TROPHY_DOLL
 	jr OpenBox
 ; f767
 
-GorgeousBox: ; f767
+GorgeousBoxEffect: ; f767
 	ld c, DECOFLAG_GOLD_TROPHY_DOLL
 OpenBox: ; f769
 	farcall SetSpecificDecorationFlag
@@ -2774,97 +2723,7 @@ OpenBox: ; f769
 	db "@"
 ; 0xf77d
 
-Brightpowder:
-Item19:
-LuckyPunch:
-MetalPowder:
-Nugget:
-Item2D:
-Item32:
-ExpShare:
-SilverLeaf:
-RedScale:
-Secretpotion:
-SSTicket:
-MysteryEgg:
-ClearBell:
-SilverWing:
-QuickClaw:
-GoldLeaf:
-SoftSand:
-SharpBeak:
-PoisonBarb:
-KingsRock:
-RedApricorn:
-Tinymushroom:
-BigMushroom:
-Silverpowder:
-BluApricorn:
-Item5A:
-AmuletCoin:
-YlwApricorn:
-GrnApricorn:
-CleanseTag:
-MysticWater:
-Twistedspoon:
-WhtApricorn:
-Blackbelt:
-BlkApricorn:
-Item64:
-PnkApricorn:
-Blackglasses:
-Slowpoketail:
-PinkBow:
-Stick:
-SmokeBall:
-Nevermeltice:
-Magnet:
-Pearl:
-BigPearl:
-Everstone:
-SpellTag:
-GsBall:
-MiracleSeed:
-ThickClub:
-FocusBand:
-Item78:
-HardStone:
-LuckyEgg:
-MachinePart:
-EggTicket:
-LostItem:
-Stardust:
-StarPiece:
-Pass:
-Item87:
-Item88:
-Item89:
-Charcoal:
-ScopeLens:
-Item8D:
-Item8E:
-MetalCoat:
-DragonFang:
-Item91:
-Leftovers:
-Item93:
-Item94:
-Item95:
-DragonScale:
-BerserkGene:
-Item99:
-Item9A:
-Item9B:
-FlowerMail:
-ItemA2:
-LightBall:
-PolkadotBow:
-ItemAB:
-UpGrade:
-ItemB0:
-RainbowWing:
-ItemB3:
-TeruSama: ; f77d
+ItemDoesNothingEffect: ; f77d
 	jp IsntTheTimeMessage
 ; f780
 

From c648a6ced975f6dc7cc4ba3a5a1cb2de39d692a4 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Mon, 5 Feb 2018 13:05:26 -0500
Subject: [PATCH 117/135] Off by one

---
 engine/item_effects.asm | 172 ++++++++++++++++++++--------------------
 1 file changed, 86 insertions(+), 86 deletions(-)

diff --git a/engine/item_effects.asm b/engine/item_effects.asm
index d92694ae7..84f537243 100644
--- a/engine/item_effects.asm
+++ b/engine/item_effects.asm
@@ -15,91 +15,90 @@ _DoItemEffect:: ; e722
 
 ItemEffects: ; e73c
 ; entries correspond to item ids
-	dw PokeBallEffect        ; NO_ITEM
 	dw PokeBallEffect        ; MASTER_BALL
-	dw ItemDoesNothingEffect ; ULTRA_BALL
-	dw PokeBallEffect        ; BRIGHTPOWDER
+	dw PokeBallEffect        ; ULTRA_BALL
+	dw ItemDoesNothingEffect ; BRIGHTPOWDER
 	dw PokeBallEffect        ; GREAT_BALL
-	dw TownMapEffect         ; POKE_BALL
-	dw BicycleEffect         ; TOWN_MAP
-	dw EvoStoneEffect        ; BICYCLE
-	dw StatusHealingEffect   ; MOON_STONE
+	dw PokeBallEffect        ; POKE_BALL
+	dw TownMapEffect         ; TOWN_MAP
+	dw BicycleEffect         ; BICYCLE
+	dw EvoStoneEffect        ; MOON_STONE
 	dw StatusHealingEffect   ; ANTIDOTE
 	dw StatusHealingEffect   ; BURN_HEAL
 	dw StatusHealingEffect   ; ICE_HEAL
 	dw StatusHealingEffect   ; AWAKENING
-	dw FullRestoreEffect     ; PARLYZ_HEAL
-	dw RestoreHPEffect       ; FULL_RESTORE
+	dw StatusHealingEffect   ; PARLYZ_HEAL
+	dw FullRestoreEffect     ; FULL_RESTORE
 	dw RestoreHPEffect       ; MAX_POTION
 	dw RestoreHPEffect       ; HYPER_POTION
 	dw RestoreHPEffect       ; SUPER_POTION
-	dw EscapeRopeEffect      ; POTION
-	dw RepelEffect           ; ESCAPE_ROPE
-	dw RestorePPEffect       ; REPEL
-	dw EvoStoneEffect        ; MAX_ELIXER
+	dw RestoreHPEffect       ; POTION
+	dw EscapeRopeEffect      ; ESCAPE_ROPE
+	dw RepelEffect           ; REPEL
+	dw RestorePPEffect       ; MAX_ELIXER
 	dw EvoStoneEffect        ; FIRE_STONE
 	dw EvoStoneEffect        ; THUNDERSTONE
-	dw ItemDoesNothingEffect ; WATER_STONE
-	dw VitaminEffect         ; ITEM_19
+	dw EvoStoneEffect        ; WATER_STONE
+	dw ItemDoesNothingEffect ; ITEM_19
 	dw VitaminEffect         ; HP_UP
 	dw VitaminEffect         ; PROTEIN
 	dw VitaminEffect         ; IRON
-	dw ItemDoesNothingEffect ; CARBOS
-	dw VitaminEffect         ; LUCKY_PUNCH
-	dw RareCandyEffect       ; CALCIUM
-	dw XAccuracyEffect       ; RARE_CANDY
-	dw EvoStoneEffect        ; X_ACCURACY
-	dw ItemDoesNothingEffect ; LEAF_STONE
+	dw VitaminEffect         ; CARBOS
+	dw ItemDoesNothingEffect ; LUCKY_PUNCH
+	dw VitaminEffect         ; CALCIUM
+	dw RareCandyEffect       ; RARE_CANDY
+	dw XAccuracyEffect       ; X_ACCURACY
+	dw EvoStoneEffect        ; LEAF_STONE
 	dw ItemDoesNothingEffect ; METAL_POWDER
-	dw PokeDollEffect        ; NUGGET
-	dw StatusHealingEffect   ; POKE_DOLL
-	dw ReviveEffect          ; FULL_HEAL
+	dw ItemDoesNothingEffect ; NUGGET
+	dw PokeDollEffect        ; POKE_DOLL
+	dw StatusHealingEffect   ; FULL_HEAL
 	dw ReviveEffect          ; REVIVE
-	dw GuardSpecEffect       ; MAX_REVIVE
-	dw SuperRepelEffect      ; GUARD_SPEC
-	dw MaxRepelEffect        ; SUPER_REPEL
-	dw DireHitEffect         ; MAX_REPEL
-	dw ItemDoesNothingEffect ; DIRE_HIT
-	dw RestoreHPEffect       ; ITEM_2D
+	dw ReviveEffect          ; MAX_REVIVE
+	dw GuardSpecEffect       ; GUARD_SPEC
+	dw SuperRepelEffect      ; SUPER_REPEL
+	dw MaxRepelEffect        ; MAX_REPEL
+	dw DireHitEffect         ; DIRE_HIT
+	dw ItemDoesNothingEffect ; ITEM_2D
 	dw RestoreHPEffect       ; FRESH_WATER
 	dw RestoreHPEffect       ; SODA_POP
-	dw XItemEffect           ; LEMONADE
-	dw ItemDoesNothingEffect ; X_ATTACK
-	dw XItemEffect           ; ITEM_32
+	dw RestoreHPEffect       ; LEMONADE
+	dw XItemEffect           ; X_ATTACK
+	dw ItemDoesNothingEffect ; ITEM_32
 	dw XItemEffect           ; X_DEFEND
 	dw XItemEffect           ; X_SPEED
-	dw CoinCaseEffect        ; X_SPECIAL
-	dw ItemfinderEffect      ; COIN_CASE
-	dw PokeFluteEffect       ; ITEMFINDER
-	dw ItemDoesNothingEffect ; POKE_FLUTE
-	dw OldRodEffect          ; EXP_SHARE
-	dw GoodRodEffect         ; OLD_ROD
-	dw ItemDoesNothingEffect ; GOOD_ROD
-	dw SuperRodEffect        ; SILVER_LEAF
-	dw RestorePPEffect       ; SUPER_ROD
+	dw XItemEffect           ; X_SPECIAL
+	dw CoinCaseEffect        ; COIN_CASE
+	dw ItemfinderEffect      ; ITEMFINDER
+	dw PokeFluteEffect       ; POKE_FLUTE
+	dw ItemDoesNothingEffect ; EXP_SHARE
+	dw OldRodEffect          ; OLD_ROD
+	dw GoodRodEffect         ; GOOD_ROD
+	dw ItemDoesNothingEffect ; SILVER_LEAF
+	dw SuperRodEffect        ; SUPER_ROD
 	dw RestorePPEffect       ; PP_UP
 	dw RestorePPEffect       ; ETHER
 	dw RestorePPEffect       ; MAX_ETHER
-	dw ItemDoesNothingEffect ; ELIXER
+	dw RestorePPEffect       ; ELIXER
 	dw ItemDoesNothingEffect ; RED_SCALE
 	dw ItemDoesNothingEffect ; SECRETPOTION
 	dw ItemDoesNothingEffect ; S_S_TICKET
 	dw ItemDoesNothingEffect ; MYSTERY_EGG
 	dw ItemDoesNothingEffect ; CLEAR_BELL
-	dw RestoreHPEffect       ; SILVER_WING
-	dw ItemDoesNothingEffect ; MOOMOO_MILK
-	dw StatusHealingEffect   ; QUICK_CLAW
-	dw ItemDoesNothingEffect ; PSNCUREBERRY
+	dw ItemDoesNothingEffect ; SILVER_WING
+	dw RestoreHPEffect       ; MOOMOO_MILK
+	dw ItemDoesNothingEffect ; QUICK_CLAW
+	dw StatusHealingEffect   ; PSNCUREBERRY
 	dw ItemDoesNothingEffect ; GOLD_LEAF
 	dw ItemDoesNothingEffect ; SOFT_SAND
-	dw StatusHealingEffect   ; SHARP_BEAK
+	dw ItemDoesNothingEffect ; SHARP_BEAK
 	dw StatusHealingEffect   ; PRZCUREBERRY
 	dw StatusHealingEffect   ; BURNT_BERRY
-	dw ItemDoesNothingEffect ; ICE_BERRY
+	dw StatusHealingEffect   ; ICE_BERRY
 	dw ItemDoesNothingEffect ; POISON_BARB
-	dw BitterBerryEffect     ; KINGS_ROCK
-	dw StatusHealingEffect   ; BITTER_BERRY
-	dw ItemDoesNothingEffect ; MINT_BERRY
+	dw ItemDoesNothingEffect ; KINGS_ROCK
+	dw BitterBerryEffect     ; BITTER_BERRY
+	dw StatusHealingEffect   ; MINT_BERRY
 	dw ItemDoesNothingEffect ; RED_APRICORN
 	dw ItemDoesNothingEffect ; TINYMUSHROOM
 	dw ItemDoesNothingEffect ; BIG_MUSHROOM
@@ -123,38 +122,38 @@ ItemEffects: ; e73c
 	dw ItemDoesNothingEffect ; STICK
 	dw ItemDoesNothingEffect ; SMOKE_BALL
 	dw ItemDoesNothingEffect ; NEVERMELTICE
-	dw StatusHealingEffect   ; MAGNET
-	dw ItemDoesNothingEffect ; MIRACLEBERRY
+	dw ItemDoesNothingEffect ; MAGNET
+	dw StatusHealingEffect   ; MIRACLEBERRY
 	dw ItemDoesNothingEffect ; PEARL
 	dw ItemDoesNothingEffect ; BIG_PEARL
 	dw ItemDoesNothingEffect ; EVERSTONE
-	dw RestoreHPEffect       ; SPELL_TAG
-	dw ItemDoesNothingEffect ; RAGECANDYBAR
-	dw BlueCardEffect        ; GS_BALL
-	dw ItemDoesNothingEffect ; BLUE_CARD
+	dw ItemDoesNothingEffect ; SPELL_TAG
+	dw RestoreHPEffect       ; RAGECANDYBAR
+	dw ItemDoesNothingEffect ; GS_BALL
+	dw BlueCardEffect        ; BLUE_CARD
 	dw ItemDoesNothingEffect ; MIRACLE_SEED
 	dw ItemDoesNothingEffect ; THICK_CLUB
 	dw ItemDoesNothingEffect ; FOCUS_BAND
-	dw EnergypowderEffect    ; ITEM_78
-	dw EnergyRootEffect      ; ENERGYPOWDER
-	dw HealPowderEffect      ; ENERGY_ROOT
-	dw RevivalHerbEffect     ; HEAL_POWDER
-	dw ItemDoesNothingEffect ; REVIVAL_HERB
+	dw ItemDoesNothingEffect ; ITEM_78
+	dw EnergypowderEffect    ; ENERGYPOWDER
+	dw EnergyRootEffect      ; ENERGY_ROOT
+	dw HealPowderEffect      ; HEAL_POWDER
+	dw RevivalHerbEffect     ; REVIVAL_HERB
 	dw ItemDoesNothingEffect ; HARD_STONE
-	dw CardKeyEffect         ; LUCKY_EGG
-	dw ItemDoesNothingEffect ; CARD_KEY
+	dw ItemDoesNothingEffect ; LUCKY_EGG
+	dw CardKeyEffect         ; CARD_KEY
 	dw ItemDoesNothingEffect ; MACHINE_PART
 	dw ItemDoesNothingEffect ; EGG_TICKET
 	dw ItemDoesNothingEffect ; LOST_ITEM
 	dw ItemDoesNothingEffect ; STARDUST
-	dw BasementKeyEffect     ; STAR_PIECE
-	dw ItemDoesNothingEffect ; BASEMENT_KEY
+	dw ItemDoesNothingEffect ; STAR_PIECE
+	dw BasementKeyEffect     ; BASEMENT_KEY
 	dw ItemDoesNothingEffect ; PASS
 	dw ItemDoesNothingEffect ; ITEM_87
 	dw ItemDoesNothingEffect ; ITEM_88
 	dw ItemDoesNothingEffect ; ITEM_89
-	dw RestoreHPEffect       ; CHARCOAL
-	dw ItemDoesNothingEffect ; BERRY_JUICE
+	dw ItemDoesNothingEffect ; CHARCOAL
+	dw RestoreHPEffect       ; BERRY_JUICE
 	dw ItemDoesNothingEffect ; SCOPE_LENS
 	dw ItemDoesNothingEffect ; ITEM_8D
 	dw ItemDoesNothingEffect ; ITEM_8E
@@ -164,36 +163,37 @@ ItemEffects: ; e73c
 	dw ItemDoesNothingEffect ; LEFTOVERS
 	dw ItemDoesNothingEffect ; ITEM_93
 	dw ItemDoesNothingEffect ; ITEM_94
-	dw RestorePPEffect       ; ITEM_95
-	dw ItemDoesNothingEffect ; MYSTERYBERRY
+	dw ItemDoesNothingEffect ; ITEM_95
+	dw RestorePPEffect       ; MYSTERYBERRY
 	dw ItemDoesNothingEffect ; DRAGON_SCALE
 	dw ItemDoesNothingEffect ; BERSERK_GENE
 	dw ItemDoesNothingEffect ; ITEM_99
 	dw ItemDoesNothingEffect ; ITEM_9A
-	dw SacredAshEffect       ; ITEM_9B
-	dw PokeBallEffect        ; SACRED_ASH
-	dw ItemDoesNothingEffect ; HEAVY_BALL
-	dw PokeBallEffect        ; FLOWER_MAIL
+	dw ItemDoesNothingEffect ; ITEM_9B
+	dw SacredAshEffect       ; SACRED_ASH
+	dw PokeBallEffect        ; HEAVY_BALL
+	dw ItemDoesNothingEffect ; FLOWER_MAIL
 	dw PokeBallEffect        ; LEVEL_BALL
 	dw PokeBallEffect        ; LURE_BALL
-	dw ItemDoesNothingEffect ; FAST_BALL
+	dw PokeBallEffect        ; FAST_BALL
 	dw ItemDoesNothingEffect ; ITEM_A2
-	dw PokeBallEffect        ; LIGHT_BALL
+	dw ItemDoesNothingEffect ; LIGHT_BALL
 	dw PokeBallEffect        ; FRIEND_BALL
 	dw PokeBallEffect        ; MOON_BALL
-	dw NormalBoxEffect       ; LOVE_BALL
-	dw GorgeousBoxEffect     ; NORMAL_BOX
-	dw EvoStoneEffect        ; GORGEOUS_BOX
-	dw ItemDoesNothingEffect ; SUN_STONE
+	dw PokeBallEffect        ; LOVE_BALL
+	dw NormalBoxEffect       ; NORMAL_BOX
+	dw GorgeousBoxEffect     ; GORGEOUS_BOX
+	dw EvoStoneEffect        ; SUN_STONE
 	dw ItemDoesNothingEffect ; POLKADOT_BOW
 	dw ItemDoesNothingEffect ; ITEM_AB
-	dw RestoreHPEffect       ; UP_GRADE
+	dw ItemDoesNothingEffect ; UP_GRADE
 	dw RestoreHPEffect       ; BERRY
-	dw SquirtbottleEffect    ; GOLD_BERRY
-	dw ItemDoesNothingEffect ; SQUIRTBOTTLE
-	dw PokeBallEffect        ; ITEM_B0
-	dw ItemDoesNothingEffect ; PARK_BALL
+	dw RestoreHPEffect       ; GOLD_BERRY
+	dw SquirtbottleEffect    ; SQUIRTBOTTLE
+	dw ItemDoesNothingEffect ; ITEM_B0
+	dw PokeBallEffect        ; PARK_BALL
 	dw ItemDoesNothingEffect ; RAINBOW_WING
+	dw ItemDoesNothingEffect ; ITEM_B3
 ; e8a2
 
 

From 71f51955c9b50a5e03739e2bd1d927ea55ee6d5a Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Mon, 5 Feb 2018 13:07:22 -0500
Subject: [PATCH 118/135] Terser name for the does-nothing effect

---
 engine/item_effects.asm | 360 ++++++++++++++++++++--------------------
 1 file changed, 180 insertions(+), 180 deletions(-)

diff --git a/engine/item_effects.asm b/engine/item_effects.asm
index 84f537243..6087d9cdc 100644
--- a/engine/item_effects.asm
+++ b/engine/item_effects.asm
@@ -15,185 +15,185 @@ _DoItemEffect:: ; e722
 
 ItemEffects: ; e73c
 ; entries correspond to item ids
-	dw PokeBallEffect        ; MASTER_BALL
-	dw PokeBallEffect        ; ULTRA_BALL
-	dw ItemDoesNothingEffect ; BRIGHTPOWDER
-	dw PokeBallEffect        ; GREAT_BALL
-	dw PokeBallEffect        ; POKE_BALL
-	dw TownMapEffect         ; TOWN_MAP
-	dw BicycleEffect         ; BICYCLE
-	dw EvoStoneEffect        ; MOON_STONE
-	dw StatusHealingEffect   ; ANTIDOTE
-	dw StatusHealingEffect   ; BURN_HEAL
-	dw StatusHealingEffect   ; ICE_HEAL
-	dw StatusHealingEffect   ; AWAKENING
-	dw StatusHealingEffect   ; PARLYZ_HEAL
-	dw FullRestoreEffect     ; FULL_RESTORE
-	dw RestoreHPEffect       ; MAX_POTION
-	dw RestoreHPEffect       ; HYPER_POTION
-	dw RestoreHPEffect       ; SUPER_POTION
-	dw RestoreHPEffect       ; POTION
-	dw EscapeRopeEffect      ; ESCAPE_ROPE
-	dw RepelEffect           ; REPEL
-	dw RestorePPEffect       ; MAX_ELIXER
-	dw EvoStoneEffect        ; FIRE_STONE
-	dw EvoStoneEffect        ; THUNDERSTONE
-	dw EvoStoneEffect        ; WATER_STONE
-	dw ItemDoesNothingEffect ; ITEM_19
-	dw VitaminEffect         ; HP_UP
-	dw VitaminEffect         ; PROTEIN
-	dw VitaminEffect         ; IRON
-	dw VitaminEffect         ; CARBOS
-	dw ItemDoesNothingEffect ; LUCKY_PUNCH
-	dw VitaminEffect         ; CALCIUM
-	dw RareCandyEffect       ; RARE_CANDY
-	dw XAccuracyEffect       ; X_ACCURACY
-	dw EvoStoneEffect        ; LEAF_STONE
-	dw ItemDoesNothingEffect ; METAL_POWDER
-	dw ItemDoesNothingEffect ; NUGGET
-	dw PokeDollEffect        ; POKE_DOLL
-	dw StatusHealingEffect   ; FULL_HEAL
-	dw ReviveEffect          ; REVIVE
-	dw ReviveEffect          ; MAX_REVIVE
-	dw GuardSpecEffect       ; GUARD_SPEC
-	dw SuperRepelEffect      ; SUPER_REPEL
-	dw MaxRepelEffect        ; MAX_REPEL
-	dw DireHitEffect         ; DIRE_HIT
-	dw ItemDoesNothingEffect ; ITEM_2D
-	dw RestoreHPEffect       ; FRESH_WATER
-	dw RestoreHPEffect       ; SODA_POP
-	dw RestoreHPEffect       ; LEMONADE
-	dw XItemEffect           ; X_ATTACK
-	dw ItemDoesNothingEffect ; ITEM_32
-	dw XItemEffect           ; X_DEFEND
-	dw XItemEffect           ; X_SPEED
-	dw XItemEffect           ; X_SPECIAL
-	dw CoinCaseEffect        ; COIN_CASE
-	dw ItemfinderEffect      ; ITEMFINDER
-	dw PokeFluteEffect       ; POKE_FLUTE
-	dw ItemDoesNothingEffect ; EXP_SHARE
-	dw OldRodEffect          ; OLD_ROD
-	dw GoodRodEffect         ; GOOD_ROD
-	dw ItemDoesNothingEffect ; SILVER_LEAF
-	dw SuperRodEffect        ; SUPER_ROD
-	dw RestorePPEffect       ; PP_UP
-	dw RestorePPEffect       ; ETHER
-	dw RestorePPEffect       ; MAX_ETHER
-	dw RestorePPEffect       ; ELIXER
-	dw ItemDoesNothingEffect ; RED_SCALE
-	dw ItemDoesNothingEffect ; SECRETPOTION
-	dw ItemDoesNothingEffect ; S_S_TICKET
-	dw ItemDoesNothingEffect ; MYSTERY_EGG
-	dw ItemDoesNothingEffect ; CLEAR_BELL
-	dw ItemDoesNothingEffect ; SILVER_WING
-	dw RestoreHPEffect       ; MOOMOO_MILK
-	dw ItemDoesNothingEffect ; QUICK_CLAW
-	dw StatusHealingEffect   ; PSNCUREBERRY
-	dw ItemDoesNothingEffect ; GOLD_LEAF
-	dw ItemDoesNothingEffect ; SOFT_SAND
-	dw ItemDoesNothingEffect ; SHARP_BEAK
-	dw StatusHealingEffect   ; PRZCUREBERRY
-	dw StatusHealingEffect   ; BURNT_BERRY
-	dw StatusHealingEffect   ; ICE_BERRY
-	dw ItemDoesNothingEffect ; POISON_BARB
-	dw ItemDoesNothingEffect ; KINGS_ROCK
-	dw BitterBerryEffect     ; BITTER_BERRY
-	dw StatusHealingEffect   ; MINT_BERRY
-	dw ItemDoesNothingEffect ; RED_APRICORN
-	dw ItemDoesNothingEffect ; TINYMUSHROOM
-	dw ItemDoesNothingEffect ; BIG_MUSHROOM
-	dw ItemDoesNothingEffect ; SILVERPOWDER
-	dw ItemDoesNothingEffect ; BLU_APRICORN
-	dw ItemDoesNothingEffect ; ITEM_5A
-	dw ItemDoesNothingEffect ; AMULET_COIN
-	dw ItemDoesNothingEffect ; YLW_APRICORN
-	dw ItemDoesNothingEffect ; GRN_APRICORN
-	dw ItemDoesNothingEffect ; CLEANSE_TAG
-	dw ItemDoesNothingEffect ; MYSTIC_WATER
-	dw ItemDoesNothingEffect ; TWISTEDSPOON
-	dw ItemDoesNothingEffect ; WHT_APRICORN
-	dw ItemDoesNothingEffect ; BLACKBELT
-	dw ItemDoesNothingEffect ; BLK_APRICORN
-	dw ItemDoesNothingEffect ; ITEM_64
-	dw ItemDoesNothingEffect ; PNK_APRICORN
-	dw ItemDoesNothingEffect ; BLACKGLASSES
-	dw ItemDoesNothingEffect ; SLOWPOKETAIL
-	dw ItemDoesNothingEffect ; PINK_BOW
-	dw ItemDoesNothingEffect ; STICK
-	dw ItemDoesNothingEffect ; SMOKE_BALL
-	dw ItemDoesNothingEffect ; NEVERMELTICE
-	dw ItemDoesNothingEffect ; MAGNET
-	dw StatusHealingEffect   ; MIRACLEBERRY
-	dw ItemDoesNothingEffect ; PEARL
-	dw ItemDoesNothingEffect ; BIG_PEARL
-	dw ItemDoesNothingEffect ; EVERSTONE
-	dw ItemDoesNothingEffect ; SPELL_TAG
-	dw RestoreHPEffect       ; RAGECANDYBAR
-	dw ItemDoesNothingEffect ; GS_BALL
-	dw BlueCardEffect        ; BLUE_CARD
-	dw ItemDoesNothingEffect ; MIRACLE_SEED
-	dw ItemDoesNothingEffect ; THICK_CLUB
-	dw ItemDoesNothingEffect ; FOCUS_BAND
-	dw ItemDoesNothingEffect ; ITEM_78
-	dw EnergypowderEffect    ; ENERGYPOWDER
-	dw EnergyRootEffect      ; ENERGY_ROOT
-	dw HealPowderEffect      ; HEAL_POWDER
-	dw RevivalHerbEffect     ; REVIVAL_HERB
-	dw ItemDoesNothingEffect ; HARD_STONE
-	dw ItemDoesNothingEffect ; LUCKY_EGG
-	dw CardKeyEffect         ; CARD_KEY
-	dw ItemDoesNothingEffect ; MACHINE_PART
-	dw ItemDoesNothingEffect ; EGG_TICKET
-	dw ItemDoesNothingEffect ; LOST_ITEM
-	dw ItemDoesNothingEffect ; STARDUST
-	dw ItemDoesNothingEffect ; STAR_PIECE
-	dw BasementKeyEffect     ; BASEMENT_KEY
-	dw ItemDoesNothingEffect ; PASS
-	dw ItemDoesNothingEffect ; ITEM_87
-	dw ItemDoesNothingEffect ; ITEM_88
-	dw ItemDoesNothingEffect ; ITEM_89
-	dw ItemDoesNothingEffect ; CHARCOAL
-	dw RestoreHPEffect       ; BERRY_JUICE
-	dw ItemDoesNothingEffect ; SCOPE_LENS
-	dw ItemDoesNothingEffect ; ITEM_8D
-	dw ItemDoesNothingEffect ; ITEM_8E
-	dw ItemDoesNothingEffect ; METAL_COAT
-	dw ItemDoesNothingEffect ; DRAGON_FANG
-	dw ItemDoesNothingEffect ; ITEM_91
-	dw ItemDoesNothingEffect ; LEFTOVERS
-	dw ItemDoesNothingEffect ; ITEM_93
-	dw ItemDoesNothingEffect ; ITEM_94
-	dw ItemDoesNothingEffect ; ITEM_95
-	dw RestorePPEffect       ; MYSTERYBERRY
-	dw ItemDoesNothingEffect ; DRAGON_SCALE
-	dw ItemDoesNothingEffect ; BERSERK_GENE
-	dw ItemDoesNothingEffect ; ITEM_99
-	dw ItemDoesNothingEffect ; ITEM_9A
-	dw ItemDoesNothingEffect ; ITEM_9B
-	dw SacredAshEffect       ; SACRED_ASH
-	dw PokeBallEffect        ; HEAVY_BALL
-	dw ItemDoesNothingEffect ; FLOWER_MAIL
-	dw PokeBallEffect        ; LEVEL_BALL
-	dw PokeBallEffect        ; LURE_BALL
-	dw PokeBallEffect        ; FAST_BALL
-	dw ItemDoesNothingEffect ; ITEM_A2
-	dw ItemDoesNothingEffect ; LIGHT_BALL
-	dw PokeBallEffect        ; FRIEND_BALL
-	dw PokeBallEffect        ; MOON_BALL
-	dw PokeBallEffect        ; LOVE_BALL
-	dw NormalBoxEffect       ; NORMAL_BOX
-	dw GorgeousBoxEffect     ; GORGEOUS_BOX
-	dw EvoStoneEffect        ; SUN_STONE
-	dw ItemDoesNothingEffect ; POLKADOT_BOW
-	dw ItemDoesNothingEffect ; ITEM_AB
-	dw ItemDoesNothingEffect ; UP_GRADE
-	dw RestoreHPEffect       ; BERRY
-	dw RestoreHPEffect       ; GOLD_BERRY
-	dw SquirtbottleEffect    ; SQUIRTBOTTLE
-	dw ItemDoesNothingEffect ; ITEM_B0
-	dw PokeBallEffect        ; PARK_BALL
-	dw ItemDoesNothingEffect ; RAINBOW_WING
-	dw ItemDoesNothingEffect ; ITEM_B3
+	dw PokeBallEffect      ; MASTER_BALL
+	dw PokeBallEffect      ; ULTRA_BALL
+	dw NoEffect            ; BRIGHTPOWDER
+	dw PokeBallEffect      ; GREAT_BALL
+	dw PokeBallEffect      ; POKE_BALL
+	dw TownMapEffect       ; TOWN_MAP
+	dw BicycleEffect       ; BICYCLE
+	dw EvoStoneEffect      ; MOON_STONE
+	dw StatusHealingEffect ; ANTIDOTE
+	dw StatusHealingEffect ; BURN_HEAL
+	dw StatusHealingEffect ; ICE_HEAL
+	dw StatusHealingEffect ; AWAKENING
+	dw StatusHealingEffect ; PARLYZ_HEAL
+	dw FullRestoreEffect   ; FULL_RESTORE
+	dw RestoreHPEffect     ; MAX_POTION
+	dw RestoreHPEffect     ; HYPER_POTION
+	dw RestoreHPEffect     ; SUPER_POTION
+	dw RestoreHPEffect     ; POTION
+	dw EscapeRopeEffect    ; ESCAPE_ROPE
+	dw RepelEffect         ; REPEL
+	dw RestorePPEffect     ; MAX_ELIXER
+	dw EvoStoneEffect      ; FIRE_STONE
+	dw EvoStoneEffect      ; THUNDERSTONE
+	dw EvoStoneEffect      ; WATER_STONE
+	dw NoEffect            ; ITEM_19
+	dw VitaminEffect       ; HP_UP
+	dw VitaminEffect       ; PROTEIN
+	dw VitaminEffect       ; IRON
+	dw VitaminEffect       ; CARBOS
+	dw NoEffect            ; LUCKY_PUNCH
+	dw VitaminEffect       ; CALCIUM
+	dw RareCandyEffect     ; RARE_CANDY
+	dw XAccuracyEffect     ; X_ACCURACY
+	dw EvoStoneEffect      ; LEAF_STONE
+	dw NoEffect            ; METAL_POWDER
+	dw NoEffect            ; NUGGET
+	dw PokeDollEffect      ; POKE_DOLL
+	dw StatusHealingEffect ; FULL_HEAL
+	dw ReviveEffect        ; REVIVE
+	dw ReviveEffect        ; MAX_REVIVE
+	dw GuardSpecEffect     ; GUARD_SPEC
+	dw SuperRepelEffect    ; SUPER_REPEL
+	dw MaxRepelEffect      ; MAX_REPEL
+	dw DireHitEffect       ; DIRE_HIT
+	dw NoEffect            ; ITEM_2D
+	dw RestoreHPEffect     ; FRESH_WATER
+	dw RestoreHPEffect     ; SODA_POP
+	dw RestoreHPEffect     ; LEMONADE
+	dw XItemEffect         ; X_ATTACK
+	dw NoEffect            ; ITEM_32
+	dw XItemEffect         ; X_DEFEND
+	dw XItemEffect         ; X_SPEED
+	dw XItemEffect         ; X_SPECIAL
+	dw CoinCaseEffect      ; COIN_CASE
+	dw ItemfinderEffect    ; ITEMFINDER
+	dw PokeFluteEffect     ; POKE_FLUTE
+	dw NoEffect            ; EXP_SHARE
+	dw OldRodEffect        ; OLD_ROD
+	dw GoodRodEffect       ; GOOD_ROD
+	dw NoEffect            ; SILVER_LEAF
+	dw SuperRodEffect      ; SUPER_ROD
+	dw RestorePPEffect     ; PP_UP
+	dw RestorePPEffect     ; ETHER
+	dw RestorePPEffect     ; MAX_ETHER
+	dw RestorePPEffect     ; ELIXER
+	dw NoEffect            ; RED_SCALE
+	dw NoEffect            ; SECRETPOTION
+	dw NoEffect            ; S_S_TICKET
+	dw NoEffect            ; MYSTERY_EGG
+	dw NoEffect            ; CLEAR_BELL
+	dw NoEffect            ; SILVER_WING
+	dw RestoreHPEffect     ; MOOMOO_MILK
+	dw NoEffect            ; QUICK_CLAW
+	dw StatusHealingEffect ; PSNCUREBERRY
+	dw NoEffect            ; GOLD_LEAF
+	dw NoEffect            ; SOFT_SAND
+	dw NoEffect            ; SHARP_BEAK
+	dw StatusHealingEffect ; PRZCUREBERRY
+	dw StatusHealingEffect ; BURNT_BERRY
+	dw StatusHealingEffect ; ICE_BERRY
+	dw NoEffect            ; POISON_BARB
+	dw NoEffect            ; KINGS_ROCK
+	dw BitterBerryEffect   ; BITTER_BERRY
+	dw StatusHealingEffect ; MINT_BERRY
+	dw NoEffect            ; RED_APRICORN
+	dw NoEffect            ; TINYMUSHROOM
+	dw NoEffect            ; BIG_MUSHROOM
+	dw NoEffect            ; SILVERPOWDER
+	dw NoEffect            ; BLU_APRICORN
+	dw NoEffect            ; ITEM_5A
+	dw NoEffect            ; AMULET_COIN
+	dw NoEffect            ; YLW_APRICORN
+	dw NoEffect            ; GRN_APRICORN
+	dw NoEffect            ; CLEANSE_TAG
+	dw NoEffect            ; MYSTIC_WATER
+	dw NoEffect            ; TWISTEDSPOON
+	dw NoEffect            ; WHT_APRICORN
+	dw NoEffect            ; BLACKBELT
+	dw NoEffect            ; BLK_APRICORN
+	dw NoEffect            ; ITEM_64
+	dw NoEffect            ; PNK_APRICORN
+	dw NoEffect            ; BLACKGLASSES
+	dw NoEffect            ; SLOWPOKETAIL
+	dw NoEffect            ; PINK_BOW
+	dw NoEffect            ; STICK
+	dw NoEffect            ; SMOKE_BALL
+	dw NoEffect            ; NEVERMELTICE
+	dw NoEffect            ; MAGNET
+	dw StatusHealingEffect ; MIRACLEBERRY
+	dw NoEffect            ; PEARL
+	dw NoEffect            ; BIG_PEARL
+	dw NoEffect            ; EVERSTONE
+	dw NoEffect            ; SPELL_TAG
+	dw RestoreHPEffect     ; RAGECANDYBAR
+	dw NoEffect            ; GS_BALL
+	dw BlueCardEffect      ; BLUE_CARD
+	dw NoEffect            ; MIRACLE_SEED
+	dw NoEffect            ; THICK_CLUB
+	dw NoEffect            ; FOCUS_BAND
+	dw NoEffect            ; ITEM_78
+	dw EnergypowderEffect  ; ENERGYPOWDER
+	dw EnergyRootEffect    ; ENERGY_ROOT
+	dw HealPowderEffect    ; HEAL_POWDER
+	dw RevivalHerbEffect   ; REVIVAL_HERB
+	dw NoEffect            ; HARD_STONE
+	dw NoEffect            ; LUCKY_EGG
+	dw CardKeyEffect       ; CARD_KEY
+	dw NoEffect            ; MACHINE_PART
+	dw NoEffect            ; EGG_TICKET
+	dw NoEffect            ; LOST_ITEM
+	dw NoEffect            ; STARDUST
+	dw NoEffect            ; STAR_PIECE
+	dw BasementKeyEffect   ; BASEMENT_KEY
+	dw NoEffect            ; PASS
+	dw NoEffect            ; ITEM_87
+	dw NoEffect            ; ITEM_88
+	dw NoEffect            ; ITEM_89
+	dw NoEffect            ; CHARCOAL
+	dw RestoreHPEffect     ; BERRY_JUICE
+	dw NoEffect            ; SCOPE_LENS
+	dw NoEffect            ; ITEM_8D
+	dw NoEffect            ; ITEM_8E
+	dw NoEffect            ; METAL_COAT
+	dw NoEffect            ; DRAGON_FANG
+	dw NoEffect            ; ITEM_91
+	dw NoEffect            ; LEFTOVERS
+	dw NoEffect            ; ITEM_93
+	dw NoEffect            ; ITEM_94
+	dw NoEffect            ; ITEM_95
+	dw RestorePPEffect     ; MYSTERYBERRY
+	dw NoEffect            ; DRAGON_SCALE
+	dw NoEffect            ; BERSERK_GENE
+	dw NoEffect            ; ITEM_99
+	dw NoEffect            ; ITEM_9A
+	dw NoEffect            ; ITEM_9B
+	dw SacredAshEffect     ; SACRED_ASH
+	dw PokeBallEffect      ; HEAVY_BALL
+	dw NoEffect            ; FLOWER_MAIL
+	dw PokeBallEffect      ; LEVEL_BALL
+	dw PokeBallEffect      ; LURE_BALL
+	dw PokeBallEffect      ; FAST_BALL
+	dw NoEffect            ; ITEM_A2
+	dw NoEffect            ; LIGHT_BALL
+	dw PokeBallEffect      ; FRIEND_BALL
+	dw PokeBallEffect      ; MOON_BALL
+	dw PokeBallEffect      ; LOVE_BALL
+	dw NormalBoxEffect     ; NORMAL_BOX
+	dw GorgeousBoxEffect   ; GORGEOUS_BOX
+	dw EvoStoneEffect      ; SUN_STONE
+	dw NoEffect            ; POLKADOT_BOW
+	dw NoEffect            ; ITEM_AB
+	dw NoEffect            ; UP_GRADE
+	dw RestoreHPEffect     ; BERRY
+	dw RestoreHPEffect     ; GOLD_BERRY
+	dw SquirtbottleEffect  ; SQUIRTBOTTLE
+	dw NoEffect            ; ITEM_B0
+	dw PokeBallEffect      ; PARK_BALL
+	dw NoEffect            ; RAINBOW_WING
+	dw NoEffect            ; ITEM_B3
 ; e8a2
 
 
@@ -2723,7 +2723,7 @@ OpenBox: ; f769
 	db "@"
 ; 0xf77d
 
-ItemDoesNothingEffect: ; f77d
+NoEffect: ; f77d
 	jp IsntTheTimeMessage
 ; f780
 

From 118c387d73c0d3cb82a53e4666499da6a143d0b9 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Mon, 5 Feb 2018 22:03:40 -0500
Subject: [PATCH 119/135] Remove commented G/S roaming Suicune code

---
 engine/wildmons.asm | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/engine/wildmons.asm b/engine/wildmons.asm
index 154d84294..494e8d2a4 100755
--- a/engine/wildmons.asm
+++ b/engine/wildmons.asm
@@ -516,14 +516,11 @@ InitRoamMons: ; 2a2a0
 	ld [wRoamMon1Species], a
 	ld a, ENTEI
 	ld [wRoamMon2Species], a
-;	ld a, SUICUNE
-;	ld [wRoamMon3Species], a
 
 ; level
 	ld a, 40
 	ld [wRoamMon1Level], a
 	ld [wRoamMon2Level], a
-;	ld [wRoamMon3Level], a
 
 ; raikou starting map
 	ld a, GROUP_ROUTE_42
@@ -537,17 +534,10 @@ InitRoamMons: ; 2a2a0
 	ld a, MAP_ROUTE_37
 	ld [wRoamMon2MapNumber], a
 
-; suicune starting map
-;	ld a, GROUP_ROUTE_38
-;	ld [wRoamMon3MapGroup], a
-;	ld a, MAP_ROUTE_38
-;	ld [wRoamMon3MapNumber], a
-
 ; hp
 	xor a ; generate new stats
 	ld [wRoamMon1HP], a
 	ld [wRoamMon2HP], a
-;	ld [wRoamMon3HP], a
 
 	ret
 ; 2a2ce
@@ -631,7 +621,7 @@ UpdateRoamMons: ; 2a30d
 .SkipEntei:
 	ld a, [wRoamMon3MapGroup]
 	cp GROUP_N_A
-	jr z, .SkipSuicune
+	jr z, .Finished
 	ld b, a
 	ld a, [wRoamMon3MapNumber]
 	ld c, a
@@ -641,7 +631,7 @@ UpdateRoamMons: ; 2a30d
 	ld a, c
 	ld [wRoamMon3MapNumber], a
 
-.SkipSuicune:
+.Finished:
 	jp _BackUpMapIndices
 ; 2a355
 
@@ -712,8 +702,8 @@ JumpRoamMons: ; 2a394
 	ld [wRoamMon1MapGroup], a
 	ld a, c
 	ld [wRoamMon1MapNumber], a
-.SkipRaikou:
 
+.SkipRaikou:
 	ld a, [wRoamMon2MapGroup]
 	cp GROUP_N_A
 	jr z, .SkipEntei
@@ -722,18 +712,18 @@ JumpRoamMons: ; 2a394
 	ld [wRoamMon2MapGroup], a
 	ld a, c
 	ld [wRoamMon2MapNumber], a
-.SkipEntei:
 
+.SkipEntei:
 	ld a, [wRoamMon3MapGroup]
 	cp GROUP_N_A
-	jr z, .SkipSuicune
+	jr z, .Finished
 	call JumpRoamMon
 	ld a, b
 	ld [wRoamMon3MapGroup], a
 	ld a, c
 	ld [wRoamMon3MapNumber], a
-.SkipSuicune:
 
+.Finished:
 	jp _BackUpMapIndices
 
 JumpRoamMon: ; 2a3cd

From c158404b7cad3d1ad4201b179f25c266e2f2ebcb Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Wed, 7 Feb 2018 14:43:58 -0500
Subject: [PATCH 120/135] questionmark is not a pokemon pic

---
 engine/pokedex/pokedex_3.asm                        |   2 +-
 .../question_mark.2bpp.lz.14c284f5}                 | Bin
 .../front.png => pokedex/question_mark.png}         | Bin
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename gfx/{pokemon/questionmark/front.2bpp.lz.14c284f5 => pokedex/question_mark.2bpp.lz.14c284f5} (100%)
 rename gfx/{pokemon/questionmark/front.png => pokedex/question_mark.png} (100%)

diff --git a/engine/pokedex/pokedex_3.asm b/engine/pokedex/pokedex_3.asm
index f5247f2da..51399f434 100644
--- a/engine/pokedex/pokedex_3.asm
+++ b/engine/pokedex/pokedex_3.asm
@@ -21,7 +21,7 @@ LoadQuestionMarkPic: ; 1de0d7
 	ret
 
 .QuestionMarkLZ: ; 1de0e1
-INCBIN "gfx/pokemon/questionmark/front.2bpp.lz"
+INCBIN "gfx/pokedex/question_mark.2bpp.lz"
 
 DrawPokedexListWindow: ; 1de171 (77:6171)
 	ld a, $32
diff --git a/gfx/pokemon/questionmark/front.2bpp.lz.14c284f5 b/gfx/pokedex/question_mark.2bpp.lz.14c284f5
similarity index 100%
rename from gfx/pokemon/questionmark/front.2bpp.lz.14c284f5
rename to gfx/pokedex/question_mark.2bpp.lz.14c284f5
diff --git a/gfx/pokemon/questionmark/front.png b/gfx/pokedex/question_mark.png
similarity index 100%
rename from gfx/pokemon/questionmark/front.png
rename to gfx/pokedex/question_mark.png

From 62d6f72bb35ed75574bb74b2edca120f8d80a628 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Fri, 9 Feb 2018 13:50:20 -0500
Subject: [PATCH 121/135] Make tileset palette maps easier to edit

---
 data/tilesets.asm                                           | 2 +-
 gfx/{tilesets/palette_maps.asm => tileset_palette_maps.asm} | 0
 main.asm                                                    | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename gfx/{tilesets/palette_maps.asm => tileset_palette_maps.asm} (100%)

diff --git a/data/tilesets.asm b/data/tilesets.asm
index c44a218fc..82052f1e8 100644
--- a/data/tilesets.asm
+++ b/data/tilesets.asm
@@ -7,8 +7,8 @@ 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/tileset_anims.asm
-; - The *PalMap are defined in gfx/tilesets/palette_maps.asm
 
 Tilesets:: ; 4d596
 ; entries correspond to TILESET_* constants
diff --git a/gfx/tilesets/palette_maps.asm b/gfx/tileset_palette_maps.asm
similarity index 100%
rename from gfx/tilesets/palette_maps.asm
rename to gfx/tileset_palette_maps.asm
diff --git a/main.asm b/main.asm
index 7a5ddca9d..9a9ba485c 100644
--- a/main.asm
+++ b/main.asm
@@ -206,7 +206,7 @@ INCLUDE "engine/events/buena_menu.asm"
 SECTION "bank13", ROMX
 
 INCLUDE "engine/map_palettes.asm"
-INCLUDE "gfx/tilesets/palette_maps.asm"
+INCLUDE "gfx/tileset_palette_maps.asm"
 INCLUDE "data/collision_permissions.asm"
 INCLUDE "engine/routines/emptyallsrambanks.asm"
 INCLUDE "engine/routines/savemenu_copytilemapatonce.asm"

From ff3a43d4b05049330f964bc93de7084728a40cbe Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Tue, 20 Feb 2018 10:54:48 -0500
Subject: [PATCH 122/135] Use maskbits NUM_TYPES

---
 engine/battle/move_effects/conversion2.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine/battle/move_effects/conversion2.asm b/engine/battle/move_effects/conversion2.asm
index 7fefbfee5..074ca93ba 100644
--- a/engine/battle/move_effects/conversion2.asm
+++ b/engine/battle/move_effects/conversion2.asm
@@ -27,7 +27,7 @@ BattleCommand_Conversion2: ; 359e6
 
 .loop
 	call BattleRandom
-	and $1f
+	maskbits NUM_TYPES
 	cp UNUSED_TYPES
 	jr c, .okay
 	cp UNUSED_TYPES_END

From e018a9d005c4c9033acbd9ae4073e60c32952823 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sun, 25 Feb 2018 16:32:40 -0500
Subject: [PATCH 123/135] Sprite data values match GetSpriteLength return
 values and are not limited to multiples of 4

---
 data/sprites/sprites.asm | 207 +++++++++++++++++++--------------------
 1 file changed, 103 insertions(+), 104 deletions(-)

diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm
index 214b14757..6a44bea42 100644
--- a/data/sprites/sprites.asm
+++ b/data/sprites/sprites.asm
@@ -1,111 +1,110 @@
 overworld_sprite: MACRO
 ; pointer, length, type, palette
 	dw \1
-	db \2 * 4 tiles, BANK(\1)
-	db \3, \4
+	db \2 tiles, BANK(\1), \3, \4
 ENDM
 
 OverworldSprites: ; 14736
 ; entries correspond to SPRITE_* constants
-	overworld_sprite ChrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite ChrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite GameboyKidSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN
-	overworld_sprite SilverSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite OakSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite RedSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite BlueSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite BillSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite ElderSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite JanineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite KurtSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite MomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite BlaineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite RedsMomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite DaisySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite ElmSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite WillSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED
-	overworld_sprite FalknerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite WhitneySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite BugsySpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
-	overworld_sprite MortySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite ChuckSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite JasmineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
-	overworld_sprite PryceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite ClairSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite BrockSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite KarenSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE
-	overworld_sprite BrunoSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite MistySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite LanceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite SurgeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
-	overworld_sprite ErikaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
-	overworld_sprite KogaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite SabrinaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite CooltrainerMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite CooltrainerFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite BugCatcherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite TwinSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite YoungsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite LassSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite TeacherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite BuenaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite SuperNerdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite RockerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
-	overworld_sprite PokefanMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite PokefanFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite GrampsSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite GrannySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite SwimmerGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite SwimmerGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite BigSnorlaxSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE
-	overworld_sprite SurfingPikachuSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite RocketSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite RocketGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite NurseSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED
-	overworld_sprite LinkReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite ClerkSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
-	overworld_sprite FisherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite FishingGuruSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite ScientistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite KimonoGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite SageSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite UnusedGuySpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED
-	overworld_sprite GentlemanSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite BlackBeltSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite ReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite OfficerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite CalSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite SlowpokeSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
-	overworld_sprite CaptainSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite BigLaprasSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE
-	overworld_sprite GymGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite SailorSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite BikerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite PharmacistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite MonsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite FairySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite BirdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite DragonSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite BigOnixSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN
-	overworld_sprite N64SpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN
-	overworld_sprite SudowoodoSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN
-	overworld_sprite SurfSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite PokeBallSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
-	overworld_sprite PokedexSpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN
-	overworld_sprite PaperSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE
-	overworld_sprite VirtualBoySpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
-	overworld_sprite OldLinkReceptionistSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED
-	overworld_sprite RockSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK
-	overworld_sprite BoulderSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK
-	overworld_sprite SnesSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE
-	overworld_sprite FamicomSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
-	overworld_sprite FruitTreeSpriteGFX, 1, STILL_SPRITE, PAL_OW_TREE
-	overworld_sprite GoldTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN
-	overworld_sprite SilverTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_SILVER
-	overworld_sprite KrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite KrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite KurtOutsideSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN
-	overworld_sprite SuicuneSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE
-	overworld_sprite EnteiSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
-	overworld_sprite RaikouSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
-	overworld_sprite StandingYoungsterSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE
+	overworld_sprite ChrisSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite ChrisBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite GameboyKidSpriteGFX, 12, STANDING_SPRITE, PAL_OW_GREEN
+	overworld_sprite SilverSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite OakSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite RedSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BlueSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BillSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite ElderSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite JanineSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite KurtSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite MomSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BlaineSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite RedsMomSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite DaisySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite ElmSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite WillSpriteGFX, 12, STANDING_SPRITE, PAL_OW_RED
+	overworld_sprite FalknerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite WhitneySpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BugsySpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
+	overworld_sprite MortySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite ChuckSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite JasmineSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
+	overworld_sprite PryceSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite ClairSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BrockSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite KarenSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BLUE
+	overworld_sprite BrunoSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite MistySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite LanceSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite SurgeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
+	overworld_sprite ErikaSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
+	overworld_sprite KogaSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite SabrinaSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite CooltrainerMSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite CooltrainerFSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite BugCatcherSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite TwinSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite YoungsterSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite LassSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite TeacherSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BuenaSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite SuperNerdSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite RockerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
+	overworld_sprite PokefanMSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite PokefanFSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite GrampsSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite GrannySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite SwimmerGuySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite SwimmerGirlSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite BigSnorlaxSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BLUE
+	overworld_sprite SurfingPikachuSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite RocketSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite RocketGirlSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite NurseSpriteGFX, 12, STANDING_SPRITE, PAL_OW_RED
+	overworld_sprite LinkReceptionistSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite ClerkSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
+	overworld_sprite FisherSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite FishingGuruSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite ScientistSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite KimonoGirlSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite SageSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite UnusedGuySpriteGFX, 12, STANDING_SPRITE, PAL_OW_RED
+	overworld_sprite GentlemanSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite BlackBeltSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite ReceptionistSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite OfficerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite CalSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite SlowpokeSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED
+	overworld_sprite CaptainSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite BigLaprasSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BLUE
+	overworld_sprite GymGuySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite SailorSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite BikerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite PharmacistSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite MonsterSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite FairySpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BirdSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite DragonSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BigOnixSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BROWN
+	overworld_sprite N64SpriteGFX, 4, STILL_SPRITE, PAL_OW_BROWN
+	overworld_sprite SudowoodoSpriteGFX, 12, STANDING_SPRITE, PAL_OW_GREEN
+	overworld_sprite SurfSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite PokeBallSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED
+	overworld_sprite PokedexSpriteGFX, 4, STILL_SPRITE, PAL_OW_BROWN
+	overworld_sprite PaperSpriteGFX, 4, STILL_SPRITE, PAL_OW_BLUE
+	overworld_sprite VirtualBoySpriteGFX, 4, STILL_SPRITE, PAL_OW_RED
+	overworld_sprite OldLinkReceptionistSpriteGFX, 12, STANDING_SPRITE, PAL_OW_RED
+	overworld_sprite RockSpriteGFX, 4, STILL_SPRITE, PAL_OW_ROCK
+	overworld_sprite BoulderSpriteGFX, 4, STILL_SPRITE, PAL_OW_ROCK
+	overworld_sprite SnesSpriteGFX, 4, STILL_SPRITE, PAL_OW_BLUE
+	overworld_sprite FamicomSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED
+	overworld_sprite FruitTreeSpriteGFX, 4, STILL_SPRITE, PAL_OW_TREE
+	overworld_sprite GoldTrophySpriteGFX, 4, STILL_SPRITE, PAL_OW_BROWN
+	overworld_sprite SilverTrophySpriteGFX, 4, STILL_SPRITE, PAL_OW_SILVER
+	overworld_sprite KrisSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite KrisBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite KurtOutsideSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BROWN
+	overworld_sprite SuicuneSpriteGFX, 4, STILL_SPRITE, PAL_OW_BLUE
+	overworld_sprite EnteiSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED
+	overworld_sprite RaikouSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED
+	overworld_sprite StandingYoungsterSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BLUE

From eb3726bba049d25810ca14f050d1717e693ea2be Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sun, 25 Feb 2018 16:48:31 -0500
Subject: [PATCH 124/135] NO_ITEM == 0

---
 data/pokemon/base_stats/abra.asm       |   2 +-
 data/pokemon/base_stats/aerodactyl.asm |   2 +-
 data/pokemon/base_stats/aipom.asm      |   2 +-
 data/pokemon/base_stats/alakazam.asm   |   2 +-
 data/pokemon/base_stats/ampharos.asm   |   2 +-
 data/pokemon/base_stats/arbok.asm      |   2 +-
 data/pokemon/base_stats/arcanine.asm   |   2 +-
 data/pokemon/base_stats/ariados.asm    |   2 +-
 data/pokemon/base_stats/articuno.asm   |   2 +-
 data/pokemon/base_stats/azumarill.asm  |   2 +-
 data/pokemon/base_stats/bayleef.asm    |   2 +-
 data/pokemon/base_stats/beedrill.asm   |   2 +-
 data/pokemon/base_stats/bellossom.asm  |   2 +-
 data/pokemon/base_stats/bellsprout.asm |   2 +-
 data/pokemon/base_stats/blastoise.asm  |   2 +-
 data/pokemon/base_stats/blissey.asm    |   2 +-
 data/pokemon/base_stats/bulbasaur.asm  |   2 +-
 data/pokemon/base_stats/butterfree.asm |   2 +-
 data/pokemon/base_stats/caterpie.asm   |   2 +-
 data/pokemon/base_stats/celebi.asm     |   2 +-
 data/pokemon/base_stats/chansey.asm    |   2 +-
 data/pokemon/base_stats/charizard.asm  |   2 +-
 data/pokemon/base_stats/charmander.asm |   2 +-
 data/pokemon/base_stats/charmeleon.asm |   2 +-
 data/pokemon/base_stats/chikorita.asm  |   2 +-
 data/pokemon/base_stats/chinchou.asm   |   2 +-
 data/pokemon/base_stats/clefable.asm   |   2 +-
 data/pokemon/base_stats/clefairy.asm   |   2 +-
 data/pokemon/base_stats/cleffa.asm     |   2 +-
 data/pokemon/base_stats/cloyster.asm   |   2 +-
 data/pokemon/base_stats/corsola.asm    |   2 +-
 data/pokemon/base_stats/crobat.asm     |   2 +-
 data/pokemon/base_stats/croconaw.asm   |   2 +-
 data/pokemon/base_stats/cubone.asm     |   2 +-
 data/pokemon/base_stats/cyndaquil.asm  |   2 +-
 data/pokemon/base_stats/delibird.asm   |   2 +-
 data/pokemon/base_stats/dewgong.asm    |   2 +-
 data/pokemon/base_stats/diglett.asm    |   2 +-
 data/pokemon/base_stats/ditto.asm      |   2 +-
 data/pokemon/base_stats/dodrio.asm     |   2 +-
 data/pokemon/base_stats/doduo.asm      |   2 +-
 data/pokemon/base_stats/donphan.asm    |   2 +-
 data/pokemon/base_stats/dragonair.asm  |   2 +-
 data/pokemon/base_stats/dragonite.asm  |   2 +-
 data/pokemon/base_stats/dratini.asm    |   2 +-
 data/pokemon/base_stats/drowzee.asm    |   2 +-
 data/pokemon/base_stats/dugtrio.asm    |   2 +-
 data/pokemon/base_stats/dunsparce.asm  |   2 +-
 data/pokemon/base_stats/eevee.asm      |   2 +-
 data/pokemon/base_stats/ekans.asm      |   2 +-
 data/pokemon/base_stats/electabuzz.asm |   2 +-
 data/pokemon/base_stats/electrode.asm  |   2 +-
 data/pokemon/base_stats/elekid.asm     |   2 +-
 data/pokemon/base_stats/entei.asm      |   2 +-
 data/pokemon/base_stats/espeon.asm     |   2 +-
 data/pokemon/base_stats/exeggcute.asm  |   2 +-
 data/pokemon/base_stats/exeggutor.asm  |   2 +-
 data/pokemon/base_stats/farfetch_d.asm |   2 +-
 data/pokemon/base_stats/fearow.asm     |   2 +-
 data/pokemon/base_stats/feraligatr.asm |   2 +-
 data/pokemon/base_stats/flaaffy.asm    |   2 +-
 data/pokemon/base_stats/flareon.asm    |   2 +-
 data/pokemon/base_stats/forretress.asm |   2 +-
 data/pokemon/base_stats/furret.asm     |   2 +-
 data/pokemon/base_stats/gastly.asm     |   2 +-
 data/pokemon/base_stats/gengar.asm     |   2 +-
 data/pokemon/base_stats/geodude.asm    |   2 +-
 data/pokemon/base_stats/girafarig.asm  |   2 +-
 data/pokemon/base_stats/gligar.asm     |   2 +-
 data/pokemon/base_stats/gloom.asm      |   2 +-
 data/pokemon/base_stats/golbat.asm     |   2 +-
 data/pokemon/base_stats/goldeen.asm    |   2 +-
 data/pokemon/base_stats/golduck.asm    |   2 +-
 data/pokemon/base_stats/golem.asm      |   2 +-
 data/pokemon/base_stats/granbull.asm   |   2 +-
 data/pokemon/base_stats/graveler.asm   |   2 +-
 data/pokemon/base_stats/grimer.asm     |   2 +-
 data/pokemon/base_stats/growlithe.asm  |   2 +-
 data/pokemon/base_stats/gyarados.asm   |   2 +-
 data/pokemon/base_stats/haunter.asm    |   2 +-
 data/pokemon/base_stats/heracross.asm  |   2 +-
 data/pokemon/base_stats/hitmonchan.asm |   2 +-
 data/pokemon/base_stats/hitmonlee.asm  |   2 +-
 data/pokemon/base_stats/hitmontop.asm  |   2 +-
 data/pokemon/base_stats/ho_oh.asm      |   2 +-
 data/pokemon/base_stats/hoothoot.asm   |   2 +-
 data/pokemon/base_stats/hoppip.asm     |   2 +-
 data/pokemon/base_stats/horsea.asm     |   2 +-
 data/pokemon/base_stats/houndoom.asm   |   2 +-
 data/pokemon/base_stats/houndour.asm   |   2 +-
 data/pokemon/base_stats/hypno.asm      |   2 +-
 data/pokemon/base_stats/igglybuff.asm  |   2 +-
 data/pokemon/base_stats/ivysaur.asm    |   2 +-
 data/pokemon/base_stats/jigglypuff.asm |   2 +-
 data/pokemon/base_stats/jolteon.asm    |   2 +-
 data/pokemon/base_stats/jumpluff.asm   |   2 +-
 data/pokemon/base_stats/jynx.asm       |   2 +-
 data/pokemon/base_stats/kabuto.asm     |   2 +-
 data/pokemon/base_stats/kabutops.asm   |   2 +-
 data/pokemon/base_stats/kadabra.asm    |   2 +-
 data/pokemon/base_stats/kakuna.asm     |   2 +-
 data/pokemon/base_stats/kangaskhan.asm |   2 +-
 data/pokemon/base_stats/kingdra.asm    |   2 +-
 data/pokemon/base_stats/kingler.asm    |   2 +-
 data/pokemon/base_stats/koffing.asm    |   2 +-
 data/pokemon/base_stats/krabby.asm     |   2 +-
 data/pokemon/base_stats/lanturn.asm    |   2 +-
 data/pokemon/base_stats/lapras.asm     |   2 +-
 data/pokemon/base_stats/larvitar.asm   |   2 +-
 data/pokemon/base_stats/ledian.asm     |   2 +-
 data/pokemon/base_stats/ledyba.asm     |   2 +-
 data/pokemon/base_stats/lickitung.asm  |   2 +-
 data/pokemon/base_stats/lugia.asm      |   2 +-
 data/pokemon/base_stats/machamp.asm    |   2 +-
 data/pokemon/base_stats/machoke.asm    |   2 +-
 data/pokemon/base_stats/machop.asm     |   2 +-
 data/pokemon/base_stats/magby.asm      |   2 +-
 data/pokemon/base_stats/magcargo.asm   |   2 +-
 data/pokemon/base_stats/magikarp.asm   |   2 +-
 data/pokemon/base_stats/magmar.asm     |   2 +-
 data/pokemon/base_stats/magnemite.asm  |   2 +-
 data/pokemon/base_stats/magneton.asm   |   2 +-
 data/pokemon/base_stats/mankey.asm     |   2 +-
 data/pokemon/base_stats/mantine.asm    |   2 +-
 data/pokemon/base_stats/mareep.asm     |   2 +-
 data/pokemon/base_stats/marill.asm     |   2 +-
 data/pokemon/base_stats/marowak.asm    |   2 +-
 data/pokemon/base_stats/meganium.asm   |   2 +-
 data/pokemon/base_stats/meowth.asm     |   2 +-
 data/pokemon/base_stats/metapod.asm    |   2 +-
 data/pokemon/base_stats/mew.asm        |   2 +-
 data/pokemon/base_stats/mewtwo.asm     |   2 +-
 data/pokemon/base_stats/miltank.asm    |   2 +-
 data/pokemon/base_stats/misdreavus.asm |   2 +-
 data/pokemon/base_stats/moltres.asm    |   2 +-
 data/pokemon/base_stats/mr__mime.asm   |   2 +-
 data/pokemon/base_stats/muk.asm        |   2 +-
 data/pokemon/base_stats/murkrow.asm    |   2 +-
 data/pokemon/base_stats/natu.asm       |   2 +-
 data/pokemon/base_stats/nidoking.asm   |   2 +-
 data/pokemon/base_stats/nidoqueen.asm  |   2 +-
 data/pokemon/base_stats/nidoran_f.asm  |   2 +-
 data/pokemon/base_stats/nidoran_m.asm  |   2 +-
 data/pokemon/base_stats/nidorina.asm   |   2 +-
 data/pokemon/base_stats/nidorino.asm   |   2 +-
 data/pokemon/base_stats/ninetales.asm  |   2 +-
 data/pokemon/base_stats/noctowl.asm    |   2 +-
 data/pokemon/base_stats/octillery.asm  |   2 +-
 data/pokemon/base_stats/oddish.asm     |   2 +-
 data/pokemon/base_stats/omanyte.asm    |   2 +-
 data/pokemon/base_stats/omastar.asm    |   2 +-
 data/pokemon/base_stats/onix.asm       |   2 +-
 data/pokemon/base_stats/paras.asm      |   2 +-
 data/pokemon/base_stats/parasect.asm   |   2 +-
 data/pokemon/base_stats/persian.asm    |   2 +-
 data/pokemon/base_stats/phanpy.asm     |   2 +-
 data/pokemon/base_stats/pichu.asm      |   2 +-
 data/pokemon/base_stats/pidgeot.asm    |   2 +-
 data/pokemon/base_stats/pidgeotto.asm  |   2 +-
 data/pokemon/base_stats/pidgey.asm     |   2 +-
 data/pokemon/base_stats/pikachu.asm    |   2 +-
 data/pokemon/base_stats/piloswine.asm  |   2 +-
 data/pokemon/base_stats/pineco.asm     |   2 +-
 data/pokemon/base_stats/pinsir.asm     |   2 +-
 data/pokemon/base_stats/politoed.asm   |   2 +-
 data/pokemon/base_stats/poliwag.asm    |   2 +-
 data/pokemon/base_stats/poliwhirl.asm  |   2 +-
 data/pokemon/base_stats/poliwrath.asm  |   2 +-
 data/pokemon/base_stats/ponyta.asm     |   2 +-
 data/pokemon/base_stats/porygon.asm    |   2 +-
 data/pokemon/base_stats/porygon2.asm   |   2 +-
 data/pokemon/base_stats/primeape.asm   |   2 +-
 data/pokemon/base_stats/psyduck.asm    |   2 +-
 data/pokemon/base_stats/pupitar.asm    |   2 +-
 data/pokemon/base_stats/quagsire.asm   |   2 +-
 data/pokemon/base_stats/quilava.asm    |   2 +-
 data/pokemon/base_stats/qwilfish.asm   |   2 +-
 data/pokemon/base_stats/raichu.asm     |   2 +-
 data/pokemon/base_stats/raikou.asm     |   2 +-
 data/pokemon/base_stats/rapidash.asm   |   2 +-
 data/pokemon/base_stats/raticate.asm   |   2 +-
 data/pokemon/base_stats/rattata.asm    |   2 +-
 data/pokemon/base_stats/remoraid.asm   |   2 +-
 data/pokemon/base_stats/rhydon.asm     |   2 +-
 data/pokemon/base_stats/rhyhorn.asm    |   2 +-
 data/pokemon/base_stats/sandshrew.asm  |   2 +-
 data/pokemon/base_stats/sandslash.asm  |   2 +-
 data/pokemon/base_stats/scizor.asm     |   2 +-
 data/pokemon/base_stats/scyther.asm    |   2 +-
 data/pokemon/base_stats/seadra.asm     |   2 +-
 data/pokemon/base_stats/seaking.asm    |   2 +-
 data/pokemon/base_stats/seel.asm       |   2 +-
 data/pokemon/base_stats/sentret.asm    |   2 +-
 data/pokemon/base_stats/shellder.asm   |   2 +-
 data/pokemon/base_stats/shuckle.asm    |   2 +-
 data/pokemon/base_stats/skarmory.asm   |   2 +-
 data/pokemon/base_stats/skiploom.asm   |   2 +-
 data/pokemon/base_stats/slowbro.asm    |   2 +-
 data/pokemon/base_stats/slowking.asm   |   2 +-
 data/pokemon/base_stats/slowpoke.asm   |   2 +-
 data/pokemon/base_stats/slugma.asm     |   2 +-
 data/pokemon/base_stats/smeargle.asm   |   2 +-
 data/pokemon/base_stats/smoochum.asm   |   2 +-
 data/pokemon/base_stats/sneasel.asm    |   2 +-
 data/pokemon/base_stats/snorlax.asm    |   2 +-
 data/pokemon/base_stats/snubbull.asm   |   2 +-
 data/pokemon/base_stats/spearow.asm    |   2 +-
 data/pokemon/base_stats/spinarak.asm   |   2 +-
 data/pokemon/base_stats/squirtle.asm   |   2 +-
 data/pokemon/base_stats/stantler.asm   |   2 +-
 data/pokemon/base_stats/starmie.asm    |   2 +-
 data/pokemon/base_stats/staryu.asm     |   2 +-
 data/pokemon/base_stats/steelix.asm    |   2 +-
 data/pokemon/base_stats/sudowoodo.asm  |   2 +-
 data/pokemon/base_stats/suicune.asm    |   2 +-
 data/pokemon/base_stats/sunflora.asm   |   2 +-
 data/pokemon/base_stats/sunkern.asm    |   2 +-
 data/pokemon/base_stats/swinub.asm     |   2 +-
 data/pokemon/base_stats/tangela.asm    |   2 +-
 data/pokemon/base_stats/tauros.asm     |   2 +-
 data/pokemon/base_stats/teddiursa.asm  |   2 +-
 data/pokemon/base_stats/tentacool.asm  |   2 +-
 data/pokemon/base_stats/tentacruel.asm |   2 +-
 data/pokemon/base_stats/togepi.asm     |   2 +-
 data/pokemon/base_stats/togetic.asm    |   2 +-
 data/pokemon/base_stats/totodile.asm   |   2 +-
 data/pokemon/base_stats/typhlosion.asm |   2 +-
 data/pokemon/base_stats/tyranitar.asm  |   2 +-
 data/pokemon/base_stats/tyrogue.asm    |   2 +-
 data/pokemon/base_stats/umbreon.asm    |   2 +-
 data/pokemon/base_stats/unown.asm      |   2 +-
 data/pokemon/base_stats/ursaring.asm   |   2 +-
 data/pokemon/base_stats/vaporeon.asm   |   2 +-
 data/pokemon/base_stats/venomoth.asm   |   2 +-
 data/pokemon/base_stats/venonat.asm    |   2 +-
 data/pokemon/base_stats/venusaur.asm   |   2 +-
 data/pokemon/base_stats/victreebel.asm |   2 +-
 data/pokemon/base_stats/vileplume.asm  |   2 +-
 data/pokemon/base_stats/voltorb.asm    |   2 +-
 data/pokemon/base_stats/vulpix.asm     |   2 +-
 data/pokemon/base_stats/wartortle.asm  |   2 +-
 data/pokemon/base_stats/weedle.asm     |   2 +-
 data/pokemon/base_stats/weepinbell.asm |   2 +-
 data/pokemon/base_stats/weezing.asm    |   2 +-
 data/pokemon/base_stats/wigglytuff.asm |   2 +-
 data/pokemon/base_stats/wobbuffet.asm  |   2 +-
 data/pokemon/base_stats/wooper.asm     |   2 +-
 data/pokemon/base_stats/xatu.asm       |   2 +-
 data/pokemon/base_stats/yanma.asm      |   2 +-
 data/pokemon/base_stats/zapdos.asm     |   2 +-
 data/pokemon/base_stats/zubat.asm      |   2 +-
 data/trainers/attributes.asm           | 120 ++++++++++++-------------
 252 files changed, 311 insertions(+), 311 deletions(-)

diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm
index 9dca824c0..c4ecd31b0 100644
--- a/data/pokemon/base_stats/abra.asm
+++ b/data/pokemon/base_stats/abra.asm
@@ -6,7 +6,7 @@
 	db PSYCHIC, PSYCHIC ; type
 	db 200 ; catch rate
 	db 73 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F25 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm
index 889909fa9..29e406504 100644
--- a/data/pokemon/base_stats/aerodactyl.asm
+++ b/data/pokemon/base_stats/aerodactyl.asm
@@ -6,7 +6,7 @@
 	db ROCK, FLYING ; type
 	db 45 ; catch rate
 	db 202 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 35 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/aipom.asm b/data/pokemon/base_stats/aipom.asm
index a03372532..827cc794f 100644
--- a/data/pokemon/base_stats/aipom.asm
+++ b/data/pokemon/base_stats/aipom.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 94 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm
index 3d5c6672b..1bdaca5a1 100644
--- a/data/pokemon/base_stats/alakazam.asm
+++ b/data/pokemon/base_stats/alakazam.asm
@@ -6,7 +6,7 @@
 	db PSYCHIC, PSYCHIC ; type
 	db 50 ; catch rate
 	db 186 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F25 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/ampharos.asm b/data/pokemon/base_stats/ampharos.asm
index c10d364af..790eb5938 100644
--- a/data/pokemon/base_stats/ampharos.asm
+++ b/data/pokemon/base_stats/ampharos.asm
@@ -6,7 +6,7 @@
 	db ELECTRIC, ELECTRIC ; type
 	db 45 ; catch rate
 	db 194 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm
index ece66c976..a1d1391e1 100644
--- a/data/pokemon/base_stats/arbok.asm
+++ b/data/pokemon/base_stats/arbok.asm
@@ -6,7 +6,7 @@
 	db POISON, POISON ; type
 	db 90 ; catch rate
 	db 147 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm
index 8bbca643f..0133ad049 100644
--- a/data/pokemon/base_stats/arcanine.asm
+++ b/data/pokemon/base_stats/arcanine.asm
@@ -6,7 +6,7 @@
 	db FIRE, FIRE ; type
 	db 75 ; catch rate
 	db 213 ; base exp
-	db BURNT_BERRY, BURNT_BERRY; items
+	db BURNT_BERRY, BURNT_BERRY ; items
 	db GENDER_F25 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/ariados.asm b/data/pokemon/base_stats/ariados.asm
index 792a87d3f..ca8076a20 100644
--- a/data/pokemon/base_stats/ariados.asm
+++ b/data/pokemon/base_stats/ariados.asm
@@ -6,7 +6,7 @@
 	db BUG, POISON ; type
 	db 90 ; catch rate
 	db 134 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm
index 24b5cd5f8..deca0d857 100644
--- a/data/pokemon/base_stats/articuno.asm
+++ b/data/pokemon/base_stats/articuno.asm
@@ -6,7 +6,7 @@
 	db ICE, FLYING ; type
 	db 3 ; catch rate
 	db 215 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 80 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/azumarill.asm b/data/pokemon/base_stats/azumarill.asm
index 30ba90c5a..d76e1bd72 100644
--- a/data/pokemon/base_stats/azumarill.asm
+++ b/data/pokemon/base_stats/azumarill.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 75 ; catch rate
 	db 153 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/bayleef.asm b/data/pokemon/base_stats/bayleef.asm
index 3a0720e2e..5974e3be7 100644
--- a/data/pokemon/base_stats/bayleef.asm
+++ b/data/pokemon/base_stats/bayleef.asm
@@ -6,7 +6,7 @@
 	db GRASS, GRASS ; type
 	db 45 ; catch rate
 	db 141 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm
index 40a52b0e9..8e371d790 100644
--- a/data/pokemon/base_stats/beedrill.asm
+++ b/data/pokemon/base_stats/beedrill.asm
@@ -6,7 +6,7 @@
 	db BUG, POISON ; type
 	db 45 ; catch rate
 	db 159 ; base exp
-	db NO_ITEM, POISON_BARB; items
+	db NO_ITEM, POISON_BARB ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/bellossom.asm b/data/pokemon/base_stats/bellossom.asm
index 8f5405091..9c6a6a935 100644
--- a/data/pokemon/base_stats/bellossom.asm
+++ b/data/pokemon/base_stats/bellossom.asm
@@ -6,7 +6,7 @@
 	db GRASS, GRASS ; type
 	db 45 ; catch rate
 	db 184 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm
index 038692552..315da4464 100644
--- a/data/pokemon/base_stats/bellsprout.asm
+++ b/data/pokemon/base_stats/bellsprout.asm
@@ -6,7 +6,7 @@
 	db GRASS, POISON ; type
 	db 255 ; catch rate
 	db 84 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm
index 82c282f6a..9cb62420a 100644
--- a/data/pokemon/base_stats/blastoise.asm
+++ b/data/pokemon/base_stats/blastoise.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 45 ; catch rate
 	db 210 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/blissey.asm b/data/pokemon/base_stats/blissey.asm
index ef9d1714b..8e6256843 100644
--- a/data/pokemon/base_stats/blissey.asm
+++ b/data/pokemon/base_stats/blissey.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 30 ; catch rate
 	db 255 ; base exp
-	db NO_ITEM, LUCKY_EGG; items
+	db NO_ITEM, LUCKY_EGG ; items
 	db GENDER_F100 ; gender ratio
 	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm
index 7e97d62c8..758504e94 100644
--- a/data/pokemon/base_stats/bulbasaur.asm
+++ b/data/pokemon/base_stats/bulbasaur.asm
@@ -6,7 +6,7 @@
 	db GRASS, POISON ; type
 	db 45 ; catch rate
 	db 64 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm
index c943ea07c..f2c125ac4 100644
--- a/data/pokemon/base_stats/butterfree.asm
+++ b/data/pokemon/base_stats/butterfree.asm
@@ -6,7 +6,7 @@
 	db BUG, FLYING ; type
 	db 45 ; catch rate
 	db 160 ; base exp
-	db NO_ITEM, SILVERPOWDER; items
+	db NO_ITEM, SILVERPOWDER ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm
index 60ff1c018..d7525ee53 100644
--- a/data/pokemon/base_stats/caterpie.asm
+++ b/data/pokemon/base_stats/caterpie.asm
@@ -6,7 +6,7 @@
 	db BUG, BUG ; type
 	db 255 ; catch rate
 	db 53 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/celebi.asm b/data/pokemon/base_stats/celebi.asm
index 3307591f9..79ec6dcd7 100644
--- a/data/pokemon/base_stats/celebi.asm
+++ b/data/pokemon/base_stats/celebi.asm
@@ -6,7 +6,7 @@
 	db PSYCHIC, GRASS ; type
 	db 45 ; catch rate
 	db 64 ; base exp
-	db NO_ITEM, MIRACLEBERRY; items
+	db NO_ITEM, MIRACLEBERRY ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 120 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm
index 993150249..78ec783ae 100644
--- a/data/pokemon/base_stats/chansey.asm
+++ b/data/pokemon/base_stats/chansey.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 30 ; catch rate
 	db 255 ; base exp
-	db NO_ITEM, LUCKY_EGG; items
+	db NO_ITEM, LUCKY_EGG ; items
 	db GENDER_F100 ; gender ratio
 	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm
index 631e864d9..237f7d72b 100644
--- a/data/pokemon/base_stats/charizard.asm
+++ b/data/pokemon/base_stats/charizard.asm
@@ -6,7 +6,7 @@
 	db FIRE, FLYING ; type
 	db 45 ; catch rate
 	db 209 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm
index b132a0ddf..6f60c22a8 100644
--- a/data/pokemon/base_stats/charmander.asm
+++ b/data/pokemon/base_stats/charmander.asm
@@ -6,7 +6,7 @@
 	db FIRE, FIRE ; type
 	db 45 ; catch rate
 	db 65 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm
index 826c5fcf4..832757a7e 100644
--- a/data/pokemon/base_stats/charmeleon.asm
+++ b/data/pokemon/base_stats/charmeleon.asm
@@ -6,7 +6,7 @@
 	db FIRE, FIRE ; type
 	db 45 ; catch rate
 	db 142 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/chikorita.asm b/data/pokemon/base_stats/chikorita.asm
index 034d79355..78560d003 100644
--- a/data/pokemon/base_stats/chikorita.asm
+++ b/data/pokemon/base_stats/chikorita.asm
@@ -6,7 +6,7 @@
 	db GRASS, GRASS ; type
 	db 45 ; catch rate
 	db 64 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/chinchou.asm b/data/pokemon/base_stats/chinchou.asm
index 570135584..3bad12e41 100644
--- a/data/pokemon/base_stats/chinchou.asm
+++ b/data/pokemon/base_stats/chinchou.asm
@@ -6,7 +6,7 @@
 	db WATER, ELECTRIC ; type
 	db 190 ; catch rate
 	db 90 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm
index 34b332358..dc627f02c 100644
--- a/data/pokemon/base_stats/clefable.asm
+++ b/data/pokemon/base_stats/clefable.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 25 ; catch rate
 	db 129 ; base exp
-	db MYSTERYBERRY, MOON_STONE; items
+	db MYSTERYBERRY, MOON_STONE ; items
 	db GENDER_F75 ; gender ratio
 	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm
index 2ff9c1645..71c8ac9a7 100644
--- a/data/pokemon/base_stats/clefairy.asm
+++ b/data/pokemon/base_stats/clefairy.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 150 ; catch rate
 	db 68 ; base exp
-	db MYSTERYBERRY, MOON_STONE; items
+	db MYSTERYBERRY, MOON_STONE ; items
 	db GENDER_F75 ; gender ratio
 	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/cleffa.asm b/data/pokemon/base_stats/cleffa.asm
index 5436c661e..af68d2f36 100644
--- a/data/pokemon/base_stats/cleffa.asm
+++ b/data/pokemon/base_stats/cleffa.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 150 ; catch rate
 	db 37 ; base exp
-	db MYSTERYBERRY, MOON_STONE; items
+	db MYSTERYBERRY, MOON_STONE ; items
 	db GENDER_F75 ; gender ratio
 	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm
index 552d9a6fe..7dfc72ff9 100644
--- a/data/pokemon/base_stats/cloyster.asm
+++ b/data/pokemon/base_stats/cloyster.asm
@@ -6,7 +6,7 @@
 	db WATER, ICE ; type
 	db 60 ; catch rate
 	db 203 ; base exp
-	db PEARL, BIG_PEARL; items
+	db PEARL, BIG_PEARL ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/corsola.asm b/data/pokemon/base_stats/corsola.asm
index 16234bbf1..e5f2536f8 100644
--- a/data/pokemon/base_stats/corsola.asm
+++ b/data/pokemon/base_stats/corsola.asm
@@ -6,7 +6,7 @@
 	db WATER, ROCK ; type
 	db 60 ; catch rate
 	db 113 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F75 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/crobat.asm b/data/pokemon/base_stats/crobat.asm
index f52866f3b..11b39ab2d 100644
--- a/data/pokemon/base_stats/crobat.asm
+++ b/data/pokemon/base_stats/crobat.asm
@@ -6,7 +6,7 @@
 	db POISON, FLYING ; type
 	db 90 ; catch rate
 	db 204 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/croconaw.asm b/data/pokemon/base_stats/croconaw.asm
index 2f08eaecc..8b0fa482f 100644
--- a/data/pokemon/base_stats/croconaw.asm
+++ b/data/pokemon/base_stats/croconaw.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 45 ; catch rate
 	db 143 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm
index 55fdf7586..a44eea42e 100644
--- a/data/pokemon/base_stats/cubone.asm
+++ b/data/pokemon/base_stats/cubone.asm
@@ -6,7 +6,7 @@
 	db GROUND, GROUND ; type
 	db 190 ; catch rate
 	db 87 ; base exp
-	db NO_ITEM, THICK_CLUB; items
+	db NO_ITEM, THICK_CLUB ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/cyndaquil.asm b/data/pokemon/base_stats/cyndaquil.asm
index 9ffb7a562..e4a632ef7 100644
--- a/data/pokemon/base_stats/cyndaquil.asm
+++ b/data/pokemon/base_stats/cyndaquil.asm
@@ -6,7 +6,7 @@
 	db FIRE, FIRE ; type
 	db 45 ; catch rate
 	db 65 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/delibird.asm b/data/pokemon/base_stats/delibird.asm
index f00e6fbf6..aacb0e6ae 100644
--- a/data/pokemon/base_stats/delibird.asm
+++ b/data/pokemon/base_stats/delibird.asm
@@ -6,7 +6,7 @@
 	db ICE, FLYING ; type
 	db 45 ; catch rate
 	db 183 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm
index d90aac1b3..18117d30d 100644
--- a/data/pokemon/base_stats/dewgong.asm
+++ b/data/pokemon/base_stats/dewgong.asm
@@ -6,7 +6,7 @@
 	db WATER, ICE ; type
 	db 75 ; catch rate
 	db 176 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm
index 8c97db59d..eb16f74ea 100644
--- a/data/pokemon/base_stats/diglett.asm
+++ b/data/pokemon/base_stats/diglett.asm
@@ -6,7 +6,7 @@
 	db GROUND, GROUND ; type
 	db 255 ; catch rate
 	db 81 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm
index 06c7f2b4c..98edff5b3 100644
--- a/data/pokemon/base_stats/ditto.asm
+++ b/data/pokemon/base_stats/ditto.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 35 ; catch rate
 	db 61 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm
index c3232e2f1..dbdb095e2 100644
--- a/data/pokemon/base_stats/dodrio.asm
+++ b/data/pokemon/base_stats/dodrio.asm
@@ -6,7 +6,7 @@
 	db NORMAL, FLYING ; type
 	db 45 ; catch rate
 	db 158 ; base exp
-	db NO_ITEM, SHARP_BEAK; items
+	db NO_ITEM, SHARP_BEAK ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm
index 0d503a191..668740723 100644
--- a/data/pokemon/base_stats/doduo.asm
+++ b/data/pokemon/base_stats/doduo.asm
@@ -6,7 +6,7 @@
 	db NORMAL, FLYING ; type
 	db 190 ; catch rate
 	db 96 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/donphan.asm b/data/pokemon/base_stats/donphan.asm
index af38c1aee..06d91e3a5 100644
--- a/data/pokemon/base_stats/donphan.asm
+++ b/data/pokemon/base_stats/donphan.asm
@@ -6,7 +6,7 @@
 	db GROUND, GROUND ; type
 	db 60 ; catch rate
 	db 189 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm
index 272310082..a876a54de 100644
--- a/data/pokemon/base_stats/dragonair.asm
+++ b/data/pokemon/base_stats/dragonair.asm
@@ -6,7 +6,7 @@
 	db DRAGON, DRAGON ; type
 	db 45 ; catch rate
 	db 144 ; base exp
-	db NO_ITEM, DRAGON_SCALE; items
+	db NO_ITEM, DRAGON_SCALE ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm
index b3698900a..6d088437f 100644
--- a/data/pokemon/base_stats/dragonite.asm
+++ b/data/pokemon/base_stats/dragonite.asm
@@ -6,7 +6,7 @@
 	db DRAGON, FLYING ; type
 	db 45 ; catch rate
 	db 218 ; base exp
-	db NO_ITEM, DRAGON_SCALE; items
+	db NO_ITEM, DRAGON_SCALE ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm
index 7cdf68c88..2e8b2a226 100644
--- a/data/pokemon/base_stats/dratini.asm
+++ b/data/pokemon/base_stats/dratini.asm
@@ -6,7 +6,7 @@
 	db DRAGON, DRAGON ; type
 	db 45 ; catch rate
 	db 67 ; base exp
-	db NO_ITEM, DRAGON_SCALE; items
+	db NO_ITEM, DRAGON_SCALE ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm
index 9cfad8c45..9d1ad9b41 100644
--- a/data/pokemon/base_stats/drowzee.asm
+++ b/data/pokemon/base_stats/drowzee.asm
@@ -6,7 +6,7 @@
 	db PSYCHIC, PSYCHIC ; type
 	db 190 ; catch rate
 	db 102 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm
index fe6d0415b..8743b2513 100644
--- a/data/pokemon/base_stats/dugtrio.asm
+++ b/data/pokemon/base_stats/dugtrio.asm
@@ -6,7 +6,7 @@
 	db GROUND, GROUND ; type
 	db 50 ; catch rate
 	db 153 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/dunsparce.asm b/data/pokemon/base_stats/dunsparce.asm
index 5118dfd2c..5e6e2170b 100644
--- a/data/pokemon/base_stats/dunsparce.asm
+++ b/data/pokemon/base_stats/dunsparce.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 190 ; catch rate
 	db 75 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm
index 8fce2db3f..0176dec0d 100644
--- a/data/pokemon/base_stats/eevee.asm
+++ b/data/pokemon/base_stats/eevee.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 92 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 35 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm
index a0c72af1e..5d9903d0e 100644
--- a/data/pokemon/base_stats/ekans.asm
+++ b/data/pokemon/base_stats/ekans.asm
@@ -6,7 +6,7 @@
 	db POISON, POISON ; type
 	db 255 ; catch rate
 	db 62 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm
index 521a23344..1ab247deb 100644
--- a/data/pokemon/base_stats/electabuzz.asm
+++ b/data/pokemon/base_stats/electabuzz.asm
@@ -6,7 +6,7 @@
 	db ELECTRIC, ELECTRIC ; type
 	db 45 ; catch rate
 	db 156 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F25 ; gender ratio
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm
index 456bc5797..29b58e505 100644
--- a/data/pokemon/base_stats/electrode.asm
+++ b/data/pokemon/base_stats/electrode.asm
@@ -6,7 +6,7 @@
 	db ELECTRIC, ELECTRIC ; type
 	db 60 ; catch rate
 	db 150 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/elekid.asm b/data/pokemon/base_stats/elekid.asm
index 48eb8ac14..75b6f4375 100644
--- a/data/pokemon/base_stats/elekid.asm
+++ b/data/pokemon/base_stats/elekid.asm
@@ -6,7 +6,7 @@
 	db ELECTRIC, ELECTRIC ; type
 	db 45 ; catch rate
 	db 106 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F25 ; gender ratio
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/entei.asm b/data/pokemon/base_stats/entei.asm
index 3e0a778c7..1374353ea 100644
--- a/data/pokemon/base_stats/entei.asm
+++ b/data/pokemon/base_stats/entei.asm
@@ -6,7 +6,7 @@
 	db FIRE, FIRE ; type
 	db 3 ; catch rate
 	db 217 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 80 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/espeon.asm b/data/pokemon/base_stats/espeon.asm
index 502185e9a..a918b8a20 100644
--- a/data/pokemon/base_stats/espeon.asm
+++ b/data/pokemon/base_stats/espeon.asm
@@ -6,7 +6,7 @@
 	db PSYCHIC, PSYCHIC ; type
 	db 45 ; catch rate
 	db 197 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 35 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm
index 3cc9a8543..208e93267 100644
--- a/data/pokemon/base_stats/exeggcute.asm
+++ b/data/pokemon/base_stats/exeggcute.asm
@@ -6,7 +6,7 @@
 	db GRASS, PSYCHIC ; type
 	db 90 ; catch rate
 	db 98 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm
index 3e3e83281..a573c30ff 100644
--- a/data/pokemon/base_stats/exeggutor.asm
+++ b/data/pokemon/base_stats/exeggutor.asm
@@ -6,7 +6,7 @@
 	db GRASS, PSYCHIC ; type
 	db 45 ; catch rate
 	db 212 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/farfetch_d.asm b/data/pokemon/base_stats/farfetch_d.asm
index 874f06d69..eed2f6c60 100644
--- a/data/pokemon/base_stats/farfetch_d.asm
+++ b/data/pokemon/base_stats/farfetch_d.asm
@@ -6,7 +6,7 @@
 	db NORMAL, FLYING ; type
 	db 45 ; catch rate
 	db 94 ; base exp
-	db NO_ITEM, STICK; items
+	db NO_ITEM, STICK ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm
index 432c9965a..294aa8b4d 100644
--- a/data/pokemon/base_stats/fearow.asm
+++ b/data/pokemon/base_stats/fearow.asm
@@ -6,7 +6,7 @@
 	db NORMAL, FLYING ; type
 	db 90 ; catch rate
 	db 162 ; base exp
-	db NO_ITEM, SHARP_BEAK; items
+	db NO_ITEM, SHARP_BEAK ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/feraligatr.asm b/data/pokemon/base_stats/feraligatr.asm
index 6cdaa6857..acdbc4126 100644
--- a/data/pokemon/base_stats/feraligatr.asm
+++ b/data/pokemon/base_stats/feraligatr.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 45 ; catch rate
 	db 210 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/flaaffy.asm b/data/pokemon/base_stats/flaaffy.asm
index 01d1fcc77..462f62aa7 100644
--- a/data/pokemon/base_stats/flaaffy.asm
+++ b/data/pokemon/base_stats/flaaffy.asm
@@ -6,7 +6,7 @@
 	db ELECTRIC, ELECTRIC ; type
 	db 120 ; catch rate
 	db 117 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm
index d38a9411a..ccdc379e0 100644
--- a/data/pokemon/base_stats/flareon.asm
+++ b/data/pokemon/base_stats/flareon.asm
@@ -6,7 +6,7 @@
 	db FIRE, FIRE ; type
 	db 45 ; catch rate
 	db 198 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 35 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/forretress.asm b/data/pokemon/base_stats/forretress.asm
index a22389430..24eded41f 100644
--- a/data/pokemon/base_stats/forretress.asm
+++ b/data/pokemon/base_stats/forretress.asm
@@ -6,7 +6,7 @@
 	db BUG, STEEL ; type
 	db 75 ; catch rate
 	db 118 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/furret.asm b/data/pokemon/base_stats/furret.asm
index 303e301d0..cb1400fa3 100644
--- a/data/pokemon/base_stats/furret.asm
+++ b/data/pokemon/base_stats/furret.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 90 ; catch rate
 	db 116 ; base exp
-	db BERRY, GOLD_BERRY; items
+	db BERRY, GOLD_BERRY ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm
index cc399fabf..e3bdd277d 100644
--- a/data/pokemon/base_stats/gastly.asm
+++ b/data/pokemon/base_stats/gastly.asm
@@ -6,7 +6,7 @@
 	db GHOST, POISON ; type
 	db 190 ; catch rate
 	db 95 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm
index a8b2240a2..fd08cb5b9 100644
--- a/data/pokemon/base_stats/gengar.asm
+++ b/data/pokemon/base_stats/gengar.asm
@@ -6,7 +6,7 @@
 	db GHOST, POISON ; type
 	db 45 ; catch rate
 	db 190 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm
index 4cfc7ea5b..f084e0b84 100644
--- a/data/pokemon/base_stats/geodude.asm
+++ b/data/pokemon/base_stats/geodude.asm
@@ -6,7 +6,7 @@
 	db ROCK, GROUND ; type
 	db 255 ; catch rate
 	db 86 ; base exp
-	db NO_ITEM, EVERSTONE; items
+	db NO_ITEM, EVERSTONE ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/girafarig.asm b/data/pokemon/base_stats/girafarig.asm
index 996171792..e4a93e1a1 100644
--- a/data/pokemon/base_stats/girafarig.asm
+++ b/data/pokemon/base_stats/girafarig.asm
@@ -6,7 +6,7 @@
 	db NORMAL, PSYCHIC ; type
 	db 60 ; catch rate
 	db 149 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/gligar.asm b/data/pokemon/base_stats/gligar.asm
index d0b026f7c..ae609d5d2 100644
--- a/data/pokemon/base_stats/gligar.asm
+++ b/data/pokemon/base_stats/gligar.asm
@@ -6,7 +6,7 @@
 	db GROUND, FLYING ; type
 	db 60 ; catch rate
 	db 108 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm
index 78ca61d01..3fa7e5519 100644
--- a/data/pokemon/base_stats/gloom.asm
+++ b/data/pokemon/base_stats/gloom.asm
@@ -6,7 +6,7 @@
 	db GRASS, POISON ; type
 	db 120 ; catch rate
 	db 132 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm
index 0928342a3..071df7e59 100644
--- a/data/pokemon/base_stats/golbat.asm
+++ b/data/pokemon/base_stats/golbat.asm
@@ -6,7 +6,7 @@
 	db POISON, FLYING ; type
 	db 90 ; catch rate
 	db 171 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm
index 1a598fd28..eb432d38b 100644
--- a/data/pokemon/base_stats/goldeen.asm
+++ b/data/pokemon/base_stats/goldeen.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 225 ; catch rate
 	db 111 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm
index 53a633c1d..5cc8e01a1 100644
--- a/data/pokemon/base_stats/golduck.asm
+++ b/data/pokemon/base_stats/golduck.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 75 ; catch rate
 	db 174 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm
index b484a9f73..bb973d0b9 100644
--- a/data/pokemon/base_stats/golem.asm
+++ b/data/pokemon/base_stats/golem.asm
@@ -6,7 +6,7 @@
 	db ROCK, GROUND ; type
 	db 45 ; catch rate
 	db 177 ; base exp
-	db NO_ITEM, EVERSTONE; items
+	db NO_ITEM, EVERSTONE ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/granbull.asm b/data/pokemon/base_stats/granbull.asm
index 272cb2c04..3d3933377 100644
--- a/data/pokemon/base_stats/granbull.asm
+++ b/data/pokemon/base_stats/granbull.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 75 ; catch rate
 	db 178 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F75 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm
index 216378ea9..97c4699c0 100644
--- a/data/pokemon/base_stats/graveler.asm
+++ b/data/pokemon/base_stats/graveler.asm
@@ -6,7 +6,7 @@
 	db ROCK, GROUND ; type
 	db 120 ; catch rate
 	db 134 ; base exp
-	db NO_ITEM, EVERSTONE; items
+	db NO_ITEM, EVERSTONE ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm
index 24a0c6edd..35c0e5eaf 100644
--- a/data/pokemon/base_stats/grimer.asm
+++ b/data/pokemon/base_stats/grimer.asm
@@ -6,7 +6,7 @@
 	db POISON, POISON ; type
 	db 190 ; catch rate
 	db 90 ; base exp
-	db NO_ITEM, NUGGET; items
+	db NO_ITEM, NUGGET ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm
index aaef18154..61c9f5e54 100644
--- a/data/pokemon/base_stats/growlithe.asm
+++ b/data/pokemon/base_stats/growlithe.asm
@@ -6,7 +6,7 @@
 	db FIRE, FIRE ; type
 	db 190 ; catch rate
 	db 91 ; base exp
-	db BURNT_BERRY, BURNT_BERRY; items
+	db BURNT_BERRY, BURNT_BERRY ; items
 	db GENDER_F25 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm
index 66916f2d8..0e4d5ca6e 100644
--- a/data/pokemon/base_stats/gyarados.asm
+++ b/data/pokemon/base_stats/gyarados.asm
@@ -6,7 +6,7 @@
 	db WATER, FLYING ; type
 	db 45 ; catch rate
 	db 214 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 5 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm
index e6268fefa..f9f985a70 100644
--- a/data/pokemon/base_stats/haunter.asm
+++ b/data/pokemon/base_stats/haunter.asm
@@ -6,7 +6,7 @@
 	db GHOST, POISON ; type
 	db 90 ; catch rate
 	db 126 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/heracross.asm b/data/pokemon/base_stats/heracross.asm
index b02fb74d8..699fc40a8 100644
--- a/data/pokemon/base_stats/heracross.asm
+++ b/data/pokemon/base_stats/heracross.asm
@@ -6,7 +6,7 @@
 	db BUG, FIGHTING ; type
 	db 45 ; catch rate
 	db 200 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm
index 0d753ff50..f5d84215b 100644
--- a/data/pokemon/base_stats/hitmonchan.asm
+++ b/data/pokemon/base_stats/hitmonchan.asm
@@ -6,7 +6,7 @@
 	db FIGHTING, FIGHTING ; type
 	db 45 ; catch rate
 	db 140 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F0 ; gender ratio
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm
index 6fd72dd4e..4577d6cca 100644
--- a/data/pokemon/base_stats/hitmonlee.asm
+++ b/data/pokemon/base_stats/hitmonlee.asm
@@ -6,7 +6,7 @@
 	db FIGHTING, FIGHTING ; type
 	db 45 ; catch rate
 	db 139 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F0 ; gender ratio
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/hitmontop.asm b/data/pokemon/base_stats/hitmontop.asm
index f7041fbc1..caf0375a1 100644
--- a/data/pokemon/base_stats/hitmontop.asm
+++ b/data/pokemon/base_stats/hitmontop.asm
@@ -6,7 +6,7 @@
 	db FIGHTING, FIGHTING ; type
 	db 45 ; catch rate
 	db 138 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F0 ; gender ratio
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/ho_oh.asm b/data/pokemon/base_stats/ho_oh.asm
index f63bd3a1b..248fc05b7 100644
--- a/data/pokemon/base_stats/ho_oh.asm
+++ b/data/pokemon/base_stats/ho_oh.asm
@@ -6,7 +6,7 @@
 	db FIRE, FLYING ; type
 	db 3 ; catch rate
 	db 220 ; base exp
-	db SACRED_ASH, SACRED_ASH; items
+	db SACRED_ASH, SACRED_ASH ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 120 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/hoothoot.asm b/data/pokemon/base_stats/hoothoot.asm
index 9fcc72dcf..29293fc6a 100644
--- a/data/pokemon/base_stats/hoothoot.asm
+++ b/data/pokemon/base_stats/hoothoot.asm
@@ -6,7 +6,7 @@
 	db NORMAL, FLYING ; type
 	db 255 ; catch rate
 	db 58 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/hoppip.asm b/data/pokemon/base_stats/hoppip.asm
index 05d378af8..4119f13a7 100644
--- a/data/pokemon/base_stats/hoppip.asm
+++ b/data/pokemon/base_stats/hoppip.asm
@@ -6,7 +6,7 @@
 	db GRASS, FLYING ; type
 	db 255 ; catch rate
 	db 74 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm
index 1869ebacf..dd3c085a8 100644
--- a/data/pokemon/base_stats/horsea.asm
+++ b/data/pokemon/base_stats/horsea.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 225 ; catch rate
 	db 83 ; base exp
-	db NO_ITEM, DRAGON_SCALE; items
+	db NO_ITEM, DRAGON_SCALE ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/houndoom.asm b/data/pokemon/base_stats/houndoom.asm
index 7c14cf179..57a9a77fe 100644
--- a/data/pokemon/base_stats/houndoom.asm
+++ b/data/pokemon/base_stats/houndoom.asm
@@ -6,7 +6,7 @@
 	db DARK, FIRE ; type
 	db 45 ; catch rate
 	db 204 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/houndour.asm b/data/pokemon/base_stats/houndour.asm
index c212ea227..108d548b9 100644
--- a/data/pokemon/base_stats/houndour.asm
+++ b/data/pokemon/base_stats/houndour.asm
@@ -6,7 +6,7 @@
 	db DARK, FIRE ; type
 	db 120 ; catch rate
 	db 114 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm
index 312659af0..d48bb297a 100644
--- a/data/pokemon/base_stats/hypno.asm
+++ b/data/pokemon/base_stats/hypno.asm
@@ -6,7 +6,7 @@
 	db PSYCHIC, PSYCHIC ; type
 	db 75 ; catch rate
 	db 165 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/igglybuff.asm b/data/pokemon/base_stats/igglybuff.asm
index 73cf2f077..b6aa6adf5 100644
--- a/data/pokemon/base_stats/igglybuff.asm
+++ b/data/pokemon/base_stats/igglybuff.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 170 ; catch rate
 	db 39 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F75 ; gender ratio
 	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm
index aa3d60b65..e06579d8b 100644
--- a/data/pokemon/base_stats/ivysaur.asm
+++ b/data/pokemon/base_stats/ivysaur.asm
@@ -6,7 +6,7 @@
 	db GRASS, POISON ; type
 	db 45 ; catch rate
 	db 141 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm
index 42f9a3e69..5a3066a56 100644
--- a/data/pokemon/base_stats/jigglypuff.asm
+++ b/data/pokemon/base_stats/jigglypuff.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 170 ; catch rate
 	db 76 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F75 ; gender ratio
 	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm
index 283ce0fd8..109096d97 100644
--- a/data/pokemon/base_stats/jolteon.asm
+++ b/data/pokemon/base_stats/jolteon.asm
@@ -6,7 +6,7 @@
 	db ELECTRIC, ELECTRIC ; type
 	db 45 ; catch rate
 	db 197 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 35 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/jumpluff.asm b/data/pokemon/base_stats/jumpluff.asm
index d9ffb165a..eb98fdb31 100644
--- a/data/pokemon/base_stats/jumpluff.asm
+++ b/data/pokemon/base_stats/jumpluff.asm
@@ -6,7 +6,7 @@
 	db GRASS, FLYING ; type
 	db 45 ; catch rate
 	db 176 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm
index 47fbefdc2..030c2a978 100644
--- a/data/pokemon/base_stats/jynx.asm
+++ b/data/pokemon/base_stats/jynx.asm
@@ -6,7 +6,7 @@
 	db ICE, PSYCHIC ; type
 	db 45 ; catch rate
 	db 137 ; base exp
-	db ICE_BERRY, ICE_BERRY; items
+	db ICE_BERRY, ICE_BERRY ; items
 	db GENDER_F100 ; gender ratio
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm
index 36089b5a2..f9ac24011 100644
--- a/data/pokemon/base_stats/kabuto.asm
+++ b/data/pokemon/base_stats/kabuto.asm
@@ -6,7 +6,7 @@
 	db ROCK, WATER ; type
 	db 45 ; catch rate
 	db 119 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 30 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm
index 4cba3259e..c6d755694 100644
--- a/data/pokemon/base_stats/kabutops.asm
+++ b/data/pokemon/base_stats/kabutops.asm
@@ -6,7 +6,7 @@
 	db ROCK, WATER ; type
 	db 45 ; catch rate
 	db 201 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 30 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm
index 7533d2894..eff333df4 100644
--- a/data/pokemon/base_stats/kadabra.asm
+++ b/data/pokemon/base_stats/kadabra.asm
@@ -6,7 +6,7 @@
 	db PSYCHIC, PSYCHIC ; type
 	db 100 ; catch rate
 	db 145 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F25 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm
index 5c9902df5..20c0db908 100644
--- a/data/pokemon/base_stats/kakuna.asm
+++ b/data/pokemon/base_stats/kakuna.asm
@@ -6,7 +6,7 @@
 	db BUG, POISON ; type
 	db 120 ; catch rate
 	db 71 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm
index 69f6ba6f9..f56401af5 100644
--- a/data/pokemon/base_stats/kangaskhan.asm
+++ b/data/pokemon/base_stats/kangaskhan.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 175 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F100 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.asm
index f64cddccc..930f30b7b 100644
--- a/data/pokemon/base_stats/kingdra.asm
+++ b/data/pokemon/base_stats/kingdra.asm
@@ -6,7 +6,7 @@
 	db WATER, DRAGON ; type
 	db 45 ; catch rate
 	db 207 ; base exp
-	db NO_ITEM, DRAGON_SCALE; items
+	db NO_ITEM, DRAGON_SCALE ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm
index f76ff1a26..3362dc4f0 100644
--- a/data/pokemon/base_stats/kingler.asm
+++ b/data/pokemon/base_stats/kingler.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 60 ; catch rate
 	db 206 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm
index 593be0a67..cd37c020e 100644
--- a/data/pokemon/base_stats/koffing.asm
+++ b/data/pokemon/base_stats/koffing.asm
@@ -6,7 +6,7 @@
 	db POISON, POISON ; type
 	db 190 ; catch rate
 	db 114 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm
index 830908fd5..5b8214773 100644
--- a/data/pokemon/base_stats/krabby.asm
+++ b/data/pokemon/base_stats/krabby.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 225 ; catch rate
 	db 115 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/lanturn.asm b/data/pokemon/base_stats/lanturn.asm
index d8e38b369..140d85dc4 100644
--- a/data/pokemon/base_stats/lanturn.asm
+++ b/data/pokemon/base_stats/lanturn.asm
@@ -6,7 +6,7 @@
 	db WATER, ELECTRIC ; type
 	db 75 ; catch rate
 	db 156 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm
index 5985e9f68..dbbaa0203 100644
--- a/data/pokemon/base_stats/lapras.asm
+++ b/data/pokemon/base_stats/lapras.asm
@@ -6,7 +6,7 @@
 	db WATER, ICE ; type
 	db 45 ; catch rate
 	db 219 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/larvitar.asm b/data/pokemon/base_stats/larvitar.asm
index d40e559c6..fc595d973 100644
--- a/data/pokemon/base_stats/larvitar.asm
+++ b/data/pokemon/base_stats/larvitar.asm
@@ -6,7 +6,7 @@
 	db ROCK, GROUND ; type
 	db 45 ; catch rate
 	db 67 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/ledian.asm b/data/pokemon/base_stats/ledian.asm
index e8fcc7db1..ac8e998b7 100644
--- a/data/pokemon/base_stats/ledian.asm
+++ b/data/pokemon/base_stats/ledian.asm
@@ -6,7 +6,7 @@
 	db BUG, FLYING ; type
 	db 90 ; catch rate
 	db 134 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/ledyba.asm b/data/pokemon/base_stats/ledyba.asm
index a532862ea..7ec0cf21b 100644
--- a/data/pokemon/base_stats/ledyba.asm
+++ b/data/pokemon/base_stats/ledyba.asm
@@ -6,7 +6,7 @@
 	db BUG, FLYING ; type
 	db 255 ; catch rate
 	db 54 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm
index 80c034a8a..71b61380f 100644
--- a/data/pokemon/base_stats/lickitung.asm
+++ b/data/pokemon/base_stats/lickitung.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 127 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/lugia.asm b/data/pokemon/base_stats/lugia.asm
index 76678116a..dae611f43 100644
--- a/data/pokemon/base_stats/lugia.asm
+++ b/data/pokemon/base_stats/lugia.asm
@@ -6,7 +6,7 @@
 	db PSYCHIC, FLYING ; type
 	db 3 ; catch rate
 	db 220 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 120 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm
index 67566ee37..a8a18ae9e 100644
--- a/data/pokemon/base_stats/machamp.asm
+++ b/data/pokemon/base_stats/machamp.asm
@@ -6,7 +6,7 @@
 	db FIGHTING, FIGHTING ; type
 	db 45 ; catch rate
 	db 193 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F25 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm
index fa18abc93..eeef8bdb5 100644
--- a/data/pokemon/base_stats/machoke.asm
+++ b/data/pokemon/base_stats/machoke.asm
@@ -6,7 +6,7 @@
 	db FIGHTING, FIGHTING ; type
 	db 90 ; catch rate
 	db 146 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F25 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm
index ee81897a0..a3eef3d17 100644
--- a/data/pokemon/base_stats/machop.asm
+++ b/data/pokemon/base_stats/machop.asm
@@ -6,7 +6,7 @@
 	db FIGHTING, FIGHTING ; type
 	db 180 ; catch rate
 	db 88 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F25 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/magby.asm b/data/pokemon/base_stats/magby.asm
index dcf076627..259cbd32d 100644
--- a/data/pokemon/base_stats/magby.asm
+++ b/data/pokemon/base_stats/magby.asm
@@ -6,7 +6,7 @@
 	db FIRE, FIRE ; type
 	db 45 ; catch rate
 	db 117 ; base exp
-	db BURNT_BERRY, BURNT_BERRY; items
+	db BURNT_BERRY, BURNT_BERRY ; items
 	db GENDER_F25 ; gender ratio
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/magcargo.asm b/data/pokemon/base_stats/magcargo.asm
index 03a8e8147..2daa19ead 100644
--- a/data/pokemon/base_stats/magcargo.asm
+++ b/data/pokemon/base_stats/magcargo.asm
@@ -6,7 +6,7 @@
 	db FIRE, ROCK ; type
 	db 75 ; catch rate
 	db 154 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm
index 3398a5291..16e0cebc9 100644
--- a/data/pokemon/base_stats/magikarp.asm
+++ b/data/pokemon/base_stats/magikarp.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 255 ; catch rate
 	db 20 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 5 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm
index dcef3350c..7c12c9304 100644
--- a/data/pokemon/base_stats/magmar.asm
+++ b/data/pokemon/base_stats/magmar.asm
@@ -6,7 +6,7 @@
 	db FIRE, FIRE ; type
 	db 45 ; catch rate
 	db 167 ; base exp
-	db BURNT_BERRY, BURNT_BERRY; items
+	db BURNT_BERRY, BURNT_BERRY ; items
 	db GENDER_F25 ; gender ratio
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm
index 667ca215e..de03ea6ff 100644
--- a/data/pokemon/base_stats/magnemite.asm
+++ b/data/pokemon/base_stats/magnemite.asm
@@ -6,7 +6,7 @@
 	db ELECTRIC, STEEL ; type
 	db 190 ; catch rate
 	db 89 ; base exp
-	db NO_ITEM, METAL_COAT; items
+	db NO_ITEM, METAL_COAT ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm
index 201ac98c2..9f76e9535 100644
--- a/data/pokemon/base_stats/magneton.asm
+++ b/data/pokemon/base_stats/magneton.asm
@@ -6,7 +6,7 @@
 	db ELECTRIC, STEEL ; type
 	db 60 ; catch rate
 	db 161 ; base exp
-	db NO_ITEM, METAL_COAT; items
+	db NO_ITEM, METAL_COAT ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm
index 4f4c8323c..20685da70 100644
--- a/data/pokemon/base_stats/mankey.asm
+++ b/data/pokemon/base_stats/mankey.asm
@@ -6,7 +6,7 @@
 	db FIGHTING, FIGHTING ; type
 	db 190 ; catch rate
 	db 74 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/mantine.asm b/data/pokemon/base_stats/mantine.asm
index 33b674f4e..7b5cd54a9 100644
--- a/data/pokemon/base_stats/mantine.asm
+++ b/data/pokemon/base_stats/mantine.asm
@@ -6,7 +6,7 @@
 	db WATER, FLYING ; type
 	db 25 ; catch rate
 	db 168 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/mareep.asm b/data/pokemon/base_stats/mareep.asm
index dbc7542ab..fbfe2b807 100644
--- a/data/pokemon/base_stats/mareep.asm
+++ b/data/pokemon/base_stats/mareep.asm
@@ -6,7 +6,7 @@
 	db ELECTRIC, ELECTRIC ; type
 	db 235 ; catch rate
 	db 59 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/marill.asm b/data/pokemon/base_stats/marill.asm
index f57d0e577..28f936745 100644
--- a/data/pokemon/base_stats/marill.asm
+++ b/data/pokemon/base_stats/marill.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 190 ; catch rate
 	db 58 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm
index b98e344ee..264814f55 100644
--- a/data/pokemon/base_stats/marowak.asm
+++ b/data/pokemon/base_stats/marowak.asm
@@ -6,7 +6,7 @@
 	db GROUND, GROUND ; type
 	db 75 ; catch rate
 	db 124 ; base exp
-	db NO_ITEM, THICK_CLUB; items
+	db NO_ITEM, THICK_CLUB ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/meganium.asm b/data/pokemon/base_stats/meganium.asm
index 41336bf88..7e1b00fbd 100644
--- a/data/pokemon/base_stats/meganium.asm
+++ b/data/pokemon/base_stats/meganium.asm
@@ -6,7 +6,7 @@
 	db GRASS, GRASS ; type
 	db 45 ; catch rate
 	db 208 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm
index 4f12a79ff..70a8d99c3 100644
--- a/data/pokemon/base_stats/meowth.asm
+++ b/data/pokemon/base_stats/meowth.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 255 ; catch rate
 	db 69 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm
index 4f91cbd72..335e894e3 100644
--- a/data/pokemon/base_stats/metapod.asm
+++ b/data/pokemon/base_stats/metapod.asm
@@ -6,7 +6,7 @@
 	db BUG, BUG ; type
 	db 120 ; catch rate
 	db 72 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm
index ddc70b947..00210b8fd 100644
--- a/data/pokemon/base_stats/mew.asm
+++ b/data/pokemon/base_stats/mew.asm
@@ -6,7 +6,7 @@
 	db PSYCHIC, PSYCHIC ; type
 	db 45 ; catch rate
 	db 64 ; base exp
-	db NO_ITEM, MIRACLEBERRY; items
+	db NO_ITEM, MIRACLEBERRY ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 120 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm
index 2c1e68497..72af5a116 100644
--- a/data/pokemon/base_stats/mewtwo.asm
+++ b/data/pokemon/base_stats/mewtwo.asm
@@ -6,7 +6,7 @@
 	db PSYCHIC, PSYCHIC ; type
 	db 3 ; catch rate
 	db 220 ; base exp
-	db NO_ITEM, BERSERK_GENE; items
+	db NO_ITEM, BERSERK_GENE ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 120 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/miltank.asm b/data/pokemon/base_stats/miltank.asm
index 8a28845f7..20454d80a 100644
--- a/data/pokemon/base_stats/miltank.asm
+++ b/data/pokemon/base_stats/miltank.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 200 ; base exp
-	db MOOMOO_MILK, MOOMOO_MILK; items
+	db MOOMOO_MILK, MOOMOO_MILK ; items
 	db GENDER_F100 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/misdreavus.asm b/data/pokemon/base_stats/misdreavus.asm
index 232fc4bea..e4d427ae4 100644
--- a/data/pokemon/base_stats/misdreavus.asm
+++ b/data/pokemon/base_stats/misdreavus.asm
@@ -6,7 +6,7 @@
 	db GHOST, GHOST ; type
 	db 45 ; catch rate
 	db 147 ; base exp
-	db NO_ITEM, SPELL_TAG; items
+	db NO_ITEM, SPELL_TAG ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm
index 17f90610e..975c7a9ab 100644
--- a/data/pokemon/base_stats/moltres.asm
+++ b/data/pokemon/base_stats/moltres.asm
@@ -6,7 +6,7 @@
 	db FIRE, FLYING ; type
 	db 3 ; catch rate
 	db 217 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 80 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/mr__mime.asm b/data/pokemon/base_stats/mr__mime.asm
index 3073f6d6e..9caaa03d1 100644
--- a/data/pokemon/base_stats/mr__mime.asm
+++ b/data/pokemon/base_stats/mr__mime.asm
@@ -6,7 +6,7 @@
 	db PSYCHIC, PSYCHIC ; type
 	db 45 ; catch rate
 	db 136 ; base exp
-	db NO_ITEM, MYSTERYBERRY; items
+	db NO_ITEM, MYSTERYBERRY ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm
index 4f22ac6b1..ed929874e 100644
--- a/data/pokemon/base_stats/muk.asm
+++ b/data/pokemon/base_stats/muk.asm
@@ -6,7 +6,7 @@
 	db POISON, POISON ; type
 	db 75 ; catch rate
 	db 157 ; base exp
-	db NO_ITEM, NUGGET; items
+	db NO_ITEM, NUGGET ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/murkrow.asm b/data/pokemon/base_stats/murkrow.asm
index 7e49aa5d9..db9c40fa1 100644
--- a/data/pokemon/base_stats/murkrow.asm
+++ b/data/pokemon/base_stats/murkrow.asm
@@ -6,7 +6,7 @@
 	db DARK, FLYING ; type
 	db 30 ; catch rate
 	db 107 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/natu.asm b/data/pokemon/base_stats/natu.asm
index 01fe673d3..6f1076eb7 100644
--- a/data/pokemon/base_stats/natu.asm
+++ b/data/pokemon/base_stats/natu.asm
@@ -6,7 +6,7 @@
 	db PSYCHIC, FLYING ; type
 	db 190 ; catch rate
 	db 73 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm
index e06b80f19..2d70f6621 100644
--- a/data/pokemon/base_stats/nidoking.asm
+++ b/data/pokemon/base_stats/nidoking.asm
@@ -6,7 +6,7 @@
 	db POISON, GROUND ; type
 	db 45 ; catch rate
 	db 195 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F0 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm
index 96436233c..0de2794e0 100644
--- a/data/pokemon/base_stats/nidoqueen.asm
+++ b/data/pokemon/base_stats/nidoqueen.asm
@@ -6,7 +6,7 @@
 	db POISON, GROUND ; type
 	db 45 ; catch rate
 	db 194 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F100 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/nidoran_f.asm b/data/pokemon/base_stats/nidoran_f.asm
index b6d52cbbf..d7a53a596 100644
--- a/data/pokemon/base_stats/nidoran_f.asm
+++ b/data/pokemon/base_stats/nidoran_f.asm
@@ -6,7 +6,7 @@
 	db POISON, POISON ; type
 	db 235 ; catch rate
 	db 59 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F100 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/nidoran_m.asm b/data/pokemon/base_stats/nidoran_m.asm
index b155aaf52..d89889419 100644
--- a/data/pokemon/base_stats/nidoran_m.asm
+++ b/data/pokemon/base_stats/nidoran_m.asm
@@ -6,7 +6,7 @@
 	db POISON, POISON ; type
 	db 235 ; catch rate
 	db 60 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F0 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm
index fb406792c..aad8f6eb3 100644
--- a/data/pokemon/base_stats/nidorina.asm
+++ b/data/pokemon/base_stats/nidorina.asm
@@ -6,7 +6,7 @@
 	db POISON, POISON ; type
 	db 120 ; catch rate
 	db 117 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F100 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm
index 60b0a9f34..3d1ed2ab9 100644
--- a/data/pokemon/base_stats/nidorino.asm
+++ b/data/pokemon/base_stats/nidorino.asm
@@ -6,7 +6,7 @@
 	db POISON, POISON ; type
 	db 120 ; catch rate
 	db 118 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F0 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm
index 6f167809e..fb4a416fd 100644
--- a/data/pokemon/base_stats/ninetales.asm
+++ b/data/pokemon/base_stats/ninetales.asm
@@ -6,7 +6,7 @@
 	db FIRE, FIRE ; type
 	db 75 ; catch rate
 	db 178 ; base exp
-	db BURNT_BERRY, BURNT_BERRY; items
+	db BURNT_BERRY, BURNT_BERRY ; items
 	db GENDER_F75 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/noctowl.asm b/data/pokemon/base_stats/noctowl.asm
index a0ee3cf39..5ad54adc6 100644
--- a/data/pokemon/base_stats/noctowl.asm
+++ b/data/pokemon/base_stats/noctowl.asm
@@ -6,7 +6,7 @@
 	db NORMAL, FLYING ; type
 	db 90 ; catch rate
 	db 162 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/octillery.asm b/data/pokemon/base_stats/octillery.asm
index 935e1e649..c4a9a9c09 100644
--- a/data/pokemon/base_stats/octillery.asm
+++ b/data/pokemon/base_stats/octillery.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 75 ; catch rate
 	db 164 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm
index fd7cecbfb..aac42694b 100644
--- a/data/pokemon/base_stats/oddish.asm
+++ b/data/pokemon/base_stats/oddish.asm
@@ -6,7 +6,7 @@
 	db GRASS, POISON ; type
 	db 255 ; catch rate
 	db 78 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm
index 1d934e51f..d676205de 100644
--- a/data/pokemon/base_stats/omanyte.asm
+++ b/data/pokemon/base_stats/omanyte.asm
@@ -6,7 +6,7 @@
 	db ROCK, WATER ; type
 	db 45 ; catch rate
 	db 120 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 30 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm
index 446f13bcd..33816ae00 100644
--- a/data/pokemon/base_stats/omastar.asm
+++ b/data/pokemon/base_stats/omastar.asm
@@ -6,7 +6,7 @@
 	db ROCK, WATER ; type
 	db 45 ; catch rate
 	db 199 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 30 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm
index e9e1d53ec..6b3183e97 100644
--- a/data/pokemon/base_stats/onix.asm
+++ b/data/pokemon/base_stats/onix.asm
@@ -6,7 +6,7 @@
 	db ROCK, GROUND ; type
 	db 45 ; catch rate
 	db 108 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm
index 6bea13e23..d7b2de570 100644
--- a/data/pokemon/base_stats/paras.asm
+++ b/data/pokemon/base_stats/paras.asm
@@ -6,7 +6,7 @@
 	db BUG, GRASS ; type
 	db 190 ; catch rate
 	db 70 ; base exp
-	db TINYMUSHROOM, BIG_MUSHROOM; items
+	db TINYMUSHROOM, BIG_MUSHROOM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm
index c2113d8ad..cafcef2cd 100644
--- a/data/pokemon/base_stats/parasect.asm
+++ b/data/pokemon/base_stats/parasect.asm
@@ -6,7 +6,7 @@
 	db BUG, GRASS ; type
 	db 75 ; catch rate
 	db 128 ; base exp
-	db TINYMUSHROOM, BIG_MUSHROOM; items
+	db TINYMUSHROOM, BIG_MUSHROOM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm
index 5b580bab7..a718c052d 100644
--- a/data/pokemon/base_stats/persian.asm
+++ b/data/pokemon/base_stats/persian.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 90 ; catch rate
 	db 148 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/phanpy.asm b/data/pokemon/base_stats/phanpy.asm
index 20bb20668..e3a331614 100644
--- a/data/pokemon/base_stats/phanpy.asm
+++ b/data/pokemon/base_stats/phanpy.asm
@@ -6,7 +6,7 @@
 	db GROUND, GROUND ; type
 	db 120 ; catch rate
 	db 124 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/pichu.asm b/data/pokemon/base_stats/pichu.asm
index 319f50c62..a5dccbd05 100644
--- a/data/pokemon/base_stats/pichu.asm
+++ b/data/pokemon/base_stats/pichu.asm
@@ -6,7 +6,7 @@
 	db ELECTRIC, ELECTRIC ; type
 	db 190 ; catch rate
 	db 42 ; base exp
-	db NO_ITEM, BERRY; items
+	db NO_ITEM, BERRY ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm
index 398d3aab6..5d935b01d 100644
--- a/data/pokemon/base_stats/pidgeot.asm
+++ b/data/pokemon/base_stats/pidgeot.asm
@@ -6,7 +6,7 @@
 	db NORMAL, FLYING ; type
 	db 45 ; catch rate
 	db 172 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm
index cafa3a403..766a2e5cf 100644
--- a/data/pokemon/base_stats/pidgeotto.asm
+++ b/data/pokemon/base_stats/pidgeotto.asm
@@ -6,7 +6,7 @@
 	db NORMAL, FLYING ; type
 	db 120 ; catch rate
 	db 113 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm
index 72f66c923..4d9ccb21a 100644
--- a/data/pokemon/base_stats/pidgey.asm
+++ b/data/pokemon/base_stats/pidgey.asm
@@ -6,7 +6,7 @@
 	db NORMAL, FLYING ; type
 	db 255 ; catch rate
 	db 55 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm
index 2edf64ee2..72b9e1e94 100644
--- a/data/pokemon/base_stats/pikachu.asm
+++ b/data/pokemon/base_stats/pikachu.asm
@@ -6,7 +6,7 @@
 	db ELECTRIC, ELECTRIC ; type
 	db 190 ; catch rate
 	db 82 ; base exp
-	db NO_ITEM, BERRY; items
+	db NO_ITEM, BERRY ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/piloswine.asm b/data/pokemon/base_stats/piloswine.asm
index fe20a92f7..454555e6c 100644
--- a/data/pokemon/base_stats/piloswine.asm
+++ b/data/pokemon/base_stats/piloswine.asm
@@ -6,7 +6,7 @@
 	db ICE, GROUND ; type
 	db 75 ; catch rate
 	db 160 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/pineco.asm b/data/pokemon/base_stats/pineco.asm
index 55cf7d4a4..fc5e2e591 100644
--- a/data/pokemon/base_stats/pineco.asm
+++ b/data/pokemon/base_stats/pineco.asm
@@ -6,7 +6,7 @@
 	db BUG, BUG ; type
 	db 190 ; catch rate
 	db 60 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm
index 37f28a030..7d7a46257 100644
--- a/data/pokemon/base_stats/pinsir.asm
+++ b/data/pokemon/base_stats/pinsir.asm
@@ -6,7 +6,7 @@
 	db BUG, BUG ; type
 	db 45 ; catch rate
 	db 200 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/politoed.asm b/data/pokemon/base_stats/politoed.asm
index 3cf6ec968..617dc0c7c 100644
--- a/data/pokemon/base_stats/politoed.asm
+++ b/data/pokemon/base_stats/politoed.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 45 ; catch rate
 	db 185 ; base exp
-	db NO_ITEM, KINGS_ROCK; items
+	db NO_ITEM, KINGS_ROCK ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm
index 119b5f071..d3a2722a5 100644
--- a/data/pokemon/base_stats/poliwag.asm
+++ b/data/pokemon/base_stats/poliwag.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 255 ; catch rate
 	db 77 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm
index 6d0347b28..2c2e9dba9 100644
--- a/data/pokemon/base_stats/poliwhirl.asm
+++ b/data/pokemon/base_stats/poliwhirl.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 120 ; catch rate
 	db 131 ; base exp
-	db NO_ITEM, KINGS_ROCK; items
+	db NO_ITEM, KINGS_ROCK ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm
index fb20eab80..114cc7c88 100644
--- a/data/pokemon/base_stats/poliwrath.asm
+++ b/data/pokemon/base_stats/poliwrath.asm
@@ -6,7 +6,7 @@
 	db WATER, FIGHTING ; type
 	db 45 ; catch rate
 	db 185 ; base exp
-	db NO_ITEM, KINGS_ROCK; items
+	db NO_ITEM, KINGS_ROCK ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm
index f2e8d1276..574d5e59f 100644
--- a/data/pokemon/base_stats/ponyta.asm
+++ b/data/pokemon/base_stats/ponyta.asm
@@ -6,7 +6,7 @@
 	db FIRE, FIRE ; type
 	db 190 ; catch rate
 	db 152 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm
index b8287bde2..0f7dadadf 100644
--- a/data/pokemon/base_stats/porygon.asm
+++ b/data/pokemon/base_stats/porygon.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 130 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/porygon2.asm b/data/pokemon/base_stats/porygon2.asm
index 2f6dd81c7..f2cff7de4 100644
--- a/data/pokemon/base_stats/porygon2.asm
+++ b/data/pokemon/base_stats/porygon2.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 180 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm
index c02101bcc..77b3c85b5 100644
--- a/data/pokemon/base_stats/primeape.asm
+++ b/data/pokemon/base_stats/primeape.asm
@@ -6,7 +6,7 @@
 	db FIGHTING, FIGHTING ; type
 	db 75 ; catch rate
 	db 149 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm
index af71eb065..09bc34d32 100644
--- a/data/pokemon/base_stats/psyduck.asm
+++ b/data/pokemon/base_stats/psyduck.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 190 ; catch rate
 	db 80 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/pupitar.asm b/data/pokemon/base_stats/pupitar.asm
index 59b44d324..b4bc6e5e7 100644
--- a/data/pokemon/base_stats/pupitar.asm
+++ b/data/pokemon/base_stats/pupitar.asm
@@ -6,7 +6,7 @@
 	db ROCK, GROUND ; type
 	db 45 ; catch rate
 	db 144 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/quagsire.asm b/data/pokemon/base_stats/quagsire.asm
index 0c583bed0..b9b499bd3 100644
--- a/data/pokemon/base_stats/quagsire.asm
+++ b/data/pokemon/base_stats/quagsire.asm
@@ -6,7 +6,7 @@
 	db WATER, GROUND ; type
 	db 90 ; catch rate
 	db 137 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/quilava.asm b/data/pokemon/base_stats/quilava.asm
index 5f687007b..eeafc75b9 100644
--- a/data/pokemon/base_stats/quilava.asm
+++ b/data/pokemon/base_stats/quilava.asm
@@ -6,7 +6,7 @@
 	db FIRE, FIRE ; type
 	db 45 ; catch rate
 	db 142 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/qwilfish.asm b/data/pokemon/base_stats/qwilfish.asm
index 6a2de9a23..16cf03d07 100644
--- a/data/pokemon/base_stats/qwilfish.asm
+++ b/data/pokemon/base_stats/qwilfish.asm
@@ -6,7 +6,7 @@
 	db WATER, POISON ; type
 	db 45 ; catch rate
 	db 100 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm
index 482452179..80e7cb39d 100644
--- a/data/pokemon/base_stats/raichu.asm
+++ b/data/pokemon/base_stats/raichu.asm
@@ -6,7 +6,7 @@
 	db ELECTRIC, ELECTRIC ; type
 	db 75 ; catch rate
 	db 122 ; base exp
-	db NO_ITEM, BERRY; items
+	db NO_ITEM, BERRY ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/raikou.asm b/data/pokemon/base_stats/raikou.asm
index 4a1775245..8c8f3a892 100644
--- a/data/pokemon/base_stats/raikou.asm
+++ b/data/pokemon/base_stats/raikou.asm
@@ -6,7 +6,7 @@
 	db ELECTRIC, ELECTRIC ; type
 	db 3 ; catch rate
 	db 216 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 80 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm
index 6cc216709..9fef3737e 100644
--- a/data/pokemon/base_stats/rapidash.asm
+++ b/data/pokemon/base_stats/rapidash.asm
@@ -6,7 +6,7 @@
 	db FIRE, FIRE ; type
 	db 60 ; catch rate
 	db 192 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm
index 96269adb7..942abebef 100644
--- a/data/pokemon/base_stats/raticate.asm
+++ b/data/pokemon/base_stats/raticate.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 90 ; catch rate
 	db 116 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm
index f1479d2d9..9eb0fe31b 100644
--- a/data/pokemon/base_stats/rattata.asm
+++ b/data/pokemon/base_stats/rattata.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 255 ; catch rate
 	db 57 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/remoraid.asm b/data/pokemon/base_stats/remoraid.asm
index a611ffda8..a41ce6ce8 100644
--- a/data/pokemon/base_stats/remoraid.asm
+++ b/data/pokemon/base_stats/remoraid.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 190 ; catch rate
 	db 78 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm
index b610aaa52..6745dd147 100644
--- a/data/pokemon/base_stats/rhydon.asm
+++ b/data/pokemon/base_stats/rhydon.asm
@@ -6,7 +6,7 @@
 	db GROUND, ROCK ; type
 	db 60 ; catch rate
 	db 204 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm
index 8127827a2..3881e57b7 100644
--- a/data/pokemon/base_stats/rhyhorn.asm
+++ b/data/pokemon/base_stats/rhyhorn.asm
@@ -6,7 +6,7 @@
 	db GROUND, ROCK ; type
 	db 120 ; catch rate
 	db 135 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm
index 0132b0fa8..2fa394171 100644
--- a/data/pokemon/base_stats/sandshrew.asm
+++ b/data/pokemon/base_stats/sandshrew.asm
@@ -6,7 +6,7 @@
 	db GROUND, GROUND ; type
 	db 255 ; catch rate
 	db 93 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm
index 5b7a13467..4036e1642 100644
--- a/data/pokemon/base_stats/sandslash.asm
+++ b/data/pokemon/base_stats/sandslash.asm
@@ -6,7 +6,7 @@
 	db GROUND, GROUND ; type
 	db 90 ; catch rate
 	db 163 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/scizor.asm b/data/pokemon/base_stats/scizor.asm
index 6cd870ccd..e59a4bd96 100644
--- a/data/pokemon/base_stats/scizor.asm
+++ b/data/pokemon/base_stats/scizor.asm
@@ -6,7 +6,7 @@
 	db BUG, STEEL ; type
 	db 25 ; catch rate
 	db 200 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm
index 0d39fe8ff..a39f00ec9 100644
--- a/data/pokemon/base_stats/scyther.asm
+++ b/data/pokemon/base_stats/scyther.asm
@@ -6,7 +6,7 @@
 	db BUG, FLYING ; type
 	db 45 ; catch rate
 	db 187 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm
index a6f557de5..9793dbc2a 100644
--- a/data/pokemon/base_stats/seadra.asm
+++ b/data/pokemon/base_stats/seadra.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 75 ; catch rate
 	db 155 ; base exp
-	db NO_ITEM, DRAGON_SCALE; items
+	db NO_ITEM, DRAGON_SCALE ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm
index 237c9e4ff..16877fbc4 100644
--- a/data/pokemon/base_stats/seaking.asm
+++ b/data/pokemon/base_stats/seaking.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 60 ; catch rate
 	db 170 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm
index 3776f51a4..00cef0380 100644
--- a/data/pokemon/base_stats/seel.asm
+++ b/data/pokemon/base_stats/seel.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 190 ; catch rate
 	db 100 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/sentret.asm b/data/pokemon/base_stats/sentret.asm
index f0cb873e9..b32a13168 100644
--- a/data/pokemon/base_stats/sentret.asm
+++ b/data/pokemon/base_stats/sentret.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 255 ; catch rate
 	db 57 ; base exp
-	db NO_ITEM, BERRY; items
+	db NO_ITEM, BERRY ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm
index 64ed157ae..c7a39fc88 100644
--- a/data/pokemon/base_stats/shellder.asm
+++ b/data/pokemon/base_stats/shellder.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 190 ; catch rate
 	db 97 ; base exp
-	db PEARL, BIG_PEARL; items
+	db PEARL, BIG_PEARL ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/shuckle.asm b/data/pokemon/base_stats/shuckle.asm
index 78e52d9d4..ca4cbc9c2 100644
--- a/data/pokemon/base_stats/shuckle.asm
+++ b/data/pokemon/base_stats/shuckle.asm
@@ -6,7 +6,7 @@
 	db BUG, ROCK ; type
 	db 190 ; catch rate
 	db 80 ; base exp
-	db BERRY, BERRY; items
+	db BERRY, BERRY ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/skarmory.asm b/data/pokemon/base_stats/skarmory.asm
index 063c38513..73fc39741 100644
--- a/data/pokemon/base_stats/skarmory.asm
+++ b/data/pokemon/base_stats/skarmory.asm
@@ -6,7 +6,7 @@
 	db STEEL, FLYING ; type
 	db 25 ; catch rate
 	db 168 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/skiploom.asm b/data/pokemon/base_stats/skiploom.asm
index 585aad5c3..fe757d659 100644
--- a/data/pokemon/base_stats/skiploom.asm
+++ b/data/pokemon/base_stats/skiploom.asm
@@ -6,7 +6,7 @@
 	db GRASS, FLYING ; type
 	db 120 ; catch rate
 	db 136 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm
index c4b0ce378..797dbbf3a 100644
--- a/data/pokemon/base_stats/slowbro.asm
+++ b/data/pokemon/base_stats/slowbro.asm
@@ -6,7 +6,7 @@
 	db WATER, PSYCHIC ; type
 	db 75 ; catch rate
 	db 164 ; base exp
-	db NO_ITEM, KINGS_ROCK; items
+	db NO_ITEM, KINGS_ROCK ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/slowking.asm b/data/pokemon/base_stats/slowking.asm
index 4f3f570d5..56e565e5c 100644
--- a/data/pokemon/base_stats/slowking.asm
+++ b/data/pokemon/base_stats/slowking.asm
@@ -6,7 +6,7 @@
 	db WATER, PSYCHIC ; type
 	db 70 ; catch rate
 	db 164 ; base exp
-	db NO_ITEM, KINGS_ROCK; items
+	db NO_ITEM, KINGS_ROCK ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm
index b5efaa2ad..99d9a60ba 100644
--- a/data/pokemon/base_stats/slowpoke.asm
+++ b/data/pokemon/base_stats/slowpoke.asm
@@ -6,7 +6,7 @@
 	db WATER, PSYCHIC ; type
 	db 190 ; catch rate
 	db 99 ; base exp
-	db NO_ITEM, KINGS_ROCK; items
+	db NO_ITEM, KINGS_ROCK ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/slugma.asm b/data/pokemon/base_stats/slugma.asm
index 65d29368a..ec6007b5d 100644
--- a/data/pokemon/base_stats/slugma.asm
+++ b/data/pokemon/base_stats/slugma.asm
@@ -6,7 +6,7 @@
 	db FIRE, FIRE ; type
 	db 190 ; catch rate
 	db 78 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/smeargle.asm b/data/pokemon/base_stats/smeargle.asm
index bd77a4578..efc5c9b87 100644
--- a/data/pokemon/base_stats/smeargle.asm
+++ b/data/pokemon/base_stats/smeargle.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 106 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/smoochum.asm b/data/pokemon/base_stats/smoochum.asm
index 90f8fb084..6a36dbc78 100644
--- a/data/pokemon/base_stats/smoochum.asm
+++ b/data/pokemon/base_stats/smoochum.asm
@@ -6,7 +6,7 @@
 	db ICE, PSYCHIC ; type
 	db 45 ; catch rate
 	db 87 ; base exp
-	db ICE_BERRY, ICE_BERRY; items
+	db ICE_BERRY, ICE_BERRY ; items
 	db GENDER_F100 ; gender ratio
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/sneasel.asm b/data/pokemon/base_stats/sneasel.asm
index b092b5540..25829878b 100644
--- a/data/pokemon/base_stats/sneasel.asm
+++ b/data/pokemon/base_stats/sneasel.asm
@@ -6,7 +6,7 @@
 	db DARK, ICE ; type
 	db 60 ; catch rate
 	db 132 ; base exp
-	db NO_ITEM, QUICK_CLAW; items
+	db NO_ITEM, QUICK_CLAW ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm
index aeb87f428..68b1be600 100644
--- a/data/pokemon/base_stats/snorlax.asm
+++ b/data/pokemon/base_stats/snorlax.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 25 ; catch rate
 	db 154 ; base exp
-	db LEFTOVERS, LEFTOVERS; items
+	db LEFTOVERS, LEFTOVERS ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/snubbull.asm b/data/pokemon/base_stats/snubbull.asm
index 1beab40e9..0e118f05b 100644
--- a/data/pokemon/base_stats/snubbull.asm
+++ b/data/pokemon/base_stats/snubbull.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 190 ; catch rate
 	db 63 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F75 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm
index a8d565733..98b61b6b7 100644
--- a/data/pokemon/base_stats/spearow.asm
+++ b/data/pokemon/base_stats/spearow.asm
@@ -6,7 +6,7 @@
 	db NORMAL, FLYING ; type
 	db 255 ; catch rate
 	db 58 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/spinarak.asm b/data/pokemon/base_stats/spinarak.asm
index 29acb53aa..e02fb6ca1 100644
--- a/data/pokemon/base_stats/spinarak.asm
+++ b/data/pokemon/base_stats/spinarak.asm
@@ -6,7 +6,7 @@
 	db BUG, POISON ; type
 	db 255 ; catch rate
 	db 54 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm
index c8c8f8783..f09725cb0 100644
--- a/data/pokemon/base_stats/squirtle.asm
+++ b/data/pokemon/base_stats/squirtle.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 45 ; catch rate
 	db 66 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/stantler.asm b/data/pokemon/base_stats/stantler.asm
index 91793abdc..8e7bd40ce 100644
--- a/data/pokemon/base_stats/stantler.asm
+++ b/data/pokemon/base_stats/stantler.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 165 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm
index 5d0dd82f6..2021fc7dd 100644
--- a/data/pokemon/base_stats/starmie.asm
+++ b/data/pokemon/base_stats/starmie.asm
@@ -6,7 +6,7 @@
 	db WATER, PSYCHIC ; type
 	db 60 ; catch rate
 	db 207 ; base exp
-	db STARDUST, STAR_PIECE; items
+	db STARDUST, STAR_PIECE ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm
index cdb4db546..06f2e54e2 100644
--- a/data/pokemon/base_stats/staryu.asm
+++ b/data/pokemon/base_stats/staryu.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 225 ; catch rate
 	db 106 ; base exp
-	db STARDUST, STAR_PIECE; items
+	db STARDUST, STAR_PIECE ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/steelix.asm b/data/pokemon/base_stats/steelix.asm
index 2332b5abb..e8e620831 100644
--- a/data/pokemon/base_stats/steelix.asm
+++ b/data/pokemon/base_stats/steelix.asm
@@ -6,7 +6,7 @@
 	db STEEL, GROUND ; type
 	db 25 ; catch rate
 	db 196 ; base exp
-	db NO_ITEM, METAL_COAT; items
+	db NO_ITEM, METAL_COAT ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/sudowoodo.asm b/data/pokemon/base_stats/sudowoodo.asm
index 63b1d3349..cd95db096 100644
--- a/data/pokemon/base_stats/sudowoodo.asm
+++ b/data/pokemon/base_stats/sudowoodo.asm
@@ -6,7 +6,7 @@
 	db ROCK, ROCK ; type
 	db 65 ; catch rate
 	db 135 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/suicune.asm b/data/pokemon/base_stats/suicune.asm
index 669a85aaa..372025a0c 100644
--- a/data/pokemon/base_stats/suicune.asm
+++ b/data/pokemon/base_stats/suicune.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 3 ; catch rate
 	db 215 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 80 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/sunflora.asm b/data/pokemon/base_stats/sunflora.asm
index 96973dc7d..f5505fe02 100644
--- a/data/pokemon/base_stats/sunflora.asm
+++ b/data/pokemon/base_stats/sunflora.asm
@@ -6,7 +6,7 @@
 	db GRASS, GRASS ; type
 	db 120 ; catch rate
 	db 146 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/sunkern.asm b/data/pokemon/base_stats/sunkern.asm
index b6305b273..ed43b7298 100644
--- a/data/pokemon/base_stats/sunkern.asm
+++ b/data/pokemon/base_stats/sunkern.asm
@@ -6,7 +6,7 @@
 	db GRASS, GRASS ; type
 	db 235 ; catch rate
 	db 52 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/swinub.asm b/data/pokemon/base_stats/swinub.asm
index 9b12a6c6e..4adeab317 100644
--- a/data/pokemon/base_stats/swinub.asm
+++ b/data/pokemon/base_stats/swinub.asm
@@ -6,7 +6,7 @@
 	db ICE, GROUND ; type
 	db 225 ; catch rate
 	db 78 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm
index 7b8272210..a081dcf2e 100644
--- a/data/pokemon/base_stats/tangela.asm
+++ b/data/pokemon/base_stats/tangela.asm
@@ -6,7 +6,7 @@
 	db GRASS, GRASS ; type
 	db 45 ; catch rate
 	db 166 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm
index 1b294e951..63efbd9e5 100644
--- a/data/pokemon/base_stats/tauros.asm
+++ b/data/pokemon/base_stats/tauros.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 211 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F0 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/teddiursa.asm b/data/pokemon/base_stats/teddiursa.asm
index a88ea6b64..ab1e1c83f 100644
--- a/data/pokemon/base_stats/teddiursa.asm
+++ b/data/pokemon/base_stats/teddiursa.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 120 ; catch rate
 	db 124 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm
index a11b5e0fe..c5ce41e0a 100644
--- a/data/pokemon/base_stats/tentacool.asm
+++ b/data/pokemon/base_stats/tentacool.asm
@@ -6,7 +6,7 @@
 	db WATER, POISON ; type
 	db 190 ; catch rate
 	db 105 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm
index b5e4876a4..35037c668 100644
--- a/data/pokemon/base_stats/tentacruel.asm
+++ b/data/pokemon/base_stats/tentacruel.asm
@@ -6,7 +6,7 @@
 	db WATER, POISON ; type
 	db 60 ; catch rate
 	db 205 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/togepi.asm b/data/pokemon/base_stats/togepi.asm
index a660370a6..d435a3a04 100644
--- a/data/pokemon/base_stats/togepi.asm
+++ b/data/pokemon/base_stats/togepi.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 190 ; catch rate
 	db 74 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/togetic.asm b/data/pokemon/base_stats/togetic.asm
index fb96952f8..77176266c 100644
--- a/data/pokemon/base_stats/togetic.asm
+++ b/data/pokemon/base_stats/togetic.asm
@@ -6,7 +6,7 @@
 	db NORMAL, FLYING ; type
 	db 75 ; catch rate
 	db 114 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/totodile.asm b/data/pokemon/base_stats/totodile.asm
index 476ac9614..86830e11e 100644
--- a/data/pokemon/base_stats/totodile.asm
+++ b/data/pokemon/base_stats/totodile.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 45 ; catch rate
 	db 66 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/typhlosion.asm b/data/pokemon/base_stats/typhlosion.asm
index 49f518649..06fc8be7b 100644
--- a/data/pokemon/base_stats/typhlosion.asm
+++ b/data/pokemon/base_stats/typhlosion.asm
@@ -6,7 +6,7 @@
 	db FIRE, FIRE ; type
 	db 45 ; catch rate
 	db 209 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/tyranitar.asm b/data/pokemon/base_stats/tyranitar.asm
index 6ad00c834..a3bd68aef 100644
--- a/data/pokemon/base_stats/tyranitar.asm
+++ b/data/pokemon/base_stats/tyranitar.asm
@@ -6,7 +6,7 @@
 	db ROCK, DARK ; type
 	db 45 ; catch rate
 	db 218 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/tyrogue.asm b/data/pokemon/base_stats/tyrogue.asm
index 74d2ae9d6..597c5b06b 100644
--- a/data/pokemon/base_stats/tyrogue.asm
+++ b/data/pokemon/base_stats/tyrogue.asm
@@ -6,7 +6,7 @@
 	db FIGHTING, FIGHTING ; type
 	db 75 ; catch rate
 	db 91 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F0 ; gender ratio
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/umbreon.asm b/data/pokemon/base_stats/umbreon.asm
index 4e04da7fb..7012c9929 100644
--- a/data/pokemon/base_stats/umbreon.asm
+++ b/data/pokemon/base_stats/umbreon.asm
@@ -6,7 +6,7 @@
 	db DARK, DARK ; type
 	db 45 ; catch rate
 	db 197 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 35 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/unown.asm b/data/pokemon/base_stats/unown.asm
index 6eef4b84d..f7d84f142 100644
--- a/data/pokemon/base_stats/unown.asm
+++ b/data/pokemon/base_stats/unown.asm
@@ -6,7 +6,7 @@
 	db PSYCHIC, PSYCHIC ; type
 	db 225 ; catch rate
 	db 61 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/ursaring.asm b/data/pokemon/base_stats/ursaring.asm
index 20b47b992..c577515a1 100644
--- a/data/pokemon/base_stats/ursaring.asm
+++ b/data/pokemon/base_stats/ursaring.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 60 ; catch rate
 	db 189 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm
index 1bb244087..adc313ee1 100644
--- a/data/pokemon/base_stats/vaporeon.asm
+++ b/data/pokemon/base_stats/vaporeon.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 45 ; catch rate
 	db 196 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 35 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm
index da5331286..43e50bfd4 100644
--- a/data/pokemon/base_stats/venomoth.asm
+++ b/data/pokemon/base_stats/venomoth.asm
@@ -6,7 +6,7 @@
 	db BUG, POISON ; type
 	db 75 ; catch rate
 	db 138 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm
index 2da97c64f..77f05af31 100644
--- a/data/pokemon/base_stats/venonat.asm
+++ b/data/pokemon/base_stats/venonat.asm
@@ -6,7 +6,7 @@
 	db BUG, POISON ; type
 	db 190 ; catch rate
 	db 75 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm
index 39968701f..ff41011b3 100644
--- a/data/pokemon/base_stats/venusaur.asm
+++ b/data/pokemon/base_stats/venusaur.asm
@@ -6,7 +6,7 @@
 	db GRASS, POISON ; type
 	db 45 ; catch rate
 	db 208 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm
index 95f3b42db..0e8127220 100644
--- a/data/pokemon/base_stats/victreebel.asm
+++ b/data/pokemon/base_stats/victreebel.asm
@@ -6,7 +6,7 @@
 	db GRASS, POISON ; type
 	db 45 ; catch rate
 	db 191 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm
index c0316bfee..e894606ac 100644
--- a/data/pokemon/base_stats/vileplume.asm
+++ b/data/pokemon/base_stats/vileplume.asm
@@ -6,7 +6,7 @@
 	db GRASS, POISON ; type
 	db 45 ; catch rate
 	db 184 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm
index 13ca3fef3..a22e09fb8 100644
--- a/data/pokemon/base_stats/voltorb.asm
+++ b/data/pokemon/base_stats/voltorb.asm
@@ -6,7 +6,7 @@
 	db ELECTRIC, ELECTRIC ; type
 	db 190 ; catch rate
 	db 103 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm
index 21ca508bc..8b233e6da 100644
--- a/data/pokemon/base_stats/vulpix.asm
+++ b/data/pokemon/base_stats/vulpix.asm
@@ -6,7 +6,7 @@
 	db FIRE, FIRE ; type
 	db 190 ; catch rate
 	db 63 ; base exp
-	db BURNT_BERRY, BURNT_BERRY; items
+	db BURNT_BERRY, BURNT_BERRY ; items
 	db GENDER_F75 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm
index ea7a0bd84..20db04447 100644
--- a/data/pokemon/base_stats/wartortle.asm
+++ b/data/pokemon/base_stats/wartortle.asm
@@ -6,7 +6,7 @@
 	db WATER, WATER ; type
 	db 45 ; catch rate
 	db 143 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F12_5 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm
index da63aa6f4..c2536b316 100644
--- a/data/pokemon/base_stats/weedle.asm
+++ b/data/pokemon/base_stats/weedle.asm
@@ -6,7 +6,7 @@
 	db BUG, POISON ; type
 	db 255 ; catch rate
 	db 52 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm
index c55c8234f..20e8ffcd6 100644
--- a/data/pokemon/base_stats/weepinbell.asm
+++ b/data/pokemon/base_stats/weepinbell.asm
@@ -6,7 +6,7 @@
 	db GRASS, POISON ; type
 	db 120 ; catch rate
 	db 151 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm
index 10270e200..1db8162dd 100644
--- a/data/pokemon/base_stats/weezing.asm
+++ b/data/pokemon/base_stats/weezing.asm
@@ -6,7 +6,7 @@
 	db POISON, POISON ; type
 	db 60 ; catch rate
 	db 173 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm
index c8577ff6c..0a3498b8f 100644
--- a/data/pokemon/base_stats/wigglytuff.asm
+++ b/data/pokemon/base_stats/wigglytuff.asm
@@ -6,7 +6,7 @@
 	db NORMAL, NORMAL ; type
 	db 50 ; catch rate
 	db 109 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F75 ; gender ratio
 	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/wobbuffet.asm b/data/pokemon/base_stats/wobbuffet.asm
index c84ac68c4..816f71e8c 100644
--- a/data/pokemon/base_stats/wobbuffet.asm
+++ b/data/pokemon/base_stats/wobbuffet.asm
@@ -6,7 +6,7 @@
 	db PSYCHIC, PSYCHIC ; type
 	db 45 ; catch rate
 	db 177 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/wooper.asm b/data/pokemon/base_stats/wooper.asm
index da5101f9c..e3b4e19e6 100644
--- a/data/pokemon/base_stats/wooper.asm
+++ b/data/pokemon/base_stats/wooper.asm
@@ -6,7 +6,7 @@
 	db WATER, GROUND ; type
 	db 255 ; catch rate
 	db 52 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/xatu.asm b/data/pokemon/base_stats/xatu.asm
index 3c58623b8..79bf0bc60 100644
--- a/data/pokemon/base_stats/xatu.asm
+++ b/data/pokemon/base_stats/xatu.asm
@@ -6,7 +6,7 @@
 	db PSYCHIC, FLYING ; type
 	db 75 ; catch rate
 	db 171 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/yanma.asm b/data/pokemon/base_stats/yanma.asm
index 756482591..01918230c 100644
--- a/data/pokemon/base_stats/yanma.asm
+++ b/data/pokemon/base_stats/yanma.asm
@@ -6,7 +6,7 @@
 	db BUG, FLYING ; type
 	db 75 ; catch rate
 	db 147 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm
index 342590f12..5dc9562b0 100644
--- a/data/pokemon/base_stats/zapdos.asm
+++ b/data/pokemon/base_stats/zapdos.asm
@@ -6,7 +6,7 @@
 	db ELECTRIC, FLYING ; type
 	db 3 ; catch rate
 	db 216 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDERLESS ; gender ratio
 	db 100 ; unknown 1
 	db 80 ; step cycles to hatch
diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm
index abbd6402d..ee3716844 100644
--- a/data/pokemon/base_stats/zubat.asm
+++ b/data/pokemon/base_stats/zubat.asm
@@ -6,7 +6,7 @@
 	db POISON, FLYING ; type
 	db 255 ; catch rate
 	db 54 ; base exp
-	db NO_ITEM, NO_ITEM; items
+	db NO_ITEM, NO_ITEM ; items
 	db GENDER_F50 ; gender ratio
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
diff --git a/data/trainers/attributes.asm b/data/trainers/attributes.asm
index 224e460c9..29ae6ebd6 100644
--- a/data/trainers/attributes.asm
+++ b/data/trainers/attributes.asm
@@ -2,43 +2,43 @@ TrainerClassAttributes: ; 3959c
 ; entries correspond to trainer classes (see constants/trainer_constants.asm)
 
 ; Falkner
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Whitney
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Bugsy
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Morty
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Pryce
-	db HYPER_POTION, 0 ; items
+	db HYPER_POTION, NO_ITEM ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Jasmine
-	db HYPER_POTION, 0 ; items
+	db HYPER_POTION, NO_ITEM ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Chuck
-	db FULL_HEAL, 0 ; items
+	db FULL_HEAL, NO_ITEM ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
@@ -50,31 +50,31 @@ TrainerClassAttributes: ; 3959c
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Rival1
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 15 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Pokemon Prof
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_AGGRESSIVE + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Will
-	db MAX_POTION, 0 ; items
+	db MAX_POTION, NO_ITEM ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Cal
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Bruno
-	db MAX_POTION, 0 ; items
+	db MAX_POTION, NO_ITEM ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
@@ -98,175 +98,175 @@ TrainerClassAttributes: ; 3959c
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Brock
-	db HYPER_POTION, 0 ; items
+	db HYPER_POTION, NO_ITEM ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Misty
-	db FULL_HEAL, 0 ; items
+	db FULL_HEAL, NO_ITEM ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Lt Surge
-	db HYPER_POTION, 0 ; items
+	db HYPER_POTION, NO_ITEM ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Scientist
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Erika
-	db HYPER_POTION, 0 ; items
+	db HYPER_POTION, NO_ITEM ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Youngster
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 4 ; base reward
 	dw AI_BASIC + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Schoolboy
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 8 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS
 	dw CONTEXT_USE + SWITCH_OFTEN
 
 ; Bird Keeper
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 6 ; base reward
 	dw AI_BASIC + AI_TYPES + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Lass
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 6 ; base reward
 	dw AI_BASIC + AI_CAUTIOUS + AI_STATUS
 	dw CONTEXT_USE + SWITCH_OFTEN
 
 ; Janine
-	db DIRE_HIT, 0 ; items
+	db DIRE_HIT, NO_ITEM ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Cooltrainerm
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 12 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Cooltrainerf
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 12 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Beauty
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 22 ; base reward
 	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Pokemaniac
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 15 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_OFFENSIVE + AI_AGGRESSIVE + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Gruntm
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 10 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Gentleman
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 18 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_AGGRESSIVE + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Skier
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 18 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Teacher
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 18 ; base reward
 	dw AI_BASIC + AI_OPPORTUNIST + AI_AGGRESSIVE + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Sabrina
-	db HYPER_POTION, 0 ; items
+	db HYPER_POTION, NO_ITEM ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Bug Catcher
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 4 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Fisher
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 10 ; base reward
 	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS
 	dw CONTEXT_USE + SWITCH_OFTEN
 
 ; Swimmerm
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 2 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OFFENSIVE + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Swimmerf
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 5 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Sailor
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 10 ; base reward
 	dw AI_BASIC + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Super Nerd
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 8 ; base reward
 	dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Rival2
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Guitarist
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 8 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Hiker
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 8 ; base reward
 	dw AI_BASIC + AI_OFFENSIVE + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Biker
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 8 ; base reward
 	dw AI_BASIC + AI_TYPES + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
@@ -278,97 +278,97 @@ TrainerClassAttributes: ; 3959c
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Burglar
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 22 ; base reward
 	dw AI_BASIC + AI_OFFENSIVE + AI_CAUTIOUS + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Firebreather
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 12 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Juggler
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 10 ; base reward
 	dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Blackbelt T
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 6 ; base reward
 	dw AI_BASIC + AI_OFFENSIVE + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Executivem
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 18 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_SMART + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Psychic T
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 8 ; base reward
 	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Picnicker
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 5 ; base reward
 	dw AI_BASIC + AI_CAUTIOUS + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Camper
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 5 ; base reward
 	dw AI_BASIC + AI_CAUTIOUS + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Executivef
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 18 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_SMART + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Sage
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 8 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Medium
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 10 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Boarder
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 18 ; base reward
 	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Pokefanm
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 20 ; base reward
 	dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Kimono Girl
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 18 ; base reward
 	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Twins
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 5 ; base reward
 	dw NO_AI
 	dw CONTEXT_USE + SWITCH_OFTEN
 
 ; Pokefanf
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 20 ; base reward
 	dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
@@ -386,19 +386,19 @@ TrainerClassAttributes: ; 3959c
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Officer
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 10 ; base reward
 	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_STATUS
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Gruntf
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 10 ; base reward
 	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
 ; Mysticalman
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES

From cbd423ec0826919a58f0661955bd565d256bdcf1 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sun, 25 Feb 2018 16:49:03 -0500
Subject: [PATCH 125/135] Format map object attributes like trainer attributes,
 in preparation for bit flag constants

---
 data/sprites/map_objects.asm | 349 ++++++++++++++++++++++++++++++-----
 1 file changed, 305 insertions(+), 44 deletions(-)

diff --git a/data/sprites/map_objects.asm b/data/sprites/map_objects.asm
index dedd4c5ab..8821f8a1b 100755
--- a/data/sprites/map_objects.asm
+++ b/data/sprites/map_objects.asm
@@ -1,47 +1,308 @@
-sprite_movement_data: MACRO
-	db \1, \2, \3, \4, \5
-	dn \6, 0
-ENDM
-
 SpriteMovementData:: ; 4273
 ; entries correspond to SPRITEMOVEDATA_* constants
-	; function,                                              facing, action,                      flags1, flags2, palette flags
-	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   OBJECT_ACTION_STAND,         $02,    $00,    %0000 ; SPRITEMOVEDATA_00
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,         $0c,    $00,    %0000 ; SPRITEMOVEDATA_STILL
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_WANDER
-	sprite_movement_data SPRITEMOVEFN_SLOW_RANDOM_SPIN,      DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINRANDOM_SLOW
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_Y,         DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_WALK_UP_DOWN
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_X,         DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_WALK_LEFT_RIGHT
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_STANDING_DOWN
-	sprite_movement_data SPRITEMOVEFN_STANDING,              UP,     OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_STANDING_UP
-	sprite_movement_data SPRITEMOVEFN_STANDING,              LEFT,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_STANDING_LEFT
-	sprite_movement_data SPRITEMOVEFN_STANDING,              RIGHT,  OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_STANDING_RIGHT
-	sprite_movement_data SPRITEMOVEFN_FAST_RANDOM_SPIN,      DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINRANDOM_FAST
-	sprite_movement_data SPRITEMOVEFN_OBEY_DPAD,             DOWN,   OBJECT_ACTION_STAND,         $02,    $00,    %0000 ; SPRITEMOVEDATA_PLAYER
-	sprite_movement_data SPRITEMOVEFN_08,                    DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_0C
-	sprite_movement_data SPRITEMOVEFN_09,                    DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_0D
-	sprite_movement_data SPRITEMOVEFN_0A,                    DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_0E
-	sprite_movement_data SPRITEMOVEFN_0B,                    DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_0F
-	sprite_movement_data SPRITEMOVEFN_0C,                    DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_10
-	sprite_movement_data SPRITEMOVEFN_0D,                    DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_11
-	sprite_movement_data SPRITEMOVEFN_0E,                    DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_12
-	sprite_movement_data SPRITEMOVEFN_FOLLOW,                DOWN,   OBJECT_ACTION_STAND,         $02,    $00,    %0000 ; SPRITEMOVEDATA_FOLLOWING
-	sprite_movement_data SPRITEMOVEFN_SCRIPTED,              DOWN,   OBJECT_ACTION_STAND,         $02,    $00,    %0000 ; SPRITEMOVEDATA_SCRIPTED
-	sprite_movement_data SPRITEMOVEFN_BIG_SNORLAX,           DOWN,   OBJECT_ACTION_BIG_DOLL_SYM,  $2e,    $01,    %1100 ; SPRITEMOVEDATA_BIGDOLLSYM
-	sprite_movement_data SPRITEMOVEFN_BOUNCE,                DOWN,   OBJECT_ACTION_BOUNCE,        $2e,    $00,    %0000 ; SPRITEMOVEDATA_POKEMON
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,         $0c,    $00,    %0000 ; SPRITEMOVEDATA_SUDOWOODO
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,         $2e,    $10,    %0000 ; SPRITEMOVEDATA_SMASHABLE_ROCK
-	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_STAND,         $2e,    $00,    %0100 ; SPRITEMOVEDATA_STRENGTH_BOULDER
-	sprite_movement_data SPRITEMOVEFN_FOLLOWNOTEXACT,        DOWN,   OBJECT_ACTION_STAND,         $02,    $00,    %0000 ; SPRITEMOVEDATA_FOLLOWNOTEXACT
-	sprite_movement_data SPRITEMOVEFN_SHADOW,                DOWN,   OBJECT_ACTION_00,            $8e,    $01,    %0000 ; SPRITEMOVEDATA_SHADOW
-	sprite_movement_data SPRITEMOVEFN_EMOTE,                 DOWN,   OBJECT_ACTION_EMOTE,         $8e,    $02,    %0000 ; SPRITEMOVEDATA_EMOTE
-	sprite_movement_data SPRITEMOVEFN_SCREENSHAKE,           DOWN,   OBJECT_ACTION_00,            $82,    $00,    %0000 ; SPRITEMOVEDATA_SCREENSHAKE
-	sprite_movement_data SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE, LEFT,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE
-	sprite_movement_data SPRITEMOVEFN_SPIN_CLOCKWISE,        RIGHT,  OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINCLOCKWISE
-	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_BIG_DOLL_ASYM, $2e,    $01,    %1100 ; SPRITEMOVEDATA_BIGDOLLASYM
-	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_BIG_DOLL,      $2e,    $01,    %1100 ; SPRITEMOVEDATA_BIGDOLL
-	sprite_movement_data SPRITEMOVEFN_BOULDERDUST,           DOWN,   OBJECT_ACTION_BOULDER_DUST,  $8e,    $01,    %0000 ; SPRITEMOVEDATA_BOULDERDUST
-	sprite_movement_data SPRITEMOVEFN_GRASS,                 DOWN,   OBJECT_ACTION_GRASS_SHAKE,   $8e,    $02,    %0000 ; SPRITEMOVEDATA_GRASS
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0010 ; SPRITEMOVEDATA_SWIM_WANDER
-	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   OBJECT_ACTION_STAND,         $00,    $00,    %0000 ; 25
+
+; SPRITEMOVEDATA_00
+	db SPRITEMOVEFN_00 ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000010 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_STILL
+	db SPRITEMOVEFN_STANDING ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00001100 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_WANDER
+	db SPRITEMOVEFN_RANDOM_WALK_XY ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000000 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_SPINRANDOM_SLOW
+	db SPRITEMOVEFN_SLOW_RANDOM_SPIN ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000000 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_WALK_UP_DOWN
+	db SPRITEMOVEFN_RANDOM_WALK_Y ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000000 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_WALK_LEFT_RIGHT
+	db SPRITEMOVEFN_RANDOM_WALK_X ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000000 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_STANDING_DOWN
+	db SPRITEMOVEFN_STANDING ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000000 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_STANDING_UP
+	db SPRITEMOVEFN_STANDING ; movement function
+	db UP ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000000 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_STANDING_LEFT
+	db SPRITEMOVEFN_STANDING ; movement function
+	db LEFT ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000000 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_STANDING_RIGHT
+	db SPRITEMOVEFN_STANDING ; movement function
+	db RIGHT ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000000 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_SPINRANDOM_FAST
+	db SPRITEMOVEFN_FAST_RANDOM_SPIN ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000000 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_PLAYER
+	db SPRITEMOVEFN_OBEY_DPAD ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000010 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_0C
+	db SPRITEMOVEFN_08 ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000000 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_0D
+	db SPRITEMOVEFN_09 ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000000 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_0E
+	db SPRITEMOVEFN_0A ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000000 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_0F
+	db SPRITEMOVEFN_0B ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000000 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_10
+	db SPRITEMOVEFN_0C ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000000 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_11
+	db SPRITEMOVEFN_0D ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000000 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_12
+	db SPRITEMOVEFN_0E ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000000 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_FOLLOWING
+	db SPRITEMOVEFN_FOLLOW ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000010 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_SCRIPTED
+	db SPRITEMOVEFN_SCRIPTED ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000010 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_BIGDOLLSYM
+	db SPRITEMOVEFN_BIG_SNORLAX ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_BIG_DOLL_SYM ; action
+	db %00101110 ; flags1
+	db %00000001 ; flags2
+	db %11000000 ; palette flags
+
+; SPRITEMOVEDATA_POKEMON
+	db SPRITEMOVEFN_BOUNCE ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_BOUNCE ; action
+	db %00101110 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_SUDOWOODO
+	db SPRITEMOVEFN_STANDING ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00001100 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_SMASHABLE_ROCK
+	db SPRITEMOVEFN_STANDING ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00101110 ; flags1
+	db %00010000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_STRENGTH_BOULDER
+	db SPRITEMOVEFN_STRENGTH ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00101110 ; flags1
+	db %00000000 ; flags2
+	db %01000000 ; palette flags
+
+; SPRITEMOVEDATA_FOLLOWNOTEXACT
+	db SPRITEMOVEFN_FOLLOWNOTEXACT ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000010 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_SHADOW
+	db SPRITEMOVEFN_SHADOW ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_00 ; action
+	db %10001110 ; flags1
+	db %00000001 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_EMOTE
+	db SPRITEMOVEFN_EMOTE ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_EMOTE ; action
+	db %10001110 ; flags1
+	db %00000010 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_SCREENSHAKE
+	db SPRITEMOVEFN_SCREENSHAKE ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_00 ; action
+	db %10000010 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE
+	db SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE ; movement function
+	db LEFT ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000000 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_SPINCLOCKWISE
+	db SPRITEMOVEFN_SPIN_CLOCKWISE ; movement function
+	db RIGHT ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000000 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_BIGDOLLASYM
+	db SPRITEMOVEFN_STRENGTH ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_BIG_DOLL_ASYM ; action
+	db %00101110 ; flags1
+	db %00000001 ; flags2
+	db %11000000 ; palette flags
+
+; SPRITEMOVEDATA_BIGDOLL
+	db SPRITEMOVEFN_STRENGTH ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_BIG_DOLL ; action
+	db %00101110 ; flags1
+	db %00000001 ; flags2
+	db %11000000 ; palette flags
+
+; SPRITEMOVEDATA_BOULDERDUST
+	db SPRITEMOVEFN_BOULDERDUST ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_BOULDER_DUST ; action
+	db %10001110 ; flags1
+	db %00000001 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_GRASS
+	db SPRITEMOVEFN_GRASS ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_GRASS_SHAKE ; action
+	db %10001110 ; flags1
+	db %00000010 ; flags2
+	db %00000000 ; palette flags
+
+; SPRITEMOVEDATA_SWIM_WANDER
+	db SPRITEMOVEFN_RANDOM_WALK_XY ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000000 ; flags1
+	db %00000000 ; flags2
+	db %00100000 ; palette flags
+
+; 25
+	db SPRITEMOVEFN_00 ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db %00000000 ; flags1
+	db %00000000 ; flags2
+	db %00000000 ; palette flags
+
 ; 4357

From 60add76ee7b74fac4067feb0451eac2b8cf35a03 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sun, 25 Feb 2018 19:23:01 -0500
Subject: [PATCH 126/135] * Remove rept 4 (fa3192e) * FindGreaterThanThatLevel
 -> FindAboveLevel (132fe46) * More meaningful egg group names (0eeb00d)

---
 constants/pokemon_data_constants.asm   | 10 +++++-----
 data/pokemon/base_stats/abra.asm       |  2 +-
 data/pokemon/base_stats/alakazam.asm   |  2 +-
 data/pokemon/base_stats/articuno.asm   |  2 +-
 data/pokemon/base_stats/azumarill.asm  |  2 +-
 data/pokemon/base_stats/blastoise.asm  |  2 +-
 data/pokemon/base_stats/celebi.asm     |  2 +-
 data/pokemon/base_stats/chinchou.asm   |  2 +-
 data/pokemon/base_stats/cleffa.asm     |  2 +-
 data/pokemon/base_stats/cloyster.asm   |  2 +-
 data/pokemon/base_stats/corsola.asm    |  2 +-
 data/pokemon/base_stats/croconaw.asm   |  2 +-
 data/pokemon/base_stats/delibird.asm   |  2 +-
 data/pokemon/base_stats/dewgong.asm    |  2 +-
 data/pokemon/base_stats/dragonair.asm  |  2 +-
 data/pokemon/base_stats/dragonite.asm  |  2 +-
 data/pokemon/base_stats/dratini.asm    |  2 +-
 data/pokemon/base_stats/drowzee.asm    |  2 +-
 data/pokemon/base_stats/electabuzz.asm |  2 +-
 data/pokemon/base_stats/elekid.asm     |  2 +-
 data/pokemon/base_stats/entei.asm      |  2 +-
 data/pokemon/base_stats/feraligatr.asm |  2 +-
 data/pokemon/base_stats/goldeen.asm    |  2 +-
 data/pokemon/base_stats/golduck.asm    |  2 +-
 data/pokemon/base_stats/gyarados.asm   |  2 +-
 data/pokemon/base_stats/hitmonchan.asm |  2 +-
 data/pokemon/base_stats/hitmonlee.asm  |  2 +-
 data/pokemon/base_stats/hitmontop.asm  |  2 +-
 data/pokemon/base_stats/ho_oh.asm      |  2 +-
 data/pokemon/base_stats/horsea.asm     |  2 +-
 data/pokemon/base_stats/hypno.asm      |  2 +-
 data/pokemon/base_stats/igglybuff.asm  |  2 +-
 data/pokemon/base_stats/jynx.asm       |  2 +-
 data/pokemon/base_stats/kabuto.asm     |  2 +-
 data/pokemon/base_stats/kabutops.asm   |  2 +-
 data/pokemon/base_stats/kadabra.asm    |  2 +-
 data/pokemon/base_stats/kingdra.asm    |  2 +-
 data/pokemon/base_stats/kingler.asm    |  2 +-
 data/pokemon/base_stats/krabby.asm     |  2 +-
 data/pokemon/base_stats/lanturn.asm    |  2 +-
 data/pokemon/base_stats/lapras.asm     |  2 +-
 data/pokemon/base_stats/lugia.asm      |  2 +-
 data/pokemon/base_stats/machamp.asm    |  2 +-
 data/pokemon/base_stats/machoke.asm    |  2 +-
 data/pokemon/base_stats/machop.asm     |  2 +-
 data/pokemon/base_stats/magby.asm      |  2 +-
 data/pokemon/base_stats/magikarp.asm   |  2 +-
 data/pokemon/base_stats/magmar.asm     |  2 +-
 data/pokemon/base_stats/mantine.asm    |  2 +-
 data/pokemon/base_stats/marill.asm     |  2 +-
 data/pokemon/base_stats/mew.asm        |  2 +-
 data/pokemon/base_stats/mewtwo.asm     |  2 +-
 data/pokemon/base_stats/moltres.asm    |  2 +-
 data/pokemon/base_stats/mr__mime.asm   |  2 +-
 data/pokemon/base_stats/nidoqueen.asm  |  2 +-
 data/pokemon/base_stats/nidorina.asm   |  2 +-
 data/pokemon/base_stats/octillery.asm  |  2 +-
 data/pokemon/base_stats/omanyte.asm    |  2 +-
 data/pokemon/base_stats/omastar.asm    |  2 +-
 data/pokemon/base_stats/pichu.asm      |  2 +-
 data/pokemon/base_stats/politoed.asm   |  2 +-
 data/pokemon/base_stats/poliwag.asm    |  2 +-
 data/pokemon/base_stats/poliwhirl.asm  |  2 +-
 data/pokemon/base_stats/poliwrath.asm  |  2 +-
 data/pokemon/base_stats/psyduck.asm    |  2 +-
 data/pokemon/base_stats/quagsire.asm   |  2 +-
 data/pokemon/base_stats/qwilfish.asm   |  2 +-
 data/pokemon/base_stats/raikou.asm     |  2 +-
 data/pokemon/base_stats/remoraid.asm   |  2 +-
 data/pokemon/base_stats/seadra.asm     |  2 +-
 data/pokemon/base_stats/seaking.asm    |  2 +-
 data/pokemon/base_stats/seel.asm       |  2 +-
 data/pokemon/base_stats/shellder.asm   |  2 +-
 data/pokemon/base_stats/slowbro.asm    |  2 +-
 data/pokemon/base_stats/slowking.asm   |  2 +-
 data/pokemon/base_stats/slowpoke.asm   |  2 +-
 data/pokemon/base_stats/smoochum.asm   |  2 +-
 data/pokemon/base_stats/squirtle.asm   |  2 +-
 data/pokemon/base_stats/starmie.asm    |  2 +-
 data/pokemon/base_stats/staryu.asm     |  2 +-
 data/pokemon/base_stats/suicune.asm    |  2 +-
 data/pokemon/base_stats/tentacool.asm  |  2 +-
 data/pokemon/base_stats/tentacruel.asm |  2 +-
 data/pokemon/base_stats/togepi.asm     |  2 +-
 data/pokemon/base_stats/totodile.asm   |  2 +-
 data/pokemon/base_stats/tyrogue.asm    |  2 +-
 data/pokemon/base_stats/unown.asm      |  2 +-
 data/pokemon/base_stats/wartortle.asm  |  2 +-
 data/pokemon/base_stats/wooper.asm     |  2 +-
 data/pokemon/base_stats/zapdos.asm     |  2 +-
 data/special_pointers.asm              |  2 +-
 engine/breeding.asm                    |  4 ++--
 engine/events/specials.asm             |  4 ++--
 engine/search2.asm                     |  6 +++---
 engine/sprites.asm                     |  5 +++--
 95 files changed, 105 insertions(+), 104 deletions(-)

diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index 35985d565..ac5a1aeba 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -47,20 +47,20 @@ GENDERLESS   EQU -1
 ; wBaseEggGroups values
 	const_def 1
 	const EGG_MONSTER      ; 1
-	const EGG_WATER_1      ; 2
+	const EGG_AMPHIBIAN    ; 2
 	const EGG_BUG          ; 3
 	const EGG_FLYING       ; 4
 	const EGG_FIELD        ; 5
 	const EGG_FAIRY        ; 6
 	const EGG_GRASS        ; 7
-	const EGG_HUMANLIKE    ; 8
-	const EGG_WATER_3      ; 9
+	const EGG_HUMANSHAPE   ; 8
+	const EGG_INVERTEBRATE ; 9
 	const EGG_MINERAL      ; a
 	const EGG_AMORPHOUS    ; b
-	const EGG_WATER_2      ; c
+	const EGG_FISH         ; c
 	const EGG_DITTO        ; d
 	const EGG_DRAGON       ; e
-	const EGG_UNDISCOVERED ; f
+	const EGG_NONE         ; f
 
 
 ; pokedex entries (see data/pokemon/dex_entries.asm)
diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm
index c4ecd31b0..890c46f20 100644
--- a/data/pokemon/base_stats/abra.asm
+++ b/data/pokemon/base_stats/abra.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/abra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
-	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH
diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm
index 1bdaca5a1..5de640d73 100644
--- a/data/pokemon/base_stats/alakazam.asm
+++ b/data/pokemon/base_stats/alakazam.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/alakazam/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
-	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH
diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm
index deca0d857..acaf1c851 100644
--- a/data/pokemon/base_stats/articuno.asm
+++ b/data/pokemon/base_stats/articuno.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/articuno/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, STEEL_WING, FLY, ICE_BEAM
diff --git a/data/pokemon/base_stats/azumarill.asm b/data/pokemon/base_stats/azumarill.asm
index d76e1bd72..d9675a86f 100644
--- a/data/pokemon/base_stats/azumarill.asm
+++ b/data/pokemon/base_stats/azumarill.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/azumarill/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_FAST ; growth rate
-	dn EGG_WATER_1, EGG_FAIRY ; egg groups
+	dn EGG_AMPHIBIAN, EGG_FAIRY ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm
index 9cb62420a..0439b041a 100644
--- a/data/pokemon/base_stats/blastoise.asm
+++ b/data/pokemon/base_stats/blastoise.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/blastoise/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
-	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
+	dn EGG_MONSTER, EGG_AMPHIBIAN ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/celebi.asm b/data/pokemon/base_stats/celebi.asm
index 79ec6dcd7..69bc8e751 100644
--- a/data/pokemon/base_stats/celebi.asm
+++ b/data/pokemon/base_stats/celebi.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/celebi/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, NIGHTMARE, FLASH
diff --git a/data/pokemon/base_stats/chinchou.asm b/data/pokemon/base_stats/chinchou.asm
index 3bad12e41..73cf5e3a7 100644
--- a/data/pokemon/base_stats/chinchou.asm
+++ b/data/pokemon/base_stats/chinchou.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/chinchou/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_WATER_2, EGG_WATER_2 ; egg groups
+	dn EGG_FISH, EGG_FISH ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/cleffa.asm b/data/pokemon/base_stats/cleffa.asm
index af68d2f36..923b339b9 100644
--- a/data/pokemon/base_stats/cleffa.asm
+++ b/data/pokemon/base_stats/cleffa.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/cleffa/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_FAST ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, FLASH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm
index 7dfc72ff9..bc0eb18c2 100644
--- a/data/pokemon/base_stats/cloyster.asm
+++ b/data/pokemon/base_stats/cloyster.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/cloyster/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
+	dn EGG_INVERTEBRATE, EGG_INVERTEBRATE ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/corsola.asm b/data/pokemon/base_stats/corsola.asm
index e5f2536f8..b2031decf 100644
--- a/data/pokemon/base_stats/corsola.asm
+++ b/data/pokemon/base_stats/corsola.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/corsola/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_FAST ; growth rate
-	dn EGG_WATER_1, EGG_WATER_3 ; egg groups
+	dn EGG_AMPHIBIAN, EGG_INVERTEBRATE ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/croconaw.asm b/data/pokemon/base_stats/croconaw.asm
index 8b0fa482f..3ff4f459c 100644
--- a/data/pokemon/base_stats/croconaw.asm
+++ b/data/pokemon/base_stats/croconaw.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/croconaw/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
-	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
+	dn EGG_MONSTER, EGG_AMPHIBIAN ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/delibird.asm b/data/pokemon/base_stats/delibird.asm
index aacb0e6ae..0ab283291 100644
--- a/data/pokemon/base_stats/delibird.asm
+++ b/data/pokemon/base_stats/delibird.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/delibird/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_FAST ; growth rate
-	dn EGG_WATER_1, EGG_FIELD ; egg groups
+	dn EGG_AMPHIBIAN, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, FLY, ICE_BEAM
diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm
index 18117d30d..0d8a93aad 100644
--- a/data/pokemon/base_stats/dewgong.asm
+++ b/data/pokemon/base_stats/dewgong.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/dewgong/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_WATER_1, EGG_FIELD ; egg groups
+	dn EGG_AMPHIBIAN, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm
index a876a54de..f11c57490 100644
--- a/data/pokemon/base_stats/dragonair.asm
+++ b/data/pokemon/base_stats/dragonair.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/dragonair/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_WATER_1, EGG_DRAGON ; egg groups
+	dn EGG_AMPHIBIAN, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, SURF, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm
index 6d088437f..bcfba804c 100644
--- a/data/pokemon/base_stats/dragonite.asm
+++ b/data/pokemon/base_stats/dragonite.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/dragonite/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_WATER_1, EGG_DRAGON ; egg groups
+	dn EGG_AMPHIBIAN, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, FLY, SURF, STRENGTH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm
index 2e8b2a226..d55f7cbdd 100644
--- a/data/pokemon/base_stats/dratini.asm
+++ b/data/pokemon/base_stats/dratini.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/dratini/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_WATER_1, EGG_DRAGON ; egg groups
+	dn EGG_AMPHIBIAN, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, SURF, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm
index 9d1ad9b41..d00ea31b3 100644
--- a/data/pokemon/base_stats/drowzee.asm
+++ b/data/pokemon/base_stats/drowzee.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/drowzee/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, FLASH
diff --git a/data/pokemon/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm
index 1ab247deb..b9524d571 100644
--- a/data/pokemon/base_stats/electabuzz.asm
+++ b/data/pokemon/base_stats/electabuzz.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/electabuzz/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/elekid.asm b/data/pokemon/base_stats/elekid.asm
index 75b6f4375..ba7abf250 100644
--- a/data/pokemon/base_stats/elekid.asm
+++ b/data/pokemon/base_stats/elekid.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/elekid/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/entei.asm b/data/pokemon/base_stats/entei.asm
index 1374353ea..c5eccc9d8 100644
--- a/data/pokemon/base_stats/entei.asm
+++ b/data/pokemon/base_stats/entei.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/entei/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, CUT, STRENGTH, FLASH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/feraligatr.asm b/data/pokemon/base_stats/feraligatr.asm
index acdbc4126..13998cc39 100644
--- a/data/pokemon/base_stats/feraligatr.asm
+++ b/data/pokemon/base_stats/feraligatr.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/feraligatr/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
-	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
+	dn EGG_MONSTER, EGG_AMPHIBIAN ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm
index eb432d38b..7ac01f3c6 100644
--- a/data/pokemon/base_stats/goldeen.asm
+++ b/data/pokemon/base_stats/goldeen.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/goldeen/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_WATER_2, EGG_WATER_2 ; egg groups
+	dn EGG_FISH, EGG_FISH ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm
index 5cc8e01a1..07a1fd8d7 100644
--- a/data/pokemon/base_stats/golduck.asm
+++ b/data/pokemon/base_stats/golduck.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/golduck/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_WATER_1, EGG_FIELD ; egg groups
+	dn EGG_AMPHIBIAN, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, FURY_CUTTER, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm
index 0e4d5ca6e..2287ae579 100644
--- a/data/pokemon/base_stats/gyarados.asm
+++ b/data/pokemon/base_stats/gyarados.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/gyarados/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_WATER_2, EGG_DRAGON ; egg groups
+	dn EGG_FISH, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm
index f5d84215b..49d92287c 100644
--- a/data/pokemon/base_stats/hitmonchan.asm
+++ b/data/pokemon/base_stats/hitmonchan.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/hitmonchan/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH
diff --git a/data/pokemon/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm
index 4577d6cca..a8b11274a 100644
--- a/data/pokemon/base_stats/hitmonlee.asm
+++ b/data/pokemon/base_stats/hitmonlee.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/hitmonlee/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH
diff --git a/data/pokemon/base_stats/hitmontop.asm b/data/pokemon/base_stats/hitmontop.asm
index caf0375a1..6a383b07c 100644
--- a/data/pokemon/base_stats/hitmontop.asm
+++ b/data/pokemon/base_stats/hitmontop.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/hitmontop/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH
diff --git a/data/pokemon/base_stats/ho_oh.asm b/data/pokemon/base_stats/ho_oh.asm
index 248fc05b7..ea99530ee 100644
--- a/data/pokemon/base_stats/ho_oh.asm
+++ b/data/pokemon/base_stats/ho_oh.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/ho_oh/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, STEEL_WING, NIGHTMARE, FLY, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT
diff --git a/data/pokemon/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm
index dd3c085a8..f325bec04 100644
--- a/data/pokemon/base_stats/horsea.asm
+++ b/data/pokemon/base_stats/horsea.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/horsea/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_WATER_1, EGG_DRAGON ; egg groups
+	dn EGG_AMPHIBIAN, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm
index d48bb297a..e9761fe8d 100644
--- a/data/pokemon/base_stats/hypno.asm
+++ b/data/pokemon/base_stats/hypno.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/hypno/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, FLASH
diff --git a/data/pokemon/base_stats/igglybuff.asm b/data/pokemon/base_stats/igglybuff.asm
index b6aa6adf5..687171369 100644
--- a/data/pokemon/base_stats/igglybuff.asm
+++ b/data/pokemon/base_stats/igglybuff.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/igglybuff/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_FAST ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, FLASH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm
index 030c2a978..1a7149d35 100644
--- a/data/pokemon/base_stats/jynx.asm
+++ b/data/pokemon/base_stats/jynx.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/jynx/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, ICE_BEAM
diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm
index f9ac24011..ec70d85af 100644
--- a/data/pokemon/base_stats/kabuto.asm
+++ b/data/pokemon/base_stats/kabuto.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/kabuto/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_WATER_1, EGG_WATER_3 ; egg groups
+	dn EGG_AMPHIBIAN, EGG_INVERTEBRATE ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, ICE_BEAM
diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm
index c6d755694..12199ea2a 100644
--- a/data/pokemon/base_stats/kabutops.asm
+++ b/data/pokemon/base_stats/kabutops.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/kabutops/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_WATER_1, EGG_WATER_3 ; egg groups
+	dn EGG_AMPHIBIAN, EGG_INVERTEBRATE ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm
index eff333df4..9a7f7f841 100644
--- a/data/pokemon/base_stats/kadabra.asm
+++ b/data/pokemon/base_stats/kadabra.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/kadabra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
-	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH
diff --git a/data/pokemon/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.asm
index 930f30b7b..cc10e3ad5 100644
--- a/data/pokemon/base_stats/kingdra.asm
+++ b/data/pokemon/base_stats/kingdra.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/kingdra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_WATER_1, EGG_DRAGON ; egg groups
+	dn EGG_AMPHIBIAN, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm
index 3362dc4f0..7e933bfc8 100644
--- a/data/pokemon/base_stats/kingler.asm
+++ b/data/pokemon/base_stats/kingler.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/kingler/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
+	dn EGG_INVERTEBRATE, EGG_INVERTEBRATE ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm
index 5b8214773..81ee37273 100644
--- a/data/pokemon/base_stats/krabby.asm
+++ b/data/pokemon/base_stats/krabby.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/krabby/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
+	dn EGG_INVERTEBRATE, EGG_INVERTEBRATE ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/lanturn.asm b/data/pokemon/base_stats/lanturn.asm
index 140d85dc4..5cc07637d 100644
--- a/data/pokemon/base_stats/lanturn.asm
+++ b/data/pokemon/base_stats/lanturn.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/lanturn/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_WATER_2, EGG_WATER_2 ; egg groups
+	dn EGG_FISH, EGG_FISH ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm
index dbbaa0203..91dcbfed7 100644
--- a/data/pokemon/base_stats/lapras.asm
+++ b/data/pokemon/base_stats/lapras.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/lapras/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
+	dn EGG_MONSTER, EGG_AMPHIBIAN ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, STRENGTH, WHIRLPOOL, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/lugia.asm b/data/pokemon/base_stats/lugia.asm
index dae611f43..1896e2158 100644
--- a/data/pokemon/base_stats/lugia.asm
+++ b/data/pokemon/base_stats/lugia.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/lugia/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DREAM_EATER, DETECT, REST, STEEL_WING, NIGHTMARE, FLY, SURF, STRENGTH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm
index a8a18ae9e..5595336c7 100644
--- a/data/pokemon/base_stats/machamp.asm
+++ b/data/pokemon/base_stats/machamp.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/machamp/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
-	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm
index eeef8bdb5..ebbd9e3a8 100644
--- a/data/pokemon/base_stats/machoke.asm
+++ b/data/pokemon/base_stats/machoke.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/machoke/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
-	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm
index a3eef3d17..51446b53f 100644
--- a/data/pokemon/base_stats/machop.asm
+++ b/data/pokemon/base_stats/machop.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/machop/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
-	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/magby.asm b/data/pokemon/base_stats/magby.asm
index 259cbd32d..1d029bd65 100644
--- a/data/pokemon/base_stats/magby.asm
+++ b/data/pokemon/base_stats/magby.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/magby/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm
index 16e0cebc9..6083db8e9 100644
--- a/data/pokemon/base_stats/magikarp.asm
+++ b/data/pokemon/base_stats/magikarp.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/magikarp/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_WATER_2, EGG_DRAGON ; egg groups
+	dn EGG_FISH, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm
diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm
index 7c12c9304..a01e0387b 100644
--- a/data/pokemon/base_stats/magmar.asm
+++ b/data/pokemon/base_stats/magmar.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/magmar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/mantine.asm b/data/pokemon/base_stats/mantine.asm
index 7b5cd54a9..838116bf8 100644
--- a/data/pokemon/base_stats/mantine.asm
+++ b/data/pokemon/base_stats/mantine.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/mantine/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_WATER_1, EGG_WATER_1 ; egg groups
+	dn EGG_AMPHIBIAN, EGG_AMPHIBIAN ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/marill.asm b/data/pokemon/base_stats/marill.asm
index 28f936745..c41482463 100644
--- a/data/pokemon/base_stats/marill.asm
+++ b/data/pokemon/base_stats/marill.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/marill/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_FAST ; growth rate
-	dn EGG_WATER_1, EGG_FAIRY ; egg groups
+	dn EGG_AMPHIBIAN, EGG_FAIRY ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm
index 00210b8fd..a96cf034d 100644
--- a/data/pokemon/base_stats/mew.asm
+++ b/data/pokemon/base_stats/mew.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/mew/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, FLY, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm
index 72af5a116..71e3b9f09 100644
--- a/data/pokemon/base_stats/mewtwo.asm
+++ b/data/pokemon/base_stats/mewtwo.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/mewtwo/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, THUNDERPUNCH, DREAM_EATER, DETECT, REST, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm
index 975c7a9ab..a94a4fa5f 100644
--- a/data/pokemon/base_stats/moltres.asm
+++ b/data/pokemon/base_stats/moltres.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/moltres/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, STEEL_WING, FLY, FLAMETHROWER
diff --git a/data/pokemon/base_stats/mr__mime.asm b/data/pokemon/base_stats/mr__mime.asm
index 9caaa03d1..476483d9e 100644
--- a/data/pokemon/base_stats/mr__mime.asm
+++ b/data/pokemon/base_stats/mr__mime.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/mr__mime/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm
index 0de2794e0..72eb9336c 100644
--- a/data/pokemon/base_stats/nidoqueen.asm
+++ b/data/pokemon/base_stats/nidoqueen.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/nidoqueen/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm
index aad8f6eb3..d446a0d3b 100644
--- a/data/pokemon/base_stats/nidorina.asm
+++ b/data/pokemon/base_stats/nidorina.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/nidorina/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, STRENGTH, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/octillery.asm b/data/pokemon/base_stats/octillery.asm
index c4a9a9c09..acc36a9f6 100644
--- a/data/pokemon/base_stats/octillery.asm
+++ b/data/pokemon/base_stats/octillery.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/octillery/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_WATER_1, EGG_WATER_2 ; egg groups
+	dn EGG_AMPHIBIAN, EGG_FISH ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, FLAMETHROWER, ICE_BEAM
diff --git a/data/pokemon/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm
index d676205de..3c2ff8a81 100644
--- a/data/pokemon/base_stats/omanyte.asm
+++ b/data/pokemon/base_stats/omanyte.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/omanyte/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_WATER_1, EGG_WATER_3 ; egg groups
+	dn EGG_AMPHIBIAN, EGG_INVERTEBRATE ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm
index 33816ae00..b5167ffaa 100644
--- a/data/pokemon/base_stats/omastar.asm
+++ b/data/pokemon/base_stats/omastar.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/omastar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_WATER_1, EGG_WATER_3 ; egg groups
+	dn EGG_AMPHIBIAN, EGG_INVERTEBRATE ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/pichu.asm b/data/pokemon/base_stats/pichu.asm
index a5dccbd05..6805a0386 100644
--- a/data/pokemon/base_stats/pichu.asm
+++ b/data/pokemon/base_stats/pichu.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/pichu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/politoed.asm b/data/pokemon/base_stats/politoed.asm
index 617dc0c7c..afe79bca0 100644
--- a/data/pokemon/base_stats/politoed.asm
+++ b/data/pokemon/base_stats/politoed.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/politoed/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
-	dn EGG_WATER_1, EGG_WATER_1 ; egg groups
+	dn EGG_AMPHIBIAN, EGG_AMPHIBIAN ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm
index d3a2722a5..3056d63e8 100644
--- a/data/pokemon/base_stats/poliwag.asm
+++ b/data/pokemon/base_stats/poliwag.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/poliwag/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
-	dn EGG_WATER_1, EGG_WATER_1 ; egg groups
+	dn EGG_AMPHIBIAN, EGG_AMPHIBIAN ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm
index 2c2e9dba9..c4a6667a6 100644
--- a/data/pokemon/base_stats/poliwhirl.asm
+++ b/data/pokemon/base_stats/poliwhirl.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/poliwhirl/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
-	dn EGG_WATER_1, EGG_WATER_1 ; egg groups
+	dn EGG_AMPHIBIAN, EGG_AMPHIBIAN ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm
index 114cc7c88..f3725f1f2 100644
--- a/data/pokemon/base_stats/poliwrath.asm
+++ b/data/pokemon/base_stats/poliwrath.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/poliwrath/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
-	dn EGG_WATER_1, EGG_WATER_1 ; egg groups
+	dn EGG_AMPHIBIAN, EGG_AMPHIBIAN ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm
index 09bc34d32..1451b0a44 100644
--- a/data/pokemon/base_stats/psyduck.asm
+++ b/data/pokemon/base_stats/psyduck.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/psyduck/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_WATER_1, EGG_FIELD ; egg groups
+	dn EGG_AMPHIBIAN, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/quagsire.asm b/data/pokemon/base_stats/quagsire.asm
index b9b499bd3..4f1e9c111 100644
--- a/data/pokemon/base_stats/quagsire.asm
+++ b/data/pokemon/base_stats/quagsire.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/quagsire/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_WATER_1, EGG_FIELD ; egg groups
+	dn EGG_AMPHIBIAN, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, FLASH, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/qwilfish.asm b/data/pokemon/base_stats/qwilfish.asm
index 16cf03d07..b0a76573c 100644
--- a/data/pokemon/base_stats/qwilfish.asm
+++ b/data/pokemon/base_stats/qwilfish.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/qwilfish/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_WATER_2, EGG_WATER_2 ; egg groups
+	dn EGG_FISH, EGG_FISH ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/raikou.asm b/data/pokemon/base_stats/raikou.asm
index 8c8f3a892..11e2a12c9 100644
--- a/data/pokemon/base_stats/raikou.asm
+++ b/data/pokemon/base_stats/raikou.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/raikou/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, CUT, STRENGTH, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/remoraid.asm b/data/pokemon/base_stats/remoraid.asm
index a41ce6ce8..8f281f8fa 100644
--- a/data/pokemon/base_stats/remoraid.asm
+++ b/data/pokemon/base_stats/remoraid.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/remoraid/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_WATER_1, EGG_WATER_2 ; egg groups
+	dn EGG_AMPHIBIAN, EGG_FISH ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, FLAMETHROWER, ICE_BEAM
diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm
index 9793dbc2a..1487033e0 100644
--- a/data/pokemon/base_stats/seadra.asm
+++ b/data/pokemon/base_stats/seadra.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/seadra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_WATER_1, EGG_DRAGON ; egg groups
+	dn EGG_AMPHIBIAN, EGG_DRAGON ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm
index 16877fbc4..ed3d5b2a9 100644
--- a/data/pokemon/base_stats/seaking.asm
+++ b/data/pokemon/base_stats/seaking.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/seaking/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_WATER_2, EGG_WATER_2 ; egg groups
+	dn EGG_FISH, EGG_FISH ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm
index 00cef0380..bef5f0f95 100644
--- a/data/pokemon/base_stats/seel.asm
+++ b/data/pokemon/base_stats/seel.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/seel/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_WATER_1, EGG_FIELD ; egg groups
+	dn EGG_AMPHIBIAN, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm
index c7a39fc88..257530b19 100644
--- a/data/pokemon/base_stats/shellder.asm
+++ b/data/pokemon/base_stats/shellder.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/shellder/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
+	dn EGG_INVERTEBRATE, EGG_INVERTEBRATE ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm
index 797dbbf3a..2df788e38 100644
--- a/data/pokemon/base_stats/slowbro.asm
+++ b/data/pokemon/base_stats/slowbro.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/slowbro/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
+	dn EGG_MONSTER, EGG_AMPHIBIAN ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, FURY_CUTTER, NIGHTMARE, SURF, STRENGTH, FLASH, FLAMETHROWER, ICE_BEAM
diff --git a/data/pokemon/base_stats/slowking.asm b/data/pokemon/base_stats/slowking.asm
index 56e565e5c..a06c9f452 100644
--- a/data/pokemon/base_stats/slowking.asm
+++ b/data/pokemon/base_stats/slowking.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/slowking/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
+	dn EGG_MONSTER, EGG_AMPHIBIAN ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, FURY_CUTTER, NIGHTMARE, SURF, STRENGTH, FLASH, WHIRLPOOL, FLAMETHROWER, ICE_BEAM
diff --git a/data/pokemon/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm
index 99d9a60ba..62da39492 100644
--- a/data/pokemon/base_stats/slowpoke.asm
+++ b/data/pokemon/base_stats/slowpoke.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/slowpoke/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
+	dn EGG_MONSTER, EGG_AMPHIBIAN ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, STRENGTH, FLASH, FLAMETHROWER, ICE_BEAM
diff --git a/data/pokemon/base_stats/smoochum.asm b/data/pokemon/base_stats/smoochum.asm
index 6a36dbc78..7be8e51de 100644
--- a/data/pokemon/base_stats/smoochum.asm
+++ b/data/pokemon/base_stats/smoochum.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/smoochum/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SWEET_SCENT, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, ICE_BEAM
diff --git a/data/pokemon/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm
index f09725cb0..23f48a54e 100644
--- a/data/pokemon/base_stats/squirtle.asm
+++ b/data/pokemon/base_stats/squirtle.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/squirtle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
-	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
+	dn EGG_MONSTER, EGG_AMPHIBIAN ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm
index 2021fc7dd..ca5f3d919 100644
--- a/data/pokemon/base_stats/starmie.asm
+++ b/data/pokemon/base_stats/starmie.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/starmie/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
+	dn EGG_INVERTEBRATE, EGG_INVERTEBRATE ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm
index 06f2e54e2..81fc90216 100644
--- a/data/pokemon/base_stats/staryu.asm
+++ b/data/pokemon/base_stats/staryu.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/staryu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
+	dn EGG_INVERTEBRATE, EGG_INVERTEBRATE ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/suicune.asm b/data/pokemon/base_stats/suicune.asm
index 372025a0c..6ac110534 100644
--- a/data/pokemon/base_stats/suicune.asm
+++ b/data/pokemon/base_stats/suicune.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/suicune/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, CUT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm
index c5ce41e0a..11cd6a076 100644
--- a/data/pokemon/base_stats/tentacool.asm
+++ b/data/pokemon/base_stats/tentacool.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/tentacool/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
+	dn EGG_INVERTEBRATE, EGG_INVERTEBRATE ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm
index 35037c668..ba8f0114d 100644
--- a/data/pokemon/base_stats/tentacruel.asm
+++ b/data/pokemon/base_stats/tentacruel.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/tentacruel/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
+	dn EGG_INVERTEBRATE, EGG_INVERTEBRATE ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/togepi.asm b/data/pokemon/base_stats/togepi.asm
index d435a3a04..98b5f6bcd 100644
--- a/data/pokemon/base_stats/togepi.asm
+++ b/data/pokemon/base_stats/togepi.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/togepi/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_FAST ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, FLASH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/totodile.asm b/data/pokemon/base_stats/totodile.asm
index 86830e11e..b99fd7853 100644
--- a/data/pokemon/base_stats/totodile.asm
+++ b/data/pokemon/base_stats/totodile.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/totodile/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
-	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
+	dn EGG_MONSTER, EGG_AMPHIBIAN ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/tyrogue.asm b/data/pokemon/base_stats/tyrogue.asm
index 597c5b06b..fb7e75eb5 100644
--- a/data/pokemon/base_stats/tyrogue.asm
+++ b/data/pokemon/base_stats/tyrogue.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/tyrogue/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH
diff --git a/data/pokemon/base_stats/unown.asm b/data/pokemon/base_stats/unown.asm
index f7d84f142..8d92bfff4 100644
--- a/data/pokemon/base_stats/unown.asm
+++ b/data/pokemon/base_stats/unown.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/unown_a/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm
diff --git a/data/pokemon/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm
index 20db04447..5e049d67f 100644
--- a/data/pokemon/base_stats/wartortle.asm
+++ b/data/pokemon/base_stats/wartortle.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/wartortle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
-	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
+	dn EGG_MONSTER, EGG_AMPHIBIAN ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
diff --git a/data/pokemon/base_stats/wooper.asm b/data/pokemon/base_stats/wooper.asm
index e3b4e19e6..0d4ebebae 100644
--- a/data/pokemon/base_stats/wooper.asm
+++ b/data/pokemon/base_stats/wooper.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/wooper/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
-	dn EGG_WATER_1, EGG_FIELD ; egg groups
+	dn EGG_AMPHIBIAN, EGG_FIELD ; egg groups
 
 	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, ICE_BEAM
diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm
index 5dc9562b0..afdd064ad 100644
--- a/data/pokemon/base_stats/zapdos.asm
+++ b/data/pokemon/base_stats/zapdos.asm
@@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/zapdos/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
-	dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
 	; tm/hm learnset
 	tmhm CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, STEEL_WING, FLY, FLASH, THUNDERBOLT
diff --git a/data/special_pointers.asm b/data/special_pointers.asm
index 5ebde7dc0..50e52246e 100644
--- a/data/special_pointers.asm
+++ b/data/special_pointers.asm
@@ -75,7 +75,7 @@ SpecialsPointers:: ; c029
 	add_special RestartMapMusic ; bank 0
 	add_special HealMachineAnim
 	add_special SurfStartStep
-	add_special FindPartyMonGreaterThanThatLevel ; $40
+	add_special FindPartyMonAboveLevel ; $40
 	add_special FindPartyMonAtLeastThatHappy
 	add_special FindPartyMonThatSpecies
 	add_special FindPartyMonThatSpeciesYourTrainerID
diff --git a/engine/breeding.asm b/engine/breeding.asm
index ee8bbbb31..fc183f644 100755
--- a/engine/breeding.asm
+++ b/engine/breeding.asm
@@ -112,14 +112,14 @@ CheckBreedmonCompatibility: ; 16e1d
 	ld [wCurSpecies], a
 	call GetBaseData
 	ld a, [wBaseEggGroups]
-	cp EGG_UNDISCOVERED * $11
+	cp EGG_NONE * $11
 	jr z, .Incompatible
 
 	ld a, [wBreedMon1Species]
 	ld [wCurSpecies], a
 	call GetBaseData
 	ld a, [wBaseEggGroups]
-	cp EGG_UNDISCOVERED * $11
+	cp EGG_NONE * $11
 	jr z, .Incompatible
 
 ; Ditto is automatically compatible with everything.
diff --git a/engine/events/specials.asm b/engine/events/specials.asm
index 3904f4a31..acfc3c450 100644
--- a/engine/events/specials.asm
+++ b/engine/events/specials.asm
@@ -50,10 +50,10 @@ UnusedSetSeenMon: ; c252
 	ret
 ; c25a
 
-FindPartyMonGreaterThanThatLevel: ; c25a
+FindPartyMonAboveLevel: ; c25a
 	ld a, [wScriptVar]
 	ld b, a
-	farcall _FindPartyMonGreaterThanThatLevel
+	farcall _FindPartyMonAboveLevel
 	jr z, FoundNone
 	jr FoundOne
 
diff --git a/engine/search2.asm b/engine/search2.asm
index c43555080..b7112f1f8 100755
--- a/engine/search2.asm
+++ b/engine/search2.asm
@@ -1,6 +1,6 @@
-_FindPartyMonGreaterThanThatLevel: ; 4dbd2
+_FindPartyMonAboveLevel: ; 4dbd2
 	ld hl, wPartyMon1Level
-	call FindGreaterThanThatLevel
+	call FindAboveLevel
 	ret
 
 _FindPartyMonAtLeastThatHappy: ; 4dbd9
@@ -69,7 +69,7 @@ FindAtLeastThatHappy: ; 4dc0a
 	and a
 	ret
 
-FindGreaterThanThatLevel: ; 4dc31
+FindAboveLevel: ; 4dc31
 	ld c, $0
 	ld a, [wPartyCount]
 	ld d, a
diff --git a/engine/sprites.asm b/engine/sprites.asm
index 97ac13559..99d1d2ae4 100755
--- a/engine/sprites.asm
+++ b/engine/sprites.asm
@@ -562,9 +562,10 @@ INCLUDE "data/sprite_anims/oam.asm"
 BrokenStdGFXPointers:
 	; tile count, bank, pointer
 	; (all pointers were dummied out to .deleted)
-rept 4
 	dbbw 128, $01, .deleted
-endr
+	dbbw 128, $01, .deleted
+	dbbw 128, $01, .deleted
+	dbbw 128, $01, .deleted
 	dbbw 16, $37, .deleted
 	dbbw 16, $11, .deleted
 	dbbw 16, $39, .deleted

From be28a0ff4eb4ba04dcbd0fc025b3a68af535a0a1 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sun, 25 Feb 2018 19:50:48 -0500
Subject: [PATCH 127/135] Meaningful $ff values

---
 engine/battle/core.asm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index a1ccc0340..2f3fdeb4d 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -3324,7 +3324,7 @@ AddBattleParticipant: ; 3d581
 ; 3d599
 
 FindPkmnInOTPartyToSwitchIntoBattle: ; 3d599
-	ld b, $ff
+	ld b, -1
 	ld a, $1
 	ld [wBuffer1], a
 	ld [wBuffer2], a
@@ -3468,7 +3468,7 @@ ScoreMonTypeMatchups: ; 3d672
 	ld a, [wBuffer1]
 	and a
 	jr z, .okay2
-	ld b, $ff
+	ld b, -1
 	ld c, a
 .loop3
 	inc b
@@ -3477,7 +3477,7 @@ ScoreMonTypeMatchups: ; 3d672
 	jr .quit
 
 .okay2
-	ld b, $ff
+	ld b, -1
 	ld a, [wBuffer2]
 	ld c, a
 .loop4
@@ -8849,13 +8849,13 @@ BattleEnd_HandleRoamMons: ; 3f998
 
 .caught_or_defeated_roam_mon
 	call GetRoamMonHP
-	ld [hl], $0
+	ld [hl], 0
 	call GetRoamMonMapGroup
-	ld [hl], $ff
+	ld [hl], GROUP_N_A
 	call GetRoamMonMapNumber
-	ld [hl], $ff
+	ld [hl], MAP_N_A
 	call GetRoamMonSpecies
-	ld [hl], $0
+	ld [hl], 0
 	ret
 
 .not_roaming

From f964d04a873769c0aa1d27a7dd032170f55853fd Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sun, 25 Feb 2018 20:05:37 -0500
Subject: [PATCH 128/135] * loadmenuheader -> loadmenu (ead103d) * objectface
 -> turnobject (c834bda)

---
 docs/event_commands.md                        |  4 +--
 engine/events/std_scripts.asm                 | 10 +++---
 engine/scripting.asm                          |  8 ++---
 macros/legacy.asm                             |  7 ++--
 macros/scripts/battle_anims.asm               |  2 +-
 macros/scripts/events.asm                     | 12 +++----
 maps/AzaleaTown.asm                           | 16 ++++-----
 maps/BattleTower1F.asm                        |  6 ++--
 maps/BurnedTower1F.asm                        |  4 +--
 maps/BurnedTowerB1F.asm                       | 18 +++++-----
 maps/CeladonCafe.asm                          | 12 +++----
 maps/CeladonDeptStore3F.asm                   |  4 +--
 maps/CeladonDeptStore6F.asm                   |  2 +-
 maps/CeladonGameCorner.asm                    | 14 ++++----
 maps/CeladonGameCornerPrizeRoom.asm           |  4 +--
 maps/CeruleanCity.asm                         |  4 +--
 maps/CeruleanGym.asm                          |  2 +-
 maps/CherrygroveCity.asm                      | 20 +++++------
 maps/CianwoodCity.asm                         |  4 +--
 maps/CianwoodGym.asm                          |  2 +-
 maps/DragonShrine.asm                         | 28 +++++++--------
 maps/DragonsDenB1F.asm                        |  2 +-
 maps/EarlsPokemonAcademy.asm                  |  6 ++--
 maps/EcruteakPokecenter1F.asm                 | 12 +++----
 maps/ElmsLab.asm                              | 34 +++++++++----------
 maps/FastShip1F.asm                           |  2 +-
 maps/FastShipCabins_SE_SSE_CaptainsCabin.asm  | 12 +++----
 maps/GoldenrodCity.asm                        |  4 +--
 maps/GoldenrodDeptStore4F.asm                 |  2 +-
 maps/GoldenrodDeptStore6F.asm                 |  2 +-
 maps/GoldenrodDeptStoreRoof.asm               |  6 ++--
 maps/GoldenrodFlowerShop.asm                  |  2 +-
 maps/GoldenrodGameCorner.asm                  | 16 ++++-----
 maps/GoldenrodGym.asm                         |  2 +-
 maps/GoldenrodPokecenter1F.asm                |  4 +--
 ...oldenrodUndergroundSwitchRoomEntrances.asm |  8 ++---
 maps/HallOfFame.asm                           |  4 +--
 maps/IlexForest.asm                           |  2 +-
 maps/IndigoPlateauPokecenter1F.asm            | 10 +++---
 maps/KurtsHouse.asm                           | 18 +++++-----
 maps/LancesRoom.asm                           | 18 +++++-----
 maps/MahoganyMart1F.asm                       |  2 +-
 maps/MahoganyTown.asm                         |  2 +-
 maps/MountMoon.asm                            |  2 +-
 maps/MountMoonSquare.asm                      |  6 ++--
 maps/MrPokemonsHouse.asm                      | 14 ++++----
 maps/NationalPark.asm                         |  2 +-
 maps/NewBarkTown.asm                          | 14 ++++----
 maps/OlivineCity.asm                          |  8 ++---
 maps/OlivineLighthouse6F.asm                  | 16 ++++-----
 maps/OlivinePort.asm                          | 14 ++++----
 maps/PlayersHouse1F.asm                       |  6 ++--
 maps/Pokecenter2F.asm                         |  4 +--
 maps/PokecomCenterAdminRoomMobile.asm         |  4 +--
 maps/PowerPlant.asm                           | 10 +++---
 maps/RadioTower2F.asm                         | 32 ++++++++---------
 maps/RadioTower5F.asm                         |  6 ++--
 maps/Route16Gate.asm                          |  2 +-
 maps/Route17Route18Gate.asm                   |  2 +-
 maps/Route25.asm                              | 16 ++++-----
 maps/Route27.asm                              |  6 ++--
 maps/Route29.asm                              | 12 +++----
 maps/Route30.asm                              |  2 +-
 maps/Route32.asm                              | 10 +++---
 maps/Route34IlexForestGate.asm                |  6 ++--
 maps/Route35NationalParkGate.asm              |  2 +-
 maps/Route36.asm                              |  4 +--
 maps/Route36NationalParkGate.asm              |  6 ++--
 maps/Route39Barn.asm                          |  8 ++---
 maps/Route43Gate.asm                          |  4 +--
 maps/RuinsOfAlphKabutoChamber.asm             |  2 +-
 maps/RuinsOfAlphOutside.asm                   | 10 +++---
 maps/RuinsOfAlphResearchCenter.asm            |  2 +-
 maps/SlowpokeWellB1F.asm                      |  2 +-
 maps/SproutTower3F.asm                        |  6 ++--
 maps/TeamRocketBaseB1F.asm                    | 28 +++++++--------
 maps/TeamRocketBaseB2F.asm                    | 26 +++++++-------
 maps/TeamRocketBaseB3F.asm                    | 10 +++---
 maps/TinTower1F.asm                           | 10 +++---
 maps/TrainerHouseB1F.asm                      |  2 +-
 maps/VermilionPort.asm                        |  6 ++--
 maps/VictoryRoad.asm                          |  6 ++--
 maps/VictoryRoadGate.asm                      |  2 +-
 maps/VioletCity.asm                           |  2 +-
 maps/VioletPokecenter1F.asm                   |  4 +--
 maps/WiseTriosRoom.asm                        | 10 +++---
 86 files changed, 351 insertions(+), 348 deletions(-)

diff --git a/docs/event_commands.md b/docs/event_commands.md
index fdf611cbf..bb6d4def4 100644
--- a/docs/event_commands.md
+++ b/docs/event_commands.md
@@ -163,7 +163,7 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
 
 ## `$4E`: `yesorno`
 
-## `$4F`: loadmenuheader menu_header
+## `$4F`: loadmenu menu_header
 
 ## `$50`: `closewindow`
 
@@ -241,7 +241,7 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
 
 ## `$75`: showemote emote_id, object_id, length
 
-## `$76`: objectface object_id, facing
+## `$76`: turnobject object_id, facing
 
 ## `$77`: follownotexact object2, object1
 
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
index e3dbd92df..85d6e7dc5 100644
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -109,7 +109,7 @@ PokecenterNurseScript:
 	farwritetext NurseTakePokemonText
 	pause 20
 	special StubbedTrainerRankings_Healings
-	objectface LAST_TALKED, LEFT
+	turnobject LAST_TALKED, LEFT
 	pause 10
 	special HealParty
 	playmusic MUSIC_NONE
@@ -117,7 +117,7 @@ PokecenterNurseScript:
 	special HealMachineAnim
 	pause 30
 	special RestartMapMusic
-	objectface LAST_TALKED, DOWN
+	turnobject LAST_TALKED, DOWN
 	pause 10
 
 	checkphonecall ; elm already called about pokerus
@@ -134,9 +134,9 @@ PokecenterNurseScript:
 .done
 	farwritetext NurseGoodbyeText
 
-	objectface LAST_TALKED, UP
+	turnobject LAST_TALKED, UP
 	pause 10
-	objectface LAST_TALKED, DOWN
+	turnobject LAST_TALKED, DOWN
 	pause 10
 
 	waitbutton
@@ -1811,7 +1811,7 @@ CoinVendor_IntroScript: ; 0xbcde0
 
 .loop ; 0xbcde4
 	special DisplayMoneyAndCoinBalance
-	loadmenuheader .MenuHeader
+	loadmenu .MenuHeader
 	verticalmenu
 	closewindow
 	ifequal 1, .Buy50
diff --git a/engine/scripting.asm b/engine/scripting.asm
index f1c7ef7b0..f65f2f9c0 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -144,7 +144,7 @@ ScriptCommandTable:
 	dw Script_writetext                  ; 4c
 	dw Script_repeattext                 ; 4d
 	dw Script_yesorno                    ; 4e
-	dw Script_loadmenuheader             ; 4f
+	dw Script_loadmenu                   ; 4f
 	dw Script_closewindow                ; 50
 	dw Script_jumptextfaceplayer         ; 51
 if _CRYSTAL
@@ -185,7 +185,7 @@ endc
 	dw Script_writeobjectxy              ; 73
 	dw Script_loademote                  ; 74
 	dw Script_showemote                  ; 75
-	dw Script_objectface                 ; 76
+	dw Script_turnobject                 ; 76
 	dw Script_follownotexact             ; 77
 	dw Script_earthquake                 ; 78
 	dw Script_changemap                  ; 79
@@ -432,7 +432,7 @@ Script_yesorno:
 	ld [wScriptVar], a
 	ret
 
-Script_loadmenuheader:
+Script_loadmenu:
 ; script command 0x4f
 ; parameters: menu_header
 
@@ -1052,7 +1052,7 @@ Script_faceobject:
 	call ApplyObjectFacing
 	ret
 
-Script_objectface:
+Script_turnobject:
 ; script command 0x76
 ; parameters: object_id, facing
 
diff --git a/macros/legacy.asm b/macros/legacy.asm
index a8a89829a..245e24c6e 100644
--- a/macros/legacy.asm
+++ b/macros/legacy.asm
@@ -25,14 +25,17 @@ checkmaptriggers EQUS "checkmapscene"
 domaptrigger     EQUS "setmapscene"
 checktriggers    EQUS "checkscene"
 dotrigger        EQUS "setscene"
+
 faceperson       EQUS "faceobject"
 moveperson       EQUS "moveobject"
 writepersonxy    EQUS "writeobjectxy"
-spriteface       EQUS "objectface"
+spriteface       EQUS "turnobject"
+objectface       EQUS "turnobject"
 
 RAM2MEM           EQUS "vartomem"
 loadfont          EQUS "opentext"
-loadmenudata      EQUS "loadmenuheader"
+loadmenudata      EQUS "loadmenu"
+loadmenuheader    EQUS "loadmenu"
 writebackup       EQUS "closewindow"
 interpretmenu     EQUS "_2dmenu"
 interpretmenu2    EQUS "verticalmenu"
diff --git a/macros/scripts/battle_anims.asm b/macros/scripts/battle_anims.asm
index 5c7aabed3..76300e78f 100644
--- a/macros/scripts/battle_anims.asm
+++ b/macros/scripts/battle_anims.asm
@@ -1,6 +1,6 @@
 anim_wait: MACRO
 if \1 >= $d0
-	flip out
+	fail "anim_wait argument must be less than $d0."
 endc
 	db \1
 ENDM
diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm
index 6f6d1992d..869dd7edf 100644
--- a/macros/scripts/events.asm
+++ b/macros/scripts/events.asm
@@ -516,9 +516,9 @@ yesorno: MACRO
 	db yesorno_command
 ENDM
 
-	enum loadmenuheader_command ; $4f
-loadmenuheader: MACRO
-	db loadmenuheader_command
+	enum loadmenu_command ; $4f
+loadmenu: MACRO
+	db loadmenu_command
 	dw \1 ; menu_header
 ENDM
 
@@ -747,9 +747,9 @@ showemote: MACRO
 	db \3 ; time
 ENDM
 
-	enum objectface_command ; $76
-objectface: MACRO
-	db objectface_command
+	enum turnobject_command ; $76
+turnobject: MACRO
+	db turnobject_command
 	db \1 ; object id
 	db \2 ; facing
 ENDM
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index cbfe8b425..4a55e5ac0 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -36,23 +36,23 @@ AzaleaTown_MapScripts:
 
 AzaleaTownRivalBattleScene1:
 	moveobject AZALEATOWN_SILVER, 11, 11
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
 	appear AZALEATOWN_SILVER
 	applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement1
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	jump AzaleaTownRivalBattleScript
 
 AzaleaTownRivalBattleScene2:
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
 	appear AZALEATOWN_SILVER
 	applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement2
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 AzaleaTownRivalBattleScript:
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
@@ -96,7 +96,7 @@ AzaleaTownRivalBattleScript:
 	writetext AzaleaTownRivalAfterText
 	waitbutton
 	closetext
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement
 	playsound SFX_EXIT_BUILDING
 	disappear AZALEATOWN_SILVER
@@ -158,13 +158,13 @@ AzaleaTownCelebiScene:
 	opentext
 	writetext AzaleaTownKurtText1
 	buttonsound
-	objectface AZALEATOWN_KURT_OUTSIDE, RIGHT
+	turnobject AZALEATOWN_KURT_OUTSIDE, RIGHT
 	writetext AzaleaTownKurtText2
 	buttonsound
 	writetext AzaleaTownKurtText3
 	waitbutton
 	verbosegiveitem GS_BALL
-	objectface AZALEATOWN_KURT_OUTSIDE, LEFT
+	turnobject AZALEATOWN_KURT_OUTSIDE, LEFT
 	setflag ENGINE_FOREST_IS_RESTLESS
 	clearevent EVENT_ILEX_FOREST_LASS
 	setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
@@ -177,7 +177,7 @@ AzaleaTownKurtScript:
 	opentext
 	writetext AzaleaTownKurtText3
 	waitbutton
-	objectface AZALEATOWN_KURT_OUTSIDE, LEFT
+	turnobject AZALEATOWN_KURT_OUTSIDE, LEFT
 	closetext
 	end
 
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index ef2d5a7f8..474d3c04a 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -176,10 +176,10 @@ UnreferencedScript_0x9e4be:
 	ifequal $a, Script_Menu_ChallengeExplanationCancel
 	ifnotequal $0, Script_MobileError
 	writetext Text_ReceivedAListOfLeadersOnTheHonorRoll
-	objectface BATTLETOWER1F_RECEPTIONIST, LEFT
+	turnobject BATTLETOWER1F_RECEPTIONIST, LEFT
 	writetext Text_PleaseConfirmOnThisMonitor
 	waitbutton
-	objectface BATTLETOWER1F_RECEPTIONIST, DOWN
+	turnobject BATTLETOWER1F_RECEPTIONIST, DOWN
 	closetext
 	end
 
@@ -250,7 +250,7 @@ YoungsterScript_0x9e55d:
 	writetext Text_BattleTowerYoungster
 	waitbutton
 	closetext
-	objectface BATTLETOWER1F_YOUNGSTER, RIGHT
+	turnobject BATTLETOWER1F_YOUNGSTER, RIGHT
 	end
 
 CooltrainerFScript_0x9e568:
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index b0df5c97f..074d3997a 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -36,7 +36,7 @@ BurnedTower1F_MapScripts:
 	return
 
 .MeetEusine:
-	objectface BURNEDTOWER1F_EUSINE, DOWN
+	turnobject BURNEDTOWER1F_EUSINE, DOWN
 	showemote EMOTE_SHOCK, BURNEDTOWER1F_EUSINE, 15
 	applymovement BURNEDTOWER1F_EUSINE, BurnedTower1FEusineMovement
 	opentext
@@ -51,7 +51,7 @@ BurnedTowerRivalBattleScript:
 	showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 15
 	special FadeOutMusic
 	pause 15
-	objectface BURNEDTOWER1F_SILVER, RIGHT
+	turnobject BURNEDTOWER1F_SILVER, RIGHT
 	pause 15
 	applymovement PLAYER, BurnedTowerMovement_PlayerWalksToSilver
 	applymovement BURNEDTOWER1F_SILVER, BurnedTowerMovement_SilverWalksToPlayer
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index 17c3bc1e3..32d3b57d2 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -34,48 +34,48 @@ ReleaseTheBeasts:
 	playmusic MUSIC_NONE
 	pause 30
 	appear BURNEDTOWERB1F_RAIKOU1
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	pause 5
 	disappear BURNEDTOWERB1F_RAIKOU2
 	pause 15
 	cry RAIKOU
 	appear BURNEDTOWERB1F_ENTEI1
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	pause 5
 	disappear BURNEDTOWERB1F_ENTEI2
 	pause 15
 	cry ENTEI
 	appear BURNEDTOWERB1F_SUICUNE1
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	pause 5
 	disappear BURNEDTOWERB1F_SUICUNE2
 	pause 15
 	cry SUICUNE
 	pause 15
 	playsound SFX_WARP_FROM
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement BURNEDTOWERB1F_RAIKOU1, BurnedTowerRaikouMovement
 	disappear BURNEDTOWERB1F_RAIKOU1
 	waitsfx
 	playsound SFX_WARP_FROM
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	applymovement BURNEDTOWERB1F_ENTEI1, BurnedTowerEnteiMovement
 	disappear BURNEDTOWERB1F_ENTEI1
 	waitsfx
 	pause 15
 	playsound SFX_WARP_FROM
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement1
 	playsound SFX_WARP_FROM
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement2
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	pause 20
 	cry SUICUNE
 	pause 30
 	playsound SFX_WARP_FROM
 	applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement3
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	disappear BURNEDTOWERB1F_SUICUNE1
 	waitsfx
 	special RestartMapMusic
diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm
index e2485619b..89588ddd3 100644
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -28,7 +28,7 @@ CeladonCafeFisher1:
 	writetext Fisher1Text_Concentration
 	waitbutton
 	closetext
-	objectface CELADONCAFE_FISHER1, LEFT
+	turnobject CELADONCAFE_FISHER1, LEFT
 	end
 
 CeladonCafeFisher2:
@@ -41,7 +41,7 @@ CeladonCafeFisher2:
 	writetext Fisher2Text_Quantity
 	waitbutton
 	closetext
-	objectface CELADONCAFE_FISHER2, RIGHT
+	turnobject CELADONCAFE_FISHER2, RIGHT
 	end
 
 CeladonCafeFisher3:
@@ -54,7 +54,7 @@ CeladonCafeFisher3:
 	writetext Fisher3Text_GoldenrodIsBest
 	waitbutton
 	closetext
-	objectface CELADONCAFE_FISHER3, RIGHT
+	turnobject CELADONCAFE_FISHER3, RIGHT
 	end
 
 CeladonCafeTeacher:
@@ -69,7 +69,7 @@ CeladonCafeTeacher:
 	writetext TeacherText_NoCoinCase
 	waitbutton
 	closetext
-	objectface CELADONCAFE_TEACHER, LEFT
+	turnobject CELADONCAFE_TEACHER, LEFT
 	end
 
 .HasCoinCase:
@@ -77,12 +77,12 @@ CeladonCafeTeacher:
 	writetext TeacherText_KeepEating
 	waitbutton
 	closetext
-	objectface CELADONCAFE_TEACHER, RIGHT
+	turnobject CELADONCAFE_TEACHER, RIGHT
 	opentext
 	writetext TeacherText_MoreChef
 	waitbutton
 	closetext
-	objectface CELADONCAFE_TEACHER, LEFT
+	turnobject CELADONCAFE_TEACHER, LEFT
 	end
 
 EatathonContestPoster:
diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm
index eafcc6382..6424102cd 100644
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -26,7 +26,7 @@ CeladonDeptStore3FGameboyKid1Script:
 	writetext CeladonDeptStore3FGameboyKid1Text
 	waitbutton
 	closetext
-	objectface CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN
+	turnobject CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN
 	end
 
 CeladonDeptStore3FGameboyKid2Script:
@@ -35,7 +35,7 @@ CeladonDeptStore3FGameboyKid2Script:
 	writetext CeladonDeptStore3FGameboyKid2Text
 	waitbutton
 	closetext
-	objectface CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN
+	turnobject CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN
 	end
 
 CeladonDeptStore3FSuperNerdScript:
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index 243c8d11a..bc67437e5 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -23,7 +23,7 @@ CeladonDeptStore6FVendingMachine:
 	writetext CeladonVendingText
 .Start:
 	special PlaceMoneyTopRight
-	loadmenuheader .MenuHeader
+	loadmenu .MenuHeader
 	verticalmenu
 	closewindow
 	ifequal 1, .FreshWater
diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm
index 5bbcb42ef..9b95241e3 100644
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -26,7 +26,7 @@ CeladonGameCornerPokefanMScript:
 	writetext CeladonGameCornerPokefanMText
 	waitbutton
 	closetext
-	objectface CELADONGAMECORNER_POKEFAN_M, LEFT
+	turnobject CELADONGAMECORNER_POKEFAN_M, LEFT
 	end
 
 CeladonGameCornerTeacherScript:
@@ -35,7 +35,7 @@ CeladonGameCornerTeacherScript:
 	writetext CeladonGameCornerTeacherText
 	waitbutton
 	closetext
-	objectface CELADONGAMECORNER_TEACHER, RIGHT
+	turnobject CELADONGAMECORNER_TEACHER, RIGHT
 	end
 
 CeladonGameCornerFishingGuruScript:
@@ -44,7 +44,7 @@ CeladonGameCornerFishingGuruScript:
 	writetext CeladonGameCornerFishingGuruText
 	waitbutton
 	closetext
-	objectface CELADONGAMECORNER_FISHING_GURU, RIGHT
+	turnobject CELADONGAMECORNER_FISHING_GURU, RIGHT
 	end
 
 CeladonGameCornerFisherScript:
@@ -66,7 +66,7 @@ CeladonGameCornerFisherScript:
 	writetext CeladonGameCornerFisherText2
 	waitbutton
 	closetext
-	objectface LAST_TALKED, LEFT
+	turnobject LAST_TALKED, LEFT
 	end
 
 .GiveCoins:
@@ -80,14 +80,14 @@ CeladonGameCornerFisherScript:
 	writetext CeladonGameCornerFisherNoCoinCaseText
 	waitbutton
 	closetext
-	objectface LAST_TALKED, LEFT
+	turnobject LAST_TALKED, LEFT
 	end
 
 .FullCoinCase:
 	writetext CeladonGameCornerFisherFullCoinCaseText
 	waitbutton
 	closetext
-	objectface LAST_TALKED, LEFT
+	turnobject LAST_TALKED, LEFT
 	end
 
 CeladonGymGuyScript:
@@ -99,7 +99,7 @@ CeladonGameCornerGrampsScript:
 	writetext CeladonGameCornerGrampsText
 	waitbutton
 	closetext
-	objectface CELADONGAMECORNER_GRAMPS, LEFT
+	turnobject CELADONGAMECORNER_GRAMPS, LEFT
 	end
 
 CeladonGameCornerPoster1Script:
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index 0141f21f3..fdeeefc3c 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -23,7 +23,7 @@ CeladonGameCornerPrizeRoomTMVendor:
 	writetext CeladonPrizeRoom_AskWhichPrizeText
 CeladonPrizeRoom_tmcounterloop:
 	special DisplayCoinCaseBalance
-	loadmenuheader CeladonPrizeRoom_TMMenuHeader
+	loadmenu CeladonPrizeRoom_TMMenuHeader
 	verticalmenu
 	closewindow
 	ifequal 1, .doubleteam
@@ -124,7 +124,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
 .loop
 	writetext CeladonPrizeRoom_AskWhichPrizeText
 	special DisplayCoinCaseBalance
-	loadmenuheader .MenuHeader
+	loadmenu .MenuHeader
 	verticalmenu
 	closewindow
 	ifequal 1, .pikachu
diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm
index 34727e077..38fdc9a41 100644
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -49,7 +49,7 @@ CeruleanCityCooltrainerFScript:
 	writetext CeruleanCityCooltrainerFText1
 	waitbutton
 	closetext
-	objectface CERULEANCITY_COOLTRAINER_F, LEFT
+	turnobject CERULEANCITY_COOLTRAINER_F, LEFT
 	opentext
 	writetext CeruleanCityCooltrainerFText2
 	waitbutton
@@ -113,7 +113,7 @@ CeruleanCityYoungsterScript:
 	playsound SFX_TRANSACTION
 	waitsfx
 	showemote EMOTE_SHOCK, CERULEANCITY_YOUNGSTER, 15
-	objectface CERULEANCITY_YOUNGSTER, LEFT
+	turnobject CERULEANCITY_YOUNGSTER, LEFT
 	opentext
 	writetext CeruleanCityYoungsterText2
 	waitbutton
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index a7e81fea5..7e5f62973 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -52,7 +52,7 @@ CeruleanGym_MapScripts:
 	waitsfx
 	special RestartMapMusic
 	pause 15
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	pause 15
 	end
 
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index 3fc6df5b8..3831a8f35 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -42,28 +42,28 @@ CherrygroveCityGuideGent:
 	waitbutton
 	closetext
 	applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement2
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext GuideGentMartText
 	waitbutton
 	closetext
 	applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement3
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext GuideGentRoute30Text
 	waitbutton
 	closetext
 	applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement4
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	opentext
 	writetext GuideGentSeaText
 	waitbutton
 	closetext
 	applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement5
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	pause 60
-	objectface CHERRYGROVECITY_GRAMPS, LEFT
-	objectface PLAYER, RIGHT
+	turnobject CHERRYGROVECITY_GRAMPS, LEFT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext GuideGentGiftText
 	buttonsound
@@ -77,7 +77,7 @@ CherrygroveCityGuideGent:
 	closetext
 	stopfollow
 	special RestartMapMusic
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement6
 	playsound SFX_ENTER_DOOR
 	disappear CHERRYGROVECITY_GRAMPS
@@ -101,13 +101,13 @@ CherrygroveCityGuideGent:
 CherrygroveSilverSceneSouth:
 	moveobject CHERRYGROVECITY_SILVER, 39, 7
 CherrygroveSilverSceneNorth:
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
 	appear CHERRYGROVECITY_SILVER
 	applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalWalksToYou
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
 	writetext UnknownText_0x19c4e2
@@ -166,7 +166,7 @@ CherrygroveSilverSceneNorth:
 .FinishRival:
 	playsound SFX_TACKLE
 	applymovement PLAYER, CherrygroveCity_RivalPushesYouOutOfTheWay
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft
 	disappear CHERRYGROVECITY_SILVER
 	setscene SCENE_CHERRYGROVECITY_NOTHING
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index 38b6982e2..15bb6d7bb 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -36,12 +36,12 @@ CianwoodCity_MapScripts:
 	return
 
 CianwoodCitySuicuneAndEusine:
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	showemote EMOTE_SHOCK, PLAYER, 15
 	pause 15
 	playsound SFX_WARP_FROM
 	applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00da
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	pause 15
 	playsound SFX_WARP_FROM
 	applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0
diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm
index 4e76b7385..1f24dc448 100644
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -22,7 +22,7 @@ ChuckScript_0x9d60f:
 	writetext ChuckIntroText1
 	waitbutton
 	closetext
-	objectface CIANWOODGYM_CHUCK, RIGHT
+	turnobject CIANWOODGYM_CHUCK, RIGHT
 	opentext
 	writetext ChuckIntroText2
 	waitbutton
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index ccff4b538..9ca05c6db 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -28,7 +28,7 @@ DragonShrine_MapScripts:
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	writetext DragonShrineQuestion1Text
 	buttonsound
-	loadmenuheader DragonShrineQuestion1_MenuHeader
+	loadmenu DragonShrineQuestion1_MenuHeader
 	verticalmenu
 	closewindow
 	ifequal 1, .RightAnswer
@@ -40,7 +40,7 @@ DragonShrine_MapScripts:
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
 	writetext DragonShrineQuestion2Text
 	buttonsound
-	loadmenuheader DragonShrineQuestion2_MenuHeader
+	loadmenu DragonShrineQuestion2_MenuHeader
 	verticalmenu
 	closewindow
 	ifequal 1, .RightAnswer
@@ -50,7 +50,7 @@ DragonShrine_MapScripts:
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4
 	writetext DragonShrineQuestion3Text
 	buttonsound
-	loadmenuheader DragonShrineQuestion3_MenuHeader
+	loadmenu DragonShrineQuestion3_MenuHeader
 	verticalmenu
 	closewindow
 	ifequal 1, .WrongAnswer
@@ -60,7 +60,7 @@ DragonShrine_MapScripts:
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5
 	writetext DragonShrineQuestion4Text
 	buttonsound
-	loadmenuheader DragonShrineQuestion4_MenuHeader
+	loadmenu DragonShrineQuestion4_MenuHeader
 	verticalmenu
 	closewindow
 	ifequal 1, .RightAnswer
@@ -70,7 +70,7 @@ DragonShrine_MapScripts:
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6
 	writetext DragonShrineQuestion5Text
 	buttonsound
-	loadmenuheader DragonShrineQuestion5_MenuHeader
+	loadmenu DragonShrineQuestion5_MenuHeader
 	verticalmenu
 	closewindow
 	ifequal 1, .WrongAnswer
@@ -91,12 +91,12 @@ DragonShrine_MapScripts:
 	iftrue .Question2
 .WrongAnswer:
 	closetext
-	objectface DRAGONSHRINE_ELDER1, LEFT
+	turnobject DRAGONSHRINE_ELDER1, LEFT
 	opentext
 	writetext DragonShrineWrongAnswerText1
 	waitbutton
 	closetext
-	objectface DRAGONSHRINE_ELDER1, DOWN
+	turnobject DRAGONSHRINE_ELDER1, DOWN
 	opentext
 	writetext DragonShrineWrongAnswerText2
 	waitbutton
@@ -122,12 +122,12 @@ DragonShrine_MapScripts:
 	playmusic MUSIC_CLAIR
 	appear DRAGONSHRINE_CLAIR
 	waitsfx
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	pause 30
 	applymovement DRAGONSHRINE_CLAIR, DragonShrineClairWalkInMovement
-	objectface DRAGONSHRINE_CLAIR, RIGHT
-	objectface PLAYER, LEFT
-	objectface DRAGONSHRINE_ELDER1, LEFT
+	turnobject DRAGONSHRINE_CLAIR, RIGHT
+	turnobject PLAYER, LEFT
+	turnobject DRAGONSHRINE_ELDER1, LEFT
 	opentext
 	writetext DragonShrineClairYouPassedText
 	waitbutton
@@ -144,7 +144,7 @@ DragonShrine_MapScripts:
 	waitbutton
 	closetext
 	applymovement DRAGONSHRINE_ELDER1, DragonShrineElderWalkToClairMovement
-	objectface DRAGONSHRINE_CLAIR, UP
+	turnobject DRAGONSHRINE_CLAIR, UP
 	opentext
 	writetext DragonShrineMustIInformLanceText
 	waitbutton
@@ -171,9 +171,9 @@ DragonShrine_MapScripts:
 	waitbutton
 	closetext
 	applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2ce
-	objectface DRAGONSHRINE_CLAIR, UP
+	turnobject DRAGONSHRINE_CLAIR, UP
 	applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2d1
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext DragonShrineElderScoldsClairText
 	waitbutton
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 2404cebe1..74a803768 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -47,7 +47,7 @@ DragonsDenB1F_ClairScene:
 	pause 30
 	closetext
 	showemote EMOTE_SHOCK, PLAYER, 15
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	playmusic MUSIC_CLAIR
 	applymovement DRAGONSDENB1F_CLAIR, MovementDragonsDen_ClairWalksToYou
 	opentext
diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm
index 9fa76633d..2456550b9 100644
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -45,7 +45,7 @@ EarlsPokemonAcademyGameboyKid1Script:
 	writetext EarlsPokemonAcademyGameboyKid1Text
 	waitbutton
 	closetext
-	objectface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN
+	turnobject EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN
 	end
 
 EarlsPokemonAcademyGameboyKid2Script:
@@ -54,7 +54,7 @@ EarlsPokemonAcademyGameboyKid2Script:
 	writetext EarlsPokemonAcademyGameboyKid2Text
 	waitbutton
 	closetext
-	objectface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN
+	turnobject EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN
 	end
 
 EarlsPokemonAcademyYoungster2Script:
@@ -64,7 +64,7 @@ AcademyBlackboard:
 	opentext
 	writetext AcademyBlackboardText
 .Loop:
-	loadmenuheader .BlackboardMenuHeader
+	loadmenu .BlackboardMenuHeader
 	_2dmenu
 	closewindow
 	ifequal 1, .Poison
diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm
index 3456e6577..eceb7a5ef 100644
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -26,15 +26,15 @@ EcruteakPokecenter1F_MapScripts:
 	waitsfx
 	applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokecenter1FBillMovement1
 	applymovement PLAYER, EcruteakPokecenter1FPlayerMovement1
-	objectface ECRUTEAKPOKECENTER1F_NURSE, UP
+	turnobject ECRUTEAKPOKECENTER1F_NURSE, UP
 	pause 10
-	objectface ECRUTEAKPOKECENTER1F_NURSE, DOWN
+	turnobject ECRUTEAKPOKECENTER1F_NURSE, DOWN
 	pause 30
-	objectface ECRUTEAKPOKECENTER1F_NURSE, UP
+	turnobject ECRUTEAKPOKECENTER1F_NURSE, UP
 	pause 10
-	objectface ECRUTEAKPOKECENTER1F_NURSE, DOWN
+	turnobject ECRUTEAKPOKECENTER1F_NURSE, DOWN
 	pause 20
-	objectface ECRUTEAKPOKECENTER1F_BILL, DOWN
+	turnobject ECRUTEAKPOKECENTER1F_BILL, DOWN
 	pause 10
 	opentext
 	writetext EcruteakPokecenter1F_BillText1
@@ -45,7 +45,7 @@ EcruteakPokecenter1F_MapScripts:
 	writetext EcruteakPokecenter1F_BillText2
 	waitbutton
 	closetext
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokecenter1FBillMovement2
 	playsound SFX_EXIT_BUILDING
 	disappear ECRUTEAKPOKECENTER1F_BILL
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 332dedcaf..8490fed48 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -47,7 +47,7 @@ ElmsLab_MapScripts:
 .WalkUpToElm:
 	applymovement PLAYER, ElmsLab_WalkUpToElmMovement
 	showemote EMOTE_SHOCK, ELMSLAB_ELM, 15
-	objectface ELMSLAB_ELM, RIGHT
+	turnobject ELMSLAB_ELM, RIGHT
 	opentext
 	writetext ElmText_Intro
 .MustSayYes:
@@ -65,20 +65,20 @@ ElmsLab_MapScripts:
 	playsound SFX_GLASS_TING
 	pause 30
 	showemote EMOTE_SHOCK, ELMSLAB_ELM, 10
-	objectface ELMSLAB_ELM, DOWN
+	turnobject ELMSLAB_ELM, DOWN
 	opentext
 	writetext ElmText_GotAnEmail
 	waitbutton
 	closetext
 	opentext
-	objectface ELMSLAB_ELM, RIGHT
+	turnobject ELMSLAB_ELM, RIGHT
 	writetext ElmText_MissionFromMrPokemon
 	waitbutton
 	closetext
 	applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement1
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement2
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext ElmText_ChooseAPokemon
 	waitbutton
@@ -147,7 +147,7 @@ ElmCheckGotEggAgain:
 	end
 
 LabTryToLeaveScript:
-	objectface ELMSLAB_ELM, DOWN
+	turnobject ELMSLAB_ELM, DOWN
 	opentext
 	writetext LabWhereGoingText
 	waitbutton
@@ -158,7 +158,7 @@ LabTryToLeaveScript:
 CyndaquilPokeBallScript:
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
 	iftrue LookAtElmPokeBallScript
-	objectface ELMSLAB_ELM, DOWN
+	turnobject ELMSLAB_ELM, DOWN
 	refreshscreen
 	pokepic CYNDAQUIL
 	cry CYNDAQUIL
@@ -188,7 +188,7 @@ CyndaquilPokeBallScript:
 TotodilePokeBallScript:
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
 	iftrue LookAtElmPokeBallScript
-	objectface ELMSLAB_ELM, DOWN
+	turnobject ELMSLAB_ELM, DOWN
 	refreshscreen
 	pokepic TOTODILE
 	cry TOTODILE
@@ -216,7 +216,7 @@ TotodilePokeBallScript:
 ChikoritaPokeBallScript:
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
 	iftrue LookAtElmPokeBallScript
-	objectface ELMSLAB_ELM, DOWN
+	turnobject ELMSLAB_ELM, DOWN
 	refreshscreen
 	pokepic CHIKORITA
 	cry CHIKORITA
@@ -248,7 +248,7 @@ DidntChooseStarterScript:
 	end
 
 ElmDirectionsScript:
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext ElmDirectionsText1
 	waitbutton
@@ -260,12 +260,12 @@ ElmDirectionsScript:
 	waitsfx
 	waitbutton
 	closetext
-	objectface ELMSLAB_ELM, LEFT
+	turnobject ELMSLAB_ELM, LEFT
 	opentext
 	writetext ElmDirectionsText2
 	waitbutton
 	closetext
-	objectface ELMSLAB_ELM, DOWN
+	turnobject ELMSLAB_ELM, DOWN
 	opentext
 	writetext ElmDirectionsText3
 	waitbutton
@@ -457,14 +457,14 @@ ElmJumpRightScript:
 
 AideScript_WalkPotion1:
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksRight1
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	scall AideScript_GivePotion
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft1
 	end
 
 AideScript_WalkPotion2:
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksRight2
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	scall AideScript_GivePotion
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft2
 	end
@@ -482,14 +482,14 @@ AideScript_GivePotion:
 
 AideScript_WalkBalls1:
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksRight1
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	scall AideScript_GiveYouBalls
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft1
 	end
 
 AideScript_WalkBalls2:
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksRight2
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	scall AideScript_GiveYouBalls
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft2
 	end
@@ -550,7 +550,7 @@ MeetCopScript2:
 MeetCopScript:
 	applymovement PLAYER, MeetCopScript_WalkUp
 CopScript:
-	objectface ELMSLAB_OFFICER, LEFT
+	turnobject ELMSLAB_OFFICER, LEFT
 	opentext
 	writetext ElmsLabOfficerText1
 	buttonsound
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index 9d880cfa2..76516f107 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -130,7 +130,7 @@ WorriedGrandpaSceneLeft:
 	writetext UnknownText_0x75412
 	waitbutton
 	closetext
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222
 	disappear FASTSHIP1F_GENTLEMAN
 	setscene SCENE_DEFAULT
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index 67109ec4c..5c61d99a0 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -36,7 +36,7 @@ SSAquaCaptain:
 	end
 
 SSAquaGranddaughterBefore:
-	objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, RIGHT
+	turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, RIGHT
 	opentext
 	writetext SSAquaGranddaughterCaptainPlayWithMeText
 	waitbutton
@@ -52,13 +52,13 @@ SSAquaGranddaughterBefore:
 	applymovement PLAYER, MovementData_0x76004
 	moveobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, 3, 19
 	appear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1
-	objectface PLAYER, UP
-	objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP
+	turnobject PLAYER, UP
+	turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP
 	special FadeInQuickly
-	objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN
+	turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN
 	showemote EMOTE_SHOCK, FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, 15
 	applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, MovementData_0x7600c
-	objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, RIGHT
+	turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, RIGHT
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .PlayerIsFemale
 	opentext
@@ -73,7 +73,7 @@ SSAquaGranddaughterBefore:
 	waitbutton
 	closetext
 .cont:
-	objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN
+	turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN
 	applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, MovementData_0x76010
 	opentext
 	writetext SSAquaEntertainedGranddaughterText
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 5474b85e7..97486ae06 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -63,7 +63,7 @@ MoveTutorScript:
 	checkcoins 4000
 	ifequal HAVE_LESS, .NotEnoughMoney
 	writetext UnknownText_0x1990ce
-	loadmenuheader .MoveMenuHeader
+	loadmenu .MoveMenuHeader
 	verticalmenu
 	closewindow
 	ifequal MOVETUTOR_FLAMETHROWER, .Flamethrower
@@ -210,7 +210,7 @@ GoldenrodCityRocketScoutScript:
 	writetext GoldenrodCityRocketScoutText2
 	waitbutton
 	closetext
-	objectface GOLDENRODCITY_ROCKETSCOUT, UP
+	turnobject GOLDENRODCITY_ROCKETSCOUT, UP
 	end
 
 GoldenrodCityRocket1Script:
diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm
index 1f9a6a92d..2b77d5ae1 100644
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -28,7 +28,7 @@ GameboyKidScript_0x55ef7:
 	writetext UnknownText_0x55f74
 	waitbutton
 	closetext
-	objectface GOLDENRODDEPTSTORE4F_GAMEBOY_KID, DOWN
+	turnobject GOLDENRODDEPTSTORE4F_GAMEBOY_KID, DOWN
 	end
 
 GoldenrodDeptStore4FDirectory:
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index bf510a58f..fa21f5e92 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -12,7 +12,7 @@ GoldenrodVendingMachine:
 	writetext GoldenrodVendingText
 .Start:
 	special PlaceMoneyTopRight
-	loadmenuheader .MenuHeader
+	loadmenu .MenuHeader
 	verticalmenu
 	closewindow
 	ifequal 1, .FreshWater
diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm
index cd6162349..a41e2f9b0 100644
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -52,7 +52,7 @@ FisherScript_0x56749:
 	writetext UnknownText_0x567d2
 	waitbutton
 	closetext
-	objectface GOLDENRODDEPTSTOREROOF_FISHER, UP
+	turnobject GOLDENRODDEPTSTOREROOF_FISHER, UP
 	end
 
 GoldenrodDeptStoreRoofTwinScript:
@@ -63,12 +63,12 @@ SuperNerdScript_0x56757:
 	writetext UnknownText_0x56867
 	waitbutton
 	closetext
-	objectface GOLDENRODDEPTSTOREROOF_SUPER_NERD, UP
+	turnobject GOLDENRODDEPTSTOREROOF_SUPER_NERD, UP
 	opentext
 	writetext UnknownText_0x56871
 	waitbutton
 	closetext
-	objectface GOLDENRODDEPTSTOREROOF_SUPER_NERD, RIGHT
+	turnobject GOLDENRODDEPTSTOREROOF_SUPER_NERD, RIGHT
 	end
 
 GoldenrodDeptStoreRoofPokefanMScript:
diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm
index 6c73499b6..ea060d0d3 100644
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -30,7 +30,7 @@ FlowerShopTeacherScript:
 	end
 
 .Lalala:
-	objectface GOLDENRODFLOWERSHOP_TEACHER, LEFT
+	turnobject GOLDENRODFLOWERSHOP_TEACHER, LEFT
 	opentext
 	writetext UnknownText_0x5552e
 	waitbutton
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index c1accf826..dee306ba7 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -43,7 +43,7 @@ GoldenrodGameCornerPokefanM3Script:
 	writetext GoldenrodGameCornerPokefanM3Text
 	waitbutton
 	closetext
-	objectface GOLDENRODGAMECORNER_POKEFAN_M3, RIGHT
+	turnobject GOLDENRODGAMECORNER_POKEFAN_M3, RIGHT
 	end
 
 GoldenrodGmeCornerCoinVendorScript:
@@ -59,7 +59,7 @@ GoldenrodGmeCornerTMVendorScript:
 	writetext GoldenrodGameCornerPrizeVendorWhichPrizeText
 GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36
 	special DisplayCoinCaseBalance
-	loadmenuheader GoldenrodGameCornerTMVendorMenuHeader
+	loadmenu GoldenrodGameCornerTMVendorMenuHeader
 	verticalmenu
 	closewindow
 	ifequal 1, .Thunder
@@ -160,7 +160,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
 .loop
 	writetext GoldenrodGameCornerPrizeVendorWhichPrizeText
 	special DisplayCoinCaseBalance
-	loadmenuheader .MenuHeader
+	loadmenu .MenuHeader
 	verticalmenu
 	closewindow
 	ifequal 1, .abra
@@ -242,7 +242,7 @@ GoldenrodGameCornerPharmacistScript:
 	writetext GoldenrodGameCornerPharmacistText
 	waitbutton
 	closetext
-	objectface LAST_TALKED, LEFT
+	turnobject LAST_TALKED, LEFT
 	end
 
 GoldenrodGameCornerPokefanM1Script:
@@ -251,7 +251,7 @@ GoldenrodGameCornerPokefanM1Script:
 	writetext GoldenrodGameCornerPokefanM1Text
 	waitbutton
 	closetext
-	objectface GOLDENRODGAMECORNER_POKEFAN_M1, RIGHT
+	turnobject GOLDENRODGAMECORNER_POKEFAN_M1, RIGHT
 	end
 
 GoldenrodGameCornerCooltrainerMScript:
@@ -260,7 +260,7 @@ GoldenrodGameCornerCooltrainerMScript:
 	writetext GoldenrodGameCornerCooltrainerMText
 	waitbutton
 	closetext
-	objectface GOLDENRODGAMECORNER_COOLTRAINER_M, LEFT
+	turnobject GOLDENRODGAMECORNER_COOLTRAINER_M, LEFT
 	end
 
 GoldenrodGameCornerPokefanFScript:
@@ -269,7 +269,7 @@ GoldenrodGameCornerPokefanFScript:
 	writetext GoldenrodGameCornerPokefanFText
 	waitbutton
 	closetext
-	objectface GOLDENRODGAMECORNER_POKEFAN_F, RIGHT
+	turnobject GOLDENRODGAMECORNER_POKEFAN_F, RIGHT
 	end
 
 GoldenrodGameCornerCooltrainerFScript:
@@ -281,7 +281,7 @@ GoldenrodGameCornerGentlemanScript:
 	writetext GoldenrodGameCornerGentlemanText
 	waitbutton
 	closetext
-	objectface GOLDENRODGAMECORNER_GENTLEMAN, RIGHT
+	turnobject GOLDENRODGAMECORNER_GENTLEMAN, RIGHT
 	end
 
 GoldenrodGameCornerPokefanM2Script:
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
index 9f9524596..cdf754bad 100644
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -104,7 +104,7 @@ TrainerLassCarrie:
 WhitneyCriesScript:
 	showemote EMOTE_SHOCK, GOLDENRODGYM_LASS2, 15
 	applymovement GOLDENRODGYM_LASS2, BridgetWalksUpMovement
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	opentext
 	writetext BridgetWhitneyCriesText
 	waitbutton
diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm
index bdaea95ea..9e5173fb7 100644
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -28,7 +28,7 @@ GoldenrodPokecenter1F_GSBallSceneLeft:
 	appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
 	playmusic MUSIC_SHOW_ME_AROUND
 	applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x6105a
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext UnknownText_0x622f0
 	waitbutton
@@ -60,7 +60,7 @@ GoldenrodPokecenter1F_GSBallSceneRight:
 	appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
 	playmusic MUSIC_SHOW_ME_AROUND
 	applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x61065
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext UnknownText_0x622f0
 	waitbutton
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index a3733aaec..9e08b0448 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -117,7 +117,7 @@ TeacherScript_0x7ca7d:
 	jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_TeacherText
 
 UndergroundSilverScene1:
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
@@ -125,7 +125,7 @@ UndergroundSilverScene1:
 	appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
 	waitsfx
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement1
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	scall UndergroundSilverBattleScript
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1
 	playsound SFX_EXIT_BUILDING
@@ -136,7 +136,7 @@ UndergroundSilverScene1:
 	end
 
 UndergroundSilverScene2:
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
@@ -144,7 +144,7 @@ UndergroundSilverScene2:
 	appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
 	waitsfx
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement2
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	scall UndergroundSilverBattleScript
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2
 	playsound SFX_EXIT_BUILDING
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index e3541bbd3..3d9492f14 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -19,12 +19,12 @@ HallOfFame_MapScripts:
 	follow HALLOFFAME_LANCE, PLAYER
 	applymovement HALLOFFAME_LANCE, HallOfFame_WalkUpWithLance
 	stopfollow
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext HallOfFame_LanceText
 	waitbutton
 	closetext
-	objectface HALLOFFAME_LANCE, UP
+	turnobject HALLOFFAME_LANCE, UP
 	applymovement PLAYER, HallOfFame_SlowlyApproachMachine
 	setscene SCENE_FINISHED
 	pause 15
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index 94e1b0eb0..3c6f2343a 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -460,7 +460,7 @@ MapIlexForestSignpost4Script:
 	special FadeOutMusic
 	applymovement PLAYER, MovementData_0x6ef58
 	pause 30
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	pause 20
 	clearflag ENGINE_FOREST_IS_RESTLESS
 	special CelebiShrineEvent
diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm
index ce5a3b782..b44f56b2d 100644
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -54,13 +54,13 @@ PlateauRivalBattle1:
 	ifequal SATURDAY, PlateauRivalScriptDone
 	moveobject INDIGOPLATEAUPOKECENTER1F_SILVER, 17, 9
 	appear INDIGOPLATEAUPOKECENTER1F_SILVER
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
 	applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement1
 	playmusic MUSIC_RIVAL_ENCOUNTER
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	jump PlateauRivalBattleCommon
 
 PlateauRivalBattle2:
@@ -75,13 +75,13 @@ PlateauRivalBattle2:
 	ifequal FRIDAY, PlateauRivalScriptDone
 	ifequal SATURDAY, PlateauRivalScriptDone
 	appear INDIGOPLATEAUPOKECENTER1F_SILVER
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
 	applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement2
 	playmusic MUSIC_RIVAL_ENCOUNTER
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 PlateauRivalBattleCommon:
 	opentext
 	writetext PlateauRivalText1
@@ -125,7 +125,7 @@ PlateauRivalPostBattle:
 	writetext PlateauRivalText2
 	waitbutton
 	closetext
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalLeavesMovement
 	disappear INDIGOPLATEAUPOKECENTER1F_SILVER
 	setscene SCENE_DEFAULT
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index 97e2d5ebe..6710c7e5e 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -46,7 +46,7 @@ KurtScript_0x18e178:
 	setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
 	checkcode VAR_FACING
 	ifequal UP, .RunAround
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	playsound SFX_FLY
 	applymovement KURTSHOUSE_KURT1, MovementData_0x18e466
 	playsound SFX_EXIT_BUILDING
@@ -56,7 +56,7 @@ KurtScript_0x18e178:
 	end
 
 .RunAround:
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	playsound SFX_FLY
 	applymovement KURTSHOUSE_KURT1, MovementData_0x18e46c
 	playsound SFX_EXIT_BUILDING
@@ -294,13 +294,13 @@ KurtScript_0x18e178:
 	showemote EMOTE_SHOCK, KURTSHOUSE_KURT1, 30
 	checkcode VAR_FACING
 	ifequal UP, .GSBallRunAround
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	playsound SFX_FLY
 	applymovement KURTSHOUSE_KURT1, MovementData_0x18e466
 	jump .KurtHasLeftTheBuilding
 
 .GSBallRunAround:
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	playsound SFX_FLY
 	applymovement KURTSHOUSE_KURT1, MovementData_0x18e46c
 .KurtHasLeftTheBuilding:
@@ -323,21 +323,21 @@ KurtMakingBallsScript:
 	writetext UnknownText_0x18e7d8
 	waitbutton
 	closetext
-	objectface KURTSHOUSE_KURT2, UP
+	turnobject KURTSHOUSE_KURT2, UP
 	end
 
 Script_FirstTimeBuggingKurt:
 	writetext UnknownText_0x18e863
 	waitbutton
 	closetext
-	objectface KURTSHOUSE_KURT2, UP
+	turnobject KURTSHOUSE_KURT2, UP
 	setevent EVENT_BUGGING_KURT_TOO_MUCH
 	end
 
 KurtScript_ImCheckingItNow:
 	writetext UnknownText_0x18e934
 	waitbutton
-	objectface KURTSHOUSE_KURT2, UP
+	turnobject KURTSHOUSE_KURT2, UP
 	writetext UnknownText_0x18e949
 	waitbutton
 	closetext
@@ -393,14 +393,14 @@ KurtsGranddaughter2Subscript:
 	writetext KurtsGranddaughterHelpText
 	waitbutton
 	closetext
-	objectface KURTSHOUSE_TWIN2, RIGHT
+	turnobject KURTSHOUSE_TWIN2, RIGHT
 	end
 
 .GSBall:
 	writetext KurtsGranddaughterGSBallText
 	waitbutton
 	closetext
-	objectface KURTSHOUSE_TWIN2, RIGHT
+	turnobject KURTSHOUSE_TWIN2, RIGHT
 	end
 
 KurtsGranddaughterFunScript:
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index 5e60b2718..b6cdcfb56 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -50,7 +50,7 @@ Script_ApproachLanceFromRight:
 	special FadeOutMusic
 	applymovement PLAYER, MovementData_ApproachLanceFromRight
 LanceScript_0x180e7b:
-	objectface LANCESROOM_LANCE, LEFT
+	turnobject LANCESROOM_LANCE, LEFT
 	opentext
 	writetext LanceBattleIntroText
 	waitbutton
@@ -74,9 +74,9 @@ LanceScript_0x180e7b:
 	musicfadeout MUSIC_BEAUTY_ENCOUNTER, 16
 	pause 30
 	showemote EMOTE_SHOCK, LANCESROOM_LANCE, 15
-	objectface LANCESROOM_LANCE, DOWN
+	turnobject LANCESROOM_LANCE, DOWN
 	pause 10
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	appear LANCESROOM_MARY
 	applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRushesIn
 	opentext
@@ -88,27 +88,27 @@ LanceScript_0x180e7b:
 	follow LANCESROOM_MARY, LANCESROOM_OAK
 	applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryYieldsToOak
 	stopfollow
-	objectface LANCESROOM_OAK, UP
-	objectface LANCESROOM_LANCE, LEFT
+	turnobject LANCESROOM_OAK, UP
+	turnobject LANCESROOM_LANCE, LEFT
 	opentext
 	writetext UnknownText_0x18121b
 	waitbutton
 	closetext
 	applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryInterviewChampion
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	opentext
 	writetext UnknownText_0x18134b
 	waitbutton
 	closetext
 	applymovement LANCESROOM_LANCE, LancesRoomMovementData_LancePositionsSelfToGuidePlayerAway
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext UnknownText_0x18137b
 	waitbutton
 	closetext
 	follow LANCESROOM_LANCE, PLAYER
-	objectface LANCESROOM_MARY, UP
-	objectface LANCESROOM_OAK, UP
+	turnobject LANCESROOM_MARY, UP
+	turnobject LANCESROOM_OAK, UP
 	applymovement LANCESROOM_LANCE, LancesRoomMovementData_LanceLeadsPlayerToHallOfFame
 	stopfollow
 	playsound SFX_EXIT_BUILDING
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index 3976a4968..242aa0ed8 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -91,7 +91,7 @@ UnknownScript_0x6c38f:
 	reloadmappart
 	closetext
 	setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
-	objectface MAHOGANYMART1F_LANCE, LEFT
+	turnobject MAHOGANYMART1F_LANCE, LEFT
 	opentext
 	writetext UnknownText_0x6c5ba
 	waitbutton
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index 6677679e7..bf070a5f3 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -28,7 +28,7 @@ UnknownScript_0x190013:
 	follow PLAYER, MAHOGANYTOWN_POKEFAN_M
 	applymovement PLAYER, MovementData_0x1900a7
 	stopfollow
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	scall UnknownScript_0x19002f
 	applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x1900ad
 	end
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index 829dcf1d9..1385f8e5d 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -16,7 +16,7 @@ MountMoon_MapScripts:
 	end
 
 .RivalBattle:
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index 502c752d3..29784336e 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -34,7 +34,7 @@ ClefairyDance:
 	applymovement PLAYER, PlayerWalksUpToDancingClefairies
 	pause 15
 	appear MOUNTMOONSQUARE_ROCK
-	objectface MOUNTMOONSQUARE_FAIRY1, RIGHT
+	turnobject MOUNTMOONSQUARE_FAIRY1, RIGHT
 	cry CLEFAIRY
 	waitsfx
 	pause 30
@@ -54,10 +54,10 @@ ClefairyDance:
 	follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2
 	applymovement MOUNTMOONSQUARE_FAIRY1, ClefairyDanceStep7
 	stopfollow
-	objectface MOUNTMOONSQUARE_FAIRY1, DOWN
+	turnobject MOUNTMOONSQUARE_FAIRY1, DOWN
 	pause 10
 	showemote EMOTE_SHOCK, MOUNTMOONSQUARE_FAIRY1, 15
-	objectface MOUNTMOONSQUARE_FAIRY1, DOWN
+	turnobject MOUNTMOONSQUARE_FAIRY1, DOWN
 	cry CLEFAIRY
 	pause 15
 	follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index 53358e632..5f40fac1b 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -18,7 +18,7 @@ MrPokemonsHouse_MapScripts:
 
 .MrPokemonEvent:
 	showemote EMOTE_SHOCK, MRPOKEMONSHOUSE_GENTLEMAN, 15
-	objectface MRPOKEMONSHOUSE_GENTLEMAN, DOWN
+	turnobject MRPOKEMONSHOUSE_GENTLEMAN, DOWN
 	opentext
 	writetext MrPokemonIntroText1
 	waitbutton
@@ -37,11 +37,11 @@ MrPokemonsHouse_MapScripts:
 	blackoutmod CHERRYGROVE_CITY
 	writetext MrPokemonIntroText3
 	buttonsound
-	objectface MRPOKEMONSHOUSE_GENTLEMAN, RIGHT
+	turnobject MRPOKEMONSHOUSE_GENTLEMAN, RIGHT
 	writetext MrPokemonIntroText4
 	buttonsound
-	objectface MRPOKEMONSHOUSE_GENTLEMAN, DOWN
-	objectface MRPOKEMONSHOUSE_OAK, LEFT
+	turnobject MRPOKEMONSHOUSE_GENTLEMAN, DOWN
+	turnobject MRPOKEMONSHOUSE_OAK, LEFT
 	writetext MrPokemonIntroText5
 	waitbutton
 	closetext
@@ -84,7 +84,7 @@ MrPokemonsHouse_MrPokemonScript:
 MrPokemonsHouse_OakScript:
 	playmusic MUSIC_PROF_OAK
 	applymovement MRPOKEMONSHOUSE_OAK, MrPokemonsHouse_OakWalksToPlayer
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext MrPokemonsHouse_OakText1
 	buttonsound
@@ -96,14 +96,14 @@ MrPokemonsHouse_OakScript:
 	writetext MrPokemonsHouse_OakText2
 	waitbutton
 	closetext
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	applymovement MRPOKEMONSHOUSE_OAK, MrPokemonsHouse_OakExits
 	playsound SFX_EXIT_BUILDING
 	disappear MRPOKEMONSHOUSE_OAK
 	waitsfx
 	special RestartMapMusic
 	pause 15
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext MrPokemonsHouse_MrPokemonHealText
 	waitbutton
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index d28654bdd..0dfccb037 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -66,7 +66,7 @@ GameboyKidScript_0x5c037:
 	writetext UnknownText_0x5c42a
 	waitbutton
 	closetext
-	objectface NATIONALPARK_GAMEBOY_KID, DOWN
+	turnobject NATIONALPARK_GAMEBOY_KID, DOWN
 	end
 
 TrainerSchoolboyJack1:
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index d4ae92d48..7f2f044b8 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -24,12 +24,12 @@ NewBarkTown_MapScripts:
 
 NewBarkTown_TeacherStopsYouScene1:
 	playmusic MUSIC_MOM
-	objectface NEWBARKTOWN_TEACHER, LEFT
+	turnobject NEWBARKTOWN_TEACHER, LEFT
 	opentext
 	writetext Text_WaitPlayer
 	waitbutton
 	closetext
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	applymovement NEWBARKTOWN_TEACHER, Movement_TeacherRunsToYou1_NBT
 	opentext
 	writetext Text_WhatDoYouThinkYoureDoing
@@ -47,14 +47,14 @@ NewBarkTown_TeacherStopsYouScene1:
 
 NewBarkTown_TeacherStopsYouScene2:
 	playmusic MUSIC_MOM
-	objectface NEWBARKTOWN_TEACHER, LEFT
+	turnobject NEWBARKTOWN_TEACHER, LEFT
 	opentext
 	writetext Text_WaitPlayer
 	waitbutton
 	closetext
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	applymovement NEWBARKTOWN_TEACHER, Movement_TeacherRunsToYou2_NBT
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext Text_WhatDoYouThinkYoureDoing
 	waitbutton
@@ -109,7 +109,7 @@ NewBarkTownSilverScript:
 	writetext NewBarkTownRivalText1
 	waitbutton
 	closetext
-	objectface NEWBARKTOWN_SILVER, LEFT
+	turnobject NEWBARKTOWN_SILVER, LEFT
 	opentext
 	writetext NewBarkTownRivalText2
 	waitbutton
@@ -118,7 +118,7 @@ NewBarkTownSilverScript:
 	applymovement PLAYER, Movement_SilverPushesYouAway_NBT
 	stopfollow
 	pause 5
-	objectface NEWBARKTOWN_SILVER, DOWN
+	turnobject NEWBARKTOWN_SILVER, DOWN
 	pause 5
 	playsound SFX_TACKLE
 	applymovement PLAYER, Movement_SilverShovesYouOut_NBT
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index 053001a47..380f71bab 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -23,7 +23,7 @@ OlivineCity_MapScripts:
 	return
 
 UnknownScript_0x1a8833:
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
@@ -37,7 +37,7 @@ UnknownScript_0x1a8833:
 	waitbutton
 	closetext
 	applymovement PLAYER, MovementData_0x1a88f4
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88db
 	setscene SCENE_FINISHED
 	disappear OLIVINECITY_OLIVINE_RIVAL
@@ -47,7 +47,7 @@ UnknownScript_0x1a8833:
 	end
 
 UnknownScript_0x1a886b:
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
@@ -61,7 +61,7 @@ UnknownScript_0x1a886b:
 	waitbutton
 	closetext
 	applymovement PLAYER, MovementData_0x1a88f7
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88e8
 	disappear OLIVINECITY_OLIVINE_RIVAL
 	setscene SCENE_FINISHED
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index 8023a6a3c..ed244cc7c 100644
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -34,9 +34,9 @@ UnknownScript_0x60bab:
 	writetext UnknownText_0x60dea
 	waitbutton
 	closetext
-	objectface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
+	turnobject OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
 	pause 15
-	objectface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
+	turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT
 	opentext
 	playmusic MUSIC_HEAL
 	writetext UnknownText_0x60e44
@@ -52,13 +52,13 @@ UnknownScript_0x60bab:
 	writetext UnknownText_0x60f3d
 	waitbutton
 	closetext
-	objectface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
+	turnobject OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
 	pause 10
-	objectface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
+	turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT
 	pause 10
-	objectface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
+	turnobject OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
 	pause 10
-	objectface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
+	turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT
 	pause 10
 	faceplayer
 	opentext
@@ -88,9 +88,9 @@ UnknownScript_0x60c25:
 	writetext UnknownText_0x60edf
 	waitbutton
 	closetext
-	objectface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
+	turnobject OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
 	pause 15
-	objectface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
+	turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT
 	opentext
 	writetext UnknownText_0x60ef1
 	waitbutton
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index fec26c331..558812ebe 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -37,7 +37,7 @@ SailorScript_0x748c0:
 	writetext UnknownText_0x74a55
 	waitbutton
 	closetext
-	objectface OLIVINEPORT_SAILOR1, DOWN
+	turnobject OLIVINEPORT_SAILOR1, DOWN
 	pause 10
 	playsound SFX_EXIT_BUILDING
 	disappear OLIVINEPORT_SAILOR1
@@ -73,12 +73,12 @@ UnknownScript_0x74919:
 	end
 
 UnknownScript_0x7491f:
-	objectface OLIVINEPORT_SAILOR3, RIGHT
+	turnobject OLIVINEPORT_SAILOR3, RIGHT
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	iftrue UnknownScript_0x7498b
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	iftrue UnknownScript_0x7498b
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	opentext
 	checkevent EVENT_FAST_SHIP_FIRST_TIME
 	iffalse UnknownScript_0x7494e
@@ -201,7 +201,7 @@ FishingGuruScript_0x74a01:
 	writetext UnknownText_0x74bf4
 	waitbutton
 	closetext
-	objectface OLIVINEPORT_FISHING_GURU1, UP
+	turnobject OLIVINEPORT_FISHING_GURU1, UP
 	end
 
 FishingGuruScript_0x74a0c:
@@ -210,7 +210,7 @@ FishingGuruScript_0x74a0c:
 	writetext UnknownText_0x74c35
 	waitbutton
 	closetext
-	objectface OLIVINEPORT_FISHING_GURU2, UP
+	turnobject OLIVINEPORT_FISHING_GURU2, UP
 	end
 
 YoungsterScript_0x74a17:
@@ -219,7 +219,7 @@ YoungsterScript_0x74a17:
 	writetext UnknownText_0x74c76
 	waitbutton
 	closetext
-	objectface OLIVINEPORT_YOUNGSTER, DOWN
+	turnobject OLIVINEPORT_YOUNGSTER, DOWN
 	end
 
 CooltrainerFScript_0x74a22:
@@ -228,7 +228,7 @@ CooltrainerFScript_0x74a22:
 	writetext UnknownText_0x74ca2
 	waitbutton
 	closetext
-	objectface OLIVINEPORT_COOLTRAINER_F, DOWN
+	turnobject OLIVINEPORT_COOLTRAINER_F, DOWN
 	end
 
 OlivinePortHiddenProtein:
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index 1e9f368d4..397981e54 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -24,7 +24,7 @@ UnknownScript_0x7a4d8:
 UnknownScript_0x7a4db:
 	playmusic MUSIC_MOM
 	showemote EMOTE_SHOCK, PLAYERSHOUSE1F_MOM1, 15
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	iffalse UnknownScript_0x7a4f2
 	applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fc
@@ -96,7 +96,7 @@ UnknownScript_0x7a564:
 
 UnknownScript_0x7a56b:
 	special RestartMapMusic
-	objectface PLAYERSHOUSE1F_MOM1, LEFT
+	turnobject PLAYERSHOUSE1F_MOM1, LEFT
 	end
 
 UnknownScript_0x7a572:
@@ -179,7 +179,7 @@ NeighborScript:
 	writetext NeighborText
 	waitbutton
 	closetext
-	objectface PLAYERSHOUSE1F_POKEFAN_F, RIGHT
+	turnobject PLAYERSHOUSE1F_POKEFAN_F, RIGHT
 	end
 
 TVScript:
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 1e7f7222b..6e2583c5b 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -426,7 +426,7 @@ Pokecenter2F_CheckGender:
 	waitbutton
 	closetext
 	applymovement2 Pokecenter2FMovementData_ReceptionistLooksRight
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	opentext
 	writetext Text_ChangeTheLook
 	waitbutton
@@ -533,7 +533,7 @@ TimeCapsuleScript_CheckPlayerGender:
 	closetext
 	checkcode VAR_FACING
 	ifnotequal UP, .FemaleChangeApperance
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 .FemaleChangeApperance:
 	opentext
 	writetext Text_ChangeTheLook
diff --git a/maps/PokecomCenterAdminRoomMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm
index 96d319cc2..840d3a771 100644
--- a/maps/PokecomCenterAdminRoomMobile.asm
+++ b/maps/PokecomCenterAdminRoomMobile.asm
@@ -23,7 +23,7 @@ PokecomCenterAdminRoomMobileSignpost0Script:
 	waitbutton
 UnknownScript_0x625df:
 	reloadmappart
-	loadmenuheader MenuHeader_0x62602
+	loadmenu MenuHeader_0x62602
 	verticalmenu
 	closewindow
 	ifequal 1, UnknownScript_0x625f0
@@ -65,7 +65,7 @@ PokecomCenterAdminRoomMobileSignpost1Script:
 	waitbutton
 UnknownScript_0x62629:
 	reloadmappart
-	loadmenuheader MenuHeader_0x6264c
+	loadmenu MenuHeader_0x6264c
 	verticalmenu
 	closewindow
 	ifequal 1, UnknownScript_0x6263a
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index 89ec341b2..73b1b0aed 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -26,19 +26,19 @@ PowerPlantGuardPhoneScript:
 	waitsfx
 	pause 30
 	applymovement POWERPLANT_OFFICER1, MovementData_0x188ed5
-	objectface POWERPLANT_GYM_GUY1, DOWN
-	objectface POWERPLANT_GYM_GUY2, DOWN
+	turnobject POWERPLANT_GYM_GUY1, DOWN
+	turnobject POWERPLANT_GYM_GUY2, DOWN
 	opentext
 	writetext UnknownText_0x188f22
 	waitbutton
 	closetext
-	objectface POWERPLANT_OFFICER1, LEFT
-	objectface PLAYER, RIGHT
+	turnobject POWERPLANT_OFFICER1, LEFT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext UnknownText_0x188f7f
 	waitbutton
 	closetext
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	applymovement POWERPLANT_OFFICER1, MovementData_0x188eda
 	setscene SCENE_POWERPLANT_NOTHING
 	end
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
index 0c992176d..004fe2f77 100644
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -120,17 +120,17 @@ Buena:
 	writetext UnknownText_0x5de84
 	waitbutton
 	closetext
-	objectface RADIOTOWER2F_BUENA, RIGHT
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 	checkcode VAR_FACING
 	ifnotequal RIGHT, UnknownScript_0x5d7be
 	applymovement PLAYER, MovementData_0x5d921
 UnknownScript_0x5d7be:
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext UnknownText_0x5dedd
 	waitbutton
 	closetext
-	objectface RADIOTOWER2F_BUENA, DOWN
+	turnobject RADIOTOWER2F_BUENA, DOWN
 	refreshscreen
 	special BuenasPassword
 	closetext
@@ -146,7 +146,7 @@ UnknownScript_0x5d7be:
 	playsound SFX_TRANSACTION
 	setflag ENGINE_BUENAS_PASSWORD_2
 	pause 20
-	objectface RADIOTOWER2F_BUENA, RIGHT
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 	opentext
 	writetext UnknownText_0x5e054
 	waitbutton
@@ -172,14 +172,14 @@ UnknownScript_0x5d80a:
 	checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
 	iftrue UnknownScript_0x5d8cc
 UnknownScript_0x5d81a:
-	objectface RADIOTOWER2F_BUENA, RIGHT
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 	end
 
 UnknownScript_0x5d81e:
 	writetext UnknownText_0x5df29
 	waitbutton
 	closetext
-	objectface RADIOTOWER2F_BUENA, RIGHT
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 	special FadeOutMusic
 	pause 20
 	special RestartMapMusic
@@ -194,7 +194,7 @@ UnknownScript_0x5d82f:
 	checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
 	iftrue UnknownScript_0x5d8cc
 UnknownScript_0x5d83f:
-	objectface RADIOTOWER2F_BUENA, RIGHT
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 	pause 10
 	end
 
@@ -204,13 +204,13 @@ UnknownScript_0x5d845:
 	writetext UnknownText_0x5e01c
 	waitbutton
 	closetext
-	objectface RADIOTOWER2F_BUENA, RIGHT
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 	pause 20
 	opentext
 	writetext UnknownText_0x5e054
 	waitbutton
 	closetext
-	objectface RADIOTOWER2F_BUENA, RIGHT
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 	special FadeOutMusic
 	pause 20
 	special RestartMapMusic
@@ -231,7 +231,7 @@ UnknownScript_0x5d86b:
 	checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
 	iftrue UnknownScript_0x5d8cc
 UnknownScript_0x5d87b:
-	objectface RADIOTOWER2F_BUENA, RIGHT
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 	end
 
 UnknownScript_0x5d87f:
@@ -243,7 +243,7 @@ UnknownScript_0x5d87f:
 	checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
 	iftrue UnknownScript_0x5d8cc
 UnknownScript_0x5d88f:
-	objectface RADIOTOWER2F_BUENA, RIGHT
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 	end
 
 UnknownScript_0x5d893:
@@ -261,9 +261,9 @@ UnknownScript_0x5d8a4:
 	checkcellnum PHONE_BUENA
 	iftrue UnknownScript_0x5d8fe
 	pause 20
-	objectface RADIOTOWER2F_BUENA, DOWN
+	turnobject RADIOTOWER2F_BUENA, DOWN
 	pause 15
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	pause 15
 	checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
 	iftrue UnknownScript_0x5d8cc
@@ -288,7 +288,7 @@ UnknownScript_0x5d8d0:
 	writetext UnknownText_0x5e310
 	waitbutton
 	closetext
-	objectface RADIOTOWER2F_BUENA, RIGHT
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 	addcellnum PHONE_BUENA
 	end
 
@@ -296,14 +296,14 @@ UnknownScript_0x5d8ed:
 	writetext UnknownText_0x5e33c
 	waitbutton
 	closetext
-	objectface RADIOTOWER2F_BUENA, RIGHT
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 	end
 
 UnknownScript_0x5d8f6:
 	writetext UnknownText_0x5e35e
 	waitbutton
 	closetext
-	objectface RADIOTOWER2F_BUENA, RIGHT
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 UnknownScript_0x5d8fe:
 	end
 
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index ceeb94cde..13f0800d7 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -23,7 +23,7 @@ RadioTower5F_MapScripts:
 	end
 
 FakeDirectorScript:
-	objectface RADIOTOWER5F_DIRECTOR, UP
+	turnobject RADIOTOWER5F_DIRECTOR, UP
 	showemote EMOTE_SHOCK, RADIOTOWER5F_DIRECTOR, 15
 	opentext
 	writetext FakeDirectorTextBefore1
@@ -79,7 +79,7 @@ TrainerExecutivef1:
 RadioTower5FRocketBossScene:
 	applymovement PLAYER, MovementData_0x60125
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	objectface RADIOTOWER5F_ROCKET, RIGHT
+	turnobject RADIOTOWER5F_ROCKET, RIGHT
 	opentext
 	writetext RadioTower5FRocketBossBeforeText
 	waitbutton
@@ -116,7 +116,7 @@ RadioTower5FRocketBossScene:
 	moveobject RADIOTOWER5F_DIRECTOR, 12, 0
 	appear RADIOTOWER5F_DIRECTOR
 	applymovement RADIOTOWER5F_DIRECTOR, RadioTower5FDirectorWalksIn
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext RadioTower5FDirectorThankYouText
 	buttonsound
diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm
index 0eb121e05..1c5aacc12 100644
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -20,7 +20,7 @@ UnknownScript_0x733ed:
 
 UnknownScript_0x733f3:
 	showemote EMOTE_SHOCK, ROUTE16GATE_OFFICER, 15
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext UnknownText_0x73496
 	waitbutton
diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm
index dcf24da14..e682c4a79 100644
--- a/maps/Route17Route18Gate.asm
+++ b/maps/Route17Route18Gate.asm
@@ -20,7 +20,7 @@ UnknownScript_0x73611:
 
 UnknownScript_0x73617:
 	showemote EMOTE_SHOCK, ROUTE17ROUTE18GATE_OFFICER, 15
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext UnknownText_0x7364d
 	waitbutton
diff --git a/maps/Route25.asm b/maps/Route25.asm
index 62e247756..20179b4b4 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -28,21 +28,21 @@ Route25MistyDate1Script:
 	showemote EMOTE_HEART, ROUTE25_MISTY, 15
 	pause 30
 	showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10
-	objectface ROUTE25_MISTY, DOWN
+	turnobject ROUTE25_MISTY, DOWN
 	applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x19efe8
 	disappear ROUTE25_COOLTRAINER_M1
 	pause 15
 	playmusic MUSIC_BEAUTY_ENCOUNTER
-	objectface ROUTE25_MISTY, UP
+	turnobject ROUTE25_MISTY, UP
 	pause 10
 	applymovement ROUTE25_MISTY, MovementData_0x19efed
 	opentext
 	writetext Route25MistyDateText
 	waitbutton
 	closetext
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	applymovement ROUTE25_MISTY, MovementData_0x19effa
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement ROUTE25_MISTY, MovementData_0x19f000
 	disappear ROUTE25_MISTY
 	clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
@@ -54,21 +54,21 @@ Route25MistyDate2Script:
 	showemote EMOTE_HEART, ROUTE25_MISTY, 15
 	pause 30
 	showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10
-	objectface ROUTE25_MISTY, DOWN
+	turnobject ROUTE25_MISTY, DOWN
 	applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x19efea
 	disappear ROUTE25_COOLTRAINER_M1
 	pause 15
 	playmusic MUSIC_BEAUTY_ENCOUNTER
-	objectface ROUTE25_MISTY, UP
+	turnobject ROUTE25_MISTY, UP
 	pause 10
 	applymovement ROUTE25_MISTY, MovementData_0x19eff4
 	opentext
 	writetext Route25MistyDateText
 	waitbutton
 	closetext
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	applymovement ROUTE25_MISTY, MovementData_0x19effd
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement ROUTE25_MISTY, MovementData_0x19f000
 	disappear ROUTE25_MISTY
 	clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
diff --git a/maps/Route27.asm b/maps/Route27.asm
index f19acf508..dd11206a3 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -23,17 +23,17 @@ Route27_MapScripts:
 	end
 
 UnknownScript_0x1a0873:
-	objectface ROUTE27_FISHER, LEFT
+	turnobject ROUTE27_FISHER, LEFT
 	showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
 	applymovement ROUTE27_FISHER, MovementData_0x1a0a66
 	jump UnknownScript_0x1a088c
 
 UnknownScript_0x1a0881:
-	objectface ROUTE27_FISHER, LEFT
+	turnobject ROUTE27_FISHER, LEFT
 	showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
 	applymovement ROUTE27_FISHER, MovementData_0x1a0a69
 UnknownScript_0x1a088c:
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext Route27FisherHeyText
 	buttonsound
diff --git a/maps/Route29.asm b/maps/Route29.asm
index e8fc8878a..f5a2cff8b 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -37,10 +37,10 @@ Route29_MapScripts:
 	return
 
 Route29Tutorial1:
-	objectface ROUTE29_COOLTRAINER_M1, UP
+	turnobject ROUTE29_COOLTRAINER_M1, UP
 	showemote EMOTE_SHOCK, ROUTE29_COOLTRAINER_M1, 15
 	applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1a
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	setevent EVENT_DUDE_TALKED_TO_YOU
 	opentext
 	writetext CatchingTutorialIntroText
@@ -52,7 +52,7 @@ Route29Tutorial1:
 	stopfollow
 	loadwildmon RATTATA, 5
 	catchtutorial BATTLETYPE_TUTORIAL
-	objectface ROUTE29_COOLTRAINER_M1, UP
+	turnobject ROUTE29_COOLTRAINER_M1, UP
 	opentext
 	writetext CatchingTutorialDebriefText
 	waitbutton
@@ -62,10 +62,10 @@ Route29Tutorial1:
 	end
 
 Route29Tutorial2:
-	objectface ROUTE29_COOLTRAINER_M1, UP
+	turnobject ROUTE29_COOLTRAINER_M1, UP
 	showemote EMOTE_SHOCK, ROUTE29_COOLTRAINER_M1, 15
 	applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2a
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	setevent EVENT_DUDE_TALKED_TO_YOU
 	opentext
 	writetext CatchingTutorialIntroText
@@ -77,7 +77,7 @@ Route29Tutorial2:
 	stopfollow
 	loadwildmon RATTATA, 5
 	catchtutorial BATTLETYPE_TUTORIAL
-	objectface ROUTE29_COOLTRAINER_M1, UP
+	turnobject ROUTE29_COOLTRAINER_M1, UP
 	opentext
 	writetext CatchingTutorialDebriefText
 	waitbutton
diff --git a/maps/Route30.asm b/maps/Route30.asm
index 5f20a239d..a7d066601 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -29,7 +29,7 @@ YoungsterJoey_ImportantBattleScript:
 	faceplayer
 	writetext Text_ThisIsABigBattle
 	waitbutton
-	objectface ROUTE30_YOUNGSTER1, UP
+	turnobject ROUTE30_YOUNGSTER1, UP
 	closetext
 	playsound SFX_TACKLE
 	applymovement ROUTE30_MONSTER1, Route30_MikeysRattataAttacksMovement
diff --git a/maps/Route32.asm b/maps/Route32.asm
index cbfe311cd..0402dd7f7 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -85,8 +85,8 @@ Route32CooltrainerMContinueScene:
 	end
 
 Route32CooltrainerMStopsYouScene:
-	objectface ROUTE32_COOLTRAINER_M, LEFT
-	objectface PLAYER, RIGHT
+	turnobject ROUTE32_COOLTRAINER_M, LEFT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext Route32CooltrainerMText_WhatsTheHurry
 	waitbutton
@@ -94,7 +94,7 @@ Route32CooltrainerMStopsYouScene:
 	follow PLAYER, ROUTE32_COOLTRAINER_M
 	applymovement PLAYER, Movement_Route32CooltrainerMPushesYouBackToViolet
 	stopfollow
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	scall Route32CooltrainerMContinueScene
 	applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset1
 	applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset2
@@ -118,8 +118,8 @@ Route32RoarTMGuyScript:
 	end
 
 Route32WannaBuyASlowpokeTailScript:
-	objectface ROUTE32_FISHER4, DOWN
-	objectface PLAYER, UP
+	turnobject ROUTE32_FISHER4, DOWN
+	turnobject PLAYER, UP
 	jump _OfferToSellSlowpokeTail
 
 SlowpokeTailSalesmanScript:
diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
index 19291b412..95d45ecc7 100644
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -26,12 +26,12 @@ UnknownScript_0x62d3d:
 	checkevent EVENT_FOREST_IS_RESTLESS
 	iffalse UnknownScript_0x62d62
 	showemote EMOTE_SHOCK, ROUTE34ILEXFORESTGATE_TEACHER2, 20
-	objectface ROUTE34ILEXFORESTGATE_TEACHER2, LEFT
-	objectface PLAYER, RIGHT
+	turnobject ROUTE34ILEXFORESTGATE_TEACHER2, LEFT
+	turnobject PLAYER, RIGHT
 	follow PLAYER, ROUTE34ILEXFORESTGATE_TEACHER2
 	applymovement PLAYER, MovementData_0x62d97
 	stopfollow
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	opentext
 	writetext UnknownText_0x62e41
 	waitbutton
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index 4bde14d74..4e4229428 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -53,7 +53,7 @@ Route35NationalParkGate_MapScripts:
 
 .LeavingContestEarly:
 	applymovement PLAYER, MovementData_0x6a2e2
-	objectface ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT
+	turnobject ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT
 	opentext
 	checkcode VAR_CONTESTMINUTES
 	addvar 1
diff --git a/maps/Route36.asm b/maps/Route36.asm
index 0a46f1ca7..d5f9d3787 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -37,10 +37,10 @@ Route36SuicuneScript:
 	showemote EMOTE_SHOCK, PLAYER, 15
 	pause 15
 	playsound SFX_WARP_FROM
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	applymovement ROUTE36_SUICUNE, Route36SuicuneMovement
 	disappear ROUTE36_SUICUNE
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	pause 10
 	setscene SCENE_ROUTE36_NOTHING
 	clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index 7afa94b5e..198536229 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -62,7 +62,7 @@ Route36NationalParkGate_MapScripts:
 	return
 
 .LeavingContestEarly:
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	checkcode VAR_CONTESTMINUTES
 	addvar 1
@@ -87,7 +87,7 @@ Route36NationalParkGate_MapScripts:
 	writetext UnknownText_0x6b300
 	waitbutton
 	closetext
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	playsound SFX_EXIT_BUILDING
 	special FadeOutPalettes
 	waitsfx
@@ -170,7 +170,7 @@ Route36OfficerScriptContest:
 	closetext
 	setflag ENGINE_BUG_CONTEST_TIMER
 	special GiveParkBalls
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	playsound SFX_EXIT_BUILDING
 	special FadeOutPalettes
 	waitsfx
diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm
index f1bbdcad4..61b99e037 100644
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -16,14 +16,14 @@ TwinScript_0x9cc76:
 	writetext Text_MoomooIsSick
 	waitbutton
 	closetext
-	objectface ROUTE39BARN_TWIN1, RIGHT
+	turnobject ROUTE39BARN_TWIN1, RIGHT
 	end
 
 .FeedingMooMoo:
 	writetext Text_WereFeedingMoomoo
 	waitbutton
 	closetext
-	objectface ROUTE39BARN_TWIN1, RIGHT
+	turnobject ROUTE39BARN_TWIN1, RIGHT
 	end
 
 TwinScript_0x9cc90:
@@ -34,14 +34,14 @@ TwinScript_0x9cc90:
 	writetext Text_MoomooIsSick
 	waitbutton
 	closetext
-	objectface ROUTE39BARN_TWIN2, LEFT
+	turnobject ROUTE39BARN_TWIN2, LEFT
 	end
 
 .FeedingMooMoo:
 	writetext Text_WereFeedingMoomoo
 	waitbutton
 	closetext
-	objectface ROUTE39BARN_TWIN2, LEFT
+	turnobject ROUTE39BARN_TWIN2, LEFT
 	end
 
 MooMoo:
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index 9b24aaf25..69869991d 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -42,7 +42,7 @@ RocketScript_Southbound:
 	applymovement PLAYER, PlayerStepsIn
 	showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET2, 15
 	applymovement ROUTE43GATE_ROCKET2, Rocket2Script_BlocksYouSouth
-	objectface ROUTE43GATE_ROCKET1, UP
+	turnobject ROUTE43GATE_ROCKET1, UP
 	showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET1, 15
 	applymovement ROUTE43GATE_ROCKET1, Rocket1Script_BlocksYouSouth
 	opentext
@@ -74,7 +74,7 @@ RocketScript_ShakeDownSouth:
 RocketScript_Northbound:
 	showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET1, 15
 	applymovement ROUTE43GATE_ROCKET1, Rocket1Script_BlocksYouNorth
-	objectface ROUTE43GATE_ROCKET2, DOWN
+	turnobject ROUTE43GATE_ROCKET2, DOWN
 	showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET2, 15
 	applymovement ROUTE43GATE_ROCKET2, Rocket2Script_BlocksYouNorth
 	opentext
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index fed2ca1f5..c56f6d1d0 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -95,7 +95,7 @@ UnknownScript_0x587c0:
 	writetext UnknownText_0x588f5
 	waitbutton
 	closetext
-	objectface RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP
+	turnobject RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP
 	end
 
 UnknownScript_0x587c9:
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index 9c6c3da41..71ac65040 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -42,13 +42,13 @@ RuinsOfAlphOutside_MapScripts:
 	return
 
 RuinsOfAlphOutsideScientistScene1:
-	objectface RUINSOFALPHOUTSIDE_SCIENTIST, UP
-	objectface PLAYER, DOWN
+	turnobject RUINSOFALPHOUTSIDE_SCIENTIST, UP
+	turnobject PLAYER, DOWN
 	jump UnknownScript_0x58044
 
 RuinsOfAlphOutsideScientistScene2:
-	objectface RUINSOFALPHOUTSIDE_SCIENTIST, LEFT
-	objectface PLAYER, RIGHT
+	turnobject RUINSOFALPHOUTSIDE_SCIENTIST, LEFT
+	turnobject PLAYER, RIGHT
 	jump UnknownScript_0x58044
 
 ScientistScript_0x58043:
@@ -96,7 +96,7 @@ YoungsterScript_0x5807e:
 	writetext UnknownText_0x5848e
 	waitbutton
 	closetext
-	objectface RUINSOFALPHOUTSIDE_YOUNGSTER3, UP
+	turnobject RUINSOFALPHOUTSIDE_YOUNGSTER3, UP
 	end
 
 TrainerPsychicNathan:
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index 0b136853f..c05583cd4 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -38,7 +38,7 @@ RuinsOfAlphResearchCenter_MapScripts:
 	pause 30
 	playsound SFX_TRANSACTION
 	pause 30
-	objectface RUINSOFALPHRESEARCHCENTER_SCIENTIST3, DOWN
+	turnobject RUINSOFALPHRESEARCHCENTER_SCIENTIST3, DOWN
 	opentext
 	writetext UnknownText_0x59278
 	waitbutton
diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm
index d5ad15387..e1af3bfcf 100644
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -48,7 +48,7 @@ TrainerGruntM1:
 	moveobject SLOWPOKEWELLB1F_KURT, 11, 6
 	appear SLOWPOKEWELLB1F_KURT
 	applymovement SLOWPOKEWELLB1F_KURT, KurtSlowpokeWellVictoryMovementData
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext KurtLeaveSlowpokeWellText
 	waitbutton
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index 78c58eca0..8121d2d4a 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -21,7 +21,7 @@ SproutTower3F_MapScripts:
 	end
 
 UnknownScript_0x184947:
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	playsound SFX_TACKLE
@@ -38,7 +38,7 @@ UnknownScript_0x184947:
 	waitbutton
 	closetext
 	showemote EMOTE_SHOCK, SPROUTTOWER3F_SILVER, 15
-	objectface SPROUTTOWER3F_SILVER, DOWN
+	turnobject SPROUTTOWER3F_SILVER, DOWN
 	pause 15
 	applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a24
 	playmusic MUSIC_RIVAL_ENCOUNTER
@@ -46,7 +46,7 @@ UnknownScript_0x184947:
 	writetext UnknownText_0x184aec
 	waitbutton
 	closetext
-	objectface SPROUTTOWER3F_SILVER, UP
+	turnobject SPROUTTOWER3F_SILVER, UP
 	opentext
 	writetext UnknownText_0x184bc8
 	pause 15
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index 4aad71817..3985c5c3e 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -30,7 +30,7 @@ SecurityCamera1a:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 2
 	appear TEAMROCKETBASEB1F_ROCKET1
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
@@ -55,7 +55,7 @@ SecurityCamera1b:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 3
 	appear TEAMROCKETBASEB1F_ROCKET1
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
@@ -80,14 +80,14 @@ SecurityCamera2a:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 4, 7
 	appear TEAMROCKETBASEB1F_ROCKET1
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement2
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 12, 5
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement3
@@ -106,14 +106,14 @@ SecurityCamera2b:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 4, 8
 	appear TEAMROCKETBASEB1F_ROCKET1
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement4
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 12, 5
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement5
@@ -132,14 +132,14 @@ SecurityCamera3a:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 6
 	appear TEAMROCKETBASEB1F_ROCKET1
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 11
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement6
@@ -158,14 +158,14 @@ SecurityCamera3b:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 7
 	appear TEAMROCKETBASEB1F_ROCKET1
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 12
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement7
@@ -184,14 +184,14 @@ SecurityCamera4:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 17, 16
 	appear TEAMROCKETBASEB1F_ROCKET1
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 11
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement8
@@ -210,14 +210,14 @@ SecurityCamera5:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 3, 16
 	appear TEAMROCKETBASEB1F_ROCKET1
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 14, 16
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement9
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 511a79bd8..c5caaed7a 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -61,20 +61,20 @@ UnknownScript_0x6cfac:
 	writetext UnknownText_0x6d2ad
 	waitbutton
 	closetext
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
 	applymovement PLAYER, MovementData_0x6d21f
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d224
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d22f
 	opentext
 	writetext UnknownText_0x6d2c3
 	waitbutton
 	closetext
 	cry DRAGONITE
-	objectface TEAMROCKETBASEB2F_ROCKET_GIRL, LEFT
-	objectface PLAYER, LEFT
+	turnobject TEAMROCKETBASEB2F_ROCKET_GIRL, LEFT
+	turnobject PLAYER, LEFT
 	appear TEAMROCKETBASEB2F_DRAGON
 	applymovement TEAMROCKETBASEB2F_DRAGON, MovementData_0x6d236
 	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d23b
@@ -85,7 +85,7 @@ UnknownScript_0x6cfac:
 	writetext UnknownText_0x6d38c
 	waitbutton
 	closetext
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d241
 	opentext
 	writetext UnknownText_0x6d3bd
@@ -118,13 +118,13 @@ UnknownScript_0x6cfac:
 	special FadeInQuickly
 	setscene SCENE_TEAMROCKETBASEB2F_ELECTRODES
 	clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE
-	objectface TEAMROCKETBASEB2F_LANCE, DOWN
+	turnobject TEAMROCKETBASEB2F_LANCE, DOWN
 	opentext
 	writetext UnknownText_0x6d5d8
 	waitbutton
 	closetext
 	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d250
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext UnknownText_0x6d64e
 	waitbutton
@@ -153,12 +153,12 @@ UnknownScript_0x6d07a:
 	end
 
 LanceHealsScript1:
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	jump LanceHealsCommon
 
 LanceHealsScript2:
-	objectface PLAYER, RIGHT
-	objectface TEAMROCKETBASEB2F_LANCE, LEFT
+	turnobject PLAYER, RIGHT
+	turnobject TEAMROCKETBASEB2F_LANCE, LEFT
 LanceHealsCommon:
 	opentext
 	writetext LanceHealsText1
@@ -281,7 +281,7 @@ UnknownScript_0x6d184:
 	moveobject TEAMROCKETBASEB2F_LANCE, 18, 6
 	appear TEAMROCKETBASEB2F_LANCE
 	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext UnknownText_0x6d809
 	buttonsound
@@ -290,12 +290,12 @@ UnknownScript_0x6d184:
 	writetext UnknownText_0x6d8f8
 	waitbutton
 	closetext
-	objectface TEAMROCKETBASEB2F_LANCE, DOWN
+	turnobject TEAMROCKETBASEB2F_LANCE, DOWN
 	opentext
 	writetext UnknownText_0x6d994
 	waitbutton
 	closetext
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d283
 	disappear TEAMROCKETBASEB2F_LANCE
 	setevent EVENT_CLEARED_ROCKET_HIDEOUT
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index db2b7dcf8..53fc9e44e 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -47,9 +47,9 @@ TeamRocketBaseB3F_MapScripts:
 	return
 
 LanceGetPasswordScript:
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	pause 5
-	objectface TEAMROCKETBASEB3F_MOLTRES, RIGHT
+	turnobject TEAMROCKETBASEB3F_MOLTRES, RIGHT
 	pause 20
 	applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12a
 	opentext
@@ -62,12 +62,12 @@ LanceGetPasswordScript:
 	end
 
 RocketBaseRival:
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	appear TEAMROCKETBASEB3F_SILVER
 	applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalEnterMovement
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
 	writetext RocketBaseRivalText
@@ -94,7 +94,7 @@ UnknownScript_0x6e056:
 	pause 30
 	showemote EMOTE_SHOCK, TEAMROCKETBASEB3F_ROCKET1, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	objectface TEAMROCKETBASEB3F_ROCKET1, DOWN
+	turnobject TEAMROCKETBASEB3F_ROCKET1, DOWN
 	opentext
 	writetext UnknownText_0x6e400
 	waitbutton
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index 77fa5b83e..821658d0d 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -88,7 +88,7 @@ TinTower1F_MapScripts:
 	special MonCheck
 	iftrue .Next1 ; if player caught Raikou, he doesn't appear in Tin Tower
 	applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement1
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	cry RAIKOU
 	pause 10
 	playsound SFX_WARP_FROM
@@ -101,7 +101,7 @@ TinTower1F_MapScripts:
 	special MonCheck
 	iftrue .Next2 ; if player caught Entei, he doesn't appear in Tin Tower
 	applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement1
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	cry ENTEI
 	pause 10
 	playsound SFX_WARP_FROM
@@ -110,7 +110,7 @@ TinTower1F_MapScripts:
 	playsound SFX_EXIT_BUILDING
 	waitsfx
 .Next2:
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	pause 10
 	applymovement PLAYER, TinTowerPlayerMovement2
 	applymovement TINTOWER1F_SUICUNE, TinTowerSuicuneMovement
@@ -132,7 +132,7 @@ TinTower1F_MapScripts:
 	clearevent EVENT_SET_WHEN_FOUGHT_HO_OH
 	reloadmapafterbattle
 	pause 20
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	playmusic MUSIC_MYSTICALMAN_ENCOUNTER
 	playsound SFX_ENTER_DOOR
 	moveobject TINTOWER1F_EUSINE, 10, 15
@@ -153,7 +153,7 @@ TinTower1F_MapScripts:
 	moveobject TINTOWER1F_SAGE1, 7, 13
 	moveobject TINTOWER1F_SAGE2, 9, 13
 	moveobject TINTOWER1F_SAGE3, 11, 13
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext TinTowerEusineSuicuneText
 	waitbutton
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index 6ed62935d..b37be60a7 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -12,7 +12,7 @@ TrainerHouseB1F_MapScripts:
 	end
 
 TrainerHouseReceptionistScript:
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	checkflag ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY
 	iftrue .FoughtTooManyTimes
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index 2a7d6a5f9..8d8ed3ea8 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -43,7 +43,7 @@ SailorScript_0x74dc4:
 	writetext UnknownText_0x74f06
 	waitbutton
 	closetext
-	objectface VERMILIONPORT_SAILOR1, DOWN
+	turnobject VERMILIONPORT_SAILOR1, DOWN
 	pause 10
 	playsound SFX_EXIT_BUILDING
 	disappear VERMILIONPORT_SAILOR1
@@ -77,12 +77,12 @@ UnknownScript_0x74e1a:
 	end
 
 UnknownScript_0x74e20:
-	objectface VERMILIONPORT_SAILOR2, RIGHT
+	turnobject VERMILIONPORT_SAILOR2, RIGHT
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	iftrue UnknownScript_0x74e86
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	iftrue UnknownScript_0x74e86
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	opentext
 	checkcode VAR_WEEKDAY
 	ifequal MONDAY, UnknownScript_0x74e72
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index 46fb6d892..cf2219908 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -21,7 +21,7 @@ VictoryRoad_MapScripts:
 
 UnknownScript_0x74492:
 	moveobject VICTORYROAD_SILVER, 18, 11
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
@@ -35,7 +35,7 @@ UnknownScript_0x74492:
 	end
 
 UnknownScript_0x744b5:
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
@@ -49,7 +49,7 @@ UnknownScript_0x744b5:
 	end
 
 UnknownScript_0x744d4:
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
 	writetext UnknownText_0x7455f
diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm
index 124905729..451bf9371 100644
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -17,7 +17,7 @@ VictoryRoadGate_MapScripts:
 	end
 
 VictoryRoadGateBadgeCheckScene:
-	objectface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	jump VictoryRoadGateBadgeCheckScript
 
 VictoryRoadGateOfficerScript:
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
index d4ece46fb..024dbde82 100644
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -40,7 +40,7 @@ VioletCityEarlScript:
 	playmusic MUSIC_SHOW_ME_AROUND
 	follow VIOLETCITY_EARL, PLAYER
 	applymovement VIOLETCITY_EARL, VioletCityFollowEarl_MovementData
-	objectface PLAYER, UP
+	turnobject PLAYER, UP
 	applymovement VIOLETCITY_EARL, VioletCitySpinningEarl_MovementData
 	stopfollow
 	special RestartMapMusic
diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm
index 5795f1591..ca11063d6 100644
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -36,7 +36,7 @@ VioletPokecenter1F_ElmsAideScript:
 	closetext
 	checkcode VAR_FACING
 	ifequal UP, .AideWalksAroundPlayer
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksStraightOutOfPokecenter
 	playsound SFX_EXIT_BUILDING
 	disappear VIOLETPOKECENTER1F_SCIENTIST
@@ -45,7 +45,7 @@ VioletPokecenter1F_ElmsAideScript:
 
 .AideWalksAroundPlayer:
 	applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksLeftToExitPokecenter
-	objectface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideFinishesLeavingPokecenter
 	playsound SFX_EXIT_BUILDING
 	disappear VIOLETPOKECENTER1F_SCIENTIST
diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm
index 46dc964f2..2eca18e19 100644
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -51,19 +51,19 @@ WiseTriosRoomSage3Script:
 	jumptextfaceplayer WiseTriosRoomSage3Text
 
 UnknownScript_0x985a3:
-	objectface WISETRIOSROOM_SAGE3, UP
-	objectface PLAYER, DOWN
+	turnobject WISETRIOSROOM_SAGE3, UP
+	turnobject PLAYER, DOWN
 	showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE3, 20
 	follow PLAYER, WISETRIOSROOM_SAGE3
 	applymovement PLAYER, MovementData_0x98622
 	stopfollow
-	objectface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext UnknownText_0x98712
 	waitbutton
 	closetext
 	applymovement WISETRIOSROOM_SAGE3, MovementData_0x98625
-	objectface WISETRIOSROOM_SAGE3, LEFT
+	turnobject WISETRIOSROOM_SAGE3, LEFT
 	end
 
 TrainerSageGaku:
@@ -101,7 +101,7 @@ TrainerSageKoji:
 	waitbutton
 	closetext
 	applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628
-	objectface WISETRIOSROOM_SAGE6, UP
+	turnobject WISETRIOSROOM_SAGE6, UP
 	setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
 	setscene SCENE_FINISHED
 	end

From 10173f2a6293542f8976cc5dccc9d2080a52caa7 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sun, 25 Feb 2018 20:12:58 -0500
Subject: [PATCH 129/135] Default macro parameters use recursion; avoids
 repeating internal structure

---
 macros/scripts/events.asm     | 38 +++++++++++++++++------------------
 macros/scripts/maps.asm       |  6 +++---
 maps/Route35GoldenrodGate.asm |  2 +-
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm
index 869dd7edf..3723a3a8d 100644
--- a/macros/scripts/events.asm
+++ b/macros/scripts/events.asm
@@ -194,23 +194,23 @@ ENDM
 
 	enum giveitem_command ; $1f
 giveitem: MACRO
+if _NARG == 1
+	giveitem \1, 1
+else
 	db giveitem_command
 	db \1 ; item
-if _NARG == 2
 	db \2 ; quantity
-else
-	db 1
 endc
 ENDM
 
 	enum takeitem_command ; $20
 takeitem: MACRO
+if _NARG == 1
+	takeitem \1, 1
+else
 	db takeitem_command
 	db \1 ; item
-if _NARG == 2
 	db \2 ; quantity
-else
-	db 1
 endc
 ENDM
 
@@ -291,22 +291,20 @@ ENDM
 
 	enum givepoke_command ; $2d
 givepoke: MACRO
+if _NARG == 2
+	givepoke \1, \2, NO_ITEM, FALSE
+elif _NARG == 3
+	givepoke \1, \2, \3, FALSE
+else
 	db givepoke_command
 	db \1 ; pokemon
 	db \2 ; level
-if _NARG >= 3
 	db \3 ; item
-if _NARG >= 4
 	db \4 ; trainer
 if \4
 	dw \5 ; trainer_name_pointer
 	dw \6 ; pkmn_nickname
 endc
-else
-	db 0
-endc
-else
-	db 0, 0
 endc
 ENDM
 
@@ -473,11 +471,11 @@ ENDM
 
 	enum refreshscreen_command ; $48
 refreshscreen: MACRO
-	db refreshscreen_command
-if _NARG == 1
-	db \1 ; dummy
+if _NARG == 0
+	refreshscreen 0
 else
-	db 0
+	db refreshscreen_command
+	db \1 ; dummy
 endc
 ENDM
 
@@ -982,12 +980,12 @@ ENDM
 
 	enum verbosegiveitem_command ; $9e
 verbosegiveitem: MACRO
+if _NARG == 1
+	verbosegiveitem \1, 1
+else
 	db verbosegiveitem_command
 	db \1 ; item
-if _NARG == 2
 	db \2 ; quantity
-else
-	db 1
 endc
 ENDM
 
diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm
index 3be893a6f..d5f5b00e1 100644
--- a/macros/scripts/maps.asm
+++ b/macros/scripts/maps.asm
@@ -92,10 +92,10 @@ ENDM
 itemball: MACRO
 ;\1: item: from constants/item_constants.asm
 ;\2: quantity: default 1
-if _NARG == 2
-	db \1, \2
+if _NARG == 1
+	itemball \1, 1
 else
-	db \1, 1
+	db \1, \2
 endc
 ENDM
 
diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm
index 3bd8ec0ae..3b469c14d 100644
--- a/maps/Route35GoldenrodGate.asm
+++ b/maps/Route35GoldenrodGate.asm
@@ -28,7 +28,7 @@ OfficerScript_0x69d37:
 	writetext UnknownText_0x69eb8
 	playsound SFX_KEY_ITEM
 	waitsfx
-	givepoke SPEAROW, 10, NO_ITEM, 1, GiftSpearowName, GiftSpearowOTName
+	givepoke SPEAROW, 10, NO_ITEM, TRUE, GiftSpearowName, GiftSpearowOTName
 	givepokeitem GiftSpearowMail
 	setevent EVENT_GOT_KENYA
 .alreadyhavekenya

From 409fd9d33f88b2ad1e1d1f01360c62416a805e1f Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sun, 25 Feb 2018 22:11:32 -0500
Subject: [PATCH 130/135] Comment Stadium 2 alternative egg group names

---
 constants/pokemon_data_constants.asm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index ac5a1aeba..cbbac7f43 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -47,20 +47,20 @@ GENDERLESS   EQU -1
 ; wBaseEggGroups values
 	const_def 1
 	const EGG_MONSTER      ; 1
-	const EGG_AMPHIBIAN    ; 2
+	const EGG_AMPHIBIAN    ; 2 (aka Water 1 in Stadium 2)
 	const EGG_BUG          ; 3
 	const EGG_FLYING       ; 4
-	const EGG_FIELD        ; 5
+	const EGG_FIELD        ; 5 (aka Ground in Stadium 2)
 	const EGG_FAIRY        ; 6
-	const EGG_GRASS        ; 7
-	const EGG_HUMANSHAPE   ; 8
-	const EGG_INVERTEBRATE ; 9
+	const EGG_GRASS        ; 7 (aka Plant in Stadium 2)
+	const EGG_HUMANSHAPE   ; 8 (aka Humanshape in Stadium 2)
+	const EGG_INVERTEBRATE ; 9 (aka Water 3 in Stadium 2)
 	const EGG_MINERAL      ; a
-	const EGG_AMORPHOUS    ; b
-	const EGG_FISH         ; c
+	const EGG_AMORPHOUS    ; b (aka Indeterminate in Stadium 2)
+	const EGG_FISH         ; c (aka Water 2 in Stadium 2)
 	const EGG_DITTO        ; d
 	const EGG_DRAGON       ; e
-	const EGG_NONE         ; f
+	const EGG_NONE         ; f (aka Undiscovered, or No Eggs in Stadium 2)
 
 
 ; pokedex entries (see data/pokemon/dex_entries.asm)

From 2f9a0d7d9f3e2ee0f1db0ef25cd47803bc0efdf6 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sun, 25 Feb 2018 22:19:17 -0500
Subject: [PATCH 131/135] Pokecom Center Admin Room -> Office

---
 constants/map_constants.asm                   |  2 +-
 data/maps/attributes.asm                      |  2 +-
 data/maps/blocks.asm                          |  4 +-
 data/maps/maps.asm                            |  2 +-
 data/maps/scripts.asm                         |  2 +-
 maps/GoldenrodPokecenter1F.asm                |  2 +-
 ...asm => PokecomCenterAdminOfficeMobile.asm} | 46 +++++++++----------
 ...blk => PokecomCenterAdminOfficeMobile.blk} |  0
 8 files changed, 30 insertions(+), 30 deletions(-)
 rename maps/{PokecomCenterAdminRoomMobile.asm => PokecomCenterAdminOfficeMobile.asm} (79%)
 rename maps/{PokecomCenterAdminRoomMobile.blk => PokecomCenterAdminOfficeMobile.blk} (100%)

diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 21476ae0e..0f604b42a 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -260,7 +260,7 @@ ENDM
 	map_const GOLDENROD_DEPT_STORE_ROOF,                    8,  4 ; 18
 	map_const GOLDENROD_GAME_CORNER,                       10,  7 ; 19
 	map_const GOLDENROD_POKECENTER_1F,                      5,  4 ; 20
-	map_const POKECOM_CENTER_ADMIN_ROOM_MOBILE,            16, 16 ; 21
+	map_const POKECOM_CENTER_ADMIN_OFFICE_MOBILE,          16, 16 ; 21
 	map_const ILEX_FOREST_AZALEA_GATE,                      5,  4 ; 22
 	map_const ROUTE_34_ILEX_FOREST_GATE,                    5,  4 ; 23
 	map_const DAY_CARE,                                     5,  4 ; 24
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
index 23afc8103..fff261319 100644
--- a/data/maps/attributes.asm
+++ b/data/maps/attributes.asm
@@ -517,7 +517,7 @@ ENDM
 	map_attributes GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0
 	map_attributes GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $00, 0
 	map_attributes GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $00, 0
-	map_attributes PokecomCenterAdminRoomMobile, POKECOM_CENTER_ADMIN_ROOM_MOBILE, $00, 0
+	map_attributes PokecomCenterAdminOfficeMobile, POKECOM_CENTER_ADMIN_OFFICE_MOBILE, $00, 0
 	map_attributes IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $00, 0
 	map_attributes Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $00, 0
 	map_attributes DayCare, DAY_CARE, $00, 0
diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm
index 6ee73f3e9..c4f180b8f 100644
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
@@ -1022,8 +1022,8 @@ BattleTower1F_Blocks:
 BattleTowerBattleRoom_Blocks:
 	INCBIN "maps/BattleTowerBattleRoom.blk"
 
-PokecomCenterAdminRoomMobile_Blocks:
-	INCBIN "maps/PokecomCenterAdminRoomMobile.blk"
+PokecomCenterAdminOfficeMobile_Blocks:
+	INCBIN "maps/PokecomCenterAdminOfficeMobile.blk"
 
 MobileTradeRoom_Blocks:
 	INCBIN "maps/MobileTradeRoom.blk"
diff --git a/data/maps/maps.asm b/data/maps/maps.asm
index 471884825..e86cef4c4 100644
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@@ -271,7 +271,7 @@ MapGroup_Goldenrod:
 	map GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map PokecomCenterAdminRoomMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PokecomCenterAdminOfficeMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map DayCare, TILESET_HOUSE, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm
index 4d314cd1e..ff9974833 100644
--- a/data/maps/scripts.asm
+++ b/data/maps/scripts.asm
@@ -63,7 +63,7 @@ INCLUDE "maps/RadioTower5F.asm"
 INCLUDE "maps/OlivineLighthouse5F.asm"
 INCLUDE "maps/OlivineLighthouse6F.asm"
 INCLUDE "maps/GoldenrodPokecenter1F.asm"
-INCLUDE "maps/PokecomCenterAdminRoomMobile.asm"
+INCLUDE "maps/PokecomCenterAdminOfficeMobile.asm"
 INCLUDE "maps/IlexForestAzaleaGate.asm"
 INCLUDE "maps/Route34IlexForestGate.asm"
 INCLUDE "maps/DayCare.asm"
diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm
index 9e5173fb7..2009b79be 100644
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -808,7 +808,7 @@ GoldenrodPokecenter1F_MapEvents:
 	db 4 ; warp events
 	warp_event  3,  7, GOLDENROD_CITY, 15
 	warp_event  4,  7, GOLDENROD_CITY, 15
-	warp_event  0,  6, POKECOM_CENTER_ADMIN_ROOM_MOBILE, 1
+	warp_event  0,  6, POKECOM_CENTER_ADMIN_OFFICE_MOBILE, 1
 	warp_event  0,  7, POKECENTER_2F, 1
 
 	db 2 ; coord events
diff --git a/maps/PokecomCenterAdminRoomMobile.asm b/maps/PokecomCenterAdminOfficeMobile.asm
similarity index 79%
rename from maps/PokecomCenterAdminRoomMobile.asm
rename to maps/PokecomCenterAdminOfficeMobile.asm
index 840d3a771..901f278b6 100644
--- a/maps/PokecomCenterAdminRoomMobile.asm
+++ b/maps/PokecomCenterAdminOfficeMobile.asm
@@ -1,23 +1,23 @@
 	const_def 2 ; object constants
-	const POKECOMCENTERADMINROOMMOBILE_SCIENTIST1
-	const POKECOMCENTERADMINROOMMOBILE_SCIENTIST2
-	const POKECOMCENTERADMINROOMMOBILE_SCIENTIST3
+	const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST1
+	const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST2
+	const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST3
 
-PokecomCenterAdminRoomMobile_MapScripts:
+PokecomCenterAdminOfficeMobile_MapScripts:
 	db 0 ; scene scripts
 
 	db 0 ; callbacks
 
-PokecomCenterAdminRoomMobileScientist1Script:
-	jumptextfaceplayer PokecomCenterAdminRoomMobileScientist1Text
+PokecomCenterAdminOfficeMobileScientist1Script:
+	jumptextfaceplayer PokecomCenterAdminOfficeMobileScientist1Text
 
-PokecomCenterAdminRoomMobileScientist2Script:
-	jumptextfaceplayer PokecomCenterAdminRoomMobileScientist2Text
+PokecomCenterAdminOfficeMobileScientist2Script:
+	jumptextfaceplayer PokecomCenterAdminOfficeMobileScientist2Text
 
-PokecomCenterAdminRoomMobileScientist3Script:
-	jumptextfaceplayer PokecomCenterAdminRoomMobileScientist3Text
+PokecomCenterAdminOfficeMobileScientist3Script:
+	jumptextfaceplayer PokecomCenterAdminOfficeMobileScientist3Text
 
-PokecomCenterAdminRoomMobileSignpost0Script:
+PokecomCenterAdminOfficeMobileSignpost0Script:
 	opentext
 	writetext UnknownText_0x627ee
 	waitbutton
@@ -59,7 +59,7 @@ MenuHeader_0x62602:
 	db "モバイルセンター@" ; MOBILE CENTER
 	db "やめる@" ; QUIT
 
-PokecomCenterAdminRoomMobileSignpost1Script:
+PokecomCenterAdminOfficeMobileSignpost1Script:
 	opentext
 	writetext UnknownText_0x62989
 	waitbutton
@@ -101,10 +101,10 @@ MenuHeader_0x6264c:
 	db "でんわつながらないとき@" ; Don't use phone
 	db "やめる@" ; QUIT
 
-PokecomCenterAdminRoomMobileSignpost2Script:
+PokecomCenterAdminOfficeMobileSignpost2Script:
 	jumptext UnknownText_0x62b26
 
-PokecomCenterAdminRoomMobileScientist1Text:
+PokecomCenterAdminOfficeMobileScientist1Text:
 	text "#COM CENTER and"
 	line "MOBILE CENTER were"
 
@@ -118,7 +118,7 @@ PokecomCenterAdminRoomMobileScientist1Text:
 	line "strangers."
 	done
 
-PokecomCenterAdminRoomMobileScientist2Text:
+PokecomCenterAdminOfficeMobileScientist2Text:
 	text "When you linked"
 	line "with someone by"
 
@@ -135,7 +135,7 @@ PokecomCenterAdminRoomMobileScientist2Text:
 	line "got the shakes!"
 	done
 
-PokecomCenterAdminRoomMobileScientist3Text:
+PokecomCenterAdminOfficeMobileScientist3Text:
 	text "They were able to"
 	line "build this huge"
 
@@ -260,7 +260,7 @@ UnknownText_0x62b26:
 	para "<……> <……> <……>"
 	done
 
-PokecomCenterAdminRoomMobile_MapEvents:
+PokecomCenterAdminOfficeMobile_MapEvents:
 	db 0, 0 ; filler
 
 	db 2 ; warp events
@@ -270,11 +270,11 @@ PokecomCenterAdminRoomMobile_MapEvents:
 	db 0 ; coord events
 
 	db 3 ; bg events
-	bg_event  6, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost0Script
-	bg_event  6, 28, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost1Script
-	bg_event  3, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost2Script
+	bg_event  6, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileSignpost0Script
+	bg_event  6, 28, BGEVENT_UP, PokecomCenterAdminOfficeMobileSignpost1Script
+	bg_event  3, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileSignpost2Script
 
 	db 3 ; object events
-	object_event  4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist1Script, -1
-	object_event  7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist2Script, -1
-	object_event  7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist3Script, -1
+	object_event  4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist1Script, -1
+	object_event  7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist2Script, -1
+	object_event  7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist3Script, -1
diff --git a/maps/PokecomCenterAdminRoomMobile.blk b/maps/PokecomCenterAdminOfficeMobile.blk
similarity index 100%
rename from maps/PokecomCenterAdminRoomMobile.blk
rename to maps/PokecomCenterAdminOfficeMobile.blk

From b254a4571d4db54e4fdf15302788acc47d0de08c Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sun, 25 Feb 2018 22:23:20 -0500
Subject: [PATCH 132/135] ENGINE_BUG_CONTEST_ON ->
 ENGINE_MAIN_MENU_MOBILE_CHOICES (resolves #490) Went with CHOICES instead of
 HIDDEN since setting the flag would presumably have shown the items, not
 hidden them

---
 constants/engine_flags.asm   |  2 +-
 constants/wram_constants.asm | 16 ++++++++--------
 data/engine_flags.asm        |  2 +-
 engine/main_menu.asm         |  4 ++--
 maps/ElmsLab.asm             |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm
index 7941f3b10..9b2eaaeaf 100644
--- a/constants/engine_flags.asm
+++ b/constants/engine_flags.asm
@@ -22,7 +22,7 @@
 	const ENGINE_CAUGHT_POKERUS
 	const ENGINE_ROCKET_SIGNAL_ON_CH20
 	const ENGINE_CREDITS_SKIP
-	const ENGINE_BUG_CONTEST_ON ; 10
+	const ENGINE_MAIN_MENU_MOBILE_CHOICES ; 10
 ; wStatusFlags2
 	const ENGINE_BUG_CONTEST_TIMER
 	const ENGINE_SAFARI_ZONE
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index 8162f5bc1..9f9132a66 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -150,14 +150,14 @@ NUM_OBJECTS   EQU $10
 
 ; wStatusFlags:: ; d84c
 	const_def
-	const STATUSFLAGS_POKEDEX_F            ; 0
-	const STATUSFLAGS_UNOWN_DEX_F          ; 1
-	const STATUSFLAGS_FLASH_F              ; 2
-	const STATUSFLAGS_CAUGHT_POKERUS_F     ; 3
-	const STATUSFLAGS_ROCKET_SIGNAL_F      ; 4
-	const STATUSFLAGS_NO_WILD_ENCOUNTERS_F ; 5
-	const STATUSFLAGS_HALL_OF_FAME_F       ; 6
-	const STATUSFLAGS_BUG_CONTEST_ON_F     ; 7
+	const STATUSFLAGS_POKEDEX_F                  ; 0
+	const STATUSFLAGS_UNOWN_DEX_F                ; 1
+	const STATUSFLAGS_FLASH_F                    ; 2
+	const STATUSFLAGS_CAUGHT_POKERUS_F           ; 3
+	const STATUSFLAGS_ROCKET_SIGNAL_F            ; 4
+	const STATUSFLAGS_NO_WILD_ENCOUNTERS_F       ; 5
+	const STATUSFLAGS_HALL_OF_FAME_F             ; 6
+	const STATUSFLAGS_MAIN_MENU_MOBILE_CHOICES_F ; 7
 
 ; wStatusFlags2:: ; d84d
 	const_def
diff --git a/data/engine_flags.asm b/data/engine_flags.asm
index 80834bdac..7a74276cd 100644
--- a/data/engine_flags.asm
+++ b/data/engine_flags.asm
@@ -29,7 +29,7 @@ EngineFlags: ; 80462
 	engine_flag wStatusFlags, STATUSFLAGS_CAUGHT_POKERUS_F
 	engine_flag wStatusFlags, STATUSFLAGS_ROCKET_SIGNAL_F
 	engine_flag wStatusFlags, STATUSFLAGS_HALL_OF_FAME_F
-	engine_flag wStatusFlags, STATUSFLAGS_BUG_CONTEST_ON_F
+	engine_flag wStatusFlags, STATUSFLAGS_MAIN_MENU_MOBILE_CHOICES_F
 
 	engine_flag wStatusFlags2, STATUSFLAGS2_BUG_CONTEST_TIMER_F
 	engine_flag wStatusFlags2, STATUSFLAGS2_SAFARI_GAME_F
diff --git a/engine/main_menu.asm b/engine/main_menu.asm
index b4a5d1919..d83ce873b 100755
--- a/engine/main_menu.asm
+++ b/engine/main_menu.asm
@@ -168,7 +168,7 @@ MainMenu_GetWhichMenu: ; 49da4
 	jr nz, .mystery_gift
 	; This check makes no difference.
 	ld a, [wStatusFlags]
-	bit STATUSFLAGS_BUG_CONTEST_ON_F, a
+	bit STATUSFLAGS_MAIN_MENU_MOBILE_CHOICES_F, a
 	ld a, $1 ; Continue
 	jr z, .ok
 	jr .ok
@@ -183,7 +183,7 @@ MainMenu_GetWhichMenu: ; 49da4
 .mystery_gift
 	; This check makes no difference.
 	ld a, [wStatusFlags]
-	bit STATUSFLAGS_BUG_CONTEST_ON_F, a
+	bit STATUSFLAGS_MAIN_MENU_MOBILE_CHOICES_F, a
 	jr z, .ok3
 	jr .ok3
 
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 8490fed48..4d936906c 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -338,7 +338,7 @@ ElmAfterTheftScript:
 	writetext ElmAfterTheftText5
 	buttonsound
 	setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
-	setflag ENGINE_BUG_CONTEST_ON
+	setflag ENGINE_MAIN_MENU_MOBILE_CHOICES
 	setmapscene ROUTE_29, SCENE_ROUTE29_CATCH_TUTORIAL
 	clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY
 	setevent EVENT_ROUTE_30_BATTLE

From 9a7da21006c2c51780424af3410ff8d7d0b59e61 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sun, 25 Feb 2018 22:25:32 -0500
Subject: [PATCH 133/135] Mention "HAUNTED HOUSE" (resolves #492)

---
 data/maps/landmarks.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm
index 0b927aaf6..2ef8a2dea 100644
--- a/data/maps/landmarks.asm
+++ b/data/maps/landmarks.asm
@@ -129,7 +129,7 @@ WhirlIslandsName:    db "WHIRL¯ISLANDS@"
 MtMortarName:        db "MT.MORTAR@"
 DragonsDenName:      db "DRAGON'S¯DEN@"
 IcePathName:         db "ICE PATH@"
-NotApplicableName:   db "N/A@"
+NotApplicableName:   db "N/A@" ; "オバケやしき" ("HAUNTED HOUSE") in Japanese
 PalletTownName:      db "PALLET TOWN@"
 ViridianCityName:    db "VIRIDIAN¯CITY@"
 PewterCityName:      db "PEWTER CITY@"

From 711e2d6143d59093a763f9bbd4a527f349fdeff8 Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sun, 25 Feb 2018 22:33:07 -0500
Subject: [PATCH 134/135] Mention unused Battle Tower-related text (resolves
 #491)

---
 maps/BattleTowerOutside.asm | 3 +++
 maps/GoldenrodCity.asm      | 4 ++--
 maps/OlivineCity.asm        | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm
index 6f3e6674c..afc193180 100644
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -105,6 +105,7 @@ BattleTowerOutsideSailorText:
 	done
 
 BattleTowerOutsideText_BattleTower:
+; unused; originally shown when the Battle Tower was closed
 	text "BATTLE TOWER"
 	done
 
@@ -116,11 +117,13 @@ BattleTowerOutsideText_UltimateChallenge:
 	done
 
 BattleTowerOutsideText_DoorsClosed:
+; unused; originally shown when the Battle Tower was closed
 	text "The BATTLE TOWER's"
 	line "doors are closed…"
 	done
 
 BattleTowerOutsideText_DoorsOpen:
+; unused; originally shown after the Battle Tower opened
 	text "It's open!"
 	done
 
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 97486ae06..f9f076ea0 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -476,8 +476,8 @@ GoldenrodCityUndergroundSignSouthText:
 	line "ENTRANCE"
 	done
 
-PokeComCenterSignText:
-; unused in the english version
+GoldenrodCityPokeComCenterSignText:
+; unused
 	text "For Mobile Tips!"
 	line "#COM CENTER"
 	done
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index 380f71bab..0b3ebb96a 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -281,7 +281,8 @@ OlivineCityBattleTowerSignText:
 	line "Opening Now!"
 	done
 
-UnknownText_0x1a8cba:
+OlivineCityBattleTowerSignText_NotYetOpen:
+; unused; originally shown when the Battle Tower was closed
 	text "BATTLE TOWER AHEAD"
 	done
 

From 7453bd1aa8e55a1a9fcce7c69f62106f5e5f6e9c Mon Sep 17 00:00:00 2001
From: Rangi 
Date: Sun, 25 Feb 2018 22:38:09 -0500
Subject: [PATCH 135/135] "HUMANSHAPE, aka Humanshape"

---
 constants/pokemon_data_constants.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index cbbac7f43..e82902da3 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -53,7 +53,7 @@ GENDERLESS   EQU -1
 	const EGG_FIELD        ; 5 (aka Ground in Stadium 2)
 	const EGG_FAIRY        ; 6
 	const EGG_GRASS        ; 7 (aka Plant in Stadium 2)
-	const EGG_HUMANSHAPE   ; 8 (aka Humanshape in Stadium 2)
+	const EGG_HUMANSHAPE   ; 8 (aka Human-Like)
 	const EGG_INVERTEBRATE ; 9 (aka Water 3 in Stadium 2)
 	const EGG_MINERAL      ; a
 	const EGG_AMORPHOUS    ; b (aka Indeterminate in Stadium 2)