Feedback Fix No2

* Changed "ARCADE" to "GAME CENTER" for the sake of uniformization.
* Labeled the map constants.
* Labeled the scene constants.
* Updated a handful of comments to reflect corresponding constant name.
This commit is contained in:
FrenchOrange
2023-08-26 00:48:45 +02:00
parent 5c5347cc0b
commit f274e99d1b
9 changed files with 460 additions and 460 deletions
+119 -119
View File
@@ -1,122 +1,122 @@
const_def
const OVERWORLD_MAP ; $00
const MAP_01 ; $01
const MAP_02 ; $02
const MAP_03 ; $03
const MAP_04 ; $04
const MAP_05 ; $05
const MAP_06 ; $06
const MAP_07 ; $07
const MAP_08 ; $08
const MAP_09 ; $09
const MAP_0A ; $0a
const MAP_0B ; $0b
const MAP_0C ; $0c
const MAP_0D ; $0d
const MAP_0E ; $0e
const MAP_0F ; $0f
const MAP_10 ; $10
const MAP_11 ; $11
const MAP_12 ; $12
const MAP_13 ; $13
const MAP_14 ; $14
const MAP_15 ; $15
const MAP_16 ; $16
const MAP_17 ; $17
const MAP_18 ; $18
const MAP_19 ; $19
const MAP_1A ; $1a
const MAP_1B ; $1b
const MAP_1C ; $1c
const MAP_1D ; $1d
const MAP_1E ; $1e
const MAP_1F ; $1f
const MAP_20 ; $20
const MAP_21 ; $21
const MAP_22 ; $22
const MAP_23 ; $23
const MAP_24 ; $24
const MAP_25 ; $25
const MAP_26 ; $26
const MAP_27 ; $27
const MAP_28 ; $28
const MAP_29 ; $29
const MAP_2A ; $2a
const MAP_2B ; $2b
const MAP_2C ; $2c
const MAP_2D ; $2d
const MAP_2E ; $2e
const MAP_2F ; $2f
const MAP_30 ; $30
const MAP_31 ; $31
const MAP_32 ; $32
const MAP_33 ; $33
const MAP_34 ; $34
const MAP_35 ; $35
const MAP_36 ; $36
const MAP_37 ; $37
const MAP_38 ; $38
const MAP_39 ; $39
const MAP_3A ; $3a
const MAP_3B ; $3b
const MAP_3C ; $3c
const MAP_3D ; $3d
const MAP_3E ; $3e
const MAP_3F ; $3f
const MAP_40 ; $40
const MAP_41 ; $41
const MAP_42 ; $42
const MAP_43 ; $43
const MAP_44 ; $44
const MAP_45 ; $45
const MAP_46 ; $46
const MAP_47 ; $47
const MAP_48 ; $48
const MAP_49 ; $49
const MAP_4A ; $4a
const MAP_4B ; $4b
const MAP_4C ; $4c
const MAP_4D ; $4d
const MAP_4E ; $4e
const MAP_4F ; $4f
const MAP_50 ; $50
const MAP_51 ; $51
const MAP_52 ; $52
const MAP_53 ; $53
const MAP_54 ; $54
const MAP_55 ; $55
const MAP_56 ; $56
const MAP_57 ; $57
const MAP_58 ; $58
const MAP_59 ; $59
const MAP_5A ; $5a
const MAP_5B ; $5b
const MAP_5C ; $5c
const MAP_5D ; $5d
const MAP_5E ; $5e
const MAP_5F ; $5f
const MAP_60 ; $60
const MAP_61 ; $61
const MAP_62 ; $62
const MAP_63 ; $63
const MAP_64 ; $64
const MAP_65 ; $65
const MAP_66 ; $66
const MAP_67 ; $67
const MAP_68 ; $68
const MAP_69 ; $69
const MAP_6A ; $6a
const MAP_6B ; $6b
const MAP_6C ; $6c
const MAP_6D ; $6d
const MAP_6E ; $6e
const MAP_6F ; $6f
const MAP_70 ; $70
const MAP_71 ; $71
const MAP_72 ; $72
const MAP_73 ; $73
const MAP_74 ; $74
const MAP_75 ; $75
const OVERWORLD_MAP_TCG ; $00
const OVERWORLD_MAP_GR ; $01
const MAP_MASON_LABORATORY_MAIN ; $02
const MAP_MASON_LABORATORY_SIDE_1 ; $03
const MAP_MASON_LABORATORY_SIDE_2 ; $04
const MAP_ISHIHARAS_HOUSE ; $05
const MAP_LIGHTNING_CLUB_ENTRANCE ; $06
const MAP_LIGHTNING_CLUB_LOBBY ; $07
const MAP_LIGHTNING_CLUB_1 ; $08
const MAP_LIGHTNING_CLUB_2 ; $09
const MAP_PSYCHIC_CLUB_ENTRANCE ; $0a
const MAP_PSYCHIC_CLUB_LOBBY ; $0b
const MAP_PSYCHIC_CLUB ; $0c
const MAP_ROCK_CLUB_ENTRANCE ; $0d
const MAP_ROCK_CLUB_LOBBY ; $0e
const MAP_ROCK_CLUB ; $0f
const MAP_FIGHTING_CLUB_ENTRANCE ; $10
const MAP_FIGHTING_CLUB_LOBBY ; $11
const MAP_FIGHTING_CLUB ; $12
const MAP_GRASS_CLUB_ENTRANCE ; $13
const MAP_GRASS_CLUB_LOBBY ; $14
const MAP_GRASS_CLUB ; $15
const MAP_SCIENCE_CLUB_ENTRANCE ; $16
const MAP_SCIENCE_CLUB_LOBBY ; $17
const MAP_SCIENCE_CLUB ; $18
const MAP_WATER_CLUB_ENTRANCE ; $19
const MAP_WATER_CLUB_LOBBY ; $1a
const MAP_WATER_CLUB ; $1b
const MAP_FIRE_CLUB_ENTRANCE ; $1c
const MAP_FIRE_CLUB_LOBBY ; $1d
const MAP_FIRE_CLUB ; $1e
const MAP_TCG_AIRPORT_ENTRANCE ; $1f
const MAP_TCG_AIRPORT ; $20
const MAP_TCG_CHALLENGE_HALL_ENTRANCE ; $21
const MAP_TCG_CHALLENGE_HALL_LOBBY ; $22
const MAP_TCG_CHALLENGE_HALL ; $23
const MAP_POKEMON_DOME_ENTRANCE ; $24
const MAP_POKEMON_DOME ; $25
const MAP_OVERHEAD_ISLANDS ; $26
const MAP_GR_AIRPORT_ENTRANCE ; $27
const MAP_GR_AIRPORT ; $28
const MAP_ISHIHARAS_VILLA_1 ; $29
const MAP_ISHIHARAS_VILLA_2 ; $2a
const MAP_GAME_CENTER_ENTRANCE ; $2b
const MAP_GAME_CENTER_LOBBY ; $2c
const MAP_GAME_CENTER_1 ; $2d
const MAP_GAME_CENTER_2 ; $2e
const MAP_CARD_DUNGEON_PAWN ; $2f
const MAP_CARD_DUNGEON_KNIGHT ; $30
const MAP_CARD_DUNGEON_BISHOP ; $31
const MAP_CARD_DUNGEON_ROOK ; $32
const MAP_CARD_DUNGEON_QUEEN ; $33
const MAP_SEALED_FORT_ENTRANCE ; $34
const MAP_SEALED_FORT ; $35
const MAP_GR_CHALLENGE_HALL_ENTRANCE ; $36
const MAP_GR_CHALLENGE_HALL_LOBBY ; $37
const MAP_GR_CHALLENGE_HALL ; $38
const MAP_GRASS_FORT_ENTRANCE ; $39
const MAP_GRASS_FORT_LOBBY ; $3a
const MAP_GRASS_FORT_MIDORI ; $3b
const MAP_GRASS_FORT_YUUTA ; $3c
const MAP_GRASS_FORT_MIYUKI ; $3d
const MAP_GRASS_FORT_MORINO ; $3e
const MAP_LIGHTNING_FORT_ENTRANCE ; $3f
const MAP_LIGHTNING_FORT_LOBBY ; $40
const MAP_LIGHTNING_FORT_RENNA ; $41
const MAP_LIGHTNING_FORT_ICHIKAWA ; $42
const MAP_LIGHTNING_FORT_CATHERINE ; $43
const MAP_FIRE_FORT_ENTRANCE ; $44
const MAP_FIRE_FORT_LOBBY ; $45
const MAP_FIRE_FORT_JES ; $46
const MAP_FIRE_FORT_YUKI ; $47
const MAP_FIRE_FORT_SHOKO ; $48
const MAP_FIRE_FORT_HIDERO ; $49
const MAP_WATER_FORT_ENTRANCE ; $4a
const MAP_WATER_FORT_LOBBY ; $4b
const MAP_WATER_FORT_MIYAJIMA ; $4c
const MAP_WATER_FORT_SENTA ; $4d
const MAP_WATER_FORT_AIRA ; $4e
const MAP_WATER_FORT_KANOKO ; $4f
const MAP_FIGHTING_FORT_ENTRANCE ; $50
const MAP_FIGHTING_FORT ; $51
const MAP_FIGHTING_FORT_MAZE_1 ; $52
const MAP_FIGHTING_FORT_MAZE_2 ; $53
const MAP_FIGHTING_FORT_MAZE_3 ; $54
const MAP_FIGHTING_FORT_MAZE_4 ; $55
const MAP_FIGHTING_FORT_MAZE_5 ; $56
const MAP_FIGHTING_FORT_MAZE_6 ; $57
const MAP_FIGHTING_FORT_GODA ; $58
const MAP_FIGHTING_FORT_GRACE ; $59
const MAP_PSYCHIC_STRONGHOLD_ENTRANCE ; $5a
const MAP_PSYCHIC_STRONGHOLD_LOBBY ; $5b
const MAP_PSYCHIC_STRONGHOLD ; $5c
const MAP_PSYCHIC_STRONGHOLD_MAMI ; $5d
const MAP_COLORLESS_ALTAR_ENTRANCE ; $5e
const MAP_COLORLESS_ALTAR ; $5f
const MAP_GR_CASTLE_ENTRANCE ; $60
const MAP_GR_CASTLE ; $61
const MAP_GR_CASTLE_BIRURITCHI ; $62
const MAP_POKEMON_DOME_BACK ; $63
const MAP_FIGHTING_FORT_MAZE_7 ; $64
const MAP_FIGHTING_FORT_MAZE_8 ; $65
const MAP_FIGHTING_FORT_MAZE_9 ; $66
const MAP_FIGHTING_FORT_MAZE_10 ; $67
const MAP_FIGHTING_FORT_MAZE_11 ; $68
const MAP_FIGHTING_FORT_MAZE_12 ; $69
const MAP_FIGHTING_FORT_MAZE_13 ; $6a
const MAP_FIGHTING_FORT_MAZE_14 ; $6b
const MAP_FIGHTING_FORT_MAZE_15 ; $6c
const MAP_FIGHTING_FORT_MAZE_16 ; $6d
const MAP_FIGHTING_FORT_MAZE_17 ; $6e
const MAP_FIGHTING_FORT_MAZE_18 ; $6f
const MAP_FIGHTING_FORT_MAZE_19 ; $70
const MAP_FIGHTING_FORT_MAZE_20 ; $71
const MAP_FIGHTING_FORT_MAZE_21 ; $72
const MAP_FIGHTING_FORT_MAZE_22 ; $73
const MAP_FIGHTING_FORT_BASEMENT ; $74
const MAP_GR_CHALLENGE_HALL_2 ; $75
DEF NUM_OW_ANIMATED_TILES EQU 25
@@ -140,7 +140,7 @@ DEF NUM_OW_ANIMATED_TILES EQU 25
const_def
const OWMAP_GR_AIRPORT ; $0
const OWMAP_ISHIHARAS_VILLA ; $1
const OWMAP_ARCADE ; $2
const OWMAP_GAME_CENTER ; $2
const OWMAP_SEALED_FORT ; $3
const OWMAP_GR_CHALLENGE_HALL ; $4
const OWMAP_GR_GRASS_FORT ; $5
+36 -36
View File
@@ -1,38 +1,38 @@
const_def
const SCENE_00 ; $00
const SCENE_01 ; $01
const SCENE_02 ; $02
const SCENE_03 ; $03
const SCENE_04 ; $04
const SCENE_05 ; $05
const SCENE_06 ; $06
const SCENE_07 ; $07
const SCENE_08 ; $08
const SCENE_09 ; $09
const SCENE_INTRO_BASE_SET ; $0a
const SCENE_INTRO_JUNGLE ; $0b
const SCENE_INTRO_FOSSIL ; $0c
const SCENE_INTRO_TEAM_ROCKET ; $0d
const SCENE_0E ; $0e
const SCENE_0F ; $0f
const SCENE_10 ; $10
const SCENE_11 ; $11
const SCENE_12 ; $12
const SCENE_13 ; $13
const SCENE_14 ; $14
const SCENE_15 ; $15
const SCENE_16 ; $16
const SCENE_17 ; $17
const SCENE_18 ; $18
const SCENE_19 ; $19
const SCENE_1A ; $1a
const SCENE_1B ; $1b
const SCENE_1C ; $1c
const SCENE_1D ; $1d
const SCENE_1E ; $1e
const SCENE_1F ; $1f
const SCENE_20 ; $20
const SCENE_21 ; $21
const SCENE_22 ; $22
const SCENE_23 ; $23
const SCENE_SPECIAL_RULES ; $00
const SCENE_SLOT_MACHINE ; $01
const SCENE_BEGINNING_PACK ; $02
const SCENE_LEGENDARY_PACK ; $03
const SCENE_FOSSIL_PACK ; $04
const SCENE_PSYCHIC_PACK ; $05
const SCENE_FLYING_PACK ; $06
const SCENE_ROCKET_PACK ; $07
const SCENE_AMBITION_PACK ; $08
const SCENE_PRESENT_PACK ; $09
const SCENE_INTRO_BASE_SET ; $0a
const SCENE_INTRO_JUNGLE ; $0b
const SCENE_INTRO_FOSSIL ; $0c
const SCENE_INTRO_TEAM_ROCKET ; $0d
const SCENE_TOURNAMENT_TABLE ; $0e
const SCENE_CARD_POP_MENU ; $0f
const SCENE_CARD_POP ; $10
const SCENE_CARD_POP_ERROR ; $11
const SCENE_LINK ; $12
const SCENE_RARE_CARD_POP ; $13
const SCENE_RARE_CARD_POP_ERROR ; $14
const SCENE_BLACK_BOX ; $15
const SCENE_TITLE_SCREEN_1 ; $16
const SCENE_TITLE_SCREEN_2 ; $17
const SCENE_TITLE_SCREEN_3 ; $18
const SCENE_TITLE_SCREEN_4 ; $19
const SCENE_PRINTER_1 ; $1a
const SCENE_PRINTER_2 ; $1b
const SCENE_FULL_MAILBOX ; $1c
const SCENE_GOT_MAIL ; $1d
const SCENE_MAILBOX ; $1e
const SCENE_DECK_DIAGNOSIS ; $1f
const SCENE_LINK_INTRO_1 ; $20
const SCENE_LINK_INTRO_2 ; $21
const SCENE_COIN_TOSS_RESULT_1 ; $22
const SCENE_COIN_TOSS_RESULT_2 ; $23
const SCENE_GBC_ONLY_DISCLAIMER ; $24
+1 -1
View File
@@ -567,7 +567,7 @@ Credits:
credits_draw_box 0, 0, 20, 18
credits_init_ow
credits_load_map OVERWORLD_MAP
credits_load_map OVERWORLD_MAP_TCG
credits_load_tilemap TILEMAP_100, 0, 0
credits_load_ow_obj OW_MARK, SOUTH, $34, $30
credits_fade_in CREDITS_FADE_ALL, $0a
+118 -118
View File
@@ -7,239 +7,239 @@ MACRO map_gfx
ENDM
MapGfx:
; MAP_00
; OVERWORLD_MAP_TCG
map_gfx TILEMAP_000, TILESET_TCG_ISLAND, PALETTE_000, OW_ANIM_00, PALETTE_166
; MAP_01
; OVERWORLD_MAP_GR
map_gfx TILEMAP_003, TILESET_GR_ISLAND, PALETTE_001, OW_ANIM_16, PALETTE_166
; MAP_02
; MAP_MASON_LABORATORY_MAIN
map_gfx TILEMAP_005, TILESET_MASON_LAB_MAIN, PALETTE_002, OW_ANIM_2B, PALETTE_161
; MAP_03
; MAP_MASON_LABORATORY_SIDE_1
map_gfx TILEMAP_007, TILESET_MASON_LAB_SIDE_1, PALETTE_003, OW_ANIM_0D, PALETTE_161
; MAP_04
; MAP_MASON_LABORATORY_SIDE_2
map_gfx TILEMAP_009, TILESET_MASON_LAB_SIDE_2, PALETTE_004, OW_ANIM_NONE, PALETTE_161
; MAP_05
; MAP_ISHIHARAS_HOUSE
map_gfx TILEMAP_00A, TILESET_ISHIHARA_HOUSE, PALETTE_005, OW_ANIM_NONE, PALETTE_161
; MAP_06
; MAP_LIGHTNING_CLUB_ENTRANCE
map_gfx TILEMAP_00B, TILESET_LIGHTNING_CLUB_ENTRANCE, PALETTE_006, OW_ANIM_1A, PALETTE_161
; MAP_07
; MAP_LIGHTNING_CLUB_LOBBY
map_gfx TILEMAP_00D, TILESET_LIGHTNING_CLUB_LOBBY, PALETTE_007, OW_ANIM_NONE, PALETTE_161
; MAP_08
; MAP_LIGHTNING_CLUB_1
map_gfx TILEMAP_00E, TILESET_LIGHTNING_CLUB, PALETTE_008, OW_ANIM_NONE, PALETTE_161
; MAP_09
; MAP_LIGHTNING_CLUB_2
map_gfx TILEMAP_00F, TILESET_LIGHTNING_CLUB, PALETTE_008, OW_ANIM_01, PALETTE_161
; MAP_0A
; MAP_PSYCHIC_CLUB_ENTRANCE
map_gfx TILEMAP_010, TILESET_PSYCHIC_CLUB_ENTRANCE, PALETTE_009, OW_ANIM_05, PALETTE_161
; MAP_0B
; MAP_PSYCHIC_CLUB_LOBBY
map_gfx TILEMAP_011, TILESET_PSYCHIC_CLUB_LOBBY, PALETTE_00A, OW_ANIM_04, PALETTE_161
; MAP_0C
; MAP_PSYCHIC_CLUB
map_gfx TILEMAP_012, TILESET_PSYCHIC_CLUB, PALETTE_00B, OW_ANIM_03, PALETTE_165
; MAP_0D
; MAP_ROCK_CLUB_ENTRANCE
map_gfx TILEMAP_014, TILESET_ROCK_CLUB_ENTRANCE, PALETTE_00C, OW_ANIM_NONE, PALETTE_161
; MAP_0E
; MAP_ROCK_CLUB_LOBBY
map_gfx TILEMAP_015, TILESET_ROCK_CLUB_LOBBY, PALETTE_00D, OW_ANIM_NONE, PALETTE_161
; MAP_0F
; MAP_ROCK_CLUB
map_gfx TILEMAP_016, TILESET_ROCK_CLUB, PALETTE_00E, OW_ANIM_NONE, PALETTE_161
; MAP_10
; MAP_FIGHTING_CLUB_ENTRANCE
map_gfx TILEMAP_017, TILESET_FIGHTING_CLUB_ENTRANCE, PALETTE_00F, OW_ANIM_NONE, PALETTE_161
; MAP_11
; MAP_FIGHTING_CLUB_LOBBY
map_gfx TILEMAP_018, TILESET_FIGHTING_CLUB_LOBBY, PALETTE_010, OW_ANIM_NONE, PALETTE_161
; MAP_12
; MAP_FIGHTING_CLUB
map_gfx TILEMAP_019, TILESET_FIGHTING_CLUB, PALETTE_011, OW_ANIM_NONE, PALETTE_161
; MAP_13
; MAP_GRASS_CLUB_ENTRANCE
map_gfx TILEMAP_01B, TILESET_GRASS_CLUB_ENTRANCE, PALETTE_012, OW_ANIM_NONE, PALETTE_161
; MAP_14
; MAP_GRASS_CLUB_LOBBY
map_gfx TILEMAP_01C, TILESET_GRASS_CLUB_LOBBY, PALETTE_013, OW_ANIM_NONE, PALETTE_161
; MAP_15
; MAP_GRASS_CLUB
map_gfx TILEMAP_01D, TILESET_GRASS_CLUB, PALETTE_014, OW_ANIM_06, PALETTE_161
; MAP_16
; MAP_SCIENCE_CLUB_ENTRANCE
map_gfx TILEMAP_01F, TILESET_SCIENCE_CLUB_ENTRANCE, PALETTE_015, OW_ANIM_NONE, PALETTE_161
; MAP_17
; MAP_SCIENCE_CLUB_LOBBY
map_gfx TILEMAP_020, TILESET_SCIENCE_CLUB_LOBBY, PALETTE_016, OW_ANIM_NONE, PALETTE_161
; MAP_18
; MAP_SCIENCE_CLUB
map_gfx TILEMAP_021, TILESET_SCIENCE_CLUB, PALETTE_017, OW_ANIM_NONE, PALETTE_161
; MAP_19
; MAP_WATER_CLUB_ENTRANCE
map_gfx TILEMAP_026, TILESET_WATER_CLUB_ENTRANCE, PALETTE_018, OW_ANIM_02, PALETTE_161
; MAP_1A
; MAP_WATER_CLUB_LOBBY
map_gfx TILEMAP_027, TILESET_WATER_CLUB_LOBBY, PALETTE_019, OW_ANIM_07, PALETTE_161
; MAP_1B
; MAP_WATER_CLUB
map_gfx TILEMAP_028, TILESET_WATER_CLUB, PALETTE_01A, OW_ANIM_08, PALETTE_161
; MAP_1C
; MAP_FIRE_CLUB_ENTRANCE
map_gfx TILEMAP_02B, TILESET_FIRE_CLUB_ENTRANCE, PALETTE_01B, OW_ANIM_0A, PALETTE_161
; MAP_1D
; MAP_FIRE_CLUB_LOBBY
map_gfx TILEMAP_02C, TILESET_FIRE_CLUB_LOBBY, PALETTE_01C, OW_ANIM_0B, PALETTE_161
; MAP_1E
; MAP_FIRE_CLUB
map_gfx TILEMAP_02D, TILESET_FIRE_CLUB, PALETTE_01D, OW_ANIM_09, PALETTE_161
; MAP_1F
; MAP_TCG_AIRPORT_ENTRANCE
map_gfx TILEMAP_030, TILESET_TCG_AIRPORT_ENTRANCE, PALETTE_01E, OW_ANIM_NONE, PALETTE_161
; MAP_20
; MAP_TCG_AIRPORT
map_gfx TILEMAP_031, TILESET_TCG_AIRPORT, PALETTE_01F, OW_ANIM_NONE, PALETTE_161
; MAP_21
; MAP_TCG_CHALLENGE_HALL_ENTRANCE
map_gfx TILEMAP_032, TILESET_TCG_CHALLENGE_HALL_ENTRANCE, PALETTE_020, OW_ANIM_NONE, PALETTE_161
; MAP_22
; MAP_TCG_CHALLENGE_HALL_LOBBY
map_gfx TILEMAP_033, TILESET_TCG_CHALLENGE_HALL_LOBBY, PALETTE_021, OW_ANIM_NONE, PALETTE_161
; MAP_23
; MAP_TCG_CHALLENGE_HALL
map_gfx TILEMAP_034, TILESET_TCG_CHALLENGE_HALL, PALETTE_022, OW_ANIM_NONE, PALETTE_161
; MAP_24
; MAP_POKEMON_DOME_ENTRANCE
map_gfx TILEMAP_035, TILESET_POKEMON_DOME_ENTRANCE, PALETTE_023, OW_ANIM_NONE, PALETTE_161
; MAP_25
; MAP_POKEMON_DOME
map_gfx TILEMAP_036, TILESET_POKEMON_DOME, PALETTE_024, OW_ANIM_NONE, PALETTE_161
; MAP_26
; MAP_OVERHEAD_ISLANDS
map_gfx TILEMAP_039, TILESET_OVERHEAD_ISLANDS, PALETTE_025, OW_ANIM_14, PALETTE_166
; MAP_27
; MAP_GR_AIRPORT_ENTRANCE
map_gfx TILEMAP_03A, TILESET_GR_AIRPORT_ENTRANCE, PALETTE_026, OW_ANIM_NONE, PALETTE_161
; MAP_28
; MAP_GR_AIRPORT
map_gfx TILEMAP_03B, TILESET_GR_AIRPORT, PALETTE_027, OW_ANIM_NONE, PALETTE_161
; MAP_29
; MAP_ISHIHARAS_VILLA_1
map_gfx TILEMAP_03C, TILESET_ISHIHARA_VILLA_1, PALETTE_028, OW_ANIM_NONE, PALETTE_161
; MAP_2A
; MAP_ISHIHARAS_VILLA_2
map_gfx TILEMAP_03D, TILESET_ISHIHARA_VILLA_2, PALETTE_029, OW_ANIM_NONE, PALETTE_161
; MAP_2B
; MAP_GAME_CENTER_ENTRANCE
map_gfx TILEMAP_03E, TILESET_GAME_CENTER_ENTRANCE, PALETTE_02A, OW_ANIM_1B, PALETTE_161
; MAP_2C
; MAP_GAME_CENTER_LOBBY
map_gfx TILEMAP_03F, TILESET_GAME_CENTER_LOBBY, PALETTE_02B, OW_ANIM_NONE, PALETTE_161
; MAP_2D
; MAP_GAME_CENTER_1
map_gfx TILEMAP_040, TILESET_GAME_CENTER_1, PALETTE_02C, OW_ANIM_1C, PALETTE_161
; MAP_2E
; MAP_GAME_CENTER_2
map_gfx TILEMAP_041, TILESET_GAME_CENTER_2, PALETTE_02D, OW_ANIM_NONE, PALETTE_161
; MAP_2F
; MAP_CARD_DUNGEON_PAWN
map_gfx TILEMAP_042, TILESET_CARD_DUNGEON_PAWN, PALETTE_02E, OW_ANIM_NONE, PALETTE_161
; MAP_30
; MAP_CARD_DUNGEON_KNIGHT
map_gfx TILEMAP_045, TILESET_CARD_DUNGEON_KNIGHT, PALETTE_02F, OW_ANIM_NONE, PALETTE_161
; MAP_31
; MAP_CARD_DUNGEON_BISHOP
map_gfx TILEMAP_048, TILESET_CARD_DUNGEON_BISHOP, PALETTE_030, OW_ANIM_NONE, PALETTE_161
; MAP_32
; MAP_CARD_DUNGEON_ROOK
map_gfx TILEMAP_04B, TILESET_CARD_DUNGEON_ROOK, PALETTE_031, OW_ANIM_NONE, PALETTE_161
; MAP_33
; MAP_CARD_DUNGEON_QUEEN
map_gfx TILEMAP_04E, TILESET_CARD_DUNGEON_QUEEN, PALETTE_032, OW_ANIM_NONE, PALETTE_161
; MAP_34
; MAP_SEALED_FORT_ENTRANCE
map_gfx TILEMAP_050, TILESET_SEALED_FORT_ENTRANCE, PALETTE_033, OW_ANIM_1D, PALETTE_161
; MAP_35
; MAP_SEALED_FORT
map_gfx TILEMAP_053, TILESET_SEALED_FORT, PALETTE_034, OW_ANIM_1E, PALETTE_161
; MAP_36
; MAP_GR_CHALLENGE_HALL_ENTRANCE
map_gfx TILEMAP_054, TILESET_GR_CHALLENGE_HALL_ENTRANCE, PALETTE_035, OW_ANIM_NONE, PALETTE_161
; MAP_37
; MAP_GR_CHALLENGE_HALL_LOBBY
map_gfx TILEMAP_055, TILESET_GR_CHALLENGE_HALL_LOBBY, PALETTE_036, OW_ANIM_NONE, PALETTE_161
; MAP_38
; MAP_GR_CHALLENGE_HALL
map_gfx TILEMAP_056, TILESET_GR_CHALLENGE_HALL, PALETTE_037, OW_ANIM_NONE, PALETTE_161
; MAP_39
; MAP_GRASS_FORT_ENTRANCE
map_gfx TILEMAP_058, TILESET_GRASS_FORT_ENTRANCE, PALETTE_038, OW_ANIM_NONE, PALETTE_161
; MAP_3A
; MAP_GRASS_FORT_LOBBY
map_gfx TILEMAP_059, TILESET_GRASS_FORT_LOBBY, PALETTE_039, OW_ANIM_NONE, PALETTE_161
; MAP_3B
; MAP_GRASS_FORT_MIDORI
map_gfx TILEMAP_05A, TILESET_GRASS_FORT_MIDORI, PALETTE_03A, OW_ANIM_NONE, PALETTE_161
; MAP_3C
; MAP_GRASS_FORT_YUUTA
map_gfx TILEMAP_05D, TILESET_GRASS_FORT_YUUTA, PALETTE_03C, OW_ANIM_NONE, PALETTE_161
; MAP_3D
; MAP_GRASS_FORT_MIYUKI
map_gfx TILEMAP_060, TILESET_GRASS_FORT_MIYUKI, PALETTE_03D, OW_ANIM_NONE, PALETTE_161
; MAP_3E
; MAP_GRASS_FORT_MORINO
map_gfx TILEMAP_063, TILESET_GRASS_FORT_MORINO, PALETTE_03E, OW_ANIM_1F, PALETTE_161
; MAP_3F
; MAP_LIGHTNING_FORT_ENTRANCE
map_gfx TILEMAP_064, TILESET_LIGHTNING_FORT_ENTRANCE, PALETTE_03F, OW_ANIM_0E, PALETTE_161
; MAP_40
; MAP_LIGHTNING_FORT_LOBBY
map_gfx TILEMAP_067, TILESET_LIGHTNING_FORT_LOBBY, PALETTE_040, OW_ANIM_12, PALETTE_161
; MAP_41
; MAP_LIGHTNING_FORT_RENNA
map_gfx TILEMAP_068, TILESET_LIGHTNING_FORT_RENNA, PALETTE_041, OW_ANIM_10, PALETTE_161
; MAP_42
; MAP_LIGHTNING_FORT_ICHIKAWA
map_gfx TILEMAP_06B, TILESET_LIGHTNING_FORT_ICHIKAWA, PALETTE_042, OW_ANIM_11, PALETTE_163
; MAP_43
; MAP_LIGHTNING_FORT_CATHERINE
map_gfx TILEMAP_071, TILESET_LIGHTNING_FORT_CATHERINE, PALETTE_043, OW_ANIM_0F, PALETTE_161
; MAP_44
; MAP_FIRE_FORT_ENTRANCE
map_gfx TILEMAP_072, TILESET_FIRE_FORT_ENTRANCE, PALETTE_044, OW_ANIM_20, PALETTE_161
; MAP_45
; MAP_FIRE_FORT_LOBBY
map_gfx TILEMAP_075, TILESET_FIRE_FORT_LOBBY, PALETTE_045, OW_ANIM_21, PALETTE_161
; MAP_46
; MAP_FIRE_FORT_JES
map_gfx TILEMAP_076, TILESET_FIRE_FORT_JES, PALETTE_046, OW_ANIM_22, PALETTE_161
; MAP_47
; MAP_FIRE_FORT_YUKI
map_gfx TILEMAP_079, TILESET_FIRE_FORT_YUKI, PALETTE_047, OW_ANIM_13, PALETTE_161
; MAP_48
; MAP_FIRE_FORT_SHOKO
map_gfx TILEMAP_07C, TILESET_FIRE_FORT_SHOKO, PALETTE_048, OW_ANIM_23, PALETTE_161
; MAP_49
; MAP_FIRE_FORT_HIDERO
map_gfx TILEMAP_081, TILESET_FIRE_FORT_HIDERO, PALETTE_049, OW_ANIM_18, PALETTE_164
; MAP_4A
; MAP_WATER_FORT_ENTRANCE
map_gfx TILEMAP_082, TILESET_WATER_FORT_ENTRANCE, PALETTE_04A, OW_ANIM_NONE, PALETTE_161
; MAP_4B
; MAP_WATER_FORT_LOBBY
map_gfx TILEMAP_085, TILESET_WATER_FORT_LOBBY, PALETTE_04B, OW_ANIM_24, PALETTE_161
; MAP_4C
; MAP_WATER_FORT_MIYAJIMA
map_gfx TILEMAP_086, TILESET_WATER_FORT_MIYAJIMA, PALETTE_04C, OW_ANIM_25, PALETTE_161
; MAP_4D
; MAP_WATER_FORT_SENTA
map_gfx TILEMAP_089, TILESET_WATER_FORT_SENTA, PALETTE_04D, OW_ANIM_17, PALETTE_161
; MAP_4E
; MAP_WATER_FORT_AIRA
map_gfx TILEMAP_08E, TILESET_WATER_FORT_AIRA, PALETTE_04E, OW_ANIM_26, PALETTE_161
; MAP_4F
; MAP_WATER_FORT_KANOKO
map_gfx TILEMAP_091, TILESET_WATER_FORT_KANOKO, PALETTE_04F, OW_ANIM_15, PALETTE_161
; MAP_50
; MAP_FIGHTING_FORT_ENTRANCE
map_gfx TILEMAP_092, TILESET_FIGHTING_FORT_ENTRANCE, PALETTE_050, OW_ANIM_NONE, PALETTE_161
; MAP_51
; MAP_FIGHTING_FORT
map_gfx TILEMAP_095, TILESET_FIGHTING_FORT, PALETTE_051, OW_ANIM_NONE, PALETTE_161
; MAP_52
; MAP_FIGHTING_FORT_MAZE_1
map_gfx TILEMAP_098, TILESET_FIGHTING_FORT_MAZE_1, PALETTE_052, OW_ANIM_NONE, PALETTE_161
; MAP_53
; MAP_FIGHTING_FORT_MAZE_2
map_gfx TILEMAP_099, TILESET_FIGHTING_FORT_MAZE_2, PALETTE_054, OW_ANIM_NONE, PALETTE_161
; MAP_54
; MAP_FIGHTING_FORT_MAZE_3
map_gfx TILEMAP_09B, TILESET_FIGHTING_FORT_MAZE_3, PALETTE_055, OW_ANIM_NONE, PALETTE_161
; MAP_55
; MAP_FIGHTING_FORT_MAZE_4
map_gfx TILEMAP_09C, TILESET_FIGHTING_FORT_MAZE_4, PALETTE_056, OW_ANIM_NONE, PALETTE_161
; MAP_56
; MAP_FIGHTING_FORT_MAZE_5
map_gfx TILEMAP_09E, TILESET_FIGHTING_FORT_MAZE_5, PALETTE_057, OW_ANIM_NONE, PALETTE_161
; MAP_57
; MAP_FIGHTING_FORT_MAZE_6
map_gfx TILEMAP_09F, TILESET_FIGHTING_FORT_MAZE_6, PALETTE_058, OW_ANIM_NONE, PALETTE_161
; MAP_58
; MAP_FIGHTING_FORT_GODA
map_gfx TILEMAP_0A0, TILESET_FIGHTING_FORT_GODA, PALETTE_059, OW_ANIM_NONE, PALETTE_161
; MAP_59
; MAP_FIGHTING_FORT_GRACE
map_gfx TILEMAP_0A3, TILESET_FIGHTING_FORT_GRACE, PALETTE_05A, OW_ANIM_NONE, PALETTE_162
; MAP_5A
; MAP_PSYCHIC_STRONGHOLD_ENTRANCE
map_gfx TILEMAP_0A4, TILESET_PSYCHIC_STRONGHOLD_ENTRANCE, PALETTE_05B, OW_ANIM_0C, PALETTE_161
; MAP_5B
; MAP_PSYCHIC_STRONGHOLD_LOBBY
map_gfx TILEMAP_0A5, TILESET_PSYCHIC_STRONGHOLD_LOBBY, PALETTE_05C, OW_ANIM_NONE, PALETTE_161
; MAP_5C
; MAP_PSYCHIC_STRONGHOLD
map_gfx TILEMAP_0A6, TILESET_PSYCHIC_STRONGHOLD, PALETTE_05D, OW_ANIM_19, PALETTE_161
; MAP_5D
; MAP_PSYCHIC_STRONGHOLD_MAMI
map_gfx TILEMAP_0B0, TILESET_PSYCHIC_STRONGHOLD_MAMI, PALETTE_05E, OW_ANIM_2A, PALETTE_161
; MAP_5E
; MAP_COLORLESS_ALTAR_ENTRANCE
map_gfx TILEMAP_0B1, TILESET_COLORLESS_ALTAR_ENTRANCE, PALETTE_060, OW_ANIM_27, PALETTE_161
; MAP_5F
; MAP_COLORLESS_ALTAR
map_gfx TILEMAP_0B2, TILESET_COLORLESS_ALTAR, PALETTE_061, OW_ANIM_28, PALETTE_161
; MAP_60
; MAP_GR_CASTLE_ENTRANCE
map_gfx TILEMAP_0B3, TILESET_GR_CASTLE_ENTRANCE, PALETTE_062, OW_ANIM_NONE, PALETTE_161
; MAP_61
; MAP_GR_CASTLE
map_gfx TILEMAP_0B6, TILESET_GR_CASTLE, PALETTE_063, OW_ANIM_NONE, PALETTE_161
; MAP_62
; MAP_GR_CASTLE_BIRURITCHI
map_gfx TILEMAP_0B7, TILESET_GR_CASTLE_BIRURITCHI, PALETTE_064, OW_ANIM_NONE, PALETTE_161
; MAP_63
; MAP_POKEMON_DOME_BACK
map_gfx TILEMAP_0B8, TILESET_POKEMON_DOME_BACK, PALETTE_065, OW_ANIM_NONE, PALETTE_161
; MAP_64
; MAP_FIGHTING_FORT_MAZE_7
map_gfx TILEMAP_0BA, TILESET_FIGHTING_FORT_MAZE_7, PALETTE_066, OW_ANIM_NONE, PALETTE_161
; MAP_65
; MAP_FIGHTING_FORT_MAZE_8
map_gfx TILEMAP_0BB, TILESET_FIGHTING_FORT_MAZE_8, PALETTE_067, OW_ANIM_NONE, PALETTE_161
; MAP_66
; MAP_FIGHTING_FORT_MAZE_9
map_gfx TILEMAP_0BD, TILESET_FIGHTING_FORT_MAZE_9, PALETTE_068, OW_ANIM_NONE, PALETTE_161
; MAP_67
; MAP_FIGHTING_FORT_MAZE_10
map_gfx TILEMAP_0BE, TILESET_FIGHTING_FORT_MAZE_10, PALETTE_069, OW_ANIM_NONE, PALETTE_161
; MAP_68
; MAP_FIGHTING_FORT_MAZE_11
map_gfx TILEMAP_0BF, TILESET_FIGHTING_FORT_MAZE_11, PALETTE_06A, OW_ANIM_NONE, PALETTE_161
; MAP_69
; MAP_FIGHTING_FORT_MAZE_12
map_gfx TILEMAP_0C0, TILESET_FIGHTING_FORT_MAZE_12, PALETTE_06B, OW_ANIM_NONE, PALETTE_161
; MAP_6A
; MAP_FIGHTING_FORT_MAZE_13
map_gfx TILEMAP_0C2, TILESET_FIGHTING_FORT_MAZE_13, PALETTE_06C, OW_ANIM_NONE, PALETTE_161
; MAP_6B
; MAP_FIGHTING_FORT_MAZE_14
map_gfx TILEMAP_0C3, TILESET_FIGHTING_FORT_MAZE_14, PALETTE_06D, OW_ANIM_NONE, PALETTE_161
; MAP_6C
; MAP_FIGHTING_FORT_MAZE_15
map_gfx TILEMAP_0C5, TILESET_FIGHTING_FORT_MAZE_15, PALETTE_06E, OW_ANIM_NONE, PALETTE_161
; MAP_6D
; MAP_FIGHTING_FORT_MAZE_16
map_gfx TILEMAP_0C6, TILESET_FIGHTING_FORT_MAZE_16, PALETTE_06F, OW_ANIM_NONE, PALETTE_161
; MAP_6E
; MAP_FIGHTING_FORT_MAZE_17
map_gfx TILEMAP_0C8, TILESET_FIGHTING_FORT_MAZE_17, PALETTE_070, OW_ANIM_NONE, PALETTE_161
; MAP_6F
; MAP_FIGHTING_FORT_MAZE_18
map_gfx TILEMAP_0CB, TILESET_FIGHTING_FORT_MAZE_18, PALETTE_071, OW_ANIM_NONE, PALETTE_161
; MAP_70
; MAP_FIGHTING_FORT_MAZE_19
map_gfx TILEMAP_0CD, TILESET_FIGHTING_FORT_MAZE_19, PALETTE_072, OW_ANIM_NONE, PALETTE_161
; MAP_71
; MAP_FIGHTING_FORT_MAZE_20
map_gfx TILEMAP_0CE, TILESET_FIGHTING_FORT_MAZE_20, PALETTE_073, OW_ANIM_NONE, PALETTE_161
; MAP_72
; MAP_FIGHTING_FORT_MAZE_21
map_gfx TILEMAP_0CF, TILESET_FIGHTING_FORT_MAZE_21, PALETTE_074, OW_ANIM_NONE, PALETTE_161
; MAP_73
; MAP_FIGHTING_FORT_MAZE_22
map_gfx TILEMAP_0D0, TILESET_FIGHTING_FORT_MAZE_22, PALETTE_075, OW_ANIM_NONE, PALETTE_161
; MAP_74
; MAP_FIGHTING_FORT_BASEMENT
map_gfx TILEMAP_0D1, TILESET_FIGHTING_FORT_BASEMENT, PALETTE_076, OW_ANIM_NONE, PALETTE_161
; MAP_75
; MAP_GR_CHALLENGE_HALL_2
map_gfx TILEMAP_0D2, TILESET_GR_CHALLENGE_HALL_2, PALETTE_077, OW_ANIM_29, PALETTE_161
+26 -26
View File
@@ -1,7 +1,7 @@
SECTION "Bank c@4080", ROMX[$4080], BANK[$c]
Data_30080:
db MAP_01
db OVERWORLD_MAP_GR
dba Data_30085
db $15
@@ -281,7 +281,7 @@ Func_30242:
.LocationConnections:
; OWMAP_GR_AIRPORT
db OWMAP_ARCADE ; down
db OWMAP_GAME_CENTER ; down
db OWMAP_SEALED_FORT ; up
db OWMAP_GR_AIRPORT ; left
db OWMAP_GR_GRASS_FORT ; right
@@ -292,11 +292,11 @@ Func_30242:
db OWMAP_ISHIHARAS_VILLA ; left
db OWMAP_GR_PSYCHIC_STRONGHOLD ; right
; OWMAP_ARCADE
db OWMAP_ARCADE ; down
; OWMAP_GAME_CENTER
db OWMAP_GAME_CENTER ; down
db OWMAP_GR_GRASS_FORT ; up
db OWMAP_GR_AIRPORT ; left
db OWMAP_ARCADE ; right
db OWMAP_GAME_CENTER ; right
; OWMAP_SEALED_FORT
db OWMAP_GR_AIRPORT ; down
@@ -311,7 +311,7 @@ Func_30242:
db OWMAP_GR_FIGHTING_FORT ; right
; OWMAP_GR_GRASS_FORT
db OWMAP_ARCADE ; down
db OWMAP_GAME_CENTER ; down
db OWMAP_SEALED_FORT ; up
db OWMAP_GR_AIRPORT ; left
db OWMAP_GR_LIGHTNING_FORT ; right
@@ -384,7 +384,7 @@ PrintGRIslandLocationName:
.data
textitem 33, 4, Text09c3 ; OWMAP_GR_AIRPORT
textitem 33, 2, Text09c4 ; OWMAP_ISHIHARAS_VILLA
textitem 33, 3, Text09c5 ; OWMAP_ARCADE
textitem 33, 3, Text09c5 ; OWMAP_GAME_CENTER
textitem 33, 2, Text09c6 ; OWMAP_SEALED_FORT
textitem 33, 2, Text09c7 ; OWMAP_GR_CHALLENGE_HALL
textitem 33, 2, Text09c8 ; OWMAP_GR_GRASS_FORT
@@ -412,7 +412,7 @@ Func_3030a:
.PointerTable:
dw .NoCheckEventCD ; OWMAP_GR_AIRPORT
dw .CheckEventCD ; OWMAP_ISHIHARAS_VILLA
dw .NoCheckEventCD ; OWMAP_ARCADE
dw .NoCheckEventCD ; OWMAP_GAME_CENTER
dw .NoCheckEventCD ; OWMAP_SEALED_FORT
dw .NoCheckEventCD ; OWMAP_GR_CHALLENGE_HALL
dw .NoCheckEventCD ; OWMAP_GR_GRASS_FORT
@@ -576,7 +576,7 @@ Func_303c7:
.data
db $27, 5, 11, NORTH ; OWMAP_GR_AIRPORT
db $29, 4, 9, NORTH ; OWMAP_ISHIHARAS_VILLA
db $2b, 5, 14, NORTH ; OWMAP_ARCADE
db $2b, 5, 14, NORTH ; OWMAP_GAME_CENTER
db $34, 5, 7, NORTH ; OWMAP_SEALED_FORT
db $36, 4, 7, NORTH ; OWMAP_GR_CHALLENGE_HALL
db $39, 4, 7, NORTH ; OWMAP_GR_GRASS_FORT
@@ -744,7 +744,7 @@ GRIslandLocationPositions:
; x, y
db $18, $b0 ; OWMAP_GR_AIRPORT
db $88, $08 ; OWMAP_ISHIHARAS_VILLA
db $38, $c0 ; OWMAP_ARCADE
db $38, $c0 ; OWMAP_GAME_CENTER
db $10, $80 ; OWMAP_SEALED_FORT
db $68, $60 ; OWMAP_GR_CHALLENGE_HALL
db $3c, $88 ; OWMAP_GR_GRASS_FORT
@@ -759,7 +759,7 @@ GRIslandLocationPositions:
Data_3056a:
db 0, $00, $60, $00 ; OWMAP_GR_AIRPORT
db 2, $30, $00, $00 ; OWMAP_ISHIHARAS_VILLA
db 0, $00, $60, $00 ; OWMAP_ARCADE
db 0, $00, $60, $00 ; OWMAP_GAME_CENTER
db 0, $00, $60, $00 ; OWMAP_SEALED_FORT
db 1, $20, $30, $00 ; OWMAP_GR_CHALLENGE_HALL
db 0, $00, $60, $00 ; OWMAP_GR_GRASS_FORT
@@ -774,7 +774,7 @@ Data_3056a:
GRIslandMovementCommands:
dw .GRAirport ; OWMAP_GR_AIRPORT
dw .IshiharasVilla ; OWMAP_ISHIHARAS_VILLA
dw .Arcade ; OWMAP_ARCADE
dw .GameCenter ; OWMAP_GAME_CENTER
dw .SealedFort ; OWMAP_SEALED_FORT
dw .GRChallengeHall ; OWMAP_GR_CHALLENGE_HALL
dw .GRGrassFort ; OWMAP_GR_GRASS_FORT
@@ -789,7 +789,7 @@ GRIslandMovementCommands:
.GRAirport:
dw NULL ; OWMAP_GR_AIRPORT
dw $470a ; OWMAP_ISHIHARAS_VILLA
dw $4724 ; OWMAP_ARCADE
dw $4724 ; OWMAP_GAME_CENTER
dw $472a ; OWMAP_SEALED_FORT
dw $4732 ; OWMAP_GR_CHALLENGE_HALL
dw $4740 ; OWMAP_GR_GRASS_FORT
@@ -804,7 +804,7 @@ GRIslandMovementCommands:
.IshiharasVilla:
dw $47d4 ; OWMAP_GR_AIRPORT
dw NULL ; OWMAP_ISHIHARAS_VILLA
dw $47ee ; OWMAP_ARCADE
dw $47ee ; OWMAP_GAME_CENTER
dw $480c ; OWMAP_SEALED_FORT
dw $482a ; OWMAP_GR_CHALLENGE_HALL
dw $4836 ; OWMAP_GR_GRASS_FORT
@@ -816,10 +816,10 @@ GRIslandMovementCommands:
dw $488c ; OWMAP_COLORLESS_ALTAR
dw $4896 ; OWMAP_GR_CASTLE
.Arcade:
.GameCenter:
dw $489e ; OWMAP_GR_AIRPORT
dw $48a4 ; OWMAP_ISHIHARAS_VILLA
dw NULL ; OWMAP_ARCADE
dw NULL ; OWMAP_GAME_CENTER
dw $48c0 ; OWMAP_SEALED_FORT
dw $48cc ; OWMAP_GR_CHALLENGE_HALL
dw $48de ; OWMAP_GR_GRASS_FORT
@@ -834,7 +834,7 @@ GRIslandMovementCommands:
.SealedFort:
dw $4992 ; OWMAP_GR_AIRPORT
dw $499a ; OWMAP_ISHIHARAS_VILLA
dw $49b6 ; OWMAP_ARCADE
dw $49b6 ; OWMAP_GAME_CENTER
dw NULL ; OWMAP_SEALED_FORT
dw $49c2 ; OWMAP_GR_CHALLENGE_HALL
dw $49d4 ; OWMAP_GR_GRASS_FORT
@@ -849,7 +849,7 @@ GRIslandMovementCommands:
.GRChallengeHall:
dw $4a88 ; OWMAP_GR_AIRPORT
dw $4a98 ; OWMAP_ISHIHARAS_VILLA
dw $4aa4 ; OWMAP_ARCADE
dw $4aa4 ; OWMAP_GAME_CENTER
dw $4ab8 ; OWMAP_SEALED_FORT
dw NULL ; OWMAP_GR_CHALLENGE_HALL
dw $4acc ; OWMAP_GR_GRASS_FORT
@@ -864,7 +864,7 @@ GRIslandMovementCommands:
.GRGrassFort:
dw $4b12 ; OWMAP_GR_AIRPORT
dw $4b1a ; OWMAP_ISHIHARAS_VILLA
dw $4b2e ; OWMAP_ARCADE
dw $4b2e ; OWMAP_GAME_CENTER
dw $4b3a ; OWMAP_SEALED_FORT
dw $4b46 ; OWMAP_GR_CHALLENGE_HALL
dw NULL ; OWMAP_GR_GRASS_FORT
@@ -879,7 +879,7 @@ GRIslandMovementCommands:
.GRLightningFort:
dw $4bc0 ; OWMAP_GR_AIRPORT
dw $4bd0 ; OWMAP_ISHIHARAS_VILLA
dw $4bdc ; OWMAP_ARCADE
dw $4bdc ; OWMAP_GAME_CENTER
dw $4bf0 ; OWMAP_SEALED_FORT
dw $50a4 ; OWMAP_GR_CHALLENGE_HALL
dw $4c04 ; OWMAP_GR_GRASS_FORT
@@ -894,7 +894,7 @@ GRIslandMovementCommands:
.GRFireFort:
dw $4c50 ; OWMAP_GR_AIRPORT
dw $4c64 ; OWMAP_ISHIHARAS_VILLA
dw $4c74 ; OWMAP_ARCADE
dw $4c74 ; OWMAP_GAME_CENTER
dw $4c8c ; OWMAP_SEALED_FORT
dw $4ca4 ; OWMAP_GR_CHALLENGE_HALL
dw $4cac ; OWMAP_GR_GRASS_FORT
@@ -909,7 +909,7 @@ GRIslandMovementCommands:
.GRWaterFort:
dw $4d0c ; OWMAP_GR_AIRPORT
dw $4d1e ; OWMAP_ISHIHARAS_VILLA
dw $4d2e ; OWMAP_ARCADE
dw $4d2e ; OWMAP_GAME_CENTER
dw $4d44 ; OWMAP_SEALED_FORT
dw $4d5a ; OWMAP_GR_CHALLENGE_HALL
dw $4d62 ; OWMAP_GR_GRASS_FORT
@@ -924,7 +924,7 @@ GRIslandMovementCommands:
.GRFightingFort:
dw $4dc0 ; OWMAP_GR_AIRPORT
dw $4dd4 ; OWMAP_ISHIHARAS_VILLA
dw $4dde ; OWMAP_ARCADE
dw $4dde ; OWMAP_GAME_CENTER
dw $4df6 ; OWMAP_SEALED_FORT
dw $4e0e ; OWMAP_GR_CHALLENGE_HALL
dw $4e14 ; OWMAP_GR_GRASS_FORT
@@ -939,7 +939,7 @@ GRIslandMovementCommands:
.GRPsychicStronghold:
dw $4e60 ; OWMAP_GR_AIRPORT
dw $4e78 ; OWMAP_ISHIHARAS_VILLA
dw $4e80 ; OWMAP_ARCADE
dw $4e80 ; OWMAP_GAME_CENTER
dw $4e9c ; OWMAP_SEALED_FORT
dw $4eb8 ; OWMAP_GR_CHALLENGE_HALL
dw $4ec2 ; OWMAP_GR_GRASS_FORT
@@ -954,7 +954,7 @@ GRIslandMovementCommands:
.ColorlessAltar:
dw $4f0e ; OWMAP_GR_AIRPORT
dw $4f2c ; OWMAP_ISHIHARAS_VILLA
dw $4f38 ; OWMAP_ARCADE
dw $4f38 ; OWMAP_GAME_CENTER
dw $4f5a ; OWMAP_SEALED_FORT
dw $4f7c ; OWMAP_GR_CHALLENGE_HALL
dw $4f8c ; OWMAP_GR_GRASS_FORT
@@ -969,7 +969,7 @@ GRIslandMovementCommands:
.GRCastle:
dw $4ff6 ; OWMAP_GR_AIRPORT
dw $500e ; OWMAP_ISHIHARAS_VILLA
dw $5016 ; OWMAP_ARCADE
dw $5016 ; OWMAP_GAME_CENTER
dw $5032 ; OWMAP_SEALED_FORT
dw $504e ; OWMAP_GR_CHALLENGE_HALL
dw $5058 ; OWMAP_GR_GRASS_FORT
+1 -1
View File
@@ -16,7 +16,7 @@ Prologue::
; load map and fade in
ld a, MUSIC_HERECOMESGR
farcall PlayAfterCurrentSong
ld bc, OVERWORLD_MAP
ld bc, OVERWORLD_MAP_TCG
farcall LoadOWMap
ld bc, TILEMAP_001
lb de, 0, 0
+1 -1
View File
@@ -1,7 +1,7 @@
SECTION "Bank 10@4462", ROMX[$4462], BANK[$10]
Data_40462:
db OVERWORLD_MAP
db OVERWORLD_MAP_TCG
dba Data_40467
db $09
+121 -121
View File
@@ -842,127 +842,127 @@ _LoadOWObject:
SECTION "Bank 4B@707f", ROMX[$707f], BANK[$4b]
Data_12f07f:
dw TILESET_MARK, SPRITE_ANIM_67, OWFRAMEGROUP_0E ; $000
dw TILESET_MINT, SPRITE_ANIM_68, OWFRAMEGROUP_0F ; $001
dw TILESET_DR_MASON, SPRITE_ANIM_62, OWFRAMEGROUP_2F ; $002
dw TILESET_RONALD, SPRITE_ANIM_62, OWFRAMEGROUP_2F ; $003
dw TILESET_ISHIHARA, SPRITE_ANIM_63, OWFRAMEGROUP_30 ; $004
dw TILESET_IMAKUNI_BLACK, SPRITE_ANIM_62, OWFRAMEGROUP_2F ; $005
dw TILESET_IMAKUNI_RED, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; $006
dw TILESET_ISAAC, SPRITE_ANIM_65, OWFRAMEGROUP_32 ; $007
dw TILESET_MURRAY, SPRITE_ANIM_63, OWFRAMEGROUP_30 ; $008
dw TILESET_GENE, SPRITE_ANIM_61, OWFRAMEGROUP_2E ; $009
dw TILESET_MITCH, SPRITE_ANIM_61, OWFRAMEGROUP_2E ; $00A
dw TILESET_NIKKI, SPRITE_ANIM_69, OWFRAMEGROUP_10 ; $00B
dw TILESET_RICK, SPRITE_ANIM_61, OWFRAMEGROUP_2E ; $00C
dw TILESET_AMY, SPRITE_ANIM_6A, OWFRAMEGROUP_11 ; $00D
dw TILESET_AMY_COPY, SPRITE_ANIM_6B, OWFRAMEGROUP_12 ; $00E
dw TILESET_SARA, SPRITE_ANIM_62, OWFRAMEGROUP_2F ; $00F
dw TILESET_AMANDA, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; $010
dw TILESET_KEN, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; $011
dw TILESET_COURTNEY, SPRITE_ANIM_66, OWFRAMEGROUP_33 ; $012
dw TILESET_STEVE, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; $013
dw TILESET_JACK, SPRITE_ANIM_61, OWFRAMEGROUP_2E ; $014
dw TILESET_ROD, SPRITE_ANIM_6C, OWFRAMEGROUP_13 ; $015
dw TILESET_EIJI, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; $016
dw TILESET_MAGICIAN, SPRITE_ANIM_6D, OWFRAMEGROUP_14 ; $017
dw TILESET_TOSHIRON, SPRITE_ANIM_64, OWFRAMEGROUP_31 ; $018
dw TILESET_PIERROT, SPRITE_ANIM_6E, OWFRAMEGROUP_15 ; $019
dw TILESET_ANNA, SPRITE_ANIM_6F, OWFRAMEGROUP_16 ; $01A
dw TILESET_DEE, SPRITE_ANIM_62, OWFRAMEGROUP_2F ; $01B
dw TILESET_MASQUERADE, SPRITE_ANIM_63, OWFRAMEGROUP_30 ; $01C
dw TILESET_PAWN, SPRITE_ANIM_63, OWFRAMEGROUP_30 ; $01D
dw TILESET_KNIGHT, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; $01E
dw TILESET_BISHOP, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; $01F
dw TILESET_ROOK, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; $020
dw TILESET_QUEEN, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; $021
dw TILESET_GR_1, SPRITE_ANIM_65, OWFRAMEGROUP_32 ; $022
dw TILESET_GR_2, SPRITE_ANIM_61, OWFRAMEGROUP_2E ; $023
dw TILESET_GR_3, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; $024
dw TILESET_GR_4, SPRITE_ANIM_63, OWFRAMEGROUP_30 ; $025
dw TILESET_GR_5, SPRITE_ANIM_64, OWFRAMEGROUP_31 ; $026
dw TILESET_MIDORI, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; $027
dw TILESET_MORINO, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; $028
dw TILESET_RENNA, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; $029
dw TILESET_ICHIKAWA, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; $02A
dw TILESET_CATHERINE, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; $02B
dw TILESET_JES, SPRITE_ANIM_61, OWFRAMEGROUP_2E ; $02C
dw TILESET_YUKI, SPRITE_ANIM_62, OWFRAMEGROUP_2F ; $02D
dw TILESET_SHOKO, SPRITE_ANIM_70, OWFRAMEGROUP_17 ; $02E
dw TILESET_HIDERO, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; $02F
dw TILESET_AIRA, SPRITE_ANIM_71, OWFRAMEGROUP_18 ; $030
dw TILESET_KANOKO, SPRITE_ANIM_66, OWFRAMEGROUP_33 ; $031
dw TILESET_GODA, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; $032
dw TILESET_GRACE, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; $033
dw TILESET_KAMIYA, SPRITE_ANIM_72, OWFRAMEGROUP_19 ; $034
dw TILESET_MIWA, SPRITE_ANIM_73, OWFRAMEGROUP_1A ; $035
dw TILESET_KEVIN, SPRITE_ANIM_74, OWFRAMEGROUP_1B ; $036
dw TILESET_YOSUKE, SPRITE_ANIM_75, OWFRAMEGROUP_1C ; $037
dw TILESET_RYOKO, SPRITE_ANIM_76, OWFRAMEGROUP_1D ; $038
dw TILESET_MAMI, SPRITE_ANIM_77, OWFRAMEGROUP_1E ; $039
dw TILESET_NISHIJIMA, SPRITE_ANIM_61, OWFRAMEGROUP_2E ; $03A
dw TILESET_ISHII, SPRITE_ANIM_61, OWFRAMEGROUP_2E ; $03B
dw TILESET_SAMEJIMA, SPRITE_ANIM_78, OWFRAMEGROUP_1F ; $03C
dw TILESET_KANZAKI, SPRITE_ANIM_79, OWFRAMEGROUP_20 ; $03D
dw TILESET_RUI, SPRITE_ANIM_7A, OWFRAMEGROUP_21 ; $03E
dw TILESET_BIRURITCHI, SPRITE_ANIM_63, OWFRAMEGROUP_30 ; $03F
dw TILESET_GR_X, SPRITE_ANIM_64, OWFRAMEGROUP_31 ; $040
dw TILESET_TOBI_CHAN, SPRITE_ANIM_7B, OWFRAMEGROUP_22 ; $041
dw TILESET_YOUNGSTER, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; $042
dw TILESET_LAD, SPRITE_ANIM_65, OWFRAMEGROUP_32 ; $043
dw TILESET_SPECS, SPRITE_ANIM_63, OWFRAMEGROUP_30 ; $044
dw TILESET_BUTCH, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; $045
dw TILESET_MANIA, SPRITE_ANIM_61, OWFRAMEGROUP_2E ; $046
dw TILESET_JOSHUA, SPRITE_ANIM_61, OWFRAMEGROUP_2E ; $047
dw TILESET_HOOD, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; $048
dw TILESET_TECH, SPRITE_ANIM_62, OWFRAMEGROUP_2F ; $049
dw TILESET_CHAP, SPRITE_ANIM_65, OWFRAMEGROUP_32 ; $04A
dw TILESET_MAN, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; $04B
dw TILESET_PAPPY, SPRITE_ANIM_63, OWFRAMEGROUP_30 ; $04C
dw TILESET_GAMBLER, SPRITE_ANIM_62, OWFRAMEGROUP_2F ; $04D
dw TILESET_GR_LAD, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; $04E
dw TILESET_GR_CHAP, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; $04F
dw TILESET_MIYAJIMA, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; $050
dw TILESET_GR_PAPPY, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; $051
dw TILESET_DEALER_BOY, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; $052
dw TILESET_MONOCLE, SPRITE_ANIM_7C, OWFRAMEGROUP_23 ; $053
dw TILESET_GIRL, SPRITE_ANIM_62, OWFRAMEGROUP_2F ; $054
dw TILESET_LASS1, SPRITE_ANIM_63, OWFRAMEGROUP_30 ; $055
dw TILESET_LASS2, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; $056
dw TILESET_LASS3, SPRITE_ANIM_65, OWFRAMEGROUP_32 ; $057
dw TILESET_SWIMMER, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; $058
dw TILESET_GAL, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; $059
dw TILESET_WOMAN, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; $05A
dw TILESET_GRANNY, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; $05B
dw TILESET_GR_STAFF, SPRITE_ANIM_62, OWFRAMEGROUP_2F ; $05C
dw TILESET_GR_LASS, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; $05D
dw TILESET_GR_GAL, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; $05E
dw TILESET_GR_WOMAN, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; $05F
dw TILESET_GR_GRANNY, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; $060
dw TILESET_CHIP_GIRL, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; $061
dw TILESET_DEALER_GIRL, SPRITE_ANIM_63, OWFRAMEGROUP_30 ; $062
dw TILESET_CLERK, SPRITE_ANIM_7D, OWFRAMEGROUP_24 ; $063
dw TILESET_GR_CLERK, SPRITE_ANIM_7E, OWFRAMEGROUP_25 ; $064
dw TILESET_CAPTURED_AMY, SPRITE_ANIM_7F, OWFRAMEGROUP_26 ; $065
dw TILESET_CAPTURED_SARA, SPRITE_ANIM_80, OWFRAMEGROUP_27 ; $066
dw TILESET_CAPTURED_AMANDA, SPRITE_ANIM_81, OWFRAMEGROUP_28 ; $067
dw TILESET_WARP_SPARKLES, SPRITE_ANIM_82, OWFRAMEGROUP_29 ; $068
dw TILESET_GR_BLIMP, SPRITE_ANIM_83, OWFRAMEGROUP_2A ; $069
dw TILESET_TRACTOR_BEAM, SPRITE_ANIM_84, OWFRAMEGROUP_2B ; $06A
dw TILESET_TCG_OAM, SPRITE_ANIM_86, OWFRAMEGROUP_00 ; $06B
dw TILESET_TCG_OAM, SPRITE_ANIM_86, OWFRAMEGROUP_01 ; $06C
dw TILESET_GR_OAM, SPRITE_ANIM_87, OWFRAMEGROUP_02 ; $06D
dw TILESET_GR_OAM, SPRITE_ANIM_88, OWFRAMEGROUP_03 ; $06E
dw TILESET_GR_OAM, SPRITE_ANIM_89, OWFRAMEGROUP_04 ; $06F
dw TILESET_GR_OAM, SPRITE_ANIM_8A, OWFRAMEGROUP_05 ; $070
dw TILESET_CHEST, SPRITE_ANIM_8D, OWFRAMEGROUP_0A ; $071
dw TILESET_CHEST, SPRITE_ANIM_8D, OWFRAMEGROUP_0B ; $072
dw TILESET_POD_DOORS, SPRITE_ANIM_8E, OWFRAMEGROUP_0C ; $073
dw TILESET_PLATFORM, SPRITE_ANIM_90, OWFRAMEGROUP_0D ; $074
dw TILESET_COINS_FORT, SPRITE_ANIM_8B, OWFRAMEGROUP_06 ; $075
dw TILESET_COINS_FORT, SPRITE_ANIM_8B, OWFRAMEGROUP_07 ; $076
dw TILESET_COINS_CASTLE, SPRITE_ANIM_8C, OWFRAMEGROUP_08 ; $077
dw TILESET_COINS_CASTLE, SPRITE_ANIM_8C, OWFRAMEGROUP_09 ; $078
dw TILESET_MARK, SPRITE_ANIM_67, OWFRAMEGROUP_0E ; OWSPRITE_MARK
dw TILESET_MINT, SPRITE_ANIM_68, OWFRAMEGROUP_0F ; OWSPRITE_MINT
dw TILESET_DR_MASON, SPRITE_ANIM_62, OWFRAMEGROUP_2F ; OWSPRITE_DR_MASON
dw TILESET_RONALD, SPRITE_ANIM_62, OWFRAMEGROUP_2F ; OWSPRITE_RONALD
dw TILESET_ISHIHARA, SPRITE_ANIM_63, OWFRAMEGROUP_30 ; OWSPRITE_ISHIHARA
dw TILESET_IMAKUNI_BLACK, SPRITE_ANIM_62, OWFRAMEGROUP_2F ; OWSPRITE_IMAKUNI_BLACK
dw TILESET_IMAKUNI_RED, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; OWSPRITE_IMAKUNI_RED
dw TILESET_ISAAC, SPRITE_ANIM_65, OWFRAMEGROUP_32 ; OWSPRITE_ISAAC
dw TILESET_MURRAY, SPRITE_ANIM_63, OWFRAMEGROUP_30 ; OWSPRITE_MURRAY
dw TILESET_GENE, SPRITE_ANIM_61, OWFRAMEGROUP_2E ; OWSPRITE_GENE
dw TILESET_MITCH, SPRITE_ANIM_61, OWFRAMEGROUP_2E ; OWSPRITE_MITCH
dw TILESET_NIKKI, SPRITE_ANIM_69, OWFRAMEGROUP_10 ; OWSPRITE_NIKKI
dw TILESET_RICK, SPRITE_ANIM_61, OWFRAMEGROUP_2E ; OWSPRITE_RICK
dw TILESET_AMY, SPRITE_ANIM_6A, OWFRAMEGROUP_11 ; OWSPRITE_AMY
dw TILESET_AMY_COPY, SPRITE_ANIM_6B, OWFRAMEGROUP_12 ; OWSPRITE_AMY_COPY
dw TILESET_SARA, SPRITE_ANIM_62, OWFRAMEGROUP_2F ; OWSPRITE_SARA
dw TILESET_AMANDA, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; OWSPRITE_AMANDA
dw TILESET_KEN, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; OWSPRITE_KEN
dw TILESET_COURTNEY, SPRITE_ANIM_66, OWFRAMEGROUP_33 ; OWSPRITE_COURTNEY
dw TILESET_STEVE, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; OWSPRITE_STEVE
dw TILESET_JACK, SPRITE_ANIM_61, OWFRAMEGROUP_2E ; OWSPRITE_JACK
dw TILESET_ROD, SPRITE_ANIM_6C, OWFRAMEGROUP_13 ; OWSPRITE_ROD
dw TILESET_EIJI, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; OWSPRITE_EIJI
dw TILESET_MAGICIAN, SPRITE_ANIM_6D, OWFRAMEGROUP_14 ; OWSPRITE_MAGICIAN
dw TILESET_TOSHIRON, SPRITE_ANIM_64, OWFRAMEGROUP_31 ; OWSPRITE_TOSHIRON
dw TILESET_PIERROT, SPRITE_ANIM_6E, OWFRAMEGROUP_15 ; OWSPRITE_PIERROT
dw TILESET_ANNA, SPRITE_ANIM_6F, OWFRAMEGROUP_16 ; OWSPRITE_ANNA
dw TILESET_DEE, SPRITE_ANIM_62, OWFRAMEGROUP_2F ; OWSPRITE_DEE
dw TILESET_MASQUERADE, SPRITE_ANIM_63, OWFRAMEGROUP_30 ; OWSPRITE_MASQUERADE
dw TILESET_PAWN, SPRITE_ANIM_63, OWFRAMEGROUP_30 ; OWSPRITE_PAWN
dw TILESET_KNIGHT, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; OWSPRITE_KNIGHT
dw TILESET_BISHOP, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; OWSPRITE_BISHOP
dw TILESET_ROOK, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; OWSPRITE_ROOK
dw TILESET_QUEEN, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; OWSPRITE_QUEEN
dw TILESET_GR_1, SPRITE_ANIM_65, OWFRAMEGROUP_32 ; OWSPRITE_GR_1
dw TILESET_GR_2, SPRITE_ANIM_61, OWFRAMEGROUP_2E ; OWSPRITE_GR_2
dw TILESET_GR_3, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; OWSPRITE_GR_3
dw TILESET_GR_4, SPRITE_ANIM_63, OWFRAMEGROUP_30 ; OWSPRITE_GR_4
dw TILESET_GR_5, SPRITE_ANIM_64, OWFRAMEGROUP_31 ; OWSPRITE_GR_5
dw TILESET_MIDORI, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; OWSPRITE_MIDORI
dw TILESET_MORINO, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; OWSPRITE_MORINO
dw TILESET_RENNA, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; OWSPRITE_RENNA
dw TILESET_ICHIKAWA, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; OWSPRITE_ICHIKAWA
dw TILESET_CATHERINE, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; OWSPRITE_CATHERINE
dw TILESET_JES, SPRITE_ANIM_61, OWFRAMEGROUP_2E ; OWSPRITE_JES
dw TILESET_YUKI, SPRITE_ANIM_62, OWFRAMEGROUP_2F ; OWSPRITE_YUKI
dw TILESET_SHOKO, SPRITE_ANIM_70, OWFRAMEGROUP_17 ; OWSPRITE_SHOKO
dw TILESET_HIDERO, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; OWSPRITE_HIDERO
dw TILESET_AIRA, SPRITE_ANIM_71, OWFRAMEGROUP_18 ; OWSPRITE_AIRA
dw TILESET_KANOKO, SPRITE_ANIM_66, OWFRAMEGROUP_33 ; OWSPRITE_KANOKO
dw TILESET_GODA, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; OWSPRITE_GODA
dw TILESET_GRACE, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; OWSPRITE_GRACE
dw TILESET_KAMIYA, SPRITE_ANIM_72, OWFRAMEGROUP_19 ; OWSPRITE_KAMIYA
dw TILESET_MIWA, SPRITE_ANIM_73, OWFRAMEGROUP_1A ; OWSPRITE_MIWA
dw TILESET_KEVIN, SPRITE_ANIM_74, OWFRAMEGROUP_1B ; OWSPRITE_KEVIN
dw TILESET_YOSUKE, SPRITE_ANIM_75, OWFRAMEGROUP_1C ; OWSPRITE_YOSUKE
dw TILESET_RYOKO, SPRITE_ANIM_76, OWFRAMEGROUP_1D ; OWSPRITE_RYOKO
dw TILESET_MAMI, SPRITE_ANIM_77, OWFRAMEGROUP_1E ; OWSPRITE_MAMI
dw TILESET_NISHIJIMA, SPRITE_ANIM_61, OWFRAMEGROUP_2E ; OWSPRITE_NISHIJIMA
dw TILESET_ISHII, SPRITE_ANIM_61, OWFRAMEGROUP_2E ; OWSPRITE_ISHII
dw TILESET_SAMEJIMA, SPRITE_ANIM_78, OWFRAMEGROUP_1F ; OWSPRITE_SAMEJIMA
dw TILESET_KANZAKI, SPRITE_ANIM_79, OWFRAMEGROUP_20 ; OWSPRITE_KANZAKI
dw TILESET_RUI, SPRITE_ANIM_7A, OWFRAMEGROUP_21 ; OWSPRITE_RUI
dw TILESET_BIRURITCHI, SPRITE_ANIM_63, OWFRAMEGROUP_30 ; OWSPRITE_BIRURITCHI
dw TILESET_GR_X, SPRITE_ANIM_64, OWFRAMEGROUP_31 ; OWSPRITE_GR_X
dw TILESET_TOBI_CHAN, SPRITE_ANIM_7B, OWFRAMEGROUP_22 ; OWSPRITE_TOBI_CHAN
dw TILESET_YOUNGSTER, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; OWSPRITE_YOUNGSTER
dw TILESET_LAD, SPRITE_ANIM_65, OWFRAMEGROUP_32 ; OWSPRITE_LAD
dw TILESET_SPECS, SPRITE_ANIM_63, OWFRAMEGROUP_30 ; OWSPRITE_SPECS
dw TILESET_BUTCH, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; OWSPRITE_BUTCH
dw TILESET_MANIA, SPRITE_ANIM_61, OWFRAMEGROUP_2E ; OWSPRITE_MANIA
dw TILESET_JOSHUA, SPRITE_ANIM_61, OWFRAMEGROUP_2E ; OWSPRITE_JOSHUA
dw TILESET_HOOD, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; OWSPRITE_HOOD
dw TILESET_TECH, SPRITE_ANIM_62, OWFRAMEGROUP_2F ; OWSPRITE_TECH
dw TILESET_CHAP, SPRITE_ANIM_65, OWFRAMEGROUP_32 ; OWSPRITE_CHAP
dw TILESET_MAN, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; OWSPRITE_MAN
dw TILESET_PAPPY, SPRITE_ANIM_63, OWFRAMEGROUP_30 ; OWSPRITE_PAPPY
dw TILESET_GAMBLER, SPRITE_ANIM_62, OWFRAMEGROUP_2F ; OWSPRITE_GAMBLER
dw TILESET_GR_LAD, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; OWSPRITE_GR_LAD
dw TILESET_GR_CHAP, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; OWSPRITE_GR_CHAP
dw TILESET_MIYAJIMA, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; OWSPRITE_MIYAJIMA
dw TILESET_GR_PAPPY, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; OWSPRITE_GR_PAPPY
dw TILESET_DEALER_BOY, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; OWSPRITE_DEALER_BOY
dw TILESET_MONOCLE, SPRITE_ANIM_7C, OWFRAMEGROUP_23 ; OWSPRITE_MONOCLE
dw TILESET_GIRL, SPRITE_ANIM_62, OWFRAMEGROUP_2F ; OWSPRITE_GIRL
dw TILESET_LASS1, SPRITE_ANIM_63, OWFRAMEGROUP_30 ; OWSPRITE_LASS1
dw TILESET_LASS2, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; OWSPRITE_LASS2
dw TILESET_LASS3, SPRITE_ANIM_65, OWFRAMEGROUP_32 ; OWSPRITE_LASS3
dw TILESET_SWIMMER, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; OWSPRITE_SWIMMER
dw TILESET_GAL, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; OWSPRITE_GAL
dw TILESET_WOMAN, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; OWSPRITE_WOMAN
dw TILESET_GRANNY, SPRITE_ANIM_60, OWFRAMEGROUP_2D ; OWSPRITE_GRANNY
dw TILESET_GR_STAFF, SPRITE_ANIM_62, OWFRAMEGROUP_2F ; OWSPRITE_GR_STAFF
dw TILESET_GR_LASS, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; OWSPRITE_GR_LASS
dw TILESET_GR_GAL, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; OWSPRITE_GR_GAL
dw TILESET_GR_WOMAN, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; OWSPRITE_GR_WOMAN
dw TILESET_GR_GRANNY, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; OWSPRITE_GR_GRANNT
dw TILESET_CHIP_GIRL, SPRITE_ANIM_5F, OWFRAMEGROUP_2C ; OWSPRITE_CHIP_GIRL
dw TILESET_DEALER_GIRL, SPRITE_ANIM_63, OWFRAMEGROUP_30 ; OWSPRITE_DEALER_GIRL
dw TILESET_CLERK, SPRITE_ANIM_7D, OWFRAMEGROUP_24 ; OWSPRITE_CLERK
dw TILESET_GR_CLERK, SPRITE_ANIM_7E, OWFRAMEGROUP_25 ; OWSPRITE_GR_GIRL
dw TILESET_CAPTURED_AMY, SPRITE_ANIM_7F, OWFRAMEGROUP_26 ; OWSPRITE_CAPTURED_AMY
dw TILESET_CAPTURED_SARA, SPRITE_ANIM_80, OWFRAMEGROUP_27 ; OWSPRITE_CAPTURED_SARA
dw TILESET_CAPTURED_AMANDA, SPRITE_ANIM_81, OWFRAMEGROUP_28 ; OWSPRITE_CAPTURED_AMANDA
dw TILESET_WARP_SPARKLES, SPRITE_ANIM_82, OWFRAMEGROUP_29 ; OWSPRITE_WARP_SPARKLES
dw TILESET_GR_BLIMP, SPRITE_ANIM_83, OWFRAMEGROUP_2A ; OWSPRITE_GR_BLIMP
dw TILESET_TRACTOR_BEAM, SPRITE_ANIM_84, OWFRAMEGROUP_2B ; OWSPRITE_TRACTOR_BEAM
dw TILESET_TCG_OAM, SPRITE_ANIM_86, OWFRAMEGROUP_00 ; OWSPRITE_VOLCANO_SMOKE_TCG
dw TILESET_TCG_OAM, SPRITE_ANIM_86, OWFRAMEGROUP_01 ; OWSPRITE_CURSOR_TCG
dw TILESET_GR_OAM, SPRITE_ANIM_87, OWFRAMEGROUP_02 ; OWSPRITE_VOLCANO_SMOKE_GR
dw TILESET_GR_OAM, SPRITE_ANIM_88, OWFRAMEGROUP_03 ; OWSPRITE_GR_CASTLE_FLAG
dw TILESET_GR_OAM, SPRITE_ANIM_89, OWFRAMEGROUP_04 ; OWSPRITE_CURSOR_GR
dw TILESET_GR_OAM, SPRITE_ANIM_8A, OWFRAMEGROUP_05 ; OWSPRITE_GR_CROSS
dw TILESET_CHEST, SPRITE_ANIM_8D, OWFRAMEGROUP_0A ; OWSPRITE_CHEST_CLOSED
dw TILESET_CHEST, SPRITE_ANIM_8D, OWFRAMEGROUP_0B ; OWSPRITE_CHEST_OPENED
dw TILESET_POD_DOORS, SPRITE_ANIM_8E, OWFRAMEGROUP_0C ; OWSPRITE_POD_DOORS
dw TILESET_PLATFORM, SPRITE_ANIM_90, OWFRAMEGROUP_0D ; OWSPRITE_STRONGHOLD_PLATFORM
dw TILESET_COINS_FORT, SPRITE_ANIM_8B, OWFRAMEGROUP_06 ; OWSPRITE_RED_FORT_COIN
dw TILESET_COINS_FORT, SPRITE_ANIM_8B, OWFRAMEGROUP_07 ; OWSPRITE_BLUE_FORT_COIN
dw TILESET_COINS_CASTLE, SPRITE_ANIM_8C, OWFRAMEGROUP_08 ; OWSPRITE_WHITE_CASTLE_COIN
dw TILESET_COINS_CASTLE, SPRITE_ANIM_8C, OWFRAMEGROUP_09 ; OWSPRITE_PURPLE_CASTLE_COIN
OWObjectFramesets:
; north, east, south, west
+37 -37
View File
@@ -57,43 +57,43 @@ _LoadScene::
ret
SceneDataPointers:
dw .SceneSpecialRules ; $00
dw .SceneSlotMachine ; $01
dw .SceneBeginningPack ; $02
dw .SceneLegendaryPack ; $03
dw .SceneFossilPack ; $04
dw .ScenePsychicPack ; $05
dw .SceneFlyingPack ; $06
dw .SceneRocketPack ; $07
dw .SceneAmbitionPack ; $08
dw .ScenePresentPack ; $09
dw .SceneIntroBaseSet ; $0A
dw .SceneIntroJungle ; $0B
dw .SceneIntroFossil ; $0C
dw .SceneIntroTeamRocket ; $0D
dw .SceneTournamentTable ; $0E
dw .SceneCardPopMenu ; $0F
dw .SceneCardPop ; $10
dw .SceneCardPopError ; $11
dw .SceneLink ; $12
dw .SceneRareCardPop ; $13
dw .SceneRareCardPopError ; $14
dw .SceneBlackBox ; $15
dw .SceneTitleScreen1 ; $16
dw .SceneTitleScreen2 ; $17
dw .SceneTitleScreen3 ; $18
dw .SceneTitleScreen4 ; $19
dw .ScenePrinter1 ; $1A
dw .ScenePrinter2 ; $1B
dw .SceneFullMailbox ; $1C
dw .SceneGotMail ; $1D
dw .SceneMailbox ; $1E
dw .SceneDeckDiagnosis ; $1F
dw .SceneLinkIntro1 ; $20
dw .SceneLinkIntro2 ; $21
dw .SceneCoinTossResult1 ; $22
dw .SceneCoinTossResult2 ; $23
dw .SceneGBCOnlyDisclaimer ; $24
dw .SceneSpecialRules ; SCENE_SPECIAL_RULES
dw .SceneSlotMachine ; SCENE_SLOT_MACHINE
dw .SceneBeginningPack ; SCENE_BEGINNING_PACK
dw .SceneLegendaryPack ; SCENE_LEGENDARY_PACK
dw .SceneFossilPack ; SCENE_FOSSIL_PACK
dw .ScenePsychicPack ; SCENE_PSYCHIC_PACK
dw .SceneFlyingPack ; SCENE_FLYING_PACK
dw .SceneRocketPack ; SCENE_ROCKET_PACK
dw .SceneAmbitionPack ; SCENE_AMBITION_PACK
dw .ScenePresentPack ; SCENE_PRESENT_PACK
dw .SceneIntroBaseSet ; SCENE_INTRO_BASE_SET
dw .SceneIntroJungle ; SCENE_INTRO_JUNGLE
dw .SceneIntroFossil ; SCENE_INTRO_FOSSIL
dw .SceneIntroTeamRocket ; SCENE_INTRO_TEAM_ROCKET
dw .SceneTournamentTable ; SCENE_TOURNAMENT_TABLE
dw .SceneCardPopMenu ; SCENE_CARD_POP_MENU
dw .SceneCardPop ; SCENE_CARD_POP
dw .SceneCardPopError ; SCENE_CARD_POP_ERROR
dw .SceneLink ; SCENE_LINK
dw .SceneRareCardPop ; SCENE_RARE_CARD_POP
dw .SceneRareCardPopError ; SCENE_RARE_CARD_POP_ERRORR
dw .SceneBlackBox ; SCENE_BLACK_BOX
dw .SceneTitleScreen1 ; SCENE_TITLE_SCREEN_1
dw .SceneTitleScreen2 ; SCENE_TITLE_SCREEN_2
dw .SceneTitleScreen3 ; SCENE_TITLE_SCREEN_3
dw .SceneTitleScreen4 ; SCENE_TITLE_SCREEN_4
dw .ScenePrinter1 ; SCENE_PRINTER_1
dw .ScenePrinter2 ; SCENE_PRINTER_2
dw .SceneFullMailbox ; SCENE_FULL_MAILBOX
dw .SceneGotMail ; SCENE_GOT_MAIL
dw .SceneMailbox ; SCENE_MAILBOX
dw .SceneDeckDiagnosis ; SCENE_DECK_DIAGNOSIS
dw .SceneLinkIntro1 ; SCENE_LINK_INTRO_1
dw .SceneLinkIntro2 ; SCENE_LINK_INTRO_2
dw .SceneCoinTossResult1 ; SCENE_COIN_TOSS_RESULT_1
dw .SceneCoinTossResult2 ; SCENE_COIN_TOSS_RESULT_2
dw .SceneGBCOnlyDisclaimer ; SCENE_GBC_ONLY_DISCLAIMER
.SceneSpecialRules
dw TILESET_SPECIAL_RULES