From 33aa25af7f4239a912d5a9b567586172312c831d Mon Sep 17 00:00:00 2001 From: Electro Date: Tue, 22 Jul 2025 11:24:53 +0100 Subject: [PATCH] Use hardware.inc --- CONTRIBUTING.md | 19 +- bugs_and_glitches.md | 132 +- src/audio/music1.asm | 202 +- src/audio/music2.asm | 202 +- src/audio/sfx.asm | 38 +- src/constants.asm | 3 +- src/constants/gfx_constants.asm | 14 +- src/constants/hardware.inc | 1065 +++++++ src/constants/hardware_constants.asm | 200 -- src/constants/misc_constants.asm | 34 +- src/data/duel/animations/anims1.asm | 1894 +++++------ src/data/duel/animations/anims2.asm | 2736 ++++++++-------- src/data/duel/animations/anims3.asm | 2802 ++++++++--------- src/data/duel/animations/anims4.asm | 700 ++-- src/engine/bank20.asm | 16 +- src/engine/credits.asm | 10 +- src/engine/debug_sprites.asm | 10 +- src/engine/duel/core.asm | 168 +- src/engine/duel/effect_functions.asm | 12 +- src/engine/game_loop.asm | 2 +- src/engine/gfx/color.asm | 4 +- src/engine/input_name.asm | 36 +- src/engine/intro.asm | 2 +- src/engine/link/ir_core.asm | 22 +- src/engine/link/ir_functions.asm | 4 +- src/engine/link/link_duel.asm | 6 +- src/engine/link/printer.asm | 4 +- src/engine/menus/booster_pack.asm | 2 +- src/engine/menus/card_album.asm | 14 +- src/engine/menus/config.asm | 6 +- src/engine/menus/debug.asm | 2 +- src/engine/menus/deck_check.asm | 12 +- src/engine/menus/deck_configuration.asm | 48 +- src/engine/menus/deck_machine.asm | 14 +- src/engine/menus/deck_selection.asm | 6 +- src/engine/menus/duel.asm | 28 +- src/engine/menus/glossary.asm | 4 +- src/engine/menus/init_menu.asm | 2 +- src/engine/menus/mail.asm | 6 +- src/engine/menus/play_area.asm | 52 +- src/engine/menus/printer.asm | 4 +- src/engine/menus/start.asm | 2 +- src/engine/menus/status.asm | 2 +- src/engine/menus/unknown.asm | 14 +- .../overworld/debug_player_coordinates.asm | 8 +- src/engine/overworld/overworld.asm | 8 +- src/engine/overworld_map.asm | 4 +- src/engine/sgb.asm | 4 +- src/engine/unused_copyright.asm | 2 +- src/engine/unused_save_validation.asm | 14 +- src/home/audio_callback.asm | 4 +- src/home/bg_map.asm | 4 +- src/home/card_data.asm | 2 +- src/home/double_speed.asm | 10 +- src/home/empty_screen.asm | 2 +- src/home/frames.asm | 12 +- src/home/hblank.asm | 8 +- src/home/input.asm | 14 +- src/home/interrupt.asm | 12 +- src/home/lcd.asm | 22 +- src/home/lcd_enable_frame.asm | 2 +- src/home/load_animation.asm | 8 +- src/home/menus.asm | 42 +- src/home/objects.asm | 10 +- src/home/palettes.asm | 6 +- src/home/print_text.asm | 4 +- src/home/process_text.asm | 2 +- src/home/scroll.asm | 12 +- src/home/serial.asm | 6 +- src/home/setup.asm | 14 +- src/home/sgb.asm | 6 +- src/home/sram.asm | 14 +- src/home/switch_rom.asm | 2 +- src/home/text_box.asm | 16 +- src/home/tiles.asm | 4 +- src/home/time.asm | 8 +- src/wram.asm | 8 +- tools/extract_anim_data.py | 10 +- 78 files changed, 5853 insertions(+), 5006 deletions(-) create mode 100644 src/constants/hardware.inc delete mode 100644 src/constants/hardware_constants.asm diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ef1b4c8..3137de5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -124,11 +124,11 @@ Another important thing to document in many cases is the input and output parame More examples below. ```asm -; copies b bytes of data to sp-$1f and to hl, and returns hl += BG_MAP_WIDTH +; copies b bytes of data to sp-$1f and to hl, and returns hl += TILEMAP_WIDTH ; d = value of byte 0 ; e = value of byte b ; a = value of bytes [1, b-1] -; b is supposed to be BG_MAP_WIDTH or smaller, else the stack would get corrupted +; b is supposed to be TILEMAP_WIDTH or smaller, else the stack would get corrupted CopyLine:: ``` @@ -277,7 +277,7 @@ A constant almost never comes alone. For example a single ``BULBASAUR`` or ``BUL There are, however, other cases where individual constants also help improve the readability of the code (or data structure) that is going to use them. Sizes/lengths and maximum values are good examples of this. For example, ``MAX_BENCH_POKEMON``, ``MAX_PLAY_AREA_POKEMON``, ``DECK_SIZE``, or just a generic one like ``SCREEN_WIDTH``. Do this when there are multiple candidates to replace in the code. For example, if a specific feature drew a cursor in screen coordinates 8,9 and nothing else did it, it wouldn't make sense to create a constant like ``FEATURE_X_CURSOR_COORDS`` just to replace those very specific numbers (an inline comment near the instruction might be appropriate instead). -Speaking of generic constants, there are multiple constants already defined for dealing with close-to-hardware stuff that you should be looking to use when appropriate (button constants such as ``A_BUTTON`` are another good examples of this). The already defined text constants (and macros) help dealing with text-related code and data, and are particularly helpful for distinguishing between the different game fonts. +Speaking of generic constants, there are multiple constants already defined for dealing with close-to-hardware stuff that you should be looking to use when appropriate (button constants such as ``PAD_A`` are another good examples of this). The already defined text constants (and macros) help dealing with text-related code and data, and are particularly helpful for distinguishing between the different game fonts. Constants for WRAM address offsets (i.e. for the likes of ``wAddressN - wAddress``) are sometimes a good idea as well, and typically follow the addresses defined in some WRAM macro. For example, look at the constants defined with the previously seen ``card_data_struct`` macro in mind: @@ -296,20 +296,19 @@ DEF PKMN_CARD_DATA_LENGTH EQU $41 Some constants make sense to have as both a value and a flag. Again, button constants are a good example of this. For these, the convention is to use ``CONSTANT_NAME`` for the value, and ``CONSTANT_NAME_F`` for the flag, so you can use either of them depending on the assembly instruction (e.g. ``and CONSTANT_NAME`` or ``bit CONSTANT_NAME_F, a``). For example: ```asm -DEF A_BUTTON_F EQU 0 -DEF B_BUTTON_F EQU 1 + const FIRE ; $00 + const GRASS ; $01 (...) -DEF A_BUTTON EQU 1 << A_BUTTON_F ; $01 -DEF B_BUTTON EQU 1 << B_BUTTON_F ; $02 +DEF FIRE_F EQU $1 << FIRE ; $01 +DEF GRASS_F EQU $1 << GRASS ; $02 (...) ``` -Bit mask constants are also useful if they are used multiple times. Buttons again are a simple enough example to illustrate this: +Bit mask constants are also useful if they are used multiple times. Palette colors are an example to illustrate this: ```asm -DEF BUTTONS EQU A_BUTTON | B_BUTTON | SELECT | START ; $0f -DEF D_PAD EQU D_RIGHT | D_LEFT | D_UP | D_DOWN ; $f0 +DEF PALRGB_WHITE EQU (31 << B_COLOR_BLUE) | (31 << B_COLOR_GREEN) | (31 << B_COLOR_RED) ``` Finally, note that constants that are exclusive to a specific feature or function should generally be local, and thus placed above the code that uses them. This is usually not the case, however, so you should usually be looking to declare them inside the constants/ directory as mentioned before. This kind of refactoring is also more appropriate when the disassembly is in a more advanced state as well. diff --git a/bugs_and_glitches.md b/bugs_and_glitches.md index f6900b4..e943139 100644 --- a/bugs_and_glitches.md +++ b/bugs_and_glitches.md @@ -624,38 +624,38 @@ Characters that are assigned the green NPC palette have incorrect profile frame ```diff .data_a9459 db 4 ; size -- db 0, 0, 6, %011 | (1 << OAM_OBP_NUM) -+ db 0, 0, 12, %011 | (1 << OAM_OBP_NUM) - db 0, 8, 13, %011 | (1 << OAM_OBP_NUM) - db 8, 0, 14, %011 | (1 << OAM_OBP_NUM) - db 8, 8, 15, %011 | (1 << OAM_OBP_NUM) +- db 0, 0, 6, %011 | OAM_PAL1 ++ db 0, 0, 12, %011 | OAM_PAL1 + db 0, 8, 13, %011 | OAM_PAL1 + db 8, 0, 14, %011 | OAM_PAL1 + db 8, 8, 15, %011 | OAM_PAL1 .data_a946a db 4 ; size -- db 0, 0, 8, %011 | (1 << OAM_OBP_NUM) -+ db 0, 0, 16, %011 | (1 << OAM_OBP_NUM) - db 0, 8, 17, %011 | (1 << OAM_OBP_NUM) - db 8, 0, 18, %011 | (1 << OAM_OBP_NUM) - db 8, 8, 19, %011 | (1 << OAM_OBP_NUM) +- db 0, 0, 8, %011 | OAM_PAL1 ++ db 0, 0, 16, %011 | OAM_PAL1 + db 0, 8, 17, %011 | OAM_PAL1 + db 8, 0, 18, %011 | OAM_PAL1 + db 8, 8, 19, %011 | OAM_PAL1 ... .data_a94ae db 4 ; size - db 0, 0, 13, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 15, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) -- db 0, 8, 6, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) -+ db 0, 8, 12, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 14, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 13, %011 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 15, %011 | OAM_PAL1 | OAM_XFLIP +- db 0, 8, 6, %011 | OAM_PAL1 | OAM_XFLIP ++ db 0, 8, 12, %011 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 14, %011 | OAM_PAL1 | OAM_XFLIP .data_a94bf db 4 ; size - db 0, 0, 17, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 19, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) -- db 0, 8, 8, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) -+ db 0, 8, 16, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 18, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 17, %011 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 19, %011 | OAM_PAL1 | OAM_XFLIP +- db 0, 8, 8, %011 | OAM_PAL1 | OAM_XFLIP ++ db 0, 8, 16, %011 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 18, %011 | OAM_PAL1 | OAM_XFLIP ``` ### Big Lightning animation has incorrect frame data @@ -666,8 +666,8 @@ One of the bolts from the "big lightning" duel animation has its topmost row of ```diff .data_ab5fd db 28 ; size -- db -72, -8, 0, (1 << OAM_X_FLIP) -+ db -72, 0, 0, (1 << OAM_X_FLIP) +- db -72, -8, 0, OAM_XFLIP ++ db -72, 0, 0, OAM_XFLIP db -16, 32, 27, $0 ... db -56, 10, 42, $0 @@ -678,10 +678,10 @@ The base of the lightning being cut-off is addressed below, though that specific ```diff .data_ab5fd - db 28 ; size -- db -72, -8, 0, (1 << OAM_X_FLIP) +- db -72, -8, 0, OAM_XFLIP + db 29 ; size -+ db -72, 0, 0, (1 << OAM_X_FLIP) -+ db -72, -8, 1, (1 << OAM_X_FLIP) ++ db -72, 0, 0, OAM_XFLIP ++ db -72, -8, 1, OAM_XFLIP db -16, 32, 27, $0 ... db -56, 10, 42, $0 @@ -696,16 +696,16 @@ The fire blasts from Dive Bomb's duel animation mistakenly reuse the same tile t .data_ac685 db 19 ; size ... - db -8, 8, 11, (1 << OAM_X_FLIP) - db -8, 16, 10, (1 << OAM_X_FLIP) -- db 0, 24, 10, (1 << OAM_X_FLIP) -+ db 0, 24, 12, (1 << OAM_X_FLIP) - db 0, 16, 13, (1 << OAM_X_FLIP) - db 0, 8, 14, (1 << OAM_X_FLIP) - db 8, 8, 17, (1 << OAM_X_FLIP) - db 8, 16, 16, (1 << OAM_X_FLIP) - db 8, 24, 15, (1 << OAM_X_FLIP) - db 16, 24, 18, (1 << OAM_X_FLIP) + db -8, 8, 11, OAM_XFLIP + db -8, 16, 10, OAM_XFLIP +- db 0, 24, 10, OAM_XFLIP ++ db 0, 24, 12, OAM_XFLIP + db 0, 16, 13, OAM_XFLIP + db 0, 8, 14, OAM_XFLIP + db 8, 8, 17, OAM_XFLIP + db 8, 16, 16, OAM_XFLIP + db 8, 24, 15, OAM_XFLIP + db 16, 24, 18, OAM_XFLIP .data_ac6d2 db 19 ; size @@ -724,16 +724,16 @@ The fire blasts from Dive Bomb's duel animation mistakenly reuse the same tile t .data_ac71f db 29 ; size ... - db -8, 8, 11, (1 << OAM_X_FLIP) - db -8, 16, 10, (1 << OAM_X_FLIP) -- db 0, 24, 10, (1 << OAM_X_FLIP) -+ db 0, 24, 12, (1 << OAM_X_FLIP) - db 0, 16, 13, (1 << OAM_X_FLIP) - db 0, 8, 14, (1 << OAM_X_FLIP) - db 8, 8, 17, (1 << OAM_X_FLIP) - db 8, 16, 16, (1 << OAM_X_FLIP) - db 8, 24, 15, (1 << OAM_X_FLIP) - db 16, 24, 18, (1 << OAM_X_FLIP) + db -8, 8, 11, OAM_XFLIP + db -8, 16, 10, OAM_XFLIP +- db 0, 24, 10, OAM_XFLIP ++ db 0, 24, 12, OAM_XFLIP + db 0, 16, 13, OAM_XFLIP + db 0, 8, 14, OAM_XFLIP + db 8, 8, 17, OAM_XFLIP + db 8, 16, 16, OAM_XFLIP + db 8, 24, 15, OAM_XFLIP + db 16, 24, 18, OAM_XFLIP ``` The flames of one of the blasts being cut-off is addressed below, though that specific fix will cause a byte overflow, forcing one to rearrange `anim2.asm`. @@ -743,17 +743,17 @@ The flames of one of the blasts being cut-off is addressed below, though that sp - db 19 ; size + db 20 ; size ... - db -8, 8, 11, (1 << OAM_X_FLIP) - db -8, 16, 10, (1 << OAM_X_FLIP) -- db 0, 24, 10, (1 << OAM_X_FLIP) -+ db 0, 24, 12, (1 << OAM_X_FLIP) - db 0, 16, 13, (1 << OAM_X_FLIP) - db 0, 8, 14, (1 << OAM_X_FLIP) - db 8, 8, 17, (1 << OAM_X_FLIP) - db 8, 16, 16, (1 << OAM_X_FLIP) - db 8, 24, 15, (1 << OAM_X_FLIP) -+ db 16, 16, 19, (1 << OAM_X_FLIP) - db 16, 24, 18, (1 << OAM_X_FLIP) + db -8, 8, 11, OAM_XFLIP + db -8, 16, 10, OAM_XFLIP +- db 0, 24, 10, OAM_XFLIP ++ db 0, 24, 12, OAM_XFLIP + db 0, 16, 13, OAM_XFLIP + db 0, 8, 14, OAM_XFLIP + db 8, 8, 17, OAM_XFLIP + db 8, 16, 16, OAM_XFLIP + db 8, 24, 15, OAM_XFLIP ++ db 16, 16, 19, OAM_XFLIP + db 16, 24, 18, OAM_XFLIP .data_ac6d2 - db 19 ; size @@ -774,16 +774,16 @@ The flames of one of the blasts being cut-off is addressed below, though that sp .data_ac71f db 29 ; size ... - db -8, 8, 11, (1 << OAM_X_FLIP) - db -8, 16, 10, (1 << OAM_X_FLIP) -- db 0, 24, 10, (1 << OAM_X_FLIP) -+ db 0, 24, 12, (1 << OAM_X_FLIP) - db 0, 16, 13, (1 << OAM_X_FLIP) - db 0, 8, 14, (1 << OAM_X_FLIP) - db 8, 8, 17, (1 << OAM_X_FLIP) - db 8, 16, 16, (1 << OAM_X_FLIP) - db 8, 24, 15, (1 << OAM_X_FLIP) - db 16, 24, 18, (1 << OAM_X_FLIP) + db -8, 8, 11, OAM_XFLIP + db -8, 16, 10, OAM_XFLIP +- db 0, 24, 10, OAM_XFLIP ++ db 0, 24, 12, OAM_XFLIP + db 0, 16, 13, OAM_XFLIP + db 0, 8, 14, OAM_XFLIP + db 8, 8, 17, OAM_XFLIP + db 8, 16, 16, OAM_XFLIP + db 8, 24, 15, OAM_XFLIP + db 16, 24, 18, OAM_XFLIP ``` ## Text diff --git a/src/audio/music1.asm b/src/audio/music1.asm index 99dc82e..01e43d6 100644 --- a/src/audio/music1.asm +++ b/src/audio/music1.asm @@ -106,13 +106,13 @@ Music1_f406f: Music1_Init: xor a - ldh [rNR52], a - ld a, $80 - ldh [rNR52], a + ldh [rAUDENA], a + ld a, AUDENA_ON + ldh [rAUDENA], a ld a, $77 - ldh [rNR50], a - ld a, $ff - ldh [rNR51], a + ldh [rAUDVOL], a + ld a, AUDTERM_1_RIGHT | AUDTERM_2_RIGHT | AUDTERM_3_RIGHT | AUDTERM_4_RIGHT | AUDTERM_1_LEFT | AUDTERM_2_LEFT | AUDTERM_3_LEFT | AUDTERM_4_LEFT + ldh [rAUDTERM], a ld a, $3d ld [wCurSongBank], a ld a, $80 @@ -169,7 +169,7 @@ Music1_Update: call Bankswitch3dTo3f ld a, [wCurSongBank] ldh [hBankROM], a - ld [MBC3RomBank], a + ld [rROMB], a ld a, [wddf2] cp $0 jr z, .update_channels @@ -215,35 +215,35 @@ Music1_StopAllChannels: ld [wMusicIsPlaying], a bit 0, d jr nz, .stop_channel_2 - ld a, $8 - ldh [rNR12], a - swap a - ldh [rNR14], a + ld a, AUD1ENV_UP + ldh [rAUD1ENV], a + swap a ; AUD1HIGH_RESTART + ldh [rAUD1HIGH], a .stop_channel_2 xor a ld [wMusicIsPlaying + 1], a bit 1, d jr nz, .stop_channel_4 - ld a, $8 - ldh [rNR22], a - swap a - ldh [rNR24], a + ld a, AUD2ENV_UP + ldh [rAUD2ENV], a + swap a ; AUD2HIGH_RESTART + ldh [rAUD2HIGH], a .stop_channel_4 xor a ld [wMusicIsPlaying + 3], a bit 3, d jr nz, .stop_channel_3 - ld a, $8 - ldh [rNR42], a - swap a - ldh [rNR44], a + ld a, AUD4ENV_UP + ldh [rAUD4ENV], a + swap a ; AUD4GO_RESTART + ldh [rAUD4GO], a .stop_channel_3 xor a ld [wMusicIsPlaying + 2], a bit 2, d jr nz, .done - ld a, $0 - ldh [rNR32], a + ld a, AUD3LEVEL_MUTE + ldh [rAUD3LEVEL], a .done ret @@ -257,7 +257,7 @@ Music1_BeginSong: ld a, [hl] ld [wCurSongBank], a ldh [hBankROM], a - ld [MBC3RomBank], a + ld [rROMB], a pop af add a ld c, a @@ -399,7 +399,7 @@ Music1_UpdateChannel1: ld a, [wdd8c] bit 0, a jr nz, .asm_f42d4 - ld hl, rNR12 + ld hl, rAUD1ENV ld a, [wMusicEcho] ld [hli], a inc hl @@ -428,10 +428,10 @@ Music1_UpdateChannel1: ld a, [wdd8c] bit 0, a jr nz, .asm_f4309 - ld a, $8 - ldh [rNR12], a - swap a - ldh [rNR14], a + ld a, AUD1ENV_UP + ldh [rAUD1ENV], a + swap a ; AUD1HIGH_RESTART + ldh [rAUD1HIGH], a .asm_f4309 ret @@ -452,7 +452,7 @@ Music1_UpdateChannel2: ld a, [wdd8c] bit 1, a jr nz, .asm_f4339 - ld hl, rNR22 + ld hl, rAUD2ENV ld a, [wMusicEcho + 1] ld [hli], a inc hl @@ -481,10 +481,10 @@ Music1_UpdateChannel2: ld a, [wdd8c] bit 1, a jr nz, .asm_f436e - ld a, $8 - ldh [rNR22], a - swap a - ldh [rNR24], a + ld a, AUD2ENV_UP + ldh [rAUD2ENV], a + swap a ; AUD2HIGH_RESTART + ldh [rAUD2HIGH], a .asm_f436e ret @@ -506,7 +506,7 @@ Music1_UpdateChannel3: cp $1 jr z, .asm_f4398 ld a, [wMusicEcho + 2] - ldh [rNR32], a + ldh [rAUD3LEVEL], a .asm_f4398 ld a, [wddbb + 2] dec a @@ -530,10 +530,10 @@ Music1_UpdateChannel3: ld a, [wdd8c] bit 2, a jr nz, .asm_f43cd - ld a, $0 - ldh [rNR32], a - ld a, $80 - ldh [rNR34], a + ld a, AUD3LEVEL_MUTE + ldh [rAUD3LEVEL], a + ld a, AUD3HIGH_RESTART + ldh [rAUD3HIGH], a .asm_f43cd ret @@ -568,10 +568,10 @@ Music1_UpdateChannel4: jr nz, .asm_f4413 xor a ld [wddef], a - ld a, $8 - ldh [rNR42], a - swap a - ldh [rNR44], a + ld a, AUD4ENV_UP + ldh [rAUD4ENV], a + swap a ; AUD4GO_RESTART + ldh [rAUD4GO], a .asm_f4413 ret @@ -1167,26 +1167,26 @@ Music1_f4714: cp $80 jr z, .asm_f4733 ld a, [wMusicVolume] - ldh [rNR12], a - ld d, $80 + ldh [rAUD1ENV], a + ld d, AUD1HIGH_RESTART .asm_f4733 ld [hl], $2 - ld a, $8 - ldh [rNR10], a + ld a, AUD1SWEEP_DOWN + ldh [rAUD1SWEEP], a ld a, [wMusicDuty1] - ldh [rNR11], a + ldh [rAUD1LEN], a ld a, [wMusicCh1CurPitch] - ldh [rNR13], a + ldh [rAUD1LOW], a ld a, [wMusicCh1CurOctave] or d - ldh [rNR14], a + ldh [rAUD1HIGH], a .asm_f4749 ret .asm_f474a ld hl, wMusicTie ld [hl], $0 - ld hl, rNR12 - ld a, $8 + ld hl, rAUD1ENV + ld a, AUD1ENV_UP ld [hli], a inc hl swap a @@ -1206,24 +1206,24 @@ Music1_f475a: cp $80 jr z, .asm_f4779 ld a, [wMusicVolume + 1] - ldh [rNR22], a - ld d, $80 + ldh [rAUD2ENV], a + ld d, AUD2HIGH_RESTART .asm_f4779 ld [hl], $2 ld a, [wMusicDuty2] - ldh [rNR21], a + ldh [rAUD2LEN], a ld a, [wMusicCh2CurPitch] - ldh [rNR23], a + ldh [rAUD2LOW], a ld a, [wMusicCh2CurOctave] or d - ldh [rNR24], a + ldh [rAUD2HIGH], a .asm_f478b ret .asm_f478c ld hl, wMusicTie + 1 ld [hl], $0 - ld hl, rNR22 - ld a, $8 + ld hl, rAUD2ENV + ld a, AUD2ENV_UP ld [hli], a inc hl swap a @@ -1238,8 +1238,8 @@ Music1_f479c: ld a, [wMusicWaveChange] or a jr z, .no_wave_change - xor a - ldh [rNR30], a + xor a ; AUD3ENA_OFF + ldh [rAUD3ENA], a call Music1_LoadWaveInstrument ld d, $80 .no_wave_change @@ -1251,28 +1251,28 @@ Music1_f479c: cp $80 jr z, .asm_f47cc ld a, [wMusicVolume + 2] - ldh [rNR32], a - xor a - ldh [rNR30], a - ld d, $80 + ldh [rAUD3LEVEL], a + xor a ; AUD3ENA_OFF + ldh [rAUD3ENA], a + ld d, AUD3HIGH_RESTART .asm_f47cc ld [hl], $2 xor a - ldh [rNR31], a + ldh [rAUD3LEN], a ld a, [wMusicCh3CurPitch] - ldh [rNR33], a - ld a, $80 - ldh [rNR30], a + ldh [rAUD3LOW], a + ld a, AUD3ENA_ON + ldh [rAUD3ENA], a ld a, [wMusicCh3CurOctave] or d - ldh [rNR34], a + ldh [rAUD3HIGH], a .asm_f47e0 ret .asm_f47e1 ld hl, wMusicTie ld [hl], $0 - xor a - ldh [rNR30], a + xor a ; AUD3ENA_OFF + ldh [rAUD3ENA], a ret Music1_LoadWaveInstrument: @@ -1306,7 +1306,7 @@ Music1_f480a: ld a, [wddba] cp $0 jr z, .asm_f482a - ld de, rNR41 + ld de, rAUD4LEN ld hl, wddab ld a, [hli] ld [de], a @@ -1324,8 +1324,8 @@ Music1_f480a: .asm_f482a xor a ld [wddef], a - ld hl, rNR42 - ld a, $8 + ld hl, rAUD4ENV + ld a, AUD4ENV_UP ld [hli], a inc hl swap a @@ -1349,7 +1349,7 @@ Music1_f4839: jr nz, .asm_f4853 jr Music1_f480a.asm_f482a .asm_f4853 - ldh [rNR43], a + ldh [rAUD4POLY], a inc de ld a, d ld [hld], a @@ -1368,7 +1368,7 @@ Music1_f485a: Music1_f4866: ld a, [wMusicPanning] - ldh [rNR50], a + ldh [rAUDVOL], a ld a, [wdd8c] or a ld hl, wMusicStereoPanning @@ -1397,7 +1397,7 @@ Music1_f4866: swap e or e and d - ldh [rNR51], a + ldh [rAUDTERM], a ret Music1_UpdateVibrato: @@ -1495,13 +1495,13 @@ Music1_f490b: bit 0, a jr nz, .done ld a, e - ldh [rNR13], a - ldh a, [rNR11] - and $c0 - ldh [rNR11], a + ldh [rAUD1LOW], a + ldh a, [rAUD1LEN] + and ~AUD1LEN_TIMER + ldh [rAUD1LEN], a ld a, d and $3f - ldh [rNR14], a + ldh [rAUD1HIGH], a ret .not_channel_1 cp $1 @@ -1513,12 +1513,12 @@ Music1_f490b: bit 1, a jr nz, .done ld a, e - ldh [rNR23], a - ldh a, [rNR21] - and $c0 - ldh [rNR21], a + ldh [rAUD2LOW], a + ldh a, [rAUD2LEN] + and ~AUD2LEN_TIMER + ldh [rAUD2LEN], a ld a, d - ldh [rNR24], a + ldh [rAUD2HIGH], a ret .not_channel_2 cp $2 @@ -1530,11 +1530,11 @@ Music1_f490b: bit 2, a jr nz, .done ld a, e - ldh [rNR33], a + ldh [rAUD3LOW], a xor a - ldh [rNR31], a + ldh [rAUD3LEN], a ld a, d - ldh [rNR34], a + ldh [rAUD3HIGH], a .done ret @@ -1566,29 +1566,29 @@ Music1_f4980: ld d, a bit 0, d jr nz, .asm_f4990 - ld a, $8 - ldh [rNR12], a - swap a - ldh [rNR14], a + ld a, AUD1ENV_UP + ldh [rAUD1ENV], a + swap a ; AUD1HIGH_RESTART + ldh [rAUD1HIGH], a .asm_f4990 bit 1, d jr nz, .asm_f499c swap a - ldh [rNR22], a - swap a - ldh [rNR24], a + ldh [rAUD2ENV], a + swap a ; AUD2HIGH_RESTART + ldh [rAUD2HIGH], a .asm_f499c bit 3, d jr nz, .asm_f49a8 swap a - ldh [rNR42], a - swap a - ldh [rNR44], a + ldh [rAUD4ENV], a + swap a ; AUD4GO_RESTART + ldh [rAUD4GO], a .asm_f49a8 bit 2, d jr nz, .asm_f49b0 - ld a, $0 - ldh [rNR32], a + ld a, AUD3LEVEL_MUTE + ldh [rAUD3LEVEL], a .asm_f49b0 ret diff --git a/src/audio/music2.asm b/src/audio/music2.asm index e786d31..61daae7 100644 --- a/src/audio/music2.asm +++ b/src/audio/music2.asm @@ -106,13 +106,13 @@ Music2_f406f: Music2_Init: xor a - ldh [rNR52], a - ld a, $80 - ldh [rNR52], a + ldh [rAUDENA], a + ld a, AUDENA_ON + ldh [rAUDENA], a ld a, $77 - ldh [rNR50], a - ld a, $ff - ldh [rNR51], a + ldh [rAUDVOL], a + ld a, AUDTERM_1_RIGHT | AUDTERM_2_RIGHT | AUDTERM_3_RIGHT | AUDTERM_4_RIGHT | AUDTERM_1_LEFT | AUDTERM_2_LEFT | AUDTERM_3_LEFT | AUDTERM_4_LEFT + ldh [rAUDTERM], a ld a, $3d ld [wCurSongBank], a ld a, $80 @@ -169,7 +169,7 @@ Music2_Update: call Bankswitch3dTo3f ld a, [wCurSongBank] ldh [hBankROM], a - ld [MBC3RomBank], a + ld [rROMB], a ld a, [wddf2] cp $0 jr z, .update_channels @@ -215,35 +215,35 @@ Music2_StopAllChannels: ld [wMusicIsPlaying], a bit 0, d jr nz, .stop_channel_2 - ld a, $8 - ldh [rNR12], a - swap a - ldh [rNR14], a + ld a, AUD1ENV_UP + ldh [rAUD1ENV], a + swap a ; AUD1HIGH_RESTART + ldh [rAUD1HIGH], a .stop_channel_2 xor a ld [wMusicIsPlaying + 1], a bit 1, d jr nz, .stop_channel_4 - ld a, $8 - ldh [rNR22], a - swap a - ldh [rNR24], a + ld a, AUD2ENV_UP + ldh [rAUD2ENV], a + swap a ; AUD2HIGH_RESTART + ldh [rAUD2HIGH], a .stop_channel_4 xor a ld [wMusicIsPlaying + 3], a bit 3, d jr nz, .stop_channel_3 - ld a, $8 - ldh [rNR42], a - swap a - ldh [rNR44], a + ld a, AUD4ENV_UP + ldh [rAUD4ENV], a + swap a ; AUD4GO_RESTART + ldh [rAUD4GO], a .stop_channel_3 xor a ld [wMusicIsPlaying + 2], a bit 2, d jr nz, .done - ld a, $0 - ldh [rNR32], a + ld a, AUD3LEVEL_MUTE + ldh [rAUD3LEVEL], a .done ret @@ -257,7 +257,7 @@ Music2_BeginSong: ld a, [hl] ld [wCurSongBank], a ldh [hBankROM], a - ld [MBC3RomBank], a + ld [rROMB], a pop af add a ld c, a @@ -399,7 +399,7 @@ Music2_UpdateChannel1: ld a, [wdd8c] bit 0, a jr nz, .asm_f42d4 - ld hl, rNR12 + ld hl, rAUD1ENV ld a, [wMusicEcho] ld [hli], a inc hl @@ -428,10 +428,10 @@ Music2_UpdateChannel1: ld a, [wdd8c] bit 0, a jr nz, .asm_f4309 - ld a, $8 - ldh [rNR12], a - swap a - ldh [rNR14], a + ld a, AUD1ENV_UP + ldh [rAUD1ENV], a + swap a ; AUD1HIGH_RESTART + ldh [rAUD1HIGH], a .asm_f4309 ret @@ -452,7 +452,7 @@ Music2_UpdateChannel2: ld a, [wdd8c] bit 1, a jr nz, .asm_f4339 - ld hl, rNR22 + ld hl, rAUD2ENV ld a, [wMusicEcho + 1] ld [hli], a inc hl @@ -481,10 +481,10 @@ Music2_UpdateChannel2: ld a, [wdd8c] bit 1, a jr nz, .asm_f436e - ld a, $8 - ldh [rNR22], a - swap a - ldh [rNR24], a + ld a, AUD2ENV_UP + ldh [rAUD2ENV], a + swap a ; AUD2HIGH_RESTART + ldh [rAUD2HIGH], a .asm_f436e ret @@ -506,7 +506,7 @@ Music2_UpdateChannel3: cp $1 jr z, .asm_f4398 ld a, [wMusicEcho + 2] - ldh [rNR32], a + ldh [rAUD3LEVEL], a .asm_f4398 ld a, [wddbb + 2] dec a @@ -530,10 +530,10 @@ Music2_UpdateChannel3: ld a, [wdd8c] bit 2, a jr nz, .asm_f43cd - ld a, $0 - ldh [rNR32], a - ld a, $80 - ldh [rNR34], a + ld a, AUD3LEVEL_MUTE + ldh [rAUD3LEVEL], a + ld a, AUD3HIGH_RESTART + ldh [rAUD3HIGH], a .asm_f43cd ret @@ -568,10 +568,10 @@ Music2_UpdateChannel4: jr nz, .asm_f4413 xor a ld [wddef], a - ld a, $8 - ldh [rNR42], a - swap a - ldh [rNR44], a + ld a, AUD4ENV_UP + ldh [rAUD4ENV], a + swap a ; AUD4GO_RESTART + ldh [rAUD4GO], a .asm_f4413 ret @@ -1167,26 +1167,26 @@ Music2_f4714: cp $80 jr z, .asm_f4733 ld a, [wMusicVolume] - ldh [rNR12], a - ld d, $80 + ldh [rAUD1ENV], a + ld d, AUD1HIGH_RESTART .asm_f4733 ld [hl], $2 - ld a, $8 - ldh [rNR10], a + ld a, AUD1SWEEP_DOWN + ldh [rAUD1SWEEP], a ld a, [wMusicDuty1] - ldh [rNR11], a + ldh [rAUD1LEN], a ld a, [wMusicCh1CurPitch] - ldh [rNR13], a + ldh [rAUD1LOW], a ld a, [wMusicCh1CurOctave] or d - ldh [rNR14], a + ldh [rAUD1HIGH], a .asm_f4749 ret .asm_f474a ld hl, wMusicTie ld [hl], $0 - ld hl, rNR12 - ld a, $8 + ld hl, rAUD1ENV + ld a, AUD1ENV_UP ld [hli], a inc hl swap a @@ -1206,24 +1206,24 @@ Music2_f475a: cp $80 jr z, .asm_f4779 ld a, [wMusicVolume + 1] - ldh [rNR22], a - ld d, $80 + ldh [rAUD2ENV], a + ld d, AUD2HIGH_RESTART .asm_f4779 ld [hl], $2 ld a, [wMusicDuty2] - ldh [rNR21], a + ldh [rAUD2LEN], a ld a, [wMusicCh2CurPitch] - ldh [rNR23], a + ldh [rAUD2LOW], a ld a, [wMusicCh2CurOctave] or d - ldh [rNR24], a + ldh [rAUD2HIGH], a .asm_f478b ret .asm_f478c ld hl, wMusicTie + 1 ld [hl], $0 - ld hl, rNR22 - ld a, $8 + ld hl, rAUD2ENV + ld a, AUD2ENV_UP ld [hli], a inc hl swap a @@ -1238,8 +1238,8 @@ Music2_f479c: ld a, [wMusicWaveChange] or a jr z, .no_wave_change - xor a - ldh [rNR30], a + xor a ; AUD3ENA_OFF + ldh [rAUD3ENA], a call Music2_LoadWaveInstrument ld d, $80 .no_wave_change @@ -1251,28 +1251,28 @@ Music2_f479c: cp $80 jr z, .asm_f47cc ld a, [wMusicVolume + 2] - ldh [rNR32], a - xor a - ldh [rNR30], a - ld d, $80 + ldh [rAUD3LEVEL], a + xor a ; AUD3ENA_OFF + ldh [rAUD3ENA], a + ld d, AUD3HIGH_RESTART .asm_f47cc ld [hl], $2 xor a - ldh [rNR31], a + ldh [rAUD3LEN], a ld a, [wMusicCh3CurPitch] - ldh [rNR33], a - ld a, $80 - ldh [rNR30], a + ldh [rAUD3LOW], a + ld a, AUD3ENA_ON + ldh [rAUD3ENA], a ld a, [wMusicCh3CurOctave] or d - ldh [rNR34], a + ldh [rAUD3HIGH], a .asm_f47e0 ret .asm_f47e1 ld hl, wMusicTie ld [hl], $0 - xor a - ldh [rNR30], a + xor a ; AUD3ENA_OFF + ldh [rAUD3ENA], a ret Music2_LoadWaveInstrument: @@ -1306,7 +1306,7 @@ Music2_f480a: ld a, [wddba] cp $0 jr z, .asm_f482a - ld de, rNR41 + ld de, rAUD4LEN ld hl, wddab ld a, [hli] ld [de], a @@ -1324,8 +1324,8 @@ Music2_f480a: .asm_f482a xor a ld [wddef], a - ld hl, rNR42 - ld a, $8 + ld hl, rAUD4ENV + ld a, AUD4ENV_UP ld [hli], a inc hl swap a @@ -1349,7 +1349,7 @@ Music2_f4839: jr nz, .asm_f4853 jr Music2_f480a.asm_f482a .asm_f4853 - ldh [rNR43], a + ldh [rAUD4POLY], a inc de ld a, d ld [hld], a @@ -1368,7 +1368,7 @@ Music2_f485a: Music2_f4866: ld a, [wMusicPanning] - ldh [rNR50], a + ldh [rAUDVOL], a ld a, [wdd8c] or a ld hl, wMusicStereoPanning @@ -1397,7 +1397,7 @@ Music2_f4866: swap e or e and d - ldh [rNR51], a + ldh [rAUDTERM], a ret Music2_UpdateVibrato: @@ -1495,13 +1495,13 @@ Music2_f490b: bit 0, a jr nz, .done ld a, e - ldh [rNR13], a - ldh a, [rNR11] - and $c0 - ldh [rNR11], a + ldh [rAUD1LOW], a + ldh a, [rAUD1LEN] + and ~AUD1LEN_TIMER + ldh [rAUD1LEN], a ld a, d and $3f - ldh [rNR14], a + ldh [rAUD1HIGH], a ret .not_channel_1 cp $1 @@ -1513,12 +1513,12 @@ Music2_f490b: bit 1, a jr nz, .done ld a, e - ldh [rNR23], a - ldh a, [rNR21] - and $c0 - ldh [rNR21], a + ldh [rAUD2LOW], a + ldh a, [rAUD2LEN] + and ~AUD2LEN_TIMER + ldh [rAUD2LEN], a ld a, d - ldh [rNR24], a + ldh [rAUD2HIGH], a ret .not_channel_2 cp $2 @@ -1530,11 +1530,11 @@ Music2_f490b: bit 2, a jr nz, .done ld a, e - ldh [rNR33], a + ldh [rAUD3LOW], a xor a - ldh [rNR31], a + ldh [rAUD3LEN], a ld a, d - ldh [rNR34], a + ldh [rAUD3HIGH], a .done ret @@ -1566,29 +1566,29 @@ Music2_f4980: ld d, a bit 0, d jr nz, .asm_f4990 - ld a, $8 - ldh [rNR12], a - swap a - ldh [rNR14], a + ld a, AUD1ENV_UP + ldh [rAUD1ENV], a + swap a ; AUD1HIGH_RESTART + ldh [rAUD1HIGH], a .asm_f4990 bit 1, d jr nz, .asm_f499c swap a - ldh [rNR22], a - swap a - ldh [rNR24], a + ldh [rAUD2ENV], a + swap a ; AUD2HIGH_RESTART + ldh [rAUD2HIGH], a .asm_f499c bit 3, d jr nz, .asm_f49a8 swap a - ldh [rNR42], a - swap a - ldh [rNR44], a + ldh [rAUD4ENV], a + swap a ; AUD4GO_RESTART + ldh [rAUD4GO], a .asm_f49a8 bit 2, d jr nz, .asm_f49b0 - ld a, $0 - ldh [rNR32], a + ld a, AUD3LEVEL_MUTE + ldh [rAUD3LEVEL], a .asm_f49b0 ret diff --git a/src/audio/sfx.asm b/src/audio/sfx.asm index 0098089..08eb80e 100644 --- a/src/audio/sfx.asm +++ b/src/audio/sfx.asm @@ -170,7 +170,7 @@ SFX_frequency: ld [hl], $0 or d ld d, a - ld hl, rNR11 + ld hl, rAUD1LEN ld a, c add a add a @@ -203,7 +203,7 @@ SFX_envelope: ld a, [hli] ld e, a push hl - ld hl, rNR12 + ld hl, rAUD1ENV ld a, c add a add a @@ -217,7 +217,7 @@ SFX_envelope: SFX_duty: swap a ld e, a - ld hl, rNR11 + ld hl, rAUD1LEN ld a, c add a add a @@ -332,7 +332,7 @@ SFX_ApplyPitchOffset: ld [hl], $0 or d ld d, a - ld hl, rNR11 + ld hl, rAUD1LEN ld a, c add a add a @@ -381,7 +381,7 @@ Func_fc1cd: ld [hl], $0 or e ld e, a - ld hl, rNR41 + ld hl, rAUD4LEN xor a ld [hli], a inc hl @@ -400,8 +400,8 @@ SFX_wave: ld a, [hli] ld h, [hl] ld l, a - ld a, $0 - ldh [rNR30], a + ld a, AUD3ENA_OFF + ldh [rAUD3ENA], a ld b, d ld de, $ff30 .asm_fc215 @@ -414,8 +414,8 @@ SFX_wave: jr nz, .asm_fc215 ld a, $1 ld [wMusicWaveChange], a - ld a, $80 - ldh [rNR30], a + ld a, AUD3ENA_ON + ldh [rAUD3ENA], a ld b, $0 pop hl jp ExecuteNextSFXCommand @@ -462,9 +462,9 @@ SFX_end: add c ld e, a ld d, b ; 0 - ld hl, rNR12 + ld hl, rAUD1ENV add hl, de - ld a, $8 + ld a, AUD1ENV_UP ld [hli], a inc hl swap a @@ -480,16 +480,18 @@ Func_fc26c: ld [wCurSfxID], a ret +; bug, these instructions are supposed to be +; loading to hardware registers, not loading from them Func_fc279: ld a, $8 - ldh a, [rNR12] - ldh a, [rNR22] - ldh a, [rNR32] - ldh a, [rNR42] + ldh a, [rAUD1ENV] + ldh a, [rAUD2ENV] + ldh a, [rAUD3LEVEL] + ldh a, [rAUD4ENV] ld a, $80 - ldh a, [rNR14] - ldh a, [rNR24] - ldh a, [rNR44] + ldh a, [rAUD1HIGH] + ldh a, [rAUD2HIGH] + ldh a, [rAUD4GO] xor a ld [wdd8c], a ret diff --git a/src/constants.asm b/src/constants.asm index 1a04af4..4c25f1b 100644 --- a/src/constants.asm +++ b/src/constants.asm @@ -1,3 +1,5 @@ +INCLUDE "constants/hardware.inc" + INCLUDE "constants/booster_constants.asm" INCLUDE "constants/card_constants.asm" INCLUDE "constants/card_data_constants.asm" @@ -6,7 +8,6 @@ INCLUDE "constants/deck_constants.asm" INCLUDE "constants/duel_constants.asm" INCLUDE "constants/duel_interface_constants.asm" INCLUDE "constants/gfx_constants.asm" -INCLUDE "constants/hardware_constants.asm" INCLUDE "constants/map_constants.asm" INCLUDE "constants/menu_constants.asm" INCLUDE "constants/misc_constants.asm" diff --git a/src/constants/gfx_constants.asm b/src/constants/gfx_constants.asm index 21ba3fb..0d98459 100644 --- a/src/constants/gfx_constants.asm +++ b/src/constants/gfx_constants.asm @@ -1,22 +1,12 @@ -; screen size -DEF SCREEN_WIDTH EQU 20 ; tiles -DEF SCREEN_HEIGHT EQU 18 ; tiles - -; background map size -DEF BG_MAP_WIDTH EQU 32 ; tiles -DEF BG_MAP_HEIGHT EQU 32 ; tiles - ; cgb palette size -DEF CGB_PAL_SIZE EQU 8 ; bytes -DEF palettes EQUS "* CGB_PAL_SIZE" +DEF palettes EQUS "* PAL_SIZE" DEF NUM_BACKGROUND_PALETTES EQU 8 DEF NUM_OBJECT_PALETTES EQU 8 -DEF PALRGB_WHITE EQU (31 << 10 | 31 << 5 | 31) +DEF PALRGB_WHITE EQU (31 << B_COLOR_BLUE) | (31 << B_COLOR_GREEN) | (31 << B_COLOR_RED) ; tile size -DEF TILE_SIZE EQU 16 ; bytes DEF tiles EQUS "* TILE_SIZE" DEF TILE_SIZE_1BPP EQU 8 ; bytes diff --git a/src/constants/hardware.inc b/src/constants/hardware.inc new file mode 100644 index 0000000..628b682 --- /dev/null +++ b/src/constants/hardware.inc @@ -0,0 +1,1065 @@ +;****************************************************************************** +; Game Boy hardware constant definitions +; https://github.com/gbdev/hardware.inc +;****************************************************************************** + +; To the extent possible under law, the authors of this work have +; waived all copyright and related or neighboring rights to the work. +; See https://creativecommons.org/publicdomain/zero/1.0/ for details. +; SPDX-License-Identifier: CC0-1.0 + +; If this file was already included, don't do it again +if !def(HARDWARE_INC) + +; Check for the minimum supported RGBDS version +if !def(__RGBDS_MAJOR__) || !def(__RGBDS_MINOR__) || !def(__RGBDS_PATCH__) + fail "This version of 'hardware.inc' requires RGBDS version 0.5.0 or later" +endc +if __RGBDS_MAJOR__ == 0 && __RGBDS_MINOR__ < 5 + fail "This version of 'hardware.inc' requires RGBDS version 0.5.0 or later." +endc + +; Define the include guard and the current hardware.inc version +; (do this after the RGBDS version check since the `def` syntax depends on it) +def HARDWARE_INC equ 1 +def HARDWARE_INC_VERSION equs "5.1.0" + +; Usage: rev_Check_hardware_inc +; Examples: +; rev_Check_hardware_inc 1.2.3 +; rev_Check_hardware_inc 1.2 (equivalent to 1.2.0) +; rev_Check_hardware_inc 1 (equivalent to 1.0.0) +MACRO rev_Check_hardware_inc + if _NARG == 1 ; Actual invocation by the user + def hw_inc_cur_ver\@ equs strrpl("{HARDWARE_INC_VERSION}", ".", ",") + def hw_inc_min_ver\@ equs strrpl("\1", ".", ",") + rev_Check_hardware_inc {hw_inc_cur_ver\@}, {hw_inc_min_ver\@}, 0, 0 + purge hw_inc_cur_ver\@, hw_inc_min_ver\@ + else ; Recursive invocation + if \1 != \4 || (\2 < \5 || (\2 == \5 && \3 < \6)) + fail "Version \1.\2.\3 of 'hardware.inc' is incompatible with requested version \4.\5.\6" + endc + endc +ENDM + + +;****************************************************************************** +; Memory-mapped registers ($FFxx range) +;****************************************************************************** + +; -- JOYP / P1 ($FF00) -------------------------------------------------------- +; Joypad face buttons +def rJOYP equ $FF00 + +def B_JOYP_GET_BUTTONS equ 5 ; 0 = reading buttons [r/w] +def B_JOYP_GET_CTRL_PAD equ 4 ; 0 = reading Control Pad [r/w] + def JOYP_GET equ %00_11_0000 ; select which inputs to read from the lower nybble + def JOYP_GET_BUTTONS equ %00_01_0000 ; reading A/B/Select/Start buttons + def JOYP_GET_CTRL_PAD equ %00_10_0000 ; reading Control Pad directions + def JOYP_GET_NONE equ %00_11_0000 ; reading nothing + +def B_JOYP_START equ 3 ; 0 = Start is pressed (if reading buttons) [ro] +def B_JOYP_SELECT equ 2 ; 0 = Select is pressed (if reading buttons) [ro] +def B_JOYP_B equ 1 ; 0 = B is pressed (if reading buttons) [ro] +def B_JOYP_A equ 0 ; 0 = A is pressed (if reading buttons) [ro] +def B_JOYP_DOWN equ 3 ; 0 = Down is pressed (if reading Control Pad) [ro] +def B_JOYP_UP equ 2 ; 0 = Up is pressed (if reading Control Pad) [ro] +def B_JOYP_LEFT equ 1 ; 0 = Left is pressed (if reading Control Pad) [ro] +def B_JOYP_RIGHT equ 0 ; 0 = Right is pressed (if reading Control Pad) [ro] + def JOYP_INPUTS equ %0000_1111 + def JOYP_START equ 1 << B_JOYP_START + def JOYP_SELECT equ 1 << B_JOYP_SELECT + def JOYP_B equ 1 << B_JOYP_B + def JOYP_A equ 1 << B_JOYP_A + def JOYP_DOWN equ 1 << B_JOYP_DOWN + def JOYP_UP equ 1 << B_JOYP_UP + def JOYP_LEFT equ 1 << B_JOYP_LEFT + def JOYP_RIGHT equ 1 << B_JOYP_RIGHT + +; Combined input byte, with Control Pad in high nybble (conventional order) +def B_PAD_DOWN equ 7 +def B_PAD_UP equ 6 +def B_PAD_LEFT equ 5 +def B_PAD_RIGHT equ 4 +def B_PAD_START equ 3 +def B_PAD_SELECT equ 2 +def B_PAD_B equ 1 +def B_PAD_A equ 0 + def PAD_CTRL_PAD equ %1111_0000 + def PAD_BUTTONS equ %0000_1111 + def PAD_DOWN equ 1 << B_PAD_DOWN + def PAD_UP equ 1 << B_PAD_UP + def PAD_LEFT equ 1 << B_PAD_LEFT + def PAD_RIGHT equ 1 << B_PAD_RIGHT + def PAD_START equ 1 << B_PAD_START + def PAD_SELECT equ 1 << B_PAD_SELECT + def PAD_B equ 1 << B_PAD_B + def PAD_A equ 1 << B_PAD_A + + +; Combined input byte, with Control Pad in low nybble (swapped order) +def B_PAD_SWAP_START equ 7 +def B_PAD_SWAP_SELECT equ 6 +def B_PAD_SWAP_B equ 5 +def B_PAD_SWAP_A equ 4 +def B_PAD_SWAP_DOWN equ 3 +def B_PAD_SWAP_UP equ 2 +def B_PAD_SWAP_LEFT equ 1 +def B_PAD_SWAP_RIGHT equ 0 + def PAD_SWAP_CTRL_PAD equ %0000_1111 + def PAD_SWAP_BUTTONS equ %1111_0000 + def PAD_SWAP_START equ 1 << B_PAD_SWAP_START + def PAD_SWAP_SELECT equ 1 << B_PAD_SWAP_SELECT + def PAD_SWAP_B equ 1 << B_PAD_SWAP_B + def PAD_SWAP_A equ 1 << B_PAD_SWAP_A + def PAD_SWAP_DOWN equ 1 << B_PAD_SWAP_DOWN + def PAD_SWAP_UP equ 1 << B_PAD_SWAP_UP + def PAD_SWAP_LEFT equ 1 << B_PAD_SWAP_LEFT + def PAD_SWAP_RIGHT equ 1 << B_PAD_SWAP_RIGHT + +; -- SB ($FF01) --------------------------------------------------------------- +; Serial transfer data [r/w] +def rSB equ $FF01 + +; -- SC ($FF02) --------------------------------------------------------------- +; Serial transfer control +def rSC equ $FF02 + +def B_SC_START equ 7 ; reading 1 = transfer in progress, writing 1 = start transfer [r/w] +def B_SC_SPEED equ 1 ; (CGB only) 1 = use faster internal clock [r/w] +def B_SC_SOURCE equ 0 ; 0 = use external clock ("slave"), 1 = use internal clock ("master") [r/w] + def SC_START equ 1 << B_SC_START + def SC_SPEED equ 1 << B_SC_SPEED + def SC_SLOW equ 0 << B_SC_SPEED + def SC_FAST equ 1 << B_SC_SPEED + def SC_SOURCE equ 1 << B_SC_SOURCE + def SC_EXTERNAL equ 0 << B_SC_SOURCE + def SC_INTERNAL equ 1 << B_SC_SOURCE + +; -- $FF03 is unused ---------------------------------------------------------- + +; -- DIV ($FF04) -------------------------------------------------------------- +; Divider register [r/w] +def rDIV equ $FF04 + +; -- TIMA ($FF05) ------------------------------------------------------------- +; Timer counter [r/w] +def rTIMA equ $FF05 + +; -- TMA ($FF06) -------------------------------------------------------------- +; Timer modulo [r/w] +def rTMA equ $FF06 + +; -- TAC ($FF07) -------------------------------------------------------------- +; Timer control +def rTAC equ $FF07 + +def B_TAC_START equ 2 ; enable incrementing TIMA [r/w] + def TAC_STOP equ 0 << B_TAC_START + def TAC_START equ 1 << B_TAC_START + +def TAC_CLOCK equ %000000_11 ; the frequency at which TIMA increments [r/w] + def TAC_4KHZ equ %000000_00 ; every 256 M-cycles = ~4 KHz on DMG + def TAC_262KHZ equ %000000_01 ; every 4 M-cycles = ~262 KHz on DMG + def TAC_65KHZ equ %000000_10 ; every 16 M-cycles = ~65 KHz on DMG + def TAC_16KHZ equ %000000_11 ; every 64 M-cycles = ~16 KHz on DMG + +; -- $FF08-$FF0E are unused --------------------------------------------------- + +; -- IF ($FF0F) --------------------------------------------------------------- +; Pending interrupts +def rIF equ $FF0F + +def B_IF_JOYPAD equ 4 ; 1 = joypad interrupt is pending [r/w] +def B_IF_SERIAL equ 3 ; 1 = serial interrupt is pending [r/w] +def B_IF_TIMER equ 2 ; 1 = timer interrupt is pending [r/w] +def B_IF_STAT equ 1 ; 1 = STAT interrupt is pending [r/w] +def B_IF_VBLANK equ 0 ; 1 = VBlank interrupt is pending [r/w] + def IF_JOYPAD equ 1 << B_IF_JOYPAD + def IF_SERIAL equ 1 << B_IF_SERIAL + def IF_TIMER equ 1 << B_IF_TIMER + def IF_STAT equ 1 << B_IF_STAT + def IF_VBLANK equ 1 << B_IF_VBLANK + +; -- AUD1SWEEP / NR10 ($FF10) ------------------------------------------------- +; Audio channel 1 sweep +def rAUD1SWEEP equ $FF10 + +def AUD1SWEEP_TIME equ %0_111_0000 ; how long between sweep iterations + ; (in 128 Hz ticks, ~7.8 ms apart) [r/w] + +def B_AUD1SWEEP_DIR equ 3 ; sweep direction [r/w] + def AUD1SWEEP_DIR equ 1 << B_AUD1SWEEP_DIR + def AUD1SWEEP_UP equ 0 << B_AUD1SWEEP_DIR + def AUD1SWEEP_DOWN equ 1 << B_AUD1SWEEP_DIR + +def AUD1SWEEP_SHIFT equ %00000_111 ; how much the period increases/decreases per iteration [r/w] + +; -- AUD1LEN / NR11 ($FF11) --------------------------------------------------- +; Audio channel 1 length timer and duty cycle +def rAUD1LEN equ $FF11 + +def AUD1LEN_DUTY equ %11_000000 ; ratio of time spent high vs. time spent low [r/w] + def AUD1LEN_DUTY_12_5 equ %00_000000 ; 12.5% + def AUD1LEN_DUTY_25 equ %01_000000 ; 25% + def AUD1LEN_DUTY_50 equ %10_000000 ; 50% + def AUD1LEN_DUTY_75 equ %11_000000 ; 75% + +def AUD1LEN_TIMER equ %00_111111 ; initial length timer (0-63) [wo] + +; -- AUD1ENV / NR12 ($FF12) --------------------------------------------------- +; Audio channel 1 volume and envelope +def rAUD1ENV equ $FF12 + +def AUD1ENV_INIT_VOLUME equ %1111_0000 ; initial volume [r/w] + +def B_AUD1ENV_DIR equ 3 ; direction of volume envelope [r/w] + def AUD1ENV_DIR equ 1 << B_AUD1ENV_DIR + def AUD1ENV_DOWN equ 0 << B_AUD1ENV_DIR + def AUD1ENV_UP equ 1 << B_AUD1ENV_DIR + +def AUD1ENV_PACE equ %00000_111 ; how long between envelope iterations + ; (in 64 Hz ticks, ~15.6 ms apart) [r/w] + +; -- AUD1LOW / NR13 ($FF13) --------------------------------------------------- +; Audio channel 1 period (low 8 bits) [r/w] +def rAUD1LOW equ $FF13 + +; -- AUD1HIGH / NR14 ($FF14) -------------------------------------------------- +; Audio channel 1 period (high 3 bits) and control +def rAUD1HIGH equ $FF14 + +def B_AUD1HIGH_RESTART equ 7 ; 1 = restart the channel [wo] +def B_AUD1HIGH_LEN_ENABLE equ 6 ; 1 = reset the channel after the length timer expires [r/w] + def AUD1HIGH_RESTART equ 1 << B_AUD1HIGH_RESTART + def AUD1HIGH_LENGTH_OFF equ 0 << B_AUD1HIGH_LEN_ENABLE + def AUD1HIGH_LENGTH_ON equ 1 << B_AUD1HIGH_LEN_ENABLE + +def AUD1HIGH_PERIOD_HIGH equ %00000_111 ; upper 3 bits of the channel's period [r/w] + +; -- $FF15 is unused ---------------------------------------------------------- + +; -- AUD2LEN / NR21 ($FF16) --------------------------------------------------- +; Audio channel 2 length timer and duty cycle +def rAUD2LEN equ $FF16 + +def AUD2LEN_DUTY equ %11_000000 ; ratio of time spent high vs. time spent low [r/w] + def AUD2LEN_DUTY_12_5 equ %00_000000 ; 12.5% + def AUD2LEN_DUTY_25 equ %01_000000 ; 25% + def AUD2LEN_DUTY_50 equ %10_000000 ; 50% + def AUD2LEN_DUTY_75 equ %11_000000 ; 75% + +def AUD2LEN_TIMER equ %00_111111 ; initial length timer (0-63) [wo] + +; -- AUD2ENV / NR22 ($FF17) --------------------------------------------------- +; Audio channel 2 volume and envelope +def rAUD2ENV equ $FF17 + +def AUD2ENV_INIT_VOLUME equ %1111_0000 ; initial volume [r/w] + +def B_AUD2ENV_DIR equ 3 ; direction of volume envelope [r/w] + def AUD2ENV_DIR equ 1 << B_AUD2ENV_DIR + def AUD2ENV_DOWN equ 0 << B_AUD2ENV_DIR + def AUD2ENV_UP equ 1 << B_AUD2ENV_DIR + +def AUD2ENV_PACE equ %00000_111 ; how long between envelope iterations + ; (in 64 Hz ticks, ~15.6 ms apart) [r/w] + +; -- AUD2LOW / NR23 ($FF18) --------------------------------------------------- +; Audio channel 2 period (low 8 bits) [r/w] +def rAUD2LOW equ $FF18 + +; -- AUD2HIGH / NR24 ($FF19) -------------------------------------------------- +; Audio channel 2 period (high 3 bits) and control +def rAUD2HIGH equ $FF19 + +def B_AUD2HIGH_RESTART equ 7 ; 1 = restart the channel [wo] +def B_AUD2HIGH_LEN_ENABLE equ 6 ; 1 = reset the channel after the length timer expires [r/w] + def AUD2HIGH_RESTART equ 1 << B_AUD2HIGH_RESTART + def AUD2HIGH_LENGTH_OFF equ 0 << B_AUD2HIGH_LEN_ENABLE + def AUD2HIGH_LENGTH_ON equ 1 << B_AUD2HIGH_LEN_ENABLE + +def AUD2HIGH_PERIOD_HIGH equ %00000_111 ; upper 3 bits of the channel's period [r/w] + +; -- AUD3ENA / NR30 ($FF1A) --------------------------------------------------- +; Audio channel 3 enable +def rAUD3ENA equ $FF1A + +def B_AUD3ENA_ENABLE equ 7 ; 1 = channel is active [r/w] + def AUD3ENA_OFF equ 0 << B_AUD3ENA_ENABLE + def AUD3ENA_ON equ 1 << B_AUD3ENA_ENABLE + +; -- AUD3LEN / NR31 ($FF1B) --------------------------------------------------- +; Audio channel 3 length timer [wo] +def rAUD3LEN equ $FF1B + +; -- AUD3LEVEL / NR32 ($FF1C) ------------------------------------------------- +; Audio channel 3 volume +def rAUD3LEVEL equ $FF1C + +def AUD3LEVEL_VOLUME equ %0_11_00000 ; volume level [r/w] + def AUD3LEVEL_MUTE equ %0_00_00000 ; 0% (muted) + def AUD3LEVEL_100 equ %0_01_00000 ; 100% + def AUD3LEVEL_50 equ %0_10_00000 ; 50% + def AUD3LEVEL_25 equ %0_11_00000 ; 25% + +; -- AUD3LOW / NR33 ($FF1D) --------------------------------------------------- +; Audio channel 3 period (low 8 bits) [r/w] +def rAUD3LOW equ $FF1D + +; -- AUD3HIGH / NR34 ($FF1E) -------------------------------------------------- +; Audio channel 3 period (high 3 bits) and control +def rAUD3HIGH equ $FF1E + +def B_AUD3HIGH_RESTART equ 7 ; 1 = restart the channel [wo] +def B_AUD3HIGH_LEN_ENABLE equ 6 ; 1 = reset the channel after the length timer expires [r/w] + def AUD3HIGH_RESTART equ 1 << B_AUD3HIGH_RESTART + def AUD3HIGH_LENGTH_OFF equ 0 << B_AUD3HIGH_LEN_ENABLE + def AUD3HIGH_LENGTH_ON equ 1 << B_AUD3HIGH_LEN_ENABLE + +def AUD3HIGH_PERIOD_HIGH equ %00000_111 ; upper 3 bits of the channel's period [r/w] + +; -- $FF1F is unused ---------------------------------------------------------- + +; -- AUD4LEN / NR41 ($FF20) --------------------------------------------------- +; Audio channel 4 length timer +def rAUD4LEN equ $FF20 + +def AUD4LEN_TIMER equ %00_111111 ; initial length timer (0-63) [wo] + +; -- AUD4ENV / NR42 ($FF21) --------------------------------------------------- +; Audio channel 4 volume and envelope +def rAUD4ENV equ $FF21 + +def AUD4ENV_INIT_VOLUME equ %1111_0000 ; initial volume [r/w] + +def B_AUD4ENV_DIR equ 3 ; direction of volume envelope [r/w] + def AUD4ENV_DIR equ 1 << B_AUD4ENV_DIR + def AUD4ENV_DOWN equ 0 << B_AUD4ENV_DIR + def AUD4ENV_UP equ 1 << B_AUD4ENV_DIR + +def AUD4ENV_PACE equ %00000_111 ; how long between envelope iterations + ; (in 64 Hz ticks, ~15.6 ms apart) [r/w] + +; -- AUD4POLY / NR43 ($FF22) -------------------------------------------------- +; Audio channel 4 period and randomness +def rAUD4POLY equ $FF22 + +def AUD4POLY_SHIFT equ %1111_0000 ; coarse control of the channel's period [r/w] + +def B_AUD4POLY_WIDTH equ 3 ; controls the noise generator (LFSR)'s step width [r/w] + def AUD4POLY_15STEP equ 0 << B_AUD4POLY_WIDTH + def AUD4POLY_7STEP equ 1 << B_AUD4POLY_WIDTH + +def AUD4POLY_DIV equ %00000_111 ; fine control of the channel's period [r/w] + +; -- AUD4GO / NR44 ($FF23) ---------------------------------------------------- +; Audio channel 4 control +def rAUD4GO equ $FF23 + +def B_AUD4GO_RESTART equ 7 ; 1 = restart the channel [wo] +def B_AUD4GO_LEN_ENABLE equ 6 ; 1 = reset the channel after the length timer expires [r/w] + def AUD4GO_RESTART equ 1 << B_AUD4GO_RESTART + def AUD4GO_LENGTH_OFF equ 0 << B_AUD4GO_LEN_ENABLE + def AUD4GO_LENGTH_ON equ 1 << B_AUD4GO_LEN_ENABLE + +; -- AUDVOL / NR50 ($FF24) ---------------------------------------------------- +; Audio master volume and VIN mixer +def rAUDVOL equ $FF24 + +def B_AUDVOL_VIN_LEFT equ 7 ; 1 = output VIN to left ear (SO2, speaker 2) [r/w] + def AUDVOL_VIN_LEFT equ 1 << B_AUDVOL_VIN_LEFT + +def AUDVOL_LEFT equ %0_111_0000 ; 0 = barely audible, 7 = full volume [r/w] + +def B_AUDVOL_VIN_RIGHT equ 3 ; 1 = output VIN to right ear (SO1, speaker 1) [r/w] + def AUDVOL_VIN_RIGHT equ 1 << B_AUDVOL_VIN_RIGHT + +def AUDVOL_RIGHT equ %00000_111 ; 0 = barely audible, 7 = full volume [r/w] + +; -- AUDTERM / NR51 ($FF25) --------------------------------------------------- +; Audio channel mixer +def rAUDTERM equ $FF25 + +def B_AUDTERM_4_LEFT equ 7 ; 1 = output channel 4 to left ear [r/w] +def B_AUDTERM_3_LEFT equ 6 ; 1 = output channel 3 to left ear [r/w] +def B_AUDTERM_2_LEFT equ 5 ; 1 = output channel 2 to left ear [r/w] +def B_AUDTERM_1_LEFT equ 4 ; 1 = output channel 1 to left ear [r/w] +def B_AUDTERM_4_RIGHT equ 3 ; 1 = output channel 4 to right ear [r/w] +def B_AUDTERM_3_RIGHT equ 2 ; 1 = output channel 3 to right ear [r/w] +def B_AUDTERM_2_RIGHT equ 1 ; 1 = output channel 2 to right ear [r/w] +def B_AUDTERM_1_RIGHT equ 0 ; 1 = output channel 1 to right ear [r/w] + def AUDTERM_4_LEFT equ 1 << B_AUDTERM_4_LEFT + def AUDTERM_3_LEFT equ 1 << B_AUDTERM_3_LEFT + def AUDTERM_2_LEFT equ 1 << B_AUDTERM_2_LEFT + def AUDTERM_1_LEFT equ 1 << B_AUDTERM_1_LEFT + def AUDTERM_4_RIGHT equ 1 << B_AUDTERM_4_RIGHT + def AUDTERM_3_RIGHT equ 1 << B_AUDTERM_3_RIGHT + def AUDTERM_2_RIGHT equ 1 << B_AUDTERM_2_RIGHT + def AUDTERM_1_RIGHT equ 1 << B_AUDTERM_1_RIGHT + +; -- AUDENA / NR52 ($FF26) ---------------------------------------------------- +; Audio master enable +def rAUDENA equ $FF26 + +def B_AUDENA_ENABLE equ 7 ; 0 = disable the APU (resets all audio registers to 0!) [r/w] +def B_AUDENA_ENABLE_CH4 equ 3 ; 1 = channel 4 is running [ro] +def B_AUDENA_ENABLE_CH3 equ 2 ; 1 = channel 3 is running [ro] +def B_AUDENA_ENABLE_CH2 equ 1 ; 1 = channel 2 is running [ro] +def B_AUDENA_ENABLE_CH1 equ 0 ; 1 = channel 1 is running [ro] + def AUDENA_OFF equ 0 << B_AUDENA_ENABLE + def AUDENA_ON equ 1 << B_AUDENA_ENABLE + def AUDENA_CH4_OFF equ 0 << B_AUDENA_ENABLE_CH4 + def AUDENA_CH4_ON equ 1 << B_AUDENA_ENABLE_CH4 + def AUDENA_CH3_OFF equ 0 << B_AUDENA_ENABLE_CH3 + def AUDENA_CH3_ON equ 1 << B_AUDENA_ENABLE_CH3 + def AUDENA_CH2_OFF equ 0 << B_AUDENA_ENABLE_CH2 + def AUDENA_CH2_ON equ 1 << B_AUDENA_ENABLE_CH2 + def AUDENA_CH1_OFF equ 0 << B_AUDENA_ENABLE_CH1 + def AUDENA_CH1_ON equ 1 << B_AUDENA_ENABLE_CH1 + +; -- $FF27-$FF2F are unused --------------------------------------------------- + +; -- AUD3WAVE ($FF30-$FF3F) --------------------------------------------------- +; Audio channel 3 wave pattern RAM [r/w] +def _AUD3WAVERAM equ $FF30 ; $FF30-$FF3F + +def rAUD3WAVE_0 equ $FF30 +def rAUD3WAVE_1 equ $FF31 +def rAUD3WAVE_2 equ $FF32 +def rAUD3WAVE_3 equ $FF33 +def rAUD3WAVE_4 equ $FF34 +def rAUD3WAVE_5 equ $FF35 +def rAUD3WAVE_6 equ $FF36 +def rAUD3WAVE_7 equ $FF37 +def rAUD3WAVE_8 equ $FF38 +def rAUD3WAVE_9 equ $FF39 +def rAUD3WAVE_A equ $FF3A +def rAUD3WAVE_B equ $FF3B +def rAUD3WAVE_C equ $FF3C +def rAUD3WAVE_D equ $FF3D +def rAUD3WAVE_E equ $FF3E +def rAUD3WAVE_F equ $FF3F + +def AUD3WAVE_SIZE equ 16 + +; -- LCDC ($FF40) ------------------------------------------------------------- +; PPU graphics control +def rLCDC equ $FF40 + +def B_LCDC_ENABLE equ 7 ; whether the PPU (and LCD) are turned on [r/w] +def B_LCDC_WIN_MAP equ 6 ; which tilemap the Window reads from [r/w] +def B_LCDC_WINDOW equ 5 ; whether the Window is enabled [r/w] +def B_LCDC_BLOCKS equ 4 ; which "tile blocks" the BG and Window use [r/w] +def B_LCDC_BG_MAP equ 3 ; which tilemap the BG reads from [r/w] +def B_LCDC_OBJ_SIZE equ 2 ; how many pixels tall each OBJ is [r/w] +def B_LCDC_OBJS equ 1 ; whether OBJs are enabled [r/w] +def B_LCDC_BG equ 0 ; (DMG only) whether the BG is enabled [r/w] +def B_LCDC_PRIO equ 0 ; (CGB only) whether OBJ priority bits are enabled [r/w] + def LCDC_ENABLE equ 1 << B_LCDC_ENABLE + def LCDC_OFF equ 0 << B_LCDC_ENABLE + def LCDC_ON equ 1 << B_LCDC_ENABLE + def LCDC_WIN_MAP equ 1 << B_LCDC_WIN_MAP + def LCDC_WIN_9800 equ 0 << B_LCDC_WIN_MAP + def LCDC_WIN_9C00 equ 1 << B_LCDC_WIN_MAP + def LCDC_WINDOW equ 1 << B_LCDC_WINDOW + def LCDC_WIN_OFF equ 0 << B_LCDC_WINDOW + def LCDC_WIN_ON equ 1 << B_LCDC_WINDOW + def LCDC_BLOCKS equ 1 << B_LCDC_BLOCKS + def LCDC_BLOCK21 equ 0 << B_LCDC_BLOCKS + def LCDC_BLOCK01 equ 1 << B_LCDC_BLOCKS + def LCDC_BG_MAP equ 1 << B_LCDC_BG_MAP + def LCDC_BG_9800 equ 0 << B_LCDC_BG_MAP + def LCDC_BG_9C00 equ 1 << B_LCDC_BG_MAP + def LCDC_OBJ_SIZE equ 1 << B_LCDC_OBJ_SIZE + def LCDC_OBJ_8 equ 0 << B_LCDC_OBJ_SIZE + def LCDC_OBJ_16 equ 1 << B_LCDC_OBJ_SIZE + def LCDC_OBJS equ 1 << B_LCDC_OBJS + def LCDC_OBJ_OFF equ 0 << B_LCDC_OBJS + def LCDC_OBJ_ON equ 1 << B_LCDC_OBJS + def LCDC_BG equ 1 << B_LCDC_BG + def LCDC_BG_OFF equ 0 << B_LCDC_BG + def LCDC_BG_ON equ 1 << B_LCDC_BG + def LCDC_PRIO equ 1 << B_LCDC_PRIO + def LCDC_PRIO_OFF equ 0 << B_LCDC_PRIO + def LCDC_PRIO_ON equ 1 << B_LCDC_PRIO + +; -- STAT ($FF41) ------------------------------------------------------------- +; Graphics status and interrupt control +def rSTAT equ $FF41 + +def B_STAT_LYC equ 6 ; 1 = LY match triggers the STAT interrupt [r/w] +def B_STAT_MODE_2 equ 5 ; 1 = OAM Scan triggers the PPU interrupt [r/w] +def B_STAT_MODE_1 equ 4 ; 1 = VBlank triggers the PPU interrupt [r/w] +def B_STAT_MODE_0 equ 3 ; 1 = HBlank triggers the PPU interrupt [r/w] +def B_STAT_LYCF equ 2 ; 1 = LY is currently equal to LYC [ro] +def B_STAT_BUSY equ 1 ; 1 = the PPU is currently accessing VRAM [ro] + def STAT_LYC equ 1 << B_STAT_LYC + def STAT_MODE_2 equ 1 << B_STAT_MODE_2 + def STAT_MODE_1 equ 1 << B_STAT_MODE_1 + def STAT_MODE_0 equ 1 << B_STAT_MODE_0 + def STAT_LYCF equ 1 << B_STAT_LYCF + def STAT_BUSY equ 1 << B_STAT_BUSY + +def STAT_MODE equ %000000_11 ; PPU's current status [ro] + def STAT_HBLANK equ %000000_00 ; waiting after a line's rendering (HBlank) + def STAT_VBLANK equ %000000_01 ; waiting between frames (VBlank) + def STAT_OAM equ %000000_10 ; checking which OBJs will be rendered on this line (OAM scan) + def STAT_LCD equ %000000_11 ; pushing pixels to the LCD + +; -- SCY ($FF42) -------------------------------------------------------------- +; Background Y scroll offset (in pixels) [r/w] +def rSCY equ $FF42 + +; -- SCX ($FF43) -------------------------------------------------------------- +; Background X scroll offset (in pixels) [r/w] +def rSCX equ $FF43 + +; -- LY ($FF44) --------------------------------------------------------------- +; Y coordinate of the line currently processed by the PPU (0-153) [ro] +def rLY equ $FF44 + +def LY_VBLANK equ 144 ; 144-153 is the VBlank period + +; -- LYC ($FF45) -------------------------------------------------------------- +; Value that LY is constantly compared to [r/w] +def rLYC equ $FF45 + +; -- DMA ($FF46) -------------------------------------------------------------- +; OAM DMA start address (high 8 bits) and start [wo] +def rDMA equ $FF46 + +; -- BGP ($FF47) -------------------------------------------------------------- +; (DMG only) Background color mapping [r/w] +def rBGP equ $FF47 + +def BGP_SGB_TRANSFER equ %11_10_01_00 ; set BGP to this value before SGB VRAM transfer + +; -- OBP0 ($FF48) ------------------------------------------------------------- +; (DMG only) OBJ color mapping #0 [r/w] +def rOBP0 equ $FF48 + +; -- OBP1 ($FF49) ------------------------------------------------------------- +; (DMG only) OBJ color mapping #1 [r/w] +def rOBP1 equ $FF49 + +; -- WY ($FF4A) --------------------------------------------------------------- +; Y coordinate of the Window's top-left pixel (0-143) [r/w] +def rWY equ $FF4A + +; -- WX ($FF4B) --------------------------------------------------------------- +; X coordinate of the Window's top-left pixel, plus 7 (7-166) [r/w] +def rWX equ $FF4B + +def WX_OFS equ 7 ; subtract this to get the actual Window Y coordinate + +; -- SYS / KEY0 ($FF4C) ------------------------------------------------------- +; (CGB boot ROM only) CPU mode select +def rSYS equ $FF4C + +; This is known as the "CPU mode register" in Fig. 11 of this patent: +; https://patents.google.com/patent/US6322447B1/en?oq=US6322447bi +; "OBJ priority mode designating register" in the same patent +; Credit to @mattcurrie for this finding! + +def SYS_MODE equ %0000_11_00 ; current system mode [r/w] + def SYS_CGB equ %0000_00_00 ; CGB mode + def SYS_DMG equ %0000_01_00 ; DMG compatibility mode + def SYS_PGB1 equ %0000_10_00 ; LCD is driven externally, CPU is stopped + def SYS_PGB2 equ %0000_11_00 ; LCD is driven externally, CPU is running + +; -- SPD / KEY1 ($FF4D) ------------------------------------------------------- +; (CGB only) Double-speed mode control +def rSPD equ $FF4D + +def B_SPD_DOUBLE equ 7 ; current clock speed [ro] +def B_SPD_PREPARE equ 0 ; 1 = next `stop` instruction will switch clock speeds [r/w] + def SPD_SINGLE equ 0 << B_SPD_DOUBLE + def SPD_DOUBLE equ 1 << B_SPD_DOUBLE + def SPD_PREPARE equ 1 << B_SPD_PREPARE + +; -- $FF4E is unused ---------------------------------------------------------- + +; -- VBK ($FF4F) -------------------------------------------------------------- +; (CGB only) VRAM bank number (0 or 1) +def rVBK equ $FF4F + +def VBK_BANK equ %0000000_1 ; mapped VRAM bank [r/w] + +; -- BANK ($FF50) ------------------------------------------------------------- +; (boot ROM only) Boot ROM mapping control +def rBANK equ $FF50 + +def B_BANK_ON equ 0 ; whether the boot ROM is mapped [wo] + def BANK_ON equ 0 << B_BANK_ON + def BANK_OFF equ 1 << B_BANK_ON + +; -- VDMA_SRC_HIGH / HDMA1 ($FF51) -------------------------------------------- +; (CGB only) VRAM DMA source address (high 8 bits) [wo] +def rVDMA_SRC_HIGH equ $FF51 + +; -- VDMA_SRC_LOW / HDMA2 ($FF52) --------------------------------------------- +; (CGB only) VRAM DMA source address (low 8 bits) [wo] +def rVDMA_SRC_LOW equ $FF52 + +; -- VDMA_DEST_HIGH / HDMA3 ($FF53) ------------------------------------------- +; (CGB only) VRAM DMA destination address (high 8 bits) [wo] +def rVDMA_DEST_HIGH equ $FF53 + +; -- VDMA_DEST_LOW / HDMA3 ($FF54) -------------------------------------------- +; (CGB only) VRAM DMA destination address (low 8 bits) [wo] +def rVDMA_DEST_LOW equ $FF54 + +; -- VDMA_LEN / HDMA5 ($FF55) ------------------------------------------------- +; (CGB only) VRAM DMA length, mode, and start +def rVDMA_LEN equ $FF55 + +def B_VDMA_LEN_MODE equ 7 ; on write: VRAM DMA mode [wo] + def VDMA_LEN_MODE equ 1 << B_VDMA_LEN_MODE + def VDMA_LEN_MODE_GENERAL equ 0 << B_VDMA_LEN_MODE ; GDMA (general-purpose) + def VDMA_LEN_MODE_HBLANK equ 1 << B_VDMA_LEN_MODE ; HDMA (HBlank) + +def B_VDMA_LEN_BUSY equ 7 ; on read: is a VRAM DMA active? + def VDMA_LEN_BUSY equ 1 << B_VDMA_LEN_BUSY + def VDMA_LEN_NO equ 0 << B_VDMA_LEN_BUSY + def VDMA_LEN_YES equ 1 << B_VDMA_LEN_BUSY + +def VDMA_LEN_SIZE equ %0_1111111 ; how many 16-byte blocks (minus 1) to transfer [r/w] + +; -- RP ($FF56) --------------------------------------------------------------- +; (CGB only) Infrared communications port +def rRP equ $FF56 + +def RP_READ equ %11_000000 ; whether the IR read is enabled [r/w] + def RP_DISABLE equ %00_000000 + def RP_ENABLE equ %11_000000 + +def B_RP_DATA_IN equ 1 ; 0 = IR light is being received [ro] +def B_RP_LED_ON equ 0 ; 1 = IR light is being sent [r/w] + def RP_DATA_IN equ 1 << B_RP_DATA_IN + def RP_LED_ON equ 1 << B_RP_LED_ON + def RP_WRITE_LOW equ 0 << B_RP_LED_ON + def RP_WRITE_HIGH equ 1 << B_RP_LED_ON + +; -- $FF57-$FF67 are unused --------------------------------------------------- + +; -- BGPI / BCPS ($FF68) ------------------------------------------------------ +; (CGB only) Background palette I/O index +def rBGPI equ $FF68 + +def B_BGPI_AUTOINC equ 7 ; whether the index field is incremented after each write to BCPD [r/w] + def BGPI_AUTOINC equ 1 << B_BGPI_AUTOINC + +def BGPI_INDEX equ %00_111111 ; the index within Palette RAM accessed via BCPD [r/w] + +; -- BGPD / BCPD ($FF69) ------------------------------------------------------ +; (CGB only) Background palette I/O access [r/w] +def rBGPD equ $FF69 + +; -- OBPI / OCPS ($FF6A) ------------------------------------------------------ +; (CGB only) OBJ palette I/O index +def rOBPI equ $FF6A + +def B_OBPI_AUTOINC equ 7 ; whether the index field is incremented after each write to OBPD [r/w] + def OBPI_AUTOINC equ 1 << B_OBPI_AUTOINC + +def OBPI_INDEX equ %00_111111 ; the index within Palette RAM accessed via OBPD [r/w] + +; -- OBPD / OCPD ($FF6B) ------------------------------------------------------ +; (CGB only) OBJ palette I/O access [r/w] +def rOBPD equ $FF6B + +; -- OPRI ($FF6C) ------------------------------------------------------------- +; (CGB boot ROM only) OBJ draw priority mode +def rOPRI equ $FF6C + +def B_OPRI_PRIORITY equ 0 ; which drawing priority is used for OBJs [r/w] + def OPRI_PRIORITY equ 1 << B_OPRI_PRIORITY + def OPRI_OAM equ 0 << B_OPRI_PRIORITY ; CGB mode default: earliest OBJ in OAM wins + def OPRI_COORD equ 1 << B_OPRI_PRIORITY ; DMG mode default: leftmost OBJ wins + +; -- $FF6D-$FF6F are unused --------------------------------------------------- + +; -- WBK / SVBK ($FF70) ------------------------------------------------------- +; (CGB only) WRAM bank number +def rWBK equ $FF70 + +def WBK_BANK equ %00000_111 ; mapped WRAM bank (0-7) [r/w] + +; -- $FF71-$FF75 are unused --------------------------------------------------- + +; -- PCM12 ($FF76) ------------------------------------------------------------ +; Audio channels 1 and 2 output +def rPCM12 equ $FF76 + +def PCM12_CH2 equ %1111_0000 ; audio channel 2 output [ro] +def PCM12_CH1 equ %0000_1111 ; audio channel 1 output [ro] + +; -- PCM34 ($FF77) ------------------------------------------------------------ +; Audio channels 3 and 4 output +def rPCM34 equ $FF77 + +def PCM34_CH4 equ %1111_0000 ; audio channel 4 output [ro] +def PCM34_CH3 equ %0000_1111 ; audio channel 3 output [ro] + +; -- $FF78-$FF7F are unused --------------------------------------------------- + +; -- IE ($FFFF) --------------------------------------------------------------- +; Interrupt enable +def rIE equ $FFFF + +def B_IE_JOYPAD equ 4 ; 1 = joypad interrupt is enabled [r/w] +def B_IE_SERIAL equ 3 ; 1 = serial interrupt is enabled [r/w] +def B_IE_TIMER equ 2 ; 1 = timer interrupt is enabled [r/w] +def B_IE_STAT equ 1 ; 1 = STAT interrupt is enabled [r/w] +def B_IE_VBLANK equ 0 ; 1 = VBlank interrupt is enabled [r/w] + def IE_JOYPAD equ 1 << B_IE_JOYPAD + def IE_SERIAL equ 1 << B_IE_SERIAL + def IE_TIMER equ 1 << B_IE_TIMER + def IE_STAT equ 1 << B_IE_STAT + def IE_VBLANK equ 1 << B_IE_VBLANK + + +;****************************************************************************** +; Cartridge registers (MBC) +;****************************************************************************** + +; Note that these "registers" are each actually accessible at an entire address range; +; however, one address for each of these ranges is considered the "canonical" one, and +; these addresses are what's provided here. + + +; ** Common to most MBCs ****************************************************** + +; -- RAMG ($0000-$1FFF) ------------------------------------------------------- +; Whether SRAM can be accessed [wo] +def rRAMG equ $0000 + +; Common values (not for HuC1 or HuC-3) +def RAMG_SRAM_DISABLE equ $00 +def RAMG_SRAM_ENABLE equ $0A ; some MBCs accept any value whose low nybble is $A + +; (HuC-3 only) switch SRAM to map cartridge RAM, RTC, or IR +def RAMG_CART_RAM_RO equ $00 ; select cartridge RAM [ro] +def RAMG_CART_RAM equ $0A ; select cartridge RAM [r/w] +def RAMG_RTC_IN equ $0B ; select RTC command/argument [wo] + def RAMG_RTC_IN_CMD equ %0_111_0000 ; command + def RAMG_RTC_IN_ARG equ %0_000_1111 ; argument +def RAMG_RTC_OUT equ $0C ; select RTC command/response [ro] + def RAMG_RTC_OUT_CMD equ %0_111_0000 ; command + def RAMG_RTC_OUT_RESULT equ %0_000_1111 ; result +def RAMG_RTC_SEMAPHORE equ $0D ; select RTC semaphore [r/w] +def RAMG_IR equ $0E ; (HuC1 and HuC-3 only) select IR [r/w] + +; -- ROMB ($2000-$3FFF) ------------------------------------------------------- +; ROM bank number (not for MBC5 or MBC6) [wo] +def rROMB equ $2000 + +; -- RAMB ($4000-$5FFF) ------------------------------------------------------- +; SRAM bank number (not for MBC2, MBC6, or MBC7) [wo] +def rRAMB equ $4000 + +; (MBC3 only) Special RAM bank numbers that actually map values into RTCREG +def RAMB_RTC_S equ $08 ; seconds counter (0-59) +def RAMB_RTC_M equ $09 ; minutes counter (0-59) +def RAMB_RTC_H equ $0A ; hours counter (0-23) +def RAMB_RTC_DL equ $0B ; days counter, low byte (0-255) +def RAMB_RTC_DH equ $0C ; days counter, high bit and other flags + def B_RAMB_RTC_DH_CARRY equ 7 ; 1 = days counter overflowed [wo] + def B_RAMB_RTC_DH_HALT equ 6 ; 0 = run timer, 1 = stop timer [wo] + def B_RAMB_RTC_DH_HIGH equ 0 ; days counter, high bit (bit 8) [wo] + def RAMB_RTC_DH_CARRY equ 1 << B_RAMB_RTC_DH_CARRY + def RAMB_RTC_DH_HALT equ 1 << B_RAMB_RTC_DH_HALT + def RAMB_RTC_DH_HIGH equ 1 << B_RAMB_RTC_DH_HIGH + +def B_RAMB_RUMBLE equ 3 ; (MBC5 and MBC7 only) enable the rumble motor (if any) + def RAMB_RUMBLE equ 1 << B_RAMB_RUMBLE + def RAMB_RUMBLE_OFF equ 0 << B_RAMB_RUMBLE + def RAMB_RUMBLE_ON equ 1 << B_RAMB_RUMBLE + + +; ** MBC1 and MMM01 only ****************************************************** + +; -- BMODE ($6000-$7FFF) ------------------------------------------------------ +; Banking mode select [wo] +def rBMODE equ $6000 + +def BMODE_SIMPLE equ $00 ; locks ROMB and RAMB to bank 0 +def BMODE_ADVANCED equ $01 ; allows bank-switching with RAMB + + +; ** MBC2 only **************************************************************** + +; -- ROM2B ($0000-$3FFF with bit 8 set) --------------------------------------- +; ROM bank number [wo] +def rROM2B equ $2100 + + +; ** MBC3 only **************************************************************** + +; -- RTCLATCH ($6000-$7FFF) --------------------------------------------------- +; RTC latch clock data [wo] +def rRTCLATCH equ $6000 + +; Write $00 then $01 to latch the current time into RTCREG +def RTCLATCH_START equ $00 +def RTCLATCH_FINISH equ $01 + +; -- RTCREG ($A000-$BFFF) ----------------------------------------------------- +; RTC register [r/w] +def rRTCREG equ $A000 + + +; ** MBC5 only **************************************************************** + +; -- ROMB0 ($2000-$3FFF) ------------------------------------------------------ +; ROM bank number low byte (bits 0-7) [wo] +def rROMB0 equ $2000 + +; -- ROMB1 ($3000-$3FFF) ------------------------------------------------------ +; ROM bank number high bit (bit 8) [wo] +def rROMB1 equ $3000 + + +; ** MBC6 only **************************************************************** + +; -- RAMBA ($0400-$07FF) ------------------------------------------------------ +; RAM bank A number [wo] +def rRAMBA equ $0400 + +; -- RAMBB ($0800-$0BFF) ------------------------------------------------------ +; RAM bank B number [wo] +def rRAMBB equ $0800 + +; -- FLASH ($0C00-$0FFF) ------------------------------------------------------ +; Whether the flash chip can be accessed [wo] +def rFLASH equ $0C00 + +; -- FMODE ($1000) ------------------------------------------------------------ +; Write mode select for the flash chip +def rFMODE equ $1000 + +; -- ROMBA ($2000-$27FF) ------------------------------------------------------ +; ROM/Flash bank A number [wo] +def rROMBA equ $2000 + +; -- FLASHA ($2800-$2FFF) ----------------------------------------------------- +; ROM/Flash bank A select [wo] +def rFLASHA equ $2800 + +; -- ROMBB ($3000-$37FF) ------------------------------------------------------ +; ROM/Flash bank B number [wo] +def rROMBB equ $3000 + +; -- FLASHB ($3800-$3FFF) ----------------------------------------------------- +; ROM/Flash bank B select [wo] +def rFLASHB equ $3800 + + +; ** MBC7 only **************************************************************** + +; -- RAMREG ($4000-$5FFF) ----------------------------------------------------- +; Enable RAM register access [wo] +def rRAMREG equ $4000 + +def RAMREG_ENABLE equ $40 + +; -- ACCLATCH0 ($Ax0x) -------------------------------------------------------- +; Latch accelerometer start [wo] +def rACCLATCH0 equ $A000 + +def ACCLATCH0_START equ $55 + +; -- ACCLATCH1 ($Ax1x) -------------------------------------------------------- +; Latch accelerometer finish [wo] +def rACCLATCH1 equ $A010 + +def ACCLATCH1_FINISH equ $AA + +; -- ACCELX0 ($Ax2x) ---------------------------------------------------------- +; Accelerometer X value low byte [ro] +def rACCELX0 equ $A020 + +; -- ACCELX1 ($Ax3x) ---------------------------------------------------------- +; Accelerometer X value high byte [ro] +def rACCELX1 equ $A030 + +; -- ACCELY0 ($Ax4x) ---------------------------------------------------------- +; Accelerometer Y value low byte [ro] +def rACCELY0 equ $A040 + +; -- ACCELY1 ($Ax5x) ---------------------------------------------------------- +; Accelerometer Y value high byte [ro] +def rACCELY1 equ $A050 + +; -- EEPROM ($Ax8x) ----------------------------------------------------------- +; EEPROM access [r/w] +def rEEPROM equ $A080 + + +; ** HuC1 only **************************************************************** + +; -- IRREG ($A000-$BFFF) ------------------------------------------------------ +; IR register [r/w] +def rIRREG equ $A000 + +def IR_LED_OFF equ $C0 +def IR_LED_ON equ $C1 + + +;****************************************************************************** +; Screen-related constants +;****************************************************************************** + +def SCREEN_WIDTH_PX equ 160 ; width of screen in pixels +def SCREEN_HEIGHT_PX equ 144 ; height of screen in pixels +def SCREEN_WIDTH equ 20 ; width of screen in bytes +def SCREEN_HEIGHT equ 18 ; height of screen in bytes +def SCREEN_AREA equ SCREEN_WIDTH * SCREEN_HEIGHT ; size of screen in bytes + +def TILEMAP_WIDTH_PX equ 256 ; width of tilemap in pixels +def TILEMAP_HEIGHT_PX equ 256 ; height of tilemap in pixels +def TILEMAP_WIDTH equ 32 ; width of tilemap in bytes +def TILEMAP_HEIGHT equ 32 ; height of tilemap in bytes +def TILEMAP_AREA equ TILEMAP_WIDTH * TILEMAP_HEIGHT ; size of tilemap in bytes + +def TILE_WIDTH equ 8 ; width of tile in pixels +def TILE_HEIGHT equ 8 ; height of tile in pixels +def TILE_SIZE equ 16 ; size of tile in bytes (2 bits/pixel) + +def COLOR_SIZE equ 2 ; size of color in bytes (little-endian BGR555) + def B_COLOR_RED equ 0 ; bits 4-0 + def B_COLOR_GREEN equ 5 ; bits 9-5 + def B_COLOR_BLUE equ 10 ; bits 14-10 + def COLOR_RED equ %000_11111 ; for the low byte + def COLOR_GREEN_LOW equ %111_00000 ; for the low byte + def COLOR_GREEN_HIGH equ %0_00000_11 ; for the high byte + def COLOR_BLUE equ %0_11111_00 ; for the high byte +def PAL_COLORS equ 4 ; colors per palette +def PAL_SIZE equ COLOR_SIZE * PAL_COLORS ; size of palette in bytes + +; Tilemaps the BG or Window can read from (controlled by LCDC) +def TILEMAP0 equ $9800 ; $9800-$9BFF +def TILEMAP1 equ $9C00 ; $9C00-$9FFF + +; (CGB only) BG tile attribute fields +def B_BG_PRIO equ 7 ; whether the BG tile colors 1-3 are drawn above OBJs +def B_BG_YFLIP equ 6 ; whether the whole BG tile is flipped vertically +def B_BG_XFLIP equ 5 ; whether the whole BG tile is flipped horizontally +def B_BG_BANK1 equ 3 ; which VRAM bank the BG tile is taken from +def BG_PALETTE equ %00000_111 ; which palette the BG tile uses + def BG_PRIO equ 1 << B_BG_PRIO + def BG_YFLIP equ 1 << B_BG_YFLIP + def BG_XFLIP equ 1 << B_BG_XFLIP + def BG_BANK0 equ 0 << B_BG_BANK1 + def BG_BANK1 equ 1 << B_BG_BANK1 + + +;****************************************************************************** +; OBJ-related constants +;****************************************************************************** + +; OAM attribute field offsets +rsreset +def OAMA_Y rb ; 0 + def OAM_Y_OFS equ 16 ; subtract 16 from what's written to OAM to get the real Y position +def OAMA_X rb ; 1 + def OAM_X_OFS equ 8 ; subtract 8 from what's written to OAM to get the real X position +def OAMA_TILEID rb ; 2 +def OAMA_FLAGS rb ; 3 + def B_OAM_PRIO equ 7 ; whether the OBJ is drawn below BG colors 1-3 + def B_OAM_YFLIP equ 6 ; whether the whole OBJ is flipped vertically + def B_OAM_XFLIP equ 5 ; whether the whole OBJ is flipped horizontally + def B_OAM_PAL1 equ 4 ; (DMG only) which of the two palettes the OBJ uses + def B_OAM_BANK1 equ 3 ; (CGB only) which VRAM bank the OBJ takes its tile(s) from + def OAM_PALETTE equ %00000_111 ; (CGB only) which palette the OBJ uses + def OAM_PRIO equ 1 << B_OAM_PRIO + def OAM_YFLIP equ 1 << B_OAM_YFLIP + def OAM_XFLIP equ 1 << B_OAM_XFLIP + def OAM_PAL0 equ 0 << B_OAM_PAL1 + def OAM_PAL1 equ 1 << B_OAM_PAL1 + def OAM_BANK0 equ 0 << B_OAM_BANK1 + def OAM_BANK1 equ 1 << B_OAM_BANK1 +def OBJ_SIZE rb 0 ; size of OBJ in bytes = 4 + +def OAM_COUNT equ 40 ; how many OBJs there are room for in OAM +def OAM_SIZE equ OBJ_SIZE * OAM_COUNT + + +;****************************************************************************** +; Interrupt vector addresses +;****************************************************************************** + +def INT_HANDLER_VBLANK equ $0040 ; VBlank interrupt handler address +def INT_HANDLER_STAT equ $0048 ; STAT interrupt handler address +def INT_HANDLER_TIMER equ $0050 ; timer interrupt handler address +def INT_HANDLER_SERIAL equ $0058 ; serial interrupt handler address +def INT_HANDLER_JOYPAD equ $0060 ; joypad interrupt handler address + + +;****************************************************************************** +; Boot-up register values +;****************************************************************************** + +; Register A = CPU type +def BOOTUP_A_DMG equ $01 +def BOOTUP_A_CGB equ $11 ; CGB or AGB +def BOOTUP_A_MGB equ $FF + def BOOTUP_A_SGB equ BOOTUP_A_DMG + def BOOTUP_A_SGB2 equ BOOTUP_A_MGB + +; Register B = CPU qualifier (if A is BOOTUP_A_CGB) +def B_BOOTUP_B_AGB equ 0 + def BOOTUP_B_CGB equ 0 << B_BOOTUP_B_AGB + def BOOTUP_B_AGB equ 1 << B_BOOTUP_B_AGB + + +;****************************************************************************** +; Aliases +;****************************************************************************** + +; Prefer the standard names to these aliases, which may be official but are +; less directly meaningful or human-readable. + +def rP1 equ rJOYP + +def rNR10 equ rAUD1SWEEP +def rNR11 equ rAUD1LEN +def rNR12 equ rAUD1ENV +def rNR13 equ rAUD1LOW +def rNR14 equ rAUD1HIGH +def rNR21 equ rAUD2LEN +def rNR22 equ rAUD2ENV +def rNR23 equ rAUD2LOW +def rNR24 equ rAUD2HIGH +def rNR30 equ rAUD3ENA +def rNR31 equ rAUD3LEN +def rNR32 equ rAUD3LEVEL +def rNR33 equ rAUD3LOW +def rNR34 equ rAUD3HIGH +def rNR41 equ rAUD4LEN +def rNR42 equ rAUD4ENV +def rNR43 equ rAUD4POLY +def rNR44 equ rAUD4GO +def rNR50 equ rAUDVOL +def rNR51 equ rAUDTERM +def rNR52 equ rAUDENA + +def rKEY0 equ rSYS +def rKEY1 equ rSPD + +def rHDMA1 equ rVDMA_SRC_HIGH +def rHDMA2 equ rVDMA_SRC_LOW +def rHDMA3 equ rVDMA_DEST_HIGH +def rHDMA4 equ rVDMA_DEST_LOW +def rHDMA5 equ rVDMA_LEN + +def rBCPS equ rBGPI +def rBCPD equ rBGPD + +def rOCPS equ rOBPI +def rOCPD equ rOBPD + +def rSVBK equ rWBK + +endc ; HARDWARE_INC diff --git a/src/constants/hardware_constants.asm b/src/constants/hardware_constants.asm deleted file mode 100644 index 4a96d0c..0000000 --- a/src/constants/hardware_constants.asm +++ /dev/null @@ -1,200 +0,0 @@ -; From http://bgb.bircd.org/pandocs.htm and https://github.com/tobiasvl/hardware.inc - -DEF GBC EQU $11 - -; MBC3 -DEF MBC3SRamEnable EQU $0000 -DEF MBC3RomBank EQU $2000 -DEF MBC3SRamBank EQU $4000 -DEF MBC3LatchClock EQU $6000 -DEF MBC3RTC EQU $a000 - -DEF SRAM_DISABLE EQU $00 -DEF SRAM_ENABLE EQU $0a - -DEF NUM_SRAM_BANKS EQU 4 - -DEF RTC_S EQU $08 ; Seconds 0-59 (0-3Bh) -DEF RTC_M EQU $09 ; Minutes 0-59 (0-3Bh) -DEF RTC_H EQU $0a ; Hours 0-23 (0-17h) -DEF RTC_DL EQU $0b ; Lower 8 bits of Day Counter (0-FFh) -DEF RTC_DH EQU $0c ; Upper 1 bit of Day Counter, Carry Bit, Halt Flag - ; Bit 0 Most significant bit of Day Counter (Bit 8) - ; Bit 6 Halt (0=Active, 1=Stop Timer) - ; Bit 7 Day Counter Carry Bit (1=Counter Overflow) - -; interrupt flags -DEF INT_VBLANK EQU 0 -DEF INT_LCD_STAT EQU 1 -DEF INT_TIMER EQU 2 -DEF INT_SERIAL EQU 3 -DEF INT_JOYPAD EQU 4 - -; OAM attribute flags -DEF OAM_PALETTE EQU %111 -DEF OAM_TILE_BANK EQU 3 -DEF OAM_OBP_NUM EQU 4 ; Non CGB Mode Only -DEF OAM_X_FLIP EQU 5 -DEF OAM_Y_FLIP EQU 6 -DEF OAM_PRIORITY EQU 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3) - -; Hardware registers -DEF rJOYP EQU $ff00 ; Joypad (R/W) -DEF P15 EQU %00100000 -DEF JOY_BTNS_SELECT EQU P15 -DEF P14 EQU %00010000 -DEF JOY_DPAD_SELECT EQU P14 -DEF JOY_INPUT_MASK EQU %00001111 -DEF P13 EQU %00001000 -DEF P12 EQU %00000100 -DEF P11 EQU %00000010 -DEF P10 EQU %00000001 -DEF JOY_INPUT_DOWN EQU P13 -DEF JOY_INPUT_UP EQU P12 -DEF JOY_INPUT_LEFT EQU P11 -DEF JOY_INPUT_RIGHT EQU P10 -DEF JOY_INPUT_START EQU P13 -DEF JOY_INPUT_SELECT EQU P12 -DEF JOY_INPUT_B EQU P11 -DEF JOY_INPUT_A EQU P10 -DEF SNES_JOYPAD1 EQU $3 ; lower two bits -DEF SNES_JOYPAD2 EQU $2 ; lower two bits -DEF SNES_JOYPAD3 EQU $1 ; lower two bits -DEF SNES_JOYPAD4 EQU $0 ; lower two bits - -DEF rSB EQU $ff01 ; Serial transfer data (R/W) -DEF rSC EQU $ff02 ; Serial Transfer Control (R/W) -DEF SC_START EQU $80 -DEF SC_INTERNAL EQU $01 -DEF SC_EXTERNAL EQU $00 - -DEF rDIV EQU $ff04 ; Divider Register (R/W) -DEF rTIMA EQU $ff05 ; Timer counter (R/W) -DEF rTMA EQU $ff06 ; Timer Modulo (R/W) -DEF rTAC EQU $ff07 ; Timer Control (R/W) -DEF TAC_START EQU $04 -DEF TAC_STOP EQU $00 -DEF TAC_4096_HZ EQU $00 -DEF TAC_262144_HZ EQU $01 -DEF TAC_65536_HZ EQU $02 -DEF TAC_16384_HZ EQU $03 - -DEF rIF EQU $ff0f ; Interrupt Flag (R/W) - -DEF rNR10 EQU $ff10 ; Channel 1 Sweep register (R/W) -DEF rNR11 EQU $ff11 ; Channel 1 Sound length/Wave pattern duty (R/W) -DEF rNR12 EQU $ff12 ; Channel 1 Volume Envelope (R/W) -DEF rNR13 EQU $ff13 ; Channel 1 Frequency lo (Write Only) -DEF rNR14 EQU $ff14 ; Channel 1 Frequency hi (R/W) - -DEF rNR21 EQU $ff16 ; Channel 2 Sound Length/Wave Pattern Duty (R/W) -DEF rNR22 EQU $ff17 ; Channel 2 Volume Envelope (R/W) -DEF rNR23 EQU $ff18 ; Channel 2 Frequency lo data (W) -DEF rNR24 EQU $ff19 ; Channel 2 Frequency hi data (R/W) - -DEF rNR30 EQU $ff1a ; Channel 3 Sound on/off (R/W) -DEF rNR31 EQU $ff1b ; Channel 3 Sound Length -DEF rNR32 EQU $ff1c ; Channel 3 Select output level (R/W) -DEF rNR33 EQU $ff1d ; Channel 3 Frequency's lower data (W) -DEF rNR34 EQU $ff1e ; Channel 3 Frequency's higher data (R/W) - -DEF rNR41 EQU $ff20 ; Channel 4 Sound Length (R/W) -DEF rNR42 EQU $ff21 ; Channel 4 Volume Envelope (R/W) -DEF rNR43 EQU $ff22 ; Channel 4 Polynomial Counter (R/W) -DEF rNR44 EQU $ff23 ; Channel 4 Counter/consecutive; Initial (R/W) - -DEF rNR50 EQU $ff24 ; Channel control / ON-OFF / Volume (R/W) -DEF rNR51 EQU $ff25 ; Selection of Sound output terminal (R/W) -DEF rNR52 EQU $ff26 ; Sound on/off - -DEF rLCDC EQU $ff40 ; LCD Control (R/W) -DEF LCDC_OFF EQU %01111111 ; LCD Control Operation (and) -DEF LCDC_ON EQU %10000000 ; LCD Control Operation (ld/or) -DEF LCDC_ENABLE_F EQU 7 -DEF LCDC_WIN9800 EQU %10111111 ; Window Tile Map Display Select (and) -DEF LCDC_WIN9C00 EQU %01000000 ; Window Tile Map Display Select (ld/or) -DEF LCDC_WINSELECT EQU LCDC_WIN9C00 -DEF LCDC_WINOFF EQU %11011111 ; Window Display (and) -DEF LCDC_WINON EQU %00100000 ; Window Display (ld/or) -DEF LCDC_WINENABLE EQU LCDC_WINON -DEF LCDC_BG8800 EQU %11101111 ; BG & Window Tile Data Select (and) -DEF LCDC_BG8000 EQU %00010000 ; BG & Window Tile Data Select (ld/or) -DEF LCDC_BGTILEDATA EQU LCDC_BG8000 -DEF LCDC_BG9800 EQU %11110111 ; BG Tile Map Display Select (and) -DEF LCDC_BG9C00 EQU %00001000 ; BG Tile Map Display Select (ld/or) -DEF LCDC_BGTILEMAP EQU LCDC_BG9C00 -DEF LCDC_OBJ8 EQU %11111011 ; OBJ Construction (and) -DEF LCDC_OBJ16 EQU %00000100 ; OBJ Construction (ld/or) -DEF LCDC_OBJSIZE EQU LCDC_OBJ16 -DEF LCDC_OBJOFF EQU %11111101 ; OBJ Display (and) -DEF LCDC_OBJON EQU %00000010 ; OBJ Display (ld/or) -DEF LCDC_OBJENABLE EQU LCDC_OBJON -DEF LCDC_BGOFF EQU %11111110 ; BG Display (and) -DEF LCDC_BGON EQU %00000001 ; BG Display (ld/or) -DEF LCDC_BGENABLE EQU LCDC_BGON - -DEF rSTAT EQU $ff41 ; LCDC Status (R/W) -DEF STAT_LYC EQU 6 ; LYC=LY Coincidence -DEF STAT_MODE_OAM EQU 5 ; Mode 10 (OAM) -DEF STAT_MODE_VBLANK EQU 4 ; Mode 01 (V-Blank) -DEF STAT_MODE_HBLANK EQU 3 ; Mode 00 (H-Blank) -DEF STAT_LYCFLAG EQU 2 ; 0:LYC<>LY, 1:LYC=LY -DEF STAT_LCDC_STATUS EQU %00000011 -DEF STAT_ON_HBLANK EQU %00000000 ; H-Blank -DEF STAT_ON_VBLANK EQU %00000001 ; V-Blank -DEF STAT_ON_OAM EQU %00000010 ; OAM-RAM is used by system -DEF STAT_ON_LCD EQU %00000011 ; Both OAM and VRAM used by system -DEF STAT_BUSY EQU 1 ; When set, VRAM and OAM access is unsafe - -DEF rSCY EQU $ff42 ; Scroll Y (R/W) -DEF rSCX EQU $ff43 ; Scroll X (R/W) - -DEF rLY EQU $ff44 ; LCDC Y-Coordinate (R) -DEF LY_VBLANK EQU 145 -DEF rLYC EQU $ff45 ; LY Compare (R/W) - -DEF rDMA EQU $ff46 ; DMA Transfer and Start Address (W) - -DEF rBGP EQU $ff47 ; BG Palette Data (R/W) - Non CGB Mode Only -DEF rOBP0 EQU $ff48 ; Object Palette 0 Data (R/W) - Non CGB Mode Only -DEF rOBP1 EQU $ff49 ; Object Palette 1 Data (R/W) - Non CGB Mode Only - -DEF rWY EQU $ff4a ; Window Y Position (R/W) -DEF rWX EQU $ff4b ; Window X Position minus 7 (R/W) - -DEF rKEY1 EQU $ff4d ; CGB Mode Only - Prepare Speed Switch - -DEF rVBK EQU $ff4f ; CGB Mode Only - VRAM Bank - -DEF rHDMA1 EQU $ff51 ; CGB Mode Only - New DMA Source, High -DEF rHDMA2 EQU $ff52 ; CGB Mode Only - New DMA Source, Low -DEF rHDMA3 EQU $ff53 ; CGB Mode Only - New DMA Destination, High -DEF rHDMA4 EQU $ff54 ; CGB Mode Only - New DMA Destination, Low -DEF rHDMA5 EQU $ff55 ; CGB Mode Only - New DMA Length/Mode/Start - -DEF rRP EQU $ff56 ; CGB Mode Only - Infrared Communications Port -DEF RPF_ENREAD EQU %11000000 -DEF RPF_DATAIN EQU %00000010 ; 0=Receiving IR Signal, 1=Normal -DEF RPF_WRITE_HI EQU %00000001 -DEF RPF_WRITE_LO EQU %00000000 - -DEF RPB_LED_ON EQU 0 -DEF RPB_DATAIN EQU 1 - -DEF rBGPI EQU $ff68 ; CGB Mode Only - Background Palette Index -DEF rBGPD EQU $ff69 ; CGB Mode Only - Background Palette Data -DEF rOBPI EQU $ff6a ; CGB Mode Only - Sprite Palette Index -DEF rOBPD EQU $ff6b ; CGB Mode Only - Sprite Palette Data - -DEF rUNKNOWN1 EQU $ff6c ; (FEh) Bit 0 (Read/Write) - CGB Mode Only - -DEF rSVBK EQU $ff70 ; CGB Mode Only - WRAM Bank - -DEF rUNKNOWN2 EQU $ff72 ; (00h) - Bit 0-7 (Read/Write) -DEF rUNKNOWN3 EQU $ff73 ; (00h) - Bit 0-7 (Read/Write) -DEF rUNKNOWN4 EQU $ff74 ; (00h) - Bit 0-7 (Read/Write) - CGB Mode Only -DEF rUNKNOWN5 EQU $ff75 ; (8Fh) - Bit 4-6 (Read/Write) -DEF rUNKNOWN6 EQU $ff76 ; (00h) - Always 00h (Read Only) -DEF rUNKNOWN7 EQU $ff77 ; (00h) - Always 00h (Read Only) - -DEF rIE EQU $ffff ; Interrupt Enable (R/W) diff --git a/src/constants/misc_constants.asm b/src/constants/misc_constants.asm index 13dc081..748dd90 100644 --- a/src/constants/misc_constants.asm +++ b/src/constants/misc_constants.asm @@ -1,25 +1,3 @@ -; buttons -DEF A_BUTTON_F EQU 0 -DEF B_BUTTON_F EQU 1 -DEF SELECT_F EQU 2 -DEF START_F EQU 3 -DEF D_RIGHT_F EQU 4 -DEF D_LEFT_F EQU 5 -DEF D_UP_F EQU 6 -DEF D_DOWN_F EQU 7 - -DEF A_BUTTON EQU 1 << A_BUTTON_F ; $01 -DEF B_BUTTON EQU 1 << B_BUTTON_F ; $02 -DEF SELECT EQU 1 << SELECT_F ; $04 -DEF START EQU 1 << START_F ; $08 -DEF D_RIGHT EQU 1 << D_RIGHT_F ; $10 -DEF D_LEFT EQU 1 << D_LEFT_F ; $20 -DEF D_UP EQU 1 << D_UP_F ; $40 -DEF D_DOWN EQU 1 << D_DOWN_F ; $80 - -DEF BUTTONS EQU A_BUTTON | B_BUTTON | SELECT | START ; $0f -DEF D_PAD EQU D_RIGHT | D_LEFT | D_UP | D_DOWN ; $f0 - ; console types (wConsole) DEF CONSOLE_DMG EQU $00 DEF CONSOLE_SGB EQU $01 @@ -62,6 +40,18 @@ DEF CARDPOP_NAME_LIST_SIZE EQUS "CARDPOP_NAME_LIST_MAX_ELEMS * NAME_BUFFER_LENGT DEF NUM_CHALLENGE_MACHINE_OPPONENTS EQU 5 +; rJOYP constants to read IR signals or SNES input +DEF P15 EQU %00100000 +DEF P14 EQU %00010000 +DEF P13 EQU %00001000 +DEF P12 EQU %00000100 +DEF P11 EQU %00000010 +DEF P10 EQU %00000001 +DEF SNES_JOYPAD1 EQU $3 ; lower two bits +DEF SNES_JOYPAD2 EQU $2 ; lower two bits +DEF SNES_JOYPAD3 EQU $1 ; lower two bits +DEF SNES_JOYPAD4 EQU $0 ; lower two bits + ; commands transmitted through IR to be ; executed by the other device ; (see ExecuteReceivedIRCommands) diff --git a/src/data/duel/animations/anims1.asm b/src/data/duel/animations/anims1.asm index 3fa3aa0..61277a9 100644 --- a/src/data/duel/animations/anims1.asm +++ b/src/data/duel/animations/anims1.asm @@ -29,15 +29,15 @@ AnimFrameTable0:: db 4 ; size db 0, 0, 6, $0 db 8, 0, 7, $0 - db 8, 8, 7, (1 << OAM_X_FLIP) - db 0, 8, 6, (1 << OAM_X_FLIP) + db 8, 8, 7, OAM_XFLIP + db 0, 8, 6, OAM_XFLIP .data_a8ea1 db 4 ; size - db 0, 0, 9, (1 << OAM_X_FLIP) - db 8, 0, 11, (1 << OAM_X_FLIP) - db 0, 8, 8, (1 << OAM_X_FLIP) - db 8, 8, 10, (1 << OAM_X_FLIP) + db 0, 0, 9, OAM_XFLIP + db 8, 0, 11, OAM_XFLIP + db 0, 8, 8, OAM_XFLIP + db 8, 8, 10, OAM_XFLIP .data_a8eb2 db 4 ; size @@ -64,29 +64,29 @@ AnimFrameTable0:: db 4 ; size db 0, 0, 0, $0 db 8, 0, 1, $0 - db 0, 8, 0, (1 << OAM_X_FLIP) - db 8, 8, 1, (1 << OAM_X_FLIP) + db 0, 8, 0, OAM_XFLIP + db 8, 8, 1, OAM_XFLIP .data_a8ef6 db 4 ; size - db 0, 0, 3, (1 << OAM_X_FLIP) - db 8, 0, 5, (1 << OAM_X_FLIP) - db 0, 8, 2, (1 << OAM_X_FLIP) - db 8, 8, 4, (1 << OAM_X_FLIP) + db 0, 0, 3, OAM_XFLIP + db 8, 0, 5, OAM_XFLIP + db 0, 8, 2, OAM_XFLIP + db 8, 8, 4, OAM_XFLIP .data_a8f07 db 4 ; size - db 0, 0, 13, (1 << OAM_X_FLIP) - db 8, 0, 15, (1 << OAM_X_FLIP) - db 0, 8, 12, (1 << OAM_X_FLIP) - db 8, 8, 14, (1 << OAM_X_FLIP) + db 0, 0, 13, OAM_XFLIP + db 8, 0, 15, OAM_XFLIP + db 0, 8, 12, OAM_XFLIP + db 8, 8, 14, OAM_XFLIP .data_a8f18 db 4 ; size - db 0, 0, 17, (1 << OAM_X_FLIP) - db 8, 0, 19, (1 << OAM_X_FLIP) - db 0, 8, 16, (1 << OAM_X_FLIP) - db 8, 8, 18, (1 << OAM_X_FLIP) + db 0, 0, 17, OAM_XFLIP + db 8, 0, 19, OAM_XFLIP + db 0, 8, 16, OAM_XFLIP + db 8, 8, 18, OAM_XFLIP AnimData4:: frame_table AnimFrameTable1 @@ -110,73 +110,73 @@ AnimFrameTable1:: .data_a8f54 db 4 ; size - db 0, 0, 8, (1 << OAM_OBP_NUM) - db 0, 8, 9, (1 << OAM_OBP_NUM) - db 8, 0, 10, (1 << OAM_OBP_NUM) - db 8, 8, 11, (1 << OAM_OBP_NUM) + db 0, 0, 8, OAM_PAL1 + db 0, 8, 9, OAM_PAL1 + db 8, 0, 10, OAM_PAL1 + db 8, 8, 11, OAM_PAL1 .data_a8f65 db 4 ; size - db 0, 0, 6, (1 << OAM_OBP_NUM) - db 8, 0, 7, (1 << OAM_OBP_NUM) - db 8, 8, 7, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 6, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 6, OAM_PAL1 + db 8, 0, 7, OAM_PAL1 + db 8, 8, 7, OAM_PAL1 | OAM_XFLIP + db 0, 8, 6, OAM_PAL1 | OAM_XFLIP .data_a8f76 db 4 ; size - db 0, 0, 9, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 11, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 8, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 10, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 9, OAM_PAL1 | OAM_XFLIP + db 8, 0, 11, OAM_PAL1 | OAM_XFLIP + db 0, 8, 8, OAM_PAL1 | OAM_XFLIP + db 8, 8, 10, OAM_PAL1 | OAM_XFLIP .data_a8f87 db 4 ; size - db 0, 0, 12, (1 << OAM_OBP_NUM) - db 0, 8, 13, (1 << OAM_OBP_NUM) - db 8, 0, 14, (1 << OAM_OBP_NUM) - db 8, 8, 15, (1 << OAM_OBP_NUM) + db 0, 0, 12, OAM_PAL1 + db 0, 8, 13, OAM_PAL1 + db 8, 0, 14, OAM_PAL1 + db 8, 8, 15, OAM_PAL1 .data_a8f98 db 4 ; size - db 0, 0, 16, (1 << OAM_OBP_NUM) - db 0, 8, 17, (1 << OAM_OBP_NUM) - db 8, 0, 18, (1 << OAM_OBP_NUM) - db 8, 8, 19, (1 << OAM_OBP_NUM) + db 0, 0, 16, OAM_PAL1 + db 0, 8, 17, OAM_PAL1 + db 8, 0, 18, OAM_PAL1 + db 8, 8, 19, OAM_PAL1 .data_a8fa9 db 4 ; size - db 0, 0, 2, (1 << OAM_OBP_NUM) - db 0, 8, 3, (1 << OAM_OBP_NUM) - db 8, 0, 4, (1 << OAM_OBP_NUM) - db 8, 8, 5, (1 << OAM_OBP_NUM) + db 0, 0, 2, OAM_PAL1 + db 0, 8, 3, OAM_PAL1 + db 8, 0, 4, OAM_PAL1 + db 8, 8, 5, OAM_PAL1 .data_a8fba db 4 ; size - db 0, 0, 0, (1 << OAM_OBP_NUM) - db 8, 0, 1, (1 << OAM_OBP_NUM) - db 0, 8, 0, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 1, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 0, OAM_PAL1 + db 8, 0, 1, OAM_PAL1 + db 0, 8, 0, OAM_PAL1 | OAM_XFLIP + db 8, 8, 1, OAM_PAL1 | OAM_XFLIP .data_a8fcb db 4 ; size - db 0, 0, 3, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 5, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 2, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 4, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 3, OAM_PAL1 | OAM_XFLIP + db 8, 0, 5, OAM_PAL1 | OAM_XFLIP + db 0, 8, 2, OAM_PAL1 | OAM_XFLIP + db 8, 8, 4, OAM_PAL1 | OAM_XFLIP .data_a8fdc db 4 ; size - db 0, 0, 13, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 15, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 12, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 14, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 13, OAM_PAL1 | OAM_XFLIP + db 8, 0, 15, OAM_PAL1 | OAM_XFLIP + db 0, 8, 12, OAM_PAL1 | OAM_XFLIP + db 8, 8, 14, OAM_PAL1 | OAM_XFLIP .data_a8fed db 4 ; size - db 0, 0, 17, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 19, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 16, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 18, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 17, OAM_PAL1 | OAM_XFLIP + db 8, 0, 19, OAM_PAL1 | OAM_XFLIP + db 0, 8, 16, OAM_PAL1 | OAM_XFLIP + db 8, 8, 18, OAM_PAL1 | OAM_XFLIP AnimData7:: frame_table AnimFrameTable1 @@ -197,31 +197,31 @@ AnimFrameTable2:: .data_a9020 db 4 ; size - db -2, 7, 20, (1 << OAM_OBP_NUM) - db -2, 15, 21, (1 << OAM_OBP_NUM) - db 6, 7, 22, (1 << OAM_OBP_NUM) - db 6, 15, 23, (1 << OAM_OBP_NUM) + db -2, 7, 20, OAM_PAL1 + db -2, 15, 21, OAM_PAL1 + db 6, 7, 22, OAM_PAL1 + db 6, 15, 23, OAM_PAL1 .data_a9031 db 4 ; size - db 5, 4, 24, (1 << OAM_OBP_NUM) - db 5, 12, 25, (1 << OAM_OBP_NUM) - db -3, 4, 13, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db -3, 12, 12, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 5, 4, 24, OAM_PAL1 + db 5, 12, 25, OAM_PAL1 + db -3, 4, 13, OAM_PAL1 | OAM_XFLIP + db -3, 12, 12, OAM_PAL1 | OAM_XFLIP .data_a9042 db 4 ; size - db 5, 2, 25, (1 << OAM_OBP_NUM) - db -3, -6, 13, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db -3, 2, 12, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 5, -6, 26, (1 << OAM_OBP_NUM) + db 5, 2, 25, OAM_PAL1 + db -3, -6, 13, OAM_PAL1 | OAM_XFLIP + db -3, 2, 12, OAM_PAL1 | OAM_XFLIP + db 5, -6, 26, OAM_PAL1 .data_a9053 db 4 ; size - db 0, -16, 0, (1 << OAM_OBP_NUM) - db 8, -16, 1, (1 << OAM_OBP_NUM) - db 0, -8, 0, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, -8, 1, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, -16, 0, OAM_PAL1 + db 8, -16, 1, OAM_PAL1 + db 0, -8, 0, OAM_PAL1 | OAM_XFLIP + db 8, -8, 1, OAM_PAL1 | OAM_XFLIP AnimData9:: frame_table AnimFrameTable2 @@ -246,8 +246,8 @@ AnimFrameTable3:: db 4 ; size db 0, 0, 6, $0 db 8, 0, 7, $0 - db 0, 8, 6, (1 << OAM_X_FLIP) - db 8, 8, 7, (1 << OAM_X_FLIP) + db 0, 8, 6, OAM_XFLIP + db 8, 8, 7, OAM_XFLIP .data_a909f db 4 ; size @@ -260,15 +260,15 @@ AnimFrameTable3:: db 4 ; size db 0, 0, 0, $0 db 8, 0, 1, $0 - db 0, 8, 0, (1 << OAM_X_FLIP) - db 8, 8, 1, (1 << OAM_X_FLIP) + db 0, 8, 0, OAM_XFLIP + db 8, 8, 1, OAM_XFLIP .data_a90c1 db 4 ; size - db 0, 0, 3, (1 << OAM_X_FLIP) - db 8, 0, 5, (1 << OAM_X_FLIP) - db 0, 8, 2, (1 << OAM_X_FLIP) - db 8, 8, 4, (1 << OAM_X_FLIP) + db 0, 0, 3, OAM_XFLIP + db 8, 0, 5, OAM_XFLIP + db 0, 8, 2, OAM_XFLIP + db 8, 8, 4, OAM_XFLIP AnimData13:: frame_table AnimFrameTable3 @@ -306,15 +306,15 @@ AnimFrameTable4:: db 4 ; size db 0, 0, 6, $0 db 8, 0, 7, $0 - db 8, 8, 7, (1 << OAM_X_FLIP) - db 0, 8, 6, (1 << OAM_X_FLIP) + db 8, 8, 7, OAM_XFLIP + db 0, 8, 6, OAM_XFLIP .data_a912a db 4 ; size - db 0, 0, 9, (1 << OAM_X_FLIP) - db 8, 0, 11, (1 << OAM_X_FLIP) - db 0, 8, 8, (1 << OAM_X_FLIP) - db 8, 8, 10, (1 << OAM_X_FLIP) + db 0, 0, 9, OAM_XFLIP + db 8, 0, 11, OAM_XFLIP + db 0, 8, 8, OAM_XFLIP + db 8, 8, 10, OAM_XFLIP .data_a913b db 4 ; size @@ -341,29 +341,29 @@ AnimFrameTable4:: db 4 ; size db 0, 0, 0, $0 db 8, 0, 1, $0 - db 0, 8, 0, (1 << OAM_X_FLIP) - db 8, 8, 1, (1 << OAM_X_FLIP) + db 0, 8, 0, OAM_XFLIP + db 8, 8, 1, OAM_XFLIP .data_a917f db 4 ; size - db 0, 0, 3, (1 << OAM_X_FLIP) - db 8, 0, 5, (1 << OAM_X_FLIP) - db 0, 8, 2, (1 << OAM_X_FLIP) - db 8, 8, 4, (1 << OAM_X_FLIP) + db 0, 0, 3, OAM_XFLIP + db 8, 0, 5, OAM_XFLIP + db 0, 8, 2, OAM_XFLIP + db 8, 8, 4, OAM_XFLIP .data_a9190 db 4 ; size - db 0, 0, 13, (1 << OAM_X_FLIP) - db 8, 0, 15, (1 << OAM_X_FLIP) - db 0, 8, 12, (1 << OAM_X_FLIP) - db 8, 8, 14, (1 << OAM_X_FLIP) + db 0, 0, 13, OAM_XFLIP + db 8, 0, 15, OAM_XFLIP + db 0, 8, 12, OAM_XFLIP + db 8, 8, 14, OAM_XFLIP .data_a91a1 db 4 ; size - db 0, 0, 17, (1 << OAM_X_FLIP) - db 8, 0, 19, (1 << OAM_X_FLIP) - db 0, 8, 16, (1 << OAM_X_FLIP) - db 8, 8, 18, (1 << OAM_X_FLIP) + db 0, 0, 17, OAM_XFLIP + db 8, 0, 19, OAM_XFLIP + db 0, 8, 16, OAM_XFLIP + db 8, 8, 18, OAM_XFLIP AnimData15:: frame_table AnimFrameTable4 @@ -407,73 +407,73 @@ AnimFrameTable5:: .data_a9212 db 4 ; size - db 0, 0, 8, %001 | (1 << OAM_OBP_NUM) - db 0, 8, 9, %001 | (1 << OAM_OBP_NUM) - db 8, 0, 10, %001 | (1 << OAM_OBP_NUM) - db 8, 8, 11, %001 | (1 << OAM_OBP_NUM) + db 0, 0, 8, %001 | OAM_PAL1 + db 0, 8, 9, %001 | OAM_PAL1 + db 8, 0, 10, %001 | OAM_PAL1 + db 8, 8, 11, %001 | OAM_PAL1 .data_a9223 db 4 ; size - db 0, 0, 6, %001 | (1 << OAM_OBP_NUM) - db 8, 0, 7, %001 | (1 << OAM_OBP_NUM) - db 8, 8, 7, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 6, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 6, %001 | OAM_PAL1 + db 8, 0, 7, %001 | OAM_PAL1 + db 8, 8, 7, %001 | OAM_PAL1 | OAM_XFLIP + db 0, 8, 6, %001 | OAM_PAL1 | OAM_XFLIP .data_a9234 db 4 ; size - db 0, 0, 9, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 11, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 8, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 10, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 9, %001 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 11, %001 | OAM_PAL1 | OAM_XFLIP + db 0, 8, 8, %001 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 10, %001 | OAM_PAL1 | OAM_XFLIP .data_a9245 db 4 ; size - db 0, 0, 12, %001 | (1 << OAM_OBP_NUM) - db 0, 8, 13, %001 | (1 << OAM_OBP_NUM) - db 8, 0, 14, %001 | (1 << OAM_OBP_NUM) - db 8, 8, 15, %001 | (1 << OAM_OBP_NUM) + db 0, 0, 12, %001 | OAM_PAL1 + db 0, 8, 13, %001 | OAM_PAL1 + db 8, 0, 14, %001 | OAM_PAL1 + db 8, 8, 15, %001 | OAM_PAL1 .data_a9256 db 4 ; size - db 0, 0, 16, %001 | (1 << OAM_OBP_NUM) - db 0, 8, 17, %001 | (1 << OAM_OBP_NUM) - db 8, 0, 18, %001 | (1 << OAM_OBP_NUM) - db 8, 8, 19, %001 | (1 << OAM_OBP_NUM) + db 0, 0, 16, %001 | OAM_PAL1 + db 0, 8, 17, %001 | OAM_PAL1 + db 8, 0, 18, %001 | OAM_PAL1 + db 8, 8, 19, %001 | OAM_PAL1 .data_a9267 db 4 ; size - db 0, 0, 2, %001 | (1 << OAM_OBP_NUM) - db 0, 8, 3, %001 | (1 << OAM_OBP_NUM) - db 8, 0, 4, %001 | (1 << OAM_OBP_NUM) - db 8, 8, 5, %001 | (1 << OAM_OBP_NUM) + db 0, 0, 2, %001 | OAM_PAL1 + db 0, 8, 3, %001 | OAM_PAL1 + db 8, 0, 4, %001 | OAM_PAL1 + db 8, 8, 5, %001 | OAM_PAL1 .data_a9278 db 4 ; size - db 0, 0, 0, %001 | (1 << OAM_OBP_NUM) - db 8, 0, 1, %001 | (1 << OAM_OBP_NUM) - db 0, 8, 0, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 1, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 0, %001 | OAM_PAL1 + db 8, 0, 1, %001 | OAM_PAL1 + db 0, 8, 0, %001 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 1, %001 | OAM_PAL1 | OAM_XFLIP .data_a9289 db 4 ; size - db 0, 0, 3, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 5, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 2, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 4, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 3, %001 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 5, %001 | OAM_PAL1 | OAM_XFLIP + db 0, 8, 2, %001 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 4, %001 | OAM_PAL1 | OAM_XFLIP .data_a929a db 4 ; size - db 0, 0, 13, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 15, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 12, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 14, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 13, %001 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 15, %001 | OAM_PAL1 | OAM_XFLIP + db 0, 8, 12, %001 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 14, %001 | OAM_PAL1 | OAM_XFLIP .data_a92ab db 4 ; size - db 0, 0, 17, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 19, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 16, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 18, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 17, %001 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 19, %001 | OAM_PAL1 | OAM_XFLIP + db 0, 8, 16, %001 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 18, %001 | OAM_PAL1 | OAM_XFLIP AnimData19:: frame_table AnimFrameTable5 @@ -526,15 +526,15 @@ AnimFrameTable6:: db 4 ; size db 0, 0, 6, %010 db 8, 0, 7, %010 - db 8, 8, 7, %010 | (1 << OAM_X_FLIP) - db 0, 8, 6, %010 | (1 << OAM_X_FLIP) + db 8, 8, 7, %010 | OAM_XFLIP + db 0, 8, 6, %010 | OAM_XFLIP .data_a933e db 4 ; size - db 0, 0, 9, %010 | (1 << OAM_X_FLIP) - db 8, 0, 11, %010 | (1 << OAM_X_FLIP) - db 0, 8, 8, %010 | (1 << OAM_X_FLIP) - db 8, 8, 10, %010 | (1 << OAM_X_FLIP) + db 0, 0, 9, %010 | OAM_XFLIP + db 8, 0, 11, %010 | OAM_XFLIP + db 0, 8, 8, %010 | OAM_XFLIP + db 8, 8, 10, %010 | OAM_XFLIP .data_a934f db 4 ; size @@ -561,29 +561,29 @@ AnimFrameTable6:: db 4 ; size db 0, 0, 0, %010 db 8, 0, 1, %010 - db 0, 8, 0, %010 | (1 << OAM_X_FLIP) - db 8, 8, 1, %010 | (1 << OAM_X_FLIP) + db 0, 8, 0, %010 | OAM_XFLIP + db 8, 8, 1, %010 | OAM_XFLIP .data_a9393 db 4 ; size - db 0, 0, 3, %010 | (1 << OAM_X_FLIP) - db 8, 0, 5, %010 | (1 << OAM_X_FLIP) - db 0, 8, 2, %010 | (1 << OAM_X_FLIP) - db 8, 8, 4, %010 | (1 << OAM_X_FLIP) + db 0, 0, 3, %010 | OAM_XFLIP + db 8, 0, 5, %010 | OAM_XFLIP + db 0, 8, 2, %010 | OAM_XFLIP + db 8, 8, 4, %010 | OAM_XFLIP .data_a93a4 db 4 ; size - db 0, 0, 13, %010 | (1 << OAM_X_FLIP) - db 8, 0, 15, %010 | (1 << OAM_X_FLIP) - db 0, 8, 12, %010 | (1 << OAM_X_FLIP) - db 8, 8, 14, %010 | (1 << OAM_X_FLIP) + db 0, 0, 13, %010 | OAM_XFLIP + db 8, 0, 15, %010 | OAM_XFLIP + db 0, 8, 12, %010 | OAM_XFLIP + db 8, 8, 14, %010 | OAM_XFLIP .data_a93b5 db 4 ; size - db 0, 0, 17, %010 | (1 << OAM_X_FLIP) - db 8, 0, 19, %010 | (1 << OAM_X_FLIP) - db 0, 8, 16, %010 | (1 << OAM_X_FLIP) - db 8, 8, 18, %010 | (1 << OAM_X_FLIP) + db 0, 0, 17, %010 | OAM_XFLIP + db 8, 0, 19, %010 | OAM_XFLIP + db 0, 8, 16, %010 | OAM_XFLIP + db 8, 8, 18, %010 | OAM_XFLIP AnimData23:: frame_table AnimFrameTable6 @@ -627,73 +627,73 @@ AnimFrameTable7:: .data_a9426 db 4 ; size - db 0, 0, 8, %011 | (1 << OAM_OBP_NUM) - db 0, 8, 9, %011 | (1 << OAM_OBP_NUM) - db 8, 0, 10, %011 | (1 << OAM_OBP_NUM) - db 8, 8, 11, %011 | (1 << OAM_OBP_NUM) + db 0, 0, 8, %011 | OAM_PAL1 + db 0, 8, 9, %011 | OAM_PAL1 + db 8, 0, 10, %011 | OAM_PAL1 + db 8, 8, 11, %011 | OAM_PAL1 .data_a9437 db 4 ; size - db 0, 0, 6, %011 | (1 << OAM_OBP_NUM) - db 8, 0, 7, %011 | (1 << OAM_OBP_NUM) - db 8, 8, 7, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 6, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 6, %011 | OAM_PAL1 + db 8, 0, 7, %011 | OAM_PAL1 + db 8, 8, 7, %011 | OAM_PAL1 | OAM_XFLIP + db 0, 8, 6, %011 | OAM_PAL1 | OAM_XFLIP .data_a9448 db 4 ; size - db 0, 0, 9, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 11, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 8, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 10, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 9, %011 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 11, %011 | OAM_PAL1 | OAM_XFLIP + db 0, 8, 8, %011 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 10, %011 | OAM_PAL1 | OAM_XFLIP .data_a9459 db 4 ; size - db 0, 0, 6, %011 | (1 << OAM_OBP_NUM) - db 0, 8, 13, %011 | (1 << OAM_OBP_NUM) - db 8, 0, 14, %011 | (1 << OAM_OBP_NUM) - db 8, 8, 15, %011 | (1 << OAM_OBP_NUM) + db 0, 0, 6, %011 | OAM_PAL1 + db 0, 8, 13, %011 | OAM_PAL1 + db 8, 0, 14, %011 | OAM_PAL1 + db 8, 8, 15, %011 | OAM_PAL1 .data_a946a db 4 ; size - db 0, 0, 8, %011 | (1 << OAM_OBP_NUM) - db 0, 8, 17, %011 | (1 << OAM_OBP_NUM) - db 8, 0, 18, %011 | (1 << OAM_OBP_NUM) - db 8, 8, 19, %011 | (1 << OAM_OBP_NUM) + db 0, 0, 8, %011 | OAM_PAL1 + db 0, 8, 17, %011 | OAM_PAL1 + db 8, 0, 18, %011 | OAM_PAL1 + db 8, 8, 19, %011 | OAM_PAL1 .data_a947b db 4 ; size - db 0, 0, 2, %011 | (1 << OAM_OBP_NUM) - db 0, 8, 3, %011 | (1 << OAM_OBP_NUM) - db 8, 0, 4, %011 | (1 << OAM_OBP_NUM) - db 8, 8, 5, %011 | (1 << OAM_OBP_NUM) + db 0, 0, 2, %011 | OAM_PAL1 + db 0, 8, 3, %011 | OAM_PAL1 + db 8, 0, 4, %011 | OAM_PAL1 + db 8, 8, 5, %011 | OAM_PAL1 .data_a948c db 4 ; size - db 0, 0, 0, %011 | (1 << OAM_OBP_NUM) - db 8, 0, 1, %011 | (1 << OAM_OBP_NUM) - db 0, 8, 0, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 1, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 0, %011 | OAM_PAL1 + db 8, 0, 1, %011 | OAM_PAL1 + db 0, 8, 0, %011 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 1, %011 | OAM_PAL1 | OAM_XFLIP .data_a949d db 4 ; size - db 0, 0, 3, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 5, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 2, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 4, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 3, %011 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 5, %011 | OAM_PAL1 | OAM_XFLIP + db 0, 8, 2, %011 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 4, %011 | OAM_PAL1 | OAM_XFLIP .data_a94ae db 4 ; size - db 0, 0, 13, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 15, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 6, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 14, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 13, %011 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 15, %011 | OAM_PAL1 | OAM_XFLIP + db 0, 8, 6, %011 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 14, %011 | OAM_PAL1 | OAM_XFLIP .data_a94bf db 4 ; size - db 0, 0, 17, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 19, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 8, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 18, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 17, %011 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 19, %011 | OAM_PAL1 | OAM_XFLIP + db 0, 8, 8, %011 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 18, %011 | OAM_PAL1 | OAM_XFLIP AnimData27:: frame_table AnimFrameTable7 @@ -746,15 +746,15 @@ AnimFrameTable8:: db 4 ; size db 0, 0, 6, %100 db 8, 0, 7, %100 - db 8, 8, 7, %100 | (1 << OAM_X_FLIP) - db 0, 8, 6, %100 | (1 << OAM_X_FLIP) + db 8, 8, 7, %100 | OAM_XFLIP + db 0, 8, 6, %100 | OAM_XFLIP .data_a9552 db 4 ; size - db 0, 0, 9, %100 | (1 << OAM_X_FLIP) - db 8, 0, 11, %100 | (1 << OAM_X_FLIP) - db 0, 8, 8, %100 | (1 << OAM_X_FLIP) - db 8, 8, 10, %100 | (1 << OAM_X_FLIP) + db 0, 0, 9, %100 | OAM_XFLIP + db 8, 0, 11, %100 | OAM_XFLIP + db 0, 8, 8, %100 | OAM_XFLIP + db 8, 8, 10, %100 | OAM_XFLIP .data_a9563 db 4 ; size @@ -781,29 +781,29 @@ AnimFrameTable8:: db 4 ; size db 0, 0, 0, %100 db 8, 0, 1, %100 - db 0, 8, 0, %100 | (1 << OAM_X_FLIP) - db 8, 8, 1, %100 | (1 << OAM_X_FLIP) + db 0, 8, 0, %100 | OAM_XFLIP + db 8, 8, 1, %100 | OAM_XFLIP .data_a95a7 db 4 ; size - db 0, 0, 3, %100 | (1 << OAM_X_FLIP) - db 8, 0, 5, %100 | (1 << OAM_X_FLIP) - db 0, 8, 2, %100 | (1 << OAM_X_FLIP) - db 8, 8, 4, %100 | (1 << OAM_X_FLIP) + db 0, 0, 3, %100 | OAM_XFLIP + db 8, 0, 5, %100 | OAM_XFLIP + db 0, 8, 2, %100 | OAM_XFLIP + db 8, 8, 4, %100 | OAM_XFLIP .data_a95b8 db 4 ; size - db 0, 0, 13, %100 | (1 << OAM_X_FLIP) - db 8, 0, 15, %100 | (1 << OAM_X_FLIP) - db 0, 8, 12, %100 | (1 << OAM_X_FLIP) - db 8, 8, 14, %100 | (1 << OAM_X_FLIP) + db 0, 0, 13, %100 | OAM_XFLIP + db 8, 0, 15, %100 | OAM_XFLIP + db 0, 8, 12, %100 | OAM_XFLIP + db 8, 8, 14, %100 | OAM_XFLIP .data_a95c9 db 4 ; size - db 0, 0, 17, %100 | (1 << OAM_X_FLIP) - db 8, 0, 19, %100 | (1 << OAM_X_FLIP) - db 0, 8, 16, %100 | (1 << OAM_X_FLIP) - db 8, 8, 18, %100 | (1 << OAM_X_FLIP) + db 0, 0, 17, %100 | OAM_XFLIP + db 8, 0, 19, %100 | OAM_XFLIP + db 0, 8, 16, %100 | OAM_XFLIP + db 8, 8, 18, %100 | OAM_XFLIP AnimData31:: frame_table AnimFrameTable8 @@ -847,73 +847,73 @@ AnimFrameTable9:: .data_a963a db 4 ; size - db 0, 0, 8, %101 | (1 << OAM_OBP_NUM) - db 0, 8, 9, %101 | (1 << OAM_OBP_NUM) - db 8, 0, 10, %101 | (1 << OAM_OBP_NUM) - db 8, 8, 11, %101 | (1 << OAM_OBP_NUM) + db 0, 0, 8, %101 | OAM_PAL1 + db 0, 8, 9, %101 | OAM_PAL1 + db 8, 0, 10, %101 | OAM_PAL1 + db 8, 8, 11, %101 | OAM_PAL1 .data_a964b db 4 ; size - db 0, 0, 6, %101 | (1 << OAM_OBP_NUM) - db 8, 0, 7, %101 | (1 << OAM_OBP_NUM) - db 8, 8, 7, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 6, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 6, %101 | OAM_PAL1 + db 8, 0, 7, %101 | OAM_PAL1 + db 8, 8, 7, %101 | OAM_PAL1 | OAM_XFLIP + db 0, 8, 6, %101 | OAM_PAL1 | OAM_XFLIP .data_a965c db 4 ; size - db 0, 0, 9, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 11, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 8, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 10, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 9, %101 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 11, %101 | OAM_PAL1 | OAM_XFLIP + db 0, 8, 8, %101 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 10, %101 | OAM_PAL1 | OAM_XFLIP .data_a966d db 4 ; size - db 0, 0, 12, %101 | (1 << OAM_OBP_NUM) - db 0, 8, 13, %101 | (1 << OAM_OBP_NUM) - db 8, 0, 14, %101 | (1 << OAM_OBP_NUM) - db 8, 8, 15, %101 | (1 << OAM_OBP_NUM) + db 0, 0, 12, %101 | OAM_PAL1 + db 0, 8, 13, %101 | OAM_PAL1 + db 8, 0, 14, %101 | OAM_PAL1 + db 8, 8, 15, %101 | OAM_PAL1 .data_a967e db 4 ; size - db 0, 0, 16, %101 | (1 << OAM_OBP_NUM) - db 0, 8, 17, %101 | (1 << OAM_OBP_NUM) - db 8, 0, 18, %101 | (1 << OAM_OBP_NUM) - db 8, 8, 19, %101 | (1 << OAM_OBP_NUM) + db 0, 0, 16, %101 | OAM_PAL1 + db 0, 8, 17, %101 | OAM_PAL1 + db 8, 0, 18, %101 | OAM_PAL1 + db 8, 8, 19, %101 | OAM_PAL1 .data_a968f db 4 ; size - db 0, 0, 2, %101 | (1 << OAM_OBP_NUM) - db 0, 8, 3, %101 | (1 << OAM_OBP_NUM) - db 8, 0, 4, %101 | (1 << OAM_OBP_NUM) - db 8, 8, 5, %101 | (1 << OAM_OBP_NUM) + db 0, 0, 2, %101 | OAM_PAL1 + db 0, 8, 3, %101 | OAM_PAL1 + db 8, 0, 4, %101 | OAM_PAL1 + db 8, 8, 5, %101 | OAM_PAL1 .data_a96a0 db 4 ; size - db 0, 0, 0, %101 | (1 << OAM_OBP_NUM) - db 8, 0, 1, %101 | (1 << OAM_OBP_NUM) - db 0, 8, 0, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 1, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 0, %101 | OAM_PAL1 + db 8, 0, 1, %101 | OAM_PAL1 + db 0, 8, 0, %101 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 1, %101 | OAM_PAL1 | OAM_XFLIP .data_a96b1 db 4 ; size - db 0, 0, 3, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 5, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 2, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 4, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 3, %101 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 5, %101 | OAM_PAL1 | OAM_XFLIP + db 0, 8, 2, %101 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 4, %101 | OAM_PAL1 | OAM_XFLIP .data_a96c2 db 4 ; size - db 0, 0, 13, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 15, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 12, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 14, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 13, %101 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 15, %101 | OAM_PAL1 | OAM_XFLIP + db 0, 8, 12, %101 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 14, %101 | OAM_PAL1 | OAM_XFLIP .data_a96d3 db 4 ; size - db 0, 0, 17, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 19, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 16, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 18, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 17, %101 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 19, %101 | OAM_PAL1 | OAM_XFLIP + db 0, 8, 16, %101 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 18, %101 | OAM_PAL1 | OAM_XFLIP AnimData35:: frame_table AnimFrameTable9 @@ -966,15 +966,15 @@ AnimFrameTable10:: db 4 ; size db 0, 0, 6, %110 db 8, 0, 7, %110 - db 8, 8, 7, %110 | (1 << OAM_X_FLIP) - db 0, 8, 6, %110 | (1 << OAM_X_FLIP) + db 8, 8, 7, %110 | OAM_XFLIP + db 0, 8, 6, %110 | OAM_XFLIP .data_a9766 db 4 ; size - db 0, 0, 9, %110 | (1 << OAM_X_FLIP) - db 8, 0, 11, %110 | (1 << OAM_X_FLIP) - db 0, 8, 8, %110 | (1 << OAM_X_FLIP) - db 8, 8, 10, %110 | (1 << OAM_X_FLIP) + db 0, 0, 9, %110 | OAM_XFLIP + db 8, 0, 11, %110 | OAM_XFLIP + db 0, 8, 8, %110 | OAM_XFLIP + db 8, 8, 10, %110 | OAM_XFLIP .data_a9777 db 4 ; size @@ -1001,29 +1001,29 @@ AnimFrameTable10:: db 4 ; size db 0, 0, 0, %110 db 8, 0, 1, %110 - db 0, 8, 0, %110 | (1 << OAM_X_FLIP) - db 8, 8, 1, %110 | (1 << OAM_X_FLIP) + db 0, 8, 0, %110 | OAM_XFLIP + db 8, 8, 1, %110 | OAM_XFLIP .data_a97bb db 4 ; size - db 0, 0, 3, %110 | (1 << OAM_X_FLIP) - db 8, 0, 5, %110 | (1 << OAM_X_FLIP) - db 0, 8, 2, %110 | (1 << OAM_X_FLIP) - db 8, 8, 4, %110 | (1 << OAM_X_FLIP) + db 0, 0, 3, %110 | OAM_XFLIP + db 8, 0, 5, %110 | OAM_XFLIP + db 0, 8, 2, %110 | OAM_XFLIP + db 8, 8, 4, %110 | OAM_XFLIP .data_a97cc db 4 ; size - db 0, 0, 13, %110 | (1 << OAM_X_FLIP) - db 8, 0, 15, %110 | (1 << OAM_X_FLIP) - db 0, 8, 12, %110 | (1 << OAM_X_FLIP) - db 8, 8, 14, %110 | (1 << OAM_X_FLIP) + db 0, 0, 13, %110 | OAM_XFLIP + db 8, 0, 15, %110 | OAM_XFLIP + db 0, 8, 12, %110 | OAM_XFLIP + db 8, 8, 14, %110 | OAM_XFLIP .data_a97dd db 4 ; size - db 0, 0, 17, %110 | (1 << OAM_X_FLIP) - db 8, 0, 19, %110 | (1 << OAM_X_FLIP) - db 0, 8, 16, %110 | (1 << OAM_X_FLIP) - db 8, 8, 18, %110 | (1 << OAM_X_FLIP) + db 0, 0, 17, %110 | OAM_XFLIP + db 8, 0, 19, %110 | OAM_XFLIP + db 0, 8, 16, %110 | OAM_XFLIP + db 8, 8, 18, %110 | OAM_XFLIP AnimData39:: frame_table AnimFrameTable10 @@ -1067,73 +1067,73 @@ AnimFrameTable11:: .data_a984e db 4 ; size - db 0, 0, 8, %111 | (1 << OAM_OBP_NUM) - db 0, 8, 9, %111 | (1 << OAM_OBP_NUM) - db 8, 0, 10, %111 | (1 << OAM_OBP_NUM) - db 8, 8, 11, %111 | (1 << OAM_OBP_NUM) + db 0, 0, 8, %111 | OAM_PAL1 + db 0, 8, 9, %111 | OAM_PAL1 + db 8, 0, 10, %111 | OAM_PAL1 + db 8, 8, 11, %111 | OAM_PAL1 .data_a985f db 4 ; size - db 0, 0, 6, %111 | (1 << OAM_OBP_NUM) - db 8, 0, 7, %111 | (1 << OAM_OBP_NUM) - db 8, 8, 7, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 6, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 6, %111 | OAM_PAL1 + db 8, 0, 7, %111 | OAM_PAL1 + db 8, 8, 7, %111 | OAM_PAL1 | OAM_XFLIP + db 0, 8, 6, %111 | OAM_PAL1 | OAM_XFLIP .data_a9870 db 4 ; size - db 0, 0, 9, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 11, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 8, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 10, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 9, %111 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 11, %111 | OAM_PAL1 | OAM_XFLIP + db 0, 8, 8, %111 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 10, %111 | OAM_PAL1 | OAM_XFLIP .data_a9881 db 4 ; size - db 0, 0, 12, %111 | (1 << OAM_OBP_NUM) - db 0, 8, 13, %111 | (1 << OAM_OBP_NUM) - db 8, 0, 14, %111 | (1 << OAM_OBP_NUM) - db 8, 8, 15, %111 | (1 << OAM_OBP_NUM) + db 0, 0, 12, %111 | OAM_PAL1 + db 0, 8, 13, %111 | OAM_PAL1 + db 8, 0, 14, %111 | OAM_PAL1 + db 8, 8, 15, %111 | OAM_PAL1 .data_a9892 db 4 ; size - db 0, 0, 16, %111 | (1 << OAM_OBP_NUM) - db 0, 8, 17, %111 | (1 << OAM_OBP_NUM) - db 8, 0, 18, %111 | (1 << OAM_OBP_NUM) - db 8, 8, 19, %111 | (1 << OAM_OBP_NUM) + db 0, 0, 16, %111 | OAM_PAL1 + db 0, 8, 17, %111 | OAM_PAL1 + db 8, 0, 18, %111 | OAM_PAL1 + db 8, 8, 19, %111 | OAM_PAL1 .data_a98a3 db 4 ; size - db 0, 0, 2, %111 | (1 << OAM_OBP_NUM) - db 0, 8, 3, %111 | (1 << OAM_OBP_NUM) - db 8, 0, 4, %111 | (1 << OAM_OBP_NUM) - db 8, 8, 5, %111 | (1 << OAM_OBP_NUM) + db 0, 0, 2, %111 | OAM_PAL1 + db 0, 8, 3, %111 | OAM_PAL1 + db 8, 0, 4, %111 | OAM_PAL1 + db 8, 8, 5, %111 | OAM_PAL1 .data_a98b4 db 4 ; size - db 0, 0, 0, %111 | (1 << OAM_OBP_NUM) - db 8, 0, 1, %111 | (1 << OAM_OBP_NUM) - db 0, 8, 0, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 1, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 0, %111 | OAM_PAL1 + db 8, 0, 1, %111 | OAM_PAL1 + db 0, 8, 0, %111 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 1, %111 | OAM_PAL1 | OAM_XFLIP .data_a98c5 db 4 ; size - db 0, 0, 3, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 5, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 2, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 4, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 3, %111 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 5, %111 | OAM_PAL1 | OAM_XFLIP + db 0, 8, 2, %111 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 4, %111 | OAM_PAL1 | OAM_XFLIP .data_a98d6 db 4 ; size - db 0, 0, 13, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 15, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 12, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 14, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 13, %111 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 15, %111 | OAM_PAL1 | OAM_XFLIP + db 0, 8, 12, %111 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 14, %111 | OAM_PAL1 | OAM_XFLIP .data_a98e7 db 4 ; size - db 0, 0, 17, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 19, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 8, 16, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 18, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 17, %111 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 19, %111 | OAM_PAL1 | OAM_XFLIP + db 0, 8, 16, %111 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 18, %111 | OAM_PAL1 | OAM_XFLIP AnimData43:: frame_table AnimFrameTable11 @@ -1177,22 +1177,22 @@ AnimFrameTable12:: db 4 ; size db 5, 4, 24, $0 db 5, 12, 25, $0 - db -3, 4, 13, (1 << OAM_X_FLIP) - db -3, 12, 12, (1 << OAM_X_FLIP) + db -3, 4, 13, OAM_XFLIP + db -3, 12, 12, OAM_XFLIP .data_a9962 db 4 ; size db 5, 2, 25, $0 - db -3, -6, 13, (1 << OAM_X_FLIP) - db -3, 2, 12, (1 << OAM_X_FLIP) + db -3, -6, 13, OAM_XFLIP + db -3, 2, 12, OAM_XFLIP db 5, -6, 26, $0 .data_a9973 db 4 ; size db 0, -16, 0, $0 db 8, -16, 1, $0 - db 0, -8, 0, (1 << OAM_X_FLIP) - db 8, -8, 1, (1 << OAM_X_FLIP) + db 0, -8, 0, OAM_XFLIP + db 8, -8, 1, OAM_XFLIP AnimData47:: frame_table AnimFrameTable12 @@ -1217,8 +1217,8 @@ AnimFrameTable13:: db 4 ; size db 0, 0, 6, $0 db 8, 0, 7, $0 - db 0, 8, 6, (1 << OAM_X_FLIP) - db 8, 8, 7, (1 << OAM_X_FLIP) + db 0, 8, 6, OAM_XFLIP + db 8, 8, 7, OAM_XFLIP .data_a99bf db 4 ; size @@ -1231,15 +1231,15 @@ AnimFrameTable13:: db 4 ; size db 0, 0, 0, $0 db 8, 0, 1, $0 - db 0, 8, 0, (1 << OAM_X_FLIP) - db 8, 8, 1, (1 << OAM_X_FLIP) + db 0, 8, 0, OAM_XFLIP + db 8, 8, 1, OAM_XFLIP .data_a99e1 db 4 ; size - db 0, 0, 3, (1 << OAM_X_FLIP) - db 8, 0, 5, (1 << OAM_X_FLIP) - db 0, 8, 2, (1 << OAM_X_FLIP) - db 8, 8, 4, (1 << OAM_X_FLIP) + db 0, 0, 3, OAM_XFLIP + db 8, 0, 5, OAM_XFLIP + db 0, 8, 2, OAM_XFLIP + db 8, 8, 4, OAM_XFLIP AnimData49:: frame_table AnimFrameTable13 @@ -1273,21 +1273,21 @@ AnimFrameTable14:: .data_a9a30 db 2 ; size db 0, 0, 0, $0 - db 0, 8, 0, (1 << OAM_X_FLIP) + db 0, 8, 0, OAM_XFLIP .data_a9a39 db 4 ; size db 0, 0, 1, $0 db 8, 0, 2, $0 - db 0, 8, 1, (1 << OAM_X_FLIP) - db 8, 8, 2, (1 << OAM_X_FLIP) + db 0, 8, 1, OAM_XFLIP + db 8, 8, 2, OAM_XFLIP .data_a9a4a db 4 ; size db 0, 0, 3, $0 db 8, 0, 4, $0 - db 0, 8, 3, (1 << OAM_X_FLIP) - db 8, 8, 4, (1 << OAM_X_FLIP) + db 0, 8, 3, OAM_XFLIP + db 8, 8, 4, OAM_XFLIP .data_a9a5b db 1 ; size @@ -1297,8 +1297,8 @@ AnimFrameTable14:: db 4 ; size db 0, 0, 6, $0 db 8, 0, 7, $0 - db 0, 8, 6, (1 << OAM_X_FLIP) - db 8, 8, 7, (1 << OAM_X_FLIP) + db 0, 8, 6, OAM_XFLIP + db 8, 8, 7, OAM_XFLIP AnimData53:: frame_table AnimFrameTable14 @@ -1329,21 +1329,21 @@ AnimFrameTable15:: .data_a9aac db 2 ; size db 0, 0, 0, %110 - db 0, 8, 0, %110 | (1 << OAM_X_FLIP) + db 0, 8, 0, %110 | OAM_XFLIP .data_a9ab5 db 4 ; size db 0, 0, 1, %110 db 8, 0, 2, %110 - db 0, 8, 1, %110 | (1 << OAM_X_FLIP) - db 8, 8, 2, %110 | (1 << OAM_X_FLIP) + db 0, 8, 1, %110 | OAM_XFLIP + db 8, 8, 2, %110 | OAM_XFLIP .data_a9ac6 db 4 ; size db 0, 0, 3, %110 db 8, 0, 4, %110 - db 0, 8, 3, %110 | (1 << OAM_X_FLIP) - db 8, 8, 4, %110 | (1 << OAM_X_FLIP) + db 0, 8, 3, %110 | OAM_XFLIP + db 8, 8, 4, %110 | OAM_XFLIP .data_a9ad7 db 1 ; size @@ -1353,8 +1353,8 @@ AnimFrameTable15:: db 4 ; size db 0, 0, 6, %100 db 8, 0, 7, %100 - db 0, 8, 6, %100 | (1 << OAM_X_FLIP) - db 8, 8, 7, %100 | (1 << OAM_X_FLIP) + db 0, 8, 6, %100 | OAM_XFLIP + db 8, 8, 7, %100 | OAM_XFLIP AnimData56:: frame_table AnimFrameTable15 @@ -1384,31 +1384,31 @@ AnimFrameTable16:: .data_a9b2a db 4 ; size - db 0, 0, 0, (1 << OAM_OBP_NUM) - db 0, 8, 1, (1 << OAM_OBP_NUM) - db 8, 0, 2, (1 << OAM_OBP_NUM) - db 8, 8, 3, (1 << OAM_OBP_NUM) + db 0, 0, 0, OAM_PAL1 + db 0, 8, 1, OAM_PAL1 + db 8, 0, 2, OAM_PAL1 + db 8, 8, 3, OAM_PAL1 .data_a9b3b db 4 ; size - db 0, 8, 0, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 0, 1, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 2, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 3, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 8, 0, OAM_PAL1 | OAM_XFLIP + db 0, 0, 1, OAM_PAL1 | OAM_XFLIP + db 8, 8, 2, OAM_PAL1 | OAM_XFLIP + db 8, 0, 3, OAM_PAL1 | OAM_XFLIP .data_a9b4c db 4 ; size - db 0, 0, 4, (1 << OAM_OBP_NUM) - db 0, 8, 5, (1 << OAM_OBP_NUM) - db 8, 0, 6, (1 << OAM_OBP_NUM) - db 8, 8, 7, (1 << OAM_OBP_NUM) + db 0, 0, 4, OAM_PAL1 + db 0, 8, 5, OAM_PAL1 + db 8, 0, 6, OAM_PAL1 + db 8, 8, 7, OAM_PAL1 .data_a9b5d db 4 ; size - db 0, 8, 4, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 0, 5, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 6, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 7, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 8, 4, OAM_PAL1 | OAM_XFLIP + db 0, 0, 5, OAM_PAL1 | OAM_XFLIP + db 8, 8, 6, OAM_PAL1 | OAM_XFLIP + db 8, 0, 7, OAM_PAL1 | OAM_XFLIP AnimData59:: frame_table AnimFrameTable17 @@ -1467,66 +1467,66 @@ AnimFrameTable17:: db 0, 0, 0, $0 db 0, 8, 1, $0 db 8, 0, 2, $0 - db 8, 8, 3, (1 << OAM_OBP_NUM) + db 8, 8, 3, OAM_PAL1 .data_a9c0a db 1 ; size - db 8, 8, 4, (1 << OAM_OBP_NUM) + db 8, 8, 4, OAM_PAL1 .data_a9c0f db 4 ; size db -1, 0, 0, $0 db -1, 8, 1, $0 db 7, 0, 2, $0 - db 7, 8, 3, (1 << OAM_OBP_NUM) + db 7, 8, 3, OAM_PAL1 .data_a9c20 db 1 ; size - db 7, 8, 4, (1 << OAM_OBP_NUM) + db 7, 8, 4, OAM_PAL1 .data_a9c25 db 4 ; size db 1, 0, 0, $0 db 1, 8, 1, $0 db 9, 0, 2, $0 - db 9, 8, 3, (1 << OAM_OBP_NUM) + db 9, 8, 3, OAM_PAL1 .data_a9c36 db 1 ; size - db 9, 8, 4, (1 << OAM_OBP_NUM) + db 9, 8, 4, OAM_PAL1 .data_a9c3b db 4 ; size - db 0, 8, 0, (1 << OAM_X_FLIP) - db 0, 0, 1, (1 << OAM_X_FLIP) - db 8, 8, 2, (1 << OAM_X_FLIP) - db 8, 0, 3, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 8, 0, OAM_XFLIP + db 0, 0, 1, OAM_XFLIP + db 8, 8, 2, OAM_XFLIP + db 8, 0, 3, OAM_PAL1 | OAM_XFLIP .data_a9c4c db 1 ; size - db 8, 0, 4, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 8, 0, 4, OAM_PAL1 | OAM_XFLIP .data_a9c51 db 4 ; size - db -1, 8, 0, (1 << OAM_X_FLIP) - db -1, 0, 1, (1 << OAM_X_FLIP) - db 7, 8, 2, (1 << OAM_X_FLIP) - db 7, 0, 3, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db -1, 8, 0, OAM_XFLIP + db -1, 0, 1, OAM_XFLIP + db 7, 8, 2, OAM_XFLIP + db 7, 0, 3, OAM_PAL1 | OAM_XFLIP .data_a9c62 db 1 ; size - db 7, 0, 4, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 7, 0, 4, OAM_PAL1 | OAM_XFLIP .data_a9c67 db 4 ; size - db 1, 8, 0, (1 << OAM_X_FLIP) - db 1, 0, 1, (1 << OAM_X_FLIP) - db 9, 8, 2, (1 << OAM_X_FLIP) - db 9, 0, 3, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 1, 8, 0, OAM_XFLIP + db 1, 0, 1, OAM_XFLIP + db 9, 8, 2, OAM_XFLIP + db 9, 0, 3, OAM_PAL1 | OAM_XFLIP .data_a9c78 db 1 ; size - db 9, 0, 4, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 9, 0, 4, OAM_PAL1 | OAM_XFLIP .data_a9c7d db 2 ; size @@ -1538,71 +1538,71 @@ AnimFrameTable17:: db 0, 0, 7, $0 db 8, 8, 9, $0 db 8, 0, 8, $0 - db 0, 8, 3, (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) + db 0, 8, 3, OAM_PAL1 | OAM_YFLIP .data_a9c97 db 1 ; size - db 0, 8, 4, (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) + db 0, 8, 4, OAM_PAL1 | OAM_YFLIP .data_a9c9c db 4 ; size db -1, 0, 7, $0 db 7, 8, 9, $0 db 7, 0, 8, $0 - db -1, 8, 3, (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) + db -1, 8, 3, OAM_PAL1 | OAM_YFLIP .data_a9cad db 1 ; size - db -1, 8, 4, (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) + db -1, 8, 4, OAM_PAL1 | OAM_YFLIP .data_a9cb2 db 4 ; size db 1, 0, 7, $0 db 9, 8, 9, $0 db 9, 0, 8, $0 - db 1, 8, 3, (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) + db 1, 8, 3, OAM_PAL1 | OAM_YFLIP .data_a9cc3 db 1 ; size - db 1, 8, 4, (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) + db 1, 8, 4, OAM_PAL1 | OAM_YFLIP .data_a9cc8 db 4 ; size - db 0, 8, 7, (1 << OAM_X_FLIP) - db 8, 0, 9, (1 << OAM_X_FLIP) - db 8, 8, 8, (1 << OAM_X_FLIP) - db 0, 0, 3, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, 8, 7, OAM_XFLIP + db 8, 0, 9, OAM_XFLIP + db 8, 8, 8, OAM_XFLIP + db 0, 0, 3, OAM_PAL1 | OAM_XFLIP | OAM_YFLIP .data_a9cd9 db 1 ; size - db 0, 0, 4, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, 0, 4, OAM_PAL1 | OAM_XFLIP | OAM_YFLIP .data_a9cde db 4 ; size - db -1, 8, 7, (1 << OAM_X_FLIP) - db 7, 0, 9, (1 << OAM_X_FLIP) - db 7, 8, 8, (1 << OAM_X_FLIP) - db -1, 0, 3, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -1, 8, 7, OAM_XFLIP + db 7, 0, 9, OAM_XFLIP + db 7, 8, 8, OAM_XFLIP + db -1, 0, 3, OAM_PAL1 | OAM_XFLIP | OAM_YFLIP .data_a9cef db 1 ; size - db -1, 0, 4, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -1, 0, 4, OAM_PAL1 | OAM_XFLIP | OAM_YFLIP .data_a9cf4 db 4 ; size - db 1, 8, 7, (1 << OAM_X_FLIP) - db 9, 0, 9, (1 << OAM_X_FLIP) - db 9, 8, 8, (1 << OAM_X_FLIP) - db 1, 0, 3, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 1, 8, 7, OAM_XFLIP + db 9, 0, 9, OAM_XFLIP + db 9, 8, 8, OAM_XFLIP + db 1, 0, 3, OAM_PAL1 | OAM_XFLIP | OAM_YFLIP .data_a9d05 db 1 ; size - db 1, 0, 4, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 1, 0, 4, OAM_PAL1 | OAM_XFLIP | OAM_YFLIP .data_a9d0a db 2 ; size - db 0, 0, 5, (1 << OAM_X_FLIP) - db 8, 0, 6, (1 << OAM_X_FLIP) + db 0, 0, 5, OAM_XFLIP + db 8, 0, 6, OAM_XFLIP AnimData60:: frame_table AnimFrameTable17 @@ -1778,145 +1778,145 @@ AnimFrameTable18:: .data_a9f51 db 4 ; size - db 0, 0, 0, %001 | (1 << OAM_OBP_NUM) - db 0, 8, 1, %001 | (1 << OAM_OBP_NUM) - db 8, 0, 2, %001 | (1 << OAM_OBP_NUM) - db 8, 8, 3, %101 | (1 << OAM_OBP_NUM) + db 0, 0, 0, %001 | OAM_PAL1 + db 0, 8, 1, %001 | OAM_PAL1 + db 8, 0, 2, %001 | OAM_PAL1 + db 8, 8, 3, %101 | OAM_PAL1 .data_a9f62 db 1 ; size - db 8, 8, 4, %101 | (1 << OAM_OBP_NUM) + db 8, 8, 4, %101 | OAM_PAL1 .data_a9f67 db 4 ; size - db -1, 0, 0, %001 | (1 << OAM_OBP_NUM) - db -1, 8, 1, %001 | (1 << OAM_OBP_NUM) - db 7, 0, 2, %001 | (1 << OAM_OBP_NUM) - db 7, 8, 3, %101 | (1 << OAM_OBP_NUM) + db -1, 0, 0, %001 | OAM_PAL1 + db -1, 8, 1, %001 | OAM_PAL1 + db 7, 0, 2, %001 | OAM_PAL1 + db 7, 8, 3, %101 | OAM_PAL1 .data_a9f78 db 1 ; size - db 7, 8, 4, %101 | (1 << OAM_OBP_NUM) + db 7, 8, 4, %101 | OAM_PAL1 .data_a9f7d db 4 ; size - db 1, 0, 0, %001 | (1 << OAM_OBP_NUM) - db 1, 8, 1, %001 | (1 << OAM_OBP_NUM) - db 9, 0, 2, %001 | (1 << OAM_OBP_NUM) - db 9, 8, 3, %101 | (1 << OAM_OBP_NUM) + db 1, 0, 0, %001 | OAM_PAL1 + db 1, 8, 1, %001 | OAM_PAL1 + db 9, 0, 2, %001 | OAM_PAL1 + db 9, 8, 3, %101 | OAM_PAL1 .data_a9f8e db 1 ; size - db 9, 8, 4, %101 | (1 << OAM_OBP_NUM) + db 9, 8, 4, %101 | OAM_PAL1 .data_a9f93 db 4 ; size - db 0, 8, 0, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 0, 1, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 2, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 3, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 8, 0, %001 | OAM_PAL1 | OAM_XFLIP + db 0, 0, 1, %001 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 2, %001 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 3, %101 | OAM_PAL1 | OAM_XFLIP .data_a9fa4 db 1 ; size - db 8, 0, 4, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 8, 0, 4, %101 | OAM_PAL1 | OAM_XFLIP .data_a9fa9 db 4 ; size - db -1, 8, 0, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db -1, 0, 1, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 7, 8, 2, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 7, 0, 3, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db -1, 8, 0, %001 | OAM_PAL1 | OAM_XFLIP + db -1, 0, 1, %001 | OAM_PAL1 | OAM_XFLIP + db 7, 8, 2, %001 | OAM_PAL1 | OAM_XFLIP + db 7, 0, 3, %101 | OAM_PAL1 | OAM_XFLIP .data_a9fba db 1 ; size - db 7, 0, 4, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 7, 0, 4, %101 | OAM_PAL1 | OAM_XFLIP .data_a9fbf db 4 ; size - db 1, 8, 0, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 1, 0, 1, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 9, 8, 2, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 9, 0, 3, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 1, 8, 0, %001 | OAM_PAL1 | OAM_XFLIP + db 1, 0, 1, %001 | OAM_PAL1 | OAM_XFLIP + db 9, 8, 2, %001 | OAM_PAL1 | OAM_XFLIP + db 9, 0, 3, %101 | OAM_PAL1 | OAM_XFLIP .data_a9fd0 db 1 ; size - db 9, 0, 4, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 9, 0, 4, %101 | OAM_PAL1 | OAM_XFLIP .data_a9fd5 db 2 ; size - db 0, 8, 5, %001 | (1 << OAM_OBP_NUM) - db 8, 8, 6, %001 | (1 << OAM_OBP_NUM) + db 0, 8, 5, %001 | OAM_PAL1 + db 8, 8, 6, %001 | OAM_PAL1 .data_a9fde db 4 ; size - db 0, 0, 7, %001 | (1 << OAM_OBP_NUM) - db 8, 8, 9, %001 | (1 << OAM_OBP_NUM) - db 8, 0, 8, %001 | (1 << OAM_OBP_NUM) - db 0, 8, 3, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) + db 0, 0, 7, %001 | OAM_PAL1 + db 8, 8, 9, %001 | OAM_PAL1 + db 8, 0, 8, %001 | OAM_PAL1 + db 0, 8, 3, %101 | OAM_PAL1 | OAM_YFLIP .data_a9fef db 1 ; size - db 0, 8, 4, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) + db 0, 8, 4, %101 | OAM_PAL1 | OAM_YFLIP .data_a9ff4 db 4 ; size - db -1, 0, 7, %001 | (1 << OAM_OBP_NUM) - db 7, 8, 9, %001 | (1 << OAM_OBP_NUM) - db 7, 0, 8, %001 | (1 << OAM_OBP_NUM) - db -1, 8, 3, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) + db -1, 0, 7, %001 | OAM_PAL1 + db 7, 8, 9, %001 | OAM_PAL1 + db 7, 0, 8, %001 | OAM_PAL1 + db -1, 8, 3, %101 | OAM_PAL1 | OAM_YFLIP .data_aa005 db 1 ; size - db -1, 8, 4, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) + db -1, 8, 4, %101 | OAM_PAL1 | OAM_YFLIP .data_aa00a db 4 ; size - db 1, 0, 7, %001 | (1 << OAM_OBP_NUM) - db 9, 8, 9, %001 | (1 << OAM_OBP_NUM) - db 9, 0, 8, %001 | (1 << OAM_OBP_NUM) - db 1, 8, 3, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) + db 1, 0, 7, %001 | OAM_PAL1 + db 9, 8, 9, %001 | OAM_PAL1 + db 9, 0, 8, %001 | OAM_PAL1 + db 1, 8, 3, %101 | OAM_PAL1 | OAM_YFLIP .data_aa01b db 1 ; size - db 1, 8, 4, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) + db 1, 8, 4, %101 | OAM_PAL1 | OAM_YFLIP .data_aa020 db 4 ; size - db 0, 8, 7, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 9, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 8, 8, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 0, 3, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, 8, 7, %001 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 9, %001 | OAM_PAL1 | OAM_XFLIP + db 8, 8, 8, %001 | OAM_PAL1 | OAM_XFLIP + db 0, 0, 3, %101 | OAM_PAL1 | OAM_XFLIP | OAM_YFLIP .data_aa031 db 1 ; size - db 0, 0, 4, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, 0, 4, %101 | OAM_PAL1 | OAM_XFLIP | OAM_YFLIP .data_aa036 db 4 ; size - db -1, 8, 7, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 7, 0, 9, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 7, 8, 8, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db -1, 0, 3, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -1, 8, 7, %001 | OAM_PAL1 | OAM_XFLIP + db 7, 0, 9, %001 | OAM_PAL1 | OAM_XFLIP + db 7, 8, 8, %001 | OAM_PAL1 | OAM_XFLIP + db -1, 0, 3, %101 | OAM_PAL1 | OAM_XFLIP | OAM_YFLIP .data_aa047 db 1 ; size - db -1, 0, 4, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -1, 0, 4, %101 | OAM_PAL1 | OAM_XFLIP | OAM_YFLIP .data_aa04c db 4 ; size - db 1, 8, 7, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 9, 0, 9, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 9, 8, 8, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 1, 0, 3, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 1, 8, 7, %001 | OAM_PAL1 | OAM_XFLIP + db 9, 0, 9, %001 | OAM_PAL1 | OAM_XFLIP + db 9, 8, 8, %001 | OAM_PAL1 | OAM_XFLIP + db 1, 0, 3, %101 | OAM_PAL1 | OAM_XFLIP | OAM_YFLIP .data_aa05d db 1 ; size - db 1, 0, 4, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 1, 0, 4, %101 | OAM_PAL1 | OAM_XFLIP | OAM_YFLIP .data_aa062 db 2 ; size - db 0, 0, 5, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 0, 6, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, 0, 5, %001 | OAM_PAL1 | OAM_XFLIP + db 8, 0, 6, %001 | OAM_PAL1 | OAM_XFLIP AnimData66:: frame_table AnimFrameTable18 @@ -2062,15 +2062,15 @@ AnimFrameTable19:: db -8, -8, 9, $0 db -16, -8, 8, $0 db -8, -16, 10, $0 - db -8, 0, 9, (1 << OAM_X_FLIP) - db -16, 0, 8, (1 << OAM_X_FLIP) - db -8, 8, 10, (1 << OAM_X_FLIP) - db 0, -8, 9, (1 << OAM_Y_FLIP) - db 8, -8, 8, (1 << OAM_Y_FLIP) - db 0, -16, 10, (1 << OAM_Y_FLIP) - db 0, 0, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, 0, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 8, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, 0, 9, OAM_XFLIP + db -16, 0, 8, OAM_XFLIP + db -8, 8, 10, OAM_XFLIP + db 0, -8, 9, OAM_YFLIP + db 8, -8, 8, OAM_YFLIP + db 0, -16, 10, OAM_YFLIP + db 0, 0, 9, OAM_XFLIP | OAM_YFLIP + db 8, 0, 8, OAM_XFLIP | OAM_YFLIP + db 0, 8, 10, OAM_XFLIP | OAM_YFLIP .data_aa284 db 16 ; size @@ -2078,18 +2078,18 @@ AnimFrameTable19:: db -16, -8, 5, $0 db -8, -8, 7, $0 db -8, -16, 6, $0 - db -16, 8, 4, (1 << OAM_X_FLIP) - db -16, 0, 5, (1 << OAM_X_FLIP) - db -8, 0, 7, (1 << OAM_X_FLIP) - db -8, 8, 6, (1 << OAM_X_FLIP) - db 8, -16, 4, (1 << OAM_Y_FLIP) - db 8, -8, 5, (1 << OAM_Y_FLIP) - db 0, -8, 7, (1 << OAM_Y_FLIP) - db 0, -16, 6, (1 << OAM_Y_FLIP) - db 8, 8, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, 0, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 0, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 8, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -16, 8, 4, OAM_XFLIP + db -16, 0, 5, OAM_XFLIP + db -8, 0, 7, OAM_XFLIP + db -8, 8, 6, OAM_XFLIP + db 8, -16, 4, OAM_YFLIP + db 8, -8, 5, OAM_YFLIP + db 0, -8, 7, OAM_YFLIP + db 0, -16, 6, OAM_YFLIP + db 8, 8, 4, OAM_XFLIP | OAM_YFLIP + db 8, 0, 5, OAM_XFLIP | OAM_YFLIP + db 0, 0, 7, OAM_XFLIP | OAM_YFLIP + db 0, 8, 6, OAM_XFLIP | OAM_YFLIP .data_aa2c5 db 16 ; size @@ -2097,18 +2097,18 @@ AnimFrameTable19:: db -16, -8, 1, $0 db -8, -16, 2, $0 db -8, -8, 3, $0 - db -16, 8, 0, (1 << OAM_X_FLIP) - db -16, 0, 1, (1 << OAM_X_FLIP) - db -8, 8, 2, (1 << OAM_X_FLIP) - db -8, 0, 3, (1 << OAM_X_FLIP) - db 8, 8, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, 0, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 8, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 0, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -16, 0, (1 << OAM_Y_FLIP) - db 8, -8, 1, (1 << OAM_Y_FLIP) - db 0, -16, 2, (1 << OAM_Y_FLIP) - db 0, -8, 3, (1 << OAM_Y_FLIP) + db -16, 8, 0, OAM_XFLIP + db -16, 0, 1, OAM_XFLIP + db -8, 8, 2, OAM_XFLIP + db -8, 0, 3, OAM_XFLIP + db 8, 8, 0, OAM_XFLIP | OAM_YFLIP + db 8, 0, 1, OAM_XFLIP | OAM_YFLIP + db 0, 8, 2, OAM_XFLIP | OAM_YFLIP + db 0, 0, 3, OAM_XFLIP | OAM_YFLIP + db 8, -16, 0, OAM_YFLIP + db 8, -8, 1, OAM_YFLIP + db 0, -16, 2, OAM_YFLIP + db 0, -8, 3, OAM_YFLIP AnimData72:: frame_table AnimFrameTable20 @@ -2137,45 +2137,45 @@ AnimFrameTable20:: db -24, 16, 2, $0 db 0, 24, 4, $0 db 8, 24, 5, $0 - db 16, 24, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, 16, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, 8, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, -32, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, 0, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, -8, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, -16, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, -24, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -32, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -32, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -32, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, -32, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 16, 24, 0, OAM_XFLIP | OAM_YFLIP + db 16, 16, 1, OAM_XFLIP | OAM_YFLIP + db 16, 8, 2, OAM_XFLIP | OAM_YFLIP + db 16, -32, 3, OAM_XFLIP | OAM_YFLIP + db 16, 0, 1, OAM_XFLIP | OAM_YFLIP + db 16, -8, 2, OAM_XFLIP | OAM_YFLIP + db 16, -16, 1, OAM_XFLIP | OAM_YFLIP + db 16, -24, 2, OAM_XFLIP | OAM_YFLIP + db 8, -32, 4, OAM_XFLIP | OAM_YFLIP + db 0, -32, 5, OAM_XFLIP | OAM_YFLIP + db -8, -32, 4, OAM_XFLIP | OAM_YFLIP + db -16, -32, 5, OAM_XFLIP | OAM_YFLIP .data_aa386 db 24 ; size - db -24, 24, 0, (1 << OAM_X_FLIP) - db -24, 16, 1, (1 << OAM_X_FLIP) - db -24, 8, 2, (1 << OAM_X_FLIP) - db -24, -32, 3, (1 << OAM_X_FLIP) - db -16, -32, 4, (1 << OAM_X_FLIP) - db -8, -32, 5, (1 << OAM_X_FLIP) - db -24, 0, 1, (1 << OAM_X_FLIP) - db -24, -8, 2, (1 << OAM_X_FLIP) - db -24, -16, 1, (1 << OAM_X_FLIP) - db -24, -24, 2, (1 << OAM_X_FLIP) - db 0, -32, 4, (1 << OAM_X_FLIP) - db 8, -32, 5, (1 << OAM_X_FLIP) - db 16, -32, 0, (1 << OAM_Y_FLIP) - db 16, -24, 1, (1 << OAM_Y_FLIP) - db 16, -16, 2, (1 << OAM_Y_FLIP) - db 16, 24, 3, (1 << OAM_Y_FLIP) - db 16, -8, 1, (1 << OAM_Y_FLIP) - db 16, 0, 2, (1 << OAM_Y_FLIP) - db 16, 8, 1, (1 << OAM_Y_FLIP) - db 16, 16, 2, (1 << OAM_Y_FLIP) - db 8, 24, 4, (1 << OAM_Y_FLIP) - db 0, 24, 5, (1 << OAM_Y_FLIP) - db -8, 24, 4, (1 << OAM_Y_FLIP) - db -16, 24, 5, (1 << OAM_Y_FLIP) + db -24, 24, 0, OAM_XFLIP + db -24, 16, 1, OAM_XFLIP + db -24, 8, 2, OAM_XFLIP + db -24, -32, 3, OAM_XFLIP + db -16, -32, 4, OAM_XFLIP + db -8, -32, 5, OAM_XFLIP + db -24, 0, 1, OAM_XFLIP + db -24, -8, 2, OAM_XFLIP + db -24, -16, 1, OAM_XFLIP + db -24, -24, 2, OAM_XFLIP + db 0, -32, 4, OAM_XFLIP + db 8, -32, 5, OAM_XFLIP + db 16, -32, 0, OAM_YFLIP + db 16, -24, 1, OAM_YFLIP + db 16, -16, 2, OAM_YFLIP + db 16, 24, 3, OAM_YFLIP + db 16, -8, 1, OAM_YFLIP + db 16, 0, 2, OAM_YFLIP + db 16, 8, 1, OAM_YFLIP + db 16, 16, 2, OAM_YFLIP + db 8, 24, 4, OAM_YFLIP + db 0, 24, 5, OAM_YFLIP + db -8, 24, 4, OAM_YFLIP + db -16, 24, 5, OAM_YFLIP AnimData73:: frame_table AnimFrameTable21 @@ -2202,21 +2202,21 @@ AnimFrameTable21:: .data_aa428 db 8 ; size - db 0, 8, 2, (1 << OAM_X_FLIP) + db 0, 8, 2, OAM_XFLIP db 0, 0, 2, $0 - db -8, 0, 2, (1 << OAM_Y_FLIP) - db -8, 8, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, 0, 2, OAM_YFLIP + db -8, 8, 2, OAM_XFLIP | OAM_YFLIP db 0, -16, 2, $0 - db 0, -8, 2, (1 << OAM_X_FLIP) - db -8, -8, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -16, 2, (1 << OAM_Y_FLIP) + db 0, -8, 2, OAM_XFLIP + db -8, -8, 2, OAM_XFLIP | OAM_YFLIP + db -8, -16, 2, OAM_YFLIP .data_aa449 db 8 ; size - db -7, -8, 0, (1 << OAM_X_FLIP) - db -7, -16, 1, (1 << OAM_X_FLIP) - db 1, -8, 2, (1 << OAM_X_FLIP) - db 1, -16, 3, (1 << OAM_X_FLIP) + db -7, -8, 0, OAM_XFLIP + db -7, -16, 1, OAM_XFLIP + db 1, -8, 2, OAM_XFLIP + db 1, -16, 3, OAM_XFLIP db -7, 0, 0, $0 db -7, 8, 1, $0 db 1, 0, 2, $0 @@ -2224,37 +2224,37 @@ AnimFrameTable21:: .data_aa46a db 8 ; size - db -6, -16, 1, (1 << OAM_X_FLIP) + db -6, -16, 1, OAM_XFLIP db -6, -8, 1, $0 - db 2, -16, 5, (1 << OAM_X_FLIP) - db 2, -8, 4, (1 << OAM_X_FLIP) + db 2, -16, 5, OAM_XFLIP + db 2, -8, 4, OAM_XFLIP db -6, 8, 1, $0 - db -6, 0, 1, (1 << OAM_X_FLIP) + db -6, 0, 1, OAM_XFLIP db 2, 8, 5, $0 db 2, 0, 4, $0 .data_aa48b db 9 ; size - db -5, -16, 1, (1 << OAM_X_FLIP) - db 3, -16, 5, (1 << OAM_X_FLIP) + db -5, -16, 1, OAM_XFLIP + db 3, -16, 5, OAM_XFLIP db -5, -8, 1, $0 db 3, -8, 5, $0 db -5, 8, 1, $0 db 3, 8, 5, $0 - db -5, 0, 1, (1 << OAM_X_FLIP) - db 3, 0, 5, (1 << OAM_X_FLIP) + db -5, 0, 1, OAM_XFLIP + db 3, 0, 5, OAM_XFLIP db -14, 11, 6, $0 .data_aa4b0 db 9 ; size - db -5, -16, 1, (1 << OAM_X_FLIP) - db 3, -16, 5, (1 << OAM_X_FLIP) + db -5, -16, 1, OAM_XFLIP + db 3, -16, 5, OAM_XFLIP db -5, -8, 1, $0 db 3, -8, 5, $0 db -5, 8, 1, $0 db 3, 8, 5, $0 - db -5, 0, 1, (1 << OAM_X_FLIP) - db 3, 0, 5, (1 << OAM_X_FLIP) + db -5, 0, 1, OAM_XFLIP + db 3, 0, 5, OAM_XFLIP db -18, 15, 7, $0 AnimData74:: @@ -2283,90 +2283,90 @@ AnimFrameTable22:: .data_aa510 db 8 ; size db -8, -8, 0, $0 - db -8, 0, 0, (1 << OAM_X_FLIP) + db -8, 0, 0, OAM_XFLIP db -24, -8, 0, $0 - db -24, 0, 0, (1 << OAM_X_FLIP) + db -24, 0, 0, OAM_XFLIP db -16, -8, 1, $0 db 0, -8, 1, $0 - db -16, 0, 1, (1 << OAM_X_FLIP) - db 0, 0, 1, (1 << OAM_X_FLIP) + db -16, 0, 1, OAM_XFLIP + db 0, 0, 1, OAM_XFLIP .data_aa531 db 8 ; size db -16, -24, 0, $0 - db -16, -16, 0, (1 << OAM_X_FLIP) + db -16, -16, 0, OAM_XFLIP db -16, 8, 0, $0 - db -16, 16, 0, (1 << OAM_X_FLIP) + db -16, 16, 0, OAM_XFLIP db -8, -24, 1, $0 - db -8, -16, 1, (1 << OAM_X_FLIP) + db -8, -16, 1, OAM_XFLIP db -8, 8, 1, $0 - db -8, 16, 1, (1 << OAM_X_FLIP) + db -8, 16, 1, OAM_XFLIP .data_aa552 db 8 ; size db -24, -32, 0, $0 - db -24, -24, 0, (1 << OAM_X_FLIP) + db -24, -24, 0, OAM_XFLIP db -8, 16, 0, $0 - db -8, 24, 0, (1 << OAM_X_FLIP) + db -8, 24, 0, OAM_XFLIP db -16, -32, 1, $0 - db -16, -24, 1, (1 << OAM_X_FLIP) + db -16, -24, 1, OAM_XFLIP db 0, 16, 1, $0 - db 0, 24, 1, (1 << OAM_X_FLIP) + db 0, 24, 1, OAM_XFLIP .data_aa573 db 8 ; size db -32, -24, 0, $0 - db -32, -16, 0, (1 << OAM_X_FLIP) + db -32, -16, 0, OAM_XFLIP db 0, 8, 0, $0 - db 0, 16, 0, (1 << OAM_X_FLIP) + db 0, 16, 0, OAM_XFLIP db -24, -24, 1, $0 db 8, 8, 1, $0 - db -24, -16, 1, (1 << OAM_X_FLIP) - db 8, 16, 1, (1 << OAM_X_FLIP) + db -24, -16, 1, OAM_XFLIP + db 8, 16, 1, OAM_XFLIP .data_aa594 db 8 ; size db -24, -8, 0, $0 - db -24, 0, 0, (1 << OAM_X_FLIP) + db -24, 0, 0, OAM_XFLIP db -8, -8, 0, $0 - db -8, 0, 0, (1 << OAM_X_FLIP) + db -8, 0, 0, OAM_XFLIP db -16, -8, 1, $0 db 0, -8, 1, $0 - db -16, 0, 1, (1 << OAM_X_FLIP) - db 0, 0, 1, (1 << OAM_X_FLIP) + db -16, 0, 1, OAM_XFLIP + db 0, 0, 1, OAM_XFLIP .data_aa5b5 db 8 ; size db -16, 8, 0, $0 - db -16, 16, 0, (1 << OAM_X_FLIP) + db -16, 16, 0, OAM_XFLIP db -16, -24, 0, $0 - db -16, -16, 0, (1 << OAM_X_FLIP) + db -16, -16, 0, OAM_XFLIP db -8, -24, 1, $0 - db -8, -16, 1, (1 << OAM_X_FLIP) + db -8, -16, 1, OAM_XFLIP db -8, 8, 1, $0 - db -8, 16, 1, (1 << OAM_X_FLIP) + db -8, 16, 1, OAM_XFLIP .data_aa5d6 db 8 ; size db -8, 16, 0, $0 - db -8, 24, 0, (1 << OAM_X_FLIP) + db -8, 24, 0, OAM_XFLIP db -24, -32, 0, $0 - db -24, -24, 0, (1 << OAM_X_FLIP) + db -24, -24, 0, OAM_XFLIP db -16, -32, 1, $0 - db -16, -24, 1, (1 << OAM_X_FLIP) + db -16, -24, 1, OAM_XFLIP db 0, 16, 1, $0 - db 0, 24, 1, (1 << OAM_X_FLIP) + db 0, 24, 1, OAM_XFLIP .data_aa5f7 db 8 ; size db 0, 8, 0, $0 - db 0, 16, 0, (1 << OAM_X_FLIP) + db 0, 16, 0, OAM_XFLIP db -32, -24, 0, $0 - db -32, -16, 0, (1 << OAM_X_FLIP) + db -32, -16, 0, OAM_XFLIP db -24, -24, 1, $0 - db -24, -16, 1, (1 << OAM_X_FLIP) + db -24, -16, 1, OAM_XFLIP db 8, 8, 1, $0 - db 8, 16, 1, (1 << OAM_X_FLIP) + db 8, 16, 1, OAM_XFLIP AnimData75:: frame_table AnimFrameTable23 @@ -2399,7 +2399,7 @@ AnimFrameTable23:: db -24, 24, 2, $0 db -16, -32, 1, $0 db -24, -32, 0, $0 - db -24, -16, 1, (1 << OAM_X_FLIP) + db -24, -16, 1, OAM_XFLIP db -16, 8, 1, $0 db -24, 0, 3, $0 @@ -2414,11 +2414,11 @@ AnimFrameTable23:: db -16, 24, 2, $0 db -24, 24, 2, $0 db -24, 0, 2, $0 - db -24, -16, 0, (1 << OAM_X_FLIP) + db -24, -16, 0, OAM_XFLIP db -8, -32, 1, $0 db -16, -32, 0, $0 db -24, -32, 0, $0 - db -16, -16, 1, (1 << OAM_X_FLIP) + db -16, -16, 1, OAM_XFLIP db -8, 8, 1, $0 db -16, 0, 3, $0 @@ -2437,13 +2437,13 @@ AnimFrameTable23:: db -24, 24, 2, $0 db -16, 0, 2, $0 db -24, 0, 2, $0 - db -24, -16, 0, (1 << OAM_X_FLIP) - db -16, -16, 0, (1 << OAM_X_FLIP) + db -24, -16, 0, OAM_XFLIP + db -16, -16, 0, OAM_XFLIP db 0, -32, 1, $0 db -8, -32, 0, $0 db -16, -32, 0, $0 db -24, -32, 0, $0 - db -8, -16, 1, (1 << OAM_X_FLIP) + db -8, -16, 1, OAM_XFLIP db 0, 8, 1, $0 db -8, 0, 3, $0 @@ -2479,11 +2479,11 @@ AnimFrameTable24:: db -12, -4, 5, $0 db -4, -12, 6, $0 db -4, -4, 7, $0 - db -12, 4, 4, (1 << OAM_X_FLIP) - db -4, 4, 6, (1 << OAM_X_FLIP) - db 4, -12, 4, (1 << OAM_Y_FLIP) - db 4, -4, 5, (1 << OAM_Y_FLIP) - db 4, 4, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -12, 4, 4, OAM_XFLIP + db -4, 4, 6, OAM_XFLIP + db 4, -12, 4, OAM_YFLIP + db 4, -4, 5, OAM_YFLIP + db 4, 4, 4, OAM_XFLIP | OAM_YFLIP .data_aa772 db 13 ; size @@ -2495,11 +2495,11 @@ AnimFrameTable24:: db -20, -20, 5, $0 db -12, -28, 6, $0 db -12, -20, 7, $0 - db -20, -12, 4, (1 << OAM_X_FLIP) - db -12, -12, 6, (1 << OAM_X_FLIP) - db -4, -28, 4, (1 << OAM_Y_FLIP) - db -4, -20, 5, (1 << OAM_Y_FLIP) - db -4, -12, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -20, -12, 4, OAM_XFLIP + db -12, -12, 6, OAM_XFLIP + db -4, -28, 4, OAM_YFLIP + db -4, -20, 5, OAM_YFLIP + db -4, -12, 4, OAM_XFLIP | OAM_YFLIP .data_aa7a7 db 13 ; size @@ -2511,11 +2511,11 @@ AnimFrameTable24:: db -12, 12, 5, $0 db -4, 4, 6, $0 db -4, 12, 7, $0 - db -12, 20, 4, (1 << OAM_X_FLIP) - db -4, 20, 6, (1 << OAM_X_FLIP) - db 4, 4, 4, (1 << OAM_Y_FLIP) - db 4, 12, 5, (1 << OAM_Y_FLIP) - db 4, 20, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -12, 20, 4, OAM_XFLIP + db -4, 20, 6, OAM_XFLIP + db 4, 4, 4, OAM_YFLIP + db 4, 12, 5, OAM_YFLIP + db 4, 20, 4, OAM_XFLIP | OAM_YFLIP .data_aa7dc db 17 ; size @@ -2527,15 +2527,15 @@ AnimFrameTable24:: db -24, -24, 5, $0 db -16, -32, 6, $0 db -16, -24, 7, $0 - db -24, -16, 4, (1 << OAM_X_FLIP) - db -16, -16, 6, (1 << OAM_X_FLIP) - db -8, -32, 4, (1 << OAM_Y_FLIP) - db -8, -24, 5, (1 << OAM_Y_FLIP) - db -8, -16, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -24, -16, 4, OAM_XFLIP + db -16, -16, 6, OAM_XFLIP + db -8, -32, 4, OAM_YFLIP + db -8, -24, 5, OAM_YFLIP + db -8, -16, 4, OAM_XFLIP | OAM_YFLIP db -29, -11, 8, $0 - db -29, -37, 8, (1 << OAM_X_FLIP) - db -3, -11, 8, (1 << OAM_Y_FLIP) - db -3, -37, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -29, -37, 8, OAM_XFLIP + db -3, -11, 8, OAM_YFLIP + db -3, -37, 8, OAM_XFLIP | OAM_YFLIP .data_aa821 db 17 ; size @@ -2547,15 +2547,15 @@ AnimFrameTable24:: db 0, 12, 5, $0 db 8, 4, 6, $0 db 8, 12, 7, $0 - db 0, 20, 4, (1 << OAM_X_FLIP) - db 8, 20, 6, (1 << OAM_X_FLIP) - db 16, 4, 4, (1 << OAM_Y_FLIP) - db 16, 12, 5, (1 << OAM_Y_FLIP) - db 16, 20, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, 20, 4, OAM_XFLIP + db 8, 20, 6, OAM_XFLIP + db 16, 4, 4, OAM_YFLIP + db 16, 12, 5, OAM_YFLIP + db 16, 20, 4, OAM_XFLIP | OAM_YFLIP db -5, 25, 8, $0 - db -5, -1, 8, (1 << OAM_X_FLIP) - db 21, 25, 8, (1 << OAM_Y_FLIP) - db 21, -1, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -5, -1, 8, OAM_XFLIP + db 21, 25, 8, OAM_YFLIP + db 21, -1, 8, OAM_XFLIP | OAM_YFLIP .data_aa866 db 13 ; size @@ -2563,15 +2563,15 @@ AnimFrameTable24:: db -4, -20, 5, $0 db 4, -28, 6, $0 db 4, -20, 7, $0 - db -4, -12, 4, (1 << OAM_X_FLIP) - db 4, -12, 6, (1 << OAM_X_FLIP) - db 12, -28, 4, (1 << OAM_Y_FLIP) - db 12, -20, 5, (1 << OAM_Y_FLIP) - db 12, -12, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -4, -12, 4, OAM_XFLIP + db 4, -12, 6, OAM_XFLIP + db 12, -28, 4, OAM_YFLIP + db 12, -20, 5, OAM_YFLIP + db 12, -12, 4, OAM_XFLIP | OAM_YFLIP db -9, -7, 8, $0 - db -9, -33, 8, (1 << OAM_X_FLIP) - db 17, -7, 8, (1 << OAM_Y_FLIP) - db 17, -33, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -9, -33, 8, OAM_XFLIP + db 17, -7, 8, OAM_YFLIP + db 17, -33, 8, OAM_XFLIP | OAM_YFLIP AnimData77:: frame_table AnimFrameTable24 @@ -3164,17 +3164,17 @@ AnimFrameTable26:: .data_ab074 db 2 ; size db -32, -5, 0, $0 - db -24, -4, 1, (1 << OAM_X_FLIP) + db -24, -4, 1, OAM_XFLIP .data_ab07d db 7 ; size - db -32, -3, 0, (1 << OAM_X_FLIP) - db -24, -4, 1, (1 << OAM_X_FLIP) - db -16, -2, 2, (1 << OAM_X_FLIP) - db -8, 0, 3, (1 << OAM_X_FLIP) - db -8, -8, 4, (1 << OAM_X_FLIP) - db 0, 0, 5, (1 << OAM_X_FLIP) - db 0, -8, 6, (1 << OAM_X_FLIP) + db -32, -3, 0, OAM_XFLIP + db -24, -4, 1, OAM_XFLIP + db -16, -2, 2, OAM_XFLIP + db -8, 0, 3, OAM_XFLIP + db -8, -8, 4, OAM_XFLIP + db 0, 0, 5, OAM_XFLIP + db 0, -8, 6, OAM_XFLIP .data_ab09a db 7 ; size @@ -3195,10 +3195,10 @@ AnimFrameTable26:: .data_ab0c8 db 4 ; size - db -16, 10, 8, (1 << OAM_X_FLIP) - db 8, -18, 8, (1 << OAM_X_FLIP) - db 8, 10, 7, (1 << OAM_X_FLIP) - db -16, -18, 7, (1 << OAM_X_FLIP) + db -16, 10, 8, OAM_XFLIP + db 8, -18, 8, OAM_XFLIP + db 8, 10, 7, OAM_XFLIP + db -16, -18, 7, OAM_XFLIP .data_ab0d9 db 4 ; size @@ -3209,10 +3209,10 @@ AnimFrameTable26:: .data_ab0ea db 4 ; size - db -22, 18, 8, (1 << OAM_X_FLIP) - db 14, -26, 8, (1 << OAM_X_FLIP) - db 14, 18, 7, (1 << OAM_X_FLIP) - db -22, -26, 7, (1 << OAM_X_FLIP) + db -22, 18, 8, OAM_XFLIP + db 14, -26, 8, OAM_XFLIP + db 14, 18, 7, OAM_XFLIP + db -22, -26, 7, OAM_XFLIP AnimData93:: frame_table AnimFrameTable26 @@ -3277,42 +3277,42 @@ AnimFrameTable27:: db -8, -16, 12, $0 db 0, 8, 15, $0 db 0, 16, 16, $0 - db 8, 16, 11, (1 << OAM_X_FLIP) - db 8, 8, 12, (1 << OAM_X_FLIP) + db 8, 16, 11, OAM_XFLIP + db 8, 8, 12, OAM_XFLIP .data_ab1c7 db 11 ; size - db -40, 0, 0, (1 << OAM_X_FLIP) - db -40, -8, 1, (1 << OAM_X_FLIP) - db -32, 4, 2, (1 << OAM_X_FLIP) - db -32, -4, 3, (1 << OAM_X_FLIP) - db -24, 12, 4, (1 << OAM_X_FLIP) - db -24, 4, 5, (1 << OAM_X_FLIP) - db -24, -4, 6, (1 << OAM_X_FLIP) - db -16, -4, 9, (1 << OAM_X_FLIP) - db -16, -12, 10, (1 << OAM_X_FLIP) - db -8, -8, 13, (1 << OAM_X_FLIP) - db -8, -16, 14, (1 << OAM_X_FLIP) + db -40, 0, 0, OAM_XFLIP + db -40, -8, 1, OAM_XFLIP + db -32, 4, 2, OAM_XFLIP + db -32, -4, 3, OAM_XFLIP + db -24, 12, 4, OAM_XFLIP + db -24, 4, 5, OAM_XFLIP + db -24, -4, 6, OAM_XFLIP + db -16, -4, 9, OAM_XFLIP + db -16, -12, 10, OAM_XFLIP + db -8, -8, 13, OAM_XFLIP + db -8, -16, 14, OAM_XFLIP .data_ab1f4 db 19 ; size - db -40, 0, 0, (1 << OAM_X_FLIP) - db -40, -8, 1, (1 << OAM_X_FLIP) - db -32, 4, 2, (1 << OAM_X_FLIP) - db -32, -4, 3, (1 << OAM_X_FLIP) - db -24, 12, 4, (1 << OAM_X_FLIP) - db -24, 4, 5, (1 << OAM_X_FLIP) - db -24, -4, 6, (1 << OAM_X_FLIP) - db -16, -4, 9, (1 << OAM_X_FLIP) - db -16, -12, 10, (1 << OAM_X_FLIP) - db -8, -8, 13, (1 << OAM_X_FLIP) - db -8, -16, 14, (1 << OAM_X_FLIP) - db -16, 16, 7, (1 << OAM_X_FLIP) - db -16, 8, 8, (1 << OAM_X_FLIP) - db -8, 16, 11, (1 << OAM_X_FLIP) - db -8, 8, 12, (1 << OAM_X_FLIP) - db 0, -16, 15, (1 << OAM_X_FLIP) - db 0, -24, 16, (1 << OAM_X_FLIP) + db -40, 0, 0, OAM_XFLIP + db -40, -8, 1, OAM_XFLIP + db -32, 4, 2, OAM_XFLIP + db -32, -4, 3, OAM_XFLIP + db -24, 12, 4, OAM_XFLIP + db -24, 4, 5, OAM_XFLIP + db -24, -4, 6, OAM_XFLIP + db -16, -4, 9, OAM_XFLIP + db -16, -12, 10, OAM_XFLIP + db -8, -8, 13, OAM_XFLIP + db -8, -16, 14, OAM_XFLIP + db -16, 16, 7, OAM_XFLIP + db -16, 8, 8, OAM_XFLIP + db -8, 16, 11, OAM_XFLIP + db -8, 8, 12, OAM_XFLIP + db 0, -16, 15, OAM_XFLIP + db 0, -24, 16, OAM_XFLIP db 8, -24, 11, $0 db 8, -16, 12, $0 @@ -3322,11 +3322,11 @@ AnimFrameTable27:: db -40, 0, 1, $0 db -32, -12, 2, $0 db -32, -4, 3, $0 - db -24, -4, 4, (1 << OAM_X_FLIP) - db -24, -12, 5, (1 << OAM_X_FLIP) - db -24, -20, 6, (1 << OAM_X_FLIP) - db -16, -20, 9, (1 << OAM_X_FLIP) - db -16, -28, 10, (1 << OAM_X_FLIP) + db -24, -4, 4, OAM_XFLIP + db -24, -12, 5, OAM_XFLIP + db -24, -20, 6, OAM_XFLIP + db -16, -20, 9, OAM_XFLIP + db -16, -28, 10, OAM_XFLIP db -8, -32, 13, $0 db -8, -24, 14, $0 @@ -3336,21 +3336,21 @@ AnimFrameTable27:: db -40, 0, 1, $0 db -32, -12, 2, $0 db -32, -4, 3, $0 - db -24, -4, 4, (1 << OAM_X_FLIP) - db -24, -12, 5, (1 << OAM_X_FLIP) - db -24, -20, 6, (1 << OAM_X_FLIP) - db -16, -20, 9, (1 << OAM_X_FLIP) - db -16, -28, 10, (1 << OAM_X_FLIP) + db -24, -4, 4, OAM_XFLIP + db -24, -12, 5, OAM_XFLIP + db -24, -20, 6, OAM_XFLIP + db -16, -20, 9, OAM_XFLIP + db -16, -28, 10, OAM_XFLIP db -8, -32, 13, $0 db -8, -24, 14, $0 db 0, -24, 15, $0 db 0, -16, 16, $0 - db 8, -16, 11, (1 << OAM_X_FLIP) - db 8, -24, 12, (1 << OAM_X_FLIP) - db -16, 0, 7, (1 << OAM_X_FLIP) - db -16, -8, 8, (1 << OAM_X_FLIP) - db -8, 0, 11, (1 << OAM_X_FLIP) - db -8, -8, 12, (1 << OAM_X_FLIP) + db 8, -16, 11, OAM_XFLIP + db 8, -24, 12, OAM_XFLIP + db -16, 0, 7, OAM_XFLIP + db -16, -8, 8, OAM_XFLIP + db -8, 0, 11, OAM_XFLIP + db -8, -8, 12, OAM_XFLIP AnimData95:: frame_table AnimFrameTable28 @@ -3393,8 +3393,8 @@ AnimFrameTable28:: .data_ab31e db 8 ; size - db -27, -20, 0, (1 << OAM_X_FLIP) - db 20, 11, 0, (1 << OAM_X_FLIP) + db -27, -20, 0, OAM_XFLIP + db 20, 11, 0, OAM_XFLIP db -15, -35, 2, $0 db 8, 28, 2, $0 db -27, -27, 1, $0 @@ -3406,54 +3406,54 @@ AnimFrameTable28:: db 8 ; size db -27, -11, 2, $0 db 20, 4, 2, $0 - db -12, -35, 0, (1 << OAM_Y_FLIP) - db 3, 28, 0, (1 << OAM_Y_FLIP) - db -27, -20, 0, (1 << OAM_X_FLIP) - db 20, 11, 0, (1 << OAM_X_FLIP) + db -12, -35, 0, OAM_YFLIP + db 3, 28, 0, OAM_YFLIP + db -27, -20, 0, OAM_XFLIP + db 20, 11, 0, OAM_XFLIP db -15, -35, 2, $0 db 8, 28, 2, $0 .data_ab360 db 8 ; size - db 19, -4, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, -5, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 19, -4, 0, OAM_XFLIP | OAM_YFLIP + db -28, -5, 0, OAM_XFLIP | OAM_YFLIP db -7, -35, 1, $0 db 0, 29, 1, $0 db -27, -11, 2, $0 db 20, 4, 2, $0 - db -12, -35, 0, (1 << OAM_Y_FLIP) - db 3, 28, 0, (1 << OAM_Y_FLIP) + db -12, -35, 0, OAM_YFLIP + db 3, 28, 0, OAM_YFLIP .data_ab381 db 8 ; size - db -27, 3, 1, (1 << OAM_X_FLIP) - db 20, -12, 1, (1 << OAM_X_FLIP) - db -4, -36, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -5, 27, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 19, -4, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, -5, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -27, 3, 1, OAM_XFLIP + db 20, -12, 1, OAM_XFLIP + db -4, -36, 0, OAM_XFLIP | OAM_YFLIP + db -5, 27, 0, OAM_XFLIP | OAM_YFLIP + db 19, -4, 0, OAM_XFLIP | OAM_YFLIP + db -28, -5, 0, OAM_XFLIP | OAM_YFLIP db -7, -35, 1, $0 db 0, 29, 1, $0 .data_ab3a2 db 8 ; size - db 19, -19, 0, (1 << OAM_Y_FLIP) - db -28, 12, 0, (1 << OAM_Y_FLIP) + db 19, -19, 0, OAM_YFLIP + db -28, 12, 0, OAM_YFLIP db 1, -35, 2, $0 db -8, 28, 2, $0 - db -27, 3, 1, (1 << OAM_X_FLIP) - db 20, -12, 1, (1 << OAM_X_FLIP) - db -4, -36, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -5, 27, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -27, 3, 1, OAM_XFLIP + db 20, -12, 1, OAM_XFLIP + db -4, -36, 0, OAM_XFLIP | OAM_YFLIP + db -5, 27, 0, OAM_XFLIP | OAM_YFLIP .data_ab3c3 db 8 ; size - db -27, 19, 2, (1 << OAM_X_FLIP) - db 20, -28, 2, (1 << OAM_X_FLIP) - db 5, -36, 0, (1 << OAM_X_FLIP) - db -12, 27, 0, (1 << OAM_X_FLIP) - db 19, -19, 0, (1 << OAM_Y_FLIP) - db -28, 12, 0, (1 << OAM_Y_FLIP) + db -27, 19, 2, OAM_XFLIP + db 20, -28, 2, OAM_XFLIP + db 5, -36, 0, OAM_XFLIP + db -12, 27, 0, OAM_XFLIP + db 19, -19, 0, OAM_YFLIP + db -28, 12, 0, OAM_YFLIP db 1, -35, 2, $0 db -8, 28, 2, $0 @@ -3463,10 +3463,10 @@ AnimFrameTable28:: db -27, 28, 0, $0 db 8, -35, 1, $0 db -16, 28, 1, $0 - db -27, 19, 2, (1 << OAM_X_FLIP) - db 20, -28, 2, (1 << OAM_X_FLIP) - db 5, -36, 0, (1 << OAM_X_FLIP) - db -12, 27, 0, (1 << OAM_X_FLIP) + db -27, 19, 2, OAM_XFLIP + db 20, -28, 2, OAM_XFLIP + db 5, -36, 0, OAM_XFLIP + db -12, 27, 0, OAM_XFLIP AnimData96:: frame_table AnimFrameTable29 @@ -3497,8 +3497,8 @@ AnimFrameTable29:: db 26 ; size db -72, -8, 0, $0 db -72, 0, 1, $0 - db -64, 1, 2, (1 << OAM_X_FLIP) - db -64, -7, 3, (1 << OAM_X_FLIP) + db -64, 1, 2, OAM_XFLIP + db -64, -7, 3, OAM_XFLIP db -56, -9, 4, $0 db -56, -1, 5, $0 db -48, -9, 15, $0 @@ -3524,20 +3524,20 @@ AnimFrameTable29:: .data_ab4b5 db 20 ; size - db -72, 0, 0, (1 << OAM_X_FLIP) - db -72, -8, 1, (1 << OAM_X_FLIP) - db -64, 8, 2, (1 << OAM_X_FLIP) - db -64, 0, 3, (1 << OAM_X_FLIP) - db -56, 9, 4, (1 << OAM_X_FLIP) - db -56, 1, 5, (1 << OAM_X_FLIP) - db -48, 9, 15, (1 << OAM_X_FLIP) - db -40, 14, 19, (1 << OAM_X_FLIP) - db -40, 6, 20, (1 << OAM_X_FLIP) - db -32, 8, 25, (1 << OAM_X_FLIP) - db -32, 0, 26, (1 << OAM_X_FLIP) - db -24, 8, 27, (1 << OAM_X_FLIP) - db -24, 0, 28, (1 << OAM_X_FLIP) - db -48, 1, 35, (1 << OAM_X_FLIP) + db -72, 0, 0, OAM_XFLIP + db -72, -8, 1, OAM_XFLIP + db -64, 8, 2, OAM_XFLIP + db -64, 0, 3, OAM_XFLIP + db -56, 9, 4, OAM_XFLIP + db -56, 1, 5, OAM_XFLIP + db -48, 9, 15, OAM_XFLIP + db -40, 14, 19, OAM_XFLIP + db -40, 6, 20, OAM_XFLIP + db -32, 8, 25, OAM_XFLIP + db -32, 0, 26, OAM_XFLIP + db -24, 8, 27, OAM_XFLIP + db -24, 0, 28, OAM_XFLIP + db -48, 1, 35, OAM_XFLIP db -16, -8, 36, $0 db -16, 0, 37, $0 db -16, 8, 38, $0 @@ -3553,25 +3553,25 @@ AnimFrameTable29:: db -64, -8, 3, $0 db -56, -16, 4, $0 db -56, -8, 5, $0 - db -48, -2, 6, (1 << OAM_X_FLIP) - db -48, -10, 7, (1 << OAM_X_FLIP) - db -48, -18, 8, (1 << OAM_X_FLIP) - db -40, 3, 9, (1 << OAM_X_FLIP) - db -40, -5, 10, (1 << OAM_X_FLIP) - db -40, -13, 11, (1 << OAM_X_FLIP) - db -40, -21, 12, (1 << OAM_X_FLIP) + db -48, -2, 6, OAM_XFLIP + db -48, -10, 7, OAM_XFLIP + db -48, -18, 8, OAM_XFLIP + db -40, 3, 9, OAM_XFLIP + db -40, -5, 10, OAM_XFLIP + db -40, -13, 11, OAM_XFLIP + db -40, -21, 12, OAM_XFLIP db -32, -8, 13, $0 db -32, 1, 14, $0 db -32, -24, 15, $0 db -32, -16, 35, $0 - db -24, -19, 19, (1 << OAM_X_FLIP) - db -24, -27, 20, (1 << OAM_X_FLIP) + db -24, -19, 19, OAM_XFLIP + db -24, -27, 20, OAM_XFLIP db -16, -30, 25, $0 db -16, -22, 26, $0 db -8, -33, 25, $0 db -8, -25, 26, $0 - db 0, -33, 27, (1 << OAM_X_FLIP) - db 0, -41, 28, (1 << OAM_X_FLIP) + db 0, -33, 27, OAM_XFLIP + db 0, -41, 28, OAM_XFLIP db 8, -49, 36, $0 db 8, -41, 37, $0 db 8, -33, 38, $0 @@ -3581,9 +3581,9 @@ AnimFrameTable29:: .data_ab583 db 12 ; size - db -72, 8, 0, (1 << OAM_X_FLIP) - db -72, 0, 1, (1 << OAM_X_FLIP) - db -64, 8, 44, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -72, 8, 0, OAM_XFLIP + db -72, 0, 1, OAM_XFLIP + db -64, 8, 44, OAM_XFLIP | OAM_YFLIP db -64, 16, 42, $0 db -64, 24, 43, $0 db -64, 32, 44, $0 @@ -3598,16 +3598,16 @@ AnimFrameTable29:: db 18 ; size db -72, 8, 0, $0 db -72, 16, 1, $0 - db -64, 8, 44, (1 << OAM_Y_FLIP) - db -64, 0, 42, (1 << OAM_X_FLIP) - db -64, -8, 43, (1 << OAM_X_FLIP) - db -64, -16, 44, (1 << OAM_X_FLIP) - db -56, -16, 27, (1 << OAM_X_FLIP) - db -56, -24, 28, (1 << OAM_X_FLIP) - db -48, -23, 44, (1 << OAM_Y_FLIP) - db -46, -31, 42, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -45, -39, 43, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -44, -47, 44, (1 << OAM_X_FLIP) + db -64, 8, 44, OAM_YFLIP + db -64, 0, 42, OAM_XFLIP + db -64, -8, 43, OAM_XFLIP + db -64, -16, 44, OAM_XFLIP + db -56, -16, 27, OAM_XFLIP + db -56, -24, 28, OAM_XFLIP + db -48, -23, 44, OAM_YFLIP + db -46, -31, 42, OAM_XFLIP | OAM_YFLIP + db -45, -39, 43, OAM_XFLIP | OAM_YFLIP + db -44, -47, 44, OAM_XFLIP db -36, -57, 36, $0 db -36, -49, 37, $0 db -36, -41, 38, $0 @@ -3617,7 +3617,7 @@ AnimFrameTable29:: .data_ab5fd db 28 ; size - db -72, -8, 0, (1 << OAM_X_FLIP) + db -72, -8, 0, OAM_XFLIP db -16, 32, 27, $0 db -16, 40, 28, $0 db -8, 32, 29, $0 @@ -3626,24 +3626,24 @@ AnimFrameTable29:: db 0, 40, 33, $0 db -8, 48, 31, $0 db 0, 48, 34, $0 - db -24, 32, 25, (1 << OAM_X_FLIP) - db -24, 24, 26, (1 << OAM_X_FLIP) + db -24, 32, 25, OAM_XFLIP + db -24, 24, 26, OAM_XFLIP db -32, 21, 19, $0 db -32, 29, 20, $0 - db -40, 26, 15, (1 << OAM_X_FLIP) - db -40, 18, 16, (1 << OAM_X_FLIP) - db -40, 10, 17, (1 << OAM_X_FLIP) - db -40, 2, 18, (1 << OAM_X_FLIP) - db -32, 16, 21, (1 << OAM_X_FLIP) - db -32, 8, 22, (1 << OAM_X_FLIP) - db -32, 0, 23, (1 << OAM_X_FLIP) - db -24, 8, 24, (1 << OAM_X_FLIP) + db -40, 26, 15, OAM_XFLIP + db -40, 18, 16, OAM_XFLIP + db -40, 10, 17, OAM_XFLIP + db -40, 2, 18, OAM_XFLIP + db -32, 16, 21, OAM_XFLIP + db -32, 8, 22, OAM_XFLIP + db -32, 0, 23, OAM_XFLIP + db -24, 8, 24, OAM_XFLIP db -48, 15, 11, $0 db -48, 23, 12, $0 - db -64, 8, 2, (1 << OAM_X_FLIP) - db -64, 0, 3, (1 << OAM_X_FLIP) + db -64, 8, 2, OAM_XFLIP + db -64, 0, 3, OAM_XFLIP db -56, 18, 44, $0 - db -56, 2, 44, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -56, 2, 44, OAM_XFLIP | OAM_YFLIP db -56, 10, 42, $0 AnimData97:: @@ -3690,36 +3690,36 @@ AnimFrameTable30:: db 4 ; size db -8, -8, 0, $0 db 0, -8, 1, $0 - db -8, 0, 4, (1 << OAM_X_FLIP) - db 0, 0, 5, (1 << OAM_X_FLIP) + db -8, 0, 4, OAM_XFLIP + db 0, 0, 5, OAM_XFLIP .data_ab6e6 db 4 ; size db -8, -8, 2, $0 db 0, -8, 3, $0 - db -8, 0, 6, (1 << OAM_X_FLIP) - db 0, 0, 7, (1 << OAM_X_FLIP) + db -8, 0, 6, OAM_XFLIP + db 0, 0, 7, OAM_XFLIP .data_ab6f7 db 4 ; size db -8, -8, 4, $0 db 0, -8, 5, $0 - db -8, 0, 0, (1 << OAM_X_FLIP) - db 0, 0, 1, (1 << OAM_X_FLIP) + db -8, 0, 0, OAM_XFLIP + db 0, 0, 1, OAM_XFLIP .data_ab708 db 4 ; size db -8, -8, 6, $0 db 0, -8, 7, $0 - db -8, 0, 2, (1 << OAM_X_FLIP) - db 0, 0, 3, (1 << OAM_X_FLIP) + db -8, 0, 2, OAM_XFLIP + db 0, 0, 3, OAM_XFLIP .data_ab719 db 12 ; size db -8, -8, 0, $0 db 0, -8, 1, $0 - db -8, 0, 4, (1 << OAM_X_FLIP) - db 0, 0, 5, (1 << OAM_X_FLIP) + db -8, 0, 4, OAM_XFLIP + db 0, 0, 5, OAM_XFLIP db -19, 2, 8, $0 db 1, -10, 8, $0 db -12, 2, 9, $0 @@ -3780,16 +3780,16 @@ AnimFrameTable30:: db 5 ; size db -8, 10, 4, $0 db 0, 10, 5, $0 - db -8, 18, 0, (1 << OAM_X_FLIP) - db 0, 18, 1, (1 << OAM_X_FLIP) + db -8, 18, 0, OAM_XFLIP + db 0, 18, 1, OAM_XFLIP db -16, 12, 12, $0 .data_ab7ef db 6 ; size db 2, 8, 6, $0 db 10, 8, 7, $0 - db 2, 16, 2, (1 << OAM_X_FLIP) - db 10, 16, 3, (1 << OAM_X_FLIP) + db 2, 16, 2, OAM_XFLIP + db 10, 16, 3, OAM_XFLIP db -19, 12, 10, $0 db -11, 12, 11, $0 @@ -3797,97 +3797,97 @@ AnimFrameTable30:: db 9 ; size db 6, -8, 0, $0 db 14, -8, 1, $0 - db 6, 0, 4, (1 << OAM_X_FLIP) - db 14, 0, 5, (1 << OAM_X_FLIP) + db 6, 0, 4, OAM_XFLIP + db 14, 0, 5, OAM_XFLIP db 8, 12, 12, $0 db -21, 8, 0, $0 db -13, 8, 1, $0 - db -21, 16, 4, (1 << OAM_X_FLIP) - db -13, 16, 5, (1 << OAM_X_FLIP) + db -21, 16, 4, OAM_XFLIP + db -13, 16, 5, OAM_XFLIP .data_ab82d db 10 ; size db 2, -22, 2, $0 db 10, -22, 3, $0 - db 2, -14, 6, (1 << OAM_X_FLIP) - db 10, -14, 7, (1 << OAM_X_FLIP) + db 2, -14, 6, OAM_XFLIP + db 10, -14, 7, OAM_XFLIP db 5, 12, 8, $0 db 13, 12, 9, $0 db -21, 9, 2, $0 db -13, 9, 3, $0 - db -21, 17, 6, (1 << OAM_X_FLIP) - db -13, 17, 7, (1 << OAM_X_FLIP) + db -21, 17, 6, OAM_XFLIP + db -13, 17, 7, OAM_XFLIP .data_ab856 db 13 ; size db -8, -26, 4, $0 db 0, -26, 5, $0 - db -8, -18, 0, (1 << OAM_X_FLIP) - db 0, -18, 1, (1 << OAM_X_FLIP) + db -8, -18, 0, OAM_XFLIP + db 0, -18, 1, OAM_XFLIP db 8, -20, 12, $0 db -20, 8, 4, $0 db -12, 8, 5, $0 - db -20, 16, 0, (1 << OAM_X_FLIP) - db -12, 16, 1, (1 << OAM_X_FLIP) + db -20, 16, 0, OAM_XFLIP + db -12, 16, 1, OAM_XFLIP db 5, 8, 4, $0 db 13, 8, 5, $0 - db 5, 16, 0, (1 << OAM_X_FLIP) - db 13, 16, 1, (1 << OAM_X_FLIP) + db 5, 16, 0, OAM_XFLIP + db 13, 16, 1, OAM_XFLIP .data_ab88b db 16 ; size db -20, -24, 6, $0 db -12, -24, 7, $0 - db -20, -16, 2, (1 << OAM_X_FLIP) - db -12, -16, 3, (1 << OAM_X_FLIP) + db -20, -16, 2, OAM_XFLIP + db -12, -16, 3, OAM_XFLIP db -20, 8, 6, $0 db -12, 8, 7, $0 - db -20, 16, 2, (1 << OAM_X_FLIP) - db -12, 16, 3, (1 << OAM_X_FLIP) + db -20, 16, 2, OAM_XFLIP + db -12, 16, 3, OAM_XFLIP db 5, 8, 6, $0 db 13, 8, 7, $0 - db 5, 16, 2, (1 << OAM_X_FLIP) - db 13, 16, 3, (1 << OAM_X_FLIP) + db 5, 16, 2, OAM_XFLIP + db 13, 16, 3, OAM_XFLIP db 5, -24, 6, $0 db 13, -24, 7, $0 - db 5, -16, 2, (1 << OAM_X_FLIP) - db 13, -16, 3, (1 << OAM_X_FLIP) + db 5, -16, 2, OAM_XFLIP + db 13, -16, 3, OAM_XFLIP .data_ab8cc db 16 ; size db -20, -24, 0, $0 db -12, -24, 1, $0 - db -20, -16, 4, (1 << OAM_X_FLIP) - db -12, -16, 5, (1 << OAM_X_FLIP) + db -20, -16, 4, OAM_XFLIP + db -12, -16, 5, OAM_XFLIP db -20, 8, 0, $0 db -12, 8, 1, $0 - db -20, 16, 4, (1 << OAM_X_FLIP) - db -12, 16, 5, (1 << OAM_X_FLIP) + db -20, 16, 4, OAM_XFLIP + db -12, 16, 5, OAM_XFLIP db 5, -25, 0, $0 db 13, -25, 1, $0 - db 5, -17, 4, (1 << OAM_X_FLIP) - db 13, -17, 5, (1 << OAM_X_FLIP) + db 5, -17, 4, OAM_XFLIP + db 13, -17, 5, OAM_XFLIP db 6, 6, 0, $0 db 14, 6, 1, $0 - db 6, 14, 4, (1 << OAM_X_FLIP) - db 14, 14, 5, (1 << OAM_X_FLIP) + db 6, 14, 4, OAM_XFLIP + db 14, 14, 5, OAM_XFLIP .data_ab90d db 16 ; size - db -20, 16, 6, (1 << OAM_X_FLIP) - db -12, 16, 7, (1 << OAM_X_FLIP) + db -20, 16, 6, OAM_XFLIP + db -12, 16, 7, OAM_XFLIP db -20, 8, 2, $0 db -12, 8, 3, $0 - db -20, -16, 6, (1 << OAM_X_FLIP) - db -12, -16, 7, (1 << OAM_X_FLIP) + db -20, -16, 6, OAM_XFLIP + db -12, -16, 7, OAM_XFLIP db -20, -24, 2, $0 db -12, -24, 3, $0 - db 5, -16, 6, (1 << OAM_X_FLIP) - db 13, -16, 7, (1 << OAM_X_FLIP) + db 5, -16, 6, OAM_XFLIP + db 13, -16, 7, OAM_XFLIP db 5, -24, 2, $0 db 13, -24, 3, $0 - db 5, 16, 6, (1 << OAM_X_FLIP) - db 13, 16, 7, (1 << OAM_X_FLIP) + db 5, 16, 6, OAM_XFLIP + db 13, 16, 7, OAM_XFLIP db 5, 8, 2, $0 db 13, 8, 3, $0 @@ -3895,20 +3895,20 @@ AnimFrameTable30:: db 16 ; size db -20, -24, 4, $0 db -12, -24, 5, $0 - db -20, -16, 0, (1 << OAM_X_FLIP) - db -12, -16, 1, (1 << OAM_X_FLIP) + db -20, -16, 0, OAM_XFLIP + db -12, -16, 1, OAM_XFLIP db -19, 8, 4, $0 db -11, 8, 5, $0 - db -19, 16, 0, (1 << OAM_X_FLIP) - db -11, 16, 1, (1 << OAM_X_FLIP) + db -19, 16, 0, OAM_XFLIP + db -11, 16, 1, OAM_XFLIP db 4, 8, 4, $0 db 12, 8, 5, $0 - db 4, 16, 0, (1 << OAM_X_FLIP) - db 12, 16, 1, (1 << OAM_X_FLIP) + db 4, 16, 0, OAM_XFLIP + db 12, 16, 1, OAM_XFLIP db 5, -24, 4, $0 db 13, -24, 5, $0 - db 5, -16, 0, (1 << OAM_X_FLIP) - db 13, -16, 1, (1 << OAM_X_FLIP) + db 5, -16, 0, OAM_XFLIP + db 13, -16, 1, OAM_XFLIP .data_ab98f db 8 ; size @@ -4006,24 +4006,24 @@ AnimFrameTable31:: .data_abac7 db 4 ; size - db -42, -10, 24, (1 << OAM_X_FLIP) - db -42, -18, 25, (1 << OAM_X_FLIP) - db -34, -10, 26, (1 << OAM_X_FLIP) - db -34, -18, 27, (1 << OAM_X_FLIP) + db -42, -10, 24, OAM_XFLIP + db -42, -18, 25, OAM_XFLIP + db -34, -10, 26, OAM_XFLIP + db -34, -18, 27, OAM_XFLIP .data_abad8 db 4 ; size - db -14, -10, 24, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -14, -18, 25, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -22, -10, 26, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -22, -18, 27, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -14, -10, 24, OAM_XFLIP | OAM_YFLIP + db -14, -18, 25, OAM_XFLIP | OAM_YFLIP + db -22, -10, 26, OAM_XFLIP | OAM_YFLIP + db -22, -18, 27, OAM_XFLIP | OAM_YFLIP .data_abae9 db 4 ; size - db -14, 2, 24, (1 << OAM_Y_FLIP) - db -14, 10, 25, (1 << OAM_Y_FLIP) - db -22, 2, 26, (1 << OAM_Y_FLIP) - db -22, 10, 27, (1 << OAM_Y_FLIP) + db -14, 2, 24, OAM_YFLIP + db -14, 10, 25, OAM_YFLIP + db -22, 2, 26, OAM_YFLIP + db -22, 10, 27, OAM_YFLIP .data_abafa db 4 ; size @@ -4034,33 +4034,33 @@ AnimFrameTable31:: .data_abb0b db 11 ; size - db -32, -24, 13, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -32, -32, 14, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -40, -32, 17, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -48, -32, 20, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -56, -28, 22, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -56, -20, 21, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -48, -16, 18, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -48, -24, 19, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -40, -24, 16, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -40, -16, 15, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -56, -8, 23, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -32, -24, 13, OAM_XFLIP | OAM_YFLIP + db -32, -32, 14, OAM_XFLIP | OAM_YFLIP + db -40, -32, 17, OAM_XFLIP | OAM_YFLIP + db -48, -32, 20, OAM_XFLIP | OAM_YFLIP + db -56, -28, 22, OAM_XFLIP | OAM_YFLIP + db -56, -20, 21, OAM_XFLIP | OAM_YFLIP + db -48, -16, 18, OAM_XFLIP | OAM_YFLIP + db -48, -24, 19, OAM_XFLIP | OAM_YFLIP + db -40, -24, 16, OAM_XFLIP | OAM_YFLIP + db -40, -16, 15, OAM_XFLIP | OAM_YFLIP + db -56, -8, 23, OAM_XFLIP | OAM_YFLIP .data_abb38 db 13 ; size - db 1, -8, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -7, -8, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 1, -16, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -7, -16, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -24, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -24, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, -24, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -1, -32, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -1, -40, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -9, -40, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -17, -40, 12, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -17, -32, 11, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -9, -32, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 1, -8, 0, OAM_XFLIP | OAM_YFLIP + db -7, -8, 5, OAM_XFLIP | OAM_YFLIP + db 1, -16, 1, OAM_XFLIP | OAM_YFLIP + db -7, -16, 6, OAM_XFLIP | OAM_YFLIP + db 0, -24, 2, OAM_XFLIP | OAM_YFLIP + db -8, -24, 7, OAM_XFLIP | OAM_YFLIP + db -16, -24, 10, OAM_XFLIP | OAM_YFLIP + db -1, -32, 3, OAM_XFLIP | OAM_YFLIP + db -1, -40, 4, OAM_XFLIP | OAM_YFLIP + db -9, -40, 9, OAM_XFLIP | OAM_YFLIP + db -17, -40, 12, OAM_XFLIP | OAM_YFLIP + db -17, -32, 11, OAM_XFLIP | OAM_YFLIP + db -9, -32, 8, OAM_XFLIP | OAM_YFLIP .data_abb6d db 11 ; size @@ -4229,8 +4229,8 @@ AnimFrameTable33:: db 12, -56, 2, $0 db 16, 40, 1, $0 db 12, 56, 2, $0 - db -2, 0, 0, (1 << OAM_Y_FLIP) - db 1, 24, 0, (1 << OAM_Y_FLIP) + db -2, 0, 0, OAM_YFLIP + db 1, 24, 0, OAM_YFLIP .data_abd99 db 16 ; size @@ -4244,12 +4244,12 @@ AnimFrameTable33:: db 0, -56, 0, $0 db 8, 40, 2, $0 db 0, 56, 0, $0 - db 8, -56, 0, (1 << OAM_Y_FLIP) - db -9, -24, 0, (1 << OAM_Y_FLIP) - db -18, 0, 0, (1 << OAM_Y_FLIP) - db -16, 24, 0, (1 << OAM_Y_FLIP) - db 1, 16, 0, (1 << OAM_Y_FLIP) - db 8, 56, 0, (1 << OAM_Y_FLIP) + db 8, -56, 0, OAM_YFLIP + db -9, -24, 0, OAM_YFLIP + db -18, 0, 0, OAM_YFLIP + db -16, 24, 0, OAM_YFLIP + db 1, 16, 0, OAM_YFLIP + db 8, 56, 0, OAM_YFLIP .data_abdda db 18 ; size @@ -4263,14 +4263,14 @@ AnimFrameTable33:: db -8, 40, 0, $0 db -16, -56, 0, $0 db -8, 56, 0, $0 - db -8, -56, 0, (1 << OAM_Y_FLIP) - db -19, -24, 0, (1 << OAM_Y_FLIP) - db -4, -8, 0, (1 << OAM_Y_FLIP) - db -42, 0, 0, (1 << OAM_Y_FLIP) - db -13, 16, 0, (1 << OAM_Y_FLIP) - db -26, 24, 0, (1 << OAM_Y_FLIP) - db 0, 40, 0, (1 << OAM_Y_FLIP) - db 0, 56, 0, (1 << OAM_Y_FLIP) + db -8, -56, 0, OAM_YFLIP + db -19, -24, 0, OAM_YFLIP + db -4, -8, 0, OAM_YFLIP + db -42, 0, 0, OAM_YFLIP + db -13, 16, 0, OAM_YFLIP + db -26, 24, 0, OAM_YFLIP + db 0, 40, 0, OAM_YFLIP + db 0, 56, 0, OAM_YFLIP .data_abe23 db 16 ; size @@ -4282,14 +4282,14 @@ AnimFrameTable33:: db -40, -56, 0, $0 db -40, 56, 0, $0 db -64, 16, 0, $0 - db -32, -56, 0, (1 << OAM_Y_FLIP) - db -11, -32, 0, (1 << OAM_Y_FLIP) - db -43, -24, 0, (1 << OAM_Y_FLIP) - db -24, -8, 0, (1 << OAM_Y_FLIP) - db -1, 8, 0, (1 << OAM_Y_FLIP) - db -56, 16, 0, (1 << OAM_Y_FLIP) - db -21, 40, 0, (1 << OAM_Y_FLIP) - db -32, 56, 0, (1 << OAM_Y_FLIP) + db -32, -56, 0, OAM_YFLIP + db -11, -32, 0, OAM_YFLIP + db -43, -24, 0, OAM_YFLIP + db -24, -8, 0, OAM_YFLIP + db -1, 8, 0, OAM_YFLIP + db -56, 16, 0, OAM_YFLIP + db -21, 40, 0, OAM_YFLIP + db -32, 56, 0, OAM_YFLIP .data_abe64 db 12 ; size @@ -4297,21 +4297,21 @@ AnimFrameTable33:: db -48, -32, 0, $0 db -64, -8, 0, $0 db -61, 40, 0, $0 - db -40, -32, 0, (1 << OAM_Y_FLIP) - db -56, -8, 0, (1 << OAM_Y_FLIP) - db -24, 8, 0, (1 << OAM_Y_FLIP) - db -53, 40, 0, (1 << OAM_Y_FLIP) + db -40, -32, 0, OAM_YFLIP + db -56, -8, 0, OAM_YFLIP + db -24, 8, 0, OAM_YFLIP + db -53, 40, 0, OAM_YFLIP db -80, -56, 0, $0 - db -72, -56, 0, (1 << OAM_Y_FLIP) + db -72, -56, 0, OAM_YFLIP db -80, 56, 0, $0 - db -72, 56, 0, (1 << OAM_Y_FLIP) + db -72, 56, 0, OAM_YFLIP .data_abe95 db 4 ; size db -64, 0, 0, $0 - db -56, 0, 0, (1 << OAM_Y_FLIP) + db -56, 0, 0, OAM_YFLIP db -80, -32, 0, $0 - db -72, -32, 0, (1 << OAM_Y_FLIP) + db -72, -32, 0, OAM_YFLIP AnimData106:: frame_table AnimFrameTable34 @@ -4351,49 +4351,49 @@ AnimFrameTable34:: db 4 ; size db -11, -8, 0, $0 db -3, -8, 1, $0 - db -11, 0, 0, (1 << OAM_X_FLIP) - db -3, 0, 1, (1 << OAM_X_FLIP) + db -11, 0, 0, OAM_XFLIP + db -3, 0, 1, OAM_XFLIP .data_abf1c db 4 ; size db -11, -8, 2, $0 db -3, -8, 3, $0 - db -11, 0, 2, (1 << OAM_X_FLIP) - db -3, 0, 3, (1 << OAM_X_FLIP) + db -11, 0, 2, OAM_XFLIP + db -3, 0, 3, OAM_XFLIP .data_abf2d db 4 ; size db -11, -8, 4, $0 db -3, -8, 5, $0 - db -11, 0, 4, (1 << OAM_X_FLIP) - db -3, 0, 5, (1 << OAM_X_FLIP) + db -11, 0, 4, OAM_XFLIP + db -3, 0, 5, OAM_XFLIP .data_abf3e db 6 ; size db -19, -8, 6, $0 db -11, -8, 7, $0 db -3, -8, 8, $0 - db -19, 0, 6, (1 << OAM_X_FLIP) - db -11, 0, 7, (1 << OAM_X_FLIP) - db -3, 0, 8, (1 << OAM_X_FLIP) + db -19, 0, 6, OAM_XFLIP + db -11, 0, 7, OAM_XFLIP + db -3, 0, 8, OAM_XFLIP .data_abf57 db 6 ; size db -20, -8, 9, $0 db -12, -8, 10, $0 db -4, -8, 11, $0 - db -20, 0, 9, (1 << OAM_X_FLIP) - db -12, 0, 10, (1 << OAM_X_FLIP) - db -4, 0, 11, (1 << OAM_X_FLIP) + db -20, 0, 9, OAM_XFLIP + db -12, 0, 10, OAM_XFLIP + db -4, 0, 11, OAM_XFLIP .data_abf70 db 6 ; size db -19, -8, 12, $0 db -11, -8, 13, $0 db -3, -8, 14, $0 - db -19, 0, 12, (1 << OAM_X_FLIP) - db -11, 0, 13, (1 << OAM_X_FLIP) - db -3, 0, 14, (1 << OAM_X_FLIP) + db -19, 0, 12, OAM_XFLIP + db -11, 0, 13, OAM_XFLIP + db -3, 0, 14, OAM_XFLIP .data_abf89 db 8 ; size @@ -4401,10 +4401,10 @@ AnimFrameTable34:: db -19, -8, 16, $0 db -11, -8, 17, $0 db -3, -8, 18, $0 - db -27, 0, 15, (1 << OAM_X_FLIP) - db -19, 0, 16, (1 << OAM_X_FLIP) - db -11, 0, 17, (1 << OAM_X_FLIP) - db -3, 0, 18, (1 << OAM_X_FLIP) + db -27, 0, 15, OAM_XFLIP + db -19, 0, 16, OAM_XFLIP + db -11, 0, 17, OAM_XFLIP + db -3, 0, 18, OAM_XFLIP .data_abfaa db 8 ; size @@ -4412,10 +4412,10 @@ AnimFrameTable34:: db -19, -8, 20, $0 db -11, -8, 21, $0 db -3, -8, 22, $0 - db -19, 0, 20, (1 << OAM_X_FLIP) - db -11, 0, 21, (1 << OAM_X_FLIP) - db -3, 0, 22, (1 << OAM_X_FLIP) - db -29, 0, 19, (1 << OAM_X_FLIP) + db -19, 0, 20, OAM_XFLIP + db -11, 0, 21, OAM_XFLIP + db -3, 0, 22, OAM_XFLIP + db -29, 0, 19, OAM_XFLIP .data_abfcb db 8 ; size @@ -4423,10 +4423,10 @@ AnimFrameTable34:: db -19, -8, 24, $0 db -11, -8, 25, $0 db -3, -8, 26, $0 - db -27, 0, 23, (1 << OAM_X_FLIP) - db -19, 0, 24, (1 << OAM_X_FLIP) - db -11, 0, 25, (1 << OAM_X_FLIP) - db -3, 0, 26, (1 << OAM_X_FLIP) + db -27, 0, 23, OAM_XFLIP + db -19, 0, 24, OAM_XFLIP + db -11, 0, 25, OAM_XFLIP + db -3, 0, 26, OAM_XFLIP AnimData149:: frame_table AnimFrameTable71 diff --git a/src/data/duel/animations/anims2.asm b/src/data/duel/animations/anims2.asm index 0862eab..eec45b0 100644 --- a/src/data/duel/animations/anims2.asm +++ b/src/data/duel/animations/anims2.asm @@ -63,9 +63,9 @@ AnimFrameTable32:: db -24, 8, 22, $0 db -16, 8, 24, $0 db -16, 0, 23, $0 - db -16, -8, 23, (1 << OAM_X_FLIP) - db -24, -16, 22, (1 << OAM_X_FLIP) - db -16, -16, 24, (1 << OAM_X_FLIP) + db -16, -8, 23, OAM_XFLIP + db -24, -16, 22, OAM_XFLIP + db -16, -16, 24, OAM_XFLIP .data_ac0c8 db 20 ; size @@ -86,31 +86,31 @@ AnimFrameTable32:: db -16, 12, 66, $0 db -9, -12, 67, $0 db -8, -4, 68, $0 - db -9, 4, 67, (1 << OAM_X_FLIP) + db -9, 4, 67, OAM_XFLIP db -1, -12, 69, $0 - db -1, 4, 69, (1 << OAM_X_FLIP) + db -1, 4, 69, OAM_XFLIP .data_ac119 db 20 ; size - db -32, 12, 52, (1 << OAM_X_FLIP) - db -33, 4, 53, (1 << OAM_X_FLIP) + db -32, 12, 52, OAM_XFLIP + db -33, 4, 53, OAM_XFLIP db -32, -4, 70, $0 - db -33, -12, 55, (1 << OAM_X_FLIP) - db -32, -20, 56, (1 << OAM_X_FLIP) - db -24, 12, 57, (1 << OAM_X_FLIP) + db -33, -12, 55, OAM_XFLIP + db -32, -20, 56, OAM_XFLIP + db -24, 12, 57, OAM_XFLIP db -25, 4, 72, $0 db -24, -4, 59, $0 db -25, -12, 71, $0 - db -24, -20, 61, (1 << OAM_X_FLIP) - db -16, 12, 62, (1 << OAM_X_FLIP) - db -17, 4, 63, (1 << OAM_X_FLIP) + db -24, -20, 61, OAM_XFLIP + db -16, 12, 62, OAM_XFLIP + db -17, 4, 63, OAM_XFLIP db -16, -4, 64, $0 - db -17, -12, 65, (1 << OAM_X_FLIP) - db -16, -20, 66, (1 << OAM_X_FLIP) - db -9, 4, 67, (1 << OAM_X_FLIP) + db -17, -12, 65, OAM_XFLIP + db -16, -20, 66, OAM_XFLIP + db -9, 4, 67, OAM_XFLIP db -8, -4, 68, $0 db -9, -12, 67, $0 - db -1, 4, 69, (1 << OAM_X_FLIP) + db -1, 4, 69, OAM_XFLIP db -1, -12, 69, $0 .data_ac16a @@ -135,34 +135,34 @@ AnimFrameTable32:: db -16, 12, 66, $0 db -9, -12, 67, $0 db -8, -4, 68, $0 - db -9, 4, 67, (1 << OAM_X_FLIP) + db -9, 4, 67, OAM_XFLIP db -1, -12, 69, $0 - db -1, 4, 69, (1 << OAM_X_FLIP) + db -1, 4, 69, OAM_XFLIP .data_ac1c7 db 23 ; size db -38, -10, 73, $0 db -38, -2, 74, $0 db -30, -2, 75, $0 - db -32, 12, 52, (1 << OAM_X_FLIP) - db -33, 4, 53, (1 << OAM_X_FLIP) + db -32, 12, 52, OAM_XFLIP + db -33, 4, 53, OAM_XFLIP db -32, -4, 70, $0 - db -33, -12, 55, (1 << OAM_X_FLIP) - db -32, -20, 56, (1 << OAM_X_FLIP) - db -24, 12, 57, (1 << OAM_X_FLIP) + db -33, -12, 55, OAM_XFLIP + db -32, -20, 56, OAM_XFLIP + db -24, 12, 57, OAM_XFLIP db -25, 4, 72, $0 db -24, -4, 59, $0 db -25, -12, 71, $0 - db -24, -20, 61, (1 << OAM_X_FLIP) - db -16, 12, 62, (1 << OAM_X_FLIP) - db -17, 4, 63, (1 << OAM_X_FLIP) + db -24, -20, 61, OAM_XFLIP + db -16, 12, 62, OAM_XFLIP + db -17, 4, 63, OAM_XFLIP db -16, -4, 64, $0 - db -17, -12, 65, (1 << OAM_X_FLIP) - db -16, -20, 66, (1 << OAM_X_FLIP) - db -9, 4, 67, (1 << OAM_X_FLIP) + db -17, -12, 65, OAM_XFLIP + db -16, -20, 66, OAM_XFLIP + db -9, 4, 67, OAM_XFLIP db -8, -4, 68, $0 db -9, -12, 67, $0 - db -1, 4, 69, (1 << OAM_X_FLIP) + db -1, 4, 69, OAM_XFLIP db -1, -12, 69, $0 .data_ac224 @@ -187,34 +187,34 @@ AnimFrameTable32:: db -16, 12, 66, $0 db -9, -12, 67, $0 db -8, -4, 68, $0 - db -9, 4, 67, (1 << OAM_X_FLIP) + db -9, 4, 67, OAM_XFLIP db -1, -12, 69, $0 - db -1, 4, 69, (1 << OAM_X_FLIP) + db -1, 4, 69, OAM_XFLIP .data_ac281 db 23 ; size db -46, -2, 73, $0 db -46, 6, 74, $0 db -38, 6, 75, $0 - db -32, 12, 52, (1 << OAM_X_FLIP) - db -33, 4, 53, (1 << OAM_X_FLIP) + db -32, 12, 52, OAM_XFLIP + db -33, 4, 53, OAM_XFLIP db -32, -4, 70, $0 - db -33, -12, 55, (1 << OAM_X_FLIP) - db -32, -20, 56, (1 << OAM_X_FLIP) - db -24, 12, 57, (1 << OAM_X_FLIP) + db -33, -12, 55, OAM_XFLIP + db -32, -20, 56, OAM_XFLIP + db -24, 12, 57, OAM_XFLIP db -25, 4, 72, $0 db -24, -4, 59, $0 db -25, -12, 71, $0 - db -24, -20, 61, (1 << OAM_X_FLIP) - db -16, 12, 62, (1 << OAM_X_FLIP) - db -17, 4, 63, (1 << OAM_X_FLIP) + db -24, -20, 61, OAM_XFLIP + db -16, 12, 62, OAM_XFLIP + db -17, 4, 63, OAM_XFLIP db -16, -4, 64, $0 - db -17, -12, 65, (1 << OAM_X_FLIP) - db -16, -20, 66, (1 << OAM_X_FLIP) - db -9, 4, 67, (1 << OAM_X_FLIP) + db -17, -12, 65, OAM_XFLIP + db -16, -20, 66, OAM_XFLIP + db -9, 4, 67, OAM_XFLIP db -8, -4, 68, $0 db -9, -12, 67, $0 - db -1, 4, 69, (1 << OAM_X_FLIP) + db -1, 4, 69, OAM_XFLIP db -1, -12, 69, $0 .data_ac2de @@ -239,34 +239,34 @@ AnimFrameTable32:: db -16, 12, 66, $0 db -9, -12, 67, $0 db -8, -4, 68, $0 - db -9, 4, 67, (1 << OAM_X_FLIP) + db -9, 4, 67, OAM_XFLIP db -1, -12, 69, $0 - db -1, 4, 69, (1 << OAM_X_FLIP) + db -1, 4, 69, OAM_XFLIP .data_ac33b db 23 ; size db -38, 30, 73, $0 db -38, 38, 74, $0 db -30, 38, 75, $0 - db -32, 12, 52, (1 << OAM_X_FLIP) - db -33, 4, 53, (1 << OAM_X_FLIP) + db -32, 12, 52, OAM_XFLIP + db -33, 4, 53, OAM_XFLIP db -32, -4, 70, $0 - db -33, -12, 55, (1 << OAM_X_FLIP) - db -32, -20, 56, (1 << OAM_X_FLIP) - db -24, 12, 57, (1 << OAM_X_FLIP) + db -33, -12, 55, OAM_XFLIP + db -32, -20, 56, OAM_XFLIP + db -24, 12, 57, OAM_XFLIP db -25, 4, 72, $0 db -24, -4, 59, $0 db -25, -12, 71, $0 - db -24, -20, 61, (1 << OAM_X_FLIP) - db -16, 12, 62, (1 << OAM_X_FLIP) - db -17, 4, 63, (1 << OAM_X_FLIP) + db -24, -20, 61, OAM_XFLIP + db -16, 12, 62, OAM_XFLIP + db -17, 4, 63, OAM_XFLIP db -16, -4, 64, $0 - db -17, -12, 65, (1 << OAM_X_FLIP) - db -16, -20, 66, (1 << OAM_X_FLIP) - db -9, 4, 67, (1 << OAM_X_FLIP) + db -17, -12, 65, OAM_XFLIP + db -16, -20, 66, OAM_XFLIP + db -9, 4, 67, OAM_XFLIP db -8, -4, 68, $0 db -9, -12, 67, $0 - db -1, 4, 69, (1 << OAM_X_FLIP) + db -1, 4, 69, OAM_XFLIP db -1, -12, 69, $0 .data_ac398 @@ -291,34 +291,34 @@ AnimFrameTable32:: db -16, 12, 66, $0 db -9, -12, 67, $0 db -8, -4, 68, $0 - db -9, 4, 67, (1 << OAM_X_FLIP) + db -9, 4, 67, OAM_XFLIP db -1, -12, 69, $0 - db -1, 4, 69, (1 << OAM_X_FLIP) + db -1, 4, 69, OAM_XFLIP .data_ac3f5 db 23 ; size db -54, -18, 73, $0 db -54, -10, 74, $0 db -46, -10, 75, $0 - db -32, 12, 52, (1 << OAM_X_FLIP) - db -33, 4, 53, (1 << OAM_X_FLIP) + db -32, 12, 52, OAM_XFLIP + db -33, 4, 53, OAM_XFLIP db -32, -4, 70, $0 - db -33, -12, 55, (1 << OAM_X_FLIP) - db -32, -20, 56, (1 << OAM_X_FLIP) - db -24, 12, 57, (1 << OAM_X_FLIP) + db -33, -12, 55, OAM_XFLIP + db -32, -20, 56, OAM_XFLIP + db -24, 12, 57, OAM_XFLIP db -25, 4, 72, $0 db -24, -4, 59, $0 db -25, -12, 71, $0 - db -24, -20, 61, (1 << OAM_X_FLIP) - db -16, 12, 62, (1 << OAM_X_FLIP) - db -17, 4, 63, (1 << OAM_X_FLIP) + db -24, -20, 61, OAM_XFLIP + db -16, 12, 62, OAM_XFLIP + db -17, 4, 63, OAM_XFLIP db -16, -4, 64, $0 - db -17, -12, 65, (1 << OAM_X_FLIP) - db -16, -20, 66, (1 << OAM_X_FLIP) - db -9, 4, 67, (1 << OAM_X_FLIP) + db -17, -12, 65, OAM_XFLIP + db -16, -20, 66, OAM_XFLIP + db -9, 4, 67, OAM_XFLIP db -8, -4, 68, $0 db -9, -12, 67, $0 - db -1, 4, 69, (1 << OAM_X_FLIP) + db -1, 4, 69, OAM_XFLIP db -1, -12, 69, $0 .data_ac452 @@ -343,34 +343,34 @@ AnimFrameTable32:: db -16, 12, 66, $0 db -9, -12, 67, $0 db -8, -4, 68, $0 - db -9, 4, 67, (1 << OAM_X_FLIP) + db -9, 4, 67, OAM_XFLIP db -1, -12, 69, $0 - db -1, 4, 69, (1 << OAM_X_FLIP) + db -1, 4, 69, OAM_XFLIP .data_ac4af db 23 ; size db -54, -50, 73, $0 db -54, -42, 74, $0 db -46, -42, 75, $0 - db -32, 12, 52, (1 << OAM_X_FLIP) - db -33, 4, 53, (1 << OAM_X_FLIP) + db -32, 12, 52, OAM_XFLIP + db -33, 4, 53, OAM_XFLIP db -32, -4, 70, $0 - db -33, -12, 55, (1 << OAM_X_FLIP) - db -32, -20, 56, (1 << OAM_X_FLIP) - db -24, 12, 57, (1 << OAM_X_FLIP) + db -33, -12, 55, OAM_XFLIP + db -32, -20, 56, OAM_XFLIP + db -24, 12, 57, OAM_XFLIP db -25, 4, 72, $0 db -24, -4, 59, $0 db -25, -12, 71, $0 - db -24, -20, 61, (1 << OAM_X_FLIP) - db -16, 12, 62, (1 << OAM_X_FLIP) - db -17, 4, 63, (1 << OAM_X_FLIP) + db -24, -20, 61, OAM_XFLIP + db -16, 12, 62, OAM_XFLIP + db -17, 4, 63, OAM_XFLIP db -16, -4, 64, $0 - db -17, -12, 65, (1 << OAM_X_FLIP) - db -16, -20, 66, (1 << OAM_X_FLIP) - db -9, 4, 67, (1 << OAM_X_FLIP) + db -17, -12, 65, OAM_XFLIP + db -16, -20, 66, OAM_XFLIP + db -9, 4, 67, OAM_XFLIP db -8, -4, 68, $0 db -9, -12, 67, $0 - db -1, 4, 69, (1 << OAM_X_FLIP) + db -1, 4, 69, OAM_XFLIP db -1, -12, 69, $0 .data_ac50c @@ -395,34 +395,34 @@ AnimFrameTable32:: db -16, 12, 66, $0 db -9, -12, 67, $0 db -8, -4, 68, $0 - db -9, 4, 67, (1 << OAM_X_FLIP) + db -9, 4, 67, OAM_XFLIP db -1, -12, 69, $0 - db -1, 4, 69, (1 << OAM_X_FLIP) + db -1, 4, 69, OAM_XFLIP .data_ac569 db 23 ; size db -38, -74, 73, $0 db -38, -66, 74, $0 db -30, -66, 75, $0 - db -32, 12, 52, (1 << OAM_X_FLIP) - db -33, 4, 53, (1 << OAM_X_FLIP) + db -32, 12, 52, OAM_XFLIP + db -33, 4, 53, OAM_XFLIP db -32, -4, 70, $0 - db -33, -12, 55, (1 << OAM_X_FLIP) - db -32, -20, 56, (1 << OAM_X_FLIP) - db -24, 12, 57, (1 << OAM_X_FLIP) + db -33, -12, 55, OAM_XFLIP + db -32, -20, 56, OAM_XFLIP + db -24, 12, 57, OAM_XFLIP db -25, 4, 72, $0 db -24, -4, 59, $0 db -25, -12, 71, $0 - db -24, -20, 61, (1 << OAM_X_FLIP) - db -16, 12, 62, (1 << OAM_X_FLIP) - db -17, 4, 63, (1 << OAM_X_FLIP) + db -24, -20, 61, OAM_XFLIP + db -16, 12, 62, OAM_XFLIP + db -17, 4, 63, OAM_XFLIP db -16, -4, 64, $0 - db -17, -12, 65, (1 << OAM_X_FLIP) - db -16, -20, 66, (1 << OAM_X_FLIP) - db -9, 4, 67, (1 << OAM_X_FLIP) + db -17, -12, 65, OAM_XFLIP + db -16, -20, 66, OAM_XFLIP + db -9, 4, 67, OAM_XFLIP db -8, -4, 68, $0 db -9, -12, 67, $0 - db -1, 4, 69, (1 << OAM_X_FLIP) + db -1, 4, 69, OAM_XFLIP db -1, -12, 69, $0 .data_ac5c6 @@ -447,9 +447,9 @@ AnimFrameTable32:: db -16, 12, 66, $0 db -9, -12, 67, $0 db -8, -4, 68, $0 - db -9, 4, 67, (1 << OAM_X_FLIP) + db -9, 4, 67, OAM_XFLIP db -1, -12, 69, $0 - db -1, 4, 69, (1 << OAM_X_FLIP) + db -1, 4, 69, OAM_XFLIP .data_ac623 db 12 ; size @@ -459,21 +459,21 @@ AnimFrameTable32:: db 8, -24, 4, $0 db 16, -32, 6, $0 db 16, -24, 7, $0 - db 0, 16, 11, (1 << OAM_X_FLIP) - db 0, 24, 10, (1 << OAM_X_FLIP) - db 8, 24, 13, (1 << OAM_X_FLIP) - db 8, 16, 14, (1 << OAM_X_FLIP) - db 16, 16, 17, (1 << OAM_X_FLIP) - db 16, 24, 16, (1 << OAM_X_FLIP) + db 0, 16, 11, OAM_XFLIP + db 0, 24, 10, OAM_XFLIP + db 8, 24, 13, OAM_XFLIP + db 8, 16, 14, OAM_XFLIP + db 16, 16, 17, OAM_XFLIP + db 16, 24, 16, OAM_XFLIP .data_ac654 db 12 ; size - db 0, 24, 0, (1 << OAM_X_FLIP) - db 0, 16, 1, (1 << OAM_X_FLIP) - db 8, 24, 3, (1 << OAM_X_FLIP) - db 8, 16, 4, (1 << OAM_X_FLIP) - db 16, 24, 6, (1 << OAM_X_FLIP) - db 16, 16, 7, (1 << OAM_X_FLIP) + db 0, 24, 0, OAM_XFLIP + db 0, 16, 1, OAM_XFLIP + db 8, 24, 3, OAM_XFLIP + db 8, 16, 4, OAM_XFLIP + db 16, 24, 6, OAM_XFLIP + db 16, 16, 7, OAM_XFLIP db 0, -24, 11, $0 db 0, -32, 10, $0 db 8, -32, 13, $0 @@ -493,28 +493,28 @@ AnimFrameTable32:: db 8, -16, 7, $0 db 16, -32, 8, $0 db 16, -24, 9, $0 - db -8, 8, 11, (1 << OAM_X_FLIP) - db -8, 16, 10, (1 << OAM_X_FLIP) - db 0, 24, 10, (1 << OAM_X_FLIP) - db 0, 16, 13, (1 << OAM_X_FLIP) - db 0, 8, 14, (1 << OAM_X_FLIP) - db 8, 8, 17, (1 << OAM_X_FLIP) - db 8, 16, 16, (1 << OAM_X_FLIP) - db 8, 24, 15, (1 << OAM_X_FLIP) - db 16, 24, 18, (1 << OAM_X_FLIP) + db -8, 8, 11, OAM_XFLIP + db -8, 16, 10, OAM_XFLIP + db 0, 24, 10, OAM_XFLIP + db 0, 16, 13, OAM_XFLIP + db 0, 8, 14, OAM_XFLIP + db 8, 8, 17, OAM_XFLIP + db 8, 16, 16, OAM_XFLIP + db 8, 24, 15, OAM_XFLIP + db 16, 24, 18, OAM_XFLIP .data_ac6d2 db 19 ; size - db -8, 16, 0, (1 << OAM_X_FLIP) - db -8, 8, 1, (1 << OAM_X_FLIP) - db 0, 24, 2, (1 << OAM_X_FLIP) - db 0, 16, 3, (1 << OAM_X_FLIP) - db 0, 8, 4, (1 << OAM_X_FLIP) - db 8, 24, 5, (1 << OAM_X_FLIP) - db 8, 16, 6, (1 << OAM_X_FLIP) - db 8, 8, 7, (1 << OAM_X_FLIP) - db 16, 24, 8, (1 << OAM_X_FLIP) - db 16, 16, 9, (1 << OAM_X_FLIP) + db -8, 16, 0, OAM_XFLIP + db -8, 8, 1, OAM_XFLIP + db 0, 24, 2, OAM_XFLIP + db 0, 16, 3, OAM_XFLIP + db 0, 8, 4, OAM_XFLIP + db 8, 24, 5, OAM_XFLIP + db 8, 16, 6, OAM_XFLIP + db 8, 8, 7, OAM_XFLIP + db 16, 24, 8, OAM_XFLIP + db 16, 16, 9, OAM_XFLIP db -8, -16, 11, $0 db -8, -24, 10, $0 db 0, -32, 10, $0 @@ -537,15 +537,15 @@ AnimFrameTable32:: db 8, -16, 7, $0 db 16, -32, 8, $0 db 16, -24, 9, $0 - db -8, 8, 11, (1 << OAM_X_FLIP) - db -8, 16, 10, (1 << OAM_X_FLIP) - db 0, 24, 10, (1 << OAM_X_FLIP) - db 0, 16, 13, (1 << OAM_X_FLIP) - db 0, 8, 14, (1 << OAM_X_FLIP) - db 8, 8, 17, (1 << OAM_X_FLIP) - db 8, 16, 16, (1 << OAM_X_FLIP) - db 8, 24, 15, (1 << OAM_X_FLIP) - db 16, 24, 18, (1 << OAM_X_FLIP) + db -8, 8, 11, OAM_XFLIP + db -8, 16, 10, OAM_XFLIP + db 0, 24, 10, OAM_XFLIP + db 0, 16, 13, OAM_XFLIP + db 0, 8, 14, OAM_XFLIP + db 8, 8, 17, OAM_XFLIP + db 8, 16, 16, OAM_XFLIP + db 8, 24, 15, OAM_XFLIP + db 16, 24, 18, OAM_XFLIP db -8, -8, 25, $0 db -8, 0, 26, $0 db -8, 8, 27, $0 @@ -555,7 +555,7 @@ AnimFrameTable32:: db 8, -8, 31, $0 db 0, -8, 28, $0 db 0, 0, 29, $0 - db 16, 16, 19, (1 << OAM_X_FLIP) + db 16, 16, 19, OAM_XFLIP .data_ac794 db 9 ; size @@ -647,27 +647,27 @@ AnimFrameTable35:: db -24, 0, 4, $0 db -16, 8, 5, $0 db -24, 8, 6, $0 - db -8, -24, 0, (1 << OAM_Y_FLIP) - db -8, -16, 1, (1 << OAM_Y_FLIP) - db -16, -24, 2, (1 << OAM_Y_FLIP) - db -16, -16, 0, (1 << OAM_Y_FLIP) - db -16, -8, 1, (1 << OAM_Y_FLIP) - db -24, -16, 2, (1 << OAM_Y_FLIP) - db -24, -8, 3, (1 << OAM_Y_FLIP) + db -8, -24, 0, OAM_YFLIP + db -8, -16, 1, OAM_YFLIP + db -16, -24, 2, OAM_YFLIP + db -16, -16, 0, OAM_YFLIP + db -16, -8, 1, OAM_YFLIP + db -24, -16, 2, OAM_YFLIP + db -24, -8, 3, OAM_YFLIP .data_ac8bc db 11 ; size db -24, -16, 4, $0 db -24, -32, 5, $0 db -32, -24, 6, $0 - db -8, -16, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -24, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, -16, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, -24, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -16, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -24, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -16, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -24, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, -16, 0, OAM_XFLIP | OAM_YFLIP + db -8, -24, 1, OAM_XFLIP | OAM_YFLIP + db -16, -16, 2, OAM_XFLIP | OAM_YFLIP + db -16, -24, 3, OAM_XFLIP | OAM_YFLIP + db 8, -16, 0, OAM_XFLIP | OAM_YFLIP + db 8, -24, 1, OAM_XFLIP | OAM_YFLIP + db 0, -16, 2, OAM_XFLIP | OAM_YFLIP + db 0, -24, 3, OAM_XFLIP | OAM_YFLIP .data_ac8e9 db 10 ; size @@ -677,41 +677,41 @@ AnimFrameTable35:: db -8, -24, 4, $0 db -8, -32, 6, $0 db -24, -24, 6, $0 - db 16, -8, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, -16, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -8, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -16, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 16, -8, 0, OAM_XFLIP | OAM_YFLIP + db 16, -16, 1, OAM_XFLIP | OAM_YFLIP + db 8, -8, 2, OAM_XFLIP | OAM_YFLIP + db 8, -16, 3, OAM_XFLIP | OAM_YFLIP .data_ac912 db 9 ; size - db 8, -24, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -16, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -24, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -16, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, -16, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, 0, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, -8, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, 0, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -8, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 8, -24, 5, OAM_XFLIP | OAM_YFLIP + db 0, -16, 6, OAM_XFLIP | OAM_YFLIP + db 0, -24, 4, OAM_XFLIP | OAM_YFLIP + db 8, -16, 4, OAM_XFLIP | OAM_YFLIP + db 16, -16, 6, OAM_XFLIP | OAM_YFLIP + db 16, 0, 0, OAM_XFLIP | OAM_YFLIP + db 16, -8, 1, OAM_XFLIP | OAM_YFLIP + db 8, 0, 2, OAM_XFLIP | OAM_YFLIP + db 8, -8, 3, OAM_XFLIP | OAM_YFLIP .data_ac937 db 10 ; size - db 16, -8, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -16, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, -16, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 16, 0, (1 << OAM_X_FLIP) - db 0, 8, 1, (1 << OAM_X_FLIP) - db 8, 16, 2, (1 << OAM_X_FLIP) - db 8, 8, 0, (1 << OAM_X_FLIP) - db 8, 0, 1, (1 << OAM_X_FLIP) - db 16, 8, 2, (1 << OAM_X_FLIP) - db 16, 0, 3, (1 << OAM_X_FLIP) + db 16, -8, 4, OAM_XFLIP | OAM_YFLIP + db 8, -16, 5, OAM_XFLIP | OAM_YFLIP + db 16, -16, 6, OAM_XFLIP | OAM_YFLIP + db 0, 16, 0, OAM_XFLIP + db 0, 8, 1, OAM_XFLIP + db 8, 16, 2, OAM_XFLIP + db 8, 8, 0, OAM_XFLIP + db 8, 0, 1, OAM_XFLIP + db 16, 8, 2, OAM_XFLIP + db 16, 0, 3, OAM_XFLIP .data_ac960 db 10 ; size - db 8, 16, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 24, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, 24, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 8, 16, 4, OAM_XFLIP | OAM_YFLIP + db 0, 24, 5, OAM_XFLIP | OAM_YFLIP + db 8, 24, 6, OAM_XFLIP | OAM_YFLIP db -16, 0, 0, $0 db -16, 8, 1, $0 db -8, 0, 2, $0 @@ -722,12 +722,12 @@ AnimFrameTable35:: .data_ac989 db 10 ; size - db -8, 16, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 8, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, 16, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 16, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 24, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, 16, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, 16, 6, OAM_XFLIP | OAM_YFLIP + db -8, 8, 5, OAM_XFLIP | OAM_YFLIP + db -16, 16, 4, OAM_XFLIP | OAM_YFLIP + db 0, 16, 4, OAM_XFLIP | OAM_YFLIP + db 0, 24, 6, OAM_XFLIP | OAM_YFLIP + db 16, 16, 6, OAM_XFLIP | OAM_YFLIP db -24, 0, 0, $0 db -24, 8, 1, $0 db -16, 0, 2, $0 @@ -735,17 +735,17 @@ AnimFrameTable35:: .data_ac9b2 db 12 ; size - db 16, -8, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 16, -8, 6, OAM_XFLIP | OAM_YFLIP db -8, -24, 6, $0 db 8, -8, 6, $0 db 0, -24, 5, $0 - db 0, 16, 0, (1 << OAM_X_FLIP) - db 0, 8, 1, (1 << OAM_X_FLIP) - db 8, 16, 2, (1 << OAM_X_FLIP) - db 8, 8, 0, (1 << OAM_X_FLIP) - db 8, 0, 1, (1 << OAM_X_FLIP) - db 16, 8, 2, (1 << OAM_X_FLIP) - db 16, 0, 3, (1 << OAM_X_FLIP) + db 0, 16, 0, OAM_XFLIP + db 0, 8, 1, OAM_XFLIP + db 8, 16, 2, OAM_XFLIP + db 8, 8, 0, OAM_XFLIP + db 8, 0, 1, OAM_XFLIP + db 16, 8, 2, OAM_XFLIP + db 16, 0, 3, OAM_XFLIP db 8, -16, 4, $0 .data_ac9e3 @@ -873,12 +873,12 @@ AnimFrameTable36:: .data_acb33 db 6 ; size - db 8, 28, 11, (1 << OAM_X_FLIP) - db -16, 4, 11, (1 << OAM_X_FLIP) - db -8, 28, 11, (1 << OAM_X_FLIP) - db 8, -12, 11, (1 << OAM_X_FLIP) - db 0, 12, 11, (1 << OAM_X_FLIP) - db 0, -4, 11, (1 << OAM_X_FLIP) + db 8, 28, 11, OAM_XFLIP + db -16, 4, 11, OAM_XFLIP + db -8, 28, 11, OAM_XFLIP + db 8, -12, 11, OAM_XFLIP + db 0, 12, 11, OAM_XFLIP + db 0, -4, 11, OAM_XFLIP AnimData109:: frame_table AnimFrameTable37 @@ -1321,175 +1321,175 @@ AnimFrameTable38:: .data_ad16b db 4 ; size db -26, -35, 0, $0 - db -26, 27, 0, (1 << OAM_X_FLIP) - db 18, 27, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 18, -35, 0, (1 << OAM_Y_FLIP) + db -26, 27, 0, OAM_XFLIP + db 18, 27, 0, OAM_XFLIP | OAM_YFLIP + db 18, -35, 0, OAM_YFLIP .data_ad17c db 4 ; size db -25, -34, 0, $0 - db -25, 26, 0, (1 << OAM_X_FLIP) - db 17, 26, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 17, -34, 0, (1 << OAM_Y_FLIP) + db -25, 26, 0, OAM_XFLIP + db 17, 26, 0, OAM_XFLIP | OAM_YFLIP + db 17, -34, 0, OAM_YFLIP .data_ad18d db 4 ; size db -24, -32, 1, $0 - db -24, 24, 1, (1 << OAM_X_FLIP) - db 16, 24, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, -32, 1, (1 << OAM_Y_FLIP) + db -24, 24, 1, OAM_XFLIP + db 16, 24, 1, OAM_XFLIP | OAM_YFLIP + db 16, -32, 1, OAM_YFLIP .data_ad19e db 4 ; size db -23, -28, 2, $0 - db -23, 20, 2, (1 << OAM_X_FLIP) - db 15, 20, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 15, -28, 2, (1 << OAM_Y_FLIP) + db -23, 20, 2, OAM_XFLIP + db 15, 20, 2, OAM_XFLIP | OAM_YFLIP + db 15, -28, 2, OAM_YFLIP .data_ad1af db 4 ; size db -20, -24, 3, $0 - db -20, 16, 3, (1 << OAM_X_FLIP) - db 12, 16, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 12, -24, 3, (1 << OAM_Y_FLIP) + db -20, 16, 3, OAM_XFLIP + db 12, 16, 3, OAM_XFLIP | OAM_YFLIP + db 12, -24, 3, OAM_YFLIP .data_ad1c0 db 8 ; size db -17, -21, 4, $0 - db -17, 13, 4, (1 << OAM_X_FLIP) - db 9, 13, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 9, -21, 4, (1 << OAM_Y_FLIP) + db -17, 13, 4, OAM_XFLIP + db 9, 13, 4, OAM_XFLIP | OAM_YFLIP + db 9, -21, 4, OAM_YFLIP db -17, -13, 5, $0 - db -17, 5, 5, (1 << OAM_X_FLIP) - db 9, 5, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 9, -13, 5, (1 << OAM_Y_FLIP) + db -17, 5, 5, OAM_XFLIP + db 9, 5, 5, OAM_XFLIP | OAM_YFLIP + db 9, -13, 5, OAM_YFLIP .data_ad1e1 db 12 ; size db -17, -24, 6, $0 - db -17, 16, 6, (1 << OAM_X_FLIP) - db 9, 16, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 9, -24, 6, (1 << OAM_Y_FLIP) + db -17, 16, 6, OAM_XFLIP + db 9, 16, 6, OAM_XFLIP | OAM_YFLIP + db 9, -24, 6, OAM_YFLIP db -17, -16, 7, $0 - db -17, 8, 7, (1 << OAM_X_FLIP) - db 9, 8, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 9, -16, 7, (1 << OAM_Y_FLIP) + db -17, 8, 7, OAM_XFLIP + db 9, 8, 7, OAM_XFLIP | OAM_YFLIP + db 9, -16, 7, OAM_YFLIP db -9, -16, 8, $0 - db -9, 8, 8, (1 << OAM_X_FLIP) - db 1, 8, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 1, -16, 8, (1 << OAM_Y_FLIP) + db -9, 8, 8, OAM_XFLIP + db 1, 8, 8, OAM_XFLIP | OAM_YFLIP + db 1, -16, 8, OAM_YFLIP .data_ad212 db 12 ; size db -16, -16, 9, $0 - db -16, 8, 9, (1 << OAM_X_FLIP) - db 8, 8, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -16, 9, (1 << OAM_Y_FLIP) + db -16, 8, 9, OAM_XFLIP + db 8, 8, 9, OAM_XFLIP | OAM_YFLIP + db 8, -16, 9, OAM_YFLIP db -16, -8, 10, $0 - db -16, 0, 10, (1 << OAM_X_FLIP) - db 8, 0, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -8, 10, (1 << OAM_Y_FLIP) + db -16, 0, 10, OAM_XFLIP + db 8, 0, 10, OAM_XFLIP | OAM_YFLIP + db 8, -8, 10, OAM_YFLIP db -8, -16, 11, $0 - db -8, 8, 11, (1 << OAM_X_FLIP) - db 0, 8, 11, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -16, 11, (1 << OAM_Y_FLIP) + db -8, 8, 11, OAM_XFLIP + db 0, 8, 11, OAM_XFLIP | OAM_YFLIP + db 0, -16, 11, OAM_YFLIP .data_ad243 db 12 ; size db -11, -12, 12, $0 db -3, -10, 8, $0 db -14, -4, 10, $0 - db -11, 4, 12, (1 << OAM_X_FLIP) - db 3, 4, 12, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 3, -12, 12, (1 << OAM_Y_FLIP) - db -14, -4, 10, (1 << OAM_X_FLIP) - db 6, -4, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 6, -4, 10, (1 << OAM_Y_FLIP) - db -3, 2, 8, (1 << OAM_X_FLIP) - db -5, 2, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -5, -10, 8, (1 << OAM_Y_FLIP) + db -11, 4, 12, OAM_XFLIP + db 3, 4, 12, OAM_XFLIP | OAM_YFLIP + db 3, -12, 12, OAM_YFLIP + db -14, -4, 10, OAM_XFLIP + db 6, -4, 10, OAM_XFLIP | OAM_YFLIP + db 6, -4, 10, OAM_YFLIP + db -3, 2, 8, OAM_XFLIP + db -5, 2, 8, OAM_XFLIP | OAM_YFLIP + db -5, -10, 8, OAM_YFLIP .data_ad274 db 8 ; size db -16, -4, 13, $0 - db 8, -4, 13, (1 << OAM_Y_FLIP) + db 8, -4, 13, OAM_YFLIP db -4, -16, 14, $0 - db -4, 8, 14, (1 << OAM_X_FLIP) + db -4, 8, 14, OAM_XFLIP db -8, -8, 15, $0 - db -8, 0, 15, (1 << OAM_X_FLIP) - db 0, 0, 15, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -8, 15, (1 << OAM_Y_FLIP) + db -8, 0, 15, OAM_XFLIP + db 0, 0, 15, OAM_XFLIP | OAM_YFLIP + db 0, -8, 15, OAM_YFLIP .data_ad295 db 4 ; size db -8, -8, 16, $0 - db -8, 0, 16, (1 << OAM_X_FLIP) - db 0, 0, 16, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -8, 16, (1 << OAM_Y_FLIP) + db -8, 0, 16, OAM_XFLIP + db 0, 0, 16, OAM_XFLIP | OAM_YFLIP + db 0, -8, 16, OAM_YFLIP .data_ad2a6 db 6 ; size db -8, -12, 17, $0 - db -8, 4, 17, (1 << OAM_X_FLIP) - db 0, 4, 17, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -12, 17, (1 << OAM_Y_FLIP) + db -8, 4, 17, OAM_XFLIP + db 0, 4, 17, OAM_XFLIP | OAM_YFLIP + db 0, -12, 17, OAM_YFLIP db -8, -4, 18, $0 - db 0, -4, 18, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, -4, 18, OAM_XFLIP | OAM_YFLIP .data_ad2bf db 8 ; size db -16, -4, 19, $0 - db 8, -4, 19, (1 << OAM_Y_FLIP) + db 8, -4, 19, OAM_YFLIP db -4, -16, 20, $0 - db -4, 8, 20, (1 << OAM_X_FLIP) + db -4, 8, 20, OAM_XFLIP db -8, -8, 21, $0 - db -8, 0, 21, (1 << OAM_X_FLIP) - db 0, 0, 21, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -8, 21, (1 << OAM_Y_FLIP) + db -8, 0, 21, OAM_XFLIP + db 0, 0, 21, OAM_XFLIP | OAM_YFLIP + db 0, -8, 21, OAM_YFLIP .data_ad2e0 db 8 ; size db -16, -4, 22, $0 - db 8, -4, 22, (1 << OAM_Y_FLIP) + db 8, -4, 22, OAM_YFLIP db -4, -16, 23, $0 - db -4, 8, 23, (1 << OAM_X_FLIP) + db -4, 8, 23, OAM_XFLIP db -8, -8, 24, $0 - db -8, 0, 24, (1 << OAM_X_FLIP) - db 0, 0, 24, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -8, 24, (1 << OAM_Y_FLIP) + db -8, 0, 24, OAM_XFLIP + db 0, 0, 24, OAM_XFLIP | OAM_YFLIP + db 0, -8, 24, OAM_YFLIP .data_ad301 db 8 ; size db -16, -4, 25, $0 - db 8, -4, 25, (1 << OAM_Y_FLIP) + db 8, -4, 25, OAM_YFLIP db -4, -16, 26, $0 - db -4, 8, 26, (1 << OAM_X_FLIP) + db -4, 8, 26, OAM_XFLIP db -8, -8, 27, $0 - db -8, 0, 27, (1 << OAM_X_FLIP) - db 0, 0, 27, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -8, 27, (1 << OAM_Y_FLIP) + db -8, 0, 27, OAM_XFLIP + db 0, 0, 27, OAM_XFLIP | OAM_YFLIP + db 0, -8, 27, OAM_YFLIP .data_ad322 db 8 ; size db -16, -4, 28, $0 - db 8, -4, 28, (1 << OAM_Y_FLIP) + db 8, -4, 28, OAM_YFLIP db -4, -16, 29, $0 - db -4, 8, 29, (1 << OAM_X_FLIP) + db -4, 8, 29, OAM_XFLIP db -8, -8, 30, $0 - db -8, 0, 30, (1 << OAM_X_FLIP) - db 0, 0, 30, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -8, 30, (1 << OAM_Y_FLIP) + db -8, 0, 30, OAM_XFLIP + db 0, 0, 30, OAM_XFLIP | OAM_YFLIP + db 0, -8, 30, OAM_YFLIP .data_ad343 db 8 ; size db -16, -4, 31, $0 - db 8, -4, 31, (1 << OAM_Y_FLIP) + db 8, -4, 31, OAM_YFLIP db -4, -16, 32, $0 - db -4, 8, 32, (1 << OAM_X_FLIP) + db -4, 8, 32, OAM_XFLIP db -8, -8, 33, $0 - db -8, 0, 33, (1 << OAM_X_FLIP) - db 0, 0, 33, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -8, 33, (1 << OAM_Y_FLIP) + db -8, 0, 33, OAM_XFLIP + db 0, 0, 33, OAM_XFLIP | OAM_YFLIP + db 0, -8, 33, OAM_YFLIP AnimData111:: frame_table AnimFrameTable39 @@ -1517,11 +1517,11 @@ AnimFrameTable39:: db -5, 16, 2, $0 db 3, 0, 3, $0 db 3, 8, 4, $0 - db -13, -24, 0, (1 << OAM_X_FLIP) - db -5, -16, 1, (1 << OAM_X_FLIP) - db -5, -24, 2, (1 << OAM_X_FLIP) - db 3, -8, 3, (1 << OAM_X_FLIP) - db 3, -16, 4, (1 << OAM_X_FLIP) + db -13, -24, 0, OAM_XFLIP + db -5, -16, 1, OAM_XFLIP + db -5, -24, 2, OAM_XFLIP + db 3, -8, 3, OAM_XFLIP + db 3, -16, 4, OAM_XFLIP .data_ad3bc db 10 ; size @@ -1530,11 +1530,11 @@ AnimFrameTable39:: db -5, 16, 6, $0 db 3, 8, 7, $0 db 3, 0, 3, $0 - db -13, -24, 0, (1 << OAM_X_FLIP) - db -5, -16, 5, (1 << OAM_X_FLIP) - db -5, -24, 6, (1 << OAM_X_FLIP) - db 3, -16, 7, (1 << OAM_X_FLIP) - db 3, -8, 3, (1 << OAM_X_FLIP) + db -13, -24, 0, OAM_XFLIP + db -5, -16, 5, OAM_XFLIP + db -5, -24, 6, OAM_XFLIP + db 3, -16, 7, OAM_XFLIP + db 3, -8, 3, OAM_XFLIP .data_ad3e5 db 10 ; size @@ -1543,11 +1543,11 @@ AnimFrameTable39:: db -4, 16, 10, $0 db 4, 1, 11, $0 db 4, 9, 12, $0 - db -12, -24, 8, (1 << OAM_X_FLIP) - db -4, -16, 9, (1 << OAM_X_FLIP) - db -4, -24, 10, (1 << OAM_X_FLIP) - db 4, -9, 11, (1 << OAM_X_FLIP) - db 4, -17, 12, (1 << OAM_X_FLIP) + db -12, -24, 8, OAM_XFLIP + db -4, -16, 9, OAM_XFLIP + db -4, -24, 10, OAM_XFLIP + db 4, -9, 11, OAM_XFLIP + db 4, -17, 12, OAM_XFLIP .data_ad40e db 12 ; size @@ -1557,12 +1557,12 @@ AnimFrameTable39:: db 3, 2, 16, $0 db 3, 10, 17, $0 db 3, 18, 18, $0 - db -13, -24, 13, (1 << OAM_X_FLIP) - db -5, -16, 14, (1 << OAM_X_FLIP) - db -5, -24, 15, (1 << OAM_X_FLIP) - db 3, -10, 16, (1 << OAM_X_FLIP) - db 3, -18, 17, (1 << OAM_X_FLIP) - db 3, -26, 18, (1 << OAM_X_FLIP) + db -13, -24, 13, OAM_XFLIP + db -5, -16, 14, OAM_XFLIP + db -5, -24, 15, OAM_XFLIP + db 3, -10, 16, OAM_XFLIP + db 3, -18, 17, OAM_XFLIP + db 3, -26, 18, OAM_XFLIP .data_ad43f db 16 ; size @@ -1572,16 +1572,16 @@ AnimFrameTable39:: db 4, 0, 22, $0 db 4, 8, 23, $0 db 4, 16, 24, $0 - db -4, 0, 18, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -12, 8, 18, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -12, -24, 19, (1 << OAM_X_FLIP) - db -4, -16, 20, (1 << OAM_X_FLIP) - db -4, -24, 21, (1 << OAM_X_FLIP) - db 4, -8, 22, (1 << OAM_X_FLIP) - db 4, -16, 23, (1 << OAM_X_FLIP) - db 4, -24, 24, (1 << OAM_X_FLIP) - db -4, -8, 18, (1 << OAM_Y_FLIP) - db -12, -16, 18, (1 << OAM_Y_FLIP) + db -4, 0, 18, OAM_XFLIP | OAM_YFLIP + db -12, 8, 18, OAM_XFLIP | OAM_YFLIP + db -12, -24, 19, OAM_XFLIP + db -4, -16, 20, OAM_XFLIP + db -4, -24, 21, OAM_XFLIP + db 4, -8, 22, OAM_XFLIP + db 4, -16, 23, OAM_XFLIP + db 4, -24, 24, OAM_XFLIP + db -4, -8, 18, OAM_YFLIP + db -12, -16, 18, OAM_YFLIP .data_ad480 db 16 ; size @@ -1592,15 +1592,15 @@ AnimFrameTable39:: db 4, 0, 29, $0 db 4, 8, 30, $0 db 4, 16, 31, $0 - db -12, 8, 18, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -12, -24, 25, (1 << OAM_X_FLIP) - db -4, -8, 26, (1 << OAM_X_FLIP) - db -4, -16, 27, (1 << OAM_X_FLIP) - db -4, -24, 28, (1 << OAM_X_FLIP) - db 4, -8, 29, (1 << OAM_X_FLIP) - db 4, -16, 30, (1 << OAM_X_FLIP) - db 4, -24, 31, (1 << OAM_X_FLIP) - db -12, -16, 18, (1 << OAM_Y_FLIP) + db -12, 8, 18, OAM_XFLIP | OAM_YFLIP + db -12, -24, 25, OAM_XFLIP + db -4, -8, 26, OAM_XFLIP + db -4, -16, 27, OAM_XFLIP + db -4, -24, 28, OAM_XFLIP + db 4, -8, 29, OAM_XFLIP + db 4, -16, 30, OAM_XFLIP + db 4, -24, 31, OAM_XFLIP + db -12, -16, 18, OAM_YFLIP AnimData112:: frame_table AnimFrameTable40 @@ -1635,10 +1635,10 @@ AnimFrameTable40:: .data_ad516 db 8 ; size - db -64, 0, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -56, 0, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -48, 0, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -40, 0, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -64, 0, 0, OAM_XFLIP | OAM_YFLIP + db -56, 0, 0, OAM_XFLIP | OAM_YFLIP + db -48, 0, 0, OAM_XFLIP | OAM_YFLIP + db -40, 0, 0, OAM_XFLIP | OAM_YFLIP db -40, -8, 0, $0 db -48, -8, 0, $0 db -56, -8, 0, $0 @@ -1646,14 +1646,14 @@ AnimFrameTable40:: .data_ad537 db 18 ; size - db -64, 0, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -56, 0, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -48, 0, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -40, 0, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -32, 0, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -24, 0, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, 0, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 0, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -64, 0, 0, OAM_XFLIP | OAM_YFLIP + db -56, 0, 0, OAM_XFLIP | OAM_YFLIP + db -48, 0, 0, OAM_XFLIP | OAM_YFLIP + db -40, 0, 0, OAM_XFLIP | OAM_YFLIP + db -32, 0, 0, OAM_XFLIP | OAM_YFLIP + db -24, 0, 0, OAM_XFLIP | OAM_YFLIP + db -16, 0, 0, OAM_XFLIP | OAM_YFLIP + db -8, 0, 0, OAM_XFLIP | OAM_YFLIP db -8, -8, 0, $0 db -16, -8, 0, $0 db -24, -8, 0, $0 @@ -1662,41 +1662,41 @@ AnimFrameTable40:: db -48, -8, 0, $0 db -56, -8, 0, $0 db -64, -8, 0, $0 - db 0, -8, 1, (1 << OAM_Y_FLIP) - db 0, 0, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, -8, 1, OAM_YFLIP + db 0, 0, 1, OAM_XFLIP | OAM_YFLIP .data_ad580 db 18 ; size - db -64, -8, 0, (1 << OAM_Y_FLIP) - db -56, -8, 0, (1 << OAM_Y_FLIP) - db -48, -8, 0, (1 << OAM_Y_FLIP) - db -40, -8, 0, (1 << OAM_Y_FLIP) - db -32, -8, 0, (1 << OAM_Y_FLIP) - db -24, -8, 0, (1 << OAM_Y_FLIP) - db -16, -8, 0, (1 << OAM_Y_FLIP) - db -8, -8, 0, (1 << OAM_Y_FLIP) - db -8, 0, 0, (1 << OAM_X_FLIP) - db -16, 0, 0, (1 << OAM_X_FLIP) - db -24, 0, 0, (1 << OAM_X_FLIP) - db -32, 0, 0, (1 << OAM_X_FLIP) - db -40, 0, 0, (1 << OAM_X_FLIP) - db -48, 0, 0, (1 << OAM_X_FLIP) - db -56, 0, 0, (1 << OAM_X_FLIP) - db -64, 0, 0, (1 << OAM_X_FLIP) - db 0, 0, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -8, 1, (1 << OAM_Y_FLIP) + db -64, -8, 0, OAM_YFLIP + db -56, -8, 0, OAM_YFLIP + db -48, -8, 0, OAM_YFLIP + db -40, -8, 0, OAM_YFLIP + db -32, -8, 0, OAM_YFLIP + db -24, -8, 0, OAM_YFLIP + db -16, -8, 0, OAM_YFLIP + db -8, -8, 0, OAM_YFLIP + db -8, 0, 0, OAM_XFLIP + db -16, 0, 0, OAM_XFLIP + db -24, 0, 0, OAM_XFLIP + db -32, 0, 0, OAM_XFLIP + db -40, 0, 0, OAM_XFLIP + db -48, 0, 0, OAM_XFLIP + db -56, 0, 0, OAM_XFLIP + db -64, 0, 0, OAM_XFLIP + db 0, 0, 1, OAM_XFLIP | OAM_YFLIP + db 0, -8, 1, OAM_YFLIP .data_ad5c9 db 18 ; size - db -8, 0, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, 0, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -24, 0, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -32, 0, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -40, 0, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -48, 0, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -56, 0, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -64, 0, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 0, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, 0, 2, OAM_XFLIP | OAM_YFLIP + db -16, 0, 2, OAM_XFLIP | OAM_YFLIP + db -24, 0, 2, OAM_XFLIP | OAM_YFLIP + db -32, 0, 2, OAM_XFLIP | OAM_YFLIP + db -40, 0, 2, OAM_XFLIP | OAM_YFLIP + db -48, 0, 2, OAM_XFLIP | OAM_YFLIP + db -56, 0, 2, OAM_XFLIP | OAM_YFLIP + db -64, 0, 2, OAM_XFLIP | OAM_YFLIP + db 0, 0, 3, OAM_XFLIP | OAM_YFLIP db -64, -8, 2, $0 db -56, -8, 2, $0 db -48, -8, 2, $0 @@ -1705,40 +1705,40 @@ AnimFrameTable40:: db -24, -8, 2, $0 db -16, -8, 2, $0 db -8, -8, 2, $0 - db 0, -8, 3, (1 << OAM_Y_FLIP) + db 0, -8, 3, OAM_YFLIP .data_ad612 db 18 ; size - db -8, -8, 2, (1 << OAM_Y_FLIP) - db -16, -8, 2, (1 << OAM_Y_FLIP) - db -24, -8, 2, (1 << OAM_Y_FLIP) - db -32, -8, 2, (1 << OAM_Y_FLIP) - db -40, -8, 2, (1 << OAM_Y_FLIP) - db -48, -8, 2, (1 << OAM_Y_FLIP) - db -56, -8, 2, (1 << OAM_Y_FLIP) - db -64, -8, 2, (1 << OAM_Y_FLIP) - db 0, 0, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -64, 0, 2, (1 << OAM_X_FLIP) - db -56, 0, 2, (1 << OAM_X_FLIP) - db -48, 0, 2, (1 << OAM_X_FLIP) - db -40, 0, 2, (1 << OAM_X_FLIP) - db -32, 0, 2, (1 << OAM_X_FLIP) - db -24, 0, 2, (1 << OAM_X_FLIP) - db -16, 0, 2, (1 << OAM_X_FLIP) - db -8, 0, 2, (1 << OAM_X_FLIP) - db 0, -8, 3, (1 << OAM_Y_FLIP) + db -8, -8, 2, OAM_YFLIP + db -16, -8, 2, OAM_YFLIP + db -24, -8, 2, OAM_YFLIP + db -32, -8, 2, OAM_YFLIP + db -40, -8, 2, OAM_YFLIP + db -48, -8, 2, OAM_YFLIP + db -56, -8, 2, OAM_YFLIP + db -64, -8, 2, OAM_YFLIP + db 0, 0, 3, OAM_XFLIP | OAM_YFLIP + db -64, 0, 2, OAM_XFLIP + db -56, 0, 2, OAM_XFLIP + db -48, 0, 2, OAM_XFLIP + db -40, 0, 2, OAM_XFLIP + db -32, 0, 2, OAM_XFLIP + db -24, 0, 2, OAM_XFLIP + db -16, 0, 2, OAM_XFLIP + db -8, 0, 2, OAM_XFLIP + db 0, -8, 3, OAM_YFLIP .data_ad65b db 18 ; size - db -8, 0, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, 0, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -24, 0, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -32, 0, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -40, 0, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -48, 0, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -56, 0, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -64, 0, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 0, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, 0, 4, OAM_XFLIP | OAM_YFLIP + db -16, 0, 4, OAM_XFLIP | OAM_YFLIP + db -24, 0, 4, OAM_XFLIP | OAM_YFLIP + db -32, 0, 4, OAM_XFLIP | OAM_YFLIP + db -40, 0, 4, OAM_XFLIP | OAM_YFLIP + db -48, 0, 4, OAM_XFLIP | OAM_YFLIP + db -56, 0, 4, OAM_XFLIP | OAM_YFLIP + db -64, 0, 4, OAM_XFLIP | OAM_YFLIP + db 0, 0, 5, OAM_XFLIP | OAM_YFLIP db -64, -8, 4, $0 db -56, -8, 4, $0 db -48, -8, 4, $0 @@ -1747,40 +1747,40 @@ AnimFrameTable40:: db -24, -8, 4, $0 db -16, -8, 4, $0 db -8, -8, 4, $0 - db 0, -8, 5, (1 << OAM_Y_FLIP) + db 0, -8, 5, OAM_YFLIP .data_ad6a4 db 18 ; size - db -8, -8, 4, (1 << OAM_Y_FLIP) - db -16, -8, 4, (1 << OAM_Y_FLIP) - db -24, -8, 4, (1 << OAM_Y_FLIP) - db -32, -8, 4, (1 << OAM_Y_FLIP) - db -40, -8, 4, (1 << OAM_Y_FLIP) - db -48, -8, 4, (1 << OAM_Y_FLIP) - db -56, -8, 4, (1 << OAM_Y_FLIP) - db -64, -8, 4, (1 << OAM_Y_FLIP) - db 0, 0, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -64, 0, 4, (1 << OAM_X_FLIP) - db -56, 0, 4, (1 << OAM_X_FLIP) - db -48, 0, 4, (1 << OAM_X_FLIP) - db -40, 0, 4, (1 << OAM_X_FLIP) - db -32, 0, 4, (1 << OAM_X_FLIP) - db -24, 0, 4, (1 << OAM_X_FLIP) - db -16, 0, 4, (1 << OAM_X_FLIP) - db -8, 0, 4, (1 << OAM_X_FLIP) - db 0, -8, 5, (1 << OAM_Y_FLIP) + db -8, -8, 4, OAM_YFLIP + db -16, -8, 4, OAM_YFLIP + db -24, -8, 4, OAM_YFLIP + db -32, -8, 4, OAM_YFLIP + db -40, -8, 4, OAM_YFLIP + db -48, -8, 4, OAM_YFLIP + db -56, -8, 4, OAM_YFLIP + db -64, -8, 4, OAM_YFLIP + db 0, 0, 5, OAM_XFLIP | OAM_YFLIP + db -64, 0, 4, OAM_XFLIP + db -56, 0, 4, OAM_XFLIP + db -48, 0, 4, OAM_XFLIP + db -40, 0, 4, OAM_XFLIP + db -32, 0, 4, OAM_XFLIP + db -24, 0, 4, OAM_XFLIP + db -16, 0, 4, OAM_XFLIP + db -8, 0, 4, OAM_XFLIP + db 0, -8, 5, OAM_YFLIP .data_ad6ed db 19 ; size - db -8, 4, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, 4, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -24, 4, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -32, 4, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -40, 4, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -48, 4, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -56, 4, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -64, 4, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 4, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, 4, 4, OAM_XFLIP | OAM_YFLIP + db -16, 4, 4, OAM_XFLIP | OAM_YFLIP + db -24, 4, 4, OAM_XFLIP | OAM_YFLIP + db -32, 4, 4, OAM_XFLIP | OAM_YFLIP + db -40, 4, 4, OAM_XFLIP | OAM_YFLIP + db -48, 4, 4, OAM_XFLIP | OAM_YFLIP + db -56, 4, 4, OAM_XFLIP | OAM_YFLIP + db -64, 4, 4, OAM_XFLIP | OAM_YFLIP + db 0, 4, 5, OAM_XFLIP | OAM_YFLIP db -64, -12, 4, $0 db -56, -12, 4, $0 db -48, -12, 4, $0 @@ -1789,43 +1789,43 @@ AnimFrameTable40:: db -24, -12, 4, $0 db -16, -12, 4, $0 db -8, -12, 4, $0 - db 0, -12, 5, (1 << OAM_Y_FLIP) - db 0, -4, 6, (1 << OAM_Y_FLIP) + db 0, -12, 5, OAM_YFLIP + db 0, -4, 6, OAM_YFLIP .data_ad73a db 19 ; size - db -8, -12, 4, (1 << OAM_Y_FLIP) - db -16, -12, 4, (1 << OAM_Y_FLIP) - db -24, -12, 4, (1 << OAM_Y_FLIP) - db -32, -12, 4, (1 << OAM_Y_FLIP) - db -40, -12, 4, (1 << OAM_Y_FLIP) - db -48, -12, 4, (1 << OAM_Y_FLIP) - db -56, -12, 4, (1 << OAM_Y_FLIP) - db -64, -12, 4, (1 << OAM_Y_FLIP) - db 0, 4, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -64, 4, 4, (1 << OAM_X_FLIP) - db -56, 4, 4, (1 << OAM_X_FLIP) - db -48, 4, 4, (1 << OAM_X_FLIP) - db -40, 4, 4, (1 << OAM_X_FLIP) - db -32, 4, 4, (1 << OAM_X_FLIP) - db -24, 4, 4, (1 << OAM_X_FLIP) - db -16, 4, 4, (1 << OAM_X_FLIP) - db -8, 4, 4, (1 << OAM_X_FLIP) - db 0, -12, 5, (1 << OAM_Y_FLIP) - db 0, -4, 6, (1 << OAM_Y_FLIP) + db -8, -12, 4, OAM_YFLIP + db -16, -12, 4, OAM_YFLIP + db -24, -12, 4, OAM_YFLIP + db -32, -12, 4, OAM_YFLIP + db -40, -12, 4, OAM_YFLIP + db -48, -12, 4, OAM_YFLIP + db -56, -12, 4, OAM_YFLIP + db -64, -12, 4, OAM_YFLIP + db 0, 4, 5, OAM_XFLIP | OAM_YFLIP + db -64, 4, 4, OAM_XFLIP + db -56, 4, 4, OAM_XFLIP + db -48, 4, 4, OAM_XFLIP + db -40, 4, 4, OAM_XFLIP + db -32, 4, 4, OAM_XFLIP + db -24, 4, 4, OAM_XFLIP + db -16, 4, 4, OAM_XFLIP + db -8, 4, 4, OAM_XFLIP + db 0, -12, 5, OAM_YFLIP + db 0, -4, 6, OAM_YFLIP .data_ad787 db 20 ; size - db -8, 8, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, 8, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -24, 8, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -32, 8, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -40, 8, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -48, 8, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -56, 8, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -64, 8, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 8, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 0, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, 8, 7, OAM_XFLIP | OAM_YFLIP + db -16, 8, 7, OAM_XFLIP | OAM_YFLIP + db -24, 8, 7, OAM_XFLIP | OAM_YFLIP + db -32, 8, 7, OAM_XFLIP | OAM_YFLIP + db -40, 8, 7, OAM_XFLIP | OAM_YFLIP + db -48, 8, 7, OAM_XFLIP | OAM_YFLIP + db -56, 8, 7, OAM_XFLIP | OAM_YFLIP + db -64, 8, 7, OAM_XFLIP | OAM_YFLIP + db 0, 8, 8, OAM_XFLIP | OAM_YFLIP + db 0, 0, 9, OAM_XFLIP | OAM_YFLIP db -64, -16, 7, $0 db -56, -16, 7, $0 db -48, -16, 7, $0 @@ -1834,31 +1834,31 @@ AnimFrameTable40:: db -24, -16, 7, $0 db -16, -16, 7, $0 db -8, -16, 7, $0 - db 0, -16, 8, (1 << OAM_Y_FLIP) - db 0, -8, 9, (1 << OAM_Y_FLIP) + db 0, -16, 8, OAM_YFLIP + db 0, -8, 9, OAM_YFLIP .data_ad7d8 db 20 ; size - db -64, 8, 7, (1 << OAM_X_FLIP) - db -56, 8, 7, (1 << OAM_X_FLIP) - db -48, 8, 7, (1 << OAM_X_FLIP) - db -40, 8, 7, (1 << OAM_X_FLIP) - db -32, 8, 7, (1 << OAM_X_FLIP) - db -24, 8, 7, (1 << OAM_X_FLIP) - db -16, 8, 7, (1 << OAM_X_FLIP) - db -8, 8, 7, (1 << OAM_X_FLIP) - db 0, 8, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 0, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -16, 7, (1 << OAM_Y_FLIP) - db -16, -16, 7, (1 << OAM_Y_FLIP) - db -24, -16, 7, (1 << OAM_Y_FLIP) - db -32, -16, 7, (1 << OAM_Y_FLIP) - db -40, -16, 7, (1 << OAM_Y_FLIP) - db -48, -16, 7, (1 << OAM_Y_FLIP) - db -56, -16, 7, (1 << OAM_Y_FLIP) - db -64, -16, 7, (1 << OAM_Y_FLIP) - db 0, -16, 8, (1 << OAM_Y_FLIP) - db 0, -8, 9, (1 << OAM_Y_FLIP) + db -64, 8, 7, OAM_XFLIP + db -56, 8, 7, OAM_XFLIP + db -48, 8, 7, OAM_XFLIP + db -40, 8, 7, OAM_XFLIP + db -32, 8, 7, OAM_XFLIP + db -24, 8, 7, OAM_XFLIP + db -16, 8, 7, OAM_XFLIP + db -8, 8, 7, OAM_XFLIP + db 0, 8, 8, OAM_XFLIP | OAM_YFLIP + db 0, 0, 9, OAM_XFLIP | OAM_YFLIP + db -8, -16, 7, OAM_YFLIP + db -16, -16, 7, OAM_YFLIP + db -24, -16, 7, OAM_YFLIP + db -32, -16, 7, OAM_YFLIP + db -40, -16, 7, OAM_YFLIP + db -48, -16, 7, OAM_YFLIP + db -56, -16, 7, OAM_YFLIP + db -64, -16, 7, OAM_YFLIP + db 0, -16, 8, OAM_YFLIP + db 0, -8, 9, OAM_YFLIP AnimData113:: frame_table AnimFrameTable41 @@ -1898,69 +1898,69 @@ AnimFrameTable41:: .data_ad88e db 8 ; size - db -64, -12, 5, (1 << OAM_Y_FLIP) - db -64, -4, 6, (1 << OAM_Y_FLIP) - db -64, 4, 7, (1 << OAM_Y_FLIP) - db -56, -12, 2, (1 << OAM_Y_FLIP) - db -56, -4, 3, (1 << OAM_Y_FLIP) - db -56, 4, 4, (1 << OAM_Y_FLIP) - db -48, -8, 0, (1 << OAM_Y_FLIP) - db -48, 0, 1, (1 << OAM_Y_FLIP) + db -64, -12, 5, OAM_YFLIP + db -64, -4, 6, OAM_YFLIP + db -64, 4, 7, OAM_YFLIP + db -56, -12, 2, OAM_YFLIP + db -56, -4, 3, OAM_YFLIP + db -56, 4, 4, OAM_YFLIP + db -48, -8, 0, OAM_YFLIP + db -48, 0, 1, OAM_YFLIP .data_ad8af db 11 ; size - db -56, -4, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -64, -4, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -48, -4, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -40, 4, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -40, -4, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -40, -12, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -32, 4, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -32, -4, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -32, -12, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -24, 0, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -24, -8, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -56, -4, 8, OAM_XFLIP | OAM_YFLIP + db -64, -4, 8, OAM_XFLIP | OAM_YFLIP + db -48, -4, 8, OAM_XFLIP | OAM_YFLIP + db -40, 4, 5, OAM_XFLIP | OAM_YFLIP + db -40, -4, 6, OAM_XFLIP | OAM_YFLIP + db -40, -12, 7, OAM_XFLIP | OAM_YFLIP + db -32, 4, 2, OAM_XFLIP | OAM_YFLIP + db -32, -4, 3, OAM_XFLIP | OAM_YFLIP + db -32, -12, 4, OAM_XFLIP | OAM_YFLIP + db -24, 0, 0, OAM_XFLIP | OAM_YFLIP + db -24, -8, 1, OAM_XFLIP | OAM_YFLIP .data_ad8dc db 14 ; size - db -32, -4, 8, (1 << OAM_Y_FLIP) - db -40, -4, 8, (1 << OAM_Y_FLIP) - db -48, -4, 8, (1 << OAM_Y_FLIP) - db -56, -4, 8, (1 << OAM_Y_FLIP) - db -24, -4, 8, (1 << OAM_Y_FLIP) - db -16, -12, 5, (1 << OAM_Y_FLIP) - db -16, -4, 6, (1 << OAM_Y_FLIP) - db -16, 4, 7, (1 << OAM_Y_FLIP) - db -8, -12, 2, (1 << OAM_Y_FLIP) - db -8, -4, 3, (1 << OAM_Y_FLIP) - db -8, 4, 4, (1 << OAM_Y_FLIP) - db 0, -8, 0, (1 << OAM_Y_FLIP) - db 0, 0, 1, (1 << OAM_Y_FLIP) - db -64, -4, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -32, -4, 8, OAM_YFLIP + db -40, -4, 8, OAM_YFLIP + db -48, -4, 8, OAM_YFLIP + db -56, -4, 8, OAM_YFLIP + db -24, -4, 8, OAM_YFLIP + db -16, -12, 5, OAM_YFLIP + db -16, -4, 6, OAM_YFLIP + db -16, 4, 7, OAM_YFLIP + db -8, -12, 2, OAM_YFLIP + db -8, -4, 3, OAM_YFLIP + db -8, 4, 4, OAM_YFLIP + db 0, -8, 0, OAM_YFLIP + db 0, 0, 1, OAM_YFLIP + db -64, -4, 9, OAM_XFLIP | OAM_YFLIP .data_ad915 db 11 ; size - db 0, -8, 10, (1 << OAM_Y_FLIP) - db 0, 0, 11, (1 << OAM_Y_FLIP) - db -8, -8, 12, (1 << OAM_Y_FLIP) - db -8, 0, 13, (1 << OAM_Y_FLIP) + db 0, -8, 10, OAM_YFLIP + db 0, 0, 11, OAM_YFLIP + db -8, -8, 12, OAM_YFLIP + db -8, 0, 13, OAM_YFLIP db -16, -4, 8, $0 db -24, -4, 8, $0 db -32, -4, 8, $0 db -40, -4, 8, $0 db -48, -4, 8, $0 - db -56, -4, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -56, -4, 9, OAM_XFLIP | OAM_YFLIP db -64, -4, 9, $0 .data_ad942 db 11 ; size - db 0, 0, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -8, 11, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 0, 12, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -8, 13, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, 0, 10, OAM_XFLIP | OAM_YFLIP + db 0, -8, 11, OAM_XFLIP | OAM_YFLIP + db -8, 0, 12, OAM_XFLIP | OAM_YFLIP + db -8, -8, 13, OAM_XFLIP | OAM_YFLIP db -16, -4, 8, $0 db -24, -4, 8, $0 - db -48, -4, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -48, -4, 9, OAM_XFLIP | OAM_YFLIP db -56, -4, 9, $0 db -32, -4, 8, $0 db -40, -4, 8, $0 @@ -1968,11 +1968,11 @@ AnimFrameTable41:: .data_ad96f db 10 ; size - db 0, -8, 10, (1 << OAM_Y_FLIP) - db 0, 0, 11, (1 << OAM_Y_FLIP) - db -8, -8, 12, (1 << OAM_Y_FLIP) - db -8, 0, 13, (1 << OAM_Y_FLIP) - db -40, -4, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, -8, 10, OAM_YFLIP + db 0, 0, 11, OAM_YFLIP + db -8, -8, 12, OAM_YFLIP + db -8, 0, 13, OAM_YFLIP + db -40, -4, 9, OAM_XFLIP | OAM_YFLIP db -48, -4, 9, $0 db -16, -4, 8, $0 db -24, -4, 8, $0 @@ -1981,107 +1981,107 @@ AnimFrameTable41:: .data_ad998 db 9 ; size - db 0, 0, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -8, 11, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 0, 12, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -8, 13, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, 0, 10, OAM_XFLIP | OAM_YFLIP + db 0, -8, 11, OAM_XFLIP | OAM_YFLIP + db -8, 0, 12, OAM_XFLIP | OAM_YFLIP + db -8, -8, 13, OAM_XFLIP | OAM_YFLIP db -16, -4, 8, $0 db -24, -4, 8, $0 - db -32, -4, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -32, -4, 9, OAM_XFLIP | OAM_YFLIP db -40, -4, 9, $0 db -48, -4, 8, $0 .data_ad9bd db 13 ; size - db -24, -4, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -24, -4, 9, OAM_XFLIP | OAM_YFLIP db -32, -4, 9, $0 db -16, -4, 8, $0 db -40, -4, 8, $0 - db 8, -12, 14, (1 << OAM_Y_FLIP) - db 8, -4, 15, (1 << OAM_Y_FLIP) - db 8, 4, 16, (1 << OAM_Y_FLIP) - db 0, -12, 17, (1 << OAM_Y_FLIP) - db 0, -4, 18, (1 << OAM_Y_FLIP) - db 0, 4, 19, (1 << OAM_Y_FLIP) - db -8, -12, 20, (1 << OAM_Y_FLIP) - db -8, -4, 21, (1 << OAM_Y_FLIP) - db -8, 4, 22, (1 << OAM_Y_FLIP) + db 8, -12, 14, OAM_YFLIP + db 8, -4, 15, OAM_YFLIP + db 8, 4, 16, OAM_YFLIP + db 0, -12, 17, OAM_YFLIP + db 0, -4, 18, OAM_YFLIP + db 0, 4, 19, OAM_YFLIP + db -8, -12, 20, OAM_YFLIP + db -8, -4, 21, OAM_YFLIP + db -8, 4, 22, OAM_YFLIP .data_ad9f2 db 12 ; size db -32, -4, 8, $0 - db -16, -4, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -16, -4, 9, OAM_XFLIP | OAM_YFLIP db -24, -4, 9, $0 - db 8, 4, 14, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -4, 15, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -12, 16, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 4, 17, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -4, 18, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -12, 19, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 4, 20, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -4, 21, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -12, 22, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 8, 4, 14, OAM_XFLIP | OAM_YFLIP + db 8, -4, 15, OAM_XFLIP | OAM_YFLIP + db 8, -12, 16, OAM_XFLIP | OAM_YFLIP + db 0, 4, 17, OAM_XFLIP | OAM_YFLIP + db 0, -4, 18, OAM_XFLIP | OAM_YFLIP + db 0, -12, 19, OAM_XFLIP | OAM_YFLIP + db -8, 4, 20, OAM_XFLIP | OAM_YFLIP + db -8, -4, 21, OAM_XFLIP | OAM_YFLIP + db -8, -12, 22, OAM_XFLIP | OAM_YFLIP .data_ada23 db 11 ; size db -24, -4, 8, $0 db -16, -4, 9, $0 - db 8, -12, 14, (1 << OAM_Y_FLIP) - db 8, -4, 15, (1 << OAM_Y_FLIP) - db 8, 4, 16, (1 << OAM_Y_FLIP) - db 0, -12, 17, (1 << OAM_Y_FLIP) - db 0, -4, 18, (1 << OAM_Y_FLIP) - db 0, 4, 19, (1 << OAM_Y_FLIP) - db -8, -12, 20, (1 << OAM_Y_FLIP) - db -8, -4, 21, (1 << OAM_Y_FLIP) - db -8, 4, 22, (1 << OAM_Y_FLIP) + db 8, -12, 14, OAM_YFLIP + db 8, -4, 15, OAM_YFLIP + db 8, 4, 16, OAM_YFLIP + db 0, -12, 17, OAM_YFLIP + db 0, -4, 18, OAM_YFLIP + db 0, 4, 19, OAM_YFLIP + db -8, -12, 20, OAM_YFLIP + db -8, -4, 21, OAM_YFLIP + db -8, 4, 22, OAM_YFLIP .data_ada50 db 10 ; size db -16, -4, 8, $0 - db 8, 4, 14, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -4, 15, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -12, 16, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 4, 17, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -4, 18, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -12, 19, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 4, 20, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -4, 21, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -12, 22, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 8, 4, 14, OAM_XFLIP | OAM_YFLIP + db 8, -4, 15, OAM_XFLIP | OAM_YFLIP + db 8, -12, 16, OAM_XFLIP | OAM_YFLIP + db 0, 4, 17, OAM_XFLIP | OAM_YFLIP + db 0, -4, 18, OAM_XFLIP | OAM_YFLIP + db 0, -12, 19, OAM_XFLIP | OAM_YFLIP + db -8, 4, 20, OAM_XFLIP | OAM_YFLIP + db -8, -4, 21, OAM_XFLIP | OAM_YFLIP + db -8, -12, 22, OAM_XFLIP | OAM_YFLIP .data_ada79 db 14 ; size - db -16, -8, 35, (1 << OAM_Y_FLIP) - db -16, 0, 36, (1 << OAM_Y_FLIP) - db -8, -16, 31, (1 << OAM_Y_FLIP) - db -8, -8, 32, (1 << OAM_Y_FLIP) - db -8, 0, 33, (1 << OAM_Y_FLIP) - db -8, 8, 34, (1 << OAM_Y_FLIP) - db 0, -16, 27, (1 << OAM_Y_FLIP) - db 0, -8, 28, (1 << OAM_Y_FLIP) - db 0, 0, 29, (1 << OAM_Y_FLIP) - db 0, 8, 30, (1 << OAM_Y_FLIP) - db 8, -16, 23, (1 << OAM_Y_FLIP) - db 8, -8, 24, (1 << OAM_Y_FLIP) - db 8, 0, 25, (1 << OAM_Y_FLIP) - db 8, 8, 26, (1 << OAM_Y_FLIP) + db -16, -8, 35, OAM_YFLIP + db -16, 0, 36, OAM_YFLIP + db -8, -16, 31, OAM_YFLIP + db -8, -8, 32, OAM_YFLIP + db -8, 0, 33, OAM_YFLIP + db -8, 8, 34, OAM_YFLIP + db 0, -16, 27, OAM_YFLIP + db 0, -8, 28, OAM_YFLIP + db 0, 0, 29, OAM_YFLIP + db 0, 8, 30, OAM_YFLIP + db 8, -16, 23, OAM_YFLIP + db 8, -8, 24, OAM_YFLIP + db 8, 0, 25, OAM_YFLIP + db 8, 8, 26, OAM_YFLIP .data_adab2 db 14 ; size - db 12, 0, 35, (1 << OAM_X_FLIP) - db 12, -8, 36, (1 << OAM_X_FLIP) - db 4, 8, 31, (1 << OAM_X_FLIP) - db 4, 0, 32, (1 << OAM_X_FLIP) - db 4, -8, 33, (1 << OAM_X_FLIP) - db 4, -16, 34, (1 << OAM_X_FLIP) - db -4, 8, 27, (1 << OAM_X_FLIP) - db -4, 0, 28, (1 << OAM_X_FLIP) - db -4, -8, 29, (1 << OAM_X_FLIP) - db -4, -16, 30, (1 << OAM_X_FLIP) - db -12, 8, 23, (1 << OAM_X_FLIP) - db -12, 0, 24, (1 << OAM_X_FLIP) - db -12, -8, 25, (1 << OAM_X_FLIP) - db -12, -16, 26, (1 << OAM_X_FLIP) + db 12, 0, 35, OAM_XFLIP + db 12, -8, 36, OAM_XFLIP + db 4, 8, 31, OAM_XFLIP + db 4, 0, 32, OAM_XFLIP + db 4, -8, 33, OAM_XFLIP + db 4, -16, 34, OAM_XFLIP + db -4, 8, 27, OAM_XFLIP + db -4, 0, 28, OAM_XFLIP + db -4, -8, 29, OAM_XFLIP + db -4, -16, 30, OAM_XFLIP + db -12, 8, 23, OAM_XFLIP + db -12, 0, 24, OAM_XFLIP + db -12, -8, 25, OAM_XFLIP + db -12, -16, 26, OAM_XFLIP AnimData114:: frame_table AnimFrameTable42 @@ -2119,7 +2119,7 @@ AnimFrameTable42:: db -16, 22, 21, $0 db -28, 32, 22, $0 db -25, 8, 20, $0 - db -33, 8, 20, (1 << OAM_Y_FLIP) + db -33, 8, 20, OAM_YFLIP db -32, 32, 14, $0 db -24, 32, 15, $0 @@ -2134,18 +2134,18 @@ AnimFrameTable42:: db -16, 24, 13, $0 db -15, 0, 20, $0 db -32, 16, 23, $0 - db -8, 8, 23, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, 8, 23, OAM_XFLIP | OAM_YFLIP .data_adb7e db 10 ; size - db -8, 8, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 0, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, 8, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, 0, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -13, -8, 22, (1 << OAM_X_FLIP) - db -24, 5, 21, (1 << OAM_Y_FLIP) - db -7, 16, 20, (1 << OAM_X_FLIP) - db -15, 16, 20, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, 8, 0, OAM_XFLIP | OAM_YFLIP + db -8, 0, 1, OAM_XFLIP | OAM_YFLIP + db -16, 8, 2, OAM_XFLIP | OAM_YFLIP + db -16, 0, 3, OAM_XFLIP | OAM_YFLIP + db -13, -8, 22, OAM_XFLIP + db -24, 5, 21, OAM_YFLIP + db -7, 16, 20, OAM_XFLIP + db -15, 16, 20, OAM_XFLIP | OAM_YFLIP db -16, 16, 14, $0 db -8, 16, 15, $0 @@ -2154,14 +2154,14 @@ AnimFrameTable42:: db -24, -16, 18, $0 db -24, -8, 19, $0 db -24, 0, 13, $0 - db 16, -16, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, -24, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -16, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -24, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 11, -32, 22, (1 << OAM_X_FLIP) - db 0, -19, 21, (1 << OAM_Y_FLIP) - db 17, -8, 20, (1 << OAM_X_FLIP) - db 9, -8, 20, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 16, -16, 0, OAM_XFLIP | OAM_YFLIP + db 16, -24, 1, OAM_XFLIP | OAM_YFLIP + db 8, -16, 2, OAM_XFLIP | OAM_YFLIP + db 8, -24, 3, OAM_XFLIP | OAM_YFLIP + db 11, -32, 22, OAM_XFLIP + db 0, -19, 21, OAM_YFLIP + db 17, -8, 20, OAM_XFLIP + db 9, -8, 20, OAM_XFLIP | OAM_YFLIP db 8, -8, 14, $0 db 16, -8, 15, $0 db -32, -16, 16, $0 @@ -2182,7 +2182,7 @@ AnimFrameTable42:: db 32, -26, 21, $0 db 20, -16, 22, $0 db 23, -40, 20, $0 - db 15, -40, 20, (1 << OAM_Y_FLIP) + db 15, -40, 20, OAM_YFLIP db 16, -16, 14, $0 db 24, -16, 15, $0 db -8, 24, 2, $0 @@ -2192,7 +2192,7 @@ AnimFrameTable42:: db 0, 30, 21, $0 db -12, 40, 22, $0 db -9, 16, 20, $0 - db -17, 16, 20, (1 << OAM_Y_FLIP) + db -17, 16, 20, OAM_YFLIP db -16, 40, 14, $0 db -8, 40, 15, $0 @@ -2200,10 +2200,10 @@ AnimFrameTable42:: db 16 ; size db -18, -18, 12, $0 db -10, -18, 13, $0 - db -8, -24, 16, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -32, 17, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, -24, 18, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, -32, 19, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, -24, 16, OAM_XFLIP | OAM_YFLIP + db -8, -32, 17, OAM_XFLIP | OAM_YFLIP + db -16, -24, 18, OAM_XFLIP | OAM_YFLIP + db -16, -32, 19, OAM_XFLIP | OAM_YFLIP db -8, 16, 4, $0 db -8, 24, 5, $0 db 0, 16, 6, $0 @@ -2213,7 +2213,7 @@ AnimFrameTable42:: db 0, 32, 13, $0 db 1, 8, 20, $0 db -16, 24, 23, $0 - db 8, 16, 23, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 8, 16, 23, OAM_XFLIP | OAM_YFLIP .data_adc8e db 21 ; size @@ -2222,16 +2222,16 @@ AnimFrameTable42:: db -24, 8, 18, $0 db -24, 16, 19, $0 db -24, 22, 15, $0 - db 0, -32, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -32, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, 16, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, 8, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 16, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 8, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 3, 0, 22, (1 << OAM_X_FLIP) - db -8, 13, 21, (1 << OAM_Y_FLIP) - db 9, 24, 20, (1 << OAM_X_FLIP) - db 1, 24, 20, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, -32, 8, OAM_XFLIP | OAM_YFLIP + db -8, -32, 10, OAM_XFLIP | OAM_YFLIP + db 8, 16, 0, OAM_XFLIP | OAM_YFLIP + db 8, 8, 1, OAM_XFLIP | OAM_YFLIP + db 0, 16, 2, OAM_XFLIP | OAM_YFLIP + db 0, 8, 3, OAM_XFLIP | OAM_YFLIP + db 3, 0, 22, OAM_XFLIP + db -8, 13, 21, OAM_YFLIP + db 9, 24, 20, OAM_XFLIP + db 1, 24, 20, OAM_XFLIP | OAM_YFLIP db 0, 24, 14, $0 db 8, 24, 15, $0 db -8, -40, 8, $0 @@ -2254,7 +2254,7 @@ AnimFrameTable42:: db 24, 6, 21, $0 db 12, 16, 22, $0 db 15, -8, 20, $0 - db 7, -8, 20, (1 << OAM_Y_FLIP) + db 7, -8, 20, OAM_YFLIP db 8, 16, 14, $0 db 16, 16, 15, $0 @@ -2262,10 +2262,10 @@ AnimFrameTable42:: db 16 ; size db -18, 4, 12, $0 db -10, 6, 13, $0 - db -8, 0, 16, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -8, 17, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, 0, 18, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, -8, 19, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, 0, 16, OAM_XFLIP | OAM_YFLIP + db -8, -8, 17, OAM_XFLIP | OAM_YFLIP + db -16, 0, 18, OAM_XFLIP | OAM_YFLIP + db -16, -8, 19, OAM_XFLIP | OAM_YFLIP db 16, -8, 4, $0 db 16, 0, 5, $0 db 24, -8, 6, $0 @@ -2275,16 +2275,16 @@ AnimFrameTable42:: db 24, 8, 13, $0 db 25, -16, 20, $0 db 8, 0, 23, $0 - db 32, -8, 23, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 32, -8, 23, OAM_XFLIP | OAM_YFLIP .data_add65 db 6 ; size db -10, -4, 14, $0 db -2, -2, 15, $0 - db 0, -8, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -16, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -8, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -16, 11, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, -8, 8, OAM_XFLIP | OAM_YFLIP + db 0, -16, 9, OAM_XFLIP | OAM_YFLIP + db -8, -8, 10, OAM_XFLIP | OAM_YFLIP + db -8, -16, 11, OAM_XFLIP | OAM_YFLIP .data_add7e db 6 ; size @@ -2307,10 +2307,10 @@ AnimFrameTable42:: .data_addb0 db 5 ; size db 14, -28, 14, $0 - db 16, -32, 18, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, -40, 19, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 24, -32, 16, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 24, -40, 17, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 16, -32, 18, OAM_XFLIP | OAM_YFLIP + db 16, -40, 19, OAM_XFLIP | OAM_YFLIP + db 24, -32, 16, OAM_XFLIP | OAM_YFLIP + db 24, -40, 17, OAM_XFLIP | OAM_YFLIP AnimData115:: frame_table AnimFrameTable42 @@ -2381,39 +2381,39 @@ AnimFrameTable43:: .data_ade9a db 14 ; size - db -18, -8, 0, (1 << OAM_X_FLIP) - db -16, -16, 1, (1 << OAM_X_FLIP) - db -10, 0, 2, (1 << OAM_X_FLIP) - db -10, -8, 3, (1 << OAM_X_FLIP) - db -8, -16, 4, (1 << OAM_X_FLIP) - db 0, 8, 5, (1 << OAM_X_FLIP) - db -2, 0, 6, (1 << OAM_X_FLIP) - db -2, -8, 7, (1 << OAM_X_FLIP) - db 8, 16, 8, (1 << OAM_X_FLIP) - db 8, 8, 9, (1 << OAM_X_FLIP) - db 8, 0, 10, (1 << OAM_X_FLIP) - db 16, 24, 11, (1 << OAM_X_FLIP) - db 16, 16, 12, (1 << OAM_X_FLIP) - db 16, 8, 13, (1 << OAM_X_FLIP) + db -18, -8, 0, OAM_XFLIP + db -16, -16, 1, OAM_XFLIP + db -10, 0, 2, OAM_XFLIP + db -10, -8, 3, OAM_XFLIP + db -8, -16, 4, OAM_XFLIP + db 0, 8, 5, OAM_XFLIP + db -2, 0, 6, OAM_XFLIP + db -2, -8, 7, OAM_XFLIP + db 8, 16, 8, OAM_XFLIP + db 8, 8, 9, OAM_XFLIP + db 8, 0, 10, OAM_XFLIP + db 16, 24, 11, OAM_XFLIP + db 16, 16, 12, OAM_XFLIP + db 16, 8, 13, OAM_XFLIP .data_aded3 db 16 ; size db -16, -16, 19, $0 - db -16, 8, 19, (1 << OAM_X_FLIP) - db 8, 8, 19, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -16, 19, (1 << OAM_Y_FLIP) + db -16, 8, 19, OAM_XFLIP + db 8, 8, 19, OAM_XFLIP | OAM_YFLIP + db 8, -16, 19, OAM_YFLIP db -16, -8, 20, $0 - db -16, 0, 20, (1 << OAM_X_FLIP) - db 8, 0, 20, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -8, 20, (1 << OAM_Y_FLIP) + db -16, 0, 20, OAM_XFLIP + db 8, 0, 20, OAM_XFLIP | OAM_YFLIP + db 8, -8, 20, OAM_YFLIP db -8, -16, 21, $0 - db -8, 8, 21, (1 << OAM_X_FLIP) - db 0, 8, 21, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -16, 21, (1 << OAM_Y_FLIP) + db -8, 8, 21, OAM_XFLIP + db 0, 8, 21, OAM_XFLIP | OAM_YFLIP + db 0, -16, 21, OAM_YFLIP db -8, -8, 22, $0 - db -8, 0, 22, (1 << OAM_X_FLIP) - db 0, 0, 22, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -8, 22, (1 << OAM_Y_FLIP) + db -8, 0, 22, OAM_XFLIP + db 0, 0, 22, OAM_XFLIP | OAM_YFLIP + db 0, -8, 22, OAM_YFLIP .data_adf14 db 20 ; size @@ -2422,21 +2422,21 @@ AnimFrameTable43:: db -18, -12, 16, $0 db -10, -18, 17, $0 db -10, -10, 18, $0 - db -26, 10, 14, (1 << OAM_X_FLIP) - db -18, 12, 15, (1 << OAM_X_FLIP) - db -18, 4, 16, (1 << OAM_X_FLIP) - db -10, 10, 17, (1 << OAM_X_FLIP) - db -10, 2, 18, (1 << OAM_X_FLIP) - db 18, -18, 14, (1 << OAM_Y_FLIP) - db 10, -20, 15, (1 << OAM_Y_FLIP) - db 10, -12, 16, (1 << OAM_Y_FLIP) - db 2, -18, 17, (1 << OAM_Y_FLIP) - db 2, -10, 18, (1 << OAM_Y_FLIP) - db 18, 10, 14, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 10, 12, 15, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 10, 4, 16, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 2, 10, 17, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 2, 2, 18, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -26, 10, 14, OAM_XFLIP + db -18, 12, 15, OAM_XFLIP + db -18, 4, 16, OAM_XFLIP + db -10, 10, 17, OAM_XFLIP + db -10, 2, 18, OAM_XFLIP + db 18, -18, 14, OAM_YFLIP + db 10, -20, 15, OAM_YFLIP + db 10, -12, 16, OAM_YFLIP + db 2, -18, 17, OAM_YFLIP + db 2, -10, 18, OAM_YFLIP + db 18, 10, 14, OAM_XFLIP | OAM_YFLIP + db 10, 12, 15, OAM_XFLIP | OAM_YFLIP + db 10, 4, 16, OAM_XFLIP | OAM_YFLIP + db 2, 10, 17, OAM_XFLIP | OAM_YFLIP + db 2, 2, 18, OAM_XFLIP | OAM_YFLIP .data_adf65 db 1 ; size @@ -2446,45 +2446,45 @@ AnimFrameTable43:: db 8 ; size db -13, 4, 24, $0 db -1, 0, 24, $0 - db -17, -8, 24, (1 << OAM_X_FLIP) - db -5, -12, 24, (1 << OAM_X_FLIP) - db 3, -12, 26, (1 << OAM_X_FLIP) - db 7, 0, 26, (1 << OAM_X_FLIP) + db -17, -8, 24, OAM_XFLIP + db -5, -12, 24, OAM_XFLIP + db 3, -12, 26, OAM_XFLIP + db 7, 0, 26, OAM_XFLIP db -9, -8, 26, $0 db -5, 4, 26, $0 .data_adf8b db 8 ; size db -20, -9, 24, $0 - db 2, 1, 24, (1 << OAM_X_FLIP) + db 2, 1, 24, OAM_XFLIP db -14, 7, 25, $0 db -4, -14, 25, $0 db 4, -15, 26, $0 db 10, 1, 26, $0 - db -12, -9, 26, (1 << OAM_X_FLIP) - db -6, 7, 26, (1 << OAM_X_FLIP) + db -12, -9, 26, OAM_XFLIP + db -6, 7, 26, OAM_XFLIP .data_adfac db 8 ; size db -16, 13, 24, $0 - db -2, -21, 24, (1 << OAM_X_FLIP) - db -26, -11, 25, (1 << OAM_X_FLIP) + db -2, -21, 24, OAM_XFLIP + db -26, -11, 25, OAM_XFLIP db 8, 3, 25, $0 db -18, -10, 26, $0 db -8, 13, 26, $0 - db 6, -21, 26, (1 << OAM_X_FLIP) - db 16, 2, 26, (1 << OAM_X_FLIP) + db 6, -21, 26, OAM_XFLIP + db 16, 2, 26, OAM_XFLIP .data_adfcd db 8 ; size db -2, -21, 24, $0 db 8, 3, 24, $0 - db -26, -11, 24, (1 << OAM_X_FLIP) - db -16, 13, 24, (1 << OAM_X_FLIP) + db -26, -11, 24, OAM_XFLIP + db -16, 13, 24, OAM_XFLIP db 6, -21, 26, $0 db 16, 3, 26, $0 - db -18, -11, 26, (1 << OAM_X_FLIP) - db -8, 13, 26, (1 << OAM_X_FLIP) + db -18, -11, 26, OAM_XFLIP + db -8, 13, 26, OAM_XFLIP AnimData117:: frame_table AnimFrameTable43 @@ -2814,8 +2814,8 @@ AnimFrameTable45:: db 2, 10, 10, $0 db -6, 10, 11, $0 db -6, 18, 12, $0 - db -24, -34, 0, (1 << OAM_X_FLIP) - db -32, -38, 0, (1 << OAM_Y_FLIP) + db -24, -34, 0, OAM_XFLIP + db -32, -38, 0, OAM_YFLIP .data_ae3e8 db 13 ; size @@ -2827,126 +2827,126 @@ AnimFrameTable45:: db 3, 11, 10, $0 db -5, 11, 11, $0 db -5, 19, 12, $0 - db -8, -18, 0, (1 << OAM_X_FLIP) - db -16, -18, 1, (1 << OAM_X_FLIP) - db -16, -26, 2, (1 << OAM_X_FLIP) - db -24, -26, 3, (1 << OAM_X_FLIP) - db -24, -34, 4, (1 << OAM_X_FLIP) + db -8, -18, 0, OAM_XFLIP + db -16, -18, 1, OAM_XFLIP + db -16, -26, 2, OAM_XFLIP + db -24, -26, 3, OAM_XFLIP + db -24, -34, 4, OAM_XFLIP .data_ae41d db 9 ; size - db 8, -2, 0, (1 << OAM_X_FLIP) - db 0, -2, 1, (1 << OAM_X_FLIP) - db 0, -10, 2, (1 << OAM_X_FLIP) - db -8, -10, 3, (1 << OAM_X_FLIP) - db -8, -18, 4, (1 << OAM_X_FLIP) - db -8, -10, 5, (1 << OAM_X_FLIP) - db -16, -10, 6, (1 << OAM_X_FLIP) - db -2, -16, 9, (1 << OAM_X_FLIP) - db -2, -24, 10, (1 << OAM_X_FLIP) + db 8, -2, 0, OAM_XFLIP + db 0, -2, 1, OAM_XFLIP + db 0, -10, 2, OAM_XFLIP + db -8, -10, 3, OAM_XFLIP + db -8, -18, 4, OAM_XFLIP + db -8, -10, 5, OAM_XFLIP + db -16, -10, 6, OAM_XFLIP + db -2, -16, 9, OAM_XFLIP + db -2, -24, 10, OAM_XFLIP .data_ae442 db 13 ; size - db 24, 14, 0, (1 << OAM_X_FLIP) - db 16, 14, 1, (1 << OAM_X_FLIP) - db 16, 6, 2, (1 << OAM_X_FLIP) - db 8, 6, 3, (1 << OAM_X_FLIP) - db 8, -2, 4, (1 << OAM_X_FLIP) - db -4, -4, 5, (1 << OAM_X_FLIP) - db -12, -4, 6, (1 << OAM_X_FLIP) - db -12, -12, 7, (1 << OAM_X_FLIP) - db -20, -12, 8, (1 << OAM_X_FLIP) - db 4, -12, 9, (1 << OAM_X_FLIP) - db 4, -20, 10, (1 << OAM_X_FLIP) - db -4, -20, 11, (1 << OAM_X_FLIP) - db -4, -28, 12, (1 << OAM_X_FLIP) + db 24, 14, 0, OAM_XFLIP + db 16, 14, 1, OAM_XFLIP + db 16, 6, 2, OAM_XFLIP + db 8, 6, 3, OAM_XFLIP + db 8, -2, 4, OAM_XFLIP + db -4, -4, 5, OAM_XFLIP + db -12, -4, 6, OAM_XFLIP + db -12, -12, 7, OAM_XFLIP + db -20, -12, 8, OAM_XFLIP + db 4, -12, 9, OAM_XFLIP + db 4, -20, 10, OAM_XFLIP + db -4, -20, 11, OAM_XFLIP + db -4, -28, 12, OAM_XFLIP .data_ae477 db 8 ; size - db -3, -5, 5, (1 << OAM_X_FLIP) - db -11, -5, 6, (1 << OAM_X_FLIP) - db -11, -13, 7, (1 << OAM_X_FLIP) - db -19, -13, 8, (1 << OAM_X_FLIP) - db 3, -11, 9, (1 << OAM_X_FLIP) - db 3, -19, 10, (1 << OAM_X_FLIP) - db -5, -19, 11, (1 << OAM_X_FLIP) - db -5, -27, 12, (1 << OAM_X_FLIP) + db -3, -5, 5, OAM_XFLIP + db -11, -5, 6, OAM_XFLIP + db -11, -13, 7, OAM_XFLIP + db -19, -13, 8, OAM_XFLIP + db 3, -11, 9, OAM_XFLIP + db 3, -19, 10, OAM_XFLIP + db -5, -19, 11, OAM_XFLIP + db -5, -27, 12, OAM_XFLIP .data_ae498 db 13 ; size - db -4, -4, 5, (1 << OAM_X_FLIP) - db -12, -4, 6, (1 << OAM_X_FLIP) - db -12, -12, 7, (1 << OAM_X_FLIP) - db -20, -12, 8, (1 << OAM_X_FLIP) - db 4, -12, 9, (1 << OAM_X_FLIP) - db 4, -20, 10, (1 << OAM_X_FLIP) - db -4, -20, 11, (1 << OAM_X_FLIP) - db -4, -28, 12, (1 << OAM_X_FLIP) - db 8, 18, 0, (1 << OAM_Y_FLIP) - db 16, 18, 1, (1 << OAM_Y_FLIP) - db 16, 26, 2, (1 << OAM_Y_FLIP) - db 24, 26, 3, (1 << OAM_Y_FLIP) - db 24, 34, 4, (1 << OAM_Y_FLIP) + db -4, -4, 5, OAM_XFLIP + db -12, -4, 6, OAM_XFLIP + db -12, -12, 7, OAM_XFLIP + db -20, -12, 8, OAM_XFLIP + db 4, -12, 9, OAM_XFLIP + db 4, -20, 10, OAM_XFLIP + db -4, -20, 11, OAM_XFLIP + db -4, -28, 12, OAM_XFLIP + db 8, 18, 0, OAM_YFLIP + db 16, 18, 1, OAM_YFLIP + db 16, 26, 2, OAM_YFLIP + db 24, 26, 3, OAM_YFLIP + db 24, 34, 4, OAM_YFLIP .data_ae4cd db 5 ; size - db -8, 2, 0, (1 << OAM_Y_FLIP) - db 0, 2, 1, (1 << OAM_Y_FLIP) - db 0, 10, 2, (1 << OAM_Y_FLIP) - db 8, 10, 3, (1 << OAM_Y_FLIP) - db 8, 18, 4, (1 << OAM_Y_FLIP) + db -8, 2, 0, OAM_YFLIP + db 0, 2, 1, OAM_YFLIP + db 0, 10, 2, OAM_YFLIP + db 8, 10, 3, OAM_YFLIP + db 8, 18, 4, OAM_YFLIP .data_ae4e2 db 13 ; size - db -24, -14, 0, (1 << OAM_Y_FLIP) - db -16, -14, 1, (1 << OAM_Y_FLIP) - db -16, -6, 2, (1 << OAM_Y_FLIP) - db -8, -6, 3, (1 << OAM_Y_FLIP) - db -8, 2, 4, (1 << OAM_Y_FLIP) - db -5, -3, 5, (1 << OAM_Y_FLIP) - db 3, -3, 6, (1 << OAM_Y_FLIP) - db 3, 5, 7, (1 << OAM_Y_FLIP) - db 11, 5, 8, (1 << OAM_Y_FLIP) - db -11, 3, 9, (1 << OAM_Y_FLIP) - db -11, 11, 10, (1 << OAM_Y_FLIP) - db -3, 11, 11, (1 << OAM_Y_FLIP) - db -3, 19, 12, (1 << OAM_Y_FLIP) + db -24, -14, 0, OAM_YFLIP + db -16, -14, 1, OAM_YFLIP + db -16, -6, 2, OAM_YFLIP + db -8, -6, 3, OAM_YFLIP + db -8, 2, 4, OAM_YFLIP + db -5, -3, 5, OAM_YFLIP + db 3, -3, 6, OAM_YFLIP + db 3, 5, 7, OAM_YFLIP + db 11, 5, 8, OAM_YFLIP + db -11, 3, 9, OAM_YFLIP + db -11, 11, 10, OAM_YFLIP + db -3, 11, 11, OAM_YFLIP + db -3, 19, 12, OAM_YFLIP .data_ae517 db 11 ; size - db -32, -22, 2, (1 << OAM_Y_FLIP) - db -24, -22, 3, (1 << OAM_Y_FLIP) - db -24, -14, 4, (1 << OAM_Y_FLIP) - db -6, -2, 5, (1 << OAM_Y_FLIP) - db 2, -2, 6, (1 << OAM_Y_FLIP) - db 2, 6, 7, (1 << OAM_Y_FLIP) - db 10, 6, 8, (1 << OAM_Y_FLIP) - db -10, 2, 9, (1 << OAM_Y_FLIP) - db -10, 10, 10, (1 << OAM_Y_FLIP) - db -2, 10, 11, (1 << OAM_Y_FLIP) - db -2, 18, 12, (1 << OAM_Y_FLIP) + db -32, -22, 2, OAM_YFLIP + db -24, -22, 3, OAM_YFLIP + db -24, -14, 4, OAM_YFLIP + db -6, -2, 5, OAM_YFLIP + db 2, -2, 6, OAM_YFLIP + db 2, 6, 7, OAM_YFLIP + db 10, 6, 8, OAM_YFLIP + db -10, 2, 9, OAM_YFLIP + db -10, 10, 10, OAM_YFLIP + db -2, 10, 11, OAM_YFLIP + db -2, 18, 12, OAM_YFLIP .data_ae544 db 8 ; size - db -5, -3, 5, (1 << OAM_Y_FLIP) - db 3, -3, 6, (1 << OAM_Y_FLIP) - db 3, 5, 7, (1 << OAM_Y_FLIP) - db 11, 5, 8, (1 << OAM_Y_FLIP) - db -11, 3, 9, (1 << OAM_Y_FLIP) - db -11, 11, 10, (1 << OAM_Y_FLIP) - db -3, 11, 11, (1 << OAM_Y_FLIP) - db -3, 19, 12, (1 << OAM_Y_FLIP) + db -5, -3, 5, OAM_YFLIP + db 3, -3, 6, OAM_YFLIP + db 3, 5, 7, OAM_YFLIP + db 11, 5, 8, OAM_YFLIP + db -11, 3, 9, OAM_YFLIP + db -11, 11, 10, OAM_YFLIP + db -3, 11, 11, OAM_YFLIP + db -3, 19, 12, OAM_YFLIP .data_ae565 db 8 ; size - db -6, -2, 5, (1 << OAM_Y_FLIP) - db 2, -2, 6, (1 << OAM_Y_FLIP) - db 2, 6, 7, (1 << OAM_Y_FLIP) - db 10, 6, 8, (1 << OAM_Y_FLIP) - db -10, 2, 9, (1 << OAM_Y_FLIP) - db -10, 10, 10, (1 << OAM_Y_FLIP) - db -2, 10, 11, (1 << OAM_Y_FLIP) - db -2, 18, 12, (1 << OAM_Y_FLIP) + db -6, -2, 5, OAM_YFLIP + db 2, -2, 6, OAM_YFLIP + db 2, 6, 7, OAM_YFLIP + db 10, 6, 8, OAM_YFLIP + db -10, 2, 9, OAM_YFLIP + db -10, 10, 10, OAM_YFLIP + db -2, 10, 11, OAM_YFLIP + db -2, 18, 12, OAM_YFLIP AnimData121:: frame_table AnimFrameTable45 @@ -3062,8 +3062,8 @@ AnimFrameTable46:: db 8, 3, 6, $0 db 16, -1, 6, $0 db 24, -4, 17, $0 - db -8, 19, 14, (1 << OAM_X_FLIP) - db -8, 11, 15, (1 << OAM_X_FLIP) + db -8, 19, 14, OAM_XFLIP + db -8, 11, 15, OAM_XFLIP db 0, -8, 21, $0 db 0, 0, 22, $0 db -16, -4, 25, $0 @@ -3076,8 +3076,8 @@ AnimFrameTable46:: db 8, 7, 6, $0 db 16, 3, 6, $0 db 24, -1, 6, $0 - db 0, 19, 14, (1 << OAM_X_FLIP) - db 0, 11, 15, (1 << OAM_X_FLIP) + db 0, 19, 14, OAM_XFLIP + db 0, 11, 15, OAM_XFLIP db 0, -8, 23, $0 db 0, 0, 24, $0 db -16, -2, 29, $0 @@ -3089,8 +3089,8 @@ AnimFrameTable46:: .data_ae735 db 9 ; size db 24, 1, 6, $0 - db 16, 13, 14, (1 << OAM_X_FLIP) - db 16, 5, 15, (1 << OAM_X_FLIP) + db 16, 13, 14, OAM_XFLIP + db 16, 5, 15, OAM_XFLIP db 0, -8, 21, $0 db 0, 0, 22, $0 db -16, -4, 25, $0 @@ -3100,8 +3100,8 @@ AnimFrameTable46:: .data_ae75a db 9 ; size - db 24, 13, 14, (1 << OAM_X_FLIP) - db 24, 5, 15, (1 << OAM_X_FLIP) + db 24, 13, 14, OAM_XFLIP + db 24, 5, 15, OAM_XFLIP db 0, -8, 23, $0 db 0, 0, 24, $0 db -16, -2, 29, $0 @@ -3167,25 +3167,25 @@ AnimFrameTable47:: db 12 ; size db -8, -32, 3, $0 db -8, -24, 4, $0 - db 0, -32, 3, (1 << OAM_Y_FLIP) - db 0, -24, 4, (1 << OAM_Y_FLIP) + db 0, -32, 3, OAM_YFLIP + db 0, -24, 4, OAM_YFLIP db -8, -40, 2, $0 db -8, -48, 1, $0 db -16, -40, 0, $0 db -20, -48, 0, $0 - db 0, -40, 2, (1 << OAM_Y_FLIP) - db 0, -48, 1, (1 << OAM_Y_FLIP) - db 8, -40, 0, (1 << OAM_Y_FLIP) - db 12, -48, 0, (1 << OAM_Y_FLIP) + db 0, -40, 2, OAM_YFLIP + db 0, -48, 1, OAM_YFLIP + db 8, -40, 0, OAM_YFLIP + db 12, -48, 0, OAM_YFLIP .data_ae845 db 16 ; size - db 12, -32, 0, (1 << OAM_Y_FLIP) - db 8, -24, 0, (1 << OAM_Y_FLIP) - db 0, -32, 1, (1 << OAM_Y_FLIP) - db 0, -24, 2, (1 << OAM_Y_FLIP) - db 0, -16, 3, (1 << OAM_Y_FLIP) - db 0, -8, 4, (1 << OAM_Y_FLIP) + db 12, -32, 0, OAM_YFLIP + db 8, -24, 0, OAM_YFLIP + db 0, -32, 1, OAM_YFLIP + db 0, -24, 2, OAM_YFLIP + db 0, -16, 3, OAM_YFLIP + db 0, -8, 4, OAM_YFLIP db -10, -24, 5, $0 db -11, -32, 6, $0 db -20, -32, 0, $0 @@ -3194,17 +3194,17 @@ AnimFrameTable47:: db -8, -24, 2, $0 db -8, -16, 3, $0 db -8, -8, 4, $0 - db 2, -24, 5, (1 << OAM_Y_FLIP) - db 3, -32, 6, (1 << OAM_Y_FLIP) + db 2, -24, 5, OAM_YFLIP + db 3, -32, 6, OAM_YFLIP .data_ae886 db 16 ; size - db 12, -32, 0, (1 << OAM_Y_FLIP) - db 8, -24, 0, (1 << OAM_Y_FLIP) - db 0, -32, 1, (1 << OAM_Y_FLIP) - db 0, -24, 2, (1 << OAM_Y_FLIP) - db 0, -16, 3, (1 << OAM_Y_FLIP) - db 0, -8, 4, (1 << OAM_Y_FLIP) + db 12, -32, 0, OAM_YFLIP + db 8, -24, 0, OAM_YFLIP + db 0, -32, 1, OAM_YFLIP + db 0, -24, 2, OAM_YFLIP + db 0, -16, 3, OAM_YFLIP + db 0, -8, 4, OAM_YFLIP db -9, -24, 5, $0 db -10, -32, 6, $0 db -20, -32, 0, $0 @@ -3213,17 +3213,17 @@ AnimFrameTable47:: db -8, -24, 2, $0 db -8, -16, 3, $0 db -8, -8, 4, $0 - db 1, -24, 5, (1 << OAM_Y_FLIP) - db 2, -32, 6, (1 << OAM_Y_FLIP) + db 1, -24, 5, OAM_YFLIP + db 2, -32, 6, OAM_YFLIP .data_ae8c7 db 20 ; size - db 12, -16, 0, (1 << OAM_Y_FLIP) - db 8, -8, 0, (1 << OAM_Y_FLIP) - db 0, -16, 1, (1 << OAM_Y_FLIP) - db 0, -8, 2, (1 << OAM_Y_FLIP) - db 0, 0, 3, (1 << OAM_Y_FLIP) - db 0, 8, 4, (1 << OAM_Y_FLIP) + db 12, -16, 0, OAM_YFLIP + db 8, -8, 0, OAM_YFLIP + db 0, -16, 1, OAM_YFLIP + db 0, -8, 2, OAM_YFLIP + db 0, 0, 3, OAM_YFLIP + db 0, 8, 4, OAM_YFLIP db -10, -8, 5, $0 db -11, -16, 6, $0 db -12, -24, 7, $0 @@ -3234,19 +3234,19 @@ AnimFrameTable47:: db -8, -8, 2, $0 db -8, 0, 3, $0 db -8, 8, 4, $0 - db 2, -8, 5, (1 << OAM_Y_FLIP) - db 3, -16, 6, (1 << OAM_Y_FLIP) - db 4, -24, 7, (1 << OAM_Y_FLIP) - db 5, -32, 8, (1 << OAM_Y_FLIP) + db 2, -8, 5, OAM_YFLIP + db 3, -16, 6, OAM_YFLIP + db 4, -24, 7, OAM_YFLIP + db 5, -32, 8, OAM_YFLIP .data_ae918 db 20 ; size - db 12, -16, 0, (1 << OAM_Y_FLIP) - db 8, -8, 0, (1 << OAM_Y_FLIP) - db 0, -16, 1, (1 << OAM_Y_FLIP) - db 0, -8, 2, (1 << OAM_Y_FLIP) - db 0, 0, 3, (1 << OAM_Y_FLIP) - db 0, 8, 4, (1 << OAM_Y_FLIP) + db 12, -16, 0, OAM_YFLIP + db 8, -8, 0, OAM_YFLIP + db 0, -16, 1, OAM_YFLIP + db 0, -8, 2, OAM_YFLIP + db 0, 0, 3, OAM_YFLIP + db 0, 8, 4, OAM_YFLIP db -9, -8, 5, $0 db -10, -16, 6, $0 db -11, -24, 7, $0 @@ -3257,19 +3257,19 @@ AnimFrameTable47:: db -8, -8, 2, $0 db -8, 0, 3, $0 db -8, 8, 4, $0 - db 1, -8, 5, (1 << OAM_Y_FLIP) - db 2, -16, 6, (1 << OAM_Y_FLIP) - db 3, -24, 7, (1 << OAM_Y_FLIP) - db 4, -32, 8, (1 << OAM_Y_FLIP) + db 1, -8, 5, OAM_YFLIP + db 2, -16, 6, OAM_YFLIP + db 3, -24, 7, OAM_YFLIP + db 4, -32, 8, OAM_YFLIP .data_ae969 db 24 ; size - db 12, 0, 0, (1 << OAM_Y_FLIP) - db 8, 8, 0, (1 << OAM_Y_FLIP) - db 0, 0, 1, (1 << OAM_Y_FLIP) - db 0, 8, 2, (1 << OAM_Y_FLIP) - db 0, 16, 3, (1 << OAM_Y_FLIP) - db 0, 24, 4, (1 << OAM_Y_FLIP) + db 12, 0, 0, OAM_YFLIP + db 8, 8, 0, OAM_YFLIP + db 0, 0, 1, OAM_YFLIP + db 0, 8, 2, OAM_YFLIP + db 0, 16, 3, OAM_YFLIP + db 0, 24, 4, OAM_YFLIP db -10, 8, 5, $0 db -11, 0, 6, $0 db -12, -8, 7, $0 @@ -3282,21 +3282,21 @@ AnimFrameTable47:: db -8, 8, 2, $0 db -8, 16, 3, $0 db -8, 24, 4, $0 - db 2, 8, 5, (1 << OAM_Y_FLIP) - db 3, 0, 6, (1 << OAM_Y_FLIP) - db 4, -8, 7, (1 << OAM_Y_FLIP) - db 5, -16, 8, (1 << OAM_Y_FLIP) - db 6, -24, 8, (1 << OAM_Y_FLIP) - db 7, -32, 8, (1 << OAM_Y_FLIP) + db 2, 8, 5, OAM_YFLIP + db 3, 0, 6, OAM_YFLIP + db 4, -8, 7, OAM_YFLIP + db 5, -16, 8, OAM_YFLIP + db 6, -24, 8, OAM_YFLIP + db 7, -32, 8, OAM_YFLIP .data_ae9ca db 24 ; size - db 12, 0, 0, (1 << OAM_Y_FLIP) - db 8, 8, 0, (1 << OAM_Y_FLIP) - db 0, 0, 1, (1 << OAM_Y_FLIP) - db 0, 8, 2, (1 << OAM_Y_FLIP) - db 0, 16, 3, (1 << OAM_Y_FLIP) - db 0, 24, 4, (1 << OAM_Y_FLIP) + db 12, 0, 0, OAM_YFLIP + db 8, 8, 0, OAM_YFLIP + db 0, 0, 1, OAM_YFLIP + db 0, 8, 2, OAM_YFLIP + db 0, 16, 3, OAM_YFLIP + db 0, 24, 4, OAM_YFLIP db -9, 8, 5, $0 db -10, 0, 6, $0 db -11, -8, 7, $0 @@ -3309,19 +3309,19 @@ AnimFrameTable47:: db -8, 8, 2, $0 db -8, 16, 3, $0 db -8, 24, 4, $0 - db 1, 8, 5, (1 << OAM_Y_FLIP) - db 2, 0, 6, (1 << OAM_Y_FLIP) - db 3, -8, 7, (1 << OAM_Y_FLIP) - db 4, -16, 8, (1 << OAM_Y_FLIP) - db 5, -24, 8, (1 << OAM_Y_FLIP) - db 6, -32, 8, (1 << OAM_Y_FLIP) + db 1, 8, 5, OAM_YFLIP + db 2, 0, 6, OAM_YFLIP + db 3, -8, 7, OAM_YFLIP + db 4, -16, 8, OAM_YFLIP + db 5, -24, 8, OAM_YFLIP + db 6, -32, 8, OAM_YFLIP .data_aea2b db 28 ; size - db 12, 16, 0, (1 << OAM_Y_FLIP) - db 8, 24, 0, (1 << OAM_Y_FLIP) - db 0, 16, 1, (1 << OAM_Y_FLIP) - db 0, 24, 2, (1 << OAM_Y_FLIP) + db 12, 16, 0, OAM_YFLIP + db 8, 24, 0, OAM_YFLIP + db 0, 16, 1, OAM_YFLIP + db 0, 24, 2, OAM_YFLIP db -10, 24, 5, $0 db -11, 16, 6, $0 db -12, 8, 7, $0 @@ -3334,25 +3334,25 @@ AnimFrameTable47:: db -16, 24, 0, $0 db -8, 16, 1, $0 db -8, 24, 2, $0 - db 2, 24, 5, (1 << OAM_Y_FLIP) - db 3, 16, 6, (1 << OAM_Y_FLIP) - db 4, 8, 7, (1 << OAM_Y_FLIP) - db 5, 0, 8, (1 << OAM_Y_FLIP) - db 6, -8, 8, (1 << OAM_Y_FLIP) - db 7, -16, 8, (1 << OAM_Y_FLIP) - db 8, -24, 8, (1 << OAM_Y_FLIP) - db 9, -32, 8, (1 << OAM_Y_FLIP) - db 0, 32, 3, (1 << OAM_Y_FLIP) - db 0, 40, 4, (1 << OAM_Y_FLIP) + db 2, 24, 5, OAM_YFLIP + db 3, 16, 6, OAM_YFLIP + db 4, 8, 7, OAM_YFLIP + db 5, 0, 8, OAM_YFLIP + db 6, -8, 8, OAM_YFLIP + db 7, -16, 8, OAM_YFLIP + db 8, -24, 8, OAM_YFLIP + db 9, -32, 8, OAM_YFLIP + db 0, 32, 3, OAM_YFLIP + db 0, 40, 4, OAM_YFLIP db -8, 32, 3, $0 db -8, 40, 4, $0 .data_aea9c db 28 ; size - db 12, 16, 0, (1 << OAM_Y_FLIP) - db 8, 24, 0, (1 << OAM_Y_FLIP) - db 0, 16, 1, (1 << OAM_Y_FLIP) - db 0, 24, 2, (1 << OAM_Y_FLIP) + db 12, 16, 0, OAM_YFLIP + db 8, 24, 0, OAM_YFLIP + db 0, 16, 1, OAM_YFLIP + db 0, 24, 2, OAM_YFLIP db -9, 24, 5, $0 db -10, 16, 6, $0 db -11, 8, 7, $0 @@ -3365,16 +3365,16 @@ AnimFrameTable47:: db -16, 24, 0, $0 db -8, 16, 1, $0 db -8, 24, 2, $0 - db 1, 24, 5, (1 << OAM_Y_FLIP) - db 2, 16, 6, (1 << OAM_Y_FLIP) - db 3, 8, 7, (1 << OAM_Y_FLIP) - db 4, 0, 8, (1 << OAM_Y_FLIP) - db 5, -8, 8, (1 << OAM_Y_FLIP) - db 6, -16, 8, (1 << OAM_Y_FLIP) - db 7, -24, 8, (1 << OAM_Y_FLIP) - db 8, -32, 8, (1 << OAM_Y_FLIP) - db 0, 32, 3, (1 << OAM_Y_FLIP) - db 0, 40, 4, (1 << OAM_Y_FLIP) + db 1, 24, 5, OAM_YFLIP + db 2, 16, 6, OAM_YFLIP + db 3, 8, 7, OAM_YFLIP + db 4, 0, 8, OAM_YFLIP + db 5, -8, 8, OAM_YFLIP + db 6, -16, 8, OAM_YFLIP + db 7, -24, 8, OAM_YFLIP + db 8, -32, 8, OAM_YFLIP + db 0, 32, 3, OAM_YFLIP + db 0, 40, 4, OAM_YFLIP db -8, 32, 3, $0 db -8, 40, 4, $0 @@ -3388,14 +3388,14 @@ AnimFrameTable47:: db -17, -16, 8, $0 db -18, -24, 8, $0 db -19, -32, 8, $0 - db 4, 24, 7, (1 << OAM_Y_FLIP) - db 5, 16, 8, (1 << OAM_Y_FLIP) - db 6, 8, 8, (1 << OAM_Y_FLIP) - db 7, 0, 8, (1 << OAM_Y_FLIP) - db 8, -8, 8, (1 << OAM_Y_FLIP) - db 9, -16, 8, (1 << OAM_Y_FLIP) - db 10, -24, 8, (1 << OAM_Y_FLIP) - db 11, -32, 8, (1 << OAM_Y_FLIP) + db 4, 24, 7, OAM_YFLIP + db 5, 16, 8, OAM_YFLIP + db 6, 8, 8, OAM_YFLIP + db 7, 0, 8, OAM_YFLIP + db 8, -8, 8, OAM_YFLIP + db 9, -16, 8, OAM_YFLIP + db 10, -24, 8, OAM_YFLIP + db 11, -32, 8, OAM_YFLIP .data_aeb4e db 16 ; size @@ -3407,14 +3407,14 @@ AnimFrameTable47:: db -16, -16, 8, $0 db -17, -24, 8, $0 db -18, -32, 8, $0 - db 3, 24, 7, (1 << OAM_Y_FLIP) - db 4, 16, 8, (1 << OAM_Y_FLIP) - db 5, 8, 8, (1 << OAM_Y_FLIP) - db 6, 0, 8, (1 << OAM_Y_FLIP) - db 7, -8, 8, (1 << OAM_Y_FLIP) - db 8, -16, 8, (1 << OAM_Y_FLIP) - db 9, -24, 8, (1 << OAM_Y_FLIP) - db 10, -32, 8, (1 << OAM_Y_FLIP) + db 3, 24, 7, OAM_YFLIP + db 4, 16, 8, OAM_YFLIP + db 5, 8, 8, OAM_YFLIP + db 6, 0, 8, OAM_YFLIP + db 7, -8, 8, OAM_YFLIP + db 8, -16, 8, OAM_YFLIP + db 9, -24, 8, OAM_YFLIP + db 10, -32, 8, OAM_YFLIP .data_aeb8f db 16 ; size @@ -3426,14 +3426,14 @@ AnimFrameTable47:: db -19, -16, 8, $0 db -20, -24, 9, $0 db -21, -32, 9, $0 - db 6, 24, 8, (1 << OAM_Y_FLIP) - db 7, 16, 8, (1 << OAM_Y_FLIP) - db 8, 8, 8, (1 << OAM_Y_FLIP) - db 9, 0, 8, (1 << OAM_Y_FLIP) - db 10, -8, 8, (1 << OAM_Y_FLIP) - db 11, -16, 8, (1 << OAM_Y_FLIP) - db 12, -24, 9, (1 << OAM_Y_FLIP) - db 13, -32, 9, (1 << OAM_Y_FLIP) + db 6, 24, 8, OAM_YFLIP + db 7, 16, 8, OAM_YFLIP + db 8, 8, 8, OAM_YFLIP + db 9, 0, 8, OAM_YFLIP + db 10, -8, 8, OAM_YFLIP + db 11, -16, 8, OAM_YFLIP + db 12, -24, 9, OAM_YFLIP + db 13, -32, 9, OAM_YFLIP .data_aebd0 db 16 ; size @@ -3445,14 +3445,14 @@ AnimFrameTable47:: db -18, -16, 8, $0 db -19, -24, 9, $0 db -20, -32, 9, $0 - db 5, 24, 8, (1 << OAM_Y_FLIP) - db 6, 16, 8, (1 << OAM_Y_FLIP) - db 7, 8, 8, (1 << OAM_Y_FLIP) - db 8, 0, 8, (1 << OAM_Y_FLIP) - db 9, -8, 8, (1 << OAM_Y_FLIP) - db 10, -16, 8, (1 << OAM_Y_FLIP) - db 11, -24, 9, (1 << OAM_Y_FLIP) - db 12, -32, 9, (1 << OAM_Y_FLIP) + db 5, 24, 8, OAM_YFLIP + db 6, 16, 8, OAM_YFLIP + db 7, 8, 8, OAM_YFLIP + db 8, 0, 8, OAM_YFLIP + db 9, -8, 8, OAM_YFLIP + db 10, -16, 8, OAM_YFLIP + db 11, -24, 9, OAM_YFLIP + db 12, -32, 9, OAM_YFLIP .data_aec11 db 16 ; size @@ -3464,14 +3464,14 @@ AnimFrameTable47:: db -21, -16, 9, $0 db -23, -32, 10, $0 db -22, -24, 10, $0 - db 8, 24, 8, (1 << OAM_Y_FLIP) - db 9, 16, 8, (1 << OAM_Y_FLIP) - db 10, 8, 8, (1 << OAM_Y_FLIP) - db 11, 0, 8, (1 << OAM_Y_FLIP) - db 12, -8, 9, (1 << OAM_Y_FLIP) - db 13, -16, 9, (1 << OAM_Y_FLIP) - db 15, -32, 10, (1 << OAM_Y_FLIP) - db 14, -24, 10, (1 << OAM_Y_FLIP) + db 8, 24, 8, OAM_YFLIP + db 9, 16, 8, OAM_YFLIP + db 10, 8, 8, OAM_YFLIP + db 11, 0, 8, OAM_YFLIP + db 12, -8, 9, OAM_YFLIP + db 13, -16, 9, OAM_YFLIP + db 15, -32, 10, OAM_YFLIP + db 14, -24, 10, OAM_YFLIP .data_aec52 db 16 ; size @@ -3483,14 +3483,14 @@ AnimFrameTable47:: db -20, -16, 9, $0 db -22, -32, 10, $0 db -21, -24, 10, $0 - db 7, 24, 8, (1 << OAM_Y_FLIP) - db 8, 16, 8, (1 << OAM_Y_FLIP) - db 9, 8, 8, (1 << OAM_Y_FLIP) - db 10, 0, 8, (1 << OAM_Y_FLIP) - db 11, -8, 9, (1 << OAM_Y_FLIP) - db 12, -16, 9, (1 << OAM_Y_FLIP) - db 14, -32, 10, (1 << OAM_Y_FLIP) - db 13, -24, 10, (1 << OAM_Y_FLIP) + db 7, 24, 8, OAM_YFLIP + db 8, 16, 8, OAM_YFLIP + db 9, 8, 8, OAM_YFLIP + db 10, 0, 8, OAM_YFLIP + db 11, -8, 9, OAM_YFLIP + db 12, -16, 9, OAM_YFLIP + db 14, -32, 10, OAM_YFLIP + db 13, -24, 10, OAM_YFLIP .data_aec93 db 16 ; size @@ -3502,14 +3502,14 @@ AnimFrameTable47:: db -22, -8, 10, $0 db -25, -32, 11, $0 db -24, -24, 11, $0 - db 10, 24, 8, (1 << OAM_Y_FLIP) - db 11, 16, 8, (1 << OAM_Y_FLIP) - db 12, 8, 9, (1 << OAM_Y_FLIP) - db 13, 0, 9, (1 << OAM_Y_FLIP) - db 15, -16, 10, (1 << OAM_Y_FLIP) - db 14, -8, 10, (1 << OAM_Y_FLIP) - db 17, -32, 11, (1 << OAM_Y_FLIP) - db 16, -24, 11, (1 << OAM_Y_FLIP) + db 10, 24, 8, OAM_YFLIP + db 11, 16, 8, OAM_YFLIP + db 12, 8, 9, OAM_YFLIP + db 13, 0, 9, OAM_YFLIP + db 15, -16, 10, OAM_YFLIP + db 14, -8, 10, OAM_YFLIP + db 17, -32, 11, OAM_YFLIP + db 16, -24, 11, OAM_YFLIP .data_aecd4 db 16 ; size @@ -3521,14 +3521,14 @@ AnimFrameTable47:: db -21, -8, 10, $0 db -24, -32, 11, $0 db -23, -24, 11, $0 - db 9, 24, 8, (1 << OAM_Y_FLIP) - db 10, 16, 8, (1 << OAM_Y_FLIP) - db 11, 8, 9, (1 << OAM_Y_FLIP) - db 12, 0, 9, (1 << OAM_Y_FLIP) - db 14, -16, 10, (1 << OAM_Y_FLIP) - db 13, -8, 10, (1 << OAM_Y_FLIP) - db 16, -32, 11, (1 << OAM_Y_FLIP) - db 15, -24, 11, (1 << OAM_Y_FLIP) + db 9, 24, 8, OAM_YFLIP + db 10, 16, 8, OAM_YFLIP + db 11, 8, 9, OAM_YFLIP + db 12, 0, 9, OAM_YFLIP + db 14, -16, 10, OAM_YFLIP + db 13, -8, 10, OAM_YFLIP + db 16, -32, 11, OAM_YFLIP + db 15, -24, 11, OAM_YFLIP .data_aed15 db 12 ; size @@ -3538,12 +3538,12 @@ AnimFrameTable47:: db -22, 8, 10, $0 db -25, -16, 11, $0 db -24, -8, 11, $0 - db 12, 24, 9, (1 << OAM_Y_FLIP) - db 13, 16, 9, (1 << OAM_Y_FLIP) - db 15, 0, 10, (1 << OAM_Y_FLIP) - db 14, 8, 10, (1 << OAM_Y_FLIP) - db 17, -16, 11, (1 << OAM_Y_FLIP) - db 16, -8, 11, (1 << OAM_Y_FLIP) + db 12, 24, 9, OAM_YFLIP + db 13, 16, 9, OAM_YFLIP + db 15, 0, 10, OAM_YFLIP + db 14, 8, 10, OAM_YFLIP + db 17, -16, 11, OAM_YFLIP + db 16, -8, 11, OAM_YFLIP .data_aed46 db 12 ; size @@ -3553,12 +3553,12 @@ AnimFrameTable47:: db -21, 8, 10, $0 db -24, -16, 11, $0 db -23, -8, 11, $0 - db 11, 24, 9, (1 << OAM_Y_FLIP) - db 12, 16, 9, (1 << OAM_Y_FLIP) - db 14, 0, 10, (1 << OAM_Y_FLIP) - db 13, 8, 10, (1 << OAM_Y_FLIP) - db 16, -16, 11, (1 << OAM_Y_FLIP) - db 15, -8, 11, (1 << OAM_Y_FLIP) + db 11, 24, 9, OAM_YFLIP + db 12, 16, 9, OAM_YFLIP + db 14, 0, 10, OAM_YFLIP + db 13, 8, 10, OAM_YFLIP + db 16, -16, 11, OAM_YFLIP + db 15, -8, 11, OAM_YFLIP .data_aed77 db 8 ; size @@ -3566,10 +3566,10 @@ AnimFrameTable47:: db -22, 24, 10, $0 db -25, 0, 11, $0 db -24, 8, 11, $0 - db 15, 16, 10, (1 << OAM_Y_FLIP) - db 14, 24, 10, (1 << OAM_Y_FLIP) - db 17, 0, 11, (1 << OAM_Y_FLIP) - db 16, 8, 11, (1 << OAM_Y_FLIP) + db 15, 16, 10, OAM_YFLIP + db 14, 24, 10, OAM_YFLIP + db 17, 0, 11, OAM_YFLIP + db 16, 8, 11, OAM_YFLIP .data_aed98 db 8 ; size @@ -3577,24 +3577,24 @@ AnimFrameTable47:: db -21, 24, 10, $0 db -24, 0, 11, $0 db -23, 8, 11, $0 - db 14, 16, 10, (1 << OAM_Y_FLIP) - db 13, 24, 10, (1 << OAM_Y_FLIP) - db 16, 0, 11, (1 << OAM_Y_FLIP) - db 15, 8, 11, (1 << OAM_Y_FLIP) + db 14, 16, 10, OAM_YFLIP + db 13, 24, 10, OAM_YFLIP + db 16, 0, 11, OAM_YFLIP + db 15, 8, 11, OAM_YFLIP .data_aedb9 db 4 ; size db -25, 16, 11, $0 db -24, 24, 11, $0 - db 17, 16, 11, (1 << OAM_Y_FLIP) - db 16, 24, 11, (1 << OAM_Y_FLIP) + db 17, 16, 11, OAM_YFLIP + db 16, 24, 11, OAM_YFLIP .data_aedca db 4 ; size db -24, 16, 11, $0 db -23, 24, 11, $0 - db 16, 16, 11, (1 << OAM_Y_FLIP) - db 15, 24, 11, (1 << OAM_Y_FLIP) + db 16, 16, 11, OAM_YFLIP + db 15, 24, 11, OAM_YFLIP AnimData124:: frame_table AnimFrameTable48 @@ -3644,112 +3644,112 @@ AnimFrameTable48:: .data_aee76 db 13 ; size - db -32, -16, 0, (1 << OAM_X_FLIP) - db -32, -24, 1, (1 << OAM_X_FLIP) - db -24, -8, 2, (1 << OAM_X_FLIP) - db -24, -16, 3, (1 << OAM_X_FLIP) - db -24, -24, 4, (1 << OAM_X_FLIP) - db -24, -32, 5, (1 << OAM_X_FLIP) - db -16, -8, 6, (1 << OAM_X_FLIP) - db -16, -16, 7, (1 << OAM_X_FLIP) - db -16, -24, 8, (1 << OAM_X_FLIP) - db -16, -32, 9, (1 << OAM_X_FLIP) - db -8, -8, 10, (1 << OAM_X_FLIP) - db -8, -16, 9, (1 << OAM_X_FLIP) - db -8, -24, 2, (1 << OAM_Y_FLIP) + db -32, -16, 0, OAM_XFLIP + db -32, -24, 1, OAM_XFLIP + db -24, -8, 2, OAM_XFLIP + db -24, -16, 3, OAM_XFLIP + db -24, -24, 4, OAM_XFLIP + db -24, -32, 5, OAM_XFLIP + db -16, -8, 6, OAM_XFLIP + db -16, -16, 7, OAM_XFLIP + db -16, -24, 8, OAM_XFLIP + db -16, -32, 9, OAM_XFLIP + db -8, -8, 10, OAM_XFLIP + db -8, -16, 9, OAM_XFLIP + db -8, -24, 2, OAM_YFLIP .data_aeeab db 13 ; size - db -32, -16, 0, (1 << OAM_X_FLIP) - db -24, -8, 2, (1 << OAM_X_FLIP) - db -24, -32, 5, (1 << OAM_X_FLIP) - db -16, -24, 8, (1 << OAM_X_FLIP) - db -16, -32, 9, (1 << OAM_X_FLIP) - db -8, -16, 9, (1 << OAM_X_FLIP) - db -8, -24, 2, (1 << OAM_Y_FLIP) - db -32, -24, 11, (1 << OAM_X_FLIP) - db -24, -16, 12, (1 << OAM_X_FLIP) - db -24, -24, 13, (1 << OAM_X_FLIP) - db -16, -8, 14, (1 << OAM_X_FLIP) - db -16, -16, 15, (1 << OAM_X_FLIP) - db -8, -8, 16, (1 << OAM_X_FLIP) + db -32, -16, 0, OAM_XFLIP + db -24, -8, 2, OAM_XFLIP + db -24, -32, 5, OAM_XFLIP + db -16, -24, 8, OAM_XFLIP + db -16, -32, 9, OAM_XFLIP + db -8, -16, 9, OAM_XFLIP + db -8, -24, 2, OAM_YFLIP + db -32, -24, 11, OAM_XFLIP + db -24, -16, 12, OAM_XFLIP + db -24, -24, 13, OAM_XFLIP + db -16, -8, 14, OAM_XFLIP + db -16, -16, 15, OAM_XFLIP + db -8, -8, 16, OAM_XFLIP .data_aeee0 db 13 ; size - db -24, -8, 2, (1 << OAM_X_FLIP) - db -24, -32, 5, (1 << OAM_X_FLIP) - db -16, -24, 8, (1 << OAM_X_FLIP) - db -16, -32, 9, (1 << OAM_X_FLIP) - db -8, -16, 9, (1 << OAM_X_FLIP) - db -8, -24, 2, (1 << OAM_Y_FLIP) - db -32, -16, 17, (1 << OAM_X_FLIP) - db -32, -24, 18, (1 << OAM_X_FLIP) - db -24, -16, 19, (1 << OAM_X_FLIP) - db -24, -24, 20, (1 << OAM_X_FLIP) - db -16, -8, 21, (1 << OAM_X_FLIP) - db -16, -16, 22, (1 << OAM_X_FLIP) - db -8, -8, 23, (1 << OAM_X_FLIP) + db -24, -8, 2, OAM_XFLIP + db -24, -32, 5, OAM_XFLIP + db -16, -24, 8, OAM_XFLIP + db -16, -32, 9, OAM_XFLIP + db -8, -16, 9, OAM_XFLIP + db -8, -24, 2, OAM_YFLIP + db -32, -16, 17, OAM_XFLIP + db -32, -24, 18, OAM_XFLIP + db -24, -16, 19, OAM_XFLIP + db -24, -24, 20, OAM_XFLIP + db -16, -8, 21, OAM_XFLIP + db -16, -16, 22, OAM_XFLIP + db -8, -8, 23, OAM_XFLIP .data_aef15 db 18 ; size - db -32, -16, 0, (1 << OAM_X_FLIP) - db -32, -24, 1, (1 << OAM_X_FLIP) - db -24, -8, 2, (1 << OAM_X_FLIP) - db -24, -16, 3, (1 << OAM_X_FLIP) - db -24, -24, 4, (1 << OAM_X_FLIP) - db -24, -32, 5, (1 << OAM_X_FLIP) - db -16, -8, 6, (1 << OAM_X_FLIP) - db -16, -16, 7, (1 << OAM_X_FLIP) - db -16, -24, 8, (1 << OAM_X_FLIP) - db -16, -32, 9, (1 << OAM_X_FLIP) - db -8, -16, 9, (1 << OAM_X_FLIP) - db -8, -24, 2, (1 << OAM_Y_FLIP) - db -8, 0, 24, (1 << OAM_X_FLIP) - db -8, -8, 25, (1 << OAM_X_FLIP) - db 0, 0, 26, (1 << OAM_X_FLIP) - db 0, -8, 27, (1 << OAM_X_FLIP) + db -32, -16, 0, OAM_XFLIP + db -32, -24, 1, OAM_XFLIP + db -24, -8, 2, OAM_XFLIP + db -24, -16, 3, OAM_XFLIP + db -24, -24, 4, OAM_XFLIP + db -24, -32, 5, OAM_XFLIP + db -16, -8, 6, OAM_XFLIP + db -16, -16, 7, OAM_XFLIP + db -16, -24, 8, OAM_XFLIP + db -16, -32, 9, OAM_XFLIP + db -8, -16, 9, OAM_XFLIP + db -8, -24, 2, OAM_YFLIP + db -8, 0, 24, OAM_XFLIP + db -8, -8, 25, OAM_XFLIP + db 0, 0, 26, OAM_XFLIP + db 0, -8, 27, OAM_XFLIP db 4, 4, 36, $0 db 2, -20, 36, $0 .data_aef5e db 18 ; size - db -31, -16, 0, (1 << OAM_X_FLIP) - db -23, -8, 2, (1 << OAM_X_FLIP) - db -23, -32, 5, (1 << OAM_X_FLIP) - db -15, -24, 8, (1 << OAM_X_FLIP) - db -15, -32, 9, (1 << OAM_X_FLIP) - db -7, -16, 9, (1 << OAM_X_FLIP) - db -7, -24, 2, (1 << OAM_Y_FLIP) - db -31, -24, 11, (1 << OAM_X_FLIP) - db -23, -16, 12, (1 << OAM_X_FLIP) - db -23, -24, 13, (1 << OAM_X_FLIP) - db -15, -8, 14, (1 << OAM_X_FLIP) - db -15, -16, 15, (1 << OAM_X_FLIP) - db -7, 0, 28, (1 << OAM_X_FLIP) - db -7, -8, 29, (1 << OAM_X_FLIP) - db 1, 0, 30, (1 << OAM_X_FLIP) - db 1, -8, 31, (1 << OAM_X_FLIP) + db -31, -16, 0, OAM_XFLIP + db -23, -8, 2, OAM_XFLIP + db -23, -32, 5, OAM_XFLIP + db -15, -24, 8, OAM_XFLIP + db -15, -32, 9, OAM_XFLIP + db -7, -16, 9, OAM_XFLIP + db -7, -24, 2, OAM_YFLIP + db -31, -24, 11, OAM_XFLIP + db -23, -16, 12, OAM_XFLIP + db -23, -24, 13, OAM_XFLIP + db -15, -8, 14, OAM_XFLIP + db -15, -16, 15, OAM_XFLIP + db -7, 0, 28, OAM_XFLIP + db -7, -8, 29, OAM_XFLIP + db 1, 0, 30, OAM_XFLIP + db 1, -8, 31, OAM_XFLIP db -16, 1, 36, $0 db 10, 10, 36, $0 .data_aefa7 db 18 ; size - db -24, -8, 2, (1 << OAM_X_FLIP) - db -24, -32, 5, (1 << OAM_X_FLIP) - db -16, -24, 8, (1 << OAM_X_FLIP) - db -16, -32, 9, (1 << OAM_X_FLIP) - db -8, -16, 9, (1 << OAM_X_FLIP) - db -8, -24, 2, (1 << OAM_Y_FLIP) - db -32, -16, 17, (1 << OAM_X_FLIP) - db -32, -24, 18, (1 << OAM_X_FLIP) - db -24, -16, 19, (1 << OAM_X_FLIP) - db -24, -24, 20, (1 << OAM_X_FLIP) - db -16, -8, 21, (1 << OAM_X_FLIP) - db -16, -16, 22, (1 << OAM_X_FLIP) - db -8, 0, 32, (1 << OAM_X_FLIP) - db -8, -8, 33, (1 << OAM_X_FLIP) - db 0, 0, 34, (1 << OAM_X_FLIP) - db 0, -8, 35, (1 << OAM_X_FLIP) + db -24, -8, 2, OAM_XFLIP + db -24, -32, 5, OAM_XFLIP + db -16, -24, 8, OAM_XFLIP + db -16, -32, 9, OAM_XFLIP + db -8, -16, 9, OAM_XFLIP + db -8, -24, 2, OAM_YFLIP + db -32, -16, 17, OAM_XFLIP + db -32, -24, 18, OAM_XFLIP + db -24, -16, 19, OAM_XFLIP + db -24, -24, 20, OAM_XFLIP + db -16, -8, 21, OAM_XFLIP + db -16, -16, 22, OAM_XFLIP + db -8, 0, 32, OAM_XFLIP + db -8, -8, 33, OAM_XFLIP + db 0, 0, 34, OAM_XFLIP + db 0, -8, 35, OAM_XFLIP db -1, -13, 36, $0 db -24, 4, 36, $0 @@ -3832,18 +3832,18 @@ AnimFrameTable49:: .data_af0ea db 12 ; size - db -16, -8, 0, (1 << OAM_X_FLIP) - db -8, 8, 1, (1 << OAM_X_FLIP) - db -8, 0, 2, (1 << OAM_X_FLIP) - db -8, -8, 3, (1 << OAM_X_FLIP) - db 0, 16, 4, (1 << OAM_X_FLIP) - db 0, 8, 5, (1 << OAM_X_FLIP) - db 0, 0, 6, (1 << OAM_X_FLIP) - db 0, -8, 7, (1 << OAM_X_FLIP) - db 8, 16, 8, (1 << OAM_X_FLIP) - db 8, 8, 9, (1 << OAM_X_FLIP) - db 8, 0, 10, (1 << OAM_X_FLIP) - db 8, -8, 11, (1 << OAM_X_FLIP) + db -16, -8, 0, OAM_XFLIP + db -8, 8, 1, OAM_XFLIP + db -8, 0, 2, OAM_XFLIP + db -8, -8, 3, OAM_XFLIP + db 0, 16, 4, OAM_XFLIP + db 0, 8, 5, OAM_XFLIP + db 0, 0, 6, OAM_XFLIP + db 0, -8, 7, OAM_XFLIP + db 8, 16, 8, OAM_XFLIP + db 8, 8, 9, OAM_XFLIP + db 8, 0, 10, OAM_XFLIP + db 8, -8, 11, OAM_XFLIP AnimData126:: frame_table AnimFrameTable50 @@ -3917,13 +3917,13 @@ AnimFrameTable50:: db 3 ; size db -52, -52, 6, $0 db -52, -44, 7, $0 - db -52, -36, 6, (1 << OAM_X_FLIP) + db -52, -36, 6, OAM_XFLIP .data_af20f db 4 ; size db -55, -52, 3, $0 db -55, -44, 4, $0 - db -47, -44, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -47, -44, 4, OAM_XFLIP | OAM_YFLIP db -47, -36, 5, $0 .data_af220 @@ -3934,16 +3934,16 @@ AnimFrameTable50:: .data_af22d db 4 ; size - db -55, -36, 3, (1 << OAM_X_FLIP) - db -55, -44, 4, (1 << OAM_X_FLIP) - db -47, -44, 4, (1 << OAM_Y_FLIP) - db -47, -52, 5, (1 << OAM_X_FLIP) + db -55, -36, 3, OAM_XFLIP + db -55, -44, 4, OAM_XFLIP + db -47, -44, 4, OAM_YFLIP + db -47, -52, 5, OAM_XFLIP .data_af23e db 7 ; size db -52, -52, 6, $0 db -52, -44, 7, $0 - db -52, -36, 6, (1 << OAM_X_FLIP) + db -52, -36, 6, OAM_XFLIP db -66, -58, 8, $0 db -66, -50, 9, $0 db -58, -58, 10, $0 @@ -3953,12 +3953,12 @@ AnimFrameTable50:: db 8 ; size db -55, -52, 3, $0 db -55, -44, 4, $0 - db -47, -44, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -47, -44, 4, OAM_XFLIP | OAM_YFLIP db -47, -36, 5, $0 - db -61, -61, 8, (1 << OAM_Y_FLIP) - db -61, -53, 9, (1 << OAM_Y_FLIP) - db -69, -61, 10, (1 << OAM_Y_FLIP) - db -69, -53, 11, (1 << OAM_Y_FLIP) + db -61, -61, 8, OAM_YFLIP + db -61, -53, 9, OAM_YFLIP + db -69, -61, 10, OAM_YFLIP + db -69, -53, 11, OAM_YFLIP .data_af27c db 7 ; size @@ -3972,14 +3972,14 @@ AnimFrameTable50:: .data_af299 db 8 ; size - db -66, -67, 8, (1 << OAM_Y_FLIP) - db -66, -59, 9, (1 << OAM_Y_FLIP) - db -74, -67, 10, (1 << OAM_Y_FLIP) - db -74, -59, 11, (1 << OAM_Y_FLIP) - db -55, -36, 3, (1 << OAM_X_FLIP) - db -55, -44, 4, (1 << OAM_X_FLIP) - db -47, -44, 4, (1 << OAM_Y_FLIP) - db -47, -52, 5, (1 << OAM_X_FLIP) + db -66, -67, 8, OAM_YFLIP + db -66, -59, 9, OAM_YFLIP + db -74, -67, 10, OAM_YFLIP + db -74, -59, 11, OAM_YFLIP + db -55, -36, 3, OAM_XFLIP + db -55, -44, 4, OAM_XFLIP + db -47, -44, 4, OAM_YFLIP + db -47, -52, 5, OAM_XFLIP .data_af2ba db 7 ; size @@ -3993,20 +3993,20 @@ AnimFrameTable50:: .data_af2d7 db 8 ; size - db -55, -36, 3, (1 << OAM_X_FLIP) - db -55, -44, 4, (1 << OAM_X_FLIP) - db -47, -44, 4, (1 << OAM_Y_FLIP) - db -47, -52, 5, (1 << OAM_X_FLIP) - db -35, -35, 8, (1 << OAM_Y_FLIP) - db -35, -27, 9, (1 << OAM_Y_FLIP) - db -43, -35, 10, (1 << OAM_Y_FLIP) - db -43, -27, 11, (1 << OAM_Y_FLIP) + db -55, -36, 3, OAM_XFLIP + db -55, -44, 4, OAM_XFLIP + db -47, -44, 4, OAM_YFLIP + db -47, -52, 5, OAM_XFLIP + db -35, -35, 8, OAM_YFLIP + db -35, -27, 9, OAM_YFLIP + db -43, -35, 10, OAM_YFLIP + db -43, -27, 11, OAM_YFLIP .data_af2f8 db 7 ; size db -52, -52, 6, $0 db -52, -44, 7, $0 - db -52, -36, 6, (1 << OAM_X_FLIP) + db -52, -36, 6, OAM_XFLIP db -40, -32, 8, $0 db -40, -24, 9, $0 db -32, -32, 10, $0 @@ -4014,13 +4014,13 @@ AnimFrameTable50:: .data_af315 db 8 ; size - db -29, -28, 8, (1 << OAM_Y_FLIP) - db -29, -20, 9, (1 << OAM_Y_FLIP) - db -37, -28, 10, (1 << OAM_Y_FLIP) - db -37, -20, 11, (1 << OAM_Y_FLIP) + db -29, -28, 8, OAM_YFLIP + db -29, -20, 9, OAM_YFLIP + db -37, -28, 10, OAM_YFLIP + db -37, -20, 11, OAM_YFLIP db -55, -52, 3, $0 db -55, -44, 4, $0 - db -47, -44, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -47, -44, 4, OAM_XFLIP | OAM_YFLIP db -47, -36, 5, $0 AnimData127:: @@ -4061,7 +4061,7 @@ AnimFrameTable51:: db -40, -8, 2, $0 db -40, 0, 3, $0 db -40, 8, 4, $0 - db -40, 16, 0, (1 << OAM_X_FLIP) + db -40, 16, 0, OAM_XFLIP db -32, -24, 5, $0 db -32, -16, 6, $0 db -32, -8, 7, $0 @@ -4079,19 +4079,19 @@ AnimFrameTable51:: db -16, -8, 16, $0 db -16, 0, 17, $0 db -16, 8, 18, $0 - db -16, 16, 13, (1 << OAM_Y_FLIP) - db -8, -24, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -16, 16, 13, OAM_YFLIP + db -8, -24, 9, OAM_XFLIP | OAM_YFLIP db -8, -16, 19, $0 db -8, -8, 20, $0 db -8, 0, 21, $0 - db -8, 8, 12, (1 << OAM_Y_FLIP) - db -8, 16, 9, (1 << OAM_Y_FLIP) - db 0, -24, 0, (1 << OAM_Y_FLIP) - db 0, -16, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, 8, 12, OAM_YFLIP + db -8, 16, 9, OAM_YFLIP + db 0, -24, 0, OAM_YFLIP + db 0, -16, 4, OAM_XFLIP | OAM_YFLIP db 0, -8, 22, $0 - db 0, 0, 22, (1 << OAM_X_FLIP) - db 0, 8, 4, (1 << OAM_Y_FLIP) - db 0, 16, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, 0, 22, OAM_XFLIP + db 0, 8, 4, OAM_YFLIP + db 0, 16, 0, OAM_XFLIP | OAM_YFLIP .data_af422 db 38 ; size @@ -4100,7 +4100,7 @@ AnimFrameTable51:: db -40, -8, 2, $0 db -40, 0, 3, $0 db -40, 8, 4, $0 - db -40, 16, 0, (1 << OAM_X_FLIP) + db -40, 16, 0, OAM_XFLIP db -32, -24, 5, $0 db -32, -16, 6, $0 db -32, -8, 7, $0 @@ -4118,20 +4118,20 @@ AnimFrameTable51:: db -16, -8, 16, $0 db -16, 0, 17, $0 db -16, 8, 18, $0 - db -16, 16, 13, (1 << OAM_Y_FLIP) - db -8, -24, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -16, 16, 13, OAM_YFLIP + db -8, -24, 9, OAM_XFLIP | OAM_YFLIP db -8, -16, 19, $0 db -8, -8, 20, $0 db -8, 0, 21, $0 - db -8, 8, 12, (1 << OAM_Y_FLIP) - db -8, 16, 9, (1 << OAM_Y_FLIP) + db -8, 8, 12, OAM_YFLIP + db -8, 16, 9, OAM_YFLIP db 0, -8, 22, $0 db 0, 8, 24, $0 db 0, 16, 25, $0 db 0, 21, 26, $0 - db 0, -29, 26, (1 << OAM_X_FLIP) - db 0, -16, 24, (1 << OAM_X_FLIP) - db 0, -24, 25, (1 << OAM_X_FLIP) + db 0, -29, 26, OAM_XFLIP + db 0, -16, 24, OAM_XFLIP + db 0, -24, 25, OAM_XFLIP db 0, 0, 23, $0 .data_af4bb @@ -4141,7 +4141,7 @@ AnimFrameTable51:: db -44, -8, 2, $0 db -44, 0, 3, $0 db -44, 8, 4, $0 - db -44, 16, 0, (1 << OAM_X_FLIP) + db -44, 16, 0, OAM_XFLIP db -36, -24, 5, $0 db -36, -16, 6, $0 db -36, -8, 7, $0 @@ -4159,21 +4159,21 @@ AnimFrameTable51:: db -20, -8, 16, $0 db -20, 0, 17, $0 db -20, 8, 18, $0 - db -20, 16, 13, (1 << OAM_Y_FLIP) - db -12, -24, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -20, 16, 13, OAM_YFLIP + db -12, -24, 9, OAM_XFLIP | OAM_YFLIP db -12, -16, 19, $0 db -12, -8, 20, $0 db -12, 0, 21, $0 - db -12, 8, 12, (1 << OAM_Y_FLIP) - db -12, 16, 9, (1 << OAM_Y_FLIP) - db -4, -24, 0, (1 << OAM_Y_FLIP) - db -4, -16, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -4, 8, 4, (1 << OAM_Y_FLIP) - db -4, 16, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -2, -36, 26, (1 << OAM_X_FLIP) + db -12, 8, 12, OAM_YFLIP + db -12, 16, 9, OAM_YFLIP + db -4, -24, 0, OAM_YFLIP + db -4, -16, 4, OAM_XFLIP | OAM_YFLIP + db -4, 8, 4, OAM_YFLIP + db -4, 16, 0, OAM_XFLIP | OAM_YFLIP + db -2, -36, 26, OAM_XFLIP db -2, 28, 26, $0 db -4, 0, 23, $0 - db -4, -8, 23, (1 << OAM_X_FLIP) + db -4, -8, 23, OAM_XFLIP .data_af554 db 36 ; size @@ -4182,7 +4182,7 @@ AnimFrameTable51:: db -40, -8, 2, $0 db -40, 0, 3, $0 db -40, 8, 4, $0 - db -40, 16, 0, (1 << OAM_X_FLIP) + db -40, 16, 0, OAM_XFLIP db -32, -24, 5, $0 db -32, -16, 6, $0 db -32, -8, 7, $0 @@ -4200,14 +4200,14 @@ AnimFrameTable51:: db -16, -8, 16, $0 db -16, 0, 17, $0 db -16, 8, 18, $0 - db -16, 16, 13, (1 << OAM_Y_FLIP) - db -8, -24, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -16, 16, 13, OAM_YFLIP + db -8, -24, 9, OAM_XFLIP | OAM_YFLIP db -8, -16, 19, $0 - db -8, 16, 9, (1 << OAM_Y_FLIP) - db 0, -24, 0, (1 << OAM_Y_FLIP) - db 0, -16, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 8, 4, (1 << OAM_Y_FLIP) - db 0, 16, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, 16, 9, OAM_YFLIP + db 0, -24, 0, OAM_YFLIP + db 0, -16, 4, OAM_XFLIP | OAM_YFLIP + db 0, 8, 4, OAM_YFLIP + db 0, 16, 0, OAM_XFLIP | OAM_YFLIP db -8, -8, 27, $0 db -8, 0, 28, $0 db -8, 8, 29, $0 @@ -4219,7 +4219,7 @@ AnimFrameTable51:: db -40, -24, 0, $0 db -40, -16, 1, $0 db -40, 8, 4, $0 - db -40, 16, 0, (1 << OAM_X_FLIP) + db -40, 16, 0, OAM_XFLIP db -32, -24, 5, $0 db -32, 8, 8, $0 db -32, 16, 9, $0 @@ -4228,13 +4228,13 @@ AnimFrameTable51:: db -24, 8, 8, $0 db -24, 16, 13, $0 db -16, -24, 14, $0 - db -16, 16, 13, (1 << OAM_Y_FLIP) - db -8, -24, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 16, 9, (1 << OAM_Y_FLIP) - db 0, -24, 0, (1 << OAM_Y_FLIP) - db 0, -16, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 8, 4, (1 << OAM_Y_FLIP) - db 0, 16, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -16, 16, 13, OAM_YFLIP + db -8, -24, 9, OAM_XFLIP | OAM_YFLIP + db -8, 16, 9, OAM_YFLIP + db 0, -24, 0, OAM_YFLIP + db 0, -16, 4, OAM_XFLIP | OAM_YFLIP + db 0, 8, 4, OAM_YFLIP + db 0, 16, 0, OAM_XFLIP | OAM_YFLIP db -40, -8, 32, $0 db -40, 0, 33, $0 db -32, -16, 34, $0 @@ -4258,7 +4258,7 @@ AnimFrameTable51:: db -40, -24, 0, $0 db -40, -16, 1, $0 db -40, 8, 4, $0 - db -40, 16, 0, (1 << OAM_X_FLIP) + db -40, 16, 0, OAM_XFLIP db -32, -24, 5, $0 db -32, 8, 8, $0 db -32, 16, 9, $0 @@ -4267,12 +4267,12 @@ AnimFrameTable51:: db -24, 8, 8, $0 db -24, 16, 13, $0 db -16, -24, 14, $0 - db -16, 16, 13, (1 << OAM_Y_FLIP) - db -8, -24, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 16, 9, (1 << OAM_Y_FLIP) - db 0, -24, 0, (1 << OAM_Y_FLIP) - db 0, 8, 4, (1 << OAM_Y_FLIP) - db 0, 16, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -16, 16, 13, OAM_YFLIP + db -8, -24, 9, OAM_XFLIP | OAM_YFLIP + db -8, 16, 9, OAM_YFLIP + db 0, -24, 0, OAM_YFLIP + db 0, 8, 4, OAM_YFLIP + db 0, 16, 0, OAM_XFLIP | OAM_YFLIP db -40, 0, 33, $0 db -40, -8, 48, $0 db -32, -16, 49, $0 @@ -4297,7 +4297,7 @@ AnimFrameTable51:: db -40, -24, 0, $0 db -40, -16, 1, $0 db -40, 8, 4, $0 - db -40, 16, 0, (1 << OAM_X_FLIP) + db -40, 16, 0, OAM_XFLIP db -32, -24, 5, $0 db -32, 8, 8, $0 db -32, 16, 9, $0 @@ -4306,11 +4306,11 @@ AnimFrameTable51:: db -24, 8, 8, $0 db -24, 16, 13, $0 db -16, -24, 14, $0 - db -16, 16, 13, (1 << OAM_Y_FLIP) - db -8, -24, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 16, 9, (1 << OAM_Y_FLIP) - db 0, -24, 0, (1 << OAM_Y_FLIP) - db 0, 16, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -16, 16, 13, OAM_YFLIP + db -8, -24, 9, OAM_XFLIP | OAM_YFLIP + db -8, 16, 9, OAM_YFLIP + db 0, -24, 0, OAM_YFLIP + db 0, 16, 0, OAM_XFLIP | OAM_YFLIP db -40, 0, 33, $0 db -40, -8, 48, $0 db -32, -16, 49, $0 @@ -4318,7 +4318,7 @@ AnimFrameTable51:: db 0, -8, 62, $0 db 0, 0, 63, $0 db 0, -16, 61, $0 - db -32, -8, 12, (1 << OAM_Y_FLIP) + db -32, -8, 12, OAM_YFLIP db -32, 0, 8, $0 db -24, -16, 8, $0 db -24, -8, 8, $0 @@ -4336,7 +4336,7 @@ AnimFrameTable51:: db -40, -24, 0, $0 db -40, -16, 1, $0 db -40, 8, 4, $0 - db -40, 16, 0, (1 << OAM_X_FLIP) + db -40, 16, 0, OAM_XFLIP db -32, -24, 5, $0 db -32, 8, 8, $0 db -32, 16, 9, $0 @@ -4345,11 +4345,11 @@ AnimFrameTable51:: db -24, 8, 8, $0 db -24, 16, 13, $0 db -16, -24, 14, $0 - db -16, 16, 13, (1 << OAM_Y_FLIP) - db -8, -24, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 16, 9, (1 << OAM_Y_FLIP) - db 0, -24, 0, (1 << OAM_Y_FLIP) - db 0, 16, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -16, 16, 13, OAM_YFLIP + db -8, -24, 9, OAM_XFLIP | OAM_YFLIP + db -8, 16, 9, OAM_YFLIP + db 0, -24, 0, OAM_YFLIP + db 0, 16, 0, OAM_XFLIP | OAM_YFLIP db -40, 0, 33, $0 db -40, -8, 48, $0 db -32, -16, 49, $0 @@ -4357,7 +4357,7 @@ AnimFrameTable51:: db 0, -8, 62, $0 db 0, 0, 63, $0 db 0, -16, 61, $0 - db -32, -8, 12, (1 << OAM_Y_FLIP) + db -32, -8, 12, OAM_YFLIP db -32, 0, 8, $0 db -24, -16, 8, $0 db -24, -8, 8, $0 @@ -4397,62 +4397,62 @@ AnimFrameTable52:: .data_af86a db 5 ; size - db -9, -24, 3, (1 << OAM_Y_FLIP) - db -9, -16, 4, (1 << OAM_Y_FLIP) - db -17, -16, 6, (1 << OAM_Y_FLIP) - db -25, -24, 7, (1 << OAM_Y_FLIP) - db -17, -24, 5, (1 << OAM_Y_FLIP) + db -9, -24, 3, OAM_YFLIP + db -9, -16, 4, OAM_YFLIP + db -17, -16, 6, OAM_YFLIP + db -25, -24, 7, OAM_YFLIP + db -17, -24, 5, OAM_YFLIP .data_af87f db 8 ; size - db -9, -24, 3, (1 << OAM_Y_FLIP) - db -9, -16, 4, (1 << OAM_Y_FLIP) - db -17, -16, 6, (1 << OAM_Y_FLIP) - db -25, -24, 7, (1 << OAM_Y_FLIP) - db -17, -24, 5, (1 << OAM_Y_FLIP) - db -13, -23, 0, (1 << OAM_Y_FLIP) - db -21, -23, 2, (1 << OAM_Y_FLIP) - db -21, -31, 1, (1 << OAM_Y_FLIP) + db -9, -24, 3, OAM_YFLIP + db -9, -16, 4, OAM_YFLIP + db -17, -16, 6, OAM_YFLIP + db -25, -24, 7, OAM_YFLIP + db -17, -24, 5, OAM_YFLIP + db -13, -23, 0, OAM_YFLIP + db -21, -23, 2, OAM_YFLIP + db -21, -31, 1, OAM_YFLIP .data_af8a0 db 3 ; size - db -13, -23, 0, (1 << OAM_Y_FLIP) - db -21, -23, 2, (1 << OAM_Y_FLIP) - db -21, -31, 1, (1 << OAM_Y_FLIP) + db -13, -23, 0, OAM_YFLIP + db -21, -23, 2, OAM_YFLIP + db -21, -31, 1, OAM_YFLIP .data_af8ad db 8 ; size - db 8, 16, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, 8, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 8, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 16, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 16, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -13, -23, 0, (1 << OAM_Y_FLIP) - db -21, -23, 2, (1 << OAM_Y_FLIP) - db -21, -31, 1, (1 << OAM_Y_FLIP) + db 8, 16, 3, OAM_XFLIP | OAM_YFLIP + db 8, 8, 4, OAM_XFLIP | OAM_YFLIP + db 0, 8, 6, OAM_XFLIP | OAM_YFLIP + db -8, 16, 7, OAM_XFLIP | OAM_YFLIP + db 0, 16, 5, OAM_XFLIP | OAM_YFLIP + db -13, -23, 0, OAM_YFLIP + db -21, -23, 2, OAM_YFLIP + db -21, -31, 1, OAM_YFLIP .data_af8ce db 11 ; size - db 8, 16, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, 8, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 8, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 16, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 16, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -13, -23, 0, (1 << OAM_Y_FLIP) - db -21, -23, 2, (1 << OAM_Y_FLIP) - db -21, -31, 1, (1 << OAM_Y_FLIP) - db 8, 24, 1, (1 << OAM_X_FLIP) - db 0, 16, 0, (1 << OAM_X_FLIP) - db 8, 16, 2, (1 << OAM_X_FLIP) + db 8, 16, 3, OAM_XFLIP | OAM_YFLIP + db 8, 8, 4, OAM_XFLIP | OAM_YFLIP + db 0, 8, 6, OAM_XFLIP | OAM_YFLIP + db -8, 16, 7, OAM_XFLIP | OAM_YFLIP + db 0, 16, 5, OAM_XFLIP | OAM_YFLIP + db -13, -23, 0, OAM_YFLIP + db -21, -23, 2, OAM_YFLIP + db -21, -31, 1, OAM_YFLIP + db 8, 24, 1, OAM_XFLIP + db 0, 16, 0, OAM_XFLIP + db 8, 16, 2, OAM_XFLIP .data_af8fb db 6 ; size - db 8, 24, 1, (1 << OAM_X_FLIP) - db 0, 16, 0, (1 << OAM_X_FLIP) - db 8, 16, 2, (1 << OAM_X_FLIP) - db -13, -23, 0, (1 << OAM_Y_FLIP) - db -21, -23, 2, (1 << OAM_Y_FLIP) - db -21, -31, 1, (1 << OAM_Y_FLIP) + db 8, 24, 1, OAM_XFLIP + db 0, 16, 0, OAM_XFLIP + db 8, 16, 2, OAM_XFLIP + db -13, -23, 0, OAM_YFLIP + db -21, -23, 2, OAM_YFLIP + db -21, -31, 1, OAM_YFLIP .data_af914 db 11 ; size @@ -4461,12 +4461,12 @@ AnimFrameTable52:: db 10, -9, 6, $0 db 10, -17, 5, $0 db 18, -17, 7, $0 - db 8, 24, 1, (1 << OAM_X_FLIP) - db 0, 16, 0, (1 << OAM_X_FLIP) - db 8, 16, 2, (1 << OAM_X_FLIP) - db -13, -23, 0, (1 << OAM_Y_FLIP) - db -21, -23, 2, (1 << OAM_Y_FLIP) - db -21, -31, 1, (1 << OAM_Y_FLIP) + db 8, 24, 1, OAM_XFLIP + db 0, 16, 0, OAM_XFLIP + db 8, 16, 2, OAM_XFLIP + db -13, -23, 0, OAM_YFLIP + db -21, -23, 2, OAM_YFLIP + db -21, -31, 1, OAM_YFLIP .data_af941 db 14 ; size @@ -4474,28 +4474,28 @@ AnimFrameTable52:: db 2, -9, 4, $0 db 10, -9, 6, $0 db 10, -17, 5, $0 - db 8, 24, 1, (1 << OAM_X_FLIP) - db 0, 16, 0, (1 << OAM_X_FLIP) - db 8, 16, 2, (1 << OAM_X_FLIP) + db 8, 24, 1, OAM_XFLIP + db 0, 16, 0, OAM_XFLIP + db 8, 16, 2, OAM_XFLIP db 18, -17, 7, $0 db 5, -16, 0, $0 db 13, -16, 2, $0 db 13, -24, 1, $0 - db -13, -23, 0, (1 << OAM_Y_FLIP) - db -21, -23, 2, (1 << OAM_Y_FLIP) - db -21, -31, 1, (1 << OAM_Y_FLIP) + db -13, -23, 0, OAM_YFLIP + db -21, -23, 2, OAM_YFLIP + db -21, -31, 1, OAM_YFLIP .data_af97a db 9 ; size - db 8, 24, 1, (1 << OAM_X_FLIP) - db 0, 16, 0, (1 << OAM_X_FLIP) - db 8, 16, 2, (1 << OAM_X_FLIP) + db 8, 24, 1, OAM_XFLIP + db 0, 16, 0, OAM_XFLIP + db 8, 16, 2, OAM_XFLIP db 5, -16, 0, $0 db 13, -16, 2, $0 db 13, -24, 1, $0 - db -13, -23, 0, (1 << OAM_Y_FLIP) - db -21, -23, 2, (1 << OAM_Y_FLIP) - db -21, -31, 1, (1 << OAM_Y_FLIP) + db -13, -23, 0, OAM_YFLIP + db -21, -23, 2, OAM_YFLIP + db -21, -31, 1, OAM_YFLIP AnimData129:: frame_table AnimFrameTable53 @@ -4534,64 +4534,64 @@ AnimFrameTable53:: .data_afa06 db 16 ; size db -10, -32, 0, $0 - db -10, -24, 0, (1 << OAM_X_FLIP) - db -6, -16, 0, (1 << OAM_X_FLIP) + db -10, -24, 0, OAM_XFLIP + db -6, -16, 0, OAM_XFLIP db -6, -8, 0, $0 - db -10, 8, 0, (1 << OAM_X_FLIP) + db -10, 8, 0, OAM_XFLIP db -10, 0, 0, $0 - db -6, 16, 0, (1 << OAM_X_FLIP) + db -6, 16, 0, OAM_XFLIP db -6, 24, 0, $0 - db -2, -32, 6, (1 << OAM_X_FLIP) + db -2, -32, 6, OAM_XFLIP db -2, -24, 6, $0 db 2, -16, 6, $0 - db 2, -8, 6, (1 << OAM_X_FLIP) - db -2, 0, 6, (1 << OAM_X_FLIP) + db 2, -8, 6, OAM_XFLIP + db -2, 0, 6, OAM_XFLIP db -2, 8, 6, $0 db 1, 16, 6, $0 - db 1, 24, 6, (1 << OAM_X_FLIP) + db 1, 24, 6, OAM_XFLIP .data_afa47 db 32 ; size db -14, -32, 0, $0 db -6, -32, 1, $0 - db 2, -32, 5, (1 << OAM_X_FLIP) - db 10, -32, 6, (1 << OAM_X_FLIP) + db 2, -32, 5, OAM_XFLIP + db 10, -32, 6, OAM_XFLIP db -18, -24, 0, $0 db -10, -24, 1, $0 - db -2, -24, 5, (1 << OAM_X_FLIP) - db 6, -24, 6, (1 << OAM_X_FLIP) - db -18, -16, 0, (1 << OAM_X_FLIP) - db -10, -16, 1, (1 << OAM_X_FLIP) + db -2, -24, 5, OAM_XFLIP + db 6, -24, 6, OAM_XFLIP + db -18, -16, 0, OAM_XFLIP + db -10, -16, 1, OAM_XFLIP db -2, -16, 5, $0 db 6, -16, 6, $0 - db -14, -8, 0, (1 << OAM_X_FLIP) - db -6, -8, 1, (1 << OAM_X_FLIP) + db -14, -8, 0, OAM_XFLIP + db -6, -8, 1, OAM_XFLIP db 2, -8, 5, $0 db 10, -8, 6, $0 db -14, 0, 0, $0 db -6, 0, 1, $0 - db 2, 0, 5, (1 << OAM_X_FLIP) - db 10, 0, 6, (1 << OAM_X_FLIP) + db 2, 0, 5, OAM_XFLIP + db 10, 0, 6, OAM_XFLIP db -18, 8, 0, $0 db -10, 8, 1, $0 - db -2, 8, 5, (1 << OAM_X_FLIP) - db 6, 8, 6, (1 << OAM_X_FLIP) - db -18, 16, 0, (1 << OAM_X_FLIP) - db -10, 16, 1, (1 << OAM_X_FLIP) + db -2, 8, 5, OAM_XFLIP + db 6, 8, 6, OAM_XFLIP + db -18, 16, 0, OAM_XFLIP + db -10, 16, 1, OAM_XFLIP db -2, 16, 5, $0 db 6, 16, 6, $0 - db -14, 24, 0, (1 << OAM_X_FLIP) - db -6, 24, 1, (1 << OAM_X_FLIP) + db -14, 24, 0, OAM_XFLIP + db -6, 24, 1, OAM_XFLIP db 2, 24, 5, $0 db 10, 24, 6, $0 .data_afac8 db 40 ; size - db -18, -32, 0, (1 << OAM_X_FLIP) - db -10, -32, 1, (1 << OAM_X_FLIP) + db -18, -32, 0, OAM_XFLIP + db -10, -32, 1, OAM_XFLIP db -2, -32, 3, $0 - db 6, -32, 5, (1 << OAM_X_FLIP) - db 14, -32, 6, (1 << OAM_X_FLIP) + db 6, -32, 5, OAM_XFLIP + db 14, -32, 6, OAM_XFLIP db -18, -24, 0, $0 db -10, -24, 1, $0 db -2, -24, 3, $0 @@ -4602,16 +4602,16 @@ AnimFrameTable53:: db -6, -16, 3, $0 db 2, -16, 5, $0 db 10, -16, 6, $0 - db -22, -8, 0, (1 << OAM_X_FLIP) - db -14, -8, 1, (1 << OAM_X_FLIP) + db -22, -8, 0, OAM_XFLIP + db -14, -8, 1, OAM_XFLIP db -6, -8, 3, $0 - db 2, -8, 5, (1 << OAM_X_FLIP) - db 10, -8, 6, (1 << OAM_X_FLIP) - db -18, 0, 0, (1 << OAM_X_FLIP) - db -10, 0, 1, (1 << OAM_X_FLIP) + db 2, -8, 5, OAM_XFLIP + db 10, -8, 6, OAM_XFLIP + db -18, 0, 0, OAM_XFLIP + db -10, 0, 1, OAM_XFLIP db -2, 0, 3, $0 - db 6, 0, 5, (1 << OAM_X_FLIP) - db 14, 0, 6, (1 << OAM_X_FLIP) + db 6, 0, 5, OAM_XFLIP + db 14, 0, 6, OAM_XFLIP db -18, 8, 0, $0 db -10, 8, 1, $0 db -2, 8, 3, $0 @@ -4622,54 +4622,54 @@ AnimFrameTable53:: db -6, 16, 3, $0 db 2, 16, 5, $0 db 10, 16, 6, $0 - db -22, 24, 0, (1 << OAM_X_FLIP) - db -14, 24, 1, (1 << OAM_X_FLIP) + db -22, 24, 0, OAM_XFLIP + db -14, 24, 1, OAM_XFLIP db -6, 24, 3, $0 - db 2, 24, 5, (1 << OAM_X_FLIP) - db 10, 24, 6, (1 << OAM_X_FLIP) + db 2, 24, 5, OAM_XFLIP + db 10, 24, 6, OAM_XFLIP .data_afb69 db 40 ; size db -6, -32, 3, $0 - db -14, -32, 2, (1 << OAM_X_FLIP) - db -22, -32, 0, (1 << OAM_X_FLIP) + db -14, -32, 2, OAM_XFLIP + db -22, -32, 0, OAM_XFLIP db 2, -32, 4, $0 db 10, -32, 6, $0 db -2, -24, 3, $0 - db -10, -24, 2, (1 << OAM_X_FLIP) - db -18, -24, 0, (1 << OAM_X_FLIP) + db -10, -24, 2, OAM_XFLIP + db -18, -24, 0, OAM_XFLIP db 6, -24, 4, $0 db 14, -24, 6, $0 db -2, -16, 3, $0 db -10, -16, 2, $0 db -18, -16, 0, $0 - db 6, -16, 4, (1 << OAM_X_FLIP) - db 14, -16, 6, (1 << OAM_X_FLIP) + db 6, -16, 4, OAM_XFLIP + db 14, -16, 6, OAM_XFLIP db -6, -8, 3, $0 db -14, -8, 2, $0 db -22, -8, 0, $0 - db 2, -8, 4, (1 << OAM_X_FLIP) - db 10, -8, 6, (1 << OAM_X_FLIP) + db 2, -8, 4, OAM_XFLIP + db 10, -8, 6, OAM_XFLIP db -6, 0, 3, $0 - db -14, 0, 2, (1 << OAM_X_FLIP) - db -22, 0, 0, (1 << OAM_X_FLIP) + db -14, 0, 2, OAM_XFLIP + db -22, 0, 0, OAM_XFLIP db 2, 0, 4, $0 db 10, 0, 6, $0 db -2, 8, 3, $0 - db -10, 8, 2, (1 << OAM_X_FLIP) - db -18, 8, 0, (1 << OAM_X_FLIP) + db -10, 8, 2, OAM_XFLIP + db -18, 8, 0, OAM_XFLIP db 6, 8, 4, $0 db 14, 8, 6, $0 db -2, 16, 3, $0 db -10, 16, 2, $0 db -18, 16, 0, $0 - db 6, 16, 4, (1 << OAM_X_FLIP) - db 14, 16, 6, (1 << OAM_X_FLIP) + db 6, 16, 4, OAM_XFLIP + db 14, 16, 6, OAM_XFLIP db -6, 24, 3, $0 db -14, 24, 2, $0 db -22, 24, 0, $0 - db 2, 24, 4, (1 << OAM_X_FLIP) - db 10, 24, 6, (1 << OAM_X_FLIP) + db 2, 24, 4, OAM_XFLIP + db 10, 24, 6, OAM_XFLIP .data_afc0a db 40 ; size @@ -4678,16 +4678,16 @@ AnimFrameTable53:: db -6, -32, 3, $0 db 2, -32, 4, $0 db 10, -32, 5, $0 - db -18, -16, 1, (1 << OAM_X_FLIP) - db -10, -16, 2, (1 << OAM_X_FLIP) + db -18, -16, 1, OAM_XFLIP + db -10, -16, 2, OAM_XFLIP db -6, -24, 3, $0 - db 2, -24, 4, (1 << OAM_X_FLIP) - db 10, -24, 5, (1 << OAM_X_FLIP) - db -22, -24, 1, (1 << OAM_X_FLIP) - db -14, -24, 2, (1 << OAM_X_FLIP) + db 2, -24, 4, OAM_XFLIP + db 10, -24, 5, OAM_XFLIP + db -22, -24, 1, OAM_XFLIP + db -14, -24, 2, OAM_XFLIP db -2, -16, 3, $0 - db 6, -16, 4, (1 << OAM_X_FLIP) - db 14, -16, 5, (1 << OAM_X_FLIP) + db 6, -16, 4, OAM_XFLIP + db 14, -16, 5, OAM_XFLIP db -18, -8, 1, $0 db -10, -8, 2, $0 db -2, -8, 3, $0 @@ -4698,16 +4698,16 @@ AnimFrameTable53:: db -6, 0, 3, $0 db 2, 0, 4, $0 db 10, 0, 5, $0 - db -18, 16, 1, (1 << OAM_X_FLIP) - db -10, 16, 2, (1 << OAM_X_FLIP) + db -18, 16, 1, OAM_XFLIP + db -10, 16, 2, OAM_XFLIP db -6, 8, 3, $0 - db 2, 8, 4, (1 << OAM_X_FLIP) - db 10, 8, 5, (1 << OAM_X_FLIP) - db -22, 8, 1, (1 << OAM_X_FLIP) - db -14, 8, 2, (1 << OAM_X_FLIP) + db 2, 8, 4, OAM_XFLIP + db 10, 8, 5, OAM_XFLIP + db -22, 8, 1, OAM_XFLIP + db -14, 8, 2, OAM_XFLIP db -2, 16, 3, $0 - db 6, 16, 4, (1 << OAM_X_FLIP) - db 14, 16, 5, (1 << OAM_X_FLIP) + db 6, 16, 4, OAM_XFLIP + db 14, 16, 5, OAM_XFLIP db -18, 24, 1, $0 db -10, 24, 2, $0 db -2, 24, 3, $0 @@ -4721,16 +4721,16 @@ AnimFrameTable53:: db -6, -24, 3, $0 db 2, -24, 4, $0 db 10, -24, 5, $0 - db -18, -8, 1, (1 << OAM_X_FLIP) - db -10, -8, 2, (1 << OAM_X_FLIP) + db -18, -8, 1, OAM_XFLIP + db -10, -8, 2, OAM_XFLIP db -6, -16, 3, $0 - db 2, -16, 4, (1 << OAM_X_FLIP) - db 10, -16, 5, (1 << OAM_X_FLIP) - db -22, -16, 1, (1 << OAM_X_FLIP) - db -14, -16, 2, (1 << OAM_X_FLIP) + db 2, -16, 4, OAM_XFLIP + db 10, -16, 5, OAM_XFLIP + db -22, -16, 1, OAM_XFLIP + db -14, -16, 2, OAM_XFLIP db -2, -8, 3, $0 - db 6, -8, 4, (1 << OAM_X_FLIP) - db 14, -8, 5, (1 << OAM_X_FLIP) + db 6, -8, 4, OAM_XFLIP + db 14, -8, 5, OAM_XFLIP db -18, 0, 1, $0 db -10, 0, 2, $0 db -2, 0, 3, $0 @@ -4741,16 +4741,16 @@ AnimFrameTable53:: db -6, 8, 3, $0 db 2, 8, 4, $0 db 10, 8, 5, $0 - db -18, 24, 1, (1 << OAM_X_FLIP) - db -10, 24, 2, (1 << OAM_X_FLIP) + db -18, 24, 1, OAM_XFLIP + db -10, 24, 2, OAM_XFLIP db -6, 16, 3, $0 - db 2, 16, 4, (1 << OAM_X_FLIP) - db 10, 16, 5, (1 << OAM_X_FLIP) - db -22, 16, 1, (1 << OAM_X_FLIP) - db -14, 16, 2, (1 << OAM_X_FLIP) + db 2, 16, 4, OAM_XFLIP + db 10, 16, 5, OAM_XFLIP + db -22, 16, 1, OAM_XFLIP + db -14, 16, 2, OAM_XFLIP db -2, 24, 3, $0 - db 6, 24, 4, (1 << OAM_X_FLIP) - db 14, 24, 5, (1 << OAM_X_FLIP) + db 6, 24, 4, OAM_XFLIP + db 14, 24, 5, OAM_XFLIP db -18, -32, 1, $0 db -10, -32, 2, $0 db -2, -32, 3, $0 @@ -4764,16 +4764,16 @@ AnimFrameTable53:: db -6, -16, 3, $0 db 2, -16, 4, $0 db 10, -16, 5, $0 - db -18, 0, 1, (1 << OAM_X_FLIP) - db -10, 0, 2, (1 << OAM_X_FLIP) + db -18, 0, 1, OAM_XFLIP + db -10, 0, 2, OAM_XFLIP db -6, -8, 3, $0 - db 2, -8, 4, (1 << OAM_X_FLIP) - db 10, -8, 5, (1 << OAM_X_FLIP) - db -22, -8, 1, (1 << OAM_X_FLIP) - db -14, -8, 2, (1 << OAM_X_FLIP) + db 2, -8, 4, OAM_XFLIP + db 10, -8, 5, OAM_XFLIP + db -22, -8, 1, OAM_XFLIP + db -14, -8, 2, OAM_XFLIP db -2, 0, 3, $0 - db 6, 0, 4, (1 << OAM_X_FLIP) - db 14, 0, 5, (1 << OAM_X_FLIP) + db 6, 0, 4, OAM_XFLIP + db 14, 0, 5, OAM_XFLIP db -18, 8, 1, $0 db -10, 8, 2, $0 db -2, 8, 3, $0 @@ -4785,20 +4785,20 @@ AnimFrameTable53:: db 2, 16, 4, $0 db 10, 16, 5, $0 db -6, 24, 3, $0 - db 2, 24, 4, (1 << OAM_X_FLIP) - db 10, 24, 5, (1 << OAM_X_FLIP) - db -22, 24, 1, (1 << OAM_X_FLIP) - db -14, 24, 2, (1 << OAM_X_FLIP) + db 2, 24, 4, OAM_XFLIP + db 10, 24, 5, OAM_XFLIP + db -22, 24, 1, OAM_XFLIP + db -14, 24, 2, OAM_XFLIP db -18, -24, 1, $0 db -10, -24, 2, $0 db -2, -24, 3, $0 db 6, -24, 4, $0 db 14, -24, 5, $0 - db -18, -32, 1, (1 << OAM_X_FLIP) - db -10, -32, 2, (1 << OAM_X_FLIP) + db -18, -32, 1, OAM_XFLIP + db -10, -32, 2, OAM_XFLIP db -2, -32, 3, $0 - db 6, -32, 4, (1 << OAM_X_FLIP) - db 14, -32, 5, (1 << OAM_X_FLIP) + db 6, -32, 4, OAM_XFLIP + db 14, -32, 5, OAM_XFLIP .data_afded db 40 ; size @@ -4807,16 +4807,16 @@ AnimFrameTable53:: db -6, -8, 3, $0 db 2, -8, 4, $0 db 10, -8, 5, $0 - db -18, 8, 1, (1 << OAM_X_FLIP) - db -10, 8, 2, (1 << OAM_X_FLIP) + db -18, 8, 1, OAM_XFLIP + db -10, 8, 2, OAM_XFLIP db -6, 0, 3, $0 - db 2, 0, 4, (1 << OAM_X_FLIP) - db 10, 0, 5, (1 << OAM_X_FLIP) - db -22, 0, 1, (1 << OAM_X_FLIP) - db -14, 0, 2, (1 << OAM_X_FLIP) + db 2, 0, 4, OAM_XFLIP + db 10, 0, 5, OAM_XFLIP + db -22, 0, 1, OAM_XFLIP + db -14, 0, 2, OAM_XFLIP db -2, 8, 3, $0 - db 6, 8, 4, (1 << OAM_X_FLIP) - db 14, 8, 5, (1 << OAM_X_FLIP) + db 6, 8, 4, OAM_XFLIP + db 14, 8, 5, OAM_XFLIP db -18, 16, 1, $0 db -10, 16, 2, $0 db -2, 16, 3, $0 @@ -4832,16 +4832,16 @@ AnimFrameTable53:: db -2, -16, 3, $0 db 6, -16, 4, $0 db 14, -16, 5, $0 - db -18, -24, 1, (1 << OAM_X_FLIP) - db -10, -24, 2, (1 << OAM_X_FLIP) + db -18, -24, 1, OAM_XFLIP + db -10, -24, 2, OAM_XFLIP db -2, -24, 3, $0 - db 6, -24, 4, (1 << OAM_X_FLIP) - db 14, -24, 5, (1 << OAM_X_FLIP) + db 6, -24, 4, OAM_XFLIP + db 14, -24, 5, OAM_XFLIP db -6, -32, 3, $0 - db 2, -32, 4, (1 << OAM_X_FLIP) - db 10, -32, 5, (1 << OAM_X_FLIP) - db -22, -32, 1, (1 << OAM_X_FLIP) - db -14, -32, 2, (1 << OAM_X_FLIP) + db 2, -32, 4, OAM_XFLIP + db 10, -32, 5, OAM_XFLIP + db -22, -32, 1, OAM_XFLIP + db -14, -32, 2, OAM_XFLIP AnimData130:: frame_table AnimFrameTable54 @@ -4919,7 +4919,7 @@ AnimFrameTable54:: db 16, -2, 0, $0 db 10, -22, 0, $0 db -1, 18, 0, $0 - db 8, 20, 0, (1 << OAM_Y_FLIP) + db 8, 20, 0, OAM_YFLIP db -8, -8, 0, $0 db 4, -28, 0, $0 db -12, -20, 0, $0 diff --git a/src/data/duel/animations/anims3.asm b/src/data/duel/animations/anims3.asm index 0a22dff..5cb95e2 100644 --- a/src/data/duel/animations/anims3.asm +++ b/src/data/duel/animations/anims3.asm @@ -45,15 +45,15 @@ AnimFrameTable55:: .data_b008a db 9 ; size - db 4, 4, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 4, -4, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 4, -12, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -4, 4, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -4, -4, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -4, -12, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -12, 4, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -12, -4, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -12, -12, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 4, 4, 0, OAM_XFLIP | OAM_YFLIP + db 4, -4, 1, OAM_XFLIP | OAM_YFLIP + db 4, -12, 2, OAM_XFLIP | OAM_YFLIP + db -4, 4, 3, OAM_XFLIP | OAM_YFLIP + db -4, -4, 4, OAM_XFLIP | OAM_YFLIP + db -4, -12, 5, OAM_XFLIP | OAM_YFLIP + db -12, 4, 6, OAM_XFLIP | OAM_YFLIP + db -12, -4, 7, OAM_XFLIP | OAM_YFLIP + db -12, -12, 8, OAM_XFLIP | OAM_YFLIP .data_b00af db 16 ; size @@ -62,70 +62,70 @@ AnimFrameTable55:: db -12, 4, 11, $0 db -12, 12, 12, $0 db -4, 4, 13, $0 - db 12, -12, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 4, -12, 11, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 4, -20, 12, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -4, -12, 13, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -20, -12, 9, (1 << OAM_X_FLIP) - db -12, -12, 11, (1 << OAM_X_FLIP) - db -12, -20, 12, (1 << OAM_X_FLIP) - db 12, 4, 9, (1 << OAM_Y_FLIP) - db 4, -4, 10, (1 << OAM_Y_FLIP) - db 4, 4, 11, (1 << OAM_Y_FLIP) - db 4, 12, 12, (1 << OAM_Y_FLIP) + db 12, -12, 9, OAM_XFLIP | OAM_YFLIP + db 4, -12, 11, OAM_XFLIP | OAM_YFLIP + db 4, -20, 12, OAM_XFLIP | OAM_YFLIP + db -4, -12, 13, OAM_XFLIP | OAM_YFLIP + db -20, -12, 9, OAM_XFLIP + db -12, -12, 11, OAM_XFLIP + db -12, -20, 12, OAM_XFLIP + db 12, 4, 9, OAM_YFLIP + db 4, -4, 10, OAM_YFLIP + db 4, 4, 11, OAM_YFLIP + db 4, 12, 12, OAM_YFLIP .data_b00f0 db 20 ; size - db 12, -12, 14, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 12, -20, 15, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 4, -4, 16, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 4, -12, 17, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 4, -20, 18, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -4, -12, 19, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 12, -12, 14, OAM_XFLIP | OAM_YFLIP + db 12, -20, 15, OAM_XFLIP | OAM_YFLIP + db 4, -4, 16, OAM_XFLIP | OAM_YFLIP + db 4, -12, 17, OAM_XFLIP | OAM_YFLIP + db 4, -20, 18, OAM_XFLIP | OAM_YFLIP + db -4, -12, 19, OAM_XFLIP | OAM_YFLIP db -20, 4, 14, $0 db -20, 12, 15, $0 db -12, -4, 16, $0 db -12, 4, 17, $0 db -12, 12, 18, $0 db -4, 4, 19, $0 - db -20, -12, 14, (1 << OAM_X_FLIP) - db -20, -20, 15, (1 << OAM_X_FLIP) - db -12, -12, 17, (1 << OAM_X_FLIP) - db -12, -20, 18, (1 << OAM_X_FLIP) - db 12, 4, 14, (1 << OAM_Y_FLIP) - db 12, 12, 15, (1 << OAM_Y_FLIP) - db 4, 4, 17, (1 << OAM_Y_FLIP) - db 4, 12, 18, (1 << OAM_Y_FLIP) + db -20, -12, 14, OAM_XFLIP + db -20, -20, 15, OAM_XFLIP + db -12, -12, 17, OAM_XFLIP + db -12, -20, 18, OAM_XFLIP + db 12, 4, 14, OAM_YFLIP + db 12, 12, 15, OAM_YFLIP + db 4, 4, 17, OAM_YFLIP + db 4, 12, 18, OAM_YFLIP .data_b0141 db 20 ; size - db 16, -16, 20, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, -24, 21, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -8, 22, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -16, 23, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -24, 24, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -16, 25, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 16, -16, 20, OAM_XFLIP | OAM_YFLIP + db 16, -24, 21, OAM_XFLIP | OAM_YFLIP + db 8, -8, 22, OAM_XFLIP | OAM_YFLIP + db 8, -16, 23, OAM_XFLIP | OAM_YFLIP + db 8, -24, 24, OAM_XFLIP | OAM_YFLIP + db 0, -16, 25, OAM_XFLIP | OAM_YFLIP db -16, 0, 20, $0 db -16, 8, 21, $0 db -8, -8, 22, $0 db -8, 0, 23, $0 db -8, 8, 24, $0 db 0, 0, 25, $0 - db -16, -16, 20, (1 << OAM_X_FLIP) - db -16, -24, 21, (1 << OAM_X_FLIP) - db -8, -16, 23, (1 << OAM_X_FLIP) - db -8, -24, 24, (1 << OAM_X_FLIP) - db 16, 0, 20, (1 << OAM_Y_FLIP) - db 16, 8, 21, (1 << OAM_Y_FLIP) - db 8, 0, 23, (1 << OAM_Y_FLIP) - db 8, 8, 24, (1 << OAM_Y_FLIP) + db -16, -16, 20, OAM_XFLIP + db -16, -24, 21, OAM_XFLIP + db -8, -16, 23, OAM_XFLIP + db -8, -24, 24, OAM_XFLIP + db 16, 0, 20, OAM_YFLIP + db 16, 8, 21, OAM_YFLIP + db 8, 0, 23, OAM_YFLIP + db 8, 8, 24, OAM_YFLIP .data_b0192 db 4 ; size - db 0, 0, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -8, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 1, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -7, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, 0, 0, OAM_XFLIP | OAM_YFLIP + db 0, -8, 2, OAM_XFLIP | OAM_YFLIP + db -8, 1, 6, OAM_XFLIP | OAM_YFLIP + db -8, -7, 8, OAM_XFLIP | OAM_YFLIP .data_b01a3 db 4 ; size @@ -185,81 +185,81 @@ AnimFrameTable56:: db -20, -28, 2, $0 db -12, 12, 0, $0 db 0, -16, 3, $0 - db 0, -8, 3, (1 << OAM_X_FLIP) - db 8, -16, 3, (1 << OAM_Y_FLIP) - db 8, -8, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, -8, 3, OAM_XFLIP + db 8, -16, 3, OAM_YFLIP + db 8, -8, 3, OAM_XFLIP | OAM_YFLIP .data_b0252 db 9 ; size db -12, 12, 2, $0 db 0, -16, 5, $0 - db 0, -8, 5, (1 << OAM_X_FLIP) - db 8, -16, 5, (1 << OAM_Y_FLIP) - db 8, -8, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, -8, 5, OAM_XFLIP + db 8, -16, 5, OAM_YFLIP + db 8, -8, 5, OAM_XFLIP | OAM_YFLIP db -24, -32, 4, $0 - db -24, -24, 4, (1 << OAM_X_FLIP) - db -16, -24, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, -32, 4, (1 << OAM_Y_FLIP) + db -24, -24, 4, OAM_XFLIP + db -16, -24, 4, OAM_XFLIP | OAM_YFLIP + db -16, -32, 4, OAM_YFLIP .data_b0277 db 12 ; size db -16, 8, 4, $0 - db -16, 16, 4, (1 << OAM_X_FLIP) - db -8, 16, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 8, 4, (1 << OAM_Y_FLIP) + db -16, 16, 4, OAM_XFLIP + db -8, 16, 4, OAM_XFLIP | OAM_YFLIP + db -8, 8, 4, OAM_YFLIP db 0, -16, 6, $0 - db 0, -8, 6, (1 << OAM_X_FLIP) - db 8, -16, 6, (1 << OAM_Y_FLIP) - db 8, -8, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, -8, 6, OAM_XFLIP + db 8, -16, 6, OAM_YFLIP + db 8, -8, 6, OAM_XFLIP | OAM_YFLIP db -24, -32, 7, $0 - db -24, -24, 7, (1 << OAM_X_FLIP) - db -16, -24, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, -32, 7, (1 << OAM_Y_FLIP) + db -24, -24, 7, OAM_XFLIP + db -16, -24, 7, OAM_XFLIP | OAM_YFLIP + db -16, -32, 7, OAM_YFLIP .data_b02a8 db 12 ; size db -24, -32, 6, $0 - db -24, -24, 6, (1 << OAM_X_FLIP) - db -16, -32, 6, (1 << OAM_Y_FLIP) - db -16, -24, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -24, -24, 6, OAM_XFLIP + db -16, -32, 6, OAM_YFLIP + db -16, -24, 6, OAM_XFLIP | OAM_YFLIP db 0, -16, 7, $0 - db 0, -8, 7, (1 << OAM_X_FLIP) - db 8, -8, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -16, 7, (1 << OAM_Y_FLIP) + db 0, -8, 7, OAM_XFLIP + db 8, -8, 7, OAM_XFLIP | OAM_YFLIP + db 8, -16, 7, OAM_YFLIP db -16, 8, 6, $0 - db -16, 16, 6, (1 << OAM_X_FLIP) - db -8, 8, 6, (1 << OAM_Y_FLIP) - db -8, 16, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -16, 16, 6, OAM_XFLIP + db -8, 8, 6, OAM_YFLIP + db -8, 16, 6, OAM_XFLIP | OAM_YFLIP .data_b02d9 db 12 ; size db 0, -16, 6, $0 - db 0, -8, 6, (1 << OAM_X_FLIP) - db 8, -16, 6, (1 << OAM_Y_FLIP) - db 8, -8, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, -8, 6, OAM_XFLIP + db 8, -16, 6, OAM_YFLIP + db 8, -8, 6, OAM_XFLIP | OAM_YFLIP db -24, -32, 7, $0 - db -24, -24, 7, (1 << OAM_X_FLIP) - db -16, -24, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, -32, 7, (1 << OAM_Y_FLIP) + db -24, -24, 7, OAM_XFLIP + db -16, -24, 7, OAM_XFLIP | OAM_YFLIP + db -16, -32, 7, OAM_YFLIP db -16, 8, 7, $0 - db -16, 16, 7, (1 << OAM_X_FLIP) - db -8, 16, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 8, 7, (1 << OAM_Y_FLIP) + db -16, 16, 7, OAM_XFLIP + db -8, 16, 7, OAM_XFLIP | OAM_YFLIP + db -8, 8, 7, OAM_YFLIP .data_b030a db 15 ; size db -24, -32, 6, $0 - db -24, -24, 6, (1 << OAM_X_FLIP) - db -16, -32, 6, (1 << OAM_Y_FLIP) - db -16, -24, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -24, -24, 6, OAM_XFLIP + db -16, -32, 6, OAM_YFLIP + db -16, -24, 6, OAM_XFLIP | OAM_YFLIP db 0, -16, 7, $0 - db 0, -8, 7, (1 << OAM_X_FLIP) - db 8, -8, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -16, 7, (1 << OAM_Y_FLIP) + db 0, -8, 7, OAM_XFLIP + db 8, -8, 7, OAM_XFLIP | OAM_YFLIP + db 8, -16, 7, OAM_YFLIP db -16, 8, 6, $0 - db -16, 16, 6, (1 << OAM_X_FLIP) - db -8, 8, 6, (1 << OAM_Y_FLIP) - db -8, 16, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -16, 16, 6, OAM_XFLIP + db -8, 8, 6, OAM_YFLIP + db -8, 16, 6, OAM_XFLIP | OAM_YFLIP db -24, 0, 0, $0 db -8, -16, 0, $0 db 8, 24, 0, $0 @@ -267,17 +267,17 @@ AnimFrameTable56:: .data_b0347 db 16 ; size db 0, -16, 6, $0 - db 0, -8, 6, (1 << OAM_X_FLIP) - db 8, -16, 6, (1 << OAM_Y_FLIP) - db 8, -8, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, -8, 6, OAM_XFLIP + db 8, -16, 6, OAM_YFLIP + db 8, -8, 6, OAM_XFLIP | OAM_YFLIP db -24, -32, 7, $0 - db -24, -24, 7, (1 << OAM_X_FLIP) - db -16, -24, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, -32, 7, (1 << OAM_Y_FLIP) + db -24, -24, 7, OAM_XFLIP + db -16, -24, 7, OAM_XFLIP | OAM_YFLIP + db -16, -32, 7, OAM_YFLIP db -16, 8, 7, $0 - db -16, 16, 7, (1 << OAM_X_FLIP) - db -8, 16, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 8, 7, (1 << OAM_Y_FLIP) + db -16, 16, 7, OAM_XFLIP + db -8, 16, 7, OAM_XFLIP | OAM_YFLIP + db -8, 8, 7, OAM_YFLIP db -8, -16, 1, $0 db -24, 0, 1, $0 db 8, 24, 1, $0 @@ -286,169 +286,169 @@ AnimFrameTable56:: .data_b0388 db 16 ; size db -24, -32, 6, $0 - db -24, -24, 6, (1 << OAM_X_FLIP) - db -16, -32, 6, (1 << OAM_Y_FLIP) - db -16, -24, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -24, -24, 6, OAM_XFLIP + db -16, -32, 6, OAM_YFLIP + db -16, -24, 6, OAM_XFLIP | OAM_YFLIP db -16, 8, 6, $0 - db -16, 16, 6, (1 << OAM_X_FLIP) - db -8, 8, 6, (1 << OAM_Y_FLIP) - db -8, 16, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -16, 16, 6, OAM_XFLIP + db -8, 8, 6, OAM_YFLIP + db -8, 16, 6, OAM_XFLIP | OAM_YFLIP db 16, -32, 1, $0 db -8, -16, 2, $0 db -24, 0, 2, $0 db 8, 24, 2, $0 db 0, -16, 8, $0 - db 0, -8, 8, (1 << OAM_X_FLIP) - db 8, -16, 8, (1 << OAM_Y_FLIP) - db 8, -8, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, -8, 8, OAM_XFLIP + db 8, -16, 8, OAM_YFLIP + db 8, -8, 8, OAM_XFLIP | OAM_YFLIP .data_b03c9 db 25 ; size db -16, 8, 7, $0 - db -16, 16, 7, (1 << OAM_X_FLIP) - db -8, 16, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 8, 7, (1 << OAM_Y_FLIP) + db -16, 16, 7, OAM_XFLIP + db -8, 16, 7, OAM_XFLIP | OAM_YFLIP + db -8, 8, 7, OAM_YFLIP db 16, -32, 2, $0 db -2, -18, 9, $0 - db -2, -6, 9, (1 << OAM_X_FLIP) - db 10, -18, 9, (1 << OAM_Y_FLIP) - db 10, -6, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -2, -6, 9, OAM_XFLIP + db 10, -18, 9, OAM_YFLIP + db 10, -6, 9, OAM_XFLIP | OAM_YFLIP db -12, -20, 3, $0 - db -12, -12, 3, (1 << OAM_X_FLIP) - db -4, -20, 3, (1 << OAM_Y_FLIP) - db -4, -12, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -12, -12, 3, OAM_XFLIP + db -4, -20, 3, OAM_YFLIP + db -4, -12, 3, OAM_XFLIP | OAM_YFLIP db 4, 20, 3, $0 - db 4, 28, 3, (1 << OAM_X_FLIP) - db 12, 20, 3, (1 << OAM_Y_FLIP) - db 12, 28, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 4, 28, 3, OAM_XFLIP + db 12, 20, 3, OAM_YFLIP + db 12, 28, 3, OAM_XFLIP | OAM_YFLIP db -28, -4, 3, $0 - db -28, 4, 3, (1 << OAM_X_FLIP) - db -20, -4, 3, (1 << OAM_Y_FLIP) - db -20, 4, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -28, 4, 3, OAM_XFLIP + db -20, -4, 3, OAM_YFLIP + db -20, 4, 3, OAM_XFLIP | OAM_YFLIP db -24, -32, 8, $0 - db -24, -24, 8, (1 << OAM_X_FLIP) - db -16, -32, 8, (1 << OAM_Y_FLIP) - db -16, -24, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -24, -24, 8, OAM_XFLIP + db -16, -32, 8, OAM_YFLIP + db -16, -24, 8, OAM_XFLIP | OAM_YFLIP .data_b042e db 24 ; size db -26, -34, 9, $0 - db -26, -22, 9, (1 << OAM_X_FLIP) - db -14, -34, 9, (1 << OAM_Y_FLIP) - db -14, -22, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -26, -22, 9, OAM_XFLIP + db -14, -34, 9, OAM_YFLIP + db -14, -22, 9, OAM_XFLIP | OAM_YFLIP db -16, 8, 8, $0 - db -16, 16, 8, (1 << OAM_X_FLIP) - db -8, 8, 8, (1 << OAM_Y_FLIP) - db -8, 16, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -16, 16, 8, OAM_XFLIP + db -8, 8, 8, OAM_YFLIP + db -8, 16, 8, OAM_XFLIP | OAM_YFLIP db 12, -36, 3, $0 - db 12, -28, 3, (1 << OAM_X_FLIP) - db 20, -36, 3, (1 << OAM_Y_FLIP) - db 20, -28, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 12, -28, 3, OAM_XFLIP + db 20, -36, 3, OAM_YFLIP + db 20, -28, 3, OAM_XFLIP | OAM_YFLIP db -12, -20, 4, $0 - db -12, -12, 4, (1 << OAM_X_FLIP) - db -4, -20, 4, (1 << OAM_Y_FLIP) - db -4, -12, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -12, -12, 4, OAM_XFLIP + db -4, -20, 4, OAM_YFLIP + db -4, -12, 4, OAM_XFLIP | OAM_YFLIP db -28, -4, 4, $0 - db -28, 4, 4, (1 << OAM_X_FLIP) - db -20, -4, 4, (1 << OAM_Y_FLIP) - db -20, 4, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -28, 4, 4, OAM_XFLIP + db -20, -4, 4, OAM_YFLIP + db -20, 4, 4, OAM_XFLIP | OAM_YFLIP db 4, 20, 4, $0 - db 4, 28, 4, (1 << OAM_X_FLIP) - db 12, 20, 4, (1 << OAM_Y_FLIP) - db 12, 28, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 4, 28, 4, OAM_XFLIP + db 12, 20, 4, OAM_YFLIP + db 12, 28, 4, OAM_XFLIP | OAM_YFLIP .data_b048f db 20 ; size db 12, -36, 4, $0 - db 12, -28, 4, (1 << OAM_X_FLIP) - db 20, -36, 4, (1 << OAM_Y_FLIP) - db 20, -28, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 12, -28, 4, OAM_XFLIP + db 20, -36, 4, OAM_YFLIP + db 20, -28, 4, OAM_XFLIP | OAM_YFLIP db -18, 6, 9, $0 - db -18, 18, 9, (1 << OAM_X_FLIP) - db -6, 6, 9, (1 << OAM_Y_FLIP) - db -6, 18, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -18, 18, 9, OAM_XFLIP + db -6, 6, 9, OAM_YFLIP + db -6, 18, 9, OAM_XFLIP | OAM_YFLIP db -28, -4, 5, $0 - db -28, 4, 5, (1 << OAM_X_FLIP) - db -20, -4, 5, (1 << OAM_Y_FLIP) - db -20, 4, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -28, 4, 5, OAM_XFLIP + db -20, -4, 5, OAM_YFLIP + db -20, 4, 5, OAM_XFLIP | OAM_YFLIP db -12, -20, 8, $0 - db -12, -12, 8, (1 << OAM_X_FLIP) - db -4, -20, 8, (1 << OAM_Y_FLIP) - db -4, -12, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -12, -12, 8, OAM_XFLIP + db -4, -20, 8, OAM_YFLIP + db -4, -12, 8, OAM_XFLIP | OAM_YFLIP db 4, 20, 5, $0 - db 4, 28, 5, (1 << OAM_X_FLIP) - db 12, 20, 5, (1 << OAM_Y_FLIP) - db 12, 28, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 4, 28, 5, OAM_XFLIP + db 12, 20, 5, OAM_YFLIP + db 12, 28, 5, OAM_XFLIP | OAM_YFLIP .data_b04e0 db 16 ; size db -14, -22, 9, $0 - db -14, -10, 9, (1 << OAM_X_FLIP) - db -2, -22, 9, (1 << OAM_Y_FLIP) - db -2, -10, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -14, -10, 9, OAM_XFLIP + db -2, -22, 9, OAM_YFLIP + db -2, -10, 9, OAM_XFLIP | OAM_YFLIP db 4, 20, 8, $0 - db 4, 28, 8, (1 << OAM_X_FLIP) - db 12, 20, 8, (1 << OAM_Y_FLIP) - db 12, 28, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 4, 28, 8, OAM_XFLIP + db 12, 20, 8, OAM_YFLIP + db 12, 28, 8, OAM_XFLIP | OAM_YFLIP db 12, -36, 5, $0 - db 12, -28, 5, (1 << OAM_X_FLIP) - db 20, -36, 5, (1 << OAM_Y_FLIP) - db 20, -28, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 12, -28, 5, OAM_XFLIP + db 20, -36, 5, OAM_YFLIP + db 20, -28, 5, OAM_XFLIP | OAM_YFLIP db -28, -4, 6, $0 - db -28, 4, 6, (1 << OAM_X_FLIP) - db -20, -4, 6, (1 << OAM_Y_FLIP) - db -20, 4, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -28, 4, 6, OAM_XFLIP + db -20, -4, 6, OAM_YFLIP + db -20, 4, 6, OAM_XFLIP | OAM_YFLIP .data_b0521 db 12 ; size db 2, 18, 9, $0 - db 2, 30, 9, (1 << OAM_X_FLIP) - db 14, 18, 9, (1 << OAM_Y_FLIP) - db 14, 30, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 2, 30, 9, OAM_XFLIP + db 14, 18, 9, OAM_YFLIP + db 14, 30, 9, OAM_XFLIP | OAM_YFLIP db 12, -36, 6, $0 - db 12, -28, 6, (1 << OAM_X_FLIP) - db 20, -36, 6, (1 << OAM_Y_FLIP) - db 20, -28, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 12, -28, 6, OAM_XFLIP + db 20, -36, 6, OAM_YFLIP + db 20, -28, 6, OAM_XFLIP | OAM_YFLIP db -28, -4, 7, $0 - db -28, 4, 7, (1 << OAM_X_FLIP) - db -20, 4, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -20, -4, 7, (1 << OAM_Y_FLIP) + db -28, 4, 7, OAM_XFLIP + db -20, 4, 7, OAM_XFLIP | OAM_YFLIP + db -20, -4, 7, OAM_YFLIP .data_b0552 db 8 ; size db 12, -36, 8, $0 - db 12, -28, 8, (1 << OAM_X_FLIP) - db 20, -36, 8, (1 << OAM_Y_FLIP) - db 20, -28, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 12, -28, 8, OAM_XFLIP + db 20, -36, 8, OAM_YFLIP + db 20, -28, 8, OAM_XFLIP | OAM_YFLIP db -28, -4, 6, $0 - db -28, 4, 6, (1 << OAM_X_FLIP) - db -20, -4, 6, (1 << OAM_Y_FLIP) - db -20, 4, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -28, 4, 6, OAM_XFLIP + db -20, -4, 6, OAM_YFLIP + db -20, 4, 6, OAM_XFLIP | OAM_YFLIP .data_b0573 db 8 ; size db -28, -4, 7, $0 - db -28, 4, 7, (1 << OAM_X_FLIP) - db -20, 4, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -20, -4, 7, (1 << OAM_Y_FLIP) + db -28, 4, 7, OAM_XFLIP + db -20, 4, 7, OAM_XFLIP | OAM_YFLIP + db -20, -4, 7, OAM_YFLIP db 10, -38, 9, $0 - db 10, -26, 9, (1 << OAM_X_FLIP) - db 22, -38, 9, (1 << OAM_Y_FLIP) - db 22, -26, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 10, -26, 9, OAM_XFLIP + db 22, -38, 9, OAM_YFLIP + db 22, -26, 9, OAM_XFLIP | OAM_YFLIP .data_b0594 db 4 ; size db -28, -4, 8, $0 - db -28, 4, 8, (1 << OAM_X_FLIP) - db -20, -4, 8, (1 << OAM_Y_FLIP) - db -20, 4, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -28, 4, 8, OAM_XFLIP + db -20, -4, 8, OAM_YFLIP + db -20, 4, 8, OAM_XFLIP | OAM_YFLIP .data_b05a5 db 4 ; size db -30, -6, 9, $0 - db -30, 6, 9, (1 << OAM_X_FLIP) - db -18, -6, 9, (1 << OAM_Y_FLIP) - db -18, 6, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -30, 6, 9, OAM_XFLIP + db -18, -6, 9, OAM_YFLIP + db -18, 6, 9, OAM_XFLIP | OAM_YFLIP AnimData133:: frame_table AnimFrameTable57 @@ -591,10 +591,10 @@ AnimFrameTable57:: db 0, -12, 44, $0 db -8, 3, 42, $0 db -8, -5, 44, $0 - db -29, 8, 0, (1 << OAM_X_FLIP) - db -29, 0, 1, (1 << OAM_X_FLIP) - db -29, -8, 2, (1 << OAM_X_FLIP) - db -29, -16, 3, (1 << OAM_X_FLIP) + db -29, 8, 0, OAM_XFLIP + db -29, 0, 1, OAM_XFLIP + db -29, -8, 2, OAM_XFLIP + db -29, -16, 3, OAM_XFLIP db -21, -7, 13, $0 db -21, 3, 13, $0 @@ -615,14 +615,14 @@ AnimFrameTable57:: db 0, -12, 44, $0 db -8, 3, 42, $0 db -8, -5, 44, $0 - db -27, 8, 4, (1 << OAM_X_FLIP) - db -27, 0, 5, (1 << OAM_X_FLIP) - db -27, -8, 6, (1 << OAM_X_FLIP) - db -27, -16, 7, (1 << OAM_X_FLIP) - db -19, 15, 8, (1 << OAM_X_FLIP) - db -23, 12, 4, (1 << OAM_X_FLIP) - db -19, 1, 9, (1 << OAM_X_FLIP) - db -19, -9, 10, (1 << OAM_X_FLIP) + db -27, 8, 4, OAM_XFLIP + db -27, 0, 5, OAM_XFLIP + db -27, -8, 6, OAM_XFLIP + db -27, -16, 7, OAM_XFLIP + db -19, 15, 8, OAM_XFLIP + db -23, 12, 4, OAM_XFLIP + db -19, 1, 9, OAM_XFLIP + db -19, -9, 10, OAM_XFLIP .data_b07ed db 27 ; size @@ -641,18 +641,18 @@ AnimFrameTable57:: db 0, -12, 44, $0 db -8, 3, 42, $0 db -8, -5, 44, $0 - db -27, 8, 4, (1 << OAM_X_FLIP) - db -27, 0, 5, (1 << OAM_X_FLIP) - db -27, -8, 6, (1 << OAM_X_FLIP) - db -27, -16, 7, (1 << OAM_X_FLIP) - db -23, 11, 4, (1 << OAM_X_FLIP) - db -19, 0, 12, (1 << OAM_X_FLIP) - db -11, 16, 14, (1 << OAM_X_FLIP) - db -11, 3, 15, (1 << OAM_X_FLIP) - db -11, -8, 16, (1 << OAM_X_FLIP) - db -3, -8, 17, (1 << OAM_X_FLIP) - db -19, -14, 35, (1 << OAM_X_FLIP) - db -19, 14, 11, (1 << OAM_X_FLIP) + db -27, 8, 4, OAM_XFLIP + db -27, 0, 5, OAM_XFLIP + db -27, -8, 6, OAM_XFLIP + db -27, -16, 7, OAM_XFLIP + db -23, 11, 4, OAM_XFLIP + db -19, 0, 12, OAM_XFLIP + db -11, 16, 14, OAM_XFLIP + db -11, 3, 15, OAM_XFLIP + db -11, -8, 16, OAM_XFLIP + db -3, -8, 17, OAM_XFLIP + db -19, -14, 35, OAM_XFLIP + db -19, 14, 11, OAM_XFLIP .data_b085a db 31 ; size @@ -671,22 +671,22 @@ AnimFrameTable57:: db 0, -12, 44, $0 db -8, 3, 42, $0 db -8, -5, 44, $0 - db -25, -16, 18, (1 << OAM_X_FLIP) - db -25, 8, 4, (1 << OAM_X_FLIP) - db -25, 0, 5, (1 << OAM_X_FLIP) - db -25, -8, 26, (1 << OAM_X_FLIP) - db -17, 8, 4, (1 << OAM_Y_FLIP) - db -17, 15, 19, (1 << OAM_X_FLIP) - db -17, 0, 20, (1 << OAM_X_FLIP) - db -17, -10, 21, (1 << OAM_X_FLIP) - db -9, 0, 22, (1 << OAM_X_FLIP) - db -9, -9, 21, (1 << OAM_X_FLIP) - db -1, -9, 21, (1 << OAM_X_FLIP) - db -1, 16, 23, (1 << OAM_X_FLIP) - db 7, 4, 24, (1 << OAM_X_FLIP) - db 7, -8, 25, (1 << OAM_X_FLIP) - db -1, 4, 16, (1 << OAM_X_FLIP) - db -9, 12, 35, (1 << OAM_X_FLIP) + db -25, -16, 18, OAM_XFLIP + db -25, 8, 4, OAM_XFLIP + db -25, 0, 5, OAM_XFLIP + db -25, -8, 26, OAM_XFLIP + db -17, 8, 4, OAM_YFLIP + db -17, 15, 19, OAM_XFLIP + db -17, 0, 20, OAM_XFLIP + db -17, -10, 21, OAM_XFLIP + db -9, 0, 22, OAM_XFLIP + db -9, -9, 21, OAM_XFLIP + db -1, -9, 21, OAM_XFLIP + db -1, 16, 23, OAM_XFLIP + db 7, 4, 24, OAM_XFLIP + db 7, -8, 25, OAM_XFLIP + db -1, 4, 16, OAM_XFLIP + db -9, 12, 35, OAM_XFLIP .data_b08d7 db 33 ; size @@ -705,42 +705,42 @@ AnimFrameTable57:: db 0, -12, 44, $0 db -8, 3, 42, $0 db -8, -5, 44, $0 - db -24, -16, 29, (1 << OAM_X_FLIP) - db -24, -8, 28, (1 << OAM_X_FLIP) - db -24, 0, 27, (1 << OAM_X_FLIP) - db -16, 5, 30, (1 << OAM_X_FLIP) - db -16, -4, 31, (1 << OAM_X_FLIP) - db -16, -11, 32, (1 << OAM_X_FLIP) - db -8, 12, 33, (1 << OAM_X_FLIP) - db -8, 0, 34, (1 << OAM_X_FLIP) - db -8, -9, 21, (1 << OAM_X_FLIP) - db 0, 0, 35, (1 << OAM_X_FLIP) - db 8, 17, 36, (1 << OAM_X_FLIP) - db 8, 1, 37, (1 << OAM_X_FLIP) - db 16, 23, 38, (1 << OAM_X_FLIP) - db 0, -8, 21, (1 << OAM_X_FLIP) - db 8, -8, 21, (1 << OAM_X_FLIP) - db 16, -8, 21, (1 << OAM_X_FLIP) - db 16, 8, 21, (1 << OAM_X_FLIP) - db 0, 14, 42, (1 << OAM_X_FLIP) + db -24, -16, 29, OAM_XFLIP + db -24, -8, 28, OAM_XFLIP + db -24, 0, 27, OAM_XFLIP + db -16, 5, 30, OAM_XFLIP + db -16, -4, 31, OAM_XFLIP + db -16, -11, 32, OAM_XFLIP + db -8, 12, 33, OAM_XFLIP + db -8, 0, 34, OAM_XFLIP + db -8, -9, 21, OAM_XFLIP + db 0, 0, 35, OAM_XFLIP + db 8, 17, 36, OAM_XFLIP + db 8, 1, 37, OAM_XFLIP + db 16, 23, 38, OAM_XFLIP + db 0, -8, 21, OAM_XFLIP + db 8, -8, 21, OAM_XFLIP + db 16, -8, 21, OAM_XFLIP + db 16, 8, 21, OAM_XFLIP + db 0, 14, 42, OAM_XFLIP .data_b095c db 30 ; size - db -24, -17, 39, (1 << OAM_X_FLIP) - db -16, -8, 40, (1 << OAM_X_FLIP) - db -16, -16, 41, (1 << OAM_X_FLIP) - db -8, -14, 38, (1 << OAM_X_FLIP) - db 0, -7, 42, (1 << OAM_X_FLIP) - db 0, -16, 43, (1 << OAM_X_FLIP) - db 8, 11, 44, (1 << OAM_X_FLIP) - db 16, 18, 44, (1 << OAM_X_FLIP) - db 8, 0, 45, (1 << OAM_X_FLIP) - db 16, 4, 45, (1 << OAM_X_FLIP) - db 8, -16, 37, (1 << OAM_X_FLIP) - db 16, -13, 43, (1 << OAM_X_FLIP) - db 0, 4, 44, (1 << OAM_X_FLIP) - db -8, -11, 42, (1 << OAM_X_FLIP) - db -8, -3, 44, (1 << OAM_X_FLIP) + db -24, -17, 39, OAM_XFLIP + db -16, -8, 40, OAM_XFLIP + db -16, -16, 41, OAM_XFLIP + db -8, -14, 38, OAM_XFLIP + db 0, -7, 42, OAM_XFLIP + db 0, -16, 43, OAM_XFLIP + db 8, 11, 44, OAM_XFLIP + db 16, 18, 44, OAM_XFLIP + db 8, 0, 45, OAM_XFLIP + db 16, 4, 45, OAM_XFLIP + db 8, -16, 37, OAM_XFLIP + db 16, -13, 43, OAM_XFLIP + db 0, 4, 44, OAM_XFLIP + db -8, -11, 42, OAM_XFLIP + db -8, -3, 44, OAM_XFLIP db -24, 9, 39, $0 db -16, 0, 40, $0 db -16, 8, 41, $0 @@ -796,147 +796,147 @@ AnimFrameTable58:: db 8 ; size db -32, -40, 2, $0 db -24, -40, 3, $0 - db -32, -32, 2, (1 << OAM_X_FLIP) - db -24, -32, 3, (1 << OAM_X_FLIP) + db -32, -32, 2, OAM_XFLIP + db -24, -32, 3, OAM_XFLIP db -32, 24, 2, $0 db -24, 24, 3, $0 - db -32, 32, 2, (1 << OAM_X_FLIP) - db -24, 32, 3, (1 << OAM_X_FLIP) + db -32, 32, 2, OAM_XFLIP + db -24, 32, 3, OAM_XFLIP .data_b0a57 db 14 ; size db -32, -40, 2, $0 db -24, -40, 3, $0 - db -32, -32, 2, (1 << OAM_X_FLIP) - db -24, -32, 3, (1 << OAM_X_FLIP) + db -32, -32, 2, OAM_XFLIP + db -24, -32, 3, OAM_XFLIP db -32, 24, 2, $0 db -24, 24, 3, $0 - db -32, 32, 2, (1 << OAM_X_FLIP) - db -24, 32, 3, (1 << OAM_X_FLIP) + db -32, 32, 2, OAM_XFLIP + db -24, 32, 3, OAM_XFLIP db -24, 16, 0, $0 - db -24, -24, 0, (1 << OAM_X_FLIP) + db -24, -24, 0, OAM_XFLIP db -16, -32, 1, $0 db -16, 16, 1, $0 - db -16, -24, 1, (1 << OAM_X_FLIP) - db -16, 24, 1, (1 << OAM_X_FLIP) + db -16, -24, 1, OAM_XFLIP + db -16, 24, 1, OAM_XFLIP .data_b0a90 db 14 ; size db -24, -32, 2, $0 db -16, -32, 3, $0 - db -24, -24, 2, (1 << OAM_X_FLIP) - db -16, -24, 3, (1 << OAM_X_FLIP) + db -24, -24, 2, OAM_XFLIP + db -16, -24, 3, OAM_XFLIP db -24, 16, 2, $0 db -16, 16, 3, $0 - db -24, 24, 2, (1 << OAM_X_FLIP) - db -16, 24, 3, (1 << OAM_X_FLIP) + db -24, 24, 2, OAM_XFLIP + db -16, 24, 3, OAM_XFLIP db -32, -40, 0, $0 db -32, 24, 0, $0 db -24, -40, 1, $0 - db -32, -32, 0, (1 << OAM_X_FLIP) - db -32, 32, 0, (1 << OAM_X_FLIP) - db -24, 32, 1, (1 << OAM_X_FLIP) + db -32, -32, 0, OAM_XFLIP + db -32, 32, 0, OAM_XFLIP + db -24, 32, 1, OAM_XFLIP .data_b0ac9 db 8 ; size db -24, -32, 2, $0 db -16, -32, 3, $0 - db -24, -24, 2, (1 << OAM_X_FLIP) - db -16, -24, 3, (1 << OAM_X_FLIP) + db -24, -24, 2, OAM_XFLIP + db -16, -24, 3, OAM_XFLIP db -24, 16, 2, $0 db -16, 16, 3, $0 - db -24, 24, 2, (1 << OAM_X_FLIP) - db -16, 24, 3, (1 << OAM_X_FLIP) + db -24, 24, 2, OAM_XFLIP + db -16, 24, 3, OAM_XFLIP .data_b0aea db 14 ; size db -24, -32, 2, $0 db -16, -32, 3, $0 - db -24, -24, 2, (1 << OAM_X_FLIP) - db -16, -24, 3, (1 << OAM_X_FLIP) + db -24, -24, 2, OAM_XFLIP + db -16, -24, 3, OAM_XFLIP db -24, 16, 2, $0 db -16, 16, 3, $0 - db -24, 24, 2, (1 << OAM_X_FLIP) - db -16, 24, 3, (1 << OAM_X_FLIP) + db -24, 24, 2, OAM_XFLIP + db -16, 24, 3, OAM_XFLIP db -16, 8, 0, $0 db -8, -24, 1, $0 db -8, 8, 1, $0 - db -16, -16, 0, (1 << OAM_X_FLIP) - db -8, -16, 1, (1 << OAM_X_FLIP) - db -8, 16, 1, (1 << OAM_X_FLIP) + db -16, -16, 0, OAM_XFLIP + db -8, -16, 1, OAM_XFLIP + db -8, 16, 1, OAM_XFLIP .data_b0b23 db 14 ; size db -16, -24, 2, $0 db -8, -24, 3, $0 - db -16, -16, 2, (1 << OAM_X_FLIP) - db -8, -16, 3, (1 << OAM_X_FLIP) + db -16, -16, 2, OAM_XFLIP + db -8, -16, 3, OAM_XFLIP db -16, 8, 2, $0 db -8, 8, 3, $0 - db -16, 16, 2, (1 << OAM_X_FLIP) - db -8, 16, 3, (1 << OAM_X_FLIP) + db -16, 16, 2, OAM_XFLIP + db -8, 16, 3, OAM_XFLIP db -24, -32, 0, $0 db -24, 16, 0, $0 db -16, -32, 1, $0 - db -24, -24, 0, (1 << OAM_X_FLIP) - db -24, 24, 0, (1 << OAM_X_FLIP) - db -16, 24, 1, (1 << OAM_X_FLIP) + db -24, -24, 0, OAM_XFLIP + db -24, 24, 0, OAM_XFLIP + db -16, 24, 1, OAM_XFLIP .data_b0b5c db 8 ; size db -16, -24, 2, $0 db -8, -24, 3, $0 - db -16, -16, 2, (1 << OAM_X_FLIP) - db -8, -16, 3, (1 << OAM_X_FLIP) + db -16, -16, 2, OAM_XFLIP + db -8, -16, 3, OAM_XFLIP db -16, 8, 2, $0 db -8, 8, 3, $0 - db -16, 16, 2, (1 << OAM_X_FLIP) - db -8, 16, 3, (1 << OAM_X_FLIP) + db -16, 16, 2, OAM_XFLIP + db -8, 16, 3, OAM_XFLIP .data_b0b7d db 14 ; size db -16, -24, 2, $0 db -8, -24, 3, $0 - db -16, -16, 2, (1 << OAM_X_FLIP) - db -8, -16, 3, (1 << OAM_X_FLIP) + db -16, -16, 2, OAM_XFLIP + db -8, -16, 3, OAM_XFLIP db -16, 8, 2, $0 db -8, 8, 3, $0 - db -16, 16, 2, (1 << OAM_X_FLIP) - db -8, 16, 3, (1 << OAM_X_FLIP) + db -16, 16, 2, OAM_XFLIP + db -8, 16, 3, OAM_XFLIP db -8, 0, 0, $0 db 0, 0, 1, $0 db 0, -16, 1, $0 - db -8, -8, 0, (1 << OAM_X_FLIP) - db 0, -8, 1, (1 << OAM_X_FLIP) - db 0, 8, 1, (1 << OAM_X_FLIP) + db -8, -8, 0, OAM_XFLIP + db 0, -8, 1, OAM_XFLIP + db 0, 8, 1, OAM_XFLIP .data_b0bb6 db 14 ; size db -8, -16, 2, $0 db 0, -16, 3, $0 - db -8, -8, 2, (1 << OAM_X_FLIP) - db 0, -8, 3, (1 << OAM_X_FLIP) + db -8, -8, 2, OAM_XFLIP + db 0, -8, 3, OAM_XFLIP db -8, 0, 2, $0 db 0, 0, 3, $0 - db -8, 8, 2, (1 << OAM_X_FLIP) - db 0, 8, 3, (1 << OAM_X_FLIP) + db -8, 8, 2, OAM_XFLIP + db 0, 8, 3, OAM_XFLIP db -16, -24, 0, $0 db -8, -24, 1, $0 - db -16, -16, 0, (1 << OAM_X_FLIP) - db -16, 16, 0, (1 << OAM_X_FLIP) + db -16, -16, 0, OAM_XFLIP + db -16, 16, 0, OAM_XFLIP db -16, 8, 0, $0 - db -8, 16, 1, (1 << OAM_X_FLIP) + db -8, 16, 1, OAM_XFLIP .data_b0bef db 8 ; size db -8, -16, 2, $0 db 0, -16, 3, $0 - db -8, -8, 2, (1 << OAM_X_FLIP) - db 0, -8, 3, (1 << OAM_X_FLIP) + db -8, -8, 2, OAM_XFLIP + db 0, -8, 3, OAM_XFLIP db -8, 0, 2, $0 db 0, 0, 3, $0 - db -8, 8, 2, (1 << OAM_X_FLIP) - db 0, 8, 3, (1 << OAM_X_FLIP) + db -8, 8, 2, OAM_XFLIP + db 0, 8, 3, OAM_XFLIP .data_b0c10 db 10 ; size @@ -946,32 +946,32 @@ AnimFrameTable58:: db 8, 0, 7, $0 db -8, -16, 0, $0 db -8, 0, 0, $0 - db -8, -8, 0, (1 << OAM_X_FLIP) - db -8, 8, 0, (1 << OAM_X_FLIP) + db -8, -8, 0, OAM_XFLIP + db -8, 8, 0, OAM_XFLIP db 0, -16, 1, $0 - db 0, 8, 1, (1 << OAM_X_FLIP) + db 0, 8, 1, OAM_XFLIP .data_b0c39 db 8 ; size db -22, -37, 2, $0 db -14, -37, 3, $0 - db -22, -29, 2, (1 << OAM_X_FLIP) - db -14, -29, 3, (1 << OAM_X_FLIP) + db -22, -29, 2, OAM_XFLIP + db -14, -29, 3, OAM_XFLIP db -22, 21, 2, $0 db -14, 21, 3, $0 - db -22, 29, 2, (1 << OAM_X_FLIP) - db -14, 29, 3, (1 << OAM_X_FLIP) + db -22, 29, 2, OAM_XFLIP + db -14, 29, 3, OAM_XFLIP .data_b0c5a db 8 ; size db -16, -40, 2, $0 db -8, -40, 3, $0 - db -16, -32, 2, (1 << OAM_X_FLIP) - db -8, -32, 3, (1 << OAM_X_FLIP) + db -16, -32, 2, OAM_XFLIP + db -8, -32, 3, OAM_XFLIP db -16, 24, 2, $0 db -8, 24, 3, $0 - db -16, 32, 2, (1 << OAM_X_FLIP) - db -8, 32, 3, (1 << OAM_X_FLIP) + db -16, 32, 2, OAM_XFLIP + db -8, 32, 3, OAM_XFLIP AnimData135:: frame_table AnimFrameTable59 @@ -1024,7 +1024,7 @@ AnimFrameTable59:: db 4, 6, 4, $0 db -5, 23, 5, $0 db 3, 19, 6, $0 - db -5, 15, 5, (1 << OAM_X_FLIP) + db -5, 15, 5, OAM_XFLIP .data_b0d0d db 9 ; size @@ -1036,7 +1036,7 @@ AnimFrameTable59:: db 4, 6, 4, $0 db -13, 26, 5, $0 db -5, 22, 6, $0 - db -13, 18, 5, (1 << OAM_X_FLIP) + db -13, 18, 5, OAM_XFLIP .data_b0d32 db 9 ; size @@ -1048,7 +1048,7 @@ AnimFrameTable59:: db 4, 6, 4, $0 db -21, 24, 5, $0 db -13, 20, 6, $0 - db -21, 16, 5, (1 << OAM_X_FLIP) + db -21, 16, 5, OAM_XFLIP .data_b0d57 db 9 ; size @@ -1060,7 +1060,7 @@ AnimFrameTable59:: db 4, 6, 4, $0 db -29, 24, 5, $0 db -21, 20, 6, $0 - db -29, 16, 5, (1 << OAM_X_FLIP) + db -29, 16, 5, OAM_XFLIP .data_b0d7c db 9 ; size @@ -1072,7 +1072,7 @@ AnimFrameTable59:: db 4, 6, 4, $0 db -32, 32, 5, $0 db -24, 28, 6, $0 - db -32, 24, 5, (1 << OAM_X_FLIP) + db -32, 24, 5, OAM_XFLIP .data_b0da1 db 9 ; size @@ -1084,7 +1084,7 @@ AnimFrameTable59:: db 4, 6, 4, $0 db -32, 40, 5, $0 db -24, 36, 6, $0 - db -32, 32, 5, (1 << OAM_X_FLIP) + db -32, 32, 5, OAM_XFLIP AnimData136:: frame_table AnimFrameTable60 @@ -1132,20 +1132,20 @@ AnimFrameTable60:: .data_b0e52 db 14 ; size - db -16, 8, 0, (1 << OAM_X_FLIP) - db -16, 0, 1, (1 << OAM_X_FLIP) - db -16, -8, 2, (1 << OAM_X_FLIP) - db -16, -16, 3, (1 << OAM_X_FLIP) - db -8, 8, 4, (1 << OAM_X_FLIP) - db -8, 0, 5, (1 << OAM_X_FLIP) - db -8, -8, 6, (1 << OAM_X_FLIP) - db -8, -16, 7, (1 << OAM_X_FLIP) - db 0, 8, 8, (1 << OAM_X_FLIP) - db 0, 0, 9, (1 << OAM_X_FLIP) - db 0, -8, 10, (1 << OAM_X_FLIP) - db 0, -16, 11, (1 << OAM_X_FLIP) - db 8, 0, 12, (1 << OAM_X_FLIP) - db 8, -8, 13, (1 << OAM_X_FLIP) + db -16, 8, 0, OAM_XFLIP + db -16, 0, 1, OAM_XFLIP + db -16, -8, 2, OAM_XFLIP + db -16, -16, 3, OAM_XFLIP + db -8, 8, 4, OAM_XFLIP + db -8, 0, 5, OAM_XFLIP + db -8, -8, 6, OAM_XFLIP + db -8, -16, 7, OAM_XFLIP + db 0, 8, 8, OAM_XFLIP + db 0, 0, 9, OAM_XFLIP + db 0, -8, 10, OAM_XFLIP + db 0, -16, 11, OAM_XFLIP + db 8, 0, 12, OAM_XFLIP + db 8, -8, 13, OAM_XFLIP .data_b0e8b db 14 ; size @@ -1166,20 +1166,20 @@ AnimFrameTable60:: .data_b0ec4 db 14 ; size - db -16, 8, 14, (1 << OAM_X_FLIP) - db -16, 0, 15, (1 << OAM_X_FLIP) - db -16, -8, 16, (1 << OAM_X_FLIP) - db -16, -16, 17, (1 << OAM_X_FLIP) - db -8, 8, 18, (1 << OAM_X_FLIP) - db -8, 0, 19, (1 << OAM_X_FLIP) - db -8, -8, 20, (1 << OAM_X_FLIP) - db -8, -16, 21, (1 << OAM_X_FLIP) - db 0, 8, 22, (1 << OAM_X_FLIP) - db 0, 0, 23, (1 << OAM_X_FLIP) - db 0, -8, 24, (1 << OAM_X_FLIP) - db 0, -16, 25, (1 << OAM_X_FLIP) - db 8, 0, 26, (1 << OAM_X_FLIP) - db 8, -8, 27, (1 << OAM_X_FLIP) + db -16, 8, 14, OAM_XFLIP + db -16, 0, 15, OAM_XFLIP + db -16, -8, 16, OAM_XFLIP + db -16, -16, 17, OAM_XFLIP + db -8, 8, 18, OAM_XFLIP + db -8, 0, 19, OAM_XFLIP + db -8, -8, 20, OAM_XFLIP + db -8, -16, 21, OAM_XFLIP + db 0, 8, 22, OAM_XFLIP + db 0, 0, 23, OAM_XFLIP + db 0, -8, 24, OAM_XFLIP + db 0, -16, 25, OAM_XFLIP + db 8, 0, 26, OAM_XFLIP + db 8, -8, 27, OAM_XFLIP AnimData137:: frame_table AnimFrameTable61 @@ -1214,53 +1214,53 @@ AnimFrameTable61:: .data_b0f42 db 6 ; size db -20, 4, 2, $0 - db -20, 12, 2, (1 << OAM_X_FLIP) - db -12, 12, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -12, 4, 2, (1 << OAM_Y_FLIP) + db -20, 12, 2, OAM_XFLIP + db -12, 12, 2, OAM_XFLIP | OAM_YFLIP + db -12, 4, 2, OAM_YFLIP db 8, -16, 1, $0 db 8, 16, 0, $0 .data_b0f5b db 9 ; size db -20, 4, 3, $0 - db -20, 12, 3, (1 << OAM_X_FLIP) - db -12, 4, 3, (1 << OAM_Y_FLIP) - db -12, 12, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -20, 12, 3, OAM_XFLIP + db -12, 4, 3, OAM_YFLIP + db -12, 12, 3, OAM_XFLIP | OAM_YFLIP db 4, -20, 2, $0 - db 4, -12, 2, (1 << OAM_X_FLIP) - db 12, -12, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 12, -20, 2, (1 << OAM_Y_FLIP) + db 4, -12, 2, OAM_XFLIP + db 12, -12, 2, OAM_XFLIP | OAM_YFLIP + db 12, -20, 2, OAM_YFLIP db 8, 16, 1, $0 .data_b0f80 db 12 ; size db 4, -20, 3, $0 - db 4, -12, 3, (1 << OAM_X_FLIP) - db 12, -20, 3, (1 << OAM_Y_FLIP) - db 12, -12, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 4, -12, 3, OAM_XFLIP + db 12, -20, 3, OAM_YFLIP + db 12, -12, 3, OAM_XFLIP | OAM_YFLIP db 4, 12, 2, $0 - db 4, 20, 2, (1 << OAM_X_FLIP) - db 12, 20, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 12, 12, 2, (1 << OAM_Y_FLIP) + db 4, 20, 2, OAM_XFLIP + db 12, 20, 2, OAM_XFLIP | OAM_YFLIP + db 12, 12, 2, OAM_YFLIP db -20, 4, 2, $0 - db -20, 12, 2, (1 << OAM_X_FLIP) - db -12, 12, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -12, 4, 2, (1 << OAM_Y_FLIP) + db -20, 12, 2, OAM_XFLIP + db -12, 12, 2, OAM_XFLIP | OAM_YFLIP + db -12, 4, 2, OAM_YFLIP .data_b0fb1 db 12 ; size db 4, 12, 3, $0 - db 4, 20, 3, (1 << OAM_X_FLIP) - db 12, 12, 3, (1 << OAM_Y_FLIP) - db 12, 20, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 4, 20, 3, OAM_XFLIP + db 12, 12, 3, OAM_YFLIP + db 12, 20, 3, OAM_XFLIP | OAM_YFLIP db -20, 4, 3, $0 - db -20, 12, 3, (1 << OAM_X_FLIP) - db -12, 4, 3, (1 << OAM_Y_FLIP) - db -12, 12, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -20, 12, 3, OAM_XFLIP + db -12, 4, 3, OAM_YFLIP + db -12, 12, 3, OAM_XFLIP | OAM_YFLIP db 4, -20, 2, $0 - db 4, -12, 2, (1 << OAM_X_FLIP) - db 12, -12, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 12, -20, 2, (1 << OAM_Y_FLIP) + db 4, -12, 2, OAM_XFLIP + db 12, -12, 2, OAM_XFLIP | OAM_YFLIP + db 12, -20, 2, OAM_YFLIP AnimData138:: frame_table AnimFrameTable62 @@ -1295,14 +1295,14 @@ AnimFrameTable62:: .data_b103d db 2 ; size - db -24, -8, 2, (1 << OAM_Y_FLIP) + db -24, -8, 2, OAM_YFLIP db -16, -8, 0, $0 .data_b1046 db 8 ; size - db -16, 0, 2, (1 << OAM_Y_FLIP) + db -16, 0, 2, OAM_YFLIP db -21, -16, 1, $0 - db -25, 17, 3, (1 << OAM_X_FLIP) + db -25, 17, 3, OAM_XFLIP db -8, 0, 0, $0 db -16, -16, 2, $0 db -26, 25, 3, $0 @@ -1311,9 +1311,9 @@ AnimFrameTable62:: .data_b1067 db 8 ; size - db -8, 4, 2, (1 << OAM_Y_FLIP) + db -8, 4, 2, OAM_YFLIP db -13, -22, 1, $0 - db -19, 21, 3, (1 << OAM_X_FLIP) + db -19, 21, 3, OAM_XFLIP db 0, 4, 0, $0 db -8, -22, 2, $0 db -11, 19, 0, $0 @@ -1322,9 +1322,9 @@ AnimFrameTable62:: .data_b1088 db 12 ; size - db 5, 2, 2, (1 << OAM_Y_FLIP) + db 5, 2, 2, OAM_YFLIP db -5, -24, 1, $0 - db -12, 24, 3, (1 << OAM_X_FLIP) + db -12, 24, 3, OAM_XFLIP db 13, 2, 0, $0 db 0, -24, 2, $0 db -4, 22, 0, $0 @@ -1337,9 +1337,9 @@ AnimFrameTable62:: .data_b10b9 db 12 ; size - db 16, -2, 2, (1 << OAM_Y_FLIP) + db 16, -2, 2, OAM_YFLIP db 10, -22, 1, $0 - db 0, 19, 3, (1 << OAM_X_FLIP) + db 0, 19, 3, OAM_XFLIP db 24, -2, 0, $0 db 15, -22, 2, $0 db -1, 27, 3, $0 @@ -1353,7 +1353,7 @@ AnimFrameTable62:: .data_b10ea db 10 ; size db 21, -16, 1, $0 - db 10, 14, 3, (1 << OAM_X_FLIP) + db 10, 14, 3, OAM_XFLIP db 26, -16, 2, $0 db 9, 22, 3, $0 db 18, 12, 0, $0 @@ -1365,7 +1365,7 @@ AnimFrameTable62:: .data_b1113 db 8 ; size - db 18, 10, 3, (1 << OAM_X_FLIP) + db 18, 10, 3, OAM_XFLIP db 17, 18, 3, $0 db 26, 8, 0, $0 db 25, 17, 0, $0 @@ -1449,7 +1449,7 @@ AnimFrameTable63:: db -7, 16, 0, $0 db -7, 24, 0, $0 db -8, -32, 1, $0 - db 0, -32, 1, (1 << OAM_Y_FLIP) + db 0, -32, 1, OAM_YFLIP .data_b1218 db 9 ; size @@ -1461,7 +1461,7 @@ AnimFrameTable63:: db -7, 16, 0, $0 db -7, 24, 0, $0 db -8, -24, 1, $0 - db 0, -24, 1, (1 << OAM_Y_FLIP) + db 0, -24, 1, OAM_YFLIP .data_b123d db 9 ; size @@ -1473,7 +1473,7 @@ AnimFrameTable63:: db -7, 16, 0, $0 db -7, 24, 0, $0 db -8, -16, 1, $0 - db 0, -16, 1, (1 << OAM_Y_FLIP) + db 0, -16, 1, OAM_YFLIP .data_b1262 db 9 ; size @@ -1485,7 +1485,7 @@ AnimFrameTable63:: db -7, 24, 0, $0 db -8, -8, 1, $0 db -7, -32, 0, $0 - db 0, -8, 1, (1 << OAM_Y_FLIP) + db 0, -8, 1, OAM_YFLIP .data_b1287 db 9 ; size @@ -1497,7 +1497,7 @@ AnimFrameTable63:: db -8, 0, 1, $0 db -7, -24, 0, $0 db -7, -32, 0, $0 - db 0, 0, 1, (1 << OAM_Y_FLIP) + db 0, 0, 1, OAM_YFLIP .data_b12ac db 9 ; size @@ -1509,7 +1509,7 @@ AnimFrameTable63:: db -7, 0, 0, $0 db -8, 8, 1, $0 db -7, -32, 0, $0 - db 0, 8, 1, (1 << OAM_Y_FLIP) + db 0, 8, 1, OAM_YFLIP .data_b12d1 db 9 ; size @@ -1521,7 +1521,7 @@ AnimFrameTable63:: db -8, 16, 1, $0 db -7, -24, 0, $0 db -7, -32, 0, $0 - db 0, 16, 1, (1 << OAM_Y_FLIP) + db 0, 16, 1, OAM_YFLIP .data_b12f6 db 9 ; size @@ -1533,7 +1533,7 @@ AnimFrameTable63:: db -7, -16, 0, $0 db -7, -24, 0, $0 db -7, -32, 0, $0 - db 0, 24, 1, (1 << OAM_Y_FLIP) + db 0, 24, 1, OAM_YFLIP .data_b131b db 9 ; size @@ -1545,7 +1545,7 @@ AnimFrameTable63:: db -7, 0, 0, $0 db -7, 8, 0, $0 db -7, 16, 0, $0 - db 0, -24, 5, (1 << OAM_Y_FLIP) + db 0, -24, 5, OAM_YFLIP .data_b1340 db 9 ; size @@ -1557,7 +1557,7 @@ AnimFrameTable63:: db -7, 0, 0, $0 db -7, 8, 0, $0 db -7, 16, 0, $0 - db 0, -16, 6, (1 << OAM_Y_FLIP) + db 0, -16, 6, OAM_YFLIP .data_b1365 db 13 ; size @@ -1569,11 +1569,11 @@ AnimFrameTable63:: db -7, 0, 0, $0 db -7, 8, 0, $0 db -7, 16, 0, $0 - db 0, -8, 7, (1 << OAM_Y_FLIP) + db 0, -8, 7, OAM_YFLIP db -16, -8, 4, $0 - db 8, -8, 4, (1 << OAM_Y_FLIP) + db 8, -8, 4, OAM_YFLIP db -24, -8, 2, $0 - db 16, -8, 2, (1 << OAM_Y_FLIP) + db 16, -8, 2, OAM_YFLIP .data_b139a db 9 ; size @@ -1585,7 +1585,7 @@ AnimFrameTable63:: db -7, -8, 0, $0 db -7, 8, 0, $0 db -7, 16, 0, $0 - db 0, 0, 8, (1 << OAM_Y_FLIP) + db 0, 0, 8, OAM_YFLIP .data_b13bf db 11 ; size @@ -1598,8 +1598,8 @@ AnimFrameTable63:: db -7, -8, 0, $0 db -7, -16, 0, $0 db -7, -24, 0, $0 - db 8, 8, 3, (1 << OAM_Y_FLIP) - db 0, 8, 9, (1 << OAM_Y_FLIP) + db 8, 8, 3, OAM_YFLIP + db 0, 8, 9, OAM_YFLIP .data_b13ec db 13 ; size @@ -1613,9 +1613,9 @@ AnimFrameTable63:: db -7, -8, 0, $0 db -7, -16, 0, $0 db -7, -24, 0, $0 - db 16, 16, 2, (1 << OAM_Y_FLIP) - db 8, 16, 4, (1 << OAM_Y_FLIP) - db 0, 16, 10, (1 << OAM_Y_FLIP) + db 16, 16, 2, OAM_YFLIP + db 8, 16, 4, OAM_YFLIP + db 0, 16, 10, OAM_YFLIP AnimData140:: frame_table AnimFrameTable64 @@ -1657,57 +1657,57 @@ AnimFrameTable64:: .data_b1486 db 4 ; size db -72, 0, 0, $0 - db -72, -64, 0, (1 << OAM_X_FLIP) + db -72, -64, 0, OAM_XFLIP db -64, 40, 0, $0 - db -72, 24, 0, (1 << OAM_X_FLIP) + db -72, 24, 0, OAM_XFLIP .data_b1497 db 6 ; size db -66, -22, 0, $0 - db -66, -42, 0, (1 << OAM_X_FLIP) + db -66, -42, 0, OAM_XFLIP db -50, 18, 0, $0 - db -72, -8, 0, (1 << OAM_X_FLIP) + db -72, -8, 0, OAM_XFLIP db -72, 40, 0, $0 - db -66, 54, 0, (1 << OAM_X_FLIP) + db -66, 54, 0, OAM_XFLIP .data_b14b0 db 5 ; size - db -64, -32, 0, (1 << OAM_X_FLIP) + db -64, -32, 0, OAM_XFLIP db -48, 8, 0, $0 - db -66, 22, 0, (1 << OAM_X_FLIP) + db -66, 22, 0, OAM_XFLIP db -58, 2, 0, $0 - db -64, 56, 0, (1 << OAM_X_FLIP) + db -64, 56, 0, OAM_XFLIP .data_b14c5 db 7 ; size - db -56, -24, 0, (1 << OAM_X_FLIP) + db -56, -24, 0, OAM_XFLIP db -56, -40, 0, $0 - db -40, 16, 0, (1 << OAM_X_FLIP) - db -64, 32, 0, (1 << OAM_X_FLIP) + db -40, 16, 0, OAM_XFLIP + db -64, 32, 0, OAM_XFLIP db -56, -8, 0, $0 db -56, 48, 0, $0 db -66, -62, 0, $0 .data_b14e2 db 8 ; size - db -50, 6, 0, (1 << OAM_X_FLIP) + db -50, 6, 0, OAM_XFLIP db -50, -62, 0, $0 - db -26, 46, 0, (1 << OAM_X_FLIP) + db -26, 46, 0, OAM_XFLIP db -56, 24, 0, $0 - db -48, 0, 0, (1 << OAM_X_FLIP) + db -48, 0, 0, OAM_XFLIP db -42, 18, 0, $0 db -64, -72, 0, $0 db -64, -24, 0, $0 .data_b1503 db 10 ; size - db -48, 16, 0, (1 << OAM_X_FLIP) + db -48, 16, 0, OAM_XFLIP db -48, -72, 0, $0 - db -24, 56, 0, (1 << OAM_X_FLIP) + db -24, 56, 0, OAM_XFLIP db -50, -6, 0, $0 - db -34, 38, 0, (1 << OAM_X_FLIP) + db -34, 38, 0, OAM_XFLIP db -40, 0, 0, $0 - db -56, -64, 0, (1 << OAM_X_FLIP) + db -56, -64, 0, OAM_XFLIP db -64, -32, 0, $0 db -72, 48, 0, $0 db -72, 0, 0, $0 @@ -1715,91 +1715,91 @@ AnimFrameTable64:: .data_b152c db 11 ; size db -40, 8, 0, $0 - db -40, -64, 0, (1 << OAM_X_FLIP) + db -40, -64, 0, OAM_XFLIP db -16, 48, 0, $0 db -48, -16, 0, $0 - db -32, 56, 0, (1 << OAM_X_FLIP) - db -32, 8, 0, (1 << OAM_X_FLIP) - db -42, -34, 0, (1 << OAM_X_FLIP) - db -56, -24, 0, (1 << OAM_X_FLIP) + db -32, 56, 0, OAM_XFLIP + db -32, 8, 0, OAM_XFLIP + db -42, -34, 0, OAM_XFLIP + db -56, -24, 0, OAM_XFLIP db -64, 24, 0, $0 - db -72, -48, 0, (1 << OAM_X_FLIP) + db -72, -48, 0, OAM_XFLIP db -64, -32, 0, $0 .data_b1559 db 12 ; size db -34, -18, 0, $0 - db -26, -30, 0, (1 << OAM_X_FLIP) + db -26, -30, 0, OAM_XFLIP db -2, 14, 0, $0 - db -40, -8, 0, (1 << OAM_X_FLIP) + db -40, -8, 0, OAM_XFLIP db -24, 48, 0, $0 - db -18, 50, 0, (1 << OAM_X_FLIP) - db -40, -24, 0, (1 << OAM_X_FLIP) - db -48, 8, 0, (1 << OAM_X_FLIP) + db -18, 50, 0, OAM_XFLIP + db -40, -24, 0, OAM_XFLIP + db -48, 8, 0, OAM_XFLIP db -64, 16, 0, $0 - db -72, -72, 0, (1 << OAM_X_FLIP) - db -64, -8, 0, (1 << OAM_X_FLIP) + db -72, -72, 0, OAM_XFLIP + db -64, -8, 0, OAM_XFLIP db -64, -40, 0, $0 .data_b158a db 12 ; size db -32, -40, 0, $0 - db -24, -16, 0, (1 << OAM_X_FLIP) + db -24, -16, 0, OAM_XFLIP db 0, 0, 0, $0 - db -26, 18, 0, (1 << OAM_X_FLIP) + db -26, 18, 0, OAM_XFLIP db -10, 14, 0, $0 - db -16, 64, 0, (1 << OAM_X_FLIP) + db -16, 64, 0, OAM_XFLIP db -32, -32, 0, $0 - db -48, 16, 0, (1 << OAM_X_FLIP) - db -56, 24, 0, (1 << OAM_X_FLIP) - db -64, -40, 0, (1 << OAM_X_FLIP) - db -64, 0, 0, (1 << OAM_X_FLIP) - db -56, -32, 0, (1 << OAM_X_FLIP) + db -48, 16, 0, OAM_XFLIP + db -56, 24, 0, OAM_XFLIP + db -64, -40, 0, OAM_XFLIP + db -64, 0, 0, OAM_XFLIP + db -56, -32, 0, OAM_XFLIP .data_b15bb db 14 ; size - db -24, -24, 0, (1 << OAM_X_FLIP) + db -24, -24, 0, OAM_XFLIP db -16, -24, 0, $0 - db 8, 8, 0, (1 << OAM_X_FLIP) - db -24, 32, 0, (1 << OAM_X_FLIP) + db 8, 8, 0, OAM_XFLIP + db -24, 32, 0, OAM_XFLIP db -8, 0, 0, $0 db -8, 56, 0, $0 db -10, -58, 0, $0 db -40, 8, 0, $0 - db -48, 64, 0, (1 << OAM_X_FLIP) + db -48, 64, 0, OAM_XFLIP db -72, -16, 0, $0 - db -64, -32, 0, (1 << OAM_X_FLIP) + db -64, -32, 0, OAM_XFLIP db -56, -8, 0, $0 - db -48, 24, 0, (1 << OAM_X_FLIP) + db -48, 24, 0, OAM_XFLIP db -72, 48, 0, $0 .data_b15f4 db 15 ; size - db -18, 14, 0, (1 << OAM_X_FLIP) + db -18, 14, 0, OAM_XFLIP db -2, -58, 0, $0 - db 14, 46, 0, (1 << OAM_X_FLIP) + db 14, 46, 0, OAM_XFLIP db -16, 24, 0, $0 - db 0, 8, 0, (1 << OAM_X_FLIP) + db 0, 8, 0, OAM_XFLIP db 6, 30, 0, $0 db -8, -72, 0, $0 db -32, -24, 0, $0 - db -48, 72, 0, (1 << OAM_X_FLIP) + db -48, 72, 0, OAM_XFLIP db -64, -56, 0, $0 db -56, -40, 0, $0 db -48, -56, 0, $0 - db -48, 32, 0, (1 << OAM_X_FLIP) + db -48, 32, 0, OAM_XFLIP db -72, 16, 0, $0 db -64, 8, 0, $0 .data_b1631 db 15 ; size - db -16, 24, 0, (1 << OAM_X_FLIP) + db -16, 24, 0, OAM_XFLIP db 0, -72, 0, $0 - db 16, 56, 0, (1 << OAM_X_FLIP) + db 16, 56, 0, OAM_XFLIP db -2, -10, 0, $0 - db 14, 54, 0, (1 << OAM_X_FLIP) + db 14, 54, 0, OAM_XFLIP db 8, 16, 0, $0 - db 0, -64, 0, (1 << OAM_X_FLIP) + db 0, -64, 0, OAM_XFLIP db -32, -32, 0, $0 db -40, 64, 0, $0 db -64, -64, 0, $0 @@ -1812,47 +1812,47 @@ AnimFrameTable64:: .data_b166e db 13 ; size db -8, 16, 0, $0 - db 8, -64, 0, (1 << OAM_X_FLIP) + db 8, -64, 0, OAM_XFLIP db 0, -24, 0, $0 - db 16, 72, 0, (1 << OAM_X_FLIP) - db 16, 24, 0, (1 << OAM_X_FLIP) - db 14, -18, 0, (1 << OAM_X_FLIP) - db -24, -24, 0, (1 << OAM_X_FLIP) + db 16, 72, 0, OAM_XFLIP + db 16, 24, 0, OAM_XFLIP + db 14, -18, 0, OAM_XFLIP + db -24, -24, 0, OAM_XFLIP db -24, 32, 0, $0 - db -56, -56, 0, (1 << OAM_X_FLIP) - db -40, -56, 0, (1 << OAM_X_FLIP) + db -56, -56, 0, OAM_XFLIP + db -40, -56, 0, OAM_XFLIP db -32, -16, 0, $0 db -64, -32, 0, $0 - db -56, 8, 0, (1 << OAM_X_FLIP) + db -56, 8, 0, OAM_XFLIP .data_b16a3 db 12 ; size db 6, -26, 0, $0 - db 22, -22, 0, (1 << OAM_X_FLIP) - db 8, -16, 0, (1 << OAM_X_FLIP) - db 16, 0, 0, (1 << OAM_X_FLIP) - db -16, 16, 0, (1 << OAM_X_FLIP) + db 22, -22, 0, OAM_XFLIP + db 8, -16, 0, OAM_XFLIP + db 16, 0, 0, OAM_XFLIP + db -16, 16, 0, OAM_XFLIP db -32, 24, 0, $0 - db -48, -24, 0, (1 << OAM_X_FLIP) - db -40, -80, 0, (1 << OAM_X_FLIP) - db -24, -16, 0, (1 << OAM_X_FLIP) + db -48, -24, 0, OAM_XFLIP + db -40, -80, 0, OAM_XFLIP + db -24, -16, 0, OAM_XFLIP db -32, -24, 0, $0 - db -56, -24, 0, (1 << OAM_X_FLIP) - db -48, 48, 0, (1 << OAM_X_FLIP) + db -56, -24, 0, OAM_XFLIP + db -48, 48, 0, OAM_XFLIP .data_b16d4 db 11 ; size db 16, -48, 0, $0 - db 22, 26, 0, (1 << OAM_X_FLIP) + db 22, 26, 0, OAM_XFLIP db 24, -8, 0, $0 - db -16, 24, 0, (1 << OAM_X_FLIP) - db -24, 32, 0, (1 << OAM_X_FLIP) + db -16, 24, 0, OAM_XFLIP + db -24, 32, 0, OAM_XFLIP db -40, -32, 0, $0 - db -24, -40, 0, (1 << OAM_X_FLIP) - db -24, -8, 0, (1 << OAM_X_FLIP) - db -24, -16, 0, (1 << OAM_X_FLIP) - db -48, 24, 0, (1 << OAM_X_FLIP) - db -48, 64, 0, (1 << OAM_X_FLIP) + db -24, -40, 0, OAM_XFLIP + db -24, -8, 0, OAM_XFLIP + db -24, -16, 0, OAM_XFLIP + db -48, 24, 0, OAM_XFLIP + db -48, 64, 0, OAM_XFLIP AnimData141:: frame_table AnimFrameTable65 @@ -1890,244 +1890,244 @@ AnimFrameTable65:: db -24, -32, 0, $0 db -24, -24, 1, $0 db -16, -32, 2, $0 - db -24, 24, 0, (1 << OAM_X_FLIP) - db -24, 16, 1, (1 << OAM_X_FLIP) - db -16, 24, 2, (1 << OAM_X_FLIP) - db 16, -32, 0, (1 << OAM_Y_FLIP) - db 16, -24, 1, (1 << OAM_Y_FLIP) - db 8, -32, 2, (1 << OAM_Y_FLIP) - db 16, 24, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, 16, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, 24, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -24, 24, 0, OAM_XFLIP + db -24, 16, 1, OAM_XFLIP + db -16, 24, 2, OAM_XFLIP + db 16, -32, 0, OAM_YFLIP + db 16, -24, 1, OAM_YFLIP + db 8, -32, 2, OAM_YFLIP + db 16, 24, 0, OAM_XFLIP | OAM_YFLIP + db 16, 16, 1, OAM_XFLIP | OAM_YFLIP + db 8, 24, 2, OAM_XFLIP | OAM_YFLIP .data_b1785 db 12 ; size db -24, -32, 3, $0 db -24, -24, 4, $0 db -16, -32, 5, $0 - db -24, 24, 3, (1 << OAM_X_FLIP) - db -24, 16, 4, (1 << OAM_X_FLIP) - db -16, 24, 5, (1 << OAM_X_FLIP) - db 16, -32, 3, (1 << OAM_Y_FLIP) - db 16, -24, 4, (1 << OAM_Y_FLIP) - db 8, -32, 5, (1 << OAM_Y_FLIP) - db 16, 24, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, 16, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, 24, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -24, 24, 3, OAM_XFLIP + db -24, 16, 4, OAM_XFLIP + db -16, 24, 5, OAM_XFLIP + db 16, -32, 3, OAM_YFLIP + db 16, -24, 4, OAM_YFLIP + db 8, -32, 5, OAM_YFLIP + db 16, 24, 3, OAM_XFLIP | OAM_YFLIP + db 16, 16, 4, OAM_XFLIP | OAM_YFLIP + db 8, 24, 5, OAM_XFLIP | OAM_YFLIP .data_b17b6 db 12 ; size db -24, -32, 6, $0 db -24, -24, 7, $0 db -16, -32, 8, $0 - db -24, 24, 6, (1 << OAM_X_FLIP) - db -24, 16, 7, (1 << OAM_X_FLIP) - db -16, 24, 8, (1 << OAM_X_FLIP) - db 16, -32, 6, (1 << OAM_Y_FLIP) - db 16, -24, 7, (1 << OAM_Y_FLIP) - db 8, -32, 8, (1 << OAM_Y_FLIP) - db 16, 24, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, 16, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, 24, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -24, 24, 6, OAM_XFLIP + db -24, 16, 7, OAM_XFLIP + db -16, 24, 8, OAM_XFLIP + db 16, -32, 6, OAM_YFLIP + db 16, -24, 7, OAM_YFLIP + db 8, -32, 8, OAM_YFLIP + db 16, 24, 6, OAM_XFLIP | OAM_YFLIP + db 16, 16, 7, OAM_XFLIP | OAM_YFLIP + db 8, 24, 8, OAM_XFLIP | OAM_YFLIP .data_b17e7 db 12 ; size db -24, -32, 9, $0 db -24, -24, 10, $0 db -16, -32, 11, $0 - db -24, 24, 9, (1 << OAM_X_FLIP) - db -24, 16, 10, (1 << OAM_X_FLIP) - db -16, 24, 11, (1 << OAM_X_FLIP) - db 16, -32, 9, (1 << OAM_Y_FLIP) - db 16, -24, 10, (1 << OAM_Y_FLIP) - db 8, -32, 11, (1 << OAM_Y_FLIP) - db 16, 24, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, 16, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, 24, 11, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -24, 24, 9, OAM_XFLIP + db -24, 16, 10, OAM_XFLIP + db -16, 24, 11, OAM_XFLIP + db 16, -32, 9, OAM_YFLIP + db 16, -24, 10, OAM_YFLIP + db 8, -32, 11, OAM_YFLIP + db 16, 24, 9, OAM_XFLIP | OAM_YFLIP + db 16, 16, 10, OAM_XFLIP | OAM_YFLIP + db 8, 24, 11, OAM_XFLIP | OAM_YFLIP .data_b1818 db 12 ; size db -21, -28, 9, $0 db -21, -20, 10, $0 db -13, -28, 11, $0 - db -21, 20, 9, (1 << OAM_X_FLIP) - db -21, 12, 10, (1 << OAM_X_FLIP) - db -13, 20, 11, (1 << OAM_X_FLIP) - db 13, -28, 9, (1 << OAM_Y_FLIP) - db 13, -20, 10, (1 << OAM_Y_FLIP) - db 5, -28, 11, (1 << OAM_Y_FLIP) - db 13, 20, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 13, 12, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 5, 20, 11, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -21, 20, 9, OAM_XFLIP + db -21, 12, 10, OAM_XFLIP + db -13, 20, 11, OAM_XFLIP + db 13, -28, 9, OAM_YFLIP + db 13, -20, 10, OAM_YFLIP + db 5, -28, 11, OAM_YFLIP + db 13, 20, 9, OAM_XFLIP | OAM_YFLIP + db 13, 12, 10, OAM_XFLIP | OAM_YFLIP + db 5, 20, 11, OAM_XFLIP | OAM_YFLIP .data_b1849 db 12 ; size db -18, -24, 9, $0 db -18, -16, 10, $0 db -10, -24, 11, $0 - db -18, 16, 9, (1 << OAM_X_FLIP) - db -18, 8, 10, (1 << OAM_X_FLIP) - db -10, 16, 11, (1 << OAM_X_FLIP) - db 10, -24, 9, (1 << OAM_Y_FLIP) - db 10, -16, 10, (1 << OAM_Y_FLIP) - db 2, -24, 11, (1 << OAM_Y_FLIP) - db 10, 16, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 10, 8, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 2, 16, 11, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -18, 16, 9, OAM_XFLIP + db -18, 8, 10, OAM_XFLIP + db -10, 16, 11, OAM_XFLIP + db 10, -24, 9, OAM_YFLIP + db 10, -16, 10, OAM_YFLIP + db 2, -24, 11, OAM_YFLIP + db 10, 16, 9, OAM_XFLIP | OAM_YFLIP + db 10, 8, 10, OAM_XFLIP | OAM_YFLIP + db 2, 16, 11, OAM_XFLIP | OAM_YFLIP .data_b187a db 12 ; size db -15, -20, 9, $0 db -15, -12, 10, $0 db -7, -20, 11, $0 - db -15, 12, 9, (1 << OAM_X_FLIP) - db -15, 4, 10, (1 << OAM_X_FLIP) - db -7, 12, 11, (1 << OAM_X_FLIP) - db 7, -20, 9, (1 << OAM_Y_FLIP) - db 7, -12, 10, (1 << OAM_Y_FLIP) - db -1, -20, 11, (1 << OAM_Y_FLIP) - db 7, 12, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 7, 4, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -1, 12, 11, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -15, 12, 9, OAM_XFLIP + db -15, 4, 10, OAM_XFLIP + db -7, 12, 11, OAM_XFLIP + db 7, -20, 9, OAM_YFLIP + db 7, -12, 10, OAM_YFLIP + db -1, -20, 11, OAM_YFLIP + db 7, 12, 9, OAM_XFLIP | OAM_YFLIP + db 7, 4, 10, OAM_XFLIP | OAM_YFLIP + db -1, 12, 11, OAM_XFLIP | OAM_YFLIP .data_b18ab db 12 ; size - db 4, -16, 9, (1 << OAM_Y_FLIP) - db 4, -8, 10, (1 << OAM_Y_FLIP) - db -4, -16, 11, (1 << OAM_Y_FLIP) - db 4, 8, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 4, 0, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -4, 8, 11, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 4, -16, 9, OAM_YFLIP + db 4, -8, 10, OAM_YFLIP + db -4, -16, 11, OAM_YFLIP + db 4, 8, 9, OAM_XFLIP | OAM_YFLIP + db 4, 0, 10, OAM_XFLIP | OAM_YFLIP + db -4, 8, 11, OAM_XFLIP | OAM_YFLIP db -12, -16, 9, $0 db -12, -8, 10, $0 db -4, -16, 11, $0 - db -12, 8, 9, (1 << OAM_X_FLIP) - db -12, 0, 10, (1 << OAM_X_FLIP) - db -4, 8, 11, (1 << OAM_X_FLIP) + db -12, 8, 9, OAM_XFLIP + db -12, 0, 10, OAM_XFLIP + db -4, 8, 11, OAM_XFLIP .data_b18dc db 28 ; size db -20, -16, 12, $0 db -20, -8, 13, $0 - db -20, 8, 12, (1 << OAM_X_FLIP) - db -20, 0, 13, (1 << OAM_X_FLIP) - db 12, -16, 12, (1 << OAM_Y_FLIP) - db 12, -8, 13, (1 << OAM_Y_FLIP) - db 12, 8, 12, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 12, 0, 13, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -20, 8, 12, OAM_XFLIP + db -20, 0, 13, OAM_XFLIP + db 12, -16, 12, OAM_YFLIP + db 12, -8, 13, OAM_YFLIP + db 12, 8, 12, OAM_XFLIP | OAM_YFLIP + db 12, 0, 13, OAM_XFLIP | OAM_YFLIP db -16, 16, 20, $0 db -8, 16, 21, $0 db 0, 16, 21, $0 - db 8, 16, 20, (1 << OAM_Y_FLIP) - db -16, -24, 20, (1 << OAM_X_FLIP) - db -8, -24, 21, (1 << OAM_X_FLIP) - db 0, -24, 21, (1 << OAM_X_FLIP) - db 8, -24, 20, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 4, -16, 9, (1 << OAM_Y_FLIP) - db 4, -8, 10, (1 << OAM_Y_FLIP) - db -4, -16, 11, (1 << OAM_Y_FLIP) - db 4, 8, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 4, 0, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -4, 8, 11, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 8, 16, 20, OAM_YFLIP + db -16, -24, 20, OAM_XFLIP + db -8, -24, 21, OAM_XFLIP + db 0, -24, 21, OAM_XFLIP + db 8, -24, 20, OAM_XFLIP | OAM_YFLIP + db 4, -16, 9, OAM_YFLIP + db 4, -8, 10, OAM_YFLIP + db -4, -16, 11, OAM_YFLIP + db 4, 8, 9, OAM_XFLIP | OAM_YFLIP + db 4, 0, 10, OAM_XFLIP | OAM_YFLIP + db -4, 8, 11, OAM_XFLIP | OAM_YFLIP db -12, -16, 9, $0 db -12, -8, 10, $0 db -4, -16, 11, $0 - db -12, 8, 9, (1 << OAM_X_FLIP) - db -12, 0, 10, (1 << OAM_X_FLIP) - db -4, 8, 11, (1 << OAM_X_FLIP) + db -12, 8, 9, OAM_XFLIP + db -12, 0, 10, OAM_XFLIP + db -4, 8, 11, OAM_XFLIP .data_b194d db 28 ; size - db 12, 8, 14, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 12, 0, 15, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, 16, 22, (1 << OAM_Y_FLIP) - db 0, 16, 23, (1 << OAM_Y_FLIP) - db 12, -16, 14, (1 << OAM_Y_FLIP) - db 12, -8, 15, (1 << OAM_Y_FLIP) - db 8, -24, 22, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -24, 23, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -20, 8, 14, (1 << OAM_X_FLIP) - db -20, 0, 15, (1 << OAM_X_FLIP) + db 12, 8, 14, OAM_XFLIP | OAM_YFLIP + db 12, 0, 15, OAM_XFLIP | OAM_YFLIP + db 8, 16, 22, OAM_YFLIP + db 0, 16, 23, OAM_YFLIP + db 12, -16, 14, OAM_YFLIP + db 12, -8, 15, OAM_YFLIP + db 8, -24, 22, OAM_XFLIP | OAM_YFLIP + db 0, -24, 23, OAM_XFLIP | OAM_YFLIP + db -20, 8, 14, OAM_XFLIP + db -20, 0, 15, OAM_XFLIP db -16, 16, 22, $0 db -8, 16, 23, $0 db -20, -16, 14, $0 db -20, -8, 15, $0 - db -16, -24, 22, (1 << OAM_X_FLIP) - db -8, -24, 23, (1 << OAM_X_FLIP) - db 4, -16, 9, (1 << OAM_Y_FLIP) - db 4, -8, 10, (1 << OAM_Y_FLIP) - db -4, -16, 11, (1 << OAM_Y_FLIP) - db 4, 8, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 4, 0, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -4, 8, 11, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -16, -24, 22, OAM_XFLIP + db -8, -24, 23, OAM_XFLIP + db 4, -16, 9, OAM_YFLIP + db 4, -8, 10, OAM_YFLIP + db -4, -16, 11, OAM_YFLIP + db 4, 8, 9, OAM_XFLIP | OAM_YFLIP + db 4, 0, 10, OAM_XFLIP | OAM_YFLIP + db -4, 8, 11, OAM_XFLIP | OAM_YFLIP db -12, -16, 9, $0 db -12, -8, 10, $0 db -4, -16, 11, $0 - db -12, 8, 9, (1 << OAM_X_FLIP) - db -12, 0, 10, (1 << OAM_X_FLIP) - db -4, 8, 11, (1 << OAM_X_FLIP) + db -12, 8, 9, OAM_XFLIP + db -12, 0, 10, OAM_XFLIP + db -4, 8, 11, OAM_XFLIP .data_b19be db 28 ; size - db 12, 8, 16, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 12, 0, 17, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, 16, 24, (1 << OAM_Y_FLIP) - db 0, 16, 25, (1 << OAM_Y_FLIP) - db 12, -16, 16, (1 << OAM_Y_FLIP) - db 12, -8, 17, (1 << OAM_Y_FLIP) - db 8, -24, 24, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -24, 25, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -20, 8, 16, (1 << OAM_X_FLIP) - db -20, 0, 17, (1 << OAM_X_FLIP) + db 12, 8, 16, OAM_XFLIP | OAM_YFLIP + db 12, 0, 17, OAM_XFLIP | OAM_YFLIP + db 8, 16, 24, OAM_YFLIP + db 0, 16, 25, OAM_YFLIP + db 12, -16, 16, OAM_YFLIP + db 12, -8, 17, OAM_YFLIP + db 8, -24, 24, OAM_XFLIP | OAM_YFLIP + db 0, -24, 25, OAM_XFLIP | OAM_YFLIP + db -20, 8, 16, OAM_XFLIP + db -20, 0, 17, OAM_XFLIP db -16, 16, 24, $0 db -8, 16, 25, $0 db -20, -16, 16, $0 db -20, -8, 17, $0 - db -16, -24, 24, (1 << OAM_X_FLIP) - db -8, -24, 25, (1 << OAM_X_FLIP) - db 4, -16, 9, (1 << OAM_Y_FLIP) - db 4, -8, 10, (1 << OAM_Y_FLIP) - db -4, -16, 11, (1 << OAM_Y_FLIP) - db 4, 8, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 4, 0, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -4, 8, 11, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -16, -24, 24, OAM_XFLIP + db -8, -24, 25, OAM_XFLIP + db 4, -16, 9, OAM_YFLIP + db 4, -8, 10, OAM_YFLIP + db -4, -16, 11, OAM_YFLIP + db 4, 8, 9, OAM_XFLIP | OAM_YFLIP + db 4, 0, 10, OAM_XFLIP | OAM_YFLIP + db -4, 8, 11, OAM_XFLIP | OAM_YFLIP db -12, -16, 9, $0 db -12, -8, 10, $0 db -4, -16, 11, $0 - db -12, 8, 9, (1 << OAM_X_FLIP) - db -12, 0, 10, (1 << OAM_X_FLIP) - db -4, 8, 11, (1 << OAM_X_FLIP) + db -12, 8, 9, OAM_XFLIP + db -12, 0, 10, OAM_XFLIP + db -4, 8, 11, OAM_XFLIP .data_b1a2f db 28 ; size - db 12, 8, 18, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 12, 0, 19, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, 16, 26, (1 << OAM_Y_FLIP) - db 0, 16, 27, (1 << OAM_Y_FLIP) - db 12, -16, 18, (1 << OAM_Y_FLIP) - db 12, -8, 19, (1 << OAM_Y_FLIP) - db 8, -24, 26, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -24, 27, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -20, 8, 18, (1 << OAM_X_FLIP) - db -20, 0, 19, (1 << OAM_X_FLIP) + db 12, 8, 18, OAM_XFLIP | OAM_YFLIP + db 12, 0, 19, OAM_XFLIP | OAM_YFLIP + db 8, 16, 26, OAM_YFLIP + db 0, 16, 27, OAM_YFLIP + db 12, -16, 18, OAM_YFLIP + db 12, -8, 19, OAM_YFLIP + db 8, -24, 26, OAM_XFLIP | OAM_YFLIP + db 0, -24, 27, OAM_XFLIP | OAM_YFLIP + db -20, 8, 18, OAM_XFLIP + db -20, 0, 19, OAM_XFLIP db -16, 16, 26, $0 db -8, 16, 27, $0 db -20, -16, 18, $0 db -20, -8, 19, $0 - db -16, -24, 26, (1 << OAM_X_FLIP) - db -8, -24, 27, (1 << OAM_X_FLIP) - db 4, -16, 9, (1 << OAM_Y_FLIP) - db 4, -8, 10, (1 << OAM_Y_FLIP) - db -4, -16, 11, (1 << OAM_Y_FLIP) - db 4, 8, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 4, 0, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -4, 8, 11, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -16, -24, 26, OAM_XFLIP + db -8, -24, 27, OAM_XFLIP + db 4, -16, 9, OAM_YFLIP + db 4, -8, 10, OAM_YFLIP + db -4, -16, 11, OAM_YFLIP + db 4, 8, 9, OAM_XFLIP | OAM_YFLIP + db 4, 0, 10, OAM_XFLIP | OAM_YFLIP + db -4, 8, 11, OAM_XFLIP | OAM_YFLIP db -12, -16, 9, $0 db -12, -8, 10, $0 db -4, -16, 11, $0 - db -12, 8, 9, (1 << OAM_X_FLIP) - db -12, 0, 10, (1 << OAM_X_FLIP) - db -4, 8, 11, (1 << OAM_X_FLIP) + db -12, 8, 9, OAM_XFLIP + db -12, 0, 10, OAM_XFLIP + db -4, 8, 11, OAM_XFLIP AnimData142:: frame_table AnimFrameTable66 @@ -2157,7 +2157,7 @@ AnimFrameTable66:: db -24, -24, 20, $0 db -24, -16, 21, $0 db -24, 8, 21, $0 - db -24, 16, 20, (1 << OAM_X_FLIP) + db -24, 16, 20, OAM_XFLIP .data_b1aee db 10 ; size @@ -2170,7 +2170,7 @@ AnimFrameTable66:: db -16, -24, 20, $0 db -16, -16, 21, $0 db -16, 8, 21, $0 - db -16, 16, 20, (1 << OAM_X_FLIP) + db -16, 16, 20, OAM_XFLIP .data_b1b17 db 14 ; size @@ -2187,7 +2187,7 @@ AnimFrameTable66:: db -8, -24, 20, $0 db -8, -16, 21, $0 db -8, 8, 21, $0 - db -8, 16, 20, (1 << OAM_X_FLIP) + db -8, 16, 20, OAM_XFLIP .data_b1b50 db 18 ; size @@ -2208,7 +2208,7 @@ AnimFrameTable66:: db 0, -24, 20, $0 db 0, -16, 21, $0 db 0, 8, 21, $0 - db 0, 16, 20, (1 << OAM_X_FLIP) + db 0, 16, 20, OAM_XFLIP .data_b1b99 db 22 ; size @@ -2233,7 +2233,7 @@ AnimFrameTable66:: db 8, -24, 20, $0 db 8, -16, 21, $0 db 8, 8, 21, $0 - db 8, 16, 20, (1 << OAM_X_FLIP) + db 8, 16, 20, OAM_XFLIP .data_b1bf2 db 26 ; size @@ -2262,7 +2262,7 @@ AnimFrameTable66:: db 16, -24, 20, $0 db 16, -16, 21, $0 db 16, 8, 21, $0 - db 16, 16, 20, (1 << OAM_X_FLIP) + db 16, 16, 20, OAM_XFLIP .data_b1c5b db 24 ; size @@ -2339,29 +2339,29 @@ AnimFrameTable67:: db -74, -88, 0, $0 db -73, -80, 1, $0 db -72, -72, 2, $0 - db -64, -72, 2, (1 << OAM_Y_FLIP) + db -64, -72, 2, OAM_YFLIP .data_b1d64 db 19 ; size - db -36, -64, 3, (1 << OAM_X_FLIP) - db -37, -72, 4, (1 << OAM_X_FLIP) - db -38, -80, 14, (1 << OAM_X_FLIP) - db -39, -88, 15, (1 << OAM_X_FLIP) - db -45, -72, 10, (1 << OAM_X_FLIP) - db -46, -80, 11, (1 << OAM_X_FLIP) - db -47, -88, 12, (1 << OAM_X_FLIP) - db -48, -96, 13, (1 << OAM_X_FLIP) - db -53, -72, 6, (1 << OAM_X_FLIP) - db -54, -80, 7, (1 << OAM_X_FLIP) - db -55, -88, 8, (1 << OAM_X_FLIP) - db -56, -96, 9, (1 << OAM_X_FLIP) - db -61, -72, 3, (1 << OAM_X_FLIP) - db -62, -80, 4, (1 << OAM_X_FLIP) - db -63, -88, 5, (1 << OAM_X_FLIP) - db -70, -80, 0, (1 << OAM_X_FLIP) - db -71, -88, 1, (1 << OAM_X_FLIP) - db -72, -96, 2, (1 << OAM_X_FLIP) - db -64, -96, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -36, -64, 3, OAM_XFLIP + db -37, -72, 4, OAM_XFLIP + db -38, -80, 14, OAM_XFLIP + db -39, -88, 15, OAM_XFLIP + db -45, -72, 10, OAM_XFLIP + db -46, -80, 11, OAM_XFLIP + db -47, -88, 12, OAM_XFLIP + db -48, -96, 13, OAM_XFLIP + db -53, -72, 6, OAM_XFLIP + db -54, -80, 7, OAM_XFLIP + db -55, -88, 8, OAM_XFLIP + db -56, -96, 9, OAM_XFLIP + db -61, -72, 3, OAM_XFLIP + db -62, -80, 4, OAM_XFLIP + db -63, -88, 5, OAM_XFLIP + db -70, -80, 0, OAM_XFLIP + db -71, -88, 1, OAM_XFLIP + db -72, -96, 2, OAM_XFLIP + db -64, -96, 2, OAM_XFLIP | OAM_YFLIP AnimData144:: frame_table AnimFrameTable68 @@ -2405,17 +2405,17 @@ AnimFrameTable68:: .data_b1e24 db 11 ; size - db -23, 16, 4, (1 << OAM_X_FLIP) - db -23, 8, 5, (1 << OAM_X_FLIP) - db -23, 0, 6, (1 << OAM_X_FLIP) - db -15, 16, 7, (1 << OAM_X_FLIP) - db -15, 8, 8, (1 << OAM_X_FLIP) - db -15, 0, 9, (1 << OAM_X_FLIP) - db -7, 16, 10, (1 << OAM_X_FLIP) - db -7, 8, 11, (1 << OAM_X_FLIP) - db -7, 0, 12, (1 << OAM_X_FLIP) - db 1, 8, 13, (1 << OAM_X_FLIP) - db 1, 0, 14, (1 << OAM_X_FLIP) + db -23, 16, 4, OAM_XFLIP + db -23, 8, 5, OAM_XFLIP + db -23, 0, 6, OAM_XFLIP + db -15, 16, 7, OAM_XFLIP + db -15, 8, 8, OAM_XFLIP + db -15, 0, 9, OAM_XFLIP + db -7, 16, 10, OAM_XFLIP + db -7, 8, 11, OAM_XFLIP + db -7, 0, 12, OAM_XFLIP + db 1, 8, 13, OAM_XFLIP + db 1, 0, 14, OAM_XFLIP AnimData145:: frame_table AnimFrameTable68 @@ -2487,18 +2487,18 @@ AnimFrameTable69:: db 6 ; size db -8, -16, 0, $0 db -8, 8, 2, $0 - db -8, 16, 3, (1 << OAM_Y_FLIP) - db -8, 0, 1, (1 << OAM_X_FLIP) - db -8, -24, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, 16, 3, OAM_YFLIP + db -8, 0, 1, OAM_XFLIP + db -8, -24, 1, OAM_XFLIP | OAM_YFLIP db -8, -8, 3, $0 .data_b1f4a db 6 ; size db -8, -16, 2, $0 db -8, 8, 0, $0 - db -8, 16, 1, (1 << OAM_Y_FLIP) - db -8, 0, 3, (1 << OAM_X_FLIP) - db -8, -24, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, 16, 1, OAM_YFLIP + db -8, 0, 3, OAM_XFLIP + db -8, -24, 3, OAM_XFLIP | OAM_YFLIP db -8, -8, 1, $0 .data_b1f63 @@ -2507,12 +2507,12 @@ AnimFrameTable69:: db 8, -20, 6, $0 db -8, -16, 0, $0 db -8, 8, 2, $0 - db -8, 16, 3, (1 << OAM_Y_FLIP) - db -8, 0, 1, (1 << OAM_X_FLIP) - db -8, -24, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, 16, 3, OAM_YFLIP + db -8, 0, 1, OAM_XFLIP + db -8, -24, 1, OAM_XFLIP | OAM_YFLIP db -8, -8, 3, $0 - db 0, -12, 5, (1 << OAM_X_FLIP) - db 8, -12, 6, (1 << OAM_X_FLIP) + db 0, -12, 5, OAM_XFLIP + db 8, -12, 6, OAM_XFLIP .data_b1f8c db 11 ; size @@ -2521,12 +2521,12 @@ AnimFrameTable69:: db 16, -20, 6, $0 db -8, -16, 2, $0 db -8, 8, 0, $0 - db -8, 16, 1, (1 << OAM_Y_FLIP) - db -8, 0, 3, (1 << OAM_X_FLIP) - db -8, -24, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, 16, 1, OAM_YFLIP + db -8, 0, 3, OAM_XFLIP + db -8, -24, 3, OAM_XFLIP | OAM_YFLIP db -8, -8, 1, $0 - db 8, -12, 5, (1 << OAM_X_FLIP) - db 16, -12, 6, (1 << OAM_X_FLIP) + db 8, -12, 5, OAM_XFLIP + db 16, -12, 6, OAM_XFLIP .data_b1fb9 db 16 ; size @@ -2538,14 +2538,14 @@ AnimFrameTable69:: db 24, -20, 6, $0 db -8, -16, 0, $0 db -8, 8, 2, $0 - db -8, 16, 3, (1 << OAM_Y_FLIP) - db -8, 0, 1, (1 << OAM_X_FLIP) - db -8, -24, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, 16, 3, OAM_YFLIP + db -8, 0, 1, OAM_XFLIP + db -8, -24, 1, OAM_XFLIP | OAM_YFLIP db -8, -8, 3, $0 - db 16, -12, 5, (1 << OAM_X_FLIP) - db 24, -12, 6, (1 << OAM_X_FLIP) - db 0, 12, 5, (1 << OAM_X_FLIP) - db 8, 12, 6, (1 << OAM_X_FLIP) + db 16, -12, 5, OAM_XFLIP + db 24, -12, 6, OAM_XFLIP + db 0, 12, 5, OAM_XFLIP + db 8, 12, 6, OAM_XFLIP .data_b1ffa db 16 ; size @@ -2557,14 +2557,14 @@ AnimFrameTable69:: db 16, -20, 6, $0 db -8, -16, 2, $0 db -8, 8, 0, $0 - db -8, 16, 1, (1 << OAM_Y_FLIP) - db -8, 0, 3, (1 << OAM_X_FLIP) - db -8, -24, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, 16, 1, OAM_YFLIP + db -8, 0, 3, OAM_XFLIP + db -8, -24, 3, OAM_XFLIP | OAM_YFLIP db -8, -8, 1, $0 - db 8, -12, 5, (1 << OAM_X_FLIP) - db 16, -12, 6, (1 << OAM_X_FLIP) - db 8, 12, 5, (1 << OAM_X_FLIP) - db 16, 12, 6, (1 << OAM_X_FLIP) + db 8, -12, 5, OAM_XFLIP + db 16, -12, 6, OAM_XFLIP + db 8, 12, 5, OAM_XFLIP + db 16, 12, 6, OAM_XFLIP .data_b203b db 16 ; size @@ -2576,14 +2576,14 @@ AnimFrameTable69:: db 24, 4, 6, $0 db -8, -16, 0, $0 db -8, 8, 2, $0 - db -8, 16, 3, (1 << OAM_Y_FLIP) - db -8, 0, 1, (1 << OAM_X_FLIP) - db -8, -24, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, 16, 3, OAM_YFLIP + db -8, 0, 1, OAM_XFLIP + db -8, -24, 1, OAM_XFLIP | OAM_YFLIP db -8, -8, 3, $0 - db 0, -12, 5, (1 << OAM_X_FLIP) - db 8, -12, 6, (1 << OAM_X_FLIP) - db 16, 12, 5, (1 << OAM_X_FLIP) - db 24, 12, 6, (1 << OAM_X_FLIP) + db 0, -12, 5, OAM_XFLIP + db 8, -12, 6, OAM_XFLIP + db 16, 12, 5, OAM_XFLIP + db 24, 12, 6, OAM_XFLIP AnimData147:: frame_table AnimFrameTable70 @@ -2624,54 +2624,54 @@ AnimFrameTable70:: db 16 ; size db -23, -16, 0, $0 db -23, -8, 1, $0 - db -23, 0, 1, (1 << OAM_X_FLIP) - db -23, 8, 0, (1 << OAM_X_FLIP) + db -23, 0, 1, OAM_XFLIP + db -23, 8, 0, OAM_XFLIP db -15, -16, 2, $0 db -15, -8, 3, $0 - db -15, 0, 3, (1 << OAM_X_FLIP) - db -15, 8, 2, (1 << OAM_X_FLIP) - db -7, -16, 2, (1 << OAM_Y_FLIP) - db -7, -8, 3, (1 << OAM_Y_FLIP) - db -7, 0, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -7, 8, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 1, -16, 0, (1 << OAM_Y_FLIP) - db 1, -8, 1, (1 << OAM_Y_FLIP) - db 1, 0, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 1, 8, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -15, 0, 3, OAM_XFLIP + db -15, 8, 2, OAM_XFLIP + db -7, -16, 2, OAM_YFLIP + db -7, -8, 3, OAM_YFLIP + db -7, 0, 3, OAM_XFLIP | OAM_YFLIP + db -7, 8, 2, OAM_XFLIP | OAM_YFLIP + db 1, -16, 0, OAM_YFLIP + db 1, -8, 1, OAM_YFLIP + db 1, 0, 1, OAM_XFLIP | OAM_YFLIP + db 1, 8, 0, OAM_XFLIP | OAM_YFLIP .data_b2128 db 16 ; size db -23, -16, 0, $0 db -23, -8, 1, $0 - db -23, 0, 1, (1 << OAM_X_FLIP) - db -23, 8, 0, (1 << OAM_X_FLIP) + db -23, 0, 1, OAM_XFLIP + db -23, 8, 0, OAM_XFLIP db -15, -16, 2, $0 db -15, -8, 3, $0 - db -15, 0, 3, (1 << OAM_X_FLIP) - db -15, 8, 2, (1 << OAM_X_FLIP) - db -7, -8, 3, (1 << OAM_Y_FLIP) - db -7, 0, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -7, 8, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 1, -16, 0, (1 << OAM_Y_FLIP) - db 1, -8, 1, (1 << OAM_Y_FLIP) - db 1, 0, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 1, 8, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -15, 0, 3, OAM_XFLIP + db -15, 8, 2, OAM_XFLIP + db -7, -8, 3, OAM_YFLIP + db -7, 0, 3, OAM_XFLIP | OAM_YFLIP + db -7, 8, 2, OAM_XFLIP | OAM_YFLIP + db 1, -16, 0, OAM_YFLIP + db 1, -8, 1, OAM_YFLIP + db 1, 0, 1, OAM_XFLIP | OAM_YFLIP + db 1, 8, 0, OAM_XFLIP | OAM_YFLIP db -7, -16, 4, $0 .data_b2169 db 15 ; size db -23, -16, 0, $0 db -23, -8, 1, $0 - db -23, 0, 1, (1 << OAM_X_FLIP) - db -23, 8, 0, (1 << OAM_X_FLIP) + db -23, 0, 1, OAM_XFLIP + db -23, 8, 0, OAM_XFLIP db -15, -16, 2, $0 db -15, -8, 3, $0 - db -15, 0, 3, (1 << OAM_X_FLIP) - db -15, 8, 2, (1 << OAM_X_FLIP) - db -7, 0, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -7, 8, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 1, 0, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 1, 8, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -15, 0, 3, OAM_XFLIP + db -15, 8, 2, OAM_XFLIP + db -7, 0, 3, OAM_XFLIP | OAM_YFLIP + db -7, 8, 2, OAM_XFLIP | OAM_YFLIP + db 1, 0, 1, OAM_XFLIP | OAM_YFLIP + db 1, 8, 0, OAM_XFLIP | OAM_YFLIP db -7, -16, 5, $0 db -4, -13, 6, $0 db 1, -8, 7, $0 @@ -2680,16 +2680,16 @@ AnimFrameTable70:: db 15 ; size db -23, -16, 0, $0 db -23, -8, 1, $0 - db -23, 0, 1, (1 << OAM_X_FLIP) - db -23, 8, 0, (1 << OAM_X_FLIP) + db -23, 0, 1, OAM_XFLIP + db -23, 8, 0, OAM_XFLIP db -15, -16, 2, $0 db -15, -8, 3, $0 - db -15, 0, 3, (1 << OAM_X_FLIP) - db -15, 8, 2, (1 << OAM_X_FLIP) - db -7, 0, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -7, 8, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 1, 0, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 1, 8, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -15, 0, 3, OAM_XFLIP + db -15, 8, 2, OAM_XFLIP + db -7, 0, 3, OAM_XFLIP | OAM_YFLIP + db -7, 8, 2, OAM_XFLIP | OAM_YFLIP + db 1, 0, 1, OAM_XFLIP | OAM_YFLIP + db 1, 8, 0, OAM_XFLIP | OAM_YFLIP db -7, -16, 5, $0 db -1, -14, 6, $0 db 1, -8, 7, $0 @@ -2698,16 +2698,16 @@ AnimFrameTable70:: db 15 ; size db -23, -16, 0, $0 db -23, -8, 1, $0 - db -23, 0, 1, (1 << OAM_X_FLIP) - db -23, 8, 0, (1 << OAM_X_FLIP) + db -23, 0, 1, OAM_XFLIP + db -23, 8, 0, OAM_XFLIP db -15, -16, 2, $0 db -15, -8, 3, $0 - db -15, 0, 3, (1 << OAM_X_FLIP) - db -15, 8, 2, (1 << OAM_X_FLIP) - db -7, 0, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -7, 8, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 1, 0, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 1, 8, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -15, 0, 3, OAM_XFLIP + db -15, 8, 2, OAM_XFLIP + db -7, 0, 3, OAM_XFLIP | OAM_YFLIP + db -7, 8, 2, OAM_XFLIP | OAM_YFLIP + db 1, 0, 1, OAM_XFLIP | OAM_YFLIP + db 1, 8, 0, OAM_XFLIP | OAM_YFLIP db -7, -16, 5, $0 db 6, -13, 6, $0 db 1, -8, 7, $0 @@ -2716,15 +2716,15 @@ AnimFrameTable70:: db 16 ; size db -23, -16, 0, $0 db -23, -8, 1, $0 - db -23, 0, 1, (1 << OAM_X_FLIP) - db -23, 8, 0, (1 << OAM_X_FLIP) + db -23, 0, 1, OAM_XFLIP + db -23, 8, 0, OAM_XFLIP db -15, -16, 2, $0 db -15, -8, 3, $0 - db -15, 0, 3, (1 << OAM_X_FLIP) - db -15, 8, 2, (1 << OAM_X_FLIP) - db -7, 0, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -7, 8, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 1, 8, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -15, 0, 3, OAM_XFLIP + db -15, 8, 2, OAM_XFLIP + db -7, 0, 3, OAM_XFLIP | OAM_YFLIP + db -7, 8, 2, OAM_XFLIP | OAM_YFLIP + db 1, 8, 0, OAM_XFLIP | OAM_YFLIP db -7, -16, 5, $0 db 12, -4, 6, $0 db 1, -8, 8, $0 @@ -2735,15 +2735,15 @@ AnimFrameTable70:: db 16 ; size db -23, -16, 0, $0 db -23, -8, 1, $0 - db -23, 0, 1, (1 << OAM_X_FLIP) - db -23, 8, 0, (1 << OAM_X_FLIP) + db -23, 0, 1, OAM_XFLIP + db -23, 8, 0, OAM_XFLIP db -15, -16, 2, $0 db -15, -8, 3, $0 - db -15, 0, 3, (1 << OAM_X_FLIP) - db -15, 8, 2, (1 << OAM_X_FLIP) - db -7, 0, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -7, 8, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 1, 8, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -15, 0, 3, OAM_XFLIP + db -15, 8, 2, OAM_XFLIP + db -7, 0, 3, OAM_XFLIP | OAM_YFLIP + db -7, 8, 2, OAM_XFLIP | OAM_YFLIP + db 1, 8, 0, OAM_XFLIP | OAM_YFLIP db -7, -16, 5, $0 db 17, -4, 6, $0 db 1, -8, 8, $0 @@ -2754,15 +2754,15 @@ AnimFrameTable70:: db 16 ; size db -23, -16, 0, $0 db -23, -8, 1, $0 - db -23, 0, 1, (1 << OAM_X_FLIP) - db -23, 8, 0, (1 << OAM_X_FLIP) + db -23, 0, 1, OAM_XFLIP + db -23, 8, 0, OAM_XFLIP db -15, -16, 2, $0 db -15, -8, 3, $0 - db -15, 0, 3, (1 << OAM_X_FLIP) - db -15, 8, 2, (1 << OAM_X_FLIP) - db -7, 0, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -7, 8, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 1, 8, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -15, 0, 3, OAM_XFLIP + db -15, 8, 2, OAM_XFLIP + db -7, 0, 3, OAM_XFLIP | OAM_YFLIP + db -7, 8, 2, OAM_XFLIP | OAM_YFLIP + db 1, 8, 0, OAM_XFLIP | OAM_YFLIP db -7, -16, 5, $0 db 14, -4, 6, $0 db 1, -8, 8, $0 @@ -2794,17 +2794,17 @@ AnimFrameTable71:: .data_b230f db 12 ; size db -8, -16, 6, $0 - db 0, -16, 6, (1 << OAM_Y_FLIP) + db 0, -16, 6, OAM_YFLIP db -8, -8, 7, $0 - db 0, -8, 7, (1 << OAM_Y_FLIP) + db 0, -8, 7, OAM_YFLIP db -16, -8, 8, $0 - db 8, -8, 8, (1 << OAM_Y_FLIP) - db -8, 8, 6, (1 << OAM_X_FLIP) - db 0, 8, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 0, 7, (1 << OAM_X_FLIP) - db 0, 0, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, 0, 8, (1 << OAM_X_FLIP) - db 8, 0, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 8, -8, 8, OAM_YFLIP + db -8, 8, 6, OAM_XFLIP + db 0, 8, 6, OAM_XFLIP | OAM_YFLIP + db -8, 0, 7, OAM_XFLIP + db 0, 0, 7, OAM_XFLIP | OAM_YFLIP + db -16, 0, 8, OAM_XFLIP + db 8, 0, 8, OAM_XFLIP | OAM_YFLIP .data_b2340 db 4 ; size @@ -3077,33 +3077,33 @@ AnimFrameTable73:: .data_b26c0 db 5 ; size - db -28, 24, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, 8, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, 0, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, -16, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, -32, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -28, 24, 1, OAM_XFLIP | OAM_YFLIP + db -28, 8, 1, OAM_XFLIP | OAM_YFLIP + db -28, 0, 1, OAM_XFLIP | OAM_YFLIP + db -28, -16, 1, OAM_XFLIP | OAM_YFLIP + db -28, -32, 1, OAM_XFLIP | OAM_YFLIP .data_b26d5 db 8 ; size - db -28, 16, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, -8, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, -24, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, 24, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, 8, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, 0, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, -16, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, -32, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -28, 16, 1, OAM_XFLIP | OAM_YFLIP + db -28, -8, 1, OAM_XFLIP | OAM_YFLIP + db -28, -24, 1, OAM_XFLIP | OAM_YFLIP + db -28, 24, 0, OAM_XFLIP | OAM_YFLIP + db -28, 8, 0, OAM_XFLIP | OAM_YFLIP + db -28, 0, 0, OAM_XFLIP | OAM_YFLIP + db -28, -16, 0, OAM_XFLIP | OAM_YFLIP + db -28, -32, 0, OAM_XFLIP | OAM_YFLIP .data_b26f6 db 8 ; size - db -28, 24, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, 8, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, 0, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, -16, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, -32, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, 16, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, -8, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, -24, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -28, 24, 1, OAM_XFLIP | OAM_YFLIP + db -28, 8, 1, OAM_XFLIP | OAM_YFLIP + db -28, 0, 1, OAM_XFLIP | OAM_YFLIP + db -28, -16, 1, OAM_XFLIP | OAM_YFLIP + db -28, -32, 1, OAM_XFLIP | OAM_YFLIP + db -28, 16, 0, OAM_XFLIP | OAM_YFLIP + db -28, -8, 0, OAM_XFLIP | OAM_YFLIP + db -28, -24, 0, OAM_XFLIP | OAM_YFLIP AnimData154:: frame_table AnimFrameTable74 @@ -3127,23 +3127,23 @@ AnimFrameTable74:: .data_b274c db 4 ; size db -8, -8, 0, $0 - db 0, -8, 0, (1 << OAM_Y_FLIP) - db -8, 0, 0, (1 << OAM_X_FLIP) - db 0, 0, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, -8, 0, OAM_YFLIP + db -8, 0, 0, OAM_XFLIP + db 0, 0, 0, OAM_XFLIP | OAM_YFLIP .data_b275d db 4 ; size db -8, -8, 1, $0 - db 0, -8, 1, (1 << OAM_Y_FLIP) - db -8, 0, 1, (1 << OAM_X_FLIP) - db 0, 0, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, -8, 1, OAM_YFLIP + db -8, 0, 1, OAM_XFLIP + db 0, 0, 1, OAM_XFLIP | OAM_YFLIP .data_b276e db 4 ; size db -8, -8, 2, $0 - db -8, 0, 2, (1 << OAM_X_FLIP) - db 0, -8, 2, (1 << OAM_Y_FLIP) - db 0, 0, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -8, 0, 2, OAM_XFLIP + db 0, -8, 2, OAM_YFLIP + db 0, 0, 2, OAM_XFLIP | OAM_YFLIP AnimData155:: frame_table AnimFrameTable75 @@ -3174,124 +3174,124 @@ AnimFrameTable75:: .data_b27cc db 12 ; size - db 8, 8, 6, (1 << OAM_Y_FLIP) - db 0, 16, 0, (1 << OAM_X_FLIP) - db 8, 16, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -16, 6, (1 << OAM_Y_FLIP) - db 8, -8, 6, (1 << OAM_Y_FLIP) - db 8, 0, 6, (1 << OAM_Y_FLIP) + db 8, 8, 6, OAM_YFLIP + db 0, 16, 0, OAM_XFLIP + db 8, 16, 0, OAM_XFLIP | OAM_YFLIP + db 8, -16, 6, OAM_YFLIP + db 8, -8, 6, OAM_YFLIP + db 8, 0, 6, OAM_YFLIP db 0, 8, 6, $0 db 0, -16, 6, $0 db 0, -8, 6, $0 db 0, 0, 6, $0 - db 8, -24, 0, (1 << OAM_Y_FLIP) + db 8, -24, 0, OAM_YFLIP db 0, -24, 0, $0 .data_b27fd db 12 ; size - db 8, 0, 1, (1 << OAM_Y_FLIP) - db 8, 8, 2, (1 << OAM_Y_FLIP) - db 0, 0, 3, (1 << OAM_Y_FLIP) - db 0, 8, 4, (1 << OAM_Y_FLIP) + db 8, 0, 1, OAM_YFLIP + db 8, 8, 2, OAM_YFLIP + db 0, 0, 3, OAM_YFLIP + db 0, 8, 4, OAM_YFLIP db -8, 0, 0, $0 - db -8, 8, 0, (1 << OAM_X_FLIP) + db -8, 8, 0, OAM_XFLIP db 0, -24, 0, $0 - db 8, -24, 0, (1 << OAM_Y_FLIP) - db 8, -16, 6, (1 << OAM_Y_FLIP) - db 8, -8, 6, (1 << OAM_Y_FLIP) + db 8, -24, 0, OAM_YFLIP + db 8, -16, 6, OAM_YFLIP + db 8, -8, 6, OAM_YFLIP db 0, -16, 6, $0 db 0, -8, 6, $0 .data_b282e db 14 ; size - db 8, 0, 1, (1 << OAM_Y_FLIP) - db 8, 8, 2, (1 << OAM_Y_FLIP) - db 0, 0, 3, (1 << OAM_Y_FLIP) - db 0, 8, 4, (1 << OAM_Y_FLIP) + db 8, 0, 1, OAM_YFLIP + db 8, 8, 2, OAM_YFLIP + db 0, 0, 3, OAM_YFLIP + db 0, 8, 4, OAM_YFLIP db -16, 0, 1, $0 db -16, 8, 2, $0 db -8, 0, 3, $0 db -8, 8, 4, $0 db -16, -8, 0, $0 - db -8, -8, 0, (1 << OAM_Y_FLIP) + db -8, -8, 0, OAM_YFLIP db 0, -16, 0, $0 - db 8, -16, 0, (1 << OAM_Y_FLIP) - db 8, -8, 6, (1 << OAM_Y_FLIP) + db 8, -16, 0, OAM_YFLIP + db 8, -8, 6, OAM_YFLIP db 0, -8, 6, $0 .data_b2867 db 15 ; size - db 8, -8, 0, (1 << OAM_Y_FLIP) + db 8, -8, 0, OAM_YFLIP db -16, 0, 1, $0 db -16, 8, 2, $0 db -8, 8, 4, $0 - db -16, -8, 1, (1 << OAM_X_FLIP) - db -16, -16, 2, (1 << OAM_X_FLIP) - db -8, -16, 4, (1 << OAM_X_FLIP) - db 0, -16, 0, (1 << OAM_Y_FLIP) - db 8, 0, 1, (1 << OAM_Y_FLIP) - db 8, 8, 2, (1 << OAM_Y_FLIP) - db 0, 8, 4, (1 << OAM_Y_FLIP) - db 0, 0, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 0, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -8, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -8, 7, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -16, -8, 1, OAM_XFLIP + db -16, -16, 2, OAM_XFLIP + db -8, -16, 4, OAM_XFLIP + db 0, -16, 0, OAM_YFLIP + db 8, 0, 1, OAM_YFLIP + db 8, 8, 2, OAM_YFLIP + db 0, 8, 4, OAM_YFLIP + db 0, 0, 5, OAM_XFLIP | OAM_YFLIP + db -8, 0, 5, OAM_XFLIP | OAM_YFLIP + db -8, -8, 5, OAM_XFLIP | OAM_YFLIP + db 0, -8, 7, OAM_XFLIP | OAM_YFLIP .data_b28a4 db 15 ; size - db 8, 0, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, -8, 1, (1 << OAM_X_FLIP) - db -16, -16, 2, (1 << OAM_X_FLIP) - db -8, -16, 4, (1 << OAM_X_FLIP) + db 8, 0, 0, OAM_XFLIP | OAM_YFLIP + db -16, -8, 1, OAM_XFLIP + db -16, -16, 2, OAM_XFLIP + db -8, -16, 4, OAM_XFLIP db -16, 0, 1, $0 db -16, 8, 2, $0 db -8, 8, 4, $0 - db 0, 8, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -8, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -16, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -16, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -8, 5, (1 << OAM_Y_FLIP) - db -8, -8, 5, (1 << OAM_Y_FLIP) - db -8, 0, 5, (1 << OAM_Y_FLIP) - db 0, 0, 7, (1 << OAM_Y_FLIP) + db 0, 8, 0, OAM_XFLIP | OAM_YFLIP + db 8, -8, 1, OAM_XFLIP | OAM_YFLIP + db 8, -16, 2, OAM_XFLIP | OAM_YFLIP + db 0, -16, 4, OAM_XFLIP | OAM_YFLIP + db 0, -8, 5, OAM_YFLIP + db -8, -8, 5, OAM_YFLIP + db -8, 0, 5, OAM_YFLIP + db 0, 0, 7, OAM_YFLIP .data_b28e1 db 16 ; size - db 7, -8, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 7, -16, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -1, -16, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 7, 0, 1, (1 << OAM_Y_FLIP) - db 7, 8, 2, (1 << OAM_Y_FLIP) - db -1, 8, 4, (1 << OAM_Y_FLIP) - db -15, -8, 1, (1 << OAM_X_FLIP) - db -15, -16, 2, (1 << OAM_X_FLIP) - db -7, -16, 4, (1 << OAM_X_FLIP) + db 7, -8, 1, OAM_XFLIP | OAM_YFLIP + db 7, -16, 2, OAM_XFLIP | OAM_YFLIP + db -1, -16, 4, OAM_XFLIP | OAM_YFLIP + db 7, 0, 1, OAM_YFLIP + db 7, 8, 2, OAM_YFLIP + db -1, 8, 4, OAM_YFLIP + db -15, -8, 1, OAM_XFLIP + db -15, -16, 2, OAM_XFLIP + db -7, -16, 4, OAM_XFLIP db -7, -8, 5, $0 db -1, -8, 5, $0 db -1, 0, 5, $0 db -15, 0, 1, $0 db -15, 8, 2, $0 db -7, 8, 4, $0 - db -7, 0, 5, (1 << OAM_X_FLIP) + db -7, 0, 5, OAM_XFLIP .data_b2922 db 16 ; size - db -16, -7, 1, (1 << OAM_X_FLIP) - db -16, -15, 2, (1 << OAM_X_FLIP) - db -8, -15, 4, (1 << OAM_X_FLIP) - db 8, -7, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -15, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -15, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -7, 5, (1 << OAM_Y_FLIP) - db -8, -7, 5, (1 << OAM_Y_FLIP) + db -16, -7, 1, OAM_XFLIP + db -16, -15, 2, OAM_XFLIP + db -8, -15, 4, OAM_XFLIP + db 8, -7, 1, OAM_XFLIP | OAM_YFLIP + db 8, -15, 2, OAM_XFLIP | OAM_YFLIP + db 0, -15, 4, OAM_XFLIP | OAM_YFLIP + db 0, -7, 5, OAM_YFLIP + db -8, -7, 5, OAM_YFLIP db -16, -1, 1, $0 db -16, 7, 2, $0 db -8, 7, 4, $0 - db 8, -1, 1, (1 << OAM_Y_FLIP) - db 8, 7, 2, (1 << OAM_Y_FLIP) - db 0, 7, 4, (1 << OAM_Y_FLIP) - db 0, -1, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -1, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 8, -1, 1, OAM_YFLIP + db 8, 7, 2, OAM_YFLIP + db 0, 7, 4, OAM_YFLIP + db 0, -1, 5, OAM_XFLIP | OAM_YFLIP + db -8, -1, 5, OAM_XFLIP | OAM_YFLIP AnimData156:: frame_table AnimFrameTable76 @@ -3318,9 +3318,9 @@ AnimFrameTable76:: .data_b2997 db 4 ; size db -8, -8, 2, $0 - db -8, 0, 2, (1 << OAM_X_FLIP) + db -8, 0, 2, OAM_XFLIP db 0, -8, 3, $0 - db 0, 0, 3, (1 << OAM_X_FLIP) + db 0, 0, 3, OAM_XFLIP .data_b29a8 db 10 ; size @@ -3333,16 +3333,16 @@ AnimFrameTable76:: db 5, -12, 12, $0 db 5, -4, 13, $0 db 5, 4, 14, $0 - db -14, 12, 5, (1 << OAM_X_FLIP) + db -14, 12, 5, OAM_XFLIP .data_b29d1 db 6 ; size db -7, -8, 0, $0 - db -7, 0, 0, (1 << OAM_X_FLIP) + db -7, 0, 0, OAM_XFLIP db 1, -8, 1, $0 - db 1, 0, 1, (1 << OAM_X_FLIP) + db 1, 0, 1, OAM_XFLIP db -7, -16, 5, $0 - db -7, 8, 5, (1 << OAM_X_FLIP) + db -7, 8, 5, OAM_XFLIP AnimData157:: frame_table AnimFrameTable77 @@ -3413,37 +3413,37 @@ AnimFrameTable77:: db -32, 0, 0, $0 db -40, 1, 0, $0 db -48, 2, 0, $0 - db 16, -7, 0, (1 << OAM_Y_FLIP) - db 24, -8, 0, (1 << OAM_Y_FLIP) - db 32, -9, 0, (1 << OAM_Y_FLIP) - db 40, -10, 0, (1 << OAM_Y_FLIP) + db 16, -7, 0, OAM_YFLIP + db 24, -8, 0, OAM_YFLIP + db 32, -9, 0, OAM_YFLIP + db 40, -10, 0, OAM_YFLIP db -1, 16, 1, $0 db 0, 24, 1, $0 db 1, 32, 1, $0 db 2, 40, 1, $0 - db -7, -24, 1, (1 << OAM_X_FLIP) - db -8, -32, 1, (1 << OAM_X_FLIP) - db -9, -40, 1, (1 << OAM_X_FLIP) - db -10, -48, 1, (1 << OAM_X_FLIP) + db -7, -24, 1, OAM_XFLIP + db -8, -32, 1, OAM_XFLIP + db -9, -40, 1, OAM_XFLIP + db -10, -48, 1, OAM_XFLIP .data_b2afa db 16 ; size - db -24, -1, 0, (1 << OAM_X_FLIP) - db -32, 0, 0, (1 << OAM_X_FLIP) - db -40, 1, 0, (1 << OAM_X_FLIP) - db -48, 2, 0, (1 << OAM_X_FLIP) - db 16, -7, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 24, -8, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 32, -9, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 40, -10, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -1, 16, 1, (1 << OAM_Y_FLIP) - db 0, 24, 1, (1 << OAM_Y_FLIP) - db 1, 32, 1, (1 << OAM_Y_FLIP) - db 2, 40, 1, (1 << OAM_Y_FLIP) - db -7, -24, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -32, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -9, -40, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -10, -48, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -24, -1, 0, OAM_XFLIP + db -32, 0, 0, OAM_XFLIP + db -40, 1, 0, OAM_XFLIP + db -48, 2, 0, OAM_XFLIP + db 16, -7, 0, OAM_XFLIP | OAM_YFLIP + db 24, -8, 0, OAM_XFLIP | OAM_YFLIP + db 32, -9, 0, OAM_XFLIP | OAM_YFLIP + db 40, -10, 0, OAM_XFLIP | OAM_YFLIP + db -1, 16, 1, OAM_YFLIP + db 0, 24, 1, OAM_YFLIP + db 1, 32, 1, OAM_YFLIP + db 2, 40, 1, OAM_YFLIP + db -7, -24, 1, OAM_XFLIP | OAM_YFLIP + db -8, -32, 1, OAM_XFLIP | OAM_YFLIP + db -9, -40, 1, OAM_XFLIP | OAM_YFLIP + db -10, -48, 1, OAM_XFLIP | OAM_YFLIP .data_b2b3b db 16 ; size @@ -3451,124 +3451,124 @@ AnimFrameTable77:: db -30, 8, 0, $0 db -38, 11, 0, $0 db -46, 14, 0, $0 - db 14, -13, 0, (1 << OAM_Y_FLIP) - db 22, -16, 0, (1 << OAM_Y_FLIP) - db 30, -19, 0, (1 << OAM_Y_FLIP) - db 38, -22, 0, (1 << OAM_Y_FLIP) + db 14, -13, 0, OAM_YFLIP + db 22, -16, 0, OAM_YFLIP + db 30, -19, 0, OAM_YFLIP + db 38, -22, 0, OAM_YFLIP db 5, 14, 1, $0 db 8, 22, 1, $0 db 11, 30, 1, $0 db 14, 38, 1, $0 - db -13, -22, 1, (1 << OAM_X_FLIP) - db -16, -30, 1, (1 << OAM_X_FLIP) - db -19, -38, 1, (1 << OAM_X_FLIP) - db -22, -46, 1, (1 << OAM_X_FLIP) + db -13, -22, 1, OAM_XFLIP + db -16, -30, 1, OAM_XFLIP + db -19, -38, 1, OAM_XFLIP + db -22, -46, 1, OAM_XFLIP .data_b2b7c db 16 ; size - db -22, 5, 0, (1 << OAM_X_FLIP) - db -30, 8, 0, (1 << OAM_X_FLIP) - db -38, 11, 0, (1 << OAM_X_FLIP) - db -46, 14, 0, (1 << OAM_X_FLIP) - db 14, -13, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 22, -16, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 30, -19, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 38, -22, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 5, 14, 1, (1 << OAM_Y_FLIP) - db 8, 22, 1, (1 << OAM_Y_FLIP) - db 11, 30, 1, (1 << OAM_Y_FLIP) - db 14, 38, 1, (1 << OAM_Y_FLIP) - db -13, -22, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, -30, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -19, -38, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -22, -46, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -22, 5, 0, OAM_XFLIP + db -30, 8, 0, OAM_XFLIP + db -38, 11, 0, OAM_XFLIP + db -46, 14, 0, OAM_XFLIP + db 14, -13, 0, OAM_XFLIP | OAM_YFLIP + db 22, -16, 0, OAM_XFLIP | OAM_YFLIP + db 30, -19, 0, OAM_XFLIP | OAM_YFLIP + db 38, -22, 0, OAM_XFLIP | OAM_YFLIP + db 5, 14, 1, OAM_YFLIP + db 8, 22, 1, OAM_YFLIP + db 11, 30, 1, OAM_YFLIP + db 14, 38, 1, OAM_YFLIP + db -13, -22, 1, OAM_XFLIP | OAM_YFLIP + db -16, -30, 1, OAM_XFLIP | OAM_YFLIP + db -19, -38, 1, OAM_XFLIP | OAM_YFLIP + db -22, -46, 1, OAM_XFLIP | OAM_YFLIP .data_b2bbd db 12 ; size - db -42, 22, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -32, 16, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -22, 10, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 10, 14, 2, (1 << OAM_Y_FLIP) - db 16, 24, 2, (1 << OAM_Y_FLIP) - db 22, 34, 2, (1 << OAM_Y_FLIP) + db -42, 22, 2, OAM_XFLIP | OAM_YFLIP + db -32, 16, 2, OAM_XFLIP | OAM_YFLIP + db -22, 10, 2, OAM_XFLIP | OAM_YFLIP + db 10, 14, 2, OAM_YFLIP + db 16, 24, 2, OAM_YFLIP + db 22, 34, 2, OAM_YFLIP db 34, -30, 2, $0 db 24, -24, 2, $0 db 14, -18, 2, $0 - db -18, -22, 2, (1 << OAM_X_FLIP) - db -24, -32, 2, (1 << OAM_X_FLIP) - db -30, -42, 2, (1 << OAM_X_FLIP) + db -18, -22, 2, OAM_XFLIP + db -24, -32, 2, OAM_XFLIP + db -30, -42, 2, OAM_XFLIP .data_b2bee db 12 ; size db -22, 10, 2, $0 db -32, 16, 2, $0 db -42, 22, 2, $0 - db 22, 34, 2, (1 << OAM_X_FLIP) - db 16, 24, 2, (1 << OAM_X_FLIP) - db 10, 14, 2, (1 << OAM_X_FLIP) - db 14, -18, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 24, -24, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 34, -30, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -30, -42, 2, (1 << OAM_Y_FLIP) - db -24, -32, 2, (1 << OAM_Y_FLIP) - db -18, -22, 2, (1 << OAM_Y_FLIP) + db 22, 34, 2, OAM_XFLIP + db 16, 24, 2, OAM_XFLIP + db 10, 14, 2, OAM_XFLIP + db 14, -18, 2, OAM_XFLIP | OAM_YFLIP + db 24, -24, 2, OAM_XFLIP | OAM_YFLIP + db 34, -30, 2, OAM_XFLIP | OAM_YFLIP + db -30, -42, 2, OAM_YFLIP + db -24, -32, 2, OAM_YFLIP + db -18, -22, 2, OAM_YFLIP .data_b2c1f db 12 ; size - db -36, 28, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -28, 20, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -20, 12, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 12, 12, 2, (1 << OAM_Y_FLIP) - db 20, 20, 2, (1 << OAM_Y_FLIP) - db 28, 28, 2, (1 << OAM_Y_FLIP) + db -36, 28, 2, OAM_XFLIP | OAM_YFLIP + db -28, 20, 2, OAM_XFLIP | OAM_YFLIP + db -20, 12, 2, OAM_XFLIP | OAM_YFLIP + db 12, 12, 2, OAM_YFLIP + db 20, 20, 2, OAM_YFLIP + db 28, 28, 2, OAM_YFLIP db 28, -36, 2, $0 db 20, -28, 2, $0 db 12, -20, 2, $0 - db -20, -20, 2, (1 << OAM_X_FLIP) - db -28, -28, 2, (1 << OAM_X_FLIP) - db -36, -36, 2, (1 << OAM_X_FLIP) + db -20, -20, 2, OAM_XFLIP + db -28, -28, 2, OAM_XFLIP + db -36, -36, 2, OAM_XFLIP .data_b2c50 db 12 ; size db -20, 12, 2, $0 db -28, 20, 2, $0 db -36, 28, 2, $0 - db 28, 28, 2, (1 << OAM_X_FLIP) - db 20, 20, 2, (1 << OAM_X_FLIP) - db 12, 12, 2, (1 << OAM_X_FLIP) - db 12, -20, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 20, -28, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 28, -36, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -36, -36, 2, (1 << OAM_Y_FLIP) - db -28, -28, 2, (1 << OAM_Y_FLIP) - db -20, -20, 2, (1 << OAM_Y_FLIP) + db 28, 28, 2, OAM_XFLIP + db 20, 20, 2, OAM_XFLIP + db 12, 12, 2, OAM_XFLIP + db 12, -20, 2, OAM_XFLIP | OAM_YFLIP + db 20, -28, 2, OAM_XFLIP | OAM_YFLIP + db 28, -36, 2, OAM_XFLIP | OAM_YFLIP + db -36, -36, 2, OAM_YFLIP + db -28, -28, 2, OAM_YFLIP + db -20, -20, 2, OAM_YFLIP .data_b2c81 db 12 ; size - db -22, -18, 2, (1 << OAM_X_FLIP) - db -32, -24, 2, (1 << OAM_X_FLIP) - db -42, -30, 2, (1 << OAM_X_FLIP) + db -22, -18, 2, OAM_XFLIP + db -32, -24, 2, OAM_XFLIP + db -42, -30, 2, OAM_XFLIP db 22, -42, 2, $0 db 16, -32, 2, $0 db 10, -22, 2, $0 - db 14, 10, 2, (1 << OAM_Y_FLIP) - db 24, 16, 2, (1 << OAM_Y_FLIP) - db 34, 22, 2, (1 << OAM_Y_FLIP) - db -30, 34, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -24, 24, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -18, 14, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 14, 10, 2, OAM_YFLIP + db 24, 16, 2, OAM_YFLIP + db 34, 22, 2, OAM_YFLIP + db -30, 34, 2, OAM_XFLIP | OAM_YFLIP + db -24, 24, 2, OAM_XFLIP | OAM_YFLIP + db -18, 14, 2, OAM_XFLIP | OAM_YFLIP .data_b2cb2 db 12 ; size - db -42, -30, 2, (1 << OAM_Y_FLIP) - db -32, -24, 2, (1 << OAM_Y_FLIP) - db -22, -18, 2, (1 << OAM_Y_FLIP) - db 10, -22, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, -32, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 22, -42, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 34, 22, 2, (1 << OAM_X_FLIP) - db 24, 16, 2, (1 << OAM_X_FLIP) - db 14, 10, 2, (1 << OAM_X_FLIP) + db -42, -30, 2, OAM_YFLIP + db -32, -24, 2, OAM_YFLIP + db -22, -18, 2, OAM_YFLIP + db 10, -22, 2, OAM_XFLIP | OAM_YFLIP + db 16, -32, 2, OAM_XFLIP | OAM_YFLIP + db 22, -42, 2, OAM_XFLIP | OAM_YFLIP + db 34, 22, 2, OAM_XFLIP + db 24, 16, 2, OAM_XFLIP + db 14, 10, 2, OAM_XFLIP db -18, 14, 2, $0 db -24, 24, 2, $0 db -30, 34, 2, $0 @@ -3579,14 +3579,14 @@ AnimFrameTable77:: db -30, -16, 0, $0 db -38, -19, 0, $0 db -46, -22, 0, $0 - db 5, -22, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 8, -30, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 11, -38, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 14, -46, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 14, 5, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 22, 8, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 30, 11, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 38, 14, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 5, -22, 1, OAM_XFLIP | OAM_YFLIP + db 8, -30, 1, OAM_XFLIP | OAM_YFLIP + db 11, -38, 1, OAM_XFLIP | OAM_YFLIP + db 14, -46, 1, OAM_XFLIP | OAM_YFLIP + db 14, 5, 0, OAM_XFLIP | OAM_YFLIP + db 22, 8, 0, OAM_XFLIP | OAM_YFLIP + db 30, 11, 0, OAM_XFLIP | OAM_YFLIP + db 38, 14, 0, OAM_XFLIP | OAM_YFLIP db -13, 14, 1, $0 db -16, 22, 1, $0 db -19, 30, 1, $0 @@ -3594,22 +3594,22 @@ AnimFrameTable77:: .data_b2d24 db 16 ; size - db -22, -13, 0, (1 << OAM_X_FLIP) - db -30, -16, 0, (1 << OAM_X_FLIP) - db -38, -19, 0, (1 << OAM_X_FLIP) - db -46, -22, 0, (1 << OAM_X_FLIP) - db 5, -22, 1, (1 << OAM_X_FLIP) - db 8, -30, 1, (1 << OAM_X_FLIP) - db 11, -38, 1, (1 << OAM_X_FLIP) - db 14, -46, 1, (1 << OAM_X_FLIP) - db 14, 5, 0, (1 << OAM_Y_FLIP) - db 22, 8, 0, (1 << OAM_Y_FLIP) - db 30, 11, 0, (1 << OAM_Y_FLIP) - db 38, 14, 0, (1 << OAM_Y_FLIP) - db -13, 14, 1, (1 << OAM_Y_FLIP) - db -16, 22, 1, (1 << OAM_Y_FLIP) - db -19, 30, 1, (1 << OAM_Y_FLIP) - db -22, 38, 1, (1 << OAM_Y_FLIP) + db -22, -13, 0, OAM_XFLIP + db -30, -16, 0, OAM_XFLIP + db -38, -19, 0, OAM_XFLIP + db -46, -22, 0, OAM_XFLIP + db 5, -22, 1, OAM_XFLIP + db 8, -30, 1, OAM_XFLIP + db 11, -38, 1, OAM_XFLIP + db 14, -46, 1, OAM_XFLIP + db 14, 5, 0, OAM_YFLIP + db 22, 8, 0, OAM_YFLIP + db 30, 11, 0, OAM_YFLIP + db 38, 14, 0, OAM_YFLIP + db -13, 14, 1, OAM_YFLIP + db -16, 22, 1, OAM_YFLIP + db -19, 30, 1, OAM_YFLIP + db -22, 38, 1, OAM_YFLIP .data_b2d65 db 16 ; size @@ -3621,33 +3621,33 @@ AnimFrameTable77:: db -8, 24, 1, $0 db -9, 32, 1, $0 db -10, 40, 1, $0 - db -1, -24, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -32, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 1, -40, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 2, -48, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 16, -1, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 24, 0, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 32, 1, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 40, 2, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -1, -24, 1, OAM_XFLIP | OAM_YFLIP + db 0, -32, 1, OAM_XFLIP | OAM_YFLIP + db 1, -40, 1, OAM_XFLIP | OAM_YFLIP + db 2, -48, 1, OAM_XFLIP | OAM_YFLIP + db 16, -1, 0, OAM_XFLIP | OAM_YFLIP + db 24, 0, 0, OAM_XFLIP | OAM_YFLIP + db 32, 1, 0, OAM_XFLIP | OAM_YFLIP + db 40, 2, 0, OAM_XFLIP | OAM_YFLIP .data_b2da6 db 16 ; size - db -24, -7, 0, (1 << OAM_X_FLIP) - db -32, -8, 0, (1 << OAM_X_FLIP) - db -40, -9, 0, (1 << OAM_X_FLIP) - db -48, -10, 0, (1 << OAM_X_FLIP) - db 16, -1, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 24, 0, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 32, 1, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 40, 2, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -7, 16, 1, (1 << OAM_Y_FLIP) - db -8, 24, 1, (1 << OAM_Y_FLIP) - db -9, 32, 1, (1 << OAM_Y_FLIP) - db -10, 40, 1, (1 << OAM_Y_FLIP) - db -1, -24, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -32, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 1, -40, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 2, -48, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -24, -7, 0, OAM_XFLIP + db -32, -8, 0, OAM_XFLIP + db -40, -9, 0, OAM_XFLIP + db -48, -10, 0, OAM_XFLIP + db 16, -1, 0, OAM_XFLIP | OAM_YFLIP + db 24, 0, 0, OAM_XFLIP | OAM_YFLIP + db 32, 1, 0, OAM_XFLIP | OAM_YFLIP + db 40, 2, 0, OAM_XFLIP | OAM_YFLIP + db -7, 16, 1, OAM_YFLIP + db -8, 24, 1, OAM_YFLIP + db -9, 32, 1, OAM_YFLIP + db -10, 40, 1, OAM_YFLIP + db -1, -24, 1, OAM_XFLIP | OAM_YFLIP + db 0, -32, 1, OAM_XFLIP | OAM_YFLIP + db 1, -40, 1, OAM_XFLIP | OAM_YFLIP + db 2, -48, 1, OAM_XFLIP | OAM_YFLIP AnimData158:: frame_table AnimFrameTable78 @@ -3712,11 +3712,11 @@ AnimFrameTable78:: db -16, -24, 0, $0 db -16, -16, 1, $0 db -8, -24, 2, $0 - db -8, -16, 2, (1 << OAM_X_FLIP) + db -8, -16, 2, OAM_XFLIP db -48, 8, 0, $0 db -48, 16, 1, $0 db -40, 8, 2, $0 - db -40, 16, 2, (1 << OAM_X_FLIP) + db -40, 16, 2, OAM_XFLIP .data_b2e89 db 8 ; size @@ -3725,9 +3725,9 @@ AnimFrameTable78:: db -46, 8, 0, $0 db -46, 16, 1, $0 db -38, 8, 3, $0 - db -38, 16, 3, (1 << OAM_X_FLIP) + db -38, 16, 3, OAM_XFLIP db -6, -24, 3, $0 - db -6, -16, 3, (1 << OAM_X_FLIP) + db -6, -16, 3, OAM_XFLIP .data_b2eaa db 8 ; size @@ -3736,9 +3736,9 @@ AnimFrameTable78:: db -46, -8, 0, $0 db -46, 0, 1, $0 db -38, -8, 3, $0 - db -38, 0, 3, (1 << OAM_X_FLIP) + db -38, 0, 3, OAM_XFLIP db -6, -8, 3, $0 - db -6, 0, 3, (1 << OAM_X_FLIP) + db -6, 0, 3, OAM_XFLIP .data_b2ecb db 8 ; size @@ -3747,9 +3747,9 @@ AnimFrameTable78:: db -38, -24, 0, $0 db -38, -16, 1, $0 db -30, -24, 3, $0 - db -30, -16, 3, (1 << OAM_X_FLIP) + db -30, -16, 3, OAM_XFLIP db -14, 8, 3, $0 - db -14, 16, 3, (1 << OAM_X_FLIP) + db -14, 16, 3, OAM_XFLIP .data_b2eec db 8 ; size @@ -3758,9 +3758,9 @@ AnimFrameTable78:: db -30, -24, 0, $0 db -30, -16, 1, $0 db -22, -24, 3, $0 - db -22, -16, 3, (1 << OAM_X_FLIP) + db -22, -16, 3, OAM_XFLIP db -22, 8, 3, $0 - db -22, 16, 3, (1 << OAM_X_FLIP) + db -22, 16, 3, OAM_XFLIP .data_b2f0d db 8 ; size @@ -3769,122 +3769,122 @@ AnimFrameTable78:: db -22, -24, 0, $0 db -22, -16, 1, $0 db -14, -24, 3, $0 - db -14, -16, 3, (1 << OAM_X_FLIP) + db -14, -16, 3, OAM_XFLIP db -30, 8, 3, $0 - db -30, 16, 3, (1 << OAM_X_FLIP) + db -30, 16, 3, OAM_XFLIP .data_b2f2e db 8 ; size db -48, 8, 0, $0 db -48, 16, 1, $0 db -40, 8, 2, $0 - db -40, 16, 2, (1 << OAM_X_FLIP) + db -40, 16, 2, OAM_XFLIP db -14, -24, 0, $0 db -14, -16, 1, $0 db -6, -24, 3, $0 - db -6, -16, 3, (1 << OAM_X_FLIP) + db -6, -16, 3, OAM_XFLIP .data_b2f4f db 10 ; size db -48, 8, 0, $0 db -48, 16, 1, $0 db -40, 8, 2, $0 - db -40, 16, 2, (1 << OAM_X_FLIP) + db -40, 16, 2, OAM_XFLIP db -15, -24, 0, $0 db -15, -16, 1, $0 db -7, -24, 3, $0 - db -7, -16, 3, (1 << OAM_X_FLIP) + db -7, -16, 3, OAM_XFLIP db -2, -24, 3, $0 - db -2, -16, 3, (1 << OAM_X_FLIP) + db -2, -16, 3, OAM_XFLIP .data_b2f78 db 10 ; size db -48, 8, 0, $0 db -48, 16, 1, $0 db -40, 8, 2, $0 - db -40, 16, 2, (1 << OAM_X_FLIP) + db -40, 16, 2, OAM_XFLIP db -16, -24, 0, $0 db -16, -16, 1, $0 db -8, -24, 3, $0 - db -8, -16, 3, (1 << OAM_X_FLIP) + db -8, -16, 3, OAM_XFLIP db -3, -24, 4, $0 - db -3, -16, 1, (1 << OAM_Y_FLIP) + db -3, -16, 1, OAM_YFLIP .data_b2fa1 db 12 ; size db -48, 8, 0, $0 db -48, 16, 1, $0 db -40, 8, 2, $0 - db -40, 16, 2, (1 << OAM_X_FLIP) + db -40, 16, 2, OAM_XFLIP db -17, -24, 0, $0 db -17, -16, 1, $0 db -9, -24, 3, $0 - db -9, -16, 3, (1 << OAM_X_FLIP) + db -9, -16, 3, OAM_XFLIP db -4, -24, 0, $0 db -4, -16, 1, $0 db 4, -24, 3, $0 - db 4, -16, 3, (1 << OAM_X_FLIP) + db 4, -16, 3, OAM_XFLIP .data_b2fd2 db 10 ; size db -48, 8, 0, $0 db -48, 16, 1, $0 db -40, 8, 2, $0 - db -40, 16, 2, (1 << OAM_X_FLIP) + db -40, 16, 2, OAM_XFLIP db -16, -24, 0, $0 db -16, -16, 1, $0 db -7, -24, 0, $0 db -7, -16, 1, $0 db 1, -24, 3, $0 - db 1, -16, 3, (1 << OAM_X_FLIP) + db 1, -16, 3, OAM_XFLIP .data_b2ffb db 10 ; size db -48, 8, 0, $0 db -48, 16, 1, $0 db -40, 8, 2, $0 - db -40, 16, 2, (1 << OAM_X_FLIP) + db -40, 16, 2, OAM_XFLIP db -10, -24, 0, $0 db -10, -16, 1, $0 db -2, -24, 3, $0 - db -2, -16, 3, (1 << OAM_X_FLIP) - db -19, -24, 3, (1 << OAM_Y_FLIP) - db -19, -16, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -2, -16, 3, OAM_XFLIP + db -19, -24, 3, OAM_YFLIP + db -19, -16, 3, OAM_XFLIP | OAM_YFLIP .data_b3024 db 8 ; size db -16, -24, 0, $0 db -16, -16, 1, $0 db -8, -24, 2, $0 - db -8, -16, 2, (1 << OAM_X_FLIP) + db -8, -16, 2, OAM_XFLIP db -46, 8, 0, $0 db -46, 16, 1, $0 db -38, 8, 3, $0 - db -38, 16, 3, (1 << OAM_X_FLIP) + db -38, 16, 3, OAM_XFLIP .data_b3045 db 10 ; size db -16, -24, 0, $0 db -16, -16, 1, $0 db -8, -24, 2, $0 - db -8, -16, 2, (1 << OAM_X_FLIP) + db -8, -16, 2, OAM_XFLIP db -45, 8, 0, $0 db -45, 16, 1, $0 db -37, 8, 3, $0 - db -37, 16, 3, (1 << OAM_X_FLIP) - db -54, 8, 3, (1 << OAM_Y_FLIP) - db -54, 16, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -37, 16, 3, OAM_XFLIP + db -54, 8, 3, OAM_YFLIP + db -54, 16, 3, OAM_XFLIP | OAM_YFLIP .data_b306e db 10 ; size db -16, -24, 0, $0 db -16, -16, 1, $0 db -8, -24, 2, $0 - db -8, -16, 2, (1 << OAM_X_FLIP) + db -8, -16, 2, OAM_XFLIP db -44, 8, 0, $0 db -44, 16, 1, $0 db -36, 8, 3, $0 - db -36, 16, 3, (1 << OAM_X_FLIP) + db -36, 16, 3, OAM_XFLIP db -53, 8, 0, $0 db -53, 16, 1, $0 @@ -3893,27 +3893,27 @@ AnimFrameTable78:: db -16, -24, 0, $0 db -16, -16, 1, $0 db -8, -24, 2, $0 - db -8, -16, 2, (1 << OAM_X_FLIP) + db -8, -16, 2, OAM_XFLIP db -43, 8, 0, $0 db -43, 16, 1, $0 db -35, 8, 3, $0 - db -35, 16, 3, (1 << OAM_X_FLIP) + db -35, 16, 3, OAM_XFLIP db -56, 8, 0, $0 db -56, 16, 1, $0 db -48, 8, 3, $0 - db -48, 16, 3, (1 << OAM_X_FLIP) + db -48, 16, 3, OAM_XFLIP .data_b30c8 db 10 ; size db -16, -24, 0, $0 db -16, -16, 1, $0 db -8, -24, 2, $0 - db -8, -16, 2, (1 << OAM_X_FLIP) - db -40, 16, 1, (1 << OAM_Y_FLIP) + db -8, -16, 2, OAM_XFLIP + db -40, 16, 1, OAM_YFLIP db -53, 8, 0, $0 db -53, 16, 1, $0 db -45, 8, 3, $0 - db -45, 16, 3, (1 << OAM_X_FLIP) + db -45, 16, 3, OAM_XFLIP db -40, 8, 4, $0 .data_b30f1 @@ -3921,41 +3921,41 @@ AnimFrameTable78:: db -16, -24, 0, $0 db -16, -16, 1, $0 db -8, -24, 2, $0 - db -8, -16, 2, (1 << OAM_X_FLIP) + db -8, -16, 2, OAM_XFLIP db -50, 8, 0, $0 db -50, 16, 1, $0 db -42, 8, 3, $0 - db -42, 16, 3, (1 << OAM_X_FLIP) + db -42, 16, 3, OAM_XFLIP db -37, 8, 3, $0 - db -37, 16, 3, (1 << OAM_X_FLIP) + db -37, 16, 3, OAM_XFLIP .data_b311a db 12 ; size db -15, -24, 0, $0 db -15, -16, 1, $0 db -7, -24, 3, $0 - db -7, -16, 3, (1 << OAM_X_FLIP) + db -7, -16, 3, OAM_XFLIP db -2, -24, 3, $0 - db -2, -16, 3, (1 << OAM_X_FLIP) + db -2, -16, 3, OAM_XFLIP db -45, 8, 0, $0 db -45, 16, 1, $0 db -37, 8, 3, $0 - db -37, 16, 3, (1 << OAM_X_FLIP) - db -54, 8, 3, (1 << OAM_Y_FLIP) - db -54, 16, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -37, 16, 3, OAM_XFLIP + db -54, 8, 3, OAM_YFLIP + db -54, 16, 3, OAM_XFLIP | OAM_YFLIP .data_b314b db 12 ; size db -16, -24, 0, $0 db -16, -16, 1, $0 db -8, -24, 3, $0 - db -8, -16, 3, (1 << OAM_X_FLIP) + db -8, -16, 3, OAM_XFLIP db -3, -24, 4, $0 - db -3, -16, 1, (1 << OAM_Y_FLIP) + db -3, -16, 1, OAM_YFLIP db -44, 8, 0, $0 db -44, 16, 1, $0 db -36, 8, 3, $0 - db -36, 16, 3, (1 << OAM_X_FLIP) + db -36, 16, 3, OAM_XFLIP db -53, 8, 0, $0 db -53, 16, 1, $0 @@ -3964,19 +3964,19 @@ AnimFrameTable78:: db -17, -24, 0, $0 db -17, -16, 1, $0 db -9, -24, 3, $0 - db -9, -16, 3, (1 << OAM_X_FLIP) + db -9, -16, 3, OAM_XFLIP db -4, -24, 0, $0 db -4, -16, 1, $0 db 4, -24, 3, $0 - db 4, -16, 3, (1 << OAM_X_FLIP) + db 4, -16, 3, OAM_XFLIP db -43, 8, 0, $0 db -43, 16, 1, $0 db -35, 8, 3, $0 - db -35, 16, 3, (1 << OAM_X_FLIP) + db -35, 16, 3, OAM_XFLIP db -56, 8, 0, $0 db -56, 16, 1, $0 db -48, 8, 3, $0 - db -48, 16, 3, (1 << OAM_X_FLIP) + db -48, 16, 3, OAM_XFLIP .data_b31bd db 12 ; size @@ -3985,12 +3985,12 @@ AnimFrameTable78:: db -7, -24, 0, $0 db -7, -16, 1, $0 db 1, -24, 3, $0 - db 1, -16, 3, (1 << OAM_X_FLIP) - db -40, 16, 1, (1 << OAM_Y_FLIP) + db 1, -16, 3, OAM_XFLIP + db -40, 16, 1, OAM_YFLIP db -53, 8, 0, $0 db -53, 16, 1, $0 db -45, 8, 3, $0 - db -45, 16, 3, (1 << OAM_X_FLIP) + db -45, 16, 3, OAM_XFLIP db -40, 8, 4, $0 .data_b31ee @@ -3998,37 +3998,37 @@ AnimFrameTable78:: db -10, -24, 0, $0 db -10, -16, 1, $0 db -2, -24, 3, $0 - db -2, -16, 3, (1 << OAM_X_FLIP) - db -19, -24, 3, (1 << OAM_Y_FLIP) - db -19, -16, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -2, -16, 3, OAM_XFLIP + db -19, -24, 3, OAM_YFLIP + db -19, -16, 3, OAM_XFLIP | OAM_YFLIP db -50, 8, 0, $0 db -50, 16, 1, $0 db -42, 8, 3, $0 - db -42, 16, 3, (1 << OAM_X_FLIP) + db -42, 16, 3, OAM_XFLIP db -37, 8, 3, $0 - db -37, 16, 3, (1 << OAM_X_FLIP) + db -37, 16, 3, OAM_XFLIP .data_b321f db 8 ; size db -8, -24, 0, $0 db -8, -16, 1, $0 db 0, -24, 2, $0 - db 0, -16, 2, (1 << OAM_X_FLIP) + db 0, -16, 2, OAM_XFLIP db -56, -4, 0, $0 db -56, 4, 1, $0 db -48, -4, 2, $0 - db -48, 4, 2, (1 << OAM_X_FLIP) + db -48, 4, 2, OAM_XFLIP .data_b3240 db 8 ; size db 0, -24, 0, $0 db 0, -16, 1, $0 db 8, -24, 2, $0 - db 8, -16, 2, (1 << OAM_X_FLIP) + db 8, -16, 2, OAM_XFLIP db -56, -16, 0, $0 db -56, -8, 1, $0 db -48, -16, 2, $0 - db -48, -8, 2, (1 << OAM_X_FLIP) + db -48, -8, 2, OAM_XFLIP .data_b3261 db 8 ; size @@ -4037,9 +4037,9 @@ AnimFrameTable78:: db -57, -20, 0, $0 db -57, -12, 1, $0 db -49, -20, 3, $0 - db -49, -12, 3, (1 << OAM_X_FLIP) + db -49, -12, 3, OAM_XFLIP db 7, -20, 3, $0 - db 7, -12, 3, (1 << OAM_X_FLIP) + db 7, -12, 3, OAM_XFLIP .data_b3282 db 8 ; size @@ -4048,9 +4048,9 @@ AnimFrameTable78:: db -59, -28, 0, $0 db -59, -20, 1, $0 db -51, -28, 3, $0 - db -51, -20, 3, (1 << OAM_X_FLIP) + db -51, -20, 3, OAM_XFLIP db 5, -12, 3, $0 - db 5, -4, 3, (1 << OAM_X_FLIP) + db 5, -4, 3, OAM_XFLIP .data_b32a3 db 8 ; size @@ -4059,9 +4059,9 @@ AnimFrameTable78:: db -60, -36, 0, $0 db -60, -28, 1, $0 db -52, -36, 3, $0 - db -52, -28, 3, (1 << OAM_X_FLIP) + db -52, -28, 3, OAM_XFLIP db 4, -4, 3, $0 - db 4, 4, 3, (1 << OAM_X_FLIP) + db 4, 4, 3, OAM_XFLIP .data_b32c4 db 8 ; size @@ -4070,9 +4070,9 @@ AnimFrameTable78:: db -60, -44, 0, $0 db -60, -36, 1, $0 db -52, -44, 3, $0 - db -52, -36, 3, (1 << OAM_X_FLIP) + db -52, -36, 3, OAM_XFLIP db 4, 4, 3, $0 - db 4, 12, 3, (1 << OAM_X_FLIP) + db 4, 12, 3, OAM_XFLIP .data_b32e5 db 8 ; size @@ -4081,9 +4081,9 @@ AnimFrameTable78:: db -59, -52, 0, $0 db -59, -44, 1, $0 db -51, -52, 3, $0 - db -51, -44, 3, (1 << OAM_X_FLIP) + db -51, -44, 3, OAM_XFLIP db 5, 12, 3, $0 - db 5, 20, 3, (1 << OAM_X_FLIP) + db 5, 20, 3, OAM_XFLIP .data_b3306 db 8 ; size @@ -4092,93 +4092,93 @@ AnimFrameTable78:: db -57, -60, 0, $0 db -57, -52, 1, $0 db -49, -60, 3, $0 - db -49, -52, 3, (1 << OAM_X_FLIP) + db -49, -52, 3, OAM_XFLIP db 7, 20, 3, $0 - db 7, 28, 3, (1 << OAM_X_FLIP) + db 7, 28, 3, OAM_XFLIP .data_b3327 db 4 ; size db -1, -20, 0, $0 db -1, -12, 1, $0 db 7, -20, 3, $0 - db 7, -12, 3, (1 << OAM_X_FLIP) + db 7, -12, 3, OAM_XFLIP .data_b3338 db 4 ; size db -3, -12, 0, $0 db -3, -4, 1, $0 db 5, -12, 3, $0 - db 5, -4, 3, (1 << OAM_X_FLIP) + db 5, -4, 3, OAM_XFLIP .data_b3349 db 4 ; size db -4, -4, 0, $0 db -4, 4, 1, $0 db 4, -4, 3, $0 - db 4, 4, 3, (1 << OAM_X_FLIP) + db 4, 4, 3, OAM_XFLIP .data_b335a db 4 ; size db -4, 4, 0, $0 db -4, 12, 1, $0 db 4, 4, 3, $0 - db 4, 12, 3, (1 << OAM_X_FLIP) + db 4, 12, 3, OAM_XFLIP .data_b336b db 4 ; size db -3, 12, 0, $0 db -3, 20, 1, $0 db 5, 12, 3, $0 - db 5, 20, 3, (1 << OAM_X_FLIP) + db 5, 20, 3, OAM_XFLIP .data_b337c db 4 ; size db -1, 20, 0, $0 db -1, 28, 1, $0 db 7, 20, 3, $0 - db 7, 28, 3, (1 << OAM_X_FLIP) + db 7, 28, 3, OAM_XFLIP .data_b338d db 4 ; size db -57, -20, 0, $0 db -57, -12, 1, $0 db -49, -20, 3, $0 - db -49, -12, 3, (1 << OAM_X_FLIP) + db -49, -12, 3, OAM_XFLIP .data_b339e db 4 ; size db -59, -28, 0, $0 db -59, -20, 1, $0 db -51, -28, 3, $0 - db -51, -20, 3, (1 << OAM_X_FLIP) + db -51, -20, 3, OAM_XFLIP .data_b33af db 4 ; size db -60, -36, 0, $0 db -60, -28, 1, $0 db -52, -36, 3, $0 - db -52, -28, 3, (1 << OAM_X_FLIP) + db -52, -28, 3, OAM_XFLIP .data_b33c0 db 4 ; size db -60, -44, 0, $0 db -60, -36, 1, $0 db -52, -44, 3, $0 - db -52, -36, 3, (1 << OAM_X_FLIP) + db -52, -36, 3, OAM_XFLIP .data_b33d1 db 4 ; size db -59, -52, 0, $0 db -59, -44, 1, $0 db -51, -52, 3, $0 - db -51, -44, 3, (1 << OAM_X_FLIP) + db -51, -44, 3, OAM_XFLIP .data_b33e2 db 4 ; size db -57, -60, 0, $0 db -57, -52, 1, $0 db -49, -60, 3, $0 - db -49, -52, 3, (1 << OAM_X_FLIP) + db -49, -52, 3, OAM_XFLIP AnimData159:: frame_table AnimFrameTable78 @@ -4289,55 +4289,55 @@ AnimFrameTable79:: db 6 ; size db -8, -12, 17, $0 db -8, -4, 18, $0 - db -8, 4, 17, (1 << OAM_X_FLIP) + db -8, 4, 17, OAM_XFLIP db 0, -12, 19, $0 db 0, -4, 20, $0 - db 0, 4, 19, (1 << OAM_X_FLIP) + db 0, 4, 19, OAM_XFLIP .data_b3550 db 3 ; size db -4, -12, 21, $0 db -4, -4, 22, $0 - db -4, 4, 21, (1 << OAM_X_FLIP) + db -4, 4, 21, OAM_XFLIP .data_b355d db 6 ; size db -8, -12, 13, $0 db -8, -4, 14, $0 - db -8, 4, 13, (1 << OAM_X_FLIP) + db -8, 4, 13, OAM_XFLIP db 0, -12, 15, $0 db 0, -4, 16, $0 - db 0, 4, 15, (1 << OAM_X_FLIP) + db 0, 4, 15, OAM_XFLIP .data_b3576 db 9 ; size db -12, -12, 9, $0 db -12, -4, 10, $0 - db -12, 4, 9, (1 << OAM_X_FLIP) + db -12, 4, 9, OAM_XFLIP db -4, -12, 11, $0 db -4, -4, 12, $0 - db -4, 4, 11, (1 << OAM_X_FLIP) - db 4, -12, 9, (1 << OAM_Y_FLIP) - db 4, -4, 10, (1 << OAM_Y_FLIP) - db 4, 4, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -4, 4, 11, OAM_XFLIP + db 4, -12, 9, OAM_YFLIP + db 4, -4, 10, OAM_YFLIP + db 4, 4, 9, OAM_XFLIP | OAM_YFLIP .data_b359b db 6 ; size - db 0, -12, 13, (1 << OAM_Y_FLIP) - db 0, -4, 14, (1 << OAM_Y_FLIP) - db 0, 4, 13, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -12, 15, (1 << OAM_Y_FLIP) - db -8, -4, 16, (1 << OAM_Y_FLIP) - db -8, 4, 15, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, -12, 13, OAM_YFLIP + db 0, -4, 14, OAM_YFLIP + db 0, 4, 13, OAM_XFLIP | OAM_YFLIP + db -8, -12, 15, OAM_YFLIP + db -8, -4, 16, OAM_YFLIP + db -8, 4, 15, OAM_XFLIP | OAM_YFLIP .data_b35b4 db 6 ; size - db 0, -12, 17, (1 << OAM_Y_FLIP) - db 0, -4, 18, (1 << OAM_Y_FLIP) - db 0, 4, 17, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -12, 19, (1 << OAM_Y_FLIP) - db -8, -4, 20, (1 << OAM_Y_FLIP) - db -8, 4, 19, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, -12, 17, OAM_YFLIP + db 0, -4, 18, OAM_YFLIP + db 0, 4, 17, OAM_XFLIP | OAM_YFLIP + db -8, -12, 19, OAM_YFLIP + db -8, -4, 20, OAM_YFLIP + db -8, 4, 19, OAM_XFLIP | OAM_YFLIP AnimData168:: frame_table AnimFrameTable79 @@ -4628,31 +4628,31 @@ AnimFrameTable81:: .data_b3982 db 2 ; size db -32, -31, 1, $0 - db -24, -31, 1, (1 << OAM_Y_FLIP) + db -24, -31, 1, OAM_YFLIP .data_b398b db 6 ; size db -32, -31, 1, $0 - db -24, -31, 1, (1 << OAM_Y_FLIP) + db -24, -31, 1, OAM_YFLIP db -40, -22, 2, $0 db -32, -20, 3, $0 - db -16, -22, 2, (1 << OAM_Y_FLIP) - db -24, -20, 3, (1 << OAM_Y_FLIP) + db -16, -22, 2, OAM_YFLIP + db -24, -20, 3, OAM_YFLIP .data_b39a4 db 12 ; size db -32, -31, 1, $0 - db -24, -31, 1, (1 << OAM_Y_FLIP) + db -24, -31, 1, OAM_YFLIP db -40, -22, 2, $0 db -32, -20, 3, $0 db -48, -13, 4, $0 db -40, -9, 5, $0 db -32, -8, 6, $0 - db -16, -22, 2, (1 << OAM_Y_FLIP) - db -24, -20, 3, (1 << OAM_Y_FLIP) - db -8, -13, 4, (1 << OAM_Y_FLIP) - db -16, -9, 5, (1 << OAM_Y_FLIP) - db -24, -8, 6, (1 << OAM_Y_FLIP) + db -16, -22, 2, OAM_YFLIP + db -24, -20, 3, OAM_YFLIP + db -8, -13, 4, OAM_YFLIP + db -16, -9, 5, OAM_YFLIP + db -24, -8, 6, OAM_YFLIP .data_b39d5 db 10 ; size @@ -4661,299 +4661,299 @@ AnimFrameTable81:: db -48, -13, 4, $0 db -40, -9, 5, $0 db -32, -8, 6, $0 - db -16, -22, 2, (1 << OAM_Y_FLIP) - db -24, -20, 3, (1 << OAM_Y_FLIP) - db -8, -13, 4, (1 << OAM_Y_FLIP) - db -16, -9, 5, (1 << OAM_Y_FLIP) - db -24, -8, 6, (1 << OAM_Y_FLIP) + db -16, -22, 2, OAM_YFLIP + db -24, -20, 3, OAM_YFLIP + db -8, -13, 4, OAM_YFLIP + db -16, -9, 5, OAM_YFLIP + db -24, -8, 6, OAM_YFLIP .data_b39fe db 6 ; size db -48, -13, 4, $0 db -40, -9, 5, $0 db -32, -8, 6, $0 - db -8, -13, 4, (1 << OAM_Y_FLIP) - db -16, -9, 5, (1 << OAM_Y_FLIP) - db -24, -8, 6, (1 << OAM_Y_FLIP) + db -8, -13, 4, OAM_YFLIP + db -16, -9, 5, OAM_YFLIP + db -24, -8, 6, OAM_YFLIP .data_b3a17 db 2 ; size - db -32, -9, 1, (1 << OAM_X_FLIP) - db -24, -9, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -32, -9, 1, OAM_XFLIP + db -24, -9, 1, OAM_XFLIP | OAM_YFLIP .data_b3a20 db 6 ; size - db -32, -9, 1, (1 << OAM_X_FLIP) - db -24, -9, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -40, -18, 2, (1 << OAM_X_FLIP) - db -32, -20, 3, (1 << OAM_X_FLIP) - db -16, -18, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -24, -20, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -32, -9, 1, OAM_XFLIP + db -24, -9, 1, OAM_XFLIP | OAM_YFLIP + db -40, -18, 2, OAM_XFLIP + db -32, -20, 3, OAM_XFLIP + db -16, -18, 2, OAM_XFLIP | OAM_YFLIP + db -24, -20, 3, OAM_XFLIP | OAM_YFLIP .data_b3a39 db 12 ; size - db -32, -9, 1, (1 << OAM_X_FLIP) - db -24, -9, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -40, -18, 2, (1 << OAM_X_FLIP) - db -32, -20, 3, (1 << OAM_X_FLIP) - db -48, -27, 4, (1 << OAM_X_FLIP) - db -40, -31, 5, (1 << OAM_X_FLIP) - db -32, -32, 6, (1 << OAM_X_FLIP) - db -16, -18, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -24, -20, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -27, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, -31, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -24, -32, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -32, -9, 1, OAM_XFLIP + db -24, -9, 1, OAM_XFLIP | OAM_YFLIP + db -40, -18, 2, OAM_XFLIP + db -32, -20, 3, OAM_XFLIP + db -48, -27, 4, OAM_XFLIP + db -40, -31, 5, OAM_XFLIP + db -32, -32, 6, OAM_XFLIP + db -16, -18, 2, OAM_XFLIP | OAM_YFLIP + db -24, -20, 3, OAM_XFLIP | OAM_YFLIP + db -8, -27, 4, OAM_XFLIP | OAM_YFLIP + db -16, -31, 5, OAM_XFLIP | OAM_YFLIP + db -24, -32, 6, OAM_XFLIP | OAM_YFLIP .data_b3a6a db 10 ; size - db -40, -18, 2, (1 << OAM_X_FLIP) - db -32, -20, 3, (1 << OAM_X_FLIP) - db -48, -27, 4, (1 << OAM_X_FLIP) - db -40, -31, 5, (1 << OAM_X_FLIP) - db -32, -32, 6, (1 << OAM_X_FLIP) - db -16, -18, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -24, -20, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -27, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, -31, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -24, -32, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -40, -18, 2, OAM_XFLIP + db -32, -20, 3, OAM_XFLIP + db -48, -27, 4, OAM_XFLIP + db -40, -31, 5, OAM_XFLIP + db -32, -32, 6, OAM_XFLIP + db -16, -18, 2, OAM_XFLIP | OAM_YFLIP + db -24, -20, 3, OAM_XFLIP | OAM_YFLIP + db -8, -27, 4, OAM_XFLIP | OAM_YFLIP + db -16, -31, 5, OAM_XFLIP | OAM_YFLIP + db -24, -32, 6, OAM_XFLIP | OAM_YFLIP .data_b3a93 db 6 ; size - db -48, -27, 4, (1 << OAM_X_FLIP) - db -40, -31, 5, (1 << OAM_X_FLIP) - db -32, -32, 6, (1 << OAM_X_FLIP) - db -8, -27, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, -31, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -24, -32, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -48, -27, 4, OAM_XFLIP + db -40, -31, 5, OAM_XFLIP + db -32, -32, 6, OAM_XFLIP + db -8, -27, 4, OAM_XFLIP | OAM_YFLIP + db -16, -31, 5, OAM_XFLIP | OAM_YFLIP + db -24, -32, 6, OAM_XFLIP | OAM_YFLIP .data_b3aac db 1 ; size - db -48, -28, 7, %001 | (1 << OAM_OBP_NUM) + db -48, -28, 7, %001 | OAM_PAL1 .data_b3ab1 db 2 ; size - db -48, -20, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -28, 7, %001 | (1 << OAM_OBP_NUM) + db -48, -20, 7, %001 | OAM_PAL1 + db -48, -28, 7, %001 | OAM_PAL1 .data_b3aba db 3 ; size - db -48, -12, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -20, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -28, 7, %001 | (1 << OAM_OBP_NUM) + db -48, -12, 7, %001 | OAM_PAL1 + db -48, -20, 7, %001 | OAM_PAL1 + db -48, -28, 7, %001 | OAM_PAL1 .data_b3ac7 db 4 ; size - db -48, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -12, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -20, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -28, 7, %001 | (1 << OAM_OBP_NUM) + db -48, -4, 7, %001 | OAM_PAL1 + db -48, -12, 7, %001 | OAM_PAL1 + db -48, -20, 7, %001 | OAM_PAL1 + db -48, -28, 7, %001 | OAM_PAL1 .data_b3ad8 db 5 ; size - db -40, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -12, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -20, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -28, 7, %001 | (1 << OAM_OBP_NUM) + db -40, -4, 7, %001 | OAM_PAL1 + db -48, -4, 7, %001 | OAM_PAL1 + db -48, -12, 7, %001 | OAM_PAL1 + db -48, -20, 7, %001 | OAM_PAL1 + db -48, -28, 7, %001 | OAM_PAL1 .data_b3aed db 6 ; size - db -32, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -40, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -12, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -20, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -28, 7, %001 | (1 << OAM_OBP_NUM) + db -32, -4, 7, %001 | OAM_PAL1 + db -40, -4, 7, %001 | OAM_PAL1 + db -48, -4, 7, %001 | OAM_PAL1 + db -48, -12, 7, %001 | OAM_PAL1 + db -48, -20, 7, %001 | OAM_PAL1 + db -48, -28, 7, %001 | OAM_PAL1 .data_b3b06 db 7 ; size - db -32, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -40, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -24, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -12, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -20, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -28, 7, %001 | (1 << OAM_OBP_NUM) + db -32, -4, 7, %001 | OAM_PAL1 + db -40, -4, 7, %001 | OAM_PAL1 + db -24, -4, 7, %001 | OAM_PAL1 + db -48, -4, 7, %001 | OAM_PAL1 + db -48, -12, 7, %001 | OAM_PAL1 + db -48, -20, 7, %001 | OAM_PAL1 + db -48, -28, 7, %001 | OAM_PAL1 .data_b3b23 db 8 ; size - db -32, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -40, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -24, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -16, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -12, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -20, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -28, 7, %001 | (1 << OAM_OBP_NUM) + db -32, -4, 7, %001 | OAM_PAL1 + db -40, -4, 7, %001 | OAM_PAL1 + db -24, -4, 7, %001 | OAM_PAL1 + db -16, -4, 7, %001 | OAM_PAL1 + db -48, -4, 7, %001 | OAM_PAL1 + db -48, -12, 7, %001 | OAM_PAL1 + db -48, -20, 7, %001 | OAM_PAL1 + db -48, -28, 7, %001 | OAM_PAL1 .data_b3b44 db 9 ; size - db -32, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -40, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -24, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -16, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -12, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -20, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -28, 7, %001 | (1 << OAM_OBP_NUM) + db -32, -4, 7, %001 | OAM_PAL1 + db -40, -4, 7, %001 | OAM_PAL1 + db -24, -4, 7, %001 | OAM_PAL1 + db -16, -4, 7, %001 | OAM_PAL1 + db -48, -4, 7, %001 | OAM_PAL1 + db -8, -4, 7, %001 | OAM_PAL1 + db -48, -12, 7, %001 | OAM_PAL1 + db -48, -20, 7, %001 | OAM_PAL1 + db -48, -28, 7, %001 | OAM_PAL1 .data_b3b69 db 10 ; size - db -32, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -40, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -24, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -16, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 4, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -12, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -20, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -28, 7, %001 | (1 << OAM_OBP_NUM) + db -32, -4, 7, %001 | OAM_PAL1 + db -40, -4, 7, %001 | OAM_PAL1 + db -24, -4, 7, %001 | OAM_PAL1 + db -16, -4, 7, %001 | OAM_PAL1 + db -48, -4, 7, %001 | OAM_PAL1 + db -8, -4, 7, %001 | OAM_PAL1 + db -8, 4, 7, %001 | OAM_PAL1 + db -48, -12, 7, %001 | OAM_PAL1 + db -48, -20, 7, %001 | OAM_PAL1 + db -48, -28, 7, %001 | OAM_PAL1 .data_b3b92 db 11 ; size - db -32, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -40, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -24, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -16, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 12, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -12, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -20, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -28, 7, %001 | (1 << OAM_OBP_NUM) + db -32, -4, 7, %001 | OAM_PAL1 + db -40, -4, 7, %001 | OAM_PAL1 + db -24, -4, 7, %001 | OAM_PAL1 + db -16, -4, 7, %001 | OAM_PAL1 + db -48, -4, 7, %001 | OAM_PAL1 + db -8, -4, 7, %001 | OAM_PAL1 + db -8, 4, 7, %001 | OAM_PAL1 + db -8, 12, 7, %001 | OAM_PAL1 + db -48, -12, 7, %001 | OAM_PAL1 + db -48, -20, 7, %001 | OAM_PAL1 + db -48, -28, 7, %001 | OAM_PAL1 .data_b3bbf db 12 ; size - db -32, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -40, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -24, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -16, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 12, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 20, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -12, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -20, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -28, 7, %001 | (1 << OAM_OBP_NUM) + db -32, -4, 7, %001 | OAM_PAL1 + db -40, -4, 7, %001 | OAM_PAL1 + db -24, -4, 7, %001 | OAM_PAL1 + db -16, -4, 7, %001 | OAM_PAL1 + db -48, -4, 7, %001 | OAM_PAL1 + db -8, -4, 7, %001 | OAM_PAL1 + db -8, 4, 7, %001 | OAM_PAL1 + db -8, 12, 7, %001 | OAM_PAL1 + db -8, 20, 7, %001 | OAM_PAL1 + db -48, -12, 7, %001 | OAM_PAL1 + db -48, -20, 7, %001 | OAM_PAL1 + db -48, -28, 7, %001 | OAM_PAL1 .data_b3bf0 db 1 ; size - db -8, 20, 7, %001 | (1 << OAM_OBP_NUM) + db -8, 20, 7, %001 | OAM_PAL1 .data_b3bf5 db 2 ; size - db -8, 12, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 20, 7, %001 | (1 << OAM_OBP_NUM) + db -8, 12, 7, %001 | OAM_PAL1 + db -8, 20, 7, %001 | OAM_PAL1 .data_b3bfe db 3 ; size - db -8, 4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 12, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 20, 7, %001 | (1 << OAM_OBP_NUM) + db -8, 4, 7, %001 | OAM_PAL1 + db -8, 12, 7, %001 | OAM_PAL1 + db -8, 20, 7, %001 | OAM_PAL1 .data_b3c0b db 4 ; size - db -8, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 12, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 20, 7, %001 | (1 << OAM_OBP_NUM) + db -8, -4, 7, %001 | OAM_PAL1 + db -8, 4, 7, %001 | OAM_PAL1 + db -8, 12, 7, %001 | OAM_PAL1 + db -8, 20, 7, %001 | OAM_PAL1 .data_b3c1c db 5 ; size - db -16, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 12, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 20, 7, %001 | (1 << OAM_OBP_NUM) + db -16, -4, 7, %001 | OAM_PAL1 + db -8, -4, 7, %001 | OAM_PAL1 + db -8, 4, 7, %001 | OAM_PAL1 + db -8, 12, 7, %001 | OAM_PAL1 + db -8, 20, 7, %001 | OAM_PAL1 .data_b3c31 db 6 ; size - db -24, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -16, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 12, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 20, 7, %001 | (1 << OAM_OBP_NUM) + db -24, -4, 7, %001 | OAM_PAL1 + db -16, -4, 7, %001 | OAM_PAL1 + db -8, -4, 7, %001 | OAM_PAL1 + db -8, 4, 7, %001 | OAM_PAL1 + db -8, 12, 7, %001 | OAM_PAL1 + db -8, 20, 7, %001 | OAM_PAL1 .data_b3c4a db 7 ; size - db -32, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -24, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -16, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 12, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 20, 7, %001 | (1 << OAM_OBP_NUM) + db -32, -4, 7, %001 | OAM_PAL1 + db -24, -4, 7, %001 | OAM_PAL1 + db -16, -4, 7, %001 | OAM_PAL1 + db -8, -4, 7, %001 | OAM_PAL1 + db -8, 4, 7, %001 | OAM_PAL1 + db -8, 12, 7, %001 | OAM_PAL1 + db -8, 20, 7, %001 | OAM_PAL1 .data_b3c67 db 8 ; size - db -32, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -40, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -24, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -16, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 12, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 20, 7, %001 | (1 << OAM_OBP_NUM) + db -32, -4, 7, %001 | OAM_PAL1 + db -40, -4, 7, %001 | OAM_PAL1 + db -24, -4, 7, %001 | OAM_PAL1 + db -16, -4, 7, %001 | OAM_PAL1 + db -8, -4, 7, %001 | OAM_PAL1 + db -8, 4, 7, %001 | OAM_PAL1 + db -8, 12, 7, %001 | OAM_PAL1 + db -8, 20, 7, %001 | OAM_PAL1 .data_b3c88 db 9 ; size - db -32, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -40, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -24, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -16, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 12, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 20, 7, %001 | (1 << OAM_OBP_NUM) + db -32, -4, 7, %001 | OAM_PAL1 + db -40, -4, 7, %001 | OAM_PAL1 + db -24, -4, 7, %001 | OAM_PAL1 + db -16, -4, 7, %001 | OAM_PAL1 + db -48, -4, 7, %001 | OAM_PAL1 + db -8, -4, 7, %001 | OAM_PAL1 + db -8, 4, 7, %001 | OAM_PAL1 + db -8, 12, 7, %001 | OAM_PAL1 + db -8, 20, 7, %001 | OAM_PAL1 .data_b3cad db 10 ; size - db -32, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -40, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -24, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -16, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 12, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 20, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -12, 7, %001 | (1 << OAM_OBP_NUM) + db -32, -4, 7, %001 | OAM_PAL1 + db -40, -4, 7, %001 | OAM_PAL1 + db -24, -4, 7, %001 | OAM_PAL1 + db -16, -4, 7, %001 | OAM_PAL1 + db -48, -4, 7, %001 | OAM_PAL1 + db -8, -4, 7, %001 | OAM_PAL1 + db -8, 4, 7, %001 | OAM_PAL1 + db -8, 12, 7, %001 | OAM_PAL1 + db -8, 20, 7, %001 | OAM_PAL1 + db -48, -12, 7, %001 | OAM_PAL1 .data_b3cd6 db 11 ; size - db -32, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -40, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -24, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -16, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, -4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 4, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 12, 7, %001 | (1 << OAM_OBP_NUM) - db -8, 20, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -12, 7, %001 | (1 << OAM_OBP_NUM) - db -48, -20, 7, %001 | (1 << OAM_OBP_NUM) + db -32, -4, 7, %001 | OAM_PAL1 + db -40, -4, 7, %001 | OAM_PAL1 + db -24, -4, 7, %001 | OAM_PAL1 + db -16, -4, 7, %001 | OAM_PAL1 + db -48, -4, 7, %001 | OAM_PAL1 + db -8, -4, 7, %001 | OAM_PAL1 + db -8, 4, 7, %001 | OAM_PAL1 + db -8, 12, 7, %001 | OAM_PAL1 + db -8, 20, 7, %001 | OAM_PAL1 + db -48, -12, 7, %001 | OAM_PAL1 + db -48, -20, 7, %001 | OAM_PAL1 .data_b3d03 db 12 ; size db -24, -14, 8, $0 db -24, -6, 9, $0 db -16, -14, 10, $0 - db -24, 6, 8, (1 << OAM_X_FLIP) - db -24, -2, 9, (1 << OAM_X_FLIP) - db -16, 6, 10, (1 << OAM_X_FLIP) - db -32, -14, 8, (1 << OAM_Y_FLIP) - db -32, -6, 9, (1 << OAM_Y_FLIP) - db -40, -14, 10, (1 << OAM_Y_FLIP) - db -32, 6, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -32, -2, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -40, 6, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -24, 6, 8, OAM_XFLIP + db -24, -2, 9, OAM_XFLIP + db -16, 6, 10, OAM_XFLIP + db -32, -14, 8, OAM_YFLIP + db -32, -6, 9, OAM_YFLIP + db -40, -14, 10, OAM_YFLIP + db -32, 6, 8, OAM_XFLIP | OAM_YFLIP + db -32, -2, 9, OAM_XFLIP | OAM_YFLIP + db -40, 6, 10, OAM_XFLIP | OAM_YFLIP AnimData176:: frame_table AnimFrameTable81 diff --git a/src/data/duel/animations/anims4.asm b/src/data/duel/animations/anims4.asm index 027b3aa..a714f57 100644 --- a/src/data/duel/animations/anims4.asm +++ b/src/data/duel/animations/anims4.asm @@ -53,31 +53,31 @@ AnimFrameTable82:: .data_b407b db 2 ; size db -32, -31, 1, $0 - db -24, -31, 1, (1 << OAM_Y_FLIP) + db -24, -31, 1, OAM_YFLIP .data_b4084 db 6 ; size db -32, -31, 1, $0 - db -24, -31, 1, (1 << OAM_Y_FLIP) + db -24, -31, 1, OAM_YFLIP db -40, -22, 2, $0 db -32, -20, 3, $0 - db -16, -22, 2, (1 << OAM_Y_FLIP) - db -24, -20, 3, (1 << OAM_Y_FLIP) + db -16, -22, 2, OAM_YFLIP + db -24, -20, 3, OAM_YFLIP .data_b409d db 12 ; size db -32, -31, 1, $0 - db -24, -31, 1, (1 << OAM_Y_FLIP) + db -24, -31, 1, OAM_YFLIP db -40, -22, 2, $0 db -32, -20, 3, $0 db -48, -13, 4, $0 db -40, -9, 5, $0 db -32, -8, 6, $0 - db -16, -22, 2, (1 << OAM_Y_FLIP) - db -24, -20, 3, (1 << OAM_Y_FLIP) - db -8, -13, 4, (1 << OAM_Y_FLIP) - db -16, -9, 5, (1 << OAM_Y_FLIP) - db -24, -8, 6, (1 << OAM_Y_FLIP) + db -16, -22, 2, OAM_YFLIP + db -24, -20, 3, OAM_YFLIP + db -8, -13, 4, OAM_YFLIP + db -16, -9, 5, OAM_YFLIP + db -24, -8, 6, OAM_YFLIP .data_b40ce db 10 ; size @@ -86,71 +86,71 @@ AnimFrameTable82:: db -48, -13, 4, $0 db -40, -9, 5, $0 db -32, -8, 6, $0 - db -16, -22, 2, (1 << OAM_Y_FLIP) - db -24, -20, 3, (1 << OAM_Y_FLIP) - db -8, -13, 4, (1 << OAM_Y_FLIP) - db -16, -9, 5, (1 << OAM_Y_FLIP) - db -24, -8, 6, (1 << OAM_Y_FLIP) + db -16, -22, 2, OAM_YFLIP + db -24, -20, 3, OAM_YFLIP + db -8, -13, 4, OAM_YFLIP + db -16, -9, 5, OAM_YFLIP + db -24, -8, 6, OAM_YFLIP .data_b40f7 db 6 ; size db -48, -13, 4, $0 db -40, -9, 5, $0 db -32, -8, 6, $0 - db -8, -13, 4, (1 << OAM_Y_FLIP) - db -16, -9, 5, (1 << OAM_Y_FLIP) - db -24, -8, 6, (1 << OAM_Y_FLIP) + db -8, -13, 4, OAM_YFLIP + db -16, -9, 5, OAM_YFLIP + db -24, -8, 6, OAM_YFLIP .data_b4110 db 2 ; size - db -32, -9, 1, (1 << OAM_X_FLIP) - db -24, -9, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -32, -9, 1, OAM_XFLIP + db -24, -9, 1, OAM_XFLIP | OAM_YFLIP .data_b4119 db 6 ; size - db -32, -9, 1, (1 << OAM_X_FLIP) - db -24, -9, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -40, -18, 2, (1 << OAM_X_FLIP) - db -32, -20, 3, (1 << OAM_X_FLIP) - db -16, -18, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -24, -20, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -32, -9, 1, OAM_XFLIP + db -24, -9, 1, OAM_XFLIP | OAM_YFLIP + db -40, -18, 2, OAM_XFLIP + db -32, -20, 3, OAM_XFLIP + db -16, -18, 2, OAM_XFLIP | OAM_YFLIP + db -24, -20, 3, OAM_XFLIP | OAM_YFLIP .data_b4132 db 12 ; size - db -32, -9, 1, (1 << OAM_X_FLIP) - db -24, -9, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -40, -18, 2, (1 << OAM_X_FLIP) - db -32, -20, 3, (1 << OAM_X_FLIP) - db -48, -27, 4, (1 << OAM_X_FLIP) - db -40, -31, 5, (1 << OAM_X_FLIP) - db -32, -32, 6, (1 << OAM_X_FLIP) - db -16, -18, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -24, -20, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -27, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, -31, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -24, -32, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -32, -9, 1, OAM_XFLIP + db -24, -9, 1, OAM_XFLIP | OAM_YFLIP + db -40, -18, 2, OAM_XFLIP + db -32, -20, 3, OAM_XFLIP + db -48, -27, 4, OAM_XFLIP + db -40, -31, 5, OAM_XFLIP + db -32, -32, 6, OAM_XFLIP + db -16, -18, 2, OAM_XFLIP | OAM_YFLIP + db -24, -20, 3, OAM_XFLIP | OAM_YFLIP + db -8, -27, 4, OAM_XFLIP | OAM_YFLIP + db -16, -31, 5, OAM_XFLIP | OAM_YFLIP + db -24, -32, 6, OAM_XFLIP | OAM_YFLIP .data_b4163 db 10 ; size - db -40, -18, 2, (1 << OAM_X_FLIP) - db -32, -20, 3, (1 << OAM_X_FLIP) - db -48, -27, 4, (1 << OAM_X_FLIP) - db -40, -31, 5, (1 << OAM_X_FLIP) - db -32, -32, 6, (1 << OAM_X_FLIP) - db -16, -18, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -24, -20, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -27, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, -31, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -24, -32, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -40, -18, 2, OAM_XFLIP + db -32, -20, 3, OAM_XFLIP + db -48, -27, 4, OAM_XFLIP + db -40, -31, 5, OAM_XFLIP + db -32, -32, 6, OAM_XFLIP + db -16, -18, 2, OAM_XFLIP | OAM_YFLIP + db -24, -20, 3, OAM_XFLIP | OAM_YFLIP + db -8, -27, 4, OAM_XFLIP | OAM_YFLIP + db -16, -31, 5, OAM_XFLIP | OAM_YFLIP + db -24, -32, 6, OAM_XFLIP | OAM_YFLIP .data_b418c db 6 ; size - db -48, -27, 4, (1 << OAM_X_FLIP) - db -40, -31, 5, (1 << OAM_X_FLIP) - db -32, -32, 6, (1 << OAM_X_FLIP) - db -8, -27, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, -31, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -24, -32, 6, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -48, -27, 4, OAM_XFLIP + db -40, -31, 5, OAM_XFLIP + db -32, -32, 6, OAM_XFLIP + db -8, -27, 4, OAM_XFLIP | OAM_YFLIP + db -16, -31, 5, OAM_XFLIP | OAM_YFLIP + db -24, -32, 6, OAM_XFLIP | OAM_YFLIP .data_b41a5 db 1 ; size @@ -370,15 +370,15 @@ AnimFrameTable82:: db -24, -14, 8, $0 db -24, -6, 9, $0 db -16, -14, 10, $0 - db -24, 6, 8, (1 << OAM_X_FLIP) - db -24, -2, 9, (1 << OAM_X_FLIP) - db -16, 6, 10, (1 << OAM_X_FLIP) - db -32, -14, 8, (1 << OAM_Y_FLIP) - db -32, -6, 9, (1 << OAM_Y_FLIP) - db -40, -14, 10, (1 << OAM_Y_FLIP) - db -32, 6, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -32, -2, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -40, 6, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db -24, 6, 8, OAM_XFLIP + db -24, -2, 9, OAM_XFLIP + db -16, 6, 10, OAM_XFLIP + db -32, -14, 8, OAM_YFLIP + db -32, -6, 9, OAM_YFLIP + db -40, -14, 10, OAM_YFLIP + db -32, 6, 8, OAM_XFLIP | OAM_YFLIP + db -32, -2, 9, OAM_XFLIP | OAM_YFLIP + db -40, 6, 10, OAM_XFLIP | OAM_YFLIP AnimData181:: frame_table AnimFrameTable83 @@ -426,31 +426,31 @@ AnimFrameTable83:: .data_b44a6 db 2 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -16, -76, 2, OAM_YFLIP .data_b44af db 4 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP .data_b44c0 db 6 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 .data_b44d9 db 8 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -458,10 +458,10 @@ AnimFrameTable83:: .data_b44fa db 10 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -471,10 +471,10 @@ AnimFrameTable83:: .data_b4523 db 12 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -486,10 +486,10 @@ AnimFrameTable83:: .data_b4554 db 14 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -503,10 +503,10 @@ AnimFrameTable83:: .data_b458d db 16 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -522,10 +522,10 @@ AnimFrameTable83:: .data_b45ce db 18 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -543,10 +543,10 @@ AnimFrameTable83:: .data_b4617 db 20 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -566,10 +566,10 @@ AnimFrameTable83:: .data_b4668 db 22 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -591,10 +591,10 @@ AnimFrameTable83:: .data_b46c1 db 24 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -618,10 +618,10 @@ AnimFrameTable83:: .data_b4722 db 26 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -647,10 +647,10 @@ AnimFrameTable83:: .data_b478b db 28 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -678,10 +678,10 @@ AnimFrameTable83:: .data_b47fc db 30 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -711,10 +711,10 @@ AnimFrameTable83:: .data_b4875 db 32 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -742,14 +742,14 @@ AnimFrameTable83:: db 32, 44, 1, $0 db 32, 52, 1, $0 db 32, 60, 1, $0 - db 32, 68, 2, (1 << OAM_Y_FLIP) + db 32, 68, 2, OAM_YFLIP .data_b48f6 db 34 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -777,16 +777,16 @@ AnimFrameTable83:: db 32, 44, 1, $0 db 32, 52, 1, $0 db 32, 60, 1, $0 - db 16, 68, 2, (1 << OAM_Y_FLIP) - db 24, 68, 2, (1 << OAM_Y_FLIP) - db 32, 68, 2, (1 << OAM_Y_FLIP) + db 16, 68, 2, OAM_YFLIP + db 24, 68, 2, OAM_YFLIP + db 32, 68, 2, OAM_YFLIP .data_b497f db 36 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -814,26 +814,26 @@ AnimFrameTable83:: db 32, 44, 1, $0 db 32, 52, 1, $0 db 32, 60, 1, $0 - db 16, 68, 2, (1 << OAM_Y_FLIP) - db 24, 68, 2, (1 << OAM_Y_FLIP) - db 32, 68, 2, (1 << OAM_Y_FLIP) - db 8, 60, 1, (1 << OAM_X_FLIP) - db 8, 68, 1, (1 << OAM_X_FLIP) + db 16, 68, 2, OAM_YFLIP + db 24, 68, 2, OAM_YFLIP + db 32, 68, 2, OAM_YFLIP + db 8, 60, 1, OAM_XFLIP + db 8, 68, 1, OAM_XFLIP .data_b4a10 db 12 ; size - db 0, -14, 3, %001 | (1 << OAM_OBP_NUM) - db 0, -6, 4, %001 | (1 << OAM_OBP_NUM) - db 8, -14, 5, %001 | (1 << OAM_OBP_NUM) - db 0, 6, 3, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, -2, 4, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 6, 5, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db -8, -14, 3, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) - db -8, -6, 4, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) - db -16, -14, 5, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) - db -8, 6, 3, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -2, 4, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, 6, 5, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, -14, 3, %001 | OAM_PAL1 + db 0, -6, 4, %001 | OAM_PAL1 + db 8, -14, 5, %001 | OAM_PAL1 + db 0, 6, 3, %001 | OAM_PAL1 | OAM_XFLIP + db 0, -2, 4, %001 | OAM_PAL1 | OAM_XFLIP + db 8, 6, 5, %001 | OAM_PAL1 | OAM_XFLIP + db -8, -14, 3, %001 | OAM_PAL1 | OAM_YFLIP + db -8, -6, 4, %001 | OAM_PAL1 | OAM_YFLIP + db -16, -14, 5, %001 | OAM_PAL1 | OAM_YFLIP + db -8, 6, 3, %001 | OAM_PAL1 | OAM_XFLIP | OAM_YFLIP + db -8, -2, 4, %001 | OAM_PAL1 | OAM_XFLIP | OAM_YFLIP + db -16, 6, 5, %001 | OAM_PAL1 | OAM_XFLIP | OAM_YFLIP AnimData183:: frame_table AnimFrameTable84 @@ -881,31 +881,31 @@ AnimFrameTable84:: .data_b4aba db 2 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -16, -76, 2, OAM_YFLIP .data_b4ac3 db 4 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP .data_b4ad4 db 6 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 .data_b4aed db 8 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -913,10 +913,10 @@ AnimFrameTable84:: .data_b4b0e db 10 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -926,10 +926,10 @@ AnimFrameTable84:: .data_b4b37 db 12 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -941,10 +941,10 @@ AnimFrameTable84:: .data_b4b68 db 14 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -958,10 +958,10 @@ AnimFrameTable84:: .data_b4ba1 db 16 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -977,10 +977,10 @@ AnimFrameTable84:: .data_b4be2 db 18 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -998,10 +998,10 @@ AnimFrameTable84:: .data_b4c2b db 20 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -1021,10 +1021,10 @@ AnimFrameTable84:: .data_b4c7c db 22 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -1046,10 +1046,10 @@ AnimFrameTable84:: .data_b4cd5 db 24 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -1073,10 +1073,10 @@ AnimFrameTable84:: .data_b4d36 db 26 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -1102,10 +1102,10 @@ AnimFrameTable84:: .data_b4d9f db 28 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -1133,10 +1133,10 @@ AnimFrameTable84:: .data_b4e10 db 30 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -1166,10 +1166,10 @@ AnimFrameTable84:: .data_b4e89 db 32 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -1197,14 +1197,14 @@ AnimFrameTable84:: db 32, 44, 1, $0 db 32, 52, 1, $0 db 32, 60, 1, $0 - db 32, 68, 2, (1 << OAM_Y_FLIP) + db 32, 68, 2, OAM_YFLIP .data_b4f0a db 34 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -1232,16 +1232,16 @@ AnimFrameTable84:: db 32, 44, 1, $0 db 32, 52, 1, $0 db 32, 60, 1, $0 - db 16, 68, 2, (1 << OAM_Y_FLIP) - db 24, 68, 2, (1 << OAM_Y_FLIP) - db 32, 68, 2, (1 << OAM_Y_FLIP) + db 16, 68, 2, OAM_YFLIP + db 24, 68, 2, OAM_YFLIP + db 32, 68, 2, OAM_YFLIP .data_b4f93 db 36 ; size - db -16, -68, 1, (1 << OAM_X_FLIP) - db -24, -76, 2, (1 << OAM_Y_FLIP) - db -32, -76, 2, (1 << OAM_Y_FLIP) - db -16, -76, 2, (1 << OAM_Y_FLIP) + db -16, -68, 1, OAM_XFLIP + db -24, -76, 2, OAM_YFLIP + db -32, -76, 2, OAM_YFLIP + db -16, -76, 2, OAM_YFLIP db -40, -76, 1, $0 db -40, -68, 1, $0 db -40, -60, 1, $0 @@ -1269,26 +1269,26 @@ AnimFrameTable84:: db 32, 44, 1, $0 db 32, 52, 1, $0 db 32, 60, 1, $0 - db 16, 68, 2, (1 << OAM_Y_FLIP) - db 24, 68, 2, (1 << OAM_Y_FLIP) - db 32, 68, 2, (1 << OAM_Y_FLIP) - db 8, 60, 1, (1 << OAM_X_FLIP) - db 8, 68, 1, (1 << OAM_X_FLIP) + db 16, 68, 2, OAM_YFLIP + db 24, 68, 2, OAM_YFLIP + db 32, 68, 2, OAM_YFLIP + db 8, 60, 1, OAM_XFLIP + db 8, 68, 1, OAM_XFLIP .data_b5024 db 12 ; size db 0, -14, 3, $0 db 0, -6, 4, $0 db 8, -14, 5, $0 - db 0, 6, 3, (1 << OAM_X_FLIP) - db 0, -2, 4, (1 << OAM_X_FLIP) - db 8, 6, 5, (1 << OAM_X_FLIP) - db -8, -14, 3, (1 << OAM_Y_FLIP) - db -8, -6, 4, (1 << OAM_Y_FLIP) - db -16, -14, 5, (1 << OAM_Y_FLIP) - db -8, 6, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -2, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, 6, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) + db 0, 6, 3, OAM_XFLIP + db 0, -2, 4, OAM_XFLIP + db 8, 6, 5, OAM_XFLIP + db -8, -14, 3, OAM_YFLIP + db -8, -6, 4, OAM_YFLIP + db -16, -14, 5, OAM_YFLIP + db -8, 6, 3, OAM_XFLIP | OAM_YFLIP + db -8, -2, 4, OAM_XFLIP | OAM_YFLIP + db -16, 6, 5, OAM_XFLIP | OAM_YFLIP AnimData185:: frame_table AnimFrameTable85 @@ -1316,47 +1316,47 @@ AnimFrameTable85:: .data_b508e db 12 ; size db 0, -8, 0, $0 - db 0, 0, 0, (1 << OAM_X_FLIP) + db 0, 0, 0, OAM_XFLIP db 8, -8, 16, $0 - db 8, 0, 16, (1 << OAM_X_FLIP) + db 8, 0, 16, OAM_XFLIP db -16, -16, 14, $0 db -8, -16, 15, $0 - db -16, 8, 14, (1 << OAM_X_FLIP) - db -8, 8, 15, (1 << OAM_X_FLIP) + db -16, 8, 14, OAM_XFLIP + db -8, 8, 15, OAM_XFLIP db -16, -8, 12, $0 db -8, -8, 13, $0 - db -16, 0, 12, (1 << OAM_X_FLIP) - db -8, 0, 13, (1 << OAM_X_FLIP) + db -16, 0, 12, OAM_XFLIP + db -8, 0, 13, OAM_XFLIP .data_b50bf db 9 ; size db -19, 11, 3, $0 db -8, -24, 0, $0 db 0, -24, 16, $0 - db -8, -16, 0, (1 << OAM_X_FLIP) - db 0, -16, 16, (1 << OAM_X_FLIP) + db -8, -16, 0, OAM_XFLIP + db 0, -16, 16, OAM_XFLIP db -8, 8, 0, $0 db 0, 8, 16, $0 - db -8, 16, 0, (1 << OAM_X_FLIP) - db 0, 16, 16, (1 << OAM_X_FLIP) + db -8, 16, 0, OAM_XFLIP + db 0, 16, 16, OAM_XFLIP .data_b50e4 db 15 ; size db 0, 16, 0, $0 - db 0, 24, 0, (1 << OAM_X_FLIP) + db 0, 24, 0, OAM_XFLIP db 8, 16, 16, $0 - db 8, 24, 16, (1 << OAM_X_FLIP) + db 8, 24, 16, OAM_XFLIP db -19, 11, 2, $0 db -16, -16, 1, $0 db -7, -16, 17, $0 - db -16, 8, 1, (1 << OAM_X_FLIP) - db -7, 8, 17, (1 << OAM_X_FLIP) + db -16, 8, 1, OAM_XFLIP + db -7, 8, 17, OAM_XFLIP db -16, -32, 0, $0 db -8, -32, 16, $0 - db -16, -24, 0, (1 << OAM_X_FLIP) - db -8, -24, 16, (1 << OAM_X_FLIP) + db -16, -24, 0, OAM_XFLIP + db -8, -24, 16, OAM_XFLIP db 0, -8, 19, $0 - db 0, 0, 19, (1 << OAM_X_FLIP) + db 0, 0, 19, OAM_XFLIP .data_b5121 db 13 ; size @@ -1367,19 +1367,19 @@ AnimFrameTable85:: db 24, -16, 3, $0 db -16, -24, 12, $0 db -8, -24, 13, $0 - db -16, -16, 12, (1 << OAM_X_FLIP) - db -8, -16, 13, (1 << OAM_X_FLIP) + db -16, -16, 12, OAM_XFLIP + db -8, -16, 13, OAM_XFLIP db 8, 8, 0, $0 db 16, 8, 16, $0 - db 8, 16, 0, (1 << OAM_X_FLIP) - db 16, 16, 16, (1 << OAM_X_FLIP) + db 8, 16, 0, OAM_XFLIP + db 16, 16, 16, OAM_XFLIP .data_b5156 db 17 ; size db 0, -8, 0, $0 - db 0, 0, 0, (1 << OAM_X_FLIP) + db 0, 0, 0, OAM_XFLIP db 8, -8, 16, $0 - db 8, 0, 16, (1 << OAM_X_FLIP) + db 8, 0, 16, OAM_XFLIP db 24, -16, 2, $0 db -24, 8, 8, $0 db -24, 16, 9, $0 @@ -1387,12 +1387,12 @@ AnimFrameTable85:: db -16, 16, 11, $0 db -16, -16, 14, $0 db -8, -16, 15, $0 - db -16, 8, 14, (1 << OAM_X_FLIP) - db -8, 8, 15, (1 << OAM_X_FLIP) + db -16, 8, 14, OAM_XFLIP + db -8, 8, 15, OAM_XFLIP db -16, -8, 12, $0 db -8, -8, 13, $0 - db -16, 0, 12, (1 << OAM_X_FLIP) - db -8, 0, 13, (1 << OAM_X_FLIP) + db -16, 0, 12, OAM_XFLIP + db -8, 0, 13, OAM_XFLIP .data_b519b db 13 ; size @@ -1403,60 +1403,60 @@ AnimFrameTable85:: db -20, 12, 3, $0 db -8, -24, 0, $0 db 0, -24, 16, $0 - db -8, -16, 0, (1 << OAM_X_FLIP) - db 0, -16, 16, (1 << OAM_X_FLIP) + db -8, -16, 0, OAM_XFLIP + db 0, -16, 16, OAM_XFLIP db -8, 8, 0, $0 db 0, 8, 16, $0 - db -8, 16, 0, (1 << OAM_X_FLIP) - db 0, 16, 16, (1 << OAM_X_FLIP) + db -8, 16, 0, OAM_XFLIP + db 0, 16, 16, OAM_XFLIP .data_b51d0 db 18 ; size db 0, 16, 0, $0 - db 0, 24, 0, (1 << OAM_X_FLIP) + db 0, 24, 0, OAM_XFLIP db -16, -32, 0, $0 - db -16, -24, 0, (1 << OAM_X_FLIP) + db -16, -24, 0, OAM_XFLIP db -8, -32, 16, $0 - db -8, -24, 16, (1 << OAM_X_FLIP) + db -8, -24, 16, OAM_XFLIP db 8, 16, 16, $0 - db 8, 24, 16, (1 << OAM_X_FLIP) + db 8, 24, 16, OAM_XFLIP db 20, -20, 8, $0 db 20, -12, 9, $0 db 28, -20, 10, $0 db 28, -12, 11, $0 db -16, -16, 1, $0 db -7, -16, 17, $0 - db -16, 8, 1, (1 << OAM_X_FLIP) - db -7, 8, 17, (1 << OAM_X_FLIP) + db -16, 8, 1, OAM_XFLIP + db -7, 8, 17, OAM_XFLIP db 0, -8, 19, $0 - db 0, 0, 19, (1 << OAM_X_FLIP) + db 0, 0, 19, OAM_XFLIP .data_b5219 db 9 ; size db 24, -16, 3, $0 db -24, -24, 12, $0 db -16, -24, 13, $0 - db -24, -16, 12, (1 << OAM_X_FLIP) - db -16, -16, 13, (1 << OAM_X_FLIP) + db -24, -16, 12, OAM_XFLIP + db -16, -16, 13, OAM_XFLIP db 8, 8, 0, $0 db 16, 8, 16, $0 - db 8, 16, 0, (1 << OAM_X_FLIP) - db 16, 16, 16, (1 << OAM_X_FLIP) + db 8, 16, 0, OAM_XFLIP + db 16, 16, 16, OAM_XFLIP .data_b523e db 12 ; size - db 0, -14, 20, %001 | (1 << OAM_OBP_NUM) - db 0, -6, 21, %001 | (1 << OAM_OBP_NUM) - db 8, -14, 18, %001 | (1 << OAM_OBP_NUM) - db -8, -14, 20, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) - db -8, -6, 21, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) - db -16, -14, 18, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) - db -8, 6, 20, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, -2, 21, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, 6, 18, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, 6, 20, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, -2, 21, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 6, 18, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, -14, 20, %001 | OAM_PAL1 + db 0, -6, 21, %001 | OAM_PAL1 + db 8, -14, 18, %001 | OAM_PAL1 + db -8, -14, 20, %001 | OAM_PAL1 | OAM_YFLIP + db -8, -6, 21, %001 | OAM_PAL1 | OAM_YFLIP + db -16, -14, 18, %001 | OAM_PAL1 | OAM_YFLIP + db -8, 6, 20, %001 | OAM_PAL1 | OAM_XFLIP | OAM_YFLIP + db -8, -2, 21, %001 | OAM_PAL1 | OAM_XFLIP | OAM_YFLIP + db -16, 6, 18, %001 | OAM_PAL1 | OAM_XFLIP | OAM_YFLIP + db 0, 6, 20, %001 | OAM_PAL1 | OAM_XFLIP + db 0, -2, 21, %001 | OAM_PAL1 | OAM_XFLIP + db 8, 6, 18, %001 | OAM_PAL1 | OAM_XFLIP AnimData187:: frame_table AnimFrameTable86 @@ -1484,47 +1484,47 @@ AnimFrameTable86:: .data_b52a8 db 12 ; size db -8, -8, 0, $0 - db -8, 0, 0, (1 << OAM_X_FLIP) + db -8, 0, 0, OAM_XFLIP db 0, -8, 16, $0 - db 0, 0, 16, (1 << OAM_X_FLIP) + db 0, 0, 16, OAM_XFLIP db -16, -16, 14, $0 db -8, -16, 15, $0 - db -16, 8, 14, (1 << OAM_X_FLIP) - db -8, 8, 15, (1 << OAM_X_FLIP) + db -16, 8, 14, OAM_XFLIP + db -8, 8, 15, OAM_XFLIP db -24, -8, 12, $0 db -16, -8, 13, $0 - db -24, 0, 12, (1 << OAM_X_FLIP) - db -16, 0, 13, (1 << OAM_X_FLIP) + db -24, 0, 12, OAM_XFLIP + db -16, 0, 13, OAM_XFLIP .data_b52d9 db 9 ; size db -19, 11, 3, $0 db -8, -24, 0, $0 db 0, -24, 16, $0 - db -8, -16, 0, (1 << OAM_X_FLIP) - db 0, -16, 16, (1 << OAM_X_FLIP) + db -8, -16, 0, OAM_XFLIP + db 0, -16, 16, OAM_XFLIP db -8, 8, 0, $0 db 0, 8, 16, $0 - db -8, 16, 0, (1 << OAM_X_FLIP) - db 0, 16, 16, (1 << OAM_X_FLIP) + db -8, 16, 0, OAM_XFLIP + db 0, 16, 16, OAM_XFLIP .data_b52fe db 15 ; size db 0, 16, 0, $0 - db 0, 24, 0, (1 << OAM_X_FLIP) + db 0, 24, 0, OAM_XFLIP db 8, 16, 16, $0 - db 8, 24, 16, (1 << OAM_X_FLIP) + db 8, 24, 16, OAM_XFLIP db -19, 11, 2, $0 db -16, -16, 1, $0 db -7, -16, 17, $0 - db -16, 8, 1, (1 << OAM_X_FLIP) - db -7, 8, 17, (1 << OAM_X_FLIP) + db -16, 8, 1, OAM_XFLIP + db -7, 8, 17, OAM_XFLIP db -16, -32, 0, $0 db -8, -32, 16, $0 - db -16, -24, 0, (1 << OAM_X_FLIP) - db -8, -24, 16, (1 << OAM_X_FLIP) + db -16, -24, 0, OAM_XFLIP + db -8, -24, 16, OAM_XFLIP db 0, -8, 19, $0 - db 0, 0, 19, (1 << OAM_X_FLIP) + db 0, 0, 19, OAM_XFLIP .data_b533b db 13 ; size @@ -1535,19 +1535,19 @@ AnimFrameTable86:: db 24, -16, 3, $0 db -16, -24, 12, $0 db -8, -24, 13, $0 - db -16, -16, 12, (1 << OAM_X_FLIP) - db -8, -16, 13, (1 << OAM_X_FLIP) + db -16, -16, 12, OAM_XFLIP + db -8, -16, 13, OAM_XFLIP db 8, 8, 0, $0 db 16, 8, 16, $0 - db 8, 16, 0, (1 << OAM_X_FLIP) - db 16, 16, 16, (1 << OAM_X_FLIP) + db 8, 16, 0, OAM_XFLIP + db 16, 16, 16, OAM_XFLIP .data_b5370 db 17 ; size db 0, -8, 0, $0 - db 0, 0, 0, (1 << OAM_X_FLIP) + db 0, 0, 0, OAM_XFLIP db 8, -8, 16, $0 - db 8, 0, 16, (1 << OAM_X_FLIP) + db 8, 0, 16, OAM_XFLIP db 24, -16, 2, $0 db -24, 8, 8, $0 db -24, 16, 9, $0 @@ -1555,12 +1555,12 @@ AnimFrameTable86:: db -16, 16, 11, $0 db -16, -16, 14, $0 db -8, -16, 15, $0 - db -16, 8, 14, (1 << OAM_X_FLIP) - db -8, 8, 15, (1 << OAM_X_FLIP) + db -16, 8, 14, OAM_XFLIP + db -8, 8, 15, OAM_XFLIP db -16, -8, 12, $0 db -8, -8, 13, $0 - db -16, 0, 12, (1 << OAM_X_FLIP) - db -8, 0, 13, (1 << OAM_X_FLIP) + db -16, 0, 12, OAM_XFLIP + db -8, 0, 13, OAM_XFLIP .data_b53b5 db 13 ; size @@ -1571,60 +1571,60 @@ AnimFrameTable86:: db -20, 12, 3, $0 db -8, -24, 0, $0 db 0, -24, 16, $0 - db -8, -16, 0, (1 << OAM_X_FLIP) - db 0, -16, 16, (1 << OAM_X_FLIP) + db -8, -16, 0, OAM_XFLIP + db 0, -16, 16, OAM_XFLIP db -8, 8, 0, $0 db 0, 8, 16, $0 - db -8, 16, 0, (1 << OAM_X_FLIP) - db 0, 16, 16, (1 << OAM_X_FLIP) + db -8, 16, 0, OAM_XFLIP + db 0, 16, 16, OAM_XFLIP .data_b53ea db 18 ; size db 0, 16, 0, $0 - db 0, 24, 0, (1 << OAM_X_FLIP) + db 0, 24, 0, OAM_XFLIP db -16, -32, 0, $0 - db -16, -24, 0, (1 << OAM_X_FLIP) + db -16, -24, 0, OAM_XFLIP db -8, -32, 16, $0 - db -8, -24, 16, (1 << OAM_X_FLIP) + db -8, -24, 16, OAM_XFLIP db 8, 16, 16, $0 - db 8, 24, 16, (1 << OAM_X_FLIP) + db 8, 24, 16, OAM_XFLIP db 20, -20, 8, $0 db 20, -12, 9, $0 db 28, -20, 10, $0 db 28, -12, 11, $0 db -16, -16, 1, $0 db -7, -16, 17, $0 - db -16, 8, 1, (1 << OAM_X_FLIP) - db -7, 8, 17, (1 << OAM_X_FLIP) + db -16, 8, 1, OAM_XFLIP + db -7, 8, 17, OAM_XFLIP db 0, -8, 19, $0 - db 0, 0, 19, (1 << OAM_X_FLIP) + db 0, 0, 19, OAM_XFLIP .data_b5433 db 9 ; size db 24, -16, 3, $0 db -24, -24, 12, $0 db -16, -24, 13, $0 - db -24, -16, 12, (1 << OAM_X_FLIP) - db -16, -16, 13, (1 << OAM_X_FLIP) + db -24, -16, 12, OAM_XFLIP + db -16, -16, 13, OAM_XFLIP db 8, 8, 0, $0 db 16, 8, 16, $0 - db 8, 16, 0, (1 << OAM_X_FLIP) - db 16, 16, 16, (1 << OAM_X_FLIP) + db 8, 16, 0, OAM_XFLIP + db 16, 16, 16, OAM_XFLIP .data_b5458 db 12 ; size - db 0, -6, 21, (1 << OAM_OBP_NUM) - db 0, -14, 20, (1 << OAM_OBP_NUM) - db 8, -14, 18, (1 << OAM_OBP_NUM) - db -8, -6, 21, (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) - db -8, -14, 20, (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) - db -16, -14, 18, (1 << OAM_OBP_NUM) | (1 << OAM_Y_FLIP) - db -8, -2, 21, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -8, 6, 20, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db -16, 6, 18, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) - db 0, -2, 21, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 0, 6, 20, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) - db 8, 6, 18, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) + db 0, -6, 21, OAM_PAL1 + db 0, -14, 20, OAM_PAL1 + db 8, -14, 18, OAM_PAL1 + db -8, -6, 21, OAM_PAL1 | OAM_YFLIP + db -8, -14, 20, OAM_PAL1 | OAM_YFLIP + db -16, -14, 18, OAM_PAL1 | OAM_YFLIP + db -8, -2, 21, OAM_PAL1 | OAM_XFLIP | OAM_YFLIP + db -8, 6, 20, OAM_PAL1 | OAM_XFLIP | OAM_YFLIP + db -16, 6, 18, OAM_PAL1 | OAM_XFLIP | OAM_YFLIP + db 0, -2, 21, OAM_PAL1 | OAM_XFLIP + db 0, 6, 20, OAM_PAL1 | OAM_XFLIP + db 8, 6, 18, OAM_PAL1 | OAM_XFLIP AnimData191:: frame_table AnimFrameTable89 diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm index 7aef788..789586c 100644 --- a/src/engine/bank20.asm +++ b/src/engine/bank20.asm @@ -202,7 +202,7 @@ LoadTilemap: .next_row pop de - ld hl, BG_MAP_WIDTH + ld hl, TILEMAP_WIDTH add hl, de ld e, l ld d, h @@ -1391,7 +1391,7 @@ Func_80cd7: call .HandleInput call HandleAllSpriteAnimations ldh a, [hKeysPressed] - and SELECT ; if select is pressed, exit + and PAD_SELECT ; if select is pressed, exit jr z, .loop ret @@ -1403,7 +1403,7 @@ Func_80cd7: ; these are not aligned with the regular NPC indices .HandleInput ldh a, [hKeysPressed] - and A_BUTTON + and PAD_A jr z, .no_a_button ld a, [wLoadNPCDirection] inc a ; rotate NPC @@ -1413,17 +1413,17 @@ Func_80cd7: call .DrawNPCSprite .no_a_button ldh a, [hKeysPressed] - and D_PAD + and PAD_CTRL_PAD ret z farcall GetDirectionFromDPad ld hl, .func_table jp JumpToFunctionInTable .func_table - dw .up ; D_UP - dw .right ; D_RIGHT - dw .down ; D_DOWN - dw .left ; D_LEFT + dw .up ; PAD_UP + dw .right ; PAD_RIGHT + dw .down ; PAD_DOWN + dw .left ; PAD_LEFT .up ld a, 10 jr .decr_npc_id diff --git a/src/engine/credits.asm b/src/engine/credits.asm index 21267c2..b7284e3 100644 --- a/src/engine/credits.asm +++ b/src/engine/credits.asm @@ -17,7 +17,7 @@ PlayCreditsSequence:: cp $ff jr nz, .loop_cmds call WaitForSongToFinish - ld a, START + ld a, PAD_START farcall WaitUntilKeysArePressed ld a, MUSIC_STOP call PlaySong @@ -68,20 +68,20 @@ Func_1d705: ei ld hl, rSTAT - set STAT_LYC, [hl] + set B_STAT_LYC, [hl] xor a ldh [rLYC], a ld hl, rIE - set INT_LCD_STAT, [hl] + set B_IE_STAT, [hl] pop hl ret Func_1d758: push hl ld hl, rSTAT - res STAT_LYC, [hl] + res B_STAT_LYC, [hl] ld hl, rIE - res INT_LCD_STAT, [hl] + res B_IE_STAT, [hl] pop hl ret diff --git a/src/engine/debug_sprites.asm b/src/engine/debug_sprites.asm index 1b1a416..db99c2d 100644 --- a/src/engine/debug_sprites.asm +++ b/src/engine/debug_sprites.asm @@ -6,7 +6,7 @@ Func_1c865: ; pressing B makes it scroll faster Func_1c866: ; unreferenced ldh a, [hKeysHeld] - and B_BUTTON + and PAD_B call nz, .asm_1c86d ; executes following part twice .asm_1c86d ldh a, [hSCX] @@ -14,19 +14,19 @@ Func_1c866: ; unreferenced ldh a, [hSCY] ld c, a ldh a, [hKeysHeld] - bit D_UP_F, a + bit B_PAD_UP, a jr z, .check_d_down inc c .check_d_down - bit D_DOWN_F, a + bit B_PAD_DOWN, a jr z, .check_d_left dec c .check_d_left - bit D_LEFT_F, a + bit B_PAD_LEFT, a jr z, .check_d_right inc b .check_d_right - bit D_RIGHT_F, a + bit B_PAD_RIGHT, a jr z, .asm_1c889 dec b .asm_1c889 diff --git a/src/engine/duel/core.asm b/src/engine/duel/core.asm index 1b123f8..d56b69c 100644 --- a/src/engine/duel/core.asm +++ b/src/engine/duel/core.asm @@ -313,26 +313,26 @@ PrintDuelMenuAndHandleInput: .handle_input call DoFrame ldh a, [hKeysHeld] - and B_BUTTON + and PAD_B jr z, .b_not_held ldh a, [hKeysPressed] - bit D_UP_F, a + bit B_PAD_UP, a jr nz, DuelMenuShortcut_OpponentPlayArea - bit D_DOWN_F, a + bit B_PAD_DOWN, a jr nz, DuelMenuShortcut_PlayerPlayArea - bit D_LEFT_F, a + bit B_PAD_LEFT, a jr nz, DuelMenuShortcut_PlayerDiscardPile - bit D_RIGHT_F, a + bit B_PAD_RIGHT, a jr nz, DuelMenuShortcut_OpponentDiscardPile - bit START_F, a + bit B_PAD_START, a jp nz, DuelMenuShortcut_OpponentActivePokemon .b_not_held ldh a, [hKeysPressed] - and START + and PAD_START jp nz, DuelMenuShortcut_PlayerActivePokemon ldh a, [hKeysPressed] - bit SELECT_F, a + bit B_PAD_SELECT, a jp nz, DuelMenuShortcut_BothActivePokemon ld a, [wDebugSkipDuelMenuInput] or a @@ -419,21 +419,21 @@ OpenTurnHolderHandScreen_Simple: call CreateHandCardList jr c, .no_cards_in_hand call InitAndDrawCardListScreenLayout - ld a, START + A_BUTTON + ld a, PAD_START + PAD_A ld [wNoItemSelectionMenuKeys], a jp DisplayCardList .no_cards_in_hand ldtx hl, NoCardsInHandText jp DrawWideTextBox_WaitForInput -; triggered by pressing B + START in the duel menu +; triggered by pressing B + PAD_START in the duel menu DuelMenuShortcut_OpponentActivePokemon: call SwapTurn call OpenActivePokemonScreen call SwapTurn jp DuelMainInterface -; triggered by pressing START in the duel menu +; triggered by pressing PAD_START in the duel menu DuelMenuShortcut_PlayerActivePokemon: call OpenActivePokemonScreen jp DuelMainInterface @@ -746,7 +746,7 @@ DuelMenu_Check: call OpenDuelCheckMenu jp DuelMainInterface -; triggered by pressing SELECT in the duel menu +; triggered by pressing PAD_SELECT in the duel menu DuelMenuShortcut_BothActivePokemon: call FinishQueuedAnimations call OpenVariousPlayAreaScreens_FromSelectPresses @@ -768,7 +768,7 @@ OpenVariousPlayAreaScreens_FromSelectPresses: ld [wPlayAreaSelectAction], a call OpenPlayAreaScreenForViewing ldh a, [hKeysPressed] - and B_BUTTON + and PAD_B ret z scf ret @@ -1011,7 +1011,7 @@ DuelMenu_Attack: .wait_for_input call DoFrame ldh a, [hKeysPressed] - and START + and PAD_START jr nz, .display_selected_attack_info call HandleMenuInput jr nc, .wait_for_input @@ -1099,11 +1099,11 @@ OpenAttackPage: call DoFrame ; switch page (see SwitchAttackPage) if Right or Left pressed ldh a, [hDPadHeld] - and D_RIGHT | D_LEFT + and PAD_RIGHT | PAD_LEFT jr nz, .open_page ; return to Attack menu if A or B pressed ldh a, [hKeysPressed] - and A_BUTTON | B_BUTTON + and PAD_A | PAD_B jr z, .loop ret @@ -2535,7 +2535,7 @@ DrawDuelHUD: ld b, HP_BAR_LENGTH / 2 ; first row of the HP bar call SafeCopyDataHLtoDE pop de - ld hl, BG_MAP_WIDTH + ld hl, TILEMAP_WIDTH add hl, de ld e, l ld d, h @@ -3094,7 +3094,7 @@ OpenDiscardPileScreen: jr c, .discard_pile_empty call InitAndDrawCardListScreenLayout call SetDiscardPileScreenTexts - ld a, START + A_BUTTON + ld a, PAD_START + PAD_A ld [wNoItemSelectionMenuKeys], a call DisplayCardList or a @@ -3154,7 +3154,7 @@ InitAndDrawCardListScreenLayout: ld [hli], a ld [hl], a ld [wCardListItemSelectionMenuType], a - ld a, START + ld a, PAD_START ld [wNoItemSelectionMenuKeys], a ld hl, wCardListInfoBoxText ldtx [hl], PleaseSelectHandText, & $ff @@ -3229,14 +3229,14 @@ DisplayCardList: ld [hl], d ldh a, [hKeysPressed] ld b, a - bit SELECT_F, b + bit B_PAD_SELECT, b jr nz, .select_pressed - bit B_BUTTON_F, b + bit B_PAD_B, b jr nz, .b_pressed ld a, [wNoItemSelectionMenuKeys] and b jr nz, .open_card_page - ; display the item selection menu (PLAY|CHECK or SELECT|CHECK) for the selected card + ; display the item selection menu (PLAY|CHECK or PAD_SELECT|CHECK) for the selected card ; open the card page if CHECK is selected ldh a, [hCurMenuItem] call GetCardInDuelTempList_OnlyDeckIndex @@ -3247,7 +3247,7 @@ DisplayCardList: or a ret .select_pressed - ; sort cards by ID if SELECT is pressed and return to the first item + ; sort cards by ID if PAD_SELECT is pressed and return to the first item ld a, [wSortCardListByID] or a jr nz, .wait_button @@ -3262,16 +3262,16 @@ DisplayCardList: jr .reload_list .open_card_page ; open the card page directly, without an item selection menu - ; in this mode, D_UP and D_DOWN can be used to open the card page + ; in this mode, PAD_UP and PAD_DOWN can be used to open the card page ; of the card above and below the current card ldh a, [hCurMenuItem] call GetCardInDuelTempList call LoadCardDataToBuffer1_FromDeckIndex call OpenCardPage_FromCheckHandOrDiscardPile ldh a, [hDPadHeld] - bit D_UP_F, a + bit B_PAD_UP, a jr nz, .up_pressed - bit D_DOWN_F, a + bit B_PAD_DOWN, a jr nz, .down_pressed ; if B pressed, exit card page and reload the card list call DrawCardListScreenLayout @@ -3306,7 +3306,7 @@ DisplayCardList: .UpdateListOnDPadInput: ldh a, [hDPadHeld] - and D_PAD + and PAD_CTRL_PAD ret z ld a, $01 ldh [hffb0], a @@ -3335,7 +3335,7 @@ PrintCardListHeaderAndInfoBoxTexts: call PrintTextNoDelay ret -; display the SELECT|CHECK or PLAY|CHECK menu when a card of a list is selected +; display the PAD_SELECT|CHECK or PLAY|CHECK menu when a card of a list is selected ; and handle input. return carry if b is pressed. ; input: wCardListItemSelectionMenuType CardListItemSelectionMenu: @@ -3398,13 +3398,13 @@ CardListParameters: ; also return $ff unto hCurMenuItem if B is pressed. CardListFunction: ldh a, [hKeysPressed] - bit B_BUTTON_F, a + bit B_PAD_B, a jr nz, .exit - and A_BUTTON | SELECT | START + and PAD_A | PAD_SELECT | PAD_START jr nz, .action_button ldh a, [hKeysReleased] - and D_PAD - jr nz, .reload_card_image ; jump if the D_PAD key was released this frame + and PAD_CTRL_PAD + jr nz, .reload_card_image ; jump if the PAD_CTRL_PAD key was released this frame ret .exit ld a, $ff @@ -3457,10 +3457,10 @@ PrintSortNumberInCardList: ; draw the card page of the card at wLoadedCard1 and listen for input ; in order to switch the page or to exit. ; triggered by checking a hand card or a discard pile card in the Check menu. -; D_UP and D_DOWN exit the card page allowing the caller to load the card page +; PAD_UP and PAD_DOWN exit the card page allowing the caller to load the card page ; of the card above or below in the list. OpenCardPage_FromCheckHandOrDiscardPile: - ld a, B_BUTTON | D_UP | D_DOWN + ld a, PAD_B | PAD_UP | PAD_DOWN ld [wCardPageExitKeys], a xor a ; CARDPAGETYPE_NOT_PLAY_AREA jr OpenCardPage @@ -3469,7 +3469,7 @@ OpenCardPage_FromCheckHandOrDiscardPile: ; in order to switch the page or to exit. ; triggered by checking an arena card or a bench card in the Check menu. OpenCardPage_FromCheckPlayArea: - ld a, B_BUTTON + ld a, PAD_B ld [wCardPageExitKeys], a ld a, CARDPAGETYPE_PLAY_AREA jr OpenCardPage @@ -3478,7 +3478,7 @@ OpenCardPage_FromCheckPlayArea: ; in order to switch the page or to exit. ; triggered by checking a card in the Hand menu. OpenCardPage_FromHand: - ld a, B_BUTTON + ld a, PAD_B ld [wCardPageExitKeys], a xor a ; CARDPAGETYPE_NOT_PLAY_AREA ; fallthrough @@ -3506,7 +3506,7 @@ OpenCardPage: ld [wCardPageNumber], a .load_next call DisplayFirstOrNextCardPage - jr c, .done ; done if trying to advance past the last page with START or A_BUTTON + jr c, .done ; done if trying to advance past the last page with PAD_START or PAD_A call EnableLCD .input_loop call DoFrame @@ -3515,29 +3515,29 @@ OpenCardPage: ld a, [wCardPageExitKeys] and b jr nz, .done - ; START and A_BUTTON advance to the next valid card page, but close it + ; PAD_START and PAD_A advance to the next valid card page, but close it ; after trying to advance from the last page ldh a, [hKeysPressed] - and START | A_BUTTON + and PAD_START | PAD_A jr nz, .load_next - ; D_RIGHT and D_LEFT advance to the next and previous valid card page respectively. - ; however, unlike START and A_BUTTON, D_RIGHT past the last page goes back to the start. + ; PAD_RIGHT and PAD_LEFT advance to the next and previous valid card page respectively. + ; however, unlike PAD_START and PAD_A, PAD_RIGHT past the last page goes back to the start. ldh a, [hKeysPressed] - and D_RIGHT | D_LEFT + and PAD_RIGHT | PAD_LEFT jr z, .input_loop call DisplayCardPageOnLeftOrRightPressed jr .input_loop .done ret -; display the previous valid card page of the card at wLoadedCard1 if bit D_LEFT_F +; display the previous valid card page of the card at wLoadedCard1 if bit B_PAD_LEFT ; of a is set, and the first or next valid card page otherwise. ; DisplayFirstOrNextCardPage and DisplayPreviousCardPage only call DisplayCardPage ; when GoToFirstOrNextCardPage and GoToPreviousCardPage respectively return nc ; so the "call c, DisplayCardPage" instructions makes sure the card page switched ; to is always displayed. DisplayCardPageOnLeftOrRightPressed: - bit D_LEFT_F, a + bit B_PAD_LEFT, a jr nz, .left ;.right call DisplayFirstOrNextCardPage @@ -3763,7 +3763,7 @@ GoToPreviousCardPage: ; check if the card page trying to switch to is valid for the card at wLoadedCard1 ; return with the equivalent to one of these three actions: ; stay in card page trying to switch to (nc, nz) - ; change to card page returned in a if D_LEFT/D_RIGHT pressed, or exit if A_BUTTON/START pressed (c) + ; change to card page returned in a if PAD_LEFT/PAD_RIGHT pressed, or exit if PAD_A/PAD_START pressed (c) ; non-existent page, so skip to next/previous (nc, z) SwitchCardPage: ld hl, CardPageSwitchPointerTable @@ -3942,7 +3942,7 @@ SetBGP7OrSGB2ToCardPalette: .sgb ld hl, wCardPalette ld de, wTempSGBPacket + 1 ; PAL Packet color #0 (PAL23's SGB2) - ld b, CGB_PAL_SIZE + ld b, PAL_SIZE .copy_pal_loop ld a, [hli] ld [de], a @@ -3981,13 +3981,13 @@ SetOBP1OrSGB3ToCardPalette: CopyCGBCardPalette: add a add a - add a ; a *= CGB_PAL_SIZE + add a ; a *= PAL_SIZE ld e, a ld d, $00 ld hl, wBackgroundPalettesCGB ; wObjectPalettesCGB - 8 palettes add hl, de ld de, wCardPalette - ld b, CGB_PAL_SIZE + ld b, PAL_SIZE .copy_pal_loop ld a, [de] inc de @@ -4149,7 +4149,7 @@ SetDefaultConsolePalettes: call .copy_de_to_hl ld de, CGBDefaultPalettes ld hl, wObjectPalettesCGB - ld c, CGB_PAL_SIZE + ld c, PAL_SIZE call .copy_de_to_hl call FlushAllPalettes ret @@ -4922,11 +4922,11 @@ _HasAlivePokemonInPlayArea: ret OpenPlayAreaScreenForViewing: - ld a, START + A_BUTTON + ld a, PAD_START + PAD_A jr DisplayPlayAreaScreen OpenPlayAreaScreenForSelection: - ld a, START + ld a, PAD_START ; fallthrough DisplayPlayAreaScreen: @@ -5038,9 +5038,9 @@ PlayAreaScreenMenuParameters_ActivePokemonExcluded: PlayAreaScreenMenuFunction: ldh a, [hKeysPressed] - and A_BUTTON | B_BUTTON | START + and PAD_A | PAD_B | PAD_START ret z - bit B_BUTTON_F, a + bit B_PAD_B, a jr z, .start_or_a ld a, $ff ldh [hCurMenuItem], a @@ -5053,7 +5053,7 @@ SelectingBenchPokemonMenu: or a ret z ; menu not allowed ldh a, [hKeysPressed] - and SELECT + and PAD_SELECT ret z ; Select not pressed ld a, [wPlayAreaSelectAction] cp $02 @@ -5068,7 +5068,7 @@ SelectingBenchPokemonMenu: .loop_input call DoFrame ldh a, [hKeysPressed] - and A_BUTTON + and PAD_A jr nz, .a_pressed call .HandleInput call RefreshMenuCursor @@ -5076,7 +5076,7 @@ SelectingBenchPokemonMenu: call HandleSpecialDuelMainSceneHotkeys jr nc, .loop_input ldh a, [hKeysPressed] - and SELECT + and PAD_SELECT jr z, .duel_main_scene .back call HasAlivePokemonInBench @@ -5101,15 +5101,15 @@ SelectingBenchPokemonMenu: .HandleInput: ldh a, [hDPadHeld] - bit B_BUTTON_F, a + bit B_PAD_B, a ret nz - and D_RIGHT | D_LEFT + and PAD_RIGHT | PAD_LEFT ret z ; right or left pressed ld b, a ld a, [wCurrentDuelMenuItem] - bit D_LEFT_F, b + bit B_PAD_LEFT, b jr z, .right_pressed dec a bit 7, a @@ -5635,7 +5635,7 @@ DisplayPlayAreaScreenToUsePkmnPower: jr z, .asm_649b ld [wSelectedDuelSubMenuItem], a ldh a, [hKeysPressed] - and START + and PAD_START jr nz, .asm_649d ldh a, [hCurMenuItem] add a @@ -6215,7 +6215,7 @@ CheckSkipDelayAllowed: or a ret z ldh a, [hKeysHeld] - and B_BUTTON + and PAD_B ret z scf ret @@ -6280,7 +6280,7 @@ HandleWaitingLinkOpponentMenu: call .HandleInput call RefreshMenuCursor ldh a, [hKeysPressed] - bit A_BUTTON_F, a + bit B_PAD_A, a jr nz, .a_pressed ld a, $01 call HandleSpecialDuelMainSceneHotkeys @@ -6301,9 +6301,9 @@ HandleWaitingLinkOpponentMenu: .HandleInput: ldh a, [hDPadHeld] - bit B_BUTTON_F, a + bit B_PAD_B, a ret nz - and D_LEFT | D_RIGHT + and PAD_LEFT | PAD_RIGHT ret z call EraseCursor ld hl, wCurrentDuelMenuItem @@ -6337,21 +6337,21 @@ HandleWaitingLinkOpponentMenu: HandleSpecialDuelMainSceneHotkeys: ld [wDuelMainSceneSelectHotkeyAction], a ldh a, [hKeysPressed] - bit START_F, a + bit B_PAD_START, a jr nz, .start_pressed - bit SELECT_F, a + bit B_PAD_SELECT, a jr nz, .select_pressed ldh a, [hKeysHeld] - and B_BUTTON + and PAD_B ret z ; exit if no B btn ldh a, [hKeysPressed] - bit D_DOWN_F, a + bit B_PAD_DOWN, a jr nz, .down_pressed - bit D_LEFT_F, a + bit B_PAD_LEFT, a jr nz, .left_pressed - bit D_UP_F, a + bit B_PAD_UP, a jr nz, .up_pressed - bit D_RIGHT_F, a + bit B_PAD_RIGHT, a jr nz, .right_pressed or a ret @@ -8143,15 +8143,15 @@ Func_7364: ld b, a ; handle selection/cancellation buttons - and A_BUTTON | START + and PAD_A | PAD_START jr nz, .select_opp - bit B_BUTTON_F, b + bit B_PAD_B, b jr nz, .cancel ; handle D-pad inputs ; check right ld a, [wOpponentDeckID] - bit D_RIGHT_F, b + bit B_PAD_RIGHT, b jr z, .check_left inc a ; next deck ID cp NUM_DECK_IDS @@ -8159,7 +8159,7 @@ Func_7364: xor a ; wrap around to first deck ID .check_left - bit D_LEFT_F, b + bit B_PAD_LEFT, b jr z, .check_up or a jr nz, .not_first_deck_id @@ -8169,7 +8169,7 @@ Func_7364: dec a ; previous deck ID .check_up - bit D_UP_F, b + bit B_PAD_UP, b jr z, .check_down add 10 cp NUM_DECK_IDS @@ -8177,7 +8177,7 @@ Func_7364: xor a ; wrap around to first deck ID .check_down - bit D_DOWN_F, b + bit B_PAD_DOWN, b jr z, .got_deck_id sub 10 jr nc, .got_deck_id @@ -8386,19 +8386,19 @@ Func_74dc: ld b, a ld a, [wPrizeCardSelectionFrameCounter] ; left - bit D_LEFT_F, b + bit B_PAD_LEFT, b jr z, .right dec a ; previous card .right - bit D_RIGHT_F, b + bit B_PAD_RIGHT, b jr z, .up inc a ; next card .up - bit D_UP_F, b + bit B_PAD_UP, b jr z, .down add 10 .down - bit D_DOWN_F, b + bit B_PAD_DOWN, b jr z, .got_card_id sub 10 @@ -8407,7 +8407,7 @@ Func_74dc: lb bc, 5, 5 bank1call WriteTwoByteNumberInTxSymbolFormat ldh a, [hKeysPressed] - and START + and PAD_START jr z, .wait_input ld a, [wPrizeCardSelectionFrameCounter] ld e, a @@ -8434,9 +8434,9 @@ DecideLinkDuelVariables: .input_loop call DoFrame ldh a, [hKeysPressed] - bit B_BUTTON_F, a + bit B_PAD_B, a jr nz, .link_cancel - and START + and PAD_START call Func_0cc5 jr nc, .input_loop ld hl, wPlayerDuelVariables diff --git a/src/engine/duel/effect_functions.asm b/src/engine/duel/effect_functions.asm index 3811849..a267de5 100644 --- a/src/engine/duel/effect_functions.asm +++ b/src/engine/duel/effect_functions.asm @@ -812,9 +812,9 @@ HandleDefendingPokemonAttackSelection: .loop_input call DoFrame ldh a, [hKeysPressed] - bit B_BUTTON_F, a + bit B_PAD_B, a jr nz, .set_carry - and START + and PAD_START jr nz, .open_atk_page call HandleMenuInput jr nc, .loop_input @@ -4708,7 +4708,7 @@ Prophecy_PlayerSelectEffect: ldtx hl, PleaseSelectTheDeckText call TwoItemHorizontalMenu ldh a, [hKeysHeld] - and B_BUTTON + and PAD_B jr nz, Prophecy_PlayerSelectEffect ; loop back to start ldh a, [hCurMenuItem] @@ -5163,7 +5163,7 @@ DevolutionBeam_PlayerSelectEffect: ldtx hl, PleaseSelectThePlayAreaText call TwoItemHorizontalMenu ldh a, [hKeysHeld] - and B_BUTTON + and PAD_B jr nz, .set_carry ; a Play Area was selected @@ -6855,7 +6855,7 @@ Gigashock_PlayerSelectEffect: inc a call DrawPlayAreaScreenToShowChanges ldh a, [hKeysPressed] - and B_BUTTON + and PAD_B jr nz, .try_cancel call SwapTurn call GetNextPositionInTempList @@ -10382,7 +10382,7 @@ LassEffect: ldtx hl, ChooseTheCardYouWishToExamineText ldtx de, DuelistHandText bank1call SetCardListHeaderText - ld a, A_BUTTON | START + ld a, PAD_A | PAD_START ld [wNoItemSelectionMenuKeys], a bank1call DisplayCardList ret diff --git a/src/engine/game_loop.asm b/src/engine/game_loop.asm index 93316e4..0cb7ef3 100644 --- a/src/engine/game_loop.asm +++ b/src/engine/game_loop.asm @@ -17,7 +17,7 @@ GameLoop:: ei farcall StubbedUnusedSaveDataValidation ldh a, [hKeysHeld] - cp A_BUTTON | B_BUTTON + cp PAD_A | PAD_B jr z, .ask_erase_backup_ram farcall _GameLoop jr GameLoop diff --git a/src/engine/gfx/color.asm b/src/engine/gfx/color.asm index 309f7e7..703e486 100644 --- a/src/engine/gfx/color.asm +++ b/src/engine/gfx/color.asm @@ -22,7 +22,7 @@ LoadConsolePaletteData: FadeScreenToWhite: ld a, [wLCDC] - bit LCDC_ENABLE_F, a + bit B_LCDC_ENABLE, a jr z, .lcd_off ld a, [wConsolePaletteData] ld [wTempBGP], a @@ -94,7 +94,7 @@ RestoreFirstColorInOBPals: inc de ld a, [hl] ld [de], a - ld bc, CGB_PAL_SIZE - 1 + ld bc, PAL_SIZE - 1 add hl, bc ld a, c add e diff --git a/src/engine/input_name.asm b/src/engine/input_name.asm index 91cf4fc..eec725b 100644 --- a/src/engine/input_name.asm +++ b/src/engine/input_name.asm @@ -104,7 +104,7 @@ InputPlayerName: call DoFrame call UpdateRNGSources ldh a, [hDPadHeld] - and START + and PAD_START jr z, .else ; the Start button was pressed. ld a, $01 @@ -301,17 +301,17 @@ PlayerNamingScreen_CheckButtonState: ld h, a ld a, [wNamingScreenCursorY] ld l, a - bit D_UP_F, b + bit B_PAD_UP, b jr z, .asm_692c ; up dec a - bit D_DOWN_F, a + bit B_PAD_DOWN, a jr z, .asm_69a7 ld a, c dec a jr .asm_69a7 .asm_692c - bit D_DOWN_F, b + bit B_PAD_DOWN, b jr z, .asm_6937 ; down inc a @@ -323,7 +323,7 @@ PlayerNamingScreen_CheckButtonState: ld a, [wNamingScreenNumColumns] ld c, a ld a, h - bit D_LEFT_F, b + bit B_PAD_LEFT, b jr z, .asm_6974 ; left ld d, a @@ -360,13 +360,13 @@ PlayerNamingScreen_CheckButtonState: jr .asm_69aa .asm_696b dec a - bit D_DOWN_F, a + bit B_PAD_DOWN, a jr z, .asm_69aa ld a, c dec a jr .asm_69aa .asm_6974 - bit D_RIGHT_F, b + bit B_PAD_RIGHT, b jr z, .no_press ld d, a ld a, $06 @@ -441,9 +441,9 @@ PlayerNamingScreen_CheckButtonState: ld [wMenuInputSFX], a .no_press ldh a, [hKeysPressed] - and A_BUTTON | B_BUTTON + and PAD_A | PAD_B jr z, .asm_69ef - and A_BUTTON + and PAD_A jr nz, .asm_69e5 ; the B button was pressed. ld a, -1 @@ -1027,7 +1027,7 @@ InputDeckName: call UpdateRNGSources ldh a, [hDPadHeld] - and START + and PAD_START jr z, .else ; the Start button was pressed. @@ -1243,17 +1243,17 @@ DeckNamingScreen_CheckButtonState: ld h, a ld a, [wNamingScreenCursorY] ld l, a - bit D_UP_F, b + bit B_PAD_UP, b jr z, .asm_6f1f ; up dec a - bit D_DOWN_F, a + bit B_PAD_DOWN, a jr z, .asm_6f4b ld a, c dec a jr .asm_6f4b .asm_6f1f - bit D_DOWN_F, b + bit B_PAD_DOWN, b jr z, .asm_6f2a ; down inc a @@ -1267,16 +1267,16 @@ DeckNamingScreen_CheckButtonState: ld a, [wNamingScreenNumColumns] ld c, a ld a, h - bit D_LEFT_F, b + bit B_PAD_LEFT, b jr z, .asm_6f40 dec a - bit D_DOWN_F, a + bit B_PAD_DOWN, a jr z, .asm_6f4e ld a, c dec a jr .asm_6f4e .asm_6f40 - bit D_RIGHT_F, b + bit B_PAD_RIGHT, b jr z, .asm_6f73 inc a cp c @@ -1311,9 +1311,9 @@ DeckNamingScreen_CheckButtonState: ld [wMenuInputSFX], a .asm_6f73 ldh a, [hKeysPressed] - and A_BUTTON | B_BUTTON + and PAD_A | PAD_B jr z, .asm_6f89 - and A_BUTTON + and PAD_A jr nz, .asm_6f7f ; B button was pressed ld a, -1 diff --git a/src/engine/intro.asm b/src/engine/intro.asm index 087dba7..a699028 100644 --- a/src/engine/intro.asm +++ b/src/engine/intro.asm @@ -22,7 +22,7 @@ PlayIntroSequence: call DoFrameIfLCDEnabled call UpdateRNGSources ldh a, [hKeysPressed] - and A_BUTTON | START + and PAD_A | PAD_START jr nz, .jump_to_title_screen ld a, [wIntroSequencePalsNeedUpdate] or a diff --git a/src/engine/link/ir_core.asm b/src/engine/link/ir_core.asm index 39624dd..8ee6f67 100644 --- a/src/engine/link/ir_core.asm +++ b/src/engine/link/ir_core.asm @@ -5,13 +5,13 @@ ; - return TransmitIRBit: jr c, .delay_once - ld [hl], RPF_WRITE_HI | RPF_ENREAD + ld [hl], RP_WRITE_HIGH | RP_ENABLE ld a, 5 jr .loop_delay_1 ; jump to possibly to add more cycles? .loop_delay_1 dec a jr nz, .loop_delay_1 - ld [hl], RPF_WRITE_LO | RPF_ENREAD + ld [hl], RP_WRITE_LOW | RP_ENABLE ld a, 14 jr .loop_delay_2 ; jump to possibly to add more cycles? .loop_delay_2 @@ -78,7 +78,7 @@ ReceiveByteThroughIR: ld b, 0 ld hl, rRP .wait_ir - bit RPB_DATAIN, [hl] + bit B_RP_DATA_IN, [hl] jr z, .ok dec b jr nz, .wait_ir @@ -112,11 +112,11 @@ ReceiveByteThroughIR: ; if in any of the checks it is unset, ; then a is set to 0 ; this is done a total of 9 times - bit RPB_DATAIN, [hl] + bit B_RP_DATA_IN, [hl] jr nz, .asm_196ec xor a .asm_196ec - bit RPB_DATAIN, [hl] + bit B_RP_DATA_IN, [hl] jr nz, .asm_196f1 xor a .asm_196f1 @@ -244,23 +244,23 @@ StartIRCommunications: call SwitchToCGBNormalSpeed ld a, P14 ldh [rJOYP], a - ld a, RPF_ENREAD + ld a, RP_ENABLE ldh [rRP], a ret ; reenables interrupts, and switches CGB back to double speed CloseIRCommunications: - ld a, P14 | P15 + ld a, JOYP_GET_NONE ldh [rJOYP], a .wait_vblank_on ldh a, [rSTAT] - and STAT_LCDC_STATUS - cp STAT_ON_VBLANK + and STAT_MODE + cp STAT_VBLANK jr z, .wait_vblank_on .wait_vblank_off ldh a, [rSTAT] - and STAT_LCDC_STATUS - cp STAT_ON_VBLANK + and STAT_MODE + cp STAT_VBLANK jr nz, .wait_vblank_off call SwitchToCGBDoubleSpeed ei diff --git a/src/engine/link/ir_functions.asm b/src/engine/link/ir_functions.asm index 140dccb..16e29f9 100644 --- a/src/engine/link/ir_functions.asm +++ b/src/engine/link/ir_functions.asm @@ -81,10 +81,10 @@ PrepareSendCardOrDeckConfigurationThroughIR: .loop_frame call DoFrame ldh a, [hKeysPressed] - bit B_BUTTON_F, a + bit B_PAD_B, a jr nz, .b_btn ldh a, [hKeysHeld] - bit A_BUTTON_F, a + bit B_PAD_A, a jr z, .loop_frame ; a btn call TrySendIRRequest diff --git a/src/engine/link/link_duel.asm b/src/engine/link/link_duel.asm index bf7d71d..6ed03bb 100644 --- a/src/engine/link/link_duel.asm +++ b/src/engine/link/link_duel.asm @@ -153,7 +153,7 @@ _SetUpAndStartLinkDuel: ldh a, [hDPadHeld] ld b, a ld a, [wNPCDuelPrizes] - bit D_LEFT_F, b + bit B_PAD_LEFT, b jr z, .check_d_right dec a cp PRIZES_2 @@ -162,7 +162,7 @@ _SetUpAndStartLinkDuel: jr .got_prize_count .check_d_right - bit D_RIGHT_F, b + bit B_PAD_RIGHT, b jr z, .check_a_btn inc a cp PRIZES_6 + 1 @@ -174,6 +174,6 @@ _SetUpAndStartLinkDuel: ld [wPrizeCardSelectionFrameCounter], a .check_a_btn - bit A_BUTTON_F, b + bit B_PAD_A, b jr z, .loop_input ret diff --git a/src/engine/link/printer.asm b/src/engine/link/printer.asm index 42a4286..31907ab 100644 --- a/src/engine/link/printer.asm +++ b/src/engine/link/printer.asm @@ -345,7 +345,7 @@ TryInitPrinterCommunications: .wait_input call DoFrame ldh a, [hKeysHeld] - and B_BUTTON + and PAD_B jr nz, .b_button ld bc, 0 lb de, PRINTERPKT_NUL, FALSE @@ -680,7 +680,7 @@ _PrintCardList: ; even if it's not marked as seen in the collection ld e, FALSE ldh a, [hKeysHeld] - and SELECT + and PAD_SELECT jr z, .no_select inc e ; TRUE .no_select diff --git a/src/engine/menus/booster_pack.asm b/src/engine/menus/booster_pack.asm index 9ba782b..9519a50 100644 --- a/src/engine/menus/booster_pack.asm +++ b/src/engine/menus/booster_pack.asm @@ -36,7 +36,7 @@ _OpenBoosterPack: ldtx hl, ChooseTheCardYouWishToExamineText ldtx de, BoosterPackText bank1call SetCardListHeaderText - ld a, A_BUTTON | START + ld a, PAD_A | PAD_START ld [wNoItemSelectionMenuKeys], a bank1call DisplayCardList ret diff --git a/src/engine/menus/card_album.asm b/src/engine/menus/card_album.asm index 44b57ff..0ce1432 100644 --- a/src/engine/menus/card_album.asm +++ b/src/engine/menus/card_album.asm @@ -503,14 +503,14 @@ HandleCardAlbumCardPage: .handle_input ldh a, [hDPadHeld] ld b, a - and BUTTONS + and PAD_BUTTONS jp nz, .exit xor a ; FALSE ld [wMenuInputSFX], a ld a, [wCardListNumCursorPositions] ld c, a ld a, [wCardListCursorPos] - bit D_UP_F, b + bit B_PAD_UP, b jr z, .check_d_down push af @@ -536,7 +536,7 @@ HandleCardAlbumCardPage: jr .got_new_pos .check_d_down - bit D_DOWN_F, b + bit B_PAD_DOWN, b jr z, .asm_a8d6 push af @@ -585,12 +585,12 @@ HandleCardAlbumCardPage: ld a, [wced2] or a jr z, .open_card_page - bit D_LEFT_F, b + bit B_PAD_LEFT, b jr z, .check_d_right call RemoveCardFromDeck jr .open_card_page .check_d_right - bit D_RIGHT_F, b + bit B_PAD_RIGHT, b jr z, .open_card_page call TryAddCardToDeck @@ -664,7 +664,7 @@ CardAlbum: .loop_input_2 call DoFrame ldh a, [hKeysPressed] - and B_BUTTON + and PAD_B jr z, .loop_input_2 ld a, $ff call PlaySFXConfirmOrCancel @@ -698,7 +698,7 @@ CardAlbum: call HandleLeftRightInCardList jr c, .loop_input_3 ldh a, [hDPadHeld] - and START + and PAD_START jr z, .loop_input_3 .open_card_page ld a, $01 diff --git a/src/engine/menus/config.asm b/src/engine/menus/config.asm index b20950c..56325e7 100644 --- a/src/engine/menus/config.asm +++ b/src/engine/menus/config.asm @@ -32,13 +32,13 @@ _PauseMenu_Config: inc [hl] call ConfigScreenHandleDPadInput ldh a, [hKeysPressed] - and B_BUTTON | START + and PAD_B | PAD_START jr nz, .asm_105ab ld a, [wConfigCursorYPos] cp $02 jr nz, .asm_10588 ldh a, [hKeysPressed] - and A_BUTTON + and PAD_A jr z, .asm_10588 .asm_105ab ld a, SFX_CONFIRM @@ -230,7 +230,7 @@ ExitSettingsCursorPosition: ConfigScreenHandleDPadInput: ldh a, [hDPadHeld] - and D_PAD + and PAD_CTRL_PAD ret z farcall GetDirectionFromDPad ld hl, ConfigScreenDPadHandlers diff --git a/src/engine/menus/debug.asm b/src/engine/menus/debug.asm index c33e92b..ce16cad 100644 --- a/src/engine/menus/debug.asm +++ b/src/engine/menus/debug.asm @@ -115,7 +115,7 @@ DebugStandardBGCharacter: lb bc, 16, 16 lb hl, 1, 16 call FillRectangle - ld a, BUTTONS | D_PAD + ld a, PAD_BUTTONS | PAD_CTRL_PAD call WaitUntilKeysArePressed scf ret diff --git a/src/engine/menus/deck_check.asm b/src/engine/menus/deck_check.asm index 880025f..56f05f1 100644 --- a/src/engine/menus/deck_check.asm +++ b/src/engine/menus/deck_check.asm @@ -17,9 +17,9 @@ HandleCheckMenuInput: ldh a, [hDPadHeld] or a jr z, .no_pad - bit D_LEFT_F, a + bit B_PAD_LEFT, a jr nz, .horizontal - bit D_RIGHT_F, a + bit B_PAD_RIGHT, a jr z, .check_vertical ; handle horizontal input @@ -29,9 +29,9 @@ HandleCheckMenuInput: ld d, a jr .okay .check_vertical - bit D_UP_F, a + bit B_PAD_UP, a jr nz, .vertical - bit D_DOWN_F, a + bit B_PAD_DOWN, a jr z, .no_pad ; handle vertical input @@ -58,9 +58,9 @@ HandleCheckMenuInput: ld [wCheckMenuCursorBlinkCounter], a .no_pad ldh a, [hKeysPressed] - and A_BUTTON | B_BUTTON + and PAD_A | PAD_B jr z, .no_input - and A_BUTTON + and PAD_A jr nz, .a_press ld a, $ff ; cancel call PlaySFXConfirmOrCancel diff --git a/src/engine/menus/deck_configuration.asm b/src/engine/menus/deck_configuration.asm index bdbaad7..42de88f 100644 --- a/src/engine/menus/deck_configuration.asm +++ b/src/engine/menus/deck_configuration.asm @@ -402,7 +402,7 @@ HandleDeckBuildScreen: .wait_input call DoFrame ldh a, [hDPadHeld] - and START + and PAD_START jr z, .no_start_btn_1 ld a, $01 call PlaySFXConfirmOrCancel @@ -427,7 +427,7 @@ HandleDeckBuildScreen: .check_down_btn ldh a, [hDPadHeld] - and D_DOWN + and PAD_DOWN jr z, .no_down_btn call ConfirmSelectionAndReturnCarry jr .jump_to_list @@ -470,7 +470,7 @@ HandleDeckBuildScreen: .loop_input call DoFrame ldh a, [hDPadHeld] - and START + and PAD_START jr z, .no_start_btn_2 ld a, $01 call PlaySFXConfirmOrCancel @@ -1689,7 +1689,7 @@ HandleCardSelectionInput: ld a, [wCardListNumCursorPositions] ld c, a ld a, [wCardListCursorPos] - bit D_LEFT_F, b + bit B_PAD_LEFT, b jr z, .check_d_right dec a bit 7, a @@ -1699,7 +1699,7 @@ HandleCardSelectionInput: dec a jr .got_cursor_pos .check_d_right - bit D_RIGHT_F, b + bit B_PAD_RIGHT, b jr z, .handle_ab_btns inc a cp c @@ -1720,9 +1720,9 @@ HandleCardSelectionInput: ld a, [wCardListCursorPos] ld [hffb3], a ldh a, [hKeysPressed] - and A_BUTTON | B_BUTTON + and PAD_A | PAD_B jr z, HandleCardSelectionCursorBlink - and A_BUTTON + and PAD_A jr nz, ConfirmSelectionAndReturnCarry ; b button ld a, $ff @@ -1806,7 +1806,7 @@ HandleDeckCardSelectionList: ld a, [wCardListNumCursorPositions] ld c, a ld a, [wCardListCursorPos] - bit D_UP_F, b + bit B_PAD_UP, b jr z, .check_d_down push af ld a, SFX_CURSOR @@ -1830,7 +1830,7 @@ HandleDeckCardSelectionList: jr .asm_9b8f .check_d_down - bit D_DOWN_F, b + bit B_PAD_DOWN, b jr z, .asm_9b9d push af ld a, SFX_CURSOR @@ -1873,13 +1873,13 @@ HandleDeckCardSelectionList: or a jr z, .asm_9bb9 - bit D_LEFT_F, b + bit B_PAD_LEFT, b jr z, .check_d_right call GetSelectedVisibleCardID call RemoveCardFromDeckAndUpdateCount jr .asm_9bb9 .check_d_right - bit D_RIGHT_F, b + bit B_PAD_RIGHT, b jr z, .asm_9bb9 call GetSelectedVisibleCardID call AddCardToDeckAndUpdateCount @@ -1913,9 +1913,9 @@ HandleDeckCardSelectionList: .handle_ab_btns ldh a, [hKeysPressed] - and A_BUTTON | B_BUTTON + and PAD_A | PAD_B jr z, .check_sfx - and A_BUTTON + and PAD_A jr nz, .select_card ld a, $ff ld [hffb3], a @@ -2003,7 +2003,7 @@ OpenCardPageFromCardList: .handle_input ldh a, [hDPadHeld] ld b, a - and A_BUTTON | B_BUTTON | SELECT | START + and PAD_A | PAD_B | PAD_SELECT | PAD_START jp nz, .exit ; check d-pad @@ -2015,7 +2015,7 @@ OpenCardPageFromCardList: ld a, [wCardListNumCursorPositions] ld c, a ld a, [wCardListCursorPos] - bit D_UP_F, b + bit B_PAD_UP, b jr z, .check_d_down push af ld a, SFX_CURSOR @@ -2033,7 +2033,7 @@ OpenCardPageFromCardList: jr .reopen_card_page .check_d_down - bit D_DOWN_F, b + bit B_PAD_DOWN, b jr z, .handle_regular_card_page_input push af ld a, SFX_CURSOR @@ -2402,7 +2402,7 @@ HandleDeckConfirmationMenu: call HandleLeftRightInCardList jr c, .loop_input ldh a, [hDPadHeld] - and START + and PAD_START jr z, .loop_input .selected_card @@ -2447,9 +2447,9 @@ HandleLeftRightInCardList: ld a, [wCardListVisibleOffset] ld c, a ldh a, [hDPadHeld] - cp D_RIGHT + cp PAD_RIGHT jr z, .right - cp D_LEFT + cp PAD_LEFT jr z, .left or a ret @@ -2496,9 +2496,9 @@ HandleSelectUpAndDownInList: ld a, [wCardListVisibleOffset] ld c, a ldh a, [hDPadHeld] - cp SELECT | D_DOWN + cp PAD_SELECT | PAD_DOWN jr z, .sel_down - cp SELECT | D_UP + cp PAD_SELECT | PAD_UP jr z, .sel_up or a ret @@ -2542,7 +2542,7 @@ ShowDeckInfoHeaderAndWaitForBButton: .wait_input call DoFrame ldh a, [hKeysPressed] - and B_BUTTON + and PAD_B jr z, .wait_input ld a, $ff call PlaySFXConfirmOrCancel @@ -3124,7 +3124,7 @@ HandlePlayersCardsScreen: ld [wCardListNumCursorPositions], a .check_d_down ldh a, [hDPadHeld] - and D_DOWN + and PAD_DOWN jr z, .no_d_down call ConfirmSelectionAndReturnCarry jr .jump_to_list @@ -3168,7 +3168,7 @@ HandlePlayersCardsScreen: call HandleDeckCardSelectionList jr c, .asm_a36a ldh a, [hDPadHeld] - and START + and PAD_START jr z, .loop_input ; start btn pressed diff --git a/src/engine/menus/deck_machine.asm b/src/engine/menus/deck_machine.asm index b22e8d3..3a0f100 100644 --- a/src/engine/menus/deck_machine.asm +++ b/src/engine/menus/deck_machine.asm @@ -62,7 +62,7 @@ HandleDeckMissingCardsList: call HandleLeftRightInCardList jr c, .loop_input ldh a, [hDPadHeld] - and START + and PAD_START jr z, .loop_input .open_card_pge @@ -263,7 +263,7 @@ GiftCenter_ReceiveCard: call HandleLeftRightInCardList jr c, .asm_afe2 ldh a, [hDPadHeld] - and START + and PAD_START jr z, .asm_afe2 .asm_aff5 ld a, $01 @@ -658,7 +658,7 @@ HandleDeckMachineSelection: call .HandleListJumps jr c, .start ldh a, [hDPadHeld] - and START + and PAD_START jr z, .start ; start btn @@ -725,9 +725,9 @@ HandleDeckMachineSelection: ld a, [wCardListVisibleOffset] ld c, a ldh a, [hDPadHeld] - cp D_RIGHT + cp PAD_RIGHT jr z, .d_right - cp D_LEFT + cp PAD_LEFT jr z, .d_left or a ret @@ -1909,13 +1909,13 @@ HandleAutoDeckMenu: ; the following lines do nothing ldh a, [hDPadHeld] - and D_UP | D_DOWN + and PAD_UP | PAD_DOWN jr z, .asm_ba4e .asm_ba4e ; check whether to show deck confirmation list ldh a, [hDPadHeld] - and START + and PAD_START jr z, .wait_input ld a, [wCardListVisibleOffset] diff --git a/src/engine/menus/deck_selection.asm b/src/engine/menus/deck_selection.asm index 720bd09..3ed9103 100644 --- a/src/engine/menus/deck_selection.asm +++ b/src/engine/menus/deck_selection.asm @@ -149,13 +149,13 @@ DeckSelectionMenu: db SYM_SPACE ; tile behind cursor dw NULL ; function pointer if non-0 -; handles START button press when in deck selection menu -; does nothing if START button isn't pressed +; handles PAD_START button press when in deck selection menu +; does nothing if PAD_START button isn't pressed ; if a press was handled, returns carry ; prints "There is no deck here!" if the selected deck is empty HandleStartButtonInDeckSelectionMenu: ldh a, [hDPadHeld] - and START + and PAD_START ret z ; skip ; set menu item as current deck diff --git a/src/engine/menus/duel.asm b/src/engine/menus/duel.asm index 0d8dc21..6d623ff 100644 --- a/src/engine/menus/duel.asm +++ b/src/engine/menus/duel.asm @@ -1232,9 +1232,9 @@ HandleCheckMenuInput_YourOrOppPlayArea: and %10000000 ldh a, [hDPadHeld] jr nz, .check_vertical - bit D_LEFT_F, a ; test left button + bit B_PAD_LEFT, a ; test left button jr nz, .horizontal - bit D_RIGHT_F, a ; test right button + bit B_PAD_RIGHT, a ; test right button jr z, .check_vertical ; handle horizontal input @@ -1264,9 +1264,9 @@ HandleCheckMenuInput_YourOrOppPlayArea: jr .erase .check_vertical - bit D_UP_F, a + bit B_PAD_UP, a jr nz, .vertical - bit D_DOWN_F, a + bit B_PAD_DOWN, a jr z, .skip ; handle vertical input @@ -1299,9 +1299,9 @@ HandleCheckMenuInput_YourOrOppPlayArea: .skip ldh a, [hKeysPressed] - and A_BUTTON | B_BUTTON + and PAD_A | PAD_B jr z, .sfx - and A_BUTTON + and PAD_A jr nz, .a_pressed ; B pressed @@ -1722,7 +1722,7 @@ YourOrOppPlayAreaScreen_HandleInput: inc hl inc hl - bit D_UP_F, a + bit B_PAD_UP, a jr z, .else_if_down ; up @@ -1731,7 +1731,7 @@ YourOrOppPlayAreaScreen_HandleInput: .else_if_down inc hl - bit D_DOWN_F, a + bit B_PAD_DOWN, a jr z, .else_if_right ; down @@ -1740,7 +1740,7 @@ YourOrOppPlayAreaScreen_HandleInput: .else_if_right inc hl - bit D_RIGHT_F, a + bit B_PAD_RIGHT, a jr z, .else_if_left ; right @@ -1749,7 +1749,7 @@ YourOrOppPlayAreaScreen_HandleInput: .else_if_left inc hl - bit D_LEFT_F, a + bit B_PAD_LEFT, a jr z, .check_button ; left @@ -1785,9 +1785,9 @@ YourOrOppPlayAreaScreen_HandleInput: ; check if one of the dpad, left or right, is pressed. ; if not, just go back to the start. ldh a, [hDPadHeld] - bit D_RIGHT_F, a + bit B_PAD_RIGHT, a jr nz, .left_or_right - bit D_LEFT_F, a + bit B_PAD_LEFT, a jr z, YourOrOppPlayAreaScreen_HandleInput .left_or_right @@ -1833,10 +1833,10 @@ YourOrOppPlayAreaScreen_HandleInput: ld [wCheckMenuCursorBlinkCounter], a .check_button ldh a, [hKeysPressed] - and A_BUTTON | B_BUTTON + and PAD_A | PAD_B jr z, .return - and A_BUTTON + and PAD_A jr nz, .a_button ld a, -1 ; cancel diff --git a/src/engine/menus/glossary.asm b/src/engine/menus/glossary.asm index c3d17db..fda598f 100644 --- a/src/engine/menus/glossary.asm +++ b/src/engine/menus/glossary.asm @@ -19,7 +19,7 @@ OpenGlossaryScreen: ld [wVBlankOAMCopyToggle], a call DoFrame ldh a, [hKeysPressed] - and SELECT + and PAD_SELECT jr nz, .on_select farcall YourOrOppPlayAreaScreen_HandleInput @@ -182,7 +182,7 @@ OpenGlossaryScreen: .loop call DoFrame ldh a, [hKeysPressed] - and B_BUTTON + and PAD_B jr z, .loop ld a, -1 diff --git a/src/engine/menus/init_menu.asm b/src/engine/menus/init_menu.asm index 3757050..7610132 100644 --- a/src/engine/menus/init_menu.asm +++ b/src/engine/menus/init_menu.asm @@ -11,7 +11,7 @@ InitMenuScreen: ldh [hSCX], a ldh [hSCY], a ld a, [wLCDC] - bit LCDC_ENABLE_F, a + bit B_LCDC_ENABLE, a jr nz, .skip_clear_scroll xor a ldh [rSCX], a diff --git a/src/engine/menus/mail.asm b/src/engine/menus/mail.asm index d1a6720..6968232 100644 --- a/src/engine/menus/mail.asm +++ b/src/engine/menus/mail.asm @@ -47,7 +47,7 @@ _PCMenu_ReadMail: call PCMailHandleDPadInput call PCMailHandleAInput ldh a, [hKeysPressed] - and B_BUTTON + and PAD_B jr z, .asm_1079c ld a, SFX_CANCEL call PlaySFX @@ -74,7 +74,7 @@ MailScreenLabels: PCMailHandleDPadInput: ldh a, [hDPadHeld] - and D_PAD + and PAD_CTRL_PAD ret z farcall GetDirectionFromDPad ld [wPCLastDirectionPressed], a @@ -135,7 +135,7 @@ PCMailTransitionTable: PCMailHandleAInput: ldh a, [hKeysPressed] - and A_BUTTON + and PAD_A ret z ld a, SFX_CONFIRM call PlaySFX diff --git a/src/engine/menus/play_area.asm b/src/engine/menus/play_area.asm index 493caf6..47e2701 100644 --- a/src/engine/menus/play_area.asm +++ b/src/engine/menus/play_area.asm @@ -30,7 +30,7 @@ OpenInPlayAreaScreen:: call DoFrame ldh a, [hDPadHeld] - and START + and PAD_START jr nz, .selection ; if this function's been called from 'select' button, @@ -40,7 +40,7 @@ OpenInPlayAreaScreen:: jr z, .handle_input ; if it's from the Check menu, jump. ldh a, [hDPadHeld] - and SELECT + and PAD_SELECT jr nz, .skip_input .handle_input @@ -343,14 +343,14 @@ OpenInPlayAreaScreen_TransitionTable1: in_play_area_cursor_transition $30, $6c, $00, OPP_ACTIVE, PLAYER_BENCH_1, PLAYER_DISCARD_PILE, PLAYER_DISCARD_PILE in_play_area_cursor_transition $78, $80, $00, PLAYER_DISCARD_PILE, PLAYER_BENCH_1, PLAYER_ACTIVE, PLAYER_ACTIVE in_play_area_cursor_transition $78, $70, $00, OPP_ACTIVE, PLAYER_HAND, PLAYER_ACTIVE, PLAYER_ACTIVE - in_play_area_cursor_transition $78, $34, 1 << OAM_X_FLIP, OPP_BENCH_1, PLAYER_ACTIVE, OPP_DISCARD_PILE, OPP_DISCARD_PILE - in_play_area_cursor_transition $30, $20, 1 << OAM_X_FLIP, OPP_BENCH_1, OPP_DISCARD_PILE, OPP_ACTIVE, OPP_ACTIVE - in_play_area_cursor_transition $30, $38, 1 << OAM_X_FLIP, OPP_BENCH_1, PLAYER_ACTIVE, OPP_ACTIVE, OPP_ACTIVE - in_play_area_cursor_transition $90, $14, 1 << OAM_X_FLIP, OPP_PLAY_AREA, OPP_ACTIVE, OPP_BENCH_5, OPP_BENCH_2 - in_play_area_cursor_transition $78, $14, 1 << OAM_X_FLIP, OPP_PLAY_AREA, OPP_ACTIVE, OPP_BENCH_1, OPP_BENCH_3 - in_play_area_cursor_transition $60, $14, 1 << OAM_X_FLIP, OPP_PLAY_AREA, OPP_ACTIVE, OPP_BENCH_2, OPP_BENCH_4 - in_play_area_cursor_transition $48, $14, 1 << OAM_X_FLIP, OPP_PLAY_AREA, OPP_ACTIVE, OPP_BENCH_3, OPP_BENCH_5 - in_play_area_cursor_transition $30, $14, 1 << OAM_X_FLIP, OPP_PLAY_AREA, OPP_ACTIVE, OPP_BENCH_4, OPP_BENCH_1 + in_play_area_cursor_transition $78, $34, OAM_XFLIP, OPP_BENCH_1, PLAYER_ACTIVE, OPP_DISCARD_PILE, OPP_DISCARD_PILE + in_play_area_cursor_transition $30, $20, OAM_XFLIP, OPP_BENCH_1, OPP_DISCARD_PILE, OPP_ACTIVE, OPP_ACTIVE + in_play_area_cursor_transition $30, $38, OAM_XFLIP, OPP_BENCH_1, PLAYER_ACTIVE, OPP_ACTIVE, OPP_ACTIVE + in_play_area_cursor_transition $90, $14, OAM_XFLIP, OPP_PLAY_AREA, OPP_ACTIVE, OPP_BENCH_5, OPP_BENCH_2 + in_play_area_cursor_transition $78, $14, OAM_XFLIP, OPP_PLAY_AREA, OPP_ACTIVE, OPP_BENCH_1, OPP_BENCH_3 + in_play_area_cursor_transition $60, $14, OAM_XFLIP, OPP_PLAY_AREA, OPP_ACTIVE, OPP_BENCH_2, OPP_BENCH_4 + in_play_area_cursor_transition $48, $14, OAM_XFLIP, OPP_PLAY_AREA, OPP_ACTIVE, OPP_BENCH_3, OPP_BENCH_5 + in_play_area_cursor_transition $30, $14, OAM_XFLIP, OPP_PLAY_AREA, OPP_ACTIVE, OPP_BENCH_4, OPP_BENCH_1 assert_table_length NUM_INPLAYAREA_POSITIONS OpenInPlayAreaScreen_TransitionTable2: @@ -363,14 +363,14 @@ OpenInPlayAreaScreen_TransitionTable2: in_play_area_cursor_transition $30, $6c, $00, OPP_ACTIVE, PLAYER_BENCH_1, PLAYER_DISCARD_PILE, PLAYER_DISCARD_PILE in_play_area_cursor_transition $78, $80, $00, PLAYER_DISCARD_PILE, PLAYER_BENCH_1, PLAYER_ACTIVE, PLAYER_ACTIVE in_play_area_cursor_transition $78, $70, $00, OPP_ACTIVE, PLAYER_HAND, PLAYER_ACTIVE, PLAYER_ACTIVE - in_play_area_cursor_transition $78, $34, 1 << OAM_X_FLIP, OPP_BENCH_1, PLAYER_ACTIVE, OPP_DISCARD_PILE, OPP_DISCARD_PILE - in_play_area_cursor_transition $30, $20, 1 << OAM_X_FLIP, OPP_BENCH_1, OPP_DISCARD_PILE, OPP_ACTIVE, OPP_ACTIVE - in_play_area_cursor_transition $30, $38, 1 << OAM_X_FLIP, OPP_HAND, PLAYER_ACTIVE, OPP_ACTIVE, OPP_ACTIVE - in_play_area_cursor_transition $90, $14, 1 << OAM_X_FLIP, OPP_PLAY_AREA, OPP_ACTIVE, OPP_BENCH_5, OPP_BENCH_2 - in_play_area_cursor_transition $78, $14, 1 << OAM_X_FLIP, OPP_PLAY_AREA, OPP_ACTIVE, OPP_BENCH_1, OPP_BENCH_3 - in_play_area_cursor_transition $60, $14, 1 << OAM_X_FLIP, OPP_PLAY_AREA, OPP_ACTIVE, OPP_BENCH_2, OPP_BENCH_4 - in_play_area_cursor_transition $48, $14, 1 << OAM_X_FLIP, OPP_PLAY_AREA, OPP_ACTIVE, OPP_BENCH_3, OPP_BENCH_5 - in_play_area_cursor_transition $30, $14, 1 << OAM_X_FLIP, OPP_PLAY_AREA, OPP_ACTIVE, OPP_BENCH_4, OPP_BENCH_1 + in_play_area_cursor_transition $78, $34, OAM_XFLIP, OPP_BENCH_1, PLAYER_ACTIVE, OPP_DISCARD_PILE, OPP_DISCARD_PILE + in_play_area_cursor_transition $30, $20, OAM_XFLIP, OPP_BENCH_1, OPP_DISCARD_PILE, OPP_ACTIVE, OPP_ACTIVE + in_play_area_cursor_transition $30, $38, OAM_XFLIP, OPP_HAND, PLAYER_ACTIVE, OPP_ACTIVE, OPP_ACTIVE + in_play_area_cursor_transition $90, $14, OAM_XFLIP, OPP_PLAY_AREA, OPP_ACTIVE, OPP_BENCH_5, OPP_BENCH_2 + in_play_area_cursor_transition $78, $14, OAM_XFLIP, OPP_PLAY_AREA, OPP_ACTIVE, OPP_BENCH_1, OPP_BENCH_3 + in_play_area_cursor_transition $60, $14, OAM_XFLIP, OPP_PLAY_AREA, OPP_ACTIVE, OPP_BENCH_2, OPP_BENCH_4 + in_play_area_cursor_transition $48, $14, OAM_XFLIP, OPP_PLAY_AREA, OPP_ACTIVE, OPP_BENCH_3, OPP_BENCH_5 + in_play_area_cursor_transition $30, $14, OAM_XFLIP, OPP_PLAY_AREA, OPP_ACTIVE, OPP_BENCH_4, OPP_BENCH_1 assert_table_length NUM_INPLAYAREA_POSITIONS OpenInPlayAreaScreen_HandleInput: @@ -395,7 +395,7 @@ OpenInPlayAreaScreen_HandleInput: inc hl ; check d-pad - bit D_UP_F, a + bit B_PAD_UP, a jr z, .else_if_down ; up @@ -404,7 +404,7 @@ OpenInPlayAreaScreen_HandleInput: .else_if_down inc hl - bit D_DOWN_F, a + bit B_PAD_DOWN, a jr z, .else_if_right ; down @@ -413,7 +413,7 @@ OpenInPlayAreaScreen_HandleInput: .else_if_right inc hl - bit D_RIGHT_F, a + bit B_PAD_RIGHT, a jr z, .else_if_left ; right @@ -422,7 +422,7 @@ OpenInPlayAreaScreen_HandleInput: .else_if_left inc hl - bit D_LEFT_F, a + bit B_PAD_LEFT, a jr z, .check_button ; left @@ -463,7 +463,7 @@ OpenInPlayAreaScreen_HandleInput: ; handle index overflow ldh a, [hDPadHeld] - bit D_RIGHT_F, a + bit B_PAD_RIGHT, a jr z, .on_left xor a @@ -494,7 +494,7 @@ OpenInPlayAreaScreen_HandleInput: jr c, .next ldh a, [hDPadHeld] - bit D_LEFT_F, a + bit B_PAD_LEFT, a jr z, .on_right ld a, INPLAYAREA_OPP_BENCH_1 @@ -512,10 +512,10 @@ OpenInPlayAreaScreen_HandleInput: ld [wCheckMenuCursorBlinkCounter], a .check_button ldh a, [hKeysPressed] - and A_BUTTON | B_BUTTON + and PAD_A | PAD_B jr z, .return - and A_BUTTON + and PAD_A jr nz, .a_button ; pressed b button diff --git a/src/engine/menus/printer.asm b/src/engine/menus/printer.asm index 1f192db..bc386ce 100644 --- a/src/engine/menus/printer.asm +++ b/src/engine/menus/printer.asm @@ -30,7 +30,7 @@ PrinterMenu_PokemonCards: ld [wCardListNumCursorPositions], a .handle_input ldh a, [hDPadHeld] - and D_DOWN + and PAD_DOWN jr z, .asm_abca ; d_down call ConfirmSelectionAndReturnCarry @@ -75,7 +75,7 @@ PrinterMenu_PokemonCards: call HandleDeckCardSelectionList jr c, .asm_ac60 ldh a, [hDPadHeld] - and START + and PAD_START jr z, .loop_frame_2 ; start btn ld a, $01 diff --git a/src/engine/menus/start.asm b/src/engine/menus/start.asm index c0c7dd5..22661b1 100644 --- a/src/engine/menus/start.asm +++ b/src/engine/menus/start.asm @@ -45,7 +45,7 @@ HandleTitleScreen: .check_keys ldh a, [hKeysPressed] - and A_BUTTON | START + and PAD_A | PAD_START jr z, .loop ld a, SFX_CONFIRM call PlaySFX diff --git a/src/engine/menus/status.asm b/src/engine/menus/status.asm index 4397423..f0c6b0d 100644 --- a/src/engine/menus/status.asm +++ b/src/engine/menus/status.asm @@ -17,7 +17,7 @@ _PauseMenu_Status: lb bc, 13, 6 call PrintPlayTime call FlashWhiteScreen - ld a, A_BUTTON | B_BUTTON | START + ld a, PAD_A | PAD_B | PAD_START call WaitUntilKeysArePressed pop af ld [wd291], a diff --git a/src/engine/menus/unknown.asm b/src/engine/menus/unknown.asm index a5b8c5b..98587d1 100644 --- a/src/engine/menus/unknown.asm +++ b/src/engine/menus/unknown.asm @@ -9,9 +9,9 @@ Func_18661: ; unreferenced or a jr z, .check_button ; check input from dpad - bit D_LEFT_F, a + bit B_PAD_LEFT, a jr nz, .left_or_right - bit D_RIGHT_F, a + bit B_PAD_RIGHT, a jr z, .check_up_and_down .left_or_right ; swap the lsb of x position value. @@ -21,9 +21,9 @@ Func_18661: ; unreferenced jr .cursor_moved .check_up_and_down - bit D_UP_F, a + bit B_PAD_UP, a jr nz, .up_or_down - bit D_DOWN_F, a + bit B_PAD_DOWN, a jr z, .check_button .up_or_down ld a, e @@ -43,9 +43,9 @@ Func_18661: ; unreferenced ld [wCheckMenuCursorBlinkCounter], a .check_button ldh a, [hKeysPressed] - and A_BUTTON | B_BUTTON + and PAD_A | PAD_B jr z, .check_cursor_moved - and A_BUTTON + and PAD_A jr nz, .a_button ; b button @@ -78,7 +78,7 @@ Func_18661: ; unreferenced and %00001111 ret nz ld a, SYM_CURSOR_R - bit D_RIGHT_F, [hl] + bit B_PAD_RIGHT, [hl] jr z, .draw_tile .draw_blank_cursor ld a, SYM_SPACE diff --git a/src/engine/overworld/debug_player_coordinates.asm b/src/engine/overworld/debug_player_coordinates.asm index 2d58f11..220851d 100644 --- a/src/engine/overworld/debug_player_coordinates.asm +++ b/src/engine/overworld/debug_player_coordinates.asm @@ -14,10 +14,10 @@ Func_1c003: ; unreferenced ldh a, [hKeysHeld] ld b, a - and A_BUTTON | B_BUTTON + and PAD_A | PAD_B cp b jr nz, JumpSetWindowOff - and B_BUTTON + and PAD_B jr z, JumpSetWindowOff ld bc, $20 @@ -32,14 +32,14 @@ Func_1c003: ; unreferenced ldh [hWY], a ldh a, [hKeysPressed] - and A_BUTTON + and PAD_A jr z, .skip_load_scene ld a, SCENE_COLOR_PALETTE lb bc, 0, 33 call LoadScene .skip_load_scene ldh a, [hKeysHeld] - and A_BUTTON + and PAD_A jr z, .set_wd_on ld a, $67 ldh [hWX], a diff --git a/src/engine/overworld/overworld.asm b/src/engine/overworld/overworld.asm index ec0b8a3..34071ab 100644 --- a/src/engine/overworld/overworld.asm +++ b/src/engine/overworld/overworld.asm @@ -760,7 +760,7 @@ HandlePlayerMoveMode: .not_moving ldh a, [hKeysPressed] - and START + and PAD_START call nz, OpenPauseMenu ret @@ -833,7 +833,7 @@ Func_c58b: HandlePlayerMoveModeInput: ldh a, [hKeysHeld] - and D_PAD + and PAD_CTRL_PAD jr z, .skip_moving call UpdatePlayerDirectionFromDPad call AttemptPlayerMovementFromDirection @@ -842,7 +842,7 @@ HandlePlayerMoveModeInput: jr nz, .done .skip_moving ldh a, [hKeysPressed] - and A_BUTTON + and PAD_A jr z, .done call FindNPCOrObject jr .done @@ -963,7 +963,7 @@ Func_c66c: push bc ld c, $1 ldh a, [hKeysHeld] - bit B_BUTTON_F, a + bit B_PAD_B, a jr z, .asm_c67e ld a, [wd338] cp $2 diff --git a/src/engine/overworld_map.asm b/src/engine/overworld_map.asm index 16236b0..b31e1fc 100644 --- a/src/engine/overworld_map.asm +++ b/src/engine/overworld_map.asm @@ -50,7 +50,7 @@ OverworldMap_Update: ; or finalize the selection if the A button is pressed OverworldMap_HandleKeyPress: ldh a, [hKeysPressed] - and D_PAD + and PAD_CTRL_PAD jr z, .no_d_pad farcall GetDirectionFromDPad ld [wPlayerDirection], a @@ -58,7 +58,7 @@ OverworldMap_HandleKeyPress: jr .done .no_d_pad ldh a, [hKeysPressed] - and A_BUTTON + and PAD_A jr z, .done ld a, SFX_CONFIRM call PlaySFX diff --git a/src/engine/sgb.asm b/src/engine/sgb.asm index 5d474a2..aecc5e3 100644 --- a/src/engine/sgb.asm +++ b/src/engine/sgb.asm @@ -201,8 +201,8 @@ Func_70136: call SendSGB call DisableLCD ld a, [wLCDC] - and LCDC_BGENABLE | LCDC_WINSELECT - or LCDC_BGON + and LCDC_BG | LCDC_WIN_MAP + or LCDC_BG_ON ld [wLCDC], a ld a, %11100100 ldh [rBGP], a diff --git a/src/engine/unused_copyright.asm b/src/engine/unused_copyright.asm index 20b804b..b830dd5 100644 --- a/src/engine/unused_copyright.asm +++ b/src/engine/unused_copyright.asm @@ -15,7 +15,7 @@ UnusedCopyrightScreen: ; unreferenced call UpdateRNGSources pop bc ldh a, [hKeysPressed] - and START + and PAD_START jr nz, .exit dec bc ld a, b diff --git a/src/engine/unused_save_validation.asm b/src/engine/unused_save_validation.asm index 5f65e0d..802daca 100644 --- a/src/engine/unused_save_validation.asm +++ b/src/engine/unused_save_validation.asm @@ -57,13 +57,13 @@ UnusedSaveDataValidation: ; unreferenced call SetupText ldtx hl, YourDataWasDestroyedSomehowText bank1call DrawWholeScreenTextBox - ld a, SRAM_ENABLE - ld [MBC3SRamEnable], a + ld a, RAMG_SRAM_ENABLE + ld [rRAMG], a xor a ldh [hBankSRAM], a - ld [MBC3SRamBank], a - ld [MBC3RTC], a - ld [MBC3SRamEnable], a + ld [rRAMB], a + ld [rRTCREG], a + ld [rRAMG], a jp Reset ret @@ -86,8 +86,8 @@ UnusedCalculateSaveDataValidationByte: ; unreferenced ld a, c or b jr nz, .loop_xor - ld a, SRAM_ENABLE - ld [MBC3SRamEnable], a + ld a, RAMG_SRAM_ENABLE + ld [rRAMG], a ld a, e ld [sUnusedSaveDataValidationByte], a pop bc diff --git a/src/home/audio_callback.asm b/src/home/audio_callback.asm index a14cffc..f0f6365 100644 --- a/src/home/audio_callback.asm +++ b/src/home/audio_callback.asm @@ -5,7 +5,7 @@ Bankswitch3dTo3f:: push af ld a, $3f ldh [hBankROM], a - ld [MBC3RomBank], a + ld [rROMB], a pop af ld bc, .bankswitch3d push bc @@ -13,5 +13,5 @@ Bankswitch3dTo3f:: .bankswitch3d ld a, $3d ldh [hBankROM], a - ld [MBC3RomBank], a + ld [rROMB], a ret diff --git a/src/home/bg_map.asm b/src/home/bg_map.asm index 975a484..ed66c94 100644 --- a/src/home/bg_map.asm +++ b/src/home/bg_map.asm @@ -48,7 +48,7 @@ WriteDataBlockToBGMap0:: add hl, bc ; point to next structure ret -; writes a to [v*BGMap0 + BG_MAP_WIDTH * c + b] +; writes a to [v*BGMap0 + TILEMAP_WIDTH * c + b] WriteByteToBGMap0:: push af ld a, [wLCDC] @@ -70,7 +70,7 @@ WriteByteToBGMap0:: pop af ; fallthrough -; writes a to [v*BGMap0 + BG_MAP_WIDTH * c + b] during hblank +; writes a to [v*BGMap0 + TILEMAP_WIDTH * c + b] during hblank HblankWriteByteToBGMap0:: push hl push de diff --git a/src/home/card_data.asm b/src/home/card_data.asm index df01b7d..563fdda 100644 --- a/src/home/card_data.asm +++ b/src/home/card_data.asm @@ -192,7 +192,7 @@ LoadCardGfx:: res 7, h set 6, h ; $4000 ≤ hl ≤ $7fff call CopyGfxData - ld b, CGB_PAL_SIZE + ld b, PAL_SIZE ld de, wCardPalette .copy_card_palette ld a, [hli] diff --git a/src/home/double_speed.asm b/src/home/double_speed.asm index b4894cb..9db6e34 100644 --- a/src/home/double_speed.asm +++ b/src/home/double_speed.asm @@ -2,8 +2,8 @@ SwitchToCGBNormalSpeed:: call CheckForCGB ret c - ld hl, rKEY1 - bit 7, [hl] + ld hl, rSPD + bit B_SPD_DOUBLE, [hl] ret z jr CGBSpeedSwitch @@ -11,8 +11,8 @@ SwitchToCGBNormalSpeed:: SwitchToCGBDoubleSpeed:: call CheckForCGB ret c - ld hl, rKEY1 - bit 7, [hl] + ld hl, rSPD + bit B_SPD_DOUBLE, [hl] ret nz ; fallthrough @@ -22,7 +22,7 @@ CGBSpeedSwitch:: push af xor a ldh [rIE], a - set 0, [hl] + set B_SPD_PREPARE, [hl] xor a ldh [rIF], a ldh [rIE], a diff --git a/src/home/empty_screen.asm b/src/home/empty_screen.asm index 5da058e..e1452e9 100644 --- a/src/home/empty_screen.asm +++ b/src/home/empty_screen.asm @@ -21,7 +21,7 @@ AttrBlkPacket_EmptyScreen:: ds 6 ; data set 2 ds 2 ; data set 3 -; returns v*BGMap0 + BG_MAP_WIDTH * c + b in de. +; returns v*BGMap0 + TILEMAP_WIDTH * c + b in de. ; used to map coordinates at bc to a BGMap0 address. BCCoordToBGMap0Address:: ld l, c diff --git a/src/home/frames.asm b/src/home/frames.asm index 4bb0629..3e81ee7 100644 --- a/src/home/frames.asm +++ b/src/home/frames.asm @@ -9,7 +9,7 @@ DoAFrames:: ret ; updates background, sprites and other game variables, halts until vblank, and reads user input -; if wDebugPauseAllowed is not 0, the game can be paused (and resumed) by pressing the SELECT button +; if wDebugPauseAllowed is not 0, the game can be paused (and resumed) by pressing the PAD_SELECT button DoFrame:: push af push hl @@ -24,14 +24,14 @@ DoFrame:: or a jr z, .done ldh a, [hKeysPressed] - and SELECT + and PAD_SELECT jr z, .done .game_paused_loop call WaitForVBlank call ReadJoypad call HandleDPadRepeat ldh a, [hKeysPressed] - and SELECT + and PAD_SELECT jr z, .game_paused_loop .done pop bc @@ -45,11 +45,11 @@ DoFrame:: HandleDPadRepeat:: ldh a, [hKeysHeld] ldh [hDPadHeld], a - and D_PAD + and PAD_CTRL_PAD jr z, .done ld hl, hDPadRepeat ldh a, [hKeysPressed] - and D_PAD + and PAD_CTRL_PAD jr z, .dpad_key_held ld [hl], 24 ret @@ -60,6 +60,6 @@ HandleDPadRepeat:: ret .done ldh a, [hKeysPressed] - and BUTTONS + and PAD_BUTTONS ldh [hDPadHeld], a ret diff --git a/src/home/hblank.asm b/src/home/hblank.asm index 2f38734..1206d2e 100644 --- a/src/home/hblank.asm +++ b/src/home/hblank.asm @@ -5,12 +5,12 @@ HblankCopyDataHLtoDE:: ei di ldh a, [rSTAT] ; - and STAT_LCDC_STATUS ; + and STAT_MODE ; jr nz, .loop ; assert hblank ld a, [hl] ld [de], a ldh a, [rSTAT] ; - and STAT_LCDC_STATUS ; + and STAT_MODE ; jr nz, .loop ; assert still in hblank ei inc hl @@ -27,12 +27,12 @@ HblankCopyDataDEtoHL:: ei di ldh a, [rSTAT] ; - and STAT_LCDC_STATUS ; + and STAT_MODE ; jr nz, .loop ; assert hblank ld a, [de] ld [hl], a ldh a, [rSTAT] ; - and STAT_LCDC_STATUS ; + and STAT_MODE ; jr nz, .loop ; assert still in hblank ei inc hl diff --git a/src/home/input.asm b/src/home/input.asm index 41e7f52..8b41ea9 100644 --- a/src/home/input.asm +++ b/src/home/input.asm @@ -1,15 +1,15 @@ ; read joypad data to refresh hKeysHeld, hKeysPressed, and hKeysReleased ; the A + B + Start + Select combination resets the game ReadJoypad:: - ld a, JOY_BTNS_SELECT + ld a, JOYP_GET_CTRL_PAD ldh [rJOYP], a ldh a, [rJOYP] ldh a, [rJOYP] cpl - and JOY_INPUT_MASK + and JOYP_INPUTS swap a ld b, a ; buttons data - ld a, JOY_DPAD_SELECT + ld a, JOYP_GET_BUTTONS ldh [rJOYP], a ldh a, [rJOYP] ldh a, [rJOYP] @@ -18,7 +18,7 @@ ReadJoypad:: ldh a, [rJOYP] ldh a, [rJOYP] cpl - and JOY_INPUT_MASK + and JOYP_INPUTS or b ld c, a ; dpad data cpl @@ -33,8 +33,8 @@ ReadJoypad:: ld b, a ldh [hKeysPressed], a ldh a, [hKeysHeld] - and BUTTONS - cp BUTTONS + and PAD_BUTTONS + cp PAD_BUTTONS jr nz, SaveButtonsHeld ; A + B + Start + Select: reset game call ResetSerial @@ -48,7 +48,7 @@ Reset:: SaveButtonsHeld:: ld a, c ldh [hKeysHeld], a - ld a, JOY_BTNS_SELECT | JOY_DPAD_SELECT + ld a, JOYP_GET_CTRL_PAD | JOYP_GET_BUTTONS ldh [rJOYP], a ret diff --git a/src/home/interrupt.asm b/src/home/interrupt.asm index 34f8085..f5b201c 100644 --- a/src/home/interrupt.asm +++ b/src/home/interrupt.asm @@ -1,37 +1,37 @@ ; enable timer interrupt EnableInt_Timer:: ldh a, [rIE] - or 1 << INT_TIMER + or IE_TIMER ldh [rIE], a ret ; enable vblank interrupt EnableInt_VBlank:: ldh a, [rIE] - or 1 << INT_VBLANK + or IE_VBLANK ldh [rIE], a ret ; enable lcdc interrupt on hblank mode EnableInt_HBlank:: ldh a, [rSTAT] - or 1 << STAT_MODE_HBLANK + or STAT_MODE_0 ldh [rSTAT], a xor a ldh [rIF], a ldh a, [rIE] - or 1 << INT_LCD_STAT + or IE_STAT ldh [rIE], a ret ; disable lcdc interrupt and the hblank mode trigger DisableInt_HBlank:: ldh a, [rSTAT] - and ~(1 << STAT_MODE_HBLANK) + and ~STAT_MODE_0 ldh [rSTAT], a xor a ldh [rIF], a ldh a, [rIE] - and ~(1 << INT_LCD_STAT) + and ~IE_STAT ldh [rIE], a ret diff --git a/src/home/lcd.asm b/src/home/lcd.asm index 5898d16..be87bdf 100644 --- a/src/home/lcd.asm +++ b/src/home/lcd.asm @@ -2,7 +2,7 @@ WaitForVBlank:: push hl ld a, [wLCDC] - bit LCDC_ENABLE_F, a + bit B_LCDC_ENABLE, a jr z, .lcd_off ld hl, wVBlankCounter ld a, [hl] @@ -18,7 +18,7 @@ WaitForVBlank:: ; turn LCD on EnableLCD:: ld a, [wLCDC] ; - bit LCDC_ENABLE_F, a ; + bit B_LCDC_ENABLE, a ; ret nz ; assert that LCD is off or LCDC_ON ; ld [wLCDC], a ; @@ -30,21 +30,21 @@ EnableLCD:: ; wait for vblank, then turn LCD off DisableLCD:: ldh a, [rLCDC] ; - bit LCDC_ENABLE_F, a ; + bit B_LCDC_ENABLE, a ; ret z ; assert that LCD is on ldh a, [rIE] ld [wIE], a - res INT_VBLANK, a ; + res B_IE_VBLANK, a ; ldh [rIE], a ; disable vblank interrupt .wait_vblank ldh a, [rLY] ; - cp LY_VBLANK ; + cp LY_VBLANK + 1 ; jr nz, .wait_vblank ; wait for vblank ldh a, [rLCDC] ; - and LCDC_OFF ; + and LOW(~LCDC_ON) ; ldh [rLCDC], a ; ld a, [wLCDC] ; - and LCDC_OFF ; + and LOW(~LCDC_ON) ; ld [wLCDC], a ; turn LCD off xor a ldh [rBGP], a @@ -57,27 +57,27 @@ DisableLCD:: ; set OBJ size: 8x8 Set_OBJ_8x8:: ld a, [wLCDC] - and LCDC_OBJ8 + and ~LCDC_OBJ_16 ld [wLCDC], a ret ; set OBJ size: 8x16 Set_OBJ_8x16:: ld a, [wLCDC] - or LCDC_OBJ16 + or LCDC_OBJ_16 ld [wLCDC], a ret ; set Window Display on SetWindowOn:: ld a, [wLCDC] - or LCDC_WINON + or LCDC_WIN_ON ld [wLCDC], a ret ; set Window Display off SetWindowOff:: ld a, [wLCDC] - and LCDC_WINOFF + and ~LCDC_WIN_ON ld [wLCDC], a ret diff --git a/src/home/lcd_enable_frame.asm b/src/home/lcd_enable_frame.asm index 7b6b47e..62f18d4 100644 --- a/src/home/lcd_enable_frame.asm +++ b/src/home/lcd_enable_frame.asm @@ -1,7 +1,7 @@ DoFrameIfLCDEnabled:: push af ldh a, [rLCDC] - bit LCDC_ENABLE_F, a + bit B_LCDC_ENABLE, a jr z, .done push bc push de diff --git a/src/home/load_animation.asm b/src/home/load_animation.asm index 5f901d3..0f794c7 100644 --- a/src/home/load_animation.asm +++ b/src/home/load_animation.asm @@ -56,7 +56,7 @@ DrawSpriteAnimationFrame:: dec b .beginY ld a, [wCurrSpriteAttributes] - bit OAM_Y_FLIP, a + bit B_OAM_YFLIP, a jr z, .unflippedY ld a, [hl] add 8 ; size of a tile @@ -86,7 +86,7 @@ DrawSpriteAnimationFrame:: dec b .beginX ld a, [wCurrSpriteAttributes] - bit OAM_X_FLIP, a + bit B_OAM_XFLIP, a jr z, .unflippedX ld a, [hl] add 8 ; size of a tile @@ -116,11 +116,11 @@ DrawSpriteAnimationFrame:: inc hl ld a, [wCurrSpriteAttributes] add [hl] - and OAM_PALETTE | (1 << OAM_OBP_NUM) + and OAM_PALETTE | OAM_PAL1 ld b, a ld a, [wCurrSpriteAttributes] xor [hl] - and (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP) | (1 << OAM_PRIORITY) + and OAM_XFLIP | OAM_YFLIP | OAM_PRIO or b ld b, a inc hl ; unnecessary diff --git a/src/home/menus.asm b/src/home/menus.asm index f4482ae..2b9f539 100644 --- a/src/home/menus.asm +++ b/src/home/menus.asm @@ -83,7 +83,7 @@ HandleMenuInput:: ld a, [wNumMenuItems] ld c, a ld a, [wCurMenuItem] - bit D_UP_F, b + bit B_PAD_UP, b jr z, .not_up dec a bit 7, a @@ -92,7 +92,7 @@ HandleMenuInput:: dec a ; wrapping around, so load the bottommost item jr .handle_up_or_down .not_up - bit D_DOWN_F, b + bit B_PAD_DOWN, b jr z, .up_down_done inc a cp c @@ -131,9 +131,9 @@ HandleMenuInput:: ret .check_A_or_B ldh a, [hKeysPressed] - and A_BUTTON | B_BUTTON + and PAD_A | PAD_B jr z, RefreshMenuCursor_CheckPlaySFX - and A_BUTTON + and PAD_A jr nz, .A_pressed_draw_cursor ; B button pressed ld a, [wCurMenuItem] @@ -223,7 +223,7 @@ SetMenuItem:: ret ; handle input for the 2-row 3-column duel menu. -; only handles input not involving the B, START, or SELECT buttons, that is, +; only handles input not involving the B, PAD_START, or PAD_SELECT buttons, that is, ; navigating through the menu or selecting an item with the A button. ; other input in handled by PrintDuelMenuAndHandleInput.handle_input HandleDuelMenuInput:: @@ -232,13 +232,13 @@ HandleDuelMenuInput:: jr z, .blink_cursor ld b, a ld hl, wCurMenuItem - and D_UP | D_DOWN + and PAD_UP | PAD_DOWN jr z, .check_left ld a, [hl] xor 1 ; move to the other menu item in the same column jr .dpad_pressed .check_left - bit D_LEFT_F, b + bit B_PAD_LEFT, b jr z, .check_right ld a, [hl] sub 2 @@ -248,7 +248,7 @@ HandleDuelMenuInput:: add 4 jr .dpad_pressed .check_right - bit D_RIGHT_F, b + bit B_PAD_RIGHT, b jr z, .dpad_not_pressed ld a, [hl] add 2 @@ -269,7 +269,7 @@ HandleDuelMenuInput:: jr .blink_cursor .dpad_not_pressed ldh a, [hDPadHeld] - and A_BUTTON + and PAD_A jp nz, HandleMenuInput.A_pressed .blink_cursor ; blink cursor every 16 frames @@ -433,7 +433,7 @@ CardListMenuFunction:: dec a ld c, a ld a, [wCurMenuItem] - bit D_UP_F, b + bit B_PAD_UP, b jr z, .not_up cp c jp nz, .continue @@ -448,7 +448,7 @@ CardListMenuFunction:: call ReloadCardListItems jp .continue .not_up - bit D_DOWN_F, b + bit B_PAD_DOWN, b jr z, .not_down or a jr nz, .not_last_visible_item @@ -479,7 +479,7 @@ CardListMenuFunction:: ld [wRefreshMenuCursorSFX], a jp .continue .not_down - bit D_LEFT_F, b + bit B_PAD_LEFT, b jr z, .not_left ld a, [wListScrollOffset] or a @@ -508,7 +508,7 @@ CardListMenuFunction:: call ReloadCardListItems jr .continue .not_left - bit D_RIGHT_F, b + bit B_PAD_RIGHT, b jr z, .continue ld a, [wNumMenuItems] ld hl, wNumListItems @@ -581,9 +581,9 @@ CardListMenuFunction:: jp hl ; execute the function at wListFunctionPointer .no_list_function ldh a, [hKeysPressed] - and A_BUTTON | B_BUTTON + and PAD_A | PAD_B ret z - and B_BUTTON + and PAD_B jr nz, .pressed_b scf ret @@ -717,9 +717,9 @@ WaitForButtonAorB:: call DoFrame call RefreshMenuCursor ldh a, [hKeysPressed] - bit A_BUTTON_F, a + bit B_PAD_A, a jr nz, .a_pressed - bit B_BUTTON_F, a + bit B_PAD_B, a jr z, WaitForButtonAorB call EraseCursor scf @@ -816,7 +816,7 @@ DrawNarrowTextBox_WaitForInput:: call DoFrame call RefreshMenuCursor ldh a, [hKeysPressed] - and A_BUTTON | B_BUTTON + and PAD_A | PAD_B jr z, .wait_A_or_B_loop ret @@ -852,7 +852,7 @@ WaitForWideTextBoxInput:: call DoFrame call RefreshMenuCursor ldh a, [hKeysPressed] - and A_BUTTON | B_BUTTON + and PAD_A | PAD_B jr z, .wait_A_or_B_loop call EraseCursor ret @@ -920,10 +920,10 @@ HandleYesOrNoMenu:: call DoFrame call RefreshMenuCursor ldh a, [hKeysPressed] - bit A_BUTTON_F, a + bit B_PAD_A, a jr nz, .a_pressed ldh a, [hDPadHeld] - and D_RIGHT | D_LEFT + and PAD_RIGHT | PAD_LEFT jr z, .wait_button_loop ; left or right pressed, so switch to the other menu item ld a, SFX_CURSOR diff --git a/src/home/objects.asm b/src/home/objects.asm index 49d8a04..c6c4c5d 100644 --- a/src/home/objects.asm +++ b/src/home/objects.asm @@ -5,7 +5,7 @@ SetManyObjectsAttributes:: ld a, [wOAMOffset] ld c, a ld b, HIGH(wOAM) - cp 40 * 4 + cp OAM_SIZE jr nc, .beyond_oam pop hl ld a, [hli] ; [hl] = how many obj? @@ -26,7 +26,7 @@ SetManyObjectsAttributes:: ld [bc], a ; Attributes/Flags <- [hl + 4 + 4*i] inc bc ld a, c - cp 40 * 4 + cp OAM_SIZE jr nc, .beyond_oam pop af dec a @@ -42,13 +42,13 @@ SetManyObjectsAttributes:: jr .done ; for the sprite at wOAM + [wOAMOffset] / 4, set its attributes from registers e, d, c, b -; return carry if [wOAMOffset] > 40 * 4 (beyond the end of wOAM) +; return carry if [wOAMOffset] > OAM_SIZE (beyond the end of wOAM) SetOneObjectAttributes:: push hl ld a, [wOAMOffset] ld l, a ld h, HIGH(wOAM) - cp 40 * 4 + cp OAM_SIZE jr nc, .beyond_oam ld [hl], e ; Y Position inc hl @@ -73,7 +73,7 @@ ZeroObjectPositions:: xor a ld [wOAMOffset], a ld hl, wOAM - ld c, 40 + ld c, OAM_COUNT xor a .loop ld [hli], a diff --git a/src/home/palettes.asm b/src/home/palettes.asm index c94938d..f8d268a 100644 --- a/src/home/palettes.asm +++ b/src/home/palettes.asm @@ -73,7 +73,7 @@ FlushPalettesIfRequested:: ld a, [wFlushPaletteFlags] bit FLUSH_ALL_PALS_F, a jr nz, FlushAllCGBPalettes - ld b, CGB_PAL_SIZE + ld b, PAL_SIZE call CopyCGBPalettes jr .done @@ -83,7 +83,7 @@ FlushAllCGBPalettes:: ld b, 8 palettes call CopyCGBPalettes ; flush 8 OBP palettes - ld a, CGB_PAL_SIZE + ld a, PAL_SIZE ld b, 8 palettes call CopyCGBPalettes jr FlushPalettesIfRequested.done @@ -111,7 +111,7 @@ CopyCGBPalettes:: inc c .wait ldh a, [rSTAT] - and 1 << STAT_BUSY ; wait until hblank or vblank + and STAT_BUSY ; wait until hblank or vblank jr nz, .wait ld a, [hl] ld [$ff00+c], a diff --git a/src/home/print_text.asm b/src/home/print_text.asm index 1ccfd82..15bc281 100644 --- a/src/home/print_text.asm +++ b/src/home/print_text.asm @@ -139,7 +139,7 @@ PrintScrollableText:: jr nc, .apply_delay ; if text speed is 1, pressing b ignores it ldh a, [hKeysHeld] - and B_BUTTON + and PAD_B jr nz, .skip_delay .apply_delay push bc @@ -458,7 +458,7 @@ PrintText:: cp 3 jr nc, .apply_delay ; if text speed is 1, pressing b ignores it - bit B_BUTTON_F, b + bit B_PAD_B, b jr nz, .skip_delay jr .apply_delay .text_delay_loop diff --git a/src/home/process_text.asm b/src/home/process_text.asm index 7d5b2f3..4fa2033 100644 --- a/src/home/process_text.asm +++ b/src/home/process_text.asm @@ -116,7 +116,7 @@ ProcessSpecialTextCharacter:: xor a ldh [hTextLineCurPos], a ldh a, [hTextHorizontalAlign] - add BG_MAP_WIDTH + add TILEMAP_WIDTH ld b, a ; get current line's starting BGMap0 address ldh a, [hTextBGMap0Address] diff --git a/src/home/scroll.asm b/src/home/scroll.asm index 514fa21..43a5fe1 100644 --- a/src/home/scroll.asm +++ b/src/home/scroll.asm @@ -62,7 +62,7 @@ ApplyBackgroundScroll:: push hl call DisableInt_LYCoincidence ld hl, rSTAT - res STAT_LYCFLAG, [hl] ; reset coincidence flag + res B_STAT_LYCF, [hl] ; reset coincidence flag ei ld hl, wApplyBGScroll ld a, [hl] @@ -85,7 +85,7 @@ ApplyBackgroundScroll:: call GetNextBackgroundScroll ld hl, rSTAT .wait_hblank_or_vblank - bit STAT_BUSY, [hl] + bit B_STAT_BUSY, [hl] jr nz, .wait_hblank_or_vblank ldh [rSCX], a ldh a, [rLY] @@ -147,10 +147,10 @@ GetNextBackgroundScroll:: EnableInt_LYCoincidence:: push hl ld hl, rSTAT - set STAT_LYC, [hl] + set B_STAT_LYC, [hl] xor a ld hl, rIE - set INT_LCD_STAT, [hl] + set B_IE_STAT, [hl] pop hl ret @@ -158,9 +158,9 @@ EnableInt_LYCoincidence:: DisableInt_LYCoincidence:: push hl ld hl, rSTAT - res STAT_LYC, [hl] + res B_STAT_LYC, [hl] xor a ld hl, rIE - res INT_LCD_STAT, [hl] + res B_IE_STAT, [hl] pop hl ret diff --git a/src/home/serial.asm b/src/home/serial.asm index 275627a..d29c119 100644 --- a/src/home/serial.asm +++ b/src/home/serial.asm @@ -375,17 +375,17 @@ Func_0e8e:: ld a, SC_START | SC_EXTERNAL ldh [rSC], a ; use external clock, set transfer start flag ldh a, [rIF] - and ~(1 << INT_SERIAL) + and ~IE_SERIAL ldh [rIF], a ; clear serial interrupt flag ldh a, [rIE] - or 1 << INT_SERIAL ; enable serial interrupt + or IE_SERIAL ; enable serial interrupt ldh [rIE], a ret ; disable serial interrupt, and clear rSB, rSC, and serial registers in WRAM ResetSerial:: ldh a, [rIE] - and ~(1 << INT_SERIAL) + and ~IE_SERIAL ldh [rIE], a xor a ldh [rSB], a diff --git a/src/home/setup.asm b/src/home/setup.asm index fb4e76b..b928faf 100644 --- a/src/home/setup.asm +++ b/src/home/setup.asm @@ -22,19 +22,19 @@ SetupRegisters:: ld [hl], LOW(NoOp) ; inc hl ; load `jp NoOp` ld [hl], HIGH(NoOp) ; - ld a, LCDC_BGON | LCDC_OBJON | LCDC_OBJ16 | LCDC_WIN9C00 + ld a, LCDC_BG_ON | LCDC_OBJ_ON | LCDC_OBJ_16 | LCDC_WIN_9C00 ld [wLCDC], a ld a, $1 - ld [MBC3LatchClock], a - ld a, SRAM_ENABLE - ld [MBC3SRamEnable], a + ld [rRTCLATCH], a + ld a, RAMG_SRAM_ENABLE + ld [rRAMG], a NoOp:: ret ; sets wConsole and, if CGB, selects WRAM bank 1 and switches to double speed mode DetectConsole:: ld b, CONSOLE_CGB - cp GBC + cp BOOTUP_A_CGB jr z, .got_console call DetectSGB ld b, CONSOLE_DMG @@ -47,7 +47,7 @@ DetectConsole:: cp CONSOLE_CGB ret nz ld a, $01 - ldh [rSVBK], a + ldh [rWBK], a call SwitchToCGBDoubleSpeed ret @@ -70,7 +70,7 @@ SetupPalettes:: ld c, 16 .copy_pals_loop ld hl, InitialPalette - ld b, CGB_PAL_SIZE + ld b, PAL_SIZE .copy_bytes_loop ld a, [hli] ld [de], a diff --git a/src/home/sgb.asm b/src/home/sgb.asm index c2e5161..1b4b54d 100644 --- a/src/home/sgb.asm +++ b/src/home/sgb.asm @@ -217,9 +217,9 @@ Func_0bcb:: push de .wait_vblank ldh a, [rLY] - cp LY_VBLANK + 3 + cp LY_VBLANK + 4 jr nz, .wait_vblank - ld a, LCDC_BGON | LCDC_OBJON | LCDC_WIN9C00 + ld a, LCDC_BG_ON | LCDC_OBJ_ON | LCDC_WIN_9C00 ldh [rLCDC], a ld a, %11100100 ldh [rBGP], a @@ -247,7 +247,7 @@ Func_0bcb:: add hl, de dec c jr nz, .bgmap_outer_loop - ld a, LCDC_BGON | LCDC_OBJON | LCDC_WIN9C00 | LCDC_ON + ld a, LCDC_BG_ON | LCDC_OBJ_ON | LCDC_WIN_9C00 | LCDC_ON ldh [rLCDC], a pop hl call SendSGB diff --git a/src/home/sram.asm b/src/home/sram.asm index 2280ae8..62bc820 100644 --- a/src/home/sram.asm +++ b/src/home/sram.asm @@ -2,24 +2,24 @@ BankswitchSRAM:: push af ldh [hBankSRAM], a - ld [MBC3SRamBank], a - ld a, SRAM_ENABLE - ld [MBC3SRamEnable], a + ld [rRAMB], a + ld a, RAMG_SRAM_ENABLE + ld [rRAMG], a pop af ret ; enable external RAM (SRAM) EnableSRAM:: push af - ld a, SRAM_ENABLE - ld [MBC3SRamEnable], a + ld a, RAMG_SRAM_ENABLE + ld [rRAMG], a pop af ret ; disable external RAM (SRAM) DisableSRAM:: push af - xor a ; SRAM_DISABLE - ld [MBC3SRamEnable], a + xor a ; RAMG_SRAM_DISABLE + ld [rRAMG], a pop af ret diff --git a/src/home/switch_rom.asm b/src/home/switch_rom.asm index 38951cd..17a002d 100644 --- a/src/home/switch_rom.asm +++ b/src/home/switch_rom.asm @@ -89,5 +89,5 @@ BankpopROM:: ; switch ROM bank to a BankswitchROM:: ldh [hBankROM], a - ld [MBC3RomBank], a + ld [rROMB], a ret diff --git a/src/home/text_box.asm b/src/home/text_box.asm index f25ed27..454bfee 100644 --- a/src/home/text_box.asm +++ b/src/home/text_box.asm @@ -3,7 +3,7 @@ ; if LCD on, copy during h-blank only SafeCopyDataDEtoHL:: ld a, [wLCDC] ; - bit LCDC_ENABLE_F, a ; + bit B_LCDC_ENABLE, a ; jr nz, .lcd_on ; assert that LCD is on .lcd_off_loop ld a, [de] @@ -15,7 +15,7 @@ SafeCopyDataDEtoHL:: .lcd_on jp HblankCopyDataDEtoHL -; returns v*BGMap0 + BG_MAP_WIDTH * e + d in hl. +; returns v*BGMap0 + TILEMAP_WIDTH * e + d in hl. ; used to map coordinates at de to a BGMap0 address. DECoordToBGMap0Address:: ld l, e @@ -182,13 +182,13 @@ ContinueDrawingTextBoxDMGorSGB:: lb de, SYM_BOX_BTM_L, SYM_BOX_BTM_R ; fallthrough -; copies b bytes of data to sp-$1f and to hl, and returns hl += BG_MAP_WIDTH +; copies b bytes of data to sp-$1f and to hl, and returns hl += TILEMAP_WIDTH ; d = value of byte 0 ; e = value of byte b ; a = value of bytes [1, b-1] -; b is supposed to be BG_MAP_WIDTH or smaller, else the stack would get corrupted +; b is supposed to be TILEMAP_WIDTH or smaller, else the stack would get corrupted CopyLine:: - add sp, -BG_MAP_WIDTH + add sp, -TILEMAP_WIDTH push hl push bc ld hl, sp+$4 @@ -212,10 +212,10 @@ CopyLine:: call SafeCopyDataDEtoHL pop bc pop de - ; advance pointer BG_MAP_WIDTH positions and restore stack pointer - ld hl, BG_MAP_WIDTH + ; advance pointer TILEMAP_WIDTH positions and restore stack pointer + ld hl, TILEMAP_WIDTH add hl, de - add sp, BG_MAP_WIDTH + add sp, TILEMAP_WIDTH ret ; DrawRegularTextBox branches here on CGB console diff --git a/src/home/tiles.asm b/src/home/tiles.asm index e2e5a48..0838cb5 100644 --- a/src/home/tiles.asm +++ b/src/home/tiles.asm @@ -7,7 +7,7 @@ FillRectangle:: push de push af push hl - add sp, -BG_MAP_WIDTH + add sp, -TILEMAP_WIDTH call DECoordToBGMap0Address .next_row push hl @@ -38,7 +38,7 @@ FillRectangle:: ld [hl], a pop bc pop de - ld hl, BG_MAP_WIDTH + ld hl, TILEMAP_WIDTH add hl, de dec c jr nz, .next_row diff --git a/src/home/time.asm b/src/home/time.asm index f3c7644..5d7e3e5 100644 --- a/src/home/time.asm +++ b/src/home/time.asm @@ -71,16 +71,16 @@ SetupTimer:: ld b, -68 ; Value for Normal Speed call CheckForCGB jr c, .set_timer - ldh a, [rKEY1] - and $80 + ldh a, [rSPD] + and SPD_DOUBLE jr z, .set_timer ld b, $100 - 2 * 68 ; Value for CGB Double Speed .set_timer ld a, b ldh [rTMA], a - ld a, TAC_16384_HZ + ld a, TAC_16KHZ ldh [rTAC], a - ld a, TAC_START | TAC_16384_HZ + ld a, TAC_START | TAC_16KHZ ldh [rTAC], a ret diff --git a/src/wram.asm b/src/wram.asm index a78a735..a2568ab 100644 --- a/src/wram.asm +++ b/src/wram.asm @@ -170,7 +170,7 @@ wc900:: ; c900 SECTION "WRAM0 1", WRAM0 wOAM:: ; ca00 - ds $a0 + ds OAM_SIZE ; 16-byte buffer to store text, usually a name or a number ; used by TX_RAM1 but not exclusively @@ -496,12 +496,12 @@ wPlayAreaSelectAction:: ; cbd4 wTempRetreatCostCardsPos:: ; cbd5 ds $1 -; in a card list, which keys (among START and A_BUTTON) do not open the item selection +; in a card list, which keys (among PAD_START and PAD_A) do not open the item selection ; menu when a card is selected, directly "submitting" the selected card instead. wNoItemSelectionMenuKeys:: ; cbd6 ds $1 -; when viewing a card page, which keys (among B_BUTTON, D_UP, and D_DOWN) will exit the page, +; when viewing a card page, which keys (among PAD_B, PAD_UP, and PAD_DOWN) will exit the page, ; either to go back to the previous menu or list, or to load the card page of the card above/below it wCardPageExitKeys:: ; cbd7 ds $1 @@ -1340,7 +1340,7 @@ wEffectFunctionsBank:: ; ce22 ; LoadCardGfx loads the card's palette here wCardPalette:: ; ce23 - ds CGB_PAL_SIZE + ds PAL_SIZE ; information about the text being currently processed, including font width, ; the rom bank, and the memory address of the next character to be printed. diff --git a/tools/extract_anim_data.py b/tools/extract_anim_data.py index d2f06ca..fbf664f 100644 --- a/tools/extract_anim_data.py +++ b/tools/extract_anim_data.py @@ -14,15 +14,15 @@ def getOAMFlagStr(flags): if (flags & 0b111 != 0): strings.append('%{:03b}'.format(flags & 0b111)) if (flags & (1 << 3) != 0): - strings.append('(1 << OAM_TILE_BANK)') + strings.append('OAM_BANK1') if (flags & (1 << 4) != 0): - strings.append('(1 << OAM_OBP_NUM)') + strings.append('OAM_PAL1') if (flags & (1 << 5) != 0): - strings.append('(1 << OAM_X_FLIP)') + strings.append('OAM_XFLIP') if (flags & (1 << 6) != 0): - strings.append('(1 << OAM_Y_FLIP)') + strings.append('OAM_YFLIP') if (flags & (1 << 7) != 0): - strings.append('(1 << OAM_PRIORITY)') + strings.append('OAM_PRIO') return ' | '.join(s for s in strings)