diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 12:57:46 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 12:57:46 -0500 |
| commit | fdd7e7cb848747a1e0ace8a63d29aaa22dfd1140 (patch) | |
| tree | 6ddaed4de52bfcc517d573a8f30c5bd0a1650782 /data | |
| parent | bb8f652504f886af296ffcaac57bf76cdc893c97 (diff) | |
| parent | 1c1ce902515ccb3ccecde29611711c9b1a3ce955 (diff) | |
Merge branch 'master' into cable_car
Diffstat (limited to 'data')
739 files changed, 7924 insertions, 24623 deletions
diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 855221507..7c58160f6 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -1,3 +1,8 @@ +#include "constants/abilities.h" +#include "constants/battle_move_effects.h" +#include "constants/hold_effects.h" +#include "constants/items.h" +#include "constants/moves.h" .include "asm/macros.inc" .include "constants/constants.inc" .include "asm/macros/battle_ai_script.inc" diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s index 72ed3cffa..ba5d9f533 100644 --- a/data/battle_anim_80CA710.s +++ b/data/battle_anim_80CA710.s @@ -1000,7 +1000,7 @@ gSpriteAnimTable_83D6E94:: @ 83D6E94 .4byte gSpriteAnim_83D6E80 .align 2 -gBattleAnimSpriteTemplate_83D6E98:: @ 83D6E98 +gBattleAnimSpriteTemplate_EndureFlame:: @ 83D6E98 spr_template 10184, 10184, gOamData_837DF74, gSpriteAnimTable_83D6E94, NULL, gDummySpriteAffineAnimTable, sub_80CDF0C .align 2 @@ -2091,7 +2091,7 @@ gSpriteAnimTable_83D912C:: @ 83D912C .align 2 gSpriteTemplate_83D9130:: @ 83D9130 - spr_template 10115, 10115, gOamData_837DF74, gSpriteAnimTable_83D912C, NULL, gDummySpriteAffineAnimTable, sub_80D3184 + spr_template 10115, 10115, gOamData_837DF74, gSpriteAnimTable_83D912C, NULL, gDummySpriteAffineAnimTable, SetAnimRaindropCallback .align 2 gSpriteAffineAnim_83D9148:: @ 83D9148 diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 74205e66c..e0d11637d 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1,3 +1,4 @@ +#include "constants/songs.h" .include "asm/macros.inc" .include "asm/macros/battle_anim.inc" .include "constants/constants.inc" @@ -382,40 +383,40 @@ gBattleAnims_StatusConditions:: @ 81C76F8 .4byte StatusCondition_Nightmare .align 2 -gBattleAnims_Unknown1:: @ 81C771C - .4byte Unknown_81D63B4 - .4byte Unknown_81D63EA - .4byte Unknown_81D63F3 - .4byte Unknown_81D6430 - .4byte Unknown_81D6438 - .4byte Unknown_81D647E - .4byte Unknown_81D6489 - .4byte Unknown_81D661C - .4byte Unknown_81D6690 - .4byte Unknown_81D676E - .4byte Unknown_Weather_Rain - .4byte Unknown_Weather_HarshSunlight - .4byte Unknown_Weather_Sandstorm - .4byte Unknown_Weather_Hail - .4byte Unknown_81D6813 - .4byte Unknown_81D6821 - .4byte Unknown_81D6852 - .4byte Unknown_81D6877 - .4byte Unknown_81D68D5 - .4byte Unknown_81D6934 - .4byte Unknown_81D69F9 - .4byte Unknown_81D6A39 - .4byte Unknown_81D6A7C +gBattleAnims_General:: @ 81C771C + .4byte General_CastformChange + .4byte General_StatsChange + .4byte General_SubstituteFade + .4byte General_SubstituteAppear + .4byte General_PokeblockThrow + .4byte General_ItemKnockoff + .4byte General_TurnTrap + .4byte General_ItemEffect + .4byte General_SmokeballEscape + .4byte General_HangedOn + .4byte General_Rain + .4byte General_Sun + .4byte General_Sandstorm + .4byte General_Hail + .4byte General_LeechSeedDrain + .4byte General_MonHit + .4byte General_ItemSteal + .4byte General_SnatchMove + .4byte General_FutureSightHit + .4byte General_DoomDesireHit + .4byte General_FocusPunchSetUp + .4byte General_IngrainHeal + .4byte General_WishHeal .align 2 -gBattleAnims_Unknown2:: @ 81C7778 - .4byte Unknown_81D6AF6 - .4byte Unknown_81D6B17 - .4byte Unknown_81D6B28 - .4byte Unknown_81D6B39 - .4byte Unknown_81D6B8D - .4byte Unknown_81D6BA6 - .4byte Unknown_81D6BB0 +gBattleAnims_Special:: @ 81C7778 + .4byte Special_LevelUp + .4byte Special_SwitchOutPlayerMon + .4byte Special_SwitchOutOpponentMon + .4byte Special_BallThrow + .4byte Special_SafariBallThrow + .4byte Special_SubstituteToMon + .4byte Special_MonToSubstitute Move_POUND: @ 81C7794 loadsprite 10135 @@ -1415,11 +1416,11 @@ Move_FURY_CUTTER: @ 81C914A monbg 1 setalpha 12, 8 panse_19 SE_W013, 63 - createtask sub_80D30AC, 2 + createtask UpdateFuryCutterAnimDirection, 2 jumpvareq 7, 0, _81C91A7 jump _81C91B9 _81C916A: - createtask update_fury_cutter_counter_copy, 2 + createtask UpdateFuryCutterAnimCount, 2 jumpvareq 7, 1, _81C918E jumpvareq 7, 2, _81C91CB jumpvareq 7, 3, _81C91E5 @@ -3182,25 +3183,26 @@ Move_DESTINY_BOND: @ 81CBA2C Move_ENDURE: @ 81CBA87 loadsprite 10184 panse_19 SE_W082, 192 - call _81CBAC7 + call EndureFlamesAnim pause 8 createtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31 createtask sub_80A7FA0, 2, 0, 1, 0, 32, 1 - call _81CBAC7 + call EndureFlamesAnim pause 8 - call _81CBAC7 + call EndureFlamesAnim wait end -_81CBAC7: - sprite gBattleAnimSpriteTemplate_83D6E98, 2, 0, -24, 26, 2 + +EndureFlamesAnim: + sprite gBattleAnimSpriteTemplate_EndureFlame, 2, 0, -24, 26, 2 pause 4 - sprite gBattleAnimSpriteTemplate_83D6E98, 2, 0, 14, 28, 1 + sprite gBattleAnimSpriteTemplate_EndureFlame, 2, 0, 14, 28, 1 pause 4 - sprite gBattleAnimSpriteTemplate_83D6E98, 2, 0, -5, 10, 2 + sprite gBattleAnimSpriteTemplate_EndureFlame, 2, 0, -5, 10, 2 pause 4 - sprite gBattleAnimSpriteTemplate_83D6E98, 2, 0, 28, 26, 3 + sprite gBattleAnimSpriteTemplate_EndureFlame, 2, 0, 28, 26, 3 pause 4 - sprite gBattleAnimSpriteTemplate_83D6E98, 2, 0, -12, 0, 1 + sprite gBattleAnimSpriteTemplate_EndureFlame, 2, 0, -12, 0, 1 ret Move_CHARM: @ 81CBB1B @@ -5269,8 +5271,8 @@ Move_RAIN_DANCE: @ 81CE997 panse_19 SE_W240, 192 createtask sub_80E2A38, 10, 1921, 2, 0, 4, 0 wait - createtask sub_80D30F0, 2, 0, 3, 120 - createtask sub_80D30F0, 2, 0, 3, 120 + createtask CreateAnimRaindrops, 2, 0, 3, 120 + createtask CreateAnimRaindrops, 2, 0, 3, 120 pause 120 pause 30 wait @@ -7348,13 +7350,13 @@ Move_LICK: @ 81D1B32 Move_FOCUS_ENERGY: @ 81D1B59 loadsprite 10184 panse_19 SE_W082, 192 - call _81CBAC7 + call EndureFlamesAnim pause 8 createtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 32767 createtask sub_80A7FA0, 2, 0, 1, 0, 32, 1 - call _81CBAC7 + call EndureFlamesAnim pause 8 - call _81CBAC7 + call EndureFlamesAnim wait end @@ -10287,7 +10289,7 @@ StatusCondition_Nightmare: @ 81D638F clearmonbg 3 end -Unknown_81D63B4: @ 81D63B4 +General_CastformChange: @ 81D63B4 createtask c3_80DFBE4, 2 jumpvareq 7, 1, _81D63E0 jump _81D63C8 @@ -10303,12 +10305,12 @@ _81D63E0: createtask sub_812DB58, 2, 1 end -Unknown_81D63EA: @ 81D63EA +General_StatsChange: @ 81D63EA createtask sub_807BB88, 5 wait end -Unknown_81D63F3: @ 81D63F3 +General_SubstituteFade: @ 81D63F3 monbg 0 createtask sub_81416C4, 5 createtask sub_80E2A38, 10, 2, 0, 0, 16, 32767 @@ -10321,11 +10323,11 @@ Unknown_81D63F3: @ 81D63F3 createtask sub_814151C, 2, 1 end -Unknown_81D6430: @ 81D6430 +General_SubstituteAppear: @ 81D6430 createtask sub_81312E4, 2 end -Unknown_81D6438: @ 81D6438 +General_PokeblockThrow: @ 81D6438 createtask sub_8141D7C, 2 createtask sub_8141BD4, 2 pause 0 @@ -10338,12 +10340,12 @@ Unknown_81D6438: @ 81D6438 createtask sub_8141C08, 2 end -Unknown_81D647E: @ 81D647E +General_ItemKnockoff: @ 81D647E loadsprite 10224 sprite gBattleAnimSpriteTemplate_83D6734, 130 end -Unknown_81D6489: @ 81D6489 +General_TurnTrap: @ 81D6489 createtask sub_8141DAC, 5 jumpvareq 0, 1, _81D64FD jumpvareq 0, 2, _81D6522 @@ -10418,7 +10420,7 @@ _81D65D3: stopsound end -Unknown_81D661C: @ 81D661C +General_ItemEffect: @ 81D661C loadsprite 10203 loadsprite 10049 pause 0 @@ -10440,7 +10442,7 @@ Unknown_81D661C: @ 81D661C wait end -Unknown_81D6690: @ 81D6690 +General_SmokeballEscape: @ 81D6690 loadsprite 10242 monbg 0 setalpha 12, 4 @@ -10479,7 +10481,7 @@ Unknown_81D6690: @ 81D6690 blendoff end -Unknown_81D676E: @ 81D676E +General_HangedOn: @ 81D676E sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 2, 7, 0, 9, 31 panse_19 SE_W082, 192 createtask sub_812FC68, 5, 30, 128, 0, 1, 2, 0, 1 @@ -10490,34 +10492,34 @@ Unknown_81D676E: @ 81D676E sprite gBattleAnimSpriteTemplate_83C1FE0, 0, 0, 0, 15 end -Unknown_Weather_Rain: @ 81D67BB +General_Rain: @ 81D67BB loadsprite 10115 panse_19 SE_W240, 192 createtask sub_80E2A38, 10, 1921, 2, 0, 4, 0 wait - createtask sub_80D30F0, 2, 0, 3, 60 - createtask sub_80D30F0, 2, 0, 3, 60 + createtask CreateAnimRaindrops, 2, 0, 3, 60 + createtask CreateAnimRaindrops, 2, 0, 3, 60 pause 50 wait createtask sub_80E2A38, 10, 1921, 2, 4, 0, 0 wait end -Unknown_Weather_HarshSunlight: @ 81D6804 +General_Sun: @ 81D6804 jump Move_SUNNY_DAY -Unknown_Weather_Sandstorm: @ 81D6809 +General_Sandstorm: @ 81D6809 jump Move_SANDSTORM -Unknown_Weather_Hail: @ 81D680E +General_Hail: @ 81D680E jump Move_HAIL -Unknown_81D6813: @ 81D6813 +General_LeechSeedDrain: @ 81D6813 createtask sub_8141E10, 5 pause 0 jump Move_ABSORB -Unknown_81D6821: @ 81D6821 +General_MonHit: @ 81D6821 loadsprite 10135 monbg 1 setalpha 12, 8 @@ -10529,7 +10531,7 @@ Unknown_81D6821: @ 81D6821 blendoff end -Unknown_81D6852: @ 81D6852 +General_ItemSteal: @ 81D6852 loadsprite 10224 createtask sub_80E42D0, 2 createtask sub_8141808, 2 @@ -10537,7 +10539,7 @@ Unknown_81D6852: @ 81D6852 sprite gBattleAnimSpriteTemplate_83D677C, 2, 0, -5, 10, 2, -1 end -Unknown_81D6877: @ 81D6877 +General_SnatchMove: @ 81D6877 loadsprite 10224 createtask sub_80E4234, 2 call Unknown_81D6AB6 @@ -10560,7 +10562,7 @@ _81D68C5: createtask sub_8131FFC, 2 jump _81D68AE -Unknown_81D68D5: @ 81D68D5 +General_FutureSightHit: @ 81D68D5 createtask sub_80E42B0, 2 monbg 3 panse_19 SE_W060, 192 @@ -10580,7 +10582,7 @@ Unknown_81D68D5: @ 81D68D5 call Unknown_81D61F3 end -Unknown_81D6934: @ 81D6934 +General_DoomDesireHit: @ 81D6934 createtask sub_80E42B0, 2 loadsprite 10198 sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 3, 0, 16, 32767 @@ -10614,20 +10616,20 @@ Unknown_81D6934: @ 81D6934 wait end -Unknown_81D69F9: @ 81D69F9 +General_FocusPunchSetUp: @ 81D69F9 loadsprite 10184 panse_19 SE_W082, 192 - call _81CBAC7 + call EndureFlamesAnim pause 8 createtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31 createtask sub_80A7FA0, 2, 0, 1, 0, 32, 1 - call _81CBAC7 + call EndureFlamesAnim pause 8 - call _81CBAC7 + call EndureFlamesAnim wait end -Unknown_81D6A39: @ 81D6A39 +General_IngrainHeal: @ 81D6A39 loadsprite 10147 loadsprite 10031 monbg 3 @@ -10646,7 +10648,7 @@ Unknown_81D6A39: @ 81D6A39 blendoff end -Unknown_81D6A7C: @ 81D6A7C +General_WishHeal: @ 81D6A7C loadsprite 10031 loadsprite 10049 sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 3, 0, 10, 0 @@ -10681,7 +10683,7 @@ _81D6AE7: wait jump _81D6AE5 -Unknown_81D6AF6: @ 81D6AF6 +Special_LevelUp: @ 81D6AF6 panse_19 SE_EXPMAX, 0 createtask sub_813F4EC, 2 pause 0 @@ -10690,19 +10692,19 @@ Unknown_81D6AF6: @ 81D6AF6 createtask sub_813F5E8, 2 end -Unknown_81D6B17: @ 81D6B17 +Special_SwitchOutPlayerMon: @ 81D6B17 createtask sub_813F844, 2 pause 10 createtask sub_813F798, 2 end -Unknown_81D6B28: @ 81D6B28 +Special_SwitchOutOpponentMon: @ 81D6B28 createtask sub_813F844, 2 pause 10 createtask sub_813F798, 2 end -Unknown_81D6B39: @ 81D6B39 +Special_BallThrow: @ 81D6B39 createtask sub_813F990, 2 pause 0 panse_19 SE_NAGERU, 0 @@ -10726,7 +10728,7 @@ _81D6B65: blendoff jump _81D6B5C -Unknown_81D6B8D: @ 81D6B8D +Special_SafariBallThrow: @ 81D6B8D createtask sub_813F990, 2 pause 0 createtask sub_813FBB8, 2 @@ -10734,10 +10736,10 @@ Unknown_81D6B8D: @ 81D6B8D createtask sub_813F9B8, 2 end -Unknown_81D6BA6: @ 81D6BA6 +Special_SubstituteToMon: @ 81D6BA6 createtask sub_814151C, 2, 1 end -Unknown_81D6BB0: @ 81D6BB0 +Special_MonToSubstitute: @ 81D6BB0 createtask sub_814151C, 2, 0 end diff --git a/data/battle_message.s b/data/battle_message.s deleted file mode 100644 index 0ad61bfc0..000000000 --- a/data/battle_message.s +++ /dev/null @@ -1,131 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .include "data/text/battle_strings.inc" - - .align 1 -gUnknown_084016BC:: @ 84016BC - .2byte 0xE - .2byte 0x46 - .2byte 0x4A - .2byte 0x6A - .2byte 0x6B - .2byte 0x6C - .2byte 0x6E - .2byte 0x6F - .2byte 0x79 - .2byte 0x7B - .2byte 0x7D - .2byte 0x94 - .2byte 0x96 - .2byte 0x97 - .2byte 0x9B - .2byte 0x9C - .2byte 0x9F - .2byte 0xA4 - .2byte 0xAA - .2byte 0xAD - .2byte 0xB6 - .2byte 0xBF - .2byte 0xCB - .2byte 0xCD - .2byte 0xCF - .2byte 0xD6 - .2byte 0xED - .2byte 0xF4 - .2byte 0xF5 - .2byte 0x10A - .2byte 0x10F - .2byte 0x112 - .2byte 0x113 - .2byte 0x11A - .2byte 0x125 - .2byte 0x136 - .2byte 0x13C - .2byte 0x140 - .2byte 0x149 - .2byte 0x14A - .2byte 0x14E - .2byte 0x154 - .2byte 0x0 - .2byte 0x64 - .2byte 0x69 - .2byte 0x75 - .2byte 0x85 - .2byte 0xAF - .2byte 0x10D - .2byte 0x153 - .2byte 0x0 - .2byte 0x60 - .2byte 0x61 - .2byte 0x66 - .2byte 0x68 - .2byte 0x8C - .2byte 0x90 - .2byte 0xA5 - .2byte 0xB8 - .2byte 0x10C - .2byte 0x111 - .2byte 0x118 - .2byte 0x119 - .2byte 0x129 - .2byte 0x12A - .2byte 0x12C - .2byte 0x139 - .2byte 0x15A - .2byte 0x15B - .2byte 0x0 - .2byte 0x1 - .2byte 0xA - .2byte 0xB - .2byte 0x11 - .2byte 0x13 - .2byte 0x14 - .2byte 0x15 - .2byte 0x1E - .2byte 0x23 - .2byte 0x25 - .2byte 0x27 - .2byte 0x2B - .2byte 0x2C - .2byte 0x2D - .2byte 0x2E - .2byte 0x2F - .2byte 0x40 - .2byte 0x47 - .2byte 0x51 - .2byte 0x59 - .2byte 0x5A - .2byte 0x5B - .2byte 0x5C - .2byte 0x67 - .2byte 0x76 - .2byte 0x7A - .2byte 0x80 - .2byte 0x84 - .2byte 0x8B - .2byte 0x91 - .2byte 0xA3 - .2byte 0xA9 - .2byte 0xAB - .2byte 0xAE - .2byte 0xC1 - .2byte 0xCC - .2byte 0xD5 - .2byte 0xF9 - .2byte 0xFD - .2byte 0xFF - .2byte 0x100 - .2byte 0x103 - .2byte 0x104 - .2byte 0x110 - .2byte 0x11B - .2byte 0x141 - .2byte 0x157 - .2byte 0x0 - - .align 2 -gUnknown_084017A8:: @ 84017A8 - .4byte -1, -1 diff --git a/data/battle_moves.s b/data/battle_moves.s index ea32446d2..9a7398999 100644 --- a/data/battle_moves.s +++ b/data/battle_moves.s @@ -1,3 +1,4 @@ +#include "constants/battle_move_effects.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index e046794b3..4e41bcc20 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1,3 +1,4 @@ +#include "constants/abilities.h" .include "asm/macros.inc" .include "constants/constants.inc" .include "asm/macros/battle_script.inc" @@ -244,10 +245,10 @@ MoveEffect_Unused83: @ 81D6F14 MoveEffect_Unused8D: @ 81D6F14 MoveEffect_UnusedA3: @ 81D6F14 MoveEffect_VitalThrow: @ 81D6F14 - jumpifhalfword 1, 0x2024be6, 57, BattleScript_1D6F3A + jumpifhalfword 1, gCurrentMove, 57, BattleScript_1D6F3A jumpifspecialstatusflag TARGET, 0x40000, 1, BattleScript_1D6F3A - orword 0x2024c6c, 0x40000 - setbyte 0x201601f, 2 + orword gHitMarker, 0x40000 + setbyte gSharedMem + 0x1601F, 2 BattleScript_1D6F3A: @ 81D6F3A attackcanceler @@ -281,12 +282,12 @@ BattleScript_1D6F48: @ 81D6F48 faintpokemon TARGET, 0, 0x0 BattleScript_EndTurn:: @ 81D6F62 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 0, 0 end BattleScript_1D6F6C: @ 81D6F6C - orbyte 0x2024c68, 1 + orbyte gBattleMoveFlags, 1 BattleScript_1D6F72: @ 81D6F72 attackstring @@ -313,7 +314,7 @@ MoveEffect_Sleep: @ 81D6F81 jumpifhalverset TARGET, 32, BattleScript_1D9037 attackanimation waitanimation - setbyte 0x2024d21, 1 + setbyte gUnknown_02024D1F + 0x2, 1 seteffecttarget jump BattleScript_EndTurn @@ -337,7 +338,7 @@ BattleScript_1D6FE0: @ 81D6FE0 MoveEffect_PoisonHit: @ 81D6FF0 MoveEffect_PoisonTail: @ 81D6FF0 - setbyte 0x2024d21, 2 + setbyte gUnknown_02024D1F + 0x2, 2 jump BattleScript_1D6F14 MoveEffect_Absorb: @ 81D6FFB @@ -361,19 +362,19 @@ MoveEffect_Absorb: @ 81D6FFB resultmessage waitmessage 64 negativedamage - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 jumpifability TARGET, ABILITY_LIQUID_OOZE, BattleScript_1D7037 - setbyte 0x2024d23, 0 + setbyte gUnknown_02024D1F + 0x4, 0 jump BattleScript_1D703F BattleScript_1D7037: @ 81D7037 manipulatedamage 0 - setbyte 0x2024d23, 1 + setbyte gUnknown_02024D1F + 0x4, 1 BattleScript_1D703F: @ 81D703F graphicalhpupdate USER datahpupdate USER - jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7056 + jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7056 printfromtable BattleTextList_4015D0 waitmessage 64 @@ -384,15 +385,15 @@ BattleScript_1D7056: @ 81D7056 MoveEffect_BlazeKick: @ 81D7069 MoveEffect_BurnHit: @ 81D7069 - setbyte 0x2024d21, 3 + setbyte gUnknown_02024D1F + 0x2, 3 jump BattleScript_1D6F14 MoveEffect_FreezeHit: @ 81D7074 - setbyte 0x2024d21, 4 + setbyte gUnknown_02024D1F + 0x2, 4 jump BattleScript_1D6F14 MoveEffect_ParalyzeHit: @ 81D707F - setbyte 0x2024d21, 5 + setbyte gUnknown_02024D1F + 0x2, 5 jump BattleScript_1D6F14 MoveEffect_Explosion: @ 81D708A @@ -402,7 +403,7 @@ MoveEffect_Explosion: @ 81D708A faintifabilitynotdamp setuserhptozero waitstateatk - jumpifbyte 5, 0x2024c68, 1, BattleScript_1D70A5 + jumpifbyte 5, gBattleMoveFlags, 1, BattleScript_1D70A5 callatk BattleScript_1D70FB jump BattleScript_1D70A7 @@ -427,7 +428,7 @@ BattleScript_1D70A7: @ 81D70A7 resultmessage waitmessage 64 faintpokemon TARGET, 0, 0x0 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 jumpwhiletargetvalid BattleScript_1D70A7 faintpokemon USER, 0, 0x0 @@ -437,17 +438,17 @@ BattleScript_1D70E0: @ 81D70E0 missmessage resultmessage waitmessage 64 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 jumpwhiletargetvalid BattleScript_1D70A7 faintpokemon USER, 0, 0x0 end BattleScript_1D70FB: @ 81D70FB - bicbyte 0x2024c68, 1 + bicbyte gBattleMoveFlags, 1 attackanimation waitanimation - orbyte 0x2024c68, 1 + orbyte gBattleMoveFlags, 1 return MoveEffect_DreamEater: @ 81D710A @@ -481,10 +482,10 @@ BattleScript_1D7129: @ 81D7129 resultmessage waitmessage 64 negativedamage - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER - jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7167 + jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7167 printstring BATTLE_TEXT_DreamEaten waitmessage 64 @@ -498,25 +499,25 @@ MoveEffect_MirrorMove: @ 81D7173 pause 64 jumptolastusedattack ppreduce - orbyte 0x2024c68, 32 + orbyte gBattleMoveFlags, 32 printstring BATTLE_TEXT_MirrorFail waitmessage 64 jump BattleScript_EndTurn MoveEffect_AttackUp: @ 81D718B - setbyte 0x201601e, 17 + setbyte gSharedMem + 0x1601E, 17 jump BattleScript_1D71B2 MoveEffect_DefenseUp: @ 81D7196 - setbyte 0x201601e, 18 + setbyte gSharedMem + 0x1601E, 18 jump BattleScript_1D71B2 MoveEffect_SpecialAttackUp: @ 81D71A1 - setbyte 0x201601e, 20 + setbyte gSharedMem + 0x1601E, 20 jump BattleScript_1D71B2 MoveEffect_EvasionUp: @ 81D71AC - setbyte 0x201601e, 23 + setbyte gSharedMem + 0x1601E, 23 BattleScript_1D71B2: @ 81D71B2 attackcanceler @@ -525,7 +526,7 @@ BattleScript_1D71B3: @ 81D71B3 attackstring ppreduce statbuffchange 65, BattleScript_1D71E0 - jumpifbyte 1, 0x2024d23, 2, BattleScript_1D71CE + jumpifbyte 1, gUnknown_02024D1F + 0x4, 2, BattleScript_1D71CE pause 32 jump BattleScript_1D71D8 @@ -535,7 +536,7 @@ BattleScript_1D71CE: @ 81D71CE BattleScript_1D71D0: @ 81D71D0 atk47 - playanimation USER, 1, 0x20160a4 + playanimation USER, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 BattleScript_1D71D8: @ 81D71D8 printfromtable BattleTextList_401570 @@ -545,29 +546,29 @@ BattleScript_1D71E0: @ 81D71E0 jump BattleScript_EndTurn BattleScript_StatUp:: @ 81D71E5 - playanimation 2, 1, 0x20160a4 + playanimation 2, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printfromtable BattleTextList_401570 waitmessage 64 return MoveEffect_AttackDown: @ 81D71F5 - setbyte 0x201601e, 145 + setbyte gSharedMem + 0x1601E, 145 jump BattleScript_1D7227 MoveEffect_DefenseDown: @ 81D7200 - setbyte 0x201601e, 146 + setbyte gSharedMem + 0x1601E, 146 jump BattleScript_1D7227 MoveEffect_SpeedDown: @ 81D720B - setbyte 0x201601e, 147 + setbyte gSharedMem + 0x1601E, 147 jump BattleScript_1D7227 MoveEffect_AccuracyDown: @ 81D7216 - setbyte 0x201601e, 150 + setbyte gSharedMem + 0x1601E, 150 jump BattleScript_1D7227 MoveEffect_EvasionDown: @ 81D7221 - setbyte 0x201601e, 151 + setbyte gSharedMem + 0x1601E, 151 BattleScript_1D7227: @ 81D7227 attackcanceler @@ -576,8 +577,8 @@ BattleScript_1D7227: @ 81D7227 attackstring ppreduce statbuffchange 1, BattleScript_1D7271 - jumpifbyte 3, 0x2024d23, 2, BattleScript_1D725F - jumpifbyte 0, 0x2024d23, 3, BattleScript_1D7271 + jumpifbyte 3, gUnknown_02024D1F + 0x4, 2, BattleScript_1D725F + jumpifbyte 0, gUnknown_02024D1F + 0x4, 3, BattleScript_1D7271 pause 32 jump BattleScript_1D7269 @@ -585,7 +586,7 @@ BattleScript_1D725F: @ 81D725F attackanimation waitanimation atk47 - playanimation TARGET, 1, 0x20160a4 + playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 BattleScript_1D7269: @ 81D7269 printfromtable BattleTextList_40157C @@ -595,7 +596,7 @@ BattleScript_1D7271: @ 81D7271 jump BattleScript_EndTurn BattleScript_StatDown:: @ 81D7276 - playanimation 2, 1, 0x20160a4 + playanimation 2, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printfromtable BattleTextList_40157C waitmessage 64 return @@ -617,7 +618,7 @@ MoveEffect_Bide: @ 81D7297 ppreduce attackanimation waitanimation - orword 0x2024c6c, 0x8000000 + orword gHitMarker, 0x8000000 setbide jump BattleScript_EndTurn @@ -649,21 +650,21 @@ MoveEffect_MultiHit: @ 81D72ED ppreduce setloopcounter 0 atk8e - setbyte 0x2016112, 0 + setbyte gSharedMem + 0x16112, 0 BattleScript_1D7300: @ 81D7300 jumpiffainted USER, BattleScript_1D7396 jumpiffainted TARGET, BattleScript_1D7377 - jumpifhalfword 0, 0x2024be8, 214, BattleScript_1D7322 + jumpifhalfword 0, gUnknown_02024BE8, 214, BattleScript_1D7322 jumpifstatus USER, SLP, BattleScript_1D7377 BattleScript_1D7322: @ 81D7322 atk25 - copyarray 0x2024d21, 0x2016112, 1 + copyarray gUnknown_02024D1F + 0x2, gSharedMem + 0x16112, 1 critcalc atk5 atk6 - jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7374 + jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7374 atk7 attackanimation waitanimation @@ -676,10 +677,10 @@ BattleScript_1D7322: @ 81D7322 waitmessage 64 printstring BATTLE_TEXT_Terminator2 waitmessage 1 - addbyte 0x20160e4, 1 - setbyte 0x201600c, 0 + addbyte gSharedMem + 0x160E4, 1 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 - jumpifbyte 4, 0x2024c68, 64, BattleScript_1D7377 + jumpifbyte 4, gBattleMoveFlags, 64, BattleScript_1D7377 atk27 BattleScript_1D7300 jump BattleScript_1D7377 @@ -689,17 +690,17 @@ BattleScript_1D7374: @ 81D7374 BattleScript_1D7377: @ 81D7377 resultmessage waitmessage 64 - jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7396 - copyarray gBattleTextBuff1, 0x20160e0, 6 + jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7396 + copyarray gBattleTextBuff1, gSharedMem + 0x160E0, 6 printstring BATTLE_TEXT_HitMulti waitmessage 64 BattleScript_1D7396: @ 81D7396 seteffectwithchancetarget faintpokemon TARGET, 0, 0x0 - setbyte 0x201600c, 2 + setbyte gSharedMem + 0x1600C, 2 atk49 1, 0 - setbyte 0x201600c, 4 + setbyte gSharedMem + 0x1600C, 4 atk49 0, 0 end @@ -715,7 +716,7 @@ MoveEffect_Conversion: @ 81D73B1 jump BattleScript_EndTurn MoveEffect_FlinchHit: @ 81D73C6 - setbyte 0x2024d21, 8 + setbyte gUnknown_02024D1F + 0x2, 8 jump BattleScript_1D6F14 MoveEffect_RestoreHp: @ 81D73D1 @@ -725,7 +726,7 @@ MoveEffect_RestoreHp: @ 81D73D1 setdamageasrestorehalfmaxhp BattleScript_1D83B5, 1 attackanimation waitanimation - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER printstring BATTLE_TEXT_RegainedHealth @@ -747,7 +748,7 @@ MoveEffect_Toxic: @ 81D73F4 jumpifhalverset TARGET, 32, BattleScript_1D9037 attackanimation waitanimation - setbyte 0x2024d21, 6 + setbyte gUnknown_02024D1F + 0x2, 6 seteffecttarget resultmessage waitmessage 64 @@ -760,13 +761,13 @@ BattleScript_1D7455: @ 81D7455 jump BattleScript_EndTurn BattleScript_1D7463: @ 81D7463 - copyarray 0x2024c0a, 0x2024c08, 1 - setbyte 0x2024d23, 0 + copyarray gEffectBank, gBankTarget, 1 + setbyte gUnknown_02024D1F + 0x4, 0 callatk BattleScript_PSNPrevention jump BattleScript_EndTurn MoveEffect_PayDay: @ 81D747D - setbyte 0x2024d21, 11 + setbyte gUnknown_02024D1F + 0x2, 11 jump BattleScript_1D6F14 MoveEffect_LightScreen: @ 81D7488 @@ -777,7 +778,7 @@ MoveEffect_LightScreen: @ 81D7488 jump BattleScript_1D7786 MoveEffect_TriAttack: @ 81D7491 - setbyte 0x2024d21, 9 + setbyte gUnknown_02024D1F + 0x2, 9 jump BattleScript_1D6F14 MoveEffect_Rest: @ 81D749C @@ -812,7 +813,7 @@ MoveEffect_Ohko: @ 81D74E4 ppreduce accuracycheck BattleScript_ButItFailed, 65535 atk6 - jumpifbyte 4, 0x2024c68, 41, BattleScript_1D6F48 + jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D6F48 koplussomethings BattleScript_1D7505 atkab jump BattleScript_1D6F48 @@ -825,19 +826,19 @@ BattleScript_1D7505: @ 81D7505 MoveEffect_RazorWind: @ 81D7515 jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D - jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D - setbyte 0x2016055, 0 + jumpifword 4, gHitMarker, 0x200, BattleScript_1D753D + setbyte gSharedMem + 0x16055, 0 callatk BattleScript_1D756C jump BattleScript_EndTurn BattleScript_1D753D: @ 81D753D attackcanceler - setbyte 0x2024d21, 12 - setbyte 0x2016002, 1 + setbyte gUnknown_02024D1F + 0x2, 12 + setbyte gSharedMem + 0x16002, 1 clearstatus USER - orword 0x2024c6c, 0x800 - jumpifhalfword 1, 0x2024be6, 143, BattleScript_1D6F3B - setbyte 0x2024d21, 8 + orword gHitMarker, 0x800 + jumpifhalfword 1, gCurrentMove, 143, BattleScript_1D6F3B + setbyte gUnknown_02024D1F + 0x2, 8 jump BattleScript_1D6F3B BattleScript_1D756C: @ 81D756C @@ -846,10 +847,10 @@ BattleScript_1D756C: @ 81D756C ppreduce attackanimation waitanimation - orword 0x2024c6c, 0x8000000 - setbyte 0x2024d21, 76 + orword gHitMarker, 0x8000000 + setbyte gUnknown_02024D1F + 0x2, 76 seteffecttarget - copyarray 0x2024d23, 0x2016055, 1 + copyarray gUnknown_02024D1F + 0x4, gSharedMem + 0x16055, 1 printfromtable BattleTextList_401584 waitmessage 64 return @@ -860,7 +861,7 @@ MoveEffect_SuperFang: @ 81D7596 attackstring ppreduce atk6 - bicbyte 0x2024c68, 6 + bicbyte gBattleMoveFlags, 6 gethalfcurrentenemyhp jump BattleScript_1D6F48 @@ -870,22 +871,22 @@ MoveEffect_DragonRage: @ 81D75AD attackstring ppreduce atk6 - bicbyte 0x2024c68, 6 - setbyte 0x2024bec, 40 - setbyte 0x2024bed, 0 - setbyte 0x2024bee, 0 - setbyte 0x2024bef, 0 + bicbyte gBattleMoveFlags, 6 + setbyte gBattleMoveDamage, 40 + setbyte gBattleMoveDamage + 0x1, 0 + setbyte gBattleMoveDamage + 0x2, 0 + setbyte gBattleMoveDamage + 0x3, 0 atk69 jump BattleScript_1D6F48 MoveEffect_Trap: @ 81D75DC - jumpifhalfword 1, 0x2024be6, 250, BattleScript_1D7602 + jumpifhalfword 1, gCurrentMove, 250, BattleScript_1D7602 jumpifspecialstatusflag TARGET, 0x40000, 1, BattleScript_1D7602 - orword 0x2024c6c, 0x40000 - setbyte 0x201601f, 2 + orword gHitMarker, 0x40000 + setbyte gSharedMem + 0x1601F, 2 BattleScript_1D7602: @ 81D7602 - setbyte 0x2024d21, 13 + setbyte gUnknown_02024D1F + 0x2, 13 jump BattleScript_1D6F14 MoveEffect_DoubleHit: @ 81D760D @@ -895,7 +896,7 @@ MoveEffect_DoubleHit: @ 81D760D ppreduce setloopcounter 2 atk8e - setbyte 0x2016112, 0 + setbyte gSharedMem + 0x16112, 0 jump BattleScript_1D7300 MoveEffect_RecoilIfMiss: @ 81D7625 @@ -909,19 +910,19 @@ BattleScript_1D7632: @ 81D7632 pause 64 resultmessage waitmessage 64 - jumpifbyte 4, 0x2024c68, 8, BattleScript_EndTurn + jumpifbyte 4, gBattleMoveFlags, 8, BattleScript_EndTurn printstring BATTLE_TEXT_KeptGoingCrash waitmessage 64 atk5 atk6 atk7 manipulatedamage 1 - bicbyte 0x2024c68, 1 - orword 0x2024c6c, 0x100 + bicbyte gBattleMoveFlags, 1 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER faintpokemon USER, 0, 0x0 - orbyte 0x2024c68, 1 + orbyte gBattleMoveFlags, 1 jump BattleScript_EndTurn MoveEffect_Mist: @ 81D7676 @@ -948,8 +949,8 @@ MoveEffect_FocusEnergy: @ 81D7689 jump BattleScript_EndTurn MoveEffect_Recoil: @ 81D76A6 - setbyte 0x2024d21, 206 - jumpifhalfword 1, 0x2024be6, 165, BattleScript_1D6F14 + setbyte gUnknown_02024D1F + 0x2, 206 + jumpifhalfword 1, gCurrentMove, 165, BattleScript_1D6F14 atk60 27 jump BattleScript_1D6F14 @@ -964,7 +965,7 @@ MoveEffect_Confuse: @ 81D76BF jumpifhalverset TARGET, 32, BattleScript_1D9037 attackanimation waitanimation - setbyte 0x2024d21, 7 + setbyte gUnknown_02024D1F + 0x2, 7 seteffecttarget resultmessage waitmessage 64 @@ -977,23 +978,23 @@ BattleScript_1D76FE: @ 81D76FE jump BattleScript_EndTurn MoveEffect_AttackUp2: @ 81D770C - setbyte 0x201601e, 33 + setbyte gSharedMem + 0x1601E, 33 jump BattleScript_1D71B2 MoveEffect_DefenseUp2: @ 81D7717 - setbyte 0x201601e, 34 + setbyte gSharedMem + 0x1601E, 34 jump BattleScript_1D71B2 MoveEffect_SpeedUp2: @ 81D7722 - setbyte 0x201601e, 35 + setbyte gSharedMem + 0x1601E, 35 jump BattleScript_1D71B2 MoveEffect_SpecialAttackUp2: @ 81D772D - setbyte 0x201601e, 36 + setbyte gSharedMem + 0x1601E, 36 jump BattleScript_1D71B2 MoveEffect_SpecialDefenseUp2: @ 81D7738 - setbyte 0x201601e, 37 + setbyte gSharedMem + 0x1601E, 37 jump BattleScript_1D71B2 MoveEffect_Transform: @ 81D7743 @@ -1008,19 +1009,19 @@ MoveEffect_Transform: @ 81D7743 jump BattleScript_EndTurn MoveEffect_AttackDown2: @ 81D7756 - setbyte 0x201601e, 161 + setbyte gSharedMem + 0x1601E, 161 jump BattleScript_1D7227 MoveEffect_DefenseDown2: @ 81D7761 - setbyte 0x201601e, 162 + setbyte gSharedMem + 0x1601E, 162 jump BattleScript_1D7227 MoveEffect_SpeedDown2: @ 81D776C - setbyte 0x201601e, 163 + setbyte gSharedMem + 0x1601E, 163 jump BattleScript_1D7227 MoveEffect_SpecialDefenseDown2: @ 81D7777 - setbyte 0x201601e, 165 + setbyte gSharedMem + 0x1601E, 165 jump BattleScript_1D7227 MoveEffect_Reflect: @ 81D7782 @@ -1051,7 +1052,7 @@ MoveEffect_Poison: @ 81D7795 jumpifhalverset TARGET, 32, BattleScript_1D9037 attackanimation waitanimation - setbyte 0x2024d21, 2 + setbyte gUnknown_02024D1F + 0x2, 2 seteffecttarget resultmessage waitmessage 64 @@ -1064,14 +1065,14 @@ MoveEffect_Paralyze: @ 81D77F6 jumpifability TARGET, ABILITY_LIMBER, BattleScript_1D7859 jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed atk6 - jumpifbyte 4, 0x2024c68, 41, BattleScript_ButItFailed + jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_ButItFailed jumpifstatus TARGET, PAR, BattleScript_1D784B jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed accuracycheck BattleScript_ButItFailed, 0 jumpifhalverset TARGET, 32, BattleScript_1D9037 attackanimation waitanimation - setbyte 0x2024d21, 5 + setbyte gUnknown_02024D1F + 0x2, 5 seteffecttarget resultmessage waitmessage 64 @@ -1084,50 +1085,50 @@ BattleScript_1D784B: @ 81D784B jump BattleScript_EndTurn BattleScript_1D7859: @ 81D7859 - copyarray 0x2024c0a, 0x2024c08, 1 - setbyte 0x2024d23, 0 + copyarray gEffectBank, gBankTarget, 1 + setbyte gUnknown_02024D1F + 0x4, 0 callatk BattleScript_PRLZPrevention jump BattleScript_EndTurn MoveEffect_AttackDownHit: @ 81D7873 - setbyte 0x2024d21, 22 + setbyte gUnknown_02024D1F + 0x2, 22 jump BattleScript_1D6F14 MoveEffect_DefenseDownHit: @ 81D787E - setbyte 0x2024d21, 23 + setbyte gUnknown_02024D1F + 0x2, 23 jump BattleScript_1D6F14 MoveEffect_SpeedDownHit: @ 81D7889 - setbyte 0x2024d21, 24 + setbyte gUnknown_02024D1F + 0x2, 24 jump BattleScript_1D6F14 MoveEffect_SpecialAttackDownHit: @ 81D7894 - setbyte 0x2024d21, 25 + setbyte gUnknown_02024D1F + 0x2, 25 jump BattleScript_1D6F14 MoveEffect_SpecialDefenseDownHit: @ 81D789F - setbyte 0x2024d21, 26 + setbyte gUnknown_02024D1F + 0x2, 26 jump BattleScript_1D6F14 MoveEffect_AccuracyDownHit: @ 81D78AA - setbyte 0x2024d21, 27 + setbyte gUnknown_02024D1F + 0x2, 27 jump BattleScript_1D6F14 MoveEffect_SkyAttack: @ 81D78B5 jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D - jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D - setbyte 0x2016055, 3 + jumpifword 4, gHitMarker, 0x200, BattleScript_1D753D + setbyte gSharedMem + 0x16055, 3 callatk BattleScript_1D756C jump BattleScript_EndTurn MoveEffect_ConfuseHit: @ 81D78DD - setbyte 0x2024d21, 7 + setbyte gUnknown_02024D1F + 0x2, 7 jump BattleScript_1D6F14 MoveEffect_Twineedle: @ 81D78E8 attackcanceler accuracycheck BattleScript_1D6F72, 0 - setbyte 0x2016112, 2 + setbyte gSharedMem + 0x16112, 2 attackstring ppreduce setloopcounter 2 @@ -1141,7 +1142,7 @@ MoveEffect_Substitute: @ 81D7900 waitstateatk jumpifsecondarytstatus USER, S_SUBSTITUTE, BattleScript_1D7935 setsubstituteeffect - jumpifbyte 1, 0x2024d23, 1, BattleScript_1D7922 + jumpifbyte 1, gUnknown_02024D1F + 0x4, 1, BattleScript_1D7922 pause 32 jump BattleScript_1D7928 @@ -1165,7 +1166,7 @@ BattleScript_1D7935: @ 81D7935 MoveEffect_Recharge: @ 81D7943 attackcanceler accuracycheck BattleScript_1D6F72, 0 - setbyte 0x2024d21, 221 + setbyte gUnknown_02024D1F + 0x2, 221 jump BattleScript_1D6F42 BattleScript_MoveUsedMustRecharge:: @ 81D7956 @@ -1176,13 +1177,13 @@ BattleScript_MoveUsedMustRecharge:: @ 81D7956 MoveEffect_Rage: @ 81D7961 attackcanceler accuracycheck BattleScript_1D797B, 0 - setbyte 0x2024d21, 30 + setbyte gUnknown_02024D1F + 0x2, 30 seteffecttarget - setbyte 0x2024d21, 0 + setbyte gUnknown_02024D1F + 0x2, 0 jump BattleScript_1D6F42 BattleScript_1D797B: @ 81D797B - setbyte 0x2024d21, 30 + setbyte gUnknown_02024D1F + 0x2, 30 clearstatus USER jump BattleScript_1D6F72 @@ -1205,8 +1206,8 @@ MoveEffect_Metronome: @ 81D79AE pause 32 attackanimation waitanimation - setbyte 0x2016002, 0 - setbyte 0x20160a1, 0 + setbyte gSharedMem + 0x16002, 0 + setbyte gSharedMem + 0x160A1, 0 metronomeeffect MoveEffect_LeechSeed: @ 81D79C2 @@ -1254,7 +1255,7 @@ MoveEffect_LevelDamage: @ 81D7A17 attackstring ppreduce atk6 - bicbyte 0x2024c68, 6 + bicbyte gBattleMoveFlags, 6 nightshadedamageeffect atk69 jump BattleScript_1D6F48 @@ -1265,7 +1266,7 @@ MoveEffect_Psywave: @ 81D7A2F attackstring ppreduce atk6 - bicbyte 0x2024c68, 6 + bicbyte gBattleMoveFlags, 6 psywavedamageeffect atk69 jump BattleScript_1D6F48 @@ -1300,10 +1301,10 @@ MoveEffect_PainSplit: @ 81D7A79 painsplitdamagecalculator BattleScript_ButItFailed attackanimation waitanimation - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER - copyarray 0x2024bec, 0x2016014, 4 + copyarray gBattleMoveDamage, gSharedMem + 0x16014, 4 graphicalhpupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_PainSplit @@ -1318,7 +1319,7 @@ MoveEffect_Snore: @ 81D7AB0 jump BattleScript_ButItFailed BattleScript_1D7AC2: @ 81D7AC2 - jumpifhalfword 0, 0x2024be8, 214, BattleScript_1D7AD6 + jumpifhalfword 0, gUnknown_02024BE8, 214, BattleScript_1D7AD6 printstring BATTLE_TEXT_FastAsleep waitmessage 64 statusanimation USER @@ -1327,7 +1328,7 @@ BattleScript_1D7AD6: @ 81D7AD6 attackstring ppreduce accuracycheck BattleScript_1D6F77, 0 - setbyte 0x2024d21, 8 + setbyte gUnknown_02024D1F + 0x2, 8 jump BattleScript_1D6F44 MoveEffect_Conversion2: @ 81D7AEA @@ -1379,7 +1380,7 @@ BattleScript_1D7B52: @ 81D7B52 statusanimation USER attackstring ppreduce - orword 0x2024c6c, 0x800 + orword gHitMarker, 0x800 selectrandommovefromusermoves BattleScript_1D7B72 pause 64 jump BattleScript_ButItFailed @@ -1387,8 +1388,8 @@ BattleScript_1D7B52: @ 81D7B52 BattleScript_1D7B72: @ 81D7B72 attackanimation waitanimation - setbyte 0x2016002, 0 - setbyte 0x20160a1, 0 + setbyte gSharedMem + 0x16002, 0 + setbyte gSharedMem + 0x160A1, 0 jumptoattack USER MoveEffect_DestinyBond: @ 81D7B82 @@ -1428,13 +1429,13 @@ MoveEffect_HealBell: @ 81D7BB5 waitanimation printfromtable BattleTextList_4015D8 waitmessage 64 - jumpifhalfword 1, 0x2024be6, 215, BattleScript_1D7BF2 - jumpifbyte 5, 0x2024d23, 1, BattleScript_1D7BE1 + jumpifhalfword 1, gCurrentMove, 215, BattleScript_1D7BF2 + jumpifbyte 5, gUnknown_02024D1F + 0x4, 1, BattleScript_1D7BE1 printstring BATTLE_TEXT_BlocksOther waitmessage 64 BattleScript_1D7BE1: @ 81D7BE1 - jumpifbyte 5, 0x2024d23, 2, BattleScript_1D7BF2 + jumpifbyte 5, gUnknown_02024D1F + 0x4, 2, BattleScript_1D7BF2 printstring BATTLE_TEXT_BlocksOther2 waitmessage 64 @@ -1447,28 +1448,28 @@ MoveEffect_TripleKick: @ 81D7BFA attackcanceler attackstring ppreduce - setbyte 0x20160de, 0 - setbyte 0x20160df, 0 + setbyte gSharedMem + 0x160DE, 0 + setbyte gSharedMem + 0x160DF, 0 atk8e atk26 3 BattleScript_1D7C0C: @ 81D7C0C jumpiffainted USER, BattleScript_1D7CAF jumpiffainted TARGET, BattleScript_1D7C8D - jumpifhalfword 0, 0x2024be8, 214, BattleScript_1D7C2E + jumpifhalfword 0, gUnknown_02024BE8, 214, BattleScript_1D7C2E jumpifstatus USER, SLP, BattleScript_1D7C8D BattleScript_1D7C2E: @ 81D7C2E atk25 accuracycheck BattleScript_1D7C8D, 0 - addbyte 0x20160de, 10 - addbyte 0x20160e4, 1 - copyarray 0x2024dec, 0x20160de, 2 + addbyte gSharedMem + 0x160DE, 10 + addbyte gSharedMem + 0x160E4, 1 + copyarray gDynamicBasePower, gSharedMem + 0x160DE, 2 critcalc atk5 atk6 atk7 - jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7C8D + jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7C8D attackanimation waitanimation missmessage @@ -1480,9 +1481,9 @@ BattleScript_1D7C2E: @ 81D7C2E waitmessage 64 printstring BATTLE_TEXT_Terminator2 waitmessage 1 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 - jumpifbyte 4, 0x2024c68, 64, BattleScript_1D7C90 + jumpifbyte 4, gBattleMoveFlags, 64, BattleScript_1D7C90 atk27 BattleScript_1D7C0C jump BattleScript_1D7C90 @@ -1492,20 +1493,20 @@ BattleScript_1D7C8D: @ 81D7C8D BattleScript_1D7C90: @ 81D7C90 resultmessage waitmessage 64 - jumpifbyte 0, 0x20160e4, 0, BattleScript_1D7CAF - copyarray gBattleTextBuff1, 0x20160e0, 6 + jumpifbyte 0, gSharedMem + 0x160E4, 0, BattleScript_1D7CAF + copyarray gBattleTextBuff1, gSharedMem + 0x160E0, 6 printstring BATTLE_TEXT_HitMulti waitmessage 64 BattleScript_1D7CAF: @ 81D7CAF seteffectwithchancetarget faintpokemon TARGET, 0, 0x0 - setbyte 0x201600c, 14 + setbyte gSharedMem + 0x1600C, 14 atk49 0, 0 end MoveEffect_Thief: @ 81D7CC1 - setbyte 0x2024d21, 31 + setbyte gUnknown_02024D1F + 0x2, 31 jump BattleScript_1D6F14 MoveEffect_MeanLook: @ 81D7CCC @@ -1516,7 +1517,7 @@ MoveEffect_MeanLook: @ 81D7CCC jumpifsecondarytstatus TARGET, S_MEAN_LOOK, BattleScript_ButItFailed attackanimation waitanimation - setbyte 0x2024d21, 32 + setbyte gUnknown_02024D1F + 0x2, 32 seteffecttarget printstring BATTLE_TEXT_CantEscapeNow waitmessage 64 @@ -1534,7 +1535,7 @@ MoveEffect_Nightmare: @ 81D7CF4 BattleScript_1D7D1A: @ 81D7D1A attackanimation waitanimation - setbyte 0x2024d21, 33 + setbyte gUnknown_02024D1F + 0x2, 33 seteffecttarget printstring BATTLE_TEXT_NightmareStart waitmessage 64 @@ -1543,7 +1544,7 @@ BattleScript_1D7D1A: @ 81D7D1A MoveEffect_Minimize: @ 81D7D2E attackcanceler setminimize - setbyte 0x201601e, 23 + setbyte gSharedMem + 0x1601E, 23 jump BattleScript_1D71B3 MoveEffect_Curse: @ 81D7D3B @@ -1556,23 +1557,23 @@ MoveEffect_Curse: @ 81D7D3B jumpifstat USER, 0, 2, 12, BattleScript_ButItFailed BattleScript_1D7D60: @ 81D7D60 - copyarray 0x2024c08, 0x2024c07, 1 - setbyte 0x2016002, 1 + copyarray gBankTarget, gBankAttacker, 1 + setbyte gSharedMem + 0x16002, 1 attackanimation waitanimation - setbyte 0x201601e, 147 + setbyte gSharedMem + 0x1601E, 147 statbuffchange 65, BattleScript_1D7D86 printfromtable BattleTextList_40157C waitmessage 64 BattleScript_1D7D86: @ 81D7D86 - setbyte 0x201601e, 17 + setbyte gSharedMem + 0x1601E, 17 statbuffchange 65, BattleScript_1D7D9A printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D7D9A: @ 81D7D9A - setbyte 0x201601e, 18 + setbyte gSharedMem + 0x1601E, 18 statbuffchange 65, BattleScript_1D7DAE printfromtable BattleTextList_401570 waitmessage 64 @@ -1581,7 +1582,7 @@ BattleScript_1D7DAE: @ 81D7DAE jump BattleScript_EndTurn BattleScript_1D7DB3: @ 81D7DB3 - jumpifarraynotequal 0x2024c07, 0x2024c08, 1, BattleScript_1D7DC4 + jumpifarraynotequal gBankAttacker, gBankTarget, 1, BattleScript_1D7DC4 atk76 USER, 3 BattleScript_1D7DC4: @ 81D7DC4 @@ -1590,8 +1591,8 @@ BattleScript_1D7DC4: @ 81D7DC4 ppreduce jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed cursetarget BattleScript_ButItFailed - orword 0x2024c6c, 0x100 - setbyte 0x2016002, 0 + orword gHitMarker, 0x100 + setbyte gSharedMem + 0x16002, 0 attackanimation waitanimation graphicalhpupdate USER @@ -1645,14 +1646,14 @@ MoveEffect_PerishSong: @ 81D7E3D waitanimation printstring BATTLE_TEXT_PerishSong waitmessage 64 - setbyte 0x2016003, 0 + setbyte gSharedMem + 0x16003, 0 BattleScript_1D7E53: @ 81D7E53 jumpifability 10, ABILITY_SOUNDPROOF, BattleScript_1D7E73 BattleScript_1D7E5A: @ 81D7E5A - addbyte 0x2016003, 1 - jumpifarraynotequal 0x2016003, 0x2024a68, 1, BattleScript_1D7E53 + addbyte gSharedMem + 0x16003, 1 + jumpifarraynotequal gSharedMem + 0x16003, gNoOfAllBanks, 1, BattleScript_1D7E53 jump BattleScript_EndTurn BattleScript_1D7E73: @ 81D7E73 @@ -1690,18 +1691,18 @@ MoveEffect_Swagger: @ 81D7EA2 jumpifconfusedandattackmaxed 1, BattleScript_ButItFailed attackanimation waitanimation - setbyte 0x201601e, 33 + setbyte gSharedMem + 0x1601E, 33 statbuffchange 1, BattleScript_1D7EE5 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D7EE5 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D7EE5 atk47 - playanimation TARGET, 1, 0x20160a4 + playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D7EE5: @ 81D7EE5 jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D98E5 jumpifhalverset TARGET, 32, BattleScript_1D9037 - setbyte 0x2024d21, 7 + setbyte gUnknown_02024D1F + 0x2, 7 seteffecttarget jump BattleScript_EndTurn @@ -1716,7 +1717,7 @@ BattleScript_1D7F0A: @ 81D7F0A critcalc atk5 atk6 - jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7F0A + jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7F0A atk7 jump BattleScript_1D6F48 @@ -1755,7 +1756,7 @@ MoveEffect_Safeguard: @ 81D7F55 jump BattleScript_1D7786 MoveEffect_ThawHit: @ 81D7F5E - setbyte 0x2024d21, 3 + setbyte gUnknown_02024D1F + 0x2, 3 jump BattleScript_1D6F14 MoveEffect_Magnitude: @ 81D7F69 @@ -1791,7 +1792,7 @@ MoveEffect_BatonPass: @ 81D7F7C jump BattleScript_EndTurn MoveEffect_RapidSpin: @ 81D7FA9 - setbyte 0x2024d21, 163 + setbyte gUnknown_02024D1F + 0x2, 163 jump BattleScript_1D6F14 MoveEffect_Sonicboom: @ 81D7FB4 @@ -1800,11 +1801,11 @@ MoveEffect_Sonicboom: @ 81D7FB4 attackstring ppreduce atk6 - bicbyte 0x2024c68, 6 - setbyte 0x2024bec, 20 - setbyte 0x2024bed, 0 - setbyte 0x2024bee, 0 - setbyte 0x2024bef, 0 + bicbyte gBattleMoveFlags, 6 + setbyte gBattleMoveDamage, 20 + setbyte gBattleMoveDamage + 0x1, 0 + setbyte gBattleMoveDamage + 0x2, 0 + setbyte gBattleMoveDamage + 0x3, 0 atk69 jump BattleScript_1D6F48 @@ -1843,15 +1844,15 @@ MoveEffect_SunnyDay: @ 81D800E jump BattleScript_1D7FFA MoveEffect_DefenseUpHit: @ 81D8017 - setbyte 0x2024d21, 80 + setbyte gUnknown_02024D1F + 0x2, 80 jump BattleScript_1D6F14 MoveEffect_AttackUpHit: @ 81D8022 - setbyte 0x2024d21, 79 + setbyte gUnknown_02024D1F + 0x2, 79 jump BattleScript_1D6F14 MoveEffect_AllStatsUpHit: @ 81D802D - setbyte 0x2024d21, 98 + setbyte gUnknown_02024D1F + 0x2, 98 jump BattleScript_1D6F14 MoveEffect_BellyDrum: @ 81D8038 @@ -1859,7 +1860,7 @@ MoveEffect_BellyDrum: @ 81D8038 attackstring ppreduce maxattackhalvehp BattleScript_ButItFailed - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 attackanimation waitanimation graphicalhpupdate USER @@ -1891,14 +1892,14 @@ MoveEffect_MirrorCoat: @ 81D806F MoveEffect_SkullBash: @ 81D8085 jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D - jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D - setbyte 0x2016055, 2 + jumpifword 4, gHitMarker, 0x200, BattleScript_1D753D + setbyte gSharedMem + 0x16055, 2 callatk BattleScript_1D756C - setbyte 0x201601e, 18 + setbyte gSharedMem + 0x1601E, 18 statbuffchange 65, BattleScript_1D80CF - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D80CF + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D80CF atk47 - playanimation USER, 1, 0x20160a4 + playanimation USER, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printfromtable BattleTextList_401570 waitmessage 64 @@ -1907,11 +1908,11 @@ BattleScript_1D80CF: @ 81D80CF MoveEffect_Twister: @ 81D80D4 jumpifspecialstatusflag TARGET, 0x40, 1, BattleScript_1D80EE - orword 0x2024c6c, 0x10000 - setbyte 0x201601f, 2 + orword gHitMarker, 0x10000 + setbyte gSharedMem + 0x1601F, 2 BattleScript_1D80EE: @ 81D80EE - setbyte 0x2024d21, 8 + setbyte gUnknown_02024D1F + 0x2, 8 jump BattleScript_1D6F14 MoveEffect_Earthquake: @ 81D80F9 @@ -1923,13 +1924,13 @@ MoveEffect_Earthquake: @ 81D80F9 BattleScript_1D80FD: @ 81D80FD atk25 jumpifspecialstatusflag TARGET, 0x80, 1, BattleScript_1D811D - orword 0x2024c6c, 0x20000 - setbyte 0x201601f, 2 + orword gHitMarker, 0x20000 + setbyte gSharedMem + 0x1601F, 2 jump BattleScript_1D812C BattleScript_1D811D: @ 81D811D - bicword 0x2024c6c, 0x20000 - setbyte 0x201601f, 1 + bicword gHitMarker, 0x20000 + setbyte gSharedMem + 0x1601F, 1 BattleScript_1D812C: @ 81D812C accuracycheck BattleScript_1D8165, 0 @@ -1951,7 +1952,7 @@ BattleScript_1D812C: @ 81D812C printstring BATTLE_TEXT_Terminator2 waitmessage 1 faintpokemon TARGET, 0, 0x0 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 jumpwhiletargetvalid BattleScript_1D80FD end @@ -1962,7 +1963,7 @@ BattleScript_1D8165: @ 81D8165 missmessage resultmessage waitmessage 64 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 jumpwhiletargetvalid BattleScript_1D80FD end @@ -1980,52 +1981,52 @@ MoveEffect_FutureSight: @ 81D817D MoveEffect_Gust: @ 81D8194 jumpifspecialstatusflag TARGET, 0x40, 1, BattleScript_1D6F14 - orword 0x2024c6c, 0x10000 - setbyte 0x201601f, 2 + orword gHitMarker, 0x10000 + setbyte gSharedMem + 0x1601F, 2 jump BattleScript_1D6F14 MoveEffect_FlinchHit2: @ 81D81B3 jumpifspecialstatusflag TARGET, 0x100, 1, BattleScript_1D80EE - setbyte 0x201601f, 2 + setbyte gSharedMem + 0x1601F, 2 jump BattleScript_1D80EE MoveEffect_Solarbeam: @ 81D81C9 jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_1D81E1 jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_1D81E1 - jumpifhalfword 4, 0x2024db8, 96, BattleScript_1D8209 + jumpifhalfword 4, gBattleWeather, 96, BattleScript_1D8209 BattleScript_1D81E1: @ 81D81E1 jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D - jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D - setbyte 0x2016055, 1 + jumpifword 4, gHitMarker, 0x200, BattleScript_1D753D + setbyte gSharedMem + 0x16055, 1 callatk BattleScript_1D756C jump BattleScript_EndTurn BattleScript_1D8209: @ 81D8209 - orword 0x2024c6c, 0x8000000 - setbyte 0x2024d21, 76 + orword gHitMarker, 0x8000000 + setbyte gUnknown_02024D1F + 0x2, 76 seteffecttarget ppreduce jump BattleScript_1D753D MoveEffect_Thunder: @ 81D821F - setbyte 0x2024d21, 5 - orword 0x2024c6c, 0x10000 + setbyte gUnknown_02024D1F + 0x2, 5 + orword gHitMarker, 0x10000 jump BattleScript_1D6F14 MoveEffect_Teleport: @ 81D8233 attackcanceler attackstring ppreduce - jumpifhalfword 4, 0x20239f8, 8, BattleScript_ButItFailed + jumpifhalfword 4, gBattleTypeFlags, 8, BattleScript_ButItFailed atk76 USER, 2 - jumpifbyte 0, 0x2024d1e, 1, BattleScript_ButItFailed - jumpifbyte 0, 0x2024d1e, 2, BattleScript_1D8839 + jumpifbyte 0, gBattleCommunication, 1, BattleScript_ButItFailed + jumpifbyte 0, gBattleCommunication, 2, BattleScript_1D8839 attackanimation waitanimation printstring BATTLE_TEXT_FledBattle waitmessage 64 - setbyte 0x2024d26, 5 + setbyte gBattleOutcome, 5 jump BattleScript_EndTurn MoveEffect_BeatUp: @ 81D826E @@ -2034,14 +2035,14 @@ MoveEffect_BeatUp: @ 81D826E attackstring pause 32 ppreduce - setbyte 0x2024d1e, 0 + setbyte gBattleCommunication, 0 BattleScript_1D8281: @ 81D8281 atk25 beatupcalculation BattleScript_1D82C4, BattleScript_ButItFailed printstring BATTLE_TEXT_PokeAttack critcalc - jumpifbyte 1, 0x2024c0d, 2, BattleScript_1D829C + jumpifbyte 1, gCritMultiplier, 2, BattleScript_1D829C manipulatedamage 2 BattleScript_1D829C: @ 81D829C @@ -2058,7 +2059,7 @@ BattleScript_1D829C: @ 81D829C resultmessage waitmessage 64 faintpokemon TARGET, 0, 0x0 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 jump BattleScript_1D8281 @@ -2067,23 +2068,23 @@ BattleScript_1D82C4: @ 81D82C4 MoveEffect_Fly: @ 81D82C5 jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D8333 - jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D8333 - jumpifhalfword 0, 0x2024be6, 19, BattleScript_1D8322 - jumpifhalfword 0, 0x2024be6, 291, BattleScript_1D8317 - jumpifhalfword 0, 0x2024be6, 340, BattleScript_1D830C - setbyte 0x2016055, 5 + jumpifword 4, gHitMarker, 0x200, BattleScript_1D8333 + jumpifhalfword 0, gCurrentMove, 19, BattleScript_1D8322 + jumpifhalfword 0, gCurrentMove, 291, BattleScript_1D8317 + jumpifhalfword 0, gCurrentMove, 340, BattleScript_1D830C + setbyte gSharedMem + 0x16055, 5 jump BattleScript_1D8328 BattleScript_1D830C: @ 81D830C - setbyte 0x2016055, 7 + setbyte gSharedMem + 0x16055, 7 jump BattleScript_1D8328 BattleScript_1D8317: @ 81D8317 - setbyte 0x2016055, 6 + setbyte gSharedMem + 0x16055, 6 jump BattleScript_1D8328 BattleScript_1D8322: @ 81D8322 - setbyte 0x2016055, 4 + setbyte gSharedMem + 0x16055, 4 BattleScript_1D8328: @ 81D8328 callatk BattleScript_1D756C @@ -2092,12 +2093,12 @@ BattleScript_1D8328: @ 81D8328 BattleScript_1D8333: @ 81D8333 attackcanceler - setbyte 0x2024d21, 12 - setbyte 0x2016002, 1 + setbyte gUnknown_02024D1F + 0x2, 12 + setbyte gSharedMem + 0x16002, 1 clearstatus USER - orword 0x2024c6c, 0x800 - jumpifhalfword 1, 0x2024be6, 340, BattleScript_1D835D - setbyte 0x2024d21, 5 + orword gHitMarker, 0x800 + jumpifhalfword 1, gCurrentMove, 340, BattleScript_1D835D + setbyte gUnknown_02024D1F + 0x2, 5 BattleScript_1D835D: @ 81D835D accuracycheck BattleScript_1D836A, 0 @@ -2113,9 +2114,9 @@ MoveEffect_DefenseCurl: @ 81D8370 attackstring ppreduce setcurled - setbyte 0x201601e, 18 + setbyte gSharedMem + 0x1601E, 18 statbuffchange 65, BattleScript_1D838D - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D71D8 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D71D8 attackanimation waitanimation @@ -2131,7 +2132,7 @@ MoveEffect_Softboiled: @ 81D8392 BattleScript_1D839B:: @ 81D839B attackanimation waitanimation - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_RegainedHealth @@ -2147,7 +2148,7 @@ BattleScript_1D83B5:: @ 81D83B5 MoveEffect_FakeOut: @ 81D83C3 attackcanceler jumpifnotfirstturn BattleScript_1D83D4 - setbyte 0x2024d21, 136 + setbyte gUnknown_02024D1F + 0x2, 136 jump BattleScript_1D6F14 BattleScript_1D83D4: @ 81D83D4 @@ -2158,14 +2159,14 @@ BattleScript_1D83D5: @ 81D83D5 BattleScript_ButItFailed:: @ 81D83D6 pause 32 - orbyte 0x2024c68, 32 + orbyte gBattleMoveFlags, 32 resultmessage waitmessage 64 jump BattleScript_EndTurn BattleScript_1D83E8: @ 81D83E8 pause 32 - orbyte 0x2024c68, 8 + orbyte gBattleMoveFlags, 8 resultmessage waitmessage 64 jump BattleScript_EndTurn @@ -2173,7 +2174,7 @@ BattleScript_1D83E8: @ 81D83E8 MoveEffect_Uproar: @ 81D83FA attackcanceler accuracycheck BattleScript_1D6F72, 0 - setbyte 0x2024d21, 74 + setbyte gUnknown_02024D1F + 0x2, 74 attackstring jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D8414 ppreduce @@ -2195,7 +2196,7 @@ MoveEffect_Stockpile: @ 81D841A MoveEffect_SpitUp: @ 81D842D attackcanceler - jumpifbyte 0, 0x2024d24, 1, BattleScript_1D845C + jumpifbyte 0, gUnknown_02024D1F + 0x5, 1, BattleScript_1D845C attackstring ppreduce accuracycheck BattleScript_1D6F72, 0 @@ -2260,18 +2261,18 @@ MoveEffect_Flatter: @ 81D84B1 jumpifconfusedandattackmaxed 4, BattleScript_ButItFailed attackanimation waitanimation - setbyte 0x201601e, 20 + setbyte gSharedMem + 0x1601E, 20 statbuffchange 1, BattleScript_1D84F4 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D84F4 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D84F4 atk47 - playanimation TARGET, 1, 0x20160a4 + playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D84F4: @ 81D84F4 jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D98E5 jumpifhalverset TARGET, 32, BattleScript_1D9037 - setbyte 0x2024d21, 7 + setbyte gUnknown_02024D1F + 0x2, 7 seteffecttarget jump BattleScript_EndTurn @@ -2288,13 +2289,13 @@ MoveEffect_WillOWisp: @ 81D850F jumpifhalverset TARGET, 32, BattleScript_1D9037 attackanimation waitanimation - setbyte 0x2024d21, 3 + setbyte gUnknown_02024D1F + 0x2, 3 seteffecttarget jump BattleScript_EndTurn BattleScript_1D855B: @ 81D855B - copyarray 0x2024c0a, 0x2024c08, 1 - setbyte 0x2024d23, 0 + copyarray gEffectBank, gBankTarget, 1 + setbyte gUnknown_02024D1F + 0x4, 0 callatk BattleScript_BRNPrevention jump BattleScript_EndTurn @@ -2306,7 +2307,7 @@ BattleScript_1D8575: @ 81D8575 MoveEffect_Memento: @ 81D8583 attackcanceler - jumpifbyte 0, 0x2024d24, 1, BattleScript_1D860A + jumpifbyte 0, gUnknown_02024D1F + 0x5, 1, BattleScript_1D860A attackstring ppreduce jumpifattackandspecialattackcannotfall BattleScript_ButItFailed @@ -2314,20 +2315,20 @@ MoveEffect_Memento: @ 81D8583 attackanimation waitanimation jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D85FF - setbyte 0x20160dc, 0 + setbyte gSharedMem + 0x160DC, 0 playstatchangeanimation TARGET, 18, 7 playstatchangeanimation TARGET, 2, 3 - setbyte 0x201601e, 161 + setbyte gSharedMem + 0x1601E, 161 statbuffchange 1, BattleScript_1D85D0 - jumpifbyte 2, 0x2024d23, 1, BattleScript_1D85D0 + jumpifbyte 2, gUnknown_02024D1F + 0x4, 1, BattleScript_1D85D0 printfromtable BattleTextList_40157C waitmessage 64 BattleScript_1D85D0: @ 81D85D0 playstatchangeanimation TARGET, 16, 3 - setbyte 0x201601e, 164 + setbyte gSharedMem + 0x1601E, 164 statbuffchange 1, BattleScript_1D85F3 - jumpifbyte 2, 0x2024d23, 1, BattleScript_1D85F3 + jumpifbyte 2, gUnknown_02024D1F + 0x4, 1, BattleScript_1D85F3 printfromtable BattleTextList_40157C waitmessage 64 @@ -2359,7 +2360,7 @@ MoveEffect_Facade: @ 81D8626 jump BattleScript_1D6F14 BattleScript_1D8635: @ 81D8635 - setbyte 0x201601f, 2 + setbyte gSharedMem + 0x1601F, 2 jump BattleScript_1D6F14 MoveEffect_FocusPunch: @ 81D8640 @@ -2372,12 +2373,12 @@ MoveEffect_FocusPunch: @ 81D8640 MoveEffect_Smellingsalt: @ 81D8652 jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D6F14 - setbyte 0x2024d21, 164 + setbyte gUnknown_02024D1F + 0x2, 164 jumpifstatus TARGET, PAR, BattleScript_1D8671 jump BattleScript_1D6F14 BattleScript_1D8671: @ 81D8671 - setbyte 0x201601f, 2 + setbyte gSharedMem + 0x1601F, 2 jump BattleScript_1D6F14 MoveEffect_FollowMe: @ 81D867C @@ -2476,8 +2477,8 @@ MoveEffect_Assist: @ 81D8736 assistattackselect BattleScript_1D83D5 attackanimation waitanimation - setbyte 0x2016002, 0 - setbyte 0x20160a1, 0 + setbyte gSharedMem + 0x16002, 0 + setbyte gSharedMem + 0x160A1, 0 jumptoattack USER MoveEffect_Ingrain: @ 81D874D @@ -2492,7 +2493,7 @@ MoveEffect_Ingrain: @ 81D874D jump BattleScript_EndTurn MoveEffect_Superpower: @ 81D8762 - setbyte 0x2024d21, 229 + setbyte gUnknown_02024D1F + 0x2, 229 jump BattleScript_1D6F14 MoveEffect_MagicCoat: @ 81D876D @@ -2531,13 +2532,13 @@ MoveEffect_BrickBreak: @ 81D879D atk5 atk6 atk7 - jumpifbyte 0, 0x2016002, 0, BattleScript_1D87BD - bicbyte 0x2024c68, 9 + jumpifbyte 0, gSharedMem + 0x16002, 0, BattleScript_1D87BD + bicbyte gBattleMoveFlags, 9 BattleScript_1D87BD: @ 81D87BD attackanimation waitanimation - jumpifbyte 3, 0x2016002, 2, BattleScript_1D87D0 + jumpifbyte 3, gSharedMem + 0x16002, 2, BattleScript_1D87D0 printstring BATTLE_TEXT_BrokeWall waitmessage 64 @@ -2574,7 +2575,7 @@ MoveEffect_Yawn: @ 81D87EE jump BattleScript_EndTurn BattleScript_1D882F: @ 81D882F - copyarray 0x2016003, 0x20160f8, 1 + copyarray gSharedMem + 0x16003, gSharedMem + 0x160F8, 1 BattleScript_1D8839: @ 81D8839 pause 32 @@ -2583,7 +2584,7 @@ BattleScript_1D8839: @ 81D8839 jump BattleScript_EndTurn MoveEffect_KnockOff: @ 81D8847 - setbyte 0x2024d21, 54 + setbyte gUnknown_02024D1F + 0x2, 54 jump BattleScript_1D6F14 MoveEffect_Endeavor: @ 81D8852 @@ -2591,12 +2592,12 @@ MoveEffect_Endeavor: @ 81D8852 attackstring ppreduce setdamagetohealthdifference BattleScript_ButItFailed - copyarray 0x2024bf0, 0x2024bec, 4 + copyarray gHP_dealt, gBattleMoveDamage, 4 accuracycheck BattleScript_1D6F77, 0 atk6 - jumpifbyte 4, 0x2024c68, 41, BattleScript_1D6F48 - bicbyte 0x2024c68, 6 - copyarray 0x2024bec, 0x2024bf0, 4 + jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D6F48 + bicbyte gBattleMoveFlags, 6 + copyarray gBattleMoveDamage, gHP_dealt, 4 atk69 jump BattleScript_1D6F48 @@ -2675,19 +2676,19 @@ MoveEffect_SecretPower: @ 81D8918 jump BattleScript_1D6F14 MoveEffect_DoubleEdge: @ 81D891E - setbyte 0x2024d21, 230 + setbyte gUnknown_02024D1F + 0x2, 230 jump BattleScript_1D6F14 MoveEffect_TeeterDance: @ 81D8929 attackcanceler attackstring ppreduce - setbyte 0x2024c08, 0 + setbyte gBankTarget, 0 BattleScript_1D8932: @ 81D8932 atk25 - setbyte 0x2024d21, 7 - jumpifarrayequal 0x2024c07, 0x2024c08, 1, BattleScript_1D8978 + setbyte gUnknown_02024D1F + 0x2, 7 + jumpifarrayequal gBankAttacker, gBankTarget, 1, BattleScript_1D8978 jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D8996 jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D89B2 jumpifsecondarytstatus TARGET, S_CONFUSED, BattleScript_1D89C0 @@ -2700,10 +2701,10 @@ BattleScript_1D8932: @ 81D8932 waitmessage 64 BattleScript_1D8978: @ 81D8978 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 - addbyte 0x2024c08, 1 - jumpifarraynotequal 0x2024c08, 0x2024a68, 1, BattleScript_1D8932 + addbyte gBankTarget, 1 + jumpifarraynotequal gBankTarget, gNoOfAllBanks, 1, BattleScript_1D8932 end BattleScript_1D8996: @ 81D8996 @@ -2748,7 +2749,7 @@ MoveEffect_WaterSport: @ 81D89D7 jump BattleScript_EndTurn MoveEffect_PoisonFang: @ 81D89EE - setbyte 0x2024d21, 6 + setbyte gUnknown_02024D1F + 0x2, 6 jump BattleScript_1D6F14 MoveEffect_WeatherBall: @ 81D89F9 @@ -2756,7 +2757,7 @@ MoveEffect_WeatherBall: @ 81D89F9 jump BattleScript_1D6F14 MoveEffect_Overheat: @ 81D89FF - setbyte 0x2024d21, 251 + setbyte gUnknown_02024D1F + 0x2, 251 jump BattleScript_1D6F14 MoveEffect_Tickle: @ 81D8A0A @@ -2770,20 +2771,20 @@ BattleScript_1D8A1F: @ 81D8A1F accuracycheck BattleScript_ButItFailed, 0 attackanimation waitanimation - setbyte 0x20160dc, 0 + setbyte gSharedMem + 0x160DC, 0 playstatchangeanimation TARGET, 6, 5 playstatchangeanimation TARGET, 2, 1 - setbyte 0x201601e, 145 + setbyte gSharedMem + 0x1601E, 145 statbuffchange 1, BattleScript_1D8A55 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8A55 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8A55 printfromtable BattleTextList_40157C waitmessage 64 BattleScript_1D8A55: @ 81D8A55 playstatchangeanimation TARGET, 4, 1 - setbyte 0x201601e, 146 + setbyte gSharedMem + 0x1601E, 146 statbuffchange 1, BattleScript_1D8A78 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8A78 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8A78 printfromtable BattleTextList_40157C waitmessage 64 @@ -2792,7 +2793,7 @@ BattleScript_1D8A78: @ 81D8A78 BattleScript_1D8A7D: @ 81D8A7D pause 32 - orbyte 0x2024c68, 32 + orbyte gBattleMoveFlags, 32 printstring BATTLE_TEXT_StatNoLower waitmessage 64 jump BattleScript_EndTurn @@ -2807,18 +2808,18 @@ MoveEffect_CosmicPower: @ 81D8A91 BattleScript_1D8AA6: @ 81D8AA6 attackanimation waitanimation - setbyte 0x20160dc, 0 + setbyte gSharedMem + 0x160DC, 0 playstatchangeanimation USER, 36, 0 - setbyte 0x201601e, 18 + setbyte gSharedMem + 0x1601E, 18 statbuffchange 65, BattleScript_1D8AD1 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8AD1 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8AD1 printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D8AD1: @ 81D8AD1 - setbyte 0x201601e, 21 + setbyte gSharedMem + 0x1601E, 21 statbuffchange 65, BattleScript_1D8AF0 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8AF0 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8AF0 printfromtable BattleTextList_401570 waitmessage 64 @@ -2826,7 +2827,7 @@ BattleScript_1D8AF0: @ 81D8AF0 jump BattleScript_EndTurn MoveEffect_SkyUppercut: @ 81D8AF5 - orword 0x2024c6c, 0x10000 + orword gHitMarker, 0x10000 jump BattleScript_1D6F14 MoveEffect_BulkUp: @ 81D8B03 @@ -2839,18 +2840,18 @@ MoveEffect_BulkUp: @ 81D8B03 BattleScript_1D8B18: @ 81D8B18 attackanimation waitanimation - setbyte 0x20160dc, 0 + setbyte gSharedMem + 0x160DC, 0 playstatchangeanimation USER, 6, 0 - setbyte 0x201601e, 17 + setbyte gSharedMem + 0x1601E, 17 statbuffchange 65, BattleScript_1D8B43 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8B43 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8B43 printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D8B43: @ 81D8B43 - setbyte 0x201601e, 18 + setbyte gSharedMem + 0x1601E, 18 statbuffchange 65, BattleScript_1D8B62 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8B62 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8B62 printfromtable BattleTextList_401570 waitmessage 64 @@ -2867,18 +2868,18 @@ MoveEffect_CalmMind: @ 81D8B67 BattleScript_1D8B7C: @ 81D8B7C attackanimation waitanimation - setbyte 0x20160dc, 0 + setbyte gSharedMem + 0x160DC, 0 playstatchangeanimation USER, 48, 0 - setbyte 0x201601e, 20 + setbyte gSharedMem + 0x1601E, 20 statbuffchange 65, BattleScript_1D8BA7 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8BA7 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8BA7 printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D8BA7: @ 81D8BA7 - setbyte 0x201601e, 21 + setbyte gSharedMem + 0x1601E, 21 statbuffchange 65, BattleScript_1D8BC6 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8BC6 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8BC6 printfromtable BattleTextList_401570 waitmessage 64 @@ -2887,7 +2888,7 @@ BattleScript_1D8BC6: @ 81D8BC6 BattleScript_1D8BCB: @ 81D8BCB pause 32 - orbyte 0x2024c68, 32 + orbyte gBattleMoveFlags, 32 printstring BATTLE_TEXT_StatNoHigher waitmessage 64 jump BattleScript_EndTurn @@ -2902,18 +2903,18 @@ MoveEffect_DragonDance: @ 81D8BDF BattleScript_1D8BF4: @ 81D8BF4 attackanimation waitanimation - setbyte 0x20160dc, 0 + setbyte gSharedMem + 0x160DC, 0 playstatchangeanimation USER, 10, 0 - setbyte 0x201601e, 17 + setbyte gSharedMem + 0x1601E, 17 statbuffchange 65, BattleScript_1D8C1F - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8C1F + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8C1F printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D8C1F: @ 81D8C1F - setbyte 0x201601e, 19 + setbyte gSharedMem + 0x1601E, 19 statbuffchange 65, BattleScript_1D8C3E - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8C3E + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8C3E printfromtable BattleTextList_401570 waitmessage 64 @@ -2948,40 +2949,40 @@ gUnknown_081D8C65:: @ 81D8C65 return gUnknown_081D8C72:: @ 81D8C72 - setbyte 0x201600f, 0 + setbyte gSharedMem + 0x1600F, 0 atk23 0 end2 gUnknown_081D8C7B:: @ 81D8C7B atk24 BattleScript_1D8D87 - jumpifbyte 1, 0x2024d26, 0, BattleScript_1D8D86 - jumpifhalfword 4, 0x20239f8, 8, BattleScript_1D8CC2 - jumpifword 5, 0x2024c6c, 0x400000, BattleScript_1D8CC2 + jumpifbyte 1, gBattleOutcome, 0, BattleScript_1D8D86 + jumpifhalfword 4, gBattleTypeFlags, 8, BattleScript_1D8CC2 + jumpifword 5, gHitMarker, 0x400000, BattleScript_1D8CC2 printstring BATTLE_TEXT_UseNext - setbyte 0x2024d1e, 0 + setbyte gBattleCommunication, 0 atk67 - jumpifbyte 0, 0x2024d1f, 0, BattleScript_1D8CC2 + jumpifbyte 0, gUnknown_02024D1F, 0, BattleScript_1D8CC2 atk72 BattleScript_1D8D86 printstring BATTLE_TEXT_CantEscape BattleScript_1D8CC2: @ 81D8CC2 openpartyscreen 3, BattleScript_1D8D86 atk51 3, 2 - jumpifhalfword 5, 0x20239f8, 8, BattleScript_1D8D66 - jumpifhalfword 4, 0x20239f8, 2, BattleScript_1D8D66 - jumpifhalfword 4, 0x20239f8, 256, BattleScript_1D8D66 - jumpifhalfword 4, 0x20239f8, 1, BattleScript_1D8D66 - jumpifword 4, 0x2024c6c, 0x400000, BattleScript_1D8D66 - jumpifbyte 0, 0x2016084, 1, BattleScript_1D8D66 + jumpifhalfword 5, gBattleTypeFlags, 8, BattleScript_1D8D66 + jumpifhalfword 4, gBattleTypeFlags, 2, BattleScript_1D8D66 + jumpifhalfword 4, gBattleTypeFlags, 256, BattleScript_1D8D66 + jumpifhalfword 4, gBattleTypeFlags, 1, BattleScript_1D8D66 + jumpifword 4, gHitMarker, 0x400000, BattleScript_1D8D66 + jumpifbyte 0, gSharedMem + 0x16084, 1, BattleScript_1D8D66 jumpifcannotswitch USER, BattleScript_1D8D66 printstring BATTLE_TEXT_WillSwitch - setbyte 0x2024d1e, 0 + setbyte gBattleCommunication, 0 atk67 - jumpifbyte 0, 0x2024d1f, 1, BattleScript_1D8D66 + jumpifbyte 0, gUnknown_02024D1F, 1, BattleScript_1D8D66 atk6e openpartyscreen 129, BattleScript_1D8D66 atk51 USER, 2 - jumpifbyte 0, 0x2024d1e, 6, BattleScript_1D8D66 + jumpifbyte 0, gBattleCommunication, 6, BattleScript_1D8D66 atk6b atk76 USER, 5 atk74 1 @@ -3011,7 +3012,7 @@ BattleScript_1D8D66: @ 81D8D66 switch3 3, 0 waitstateatk atk52 3 - jumpifhalfword 4, 0x20239f8, 1, BattleScript_1D8D86 + jumpifhalfword 4, gBattleTypeFlags, 1, BattleScript_1D8D86 atk68 BattleScript_1D8D86: @ 81D8D86 @@ -3036,7 +3037,7 @@ BattleScript_1D8D99: @ 81D8D99 switch3 3, 0 waitstateatk atk52 5 - jumpifarraynotequal 0x2024c09, 0x2024a68, 1, BattleScript_1D8D99 + jumpifarraynotequal gBank1, gNoOfAllBanks, 1, BattleScript_1D8D99 BattleScript_1D8DBD: @ 81D8DBD end2 @@ -3056,9 +3057,9 @@ gUnknown_081D8DCE:: @ 81D8DCE end2 gUnknown_081D8DD1:: @ 81D8DD1 - jumpifhalfword 4, 0x20239f8, 256, BattleScript_1D8E01 - jumpifhalfword 4, 0x20239f8, 2048, BattleScript_1D8E01 - jumpifhalfword 0, 0x202ff5e, 1024, BattleScript_1D8E01 + jumpifhalfword 4, gBattleTypeFlags, 256, BattleScript_1D8E01 + jumpifhalfword 4, gBattleTypeFlags, 2048, BattleScript_1D8E01 + jumpifhalfword 0, gTrainerBattleOpponent, 1024, BattleScript_1D8E01 printstring BATTLE_TEXT_OutOfUsablePoke waitmessage 64 printstring BATTLE_TEXT_WhitedOut @@ -3081,7 +3082,7 @@ gUnknown_081D8E0D:: @ 81D8E0D end2 gUnknown_081D8E14:: @ 81D8E14 - playanimation USER, 8, 0x0 + playanimation USER, B_ANIM_SMOKEBALL_ESCAPE, 0x0 printstring BATTLE_TEXT_FledUsingItem waitmessage 64 end2 @@ -3121,8 +3122,8 @@ gUnknown_081D8E4A:: @ 81D8E4A gUnknown_081D8E4E:: @ 81D8E4E atk74 1 printstring 2 - setbyte 0x201601f, 2 - jumpifbyte 4, 0x20239f8, 1, BattleScript_1D8E6B + setbyte gSharedMem + 0x1601F, 2 + jumpifbyte 4, gBattleTypeFlags, 1, BattleScript_1D8E6B atk26 1 jump BattleScript_1D8E6D @@ -3152,9 +3153,9 @@ BattleScript_1D8E7A: @ 81D8E7A switch3 USER, 0 waitstateatk atk52 USER - setbyte 0x201600c, 4 + setbyte gSharedMem + 0x1600C, 4 atk49 1, 0 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 end2 @@ -3178,11 +3179,11 @@ BattleScript_1D8EAD: @ 81D8EAD resultmessage waitmessage 64 faintpokemon TARGET, 0, 0x0 - setbyte 0x201600c, 3 + setbyte gSharedMem + 0x1600C, 3 atk49 2, 6 atk76 TARGET, 4 - jumpifbyte 0, 0x2024d1e, 0, BattleScript_1D8EEE - setbyte 0x201600f, 0 + jumpifbyte 0, gBattleCommunication, 0, BattleScript_1D8EEE + setbyte gSharedMem + 0x1600F, 0 atk23 0 BattleScript_1D8EEE: @ 81D8EEE @@ -3195,7 +3196,7 @@ BattleScript_Pausex20:: @ 81D8EEF BattleScript_LevelUp:: @ 81D8EF3 atk55 0xe10016f attackcanceler - setbyte 0x201609c, 0 + setbyte gSharedMem + 0x1609C, 0 atk6c checkiflearnmoveinbattle BattleScript_1D8F4F, BattleScript_1D8F61, 1 jump BattleScript_1D8F19 @@ -3209,11 +3210,11 @@ BattleScript_1D8F19: @ 81D8F19 printstring BATTLE_TEXT_CantLearnMore printstring BATTLE_TEXT_DeleteMove waitstateatk - setbyte 0x201601a, 0 + setbyte gSharedMem + 0x1601A, 0 atk5a BattleScript_1D8F46 printstring BATTLE_TEXT_StopLearning waitstateatk - setbyte 0x201601a, 0 + setbyte gSharedMem + 0x1601A, 0 atk5b BattleScript_1D8F19 printstring BATTLE_TEXT_DidNotLearn jump BattleScript_1D8F0F @@ -3237,8 +3238,8 @@ BattleScript_1D8F61: @ 81D8F61 gUnknown_081D8F62:: @ 81D8F62 printfromtable BattleTextList_401534 waitmessage 64 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8F7C - playanimation USER, 10, 0x0 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8F7C + playanimation USER, B_ANIM_RAIN_CONTINUES, 0x0 BattleScript_1D8F7C: @ 81D8F7C end2 @@ -3246,16 +3247,16 @@ BattleScript_1D8F7C: @ 81D8F7C gUnknown_081D8F7D:: @ 81D8F7D printfromtable BattleTextList_401528 waitmessage 64 - atk46 1, 0x20160a4, 0x0 - setbyte 0x2024d1e, 0 + atk46 1, gSharedMem + 0x160A4, 0x0 + setbyte gBattleCommunication, 0 BattleScript_1D8F95: @ 81D8F95 - atk32 0x2024c07, 0x2024a7a, 0x2024d1e, 1 + atk32 gBankAttacker, gTurnOrder, gBattleCommunication, 1 weatherdamage - jumpifword 0, 0x2024bec, 0x0, BattleScript_1D8FD6 + jumpifword 0, gBattleMoveDamage, 0x0, BattleScript_1D8FD6 printfromtable BattleTextList_40152C waitmessage 64 - orword 0x2024c6c, 0x1100120 + orword gHitMarker, 0x1100120 missmessage atk5c USER graphicalhpupdate USER @@ -3264,12 +3265,12 @@ BattleScript_1D8F95: @ 81D8F95 atk24 BattleScript_1D8FD6 BattleScript_1D8FD6: @ 81D8FD6 - jumpifbyte 1, 0x2024d26, 0, BattleScript_1D8FF5 - addbyte 0x2024d1e, 1 - jumpifarraynotequal 0x2024d1e, 0x2024a68, 1, BattleScript_1D8F95 + jumpifbyte 1, gBattleOutcome, 0, BattleScript_1D8FF5 + addbyte gBattleCommunication, 1 + jumpifarraynotequal gBattleCommunication, gNoOfAllBanks, 1, BattleScript_1D8F95 BattleScript_1D8FF5: @ 81D8FF5 - bicword 0x2024c6c, 0x1100120 + bicword gHitMarker, 0x1100120 end2 gUnknown_081D8FFF:: @ 81D8FFF @@ -3280,7 +3281,7 @@ gUnknown_081D8FFF:: @ 81D8FFF gUnknown_081D9008:: @ 81D9008 printstring BATTLE_TEXT_SunStrong waitmessage 64 - playanimation USER, 11, 0x0 + playanimation USER, B_ANIM_SUN_CONTINUES, 0x0 end2 gUnknown_081D9016:: @ 81D9016 @@ -3291,7 +3292,7 @@ gUnknown_081D9016:: @ 81D9016 gUnknown_081D901D:: @ 81D901D printfromtable BattleTextList_4015EE waitmessage 64 - atk46 1, 0x20160a4, 0x0 + atk46 1, gSharedMem + 0x160A4, 0x0 end3 gUnknown_081D9030:: @ 81D9030 @@ -3312,21 +3313,21 @@ gUnknown_081D9041:: @ 81D9041 end2 BattleScript_LeechSeedTurnDrain:: @ 81D904B - playanimation USER, 14, 0x20160a4 - orword 0x2024c6c, 0x100100 + playanimation USER, B_ANIM_LEECH_SEED_DRAIN, gSharedMem + 0x160A4 + orword gHitMarker, 0x100100 graphicalhpupdate USER datahpupdate USER - copyarray 0x2024bec, 0x2024bf0, 4 + copyarray gBattleMoveDamage, gHP_dealt, 4 jumpifability USER, ABILITY_LIQUID_OOZE, BattleScript_1D907D manipulatedamage 0 - setbyte 0x2024d23, 3 + setbyte gUnknown_02024D1F + 0x4, 3 jump BattleScript_1D9083 BattleScript_1D907D: @ 81D907D - setbyte 0x2024d23, 4 + setbyte gUnknown_02024D1F + 0x4, 4 BattleScript_1D9083: @ 81D9083 - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate TARGET datahpupdate TARGET printfromtable BattleTextList_40154C @@ -3345,10 +3346,10 @@ BattleScript_BideAttack:: @ 81D90B2 waitmessage 64 accuracycheck BattleScript_1D6F77, 0 atk6 - bicbyte 0x2024c68, 6 - copyarray 0x2024bec, 0x2016090, 4 + bicbyte gBattleMoveFlags, 6 + copyarray gBattleMoveDamage, gSharedMem + 0x16090, 4 atk69 - setbyte 0x2016002, 1 + setbyte gSharedMem + 0x16002, 1 attackanimation waitanimation missmessage @@ -3372,8 +3373,8 @@ gUnknown_081D90FC:: @ 81D90FC atke2 TARGET atk58 TARGET waitstateatk - jumpifhalfword 4, 0x20239f8, 8, BattleScript_1D9116 - setbyte 0x2024d26, 5 + jumpifhalfword 4, gBattleTypeFlags, 8, BattleScript_1D9116 + setbyte gBattleOutcome, 5 atkf6 BattleScript_1D9116: @ 81D9116 @@ -3418,14 +3419,14 @@ BattleScript_EncoredNoMore:: @ 81D914F gUnknown_081D9156:: @ 81D9156 printstring BATTLE_TEXT_DestinyBondTaken waitmessage 64 - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate USER datahpupdate USER faintpokemon USER, 0, 0x0 return gUnknown_081D9171:: @ 81D9171 - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate USER datahpupdate USER callatk BattleScript_1D91FB @@ -3434,12 +3435,12 @@ gUnknown_081D9171:: @ 81D9171 return BattleScript_1D9192: @ 81D9192 - setbyte 0x201600f, 0 + setbyte gSharedMem + 0x1600F, 0 atk23 1 jump gUnknown_081D8C7B gUnknown_081D919F:: @ 81D919F - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate TARGET datahpupdate TARGET callatk BattleScript_1D91FB @@ -3448,12 +3449,12 @@ gUnknown_081D919F:: @ 81D919F return BattleScript_1D91C0: @ 81D91C0 - setbyte 0x201600f, 0 + setbyte gSharedMem + 0x1600F, 0 atk23 0 jump gUnknown_081D8C7B gUnknown_081D91CD:: @ 81D91CD - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate 3 datahpupdate 3 callatk BattleScript_1D91FB @@ -3462,7 +3463,7 @@ gUnknown_081D91CD:: @ 81D91CD return BattleScript_1D91EE: @ 81D91EE - setbyte 0x201600f, 0 + setbyte gSharedMem + 0x1600F, 0 atk23 3 jump gUnknown_081D8C7B @@ -3474,7 +3475,7 @@ BattleScript_1D91FB: @ 81D91FB BattleScript_PerishSongHits:: @ 81D9202 printstring BATTLE_TEXT_PerishSongFell waitmessage 64 - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate USER datahpupdate USER faintpokemon USER, 0, 0x0 @@ -3493,33 +3494,33 @@ BattleScript_AllStatsUp:: @ 81D9224 jumpifstat USER, 0, 5, 12, BattleScript_1D92BF BattleScript_1D9251: @ 81D9251 - setbyte 0x20160dc, 0 + setbyte gSharedMem + 0x160DC, 0 playstatchangeanimation USER, 62, 0 - setbyte 0x201601e, 17 + setbyte gSharedMem + 0x1601E, 17 statbuffchange 65, BattleScript_1D926F printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D926F: @ 81D926F - setbyte 0x201601e, 18 + setbyte gSharedMem + 0x1601E, 18 statbuffchange 65, BattleScript_1D9283 printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D9283: @ 81D9283 - setbyte 0x201601e, 19 + setbyte gSharedMem + 0x1601E, 19 statbuffchange 65, BattleScript_1D9297 printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D9297: @ 81D9297 - setbyte 0x201601e, 20 + setbyte gSharedMem + 0x1601E, 20 statbuffchange 65, BattleScript_1D92AB printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D92AB: @ 81D92AB - setbyte 0x201601e, 21 + setbyte gSharedMem + 0x1601E, 21 statbuffchange 65, BattleScript_1D92BF printfromtable BattleTextList_401570 waitmessage 64 @@ -3549,7 +3550,7 @@ BattleScript_SpikesFree:: @ 81D92D0 BattleScript_FutureSightHits:: @ 81D92D7 printstring BATTLE_TEXT_TookAttack waitmessage 64 - jumpifbyte 1, 0x2024d23, 0, BattleScript_1D92F4 + jumpifbyte 1, gUnknown_02024D1F + 0x4, 0, BattleScript_1D92F4 accuracycheck BattleScript_1D934B, 248 jump BattleScript_1D92FB @@ -3558,12 +3559,12 @@ BattleScript_1D92F4: @ 81D92F4 BattleScript_1D92FB: @ 81D92FB atk8 - jumpifbyte 1, 0x2024d23, 0, BattleScript_1D9313 - playanimation USER, 18, 0x0 + jumpifbyte 1, gUnknown_02024D1F + 0x4, 0, BattleScript_1D9313 + playanimation USER, B_ANIM_FUTURE_SIGHT_HIT, 0x0 jump BattleScript_1D931A BattleScript_1D9313: @ 81D9313 - playanimation USER, 19, 0x0 + playanimation USER, B_ANIM_DOOM_DESIRE_HIT, 0x0 BattleScript_1D931A: @ 81D931A missmessage @@ -3577,20 +3578,20 @@ BattleScript_1D931A: @ 81D931A atk24 BattleScript_1D9332 BattleScript_1D9332: @ 81D9332 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 1, 0 - setbyte 0x201600c, 8 + setbyte gSharedMem + 0x1600C, 8 atk49 2, 14 - setbyte 0x2024c68, 0 + setbyte gBattleMoveFlags, 0 end2 BattleScript_1D934B: @ 81D934B pause 32 - setbyte 0x2024c68, 0 - orbyte 0x2024c68, 32 + setbyte gBattleMoveFlags, 0 + orbyte gBattleMoveFlags, 32 resultmessage waitmessage 64 - setbyte 0x2024c68, 0 + setbyte gBattleMoveFlags, 0 end2 BattleScript_NoMovesLeft:: @ 81D9365 @@ -3626,10 +3627,10 @@ BattleScript_MoveUsedIsTaunted:: @ 81D938F BattleScript_WishComesTrue:: @ 81D939A atkd4 1, BattleScript_1D93C1 - playanimation TARGET, 22, 0x0 + playanimation TARGET, B_ANIM_WISH_HEAL, 0x0 printstring BATTLE_TEXT_WishTrue waitmessage 64 - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_RegainedHealth @@ -3645,10 +3646,10 @@ BattleScript_1D93C1: @ 81D93C1 end2 BattleScript_IngrainTurnHeal:: @ 81D93D1 - playanimation USER, 21, 0x0 + playanimation USER, B_ANIM_INGRAIN_HEAL, 0x0 printstring BATTLE_TEXT_AbsorbNutrients waitmessage 64 - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER end2 @@ -3660,20 +3661,20 @@ BattleScript_1D93EC: @ 81D93EC jump BattleScript_EndTurn BattleScript_AtkDefDown:: @ 81D93FA - setbyte 0x20160dc, 0 + setbyte gSharedMem + 0x160DC, 0 playstatchangeanimation USER, 6, 13 playstatchangeanimation USER, 2, 9 - setbyte 0x201601e, 145 + setbyte gSharedMem + 0x1601E, 145 statbuffchange 193, BattleScript_1D9427 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D9427 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D9427 printfromtable BattleTextList_40157C waitmessage 64 BattleScript_1D9427: @ 81D9427 playstatchangeanimation USER, 4, 9 - setbyte 0x201601e, 146 + setbyte gSharedMem + 0x1601E, 146 statbuffchange 193, BattleScript_1D944A - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D944A + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D944A printfromtable BattleTextList_40157C waitmessage 64 @@ -3681,7 +3682,7 @@ BattleScript_1D944A: @ 81D944A return BattleScript_KnockedOff:: @ 81D944B - playanimation TARGET, 5, 0x0 + playanimation TARGET, B_ANIM_ITEM_KNOCKOFF, 0x0 printstring BATTLE_TEXT_KnockedOffItem waitmessage 64 return @@ -3706,7 +3707,7 @@ BattleScript_MagicCoatBounce:: @ 81D946F pause 32 printstring BATTLE_TEXT_MagicCoatBounce waitmessage 64 - orword 0x2024c6c, 0x800c00 + orword gHitMarker, 0x800c00 atk76 USER, 1 return @@ -3714,10 +3715,10 @@ BattleScript_SnatchedMove:: @ 81D9487 attackstring ppreduce snatchmove - playanimation TARGET, 17, 0x0 + playanimation TARGET, B_ANIM_SNATCH_MOVE, 0x0 printstring BATTLE_TEXT_SnatchedMove waitmessage 64 - orword 0x2024c6c, 0x800c00 + orword gHitMarker, 0x800c00 atk5f return @@ -3732,21 +3733,21 @@ BattleScript_OneHitKOMsg:: @ 81D94A9 return BattleScript_SAtkDown2:: @ 81D94B0 - setbyte 0x20160dc, 0 + setbyte gSharedMem + 0x160DC, 0 playstatchangeanimation USER, 16, 11 - setbyte 0x201601e, 164 + setbyte gSharedMem + 0x1601E, 164 statbuffchange 193, BattleScript_1D94D9 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D94D9 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D94D9 printfromtable BattleTextList_40157C waitmessage 64 BattleScript_1D94D9: @ 81D94D9 return -gUnknown_081D94DA:: @ 81D94DA +BattleScript_FocusPunchSetUp:: @ 81D94DA printstring BATTLE_TEXT_Terminator2 waitmessage 1 - playanimation USER, 20, 0x0 + playanimation USER, B_ANIM_FOCUS_PUNCH_SET_UP, 0x0 printstring BATTLE_TEXT_TightenFocus waitmessage 64 end2 @@ -3758,7 +3759,7 @@ BattleScript_MoveUsedIsAsleep:: @ 81D94EE jump BattleScript_EndTurn BattleScript_MoveUsedWokeUp:: @ 81D94FB - bicword 0x2024c6c, 0x10 + bicword gHitMarker, 0x10 printfromtable BattleTextList_401562 waitmessage 64 atk98 1 @@ -3778,7 +3779,7 @@ BattleScript_1D951E: @ 81D951E statusanimation USER BattleScript_1D9520: @ 81D9520 - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate USER datahpupdate USER faintpokemon USER, 0, 0x0 @@ -3836,7 +3837,7 @@ BattleScript_MoveUsedIsConfused:: @ 81D9595 printstring BATTLE_TEXT_Confused waitmessage 64 atk65 1, 0x7 - jumpifbyte 0, 0x2024d23, 0, BattleScript_1D95D3 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 0, BattleScript_1D95D3 BattleScript_1D95AC: @ 81D95AC atk76 USER, 0 @@ -3846,7 +3847,7 @@ BattleScript_1D95AC: @ 81D95AC missmessage atk5c USER waitstateatk - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate USER datahpupdate USER faintpokemon USER, 0, 0x0 @@ -3866,7 +3867,7 @@ gUnknown_081D95DB:: @ 81D95DB return BattleScript_WrapTurnDmg:: @ 81D95E2 - playanimation USER, 6, 0x20160a4 + playanimation USER, B_ANIM_TURN_TRAP, gSharedMem + 0x160A4 printstring BATTLE_TEXT_HurtBy waitmessage 64 jump BattleScript_1D9520 @@ -3976,11 +3977,11 @@ BattleScript_1D96BA:: @ 81D96BA return BattleScript_1D96C8:: @ 81D96C8 - jumpifhalfword 0, 0x2024be6, 165, BattleScript_1D96DB + jumpifhalfword 0, gCurrentMove, 165, BattleScript_1D96DB jumpifability USER, ABILITY_ROCK_HEAD, BattleScript_1D96F5 BattleScript_1D96DB: @ 81D96DB - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate USER datahpupdate USER printstring BATTLE_TEXT_HitRecoil @@ -3991,7 +3992,7 @@ BattleScript_1D96F5: @ 81D96F5 return BattleScript_ItemSteal:: @ 81D96F6 - playanimation TARGET, 16, 0x0 + playanimation TARGET, B_ANIM_ITEM_STEAL, 0x0 printstring BATTLE_TEXT_StoleSomething waitmessage 64 return @@ -4000,12 +4001,12 @@ BattleScript_DrizzleActivates:: @ 81D9704 pause 32 printstring BATTLE_TEXT_RainMade waitstateatk - playanimation 7, 10, 0x0 + playanimation 7, B_ANIM_RAIN_CONTINUES, 0x0 callatk BattleScript_1D9761 end3 BattleScript_SpeedBoostActivates:: @ 81D9718 - playanimation USER, 1, 0x20160a4 + playanimation USER, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printstring BATTLE_TEXT_SpeedRisen waitmessage 64 end3 @@ -4019,7 +4020,7 @@ BattleScript_TraceActivates:: @ 81D9726 BattleScript_RainDishActivates:: @ 81D9730 printstring BATTLE_TEXT_RestoredHPByItem waitmessage 64 - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER end3 @@ -4028,7 +4029,7 @@ BattleScript_SandstreamActivates:: @ 81D9744 pause 32 printstring BATTLE_TEXT_WhipSandstorm waitstateatk - playanimation 7, 12, 0x0 + playanimation 7, B_ANIM_SANDSTORM_CONTINUES, 0x0 callatk BattleScript_1D9761 end3 @@ -4039,12 +4040,12 @@ BattleScript_ShedSkinActivates:: @ 81D9758 end3 BattleScript_1D9761: @ 81D9761 - setbyte 0x2016003, 0 + setbyte gSharedMem + 0x16003, 0 BattleScript_1D9767: @ 81D9767 castformswitch - addbyte 0x2016003, 1 - jumpifarraynotequal 0x2016003, 0x2024a68, 1, BattleScript_1D9767 + addbyte gSharedMem + 0x16003, 1 + jumpifarraynotequal gSharedMem + 0x16003, gNoOfAllBanks, 1, BattleScript_1D9767 return BattleScript_CastformChange:: @ 81D977D @@ -4066,8 +4067,8 @@ BattleScript_1D9792: @ 81D9792 pause 32 gUnknown_081D9795:: @ 81D9795 - setbyte 0x2024c08, 0 - setbyte 0x201601e, 145 + setbyte gBankTarget, 0 + setbyte gSharedMem + 0x1601E, 145 BattleScript_1D97A1: @ 81D97A1 atke1 BattleScript_1D97EF @@ -4076,14 +4077,14 @@ BattleScript_1D97A1: @ 81D97A1 jumpifability TARGET, ABILITY_HYPER_CUTTER, BattleScript_1D97F0 jumpifability TARGET, ABILITY_WHITE_SMOKE, BattleScript_1D97F0 statbuffchange 33, BattleScript_1D97E4 - jumpifbyte 2, 0x2024d23, 1, BattleScript_1D97E4 + jumpifbyte 2, gUnknown_02024D1F + 0x4, 1, BattleScript_1D97E4 atk47 - playanimation TARGET, 1, 0x20160a4 + playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printstring BATTLE_TEXT_CutsAttack waitmessage 64 BattleScript_1D97E4: @ 81D97E4 - addbyte 0x2024c08, 1 + addbyte gBankTarget, 1 jump BattleScript_1D97A1 BattleScript_1D97EF: @ 81D97EF @@ -4099,7 +4100,7 @@ BattleScript_DroughtActivates:: @ 81D97FE pause 32 printstring BATTLE_TEXT_SunIntensified waitstateatk - playanimation 7, 11, 0x0 + playanimation 7, B_ANIM_SUN_CONTINUES, 0x0 callatk BattleScript_1D9761 end3 @@ -4108,7 +4109,7 @@ BattleScript_TookAttack:: @ 81D9812 pause 32 printstring BATTLE_TEXT_TookAttack2 waitmessage 64 - orword 0x2024c6c, 0x400 + orword gHitMarker, 0x400 return gUnknown_081D9826:: @ 81D9826 @@ -4129,12 +4130,12 @@ BattleScript_MoveHPDrain_PPLoss:: @ 81D9842 BattleScript_MoveHPDrain:: @ 81D9843 attackstring pause 32 - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_HPRestoredUsing waitmessage 64 - orbyte 0x2024c68, 8 + orbyte gBattleMoveFlags, 8 jump BattleScript_EndTurn BattleScript_MoveHPDrain_FullHP_PPLoss:: @ 81D9865 @@ -4145,7 +4146,7 @@ BattleScript_MoveHPDrain_FullHP:: @ 81D9866 pause 32 printstring BATTLE_TEXT_MadeUseless waitmessage 64 - orbyte 0x2024c68, 8 + orbyte gBattleMoveFlags, 8 jump BattleScript_EndTurn BattleScript_FlashFireBoost_PPLoss:: @ 81D987B @@ -4218,7 +4219,7 @@ BattleScript_AbilityNoSpecificStatLoss:: @ 81D9903 pause 32 printstring BATTLE_TEXT_PreventedLoss waitmessage 64 - setbyte 0x2024d23, 3 + setbyte gUnknown_02024D1F + 0x4, 3 return BattleScript_NoItemSteal:: @ 81D9913 @@ -4233,7 +4234,7 @@ BattleScript_ColorChangeActivates:: @ 81D9921 return BattleScript_RoughSkinActivates:: @ 81D9928 - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate USER datahpupdate USER printstring BATTLE_TEXT_HurtOther @@ -4266,7 +4267,7 @@ gUnknown_081D9956:: @ 81D9956 gUnknown_081D995F:: @ 81D995F printstring BATTLE_TEXT_IgnoredOrdersSLP waitmessage 64 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 end @@ -4278,16 +4279,16 @@ gUnknown_081D996F:: @ 81D996F BattleScript_MoveUsedLoafingAround:: @ 81D9977 printfromtable BattleTextList_40160E waitmessage 64 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 end gUnknown_081D9989:: @ 81D9989 printstring BATTLE_TEXT_BeganNap waitmessage 64 - setbyte 0x2024d21, 65 + setbyte gUnknown_02024D1F + 0x2, 65 seteffecttarget - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 end @@ -4297,7 +4298,7 @@ gUnknown_081D99A0:: @ 81D99A0 jump BattleScript_1D95AC BattleScript_SubstituteFade:: @ 81D99AB - playanimation TARGET, 2, 0x0 + playanimation TARGET, B_ANIM_SUBSTITUTE_FADE, 0x0 printstring BATTLE_TEXT_SubFaded return @@ -4306,7 +4307,7 @@ BattleScript_BerryCurePrlzEnd2:: @ 81D99B6 end2 BattleScript_BerryCureParRet:: @ 81D99BC - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredParalysis waitmessage 64 atk98 10 @@ -4318,7 +4319,7 @@ BattleScript_BerryCurePsnEnd2:: @ 81D99CE end2 BattleScript_BerryCurePsnRet:: @ 81D99D4 - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredPoison waitmessage 64 atk98 10 @@ -4330,7 +4331,7 @@ BattleScript_BerryCureBrnEnd2:: @ 81D99E6 end2 BattleScript_BerryCureBrnRet:: @ 81D99EC - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredBurn waitmessage 64 atk98 10 @@ -4342,7 +4343,7 @@ BattleScript_BerryCureFrzEnd2:: @ 81D99FE end2 BattleScript_BerryCureFrzRet:: @ 81D9A04 - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredFreeze waitmessage 64 atk98 10 @@ -4354,7 +4355,7 @@ BattleScript_BerryCureSlpEnd2:: @ 81D9A16 end2 BattleScript_BerryCureSlpRet:: @ 81D9A1C - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredSleep waitmessage 64 atk98 10 @@ -4366,7 +4367,7 @@ BattleScript_BerryCureConfusionEnd2:: @ 81D9A2E end2 BattleScript_BerryCureConfusionRet:: @ 81D9A34 - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredConfusion waitmessage 64 removeitem 10 @@ -4377,7 +4378,7 @@ gUnknown_081D9A44:: @ 81D9A44 end2 gUnknown_081D9A4A:: @ 81D9A4A - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printfromtable BattleTextList_40162C waitmessage 64 atk98 10 @@ -4389,24 +4390,24 @@ BattleScript_WhiteHerbEnd2:: @ 81D9A5E end2 BattleScript_WhiteHerbRet:: @ 81D9A64 - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_RestoredStatus waitmessage 64 removeitem 10 return BattleScript_ItemHealHP_RemoveItem:: @ 81D9A74 - playanimation USER, 7, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_RestoredHealth waitmessage 64 - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER removeitem USER end2 BattleScript_BerryPPHealEnd2:: @ 81D9A91 - playanimation USER, 7, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_RestoredPP waitmessage 64 removeitem USER @@ -4417,10 +4418,10 @@ BattleScript_ItemHealHP_End2:: @ 81D9AA1 end2 BattleScript_ItemHealHP_Ret:: @ 81D9AA7 - playanimation USER, 7, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_RestoredHPLittle waitmessage 64 - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER return @@ -4430,37 +4431,37 @@ BattleScript_MoveSelectionChoiceBanded:: @ 81D9AC2 atk44 BattleScript_HangedOnMsg:: @ 81D9AC6 - playanimation TARGET, 9, 0x0 + playanimation TARGET, B_ANIM_HANGED_ON, 0x0 printstring BATTLE_TEXT_FocusSash waitmessage 64 return BattleScript_BerryConfuseHealEnd2:: @ 81D9AD4 - playanimation USER, 7, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_RestoredHealth waitmessage 64 - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER printstring BATTLE_TEXT_UnknownString2 waitmessage 64 - setbyte 0x2024d21, 71 + setbyte gUnknown_02024D1F + 0x2, 71 seteffecttarget removeitem USER end2 BattleScript_BerryStatRaiseEnd2:: @ 81D9AFE - playanimation USER, 7, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 statbuffchange 65, BattleScript_1D9B0B BattleScript_1D9B0B: @ 81D9B0B - setbyte 0x2024d23, 4 + setbyte gUnknown_02024D1F + 0x4, 4 callatk BattleScript_StatUp removeitem USER end2 BattleScript_BerryFocusEnergyEnd2:: @ 81D9B19 - playanimation USER, 7, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_HustleUse waitmessage 64 removeitem USER diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index b10b7f96f..22ecc7769 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -5,7 +5,7 @@ .section script_data, "aw", %progbits .align 2 -gUnknown_081D9E48:: @ 81D9E48 +gBattlescriptsForBallThrow:: @ 81D9E48 .4byte BattleScript_1D9EA8 .4byte BattleScript_1D9EA8 .4byte BattleScript_1D9EA8 @@ -28,10 +28,10 @@ gUnknown_081D9E7C:: @ 81D9E7C .4byte BattleScript_1D9F9C .4byte BattleScript_1D9FBB -gUnknown_081D9E94:: @ 81D9E94 +gBattlescriptsForRunningByItem:: @ 81D9E94 .4byte BattleScript_1D9FDA -gUnknown_081D9E98:: @ 81D9E98 +gBattlescriptsForSafariActions:: @ 81D9E98 .4byte BattleScript_1D9FE4 .4byte BattleScript_1D9FEB .4byte BattleScript_1D9FF4 @@ -102,7 +102,7 @@ BattleScript_TrainerBallBlock:: @ 81D9F35 atkf6 BattleScript_1D9F45: @ 81D9F45 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 end @@ -118,7 +118,7 @@ BattleScript_1D9F4F: @ 81D9F4F printstring BATTLE_TEXT_RestoredHealth waitmessage 64 atk98 1 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 atkf6 @@ -131,7 +131,7 @@ BattleScript_1D9F7B: @ 81D9F7B printfromtable BattleTextList_401620 waitmessage 64 atk98 1 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 atkf6 @@ -143,7 +143,7 @@ BattleScript_1D9F9C: @ 81D9F9C atk75 printfromtable BattleTextList_401570 waitmessage 64 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 atkf6 @@ -155,7 +155,7 @@ BattleScript_1D9FBB: @ 81D9FBB atk75 printfromtable BattleTextList_4015A0 waitmessage 64 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 atkf6 @@ -177,7 +177,7 @@ BattleScript_1D9FEB: @ 81D9FEB BattleScript_1D9FF4: @ 81D9FF4 printstring BATTLE_TEXT_ThrewBlock waitmessage 64 - playanimation USER, 4, 0x0 + playanimation USER, B_ANIM_POKEBLOCK_THROW, 0x0 printfromtable BattleTextList_40161A waitmessage 64 end2 diff --git a/data/battle_tower.s b/data/battle_tower.s deleted file mode 100644 index a45dcf72c..000000000 --- a/data/battle_tower.s +++ /dev/null @@ -1,159 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -@ 8402F00 - .include "data/battle_tower/trainers.inc" - -@ 8403860 - .include "data/battle_tower/held_items.inc" - -@ 84038E0 - .include "data/battle_tower/level_50_mons.inc" - -@ 8404BA0 - .include "data/battle_tower/level_100_mons.inc" - -gUnknown_08405E60:: @ 8405E60 - .byte 4 - .byte 7 - .byte 8 - .byte 13 - .byte 14 - .byte 15 - .byte 16 - .byte 17 - .byte 18 - .byte 19 - .byte 20 - .byte 21 - .byte 23 - .byte 29 - .byte 32 - .byte 34 - .byte 36 - .byte 38 - .byte 39 - .byte 41 - .byte 43 - .byte 45 - .byte 46 - .byte 47 - .byte 53 - .byte 56 - .byte 64 - .byte 66 - .byte 72 - .byte 73 - -gUnknown_08405E7E:: @ 8405E7E - .byte 3 - .byte 6 - .byte 9 - .byte 10 - .byte 11 - .byte 12 - .byte 22 - .byte 30 - .byte 33 - .byte 35 - .byte 40 - .byte 42 - .byte 44 - .byte 48 - .byte 49 - .byte 50 - .byte 51 - .byte 65 - .byte 67 - .byte 71 - -gUnknown_08405E92:: @ 8405E92 - .byte MAP_OBJ_GFX_HIKER - .byte MAP_OBJ_GFX_TUBER_M - .byte MAP_OBJ_GFX_MAN_4 - .byte MAP_OBJ_GFX_BOY_4 - .byte MAP_OBJ_GFX_MANIAC - .byte MAP_OBJ_GFX_RUNNING_TRIATHLETE_M - .byte MAP_OBJ_GFX_BLACK_BELT - .byte MAP_OBJ_GFX_MAN_6 - .byte MAP_OBJ_GFX_MAN_6 - .byte MAP_OBJ_GFX_CAMPER - .byte MAP_OBJ_GFX_MANIAC - .byte MAP_OBJ_GFX_PSYCHIC_M - .byte MAP_OBJ_GFX_GENTLEMAN - .byte MAP_OBJ_GFX_SCHOOL_KID_M - .byte MAP_OBJ_GFX_MAN_3 - .byte MAP_OBJ_GFX_OLD_MAN_1 - .byte MAP_OBJ_GFX_YOUNGSTER - .byte MAP_OBJ_GFX_FISHERMAN - .byte MAP_OBJ_GFX_CYCLING_TRIATHLETE_M - .byte MAP_OBJ_GFX_RUNNING_TRIATHLETE_M - .byte MAP_OBJ_GFX_RUNNING_TRIATHLETE_M - .byte MAP_OBJ_GFX_MAN_4 - .byte MAP_OBJ_GFX_MAN_6 - .byte MAP_OBJ_GFX_LITTLE_BOY_1 - .byte MAP_OBJ_GFX_SAILOR - .byte MAP_OBJ_GFX_MANIAC - .byte MAP_OBJ_GFX_MAN_5 - .byte MAP_OBJ_GFX_CAMPER - .byte MAP_OBJ_GFX_BUG_CATCHER - .byte MAP_OBJ_GFX_HIKER - -gUnknown_08405EB0:: @ 8405EB0 - .byte MAP_OBJ_GFX_WOMAN_3 - .byte MAP_OBJ_GFX_TUBER_F - .byte MAP_OBJ_GFX_WOMAN_7 - .byte MAP_OBJ_GFX_WOMAN_1 - .byte MAP_OBJ_GFX_WOMAN_3 - .byte MAP_OBJ_GFX_BEAUTY - .byte MAP_OBJ_GFX_LASS - .byte MAP_OBJ_GFX_GIRL_3 - .byte MAP_OBJ_GFX_WOMAN_2 - .byte MAP_OBJ_GFX_OLD_WOMAN_1 - .byte MAP_OBJ_GFX_CYCLING_TRIATHLETE_F - .byte MAP_OBJ_GFX_RUNNING_TRIATHLETE_F - .byte MAP_OBJ_GFX_RUNNING_TRIATHLETE_F - .byte MAP_OBJ_GFX_GIRL_3 - .byte MAP_OBJ_GFX_WOMAN_7 - .byte MAP_OBJ_GFX_RUNNING_TRIATHLETE_F - .byte MAP_OBJ_GFX_PICNICKER - .byte MAP_OBJ_GFX_WOMAN_3 - .byte MAP_OBJ_GFX_PICNICKER - .byte MAP_OBJ_GFX_LASS - - .align 1 -gBattleTowerBanlist:: @ 8405EC4 - .2byte SPECIES_MEW - .2byte SPECIES_MEWTWO - .2byte SPECIES_HO_OH - .2byte SPECIES_LUGIA - .2byte SPECIES_CELEBI - .2byte SPECIES_KYOGRE - .2byte SPECIES_GROUDON - .2byte SPECIES_RAYQUAZA - .2byte SPECIES_JIRACHI - .2byte SPECIES_DEOXYS - .2byte -1 - - .align 1 -gUnknown_08405EDA:: @ 8405EDA - .2byte ITEM_HP_UP - .2byte ITEM_PROTEIN - .2byte ITEM_IRON - .2byte ITEM_CALCIUM - .2byte ITEM_CARBOS - .2byte ITEM_ZINC - - .align 1 -gUnknown_08405EE6:: @ 8405EE6 - .2byte ITEM_BRIGHT_POWDER - .2byte ITEM_WHITE_HERB - .2byte ITEM_QUICK_CLAW - .2byte ITEM_LEFTOVERS - .2byte ITEM_MENTAL_HERB - .2byte ITEM_KINGS_ROCK - .2byte ITEM_FOCUS_BAND - .2byte ITEM_SCOPE_LENS - .2byte ITEM_CHOICE_BAND diff --git a/data/battle_tower/held_items.inc b/data/battle_tower/held_items.inc deleted file mode 100644 index 6c4f0838b..000000000 --- a/data/battle_tower/held_items.inc +++ /dev/null @@ -1,65 +0,0 @@ - .align 1 -gBattleTowerHeldItems:: @ 8403860 - .2byte ITEM_NONE - .2byte ITEM_KINGS_ROCK - .2byte ITEM_SITRUS_BERRY - .2byte ITEM_ORAN_BERRY - .2byte ITEM_CHESTO_BERRY - .2byte ITEM_HARD_STONE - .2byte ITEM_FOCUS_BAND - .2byte ITEM_PERSIM_BERRY - .2byte ITEM_MIRACLE_SEED - .2byte ITEM_BERRY_JUICE - .2byte ITEM_MACHO_BRACE - .2byte ITEM_SILVER_POWDER - .2byte ITEM_CHERI_BERRY - .2byte ITEM_BLACK_GLASSES - .2byte ITEM_BLACK_BELT - .2byte ITEM_SOUL_DEW - .2byte ITEM_CHOICE_BAND - .2byte ITEM_MAGNET - .2byte ITEM_SILK_SCARF - .2byte ITEM_WHITE_HERB - .2byte ITEM_DEEP_SEA_SCALE - .2byte ITEM_DEEP_SEA_TOOTH - .2byte ITEM_MYSTIC_WATER - .2byte ITEM_SHARP_BEAK - .2byte ITEM_QUICK_CLAW - .2byte ITEM_LEFTOVERS - .2byte ITEM_RAWST_BERRY - .2byte ITEM_LIGHT_BALL - .2byte ITEM_POISON_BARB - .2byte ITEM_NEVER_MELT_ICE - .2byte ITEM_ASPEAR_BERRY - .2byte ITEM_SPELL_TAG - .2byte ITEM_BRIGHT_POWDER - .2byte ITEM_LEPPA_BERRY - .2byte ITEM_SCOPE_LENS - .2byte ITEM_TWISTED_SPOON - .2byte ITEM_METAL_COAT - .2byte ITEM_MENTAL_HERB - .2byte ITEM_CHARCOAL - .2byte ITEM_PECHA_BERRY - .2byte ITEM_SOFT_SAND - .2byte ITEM_LUM_BERRY - .2byte ITEM_DRAGON_SCALE - .2byte ITEM_DRAGON_FANG - .2byte ITEM_IAPAPA_BERRY - .2byte ITEM_WIKI_BERRY - .2byte ITEM_SEA_INCENSE - .2byte ITEM_SHELL_BELL - .2byte ITEM_SALAC_BERRY - .2byte ITEM_LANSAT_BERRY - .2byte ITEM_APICOT_BERRY - .2byte ITEM_STARF_BERRY - .2byte ITEM_LIECHI_BERRY - .2byte ITEM_STICK - .2byte ITEM_LAX_INCENSE - .2byte ITEM_AGUAV_BERRY - .2byte ITEM_FIGY_BERRY - .2byte ITEM_THICK_CLUB - .2byte ITEM_MAGO_BERRY - .2byte ITEM_METAL_POWDER - .2byte ITEM_PETAYA_BERRY - .2byte ITEM_LUCKY_PUNCH - .2byte ITEM_GANLON_BERRY diff --git a/data/battle_tower/level_100_mons.inc b/data/battle_tower/level_100_mons.inc deleted file mode 100644 index 9e678153e..000000000 --- a/data/battle_tower/level_100_mons.inc +++ /dev/null @@ -1,2701 +0,0 @@ - .align 2 -gBattleTowerLevel100Mons:: @ 8404BA0 -@ 0 - .2byte SPECIES_LINOONE - .byte BATTLE_TOWER_ITEM_RAWST_BERRY - .byte 0x42 @ team flags - .2byte MOVE_SLASH, MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_SAND_ATTACK - .byte F_EV_SPREAD_SPEED - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 1 - .2byte SPECIES_MIGHTYENA - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x41 @ team flags - .2byte MOVE_BITE, MOVE_HOWL, MOVE_ODOR_SLEUTH, MOVE_SCARY_FACE - .byte F_EV_SPREAD_ATTACK - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 2 - .2byte SPECIES_BEAUTIFLY - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x41 @ team flags - .2byte MOVE_GIGA_DRAIN, MOVE_GUST, MOVE_STUN_SPORE, MOVE_PROTECT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 3 - .2byte SPECIES_DUSTOX - .byte BATTLE_TOWER_ITEM_PECHA_BERRY - .byte 0x41 @ team flags - .2byte MOVE_PSYBEAM, MOVE_GUST, MOVE_DOUBLE_TEAM, MOVE_SILVER_WIND - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 4 - .2byte SPECIES_LOMBRE - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x03 @ team flags - .2byte MOVE_ASTONISH, MOVE_GROWL, MOVE_MEGA_DRAIN, MOVE_SURF - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_LONELY - .2byte 0 @ padding - -@ 5 - .2byte SPECIES_NUZLEAF - .byte BATTLE_TOWER_ITEM_WHITE_HERB - .byte 0x01 @ team flags - .2byte MOVE_BULLET_SEED, MOVE_RAZOR_WIND, MOVE_FAINT_ATTACK, MOVE_GROWTH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 6 - .2byte SPECIES_SWELLOW - .byte BATTLE_TOWER_ITEM_SHARP_BEAK - .byte 0x42 @ team flags - .2byte MOVE_AERIAL_ACE, MOVE_GROWL, MOVE_ENDEAVOR, MOVE_FOCUS_ENERGY - .byte F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 7 - .2byte SPECIES_PELIPPER - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0x02 @ team flags - .2byte MOVE_SURF, MOVE_WATER_SPORT, MOVE_PROTECT, MOVE_SUPERSONIC - .byte F_EV_SPREAD_SP_ATTACK - .byte NATURE_MILD - .2byte 0 @ padding - -@ 8 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x42 @ team flags - .2byte MOVE_MACH_PUNCH, MOVE_MEGA_DRAIN, MOVE_HEADBUTT, MOVE_STUN_SPORE - .byte F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 9 - .2byte SPECIES_NINJASK - .byte BATTLE_TOWER_ITEM_RAWST_BERRY - .byte 0x41 @ team flags - .2byte MOVE_SCRATCH, MOVE_SCREECH, MOVE_LEECH_LIFE, MOVE_FLASH - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 10 - .2byte SPECIES_CROBAT - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x01 @ team flags - .2byte MOVE_BITE, MOVE_FLY, MOVE_SUPERSONIC, MOVE_HAZE - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 11 - .2byte SPECIES_MAWILE - .byte BATTLE_TOWER_ITEM_METAL_COAT - .byte 0x03 @ team flags - .2byte MOVE_VICE_GRIP, MOVE_SWEET_SCENT, MOVE_ASTONISH, MOVE_STRENGTH - .byte F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 12 - .2byte SPECIES_NOSEPASS - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x01 @ team flags - .2byte MOVE_ROCK_THROW, MOVE_SANDSTORM, MOVE_HARDEN, MOVE_PROTECT - .byte F_EV_SPREAD_ATTACK - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 13 - .2byte SPECIES_DELCATTY - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x42 @ team flags - .2byte MOVE_DOUBLE_SLAP, MOVE_TAIL_WHIP, MOVE_ATTRACT, MOVE_CHARM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 14 - .2byte SPECIES_CAMERUPT - .byte BATTLE_TOWER_ITEM_CHARCOAL - .byte 0x01 @ team flags - .2byte MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_GROWL, MOVE_SANDSTORM - .byte F_EV_SPREAD_SP_DEFENSE - .byte NATURE_RASH - .2byte 0 @ padding - -@ 15 - .2byte SPECIES_MUK - .byte BATTLE_TOWER_ITEM_ORAN_BERRY - .byte 0x01 @ team flags - .2byte MOVE_POISON_GAS, MOVE_MINIMIZE, MOVE_SLUDGE, MOVE_SCREECH - .byte F_EV_SPREAD_HP - .byte NATURE_CALM - .2byte 0 @ padding - -@ 16 - .2byte SPECIES_SANDSLASH - .byte BATTLE_TOWER_ITEM_SOFT_SAND - .byte 0x03 @ team flags - .2byte MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_DEFENSE_CURL, MOVE_SWIFT - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 17 - .2byte SPECIES_SPINDA - .byte BATTLE_TOWER_ITEM_SILK_SCARF - .byte 0x42 @ team flags - .2byte MOVE_UPROAR, MOVE_WATER_PULSE, MOVE_THRASH, MOVE_SAFEGUARD - .byte F_EV_SPREAD_SPEED - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 18 - .2byte SPECIES_WHISCASH - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x01 @ team flags - .2byte MOVE_TICKLE, MOVE_MUD_SPORT, MOVE_WATER_GUN, MOVE_WATER_SPORT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 19 - .2byte SPECIES_CACTURNE - .byte BATTLE_TOWER_ITEM_POISON_BARB - .byte 0x01 @ team flags - .2byte MOVE_POISON_STING, MOVE_PIN_MISSILE, MOVE_ABSORB, MOVE_COTTON_SPORE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 20 - .2byte SPECIES_JIGGLYPUFF - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x42 @ team flags - .2byte MOVE_SING, MOVE_ROLLOUT, MOVE_POUND, MOVE_LIGHT_SCREEN - .byte F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 21 - .2byte SPECIES_MARILL - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0x42 @ team flags - .2byte MOVE_BUBBLE_BEAM, MOVE_DEFENSE_CURL, MOVE_RAIN_DANCE, MOVE_IRON_TAIL - .byte F_EV_SPREAD_SP_DEFENSE - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 22 - .2byte SPECIES_MAGNETON - .byte BATTLE_TOWER_ITEM_RAWST_BERRY - .byte 0x01 @ team flags - .2byte MOVE_THUNDER_SHOCK, MOVE_SUPERSONIC, MOVE_FLASH, MOVE_SCREECH - .byte F_EV_SPREAD_SPEED - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 23 - .2byte SPECIES_CARVANHA - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x01 @ team flags - .2byte MOVE_BITE, MOVE_RAGE, MOVE_SCARY_FACE, MOVE_LEER - .byte F_EV_SPREAD_ATTACK - .byte NATURE_QUIRKY - .2byte 0 @ padding - -@ 24 - .2byte SPECIES_KECLEON - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x03 @ team flags - .2byte MOVE_THIEF, MOVE_LICK, MOVE_BIND, MOVE_FURY_SWIPES - .byte F_EV_SPREAD_DEFENSE - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 25 - .2byte SPECIES_NINETALES - .byte BATTLE_TOWER_ITEM_CHARCOAL - .byte 0x02 @ team flags - .2byte MOVE_EMBER, MOVE_CONFUSE_RAY, MOVE_FIRE_SPIN, MOVE_SAFEGUARD - .byte F_EV_SPREAD_SP_ATTACK - .byte NATURE_LONELY - .2byte 0 @ padding - -@ 26 - .2byte SPECIES_RAICHU - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x42 @ team flags - .2byte MOVE_SHOCK_WAVE, MOVE_GROWL, MOVE_DOUBLE_TEAM, MOVE_LIGHT_SCREEN - .byte F_EV_SPREAD_DEFENSE - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 27 - .2byte SPECIES_SEALEO - .byte BATTLE_TOWER_ITEM_NEVER_MELT_ICE - .byte 0x01 @ team flags - .2byte MOVE_ICE_BALL, MOVE_WATER_GUN, MOVE_ENCORE, MOVE_HAIL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_LAX - .2byte 0 @ padding - -@ 28 - .2byte SPECIES_GRAVELER - .byte BATTLE_TOWER_ITEM_HARD_STONE - .byte 0x01 @ team flags - .2byte MOVE_ROCK_THROW, MOVE_MUD_SPORT, MOVE_SANDSTORM, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 29 - .2byte SPECIES_SHUPPET - .byte BATTLE_TOWER_ITEM_SPELL_TAG - .byte 0x03 @ team flags - .2byte MOVE_NIGHT_SHADE, MOVE_WILL_O_WISP, MOVE_SCREECH, MOVE_KNOCK_OFF - .byte F_EV_SPREAD_SP_ATTACK - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 30 - .2byte SPECIES_LUVDISC - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x0A @ team flags - .2byte MOVE_ATTRACT, MOVE_FLAIL, MOVE_SWEET_KISS, MOVE_WATER_PULSE - .byte F_EV_SPREAD_SP_ATTACK - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 31 - .2byte SPECIES_LANTURN - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0x0A @ team flags - .2byte MOVE_THUNDER_WAVE, MOVE_SUPERSONIC, MOVE_WATER_GUN, MOVE_SPARK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 32 - .2byte SPECIES_CORSOLA - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x0A @ team flags - .2byte MOVE_MIRROR_COAT, MOVE_BUBBLE, MOVE_HARDEN, MOVE_LIGHT_SCREEN - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 33 - .2byte SPECIES_WAILMER - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x05 @ team flags - .2byte MOVE_SURF, MOVE_ROAR, MOVE_GROWL, MOVE_MIST - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 34 - .2byte SPECIES_RHYDON - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x05 @ team flags - .2byte MOVE_TAKE_DOWN, MOVE_SCARY_FACE, MOVE_TAIL_WHIP, MOVE_ROAR - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 35 - .2byte SPECIES_DODRIO - .byte BATTLE_TOWER_ITEM_SHARP_BEAK - .byte 0x05 @ team flags - .2byte MOVE_FURY_ATTACK, MOVE_PURSUIT, MOVE_AERIAL_ACE, MOVE_AGILITY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 36 - .2byte SPECIES_GOLDUCK - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x05 @ team flags - .2byte MOVE_FURY_SWIPES, MOVE_TAIL_WHIP, MOVE_DISABLE, MOVE_PSYCH_UP - .byte F_EV_SPREAD_ATTACK - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 37 - .2byte SPECIES_BELLOSSOM - .byte BATTLE_TOWER_ITEM_MIRACLE_SEED - .byte 0x0A @ team flags - .2byte MOVE_GIGA_DRAIN, MOVE_POISON_POWDER, MOVE_STUN_SPORE, MOVE_ACID - .byte F_EV_SPREAD_SP_ATTACK - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 38 - .2byte SPECIES_TROPIUS - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x05 @ team flags - .2byte MOVE_STOMP, MOVE_RAZOR_LEAF, MOVE_GUST, MOVE_SYNTHESIS - .byte F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 39 - .2byte SPECIES_SABLEYE - .byte BATTLE_TOWER_ITEM_SPELL_TAG - .byte 0x0A @ team flags - .2byte MOVE_NIGHT_SHADE, MOVE_FAKE_OUT, MOVE_PSYCH_UP, MOVE_DETECT - .byte F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 40 - .2byte SPECIES_ELECTRODE - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x03 @ team flags - .2byte MOVE_SONIC_BOOM, MOVE_SCREECH, MOVE_SPARK, MOVE_SELF_DESTRUCT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_QUIRKY - .2byte 0 @ padding - -@ 41 - .2byte SPECIES_TENTACRUEL - .byte BATTLE_TOWER_ITEM_POISON_BARB - .byte 0x01 @ team flags - .2byte MOVE_ACID, MOVE_WATER_PULSE, MOVE_BARRIER, MOVE_WRAP - .byte F_EV_SPREAD_SPEED - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 42 - .2byte SPECIES_CLAYDOL - .byte BATTLE_TOWER_ITEM_SOFT_SAND - .byte 0x05 @ team flags - .2byte MOVE_ANCIENT_POWER, MOVE_MUD_SLAP, MOVE_RAPID_SPIN, MOVE_CONFUSION - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 43 - .2byte SPECIES_GRUMPIG - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x0A @ team flags - .2byte MOVE_PSYBEAM, MOVE_PSYCH_UP, MOVE_BOUNCE, MOVE_MAGIC_COAT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 44 - .2byte SPECIES_CRAWDAUNT - .byte BATTLE_TOWER_ITEM_MENTAL_HERB - .byte 0x05 @ team flags - .2byte MOVE_CRABHAMMER, MOVE_BUBBLE_BEAM, MOVE_BRICK_BREAK, MOVE_PROTECT - .byte F_EV_SPREAD_ATTACK - .byte NATURE_CALM - .2byte 0 @ padding - -@ 45 - .2byte SPECIES_SEVIPER - .byte BATTLE_TOWER_ITEM_POISON_BARB - .byte 0x01 @ team flags - .2byte MOVE_POISON_TAIL, MOVE_GLARE, MOVE_WRAP, MOVE_THIEF - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 46 - .2byte SPECIES_ZANGOOSE - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x05 @ team flags - .2byte MOVE_FURY_CUTTER, MOVE_LEER, MOVE_QUICK_ATTACK, MOVE_DETECT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 47 - .2byte SPECIES_ALTARIA - .byte BATTLE_TOWER_ITEM_DRAGON_FANG - .byte 0x03 @ team flags - .2byte MOVE_DRAGON_BREATH, MOVE_SING, MOVE_SAFEGUARD, MOVE_TAKE_DOWN - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 48 - .2byte SPECIES_ROSELIA - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x0A @ team flags - .2byte MOVE_LEECH_SEED, MOVE_MEGA_DRAIN, MOVE_GROWTH, MOVE_STUN_SPORE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 49 - .2byte SPECIES_VOLBEAT - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x09 @ team flags - .2byte MOVE_SIGNAL_BEAM, MOVE_CONFUSE_RAY, MOVE_DOUBLE_TEAM, MOVE_LIGHT_SCREEN - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 50 - .2byte SPECIES_ILLUMISE - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x09 @ team flags - .2byte MOVE_CHARM, MOVE_ENCORE, MOVE_SOLAR_BEAM, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 51 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_MAGNET - .byte 0x03 @ team flags - .2byte MOVE_BITE, MOVE_HOWL, MOVE_THUNDER_WAVE, MOVE_SPARK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 52 - .2byte SPECIES_MAWILE - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x0A @ team flags - .2byte MOVE_CRUNCH, MOVE_IRON_DEFENSE, MOVE_TORMENT, MOVE_SANDSTORM - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_RASH - .2byte 0 @ padding - -@ 53 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x05 @ team flags - .2byte MOVE_ARM_THRUST, MOVE_FAKE_OUT, MOVE_WHIRLWIND, MOVE_REVERSAL - .byte F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 54 - .2byte SPECIES_SKARMORY - .byte BATTLE_TOWER_ITEM_METAL_COAT - .byte 0x01 @ team flags - .2byte MOVE_STEEL_WING, MOVE_AGILITY, MOVE_TAUNT, MOVE_FLY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 55 - .2byte SPECIES_TORKOAL - .byte BATTLE_TOWER_ITEM_PECHA_BERRY - .byte 0x03 @ team flags - .2byte MOVE_FIRE_SPIN, MOVE_SMOKESCREEN, MOVE_BODY_SLAM, MOVE_AMNESIA - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_MILD - .2byte 0 @ padding - -@ 56 - .2byte SPECIES_GYARADOS - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x05 @ team flags - .2byte MOVE_THRASH, MOVE_DRAGON_RAGE, MOVE_TWISTER, MOVE_HYDRO_PUMP - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_QUIRKY - .2byte 0 @ padding - -@ 57 - .2byte SPECIES_MIGHTYENA - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x05 @ team flags - .2byte MOVE_CRUNCH, MOVE_HOWL, MOVE_IRON_TAIL, MOVE_TORMENT - .byte F_EV_SPREAD_SP_ATTACK - .byte NATURE_QUIRKY - .2byte 0 @ padding - -@ 58 - .2byte SPECIES_LINOONE - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0x06 @ team flags - .2byte MOVE_SLASH, MOVE_ATTRACT, MOVE_SHOCK_WAVE, MOVE_TOXIC - .byte F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 59 - .2byte SPECIES_MASQUERAIN - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x0A @ team flags - .2byte MOVE_TOXIC, MOVE_STUN_SPORE, MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_LAX - .2byte 0 @ padding - -@ 60 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x06 @ team flags - .2byte MOVE_BULLET_SEED, MOVE_SLAM, MOVE_SCREECH, MOVE_DETECT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 61 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x06 @ team flags - .2byte MOVE_DOUBLE_KICK, MOVE_FLAMETHROWER, MOVE_DOUBLE_TEAM, MOVE_ROAR - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 62 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x49 @ team flags - .2byte MOVE_SURF, MOVE_MUD_SHOT, MOVE_MUD_SPORT, MOVE_RAIN_DANCE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 63 - .2byte SPECIES_SALAMENCE - .byte BATTLE_TOWER_ITEM_DRAGON_FANG - .byte 0x49 @ team flags - .2byte MOVE_DRAGON_BREATH, MOVE_FLY, MOVE_TOXIC, MOVE_FACADE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_CALM - .2byte 0 @ padding - -@ 64 - .2byte SPECIES_KINGDRA - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x49 @ team flags - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_SMOKESCREEN, MOVE_RAIN_DANCE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 65 - .2byte SPECIES_CORSOLA - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x03 @ team flags - .2byte MOVE_ANCIENT_POWER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_REFLECT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 66 - .2byte SPECIES_RHYDON - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x41 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_ROAR, MOVE_THUNDERBOLT - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 67 - .2byte SPECIES_HERACROSS - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x06 @ team flags - .2byte MOVE_MEGAHORN, MOVE_COUNTER, MOVE_PROTECT, MOVE_LEER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 68 - .2byte SPECIES_GIRAFARIG - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x09 @ team flags - .2byte MOVE_PSYCHIC, MOVE_CRUNCH, MOVE_BATON_PASS, MOVE_AGILITY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 69 - .2byte SPECIES_XATU - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x09 @ team flags - .2byte MOVE_PSYCHIC, MOVE_FLY, MOVE_CONFUSE_RAY, MOVE_TOXIC - .byte F_EV_SPREAD_SPEED - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 70 - .2byte SPECIES_DODRIO - .byte BATTLE_TOWER_ITEM_SHARP_BEAK - .byte 0x03 @ team flags - .2byte MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_PURSUIT, MOVE_TORMENT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 71 - .2byte SPECIES_VILEPLUME - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x89 @ team flags - .2byte MOVE_POISON_POWDER, MOVE_STUN_SPORE, MOVE_SLEEP_POWDER, MOVE_PETAL_DANCE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_MODEST - .2byte 0 @ padding - -@ 72 - .2byte SPECIES_MEDICHAM - .byte BATTLE_TOWER_ITEM_TWISTED_SPOON - .byte 0x06 @ team flags - .2byte MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_BULK_UP, MOVE_PSYCHIC - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 73 - .2byte SPECIES_ABSOL - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x06 @ team flags - .2byte MOVE_SLASH, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM, MOVE_ATTRACT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 74 - .2byte SPECIES_DUSCLOPS - .byte BATTLE_TOWER_ITEM_SPELL_TAG - .byte 0x4B @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_DISABLE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_LAX - .2byte 0 @ padding - -@ 75 - .2byte SPECIES_SHUPPET - .byte BATTLE_TOWER_ITEM_SPELL_TAG - .byte 0x43 @ team flags - .2byte MOVE_GRUDGE, MOVE_SHADOW_BALL, MOVE_CURSE, MOVE_KNOCK_OFF - .byte F_EV_SPREAD_SP_ATTACK - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 76 - .2byte SPECIES_CASTFORM - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x82 @ team flags - .2byte MOVE_WEATHER_BALL, MOVE_HAIL, MOVE_SUNNY_DAY, MOVE_RAIN_DANCE - .byte F_EV_SPREAD_SPEED - .byte NATURE_MODEST - .2byte 0 @ padding - -@ 77 - .2byte SPECIES_MILOTIC - .byte BATTLE_TOWER_ITEM_DRAGON_FANG - .byte 0x02 @ team flags - .2byte MOVE_SURF, MOVE_REFRESH, MOVE_RECOVER, MOVE_RAIN_DANCE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 78 - .2byte SPECIES_SHARPEDO - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x01 @ team flags - .2byte MOVE_CRUNCH, MOVE_FOCUS_ENERGY, MOVE_SCARY_FACE, MOVE_SCREECH - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_LAX - .2byte 0 @ padding - -@ 79 - .2byte SPECIES_FLYGON - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0x06 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_SAND_ATTACK, MOVE_DRAGON_BREATH, MOVE_SAND_TOMB - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 80 - .2byte SPECIES_TRAPINCH - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x09 @ team flags - .2byte MOVE_TOXIC, MOVE_SAND_TOMB, MOVE_CRUNCH, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_ATTACK - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 81 - .2byte SPECIES_LUNATONE - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x43 @ team flags - .2byte MOVE_PSYCHIC, MOVE_ROCK_THROW, MOVE_HYPNOSIS, MOVE_LIGHT_SCREEN - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 82 - .2byte SPECIES_SOLROCK - .byte BATTLE_TOWER_ITEM_PECHA_BERRY - .byte 0x43 @ team flags - .2byte MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_COSMIC_POWER, MOVE_CALM_MIND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 83 - .2byte SPECIES_BALTOY - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x43 @ team flags - .2byte MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_REFLECT, MOVE_SELF_DESTRUCT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 84 - .2byte SPECIES_CRAWDAUNT - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x06 @ team flags - .2byte MOVE_CRABHAMMER, MOVE_SURF, MOVE_PROTECT, MOVE_BRICK_BREAK - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_RASH - .2byte 0 @ padding - -@ 85 - .2byte SPECIES_WHISCASH - .byte BATTLE_TOWER_ITEM_ASPEAR_BERRY - .byte 0x06 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_TICKLE, MOVE_AMNESIA, MOVE_SURF - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 86 - .2byte SPECIES_SEVIPER - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x09 @ team flags - .2byte MOVE_POISON_TAIL, MOVE_CRUNCH, MOVE_GIGA_DRAIN, MOVE_HAZE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 87 - .2byte SPECIES_MAGCARGO - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x89 @ team flags - .2byte MOVE_FLAMETHROWER, MOVE_LIGHT_SCREEN, MOVE_AMNESIA, MOVE_ROCK_SLIDE - .byte F_EV_SPREAD_ATTACK - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 88 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_BLACK_BELT - .byte 0x09 @ team flags - .2byte MOVE_KARATE_CHOP, MOVE_SEISMIC_TOSS, MOVE_BRICK_BREAK, MOVE_LOW_KICK - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 89 - .2byte SPECIES_SWALOT - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x86 @ team flags - .2byte MOVE_YAWN, MOVE_WATER_PULSE, MOVE_SHADOW_BALL, MOVE_SLUDGE_BOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 90 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x0C @ team flags - .2byte MOVE_LEAF_BLADE, MOVE_GIGA_DRAIN, MOVE_FURY_CUTTER, MOVE_DETECT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 91 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x0C @ team flags - .2byte MOVE_BLAZE_KICK, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_QUICK_ATTACK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 92 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x4C @ team flags - .2byte MOVE_SURF, MOVE_MUD_SHOT, MOVE_MUD_SLAP, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 93 - .2byte SPECIES_MIGHTYENA - .byte BATTLE_TOWER_ITEM_BLACK_GLASSES - .byte 0x04 @ team flags - .2byte MOVE_CRUNCH, MOVE_HOWL, MOVE_SWAGGER, MOVE_SHADOW_BALL - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_CALM - .2byte 0 @ padding - -@ 94 - .2byte SPECIES_LINOONE - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x04 @ team flags - .2byte MOVE_SLASH, MOVE_REST, MOVE_BELLY_DRUM, MOVE_THUNDERBOLT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_MILD - .2byte 0 @ padding - -@ 95 - .2byte SPECIES_BEAUTIFLY - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x08 @ team flags - .2byte MOVE_GIGA_DRAIN, MOVE_ATTRACT, MOVE_MORNING_SUN, MOVE_STUN_SPORE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 96 - .2byte SPECIES_DUSTOX - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x08 @ team flags - .2byte MOVE_PSYCHIC, MOVE_SILVER_WIND, MOVE_MOONLIGHT, MOVE_TOXIC - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 97 - .2byte SPECIES_LUDICOLO - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x0C @ team flags - .2byte MOVE_FAKE_OUT, MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_UPROAR - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 98 - .2byte SPECIES_SHIFTRY - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x0C @ team flags - .2byte MOVE_FRUSTRATION, MOVE_GIGA_DRAIN, MOVE_TORMENT, MOVE_SWAGGER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 99 - .2byte SPECIES_SWELLOW - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x88 @ team flags - .2byte MOVE_FLY, MOVE_ENDEAVOR, MOVE_AERIAL_ACE, MOVE_TOXIC - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 100 - .2byte SPECIES_GARDEVOIR - .byte BATTLE_TOWER_ITEM_BLACK_GLASSES - .byte 0x4A @ team flags - .2byte MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_PSYCHIC, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 101 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x0C @ team flags - .2byte MOVE_DYNAMIC_PUNCH, MOVE_MIND_READER, MOVE_SNATCH, MOVE_MEGA_DRAIN - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 102 - .2byte SPECIES_VIGOROTH - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x04 @ team flags - .2byte MOVE_SLASH, MOVE_UPROAR, MOVE_ENCORE, MOVE_FACADE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_CALM - .2byte 0 @ padding - -@ 103 - .2byte SPECIES_NINJASK - .byte BATTLE_TOWER_ITEM_SILVER_POWDER - .byte 0x04 @ team flags - .2byte MOVE_FURY_CUTTER, MOVE_GIGA_DRAIN, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 104 - .2byte SPECIES_SHEDINJA - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0xCA @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_GRUDGE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 105 - .2byte SPECIES_LOUDRED - .byte BATTLE_TOWER_ITEM_PECHA_BERRY - .byte 0x04 @ team flags - .2byte MOVE_HYPER_VOICE, MOVE_HOWL, MOVE_SHADOW_BALL, MOVE_TORMENT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 106 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x04 @ team flags - .2byte MOVE_ARM_THRUST, MOVE_BULK_UP, MOVE_BRICK_BREAK, MOVE_HIDDEN_POWER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 107 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_TWISTED_SPOON - .byte 0x88 @ team flags - .2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_FUTURE_SIGHT, MOVE_DISABLE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 108 - .2byte SPECIES_CROBAT - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0x88 @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_TOXIC, MOVE_MEAN_LOOK, MOVE_SNATCH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 109 - .2byte SPECIES_MAWILE - .byte BATTLE_TOWER_ITEM_METAL_COAT - .byte 0x04 @ team flags - .2byte MOVE_CRUNCH, MOVE_IRON_DEFENSE, MOVE_FAKE_TEARS, MOVE_POISON_FANG - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 110 - .2byte SPECIES_AGGRON - .byte BATTLE_TOWER_ITEM_METAL_COAT - .byte 0x45 @ team flags - .2byte MOVE_METAL_CLAW, MOVE_FLAMETHROWER, MOVE_METAL_SOUND, MOVE_ICE_BEAM - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 111 - .2byte SPECIES_GOLEM - .byte BATTLE_TOWER_ITEM_SOFT_SAND - .byte 0xC5 @ team flags - .2byte MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_DOUBLE_TEAM, MOVE_SELF_DESTRUCT - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 112 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_MAGNET - .byte 0x04 @ team flags - .2byte MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_THUNDER_WAVE, MOVE_CHARGE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 113 - .2byte SPECIES_VOLBEAT - .byte BATTLE_TOWER_ITEM_SILVER_POWDER - .byte 0x08 @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_SIGNAL_BEAM, MOVE_MOONLIGHT, MOVE_TAIL_GLOW - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 114 - .2byte SPECIES_ILLUMISE - .byte BATTLE_TOWER_ITEM_SILVER_POWDER - .byte 0x08 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_FLATTER, MOVE_WISH, MOVE_ENCORE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 115 - .2byte SPECIES_MASQUERAIN - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x88 @ team flags - .2byte MOVE_GIGA_DRAIN, MOVE_SILVER_WIND, MOVE_STUN_SPORE, MOVE_TOXIC - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 116 - .2byte SPECIES_ROSELIA - .byte BATTLE_TOWER_ITEM_MIRACLE_SEED - .byte 0x08 @ team flags - .2byte MOVE_PETAL_DANCE, MOVE_GROWTH, MOVE_SYNTHESIS, MOVE_GRASS_WHISTLE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 117 - .2byte SPECIES_DELCATTY - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x08 @ team flags - .2byte MOVE_SING, MOVE_ATTRACT, MOVE_DOUBLE_SLAP, MOVE_HEAL_BELL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 118 - .2byte SPECIES_SEAKING - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0x88 @ team flags - .2byte MOVE_RAIN_DANCE, MOVE_SURF, MOVE_ATTRACT, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 119 - .2byte SPECIES_GYARADOS - .byte BATTLE_TOWER_ITEM_DRAGON_FANG - .byte 0x8C @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_EARTHQUAKE, MOVE_DRAGON_RAGE, MOVE_PROTECT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_CALM - .2byte 0 @ padding - -@ 120 - .2byte SPECIES_SWALOT - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x42 @ team flags - .2byte MOVE_STOCKPILE, MOVE_SWALLOW, MOVE_SPIT_UP, MOVE_YAWN - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 121 - .2byte SPECIES_MAGCARGO - .byte BATTLE_TOWER_ITEM_ASPEAR_BERRY - .byte 0x41 @ team flags - .2byte MOVE_ROCK_SLIDE, MOVE_FIRE_BLAST, MOVE_BODY_SLAM, MOVE_LIGHT_SCREEN - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_LONELY - .2byte 0 @ padding - -@ 122 - .2byte SPECIES_MUK - .byte BATTLE_TOWER_ITEM_POISON_BARB - .byte 0xC3 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_FLAMETHROWER, MOVE_ACID_ARMOR, MOVE_DISABLE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 123 - .2byte SPECIES_SPINDA - .byte BATTLE_TOWER_ITEM_SILK_SCARF - .byte 0x42 @ team flags - .2byte MOVE_DIZZY_PUNCH, MOVE_TEETER_DANCE, MOVE_PSYCH_UP, MOVE_FACADE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_MODEST - .2byte 0 @ padding - -@ 124 - .2byte SPECIES_ALTARIA - .byte BATTLE_TOWER_ITEM_DRAGON_FANG - .byte 0x03 @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_REFRESH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_RASH - .2byte 0 @ padding - -@ 125 - .2byte SPECIES_ZANGOOSE - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x03 @ team flags - .2byte MOVE_CRUSH_CLAW, MOVE_TAUNT, MOVE_SWORDS_DANCE, MOVE_DETECT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_QUIRKY - .2byte 0 @ padding - -@ 126 - .2byte SPECIES_SEVIPER - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x41 @ team flags - .2byte MOVE_SWAGGER, MOVE_TAUNT, MOVE_GLARE, MOVE_POISON_TAIL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 127 - .2byte SPECIES_GRUMPIG - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x42 @ team flags - .2byte MOVE_TOXIC, MOVE_BOUNCE, MOVE_CONFUSE_RAY, MOVE_ATTRACT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 128 - .2byte SPECIES_CACTURNE - .byte BATTLE_TOWER_ITEM_MIRACLE_SEED - .byte 0x41 @ team flags - .2byte MOVE_NEEDLE_ARM, MOVE_INGRAIN, MOVE_SPIKES, MOVE_COTTON_SPORE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 129 - .2byte SPECIES_CLAYDOL - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x03 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_SANDSTORM, MOVE_COSMIC_POWER, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 130 - .2byte SPECIES_TENTACRUEL - .byte BATTLE_TOWER_ITEM_MENTAL_HERB - .byte 0xC1 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_HYDRO_PUMP, MOVE_BARRIER, MOVE_SUPERSONIC - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 131 - .2byte SPECIES_WIGGLYTUFF - .byte BATTLE_TOWER_ITEM_RAWST_BERRY - .byte 0xC3 @ team flags - .2byte MOVE_SING, MOVE_FOCUS_PUNCH, MOVE_DISABLE, MOVE_FACADE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 132 - .2byte SPECIES_AZUMARILL - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0xC2 @ team flags - .2byte MOVE_SURF, MOVE_ATTRACT, MOVE_DEFENSE_CURL, MOVE_ROLLOUT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_RASH - .2byte 0 @ padding - -@ 133 - .2byte SPECIES_ELECTRODE - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0xC3 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_MIRROR_COAT, MOVE_LIGHT_SCREEN, MOVE_SELF_DESTRUCT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 134 - .2byte SPECIES_MILOTIC - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x42 @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_ATTRACT, MOVE_RECOVER, MOVE_REFRESH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 135 - .2byte SPECIES_KECLEON - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x43 @ team flags - .2byte MOVE_SKILL_SWAP, MOVE_ANCIENT_POWER, MOVE_WATER_PULSE, MOVE_THUNDERBOLT - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 136 - .2byte SPECIES_DUSCLOPS - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x43 @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_CURSE, MOVE_REST, MOVE_MEAN_LOOK - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 137 - .2byte SPECIES_ABSOL - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x41 @ team flags - .2byte MOVE_SLASH, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM, MOVE_SNATCH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 138 - .2byte SPECIES_NINETALES - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0xC2 @ team flags - .2byte MOVE_FLAMETHROWER, MOVE_CONFUSE_RAY, MOVE_DOUBLE_TEAM, MOVE_WILL_O_WISP - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 139 - .2byte SPECIES_PIKACHU - .byte BATTLE_TOWER_ITEM_LIGHT_BALL - .byte 0xC2 @ team flags - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_ATTRACT - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 140 - .2byte SPECIES_VILEPLUME - .byte BATTLE_TOWER_ITEM_ASPEAR_BERRY - .byte 0xC3 @ team flags - .2byte MOVE_GIGA_DRAIN, MOVE_SLEEP_POWDER, MOVE_MOONLIGHT, MOVE_SLUDGE_BOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 141 - .2byte SPECIES_DONPHAN - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x41 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_IRON_TAIL, MOVE_FISSURE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_QUIRKY - .2byte 0 @ padding - -@ 142 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0xC3 @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 143 - .2byte SPECIES_WALREIN - .byte BATTLE_TOWER_ITEM_NEVER_MELT_ICE - .byte 0x43 @ team flags - .2byte MOVE_ICE_BEAM, MOVE_BODY_SLAM, MOVE_ENCORE, MOVE_HAIL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 144 - .2byte SPECIES_RELICANTH - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x41 @ team flags - .2byte MOVE_YAWN, MOVE_MUD_SPORT, MOVE_DOUBLE_EDGE, MOVE_SANDSTORM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_LONELY - .2byte 0 @ padding - -@ 145 - .2byte SPECIES_KINGDRA - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x43 @ team flags - .2byte MOVE_RAIN_DANCE, MOVE_ICE_BEAM, MOVE_HYDRO_PUMP, MOVE_AGILITY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 146 - .2byte SPECIES_CRADILY - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x43 @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_INGRAIN, MOVE_ANCIENT_POWER, MOVE_GIGA_DRAIN - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_MILD - .2byte 0 @ padding - -@ 147 - .2byte SPECIES_ARMALDO - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x43 @ team flags - .2byte MOVE_SLASH, MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_WATER_PULSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 148 - .2byte SPECIES_METAGROSS - .byte BATTLE_TOWER_ITEM_METAL_COAT - .byte 0x41 @ team flags - .2byte MOVE_METAL_CLAW, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_AGILITY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 149 - .2byte SPECIES_SALAMENCE - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x42 @ team flags - .2byte MOVE_DRAGON_BREATH, MOVE_CRUNCH, MOVE_FLAMETHROWER, MOVE_AERIAL_ACE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 150 - .2byte SPECIES_MIGHTYENA - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x01 @ team flags - .2byte MOVE_CRUNCH, MOVE_YAWN, MOVE_FACADE, MOVE_HOWL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 151 - .2byte SPECIES_LINOONE - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x02 @ team flags - .2byte MOVE_HYPER_BEAM, MOVE_FACADE, MOVE_ATTRACT, MOVE_TRICK - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 152 - .2byte SPECIES_LUDICOLO - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x03 @ team flags - .2byte MOVE_SURF, MOVE_FOCUS_PUNCH, MOVE_FAKE_OUT, MOVE_SYNTHESIS - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 153 - .2byte SPECIES_EXPLOUD - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x01 @ team flags - .2byte MOVE_UPROAR, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 154 - .2byte SPECIES_SWELLOW - .byte BATTLE_TOWER_ITEM_LANSAT_BERRY - .byte 0x02 @ team flags - .2byte MOVE_FACADE, MOVE_SUPERSONIC, MOVE_WING_ATTACK, MOVE_ENDEAVOR - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 155 - .2byte SPECIES_PELIPPER - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x82 @ team flags - .2byte MOVE_STOCKPILE, MOVE_SWALLOW, MOVE_SPIT_UP, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 156 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x01 @ team flags - .2byte MOVE_DYNAMIC_PUNCH, MOVE_COUNTER, MOVE_BULK_UP, MOVE_MIND_READER - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 157 - .2byte SPECIES_SHEDINJA - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x01 @ team flags - .2byte MOVE_RETURN, MOVE_DOUBLE_TEAM, MOVE_TOXIC, MOVE_SHADOW_BALL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 158 - .2byte SPECIES_EXPLOUD - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x01 @ team flags - .2byte MOVE_HYPER_BEAM, MOVE_SUPERSONIC, MOVE_FLAMETHROWER, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 159 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x01 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_COUNTER, MOVE_FACADE, MOVE_FAKE_OUT - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 160 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x83 @ team flags - .2byte MOVE_PSYCHIC, MOVE_ENCORE, MOVE_DISABLE, MOVE_RECOVER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 161 - .2byte SPECIES_CROBAT - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x81 @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_AIR_CUTTER, MOVE_TORMENT, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 162 - .2byte SPECIES_SABLEYE - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x83 @ team flags - .2byte MOVE_TOXIC, MOVE_DETECT, MOVE_RECOVER, MOVE_TORMENT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 163 - .2byte SPECIES_MAWILE - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x02 @ team flags - .2byte MOVE_CRUNCH, MOVE_SWORDS_DANCE, MOVE_IRON_DEFENSE, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 164 - .2byte SPECIES_AGGRON - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x01 @ team flags - .2byte MOVE_DOUBLE_EDGE, MOVE_IRON_DEFENSE, MOVE_ROAR, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 165 - .2byte SPECIES_GOLEM - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x01 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FLAMETHROWER, MOVE_FACADE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 166 - .2byte SPECIES_NOSEPASS - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x81 @ team flags - .2byte MOVE_THUNDER_WAVE, MOVE_ROCK_SLIDE, MOVE_TORMENT, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 167 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x02 @ team flags - .2byte MOVE_THUNDER, MOVE_CRUNCH, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 168 - .2byte SPECIES_ROSELIA - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x82 @ team flags - .2byte MOVE_GRASS_WHISTLE, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_GROWTH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 169 - .2byte SPECIES_DELCATTY - .byte BATTLE_TOWER_ITEM_STARF_BERRY - .byte 0x02 @ team flags - .2byte MOVE_ASSIST, MOVE_SING, MOVE_ATTRACT, MOVE_SUBSTITUTE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 170 - .2byte SPECIES_TROPIUS - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0xC2 @ team flags - .2byte MOVE_RAZOR_LEAF, MOVE_EARTHQUAKE, MOVE_ATTRACT, MOVE_SYNTHESIS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 171 - .2byte SPECIES_SWALOT - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x03 @ team flags - .2byte MOVE_YAWN, MOVE_SLUDGE_BOMB, MOVE_ATTRACT, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 172 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_BLACK_BELT - .byte 0x01 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_BULK_UP, MOVE_LOW_KICK, MOVE_BRICK_BREAK - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 173 - .2byte SPECIES_CAMERUPT - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x40 @ team flags - .2byte MOVE_ERUPTION, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_OVERHEAT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 174 - .2byte SPECIES_MAGCARGO - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x03 @ team flags - .2byte MOVE_FLAMETHROWER, MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_REFLECT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 175 - .2byte SPECIES_WEEZING - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x81 @ team flags - .2byte MOVE_WILL_O_WISP, MOVE_HYPER_BEAM, MOVE_THUNDERBOLT, MOVE_DESTINY_BOND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 176 - .2byte SPECIES_SPINDA - .byte BATTLE_TOWER_ITEM_CHOICE_BAND - .byte 0x82 @ team flags - .2byte MOVE_TRICK, MOVE_TEETER_DANCE, MOVE_FOCUS_PUNCH, MOVE_FACADE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 177 - .2byte SPECIES_SKARMORY - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x01 @ team flags - .2byte MOVE_DRILL_PECK, MOVE_STEEL_WING, MOVE_TORMENT, MOVE_PROTECT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 178 - .2byte SPECIES_ALTARIA - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x02 @ team flags - .2byte MOVE_SING, MOVE_DRAGON_CLAW, MOVE_ICE_BEAM, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 179 - .2byte SPECIES_GRUMPIG - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x82 @ team flags - .2byte MOVE_PSYCHIC, MOVE_CONFUSE_RAY, MOVE_CALM_MIND, MOVE_REST - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 180 - .2byte SPECIES_SHIFTRY - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x20 @ team flags - .2byte MOVE_SWAGGER, MOVE_FRUSTRATION, MOVE_ATTRACT, MOVE_EXPLOSION - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 181 - .2byte SPECIES_CLAYDOL - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x20 @ team flags - .2byte MOVE_COSMIC_POWER, MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 182 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x33 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_BELLY_DRUM, MOVE_REST - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 183 - .2byte SPECIES_NOSEPASS - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x20 @ team flags - .2byte MOVE_ROCK_SLIDE, MOVE_THUNDER_WAVE, MOVE_EARTHQUAKE, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 184 - .2byte SPECIES_DUSCLOPS - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x33 @ team flags - .2byte MOVE_SHADOW_PUNCH, MOVE_WILL_O_WISP, MOVE_CONFUSE_RAY, MOVE_DESTINY_BOND - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 185 - .2byte SPECIES_SEAKING - .byte BATTLE_TOWER_ITEM_LEPPA_BERRY - .byte 0x20 @ team flags - .2byte MOVE_HORN_DRILL, MOVE_AGILITY, MOVE_SLEEP_TALK, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 186 - .2byte SPECIES_CAMERUPT - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x73 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_ERUPTION, MOVE_ROCK_SLIDE, MOVE_FISSURE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 187 - .2byte SPECIES_LANTURN - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x13 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_SURF, MOVE_THUNDER_WAVE, MOVE_CONFUSE_RAY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 188 - .2byte SPECIES_WEEZING - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x33 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_THUNDERBOLT, MOVE_FIRE_BLAST, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 189 - .2byte SPECIES_WHISCASH - .byte BATTLE_TOWER_ITEM_LEPPA_BERRY - .byte 0x20 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_SURF, MOVE_SPARK, MOVE_FISSURE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 190 - .2byte SPECIES_AGGRON - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x51 @ team flags - .2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_SURF, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 191 - .2byte SPECIES_KECLEON - .byte BATTLE_TOWER_ITEM_CHOICE_BAND - .byte 0x12 @ team flags - .2byte MOVE_TRICK, MOVE_FOCUS_PUNCH, MOVE_ATTRACT, MOVE_SNATCH - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_MILD - .2byte 0 @ padding - -@ 192 - .2byte SPECIES_SHARPEDO - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x11 @ team flags - .2byte MOVE_CRUNCH, MOVE_DOUBLE_EDGE, MOVE_SURF, MOVE_SWAGGER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 193 - .2byte SPECIES_ABSOL - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x12 @ team flags - .2byte MOVE_DOUBLE_EDGE, MOVE_FACADE, MOVE_SWORDS_DANCE, MOVE_QUICK_ATTACK - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 194 - .2byte SPECIES_WAILORD - .byte BATTLE_TOWER_ITEM_LEPPA_BERRY - .byte 0x72 @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_EARTHQUAKE, MOVE_ATTRACT, MOVE_FISSURE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 195 - .2byte SPECIES_TENTACRUEL - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x20 @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_BARRIER, MOVE_MIRROR_COAT - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 196 - .2byte SPECIES_SABLEYE - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x32 @ team flags - .2byte MOVE_SHADOW_BALL, MOVE_TOXIC, MOVE_RECOVER, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 197 - .2byte SPECIES_WOBBUFFET - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x20 @ team flags - .2byte MOVE_ENCORE, MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_MILD - .2byte 0 @ padding - -@ 198 - .2byte SPECIES_RHYDON - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x71 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_MEGAHORN, MOVE_BRICK_BREAK, MOVE_HORN_DRILL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 199 - .2byte SPECIES_GLALIE - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x31 @ team flags - .2byte MOVE_CRUNCH, MOVE_BLIZZARD, MOVE_HAIL, MOVE_SHEER_COLD - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 200 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x8C @ team flags - .2byte MOVE_LEAF_BLADE, MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 201 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x8C @ team flags - .2byte MOVE_BLAZE_KICK, MOVE_COUNTER, MOVE_ENDURE, MOVE_REVERSAL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 202 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x8C @ team flags - .2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_MIRROR_COAT, MOVE_BLIZZARD - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 203 - .2byte SPECIES_GARDEVOIR - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x1A @ team flags - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_DESTINY_BOND, MOVE_SNATCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 204 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x15 @ team flags - .2byte MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_MACH_PUNCH, MOVE_ATTRACT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 205 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x58 @ team flags - .2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_RECOVER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 206 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x15 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_FACADE, MOVE_FAKE_OUT - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 207 - .2byte SPECIES_GYARADOS - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x55 @ team flags - .2byte MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_SURF, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 208 - .2byte SPECIES_CROBAT - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x58 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_CONFUSE_RAY, MOVE_AIR_CUTTER, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 209 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x5D @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_FLAMETHROWER, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 210 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x1A @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_ROAR, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 211 - .2byte SPECIES_ELECTRODE - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x60 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_MIRROR_COAT, MOVE_EXPLOSION - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 212 - .2byte SPECIES_MUK - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x64 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_EXPLOSION - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 213 - .2byte SPECIES_FLYGON - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x1C @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 214 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x5C @ team flags - .2byte MOVE_SURF, MOVE_THUNDERBOLT, MOVE_RECOVER, MOVE_CONFUSE_RAY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 215 - .2byte SPECIES_NINETALES - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x4A @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_TOXIC, MOVE_FIRE_SPIN, MOVE_HEAT_WAVE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 216 - .2byte SPECIES_RAICHU - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x5A @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_REVERSAL, MOVE_IRON_TAIL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 217 - .2byte SPECIES_GOLDUCK - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x55 @ team flags - .2byte MOVE_SURF, MOVE_CROSS_CHOP, MOVE_ICE_BEAM, MOVE_DIG - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 218 - .2byte SPECIES_HERACROSS - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x5D @ team flags - .2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_ENDURE, MOVE_REVERSAL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 219 - .2byte SPECIES_WALREIN - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x26 @ team flags - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_SHEER_COLD - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 220 - .2byte SPECIES_KINGDRA - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x5B @ team flags - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_DRAGON_BREATH, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 221 - .2byte SPECIES_SALAMENCE - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x0D @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_FIRE_BLAST - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 222 - .2byte SPECIES_METAGROSS - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x3D @ team flags - .2byte MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 223 - .2byte SPECIES_REGIROCK - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x3C @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_THUNDERBOLT, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 224 - .2byte SPECIES_REGICE - .byte BATTLE_TOWER_ITEM_LAX_INCENSE - .byte 0x3C @ team flags - .2byte MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 225 - .2byte SPECIES_REGISTEEL - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x3C @ team flags - .2byte MOVE_METAL_CLAW, MOVE_EARTHQUAKE, MOVE_THUNDERBOLT, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 226 - .2byte SPECIES_LATIAS - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x0E @ team flags - .2byte MOVE_MIST_BALL, MOVE_THUNDERBOLT, MOVE_RECOVER, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 227 - .2byte SPECIES_LATIOS - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x0D @ team flags - .2byte MOVE_LUSTER_PURGE, MOVE_THUNDERBOLT, MOVE_RECOVER, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 228 - .2byte SPECIES_MILOTIC - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x1A @ team flags - .2byte MOVE_SURF, MOVE_TOXIC, MOVE_RECOVER, MOVE_MIRROR_COAT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 229 - .2byte SPECIES_SLAKING - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x15 @ team flags - .2byte MOVE_YAWN, MOVE_FOCUS_PUNCH, MOVE_COUNTER, MOVE_SLACK_OFF - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 230 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x8C @ team flags - .2byte MOVE_GIGA_DRAIN, MOVE_DOUBLE_TEAM, MOVE_LEECH_SEED, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 231 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x8C @ team flags - .2byte MOVE_BLAZE_KICK, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_QUICK_ATTACK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 232 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x8C @ team flags - .2byte MOVE_MUDDY_WATER, MOVE_MUD_SHOT, MOVE_MIRROR_COAT, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 233 - .2byte SPECIES_GARDEVOIR - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x0A @ team flags - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_HYPNOSIS, MOVE_DREAM_EATER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 234 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x05 @ team flags - .2byte MOVE_SPORE, MOVE_COUNTER, MOVE_SKY_UPPERCUT, MOVE_GIGA_DRAIN - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 235 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x58 @ team flags - .2byte MOVE_PSYCHIC, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_RECOVER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 236 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x04 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_COUNTER, MOVE_ENDURE, MOVE_REVERSAL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 237 - .2byte SPECIES_GYARADOS - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x44 @ team flags - .2byte MOVE_HYPER_BEAM, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 238 - .2byte SPECIES_CROBAT - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x48 @ team flags - .2byte MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_ATTRACT, MOVE_FLY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 239 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x5D @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_COUNTER, MOVE_EARTHQUAKE, MOVE_FACADE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 240 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x0A @ team flags - .2byte MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 241 - .2byte SPECIES_ELECTRODE - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x60 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_LIGHT_SCREEN, MOVE_MIRROR_COAT, MOVE_EXPLOSION - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 242 - .2byte SPECIES_MUK - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x64 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_FLAMETHROWER, MOVE_EXPLOSION - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 243 - .2byte SPECIES_FLYGON - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x1C @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_CRUNCH - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 244 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0x5C @ team flags - .2byte MOVE_BLIZZARD, MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_RECOVER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 245 - .2byte SPECIES_DODRIO - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x5A @ team flags - .2byte MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_AGILITY, MOVE_FACADE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 246 - .2byte SPECIES_RAICHU - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x4A @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_ATTRACT, MOVE_FOCUS_PUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 247 - .2byte SPECIES_GOLDUCK - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x45 @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_CROSS_CHOP, MOVE_BLIZZARD, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 248 - .2byte SPECIES_HERACROSS - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x5D @ team flags - .2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_REVERSAL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 249 - .2byte SPECIES_WALREIN - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x26 @ team flags - .2byte MOVE_SURF, MOVE_BLIZZARD, MOVE_ROCK_SLIDE, MOVE_SHEER_COLD - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 250 - .2byte SPECIES_KINGDRA - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x5C @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_DRAGON_BREATH, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 251 - .2byte SPECIES_SALAMENCE - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x1D @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 252 - .2byte SPECIES_METAGROSS - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x3D @ team flags - .2byte MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 253 - .2byte SPECIES_REGIROCK - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x3C @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_THUNDERBOLT, MOVE_FOCUS_PUNCH, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 254 - .2byte SPECIES_REGICE - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x3C @ team flags - .2byte MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_HAIL, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 255 - .2byte SPECIES_REGISTEEL - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x3C @ team flags - .2byte MOVE_METAL_CLAW, MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 256 - .2byte SPECIES_LATIAS - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x1E @ team flags - .2byte MOVE_MIST_BALL, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 257 - .2byte SPECIES_LATIOS - .byte BATTLE_TOWER_ITEM_LAX_INCENSE - .byte 0x1D @ team flags - .2byte MOVE_LUSTER_PURGE, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 258 - .2byte SPECIES_MILOTIC - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x1A @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_MIRROR_COAT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 259 - .2byte SPECIES_SLAKING - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x15 @ team flags - .2byte MOVE_YAWN, MOVE_FOCUS_PUNCH, MOVE_COUNTER, MOVE_PURSUIT - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 260 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x8C @ team flags - .2byte MOVE_LEAF_BLADE, MOVE_ROCK_TOMB, MOVE_DRAGON_CLAW, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 261 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_GANLON_BERRY - .byte 0x8C @ team flags - .2byte MOVE_FOCUS_PUNCH, MOVE_COUNTER, MOVE_SWAGGER, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 262 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x8C @ team flags - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_ATTRACT, MOVE_REST - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 263 - .2byte SPECIES_GARDEVOIR - .byte BATTLE_TOWER_ITEM_LAX_INCENSE - .byte 0x0A @ team flags - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ATTRACT, MOVE_WILL_O_WISP - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 264 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x05 @ team flags - .2byte MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_MACH_PUNCH, MOVE_COUNTER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 265 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_CHOICE_BAND - .byte 0x58 @ team flags - .2byte MOVE_PSYCHIC, MOVE_TRICK, MOVE_RECOVER, MOVE_SNATCH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 266 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x05 @ team flags - .2byte MOVE_REVENGE, MOVE_COUNTER, MOVE_FOCUS_PUNCH, MOVE_REVERSAL - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 267 - .2byte SPECIES_LUDICOLO - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x0A @ team flags - .2byte MOVE_RAIN_DANCE, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_DIVE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 268 - .2byte SPECIES_CROBAT - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x48 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_CONFUSE_RAY, MOVE_SHADOW_BALL, MOVE_SNATCH - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 269 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x5D @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_FIRE_BLAST, MOVE_LOW_KICK, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 270 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x08 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_ATTRACT, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 271 - .2byte SPECIES_ELECTRODE - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x60 @ team flags - .2byte MOVE_THUNDER, MOVE_SWIFT, MOVE_MIRROR_COAT, MOVE_EXPLOSION - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 272 - .2byte SPECIES_MUK - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x64 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_PUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 273 - .2byte SPECIES_FLYGON - .byte BATTLE_TOWER_ITEM_LAX_INCENSE - .byte 0x0C @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_FIRE_BLAST, MOVE_SANDSTORM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 274 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x4C @ team flags - .2byte MOVE_SURF, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_PSYCHIC - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 275 - .2byte SPECIES_LUDICOLO - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x4A @ team flags - .2byte MOVE_LEECH_SEED, MOVE_ATTRACT, MOVE_DOUBLE_TEAM, MOVE_PROTECT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 276 - .2byte SPECIES_SKARMORY - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x4B @ team flags - .2byte MOVE_DRILL_PECK, MOVE_STEEL_WING, MOVE_ATTRACT, MOVE_PURSUIT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 277 - .2byte SPECIES_GOLDUCK - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x49 @ team flags - .2byte MOVE_SURF, MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_CROSS_CHOP - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 278 - .2byte SPECIES_HERACROSS - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x5D @ team flags - .2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 279 - .2byte SPECIES_WALREIN - .byte BATTLE_TOWER_ITEM_LEPPA_BERRY - .byte 0x26 @ team flags - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_FISSURE, MOVE_SHEER_COLD - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 280 - .2byte SPECIES_KINGDRA - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x5C @ team flags - .2byte MOVE_SURF, MOVE_BLIZZARD, MOVE_HYPER_BEAM, MOVE_FLAIL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 281 - .2byte SPECIES_SALAMENCE - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x1D @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_FIRE_BLAST, MOVE_HYDRO_PUMP - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 282 - .2byte SPECIES_METAGROSS - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x3D @ team flags - .2byte MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_HYPER_BEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 283 - .2byte SPECIES_REGIROCK - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x3C @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_THUNDERBOLT, MOVE_SUPERPOWER, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 284 - .2byte SPECIES_REGICE - .byte BATTLE_TOWER_ITEM_LAX_INCENSE - .byte 0x3C @ team flags - .2byte MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_ANCIENT_POWER, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 285 - .2byte SPECIES_REGISTEEL - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x3C @ team flags - .2byte MOVE_METAL_CLAW, MOVE_THUNDERBOLT, MOVE_HYPER_BEAM, MOVE_EXPLOSION - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 286 - .2byte SPECIES_LATIAS - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0x1E @ team flags - .2byte MOVE_MIST_BALL, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 287 - .2byte SPECIES_LATIOS - .byte BATTLE_TOWER_ITEM_GANLON_BERRY - .byte 0x1D @ team flags - .2byte MOVE_LUSTER_PURGE, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 288 - .2byte SPECIES_MILOTIC - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0x1A @ team flags - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 289 - .2byte SPECIES_ALTARIA - .byte BATTLE_TOWER_ITEM_GANLON_BERRY - .byte 0x0A @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_ICE_BEAM, MOVE_SING, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 290 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x9C @ team flags - .2byte MOVE_LEAF_BLADE, MOVE_DETECT, MOVE_DRAGON_CLAW, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 291 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x9C @ team flags - .2byte MOVE_BLAZE_KICK, MOVE_SKY_UPPERCUT, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 292 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x9C @ team flags - .2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 293 - .2byte SPECIES_SHEDINJA - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x20 @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_SHADOW_BALL, MOVE_TOXIC, MOVE_GRUDGE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 294 - .2byte SPECIES_METAGROSS - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x1D @ team flags - .2byte MOVE_METEOR_MASH, MOVE_EARTHQUAKE, MOVE_DOUBLE_TEAM, MOVE_PROTECT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 295 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x58 @ team flags - .2byte MOVE_PSYCHIC, MOVE_THUNDER_PUNCH, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 296 - .2byte SPECIES_LATIAS - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x1E @ team flags - .2byte MOVE_MIST_BALL, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 297 - .2byte SPECIES_LATIOS - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x1D @ team flags - .2byte MOVE_LUSTER_PURGE, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 298 - .2byte SPECIES_SALAMENCE - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x1D @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_FLAMETHROWER, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 299 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x5D @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_LOW_KICK, MOVE_ROCK_SLIDE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding diff --git a/data/battle_tower/level_50_mons.inc b/data/battle_tower/level_50_mons.inc deleted file mode 100644 index 3dfc269a8..000000000 --- a/data/battle_tower/level_50_mons.inc +++ /dev/null @@ -1,2701 +0,0 @@ - .align 2 -gBattleTowerLevel50Mons:: @ 84038E0 -@ 0 - .2byte SPECIES_PIKACHU - .byte BATTLE_TOWER_ITEM_ORAN_BERRY - .byte 0x42 @ team flags - .2byte MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_THUNDER_SHOCK, MOVE_GROWL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 1 - .2byte SPECIES_BEAUTIFLY - .byte BATTLE_TOWER_ITEM_MIRACLE_SEED - .byte 0x41 @ team flags - .2byte MOVE_ABSORB, MOVE_STUN_SPORE, MOVE_GUST, MOVE_SAFEGUARD - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 2 - .2byte SPECIES_SWELLOW - .byte BATTLE_TOWER_ITEM_SHARP_BEAK - .byte 0x07 @ team flags - .2byte MOVE_PECK, MOVE_WING_ATTACK, MOVE_AERIAL_ACE, MOVE_AGILITY - .byte F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 3 - .2byte SPECIES_WALREIN - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x0B @ team flags - .2byte MOVE_HAIL, MOVE_ENCORE, MOVE_ICE_BALL, MOVE_TOXIC - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 4 - .2byte SPECIES_SEAKING - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0x07 @ team flags - .2byte MOVE_PECK, MOVE_FLAIL, MOVE_FURY_ATTACK, MOVE_SURF - .byte F_EV_SPREAD_SPEED - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 5 - .2byte SPECIES_TORCHIC - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x42 @ team flags - .2byte MOVE_FIRE_SPIN, MOVE_PROTECT, MOVE_SAND_ATTACK, MOVE_SLASH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 6 - .2byte SPECIES_MASQUERAIN - .byte BATTLE_TOWER_ITEM_WHITE_HERB - .byte 0x41 @ team flags - .2byte MOVE_STUN_SPORE, MOVE_WATER_SPORT, MOVE_QUICK_ATTACK, MOVE_GUST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 7 - .2byte SPECIES_ILLUMISE - .byte BATTLE_TOWER_ITEM_NONE - .byte 0x41 @ team flags - .2byte MOVE_FLATTER, MOVE_COVET, MOVE_WISH, MOVE_FACADE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 8 - .2byte SPECIES_DELCATTY - .byte BATTLE_TOWER_ITEM_SILK_SCARF - .byte 0x42 @ team flags - .2byte MOVE_ATTRACT, MOVE_TAIL_WHIP, MOVE_FAINT_ATTACK, MOVE_DIG - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LONELY - .2byte 0 @ padding - -@ 9 - .2byte SPECIES_KECLEON - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x0B @ team flags - .2byte MOVE_TAIL_WHIP, MOVE_SLASH, MOVE_LICK, MOVE_SCREECH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 10 - .2byte SPECIES_MIGHTYENA - .byte BATTLE_TOWER_ITEM_PECHA_BERRY - .byte 0x05 @ team flags - .2byte MOVE_BITE, MOVE_TAKE_DOWN, MOVE_ROAR, MOVE_HOWL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 11 - .2byte SPECIES_SLAKING - .byte BATTLE_TOWER_ITEM_BLACK_GLASSES - .byte 0x05 @ team flags - .2byte MOVE_FAINT_ATTACK, MOVE_COUNTER, MOVE_SCRATCH, MOVE_TAUNT - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 12 - .2byte SPECIES_MACHOKE - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x05 @ team flags - .2byte MOVE_LEER, MOVE_DIG, MOVE_LOW_KICK, MOVE_FOCUS_PUNCH - .byte F_EV_SPREAD_SPEED - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 13 - .2byte SPECIES_RHYDON - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x05 @ team flags - .2byte MOVE_STRENGTH, MOVE_ROCK_TOMB, MOVE_STOMP, MOVE_ROCK_SMASH - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_QUIRKY - .2byte 0 @ padding - -@ 14 - .2byte SPECIES_CACTURNE - .byte BATTLE_TOWER_ITEM_POISON_BARB - .byte 0x0B @ team flags - .2byte MOVE_POISON_STING, MOVE_GROWTH, MOVE_ABSORB, MOVE_SOLAR_BEAM - .byte F_EV_SPREAD_SP_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 15 - .2byte SPECIES_ZIGZAGOON - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x0A @ team flags - .2byte MOVE_FLAIL, MOVE_SAND_ATTACK, MOVE_REST, MOVE_SURF - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 16 - .2byte SPECIES_DODRIO - .byte BATTLE_TOWER_ITEM_SHARP_BEAK - .byte 0x03 @ team flags - .2byte MOVE_PURSUIT, MOVE_TRI_ATTACK, MOVE_GROWL, MOVE_AGILITY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 17 - .2byte SPECIES_WHISCASH - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x0B @ team flags - .2byte MOVE_WATER_GUN, MOVE_AMNESIA, MOVE_MAGNITUDE, MOVE_MUD_SLAP - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_LAX - .2byte 0 @ padding - -@ 18 - .2byte SPECIES_NINJASK - .byte BATTLE_TOWER_ITEM_SILVER_POWDER - .byte 0x41 @ team flags - .2byte MOVE_SAND_ATTACK, MOVE_FURY_CUTTER, MOVE_AGILITY, MOVE_HARDEN - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 19 - .2byte SPECIES_DUSCLOPS - .byte BATTLE_TOWER_ITEM_PECHA_BERRY - .byte 0x01 @ team flags - .2byte MOVE_PROTECT, MOVE_NIGHT_SHADE, MOVE_ASTONISH, MOVE_WILL_O_WISP - .byte F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 20 - .2byte SPECIES_CAMERUPT - .byte BATTLE_TOWER_ITEM_CHARCOAL - .byte 0x07 @ team flags - .2byte MOVE_DIG, MOVE_EMBER, MOVE_GROWL, MOVE_ROCK_SMASH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 21 - .2byte SPECIES_SPINDA - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0x4A @ team flags - .2byte MOVE_TEETER_DANCE, MOVE_FLAIL, MOVE_PSYCH_UP, MOVE_DOUBLE_EDGE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_CALM - .2byte 0 @ padding - -@ 22 - .2byte SPECIES_SEVIPER - .byte BATTLE_TOWER_ITEM_POISON_BARB - .byte 0x09 @ team flags - .2byte MOVE_SCREECH, MOVE_GLARE, MOVE_DIG, MOVE_POISON_FANG - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 23 - .2byte SPECIES_FLYGON - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x49 @ team flags - .2byte MOVE_SAND_ATTACK, MOVE_SAND_TOMB, MOVE_FACADE, MOVE_TOXIC - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 24 - .2byte SPECIES_AZUMARILL - .byte BATTLE_TOWER_ITEM_WHITE_HERB - .byte 0x42 @ team flags - .2byte MOVE_BUBBLE_BEAM, MOVE_TAIL_WHIP, MOVE_RAIN_DANCE, MOVE_ROLLOUT - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 25 - .2byte SPECIES_ZANGOOSE - .byte BATTLE_TOWER_ITEM_MENTAL_HERB - .byte 0x07 @ team flags - .2byte MOVE_STRENGTH, MOVE_TAUNT, MOVE_CRUSH_CLAW, MOVE_DETECT - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 26 - .2byte SPECIES_MEDICHAM - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x07 @ team flags - .2byte MOVE_REVERSAL, MOVE_MEDITATE, MOVE_CONFUSION, MOVE_FACADE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 27 - .2byte SPECIES_ROSELIA - .byte BATTLE_TOWER_ITEM_MIRACLE_SEED - .byte 0x0A @ team flags - .2byte MOVE_GROWTH, MOVE_MEGA_DRAIN, MOVE_TOXIC, MOVE_CUT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 28 - .2byte SPECIES_SWALOT - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x0B @ team flags - .2byte MOVE_STOCKPILE, MOVE_SPIT_UP, MOVE_SLUDGE, MOVE_POISON_GAS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 29 - .2byte SPECIES_MAGNETON - .byte BATTLE_TOWER_ITEM_MAGNET - .byte 0x0B @ team flags - .2byte MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SCREECH, MOVE_TRI_ATTACK - .byte F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 30 - .2byte SPECIES_GARDEVOIR - .byte BATTLE_TOWER_ITEM_TWISTED_SPOON - .byte 0x09 @ team flags - .2byte MOVE_CONFUSION, MOVE_TOXIC, MOVE_TORMENT, MOVE_PROTECT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 31 - .2byte SPECIES_RELICANTH - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0x01 @ team flags - .2byte MOVE_SURF, MOVE_ANCIENT_POWER, MOVE_ROCK_TOMB, MOVE_HARDEN - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 32 - .2byte SPECIES_NINETALES - .byte BATTLE_TOWER_ITEM_RAWST_BERRY - .byte 0x03 @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_FIRE_SPIN, MOVE_QUICK_ATTACK, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 33 - .2byte SPECIES_SHARPEDO - .byte BATTLE_TOWER_ITEM_BLACK_GLASSES - .byte 0x05 @ team flags - .2byte MOVE_BITE, MOVE_SKULL_BASH, MOVE_RAIN_DANCE, MOVE_SURF - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 34 - .2byte SPECIES_GIRAFARIG - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x03 @ team flags - .2byte MOVE_STRENGTH, MOVE_PSYBEAM, MOVE_AGILITY, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 35 - .2byte SPECIES_PELIPPER - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x0B @ team flags - .2byte MOVE_MIST, MOVE_STOCKPILE, MOVE_SWALLOW, MOVE_SPIT_UP - .byte F_EV_SPREAD_DEFENSE - .byte NATURE_QUIRKY - .2byte 0 @ padding - -@ 36 - .2byte SPECIES_SABLEYE - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0x09 @ team flags - .2byte MOVE_SHADOW_BALL, MOVE_NIGHT_SHADE, MOVE_SNATCH, MOVE_FAKE_OUT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 37 - .2byte SPECIES_LUNATONE - .byte BATTLE_TOWER_ITEM_HARD_STONE - .byte 0x0B @ team flags - .2byte MOVE_COSMIC_POWER, MOVE_SANDSTORM, MOVE_PSYCHIC, MOVE_ROCK_THROW - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 38 - .2byte SPECIES_LUDICOLO - .byte BATTLE_TOWER_ITEM_NONE - .byte 0x0B @ team flags - .2byte MOVE_THIEF, MOVE_FAKE_OUT, MOVE_SURF, MOVE_RAIN_DANCE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 39 - .2byte SPECIES_GRUMPIG - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x0B @ team flags - .2byte MOVE_ODOR_SLEUTH, MOVE_CONFUSE_RAY, MOVE_MAGIC_COAT, MOVE_PSYCHIC - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 40 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x0B @ team flags - .2byte MOVE_CUT, MOVE_LEECH_SEED, MOVE_MEGA_DRAIN, MOVE_STUN_SPORE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 41 - .2byte SPECIES_WAILORD - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0x03 @ team flags - .2byte MOVE_WATER_SPOUT, MOVE_ROLLOUT, MOVE_MIST, MOVE_RAIN_DANCE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 42 - .2byte SPECIES_WEEZING - .byte BATTLE_TOWER_ITEM_POISON_BARB - .byte 0x05 @ team flags - .2byte MOVE_SMOG, MOVE_SELF_DESTRUCT, MOVE_TOXIC, MOVE_SLUDGE_BOMB - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 43 - .2byte SPECIES_KADABRA - .byte BATTLE_TOWER_ITEM_LEPPA_BERRY - .byte 0x0B @ team flags - .2byte MOVE_FUTURE_SIGHT, MOVE_FOCUS_PUNCH, MOVE_SKILL_SWAP, MOVE_SNATCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 44 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_MAGNET - .byte 0x07 @ team flags - .2byte MOVE_THUNDER_WAVE, MOVE_BITE, MOVE_SPARK, MOVE_QUICK_ATTACK - .byte F_EV_SPREAD_SP_ATTACK - .byte NATURE_RASH - .2byte 0 @ padding - -@ 45 - .2byte SPECIES_RAICHU - .byte BATTLE_TOWER_ITEM_ASPEAR_BERRY - .byte 0x03 @ team flags - .2byte MOVE_QUICK_ATTACK, MOVE_AGILITY, MOVE_LIGHT_SCREEN, MOVE_THUNDERBOLT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 46 - .2byte SPECIES_XATU - .byte BATTLE_TOWER_ITEM_TWISTED_SPOON - .byte 0x03 @ team flags - .2byte MOVE_NIGHT_SHADE, MOVE_PECK, MOVE_CONFUSE_RAY, MOVE_FUTURE_SIGHT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 47 - .2byte SPECIES_LOUDRED - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x05 @ team flags - .2byte MOVE_UPROAR, MOVE_STOMP, MOVE_SCREECH, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_MODEST - .2byte 0 @ padding - -@ 48 - .2byte SPECIES_SOLROCK - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x03 @ team flags - .2byte MOVE_ROCK_THROW, MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_SANDSTORM - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_MILD - .2byte 0 @ padding - -@ 49 - .2byte SPECIES_CLAYDOL - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x03 @ team flags - .2byte MOVE_SANDSTORM, MOVE_REFLECT, MOVE_ROCK_TOMB, MOVE_STRENGTH - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 50 - .2byte SPECIES_CRAWDAUNT - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x03 @ team flags - .2byte MOVE_WATER_PULSE, MOVE_KNOCK_OFF, MOVE_HARDEN, MOVE_CUT - .byte F_EV_SPREAD_HP - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 51 - .2byte SPECIES_GOLBAT - .byte BATTLE_TOWER_ITEM_WHITE_HERB - .byte 0x09 @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_WING_ATTACK, MOVE_MEAN_LOOK, MOVE_BITE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 52 - .2byte SPECIES_BELLOSSOM - .byte BATTLE_TOWER_ITEM_MIRACLE_SEED - .byte 0x0A @ team flags - .2byte MOVE_SOLAR_BEAM, MOVE_PETAL_DANCE, MOVE_SWEET_SCENT, MOVE_BULLET_SEED - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 53 - .2byte SPECIES_DONPHAN - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x05 @ team flags - .2byte MOVE_ROCK_SMASH, MOVE_RAPID_SPIN, MOVE_FLAIL, MOVE_HORN_ATTACK - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 54 - .2byte SPECIES_NOSEPASS - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x0B @ team flags - .2byte MOVE_SANDSTORM, MOVE_ROCK_SLIDE, MOVE_BLOCK, MOVE_THUNDER_WAVE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 55 - .2byte SPECIES_PINSIR - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x05 @ team flags - .2byte MOVE_SWORDS_DANCE, MOVE_HARDEN, MOVE_CUT, MOVE_SEISMIC_TOSS - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 56 - .2byte SPECIES_GOLDUCK - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x0B @ team flags - .2byte MOVE_DISABLE, MOVE_PSYCH_UP, MOVE_WATER_PULSE, MOVE_BRICK_BREAK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 57 - .2byte SPECIES_SHIFTRY - .byte BATTLE_TOWER_ITEM_MENTAL_HERB - .byte 0x07 @ team flags - .2byte MOVE_TORMENT, MOVE_EXTRASENSORY, MOVE_SOLAR_BEAM, MOVE_AERIAL_ACE - .byte F_EV_SPREAD_DEFENSE - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 58 - .2byte SPECIES_DUSTOX - .byte BATTLE_TOWER_ITEM_SILVER_POWDER - .byte 0x01 @ team flags - .2byte MOVE_CONFUSION, MOVE_SILVER_WIND, MOVE_PSYBEAM, MOVE_WHIRLWIND - .byte F_EV_SPREAD_SPEED - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 59 - .2byte SPECIES_SHUPPET - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x03 @ team flags - .2byte MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_FAINT_ATTACK, MOVE_CURSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 60 - .2byte SPECIES_SEAKING - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0x07 @ team flags - .2byte MOVE_RAIN_DANCE, MOVE_SURF, MOVE_HORN_ATTACK, MOVE_HORN_DRILL - .byte F_EV_SPREAD_SP_DEFENSE - .byte NATURE_LONELY - .2byte 0 @ padding - -@ 61 - .2byte SPECIES_SKARMORY - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x07 @ team flags - .2byte MOVE_STEEL_WING, MOVE_SAND_ATTACK, MOVE_SWIFT, MOVE_AGILITY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 62 - .2byte SPECIES_TORKOAL - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x43 @ team flags - .2byte MOVE_FLAMETHROWER, MOVE_IRON_DEFENSE, MOVE_BODY_SLAM, MOVE_PROTECT - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 63 - .2byte SPECIES_GOLEM - .byte BATTLE_TOWER_ITEM_SOFT_SAND - .byte 0x05 @ team flags - .2byte MOVE_MAGNITUDE, MOVE_EXPLOSION, MOVE_STRENGTH, MOVE_SANDSTORM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 64 - .2byte SPECIES_GARDEVOIR - .byte BATTLE_TOWER_ITEM_TWISTED_SPOON - .byte 0x41 @ team flags - .2byte MOVE_REFLECT, MOVE_PSYCHIC, MOVE_IMPRISON, MOVE_TOXIC - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 65 - .2byte SPECIES_SANDSLASH - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x07 @ team flags - .2byte MOVE_SANDSTORM, MOVE_SLASH, MOVE_EARTHQUAKE, MOVE_SWIFT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 66 - .2byte SPECIES_WOBBUFFET - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x0B @ team flags - .2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_DESTINY_BOND - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_CALM - .2byte 0 @ padding - -@ 67 - .2byte SPECIES_TENTACRUEL - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0x05 @ team flags - .2byte MOVE_CONSTRICT, MOVE_SURF, MOVE_HYPER_BEAM, MOVE_SCREECH - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 68 - .2byte SPECIES_TROPIUS - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x05 @ team flags - .2byte MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_SYNTHESIS, MOVE_RAZOR_LEAF - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 69 - .2byte SPECIES_MAWILE - .byte BATTLE_TOWER_ITEM_METAL_COAT - .byte 0x43 @ team flags - .2byte MOVE_IRON_DEFENSE, MOVE_SLUDGE_BOMB, MOVE_CRUNCH, MOVE_STRENGTH - .byte F_EV_SPREAD_ATTACK - .byte NATURE_CALM - .2byte 0 @ padding - -@ 70 - .2byte SPECIES_MUK - .byte BATTLE_TOWER_ITEM_RAWST_BERRY - .byte 0x09 @ team flags - .2byte MOVE_SLUDGE, MOVE_ACID_ARMOR, MOVE_GIGA_DRAIN, MOVE_DISABLE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 71 - .2byte SPECIES_MAGCARGO - .byte BATTLE_TOWER_ITEM_CHARCOAL - .byte 0x0D @ team flags - .2byte MOVE_FLAMETHROWER, MOVE_ROCK_THROW, MOVE_HARDEN, MOVE_AMNESIA - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 72 - .2byte SPECIES_LINOONE - .byte BATTLE_TOWER_ITEM_PECHA_BERRY - .byte 0x07 @ team flags - .2byte MOVE_HEADBUTT, MOVE_TAIL_WHIP, MOVE_SURF, MOVE_DIG - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_QUIRKY - .2byte 0 @ padding - -@ 73 - .2byte SPECIES_ELECTRODE - .byte BATTLE_TOWER_ITEM_ASPEAR_BERRY - .byte 0x05 @ team flags - .2byte MOVE_LIGHT_SCREEN, MOVE_THUNDERBOLT, MOVE_SWIFT, MOVE_ROLLOUT - .byte F_EV_SPREAD_SPEED - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 74 - .2byte SPECIES_DUSCLOPS - .byte BATTLE_TOWER_ITEM_SPELL_TAG - .byte 0x09 @ team flags - .2byte MOVE_MEAN_LOOK, MOVE_NIGHT_SHADE, MOVE_SKILL_SWAP, MOVE_SHADOW_BALL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 75 - .2byte SPECIES_VILEPLUME - .byte BATTLE_TOWER_ITEM_MIRACLE_SEED - .byte 0x0A @ team flags - .2byte MOVE_TOXIC, MOVE_MOONLIGHT, MOVE_GIGA_DRAIN, MOVE_STUN_SPORE - .byte F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 76 - .2byte SPECIES_CROBAT - .byte BATTLE_TOWER_ITEM_LEPPA_BERRY - .byte 0x05 @ team flags - .2byte MOVE_BITE, MOVE_HAZE, MOVE_WING_ATTACK, MOVE_STEEL_WING - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 77 - .2byte SPECIES_CORSOLA - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x0A @ team flags - .2byte MOVE_RECOVER, MOVE_MIRROR_COAT, MOVE_HAIL, MOVE_SURF - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 78 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0x0B @ team flags - .2byte MOVE_RAPID_SPIN, MOVE_WATER_PULSE, MOVE_REFLECT, MOVE_SKILL_SWAP - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 79 - .2byte SPECIES_EXPLOUD - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x41 @ team flags - .2byte MOVE_HYPER_BEAM, MOVE_HOWL, MOVE_UPROAR, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 80 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_TWISTED_SPOON - .byte 0x0B @ team flags - .2byte MOVE_PSYBEAM, MOVE_SNATCH, MOVE_REFLECT, MOVE_HYPER_BEAM - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 81 - .2byte SPECIES_HERACROSS - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x05 @ team flags - .2byte MOVE_HORN_ATTACK, MOVE_COUNTER, MOVE_REVERSAL, MOVE_LEER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 82 - .2byte SPECIES_CASTFORM - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x0B @ team flags - .2byte MOVE_WEATHER_BALL, MOVE_SUNNY_DAY, MOVE_RAIN_DANCE, MOVE_HAIL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 83 - .2byte SPECIES_VIGOROTH - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x05 @ team flags - .2byte MOVE_FOCUS_PUNCH, MOVE_REVERSAL, MOVE_COUNTER, MOVE_TAUNT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 84 - .2byte SPECIES_DUSKULL - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x09 @ team flags - .2byte MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_SHADOW_BALL, MOVE_WILL_O_WISP - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 85 - .2byte SPECIES_LANTURN - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x07 @ team flags - .2byte MOVE_FLAIL, MOVE_SURF, MOVE_SPARK, MOVE_TAKE_DOWN - .byte F_EV_SPREAD_SPEED - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 86 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x05 @ team flags - .2byte MOVE_STRENGTH, MOVE_FAKE_OUT, MOVE_FACADE, MOVE_SAND_ATTACK - .byte F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 87 - .2byte SPECIES_KINGDRA - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0x43 @ team flags - .2byte MOVE_AGILITY, MOVE_DIVE, MOVE_ICE_BEAM, MOVE_PROTECT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 88 - .2byte SPECIES_GYARADOS - .byte BATTLE_TOWER_ITEM_DRAGON_FANG - .byte 0x41 @ team flags - .2byte MOVE_RAIN_DANCE, MOVE_SURF, MOVE_WATER_PULSE, MOVE_HYPER_BEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 89 - .2byte SPECIES_AGGRON - .byte BATTLE_TOWER_ITEM_METAL_COAT - .byte 0x45 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_BRICK_BREAK, MOVE_METAL_CLAW, MOVE_ROAR - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 90 - .2byte SPECIES_ABSOL - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0xC7 @ team flags - .2byte MOVE_SWORDS_DANCE, MOVE_IRON_TAIL, MOVE_SLASH, MOVE_FACADE - .byte F_EV_SPREAD_ATTACK - .byte NATURE_LAX - .2byte 0 @ padding - -@ 91 - .2byte SPECIES_SWELLOW - .byte BATTLE_TOWER_ITEM_SHARP_BEAK - .byte 0x0F @ team flags - .2byte MOVE_DOUBLE_TEAM, MOVE_FLY, MOVE_TOXIC, MOVE_STEEL_WING - .byte 0 - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 92 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_BLACK_BELT - .byte 0x05 @ team flags - .2byte MOVE_STRENGTH, MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 93 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_NEVER_MELT_ICE - .byte 0x41 @ team flags - .2byte MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_HYPER_BEAM, MOVE_SURF - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 94 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_MIRACLE_SEED - .byte 0x41 @ team flags - .2byte MOVE_LEAF_BLADE, MOVE_DRAGON_CLAW, MOVE_AGILITY, MOVE_PROTECT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 95 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_CHARCOAL - .byte 0x41 @ team flags - .2byte MOVE_BLAZE_KICK, MOVE_MIRROR_MOVE, MOVE_EARTHQUAKE, MOVE_PROTECT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 96 - .2byte SPECIES_ALTARIA - .byte BATTLE_TOWER_ITEM_DRAGON_FANG - .byte 0x43 @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_DRAGON_DANCE, MOVE_TOXIC, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 97 - .2byte SPECIES_LUDICOLO - .byte BATTLE_TOWER_ITEM_BLACK_BELT - .byte 0x43 @ team flags - .2byte MOVE_BRICK_BREAK, MOVE_WATER_PULSE, MOVE_RAIN_DANCE, MOVE_FOCUS_PUNCH - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 98 - .2byte SPECIES_SABLEYE - .byte BATTLE_TOWER_ITEM_SPELL_TAG - .byte 0x49 @ team flags - .2byte MOVE_SHADOW_BALL, MOVE_SNATCH, MOVE_DIG, MOVE_CONFUSE_RAY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 99 - .2byte SPECIES_ZANGOOSE - .byte BATTLE_TOWER_ITEM_BLACK_GLASSES - .byte 0x0F @ team flags - .2byte MOVE_FACADE, MOVE_THUNDERBOLT, MOVE_CRUSH_CLAW, MOVE_DETECT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_CALM - .2byte 0 @ padding - -@ 100 - .2byte SPECIES_LINOONE - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x0F @ team flags - .2byte MOVE_IRON_TAIL, MOVE_HEADBUTT, MOVE_ATTRACT, MOVE_ICE_BEAM - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 101 - .2byte SPECIES_WHISCASH - .byte BATTLE_TOWER_ITEM_SOFT_SAND - .byte 0x07 @ team flags - .2byte MOVE_MUD_SLAP, MOVE_EARTHQUAKE, MOVE_SURF, MOVE_AMNESIA - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 102 - .2byte SPECIES_SOLROCK - .byte BATTLE_TOWER_ITEM_HARD_STONE - .byte 0x43 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE, MOVE_CONFUSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 103 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x03 @ team flags - .2byte MOVE_RECOVER, MOVE_RAIN_DANCE, MOVE_SURF, MOVE_CONFUSE_RAY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 104 - .2byte SPECIES_CACTURNE - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x0F @ team flags - .2byte MOVE_INGRAIN, MOVE_LEECH_SEED, MOVE_PROTECT, MOVE_FRUSTRATION - .byte 0 - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 105 - .2byte SPECIES_SHIFTRY - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x05 @ team flags - .2byte MOVE_FRUSTRATION, MOVE_HYPER_BEAM, MOVE_GIGA_DRAIN, MOVE_TORMENT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 106 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_MAGNET - .byte 0x0F @ team flags - .2byte MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_IRON_TAIL, MOVE_ROAR - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 107 - .2byte SPECIES_KECLEON - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0xC3 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_FOCUS_PUNCH, MOVE_IRON_TAIL, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 108 - .2byte SPECIES_PINSIR - .byte BATTLE_TOWER_ITEM_SOFT_SAND - .byte 0x8D @ team flags - .2byte MOVE_GUILLOTINE, MOVE_SUBMISSION, MOVE_EARTHQUAKE, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 109 - .2byte SPECIES_METANG - .byte BATTLE_TOWER_ITEM_METAL_COAT - .byte 0x05 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_METEOR_MASH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 110 - .2byte SPECIES_CLAYDOL - .byte BATTLE_TOWER_ITEM_PECHA_BERRY - .byte 0x43 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_PROTECT - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 111 - .2byte SPECIES_MASQUERAIN - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x0A @ team flags - .2byte MOVE_TOXIC, MOVE_SILVER_WIND, MOVE_ATTRACT, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 112 - .2byte SPECIES_RELICANTH - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0xC5 @ team flags - .2byte MOVE_ROCK_TOMB, MOVE_DOUBLE_EDGE, MOVE_SURF, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 113 - .2byte SPECIES_WALREIN - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x0D @ team flags - .2byte MOVE_SURF, MOVE_ENCORE, MOVE_BLIZZARD, MOVE_HYPER_BEAM - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 114 - .2byte SPECIES_WAILORD - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0x0B @ team flags - .2byte MOVE_WATER_SPOUT, MOVE_REST, MOVE_AMNESIA, MOVE_HAIL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 115 - .2byte SPECIES_GIRAFARIG - .byte BATTLE_TOWER_ITEM_GANLON_BERRY - .byte 0x4F @ team flags - .2byte MOVE_DOUBLE_TEAM, MOVE_CRUNCH, MOVE_PSYCHIC, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 116 - .2byte SPECIES_MEDICHAM - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0x4B @ team flags - .2byte MOVE_CALM_MIND, MOVE_REVERSAL, MOVE_ROCK_TOMB, MOVE_PSYCHIC - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 117 - .2byte SPECIES_TROPIUS - .byte BATTLE_TOWER_ITEM_MENTAL_HERB - .byte 0xC7 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_SYNTHESIS, MOVE_RAZOR_LEAF, MOVE_HYPER_BEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 118 - .2byte SPECIES_NINJASK - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x05 @ team flags - .2byte MOVE_DOUBLE_TEAM, MOVE_SLASH, MOVE_SWORDS_DANCE, MOVE_LEECH_LIFE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 119 - .2byte SPECIES_CAMERUPT - .byte BATTLE_TOWER_ITEM_CHARCOAL - .byte 0x0D @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_ROCK_SLIDE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 120 - .2byte SPECIES_SHARPEDO - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x05 @ team flags - .2byte MOVE_CRUNCH, MOVE_SURF, MOVE_EARTHQUAKE, MOVE_PROTECT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 121 - .2byte SPECIES_WIGGLYTUFF - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x0E @ team flags - .2byte MOVE_PROTECT, MOVE_TOXIC, MOVE_DOUBLE_TEAM, MOVE_DIG - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_LAX - .2byte 0 @ padding - -@ 122 - .2byte SPECIES_SEVIPER - .byte BATTLE_TOWER_ITEM_POISON_BARB - .byte 0x05 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_HAZE, MOVE_CRUNCH, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 123 - .2byte SPECIES_CRADILY - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0xC1 @ team flags - .2byte MOVE_ROCK_TOMB, MOVE_CONFUSE_RAY, MOVE_INGRAIN, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 124 - .2byte SPECIES_ARMALDO - .byte BATTLE_TOWER_ITEM_RAWST_BERRY - .byte 0xC1 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_SANDSTORM, MOVE_PROTECT, MOVE_SLASH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 125 - .2byte SPECIES_MAGNETON - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x0D @ team flags - .2byte MOVE_ZAP_CANNON, MOVE_SUPERSONIC, MOVE_TOXIC, MOVE_PROTECT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 126 - .2byte SPECIES_LANTURN - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x06 @ team flags - .2byte MOVE_THUNDER, MOVE_SURF, MOVE_ICE_BEAM, MOVE_RAIN_DANCE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 127 - .2byte SPECIES_SWALOT - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0x8B @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_SNATCH, MOVE_ENCORE, MOVE_BODY_SLAM - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 128 - .2byte SPECIES_SKARMORY - .byte BATTLE_TOWER_ITEM_METAL_COAT - .byte 0x81 @ team flags - .2byte MOVE_STEEL_WING, MOVE_AGILITY, MOVE_TORMENT, MOVE_FACADE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 129 - .2byte SPECIES_DONPHAN - .byte BATTLE_TOWER_ITEM_WHITE_HERB - .byte 0x0D @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_FLAIL, MOVE_ROAR, MOVE_IRON_TAIL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 130 - .2byte SPECIES_HERACROSS - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x41 @ team flags - .2byte MOVE_FACADE, MOVE_REVERSAL, MOVE_MEGAHORN, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 131 - .2byte SPECIES_BANETTE - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x83 @ team flags - .2byte MOVE_SHADOW_BALL, MOVE_HYPER_BEAM, MOVE_THUNDERBOLT, MOVE_SKILL_SWAP - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 132 - .2byte SPECIES_SANDSLASH - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x0F @ team flags - .2byte MOVE_SANDSTORM, MOVE_TOXIC, MOVE_SLASH, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 133 - .2byte SPECIES_CRAWDAUNT - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x05 @ team flags - .2byte MOVE_GUILLOTINE, MOVE_CRABHAMMER, MOVE_BLIZZARD, MOVE_SLUDGE_BOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 134 - .2byte SPECIES_GRUMPIG - .byte BATTLE_TOWER_ITEM_TWISTED_SPOON - .byte 0x8B @ team flags - .2byte MOVE_MAGIC_COAT, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_CONFUSE_RAY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_LONELY - .2byte 0 @ padding - -@ 135 - .2byte SPECIES_RHYDON - .byte BATTLE_TOWER_ITEM_CHOICE_BAND - .byte 0x45 @ team flags - .2byte MOVE_IRON_TAIL, MOVE_EARTHQUAKE, MOVE_SURF, MOVE_FIRE_BLAST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_RASH - .2byte 0 @ padding - -@ 136 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x8B @ team flags - .2byte MOVE_PSYCHIC, MOVE_REFLECT, MOVE_RECOVER, MOVE_SKILL_SWAP - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 137 - .2byte SPECIES_DUSCLOPS - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x41 @ team flags - .2byte MOVE_SHADOW_BALL, MOVE_WILL_O_WISP, MOVE_BLIZZARD, MOVE_PSYCHIC - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 138 - .2byte SPECIES_TORKOAL - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x09 @ team flags - .2byte MOVE_FLAMETHROWER, MOVE_AMNESIA, MOVE_IRON_TAIL, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 139 - .2byte SPECIES_ELECTRODE - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x09 @ team flags - .2byte MOVE_SCREECH, MOVE_EXPLOSION, MOVE_MIRROR_COAT, MOVE_PROTECT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_RASH - .2byte 0 @ padding - -@ 140 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x0B @ team flags - .2byte MOVE_IRON_TAIL, MOVE_FOCUS_PUNCH, MOVE_DOUBLE_TEAM, MOVE_LEECH_SEED - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 141 - .2byte SPECIES_MUK - .byte BATTLE_TOWER_ITEM_POISON_BARB - .byte 0x05 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_FOCUS_PUNCH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 142 - .2byte SPECIES_WEEZING - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x05 @ team flags - .2byte MOVE_EXPLOSION, MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 143 - .2byte SPECIES_RAICHU - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x4E @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_DOUBLE_TEAM, MOVE_FOCUS_PUNCH, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 144 - .2byte SPECIES_TENTACRUEL - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0x09 @ team flags - .2byte MOVE_DOUBLE_TEAM, MOVE_TOXIC, MOVE_SURF, MOVE_SLUDGE_BOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 145 - .2byte SPECIES_EXPLOUD - .byte BATTLE_TOWER_ITEM_CHOICE_BAND - .byte 0x05 @ team flags - .2byte MOVE_BLIZZARD, MOVE_FLAMETHROWER, MOVE_EARTHQUAKE, MOVE_RETURN - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 146 - .2byte SPECIES_XATU - .byte BATTLE_TOWER_ITEM_WHITE_HERB - .byte 0x43 @ team flags - .2byte MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_TOXIC - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 147 - .2byte SPECIES_GOLEM - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x05 @ team flags - .2byte MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 148 - .2byte SPECIES_GOLDUCK - .byte BATTLE_TOWER_ITEM_PECHA_BERRY - .byte 0x83 @ team flags - .2byte MOVE_SURF, MOVE_ATTRACT, MOVE_CALM_MIND, MOVE_BLIZZARD - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 149 - .2byte SPECIES_NINETALES - .byte BATTLE_TOWER_ITEM_CHARCOAL - .byte 0x4A @ team flags - .2byte MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_TOXIC, MOVE_CONFUSE_RAY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 150 - .2byte SPECIES_KINGDRA - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x13 @ team flags - .2byte MOVE_DOUBLE_TEAM, MOVE_REST, MOVE_SURF, MOVE_DRAGON_BREATH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 151 - .2byte SPECIES_SLAKING - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x03 @ team flags - .2byte MOVE_CURSE, MOVE_AMNESIA, MOVE_YAWN, MOVE_FOCUS_PUNCH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_LAX - .2byte 0 @ padding - -@ 152 - .2byte SPECIES_GYARADOS - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0x03 @ team flags - .2byte MOVE_THUNDER, MOVE_EARTHQUAKE, MOVE_HYDRO_PUMP, MOVE_RAIN_DANCE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 153 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x21 @ team flags - .2byte MOVE_BELLY_DRUM, MOVE_ENDURE, MOVE_EARTHQUAKE, MOVE_REVERSAL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 154 - .2byte SPECIES_ABSOL - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0xC3 @ team flags - .2byte MOVE_FAINT_ATTACK, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 155 - .2byte SPECIES_ALTARIA - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x83 @ team flags - .2byte MOVE_DRAGON_DANCE, MOVE_MIRROR_MOVE, MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_RASH - .2byte 0 @ padding - -@ 156 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_BLACK_BELT - .byte 0x11 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_ENCORE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 157 - .2byte SPECIES_FLYGON - .byte BATTLE_TOWER_ITEM_DRAGON_FANG - .byte 0x43 @ team flags - .2byte MOVE_CRUNCH, MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 158 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x33 @ team flags - .2byte MOVE_COUNTER, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 159 - .2byte SPECIES_GLALIE - .byte BATTLE_TOWER_ITEM_NEVER_MELT_ICE - .byte 0x81 @ team flags - .2byte MOVE_BLIZZARD, MOVE_CRUNCH, MOVE_ICY_WIND, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 160 - .2byte SPECIES_HUNTAIL - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0xA1 @ team flags - .2byte MOVE_RAIN_DANCE, MOVE_HYDRO_PUMP, MOVE_CRUNCH, MOVE_BLIZZARD - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 161 - .2byte SPECIES_MILOTIC - .byte BATTLE_TOWER_ITEM_GANLON_BERRY - .byte 0xD3 @ team flags - .2byte MOVE_SURF, MOVE_ATTRACT, MOVE_RECOVER, MOVE_TOXIC - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 162 - .2byte SPECIES_GOREBYSS - .byte BATTLE_TOWER_ITEM_PECHA_BERRY - .byte 0x83 @ team flags - .2byte MOVE_PSYCHIC, MOVE_SURF, MOVE_BLIZZARD, MOVE_SHADOW_BALL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 163 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x53 @ team flags - .2byte MOVE_LEAF_BLADE, MOVE_ENDEAVOR, MOVE_EARTHQUAKE, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 164 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x53 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_SURF, MOVE_MUD_SHOT, MOVE_BLIZZARD - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 165 - .2byte SPECIES_AGGRON - .byte BATTLE_TOWER_ITEM_MENTAL_HERB - .byte 0x41 @ team flags - .2byte MOVE_DOUBLE_EDGE, MOVE_FLAMETHROWER, MOVE_IRON_TAIL, MOVE_BLIZZARD - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 166 - .2byte SPECIES_CRADILY - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0xE1 @ team flags - .2byte MOVE_STOCKPILE, MOVE_SPIT_UP, MOVE_SWALLOW, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 167 - .2byte SPECIES_ARMALDO - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0xC1 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SLASH, MOVE_SWORDS_DANCE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 168 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x82 @ team flags - .2byte MOVE_FOCUS_PUNCH, MOVE_COUNTER, MOVE_MACH_PUNCH, MOVE_SNATCH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 169 - .2byte SPECIES_LUDICOLO - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x83 @ team flags - .2byte MOVE_RAIN_DANCE, MOVE_SURF, MOVE_PROTECT, MOVE_TOXIC - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 170 - .2byte SPECIES_SHIFTRY - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x03 @ team flags - .2byte MOVE_TORMENT, MOVE_FAINT_ATTACK, MOVE_SHADOW_BALL, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 171 - .2byte SPECIES_TROPIUS - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0xC3 @ team flags - .2byte MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_SOLAR_BEAM, MOVE_LEECH_SEED - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 172 - .2byte SPECIES_GRUMPIG - .byte BATTLE_TOWER_ITEM_MACHO_BRACE - .byte 0x23 @ team flags - .2byte MOVE_TRICK, MOVE_SKILL_SWAP, MOVE_PSYCHIC, MOVE_REST - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 173 - .2byte SPECIES_TORKOAL - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x81 @ team flags - .2byte MOVE_IRON_DEFENSE, MOVE_TOXIC, MOVE_REST, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 174 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_NONE - .byte 0x03 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_CRUNCH, MOVE_ROAR, MOVE_THIEF - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 175 - .2byte SPECIES_PINSIR - .byte BATTLE_TOWER_ITEM_LEPPA_BERRY - .byte 0x61 @ team flags - .2byte MOVE_GUILLOTINE, MOVE_EARTHQUAKE, MOVE_DOUBLE_TEAM, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 176 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x93 @ team flags - .2byte MOVE_LIGHT_SCREEN, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 177 - .2byte SPECIES_HERACROSS - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x51 @ team flags - .2byte MOVE_MEGAHORN, MOVE_REVERSAL, MOVE_EARTHQUAKE, MOVE_COUNTER - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 178 - .2byte SPECIES_WALREIN - .byte BATTLE_TOWER_ITEM_NEVER_MELT_ICE - .byte 0x83 @ team flags - .2byte MOVE_BLIZZARD, MOVE_EARTHQUAKE, MOVE_SURF, MOVE_ROCK_SLIDE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 179 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x13 @ team flags - .2byte MOVE_PSYCHIC, MOVE_RECOVER, MOVE_ENCORE, MOVE_SNATCH - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 180 - .2byte SPECIES_MILOTIC - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0x93 @ team flags - .2byte MOVE_SURF, MOVE_BLIZZARD, MOVE_RECOVER, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 181 - .2byte SPECIES_REGICE - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x11 @ team flags - .2byte MOVE_REST, MOVE_CURSE, MOVE_BLIZZARD, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_MILD - .2byte 0 @ padding - -@ 182 - .2byte SPECIES_REGISTEEL - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x11 @ team flags - .2byte MOVE_REST, MOVE_IRON_DEFENSE, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_MILD - .2byte 0 @ padding - -@ 183 - .2byte SPECIES_REGIROCK - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x91 @ team flags - .2byte MOVE_ROCK_TOMB, MOVE_EARTHQUAKE, MOVE_THUNDERBOLT, MOVE_EXPLOSION - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 184 - .2byte SPECIES_DUSCLOPS - .byte BATTLE_TOWER_ITEM_SPELL_TAG - .byte 0x20 @ team flags - .2byte MOVE_SHADOW_BALL, MOVE_EARTHQUAKE, MOVE_BLIZZARD, MOVE_DESTINY_BOND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 185 - .2byte SPECIES_SEAKING - .byte BATTLE_TOWER_ITEM_LEPPA_BERRY - .byte 0xB2 @ team flags - .2byte MOVE_HORN_DRILL, MOVE_AGILITY, MOVE_SLEEP_TALK, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 186 - .2byte SPECIES_CAMERUPT - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x00 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_ERUPTION, MOVE_ROCK_SLIDE, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 187 - .2byte SPECIES_LANTURN - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x82 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_SURF, MOVE_THUNDER_WAVE, MOVE_BLIZZARD - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 188 - .2byte SPECIES_WEEZING - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x20 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_THUNDERBOLT, MOVE_FIRE_BLAST, MOVE_EXPLOSION - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 189 - .2byte SPECIES_WHISCASH - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x41 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_SURF, MOVE_ROCK_TOMB, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 190 - .2byte SPECIES_AGGRON - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x11 @ team flags - .2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_SURF, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 191 - .2byte SPECIES_CACTURNE - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x63 @ team flags - .2byte MOVE_DYNAMIC_PUNCH, MOVE_COUNTER, MOVE_FAINT_ATTACK, MOVE_GIGA_DRAIN - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 192 - .2byte SPECIES_SHARPEDO - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x01 @ team flags - .2byte MOVE_CRUNCH, MOVE_DOUBLE_EDGE, MOVE_SURF, MOVE_SWAGGER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 193 - .2byte SPECIES_ABSOL - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x82 @ team flags - .2byte MOVE_DOUBLE_EDGE, MOVE_FACADE, MOVE_SWORDS_DANCE, MOVE_QUICK_ATTACK - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 194 - .2byte SPECIES_WAILORD - .byte BATTLE_TOWER_ITEM_LEPPA_BERRY - .byte 0x23 @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_EARTHQUAKE, MOVE_ATTRACT, MOVE_FISSURE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 195 - .2byte SPECIES_TENTACRUEL - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x21 @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_MIRROR_COAT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_RASH - .2byte 0 @ padding - -@ 196 - .2byte SPECIES_LUDICOLO - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0xA2 @ team flags - .2byte MOVE_RAIN_DANCE, MOVE_SURF, MOVE_TOXIC, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 197 - .2byte SPECIES_WOBBUFFET - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x23 @ team flags - .2byte MOVE_ENCORE, MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 198 - .2byte SPECIES_RHYDON - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x21 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_MEGAHORN, MOVE_HORN_DRILL, MOVE_ROCK_SLIDE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 199 - .2byte SPECIES_GLALIE - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x21 @ team flags - .2byte MOVE_CRUNCH, MOVE_BLIZZARD, MOVE_HAIL, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 200 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x13 @ team flags - .2byte MOVE_LEAF_BLADE, MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 201 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x17 @ team flags - .2byte MOVE_BLAZE_KICK, MOVE_ROCK_TOMB, MOVE_ENDURE, MOVE_REVERSAL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_RASH - .2byte 0 @ padding - -@ 202 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x17 @ team flags - .2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_MUD_SHOT, MOVE_BLIZZARD - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 203 - .2byte SPECIES_GARDEVOIR - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x19 @ team flags - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_DESTINY_BOND, MOVE_WILL_O_WISP - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 204 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0xF6 @ team flags - .2byte MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_BRICK_BREAK, MOVE_SLUDGE_BOMB - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 205 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_GANLON_BERRY - .byte 0x1B @ team flags - .2byte MOVE_PSYCHIC, MOVE_THUNDER_PUNCH, MOVE_REFLECT, MOVE_RECOVER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 206 - .2byte SPECIES_SHIFTRY - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x89 @ team flags - .2byte MOVE_FAINT_ATTACK, MOVE_SHADOW_BALL, MOVE_DOUBLE_TEAM, MOVE_REST - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 207 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x85 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_FACADE, MOVE_FAKE_OUT - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 208 - .2byte SPECIES_CROBAT - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x49 @ team flags - .2byte MOVE_ATTRACT, MOVE_CONFUSE_RAY, MOVE_BITE, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 209 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x15 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_FLAMETHROWER, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 210 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x0B @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_ROAR, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 211 - .2byte SPECIES_ELECTRODE - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x27 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_MIRROR_COAT, MOVE_EXPLOSION - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 212 - .2byte SPECIES_MUK - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x05 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_EXPLOSION - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 213 - .2byte SPECIES_FLYGON - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x4D @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 214 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0x1B @ team flags - .2byte MOVE_SURF, MOVE_THUNDERBOLT, MOVE_RECOVER, MOVE_CONFUSE_RAY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 215 - .2byte SPECIES_DODRIO - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x2B @ team flags - .2byte MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_AGILITY, MOVE_FACADE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 216 - .2byte SPECIES_RAICHU - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x0A @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_REVERSAL, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 217 - .2byte SPECIES_GOLDUCK - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x0A @ team flags - .2byte MOVE_SURF, MOVE_CROSS_CHOP, MOVE_ICE_BEAM, MOVE_HYPER_BEAM - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 218 - .2byte SPECIES_HERACROSS - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x54 @ team flags - .2byte MOVE_MEGAHORN, MOVE_ROCK_TOMB, MOVE_ENDURE, MOVE_REVERSAL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 219 - .2byte SPECIES_WALREIN - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x06 @ team flags - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 220 - .2byte SPECIES_KINGDRA - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x1D @ team flags - .2byte MOVE_SURF, MOVE_TOXIC, MOVE_PROTECT, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 221 - .2byte SPECIES_SALAMENCE - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x9C @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 222 - .2byte SPECIES_METAGROSS - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x15 @ team flags - .2byte MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_LIGHT_SCREEN - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 223 - .2byte SPECIES_REGIROCK - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0xB5 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_FOCUS_PUNCH, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 224 - .2byte SPECIES_REGICE - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x96 @ team flags - .2byte MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_DOUBLE_TEAM, MOVE_REST - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 225 - .2byte SPECIES_REGISTEEL - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x94 @ team flags - .2byte MOVE_METAL_CLAW, MOVE_EARTHQUAKE, MOVE_THUNDERBOLT, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 226 - .2byte SPECIES_LATIAS - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x96 @ team flags - .2byte MOVE_MIST_BALL, MOVE_THUNDERBOLT, MOVE_REST, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_MILD - .2byte 0 @ padding - -@ 227 - .2byte SPECIES_LATIOS - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0x95 @ team flags - .2byte MOVE_LUSTER_PURGE, MOVE_REFLECT, MOVE_RECOVER, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 228 - .2byte SPECIES_MILOTIC - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x96 @ team flags - .2byte MOVE_SURF, MOVE_TOXIC, MOVE_RECOVER, MOVE_MIRROR_COAT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 229 - .2byte SPECIES_SLAKING - .byte BATTLE_TOWER_ITEM_CHOICE_BAND - .byte 0x05 @ team flags - .2byte MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 230 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x1F @ team flags - .2byte MOVE_GIGA_DRAIN, MOVE_DOUBLE_TEAM, MOVE_LEECH_SEED, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 231 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x17 @ team flags - .2byte MOVE_BLAZE_KICK, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_REST - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 232 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x17 @ team flags - .2byte MOVE_MUDDY_WATER, MOVE_MUD_SHOT, MOVE_MIRROR_COAT, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 233 - .2byte SPECIES_GARDEVOIR - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x7B @ team flags - .2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_DESTINY_BOND, MOVE_SNATCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 234 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x56 @ team flags - .2byte MOVE_SPORE, MOVE_COUNTER, MOVE_IRON_TAIL, MOVE_GIGA_DRAIN - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 235 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x0A @ team flags - .2byte MOVE_PSYCHIC, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_RECOVER - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 236 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x05 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_ROCK_TOMB, MOVE_ENDURE, MOVE_REVERSAL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 237 - .2byte SPECIES_GYARADOS - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x0C @ team flags - .2byte MOVE_HYPER_BEAM, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 238 - .2byte SPECIES_CROBAT - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x49 @ team flags - .2byte MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_ATTRACT, MOVE_PROTECT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 239 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x15 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_COUNTER, MOVE_EARTHQUAKE, MOVE_FACADE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 240 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x63 @ team flags - .2byte MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_REST, MOVE_CRUNCH - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 241 - .2byte SPECIES_ELECTRODE - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x07 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_SCREECH, MOVE_MIRROR_COAT, MOVE_EXPLOSION - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_MODEST - .2byte 0 @ padding - -@ 242 - .2byte SPECIES_MUK - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x45 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_ROCK_TOMB, MOVE_EXPLOSION - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_RASH - .2byte 0 @ padding - -@ 243 - .2byte SPECIES_FLYGON - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x4D @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 244 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x1B @ team flags - .2byte MOVE_LIGHT_SCREEN, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_REST - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 245 - .2byte SPECIES_NINETALES - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x0A @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_OVERHEAT, MOVE_FLAMETHROWER, MOVE_IRON_TAIL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 246 - .2byte SPECIES_GOLEM - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x25 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_ROAR, MOVE_FIRE_BLAST, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 247 - .2byte SPECIES_GOLDUCK - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x27 @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_CROSS_CHOP, MOVE_BLIZZARD, MOVE_PSYCH_UP - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 248 - .2byte SPECIES_HERACROSS - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x55 @ team flags - .2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_REVERSAL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 249 - .2byte SPECIES_WALREIN - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x36 @ team flags - .2byte MOVE_SURF, MOVE_BLIZZARD, MOVE_ROCK_SLIDE, MOVE_SHEER_COLD - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 250 - .2byte SPECIES_KINGDRA - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x5C @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_PROTECT, MOVE_DRAGON_BREATH, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 251 - .2byte SPECIES_SALAMENCE - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x9D @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 252 - .2byte SPECIES_METAGROSS - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x15 @ team flags - .2byte MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_HYPER_BEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 253 - .2byte SPECIES_REGIROCK - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x95 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_FACADE, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 254 - .2byte SPECIES_REGICE - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x96 @ team flags - .2byte MOVE_BLIZZARD, MOVE_THUNDERBOLT, MOVE_HAIL, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 255 - .2byte SPECIES_REGISTEEL - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x94 @ team flags - .2byte MOVE_METAL_CLAW, MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 256 - .2byte SPECIES_LATIAS - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0x96 @ team flags - .2byte MOVE_MIST_BALL, MOVE_REFLECT, MOVE_RECOVER, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 257 - .2byte SPECIES_LATIOS - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x95 @ team flags - .2byte MOVE_LUSTER_PURGE, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 258 - .2byte SPECIES_MILOTIC - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0xD6 @ team flags - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 259 - .2byte SPECIES_KECLEON - .byte BATTLE_TOWER_ITEM_CHOICE_BAND - .byte 0x69 @ team flags - .2byte MOVE_TRICK, MOVE_REST, MOVE_IRON_TAIL, MOVE_DISABLE - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_QUIRKY - .2byte 0 @ padding - -@ 260 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x5F @ team flags - .2byte MOVE_LEAF_BLADE, MOVE_EARTHQUAKE, MOVE_REST, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 261 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x7F @ team flags - .2byte MOVE_FOCUS_PUNCH, MOVE_COUNTER, MOVE_SWAGGER, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 262 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x57 @ team flags - .2byte MOVE_IRON_TAIL, MOVE_CURSE, MOVE_DOUBLE_TEAM, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 263 - .2byte SPECIES_GARDEVOIR - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x3B @ team flags - .2byte MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_REST, MOVE_IMPRISON - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 264 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x56 @ team flags - .2byte MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_SLUDGE_BOMB, MOVE_IRON_TAIL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 265 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_CHOICE_BAND - .byte 0x1A @ team flags - .2byte MOVE_PSYCHIC, MOVE_TRICK, MOVE_RECOVER, MOVE_SNATCH - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 266 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x65 @ team flags - .2byte MOVE_REVENGE, MOVE_COUNTER, MOVE_FOCUS_PUNCH, MOVE_REVERSAL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 267 - .2byte SPECIES_LUDICOLO - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x54 @ team flags - .2byte MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_TOXIC, MOVE_SURF - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 268 - .2byte SPECIES_CROBAT - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x4B @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_BITE, MOVE_AIR_CUTTER, MOVE_SHADOW_BALL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 269 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x75 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_DYNAMIC_PUNCH, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 270 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x0A @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_ATTRACT, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 271 - .2byte SPECIES_ELECTRODE - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x64 @ team flags - .2byte MOVE_THUNDER, MOVE_DOUBLE_TEAM, MOVE_MIRROR_COAT, MOVE_EXPLOSION - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 272 - .2byte SPECIES_MUK - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x49 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_PUNCH - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 273 - .2byte SPECIES_FLYGON - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0xCD @ team flags - .2byte MOVE_PROTECT, MOVE_DIG, MOVE_TOXIC, MOVE_SANDSTORM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 274 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x5B @ team flags - .2byte MOVE_SURF, MOVE_THUNDERBOLT, MOVE_BLIZZARD, MOVE_PSYCHIC - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 275 - .2byte SPECIES_LUDICOLO - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x1A @ team flags - .2byte MOVE_RAIN_DANCE, MOVE_LEECH_SEED, MOVE_DIVE, MOVE_PROTECT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 276 - .2byte SPECIES_RAICHU - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x4A @ team flags - .2byte MOVE_THUNDER, MOVE_REVERSAL, MOVE_FACADE, MOVE_IRON_TAIL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 277 - .2byte SPECIES_GOLDUCK - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x0A @ team flags - .2byte MOVE_SURF, MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_IRON_TAIL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 278 - .2byte SPECIES_HERACROSS - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x15 @ team flags - .2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_FACADE, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 279 - .2byte SPECIES_WALREIN - .byte BATTLE_TOWER_ITEM_LEPPA_BERRY - .byte 0x26 @ team flags - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_FISSURE, MOVE_SHEER_COLD - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 280 - .2byte SPECIES_KINGDRA - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x4D @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_BLIZZARD, MOVE_HYPER_BEAM, MOVE_DISABLE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 281 - .2byte SPECIES_SALAMENCE - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x9C @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_FIRE_BLAST, MOVE_HYDRO_PUMP - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 282 - .2byte SPECIES_METAGROSS - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0xB5 @ team flags - .2byte MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_PURSUIT, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 283 - .2byte SPECIES_REGIROCK - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0x95 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_SUPERPOWER, MOVE_REST - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 284 - .2byte SPECIES_REGICE - .byte BATTLE_TOWER_ITEM_LAX_INCENSE - .byte 0x96 @ team flags - .2byte MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_ANCIENT_POWER, MOVE_EXPLOSION - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_RASH - .2byte 0 @ padding - -@ 285 - .2byte SPECIES_REGISTEEL - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0xB4 @ team flags - .2byte MOVE_CURSE, MOVE_AMNESIA, MOVE_RETURN, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 286 - .2byte SPECIES_LATIAS - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x92 @ team flags - .2byte MOVE_MIST_BALL, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 287 - .2byte SPECIES_LATIOS - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x91 @ team flags - .2byte MOVE_LUSTER_PURGE, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_SURF - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 288 - .2byte SPECIES_MILOTIC - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0xB2 @ team flags - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 289 - .2byte SPECIES_SLAKING - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x65 @ team flags - .2byte MOVE_YAWN, MOVE_SLASH, MOVE_COUNTER, MOVE_HYPER_BEAM - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 290 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0xDF @ team flags - .2byte MOVE_LEAF_BLADE, MOVE_DETECT, MOVE_DRAGON_CLAW, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 291 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0xD7 @ team flags - .2byte MOVE_BLAZE_KICK, MOVE_SKY_UPPERCUT, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 292 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x5F @ team flags - .2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 293 - .2byte SPECIES_SHEDINJA - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0xDB @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_SHADOW_BALL, MOVE_TOXIC, MOVE_HYPER_BEAM - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 294 - .2byte SPECIES_METAGROSS - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x94 @ team flags - .2byte MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 295 - .2byte SPECIES_GRUMPIG - .byte BATTLE_TOWER_ITEM_MACHO_BRACE - .byte 0x4B @ team flags - .2byte MOVE_PSYCHIC, MOVE_CONFUSE_RAY, MOVE_TRICK, MOVE_REFLECT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 296 - .2byte SPECIES_LATIAS - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x92 @ team flags - .2byte MOVE_MIST_BALL, MOVE_RECOVER, MOVE_ATTRACT, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 297 - .2byte SPECIES_LATIOS - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x91 @ team flags - .2byte MOVE_LUSTER_PURGE, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 298 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x1A @ team flags - .2byte MOVE_SURF, MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 299 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x14 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_COUNTER, MOVE_ROCK_TOMB, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding diff --git a/data/battle_tower/trainers.inc b/data/battle_tower/trainers.inc deleted file mode 100644 index 05fadc320..000000000 --- a/data/battle_tower/trainers.inc +++ /dev/null @@ -1,1301 +0,0 @@ - .align 2 -gBattleTowerTrainers:: @ 8402F00 -@ 0 - .byte TRAINER_CLASS_YOUNGSTER - .string "ALVIN$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word ARE - ec_word YOU - ec_word READY - ec_word QUES - ec_word HERE_I_COME - ec_word EXCL - -@ 1 - .byte TRAINER_CLASS_BIRD_KEEPER - .string "DIRK$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word OKAY - ec_word I_AM - ec_word GOING - ec_word FOR - ec_word IT - ec_word EXCL - -@ 2 - .byte TRAINER_CLASS_LADY - .string "CYBIL$", 8 - .byte 0x02 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YOU_RE - ec_word A - ec_word PUSHOVER - ec_word LET_S - ec_word GET - ec_word GOING - -@ 3 - .byte TRAINER_CLASS_BLACK_BELT - .string "CHEN$", 8 - .byte 0x05 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word MY - ec_word SPIRIT - ec_word IS - ec_word ENOUGH - ec_word SNORT - ec_word ARRGH - -@ 4 - .byte TRAINER_CLASS_NINJA_BOY - .string "YOSHI$", 8 - .byte 0x05 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word GO - ec_word MY - ec_word POKEMON - ec_word FIGHT - ec_word THE - ec_word BATTLE - -@ 5 - .byte TRAINER_CLASS_SCHOOL_KID_F - .string "TINA$", 8 - .byte 0x0A @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word STUDY - ec_word IS - ec_word BORING - ec_word LET_S - ec_word BATTLE - ec_word NOW - -@ 6 - .byte TRAINER_CLASS_BUG_MANIAC - .string "COREY$", 8 - .byte 0x41 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word HEY - ec_word I - ec_word WILL - ec_move2 TRANSFORM - ec_word FOR - ec_move1 STRENGTH - -@ 7 - .byte TRAINER_CLASS_FISHERMAN - .string "GORDON$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word NEED - ec_word A - ec_word VACATION - ec_word RIGHT - ec_word NOW - -@ 8 - .byte TRAINER_CLASS_TUBER_F - .string "ANN$", 8 - .byte 0x02 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word WE - ec_word ALL - ec_word ADORE - ec_word POKEMON - ec_word ABSOLUTELY - ec_word TRULY - -@ 9 - .byte TRAINER_CLASS_POKEFAN_F - .string "JULIA$", 8 - .byte 0x42 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I_AM - ec_word A - ec_word CUTE - ec_word LADY - ec_word YES - ec_word I_AM - -@ 10 - .byte TRAINER_CLASS_GENTLEMAN - .string "GREGORY$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word THINK - ec_word WE - ec_word SHOULD - ec_word START - ec_word TODAY - -@ 11 - .byte TRAINER_CLASS_CAMPER - .string "KEITH$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YOU_RE - ec_word MY - ec_word FRIEND - ec_word FROM - ec_word NOW - ec_word ON - -@ 12 - .byte TRAINER_CLASS_RUNNING_TRIATHLETE_F - .string "KENDRA$", 8 - .byte 0x0A @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I_AM - ec_move1 SWIFT - ec_word HOW - ec_word ABOUT - ec_word YOU - ec_word QUES - -@ 13 - .byte TRAINER_CLASS_HIKER - .string "DEV$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word WAHAHAHA - ec_word I_AM - ec_word FEELING - ec_word LIKE - ec_word IT_S - ec_move2 PAY_DAY - -@ 14 - .byte TRAINER_CLASS_BATTLE_GIRL - .string "CASSIE$", 8 - .byte 0x0A @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YOU_RE - ec_word STRONG - ec_word AREN_T - .2byte -1 - ec_word YOU - ec_word QUES - -@ 15 - .byte TRAINER_CLASS_PSYCHIC_M - .string "JULIAN$", 8 - .byte 0x05 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word FUFUFU - .2byte -1 - ec_word YOU - ec_word CAN_T - ec_word WIN - ec_word KID - -@ 16 - .byte TRAINER_CLASS_LASS - .string "JOYCE$", 8 - .byte 0x02 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word BE - ec_word KIND - ec_word TO - ec_word THE - ec_word DIGITAL - ec_word IDOL - -@ 17 - .byte TRAINER_CLASS_GUITARIST - .string "LES$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I_AM - ec_word GREAT - ec_word YOU_RE - ec_word JUST - ec_word RATHER - ec_word OKAY - -@ 18 - .byte TRAINER_CLASS_RICH_BOY - .string "CLINTON$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word HAVE - ec_word ROUGH_SKIN - ec_word I - ec_word NEED - ec_word NATURAL_CURE - -@ 19 - .byte TRAINER_CLASS_BUG_CATCHER - .string "LEWIS$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word THIS - ec_word IS - ec_word EXCITING - ec_word CAN - ec_word I - ec_word WIN - -@ 20 - .byte TRAINER_CLASS_PICNICKER - .string "RACHAEL$", 8 - .byte 0x02 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word LIKE - ec_word WALKING - ec_word WITH - ec_word MY - ec_word POKEMON - -@ 21 - .byte TRAINER_CLASS_COLLECTOR - .string "HAROLD$", 8 - .byte 0x09 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word HERE - ec_word THEY - ec_word COME - ec_word MY - ec_move2 SUPERPOWER - ec_word POKEMON - -@ 22 - .byte TRAINER_CLASS_TUBER_M - .string "KIPP$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I_AM - ec_word A - ec_word GENIUS - ec_word I - ec_word SHOULD - ec_word WIN - -@ 23 - .byte TRAINER_CLASS_KINDLER - .string "IRWIN$", 8 - .byte 0x05 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YOU - ec_word WILL - ec_word BE - ec_word FEELING - ec_word MY - ec_word FIRE - -@ 24 - .byte TRAINER_CLASS_PSYCHIC_F - .string "EILEEN$", 8 - .byte 0x0A @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word WILL - ec_move1 ASTONISH - ec_word YOU - ec_word IN - ec_word BATTLE - -@ 25 - .byte TRAINER_CLASS_SWIMMER_F - .string "ANNE$", 8 - .byte 0x02 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word SORRY - ec_word BUT - ec_word YOU - ec_word WILL - ec_word NOT - ec_word WIN - -@ 26 - .byte TRAINER_CLASS_CYCLING_TRIATHLETE_F - .string "RUTH$", 8 - .byte 0x06 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word A - ec_word STRONG - ec_word GIRL - ec_word WANTS - ec_word TOUGH - ec_word POKEMON - -@ 27 - .byte TRAINER_CLASS_POKEMANIAC - .string "JEREMY$", 8 - .byte 0x40 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word MY - ec_word POKEMON - ec_word ARE - ec_word COOL - ec_word YOURS - ec_word CAN_T_WIN - -@ 28 - .byte TRAINER_CLASS_SAILOR - .string "TREVOR$", 8 - .byte 0x09 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word MY - ec_word OPPONENT - ec_word IS - ec_word FINALLY - ec_word HERE - ec_word EXCELLENT - -@ 29 - .byte TRAINER_CLASS_POKEMON_BREEDER_F - .string "COLETTE$", 8 - .byte 0x06 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word AM - ec_word HUNGRY - ec_move2 POUND - ec_word MY - ec_move2 BELLY_DRUM - -@ 30 - .byte TRAINER_CLASS_HEX_MANIAC - .string "PAULA$", 8 - .byte 0x42 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word IT_S - ec_word HARD - ec_word TO - ec_word TAKE - ec_word UGLY - ec_move1 SPITE - -@ 31 - .byte TRAINER_CLASS_RUIN_MANIAC - .string "STANLY$", 8 - .byte 0x41 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word ADVENTURE - ec_word AND - ec_word BATTLE - ec_word ARE - ec_word MY - ec_word LIKES - -@ 32 - .byte TRAINER_CLASS_SWIMMING_TRIATHLETE_M - .string "TROY$", 8 - .byte 0x09 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YOU - ec_word CAN_T - ec_word LOSE - ec_word TO - ec_word A - ec_word KID - -@ 33 - .byte TRAINER_CLASS_SCHOOL_KID_M - .string "ED$", 8 - .byte 0x08 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word POKEMON - ec_word DAILY - ec_word AT - ec_word SCHOOL - ec_word IT_S - ec_word AWESOME - -@ 34 - .byte TRAINER_CLASS_POKEMON_RANGER_F - .string "ELLEN$", 8 - .byte 0x04 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word ARE - ec_word YOU - ec_word KIND - ec_word TO - ec_word YOUR - ec_word POKEMON - -@ 35 - .byte TRAINER_CLASS_SWIMMER_M - .string "ARNIE$", 8 - .byte 0x09 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word BATTLE - ec_word SERIOUSLY - ec_word BEAUTIFUL - ec_word YOU - ec_move1 DIG - -@ 36 - .byte TRAINER_CLASS_RUNNING_TRIATHLETE_M - .string "HAL$", 8 - .byte 0x09 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word BOY - ec_word I_AM - ec_word TIRED - ec_word READY - ec_word FOR - ec_word SLEEP - -@ 37 - .byte TRAINER_CLASS_BEAUTY - .string "LAUREN$", 8 - .byte 0x06 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word A - ec_word TRAINER - ec_word LIKE - ec_word YOU - ec_word IS - ec_word EXCITING - -@ 38 - .byte TRAINER_CLASS_AROMA_LADY - .string "STACY$", 8 - .byte 0x06 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word HAVE - ec_word YOU - ec_word A - ec_word STENCH - ec_word OR - ec_move1 SWEET_SCENT - -@ 39 - .byte TRAINER_CLASS_COLLECTOR - .string "DARYL$", 8 - .byte 0x81 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YOUR - ec_word POKEMON - ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS - ec_word I - ec_word WANT - ec_word IT - -@ 40 - .byte TRAINER_CLASS_SWIMMING_TRIATHLETE_F - .string "KATHY$", 8 - .byte 0x04 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word WILL - ec_word TRY - ec_word MY - ec_word BEST - ec_word TODAY - -@ 41 - .byte TRAINER_CLASS_POKEMON_RANGER_M - .string "HARRIS$", 8 - .byte 0x0C @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word WAAAH - ec_word WAAAH - ec_word WAAAH - ec_word WAAAH - ec_word EHEHE - ec_move1 FAKE_TEARS - -@ 42 - .byte TRAINER_CLASS_POKEFAN_M - .string "GLENN$", 8 - .byte 0x80 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word LISTEN - ec_word TO - ec_word MY - ec_word LOUSY - ec_word ANIME - ec_word SONG - -@ 43 - .byte TRAINER_CLASS_CYCLING_TRIATHLETE_M - .string "NICO$", 8 - .byte 0x04 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word DON_T - ec_word JUST - ec_word BATTLE - ec_word DO - ec_word SOMETHING - ec_word ELSE - -@ 44 - .byte TRAINER_CLASS_POKEMON_BREEDER_M - .string "BAILEY$", 8 - .byte 0x41 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word ARE - ec_word YOU - ec_word BUSY - ec_word GET - ec_word WITH - ec_word IT - -@ 45 - .byte TRAINER_CLASS_PARASOL_LADY - .string "ABBIE$", 8 - .byte 0x08 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word THE - ec_move1 MORNING_SUN - ec_word HAS - ec_word SO - ec_word MUCH - ec_move1 COSMIC_POWER - -@ 46 - .byte TRAINER_CLASS_CAMPER - .string "AL$", 8 - .byte 0x0C @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word LET_S - ec_word HAVE - ec_word AN - ec_word EXCITING - ec_word BATTLE - ec_word YEEHAW_EXCL - -@ 47 - .byte TRAINER_CLASS_SCHOOL_KID_F - .string "PEGGY$", 8 - .byte 0x42 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word WANT - ec_word TO - ec_word SEE - ec_word SOME - ec_move1 GROWTH - -@ 48 - .byte TRAINER_CLASS_BEAUTY - .string "NAOMI$", 8 - .byte 0x04 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word IT - ec_word WAS - ec_word GREAT - ec_word TO - ec_word BE - ec_word YOUNG - -@ 49 - .byte TRAINER_CLASS_NINJA_BOY - .string "KENJI$", 8 - .byte 0x0C @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word PLEASE - .2byte -1 - ec_word DON_T - ec_word BE - ec_word MEAN - ec_word TO_ME - -@ 50 - .byte TRAINER_CLASS_CYCLING_TRIATHLETE_M - .string "ROSS$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word WAKE_UP - ec_word MY - ec_move2 HIDDEN_POWER - ec_word AND - ec_move1 ASTONISH - ec_word ME - -@ 51 - .byte TRAINER_CLASS_POKEMON_RANGER_F - .string "EDNA$", 8 - .byte 0x02 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word BATTLE_TOWER - ec_word IS - ec_word SO - ec_word ENTERTAINING - ec_word IT_S - ec_word AWESOME - -@ 52 - .byte TRAINER_CLASS_RUIN_MANIAC - .string "ANTON$", 8 - .byte 0x41 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word BLEND - ec_word THICK_FAT - ec_word AND - ec_word CHLOROPHYLL - ec_word IT_S - ec_word TASTY - -@ 53 - .byte TRAINER_CLASS_SWIMMER_M - .string "MITCH$", 8 - .byte 0x81 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word NEXT - ec_word A - ec_word GIRL - ec_word WITH - ec_word A - ec_move1 SCARY_FACE - -@ 54 - .byte TRAINER_CLASS_HEX_MANIAC - .string "ROD$", 8 - .byte 0x42 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word GIMME - ec_word A - ec_word TOUGH - ec_word BATTLE - ec_word NOT - ec_word WIMPY - -@ 55 - .byte TRAINER_CLASS_RUNNING_TRIATHLETE_M - .string "RICH$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word TASTY - ec_word WATER - ec_word IS - ec_word HIP_AND - ec_word HAPPENING - ec_word YES_SIR_EXCL - -@ 56 - .byte TRAINER_CLASS_POKEFAN_M - .string "DANIEL$", 8 - .byte 0x80 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word GO - ec_word FOR - ec_word IT - ec_word MY - ec_word LOVEY_DOVEY - ec_word POKEMON - -@ 57 - .byte TRAINER_CLASS_PSYCHIC_F - .string "GLORIA$", 8 - .byte 0x82 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word LET_S - ec_word GET - ec_word THIS - ec_word FIERY - ec_word BATTLE - ec_word HAPPENING - -@ 58 - .byte TRAINER_CLASS_GUITARIST - .string "NELSON$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word MUSIC - ec_word IS - ec_word MY - ec_word ALL - ec_word MY - ec_word DESTINY - -@ 59 - .byte TRAINER_CLASS_KINDLER - .string "FERRIS$", 8 - .byte 0x41 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word GOOD - ec_word IT - ec_word IS - ec_word SO - ec_word VERY - ec_word GOOD - -@ 60 - .byte TRAINER_CLASS_AROMA_LADY - .string "AMANDA$", 8 - .byte 0x82 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word WHAT - ec_word KIND - ec_word OF - ec_word TRAINER - ec_word ARE - ec_word YOU - -@ 61 - .byte TRAINER_CLASS_SWIMMING_TRIATHLETE_M - .string "MASON$", 8 - .byte 0x10 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word DON_T - ec_word KNOW - ec_word HOW - ec_word TO - ec_word LOSE - -@ 62 - .byte TRAINER_CLASS_DRAGON_TAMER - .string "NATE$", 8 - .byte 0x10 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word DRAGON - ec_word POKEMON - ec_word ARE - ec_word ALL - ec_word THE - ec_move1 RAGE - -@ 63 - .byte TRAINER_CLASS_LASS - .string "MIRIAM$", 8 - .byte 0x82 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YOU_RE - ec_word TOO_STRONG - ec_word SERIOUSLY - ec_word IT_S - ec_word BAD - ec_word NEWS - -@ 64 - .byte TRAINER_CLASS_POKEMANIAC - .string "THEO$", 8 - .byte 0x40 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word ADORE - ec_word MY - ec_word MEGA - ec_word CUTE - ec_word PLUSH_DOLL - -@ 65 - .byte TRAINER_CLASS_SWIMMING_TRIATHLETE_F - .string "PAMELA$", 8 - .byte 0x10 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word HERE_I_COME - ec_word I_AM - ec_word THE - ec_word CUTE - ec_move2 WATER_SPORT - ec_word IDOL - -@ 66 - .byte TRAINER_CLASS_POKEFAN_F - .string "ALISSA$", 8 - .byte 0x20 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word IT_S - ec_word A - ec_word PREPOSTEROUS - ec_word MATCH - ec_word I_AM - ec_word SHOCKED - -@ 67 - .byte TRAINER_CLASS_GENTLEMAN - .string "ARTHUR$", 8 - .byte 0x20 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word PLEASE - ec_word GIVE - ec_word ME - ec_word A - ec_word GOOD - ec_word BATTLE - -@ 68 - .byte TRAINER_CLASS_SWIMMER_F - .string "MARCY$", 8 - .byte 0x82 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I_AM - ec_word BEAUTIFUL - ec_word YOU - ec_word CAN_T - ec_word BEAT - ec_word ME - -@ 69 - .byte TRAINER_CLASS_COOL_TRAINER_M - .string "MILLER$", 8 - .byte 0x10 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word BATTLE - ec_word DAILY - ec_word I - ec_word WON_T - ec_word LOSE - -@ 70 - .byte TRAINER_CLASS_BIRD_KEEPER - .string "OLIVER$", 8 - .byte 0x11 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS - ec_word GIGGLE - ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte -1 - .2byte -1 - .2byte -1 - -@ 71 - .byte TRAINER_CLASS_CYCLING_TRIATHLETE_F - .string "MOLLY$", 8 - .byte 0x12 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word HOW - ec_word ARE - ec_word YOU - ec_word ON - ec_word MONDAY - ec_word MORNING - -@ 72 - .byte TRAINER_CLASS_BUG_MANIAC - .string "JASON$", 8 - .byte 0x40 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word WATER - ec_word AND - ec_word BUG - ec_word POKEMON - ec_word ARE - ec_word GREAT - -@ 73 - .byte TRAINER_CLASS_BATTLE_GIRL - .string "AVA$", 8 - .byte 0x20 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word WHAT - ec_word IS - ec_word THIS - ec_word PRESSURE - ec_word ELLIPSIS - ec_word STATIC - -@ 74 - .byte TRAINER_CLASS_FISHERMAN - .string "HANK$", 8 - .byte 0x10 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YOU_RE - ec_word A - ec_word KID - ec_word YOU - ec_word CAN_T - ec_word WIN - -@ 75 - .byte TRAINER_CLASS_SAILOR - .string "PETER$", 8 - .byte 0x20 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word IT_S - ec_word SERIOUSLY - ec_word TERRIBLE - ec_word I - ec_word REALLY - ec_word THINK - -@ 76 - .byte TRAINER_CLASS_EXPERT_F - .string "MINDY$", 8 - .byte 0x20 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YOU - ec_word APPEAR - ec_word TO - ec_word TRAIN - ec_word VERY - ec_word WELL - -@ 77 - .byte TRAINER_CLASS_BUG_MANIAC - .string "DWIGHT$", 8 - .byte 0x11 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word ARE - ec_word YOU - ec_word STRONG - ec_word YOU - ec_word ARE - ec_word SCARY - -@ 78 - .byte TRAINER_CLASS_POKEMON_BREEDER_F - .string "REENA$", 8 - .byte 0x12 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word ALWAYS - ec_word LOSE - ec_word MAYBE - ec_word TODAY - ec_word ELLIPSIS - -@ 79 - .byte TRAINER_CLASS_PARASOL_LADY - .string "MEGAN$", 8 - .byte 0x10 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word DON_T - ec_word MAKE - ec_word THAT - ec_move1 SCARY_FACE - ec_word AT - ec_word ME - -@ 80 - .byte TRAINER_CLASS_RUNNING_TRIATHLETE_F - .string "SIERRA$", 8 - .byte 0x04 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I_VE - ec_word RUN - ec_word A_LOT - ec_word SO - ec_word I_AM - ec_word HEALTHY - -@ 81 - .byte TRAINER_CLASS_POKEMON_RANGER_M - .string "ARNOLD$", 8 - .byte 0x08 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I_AM - ec_word FEELING - ec_word AWESOME - ec_word MY - ec_word POKEMON - ec_word ROCK - -@ 82 - .byte TRAINER_CLASS_BLACK_BELT - .string "XIN$", 8 - .byte 0x04 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word HOO_HAH - ec_word ARE - ec_word YOU - ec_word READY - ec_word TO - ec_word ROCK - -@ 83 - .byte TRAINER_CLASS_COOL_TRAINER_F - .string "KELLY$", 8 - .byte 0x02 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YOU - ec_word COULDN_T - ec_word BEAT - ec_word ME - ec_word EVER - ec_word KID - -@ 84 - .byte TRAINER_CLASS_COLLECTOR - .string "VANCE$", 8 - .byte 0x80 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word POKEMON - ec_word ALL - ec_word OVER - ec_word THE - ec_word PLACE - ec_word WOWEE - -@ 85 - .byte TRAINER_CLASS_SWIMMING_TRIATHLETE_M - .string "TOBY$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word THIS - ec_word ISN_T - ec_word SPORTS - ec_word IT_S - ec_word A - ec_word BATTLE - -@ 86 - .byte TRAINER_CLASS_GENTLEMAN - .string "NORTON$", 8 - .byte 0x20 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word HAVE - ec_word TO - ec_word WIN - ec_word PLEASE - ec_word LOSE - -@ 87 - .byte TRAINER_CLASS_BATTLE_GIRL - .string "ZOE$", 8 - .byte 0x02 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word THIS - ec_word IS - ec_word SCARY - ec_word PLEASE - ec_word BE - ec_word NICE - -@ 88 - .byte TRAINER_CLASS_BEAUTY - .string "EMMA$", 8 - .byte 0x20 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word DON_T - ec_word YOU - ec_move1 FLAIL - ec_word YOU - ec_word CAN_T - ec_move1 WITHDRAW - -@ 89 - .byte TRAINER_CLASS_HIKER - .string "VINCE$", 8 - .byte 0x04 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YAHOO - ec_word YAHOO - ec_word ARE - ec_word YOU - ec_word LISTENING - ec_word QUES - -@ 90 - .byte TRAINER_CLASS_EXPERT_M - .string "MARV$", 8 - .byte 0x10 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word LEARN - ec_word TO - ec_word BATTLE - ec_word THE - ec_word CORRECT - ec_word WAY - -@ 91 - .byte TRAINER_CLASS_POKEMON_BREEDER_M - .string "TODD$", 8 - .byte 0x40 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word THE - ec_word WAY - ec_word YOU - ec_word BATTLE - ec_word IT_S - ec_word CHILD_S_PLAY - -@ 92 - .byte TRAINER_CLASS_GUITARIST - .string "GAVIN$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word BABY - ec_word BABY - ec_word BABY - ec_word ROCK - ec_word ME - ec_word HARD - -@ 93 - .byte TRAINER_CLASS_PSYCHIC_M - .string "QUINN$", 8 - .byte 0x08 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word HAVE - ec_word A - ec_word STICKY_HOLD - ec_word ON - ec_word YOU - -@ 94 - .byte TRAINER_CLASS_COOL_TRAINER_F - .string "JENN$", 8 - .byte 0x02 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I_AM - ec_word ON - ec_word A - ec_word TOUGH - ec_word TRAINER - ec_word SEARCH - -@ 95 - .byte TRAINER_CLASS_EXPERT_M - .string "JOEL$", 8 - .byte 0x10 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word BELIEVE - ec_word IN - ec_word YOUR - ec_word POKEMON - ec_word AND - ec_word WIN - -@ 96 - .byte TRAINER_CLASS_DRAGON_TAMER - .string "KYLE$", 8 - .byte 0x0C @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word LIKE - ec_word A - ec_word GIRL - ec_word WITH - ec_move2 FORESIGHT - -@ 97 - .byte TRAINER_CLASS_COOL_TRAINER_M - .string "BRET$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word TAKE - ec_word MY - ec_word OVERWHELMING - ec_word POWER - ec_word AND - ec_word DISAPPEAR - -@ 98 - .byte TRAINER_CLASS_EXPERT_F - .string "CARRIE$", 8 - .byte 0x10 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word TRAINER - ec_word I - ec_word SEE - ec_word YOU - ec_word ARE - ec_word CAPABLE - -@ 99 - .byte TRAINER_CLASS_LADY - .string "GILLIAN$", 8 - .byte 0x02 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word COME_ON - ec_word SHOW - ec_word ME - ec_word AN - ec_word EXCELLENT - ec_word TIME diff --git a/data/cable_club.s b/data/cable_club.s deleted file mode 100644 index f0ced6292..000000000 --- a/data/cable_club.s +++ /dev/null @@ -1,32 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -.ifdef ENGLISH -TrainerCardColorName_Bronze: - .string "BRONZE$", 7 -TrainerCardColorName_Copper: - .string "COPPER$", 7 -TrainerCardColorName_Silver: - .string "SILVER$", 7 -TrainerCardColorName_Gold: - .string "GOLD$", 7 -.else -TrainerCardColorName_Bronze: - .string "BRONZE$", 7 -TrainerCardColorName_Copper: - .string "KUPFER$", 7 -TrainerCardColorName_Silver: - .string "SILBER$", 7 -TrainerCardColorName_Gold: - .string "GOLD$", 7 -.endif - - - .align 2 -gTrainerCardColorNames:: @ 839B21C - .4byte TrainerCardColorName_Bronze - .4byte TrainerCardColorName_Copper - .4byte TrainerCardColorName_Silver - .4byte TrainerCardColorName_Gold diff --git a/data/contest.s b/data/contest.s index 0e06e9290..0ffcfc636 100644 --- a/data/contest.s +++ b/data/contest.s @@ -1,3 +1,5 @@ +#include "constants/moves.h" +#include "constants/species.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -297,10 +299,10 @@ gUnknown_083CC4B4:: @ 83CC4B4 .align 2 gUnknown_083CC4D4:: @ 83CC4D4 - obj_pal 0x20180A4, 33000 - obj_pal 0x20180C4, 33001 - obj_pal 0x20180E4, 33002 - obj_pal 0x2018104, 33003 + obj_pal gSharedMem + 0x180A4, 33000 + obj_pal gSharedMem + 0x180C4, 33001 + obj_pal gSharedMem + 0x180E4, 33002 + obj_pal gSharedMem + 0x18104, 33003 .align 2 gOamData_83CC4F4:: @ 83CC4F4 diff --git a/data/credits.s b/data/credits.s deleted file mode 100644 index fe82968c0..000000000 --- a/data/credits.s +++ /dev/null @@ -1,159 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_0840B83C:: @ 840B83C - .byte 0, 1, 0 - .byte 0xFF, 1,0xFF - .byte 0xFF, 1,0xFF - .byte 0xFF, 1,0xFF - .byte 0xFF, 1,0xFF - -gUnknown_0840B84B:: @ 840B84B - .byte 1,0xFF, 1 - .byte 1,0xFF, 1 - .byte 1, 2, 1 - .byte 1,0xFF, 1 - .byte 1,0xFF, 1 - -gUnknown_0840B85A:: @ 840B85A - .byte 1, 0, 0 - .byte 1,0xFF,0xFF - .byte 1, 2, 2 - .byte 1,0xFF,0xFF - .byte 1,0x80,0x80 - -gUnknown_0840B869:: @ 840B869 - .byte 1, 3, 1 - .byte 1, 4, 1 - .byte 1, 5, 1 - .byte 1,0xC4, 1 - .byte 1,0xC3, 1 - -gUnknown_0840B878:: @ 840B878 - .byte 1, 6, 7 - .byte 1, 8, 9 - .byte 1,0xFF, 1 - .byte 1,0x88,0x89 - .byte 1,0x86,0x87 - -.ifdef GERMAN - .byte 1, 0, 0 - .byte 1,0xFF,0xFF - .byte 1,0x80,0x8A - .byte 1,0xFF,0xFF - .byte 1,0xFF,0xFF - .byte 0, 1, 0 - .byte 0xFF, 1,0xFF - .byte 0xFF, 1,0xFF - .byte 0xFF, 1,0xFF - .byte 0x80, 1,0x80 -.endif - - .include "data/text/credits.inc" - -gUnknown_0840CA00:: @ 840CA00 - .byte 104, 36 - .byte 120, 36 - .byte 136, 36 - - .align 2 -gSpriteAnim_840CA08: - obj_image_anim_frame 0, 8 - obj_image_anim_frame 64, 8 - obj_image_anim_frame 128, 8 - obj_image_anim_frame 192, 8 - obj_image_anim_jump 0 - -gSpriteAnim_840CA1C: - obj_image_anim_frame 0, 4 - obj_image_anim_frame 64, 4 - obj_image_anim_frame 128, 4 - obj_image_anim_frame 192, 4 - obj_image_anim_jump 0 - -gSpriteAnim_840CA30: - obj_image_anim_frame 256, 4 - obj_image_anim_frame 320, 4 - obj_image_anim_frame 384, 4 - obj_image_anim_end - -gSpriteAnim_840CA40: - obj_image_anim_frame 384, 30 - obj_image_anim_frame 320, 30 - obj_image_anim_frame 256, 30 - obj_image_anim_frame 256, 30 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_0840CA54:: @ 840CA54 - .4byte gSpriteAnim_840CA08 - .4byte gSpriteAnim_840CA1C - .4byte gSpriteAnim_840CA30 - .4byte gSpriteAnim_840CA40 - - -gSpriteAnim_840CA64: - obj_image_anim_frame 0, 8 - obj_image_anim_frame 64, 8 - obj_image_anim_frame 128, 8 - obj_image_anim_frame 192, 8 - obj_image_anim_jump 0 - -gSpriteAnim_840CA78: - obj_image_anim_frame 0, 4 - obj_image_anim_frame 64, 4 - obj_image_anim_frame 128, 4 - obj_image_anim_frame 192, 4 - obj_image_anim_jump 0 - -gSpriteAnim_840CA8C: - obj_image_anim_frame 0, 4 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_0840CA94:: @ 840CA94 - .4byte gSpriteAnim_840CA64 - .4byte gSpriteAnim_840CA78 - .4byte gSpriteAnim_840CA8C - - -gUnknown_0840CAA0:: @ 840CAA0 - obj_tiles gHallOfFame, 6144, 1001 - null_obj_tiles - -gUnknown_0840CAB0:: @ 840CAB0 - obj_pal unk_201f800, 1001 - null_obj_pal - - .align 2 -gOamData_840CAC0:: @ 840CAC0 - .2byte 0x00A0 - .2byte 0xC000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_840CAC8:: @ 840CAC8 - obj_image_anim_frame 0, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840CAD0:: @ 840CAD0 - obj_image_anim_frame 64, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840CAD8:: @ 840CAD8 - obj_image_anim_frame 128, 8 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_840CAE0:: @ 840CAE0 - .4byte gSpriteAnim_840CAC8 - .4byte gSpriteAnim_840CAD0 - .4byte gSpriteAnim_840CAD8 - - .align 2 -gSpriteTemplate_840CAEC:: @ 840CAEC - spr_template 1001, 1001, gOamData_840CAC0, gSpriteAnimTable_840CAE0, NULL, gDummySpriteAffineAnimTable, spritecb_814580C diff --git a/data/data2a.s b/data/data2a.s index 657fc6908..103b723e8 100644 --- a/data/data2a.s +++ b/data/data2a.s @@ -1,5 +1,8 @@ @ the second big chunk of data +#include "constants/items.h" +#include "constants/moves.h" +#include "constants/species.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -7,31 +10,31 @@ .align 2 gSpriteImageTable_81E7A10:: @ 81E7A10 - obj_frame_tiles 0x2008000, 0x800 - obj_frame_tiles 0x2008800, 0x800 - obj_frame_tiles 0x2009000, 0x800 - obj_frame_tiles 0x2009800, 0x800 + obj_frame_tiles gSharedMem + 0x8000, 0x800 + obj_frame_tiles gSharedMem + 0x8800, 0x800 + obj_frame_tiles gSharedMem + 0x9000, 0x800 + obj_frame_tiles gSharedMem + 0x9800, 0x800 .align 2 gSpriteImageTable_81E7A30:: @ 81E7A30 - obj_frame_tiles 0x200A000, 0x800 - obj_frame_tiles 0x200A800, 0x800 - obj_frame_tiles 0x200B000, 0x800 - obj_frame_tiles 0x200B800, 0x800 + obj_frame_tiles gSharedMem + 0xA000, 0x800 + obj_frame_tiles gSharedMem + 0xA800, 0x800 + obj_frame_tiles gSharedMem + 0xB000, 0x800 + obj_frame_tiles gSharedMem + 0xB800, 0x800 .align 2 gSpriteImageTable_81E7A50:: @ 81E7A50 - obj_frame_tiles 0x200C000, 0x800 - obj_frame_tiles 0x200C800, 0x800 - obj_frame_tiles 0x200D000, 0x800 - obj_frame_tiles 0x200D800, 0x800 + obj_frame_tiles gSharedMem + 0xC000, 0x800 + obj_frame_tiles gSharedMem + 0xC800, 0x800 + obj_frame_tiles gSharedMem + 0xD000, 0x800 + obj_frame_tiles gSharedMem + 0xD800, 0x800 .align 2 gSpriteImageTable_81E7A70:: @ 81E7A70 - obj_frame_tiles 0x200E000, 0x800 - obj_frame_tiles 0x200E800, 0x800 - obj_frame_tiles 0x200F000, 0x800 - obj_frame_tiles 0x200F800, 0x800 + obj_frame_tiles gSharedMem + 0xE000, 0x800 + obj_frame_tiles gSharedMem + 0xE800, 0x800 + obj_frame_tiles gSharedMem + 0xF000, 0x800 + obj_frame_tiles gSharedMem + 0xF800, 0x800 .align 2 gSpriteAnim_81E7A90:: @ 81E7A90 diff --git a/data/data2b.s b/data/data2b.s index 329384396..e82e221c1 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -72,7 +72,7 @@ gSpriteTemplate_81FAF34:: @ 81FAF34 .align 2 gUnknown_081FAF4C:: @ 81FAF4C - .4byte 0x02008000 - .4byte 0x0200a000 - .4byte 0x0200c000 - .4byte 0x0200e000 + .4byte gSharedMem + 0x8000 + .4byte gSharedMem + 0xA000 + .4byte gSharedMem + 0xC000 + .4byte gSharedMem + 0xE000 diff --git a/data/easy_chat.s b/data/easy_chat.s index 436835d19..99a03f8f5 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -1,51 +1,56 @@ +#include "constants/easy_chat.h" +#include "constants/moves.h" +#include "constants/species.h" .include "asm/macros.inc" .include "constants/constants.inc" +#define EC_DUPLICATES(count) (0xFF00 + (count)) + .section .rodata .align 1 gMysteryEventPhrase:: @ 83DB678 - ec_word MYSTERY - ec_word EVENT - ec_word IS - ec_word EXCITING + .2byte EC_WORD_MYSTERY + .2byte EC_WORD_EVENT + .2byte EC_WORD_IS + .2byte EC_WORD_EXCITING .align 1 gBerryMasterWifePhrases:: @ 83DB680 .ifdef ENGLISH - ec_word GREAT - ec_word BATTLE + .2byte EC_WORD_GREAT + .2byte EC_WORD_BATTLE - ec_word CHALLENGE - ec_word CONTEST + .2byte EC_WORD_CHALLENGE + .2byte EC_WORD_CONTEST - ec_word OVERWHELMING - ec_pokemon1 LATIAS + .2byte EC_WORD_OVERWHELMING + .2byte EC_POKEMON(LATIAS) - ec_word COOL - ec_pokemon1 LATIOS + .2byte EC_WORD_COOL + .2byte EC_POKEMON(LATIOS) - ec_word SUPER - ec_word HUSTLE + .2byte EC_WORD_SUPER + .2byte EC_WORD_HUSTLE .else - ec_word GREAT - ec_word FIGHT + .2byte EC_WORD_GREAT + .2byte EC_WORD_FIGHT - ec_word CONTEST - ec_word CHALLENGE + .2byte EC_WORD_CONTEST + .2byte EC_WORD_CHALLENGE - ec_pokemon1 LATIAS - ec_word OVERWHELMING + .2byte EC_POKEMON(LATIAS) + .2byte EC_WORD_OVERWHELMING - ec_pokemon1 LATIOS - ec_word COOL + .2byte EC_POKEMON(LATIOS) + .2byte EC_WORD_COOL - ec_word SUPER + .2byte EC_WORD_SUPER .2byte 0xFFFF .endif gUnknown_083DB694:: @ 83DB694 - .4byte 0x02001000 + .4byte gSharedMem + 0x1000 .align 2 gUnknown_083DB698:: @ 83DB698 @@ -114,39 +119,39 @@ gUnknown_083DB7C0:: @ 83DB7C0 .align 2 gUnknown_083DB7DC:: @ 83DB7DC .ifdef ENGLISH - .4byte 0x0200ac80 - .4byte 0x0200acc9 - .4byte 0x0200ad12 - .4byte 0x0200ad5b + .4byte gSharedMem + 0xAC80 + .4byte gSharedMem + 0xACC9 + .4byte gSharedMem + 0xAD12 + .4byte gSharedMem + 0xAD5B .else - .4byte 0x0200AFAC - .4byte 0x0200AFF5 - .4byte 0x0200B03E - .4byte 0x0200B087 + .4byte gSharedMem + 0xAFAC + .4byte gSharedMem + 0xAFF5 + .4byte gSharedMem + 0xB03E + .4byte gSharedMem + 0xB087 .endif .align 1 gUnknown_083DB7EC:: @ 83DB7EC .ifdef ENGLISH - ec_word I_AM - ec_word A - ec_word POKEMON - ec_word GREAT + .2byte EC_WORD_I_AM + .2byte EC_WORD_A + .2byte EC_WORD_POKEMON + .2byte EC_WORD_GREAT .else - ec_word I_AM - ec_word BIG - ec_word IN - ec_word POKEMON + .2byte EC_WORD_I_AM + .2byte EC_WORD_BIG + .2byte EC_WORD_IN + .2byte EC_WORD_POKEMON .endif .align 1 gUnknown_083DB7F4:: @ 83DB7F4 - ec_word ARE - ec_word YOU - ec_word READY - ec_word QUES - ec_word HERE_I_COME - ec_word EXCL + .2byte EC_WORD_ARE + .2byte EC_WORD_YOU + .2byte EC_WORD_READY + .2byte EC_WORD_QUES + .2byte EC_WORD_HERE_I_COME + .2byte EC_WORD_EXCL .align 2 InterviewPalette_0:: @ 83DB800 diff --git a/data/event_scripts.s b/data/event_scripts.s index 854b52c9e..76b080a5b 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,3 +1,13 @@ +#include "constants/decorations.h" +#include "constants/flags.h" +#include "constants/game_stat.h" +#include "constants/items.h" +#include "constants/map_objects.h" +#include "constants/maps.h" +#include "constants/moves.h" +#include "constants/opponents.h" +#include "constants/songs.h" +#include "constants/species.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" @@ -22,12 +32,12 @@ gSpecialVars:: .4byte gSpecialVar_0x8009 .4byte gSpecialVar_0x800A .4byte gSpecialVar_0x800B - .4byte gScriptFacing - .4byte gScriptResult - .4byte gScriptItemId - .4byte gScriptLastTalked - .4byte gScriptContestRank - .4byte gScriptContestCategory + .4byte gSpecialVar_Facing + .4byte gSpecialVar_Result + .4byte gSpecialVar_ItemId + .4byte gSpecialVar_LastTalked + .4byte gSpecialVar_ContestRank + .4byte gSpecialVar_ContestCategory .include "data/specials.inc" @@ -391,7 +401,7 @@ gUnknown_0815F36C:: @ 815F36C dofieldeffect 61 waitstate waitmessage - waitbutton + waitbuttonpress playse 5 goto EventScript_15F384 end @@ -399,7 +409,7 @@ gUnknown_0815F36C:: @ 815F36C EventScript_15F384: message UnknownString_81A3A87 waitmessage - checkflag 268 + checkflag FLAG_DECORATION_16 goto_if_eq EventScript_15F3A0 goto EventScript_15F3E2 end @@ -452,7 +462,7 @@ gUnknown_0815F43A:: @ 815F43A dofieldeffect 61 waitstate waitmessage - waitbutton + waitbuttonpress playse 5 goto EventScript_15F452 end @@ -486,7 +496,7 @@ EventScript_15F4A1: goto_if_eq EventScript_15F452 msgbox UnknownString_81A3A22, 3 special sub_80BC5BC - special sub_80C683C + special DoSecretBasePCTurnOffEffect releaseall end @@ -496,13 +506,13 @@ EventScript_15F4E0: goto_if_eq EventScript_15F452 msgbox UnknownString_81A3A3A, 3 special sub_80BC5BC - special sub_80C683C + special DoSecretBasePCTurnOffEffect releaseall end EventScript_15F503: msgbox UnknownString_81A39C0, 3 - special sub_80C683C + special DoSecretBasePCTurnOffEffect closemessage releaseall end @@ -514,7 +524,7 @@ EventScript_15F511: end EventScript_15F51D: - special sub_80C683C + special DoSecretBasePCTurnOffEffect closemessage releaseall end @@ -891,7 +901,7 @@ Std_2: faceplayer message 0x0 waitmessage - waitbutton + waitbuttonpress release return @@ -899,14 +909,14 @@ Std_3: lockall message 0x0 waitmessage - waitbutton + waitbuttonpress releaseall return Std_4: message 0x0 waitmessage - waitbutton + waitbuttonpress return Std_5: @@ -943,7 +953,7 @@ gUnknown_0819F818:: @ 819F818 goto EventScript_19F8F2 EventScript_19F83F: - ontrainerbattleend + gotopostbattlescript gUnknown_0819F840:: @ 819F840 lock @@ -962,19 +972,19 @@ gUnknown_0819F840:: @ 819F840 EventScript_19F870: special ScrSpecial_ShowTrainerNonBattlingSpeech waitmessage - waitbutton + waitbuttonpress release end EventScript_19F877: - ontrainerbattleend + gotopostbattlescript gUnknown_0819F878:: @ 819F878 applymovement LAST_TALKED, Movement_19F8F0 waitmovement 0 special PlayTrainerEncounterMusic - battlebegin - ontrainerbattleend + trainerbattlebegin + gotopostbattlescript gUnknown_0819F887:: @ 819F887 call EventScript_19F8E5 @@ -985,14 +995,14 @@ gUnknown_0819F887:: @ 819F887 special sub_8082524 special ScrSpecial_ShowTrainerIntroSpeech waitmessage - waitbutton + waitbuttonpress special ScrSpecial_StartTrainerEyeRematch waitstate releaseall end EventScript_19F8AD: - ontrainerbattleend + gotopostbattlescript gUnknown_0819F8AE:: @ 819F8AE specialvar RESULT, ScrSpecial_GetTrainerEyeRematchFlag @@ -1005,19 +1015,19 @@ gUnknown_0819F8AE:: @ 819F8AE special sub_8082524 special ScrSpecial_ShowTrainerIntroSpeech waitmessage - waitbutton + waitbuttonpress special ScrSpecial_StartTrainerEyeRematch waitstate releaseall end EventScript_19F8DD: - ontrainerbattleend + gotopostbattlescript EventScript_19F8DE: special ScrSpecial_ShowTrainerNonBattlingSpeech waitmessage - waitbutton + waitbuttonpress release end @@ -1033,8 +1043,8 @@ Movement_19F8F0:: EventScript_19F8F2: special ScrSpecial_ShowTrainerIntroSpeech waitmessage - waitbutton - battlebegin + waitbuttonpress + trainerbattlebegin specialvar RESULT, ScrSpecial_GetTrainerBattleMode compare RESULT, 0 goto_if_eq EventScript_19F934 @@ -1052,271 +1062,271 @@ EventScript_19F934: end EventScript_19F936: - ontrainerbattleendgoto + gotobeatenscript Std_6:: message 0x0 waitmessage - waitbutton + waitbuttonpress release return Event_ResetBerryTrees: @ 19F940 - plantberrytree 2, 7, 5 - plantberrytree 1, 3, 5 - plantberrytree 11, 7, 5 - plantberrytree 13, 3, 5 - plantberrytree 4, 7, 5 - plantberrytree 76, 1, 5 - plantberrytree 8, 1, 5 - plantberrytree 10, 6, 5 - plantberrytree 25, 20, 5 - plantberrytree 26, 2, 5 - plantberrytree 66, 2, 5 - plantberrytree 67, 20, 5 - plantberrytree 69, 22, 5 - plantberrytree 70, 22, 5 - plantberrytree 71, 22, 5 - plantberrytree 55, 17, 5 - plantberrytree 56, 17, 5 - plantberrytree 5, 1, 5 - plantberrytree 6, 6, 5 - plantberrytree 7, 1, 5 - plantberrytree 16, 18, 5 - plantberrytree 17, 18, 5 - plantberrytree 18, 18, 5 - plantberrytree 29, 19, 5 - plantberrytree 28, 19, 5 - plantberrytree 27, 19, 5 - plantberrytree 24, 4, 5 - plantberrytree 23, 3, 5 - plantberrytree 22, 3, 5 - plantberrytree 21, 4, 5 - plantberrytree 19, 16, 5 - plantberrytree 20, 16, 5 - plantberrytree 80, 7, 5 - plantberrytree 81, 7, 5 - plantberrytree 77, 8, 5 - plantberrytree 78, 8, 5 - plantberrytree 68, 8, 5 - plantberrytree 31, 10, 5 - plantberrytree 33, 10, 5 - plantberrytree 34, 21, 5 - plantberrytree 35, 21, 5 - plantberrytree 36, 21, 5 - plantberrytree 83, 24, 5 - plantberrytree 84, 24, 5 - plantberrytree 85, 10, 5 - plantberrytree 86, 6, 5 - plantberrytree 37, 5, 5 - plantberrytree 38, 5, 5 - plantberrytree 39, 5, 5 - plantberrytree 40, 3, 5 - plantberrytree 41, 3, 5 - plantberrytree 42, 3, 5 - plantberrytree 46, 19, 5 - plantberrytree 45, 20, 5 - plantberrytree 44, 18, 5 - plantberrytree 43, 16, 5 - plantberrytree 47, 8, 5 - plantberrytree 48, 5, 5 - plantberrytree 49, 4, 5 - plantberrytree 50, 2, 5 - plantberrytree 52, 18, 5 - plantberrytree 53, 18, 5 - plantberrytree 62, 6, 5 - plantberrytree 64, 6, 5 - plantberrytree 58, 21, 5 - plantberrytree 59, 21, 5 - plantberrytree 60, 25, 5 - plantberrytree 61, 25, 5 - plantberrytree 79, 23, 5 - plantberrytree 14, 23, 5 - plantberrytree 15, 21, 5 - plantberrytree 30, 21, 5 - plantberrytree 65, 25, 5 - plantberrytree 72, 25, 5 - plantberrytree 73, 23, 5 - plantberrytree 74, 23, 5 - plantberrytree 87, 3, 5 - plantberrytree 88, 10, 5 - plantberrytree 89, 4, 5 - plantberrytree 82, 36, 5 + setberrytree 2, 7, 5 + setberrytree 1, 3, 5 + setberrytree 11, 7, 5 + setberrytree 13, 3, 5 + setberrytree 4, 7, 5 + setberrytree 76, 1, 5 + setberrytree 8, 1, 5 + setberrytree 10, 6, 5 + setberrytree 25, 20, 5 + setberrytree 26, 2, 5 + setberrytree 66, 2, 5 + setberrytree 67, 20, 5 + setberrytree 69, 22, 5 + setberrytree 70, 22, 5 + setberrytree 71, 22, 5 + setberrytree 55, 17, 5 + setberrytree 56, 17, 5 + setberrytree 5, 1, 5 + setberrytree 6, 6, 5 + setberrytree 7, 1, 5 + setberrytree 16, 18, 5 + setberrytree 17, 18, 5 + setberrytree 18, 18, 5 + setberrytree 29, 19, 5 + setberrytree 28, 19, 5 + setberrytree 27, 19, 5 + setberrytree 24, 4, 5 + setberrytree 23, 3, 5 + setberrytree 22, 3, 5 + setberrytree 21, 4, 5 + setberrytree 19, 16, 5 + setberrytree 20, 16, 5 + setberrytree 80, 7, 5 + setberrytree 81, 7, 5 + setberrytree 77, 8, 5 + setberrytree 78, 8, 5 + setberrytree 68, 8, 5 + setberrytree 31, 10, 5 + setberrytree 33, 10, 5 + setberrytree 34, 21, 5 + setberrytree 35, 21, 5 + setberrytree 36, 21, 5 + setberrytree 83, 24, 5 + setberrytree 84, 24, 5 + setberrytree 85, 10, 5 + setberrytree 86, 6, 5 + setberrytree 37, 5, 5 + setberrytree 38, 5, 5 + setberrytree 39, 5, 5 + setberrytree 40, 3, 5 + setberrytree 41, 3, 5 + setberrytree 42, 3, 5 + setberrytree 46, 19, 5 + setberrytree 45, 20, 5 + setberrytree 44, 18, 5 + setberrytree 43, 16, 5 + setberrytree 47, 8, 5 + setberrytree 48, 5, 5 + setberrytree 49, 4, 5 + setberrytree 50, 2, 5 + setberrytree 52, 18, 5 + setberrytree 53, 18, 5 + setberrytree 62, 6, 5 + setberrytree 64, 6, 5 + setberrytree 58, 21, 5 + setberrytree 59, 21, 5 + setberrytree 60, 25, 5 + setberrytree 61, 25, 5 + setberrytree 79, 23, 5 + setberrytree 14, 23, 5 + setberrytree 15, 21, 5 + setberrytree 30, 21, 5 + setberrytree 65, 25, 5 + setberrytree 72, 25, 5 + setberrytree 73, 23, 5 + setberrytree 74, 23, 5 + setberrytree 87, 3, 5 + setberrytree 88, 10, 5 + setberrytree 89, 4, 5 + setberrytree 82, 36, 5 return gUnknown_0819FA81:: @ 819FA81 - setflag 86 - setflag 769 - setflag 770 - setflag 771 - setflag 721 - setflag 889 - setflag 726 - setflag 867 - setflag 731 - setflag 732 - setflag 814 - setflag 868 - setflag 739 - setflag 881 - setflag 738 - setflag 740 - setflag 741 - setflag 743 - setflag 744 - setflag 906 - setflag 737 - setflag 747 - setflag 748 - setflag 749 - setflag 756 - setflag 774 - setflag 895 - setflag 776 - setflag 777 - setflag 778 - setflag 779 - setflag 780 - setflag 781 - setflag 782 - setflag 783 - setflag 734 - setflag 849 - setflag 789 - setflag 790 - setflag 791 - setflag 792 - setflag 797 - setflag 798 - setflag 799 - setflag 901 - setflag 902 - setflag 903 - setflag 904 - setflag 800 - setflag 801 - setflag 803 - setflag 802 - setflag 806 - setflag 808 - setflag 809 - setflag 984 - setflag 811 - setflag 812 - setflag 866 - setflag 815 - setflag 816 - setflag 869 - setflag 823 - setflag 828 - setflag 829 - setflag 831 - setflag 859 - setflag 841 - setflag 843 - setflag 844 - setflag 847 - setflag 845 - setflag 846 - setflag 860 - setflag 861 - setflag 835 - setflag 840 - setflag 848 - setflag 851 - setflag 855 - setflag 856 - setflag 973 - setflag 870 - setflag 872 - setflag 877 - setflag 879 - setflag 891 - setflag 880 - setflag 878 - setflag 807 - setflag 983 - setflag 886 - setflag 884 - setflag 885 - setflag 961 - setflag 888 - setflag 941 - setflag 752 - setflag 757 - setflag 892 - setflag 896 - setflag 897 - setflag 898 - setflag 909 - setflag 910 - setflag 911 - setflag 915 - setflag 912 - setflag 920 - setflag 921 - setflag 922 - setflag 923 - setflag 925 - setflag 929 - setflag 930 - setflag 934 - setflag 939 - setflag 940 - setflag 928 - setflag 834 - setflag 944 - setflag 945 - setflag 947 - setflag 948 - setflag 858 - setflag 950 - setflag 968 - setflag 1133 - setflag 727 - setflag 979 - setflag 751 - setflag 991 + setflag FLAG_LINK_CONTEST_ROOM_POKEBALL + setflag FLAG_HIDE_VICTORIA_WINSTRATE + setflag FLAG_HIDE_VIVI_WINSTRATE + setflag FLAG_HIDE_VICKI_WINSTRATE + setflag FLAG_HIDE_BIRCH_IN_LAB + setflag FLAG_HIDE_RIVAL_BIRCH_LAB + setflag FLAG_HIDE_WALLY_PETALBURG + setflag FLAG_UNKNOWN_363 + setflag FLAG_HIDE_GRUNT_RUSTBORO + setflag FLAG_HIDE_DEVON_RUSTBORO + setflag FLAG_HIDE_RIVAL_RUSTBORO + setflag FLAG_HIDE_FAT_MAN_LITTLEROOT + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + setflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + setflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE + setflag FLAG_UNKNOWN_2E1 + setflag FLAG_UNKNOWN_2EB + setflag FLAG_UNKNOWN_2EC + setflag FLAG_UNKNOWN_2ED + setflag FLAG_UNKNOWN_2F4 + setflag FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1 + setflag FLAG_HIDE_ARTIST_LILCOVE_CONTEST + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER + setflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS + setflag FLAG_HIDE_PETALBURG_GYM_GUIDE + setflag FLAG_UNKNOWN_30E + setflag FLAG_UNKNOWN_30F + setflag FLAG_HIDE_NORMAN_LITTLEROOT + setflag FLAG_HIDE_MAY_PICHU_DOLL + setflag FLAG_HIDE_FANCLUB_OLD_LADY + setflag FLAG_HIDE_FANCLUB_BOY + setflag FLAG_HIDE_FANCLUB_LITTLE_BOY + setflag FLAG_HIDE_FANCLUB_LADY + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_2 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_3 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_3 + setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR + setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF + setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT + setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE + setflag FLAG_HIDE_WALLY_WANDAS_HOUSE + setflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE + setflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE + setflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE + setflag FLAG_HIDE_WALLY_FATHER_PETALBURG + setflag FLAG_HIDE_WALLY_MOTHER_PETALBURG + setflag FLAG_HIDE_WALLY_PETALBURG_GYM + setflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM + setflag FLAG_HIDE_WALLACE_SOOTOPOLIS + setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD + setflag FLAG_UNKNOWN_337 + setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN + setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN + setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN + setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN + setflag FLAG_HIDE_STERN_SLATEPORT_HARBOR + setflag FLAG_UNKNOWN_34B + setflag FLAG_UNKNOWN_34C + setflag FLAG_UNKNOWN_34F + setflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR + setflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR + setflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR + setflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR + setflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT + setflag FLAG_HIDE_STERN_SLATEPORT + setflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR + setflag FLAG_HIDE_RIVAL_ROUTE119 + setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 + setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 + setflag FLAG_HIDE_STEVEN_SOOTOPOLIS + setflag FLAG_HIDE_LANETTE + setflag FLAG_HIDE_TRICKMASTER_ENTRANCE + setflag FLAG_HIDE_MT_CHIMNEY_PEOPLE + setflag FLAG_HIDE_BRINEY_RUSTURF_TUNNEL + setflag FLAG_HIDE_BRINEY_ROUTE116 + setflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL + setflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL + setflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL + setflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL + setflag FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F + setflag FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F + setflag FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F + setflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT + setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER + setflag FLAG_HIDE_MOM_LITTLEROOT + setflag FLAG_HIDE_MOM_UPSTAIRS + setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F + setflag FLAG_UNKNOWN_BIRCH_380 + setflag FLAG_HIDE_BIRCH_ROUTE101 + setflag FLAG_HIDE_BIRCH_ROUTE103 + setflag FLAG_HIDE_FERRY_SAILOR_LILYCOVE + setflag FLAG_HIDE_LATIOS_OR_LATIAS_FLYING + setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY + setflag FLAG_UNKNOWN_393 + setflag FLAG_HIDE_WATTSON_MAUVILLE + setflag FLAG_HIDE_RIVAL_CHAMPIONS_ROOM + setflag FLAG_HIDE_BIRCH_CHAMPIONS_ROOM + setflag FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110 + setflag FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE + setflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE + setflag FLAG_HIDE_RIVAL_LAVARIDGE_1 + setflag FLAG_HIDE_RIVAL_LAVARIDGE_2 + setflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE + setflag FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F + setflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL + setflag FLAG_HIDE_PROF_COSMO_FALLARBOR + setflag FLAG_HIDE_STEVEN_ROUTE128 + setflag FLAG_HIDE_EVIL_LEADER_ROUTE128 + setflag FLAG_HIDE_OTHER_LEADER_ROUTE128 + setflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116 + setflag FLAG_HIDE_TM_SALESMAN_SLATEPORT + setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD + setflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL + setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE + setflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1 + setflag FLAG_HIDE_STEVENS_LETTER + setflag FLAG_HIDE_RIVAL_OLDALE_TOWN + setflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD + setflag FLAG_HIDE_BOY_ROUTE101 call Event_ResetBerryTrees end EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 - clearflag 925 + clearflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE call EverGrandeCity_HallOfFame_EventScript_19FD09 - setflag 869 - clearflag 950 - clearflag 727 + setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD + clearflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL + clearflag FLAG_HIDE_STEVENS_LETTER setvar 0x40c6, 1 - clearflag 751 - clearflag 860 - clearflag 861 + clearflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD + clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR + clearflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR special sub_810FAA0 - checkflag 291 + checkflag FLAG_RECEIVED_SS_TICKET call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC62 - checkflag 255 + checkflag FLAG_LATIOS_OR_LATIAS_ROAMING call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC70 - checkflag 298 + checkflag FLAG_RECEIVED_BELDUM call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5A - checkflag 123 + checkflag FLAG_RECEIVED_HM08 call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5E return EverGrandeCity_HallOfFame_EventScript_19FC5A:: @ 819FC5A - clearflag 968 + clearflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE return EverGrandeCity_HallOfFame_EventScript_19FC5E:: @ 819FC5E - clearflag 1133 + clearflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1 return EverGrandeCity_HallOfFame_EventScript_19FC62:: @ 819FC62 setvar 0x4082, 3 setvar 0x408c, 3 - clearflag 734 + clearflag FLAG_HIDE_NORMAN_LITTLEROOT return EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70 - setflag 2141 + setflag FLAG_SYS_TV_LATI return S_WhiteOut:: @ 819FC74 @@ -1326,11 +1336,11 @@ S_WhiteOut:: @ 819FC74 end EventScript_19FC84: - checkflag 221 + checkflag FLAG_RECEIVED_GO_GOGGLES goto_if_eq Route101_EventScript_1A14DC - checkflag 1213 + checkflag FLAG_DEFEATED_LAVARIDGE_GYM goto_if 0, Route101_EventScript_1A14DC - clearflag 929 + clearflag FLAG_HIDE_RIVAL_LAVARIDGE_1 setvar 0x4053, 2 return @@ -1344,42 +1354,42 @@ gUnknown_0819FC9F:: @ 819FC9F end EventScript_19FCC1: - setflag 740 - setflag 743 - setflag 741 - setflag 744 - clearflag 742 - clearflag 739 - clearflag 881 + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + setflag FLAG_HIDE_MR_BRINEY_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE end EventScript_19FCD7: - setflag 741 - setflag 744 - setflag 738 - setflag 742 - setflag 739 - setflag 881 - clearflag 740 - clearflag 743 + setflag FLAG_HIDE_MR_BRINEY_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD end EventScript_19FCF0: - setflag 738 - setflag 742 - setflag 739 - setflag 881 - setflag 740 - setflag 743 - clearflag 741 - clearflag 744 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + clearflag FLAG_HIDE_MR_BRINEY_ROUTE109 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 end EverGrandeCity_HallOfFame_EventScript_19FD09:: @ 819FD09 - clearflag 1245 - clearflag 1246 - clearflag 1247 - clearflag 1248 + clearflag FLAG_DEFEATED_ELITE_4_SYDNEY + clearflag FLAG_DEFEATED_ELITE_4_PHOEBE + clearflag FLAG_DEFEATED_ELITE_4_GLACIA + clearflag FLAG_DEFEATED_ELITE_4_DRAKE setvar 0x409c, 0 return @@ -1392,15 +1402,15 @@ PetalburgCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B RustboroCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B SlateportCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B - checkflag 188 + checkflag FLAG_RECEIVED_POKENAV goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_1A14DC - checkflag 742 + checkflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD49 - checkflag 740 + checkflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD4F - checkflag 741 + checkflag FLAG_HIDE_MR_BRINEY_ROUTE109 goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD55 return @@ -1450,7 +1460,7 @@ do_heal_party:: @ 819FD7C applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845 waitmovement 0 special ScrSpecial_HealPlayerParty - checkflag 273 + checkflag FLAG_POKERUS_EXPLAINED goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE goto OldaleTown_PokemonCenter_1F_EventScript_19FDB0 end @@ -1480,7 +1490,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA message gText_NurseJoy_Pokerus waitmessage - setflag 273 + setflag FLAG_POKERUS_EXPLAINED return OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 @@ -1489,13 +1499,13 @@ OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 step_end Std_ObtainItem: @ 819FDF7 - additem 0x8000, 0x8001 + giveitem 0x8000, 0x8001 copyvar 0x8007, RESULT call Std_ObtainItem_ return Std_ObtainItem_: @ 819FE07 - getitemname 1, 0x8000 + bufferitemname 1, 0x8000 checkitemtype 0x8000 call GetItem_HandlePocket compare 0x8007, 0x1 @@ -1514,31 +1524,31 @@ GetItem_HandlePocket: end GetItem_HandlePocket_Items: - getstdstring 2, 0xE + bufferstdstring 2, 0xE compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_KeyItems: - getstdstring 2, 0xF + bufferstdstring 2, 0xF compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_PokeBalls: - getstdstring 2, 0x10 + bufferstdstring 2, 0x10 compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_TMsHMs: - getstdstring 2, 0x11 + bufferstdstring 2, 0x11 compare 0x8007, 1 call_if 1, PlayGetTMHMFanfare return GetItem_HandlePocket_Berries: - getstdstring 2, 0x12 + bufferstdstring 2, 0x12 compare 0x8007, 1 call_if 1, PlayGetItemFanfare return @@ -1564,13 +1574,13 @@ PlayGetTMHMFanfare: return Std_ObtainDecoration: @ 819FEDA - adddecor 0x8000 + givedecoration 0x8000 copyvar 0x8007, RESULT call Std_ObtainDecoration_ return Std_ObtainDecoration_: @ 819FEE8 - getdecorname 1, 0x8000 + bufferdecorationname 1, 0x8000 compare 0x8007, 1 call_if 1, Std_ObtainDecoration_Success compare 0x8007, 0 @@ -1594,9 +1604,9 @@ Std_FindItem: @ 819FF21 lock faceplayer waitse - additem 0x8000, 0x8001 + giveitem 0x8000, 0x8001 copyvar 0x8007, RESULT - getitemname 1, 0x8000 + bufferitemname 1, 0x8000 checkitemtype 0x8000 call GetItem_HandlePocket compare 0x8007, 1 @@ -1623,9 +1633,9 @@ Std_FindItem_Fail: @ 819FF65 HiddenItemScript:: @ 819FF7B lockall waitse - additem 0x8005, 1 + giveitem 0x8005, 1 copyvar 0x8007, RESULT - getitemname 0x1, 0x8005 + bufferitemname 0x1, 0x8005 checkitemtype 0x8005 call GetItem_HandlePocket compare 0x8007, 1 @@ -1667,7 +1677,7 @@ UnusedMixRecordsScript_Yes: @ 819FFFA UnusedMixRecordsScript_Done: @ 81A0000 message UnusedMixRecordsSeeYouAgainText waitmessage - waitbutton + waitbuttonpress release end @@ -1707,9 +1717,9 @@ EventScript_1A0070: EventScript_1A0085: playse 2 - checkflag 2123 + checkflag FLAG_SYS_PC_LANETTE call_if 0, EventScript_1A00AC - checkflag 2123 + checkflag FLAG_SYS_PC_LANETTE call_if 1, EventScript_1A00B5 msgbox UnknownString_81A0A35, 4 special ShowPokemonStorageSystem @@ -1733,7 +1743,7 @@ EventScript_1A00BE: end EventScript_1A00CB: - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, EventScript_1A00BE playse 2 special AccessHallOfFamePC @@ -1791,8 +1801,8 @@ DewfordTown_Gym_EventScript_1A00FB:: @ 81A00FB LavaridgeTown_Gym_1F_EventScript_1A00FB:: @ 81A00FB MauvilleCity_Gym_EventScript_1A00FB:: @ 81A00FB RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB - clearflag 781 - setflag 296 + clearflag FLAG_HIDE_PETALBURG_GYM_GUIDE + setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS return DewfordTown_EventScript_1A0102:: @ 81A0102 @@ -1810,11 +1820,11 @@ Route109_EventScript_1A010C:: @ 81A010C return UseSurfScript:: @ 81A0117 - checkpokemove MOVE_SURF + checkpartymove MOVE_SURF compare RESULT, 6 goto_if_eq UseSurfScript_NoMon - getpartypokename 0, RESULT - setfieldeffect 0, RESULT + bufferpartymonnick 0, RESULT + setfieldeffectargument 0, RESULT lockall msgbox UseSurfPromptText, 5 compare RESULT, 0 @@ -2157,24 +2167,24 @@ Route103_EventScript_1A02F4:: @ 81A02F4 return Route101_EventScript_1A0358:: @ 81A0358 - clearflag 721 - clearflag 896 - setflag 897 - setflag 898 + clearflag FLAG_HIDE_BIRCH_IN_LAB + clearflag FLAG_UNKNOWN_BIRCH_380 + setflag FLAG_HIDE_BIRCH_ROUTE101 + setflag FLAG_HIDE_BIRCH_ROUTE103 return Route101_EventScript_1A0365:: @ 81A0365 - clearflag 897 - setflag 721 - setflag 896 - setflag 898 + clearflag FLAG_HIDE_BIRCH_ROUTE101 + setflag FLAG_HIDE_BIRCH_IN_LAB + setflag FLAG_UNKNOWN_BIRCH_380 + setflag FLAG_HIDE_BIRCH_ROUTE103 return Route101_EventScript_1A0372:: @ 81A0372 - clearflag 898 - setflag 897 - setflag 721 - setflag 896 + clearflag FLAG_HIDE_BIRCH_ROUTE103 + setflag FLAG_HIDE_BIRCH_ROUTE101 + setflag FLAG_HIDE_BIRCH_IN_LAB + setflag FLAG_UNKNOWN_BIRCH_380 return LittlerootTown_ProfessorBirchsLab_EventScript_1A037F:: @ 81A037F @@ -2198,7 +2208,7 @@ Route101_EventScript_1A03A5:: @ 81A03A5 copyvar 0x8004, 0x8009 special ShowPokedexRatingMessage waitmessage - waitbutton + waitbuttonpress return EverGrandeCity_ChampionsRoom_EventScript_1A03B0:: @ 81A03B0 @@ -2208,8 +2218,8 @@ Route101_EventScript_1A03B0:: @ 81A03B0 copyvar 0x8008, 0x8005 copyvar 0x8009, 0x8006 copyvar 0x800a, RESULT - getnumberstring 0, 0x8008 - getnumberstring 1, 0x8009 + buffernumberstring 0, 0x8008 + buffernumberstring 1, 0x8009 msgbox Route101_Text_1C44DC, 4 call Route101_EventScript_1A03A5 compare 0x800a, 0 @@ -2218,8 +2228,8 @@ Route101_EventScript_1A03B0:: @ 81A03B0 specialvar RESULT, ScriptGetPokedexInfo copyvar 0x8008, 0x8005 copyvar 0x8009, 0x8006 - getnumberstring 0, 0x8008 - getnumberstring 1, 0x8009 + buffernumberstring 0, 0x8008 + buffernumberstring 1, 0x8009 msgbox Route101_Text_1C4B05, 4 return @@ -2242,31 +2252,31 @@ SlateportCity_Harbor_Movement_1A041C:: @ 81A041C step_end PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424 - setflag 740 - setflag 743 - setflag 741 - setflag 744 - setflag 738 - setflag 742 - setflag 739 - setflag 881 + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + setflag FLAG_HIDE_MR_BRINEY_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE setvar 0x4096, 0 return RusturfTunnel_EventScript_1A0442:: @ 81A0442 removeobject 1 removeobject 10 - clearflag 808 - clearflag 984 + clearflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE + clearflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE setvar 0x409a, 6 - setflag 199 + setflag FLAG_RUSTURF_TUNNEL_OPENED return EventScript_1A0457: @ unreferenced? delay 30 applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0841 waitmovement 0 - showobject 255, 0, 0 + showobjectat 255, MAP_PETALBURG_CITY delay 30 applymovement 255, Movement_1A047A waitmovement 0 @@ -2284,15 +2294,15 @@ SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C compare FACING, 3 call_if 1, BattleTower_Outside_EventScript_160B3A delay 30 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY call BattleTower_Outside_EventScript_1A040E return CaveOfOrigin_B4F_EventScript_1A04A0:: @ 81A04A0 lockall waitse - playpokecry SPECIES_GROUDON_OR_KYOGRE, 2 - waitpokecry + playmoncry SPECIES_GROUDON_OR_KYOGRE, 2 + waitmoncry setvar 0x4005, 1 releaseall end @@ -2346,13 +2356,13 @@ MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD faceplayer setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE waitse - playpokecry SPECIES_ELECTRODE, 2 + playmoncry SPECIES_ELECTRODE, 2 delay 40 - waitpokecry - setflag 977 - setflag 2145 + waitmoncry + setflag FLAG_HIDE_ELECTRODE_1_HIDEOUT + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag 2145 + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end @@ -2362,13 +2372,13 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B faceplayer setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE waitse - playpokecry SPECIES_ELECTRODE, 2 + playmoncry SPECIES_ELECTRODE, 2 delay 40 - waitpokecry - setflag 978 - setflag 2145 + waitmoncry + setflag FLAG_HIDE_ELECTRODE_2_HIDEOUT + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag 2145 + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end @@ -2445,9 +2455,9 @@ Route119_EventScript_1A05C3:: @ 81A05C3 applymovement LAST_TALKED, Route119_Movement_1A0662 waitmovement 0 waitse - playpokecry SPECIES_KECLEON, 2 + playmoncry SPECIES_KECLEON, 2 delay 40 - waitpokecry + waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE compare 0x8004, 1 call_if 1, Route119_EventScript_1A0646 @@ -2463,38 +2473,38 @@ Route119_EventScript_1A05C3:: @ 81A05C3 call_if 1, Route119_EventScript_1A065A compare 0x8004, 7 call_if 1, Route119_EventScript_1A065E - setflag 2145 + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag 2145 + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end Route119_EventScript_1A0646:: @ 81A0646 - setflag 982 + setflag FLAG_HIDE_KECLEON_ROUTE120_3 return Route119_EventScript_1A064A:: @ 81A064A - setflag 985 + setflag FLAG_HIDE_KECLEON_ROUTE120_4 return Route119_EventScript_1A064E:: @ 81A064E - setflag 986 + setflag FLAG_HIDE_KECLEON_ROUTE120_5 return Route119_EventScript_1A0652:: @ 81A0652 - setflag 987 + setflag FLAG_HIDE_KECLEON_ROUTE120_6 return Route119_EventScript_1A0656:: @ 81A0656 - setflag 988 + setflag FLAG_HIDE_KECLEON_ROUTE120_7 return Route119_EventScript_1A065A:: @ 81A065A - setflag 989 + setflag FLAG_HIDE_KECLEON_ROUTE119_1 return Route119_EventScript_1A065E:: @ 81A065E - setflag 990 + setflag FLAG_HIDE_KECLEON_ROUTE119_2 return FortreeCity_Movement_1A0662:: @ 81A0662 @@ -2536,12 +2546,12 @@ FallarborTown_House1_EventScript_1A067F:: @ 81A067F GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F MtPyre_Summit_EventScript_1A067F:: @ 81A067F SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F - getitemname 0, 0x8004 + bufferitemname 0, 0x8004 playfanfare 372 message FallarborTown_House1_Text_1A1498 waitmessage waitfanfare - removeitem 0x8004, 1 + takeitem 0x8004, 1 return EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693 @@ -2551,18 +2561,18 @@ EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693 applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0853 waitmovement 0 playse 8 - setmaptile 6, 1, 836, 0 - setmaptile 6, 2, 837, 0 - setmaptile 0, 2, 734, 1 - setmaptile 1, 2, 733, 1 - setmaptile 2, 2, 734, 1 - setmaptile 3, 2, 733, 1 - setmaptile 4, 2, 734, 1 - setmaptile 8, 2, 733, 1 - setmaptile 9, 2, 734, 1 - setmaptile 10, 2, 733, 1 - setmaptile 11, 2, 734, 1 - setmaptile 12, 2, 733, 1 + setmetatile 6, 1, 836, 0 + setmetatile 6, 2, 837, 0 + setmetatile 0, 2, 734, 1 + setmetatile 1, 2, 733, 1 + setmetatile 2, 2, 734, 1 + setmetatile 3, 2, 733, 1 + setmetatile 4, 2, 734, 1 + setmetatile 8, 2, 733, 1 + setmetatile 9, 2, 734, 1 + setmetatile 10, 2, 733, 1 + setmetatile 11, 2, 734, 1 + setmetatile 12, 2, 733, 1 special DrawWholeMapView return @@ -2573,12 +2583,12 @@ EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710 applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0847 waitmovement 0 playse 52 - setmaptile 5, 12, 518, 1 - setmaptile 6, 12, 518, 1 - setmaptile 7, 12, 518, 1 - setmaptile 5, 13, 526, 1 - setmaptile 6, 13, 526, 1 - setmaptile 7, 13, 526, 1 + setmetatile 5, 12, 518, 1 + setmetatile 6, 12, 518, 1 + setmetatile 7, 12, 518, 1 + setmetatile 5, 13, 526, 1 + setmetatile 6, 13, 526, 1 + setmetatile 7, 13, 526, 1 special DrawWholeMapView return @@ -2586,36 +2596,36 @@ EverGrandeCity_DrakesRoom_EventScript_1A0757:: @ 81A0757 EverGrandeCity_GlaciasRoom_EventScript_1A0757:: @ 81A0757 EverGrandeCity_PhoebesRoom_EventScript_1A0757:: @ 81A0757 EverGrandeCity_SidneysRoom_EventScript_1A0757:: @ 81A0757 - setmaptile 6, 1, 836, 0 - setmaptile 6, 2, 837, 0 - setmaptile 5, 12, 518, 1 - setmaptile 6, 12, 518, 1 - setmaptile 7, 12, 518, 1 - setmaptile 5, 13, 526, 1 - setmaptile 6, 13, 526, 1 - setmaptile 7, 13, 526, 1 - setmaptile 0, 2, 734, 1 - setmaptile 1, 2, 733, 1 - setmaptile 2, 2, 734, 1 - setmaptile 3, 2, 733, 1 - setmaptile 4, 2, 734, 1 - setmaptile 8, 2, 733, 1 - setmaptile 9, 2, 734, 1 - setmaptile 10, 2, 733, 1 - setmaptile 11, 2, 734, 1 - setmaptile 12, 2, 733, 1 + setmetatile 6, 1, 836, 0 + setmetatile 6, 2, 837, 0 + setmetatile 5, 12, 518, 1 + setmetatile 6, 12, 518, 1 + setmetatile 7, 12, 518, 1 + setmetatile 5, 13, 526, 1 + setmetatile 6, 13, 526, 1 + setmetatile 7, 13, 526, 1 + setmetatile 0, 2, 734, 1 + setmetatile 1, 2, 733, 1 + setmetatile 2, 2, 734, 1 + setmetatile 3, 2, 733, 1 + setmetatile 4, 2, 734, 1 + setmetatile 8, 2, 733, 1 + setmetatile 9, 2, 734, 1 + setmetatile 10, 2, 733, 1 + setmetatile 11, 2, 734, 1 + setmetatile 12, 2, 733, 1 return EverGrandeCity_DrakesRoom_EventScript_1A07FA:: @ 81A07FA EverGrandeCity_GlaciasRoom_EventScript_1A07FA:: @ 81A07FA EverGrandeCity_PhoebesRoom_EventScript_1A07FA:: @ 81A07FA EverGrandeCity_SidneysRoom_EventScript_1A07FA:: @ 81A07FA - setmaptile 5, 12, 518, 1 - setmaptile 6, 12, 518, 1 - setmaptile 7, 12, 518, 1 - setmaptile 5, 13, 526, 1 - setmaptile 6, 13, 526, 1 - setmaptile 7, 13, 526, 1 + setmetatile 5, 12, 518, 1 + setmetatile 6, 12, 518, 1 + setmetatile 7, 12, 518, 1 + setmetatile 5, 13, 526, 1 + setmetatile 6, 13, 526, 1 + setmetatile 7, 13, 526, 1 return SlateportCity_Movement_1A0831:: @ 81A0831 @@ -3261,7 +3271,7 @@ gUnknown_081A14B8:: @ 81A14B8 EventScript_1A14CA:: message UnknownString_81A1141 waitmessage - waitbutton + waitbuttonpress special sub_8081924 waitstate fadescreen 1 @@ -3599,9 +3609,9 @@ gUnknown_081A2C51:: @ 81A2C51 special sub_80BB63C compare RESULT, 1 goto_if_eq EventScript_1A2E45 - checkpokemove MOVE_SECRET_POWER - setfieldeffect 0, RESULT - getmovename 1, MOVE_SECRET_POWER + checkpartymove MOVE_SECRET_POWER + setfieldeffectargument 0, RESULT + buffermovename 1, MOVE_SECRET_POWER compare 0x8007, 1 goto_if_eq EventScript_1A2CB0 compare 0x8007, 2 @@ -3620,7 +3630,7 @@ EventScript_1A2CB0: lockall compare RESULT, 6 goto_if_eq EventScript_1A2CF1 - getpartypokename 0, RESULT + bufferpartymonnick 0, RESULT msgbox UnknownString_8198F34, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A @@ -3651,7 +3661,7 @@ EventScript_1A2D08: lockall compare RESULT, 6 goto_if_eq EventScript_1A2D49 - getpartypokename 0, RESULT + bufferpartymonnick 0, RESULT msgbox UnknownString_81A197B, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A @@ -3682,7 +3692,7 @@ EventScript_1A2D60: lockall compare RESULT, 6 goto_if_eq EventScript_1A2DA1 - getpartypokename 0, RESULT + bufferpartymonnick 0, RESULT msgbox UnknownString_81A1A4B, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A @@ -3713,7 +3723,7 @@ EventScript_1A2DB8: closemessage playse 9 setvar 0x4097, 0 - setflag 173 + setflag FLAG_DECORATION_1 special sub_80BB8CC special sub_80BBAF0 setvar 0x8004, 0 @@ -3737,7 +3747,7 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08 closemessage - setflag 96 + setflag FLAG_RECEIVED_SECRET_POWER special sub_80BBC78 waitstate end @@ -3754,24 +3764,24 @@ gUnknown_081A2E14:: @ 81A2E14 special sub_80BC114 compare RESULT, 0 goto_if_eq EventScript_1A2E38 - clearflag 173 + clearflag FLAG_DECORATION_1 special sub_80BBAF0 setvar 0x4089, 0 waitstate end EventScript_1A2E38: - setflag 173 + setflag FLAG_DECORATION_1 special sub_80BBAF0 setvar 0x4089, 0 waitstate end EventScript_1A2E45: - checkpokemove MOVE_SECRET_POWER + checkpartymove MOVE_SECRET_POWER compare RESULT, 6 goto_if_eq EventScript_1A2EF7 - setfieldeffect 0, RESULT + setfieldeffectargument 0, RESULT setorcopyvar 0x8004, RESULT lockall special GetSecretBaseNearbyMapName @@ -3788,8 +3798,8 @@ EventScript_1A2E45: msgbox UnknownString_81A3CC9, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A - getpartypokename 0, 0x8004 - getmovename 1, MOVE_SECRET_POWER + bufferpartymonnick 0, 0x8004 + buffermovename 1, MOVE_SECRET_POWER msgbox UsedCutRockSmashText, 4 closemessage closemessage @@ -3831,20 +3841,20 @@ EventScript_1A2F3A:: LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D:: @ 81A2F3D LittlerootTown_MaysHouse_2F_EventScript_1A2F3D:: @ 81A2F3D SecretBase_RedCave1_EventScript_1A2F3D:: @ 81A2F3D - setflag 174 - setflag 175 - setflag 176 - setflag 177 - setflag 178 - setflag 179 - setflag 180 - setflag 181 - setflag 182 - setflag 183 - setflag 184 - setflag 185 - setflag 186 - setflag 187 + setflag FLAG_DECORATION_2 + setflag FLAG_DECORATION_3 + setflag FLAG_DECORATION_4 + setflag FLAG_DECORATION_5 + setflag FLAG_DECORATION_6 + setflag FLAG_DECORATION_7 + setflag FLAG_DECORATION_8 + setflag FLAG_DECORATION_9 + setflag FLAG_DECORATION_10 + setflag FLAG_DECORATION_11 + setflag FLAG_DECORATION_12 + setflag FLAG_DECORATION_13 + setflag FLAG_DECORATION_14 + setflag FLAG_DECORATION_15 return LittlerootTown_BrendansHouse_2F_EventScript_1A2F68:: @ 81A2F68 @@ -3933,7 +3943,7 @@ SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0 end SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A3086 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A30A5 @@ -3968,7 +3978,7 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5 end SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A3102 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3121 @@ -4003,7 +4013,7 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121 end SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A317E compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A319D @@ -4038,7 +4048,7 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D end SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A31FA compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3219 @@ -4073,7 +4083,7 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219 end SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A3276 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3295 @@ -4108,7 +4118,7 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295 end SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A32F2 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3311 @@ -4143,7 +4153,7 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311 end SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A336E compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A338D @@ -4178,7 +4188,7 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D end SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A33EA compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3409 @@ -4213,7 +4223,7 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409 end SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A3466 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3485 @@ -4248,7 +4258,7 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485 end SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A34E2 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3501 @@ -4429,9 +4439,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 copyvar 0x8009, 0x8006 - checkflag 105 + checkflag FLAG_OCEANIC_MUSEUM_MET_REPORTER goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 - setflag 105 + setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, 5 compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 @@ -4558,7 +4568,7 @@ SlateportCity_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 lock faceplayer - checkflag 2 + checkflag FLAG_TEMP_2 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E setvar 0x8005, 6 special sub_80BF2C4 @@ -4604,7 +4614,7 @@ FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137 compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D msgbox FallarborTown_ContestLobby_Text_1A7153, 4 - setflag 2 + setflag FLAG_TEMP_2 setvar 0x8005, 6 goto FallarborTown_ContestLobby_EventScript_1ADE46 end @@ -4634,19 +4644,19 @@ VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 end FallarborTown_ContestLobby_EventScript_1AE1EE:: @ 81AE1EE - clearflag 800 + clearflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR return FallarborTown_ContestLobby_EventScript_1AE1F2:: @ 81AE1F2 - clearflag 801 + clearflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF return FallarborTown_ContestLobby_EventScript_1AE1F6:: @ 81AE1F6 - clearflag 803 + clearflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT return FallarborTown_ContestLobby_EventScript_1AE1FA:: @ 81AE1FA - clearflag 802 + clearflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE return FallarborTown_ContestLobby_EventScript_1AE1FE:: @ 81AE1FE @@ -4655,7 +4665,7 @@ FallarborTown_ContestLobby_EventScript_1AE1FE:: @ 81AE1FE BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF lock faceplayer - checkflag 2 + checkflag FLAG_TEMP_2 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 setvar 0x8005, 7 special sub_80BF2C4 @@ -4707,7 +4717,7 @@ BattleTower_Lobby_EventScript_1AE2B3:: @ 81AE2B3 compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE2D9 msgbox BattleTower_Lobby_Text_1A7A6E, 4 - setflag 2 + setflag FLAG_TEMP_2 copyvar 0x8004, 0x8008 setvar 0x8005, 7 goto BattleTower_Lobby_EventScript_1ADE46 @@ -4730,11 +4740,11 @@ BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED special sub_80BF2C4 compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE30F - clearflag 918 + clearflag FLAG_HIDE_REPORTER_BATTLE_TOWER return BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F - setflag 918 + setflag FLAG_HIDE_REPORTER_BATTLE_TOWER return .include "data/scripts/gabby_and_ty.inc" @@ -4763,8 +4773,8 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F .include "data/text/magma_summit.inc" gUnknown_081B694A:: @ 81B694A - animdarklevel 1 - setdarklevel 1 + animateflash 1 + setflashradius 1 end .include "data/scripts/players_house.inc" @@ -4875,7 +4885,7 @@ S_FallDownHole:: @ 81C6BC5 waitmovement 0 playse 43 delay 60 - warphole UNDEFINED + warphole MAP_UNDEFINED waitstate end @@ -4918,7 +4928,7 @@ gUnknown_081C6C02:: @ 81C6C02 @ 81C6C1D lockall braillemessage Underwater_SealedChamber_Braille_1C533D - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/field_door.s b/data/field_door.s deleted file mode 100644 index d7ccdd2d4..000000000 --- a/data/field_door.s +++ /dev/null @@ -1,416 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -DoorAnimTiles_04: @ 8308F1C - .incbin "graphics/door_anims/04/0.4bpp" - .incbin "graphics/door_anims/04/1.4bpp" - .incbin "graphics/door_anims/04/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_05: @ 830923C - .incbin "graphics/door_anims/05/0.4bpp" - .incbin "graphics/door_anims/05/1.4bpp" - .incbin "graphics/door_anims/05/2.4bpp" - - .align 2 -DoorAnimTiles_08: @ 830953C - .incbin "graphics/door_anims/08/0.4bpp" - .incbin "graphics/door_anims/08/1.4bpp" - .incbin "graphics/door_anims/08/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_15: @ 830985C - .incbin "graphics/door_anims/15/0.4bpp" - .incbin "graphics/door_anims/15/1.4bpp" - .incbin "graphics/door_anims/15/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_16: @ 8309B7C - .incbin "graphics/door_anims/16/0.4bpp" - .incbin "graphics/door_anims/16/1.4bpp" - .incbin "graphics/door_anims/16/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_00: @ 8309E9C - .incbin "graphics/door_anims/00/0.4bpp" - .incbin "graphics/door_anims/00/1.4bpp" - .incbin "graphics/door_anims/00/2.4bpp" - - .align 2 -DoorAnimTiles_01: @ 830A19C - .incbin "graphics/door_anims/01/0.4bpp" - .incbin "graphics/door_anims/01/1.4bpp" - .incbin "graphics/door_anims/01/2.4bpp" - - .align 2 -DoorAnimTiles_02: @ 830A49C - .incbin "graphics/door_anims/02/0.4bpp" - .incbin "graphics/door_anims/02/1.4bpp" - .incbin "graphics/door_anims/02/2.4bpp" - - .align 2 -DoorAnimTiles_03: @ 830A79C - .incbin "graphics/door_anims/03/0.4bpp" - .incbin "graphics/door_anims/03/1.4bpp" - .incbin "graphics/door_anims/03/2.4bpp" - - .align 2 -DoorAnimTiles_06: @ 830AA9C - .incbin "graphics/door_anims/06/0.4bpp" - .incbin "graphics/door_anims/06/1.4bpp" - .incbin "graphics/door_anims/06/2.4bpp" - - .align 2 -DoorAnimTiles_07: @ 830AD9C - .incbin "graphics/door_anims/07/0.4bpp" - .incbin "graphics/door_anims/07/1.4bpp" - .incbin "graphics/door_anims/07/2.4bpp" - - .align 2 -DoorAnimTiles_09: @ 830B09C - .incbin "graphics/door_anims/09/0.4bpp" - .incbin "graphics/door_anims/09/1.4bpp" - .incbin "graphics/door_anims/09/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_10: @ 830B3BC - .incbin "graphics/door_anims/10/0.4bpp" - .incbin "graphics/door_anims/10/1.4bpp" - .incbin "graphics/door_anims/10/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_11: @ 830B6DC - .incbin "graphics/door_anims/11/0.4bpp" - .incbin "graphics/door_anims/11/1.4bpp" - .incbin "graphics/door_anims/11/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_12: @ 830B9FC - .incbin "graphics/door_anims/12/0.4bpp" - .incbin "graphics/door_anims/12/1.4bpp" - .incbin "graphics/door_anims/12/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_13: @ 830BD1C - .incbin "graphics/door_anims/13/0.4bpp" - .incbin "graphics/door_anims/13/1.4bpp" - .incbin "graphics/door_anims/13/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_14: @ 830C03C - .incbin "graphics/door_anims/14/0.4bpp" - .incbin "graphics/door_anims/14/1.4bpp" - .incbin "graphics/door_anims/14/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_17: @ 830C35C - .incbin "graphics/door_anims/17/0.4bpp" - .incbin "graphics/door_anims/17/1.4bpp" - .incbin "graphics/door_anims/17/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_18: @ 830C67C - .incbin "graphics/door_anims/18/0.4bpp" - .incbin "graphics/door_anims/18/1.4bpp" - .incbin "graphics/door_anims/18/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_19: @ 830C99C - .incbin "graphics/door_anims/19/0.4bpp" - .incbin "graphics/door_anims/19/1.4bpp" - .incbin "graphics/door_anims/19/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_20: @ 830CCBC - .incbin "graphics/door_anims/20/0.4bpp" - .incbin "graphics/door_anims/20/1.4bpp" - .incbin "graphics/door_anims/20/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_21: @ 830CFDC - .incbin "graphics/door_anims/21/0.4bpp" - .incbin "graphics/door_anims/21/1.4bpp" - .incbin "graphics/door_anims/21/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_22: @ 830D2FC - .incbin "graphics/door_anims/22/0.4bpp" - .incbin "graphics/door_anims/22/1.4bpp" - .incbin "graphics/door_anims/22/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_23: @ 830D61C - .incbin "graphics/door_anims/23/0.4bpp" - .incbin "graphics/door_anims/23/1.4bpp" - .incbin "graphics/door_anims/23/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_24: @ 830D93C - .incbin "graphics/door_anims/24/0.4bpp" - .incbin "graphics/door_anims/24/1.4bpp" - .incbin "graphics/door_anims/24/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_25: @ 830DC5C - .incbin "graphics/door_anims/25/0.4bpp" - .incbin "graphics/door_anims/25/1.4bpp" - .incbin "graphics/door_anims/25/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_26: @ 830DF7C - .incbin "graphics/door_anims/26/0.4bpp" - .incbin "graphics/door_anims/26/1.4bpp" - .incbin "graphics/door_anims/26/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_27: @ 830E29C - .incbin "graphics/door_anims/27/0.4bpp" - .incbin "graphics/door_anims/27/1.4bpp" - .incbin "graphics/door_anims/27/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_28: @ 830E5BC - .incbin "graphics/door_anims/28/0.4bpp" - .incbin "graphics/door_anims/28/1.4bpp" - .incbin "graphics/door_anims/28/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_29: @ 830E8DC - .incbin "graphics/door_anims/29/0.4bpp" - .incbin "graphics/door_anims/29/1.4bpp" - .incbin "graphics/door_anims/29/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_30: @ 830EBFC - .incbin "graphics/door_anims/30/0.4bpp" - .incbin "graphics/door_anims/30/1.4bpp" - .incbin "graphics/door_anims/30/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_31: @ 830EF1C - .incbin "graphics/door_anims/31/0.4bpp" - .incbin "graphics/door_anims/31/1.4bpp" - .incbin "graphics/door_anims/31/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_32: @ 830F23C - .incbin "graphics/door_anims/32/0.4bpp" - .incbin "graphics/door_anims/32/1.4bpp" - .incbin "graphics/door_anims/32/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_33: @ 830F55C - .incbin "graphics/door_anims/33/0.4bpp" - .incbin "graphics/door_anims/33/1.4bpp" - .incbin "graphics/door_anims/33/2.4bpp" - - .space 32 - -gDoorOpenAnimFrames:: @ 830F87C - door_anim_frame 4, -1 - door_anim_frame 4, 0 - door_anim_frame 4, 0x100 - door_anim_frame 4, 0x200 - door_anim_frame 0, 0 - -gDoorCloseAnimFrames:: @ 830F890 - door_anim_frame 4, 0x200 - door_anim_frame 4, 0x100 - door_anim_frame 4, 0 - door_anim_frame 4, -1 - door_anim_frame 0, 0 - -DoorAnimPalettes_830F8A4: - .byte 1, 1, 1, 1, 1, 1, 1, 1 - -DoorAnimPalettes_830F8AC: - .byte 1, 1, 1, 1, 1, 1, 1, 1 - -DoorAnimPalettes_830F8B4: - .byte 5, 5, 5, 5, 5, 5, 5, 5 - -DoorAnimPalettes_830F8BC: - .byte 0, 0, 1, 1, 1, 1, 1, 1 - -DoorAnimPalettes_830F8C4: - .byte 6, 6, 6, 6, 6, 6, 6, 6 - -DoorAnimPalettes_830F8CC: - .byte 8, 8, 8, 8, 8, 8, 8, 8 - -DoorAnimPalettes_830F8D4: - .byte 11, 11, 11, 11, 11, 11, 11, 11 - -DoorAnimPalettes_830F8DC: - .byte 10, 10, 10, 10, 10, 10, 10, 10 - -DoorAnimPalettes_830F8E4: - .byte 7, 7, 7, 7, 7, 7, 7, 7 - -DoorAnimPalettes_830F8EC: - .byte 8, 8, 8, 8, 8, 8, 8, 8 - -DoorAnimPalettes_830F8F4: - .byte 9, 9, 9, 9, 9, 9, 9, 9 - -DoorAnimPalettes_830F8FC: - .byte 9, 9, 1, 1, 1, 1, 1, 1 - -DoorAnimPalettes_830F904: - .byte 8, 8, 8, 8, 8, 8, 8, 8 - -DoorAnimPalettes_830F90C: - .byte 9, 9, 9, 9, 9, 9, 9, 9 - -DoorAnimPalettes_830F914: - .byte 6, 6, 6, 6, 6, 6, 6, 6 - -DoorAnimPalettes_830F91C: - .byte 6, 6, 6, 6, 6, 6, 6, 6 - -DoorAnimPalettes_830F924: - .byte 0, 0, 5, 5, 5, 5, 5, 5 - -DoorAnimPalettes_830F92C: - .byte 6, 6, 1, 1, 1, 1, 1, 1 - -DoorAnimPalettes_830F934: - .byte 7, 7, 7, 7, 7, 7, 7, 7 - -DoorAnimPalettes_830F93C: - .byte 6, 6, 5, 5, 5, 5, 5, 5 - -DoorAnimPalettes_830F944: - .byte 5, 5, 5, 5, 5, 5, 5, 5 - -DoorAnimPalettes_830F94C: - .byte 1, 1, 1, 1, 1, 1, 1, 1 - -DoorAnimPalettes_830F954: - .byte 6, 6, 7, 7, 7, 7, 7, 7 - -DoorAnimPalettes_830F95C: - .byte 7, 7, 7, 7, 7, 7, 7, 7 - -DoorAnimPalettes_830F964: - .byte 5, 5, 5, 5, 5, 5, 5, 5 - -DoorAnimPalettes_830F96C: - .byte 9, 9, 9, 9, 9, 9, 9, 9 - -DoorAnimPalettes_830F974: - .byte 8, 8, 8, 8, 8, 8, 8, 8 - -DoorAnimPalettes_830F97C: - .byte 6, 6, 6, 6, 6, 6, 6, 6 - -DoorAnimPalettes_830F984: - .byte 7, 7, 7, 7, 7, 7, 7, 7 - -DoorAnimPalettes_830F98C: - .byte 11, 11, 7, 7, 7, 7, 7, 7 - -DoorAnimPalettes_830F994: - .byte 7, 7, 7, 7, 7, 7, 7, 7 - -DoorAnimPalettes_830F99C: - .byte 6, 6, 7, 7, 7, 7, 7, 7 - -DoorAnimPalettes_830F9A4: - .byte 9, 9, 9, 9, 9, 9, 9, 9 - -DoorAnimPalettes_830F9AC: - .byte 7, 7, 7, 7, 7, 7, 7, 7 - - .align 2 -gDoorAnimGraphicsTable:: @ 830F9B4 - door_anim_gfx 0x021, 0, DoorAnimTiles_00, DoorAnimPalettes_830F8A4 - door_anim_gfx 0x061, 1, DoorAnimTiles_01, DoorAnimPalettes_830F8AC - door_anim_gfx 0x1CD, 1, DoorAnimTiles_02, DoorAnimPalettes_830F8B4 - door_anim_gfx 0x041, 1, DoorAnimTiles_03, DoorAnimPalettes_830F8BC - door_anim_gfx 0x248, 0, DoorAnimTiles_04, DoorAnimPalettes_830F8C4 - door_anim_gfx 0x249, 0, DoorAnimTiles_05, DoorAnimPalettes_830F8CC - door_anim_gfx 0x22F, 0, DoorAnimTiles_06, DoorAnimPalettes_830F8D4 - door_anim_gfx 0x21F, 0, DoorAnimTiles_07, DoorAnimPalettes_830F8DC - door_anim_gfx 0x2A5, 0, DoorAnimTiles_08, DoorAnimPalettes_830F8E4 - door_anim_gfx 0x287, 0, DoorAnimTiles_09, DoorAnimPalettes_830F8F4 - door_anim_gfx 0x2AC, 0, DoorAnimTiles_10, DoorAnimPalettes_830F934 - door_anim_gfx 0x3A1, 0, DoorAnimTiles_11, DoorAnimPalettes_830F93C - door_anim_gfx 0x2DC, 0, DoorAnimTiles_12, DoorAnimPalettes_830F92C - door_anim_gfx 0x225, 0, DoorAnimTiles_13, DoorAnimPalettes_830F924 - door_anim_gfx 0x1DB, 1, DoorAnimTiles_14, DoorAnimPalettes_830F94C - door_anim_gfx 0x246, 0, DoorAnimTiles_15, DoorAnimPalettes_830F8EC - door_anim_gfx 0x28E, 0, DoorAnimTiles_16, DoorAnimPalettes_830F944 - door_anim_gfx 0x2A1, 0, DoorAnimTiles_17, DoorAnimPalettes_830F8FC - door_anim_gfx 0x21C, 0, DoorAnimTiles_18, DoorAnimPalettes_830F914 - door_anim_gfx 0x21E, 0, DoorAnimTiles_19, DoorAnimPalettes_830F91C - door_anim_gfx 0x21D, 1, DoorAnimTiles_20, DoorAnimPalettes_830F904 - door_anim_gfx 0x21A, 0, DoorAnimTiles_21, DoorAnimPalettes_830F90C - door_anim_gfx 0x224, 0, DoorAnimTiles_22, DoorAnimPalettes_830F954 - door_anim_gfx 0x289, 0, DoorAnimTiles_23, DoorAnimPalettes_830F95C - door_anim_gfx 0x30C, 1, DoorAnimTiles_24, DoorAnimPalettes_830F964 - door_anim_gfx 0x32D, 1, DoorAnimTiles_25, DoorAnimPalettes_830F96C - door_anim_gfx 0x2ED, 1, DoorAnimTiles_26, DoorAnimPalettes_830F974 - door_anim_gfx 0x264, 1, DoorAnimTiles_27, DoorAnimPalettes_830F97C - door_anim_gfx 0x22B, 0, DoorAnimTiles_28, DoorAnimPalettes_830F984 - door_anim_gfx 0x2F7, 0, DoorAnimTiles_29, DoorAnimPalettes_830F98C - door_anim_gfx 0x297, 0, DoorAnimTiles_30, DoorAnimPalettes_830F994 - door_anim_gfx 0x285, 1, DoorAnimTiles_31, DoorAnimPalettes_830F99C - door_anim_gfx 0x25D, 1, DoorAnimTiles_32, DoorAnimPalettes_830F9A4 - door_anim_gfx 0x20E, 1, DoorAnimTiles_33, DoorAnimPalettes_830F9AC - door_anim_gfx 0, 0, 0, 0 diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index aabb1252d..900cc7009 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -67,7 +67,7 @@ gFieldEffectScriptPointers:: @ 81D9B34 .4byte gFieldEffectScript_CutGrass .4byte gFieldEffectScript_FieldMoveShowMonInit .4byte gFieldEffectScript_UseFlyAncientTomb - .4byte gFieldEffectScript_PCTurnOn + .4byte gFieldEffectScript_SecretBasePCTurnOn .4byte gFieldEffectScript_HallOfFameRecord .4byte gFieldEffectScript_UseTeleport @@ -317,8 +317,8 @@ gFieldEffectScript_UseFlyAncientTomb: @ 81D9E26 callnative FldEff_UseFlyAncientTomb end -gFieldEffectScript_PCTurnOn: @ 81D9E2C - callnative FldEff_PCTurnOn +gFieldEffectScript_SecretBasePCTurnOn: @ 81D9E2C + callnative FldEff_SecretBasePCTurnOn end gFieldEffectScript_HallOfFameRecord: @ 81D9E32 diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index c36f95460..0a0eeaa73 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -1,13 +1,13 @@ S_CuttableTree:: @ 81B0DCC lockall - checkflag 2055 + checkflag FLAG_BADGE01_GET goto_if 0, CannotUseCut - checkpokemove MOVE_CUT + checkpartymove MOVE_CUT compare RESULT, 6 goto_if_eq CannotUseCut - setfieldeffect 0, RESULT - getpartypokename 0, RESULT - getmovename 1, MOVE_CUT + setfieldeffectargument 0, RESULT + bufferpartymonnick 0, RESULT + buffermovename 1, MOVE_CUT msgbox UseCutPromptText, 5 compare RESULT, 0 goto_if_eq Cut_ChoseNo @@ -58,14 +58,14 @@ CannotUseCutText: @ 81B0E8E S_BreakableRock:: @ 81B0EB7 lockall - checkflag 2057 + checkflag FLAG_BADGE03_GET goto_if 0, CannotUseRockSmash - checkpokemove MOVE_ROCK_SMASH + checkpartymove MOVE_ROCK_SMASH compare RESULT, 6 goto_if_eq CannotUseRockSmash - setfieldeffect 0, RESULT - getpartypokename 0, RESULT - getmovename 1, MOVE_ROCK_SMASH + setfieldeffectargument 0, RESULT + bufferpartymonnick 0, RESULT + buffermovename 1, MOVE_ROCK_SMASH msgbox UseRockSmashPromptText, 5 compare RESULT, 0 goto_if_eq RockSmash_ChoseNo @@ -125,14 +125,14 @@ CannotUseRockSmashText: @ 81B0F90 S_PushableBoulder:: @ 81B0FCB lockall - checkflag 2058 + checkflag FLAG_BADGE04_GET goto_if 0, CannotUseStrength - checkflag 2089 + checkflag FLAG_SYS_USE_STRENGTH goto_if_eq AlreadyUsedStrength - checkpokemove 70 + checkpartymove 70 compare RESULT, 6 goto_if_eq CannotUseStrength - setfieldeffect 0, RESULT + setfieldeffectargument 0, RESULT msgbox UseStrengthPromptText, 5 compare RESULT, 0 goto_if_eq Strength_ChoseNo @@ -150,7 +150,7 @@ S_UseStrength:: @ 81B100E end UsedStrength: @ 81B1019 - setflag 2089 + setflag FLAG_SYS_USE_STRENGTH msgbox UsedStrengthText, 3 releaseall end @@ -190,11 +190,11 @@ AlreadyUsedStrengthText: @ 81B1127 S_UseWaterfall:: @ 81B115A lockall - checkpokemove MOVE_WATERFALL + checkpartymove MOVE_WATERFALL compare RESULT, 6 goto_if_eq Waterfall_NoMonKnows - getpartypokename 0, RESULT - setfieldeffect 0, RESULT + bufferpartymonnick 0, RESULT + setfieldeffectargument 0, RESULT msgbox UseWaterfallPromptText, 5 compare RESULT, 0 goto_if_eq Waterfall_Done @@ -223,12 +223,12 @@ UsedWaterfallText: @ 81B120D UseDiveScript:: @ 81B1220 lockall - checkpokemove MOVE_DIVE + checkpartymove MOVE_DIVE compare RESULT, 6 goto_if_eq CannotUseDive - getpartypokename 0, RESULT - setfieldeffect 0, RESULT - setfieldeffect 1, 1 + bufferpartymonnick 0, RESULT + setfieldeffectargument 0, RESULT + setfieldeffectargument 1, 1 msgbox UseDivePromptText, 5 compare RESULT, 0 goto_if_eq Dive_Done @@ -246,12 +246,12 @@ Dive_Done: @ 81B1267 S_UseDiveUnderwater:: @ 81B1269 lockall - checkpokemove MOVE_DIVE + checkpartymove MOVE_DIVE compare RESULT, 6 goto_if_eq UnderwaterCannotUseDive - getpartypokename 0, RESULT - setfieldeffect 0, RESULT - setfieldeffect 1, 1 + bufferpartymonnick 0, RESULT + setfieldeffectargument 0, RESULT + setfieldeffectargument 1, 1 msgbox UnderwaterUseDivePromptText, 5 compare RESULT, 0 goto_if_eq UnderwaterDive_Done diff --git a/data/field_special_scene.s b/data/field_special_scene.s deleted file mode 100644 index 9d3958924..000000000 --- a/data/field_special_scene.s +++ /dev/null @@ -1,41 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gMapObjectPic_MovingBox:: @ 83D28AC - .incbin "graphics/map_objects/pics/misc/moving_box.4bpp" - - .align 2 -gMapObjectPalette19:: @ 83D292C - .incbin "graphics/map_objects/palettes/19.gbapal" - -gTruckCamera_HorizontalTable:: @ 83D294C - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .byte 1 - .byte 2 - .byte 2 - .byte 2 - .byte 2 - .byte 2 - .byte 2 - .byte -1 - .byte -1 - .byte -1 - .byte 0 - -gUnknown_083D295F:: @ 83D295F - step_18 - step_end - -gUnknown_083D2961:: @ 83D2961 - step_17 - step_end diff --git a/data/field_weather.s b/data/field_weather.s deleted file mode 100644 index 836bfbe99..000000000 --- a/data/field_weather.s +++ /dev/null @@ -1,490 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -DroughtPaletteData_0: @ 8393FE8 - .incbin "graphics/weather/drought0.bin.lz" - - .align 2 -DroughtPaletteData_1: @ 839480C - .incbin "graphics/weather/drought1.bin.lz" - - .align 2 -DroughtPaletteData_2: @ 8395004 - .incbin "graphics/weather/drought2.bin.lz" - - .align 2 -DroughtPaletteData_3: @ 83957A0 - .incbin "graphics/weather/drought3.bin.lz" - - .align 2 -DroughtPaletteData_4: @ 8395FBC - .incbin "graphics/weather/drought4.bin.lz" - - .align 2 -DroughtPaletteData_5: @ 8396784 - .incbin "graphics/weather/drought5.bin.lz" - - .align 2 -gUnknown_08396FA8:: @ 8396FA8 - .4byte DroughtPaletteData_0 - .4byte DroughtPaletteData_1 - .4byte DroughtPaletteData_2 - .4byte DroughtPaletteData_3 - .4byte DroughtPaletteData_4 - .4byte DroughtPaletteData_5 - .4byte 0x2000000 - - .align 2 -gUnknown_08396FC4:: @ 8396FC4 - .4byte gUnknown_0202F7E8 - - .align 2 -gUnknown_08396FC8:: @ 8396FC8 - .4byte sub_807CAE8, nullsub_38, sub_807CAE8, sub_807CB0C - .4byte sub_807DE78, sub_807DEF4, sub_807DEC4, sub_807DF54 - .4byte sub_807DF9C, nullsub_55, sub_807DFC0, sub_807DFD0 - .4byte sub_807E364, sub_807E400, sub_807E3D0, sub_807E460 - .4byte sub_807E9C8, snowflakes_progress2, sub_807EA18, sub_807EAC0 - .4byte sub_807EE80, sub_807EFC0, sub_807EEF4, sub_807F34C - .4byte sub_807F49C, sub_807F52C, sub_807F4FC, sub_807F5EC - .4byte sub_807F7F8, sub_807F888, sub_807F858, sub_807F934 - .4byte sub_807FE9C, sub_807FF4C, sub_807FF1C, sub_807FFC8 - .4byte sub_807FB24, sub_807FBD8, sub_807FBA8, sub_807FC3C - .4byte sub_807F49C, sub_807F52C, sub_807F4FC, sub_807F5EC - .4byte sub_8080430, nullsub_56, sub_8080460, sub_8080470 - .4byte sub_807E110, sub_807E174, sub_807E144, sub_807E258 - .4byte sub_807EF24, sub_807EFC0, sub_807EF90, sub_807F34C - .4byte sub_8080474, sub_80804F8, sub_80804C8, sub_808056C - - .align 2 -gUnknown_083970B8:: @ 83970B8 - .4byte sub_807CC24 - .4byte sub_807CCAC - .4byte nullsub_39 - .4byte nullsub_39 - -gUnknown_083970C8:: @ 83970C8 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 0 - .byte 0 - .byte 2 - .byte 1 - .byte 2 - .byte 2 - .byte 2 - .byte 2 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 2 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - - .align 2 -gUnknown_083970E8:: @ 83970E8 - .incbin "graphics/weather/0.gbapal" - - .align 2 -gUnknown_08397108:: @ 8397108 - .incbin "graphics/weather/1.gbapal" - - .align 2 -gUnknown_08397128:: @ 8397128 - .incbin "graphics/weather/2.gbapal" - - .align 2 -WeatherFog0Tiles: @ 8397148 - .incbin "graphics/weather/fog0.4bpp" - - .align 2 -gWeatherFog1Tiles:: @ 8397948 - .incbin "graphics/weather/fog1.4bpp" - - .align 2 -WeatherCloudTiles: @ 8398148 - .incbin "graphics/weather/cloud.4bpp" - - .align 2 -gSpriteImage_8398948:: @ 8398948 - .incbin "graphics/weather/snow0.4bpp" - - .align 2 -gSpriteImage_8398968:: @ 8398968 - .incbin "graphics/weather/snow1.4bpp" - - .align 2 -WeatherBubbleTiles: @ 8398988 - .incbin "graphics/weather/bubble.4bpp" - - .align 2 -WeatherAshTiles: @ 83989C8 - .incbin "graphics/weather/ash.4bpp" - - .align 2 -WeatherRainTiles: @ 83999C8 - .incbin "graphics/weather/rain.4bpp" - - .align 2 -WeatherSandstormTiles: @ 8399FC8 - .incbin "graphics/weather/sandstorm.4bpp" - - .align 1 -gUnknown_0839A9C8:: @ 839A9C8 - .2byte 0, 66 - .2byte 5, 73 - .2byte 10, 78 - - .align 2 -gUnknown_0839A9D4:: @ 839A9D4 - obj_tiles WeatherCloudTiles, 0x800, 0x1200 - - .align 2 -gOamData_839A9DC:: @ 839A9DC - .2byte 0x0400 - .2byte 0xC000 - .2byte 0x0C00 - - .align 2 -gSpriteAnim_839A9E4:: @ 839A9E4 - obj_image_anim_frame 0, 16 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_839A9EC:: @ 839A9EC - .4byte gSpriteAnim_839A9E4 - - .align 2 -gSpriteTemplate_839A9F0:: @ 839A9F0 - spr_template 4608, 4609, gOamData_839A9DC, gSpriteAnimTable_839A9EC, NULL, gDummySpriteAffineAnimTable, sub_807E0F4 - - .align 1 -gUnknown_0839AA08:: @ 839AA08 - .2byte 0, 0 - .2byte 0, 160 - .2byte 0, 64 - .2byte 144, 224 - .2byte 144, 128 - .2byte 32, 32 - .2byte 32, 192 - .2byte 32, 96 - .2byte 72, 128 - .2byte 72, 32 - .2byte 72, 192 - .2byte 216, 96 - .2byte 216, 0 - .2byte 104, 160 - .2byte 104, 64 - .2byte 104, 224 - .2byte 144, 0 - .2byte 144, 160 - .2byte 144, 64 - .2byte 32, 224 - .2byte 32, 128 - .2byte 72, 32 - .2byte 72, 192 - .2byte 48, 96 - - .align 2 -gOamData_839AA68:: @ 839AA68 - .2byte 0x8000 - .2byte 0x8000 - .2byte 0x2400 - - .align 2 -gSpriteAnim_839AA70:: @ 839AA70 - obj_image_anim_frame 0, 16 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_839AA78:: @ 839AA78 - obj_image_anim_frame 8, 3 - obj_image_anim_frame 32, 2 - obj_image_anim_frame 40, 2 - obj_image_anim_end - - .align 2 -gSpriteAnim_839AA88:: @ 839AA88 - obj_image_anim_frame 8, 3 - obj_image_anim_frame 16, 3 - obj_image_anim_frame 24, 4 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_839AA98:: @ 839AA98 - .4byte gSpriteAnim_839AA70 - .4byte gSpriteAnim_839AA78 - .4byte gSpriteAnim_839AA88 - - .align 2 -gSpriteTemplate_839AAA4:: @ 839AAA4 - spr_template 4614, 4608, gOamData_839AA68, gSpriteAnimTable_839AA98, NULL, gDummySpriteAffineAnimTable, sub_807E5C0 - - .align 1 -gUnknown_0839AABC:: @ 839AABC - .2byte -104, 208 - .2byte -160, 320 - - .align 1 -gUnknown_0839AAC4:: @ 839AAC4 - .2byte 18, 7, 12, 10 - - .align 2 -gUnknown_0839AACC:: @ 839AACC - obj_tiles WeatherRainTiles, 0x600, 0x1206 - - .align 2 -gOamData_839AAD4:: @ 839AAD4 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0400 - - .align 2 -gSpriteImageTable_839AADC:: @ 839AADC - obj_frame_tiles gSpriteImage_8398948, 0x20 - obj_frame_tiles gSpriteImage_8398968, 0x20 - - .align 2 -gSpriteAnim_839AAEC:: @ 839AAEC - obj_image_anim_frame 0, 16 - obj_image_anim_end - - .align 2 -gSpriteAnim_839AAF4:: @ 839AAF4 - obj_image_anim_frame 1, 16 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_839AAFC:: @ 839AAFC - .4byte gSpriteAnim_839AAEC - .4byte gSpriteAnim_839AAF4 - - .align 2 -gSpriteTemplate_839AB04:: @ 839AB04 - spr_template 0xFFFF, 4608, gOamData_839AAD4, gSpriteAnimTable_839AAFC, gSpriteImageTable_839AADC, gDummySpriteAffineAnimTable, sub_807ED48 - -@ unused data - .2byte 0 - .2byte 6 - .2byte 6 - .2byte 12 - .2byte 18 - .2byte 42 - .2byte 300 - .2byte 300 - - .align 2 -gOamData_839AB2C:: @ 839AB2C - .2byte 0x0400 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gSpriteAnim_839AB34:: @ 839AB34 - obj_image_anim_frame 0, 16 - obj_image_anim_end - - .align 2 -gSpriteAnim_839AB3C:: @ 839AB3C - obj_image_anim_frame 32, 16 - obj_image_anim_end - - .align 2 -gSpriteAnim_839AB44:: @ 839AB44 - obj_image_anim_frame 64, 16 - obj_image_anim_end - - .align 2 -gSpriteAnim_839AB4C:: @ 839AB4C - obj_image_anim_frame 96, 16 - obj_image_anim_end - - .align 2 -gSpriteAnim_839AB54:: @ 839AB54 - obj_image_anim_frame 128, 16 - obj_image_anim_end - - .align 2 -gSpriteAnim_839AB5C:: @ 839AB5C - obj_image_anim_frame 160, 16 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_839AB64:: @ 839AB64 - .4byte gSpriteAnim_839AB34 - .4byte gSpriteAnim_839AB3C - .4byte gSpriteAnim_839AB44 - .4byte gSpriteAnim_839AB4C - .4byte gSpriteAnim_839AB54 - .4byte gSpriteAnim_839AB5C - - .align 2 -gSpriteAffineAnim_839AB7C:: @ 839AB7C - obj_rot_scal_anim_frame 0x200, 0x200, 0, 0 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_839AB8C:: @ 839AB8C - .4byte gSpriteAffineAnim_839AB7C - - .align 2 -gSpriteTemplate_839AB90:: @ 839AB90 - spr_template 4609, 4608, gOamData_839AB2C, gSpriteAnimTable_839AB64, NULL, gSpriteAffineAnimTable_839AB8C, sub_807F688 - - .align 2 -gUnknown_0839ABA8:: @ 839ABA8 - obj_tiles gWeatherFog1Tiles, 0x800, 0x1201 - - .align 2 -gUnknown_0839ABB0:: @ 839ABB0 - obj_tiles WeatherAshTiles, 0x1000, 0x1202 - - .align 2 -gOamData_839ABB8:: @ 839ABB8 - .2byte 0x0400 - .2byte 0xC000 - .2byte 0xF400 - - .align 2 -gSpriteAnim_839ABC0:: @ 839ABC0 - obj_image_anim_frame 0, 60 - obj_image_anim_frame 64, 60 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_839ABCC:: @ 839ABCC - .4byte gSpriteAnim_839ABC0 - - .align 2 -gSpriteTemplate_839ABD0:: @ 839ABD0 - spr_template 4610, 4608, gOamData_839ABB8, gSpriteAnimTable_839ABCC, NULL, gDummySpriteAffineAnimTable, sub_807FAA8 - - .align 2 -gUnknown_0839ABE8:: @ 839ABE8 - obj_tiles WeatherFog0Tiles, 0x800, 0x1203 - - .align 2 -gOamData_839ABF0:: @ 839ABF0 - .2byte 0x0400 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gSpriteAnim_839ABF8:: @ 839ABF8 - obj_image_anim_frame 0, 16 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_839AC00:: @ 839AC00 - .4byte gSpriteAnim_839ABF8 - - .align 2 -gSpriteTemplate_839AC04:: @ 839AC04 - spr_template 4611, 4608, gOamData_839ABF0, gSpriteAnimTable_839AC00, NULL, gDummySpriteAffineAnimTable, sub_807FE3C - - .align 2 -gOamData_839AC1C:: @ 839AC1C - .2byte 0x0400 - .2byte 0xC000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_839AC24:: @ 839AC24 - obj_image_anim_frame 0, 3 - obj_image_anim_end - - .align 2 -gSpriteAnim_839AC2C:: @ 839AC2C - obj_image_anim_frame 64, 3 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_839AC34:: @ 839AC34 - .4byte gSpriteAnim_839AC24 - .4byte gSpriteAnim_839AC2C - - .align 2 -gSpriteTemplate_839AC3C:: @ 839AC3C - spr_template 4612, 4609, gOamData_839AC1C, gSpriteAnimTable_839AC34, NULL, gDummySpriteAffineAnimTable, sub_8080338 - - .align 2 -gUnknown_0839AC54:: @ 839AC54 - obj_tiles WeatherSandstormTiles, 0xA00, 0x1204 - - .align 1 -gUnknown_0839AC5C:: @ 839AC5C - .2byte 0 - .2byte 120 - .2byte 80 - .2byte 160 - .2byte 40 - .2byte 0 - -gUnknown_0839AC68:: @ 839AC68 - .byte 40 - .byte 90 - .byte 60 - .byte 90 - .byte 2 - .byte 60 - .byte 40 - .byte 30 - - .align 2 -gUnknown_0839AC70:: @ 839AC70 - obj_tiles WeatherBubbleTiles, 0x40, 0x1205 - - .align 1 -gUnknown_0839AC78:: @ 839AC78 - .2byte 120, 160 - .2byte 376, 160 - .2byte 40, 140 - .2byte 296, 140 - .2byte 180, 130 - .2byte 436, 130 - .2byte 60, 160 - .2byte 436, 160 - .2byte 220, 180 - .2byte 476, 180 - .2byte 10, 90 - .2byte 266, 90 - .2byte 256, 160 - - .align 2 -gSpriteAnim_839ACAC:: @ 839ACAC - obj_image_anim_frame 0, 16 - obj_image_anim_frame 1, 16 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_839ACB8:: @ 839ACB8 - .4byte gSpriteAnim_839ACAC - - .align 2 -gSpriteTemplate_839ACBC:: @ 839ACBC - spr_template 4613, 4608, gOamData_837DF24, gSpriteAnimTable_839ACB8, NULL, gDummySpriteAffineAnimTable, unc_0807DAB4 - -gUnknown_0839ACD4:: @ 839ACD4 - .byte 2, 3, 5, 3 - -gUnknown_0839ACD8:: @ 839ACD8 - .byte 2, 2, 3, 2 diff --git a/data/fldeff_80C5CD4.s b/data/fldeff_80C5CD4.s deleted file mode 100644 index 4f0e83832..000000000 --- a/data/fldeff_80C5CD4.s +++ /dev/null @@ -1,320 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_083D1898:: @ 83D1898 - obj_tiles gUnknownGfx_083D190C, 0x80, 0 - - .align 2 -gUnknown_083D18A0:: @ 83D18A0 - obj_pal gUnknownPal_083D18EC, 0x0000 - - .align 2 -gSpriteTemplate_83D18A8:: @ 83D18A8 - spr_template 0, 0, gOamData_83D18D8, gSpriteAnimTable_83D18E8, NULL, gDummySpriteAffineAnimTable, sub_80C60CC - - .align 2 -gSpriteTemplate_83D18C0:: @ 83D18C0 - spr_template 0, 0, gOamData_83D18D8, gSpriteAnimTable_83D18E8, NULL, gDummySpriteAffineAnimTable, sub_80C6130 - - .align 2 -gOamData_83D18D8:: @ 83D18D8 - .2byte 0x4000 - .2byte 0x4000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_83D18E0:: @ 83D18E0 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83D18E8:: @ 83D18E8 - .4byte gSpriteAnim_83D18E0 - - .align 2 -gUnknownPal_083D18EC:: - .incbin "graphics/unknown/unknown_3D18EC.gbapal" - - .align 2 -gUnknownGfx_083D190C:: - .incbin "graphics/unknown/unknown_3D190C.4bpp" - - .align 2 -gSpriteImage_83D198C:: @ 83D198C - .incbin "graphics/unknown_sprites/83D259C/0.4bpp" - - .align 2 -gSpriteImage_83D1A0C:: @ 83D1A0C - .incbin "graphics/unknown_sprites/83D259C/1.4bpp" - - .align 2 -gSpriteImage_83D1A8C:: @ 83D1A8C - .incbin "graphics/unknown_sprites/83D259C/2.4bpp" - - .align 2 -gSpriteImage_83D1B0C:: @ 83D1B0C - .incbin "graphics/unknown_sprites/83D259C/3.4bpp" - - .align 2 -gSpriteImage_83D1B8C:: @ 83D1B8C - .incbin "graphics/unknown_sprites/83D259C/4.4bpp" - - .space 32 - - .align 2 -gFieldEffectObjectPalette7: @ 83D1C2C - .incbin "graphics/field_effect_objects/palettes/07.gbapal" - - .align 2 -gSpriteImage_83D1C4C:: @ 83D1C4C - .incbin "graphics/unknown_sprites/83D25EC/0.4bpp" - - .align 2 -gSpriteImage_83D1CCC:: @ 83D1CCC - .incbin "graphics/unknown_sprites/83D25EC/1.4bpp" - - .align 2 -gSpriteImage_83D1D4C:: @ 83D1D4C - .incbin "graphics/unknown_sprites/83D25EC/2.4bpp" - - .align 2 -gSpriteImage_83D1DCC:: @ 83D1DCC - .incbin "graphics/unknown_sprites/83D25EC/3.4bpp" - - .align 2 -gSpriteImage_83D1E4C:: @ 83D1E4C - .incbin "graphics/unknown_sprites/83D25EC/4.4bpp" - - .align 2 -gSpriteImage_83D1ECC:: @ 83D1ECC - .incbin "graphics/unknown_sprites/83D25C4/0.4bpp" - - .align 2 -gSpriteImage_83D1F4C:: @ 83D1F4C - .incbin "graphics/unknown_sprites/83D25C4/1.4bpp" - - .align 2 -gSpriteImage_83D1FCC:: @ 83D1FCC - .incbin "graphics/unknown_sprites/83D25C4/2.4bpp" - - .align 2 -gSpriteImage_83D204C:: @ 83D204C - .incbin "graphics/unknown_sprites/83D25C4/3.4bpp" - - .align 2 -gSpriteImage_83D20CC:: @ 83D20CC - .incbin "graphics/unknown_sprites/83D25C4/4.4bpp" - - .align 2 - .incbin "graphics/unknown_sprites/83D25C4/5.4bpp" - - .align 2 -gFieldEffectObjectPalette8: @ 83D21CC - .incbin "graphics/field_effect_objects/palettes/08.gbapal" - - .align 2 -gSpriteImage_83D21EC:: @ 83D21EC - .incbin "graphics/unknown_sprites/83D2688/0.4bpp" - - .align 2 -gSpriteImage_83D22EC:: @ 83D22EC - .incbin "graphics/unknown_sprites/83D2688/1.4bpp" - - .align 2 -gSpriteImage_83D23EC:: @ 83D23EC - .incbin "graphics/unknown_sprites/83D2688/2.4bpp" - - .align 2 -gOamData_83D24EC:: @ 83D24EC - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gSpriteAnim_83D24F4:: @ 83D24F4 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_83D250C:: @ 83D250C - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_83D2524:: @ 83D2524 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_83D253C:: @ 83D253C - obj_image_anim_frame 0, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 1, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 4, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gSpriteAnim_83D2554:: @ 83D2554 - obj_image_anim_frame 4, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 1, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gSpriteAnim_83D256C:: @ 83D256C - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83D2584:: @ 83D2584 - .4byte gSpriteAnim_83D24F4 - - .align 2 -gSpriteAnimTable_83D2588:: @ 83D2588 - .4byte gSpriteAnim_83D250C - .4byte gSpriteAnim_83D2524 - .4byte gSpriteAnim_83D253C - .4byte gSpriteAnim_83D2554 - - .align 2 -gSpriteAnimTable_83D2598:: @ 83D2598 - .4byte gSpriteAnim_83D256C - - .align 2 -gSpriteImageTable_83D259C:: @ 83D259C - obj_frame_tiles gSpriteImage_83D198C, 0x80 - obj_frame_tiles gSpriteImage_83D1A0C, 0x80 - obj_frame_tiles gSpriteImage_83D1A8C, 0x80 - obj_frame_tiles gSpriteImage_83D1B0C, 0x80 - obj_frame_tiles gSpriteImage_83D1B8C, 0x80 - - .align 2 -gSpriteImageTable_83D25C4:: @ 83D25C4 - obj_frame_tiles gSpriteImage_83D1ECC, 0x80 - obj_frame_tiles gSpriteImage_83D1F4C, 0x80 - obj_frame_tiles gSpriteImage_83D1FCC, 0x80 - obj_frame_tiles gSpriteImage_83D204C, 0x80 - obj_frame_tiles gSpriteImage_83D20CC, 0x80 - - .align 2 -gSpriteImageTable_83D25EC:: @ 83D25EC - obj_frame_tiles gSpriteImage_83D1C4C, 0x80 - obj_frame_tiles gSpriteImage_83D1CCC, 0x80 - obj_frame_tiles gSpriteImage_83D1D4C, 0x80 - obj_frame_tiles gSpriteImage_83D1DCC, 0x80 - obj_frame_tiles gSpriteImage_83D1E4C, 0x80 - - .align 2 -gSpriteTemplate_83D2614:: @ 83D2614 - spr_template 0xFFFF, 4099, gOamData_83D24EC, gSpriteAnimTable_83D2584, gSpriteImageTable_83D259C, gDummySpriteAffineAnimTable, sub_80C644C - - .align 2 -gSpriteTemplate_83D262C:: @ 83D262C - spr_template 0xFFFF, 4104, gOamData_83D24EC, gSpriteAnimTable_83D2588, gSpriteImageTable_83D25C4, gDummySpriteAffineAnimTable, sub_80C6598 - - .align 2 -gSpriteTemplate_83D2644:: @ 83D2644 - spr_template 0xFFFF, 4104, gOamData_83D24EC, gSpriteAnimTable_83D2598, gSpriteImageTable_83D25EC, gDummySpriteAffineAnimTable, sub_80C66BC - - .align 2 -gFieldEffectObjectPaletteInfo7:: @ 83D265C - obj_pal gFieldEffectObjectPalette7, 0x1003 - - .align 2 -gFieldEffectObjectPaletteInfo8:: @ 83D2664 - obj_pal gFieldEffectObjectPalette8, 0x1008 - - .align 2 -gOamData_83D266C:: @ 83D266C - .2byte 0x8000 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gSpriteAnim_83D2674:: @ 83D2674 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 1, 6 - obj_image_anim_frame 2, 6 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83D2684:: @ 83D2684 - .4byte gSpriteAnim_83D2674 - - .align 2 -gSpriteImageTable_83D2688:: @ 83D2688 - obj_frame_tiles gSpriteImage_83D21EC, 0x100 - obj_frame_tiles gSpriteImage_83D22EC, 0x100 - obj_frame_tiles gSpriteImage_83D23EC, 0x100 - - .align 2 -gSpriteTemplate_83D26A0:: @ 83D26A0 - spr_template 0xFFFF, 4110, gOamData_83D266C, gSpriteAnimTable_83D2684, gSpriteImageTable_83D2688, gDummySpriteAffineAnimTable, SpriteCB_SandPillar_0 - -@ This uses one of the secret base palettes, so there is no "09.pal" file. - .align 2 -gFieldEffectObjectPaletteInfo9:: @ 83D26B8 - obj_pal gTilesetPalettes_SecretBase + 5 * 0x20, 0x100E - - .align 2 -gSpriteImage_83D26C0:: @ 83D26C0 - .incbin "graphics/unknown_sprites/83D2860/0.4bpp" - - .align 2 -gSpriteImage_83D2740:: @ 83D2740 - .incbin "graphics/unknown_sprites/83D2860/1.4bpp" - - .align 2 -gSpriteImage_83D27C0:: @ 83D27C0 - .incbin "graphics/unknown_sprites/83D2860/2.4bpp" - - .align 2 -Palette_3D2840:: @ 83D2840 - .incbin "graphics/unknown/unknown_3D2840.gbapal" - - .align 2 -gSpriteImageTable_83D2860:: @ 83D2860 - obj_frame_tiles gSpriteImage_83D26C0, 0x80 - obj_frame_tiles gSpriteImage_83D2740, 0x80 - obj_frame_tiles gSpriteImage_83D27C0, 0x80 - - .align 2 -gUnknown_083D2878:: @ 83D2878 - obj_pal Palette_3D2840, 4096 - - .align 2 -gSpriteAnim_83D2880:: @ 83D2880 - obj_image_anim_frame 0, 30 - obj_image_anim_frame 1, 30 - obj_image_anim_frame 2, 30 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_83D2890:: @ 83D2890 - .4byte gSpriteAnim_83D2880 - - .align 2 -gSpriteTemplate_83D2894:: @ 83D2894 - spr_template 0xFFFF, 4096, gFieldOamData_32x8, gSpriteAnimTable_83D2890, gSpriteImageTable_83D2860, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/data/fldeff_cut.s b/data/fldeff_cut.s deleted file mode 100644 index e1d27647e..000000000 --- a/data/fldeff_cut.s +++ /dev/null @@ -1,31 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gOamData_CutGrass:: @ 83C15DC - .2byte 0 - .2byte 0 - .2byte 0x1401 - - .align 2 -gSpriteAnim_CutGrass:: @ 83C15E4 - obj_image_anim_frame 0, 30 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_CutGrass:: @ 83C15EC - .4byte gSpriteAnim_CutGrass - - .align 2 -gSpriteImageTable_CutGrass:: @ 83C15F0 - obj_frame_tiles gFieldEffectPic_CutGrass, 0x20 - - .align 2 -gFieldEffectObjectPaletteInfo6:: @ 83C15F8 - obj_pal gFieldEffectObjectPalette6, 0x1000 - - .align 2 -gSpriteTemplate_CutGrass:: @ 83C1600 - spr_template 0xFFFF, 0x1000, gOamData_CutGrass, gSpriteAnimTable_CutGrass, gSpriteImageTable_CutGrass, gDummySpriteAffineAnimTable, sub_80A2A48 diff --git a/data/fldeff_flash.s b/data/fldeff_flash.s deleted file mode 100644 index c8b6185f2..000000000 --- a/data/fldeff_flash.s +++ /dev/null @@ -1,71 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_083F7FC4:: @ 83F7FC4 - .byte 1, 4, 1, 0 - .4byte sub_810CFF8 - .byte 2, 4, 1, 0 - .4byte sub_810CFF8 - .byte 3, 4, 1, 0 - .4byte sub_810CFF8 - .byte 5, 4, 1, 0 - .4byte sub_810CFF8 - .byte 6, 4, 1, 0 - .4byte sub_810CFF8 - .byte 7, 4, 1, 0 - .4byte sub_810CFF8 - .byte 8, 4, 1, 0 - .4byte sub_810CFF8 - .byte 9, 4, 1, 0 - .4byte sub_810CFF8 - - .byte 4, 1, 0, 1 - .4byte sub_810CE48 - .byte 4, 2, 0, 1 - .4byte sub_810CE48 - .byte 4, 3, 0, 1 - .4byte sub_810CE48 - .byte 4, 5, 0, 1 - .4byte sub_810CE48 - .byte 4, 6, 0, 1 - .4byte sub_810CE48 - .byte 4, 7, 0, 1 - .4byte sub_810CE48 - .byte 4, 8, 0, 1 - .4byte sub_810CE48 - .byte 4, 9, 0, 1 - .4byte sub_810CE48 - - .byte 0, 0, 0, 0 - .4byte NULL - - .align 2 -gCaveTransitionPalette_White:: @ 83F804C - .rept 16 - .2byte 0x7FFF - .endr - - .align 2 -gCaveTransitionPalette_Black:: @ 83F806C - .rept 16 - .2byte 0x0000 - .endr - - .align 1 -gUnknown_083F808C:: @ 83F808C - .incbin "graphics/misc/83F808C.gbapal" - - .align 1 -gUnknown_083F809C:: @ 83F809C - .incbin "graphics/misc/83F809C.gbapal" - - .align 2 -gCaveTransitionTilemap:: @ 83F80AC - .incbin "graphics/misc/cave_transition_map.bin.lz" - - .align 2 -gCaveTransitionTiles:: @ 83F828C - .incbin "graphics/misc/cave_transition.4bpp.lz" diff --git a/data/graphics.s b/data/graphics.s index d24039de6..7792e8a9e 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -2997,8 +2997,8 @@ gBattleAnimSpriteSheet_277:: @ 8E6DA54 .incbin "graphics/battle_anims/sprites/277.4bpp.lz" .align 2 -gWeatherFog1Tilemap:: @ 8E6DE48 - .incbin "graphics/weather/fog1.bin.lz" +gBattleAnimFogTilemap:: @ 8E6DE48 + .incbin "graphics/battle_anims/backgrounds/fog.bin.lz" .align 2 gBattleAnimSpritePalette_283:: @ 8E6DFC0 @@ -3960,6 +3960,9 @@ gUnknown_08E94510:: @ 8E94510 gUnknown_08E94550:: @ 8E94550 .incbin "graphics/unknown/unknown_E94550.bin" +gUnknown_08E94590:: @ 8E94590 + .incbin "graphics/unknown/unknown_E94590.bin" + gUnknown_08E945D0:: @ 8E945D0 .incbin "graphics/interface/wordgroup_layout.bin" diff --git a/data/item_ball_scripts.inc b/data/item_ball_scripts.inc index ad4386990..aae704ab2 100644 --- a/data/item_ball_scripts.inc +++ b/data/item_ball_scripts.inc @@ -1,539 +1,539 @@ Route102_EventScript_1B1439:: @ 81B1439 - giveitem ITEM_POTION, 1, 1 + giveitem_std ITEM_POTION, 1, 1 end Route103_EventScript_1B1446:: @ 81B1446 - giveitem ITEM_GUARD_SPEC, 1, 1 + giveitem_std ITEM_GUARD_SPEC, 1, 1 end Route104_EventScript_1B1453:: @ 81B1453 - giveitem ITEM_PP_UP, 1, 1 + giveitem_std ITEM_PP_UP, 1, 1 end Route104_EventScript_1B1460:: @ 81B1460 - giveitem ITEM_POKE_BALL, 1, 1 + giveitem_std ITEM_POKE_BALL, 1, 1 end Route104_EventScript_1B146D:: @ 81B146D - giveitem ITEM_X_ACCURACY, 1, 1 + giveitem_std ITEM_X_ACCURACY, 1, 1 end Route104_EventScript_1B147A:: @ 81B147A - giveitem ITEM_POTION, 1, 1 + giveitem_std ITEM_POTION, 1, 1 end Route105_EventScript_1B1487:: @ 81B1487 - giveitem ITEM_IRON, 1, 1 + giveitem_std ITEM_IRON, 1, 1 end Route106_EventScript_1B1494:: @ 81B1494 - giveitem ITEM_PROTEIN, 1, 1 + giveitem_std ITEM_PROTEIN, 1, 1 end Route109_EventScript_1B14A1:: @ 81B14A1 - giveitem ITEM_PP_UP, 1, 1 + giveitem_std ITEM_PP_UP, 1, 1 end Route110_EventScript_1B14AE:: @ 81B14AE - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end Route110_EventScript_1B14BB:: @ 81B14BB - giveitem ITEM_DIRE_HIT, 1, 1 + giveitem_std ITEM_DIRE_HIT, 1, 1 end Route111_EventScript_1B14C8:: @ 81B14C8 - giveitem ITEM_TM37, 1, 1 + giveitem_std ITEM_TM37, 1, 1 end Route111_EventScript_1B14D5:: @ 81B14D5 - giveitem ITEM_STARDUST, 1, 1 + giveitem_std ITEM_STARDUST, 1, 1 end Route111_EventScript_1B14E2:: @ 81B14E2 - giveitem ITEM_HP_UP, 1, 1 + giveitem_std ITEM_HP_UP, 1, 1 end Route112_EventScript_1B14EF:: @ 81B14EF - giveitem ITEM_NUGGET, 1, 1 + giveitem_std ITEM_NUGGET, 1, 1 end Route113_EventScript_1B14FC:: @ 81B14FC - giveitem ITEM_MAX_ETHER, 1, 1 + giveitem_std ITEM_MAX_ETHER, 1, 1 end Route113_EventScript_1B1509:: @ 81B1509 - giveitem ITEM_SUPER_REPEL, 1, 1 + giveitem_std ITEM_SUPER_REPEL, 1, 1 end Route114_EventScript_1B1516:: @ 81B1516 - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end Route114_EventScript_1B1523:: @ 81B1523 - giveitem ITEM_PROTEIN, 1, 1 + giveitem_std ITEM_PROTEIN, 1, 1 end Route115_EventScript_1B1530:: @ 81B1530 - giveitem ITEM_SUPER_POTION, 1, 1 + giveitem_std ITEM_SUPER_POTION, 1, 1 end Route115_EventScript_1B153D:: @ 81B153D - giveitem ITEM_TM01, 1, 1 + giveitem_std ITEM_TM01, 1, 1 end Route115_EventScript_1B154A:: @ 81B154A - giveitem ITEM_IRON, 1, 1 + giveitem_std ITEM_IRON, 1, 1 end Route115_EventScript_1B1557:: @ 81B1557 - giveitem ITEM_GREAT_BALL, 1, 1 + giveitem_std ITEM_GREAT_BALL, 1, 1 end Route116_EventScript_1B1564:: @ 81B1564 - giveitem ITEM_X_SPECIAL, 1, 1 + giveitem_std ITEM_X_SPECIAL, 1, 1 end Route116_EventScript_1B1571:: @ 81B1571 - giveitem ITEM_ETHER, 1, 1 + giveitem_std ITEM_ETHER, 1, 1 end Route116_EventScript_1B157E:: @ 81B157E - giveitem ITEM_REPEL, 1, 1 + giveitem_std ITEM_REPEL, 1, 1 end Route116_EventScript_1B158B:: @ 81B158B - giveitem ITEM_HP_UP, 1, 1 + giveitem_std ITEM_HP_UP, 1, 1 end Route117_EventScript_1B1598:: @ 81B1598 - giveitem ITEM_GREAT_BALL, 1, 1 + giveitem_std ITEM_GREAT_BALL, 1, 1 end Route117_EventScript_1B15A5:: @ 81B15A5 - giveitem ITEM_REVIVE, 1, 1 + giveitem_std ITEM_REVIVE, 1, 1 end Route118_EventScript_1B15B2:: @ 81B15B2 - giveitem ITEM_HYPER_POTION, 1, 1 + giveitem_std ITEM_HYPER_POTION, 1, 1 end Route119_EventScript_1B15BF:: @ 81B15BF - giveitem ITEM_SUPER_REPEL, 1, 1 + giveitem_std ITEM_SUPER_REPEL, 1, 1 end Route119_EventScript_1B15CC:: @ 81B15CC - giveitem ITEM_ZINC, 1, 1 + giveitem_std ITEM_ZINC, 1, 1 end Route119_EventScript_1B15D9:: @ 81B15D9 - giveitem ITEM_ELIXIR, 1, 1 + giveitem_std ITEM_ELIXIR, 1, 1 end Route119_EventScript_1B15E6:: @ 81B15E6 - giveitem ITEM_LEAF_STONE, 1, 1 + giveitem_std ITEM_LEAF_STONE, 1, 1 end Route119_EventScript_1B15F3:: @ 81B15F3 - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end Route119_EventScript_1B1600:: @ 81B1600 - giveitem ITEM_HYPER_POTION, 1, 1 + giveitem_std ITEM_HYPER_POTION, 1, 1 end Route119_EventScript_1B160D:: @ 81B160D - giveitem ITEM_HYPER_POTION, 1, 1 + giveitem_std ITEM_HYPER_POTION, 1, 1 end Route120_EventScript_1B161A:: @ 81B161A - giveitem ITEM_NUGGET, 1, 1 + giveitem_std ITEM_NUGGET, 1, 1 end Route120_EventScript_1B1627:: @ 81B1627 - giveitem ITEM_FULL_HEAL, 1, 1 + giveitem_std ITEM_FULL_HEAL, 1, 1 end Route120_EventScript_1B1634:: @ 81B1634 - giveitem ITEM_HYPER_POTION, 1, 1 + giveitem_std ITEM_HYPER_POTION, 1, 1 end Route120_EventScript_1B1641:: @ 81B1641 - giveitem ITEM_NEST_BALL, 1, 1 + giveitem_std ITEM_NEST_BALL, 1, 1 end Route121_EventScript_1B164E:: @ 81B164E - giveitem ITEM_CARBOS, 1, 1 + giveitem_std ITEM_CARBOS, 1, 1 end Route123_EventScript_1B165B:: @ 81B165B - giveitem ITEM_CALCIUM, 1, 1 + giveitem_std ITEM_CALCIUM, 1, 1 end Route123_EventScript_1B1668:: @ 81B1668 - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end Route123_EventScript_1B1675:: @ 81B1675 - giveitem ITEM_ULTRA_BALL, 1, 1 + giveitem_std ITEM_ULTRA_BALL, 1, 1 end Route123_EventScript_1B1682:: @ 81B1682 - giveitem ITEM_ELIXIR, 1, 1 + giveitem_std ITEM_ELIXIR, 1, 1 end Route124_EventScript_1B168F:: @ 81B168F - giveitem ITEM_RED_SHARD, 1, 1 + giveitem_std ITEM_RED_SHARD, 1, 1 end Route124_EventScript_1B169C:: @ 81B169C - giveitem ITEM_BLUE_SHARD, 1, 1 + giveitem_std ITEM_BLUE_SHARD, 1, 1 end Route124_EventScript_1B16A9:: @ 81B16A9 - giveitem ITEM_YELLOW_SHARD, 1, 1 + giveitem_std ITEM_YELLOW_SHARD, 1, 1 end Route126_EventScript_1B16B6:: @ 81B16B6 - giveitem ITEM_GREEN_SHARD, 1, 1 + giveitem_std ITEM_GREEN_SHARD, 1, 1 end Route127_EventScript_1B16C3:: @ 81B16C3 - giveitem ITEM_ZINC, 1, 1 + giveitem_std ITEM_ZINC, 1, 1 end Route127_EventScript_1B16D0:: @ 81B16D0 - giveitem ITEM_CARBOS, 1, 1 + giveitem_std ITEM_CARBOS, 1, 1 end Route132_EventScript_1B16DD:: @ 81B16DD - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end Route133_EventScript_1B16EA:: @ 81B16EA - giveitem ITEM_BIG_PEARL, 1, 1 + giveitem_std ITEM_BIG_PEARL, 1, 1 end Route133_EventScript_1B16F7:: @ 81B16F7 - giveitem ITEM_STAR_PIECE, 1, 1 + giveitem_std ITEM_STAR_PIECE, 1, 1 end PetalburgCity_EventScript_1B1704:: @ 81B1704 - giveitem ITEM_MAX_REVIVE, 1, 1 + giveitem_std ITEM_MAX_REVIVE, 1, 1 end PetalburgCity_EventScript_1B1711:: @ 81B1711 - giveitem ITEM_ETHER, 1, 1 + giveitem_std ITEM_ETHER, 1, 1 end MauvilleCity_EventScript_1B171E:: @ 81B171E - giveitem ITEM_X_SPEED, 1, 1 + giveitem_std ITEM_X_SPEED, 1, 1 end RustboroCity_EventScript_1B172B:: @ 81B172B - giveitem ITEM_X_DEFEND, 1, 1 + giveitem_std ITEM_X_DEFEND, 1, 1 end LilycoveCity_EventScript_1B1738:: @ 81B1738 - giveitem ITEM_MAX_REPEL, 1, 1 + giveitem_std ITEM_MAX_REPEL, 1, 1 end MossdeepCity_EventScript_1B1745:: @ 81B1745 - giveitem ITEM_NET_BALL, 1, 1 + giveitem_std ITEM_NET_BALL, 1, 1 end PetalburgWoods_EventScript_1B1752:: @ 81B1752 - giveitem ITEM_X_ATTACK, 1, 1 + giveitem_std ITEM_X_ATTACK, 1, 1 end PetalburgWoods_EventScript_1B175F:: @ 81B175F - giveitem ITEM_GREAT_BALL, 1, 1 + giveitem_std ITEM_GREAT_BALL, 1, 1 end PetalburgWoods_EventScript_1B176C:: @ 81B176C - giveitem ITEM_ETHER, 1, 1 + giveitem_std ITEM_ETHER, 1, 1 end PetalburgWoods_EventScript_1B1779:: @ 81B1779 - giveitem ITEM_PARALYZE_HEAL, 1, 1 + giveitem_std ITEM_PARALYZE_HEAL, 1, 1 end RusturfTunnel_EventScript_1B1786:: @ 81B1786 - giveitem ITEM_POKE_BALL, 1, 1 + giveitem_std ITEM_POKE_BALL, 1, 1 end RusturfTunnel_EventScript_1B1793:: @ 81B1793 - giveitem ITEM_MAX_ETHER, 1, 1 + giveitem_std ITEM_MAX_ETHER, 1, 1 end GraniteCave_1F_EventScript_1B17A0:: @ 81B17A0 - giveitem ITEM_ESCAPE_ROPE, 1, 1 + giveitem_std ITEM_ESCAPE_ROPE, 1, 1 end GraniteCave_B1F_EventScript_1B17AD:: @ 81B17AD - giveitem ITEM_POKE_BALL, 1, 1 + giveitem_std ITEM_POKE_BALL, 1, 1 end GraniteCave_B2F_EventScript_1B17BA:: @ 81B17BA - giveitem ITEM_REPEL, 1, 1 + giveitem_std ITEM_REPEL, 1, 1 end GraniteCave_B2F_EventScript_1B17C7:: @ 81B17C7 - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end JaggedPass_EventScript_1B17D4:: @ 81B17D4 - giveitem ITEM_BURN_HEAL, 1, 1 + giveitem_std ITEM_BURN_HEAL, 1, 1 end FieryPath_EventScript_1B17E1:: @ 81B17E1 - giveitem ITEM_FIRE_STONE, 1, 1 + giveitem_std ITEM_FIRE_STONE, 1, 1 end FieryPath_EventScript_1B17EE:: @ 81B17EE - giveitem ITEM_TM06, 1, 1 + giveitem_std ITEM_TM06, 1, 1 end MeteorFalls_1F_1R_EventScript_1B17FB:: @ 81B17FB - giveitem ITEM_TM23, 1, 1 + giveitem_std ITEM_TM23, 1, 1 end MeteorFalls_1F_1R_EventScript_1B1808:: @ 81B1808 - giveitem ITEM_FULL_HEAL, 1, 1 + giveitem_std ITEM_FULL_HEAL, 1, 1 end MeteorFalls_1F_1R_EventScript_1B1815:: @ 81B1815 - giveitem ITEM_MOON_STONE, 1, 1 + giveitem_std ITEM_MOON_STONE, 1, 1 end MeteorFalls_1F_1R_EventScript_1B1822:: @ 81B1822 - giveitem ITEM_PP_UP, 1, 1 + giveitem_std ITEM_PP_UP, 1, 1 end MeteorFalls_B1F_2R_EventScript_1B182F:: @ 81B182F - giveitem ITEM_TM02, 1, 1 + giveitem_std ITEM_TM02, 1, 1 end NewMauville_Inside_EventScript_1B183C:: @ 81B183C - giveitem ITEM_ULTRA_BALL, 1, 1 + giveitem_std ITEM_ULTRA_BALL, 1, 1 end NewMauville_Inside_EventScript_1B1849:: @ 81B1849 - giveitem ITEM_ESCAPE_ROPE, 1, 1 + giveitem_std ITEM_ESCAPE_ROPE, 1, 1 end NewMauville_Inside_EventScript_1B1856:: @ 81B1856 - giveitem ITEM_THUNDER_STONE, 1, 1 + giveitem_std ITEM_THUNDER_STONE, 1, 1 end NewMauville_Inside_EventScript_1B1863:: @ 81B1863 - giveitem ITEM_FULL_HEAL, 1, 1 + giveitem_std ITEM_FULL_HEAL, 1, 1 end NewMauville_Inside_EventScript_1B1870:: @ 81B1870 - giveitem ITEM_PARALYZE_HEAL, 1, 1 + giveitem_std ITEM_PARALYZE_HEAL, 1, 1 end AbandonedShip_Rooms_1F_EventScript_1B187D:: @ 81B187D - giveitem ITEM_HARBOR_MAIL, 1, 1 + giveitem_std ITEM_HARBOR_MAIL, 1, 1 end AbandonedShip_Rooms_B1F_EventScript_1B188A:: @ 81B188A - giveitem ITEM_ESCAPE_ROPE, 1, 1 + giveitem_std ITEM_ESCAPE_ROPE, 1, 1 end AbandonedShip_Rooms2_B1F_EventScript_1B1897:: @ 81B1897 - giveitem ITEM_DIVE_BALL, 1, 1 + giveitem_std ITEM_DIVE_BALL, 1, 1 end AbandonedShip_Room_B1F_EventScript_1B18A4:: @ 81B18A4 - giveitem ITEM_TM13, 1, 1 + giveitem_std ITEM_TM13, 1, 1 end AbandonedShip_Rooms2_1F_EventScript_1B18B1:: @ 81B18B1 - giveitem ITEM_REVIVE, 1, 1 + giveitem_std ITEM_REVIVE, 1, 1 end AbandonedShip_CaptainsOffice_EventScript_1B18BE:: @ 81B18BE - giveitem ITEM_STORAGE_KEY, 1, 1 + giveitem_std ITEM_STORAGE_KEY, 1, 1 end AbandonedShip_HiddenFloorRooms_EventScript_1B18CB:: @ 81B18CB - giveitem ITEM_LUXURY_BALL, 1, 1 + giveitem_std ITEM_LUXURY_BALL, 1, 1 end AbandonedShip_HiddenFloorRooms_EventScript_1B18D8:: @ 81B18D8 - giveitem ITEM_SCANNER, 1, 1 + giveitem_std ITEM_SCANNER, 1, 1 end AbandonedShip_HiddenFloorRooms_EventScript_1B18E5:: @ 81B18E5 - giveitem ITEM_WATER_STONE, 1, 1 + giveitem_std ITEM_WATER_STONE, 1, 1 end AbandonedShip_HiddenFloorRooms_EventScript_1B18F2:: @ 81B18F2 - giveitem ITEM_TM18, 1, 1 + giveitem_std ITEM_TM18, 1, 1 end ScorchedSlab_EventScript_1B18FF:: @ 81B18FF - giveitem ITEM_TM11, 1, 1 + giveitem_std ITEM_TM11, 1, 1 end SafariZone_Northwest_EventScript_1B190C:: @ 81B190C - giveitem ITEM_TM22, 1, 1 + giveitem_std ITEM_TM22, 1, 1 end SafariZone_Northeast_EventScript_1B1919:: @ 81B1919 - giveitem ITEM_CALCIUM, 1, 1 + giveitem_std ITEM_CALCIUM, 1, 1 end SafariZone_Southwest_EventScript_1B1926:: @ 81B1926 - giveitem ITEM_MAX_REVIVE, 1, 1 + giveitem_std ITEM_MAX_REVIVE, 1, 1 end MtPyre_2F_EventScript_1B1933:: @ 81B1933 - giveitem ITEM_ULTRA_BALL, 1, 1 + giveitem_std ITEM_ULTRA_BALL, 1, 1 end MtPyre_3F_EventScript_1B1940:: @ 81B1940 - giveitem ITEM_SUPER_REPEL, 1, 1 + giveitem_std ITEM_SUPER_REPEL, 1, 1 end MtPyre_4F_EventScript_1B194D:: @ 81B194D - giveitem ITEM_SEA_INCENSE, 1, 1 + giveitem_std ITEM_SEA_INCENSE, 1, 1 end MtPyre_5F_EventScript_1B195A:: @ 81B195A - giveitem ITEM_LAX_INCENSE, 1, 1 + giveitem_std ITEM_LAX_INCENSE, 1, 1 end MtPyre_6F_EventScript_1B1967:: @ 81B1967 - giveitem ITEM_TM30, 1, 1 + giveitem_std ITEM_TM30, 1, 1 end MtPyre_Exterior_EventScript_1B1974:: @ 81B1974 - giveitem ITEM_MAX_POTION, 1, 1 + giveitem_std ITEM_MAX_POTION, 1, 1 end MtPyre_Exterior_EventScript_1B1981:: @ 81B1981 - giveitem ITEM_TM48, 1, 1 + giveitem_std ITEM_TM48, 1, 1 end AquaHideout_B1F_EventScript_1B198E:: @ 81B198E - giveitem ITEM_MASTER_BALL, 1, 1 + giveitem_std ITEM_MASTER_BALL, 1, 1 end AquaHideout_B1F_EventScript_1B199B:: @ 81B199B - giveitem ITEM_NUGGET, 1, 1 + giveitem_std ITEM_NUGGET, 1, 1 end AquaHideout_B1F_EventScript_1B19A8:: @ 81B19A8 - giveitem ITEM_MAX_ELIXIR, 1, 1 + giveitem_std ITEM_MAX_ELIXIR, 1, 1 end AquaHideout_B2F_EventScript_1B19B5:: @ 81B19B5 - giveitem ITEM_NEST_BALL, 1, 1 + giveitem_std ITEM_NEST_BALL, 1, 1 end MagmaHideout_B1F_EventScript_1B19C2:: @ 81B19C2 - giveitem ITEM_MASTER_BALL, 1, 1 + giveitem_std ITEM_MASTER_BALL, 1, 1 end MagmaHideout_B1F_EventScript_1B19CF:: @ 81B19CF - giveitem ITEM_NUGGET, 1, 1 + giveitem_std ITEM_NUGGET, 1, 1 end MagmaHideout_B1F_EventScript_1B19DC:: @ 81B19DC - giveitem ITEM_MAX_ELIXIR, 1, 1 + giveitem_std ITEM_MAX_ELIXIR, 1, 1 end MagmaHideout_B2F_EventScript_1B19E9:: @ 81B19E9 - giveitem ITEM_NEST_BALL, 1, 1 + giveitem_std ITEM_NEST_BALL, 1, 1 end ShoalCave_LowTideEntranceRoom_EventScript_1B19F6:: @ 81B19F6 - giveitem ITEM_BIG_PEARL, 1, 1 + giveitem_std ITEM_BIG_PEARL, 1, 1 end ShoalCave_LowTideInnerRoom_EventScript_1B1A03:: @ 81B1A03 - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end ShoalCave_LowTideStairsRoom_EventScript_1B1A10:: @ 81B1A10 - giveitem ITEM_ICE_HEAL, 1, 1 + giveitem_std ITEM_ICE_HEAL, 1, 1 end ShoalCave_LowTideIceRoom_EventScript_1B1A1D:: @ 81B1A1D - giveitem ITEM_TM07, 1, 1 + giveitem_std ITEM_TM07, 1, 1 end ShoalCave_LowTideIceRoom_EventScript_1B1A2A:: @ 81B1A2A - giveitem ITEM_NEVER_MELT_ICE, 1, 1 + giveitem_std ITEM_NEVER_MELT_ICE, 1, 1 end SeafloorCavern_Room9_EventScript_1B1A37:: @ 81B1A37 - giveitem ITEM_TM26, 1, 1 + giveitem_std ITEM_TM26, 1, 1 end CaveOfOrigin_B3F_EventScript_1B1A44:: @ 81B1A44 - giveitem ITEM_HM07, 1, 1 + giveitem_std ITEM_HM07, 1, 1 end Route110_TrickHousePuzzle1_EventScript_1B1A51:: @ 81B1A51 - giveitem ITEM_ORANGE_MAIL, 1, 1 + giveitem_std ITEM_ORANGE_MAIL, 1, 1 end Route110_TrickHousePuzzle2_EventScript_1B1A5E:: @ 81B1A5E - giveitem ITEM_HARBOR_MAIL, 1, 1 + giveitem_std ITEM_HARBOR_MAIL, 1, 1 end Route110_TrickHousePuzzle2_EventScript_1B1A6B:: @ 81B1A6B - giveitem ITEM_WAVE_MAIL, 1, 1 + giveitem_std ITEM_WAVE_MAIL, 1, 1 end Route110_TrickHousePuzzle3_EventScript_1B1A78:: @ 81B1A78 - giveitem ITEM_SHADOW_MAIL, 1, 1 + giveitem_std ITEM_SHADOW_MAIL, 1, 1 end Route110_TrickHousePuzzle3_EventScript_1B1A85:: @ 81B1A85 - giveitem ITEM_WOOD_MAIL, 1, 1 + giveitem_std ITEM_WOOD_MAIL, 1, 1 end Route110_TrickHousePuzzle4_EventScript_1B1A92:: @ 81B1A92 - giveitem ITEM_MECH_MAIL, 1, 1 + giveitem_std ITEM_MECH_MAIL, 1, 1 end Route110_TrickHousePuzzle6_EventScript_1B1A9F:: @ 81B1A9F - giveitem ITEM_GLITTER_MAIL, 1, 1 + giveitem_std ITEM_GLITTER_MAIL, 1, 1 end Route110_TrickHousePuzzle7_EventScript_1B1AAC:: @ 81B1AAC - giveitem ITEM_TROPIC_MAIL, 1, 1 + giveitem_std ITEM_TROPIC_MAIL, 1, 1 end Route110_TrickHousePuzzle8_EventScript_1B1AB9:: @ 81B1AB9 - giveitem ITEM_BEAD_MAIL, 1, 1 + giveitem_std ITEM_BEAD_MAIL, 1, 1 end VictoryRoad_1F_EventScript_1B1AC6:: @ 81B1AC6 - giveitem ITEM_MAX_ELIXIR, 1, 1 + giveitem_std ITEM_MAX_ELIXIR, 1, 1 end VictoryRoad_1F_EventScript_1B1AD3:: @ 81B1AD3 - giveitem ITEM_PP_UP, 1, 1 + giveitem_std ITEM_PP_UP, 1, 1 end VictoryRoad_B1F_EventScript_1B1AE0:: @ 81B1AE0 - giveitem ITEM_TM29, 1, 1 + giveitem_std ITEM_TM29, 1, 1 end VictoryRoad_B1F_EventScript_1B1AED:: @ 81B1AED - giveitem ITEM_FULL_RESTORE, 1, 1 + giveitem_std ITEM_FULL_RESTORE, 1, 1 end VictoryRoad_B2F_EventScript_1B1AFA:: @ 81B1AFA - giveitem ITEM_FULL_HEAL, 1, 1 + giveitem_std ITEM_FULL_HEAL, 1, 1 end @ 81B1B07 - giveitem ITEM_HM08, 1, 1 + giveitem_std ITEM_HM08, 1, 1 end diff --git a/data/landmark.s b/data/landmark.s deleted file mode 100644 index 3583365cb..000000000 --- a/data/landmark.s +++ /dev/null @@ -1,561 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -Landmark_FlowerShop: - .4byte gLandmarkName_FlowerShop - .2byte 2108 @ flag num. - - .align 2 -Landmark_PetalburgWoods: - .4byte gLandmarkName_PetalburgWoods - .2byte -1 @ flag num. - - .align 2 -Landmark_MrBrineysCottage: - .4byte gLandmarkName_MrBrineysCottage - .2byte 2109 @ flag num. - - .align 2 -Landmark_AbandonedShip: - .4byte gLandmarkName_AbandonedShip - .2byte 2110 @ flag num. - - .align 2 -Landmark_SeashoreHouse: - .4byte gLandmarkName_SeashoreHouse - .2byte 2111 @ flag num. - - .align 2 -Landmark_SlateportBeach: - .4byte gLandmarkName_SlateportBeach - .2byte -1 @ flag num. - - .align 2 -Landmark_CyclingRoad: - .4byte gLandmarkName_CyclingRoad - .2byte -1 @ flag num. - - .align 2 -Landmark_NewMauville: - .4byte gLandmarkName_NewMauville - .2byte 2112 @ flag num. - - .align 2 -Landmark_TrickHouse: - .4byte gLandmarkName_TrickHouse - .2byte 2114 @ flag num. - - .align 2 -Landmark_OldLadysRestShop: - .4byte gLandmarkName_OldLadysRestShop - .2byte 2113 @ flag num. - - .align 2 -Landmark_Desert: - .4byte gLandmarkName_Desert - .2byte -1 @ flag num. - - .align 2 -Landmark_WinstrateFamily: - .4byte gLandmarkName_WinstrateFamily - .2byte 2115 @ flag num. - - .align 2 -Landmark_CableCar: - .4byte gLandmarkName_CableCar - .2byte -1 @ flag num. - - .align 2 -Landmark_GlassWorkshop: - .4byte gLandmarkName_GlassWorkshop - .2byte 2116 @ flag num. - - .align 2 -Landmark_WeatherInstitute: - .4byte gLandmarkName_WeatherInstitute - .2byte -1 @ flag num. - - .align 2 -Landmark_MeteorFalls: - .4byte gLandmarkName_MeteorFalls - .2byte -1 @ flag num. - - .align 2 -Landmark_TunnelersRestHouse: - .4byte gLandmarkName_TunnelersRestHouse - .2byte 2138 @ flag num. - - .align 2 -Landmark_RusturfTunnel: - .4byte gLandmarkName_RusturfTunnel - .2byte -1 @ flag num. - - .align 2 -Landmark_PokemonDayCare: - .4byte gLandmarkName_PokemonDayCare - .2byte 2118 @ flag num. - - .align 2 -Landmark_SafariZoneEntrance: - .4byte gLandmarkName_SafariZoneEntrance - .2byte -1 @ flag num. - - .align 2 -Landmark_MtPyre: - .4byte gLandmarkName_MtPyre - .2byte -1 @ flag num. - - .align 2 -Landmark_ShoalCave: - .4byte gLandmarkName_ShoalCave - .2byte -1 @ flag num. - - .align 2 -Landmark_SeafloorCavern: - .4byte gLandmarkName_SeafloorCavern - .2byte 2119 @ flag num. - - .align 2 -Landmark_GraniteCave: - .4byte gLandmarkName_GraniteCave - .2byte -1 @ flag num. - - .align 2 -Landmark_OceanCurrent: - .4byte gLandmarkName_OceanCurrent - .2byte -1 @ flag num. - - .align 2 -Landmark_LanettesHouse: - .4byte gLandmarkName_LanettesHouse - .2byte 2117 @ flag num. - - .align 2 -Landmark_FieryPath: - .4byte gLandmarkName_FieryPath - .2byte 2122 @ flag num. - - .align 2 -Landmark_JaggedPass: - .4byte gLandmarkName_JaggedPass - .2byte -1 @ flag num. - - .align 2 -Landmark_BerryMastersHouse: - .4byte gLandmarkName_BerryMastersHouse - .2byte 2147 @ flag num. - - .align 2 -Landmark_IslandCave: - .4byte gLandmarkName_IslandCave - .2byte 2133 @ flag num. - - .align 2 -Landmark_DesertRuins: - .4byte gLandmarkName_DesertRuins - .2byte 2134 @ flag num. - - .align 2 -Landmark_ScorchedSlab: - .4byte gLandmarkName_ScorchedSlab - .2byte 2136 @ flag num. - - .align 2 -Landmark_AncientTomb: - .4byte gLandmarkName_AncientTomb - .2byte 2137 @ flag num. - - .align 2 -Landmark_SealedChamber: - .4byte gLandmarkName_SealedChamber - .2byte 2140 @ flag num. - - .align 2 -Landmark_FossilManiacsHouse: - .4byte gLandmarkName_FossilManiacsHouse - .2byte 2135 @ flag num. - - .align 2 -Landmark_HuntersHouse: - .4byte gLandmarkName_HuntersHouse - .2byte 2139 @ flag num. - - .align 2 -Landmark_SkyPillar: - .4byte gLandmarkName_SkyPillar - .2byte 2142 @ flag num. - - .align 2 -Landmarks_Route104_0: - .4byte Landmark_FlowerShop - .4byte NULL - - .align 2 -Landmarks_Route104_1: - .4byte Landmark_PetalburgWoods - .4byte Landmark_MrBrineysCottage - .4byte NULL - - .align 2 -Landmarks_Route105_0: - .4byte Landmark_IslandCave - .4byte NULL - - .align 2 -Landmarks_Route106_1: - .4byte Landmark_GraniteCave - .4byte NULL - - .align 2 -Landmarks_Route108_0: - .4byte Landmark_AbandonedShip - .4byte NULL - - .align 2 -Landmarks_Route109_0: - .4byte Landmark_SeashoreHouse - .4byte Landmark_SlateportBeach - .4byte NULL - - .align 2 -Landmarks_Route110_0: - .4byte Landmark_CyclingRoad - .4byte Landmark_NewMauville - .4byte NULL - - .align 2 -Landmarks_Route110_1: - .4byte Landmark_CyclingRoad - .4byte NULL - - .align 2 -Landmarks_Route110_2: - .4byte Landmark_CyclingRoad - .4byte Landmark_TrickHouse - .4byte NULL - - .align 2 -Landmarks_Route111_0: - .4byte Landmark_OldLadysRestShop - .4byte NULL - - .align 2 -Landmarks_Route111_1: - .4byte Landmark_Desert - .4byte NULL - - .align 2 -Landmarks_Route111_3: - .4byte Landmark_DesertRuins - .4byte Landmark_Desert - .4byte NULL - - .align 2 -Landmarks_Route111_4: - .4byte Landmark_WinstrateFamily - .4byte Landmark_Desert - .4byte NULL - - .align 2 -Landmarks_Route112_0: - .4byte Landmark_FieryPath - .4byte Landmark_JaggedPass - .4byte NULL - - .align 2 -Landmarks_Route112_1: - .4byte Landmark_CableCar - .4byte Landmark_FieryPath - .4byte NULL - - .align 2 -Landmarks_Route113_1: - .4byte Landmark_GlassWorkshop - .4byte NULL - - .align 2 -Landmarks_Route114_1: - .4byte Landmark_FossilManiacsHouse - .4byte NULL - - .align 2 -Landmarks_Route114_2: - .4byte Landmark_LanettesHouse - .4byte NULL - - .align 2 -Landmarks_MeteorFalls: - .4byte Landmark_MeteorFalls - .4byte NULL - - .align 2 -Landmarks_Route116_1: - .4byte Landmark_TunnelersRestHouse - .4byte Landmark_RusturfTunnel - .4byte NULL - - .align 2 -Landmarks_Route116_2: - .4byte Landmark_RusturfTunnel - .4byte NULL - - .align 2 -Landmarks_Route117_2: - .4byte Landmark_PokemonDayCare - .4byte NULL - - .align 2 -Landmarks_Route119_1: - .4byte Landmark_WeatherInstitute - .4byte NULL - - .align 2 -Landmarks_Route120_0: - .4byte Landmark_ScorchedSlab - .4byte NULL - - .align 2 -Landmarks_Route120_2: - .4byte Landmark_AncientTomb - .4byte NULL - - .align 2 -Landmarks_Route121_2: - .4byte Landmark_SafariZoneEntrance - .4byte NULL - - .align 2 -Landmarks_Route122_0: - .4byte Landmark_MtPyre - .4byte NULL - - .align 2 -Landmarks_Route123_0: - .4byte Landmark_BerryMastersHouse - .4byte NULL - - .align 2 -Landmarks_Route124_7: - .4byte Landmark_HuntersHouse - .4byte NULL - - .align 2 -Landmarks_Route125_2: - .4byte Landmark_ShoalCave - .4byte NULL - - .align 2 -Landmarks_Route128_1: - .4byte Landmark_SeafloorCavern - .4byte NULL - - .align 2 -Landmarks_Route131_1: - .4byte Landmark_SkyPillar - .4byte NULL - - .align 2 -Landmarks_OceanCurrent: - .4byte Landmark_OceanCurrent - .4byte NULL - - .align 2 -Landmarks_Route134_2: - .4byte Landmark_SealedChamber - .4byte Landmark_OceanCurrent - .4byte NULL - - .align 2 -Landmarks_MtChimney_2: - .4byte Landmark_CableCar - .4byte Landmark_JaggedPass - .4byte NULL - - .align 2 -gLandmarkLists:: @ 83FBA18 - .byte MAPSEC_Route104, 0 - .space 2 - .4byte Landmarks_Route104_0 - - .byte MAPSEC_Route104, 1 - .space 2 - .4byte Landmarks_Route104_1 - - .byte MAPSEC_Route105, 0 - .space 2 - .4byte Landmarks_Route105_0 - - .byte MAPSEC_Route106, 1 - .space 2 - .4byte Landmarks_Route106_1 - - .byte MAPSEC_Route108, 0 - .space 2 - .4byte Landmarks_Route108_0 - - .byte MAPSEC_Route109, 0 - .space 2 - .4byte Landmarks_Route109_0 - - .byte MAPSEC_Route110, 0 - .space 2 - .4byte Landmarks_Route110_0 - - .byte MAPSEC_Route110, 1 - .space 2 - .4byte Landmarks_Route110_1 - - .byte MAPSEC_Route110, 2 - .space 2 - .4byte Landmarks_Route110_2 - - .byte MAPSEC_Route111, 0 - .space 2 - .4byte Landmarks_Route111_0 - - .byte MAPSEC_Route111, 1 - .space 2 - .4byte Landmarks_Route111_1 - - .byte MAPSEC_Route111, 2 - .space 2 - .4byte Landmarks_Route111_1 - - .byte MAPSEC_Route111, 3 - .space 2 - .4byte Landmarks_Route111_3 - - .byte MAPSEC_Route111, 4 - .space 2 - .4byte Landmarks_Route111_4 - - .byte MAPSEC_Route112, 0 - .space 2 - .4byte Landmarks_Route112_0 - - .byte MAPSEC_Route112, 1 - .space 2 - .4byte Landmarks_Route112_1 - - .byte MAPSEC_Route113, 1 - .space 2 - .4byte Landmarks_Route113_1 - - .byte MAPSEC_Route114, 1 - .space 2 - .4byte Landmarks_Route114_1 - - .byte MAPSEC_Route114, 2 - .space 2 - .4byte Landmarks_Route114_2 - - .byte MAPSEC_Route114, 3 - .space 2 - .4byte Landmarks_MeteorFalls - - .byte MAPSEC_Route115, 0 - .space 2 - .4byte Landmarks_MeteorFalls - - .byte MAPSEC_Route115, 1 - .space 2 - .4byte Landmarks_MeteorFalls - - .byte MAPSEC_Route116, 1 - .space 2 - .4byte Landmarks_Route116_1 - - .byte MAPSEC_Route116, 2 - .space 2 - .4byte Landmarks_Route116_2 - - .byte MAPSEC_Route117, 2 - .space 2 - .4byte Landmarks_Route117_2 - - .byte MAPSEC_Route119, 1 - .space 2 - .4byte Landmarks_Route119_1 - - .byte MAPSEC_Route120, 0 - .space 2 - .4byte Landmarks_Route120_0 - - .byte MAPSEC_Route120, 2 - .space 2 - .4byte Landmarks_Route120_2 - - .byte MAPSEC_Route121, 2 - .space 2 - .4byte Landmarks_Route121_2 - - .byte MAPSEC_Route122, 0 - .space 2 - .4byte Landmarks_Route122_0 - - .byte MAPSEC_Route123, 0 - .space 2 - .4byte Landmarks_Route123_0 - - .byte MAPSEC_Route122, 1 - .space 2 - .4byte Landmarks_Route122_0 - - .byte MAPSEC_Route124, 7 - .space 2 - .4byte Landmarks_Route124_7 - - .byte MAPSEC_Route125, 2 - .space 2 - .4byte Landmarks_Route125_2 - - .byte MAPSEC_Route128, 1 - .space 2 - .4byte Landmarks_Route128_1 - - .byte MAPSEC_Route131, 1 - .space 2 - .4byte Landmarks_Route131_1 - - .byte MAPSEC_Route132, 0 - .space 2 - .4byte Landmarks_OceanCurrent - - .byte MAPSEC_Route132, 1 - .space 2 - .4byte Landmarks_OceanCurrent - - .byte MAPSEC_Route133, 0 - .space 2 - .4byte Landmarks_OceanCurrent - - .byte MAPSEC_Route133, 1 - .space 2 - .4byte Landmarks_OceanCurrent - - .byte MAPSEC_Route133, 2 - .space 2 - .4byte Landmarks_OceanCurrent - - .byte MAPSEC_Route134, 0 - .space 2 - .4byte Landmarks_OceanCurrent - - .byte MAPSEC_Route134, 1 - .space 2 - .4byte Landmarks_OceanCurrent - - .byte MAPSEC_Route134, 2 - .space 2 - .4byte Landmarks_Route134_2 - - .byte MAPSEC_MtChimney, 2 - .space 2 - .4byte Landmarks_MtChimney_2 - - .byte MAPSEC_Nothing, 0 - .space 2 - .4byte NULL diff --git a/data/mail.s b/data/mail.s deleted file mode 100644 index f5ae7f102..000000000 --- a/data/mail.s +++ /dev/null @@ -1,178 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 1 -gUnknown_083E562C:: @ 83E562C - .2byte 0x6ACD, 0x51A5 - .2byte 0x45FC, 0x38D4 - - .align 2 -gMailGraphicsTable:: @ 83E5634 - .4byte gMailPalette_Orange - .4byte gMailTiles_Orange - .4byte gMailTilemap_Orange - .2byte 0x2C0 - .2byte 0 - .2byte 0x294A - .2byte 0x6739 - - .4byte gMailPalette_Harbor - .4byte gMailTiles_Harbor - .4byte gMailTilemap_Harbor - .2byte 0x2E0 - .2byte 0 - .2byte 0x7FFF - .2byte 0x4631 - - .4byte gMailPalette_Glitter - .4byte gMailTiles_Glitter - .4byte gMailTilemap_Glitter - .2byte 0x400 - .2byte 0 - .2byte 0x294A - .2byte 0x6739 - - .4byte gMailPalette_Mech - .4byte gMailTiles_Mech - .4byte gMailTilemap_Mech - .2byte 0x1E0 - .2byte 0 - .2byte 0x7FFF - .2byte 0x4631 - - .4byte gMailPalette_Wood - .4byte gMailTiles_Wood - .4byte gMailTilemap_Wood - .2byte 0x2E0 - .2byte 0 - .2byte 0x7FFF - .2byte 0x4631 - - .4byte gMailPalette_Wave - .4byte gMailTiles_Wave - .4byte gMailTilemap_Wave - .2byte 0x300 - .2byte 0 - .2byte 0x294A - .2byte 0x6739 - - .4byte gMailPalette_Bead - .4byte gMailTiles_Bead - .4byte gMailTilemap_Bead - .2byte 0x140 - .2byte 0 - .2byte 0x7FFF - .2byte 0x4631 - - .4byte gMailPalette_Shadow - .4byte gMailTiles_Shadow - .4byte gMailTilemap_Shadow - .2byte 0x300 - .2byte 0 - .2byte 0x7FFF - .2byte 0x4631 - - .4byte gMailPalette_Tropic - .4byte gMailTiles_Tropic - .4byte gMailTilemap_Tropic - .2byte 0x220 - .2byte 0 - .2byte 0x294A - .2byte 0x6739 - - .4byte gMailPalette_Dream - .4byte gMailTiles_Dream - .4byte gMailTilemap_Dream - .2byte 0x340 - .2byte 0 - .2byte 0x294A - .2byte 0x6739 - - .4byte gMailPalette_Fab - .4byte gMailTiles_Fab - .4byte gMailTilemap_Fab - .2byte 0x2A0 - .2byte 0 - .2byte 0x294A - .2byte 0x6739 - - .4byte gMailPalette_Retro - .4byte gMailTiles_Retro - .4byte gMailTilemap_Retro - .2byte 0x520 - .2byte 0 - .2byte 0x294A - .2byte 0x6739 - - .align 2 -Unknown_3E5724: @ 83E5724 - .4byte 0xC - .4byte 0xC - .4byte 0xC - -gUnknown_083E5730:: @ 83E5730 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 16, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - - .align 2 -Unknown_3E5790: @ 83E5790 - .4byte 0x8 - .4byte 0x8 - .4byte 0x8 - .4byte 0x8 - .4byte 0x4 - - .align 2 -gUnknown_083E57A4:: @ 83E57A4 - .byte 5, 15, 15, 52 - .4byte Unknown_3E5790 - .byte 5, 15, 15, 52 - .4byte Unknown_3E5790 - .byte 5, 15, 16, 52 - .4byte Unknown_3E5790 - .byte 5, 15, 15, 52 - .4byte Unknown_3E5790 - .byte 5, 15, 15, 52 - .4byte Unknown_3E5790 - .byte 5, 15, 16, 52 - .4byte Unknown_3E5790 - .byte 5, 15, 16, 52 - .4byte Unknown_3E5790 - .byte 5, 15, 15, 52 - .4byte Unknown_3E5790 - .byte 5, 15, 15, 52 - .4byte Unknown_3E5790 - .byte 5, 15, 15, 52 - .4byte Unknown_3E5790 - .byte 5, 16, 15, 52 - .4byte Unknown_3E5790 - .byte 5, 15, 15, 52 - .4byte Unknown_3E5790 - -@ XXX: what is this? - .align 2 - .4byte 0x2000000 diff --git a/data/main_menu.s b/data/main_menu.s deleted file mode 100644 index 1fae3850b..000000000 --- a/data/main_menu.s +++ /dev/null @@ -1,59 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_081E764C:: @ 81E764C - .incbin "graphics/birch_speech/bg0.gbapal" - .incbin "graphics/birch_speech/bg1.gbapal" - - .align 2 -gBirchIntroShadowGfx:: @ 81E768C - .incbin "graphics/birch_speech/shadow.4bpp.lz" - - .align 2 -gUnknown_081E7834:: @ 81E7834 - .incbin "graphics/birch_speech/map.bin.lz" - - .align 2 -gUnknown_081E795C:: @ 81E795C - .incbin "graphics/birch_speech/bg2.gbapal" - - .align 2 -gUnknown_081E796C:: @ 81E796C - .space 16 - - .align 2 -gMainMenuPalette:: @ 81E797C - .incbin "graphics/misc/main_menu.gbapal" - - .align 2 -gSpriteAffineAnim_81E799C:: @ 81E799C - obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 48 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_81E79AC:: @ 81E79AC - .4byte gSpriteAffineAnim_81E799C - - .align 2 -gUnknown_081E79B0:: @ 81E79B0 - .4byte gBirchText_Boy, 0 - .4byte gBirchText_Girl, 0 - - .align 2 -gMalePresetNames:: @ 81E79C0 - .4byte gBirchText_NewName, 0 - .4byte gDefaultBoyName1, 0 - .4byte gDefaultBoyName2, 0 - .4byte gDefaultBoyName3, 0 - .4byte gDefaultBoyName4, 0 - - .align 2 -gFemalePresetNames:: @ 81E79E8 - .4byte gBirchText_NewName, 0 - .4byte gDefaultGirlName1, 0 - .4byte gDefaultGirlName2, 0 - .4byte gDefaultGirlName3, 0 - .4byte gDefaultGirlName4, 0 diff --git a/data/map_events.s b/data/map_events.s index 68c8e510e..e7fb03fb6 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,3 +1,7 @@ +#include "constants/flags.h" +#include "constants/items.h" +#include "constants/map_objects.h" +#include "constants/maps.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -396,15 +400,4 @@ .include "data/maps/events/Route119_WeatherInstitute_1F.inc" .include "data/maps/events/Route119_WeatherInstitute_2F.inc" .include "data/maps/events/Route119_House.inc" -Route124_DivingTreasureHuntersHouse_MapObjects:: @ 839300C - object_event 1, MAP_OBJ_GFX_MAN_6, 0, 5, 0, 4, 0, 0, 9, 0, 0, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_163E04, 0, 0, 0 - -Route124_DivingTreasureHuntersHouse_MapWarps:: @ 8393024 - warp_def 3, 8, 0, 0, Route124 - warp_def 4, 8, 0, 0, Route124 - -Route124_DivingTreasureHuntersHouse_MapBGEvents:: @ 8393034 - bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_164335 - -Route124_DivingTreasureHuntersHouse_MapEvents:: @ 8393040 - map_events Route124_DivingTreasureHuntersHouse_MapObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents + .include "data/maps/events/Route124_DivingTreasureHuntersHouse.inc" diff --git a/data/maps.s b/data/maps.s index a8074c02a..92f5544a1 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,3 +1,5 @@ +#include "constants/maps.h" +#include "constants/songs.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/DewfordTown/connections.inc b/data/maps/DewfordTown/connections.inc index 4f47ce304..52339411b 100644 --- a/data/maps/DewfordTown/connections.inc +++ b/data/maps/DewfordTown/connections.inc @@ -1,6 +1,6 @@ DewfordTown_MapConnectionsList:: @ 8308650 - connection up, -60, Route106 - connection right, 0, Route107 + connection up, -60, MAP_ROUTE106 + connection right, 0, MAP_ROUTE107 DewfordTown_MapConnections:: @ 8308668 .4byte 0x2 diff --git a/data/maps/EverGrandeCity/connections.inc b/data/maps/EverGrandeCity/connections.inc index fd81ce46b..7833824d8 100644 --- a/data/maps/EverGrandeCity/connections.inc +++ b/data/maps/EverGrandeCity/connections.inc @@ -1,5 +1,5 @@ EverGrandeCity_MapConnectionsList:: @ 8308808 - connection left, 40, Route128 + connection left, 40, MAP_ROUTE128 EverGrandeCity_MapConnections:: @ 8308814 .4byte 0x1 diff --git a/data/maps/FallarborTown/connections.inc b/data/maps/FallarborTown/connections.inc index 259d5adf0..369d244fc 100644 --- a/data/maps/FallarborTown/connections.inc +++ b/data/maps/FallarborTown/connections.inc @@ -1,6 +1,6 @@ FallarborTown_MapConnectionsList:: @ 8308684 - connection left, 0, Route114 - connection right, 0, Route113 + connection left, 0, MAP_ROUTE114 + connection right, 0, MAP_ROUTE113 FallarborTown_MapConnections:: @ 830869C .4byte 0x2 diff --git a/data/maps/FortreeCity/connections.inc b/data/maps/FortreeCity/connections.inc index 3012973d8..4243269aa 100644 --- a/data/maps/FortreeCity/connections.inc +++ b/data/maps/FortreeCity/connections.inc @@ -1,6 +1,6 @@ FortreeCity_MapConnectionsList:: @ 8308794 - connection left, 0, Route119 - connection right, 0, Route120 + connection left, 0, MAP_ROUTE119 + connection right, 0, MAP_ROUTE120 FortreeCity_MapConnections:: @ 83087AC .4byte 0x2 diff --git a/data/maps/LavaridgeTown/connections.inc b/data/maps/LavaridgeTown/connections.inc index b31155ae3..5adf84bd2 100644 --- a/data/maps/LavaridgeTown/connections.inc +++ b/data/maps/LavaridgeTown/connections.inc @@ -1,5 +1,5 @@ LavaridgeTown_MapConnectionsList:: @ 8308670 - connection right, -40, Route112 + connection right, -40, MAP_ROUTE112 LavaridgeTown_MapConnections:: @ 830867C .4byte 0x1 diff --git a/data/maps/LilycoveCity/connections.inc b/data/maps/LilycoveCity/connections.inc index a476e2de2..4181dbc05 100644 --- a/data/maps/LilycoveCity/connections.inc +++ b/data/maps/LilycoveCity/connections.inc @@ -1,6 +1,6 @@ LilycoveCity_MapConnectionsList:: @ 83087B4 - connection left, 10, Route121 - connection right, -10, Route124 + connection left, 10, MAP_ROUTE121 + connection right, -10, MAP_ROUTE124 LilycoveCity_MapConnections:: @ 83087CC .4byte 0x2 diff --git a/data/maps/LittlerootTown/connections.inc b/data/maps/LittlerootTown/connections.inc index d045d04d7..8484aa4b9 100644 --- a/data/maps/LittlerootTown/connections.inc +++ b/data/maps/LittlerootTown/connections.inc @@ -1,5 +1,5 @@ LittlerootTown_MapConnectionsList:: @ 8308610 - connection up, 0, Route101 + connection up, 0, MAP_ROUTE101 LittlerootTown_MapConnections:: @ 830861C .4byte 0x1 diff --git a/data/maps/MauvilleCity/connections.inc b/data/maps/MauvilleCity/connections.inc index 07f3649cd..cc06f45e7 100644 --- a/data/maps/MauvilleCity/connections.inc +++ b/data/maps/MauvilleCity/connections.inc @@ -1,8 +1,8 @@ MauvilleCity_MapConnectionsList:: @ 8308730 - connection up, 0, Route111 - connection down, 0, Route110 - connection left, 0, Route117 - connection right, 0, Route118 + connection up, 0, MAP_ROUTE111 + connection down, 0, MAP_ROUTE110 + connection left, 0, MAP_ROUTE117 + connection right, 0, MAP_ROUTE118 MauvilleCity_MapConnections:: @ 8308760 .4byte 0x4 diff --git a/data/maps/MossdeepCity/connections.inc b/data/maps/MossdeepCity/connections.inc index 0e654d9cc..5fb40e7f4 100644 --- a/data/maps/MossdeepCity/connections.inc +++ b/data/maps/MossdeepCity/connections.inc @@ -1,7 +1,7 @@ MossdeepCity_MapConnectionsList:: @ 83087D4 - connection up, 0, Route125 - connection down, 0, Route127 - connection left, -40, Route124 + connection up, 0, MAP_ROUTE125 + connection down, 0, MAP_ROUTE127 + connection left, -40, MAP_ROUTE124 MossdeepCity_MapConnections:: @ 83087F8 .4byte 0x3 diff --git a/data/maps/OldaleTown/connections.inc b/data/maps/OldaleTown/connections.inc index fc5495101..1e4bdeea8 100644 --- a/data/maps/OldaleTown/connections.inc +++ b/data/maps/OldaleTown/connections.inc @@ -1,7 +1,7 @@ OldaleTown_MapConnectionsList:: @ 8308624 - connection up, 0, Route103 - connection down, 0, Route101 - connection left, 0, Route102 + connection up, 0, MAP_ROUTE103 + connection down, 0, MAP_ROUTE101 + connection left, 0, MAP_ROUTE102 OldaleTown_MapConnections:: @ 8308648 .4byte 0x3 diff --git a/data/maps/PacifidlogTown/connections.inc b/data/maps/PacifidlogTown/connections.inc index 3c0ae1a62..0a6083d00 100644 --- a/data/maps/PacifidlogTown/connections.inc +++ b/data/maps/PacifidlogTown/connections.inc @@ -1,6 +1,6 @@ PacifidlogTown_MapConnectionsList:: @ 83086C4 - connection left, 0, Route132 - connection right, 0, Route131 + connection left, 0, MAP_ROUTE132 + connection right, 0, MAP_ROUTE131 PacifidlogTown_MapConnections:: @ 83086DC .4byte 0x2 diff --git a/data/maps/PetalburgCity/connections.inc b/data/maps/PetalburgCity/connections.inc index cabded017..b412774bf 100644 --- a/data/maps/PetalburgCity/connections.inc +++ b/data/maps/PetalburgCity/connections.inc @@ -1,6 +1,6 @@ PetalburgCity_MapConnectionsList:: @ 83086E4 - connection left, -50, Route104 - connection right, 10, Route102 + connection left, -50, MAP_ROUTE104 + connection right, 10, MAP_ROUTE102 PetalburgCity_MapConnections:: @ 83086FC .4byte 0x2 diff --git a/data/maps/Route101/connections.inc b/data/maps/Route101/connections.inc index 78f73238b..2dd103b89 100644 --- a/data/maps/Route101/connections.inc +++ b/data/maps/Route101/connections.inc @@ -1,6 +1,6 @@ Route101_MapConnectionsList:: @ 830881C - connection up, 0, OldaleTown - connection down, 0, LittlerootTown + connection up, 0, MAP_OLDALE_TOWN + connection down, 0, MAP_LITTLEROOT_TOWN Route101_MapConnections:: @ 8308834 .4byte 0x2 diff --git a/data/maps/Route102/connections.inc b/data/maps/Route102/connections.inc index c132f5fa7..56e30d843 100644 --- a/data/maps/Route102/connections.inc +++ b/data/maps/Route102/connections.inc @@ -1,6 +1,6 @@ Route102_MapConnectionsList:: @ 830883C - connection left, -10, PetalburgCity - connection right, 0, OldaleTown + connection left, -10, MAP_PETALBURG_CITY + connection right, 0, MAP_OLDALE_TOWN Route102_MapConnections:: @ 8308854 .4byte 0x2 diff --git a/data/maps/Route103/connections.inc b/data/maps/Route103/connections.inc index 1510b33d2..e3ce959f8 100644 --- a/data/maps/Route103/connections.inc +++ b/data/maps/Route103/connections.inc @@ -1,6 +1,6 @@ Route103_MapConnectionsList:: @ 830885C - connection down, 0, OldaleTown - connection right, -60, Route110 + connection down, 0, MAP_OLDALE_TOWN + connection right, -60, MAP_ROUTE110 Route103_MapConnections:: @ 8308874 .4byte 0x2 diff --git a/data/maps/Route104/connections.inc b/data/maps/Route104/connections.inc index 38085d1a8..488af7f8d 100644 --- a/data/maps/Route104/connections.inc +++ b/data/maps/Route104/connections.inc @@ -1,7 +1,7 @@ Route104_MapConnectionsList:: @ 830887C - connection up, 0, RustboroCity - connection down, 0, Route105 - connection right, 50, PetalburgCity + connection up, 0, MAP_RUSTBORO_CITY + connection down, 0, MAP_ROUTE105 + connection right, 50, MAP_PETALBURG_CITY Route104_MapConnections:: @ 83088A0 .4byte 0x3 diff --git a/data/maps/Route105/connections.inc b/data/maps/Route105/connections.inc index 6915b9d08..dc0962e5f 100644 --- a/data/maps/Route105/connections.inc +++ b/data/maps/Route105/connections.inc @@ -1,6 +1,6 @@ Route105_MapConnectionsList:: @ 83088A8 - connection up, 0, Route104 - connection down, 0, Route106 + connection up, 0, MAP_ROUTE104 + connection down, 0, MAP_ROUTE106 Route105_MapConnections:: @ 83088C0 .4byte 0x2 diff --git a/data/maps/Route106/connections.inc b/data/maps/Route106/connections.inc index 4d041e65c..41adbb9d1 100644 --- a/data/maps/Route106/connections.inc +++ b/data/maps/Route106/connections.inc @@ -1,6 +1,6 @@ Route106_MapConnectionsList:: @ 83088C8 - connection up, 0, Route105 - connection down, 60, DewfordTown + connection up, 0, MAP_ROUTE105 + connection down, 60, MAP_DEWFORD_TOWN Route106_MapConnections:: @ 83088E0 .4byte 0x2 diff --git a/data/maps/Route107/connections.inc b/data/maps/Route107/connections.inc index a3da84672..c7c7174c1 100644 --- a/data/maps/Route107/connections.inc +++ b/data/maps/Route107/connections.inc @@ -1,6 +1,6 @@ Route107_MapConnectionsList:: @ 83088E8 - connection left, 0, DewfordTown - connection right, 0, Route108 + connection left, 0, MAP_DEWFORD_TOWN + connection right, 0, MAP_ROUTE108 Route107_MapConnections:: @ 8308900 .4byte 0x2 diff --git a/data/maps/Route108/connections.inc b/data/maps/Route108/connections.inc index aba43d804..f5455457e 100644 --- a/data/maps/Route108/connections.inc +++ b/data/maps/Route108/connections.inc @@ -1,6 +1,6 @@ Route108_MapConnectionsList:: @ 8308908 - connection left, 0, Route107 - connection right, -40, Route109 + connection left, 0, MAP_ROUTE107 + connection right, -40, MAP_ROUTE109 Route108_MapConnections:: @ 8308920 .4byte 0x2 diff --git a/data/maps/Route109/connections.inc b/data/maps/Route109/connections.inc index 5135e8e8b..44a65da35 100644 --- a/data/maps/Route109/connections.inc +++ b/data/maps/Route109/connections.inc @@ -1,6 +1,6 @@ Route109_MapConnectionsList:: @ 8308928 - connection up, 0, SlateportCity - connection left, 40, Route108 + connection up, 0, MAP_SLATEPORT_CITY + connection left, 40, MAP_ROUTE108 Route109_MapConnections:: @ 8308940 .4byte 0x2 diff --git a/data/maps/Route110/connections.inc b/data/maps/Route110/connections.inc index d0f88deb3..9ba85fdbc 100644 --- a/data/maps/Route110/connections.inc +++ b/data/maps/Route110/connections.inc @@ -1,7 +1,7 @@ Route110_MapConnectionsList:: @ 8308948 - connection up, 0, MauvilleCity - connection down, 0, SlateportCity - connection left, 60, Route103 + connection up, 0, MAP_MAUVILLE_CITY + connection down, 0, MAP_SLATEPORT_CITY + connection left, 60, MAP_ROUTE103 Route110_MapConnections:: @ 830896C .4byte 0x3 diff --git a/data/maps/Route111/connections.inc b/data/maps/Route111/connections.inc index 411dea34b..a48035299 100644 --- a/data/maps/Route111/connections.inc +++ b/data/maps/Route111/connections.inc @@ -1,7 +1,7 @@ Route111_MapConnectionsList:: @ 8308974 - connection down, 0, MauvilleCity - connection left, 0, Route113 - connection left, 20, Route112 + connection down, 0, MAP_MAUVILLE_CITY + connection left, 0, MAP_ROUTE113 + connection left, 20, MAP_ROUTE112 Route111_MapConnections:: @ 8308998 .4byte 0x3 diff --git a/data/maps/Route112/connections.inc b/data/maps/Route112/connections.inc index eee04163c..88571a0ea 100644 --- a/data/maps/Route112/connections.inc +++ b/data/maps/Route112/connections.inc @@ -1,7 +1,7 @@ Route112_MapConnectionsList:: @ 83089A0 - connection up, -60, Route113 - connection left, 40, LavaridgeTown - connection right, -20, Route111 + connection up, -60, MAP_ROUTE113 + connection left, 40, MAP_LAVARIDGE_TOWN + connection right, -20, MAP_ROUTE111 Route112_MapConnections:: @ 83089C4 .4byte 0x3 diff --git a/data/maps/Route113/connections.inc b/data/maps/Route113/connections.inc index ffa7b231d..fd6d20812 100644 --- a/data/maps/Route113/connections.inc +++ b/data/maps/Route113/connections.inc @@ -1,7 +1,7 @@ Route113_MapConnectionsList:: @ 83089CC - connection down, 60, Route112 - connection left, 0, FallarborTown - connection right, 0, Route111 + connection down, 60, MAP_ROUTE112 + connection left, 0, MAP_FALLARBOR_TOWN + connection right, 0, MAP_ROUTE111 Route113_MapConnections:: @ 83089F0 .4byte 0x3 diff --git a/data/maps/Route114/connections.inc b/data/maps/Route114/connections.inc index 603c5e4b1..1a58d2439 100644 --- a/data/maps/Route114/connections.inc +++ b/data/maps/Route114/connections.inc @@ -1,6 +1,6 @@ Route114_MapConnectionsList:: @ 83089F8 - connection left, 40, Route115 - connection right, 0, FallarborTown + connection left, 40, MAP_ROUTE115 + connection right, 0, MAP_FALLARBOR_TOWN Route114_MapConnections:: @ 8308A10 .4byte 0x2 diff --git a/data/maps/Route115/connections.inc b/data/maps/Route115/connections.inc index 3886f114f..80fad1097 100644 --- a/data/maps/Route115/connections.inc +++ b/data/maps/Route115/connections.inc @@ -1,6 +1,6 @@ Route115_MapConnectionsList:: @ 8308A18 - connection down, 0, RustboroCity - connection right, -40, Route114 + connection down, 0, MAP_RUSTBORO_CITY + connection right, -40, MAP_ROUTE114 Route115_MapConnections:: @ 8308A30 .4byte 0x2 diff --git a/data/maps/Route116/connections.inc b/data/maps/Route116/connections.inc index 787314054..f8b3afd72 100644 --- a/data/maps/Route116/connections.inc +++ b/data/maps/Route116/connections.inc @@ -1,6 +1,6 @@ Route116_MapConnectionsList:: @ 8308A38 - connection down, 80, VerdanturfTown - connection left, 0, RustboroCity + connection down, 80, MAP_VERDANTURF_TOWN + connection left, 0, MAP_RUSTBORO_CITY Route116_MapConnections:: @ 8308A50 .4byte 0x2 diff --git a/data/maps/Route117/connections.inc b/data/maps/Route117/connections.inc index 2de505e01..a66a5d6f9 100644 --- a/data/maps/Route117/connections.inc +++ b/data/maps/Route117/connections.inc @@ -1,6 +1,6 @@ Route117_MapConnectionsList:: @ 8308A58 - connection left, 0, VerdanturfTown - connection right, 0, MauvilleCity + connection left, 0, MAP_VERDANTURF_TOWN + connection right, 0, MAP_MAUVILLE_CITY Route117_MapConnections:: @ 8308A70 .4byte 0x2 diff --git a/data/maps/Route118/connections.inc b/data/maps/Route118/connections.inc index 764071baf..9ec5d28b6 100644 --- a/data/maps/Route118/connections.inc +++ b/data/maps/Route118/connections.inc @@ -1,7 +1,7 @@ Route118_MapConnectionsList:: @ 8308A78 - connection up, 40, Route119 - connection left, 0, MauvilleCity - connection right, 0, Route123 + connection up, 40, MAP_ROUTE119 + connection left, 0, MAP_MAUVILLE_CITY + connection right, 0, MAP_ROUTE123 Route118_MapConnections:: @ 8308A9C .4byte 0x3 diff --git a/data/maps/Route119/connections.inc b/data/maps/Route119/connections.inc index 26ce12a01..1a499afe5 100644 --- a/data/maps/Route119/connections.inc +++ b/data/maps/Route119/connections.inc @@ -1,6 +1,6 @@ Route119_MapConnectionsList:: @ 8308AA4 - connection down, -40, Route118 - connection right, 0, FortreeCity + connection down, -40, MAP_ROUTE118 + connection right, 0, MAP_FORTREE_CITY Route119_MapConnections:: @ 8308ABC .4byte 0x2 diff --git a/data/maps/Route120/connections.inc b/data/maps/Route120/connections.inc index a0f747c68..714d8294e 100644 --- a/data/maps/Route120/connections.inc +++ b/data/maps/Route120/connections.inc @@ -1,6 +1,6 @@ Route120_MapConnectionsList:: @ 8308AC4 - connection left, 0, FortreeCity - connection right, 80, Route121 + connection left, 0, MAP_FORTREE_CITY + connection right, 80, MAP_ROUTE121 Route120_MapConnections:: @ 8308ADC .4byte 0x2 diff --git a/data/maps/Route121/connections.inc b/data/maps/Route121/connections.inc index a77f1b828..80affb98d 100644 --- a/data/maps/Route121/connections.inc +++ b/data/maps/Route121/connections.inc @@ -1,7 +1,7 @@ Route121_MapConnectionsList:: @ 8308AE4 - connection down, 20, Route122 - connection left, -80, Route120 - connection right, -10, LilycoveCity + connection down, 20, MAP_ROUTE122 + connection left, -80, MAP_ROUTE120 + connection right, -10, MAP_LILYCOVE_CITY Route121_MapConnections:: @ 8308B08 .4byte 0x3 diff --git a/data/maps/Route122/connections.inc b/data/maps/Route122/connections.inc index 214826c04..9e70cc5c0 100644 --- a/data/maps/Route122/connections.inc +++ b/data/maps/Route122/connections.inc @@ -1,6 +1,6 @@ Route122_MapConnectionsList:: @ 8308B10 - connection up, -20, Route121 - connection down, -100, Route123 + connection up, -20, MAP_ROUTE121 + connection down, -100, MAP_ROUTE123 Route122_MapConnections:: @ 8308B28 .4byte 0x2 diff --git a/data/maps/Route123/connections.inc b/data/maps/Route123/connections.inc index cc54683f4..b57ce9d3b 100644 --- a/data/maps/Route123/connections.inc +++ b/data/maps/Route123/connections.inc @@ -1,6 +1,6 @@ Route123_MapConnectionsList:: @ 8308B30 - connection up, 100, Route122 - connection left, 0, Route118 + connection up, 100, MAP_ROUTE122 + connection left, 0, MAP_ROUTE118 Route123_MapConnections:: @ 8308B48 .4byte 0x2 diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc index 5384926b0..e8ed0c8df 100644 --- a/data/maps/Route124/connections.inc +++ b/data/maps/Route124/connections.inc @@ -1,9 +1,9 @@ Route124_MapConnectionsList:: @ 8308B50 - connection down, 0, Route126 - connection left, 10, LilycoveCity - connection right, 0, Route125 - connection right, 40, MossdeepCity - connection dive, 0, Underwater1 + connection down, 0, MAP_ROUTE126 + connection left, 10, MAP_LILYCOVE_CITY + connection right, 0, MAP_ROUTE125 + connection right, 40, MAP_MOSSDEEP_CITY + connection dive, 0, MAP_UNDERWATER1 Route124_MapConnections:: @ 8308B8C .4byte 0x5 diff --git a/data/maps/Route125/connections.inc b/data/maps/Route125/connections.inc index 33b7c705c..c573987eb 100644 --- a/data/maps/Route125/connections.inc +++ b/data/maps/Route125/connections.inc @@ -1,6 +1,6 @@ Route125_MapConnectionsList:: @ 8308B94 - connection down, 0, MossdeepCity - connection left, 0, Route124 + connection down, 0, MAP_MOSSDEEP_CITY + connection left, 0, MAP_ROUTE124 Route125_MapConnections:: @ 8308BAC .4byte 0x2 diff --git a/data/maps/Route126/connections.inc b/data/maps/Route126/connections.inc index 9ff9688af..2bcf57ced 100644 --- a/data/maps/Route126/connections.inc +++ b/data/maps/Route126/connections.inc @@ -1,7 +1,7 @@ Route126_MapConnectionsList:: @ 8308BB4 - connection up, 0, Route124 - connection right, 0, Route127 - connection dive, 0, Underwater2 + connection up, 0, MAP_ROUTE124 + connection right, 0, MAP_ROUTE127 + connection dive, 0, MAP_UNDERWATER2 Route126_MapConnections:: @ 8308BD8 .4byte 0x3 diff --git a/data/maps/Route127/connections.inc b/data/maps/Route127/connections.inc index 997c98c61..017f7de41 100644 --- a/data/maps/Route127/connections.inc +++ b/data/maps/Route127/connections.inc @@ -1,8 +1,8 @@ Route127_MapConnectionsList:: @ 8308BE0 - connection up, 0, MossdeepCity - connection down, 0, Route128 - connection left, 0, Route126 - connection dive, 0, Underwater3 + connection up, 0, MAP_MOSSDEEP_CITY + connection down, 0, MAP_ROUTE128 + connection left, 0, MAP_ROUTE126 + connection dive, 0, MAP_UNDERWATER3 Route127_MapConnections:: @ 8308C10 .4byte 0x4 diff --git a/data/maps/Route128/connections.inc b/data/maps/Route128/connections.inc index b187c7f64..e66b44582 100644 --- a/data/maps/Route128/connections.inc +++ b/data/maps/Route128/connections.inc @@ -1,8 +1,8 @@ Route128_MapConnectionsList:: @ 8308C18 - connection up, 0, Route127 - connection down, 0, Route129 - connection right, -40, EverGrandeCity - connection dive, 0, Underwater4 + connection up, 0, MAP_ROUTE127 + connection down, 0, MAP_ROUTE129 + connection right, -40, MAP_EVER_GRANDE_CITY + connection dive, 0, MAP_UNDERWATER4 Route128_MapConnections:: @ 8308C48 .4byte 0x4 diff --git a/data/maps/Route129/connections.inc b/data/maps/Route129/connections.inc index 7a1db2bc7..d1022353e 100644 --- a/data/maps/Route129/connections.inc +++ b/data/maps/Route129/connections.inc @@ -1,6 +1,6 @@ Route129_MapConnectionsList:: @ 8308C50 - connection up, 0, Route128 - connection left, 0, Route130 + connection up, 0, MAP_ROUTE128 + connection left, 0, MAP_ROUTE130 Route129_MapConnections:: @ 8308C68 .4byte 0x2 diff --git a/data/maps/Route130/connections.inc b/data/maps/Route130/connections.inc index 211eba7f1..535725bb0 100644 --- a/data/maps/Route130/connections.inc +++ b/data/maps/Route130/connections.inc @@ -1,6 +1,6 @@ Route130_MapConnectionsList:: @ 8308C70 - connection left, 0, Route131 - connection right, 0, Route129 + connection left, 0, MAP_ROUTE131 + connection right, 0, MAP_ROUTE129 Route130_MapConnections:: @ 8308C88 .4byte 0x2 diff --git a/data/maps/Route131/connections.inc b/data/maps/Route131/connections.inc index a1b1adff7..2ac2b6770 100644 --- a/data/maps/Route131/connections.inc +++ b/data/maps/Route131/connections.inc @@ -1,6 +1,6 @@ Route131_MapConnectionsList:: @ 8308C90 - connection left, 0, PacifidlogTown - connection right, 0, Route130 + connection left, 0, MAP_PACIFIDLOG_TOWN + connection right, 0, MAP_ROUTE130 Route131_MapConnections:: @ 8308CA8 .4byte 0x2 diff --git a/data/maps/Route132/connections.inc b/data/maps/Route132/connections.inc index a0aff0a42..94feb7dec 100644 --- a/data/maps/Route132/connections.inc +++ b/data/maps/Route132/connections.inc @@ -1,6 +1,6 @@ Route132_MapConnectionsList:: @ 8308CB0 - connection left, 0, Route133 - connection right, 0, PacifidlogTown + connection left, 0, MAP_ROUTE133 + connection right, 0, MAP_PACIFIDLOG_TOWN Route132_MapConnections:: @ 8308CC8 .4byte 0x2 diff --git a/data/maps/Route133/connections.inc b/data/maps/Route133/connections.inc index 979b49ee9..28445baca 100644 --- a/data/maps/Route133/connections.inc +++ b/data/maps/Route133/connections.inc @@ -1,6 +1,6 @@ Route133_MapConnectionsList:: @ 8308CD0 - connection left, 0, Route134 - connection right, 0, Route132 + connection left, 0, MAP_ROUTE134 + connection right, 0, MAP_ROUTE132 Route133_MapConnections:: @ 8308CE8 .4byte 0x2 diff --git a/data/maps/Route134/connections.inc b/data/maps/Route134/connections.inc index aba5c2c9a..4b90e83ed 100644 --- a/data/maps/Route134/connections.inc +++ b/data/maps/Route134/connections.inc @@ -1,6 +1,6 @@ Route134_MapConnectionsList:: @ 8308CF0 - connection left, 0, SlateportCity - connection right, 0, Route133 + connection left, 0, MAP_SLATEPORT_CITY + connection right, 0, MAP_ROUTE133 Route134_MapConnections:: @ 8308D08 .4byte 0x2 diff --git a/data/maps/RustboroCity/connections.inc b/data/maps/RustboroCity/connections.inc index fd1fa519c..70e96e5b6 100644 --- a/data/maps/RustboroCity/connections.inc +++ b/data/maps/RustboroCity/connections.inc @@ -1,7 +1,7 @@ RustboroCity_MapConnectionsList:: @ 8308768 - connection up, 0, Route115 - connection down, 0, Route104 - connection right, 0, Route116 + connection up, 0, MAP_ROUTE115 + connection down, 0, MAP_ROUTE104 + connection right, 0, MAP_ROUTE116 RustboroCity_MapConnections:: @ 830878C .4byte 0x3 diff --git a/data/maps/SafariZone_Northeast/connections.inc b/data/maps/SafariZone_Northeast/connections.inc index 5c9c47793..6093ed2a0 100644 --- a/data/maps/SafariZone_Northeast/connections.inc +++ b/data/maps/SafariZone_Northeast/connections.inc @@ -1,6 +1,6 @@ SafariZone_Northeast_MapConnectionsList:: @ 8308DC8 - connection left, 0, SafariZone_Northwest - connection down, 0, SafariZone_Southeast + connection left, 0, MAP_SAFARI_ZONE_NORTHWEST + connection down, 0, MAP_SAFARI_ZONE_SOUTHEAST SafariZone_Northeast_MapConnections:: @ 8308DE0 .4byte 0x2 diff --git a/data/maps/SafariZone_Northwest/connections.inc b/data/maps/SafariZone_Northwest/connections.inc index b36d15bad..a7b459df2 100644 --- a/data/maps/SafariZone_Northwest/connections.inc +++ b/data/maps/SafariZone_Northwest/connections.inc @@ -1,6 +1,6 @@ SafariZone_Northwest_MapConnectionsList:: @ 8308DA8 - connection right, 0, SafariZone_Northeast - connection down, 0, SafariZone_Southwest + connection right, 0, MAP_SAFARI_ZONE_NORTHEAST + connection down, 0, MAP_SAFARI_ZONE_SOUTHWEST SafariZone_Northwest_MapConnections:: @ 8308DC0 .4byte 0x2 diff --git a/data/maps/SafariZone_Southeast/connections.inc b/data/maps/SafariZone_Southeast/connections.inc index e4782d1aa..c9c6d2143 100644 --- a/data/maps/SafariZone_Southeast/connections.inc +++ b/data/maps/SafariZone_Southeast/connections.inc @@ -1,6 +1,6 @@ SafariZone_Southeast_MapConnectionsList:: @ 8308E08 - connection up, 0, SafariZone_Northeast - connection left, 0, SafariZone_Southwest + connection up, 0, MAP_SAFARI_ZONE_NORTHEAST + connection left, 0, MAP_SAFARI_ZONE_SOUTHWEST SafariZone_Southeast_MapConnections:: @ 8308E20 .4byte 0x2 diff --git a/data/maps/SafariZone_Southwest/connections.inc b/data/maps/SafariZone_Southwest/connections.inc index a0fea0609..84e103cb4 100644 --- a/data/maps/SafariZone_Southwest/connections.inc +++ b/data/maps/SafariZone_Southwest/connections.inc @@ -1,6 +1,6 @@ SafariZone_Southwest_MapConnectionsList:: @ 8308DE8 - connection up, 0, SafariZone_Northwest - connection right, 0, SafariZone_Southeast + connection up, 0, MAP_SAFARI_ZONE_NORTHWEST + connection right, 0, MAP_SAFARI_ZONE_SOUTHEAST SafariZone_Southwest_MapConnections:: @ 8308E00 .4byte 0x2 diff --git a/data/maps/SlateportCity/connections.inc b/data/maps/SlateportCity/connections.inc index 2d3980a8c..082ed59e0 100644 --- a/data/maps/SlateportCity/connections.inc +++ b/data/maps/SlateportCity/connections.inc @@ -1,7 +1,7 @@ SlateportCity_MapConnectionsList:: @ 8308704 - connection up, 0, Route110 - connection down, 0, Route109 - connection right, 0, Route134 + connection up, 0, MAP_ROUTE110 + connection down, 0, MAP_ROUTE109 + connection right, 0, MAP_ROUTE134 SlateportCity_MapConnections:: @ 8308728 .4byte 0x3 diff --git a/data/maps/Underwater1/connections.inc b/data/maps/Underwater1/connections.inc index 65c1db901..7eaebf9da 100644 --- a/data/maps/Underwater1/connections.inc +++ b/data/maps/Underwater1/connections.inc @@ -1,6 +1,6 @@ Underwater1_MapConnectionsList:: @ 8308D10 - connection down, 0, Underwater2 - connection emerge, 0, Route124 + connection down, 0, MAP_UNDERWATER2 + connection emerge, 0, MAP_ROUTE124 Underwater1_MapConnections:: @ 8308D28 .4byte 0x2 diff --git a/data/maps/Underwater2/connections.inc b/data/maps/Underwater2/connections.inc index 58a4db314..e24e6e122 100644 --- a/data/maps/Underwater2/connections.inc +++ b/data/maps/Underwater2/connections.inc @@ -1,7 +1,7 @@ Underwater2_MapConnectionsList:: @ 8308D30 - connection up, 0, Underwater1 - connection right, 0, Underwater3 - connection emerge, 0, Route126 + connection up, 0, MAP_UNDERWATER1 + connection right, 0, MAP_UNDERWATER3 + connection emerge, 0, MAP_ROUTE126 Underwater2_MapConnections:: @ 8308D54 .4byte 0x3 diff --git a/data/maps/Underwater3/connections.inc b/data/maps/Underwater3/connections.inc index 7d6401826..ef0acd44b 100644 --- a/data/maps/Underwater3/connections.inc +++ b/data/maps/Underwater3/connections.inc @@ -1,7 +1,7 @@ Underwater3_MapConnectionsList:: @ 8308D5C - connection emerge, 0, Route127 - connection left, 0, Underwater2 - connection down, 0, Underwater4 + connection emerge, 0, MAP_ROUTE127 + connection left, 0, MAP_UNDERWATER2 + connection down, 0, MAP_UNDERWATER4 Underwater3_MapConnections:: @ 8308D80 .4byte 0x3 diff --git a/data/maps/Underwater4/connections.inc b/data/maps/Underwater4/connections.inc index 0b9a523ea..f29aba11e 100644 --- a/data/maps/Underwater4/connections.inc +++ b/data/maps/Underwater4/connections.inc @@ -1,6 +1,6 @@ Underwater4_MapConnectionsList:: @ 8308D88 - connection up, 0, Underwater3 - connection emerge, 0, Route128 + connection up, 0, MAP_UNDERWATER3 + connection emerge, 0, MAP_ROUTE128 Underwater4_MapConnections:: @ 8308DA0 .4byte 0x2 diff --git a/data/maps/VerdanturfTown/connections.inc b/data/maps/VerdanturfTown/connections.inc index e1c9c2418..16b03bc03 100644 --- a/data/maps/VerdanturfTown/connections.inc +++ b/data/maps/VerdanturfTown/connections.inc @@ -1,6 +1,6 @@ VerdanturfTown_MapConnectionsList:: @ 83086A4 - connection up, -80, Route116 - connection right, 0, Route117 + connection up, -80, MAP_ROUTE116 + connection right, 0, MAP_ROUTE117 VerdanturfTown_MapConnections:: @ 83086BC .4byte 0x2 diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/events/AbandonedShip_CaptainsOffice.inc index e05bee18c..72740dc29 100644 --- a/data/maps/events/AbandonedShip_CaptainsOffice.inc +++ b/data/maps/events/AbandonedShip_CaptainsOffice.inc @@ -1,10 +1,10 @@ AbandonedShip_CaptainsOffice_MapObjects:: @ 838E45C object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 3, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_15EAF5, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_1B18BE, 1100, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_1B18BE, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1, 0, 0 AbandonedShip_CaptainsOffice_MapWarps:: @ 838E48C - warp_def 7, 6, 3, 4, AbandonedShip_Deck - warp_def 8, 6, 3, 4, AbandonedShip_Deck + warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK + warp_def 8, 6, 3, 4, MAP_ABANDONED_SHIP_DECK AbandonedShip_CaptainsOffice_MapEvents:: @ 838E49C map_events AbandonedShip_CaptainsOffice_MapObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/events/AbandonedShip_Corridors_1F.inc index 8a42d3204..661fbdb09 100644 --- a/data/maps/events/AbandonedShip_Corridors_1F.inc +++ b/data/maps/events/AbandonedShip_Corridors_1F.inc @@ -3,18 +3,18 @@ AbandonedShip_Corridors_1F_MapObjects:: @ 838E120 object_event 2, MAP_OBJ_GFX_TUBER_M, 0, 5, 0, 10, 0, 3, 45, 116, 0, 1, 0, 3, 0, AbandonedShip_Corridors_1F_EventScript_15E96E, 0, 0, 0 AbandonedShip_Corridors_1F_MapWarps:: @ 838E150 - warp_def 9, 11, 3, 2, AbandonedShip_Deck - warp_def 8, 11, 3, 2, AbandonedShip_Deck - warp_def 0, 11, 3, 3, AbandonedShip_Deck - warp_def 1, 11, 3, 3, AbandonedShip_Deck - warp_def 11, 9, 3, 0, AbandonedShip_Rooms_1F - warp_def 14, 9, 3, 3, AbandonedShip_Rooms_1F - warp_def 11, 3, 3, 2, AbandonedShip_Rooms_1F - warp_def 14, 3, 3, 4, AbandonedShip_Rooms_1F - warp_def 3, 9, 3, 0, AbandonedShip_Rooms2_1F - warp_def 16, 2, 3, 7, AbandonedShip_Corridors_B1F - warp_def 5, 2, 3, 6, AbandonedShip_Corridors_B1F - warp_def 3, 3, 3, 2, AbandonedShip_Rooms2_1F + warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK + warp_def 8, 11, 3, 2, MAP_ABANDONED_SHIP_DECK + warp_def 0, 11, 3, 3, MAP_ABANDONED_SHIP_DECK + warp_def 1, 11, 3, 3, MAP_ABANDONED_SHIP_DECK + warp_def 11, 9, 3, 0, MAP_ABANDONED_SHIP_ROOMS_1F + warp_def 14, 9, 3, 3, MAP_ABANDONED_SHIP_ROOMS_1F + warp_def 11, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS_1F + warp_def 14, 3, 3, 4, MAP_ABANDONED_SHIP_ROOMS_1F + warp_def 3, 9, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_1F + warp_def 16, 2, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 5, 2, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 3, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_1F AbandonedShip_Corridors_1F_MapEvents:: @ 838E1B0 map_events AbandonedShip_Corridors_1F_MapObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/events/AbandonedShip_Corridors_B1F.inc index 7b50cf2fe..d889f1ade 100644 --- a/data/maps/events/AbandonedShip_Corridors_B1F.inc +++ b/data/maps/events/AbandonedShip_Corridors_B1F.inc @@ -3,14 +3,14 @@ AbandonedShip_Corridors_B1F_MapObjects:: @ 838E238 object_event 2, MAP_OBJ_GFX_SAILOR, 0, 9, 0, 6, 0, 3, 14, 0, 0, 1, 0, 4, 0, AbandonedShip_Corridors_B1F_EventScript_15EA1E, 0, 0, 0 AbandonedShip_Corridors_B1F_MapWarps:: @ 838E268 - warp_def 6, 4, 3, 2, AbandonedShip_Rooms2_B1F - warp_def 3, 4, 3, 0, AbandonedShip_Rooms2_B1F - warp_def 5, 7, 3, 0, AbandonedShip_Rooms_B1F - warp_def 8, 7, 3, 1, AbandonedShip_Rooms_B1F - warp_def 11, 7, 3, 2, AbandonedShip_Rooms_B1F - warp_def 11, 4, 3, 0, AbandonedShip_Room_B1F - warp_def 0, 2, 3, 10, AbandonedShip_Corridors_1F - warp_def 8, 2, 3, 9, AbandonedShip_Corridors_1F + warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F + warp_def 3, 4, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_B1F + warp_def 5, 7, 3, 0, MAP_ABANDONED_SHIP_ROOMS_B1F + warp_def 8, 7, 3, 1, MAP_ABANDONED_SHIP_ROOMS_B1F + warp_def 11, 7, 3, 2, MAP_ABANDONED_SHIP_ROOMS_B1F + warp_def 11, 4, 3, 0, MAP_ABANDONED_SHIP_ROOM_B1F + warp_def 0, 2, 3, 10, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Corridors_B1F_MapBGEvents:: @ 838E2A8 bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9D3 diff --git a/data/maps/events/AbandonedShip_Deck.inc b/data/maps/events/AbandonedShip_Deck.inc index 6988f8568..15f54114b 100644 --- a/data/maps/events/AbandonedShip_Deck.inc +++ b/data/maps/events/AbandonedShip_Deck.inc @@ -1,9 +1,9 @@ AbandonedShip_Deck_MapWarps:: @ 838E0E4 - warp_def 13, 15, 3, 0, Route108 - warp_def 14, 15, 3, 0, Route108 - warp_def 13, 9, 3, 1, AbandonedShip_Corridors_1F - warp_def 8, 9, 3, 2, AbandonedShip_Corridors_1F - warp_def 12, 5, 3, 0, AbandonedShip_CaptainsOffice + warp_def 13, 15, 3, 0, MAP_ROUTE108 + warp_def 14, 15, 3, 0, MAP_ROUTE108 + warp_def 13, 9, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 8, 9, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 12, 5, 3, 0, MAP_ABANDONED_SHIP_CAPTAINS_OFFICE AbandonedShip_Deck_MapEvents:: @ 838E10C map_events 0x0, AbandonedShip_Deck_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc index e5f17046d..97bdf37c5 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc @@ -1,10 +1,10 @@ AbandonedShip_HiddenFloorCorridors_MapWarps:: @ 838E4CC - warp_def 3, 8, 3, 0, AbandonedShip_HiddenFloorRooms - warp_def 6, 8, 3, 2, AbandonedShip_HiddenFloorRooms - warp_def 9, 8, 3, 4, AbandonedShip_HiddenFloorRooms - warp_def 3, 3, 3, 6, AbandonedShip_HiddenFloorRooms - warp_def 6, 3, 3, 7, AbandonedShip_HiddenFloorRooms - warp_def 9, 3, 3, 8, AbandonedShip_HiddenFloorRooms + warp_def 3, 8, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 6, 8, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 9, 8, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 3, 3, 3, 6, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 6, 3, 3, 7, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS AbandonedShip_HiddenFloorCorridors_MapBGEvents:: @ 838E4FC bg_event 3, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3 diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc index e110e051d..2e6bb9a3f 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc +++ b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc @@ -1,19 +1,19 @@ AbandonedShip_HiddenFloorRooms_MapObjects:: @ 838E540 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 41, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18CB, 1077, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18D8, 1078, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18F2, 1102, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18E5, 1101, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 41, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18CB, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18D8, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18F2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18E5, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3, 0, 0 AbandonedShip_HiddenFloorRooms_MapWarps:: @ 838E5A0 - warp_def 6, 14, 3, 0, AbandonedShip_HiddenFloorCorridors - warp_def 7, 14, 3, 0, AbandonedShip_HiddenFloorCorridors - warp_def 21, 14, 3, 1, AbandonedShip_HiddenFloorCorridors - warp_def 22, 14, 3, 1, AbandonedShip_HiddenFloorCorridors - warp_def 36, 14, 3, 2, AbandonedShip_HiddenFloorCorridors - warp_def 37, 14, 3, 2, AbandonedShip_HiddenFloorCorridors - warp_def 6, 1, 3, 3, AbandonedShip_HiddenFloorCorridors - warp_def 21, 1, 3, 4, AbandonedShip_HiddenFloorCorridors - warp_def 36, 1, 3, 5, AbandonedShip_HiddenFloorCorridors + warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 7, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 21, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 22, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 36, 14, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 37, 14, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 6, 1, 3, 3, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 21, 1, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS AbandonedShip_HiddenFloorRooms_MapBGEvents:: @ 838E5E8 bg_event 42, 10, 3, 7, 0, ITEM_ROOM_1_KEY, 31, 0 diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/events/AbandonedShip_Room_B1F.inc index 9213f3e98..22739c99f 100644 --- a/data/maps/events/AbandonedShip_Room_B1F.inc +++ b/data/maps/events/AbandonedShip_Room_B1F.inc @@ -1,9 +1,9 @@ AbandonedShip_Room_B1F_MapObjects:: @ 838E3AC - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_1B18A4, 1098, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_1B18A4, FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1, 0, 0 AbandonedShip_Room_B1F_MapWarps:: @ 838E3C4 - warp_def 4, 7, 3, 5, AbandonedShip_Corridors_B1F - warp_def 5, 7, 3, 5, AbandonedShip_Corridors_B1F + warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 5, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Room_B1F_MapEvents:: @ 838E3D4 map_events AbandonedShip_Room_B1F_MapObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/events/AbandonedShip_Rooms2_1F.inc index 842f972fa..d68dd776d 100644 --- a/data/maps/events/AbandonedShip_Rooms2_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_1F.inc @@ -1,12 +1,12 @@ AbandonedShip_Rooms2_1F_MapObjects:: @ 838E3E8 object_event 1, MAP_OBJ_GFX_MAN_5, 0, 7, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_15EA68, 0, 0, 0 object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_15EAAE, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_1B18B1, 1099, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_1B18B1, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1, 0, 0 AbandonedShip_Rooms2_1F_MapWarps:: @ 838E430 - warp_def 4, 16, 3, 8, AbandonedShip_Corridors_1F - warp_def 5, 16, 3, 8, AbandonedShip_Corridors_1F - warp_def 4, 1, 3, 11, AbandonedShip_Corridors_1F + warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 5, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 4, 1, 3, 11, MAP_ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Rooms2_1F_MapEvents:: @ 838E448 map_events AbandonedShip_Rooms2_1F_MapObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/events/AbandonedShip_Rooms2_B1F.inc index 2ad55a5e9..8f21e82c4 100644 --- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_B1F.inc @@ -1,12 +1,12 @@ AbandonedShip_Rooms2_B1F_MapObjects:: @ 838E324 object_event 1, MAP_OBJ_GFX_CAMPER, 0, 3, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_15EA4E, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_1B1897, 1097, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_1B1897, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1, 0, 0 AbandonedShip_Rooms2_B1F_MapWarps:: @ 838E354 - warp_def 4, 7, 3, 1, AbandonedShip_Corridors_B1F - warp_def 5, 7, 3, 1, AbandonedShip_Corridors_B1F - warp_def 13, 7, 3, 0, AbandonedShip_Corridors_B1F - warp_def 14, 7, 3, 0, AbandonedShip_Corridors_B1F + warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 5, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 13, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 14, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Rooms2_B1F_MapEvents:: @ 838E374 map_events AbandonedShip_Rooms2_B1F_MapObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/events/AbandonedShip_Rooms_1F.inc index 90578df28..8eaae1853 100644 --- a/data/maps/events/AbandonedShip_Rooms_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_1F.inc @@ -1,14 +1,14 @@ AbandonedShip_Rooms_1F_MapObjects:: @ 838E1C4 object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 11, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_15E986, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_1B187D, 1095, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_1B187D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1, 0, 0 AbandonedShip_Rooms_1F_MapWarps:: @ 838E1F4 - warp_def 4, 16, 3, 4, AbandonedShip_Corridors_1F - warp_def 5, 16, 3, 4, AbandonedShip_Corridors_1F - warp_def 4, 1, 3, 6, AbandonedShip_Corridors_1F - warp_def 13, 16, 3, 5, AbandonedShip_Corridors_1F - warp_def 13, 1, 3, 7, AbandonedShip_Corridors_1F - warp_def 14, 16, 3, 5, AbandonedShip_Corridors_1F + warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 5, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 4, 1, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 13, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 13, 1, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 14, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Rooms_1F_MapEvents:: @ 838E224 map_events AbandonedShip_Rooms_1F_MapObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/events/AbandonedShip_Rooms_B1F.inc index 692883bec..cb9ce260f 100644 --- a/data/maps/events/AbandonedShip_Rooms_B1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_B1F.inc @@ -1,11 +1,11 @@ AbandonedShip_Rooms_B1F_MapObjects:: @ 838E2C8 object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 25, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_15EA44, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_1B188A, 1096, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_1B188A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1, 0, 0 AbandonedShip_Rooms_B1F_MapWarps:: @ 838E2F8 - warp_def 4, 1, 3, 2, AbandonedShip_Corridors_B1F - warp_def 13, 1, 3, 3, AbandonedShip_Corridors_B1F - warp_def 22, 1, 3, 4, AbandonedShip_Corridors_B1F + warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 13, 1, 3, 3, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 22, 1, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Rooms_B1F_MapEvents:: @ 838E310 map_events AbandonedShip_Rooms_B1F_MapObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Underwater1.inc b/data/maps/events/AbandonedShip_Underwater1.inc index 9a4634860..17a89c2aa 100644 --- a/data/maps/events/AbandonedShip_Underwater1.inc +++ b/data/maps/events/AbandonedShip_Underwater1.inc @@ -1,6 +1,6 @@ AbandonedShip_Underwater1_MapWarps:: @ 838E388 - warp_def 3, 7, 3, 0, AbandonedShip_Underwater2 - warp_def 4, 7, 3, 0, AbandonedShip_Underwater2 + warp_def 3, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 + warp_def 4, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 AbandonedShip_Underwater1_MapEvents:: @ 838E398 map_events 0x0, AbandonedShip_Underwater1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Underwater2.inc b/data/maps/events/AbandonedShip_Underwater2.inc index a3a181773..6eb94059c 100644 --- a/data/maps/events/AbandonedShip_Underwater2.inc +++ b/data/maps/events/AbandonedShip_Underwater2.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater2_MapWarps:: @ 838E4B0 - warp_def 3, 1, 3, 0, AbandonedShip_Underwater1 + warp_def 3, 1, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER1 AbandonedShip_Underwater2_MapEvents:: @ 838E4B8 map_events 0x0, AbandonedShip_Underwater2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AncientTomb.inc b/data/maps/events/AncientTomb.inc index 1f527288b..0aa15569e 100644 --- a/data/maps/events/AncientTomb.inc +++ b/data/maps/events/AncientTomb.inc @@ -1,10 +1,10 @@ AncientTomb_MapObjects:: @ 838E6DC - object_event 1, MAP_OBJ_GFX_REGISTEEL, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, AncientTomb_EventScript_15F050, 937, 0, 0 + object_event 1, MAP_OBJ_GFX_REGISTEEL, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, AncientTomb_EventScript_15F050, FLAG_HIDE_REGISTEEL, 0, 0 AncientTomb_MapWarps:: @ 838E6F4 - warp_def 8, 29, 3, 0, Route120 - warp_def 8, 20, 0, 2, AncientTomb - warp_def 8, 11, 3, 1, AncientTomb + warp_def 8, 29, 3, 0, MAP_ROUTE120 + warp_def 8, 20, 0, 2, MAP_ANCIENT_TOMB + warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB AncientTomb_MapBGEvents:: @ 838E70C bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_15F021 diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/events/AquaHideout_1F.inc index 5c59bbf12..ff3212aa9 100644 --- a/data/maps/events/AquaHideout_1F.inc +++ b/data/maps/events/AquaHideout_1F.inc @@ -1,12 +1,12 @@ AquaHideout_1F_MapObjects:: @ 838CD0C - object_event 1, 241, 0, 13, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, 821, 0, 0 - object_event 2, 241, 0, 14, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, 822, 0, 0 - object_event 3, 241, 0, 20, 0, 4, 0, 3, 50, 93, 0, 1, 0, 3, 0, AquaHideout_1F_EventScript_15D80C, 924, 0, 0 + object_event 1, 241, 0, 13, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0 + object_event 2, 241, 0, 14, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0 + object_event 3, 241, 0, 20, 0, 4, 0, 3, 50, 93, 0, 1, 0, 3, 0, AquaHideout_1F_EventScript_15D80C, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 AquaHideout_1F_MapWarps:: @ 838CD54 - warp_def 13, 27, 1, 6, LilycoveCity - warp_def 14, 27, 1, 6, LilycoveCity - warp_def 22, 1, 3, 0, AquaHideout_B1F + warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY + warp_def 14, 27, 1, 6, MAP_LILYCOVE_CITY + warp_def 22, 1, 3, 0, MAP_AQUA_HIDEOUT_B1F AquaHideout_1F_MapEvents:: @ 838CD6C map_events AquaHideout_1F_MapObjects, AquaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc index 742761833..3f4d8e4ec 100644 --- a/data/maps/events/AquaHideout_B1F.inc +++ b/data/maps/events/AquaHideout_B1F.inc @@ -1,39 +1,39 @@ AquaHideout_B1F_MapObjects:: @ 838CD80 - object_event 1, 241, 0, 27, 0, 18, 0, 3, 24, 0, 0, 1, 0, 3, 0, AquaHideout_B1F_EventScript_15D850, 924, 0, 0 - object_event 2, 241, 0, 6, 0, 6, 0, 3, 9, 0, 0, 1, 0, 5, 0, AquaHideout_B1F_EventScript_15D875, 924, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, 1071, 0, 0 - object_event 4, 242, 0, 20, 0, 18, 0, 3, 27, 4, 0, 1, 0, 4, 0, AquaHideout_B1F_EventScript_15D89A, 924, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B198E, 1124, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A04FD, 977, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B199B, 1132, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A051B, 978, 0, 0 + object_event 1, 241, 0, 27, 0, 18, 0, 3, 24, 0, 0, 1, 0, 3, 0, AquaHideout_B1F_EventScript_15D850, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 2, 241, 0, 6, 0, 6, 0, 3, 9, 0, 0, 1, 0, 5, 0, AquaHideout_B1F_EventScript_15D875, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, FLAG_ITEM_AQUA_HIDEOUT_B1F_1, 0, 0 + object_event 4, 242, 0, 20, 0, 18, 0, 3, 27, 4, 0, 1, 0, 4, 0, AquaHideout_B1F_EventScript_15D89A, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B198E, FLAG_ITEM_AQUA_HIDEOUT_B1F_2, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B199B, FLAG_ITEM_AQUA_HIDEOUT_B1F_3, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT, 0, 0 AquaHideout_B1F_MapWarps:: @ 838CE40 - warp_def 29, 1, 3, 2, AquaHideout_1F - warp_def 18, 1, 3, 0, AquaHideout_B2F - warp_def 12, 1, 3, 1, AquaHideout_B2F - warp_def 3, 3, 3, 2, AquaHideout_B2F - warp_def 31, 4, 3, 7, AquaHideout_B1F - warp_def 27, 4, 3, 8, AquaHideout_B1F - warp_def 20, 4, 3, 10, AquaHideout_B1F - warp_def 27, 12, 3, 4, AquaHideout_B1F - warp_def 3, 15, 3, 5, AquaHideout_B1F - warp_def 3, 20, 3, 12, AquaHideout_B1F - warp_def 32, 19, 3, 6, AquaHideout_B1F - warp_def 23, 10, 3, 22, AquaHideout_B1F - warp_def 45, 3, 3, 9, AquaHideout_B1F - warp_def 42, 5, 3, 18, AquaHideout_B1F - warp_def 45, 5, 3, 12, AquaHideout_B1F - warp_def 48, 5, 3, 16, AquaHideout_B1F - warp_def 42, 9, 3, 15, AquaHideout_B1F - warp_def 45, 9, 3, 20, AquaHideout_B1F - warp_def 48, 9, 3, 13, AquaHideout_B1F - warp_def 42, 13, 3, 24, AquaHideout_B1F - warp_def 45, 13, 3, 17, AquaHideout_B1F - warp_def 48, 13, 3, 12, AquaHideout_B1F - warp_def 42, 17, 3, 11, AquaHideout_B1F - warp_def 45, 17, 3, 17, AquaHideout_B1F - warp_def 48, 17, 3, 19, AquaHideout_B1F + warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F + warp_def 18, 1, 3, 0, MAP_AQUA_HIDEOUT_B2F + warp_def 12, 1, 3, 1, MAP_AQUA_HIDEOUT_B2F + warp_def 3, 3, 3, 2, MAP_AQUA_HIDEOUT_B2F + warp_def 31, 4, 3, 7, MAP_AQUA_HIDEOUT_B1F + warp_def 27, 4, 3, 8, MAP_AQUA_HIDEOUT_B1F + warp_def 20, 4, 3, 10, MAP_AQUA_HIDEOUT_B1F + warp_def 27, 12, 3, 4, MAP_AQUA_HIDEOUT_B1F + warp_def 3, 15, 3, 5, MAP_AQUA_HIDEOUT_B1F + warp_def 3, 20, 3, 12, MAP_AQUA_HIDEOUT_B1F + warp_def 32, 19, 3, 6, MAP_AQUA_HIDEOUT_B1F + warp_def 23, 10, 3, 22, MAP_AQUA_HIDEOUT_B1F + warp_def 45, 3, 3, 9, MAP_AQUA_HIDEOUT_B1F + warp_def 42, 5, 3, 18, MAP_AQUA_HIDEOUT_B1F + warp_def 45, 5, 3, 12, MAP_AQUA_HIDEOUT_B1F + warp_def 48, 5, 3, 16, MAP_AQUA_HIDEOUT_B1F + warp_def 42, 9, 3, 15, MAP_AQUA_HIDEOUT_B1F + warp_def 45, 9, 3, 20, MAP_AQUA_HIDEOUT_B1F + warp_def 48, 9, 3, 13, MAP_AQUA_HIDEOUT_B1F + warp_def 42, 13, 3, 24, MAP_AQUA_HIDEOUT_B1F + warp_def 45, 13, 3, 17, MAP_AQUA_HIDEOUT_B1F + warp_def 48, 13, 3, 12, MAP_AQUA_HIDEOUT_B1F + warp_def 42, 17, 3, 11, MAP_AQUA_HIDEOUT_B1F + warp_def 45, 17, 3, 17, MAP_AQUA_HIDEOUT_B1F + warp_def 48, 17, 3, 19, MAP_AQUA_HIDEOUT_B1F AquaHideout_B1F_MapEvents:: @ 838CF08 map_events AquaHideout_B1F_MapObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc index d2cce8ab9..c4b0abc78 100644 --- a/data/maps/events/AquaHideout_B2F.inc +++ b/data/maps/events/AquaHideout_B2F.inc @@ -1,21 +1,21 @@ AquaHideout_B2F_MapObjects:: @ 838CF1C - object_event 1, 241, 0, 23, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, 924, 0, 0 - object_event 2, 241, 0, 23, 0, 10, 0, 3, 45, 52, 0, 1, 0, 3, 0, AquaHideout_B2F_EventScript_15D962, 924, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_1B19B5, 1072, 0, 0 - object_event 4, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 0, 20, 0, 1, 9, 0, 0, 0, 0, 0, 0, 0x0, 943, 0, 0 - object_event 5, 242, 0, 10, 0, 6, 0, 3, 7, 17, 0, 1, 0, 4, 0, AquaHideout_B2F_EventScript_15D987, 924, 0, 0 + object_event 1, 241, 0, 23, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 2, 241, 0, 23, 0, 10, 0, 3, 45, 52, 0, 1, 0, 3, 0, AquaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_1B19B5, FLAG_ITEM_AQUA_HIDEOUT_B2F_1, 0, 0 + object_event 4, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 0, 20, 0, 1, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT, 0, 0 + object_event 5, 242, 0, 10, 0, 6, 0, 3, 7, 17, 0, 1, 0, 4, 0, AquaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 AquaHideout_B2F_MapWarps:: @ 838CF94 - warp_def 18, 1, 3, 1, AquaHideout_B1F - warp_def 12, 1, 3, 2, AquaHideout_B1F - warp_def 3, 3, 3, 3, AquaHideout_B1F - warp_def 31, 8, 3, 5, AquaHideout_B2F - warp_def 8, 8, 3, 8, AquaHideout_B2F - warp_def 5, 8, 3, 3, AquaHideout_B2F - warp_def 18, 13, 3, 7, AquaHideout_B2F - warp_def 12, 13, 3, 6, AquaHideout_B2F - warp_def 31, 17, 3, 4, AquaHideout_B2F - warp_def 32, 20, 3, 4, AquaHideout_B1F + warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F + warp_def 12, 1, 3, 2, MAP_AQUA_HIDEOUT_B1F + warp_def 3, 3, 3, 3, MAP_AQUA_HIDEOUT_B1F + warp_def 31, 8, 3, 5, MAP_AQUA_HIDEOUT_B2F + warp_def 8, 8, 3, 8, MAP_AQUA_HIDEOUT_B2F + warp_def 5, 8, 3, 3, MAP_AQUA_HIDEOUT_B2F + warp_def 18, 13, 3, 7, MAP_AQUA_HIDEOUT_B2F + warp_def 12, 13, 3, 6, MAP_AQUA_HIDEOUT_B2F + warp_def 31, 17, 3, 4, MAP_AQUA_HIDEOUT_B2F + warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F AquaHideout_B2F_MapCoordEvents:: @ 838CFE4 coord_event 28, 17, 3, 0, 0x4001, 0, 0, AquaHideout_B2F_EventScript_15D8BD diff --git a/data/maps/events/BattleTower_BattleRoom.inc b/data/maps/events/BattleTower_BattleRoom.inc index dda5621b6..c1b2ad55e 100644 --- a/data/maps/events/BattleTower_BattleRoom.inc +++ b/data/maps/events/BattleTower_BattleRoom.inc @@ -1,10 +1,10 @@ BattleTower_BattleRoom_MapObjects:: @ 8391DAC - object_event 1, 240, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 888, 0, 0 + object_event 1, 240, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT, 0, 0 object_event 2, MAP_OBJ_GFX_TEALA, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 BattleTower_BattleRoom_MapWarps:: @ 8391DDC - warp_def 5, 8, 0, 2, BattleTower_Lobby - warp_def 6, 8, 0, 2, BattleTower_Lobby + warp_def 5, 8, 0, 2, MAP_BATTLE_TOWER_LOBBY + warp_def 6, 8, 0, 2, MAP_BATTLE_TOWER_LOBBY BattleTower_BattleRoom_MapEvents:: @ 8391DEC map_events BattleTower_BattleRoom_MapObjects, BattleTower_BattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleTower_Lobby.inc b/data/maps/events/BattleTower_Lobby.inc index 6d4e15f7a..a4abdac87 100644 --- a/data/maps/events/BattleTower_Lobby.inc +++ b/data/maps/events/BattleTower_Lobby.inc @@ -3,13 +3,13 @@ BattleTower_Lobby_MapObjects:: @ 8391C8C object_event 2, MAP_OBJ_GFX_MAN_5, 0, 12, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1606A5, 0, 0, 0 object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160715, 0, 0, 0 object_event 4, MAP_OBJ_GFX_BOY_1, 0, 1, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_16071E, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1AE1FF, 918, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160733, 941, 0, 0 + object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1AE1FF, FLAG_HIDE_REPORTER_BATTLE_TOWER, 0, 0 + object_event 6, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160733, FLAG_HIDE_AWARD_MAN_BATTLE_TOWER, 0, 0 BattleTower_Lobby_MapWarps:: @ 8391D1C - warp_def 6, 8, 0, 0, BattleTower_Outside - warp_def 7, 8, 0, 0, BattleTower_Outside - warp_def 6, 1, 0, 0, BattleTower_BattleRoom + warp_def 6, 8, 0, 0, MAP_BATTLE_TOWER_OUTSIDE + warp_def 7, 8, 0, 0, MAP_BATTLE_TOWER_OUTSIDE + warp_def 6, 1, 0, 0, MAP_BATTLE_TOWER_BATTLE_ROOM BattleTower_Lobby_MapBGEvents:: @ 8391D34 bg_event 3, 5, 3, 1, 0, BattleTower_Lobby_EventScript_160727 diff --git a/data/maps/events/BattleTower_Outside.inc b/data/maps/events/BattleTower_Outside.inc index 04085c346..902a779f1 100644 --- a/data/maps/events/BattleTower_Outside.inc +++ b/data/maps/events/BattleTower_Outside.inc @@ -6,7 +6,7 @@ BattleTower_Outside_MapObjects:: @ 8391BEC object_event 5, MAP_OBJ_GFX_BEAUTY, 0, 19, 0, 24, 0, 3, 7, 17, 0, 0, 0, 0, 0, BattleTower_Outside_EventScript_160168, 0, 0, 0 BattleTower_Outside_MapWarps:: @ 8391C64 - warp_def 14, 8, 0, 0, BattleTower_Lobby + warp_def 14, 8, 0, 0, MAP_BATTLE_TOWER_LOBBY BattleTower_Outside_MapBGEvents:: @ 8391C6C bg_event 16, 13, 0, 0, 0, BattleTower_Outside_EventScript_16025A diff --git a/data/maps/events/CaveOfOrigin_1F.inc b/data/maps/events/CaveOfOrigin_1F.inc index 43b0b615d..1e2185e9b 100644 --- a/data/maps/events/CaveOfOrigin_1F.inc +++ b/data/maps/events/CaveOfOrigin_1F.inc @@ -1,6 +1,6 @@ CaveOfOrigin_1F_MapWarps:: @ 838D718 - warp_def 11, 17, 3, 1, CaveOfOrigin_Entrance - warp_def 14, 5, 3, 0, CaveOfOrigin_B1F + warp_def 11, 17, 3, 1, MAP_CAVE_OF_ORIGIN_ENTRANCE + warp_def 14, 5, 3, 0, MAP_CAVE_OF_ORIGIN_B1F CaveOfOrigin_1F_MapCoordEvents:: @ 838D728 coord_event 7, 11, 3, 0, 0x4001, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/events/CaveOfOrigin_B1F.inc index 0a3df0655..905954d9b 100644 --- a/data/maps/events/CaveOfOrigin_B1F.inc +++ b/data/maps/events/CaveOfOrigin_B1F.inc @@ -1,6 +1,6 @@ CaveOfOrigin_B1F_MapWarps:: @ 838D76C - warp_def 13, 5, 3, 1, CaveOfOrigin_1F - warp_def 5, 11, 3, 0, CaveOfOrigin_B2F + warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F + warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_B2F CaveOfOrigin_B1F_MapCoordEvents:: @ 838D77C coord_event 12, 15, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF diff --git a/data/maps/events/CaveOfOrigin_B2F.inc b/data/maps/events/CaveOfOrigin_B2F.inc index 9c04629f0..2d98e50ac 100644 --- a/data/maps/events/CaveOfOrigin_B2F.inc +++ b/data/maps/events/CaveOfOrigin_B2F.inc @@ -1,6 +1,6 @@ CaveOfOrigin_B2F_MapWarps:: @ 838D7C0 - warp_def 5, 10, 3, 1, CaveOfOrigin_B1F - warp_def 8, 14, 3, 0, CaveOfOrigin_B3F + warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_B1F + warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_B3F CaveOfOrigin_B2F_MapCoordEvents:: @ 838D7D0 coord_event 10, 6, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF diff --git a/data/maps/events/CaveOfOrigin_B3F.inc b/data/maps/events/CaveOfOrigin_B3F.inc index 0d0b44eea..2561dee6a 100644 --- a/data/maps/events/CaveOfOrigin_B3F.inc +++ b/data/maps/events/CaveOfOrigin_B3F.inc @@ -1,9 +1,9 @@ CaveOfOrigin_B3F_MapObjects:: @ 838D814 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, CaveOfOrigin_B3F_EventScript_1B1A44, 1059, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, CaveOfOrigin_B3F_EventScript_1B1A44, FLAG_ITEM_CAVE_OF_ORIGIN_B3F_1, 0, 0 CaveOfOrigin_B3F_MapWarps:: @ 838D82C - warp_def 7, 14, 3, 1, CaveOfOrigin_B2F - warp_def 12, 6, 3, 0, CaveOfOrigin_B4F + warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_B2F + warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B4F CaveOfOrigin_B3F_MapCoordEvents:: @ 838D83C coord_event 5, 11, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B3F_EventScript_1A04AF diff --git a/data/maps/events/CaveOfOrigin_B4F.inc b/data/maps/events/CaveOfOrigin_B4F.inc index 3b4beb038..672604d3e 100644 --- a/data/maps/events/CaveOfOrigin_B4F.inc +++ b/data/maps/events/CaveOfOrigin_B4F.inc @@ -1,8 +1,8 @@ CaveOfOrigin_B4F_MapObjects:: @ 838D880 - object_event 1, 248, 0, 9, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 825, 0, 0 + object_event 1, 248, 0, 9, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN, 0, 0 CaveOfOrigin_B4F_MapWarps:: @ 838D898 - warp_def 12, 5, 3, 1, CaveOfOrigin_B3F + warp_def 12, 5, 3, 1, MAP_CAVE_OF_ORIGIN_B3F CaveOfOrigin_B4F_MapCoordEvents:: @ 838D8A0 coord_event 9, 13, 3, 0, 0x409b, 0, 0, CaveOfOrigin_B4F_EventScript_15DDD7 diff --git a/data/maps/events/CaveOfOrigin_Entrance.inc b/data/maps/events/CaveOfOrigin_Entrance.inc index 4e61e3d82..cab14e4d7 100644 --- a/data/maps/events/CaveOfOrigin_Entrance.inc +++ b/data/maps/events/CaveOfOrigin_Entrance.inc @@ -1,6 +1,6 @@ CaveOfOrigin_Entrance_MapWarps:: @ 838D6F4 - warp_def 9, 20, 3, 3, SootopolisCity - warp_def 9, 5, 3, 0, CaveOfOrigin_1F + warp_def 9, 20, 3, 3, MAP_SOOTOPOLIS_CITY + warp_def 9, 5, 3, 0, MAP_CAVE_OF_ORIGIN_1F CaveOfOrigin_Entrance_MapEvents:: @ 838D704 map_events 0x0, CaveOfOrigin_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DesertRuins.inc b/data/maps/events/DesertRuins.inc index 849c7f729..ada0e0be5 100644 --- a/data/maps/events/DesertRuins.inc +++ b/data/maps/events/DesertRuins.inc @@ -1,10 +1,10 @@ DesertRuins_MapObjects:: @ 838BEBC - object_event 1, MAP_OBJ_GFX_REGIROCK, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, DesertRuins_EventScript_15CB85, 935, 0, 0 + object_event 1, MAP_OBJ_GFX_REGIROCK, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, DesertRuins_EventScript_15CB85, FLAG_HIDE_REGIROCK, 0, 0 DesertRuins_MapWarps:: @ 838BED4 - warp_def 8, 29, 3, 1, Route111 - warp_def 8, 20, 0, 2, DesertRuins - warp_def 8, 11, 3, 1, DesertRuins + warp_def 8, 29, 3, 1, MAP_ROUTE111 + warp_def 8, 20, 0, 2, MAP_DESERT_RUINS + warp_def 8, 11, 3, 1, MAP_DESERT_RUINS DesertRuins_MapBGEvents:: @ 838BEEC bg_event 8, 20, 0, 0, 0, DesertRuins_EventScript_15CB56 diff --git a/data/maps/events/DewfordTown.inc b/data/maps/events/DewfordTown.inc index 8a5fc1fed..8ca6fa7a1 100644 --- a/data/maps/events/DewfordTown.inc +++ b/data/maps/events/DewfordTown.inc @@ -1,16 +1,16 @@ DewfordTown_MapObjects:: @ 8380B88 object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 12, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E0A2, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 9, 0, 3, 9, 16, 0, 0, 0, 3, 0, DewfordTown_EventScript_14E002, 740, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 9, 0, 3, 9, 16, 0, 0, 0, 3, 0, DewfordTown_EventScript_14E002, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, 0, 0 object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 12, 0, 14, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E0C6, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 8, 0, 1, 8, 0, 0, 0, 0, 0, 0, 0x0, 743, 0, 0 + object_event 4, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 8, 0, 1, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD, 0, 0 object_event 5, MAP_OBJ_GFX_BOY_1, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E413, 0, 0, 0 DewfordTown_MapWarps:: @ 8380C00 - warp_def 3, 3, 0, 0, DewfordTown_Hall - warp_def 2, 10, 0, 0, DewfordTown_PokemonCenter_1F - warp_def 8, 17, 0, 0, DewfordTown_Gym - warp_def 17, 14, 0, 0, DewfordTown_House1 - warp_def 8, 8, 0, 0, DewfordTown_House2 + warp_def 3, 3, 0, 0, MAP_DEWFORD_TOWN_HALL + warp_def 2, 10, 0, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F + warp_def 8, 17, 0, 0, MAP_DEWFORD_TOWN_GYM + warp_def 17, 14, 0, 0, MAP_DEWFORD_TOWN_HOUSE1 + warp_def 8, 8, 0, 0, MAP_DEWFORD_TOWN_HOUSE2 DewfordTown_MapBGEvents:: @ 8380C28 bg_event 10, 10, 0, 0, 0, DewfordTown_EventScript_14E0AB diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/events/DewfordTown_Gym.inc index 2e36395c1..10a5f8499 100644 --- a/data/maps/events/DewfordTown_Gym.inc +++ b/data/maps/events/DewfordTown_Gym.inc @@ -6,8 +6,8 @@ DewfordTown_Gym_MapObjects:: @ 8385FBC object_event 5, MAP_OBJ_GFX_MAN_2, 0, 5, 0, 24, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_Gym_EventScript_15323F, 0, 0, 0 DewfordTown_Gym_MapWarps:: @ 8386034 - warp_def 5, 27, 0, 2, DewfordTown - warp_def 6, 27, 0, 2, DewfordTown + warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN + warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN DewfordTown_Gym_MapBGEvents:: @ 8386044 bg_event 7, 21, 0, 1, 0, DewfordTown_Gym_EventScript_15325E diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/events/DewfordTown_Hall.inc index d58fbfbd4..56f7feb18 100644 --- a/data/maps/events/DewfordTown_Hall.inc +++ b/data/maps/events/DewfordTown_Hall.inc @@ -7,11 +7,11 @@ DewfordTown_Hall_MapObjects:: @ 8386088 object_event 6, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 14, 0, 7, 0, 0, 5, 1, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153342, 0, 0, 0 object_event 7, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 12, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533F2, 0, 0, 0 object_event 8, MAP_OBJ_GFX_PSYCHIC_M, 0, 15, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533FE, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15359D, 940, 0, 0 + object_event 9, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15359D, FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL, 0, 0 DewfordTown_Hall_MapWarps:: @ 8386160 - warp_def 5, 8, 0, 0, DewfordTown - warp_def 6, 8, 0, 0, DewfordTown + warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN + warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN DewfordTown_Hall_MapBGEvents:: @ 8386170 bg_event 0, 1, 3, 0, 0, DewfordTown_Hall_EventScript_153353 diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/events/DewfordTown_House1.inc index 9bed6ac7a..daedf3d19 100644 --- a/data/maps/events/DewfordTown_House1.inc +++ b/data/maps/events/DewfordTown_House1.inc @@ -4,8 +4,8 @@ DewfordTown_House1_MapObjects:: @ 8385E58 object_event 3, MAP_OBJ_GFX_ZIGZAGOON, 0, 4, 0, 2, 0, 3, 8, 19, 0, 0, 0, 0, 0, DewfordTown_House1_EventScript_153001, 0, 0, 0 DewfordTown_House1_MapWarps:: @ 8385EA0 - warp_def 3, 7, 0, 3, DewfordTown - warp_def 4, 7, 0, 3, DewfordTown + warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN + warp_def 4, 7, 0, 3, MAP_DEWFORD_TOWN DewfordTown_House1_MapEvents:: @ 8385EB0 map_events DewfordTown_House1_MapObjects, DewfordTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/events/DewfordTown_House2.inc index eae9ff28e..0553bc23a 100644 --- a/data/maps/events/DewfordTown_House2.inc +++ b/data/maps/events/DewfordTown_House2.inc @@ -3,8 +3,8 @@ DewfordTown_House2_MapObjects:: @ 838619C object_event 2, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, DewfordTown_House2_EventScript_15361F, 0, 0, 0 DewfordTown_House2_MapWarps:: @ 83861CC - warp_def 3, 8, 0, 4, DewfordTown - warp_def 4, 8, 0, 4, DewfordTown + warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN + warp_def 4, 8, 0, 4, MAP_DEWFORD_TOWN DewfordTown_House2_MapEvents:: @ 83861DC map_events DewfordTown_House2_MapObjects, DewfordTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/events/DewfordTown_PokemonCenter_1F.inc index a870483b3..b1a13dd8a 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_1F.inc +++ b/data/maps/events/DewfordTown_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ DewfordTown_PokemonCenter_1F_MapObjects:: @ 8385EC4 object_event 3, MAP_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 0, 5, 18, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_15303A, 0, 0, 0 DewfordTown_PokemonCenter_1F_MapWarps:: @ 8385F0C - warp_def 7, 8, 3, 1, DewfordTown - warp_def 6, 8, 3, 1, DewfordTown - warp_def 1, 6, 4, 0, DewfordTown_PokemonCenter_2F + warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN + warp_def 6, 8, 3, 1, MAP_DEWFORD_TOWN + warp_def 1, 6, 4, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_2F DewfordTown_PokemonCenter_1F_MapEvents:: @ 8385F24 map_events DewfordTown_PokemonCenter_1F_MapObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/events/DewfordTown_PokemonCenter_2F.inc index 0d17672de..00e066e2f 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc +++ b/data/maps/events/DewfordTown_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ DewfordTown_PokemonCenter_2F_MapObjects:: @ 8385F38 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_15305F, 0, 0, 0 DewfordTown_PokemonCenter_2F_MapWarps:: @ 8385F80 - warp_def 1, 5, 4, 2, DewfordTown_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM DewfordTown_PokemonCenter_2F_MapEvents:: @ 8385FA8 map_events DewfordTown_PokemonCenter_2F_MapObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/events/DoubleBattleColosseum.inc index f6142c4b4..4c1058845 100644 --- a/data/maps/events/DoubleBattleColosseum.inc +++ b/data/maps/events/DoubleBattleColosseum.inc @@ -1,8 +1,8 @@ DoubleBattleColosseum_MapWarps:: @ 8391428 - warp_def 5, 8, 3, 127, NONE - warp_def 6, 8, 3, 127, NONE - warp_def 7, 8, 3, 127, NONE - warp_def 8, 8, 3, 127, NONE + warp_def 5, 8, 3, 127, MAP_NONE + warp_def 6, 8, 3, 127, MAP_NONE + warp_def 7, 8, 3, 127, MAP_NONE + warp_def 8, 8, 3, 127, MAP_NONE DoubleBattleColosseum_MapCoordEvents:: @ 8391448 coord_event 3, 4, 3, 0, 0x4000, 0, 0, DoubleBattleColosseum_EventScript_1A4383 diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/events/EverGrandeCity.inc index 41fd48f06..a4b62f583 100644 --- a/data/maps/events/EverGrandeCity.inc +++ b/data/maps/events/EverGrandeCity.inc @@ -1,8 +1,8 @@ EverGrandeCity_MapWarps:: @ 83807DC - warp_def 18, 5, 0, 0, EverGrandeCity_PokemonLeague - warp_def 27, 48, 0, 0, EverGrandeCity_PokemonCenter_1F - warp_def 18, 41, 0, 0, VictoryRoad_1F - warp_def 18, 27, 0, 1, VictoryRoad_1F + warp_def 18, 5, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE + warp_def 27, 48, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F + warp_def 18, 41, 0, 0, MAP_VICTORY_ROAD_1F + warp_def 18, 27, 0, 1, MAP_VICTORY_ROAD_1F EverGrandeCity_MapCoordEvents:: @ 83807FC coord_event 17, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/events/EverGrandeCity_ChampionsRoom.inc index 5d97fe89c..c0e672813 100644 --- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc +++ b/data/maps/events/EverGrandeCity_ChampionsRoom.inc @@ -1,11 +1,11 @@ EverGrandeCity_ChampionsRoom_MapObjects:: @ 838B334 object_event 1, MAP_OBJ_GFX_STEVEN, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 240, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 920, 0, 0 - object_event 3, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 921, 0, 0 + object_event 2, 240, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_CHAMPIONS_ROOM, 0, 0 + object_event 3, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_CHAMPIONS_ROOM, 0, 0 EverGrandeCity_ChampionsRoom_MapWarps:: @ 838B37C - warp_def 6, 12, 3, 1, EverGrandeCity_Corridor4 - warp_def 6, 2, 0, 0, EverGrandeCity_HallOfFame + warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR4 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL_OF_FAME EverGrandeCity_ChampionsRoom_MapEvents:: @ 838B38C map_events EverGrandeCity_ChampionsRoom_MapObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Corridor1.inc b/data/maps/events/EverGrandeCity_Corridor1.inc index df9176426..f3ec6727e 100644 --- a/data/maps/events/EverGrandeCity_Corridor1.inc +++ b/data/maps/events/EverGrandeCity_Corridor1.inc @@ -1,8 +1,8 @@ EverGrandeCity_Corridor1_MapWarps:: @ 838B3A0 - warp_def 5, 12, 3, 1, EverGrandeCity_SidneysRoom - warp_def 5, 2, 0, 0, EverGrandeCity_PhoebesRoom - warp_def 4, 12, 3, 1, EverGrandeCity_SidneysRoom - warp_def 6, 12, 3, 1, EverGrandeCity_SidneysRoom + warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM + warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM + warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM EverGrandeCity_Corridor1_MapEvents:: @ 838B3C0 map_events 0x0, EverGrandeCity_Corridor1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Corridor2.inc b/data/maps/events/EverGrandeCity_Corridor2.inc index 35dfa181c..e9a9cdc4c 100644 --- a/data/maps/events/EverGrandeCity_Corridor2.inc +++ b/data/maps/events/EverGrandeCity_Corridor2.inc @@ -1,8 +1,8 @@ EverGrandeCity_Corridor2_MapWarps:: @ 838B3D4 - warp_def 5, 12, 3, 1, EverGrandeCity_PhoebesRoom - warp_def 5, 2, 0, 0, EverGrandeCity_GlaciasRoom - warp_def 4, 12, 3, 1, EverGrandeCity_PhoebesRoom - warp_def 6, 12, 3, 1, EverGrandeCity_PhoebesRoom + warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM + warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM + warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM EverGrandeCity_Corridor2_MapEvents:: @ 838B3F4 map_events 0x0, EverGrandeCity_Corridor2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Corridor3.inc b/data/maps/events/EverGrandeCity_Corridor3.inc index daf135a5f..98d5f7b81 100644 --- a/data/maps/events/EverGrandeCity_Corridor3.inc +++ b/data/maps/events/EverGrandeCity_Corridor3.inc @@ -1,8 +1,8 @@ EverGrandeCity_Corridor3_MapWarps:: @ 838B408 - warp_def 5, 12, 3, 1, EverGrandeCity_GlaciasRoom - warp_def 5, 2, 0, 0, EverGrandeCity_DrakesRoom - warp_def 4, 12, 3, 1, EverGrandeCity_GlaciasRoom - warp_def 6, 12, 3, 1, EverGrandeCity_GlaciasRoom + warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_DRAKES_ROOM + warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM + warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM EverGrandeCity_Corridor3_MapEvents:: @ 838B428 map_events 0x0, EverGrandeCity_Corridor3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Corridor4.inc b/data/maps/events/EverGrandeCity_Corridor4.inc index 55757ea4c..cbcf9f77e 100644 --- a/data/maps/events/EverGrandeCity_Corridor4.inc +++ b/data/maps/events/EverGrandeCity_Corridor4.inc @@ -1,6 +1,6 @@ EverGrandeCity_Corridor4_MapWarps:: @ 838B43C - warp_def 5, 33, 3, 1, EverGrandeCity_DrakesRoom - warp_def 5, 2, 0, 0, EverGrandeCity_ChampionsRoom + warp_def 5, 33, 3, 1, MAP_EVER_GRANDE_CITY_DRAKES_ROOM + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM EverGrandeCity_Corridor4_MapEvents:: @ 838B44C map_events 0x0, EverGrandeCity_Corridor4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Corridor5.inc b/data/maps/events/EverGrandeCity_Corridor5.inc index bd07dd7e0..5b77148ca 100644 --- a/data/maps/events/EverGrandeCity_Corridor5.inc +++ b/data/maps/events/EverGrandeCity_Corridor5.inc @@ -1,8 +1,8 @@ EverGrandeCity_Corridor5_MapWarps:: @ 838B460 - warp_def 5, 12, 3, 2, EverGrandeCity_PokemonLeague - warp_def 5, 2, 0, 0, EverGrandeCity_SidneysRoom - warp_def 4, 12, 3, 2, EverGrandeCity_PokemonLeague - warp_def 6, 12, 3, 2, EverGrandeCity_PokemonLeague + warp_def 5, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM + warp_def 4, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE + warp_def 6, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE EverGrandeCity_Corridor5_MapEvents:: @ 838B480 map_events 0x0, EverGrandeCity_Corridor5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/events/EverGrandeCity_DrakesRoom.inc index a925ffed8..e7ac276aa 100644 --- a/data/maps/events/EverGrandeCity_DrakesRoom.inc +++ b/data/maps/events/EverGrandeCity_DrakesRoom.inc @@ -2,8 +2,8 @@ EverGrandeCity_DrakesRoom_MapObjects:: @ 838B2F8 object_event 1, MAP_OBJ_GFX_DRAKE, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_15B764, 0, 0, 0 EverGrandeCity_DrakesRoom_MapWarps:: @ 838B310 - warp_def 6, 13, 3, 1, EverGrandeCity_Corridor3 - warp_def 6, 2, 0, 0, EverGrandeCity_Corridor4 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR3 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR4 EverGrandeCity_DrakesRoom_MapEvents:: @ 838B320 map_events EverGrandeCity_DrakesRoom_MapObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/events/EverGrandeCity_GlaciasRoom.inc index 806cfe7e1..f6c6ce97e 100644 --- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc +++ b/data/maps/events/EverGrandeCity_GlaciasRoom.inc @@ -2,8 +2,8 @@ EverGrandeCity_GlaciasRoom_MapObjects:: @ 838B2BC object_event 1, MAP_OBJ_GFX_GLACIA, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_15B6CA, 0, 0, 0 EverGrandeCity_GlaciasRoom_MapWarps:: @ 838B2D4 - warp_def 6, 13, 3, 1, EverGrandeCity_Corridor2 - warp_def 6, 2, 0, 0, EverGrandeCity_Corridor3 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR2 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR3 EverGrandeCity_GlaciasRoom_MapEvents:: @ 838B2E4 map_events EverGrandeCity_GlaciasRoom_MapObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/events/EverGrandeCity_HallOfFame.inc index 1860ee397..9290c4530 100644 --- a/data/maps/events/EverGrandeCity_HallOfFame.inc +++ b/data/maps/events/EverGrandeCity_HallOfFame.inc @@ -2,7 +2,7 @@ EverGrandeCity_HallOfFame_MapObjects:: @ 838B528 object_event 1, MAP_OBJ_GFX_STEVEN, 0, 6, 0, 16, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 EverGrandeCity_HallOfFame_MapWarps:: @ 838B540 - warp_def 7, 11, 3, 1, EverGrandeCity_ChampionsRoom + warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM EverGrandeCity_HallOfFame_MapEvents:: @ 838B548 map_events EverGrandeCity_HallOfFame_MapObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/events/EverGrandeCity_PhoebesRoom.inc index aab61bcf4..a2de097b8 100644 --- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc +++ b/data/maps/events/EverGrandeCity_PhoebesRoom.inc @@ -2,8 +2,8 @@ EverGrandeCity_PhoebesRoom_MapObjects:: @ 838B280 object_event 1, MAP_OBJ_GFX_PHOEBE, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_15B630, 0, 0, 0 EverGrandeCity_PhoebesRoom_MapWarps:: @ 838B298 - warp_def 6, 13, 3, 1, EverGrandeCity_Corridor1 - warp_def 6, 2, 0, 0, EverGrandeCity_Corridor2 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR1 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR2 EverGrandeCity_PhoebesRoom_MapEvents:: @ 838B2A8 map_events EverGrandeCity_PhoebesRoom_MapObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc index 25aee1300..f0709710d 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ EverGrandeCity_PokemonCenter_1F_MapObjects:: @ 838B55C object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 10, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC87, 0, 0, 0 EverGrandeCity_PokemonCenter_1F_MapWarps:: @ 838B5A4 - warp_def 7, 8, 3, 1, EverGrandeCity - warp_def 6, 8, 3, 1, EverGrandeCity - warp_def 1, 6, 4, 0, EverGrandeCity_PokemonCenter_2F + warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY + warp_def 6, 8, 3, 1, MAP_EVER_GRANDE_CITY + warp_def 1, 6, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F EverGrandeCity_PokemonCenter_1F_MapEvents:: @ 838B5BC map_events EverGrandeCity_PokemonCenter_1F_MapObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc index 2bc94cdcc..e7502055a 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc +++ b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ EverGrandeCity_PokemonCenter_2F_MapObjects:: @ 838B5D0 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCAC, 0, 0, 0 EverGrandeCity_PokemonCenter_2F_MapWarps:: @ 838B618 - warp_def 1, 5, 4, 2, EverGrandeCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 838B640 map_events EverGrandeCity_PokemonCenter_2F_MapObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonLeague.inc b/data/maps/events/EverGrandeCity_PokemonLeague.inc index d60761727..77247e665 100644 --- a/data/maps/events/EverGrandeCity_PokemonLeague.inc +++ b/data/maps/events/EverGrandeCity_PokemonLeague.inc @@ -5,10 +5,10 @@ EverGrandeCity_PokemonLeague_MapObjects:: @ 838B494 object_event 4, MAP_OBJ_GFX_MAN_4, 0, 11, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0, 0, 0 EverGrandeCity_PokemonLeague_MapWarps:: @ 838B4F4 - warp_def 9, 11, 3, 0, EverGrandeCity - warp_def 10, 11, 3, 0, EverGrandeCity - warp_def 9, 1, 3, 0, EverGrandeCity_Corridor5 - warp_def 10, 1, 3, 0, EverGrandeCity_Corridor5 + warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY + warp_def 10, 11, 3, 0, MAP_EVER_GRANDE_CITY + warp_def 9, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5 + warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5 EverGrandeCity_PokemonLeague_MapEvents:: @ 838B514 map_events EverGrandeCity_PokemonLeague_MapObjects, EverGrandeCity_PokemonLeague_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/events/EverGrandeCity_SidneysRoom.inc index ff370d4ef..c2a7ce10d 100644 --- a/data/maps/events/EverGrandeCity_SidneysRoom.inc +++ b/data/maps/events/EverGrandeCity_SidneysRoom.inc @@ -2,8 +2,8 @@ EverGrandeCity_SidneysRoom_MapObjects:: @ 838B244 object_event 1, MAP_OBJ_GFX_SIDNEY, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_15B596, 0, 0, 0 EverGrandeCity_SidneysRoom_MapWarps:: @ 838B25C - warp_def 6, 13, 3, 1, EverGrandeCity_Corridor5 - warp_def 6, 2, 0, 0, EverGrandeCity_Corridor1 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR5 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR1 EverGrandeCity_SidneysRoom_MapEvents:: @ 838B26C map_events EverGrandeCity_SidneysRoom_MapObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown.inc b/data/maps/events/FallarborTown.inc index 2d69688e7..755f205bc 100644 --- a/data/maps/events/FallarborTown.inc +++ b/data/maps/events/FallarborTown.inc @@ -2,14 +2,14 @@ FallarborTown_MapObjects:: @ 8380E04 object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 8, 0, 11, 0, 3, 8, 16, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E814, 0, 0, 0 object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 9, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E7F5, 0, 0, 0 object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 11, 0, 15, 0, 3, 3, 17, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E81D, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_AZURILL, 0, 8, 0, 12, 0, 3, 1, 1, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E826, 907, 0, 0 + object_event 4, MAP_OBJ_GFX_AZURILL, 0, 8, 0, 12, 0, 3, 1, 1, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E826, FLAG_HIDE_AZURILL_FALLARBOR, 0, 0 FallarborTown_MapWarps:: @ 8380E64 - warp_def 15, 15, 0, 0, FallarborTown_Mart - warp_def 8, 7, 0, 0, FallarborTown_ContestLobby - warp_def 14, 7, 0, 0, FallarborTown_PokemonCenter_1F - warp_def 6, 17, 0, 0, FallarborTown_House1 - warp_def 1, 6, 0, 0, FallarborTown_House2 + warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART + warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_CONTEST_LOBBY + warp_def 14, 7, 0, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F + warp_def 6, 17, 0, 0, MAP_FALLARBOR_TOWN_HOUSE1 + warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2 FallarborTown_MapBGEvents:: @ 8380E8C bg_event 16, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1 diff --git a/data/maps/events/FallarborTown_ContestHall.inc b/data/maps/events/FallarborTown_ContestHall.inc index 93b43eccc..30b602e60 100644 --- a/data/maps/events/FallarborTown_ContestHall.inc +++ b/data/maps/events/FallarborTown_ContestHall.inc @@ -4,8 +4,8 @@ FallarborTown_ContestHall_MapObjects:: @ 83867DC object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 0, 15, 0, 0, 2, 51, 0, 0, 0, 0, 0, FallarborTown_ContestHall_EventScript_153AE1, 0, 0, 0 FallarborTown_ContestHall_MapWarps:: @ 8386824 - warp_def 10, 17, 0, 2, FallarborTown_ContestLobby - warp_def 11, 17, 0, 2, FallarborTown_ContestLobby + warp_def 10, 17, 0, 2, MAP_FALLARBOR_TOWN_CONTEST_LOBBY + warp_def 11, 17, 0, 2, MAP_FALLARBOR_TOWN_CONTEST_LOBBY FallarborTown_ContestHall_MapBGEvents:: @ 8386834 bg_event 12, 14, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AEA diff --git a/data/maps/events/FallarborTown_ContestLobby.inc b/data/maps/events/FallarborTown_ContestLobby.inc index af7ca5ed1..811461c02 100644 --- a/data/maps/events/FallarborTown_ContestLobby.inc +++ b/data/maps/events/FallarborTown_ContestLobby.inc @@ -3,13 +3,13 @@ FallarborTown_ContestLobby_MapObjects:: @ 83866F0 object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 2, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A8E, 0, 0, 0 object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AB2, 0, 0, 0 object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B778A, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1AE0B6, 800, 0, 0 + object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_FALLARBOR, 0, 0 object_event 6, MAP_OBJ_GFX_ARTIST, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A97, 0, 0, 0 FallarborTown_ContestLobby_MapWarps:: @ 8386780 - warp_def 5, 6, 0, 1, FallarborTown - warp_def 6, 6, 0, 1, FallarborTown - warp_def 1, 1, 0, 0, FallarborTown_ContestHall + warp_def 5, 6, 0, 1, MAP_FALLARBOR_TOWN + warp_def 6, 6, 0, 1, MAP_FALLARBOR_TOWN + warp_def 1, 1, 0, 0, MAP_FALLARBOR_TOWN_CONTEST_HALL FallarborTown_ContestLobby_MapBGEvents:: @ 8386798 bg_event 10, 3, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B7823 diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/events/FallarborTown_House1.inc index d4cd3e0c9..e3104fb1d 100644 --- a/data/maps/events/FallarborTown_House1.inc +++ b/data/maps/events/FallarborTown_House1.inc @@ -1,10 +1,10 @@ FallarborTown_House1_MapObjects:: @ 8386970 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FallarborTown_House1_EventScript_153BB5, 928, 0, 0 + object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FallarborTown_House1_EventScript_153BB5, FLAG_HIDE_PROF_COSMO_FALLARBOR, 0, 0 object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_House1_EventScript_153C5E, 0, 0, 0 FallarborTown_House1_MapWarps:: @ 83869A0 - warp_def 3, 8, 0, 3, FallarborTown - warp_def 4, 8, 0, 3, FallarborTown + warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN + warp_def 4, 8, 0, 3, MAP_FALLARBOR_TOWN FallarborTown_House1_MapEvents:: @ 83869B0 map_events FallarborTown_House1_MapObjects, FallarborTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/events/FallarborTown_House2.inc index 0b1c64162..e24fef7a9 100644 --- a/data/maps/events/FallarborTown_House2.inc +++ b/data/maps/events/FallarborTown_House2.inc @@ -2,8 +2,8 @@ FallarborTown_House2_MapObjects:: @ 83869C4 object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_House2_EventScript_153C91, 0, 0, 0 FallarborTown_House2_MapWarps:: @ 83869DC - warp_def 3, 7, 0, 4, FallarborTown - warp_def 4, 7, 0, 4, FallarborTown + warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN + warp_def 4, 7, 0, 4, MAP_FALLARBOR_TOWN FallarborTown_House2_MapEvents:: @ 83869EC map_events FallarborTown_House2_MapObjects, FallarborTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/events/FallarborTown_Mart.inc index 584b70447..c343e017e 100644 --- a/data/maps/events/FallarborTown_Mart.inc +++ b/data/maps/events/FallarborTown_Mart.inc @@ -5,8 +5,8 @@ FallarborTown_Mart_MapObjects:: @ 838666C object_event 4, MAP_OBJ_GFX_SKITTY, 0, 2, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1539AE, 0, 0, 0 FallarborTown_Mart_MapWarps:: @ 83866CC - warp_def 3, 7, 0, 0, FallarborTown - warp_def 4, 7, 0, 0, FallarborTown + warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN + warp_def 4, 7, 0, 0, MAP_FALLARBOR_TOWN FallarborTown_Mart_MapEvents:: @ 83866DC map_events FallarborTown_Mart_MapObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/events/FallarborTown_PokemonCenter_1F.inc index 16f90af9d..ff2278e29 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_1F.inc @@ -2,12 +2,12 @@ FallarborTown_PokemonCenter_1F_MapObjects:: @ 8386860 object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B02, 0, 0, 0 object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B10, 0, 0, 0 object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B19, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, 871, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, FLAG_HIDE_LANETTE_FALLARBOR, 0, 0 FallarborTown_PokemonCenter_1F_MapWarps:: @ 83868C0 - warp_def 7, 8, 3, 2, FallarborTown - warp_def 6, 8, 3, 2, FallarborTown - warp_def 1, 6, 4, 0, FallarborTown_PokemonCenter_2F + warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN + warp_def 6, 8, 3, 2, MAP_FALLARBOR_TOWN + warp_def 1, 6, 4, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F FallarborTown_PokemonCenter_1F_MapEvents:: @ 83868D8 map_events FallarborTown_PokemonCenter_1F_MapObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/events/FallarborTown_PokemonCenter_2F.inc index 05ea78f75..1ae7bba2a 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ FallarborTown_PokemonCenter_2F_MapObjects:: @ 83868EC object_event 3, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA2, 0, 0, 0 FallarborTown_PokemonCenter_2F_MapWarps:: @ 8386934 - warp_def 1, 5, 4, 2, FallarborTown_PokemonCenter_1F - warp_def 5, 1, 3, 0, SingleBattleColosseum - warp_def 8, 1, 3, 0, TradeCenter - warp_def 11, 1, 3, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 3, 0, MAP_TRADE_CENTER + warp_def 11, 1, 3, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM FallarborTown_PokemonCenter_2F_MapEvents:: @ 838695C map_events FallarborTown_PokemonCenter_2F_MapObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc index a4ac688d8..575f92bd5 100644 --- a/data/maps/events/FieryPath.inc +++ b/data/maps/events/FieryPath.inc @@ -1,16 +1,16 @@ FieryPath_MapObjects:: @ 838C718 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17EE, 1091, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17E1, 1111, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17EE, FLAG_ITEM_FIERY_PATH_1, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17E1, FLAG_ITEM_FIERY_PATH_2, 0, 0 FieryPath_MapWarps:: @ 838C7D8 - warp_def 26, 36, 3, 4, Route112 - warp_def 26, 4, 3, 5, Route112 + warp_def 26, 36, 3, 4, MAP_ROUTE112 + warp_def 26, 4, 3, 5, MAP_ROUTE112 FieryPath_MapEvents:: @ 838C7E8 map_events FieryPath_MapObjects, FieryPath_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity.inc b/data/maps/events/FortreeCity.inc index 437852d25..4c80997f9 100644 --- a/data/maps/events/FortreeCity.inc +++ b/data/maps/events/FortreeCity.inc @@ -5,18 +5,18 @@ FortreeCity_MapObjects:: @ 8380020 object_event 4, MAP_OBJ_GFX_BOY_1, 0, 11, 0, 14, 0, 4, 1, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C98F, 0, 0, 0 object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C986, 0, 0, 0 object_event 6, MAP_OBJ_GFX_BOY_5, 0, 9, 0, 16, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C998, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_KECLEON_1, 0, 25, 0, 8, 0, 3, 76, 17, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C9B3, 969, 0, 0 + object_event 7, MAP_OBJ_GFX_KECLEON_1, 0, 25, 0, 8, 0, 3, 76, 17, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C9B3, FLAG_HIDE_KECLEON_FORTREE, 0, 0 FortreeCity_MapWarps:: @ 83800C8 - warp_def 5, 6, 0, 0, FortreeCity_PokemonCenter_1F - warp_def 10, 3, 0, 0, FortreeCity_House1 - warp_def 22, 11, 0, 0, FortreeCity_Gym - warp_def 4, 14, 0, 0, FortreeCity_Mart - warp_def 17, 3, 0, 0, FortreeCity_House2 - warp_def 25, 3, 0, 0, FortreeCity_House3 - warp_def 32, 2, 0, 0, FortreeCity_House4 - warp_def 12, 13, 0, 0, FortreeCity_House5 - warp_def 37, 13, 0, 0, FortreeCity_DecorationShop + warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F + warp_def 10, 3, 0, 0, MAP_FORTREE_CITY_HOUSE1 + warp_def 22, 11, 0, 0, MAP_FORTREE_CITY_GYM + warp_def 4, 14, 0, 0, MAP_FORTREE_CITY_MART + warp_def 17, 3, 0, 0, MAP_FORTREE_CITY_HOUSE2 + warp_def 25, 3, 0, 0, MAP_FORTREE_CITY_HOUSE3 + warp_def 32, 2, 0, 0, MAP_FORTREE_CITY_HOUSE4 + warp_def 12, 13, 0, 0, MAP_FORTREE_CITY_HOUSE5 + warp_def 37, 13, 0, 0, MAP_FORTREE_CITY_DECORATION_SHOP FortreeCity_MapBGEvents:: @ 8380110 bg_event 6, 9, 0, 0, 0, FortreeCity_EventScript_14C9A1 diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/events/FortreeCity_DecorationShop.inc index cc9894b5c..930a73b55 100644 --- a/data/maps/events/FortreeCity_DecorationShop.inc +++ b/data/maps/events/FortreeCity_DecorationShop.inc @@ -5,8 +5,8 @@ FortreeCity_DecorationShop_MapObjects:: @ 83893E0 object_event 4, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158298, 0, 0, 0 FortreeCity_DecorationShop_MapWarps:: @ 8389440 - warp_def 3, 5, 0, 8, FortreeCity - warp_def 4, 5, 0, 8, FortreeCity + warp_def 3, 5, 0, 8, MAP_FORTREE_CITY + warp_def 4, 5, 0, 8, MAP_FORTREE_CITY FortreeCity_DecorationShop_MapEvents:: @ 8389450 map_events FortreeCity_DecorationShop_MapObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/events/FortreeCity_Gym.inc index ad983f81b..523dd3fdc 100644 --- a/data/maps/events/FortreeCity_Gym.inc +++ b/data/maps/events/FortreeCity_Gym.inc @@ -7,8 +7,8 @@ FortreeCity_Gym_MapObjects:: @ 8389018 object_event 6, MAP_OBJ_GFX_MAN_2, 0, 2, 0, 19, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157FBE, 0, 0, 0 FortreeCity_Gym_MapWarps:: @ 83890A8 - warp_def 2, 24, 0, 2, FortreeCity - warp_def 3, 24, 0, 2, FortreeCity + warp_def 2, 24, 0, 2, MAP_FORTREE_CITY + warp_def 3, 24, 0, 2, MAP_FORTREE_CITY FortreeCity_Gym_MapBGEvents:: @ 83890B8 bg_event 1, 21, 0, 1, 0, FortreeCity_Gym_EventScript_157FDD diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/events/FortreeCity_House1.inc index ff383b464..23cd52fdc 100644 --- a/data/maps/events/FortreeCity_House1.inc +++ b/data/maps/events/FortreeCity_House1.inc @@ -4,8 +4,8 @@ FortreeCity_House1_MapObjects:: @ 8388FAC object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, FortreeCity_House1_EventScript_157EB7, 0, 0, 0 FortreeCity_House1_MapWarps:: @ 8388FF4 - warp_def 3, 5, 0, 1, FortreeCity - warp_def 4, 5, 0, 1, FortreeCity + warp_def 3, 5, 0, 1, MAP_FORTREE_CITY + warp_def 4, 5, 0, 1, MAP_FORTREE_CITY FortreeCity_House1_MapEvents:: @ 8389004 map_events FortreeCity_House1_MapObjects, FortreeCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/events/FortreeCity_House2.inc index 3b0943b2e..1c7246100 100644 --- a/data/maps/events/FortreeCity_House2.inc +++ b/data/maps/events/FortreeCity_House2.inc @@ -2,8 +2,8 @@ FortreeCity_House2_MapObjects:: @ 8389278 object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 2, 0, 3, 0, 3, 5, 1, 0, 0, 0, 0, 0, FortreeCity_House2_EventScript_1580B4, 0, 0, 0 FortreeCity_House2_MapWarps:: @ 8389290 - warp_def 3, 5, 0, 4, FortreeCity - warp_def 4, 5, 0, 4, FortreeCity + warp_def 3, 5, 0, 4, MAP_FORTREE_CITY + warp_def 4, 5, 0, 4, MAP_FORTREE_CITY FortreeCity_House2_MapEvents:: @ 83892A0 map_events FortreeCity_House2_MapObjects, FortreeCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/events/FortreeCity_House3.inc index b0b5a7412..359953246 100644 --- a/data/maps/events/FortreeCity_House3.inc +++ b/data/maps/events/FortreeCity_House3.inc @@ -3,8 +3,8 @@ FortreeCity_House3_MapObjects:: @ 83892B4 object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_House3_EventScript_158175, 0, 0, 0 FortreeCity_House3_MapWarps:: @ 83892E4 - warp_def 3, 5, 0, 5, FortreeCity - warp_def 4, 5, 0, 5, FortreeCity + warp_def 3, 5, 0, 5, MAP_FORTREE_CITY + warp_def 4, 5, 0, 5, MAP_FORTREE_CITY FortreeCity_House3_MapEvents:: @ 83892F4 map_events FortreeCity_House3_MapObjects, FortreeCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/events/FortreeCity_House4.inc index 8b85660c7..0a5f81b6c 100644 --- a/data/maps/events/FortreeCity_House4.inc +++ b/data/maps/events/FortreeCity_House4.inc @@ -1,11 +1,11 @@ FortreeCity_House4_MapObjects:: @ 8389308 object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_15817F, 0, 0, 0 object_event 2, MAP_OBJ_GFX_BOY_3, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_158188, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WINGULL, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_15821E, 933, 0, 0 + object_event 3, MAP_OBJ_GFX_WINGULL, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_15821E, FLAG_HIDE_WINGULL_FORTREE_HOUSE, 0, 0 FortreeCity_House4_MapWarps:: @ 8389350 - warp_def 3, 5, 0, 6, FortreeCity - warp_def 4, 5, 0, 6, FortreeCity + warp_def 3, 5, 0, 6, MAP_FORTREE_CITY + warp_def 4, 5, 0, 6, MAP_FORTREE_CITY FortreeCity_House4_MapEvents:: @ 8389360 map_events FortreeCity_House4_MapObjects, FortreeCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/events/FortreeCity_House5.inc index ffaa59e69..94ff0ebb1 100644 --- a/data/maps/events/FortreeCity_House5.inc +++ b/data/maps/events/FortreeCity_House5.inc @@ -4,8 +4,8 @@ FortreeCity_House5_MapObjects:: @ 8389374 object_event 3, MAP_OBJ_GFX_MAN_1, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, FortreeCity_House5_EventScript_15823B, 0, 0, 0 FortreeCity_House5_MapWarps:: @ 83893BC - warp_def 3, 5, 0, 7, FortreeCity - warp_def 4, 5, 0, 7, FortreeCity + warp_def 3, 5, 0, 7, MAP_FORTREE_CITY + warp_def 4, 5, 0, 7, MAP_FORTREE_CITY FortreeCity_House5_MapEvents:: @ 83893CC map_events FortreeCity_House5_MapObjects, FortreeCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/events/FortreeCity_Mart.inc index 5d1996fc2..2353c3c1f 100644 --- a/data/maps/events/FortreeCity_Mart.inc +++ b/data/maps/events/FortreeCity_Mart.inc @@ -5,8 +5,8 @@ FortreeCity_Mart_MapObjects:: @ 83891F4 object_event 4, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, FortreeCity_Mart_EventScript_1580AA, 0, 0, 0 FortreeCity_Mart_MapWarps:: @ 8389254 - warp_def 3, 7, 0, 3, FortreeCity - warp_def 4, 7, 0, 3, FortreeCity + warp_def 3, 7, 0, 3, MAP_FORTREE_CITY + warp_def 4, 7, 0, 3, MAP_FORTREE_CITY FortreeCity_Mart_MapEvents:: @ 8389264 map_events FortreeCity_Mart_MapObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/events/FortreeCity_PokemonCenter_1F.inc index bd7877e24..bc06da7ca 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_1F.inc +++ b/data/maps/events/FortreeCity_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ FortreeCity_PokemonCenter_1F_MapObjects:: @ 83890E4 object_event 4, MAP_OBJ_GFX_BOY_3, 0, 2, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15803B, 0, 0, 0 FortreeCity_PokemonCenter_1F_MapWarps:: @ 8389144 - warp_def 7, 8, 3, 0, FortreeCity - warp_def 6, 8, 3, 0, FortreeCity - warp_def 1, 6, 4, 0, FortreeCity_PokemonCenter_2F + warp_def 7, 8, 3, 0, MAP_FORTREE_CITY + warp_def 6, 8, 3, 0, MAP_FORTREE_CITY + warp_def 1, 6, 4, 0, MAP_FORTREE_CITY_POKEMON_CENTER_2F FortreeCity_PokemonCenter_1F_MapEvents:: @ 838915C map_events FortreeCity_PokemonCenter_1F_MapObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/events/FortreeCity_PokemonCenter_2F.inc index b6a10428c..f16c59cce 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc +++ b/data/maps/events/FortreeCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ FortreeCity_PokemonCenter_2F_MapObjects:: @ 8389170 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158060, 0, 0, 0 FortreeCity_PokemonCenter_2F_MapWarps:: @ 83891B8 - warp_def 1, 5, 4, 2, FortreeCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM FortreeCity_PokemonCenter_2F_MapEvents:: @ 83891E0 map_events FortreeCity_PokemonCenter_2F_MapObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/events/GraniteCave_1F.inc index 760c1b0e9..ade38322f 100644 --- a/data/maps/events/GraniteCave_1F.inc +++ b/data/maps/events/GraniteCave_1F.inc @@ -1,12 +1,12 @@ GraniteCave_1F_MapObjects:: @ 838BF24 object_event 1, MAP_OBJ_GFX_HIKER, 0, 36, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_1F_EventScript_15CBA7, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, GraniteCave_1F_EventScript_1B17A0, 1050, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, GraniteCave_1F_EventScript_1B17A0, FLAG_ITEM_GRANITE_CAVE_1F_1, 0, 0 GraniteCave_1F_MapWarps:: @ 838BF54 - warp_def 37, 12, 3, 0, Route106 - warp_def 35, 3, 3, 0, GraniteCave_B1F - warp_def 17, 11, 3, 1, GraniteCave_B1F - warp_def 5, 10, 3, 0, GraniteCave_StevensRoom + warp_def 37, 12, 3, 0, MAP_ROUTE106 + warp_def 35, 3, 3, 0, MAP_GRANITE_CAVE_B1F + warp_def 17, 11, 3, 1, MAP_GRANITE_CAVE_B1F + warp_def 5, 10, 3, 0, MAP_GRANITE_CAVE_STEVENS_ROOM GraniteCave_1F_MapEvents:: @ 838BF74 map_events GraniteCave_1F_MapObjects, GraniteCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/events/GraniteCave_B1F.inc index 2bfd8257d..e50fd09af 100644 --- a/data/maps/events/GraniteCave_B1F.inc +++ b/data/maps/events/GraniteCave_B1F.inc @@ -1,14 +1,14 @@ GraniteCave_B1F_MapObjects:: @ 838BF88 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B1F_EventScript_1B17AD, 1051, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B1F_EventScript_1B17AD, FLAG_ITEM_GRANITE_CAVE_B1F_1, 0, 0 GraniteCave_B1F_MapWarps:: @ 838BFA0 - warp_def 25, 13, 3, 1, GraniteCave_1F - warp_def 4, 21, 3, 2, GraniteCave_1F - warp_def 29, 13, 3, 0, GraniteCave_B2F - warp_def 28, 21, 3, 1, GraniteCave_B2F - warp_def 8, 5, 3, 2, GraniteCave_B2F - warp_def 12, 3, 3, 3, GraniteCave_B2F - warp_def 29, 2, 3, 4, GraniteCave_B2F + warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F + warp_def 4, 21, 3, 2, MAP_GRANITE_CAVE_1F + warp_def 29, 13, 3, 0, MAP_GRANITE_CAVE_B2F + warp_def 28, 21, 3, 1, MAP_GRANITE_CAVE_B2F + warp_def 8, 5, 3, 2, MAP_GRANITE_CAVE_B2F + warp_def 12, 3, 3, 3, MAP_GRANITE_CAVE_B2F + warp_def 29, 2, 3, 4, MAP_GRANITE_CAVE_B2F GraniteCave_B1F_MapEvents:: @ 838BFD8 map_events GraniteCave_B1F_MapObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc index 158577482..c8a7c5554 100644 --- a/data/maps/events/GraniteCave_B2F.inc +++ b/data/maps/events/GraniteCave_B2F.inc @@ -1,20 +1,20 @@ GraniteCave_B2F_MapObjects:: @ 838BFEC - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, 1053, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, 1054, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0 - object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 23, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, FLAG_ITEM_GRANITE_CAVE_B2F_1, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, FLAG_ITEM_GRANITE_CAVE_B2F_2, 0, 0 + object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 + object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0 + object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_17, 0, 0 GraniteCave_B2F_MapWarps:: @ 838C0C4 - warp_def 29, 13, 3, 2, GraniteCave_B1F - warp_def 28, 21, 3, 3, GraniteCave_B1F - warp_def 8, 5, 3, 4, GraniteCave_B1F - warp_def 12, 3, 3, 5, GraniteCave_B1F - warp_def 29, 2, 3, 6, GraniteCave_B1F + warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F + warp_def 28, 21, 3, 3, MAP_GRANITE_CAVE_B1F + warp_def 8, 5, 3, 4, MAP_GRANITE_CAVE_B1F + warp_def 12, 3, 3, 5, MAP_GRANITE_CAVE_B1F + warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F GraniteCave_B2F_MapBGEvents:: @ 838C0EC bg_event 28, 6, 3, 7, 0, ITEM_EVERSTONE, 48, 0 diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/events/GraniteCave_StevensRoom.inc index 2e4d9cd30..efab4fa71 100644 --- a/data/maps/events/GraniteCave_StevensRoom.inc +++ b/data/maps/events/GraniteCave_StevensRoom.inc @@ -1,8 +1,8 @@ GraniteCave_StevensRoom_MapObjects:: @ 838C118 - object_event 1, MAP_OBJ_GFX_STEVEN, 0, 7, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, 833, 0, 0 + object_event 1, MAP_OBJ_GFX_STEVEN, 0, 7, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, FLAG_HIDE_STEVEN_GRANITE_CAVE, 0, 0 GraniteCave_StevensRoom_MapWarps:: @ 838C130 - warp_def 7, 3, 3, 3, GraniteCave_1F + warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F GraniteCave_StevensRoom_MapEvents:: @ 838C138 map_events GraniteCave_StevensRoom_MapObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc index faf7a5274..3b177129a 100644 --- a/data/maps/events/InsideOfTruck.inc +++ b/data/maps/events/InsideOfTruck.inc @@ -4,9 +4,9 @@ InsideOfTruck_MapObjects:: @ 8391618 object_event 3, MAP_OBJ_GFX_MOVING_BOX, 0, 2, 0, 3, 0, 8, 8, 0, 0, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0, 0, 0 InsideOfTruck_MapWarps:: @ 8391660 - warp_def 4, 1, 0, 127, NONE - warp_def 4, 2, 0, 127, NONE - warp_def 4, 3, 0, 127, NONE + warp_def 4, 1, 0, 127, MAP_NONE + warp_def 4, 2, 0, 127, MAP_NONE + warp_def 4, 3, 0, 127, MAP_NONE InsideOfTruck_MapCoordEvents:: @ 8391678 coord_event 3, 1, 3, 0, 0x4092, 0, 0, InsideOfTruck_EventScript_15FC29 diff --git a/data/maps/events/IslandCave.inc b/data/maps/events/IslandCave.inc index a3fbc959a..94fbce914 100644 --- a/data/maps/events/IslandCave.inc +++ b/data/maps/events/IslandCave.inc @@ -1,10 +1,10 @@ IslandCave_MapObjects:: @ 838E674 - object_event 1, MAP_OBJ_GFX_REGICE, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, IslandCave_EventScript_15EF9D, 936, 0, 0 + object_event 1, MAP_OBJ_GFX_REGICE, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, IslandCave_EventScript_15EF9D, FLAG_HIDE_REGICE, 0, 0 IslandCave_MapWarps:: @ 838E68C - warp_def 8, 29, 3, 0, Route105 - warp_def 8, 20, 0, 2, IslandCave - warp_def 8, 11, 3, 1, IslandCave + warp_def 8, 29, 3, 0, MAP_ROUTE105 + warp_def 8, 20, 0, 2, MAP_ISLAND_CAVE + warp_def 8, 11, 3, 1, MAP_ISLAND_CAVE IslandCave_MapBGEvents:: @ 838E6A4 bg_event 8, 20, 0, 0, 0, IslandCave_EventScript_15EF59 diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc index 245871e9b..654cbb9ae 100644 --- a/data/maps/events/JaggedPass.inc +++ b/data/maps/events/JaggedPass.inc @@ -1,14 +1,14 @@ JaggedPass_MapObjects:: @ 838C61C object_event 1, MAP_OBJ_GFX_HIKER, 0, 8, 0, 18, 0, 3, 8, 0, 0, 1, 0, 3, 0, JaggedPass_EventScript_15D285, 0, 0, 0 object_event 2, MAP_OBJ_GFX_CAMPER, 0, 16, 0, 22, 0, 3, 14, 0, 0, 1, 0, 2, 0, JaggedPass_EventScript_15D2DA, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, JaggedPass_EventScript_1B17D4, 1070, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, JaggedPass_EventScript_1B17D4, FLAG_ITEM_JAGGED_PASS_1, 0, 0 object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 13, 0, 35, 0, 3, 15, 17, 0, 1, 0, 3, 0, JaggedPass_EventScript_15D29C, 0, 0, 0 JaggedPass_MapWarps:: @ 838C67C - warp_def 14, 40, 3, 2, Route112 - warp_def 15, 40, 3, 3, Route112 - warp_def 13, 5, 3, 2, MtChimney - warp_def 14, 5, 3, 3, MtChimney + warp_def 14, 40, 3, 2, MAP_ROUTE112 + warp_def 15, 40, 3, 3, MAP_ROUTE112 + warp_def 13, 5, 3, 2, MAP_MT_CHIMNEY + warp_def 14, 5, 3, 3, MAP_MT_CHIMNEY JaggedPass_MapCoordEvents:: @ 838C69C coord_event 13, 15, 3, 0, 2, 0, 0, 0x0 diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/events/LavaridgeTown.inc index 47dd5ab4a..1c63eb83e 100644 --- a/data/maps/events/LavaridgeTown.inc +++ b/data/maps/events/LavaridgeTown.inc @@ -5,17 +5,17 @@ LavaridgeTown_MapObjects:: @ 8380C78 object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 0, 13, 0, 3, 3, 32, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E736, 0, 0, 0 object_event 5, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 0, 4, 0, 3, 18, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E73F, 0, 0, 0 object_event 6, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 0, 4, 0, 3, 17, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E748, 0, 0, 0 - object_event 7, 243, 0, 6, 0, 16, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 930, 0, 0 - object_event 8, 240, 0, 12, 0, 15, 0, 0, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, 929, 0, 0 + object_event 7, 243, 0, 6, 0, 16, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_LAVARIDGE_2, 0, 0 + object_event 8, 240, 0, 12, 0, 15, 0, 0, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, FLAG_HIDE_RIVAL_LAVARIDGE_1, 0, 0 object_event 9, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 4, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E75A, 0, 0, 0 LavaridgeTown_MapWarps:: @ 8380D50 - warp_def 12, 15, 0, 0, LavaridgeTown_HerbShop - warp_def 5, 15, 0, 0, LavaridgeTown_Gym_1F - warp_def 15, 5, 0, 0, LavaridgeTown_Mart - warp_def 9, 6, 0, 0, LavaridgeTown_PokemonCenter_1F - warp_def 16, 15, 0, 0, LavaridgeTown_House - warp_def 9, 2, 3, 3, LavaridgeTown_PokemonCenter_1F + warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP + warp_def 5, 15, 0, 0, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 15, 5, 0, 0, MAP_LAVARIDGE_TOWN_MART + warp_def 9, 6, 0, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F + warp_def 16, 15, 0, 0, MAP_LAVARIDGE_TOWN_HOUSE + warp_def 9, 2, 3, 3, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F LavaridgeTown_MapCoordEvents:: @ 8380D80 coord_event 6, 3, 3, 0, 0, 0, 0, LavaridgeTown_EventScript_14E710 diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/events/LavaridgeTown_Gym_1F.inc index add699f5d..0df412932 100644 --- a/data/maps/events/LavaridgeTown_Gym_1F.inc +++ b/data/maps/events/LavaridgeTown_Gym_1F.inc @@ -8,28 +8,28 @@ LavaridgeTown_Gym_1F_MapObjects:: @ 838625C object_event 7, MAP_OBJ_GFX_MAN_6, 0, 6, 0, 2, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153808, 0, 0, 0 LavaridgeTown_Gym_1F_MapWarps:: @ 8386304 - warp_def 8, 23, 3, 1, LavaridgeTown - warp_def 9, 23, 3, 1, LavaridgeTown - warp_def 3, 21, 3, 0, LavaridgeTown_Gym_B1F - warp_def 1, 14, 3, 2, LavaridgeTown_Gym_B1F - warp_def 6, 14, 3, 4, LavaridgeTown_Gym_B1F - warp_def 1, 6, 3, 3, LavaridgeTown_Gym_B1F - warp_def 9, 2, 3, 1, LavaridgeTown_Gym_B1F - warp_def 6, 20, 3, 5, LavaridgeTown_Gym_B1F - warp_def 0, 23, 3, 6, LavaridgeTown_Gym_B1F - warp_def 0, 17, 3, 7, LavaridgeTown_Gym_B1F - warp_def 4, 17, 3, 8, LavaridgeTown_Gym_B1F - warp_def 0, 11, 3, 9, LavaridgeTown_Gym_B1F - warp_def 4, 12, 3, 10, LavaridgeTown_Gym_B1F - warp_def 4, 9, 3, 11, LavaridgeTown_Gym_B1F - warp_def 0, 2, 3, 12, LavaridgeTown_Gym_B1F - warp_def 4, 6, 3, 13, LavaridgeTown_Gym_B1F - warp_def 4, 2, 3, 14, LavaridgeTown_Gym_B1F - warp_def 10, 19, 3, 15, LavaridgeTown_Gym_B1F - warp_def 10, 14, 3, 16, LavaridgeTown_Gym_B1F - warp_def 6, 6, 3, 17, LavaridgeTown_Gym_B1F - warp_def 6, 2, 3, 18, LavaridgeTown_Gym_B1F - warp_def 10, 6, 3, 19, LavaridgeTown_Gym_B1F + warp_def 8, 23, 3, 1, MAP_LAVARIDGE_TOWN + warp_def 9, 23, 3, 1, MAP_LAVARIDGE_TOWN + warp_def 3, 21, 3, 0, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 1, 14, 3, 2, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 6, 14, 3, 4, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 1, 6, 3, 3, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 9, 2, 3, 1, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 6, 20, 3, 5, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 23, 3, 6, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 17, 3, 7, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 17, 3, 8, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 11, 3, 9, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 12, 3, 10, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 9, 3, 11, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 2, 3, 12, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 2, 3, 14, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 10, 19, 3, 15, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 10, 14, 3, 16, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 6, 6, 3, 17, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 6, 2, 3, 18, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 10, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_B1F LavaridgeTown_Gym_1F_MapBGEvents:: @ 83863B4 bg_event 6, 17, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153878 diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/events/LavaridgeTown_Gym_B1F.inc index 4cff944bc..9492194a8 100644 --- a/data/maps/events/LavaridgeTown_Gym_B1F.inc +++ b/data/maps/events/LavaridgeTown_Gym_B1F.inc @@ -1,24 +1,24 @@ LavaridgeTown_Gym_B1F_MapWarps:: @ 83863E0 - warp_def 3, 21, 3, 2, LavaridgeTown_Gym_1F - warp_def 9, 2, 3, 6, LavaridgeTown_Gym_1F - warp_def 1, 14, 3, 3, LavaridgeTown_Gym_1F - warp_def 1, 6, 3, 5, LavaridgeTown_Gym_1F - warp_def 6, 14, 3, 4, LavaridgeTown_Gym_1F - warp_def 6, 20, 3, 7, LavaridgeTown_Gym_1F - warp_def 0, 23, 3, 8, LavaridgeTown_Gym_1F - warp_def 0, 17, 3, 9, LavaridgeTown_Gym_1F - warp_def 4, 17, 3, 10, LavaridgeTown_Gym_1F - warp_def 0, 11, 3, 11, LavaridgeTown_Gym_1F - warp_def 4, 12, 3, 12, LavaridgeTown_Gym_1F - warp_def 4, 9, 3, 13, LavaridgeTown_Gym_1F - warp_def 0, 2, 3, 14, LavaridgeTown_Gym_1F - warp_def 4, 6, 3, 15, LavaridgeTown_Gym_1F - warp_def 4, 2, 3, 16, LavaridgeTown_Gym_1F - warp_def 10, 18, 3, 17, LavaridgeTown_Gym_1F - warp_def 10, 14, 3, 18, LavaridgeTown_Gym_1F - warp_def 6, 6, 3, 19, LavaridgeTown_Gym_1F - warp_def 6, 2, 3, 20, LavaridgeTown_Gym_1F - warp_def 10, 6, 3, 21, LavaridgeTown_Gym_1F + warp_def 3, 21, 3, 2, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 9, 2, 3, 6, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 1, 14, 3, 3, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 1, 6, 3, 5, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 6, 14, 3, 4, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 6, 20, 3, 7, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 23, 3, 8, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 17, 3, 9, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 17, 3, 10, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 11, 3, 11, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 12, 3, 12, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 9, 3, 13, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 2, 3, 14, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 6, 3, 15, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 2, 3, 16, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 10, 18, 3, 17, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 10, 14, 3, 18, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 6, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 6, 2, 3, 20, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 10, 6, 3, 21, MAP_LAVARIDGE_TOWN_GYM_1F LavaridgeTown_Gym_B1F_MapEvents:: @ 8386480 map_events 0x0, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/events/LavaridgeTown_HerbShop.inc index cb04b19d4..8223a30c3 100644 --- a/data/maps/events/LavaridgeTown_HerbShop.inc +++ b/data/maps/events/LavaridgeTown_HerbShop.inc @@ -4,8 +4,8 @@ LavaridgeTown_HerbShop_MapObjects:: @ 83861F0 object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 3, 0, 3, 5, 17, 0, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_15364C, 0, 0, 0 LavaridgeTown_HerbShop_MapWarps:: @ 8386238 - warp_def 3, 7, 0, 0, LavaridgeTown - warp_def 4, 7, 0, 0, LavaridgeTown + warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN + warp_def 4, 7, 0, 0, MAP_LAVARIDGE_TOWN LavaridgeTown_HerbShop_MapEvents:: @ 8386248 map_events LavaridgeTown_HerbShop_MapObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/events/LavaridgeTown_House.inc index feb226cd0..771b9669b 100644 --- a/data/maps/events/LavaridgeTown_House.inc +++ b/data/maps/events/LavaridgeTown_House.inc @@ -3,8 +3,8 @@ LavaridgeTown_House_MapObjects:: @ 8386494 object_event 2, MAP_OBJ_GFX_ZIGZAGOON, 0, 6, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavaridgeTown_House_EventScript_1538B7, 0, 0, 0 LavaridgeTown_House_MapWarps:: @ 83864C4 - warp_def 3, 7, 0, 4, LavaridgeTown - warp_def 4, 7, 0, 4, LavaridgeTown + warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN + warp_def 4, 7, 0, 4, MAP_LAVARIDGE_TOWN LavaridgeTown_House_MapEvents:: @ 83864D4 map_events LavaridgeTown_House_MapObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/events/LavaridgeTown_Mart.inc index 8a07501f7..ff184b78e 100644 --- a/data/maps/events/LavaridgeTown_Mart.inc +++ b/data/maps/events/LavaridgeTown_Mart.inc @@ -4,8 +4,8 @@ LavaridgeTown_Mart_MapObjects:: @ 83864E8 object_event 3, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 9, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_153903, 0, 0, 0 LavaridgeTown_Mart_MapWarps:: @ 8386530 - warp_def 3, 7, 0, 2, LavaridgeTown - warp_def 4, 7, 0, 2, LavaridgeTown + warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN + warp_def 4, 7, 0, 2, MAP_LAVARIDGE_TOWN LavaridgeTown_Mart_MapEvents:: @ 8386540 map_events LavaridgeTown_Mart_MapObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc index dac3d4a72..5e529bb1e 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc @@ -5,10 +5,10 @@ LavaridgeTown_PokemonCenter_1F_MapObjects:: @ 8386554 object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15393B, 0, 0, 0 LavaridgeTown_PokemonCenter_1F_MapWarps:: @ 83865B4 - warp_def 7, 8, 3, 3, LavaridgeTown - warp_def 6, 8, 3, 3, LavaridgeTown - warp_def 1, 6, 4, 0, LavaridgeTown_PokemonCenter_2F - warp_def 2, 1, 0, 5, LavaridgeTown + warp_def 7, 8, 3, 3, MAP_LAVARIDGE_TOWN + warp_def 6, 8, 3, 3, MAP_LAVARIDGE_TOWN + warp_def 1, 6, 4, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F + warp_def 2, 1, 0, 5, MAP_LAVARIDGE_TOWN LavaridgeTown_PokemonCenter_1F_MapEvents:: @ 83865D4 map_events LavaridgeTown_PokemonCenter_1F_MapObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc index 3ef0517b1..39035ba87 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc +++ b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ LavaridgeTown_PokemonCenter_2F_MapObjects:: @ 83865E8 object_event 3, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_15395A, 0, 0, 0 LavaridgeTown_PokemonCenter_2F_MapWarps:: @ 8386630 - warp_def 1, 5, 4, 2, LavaridgeTown_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 8386658 map_events LavaridgeTown_PokemonCenter_2F_MapObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc index a356e2b9e..8e53d3544 100644 --- a/data/maps/events/LilycoveCity.inc +++ b/data/maps/events/LilycoveCity.inc @@ -8,31 +8,31 @@ LilycoveCity_MapObjects:: @ 838016C object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 35, 0, 37, 0, 5, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC36, 0, 0, 0 object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 34, 0, 37, 0, 5, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC3F, 0, 0, 0 object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 57, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC48, 0, 0, 0 - object_event 10, 241, 0, 73, 0, 15, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, 852, 0, 0 - object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 61, 0, 36, 0, 5, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, 1042, 0, 0 - object_event 12, 241, 0, 43, 0, 18, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD3D, 852, 0, 0 - object_event 13, 241, 0, 46, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, 852, 0, 0 - object_event 14, 241, 0, 45, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, 852, 0, 0 - object_event 15, 241, 0, 38, 0, 9, 0, 5, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, 852, 0, 0 + object_event 10, 241, 0, 73, 0, 15, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 + object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 61, 0, 36, 0, 5, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, FLAG_ITEM_LILYCOVE_1, 0, 0 + object_event 12, 241, 0, 43, 0, 18, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD3D, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 + object_event 13, 241, 0, 46, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 + object_event 14, 241, 0, 45, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 + object_event 15, 241, 0, 38, 0, 9, 0, 5, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 object_event 16, MAP_OBJ_GFX_GENTLEMAN, 0, 50, 0, 7, 0, 5, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CB74, 0, 0, 0 - object_event 17, 240, 0, 27, 0, 7, 0, 5, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD46, 971, 0, 0 + object_event 17, 240, 0, 27, 0, 7, 0, 5, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD46, FLAG_HIDE_RIVAL_LILYCOVE_MART, 0, 0 LilycoveCity_MapWarps:: @ 8380304 - warp_def 27, 6, 0, 0, LilycoveCity_DepartmentStore_1F - warp_def 37, 24, 0, 0, LilycoveCity_CoveLilyMotel_1F - warp_def 24, 14, 0, 0, LilycoveCity_PokemonCenter_1F - warp_def 11, 5, 0, 0, LilycoveCity_LilycoveMuseum_1F - warp_def 23, 24, 0, 0, LilycoveCity_ContestLobby - warp_def 39, 14, 0, 1, LilycoveCity_PokemonTrainerFanClub - warp_def 70, 5, 1, 0, AquaHideout_1F - warp_def 36, 6, 0, 0, LilycoveCity_MoveDeletersHouse - warp_def 42, 6, 0, 0, LilycoveCity_House1 - warp_def 55, 15, 0, 0, LilycoveCity_House2 - warp_def 11, 22, 0, 0, LilycoveCity_House3 - warp_def 12, 14, 0, 0, LilycoveCity_House4 - warp_def 12, 32, 0, 0, LilycoveCity_Harbor - warp_def 12, 5, 0, 1, LilycoveCity_LilycoveMuseum_1F - warp_def 71, 5, 1, 0, MagmaHideout_1F + warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F + warp_def 37, 24, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F + warp_def 24, 14, 0, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F + warp_def 11, 5, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F + warp_def 23, 24, 0, 0, MAP_LILYCOVE_CITY_CONTEST_LOBBY + warp_def 39, 14, 0, 1, MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB + warp_def 70, 5, 1, 0, MAP_AQUA_HIDEOUT_1F + warp_def 36, 6, 0, 0, MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE + warp_def 42, 6, 0, 0, MAP_LILYCOVE_CITY_HOUSE1 + warp_def 55, 15, 0, 0, MAP_LILYCOVE_CITY_HOUSE2 + warp_def 11, 22, 0, 0, MAP_LILYCOVE_CITY_HOUSE3 + warp_def 12, 14, 0, 0, MAP_LILYCOVE_CITY_HOUSE4 + warp_def 12, 32, 0, 0, MAP_LILYCOVE_CITY_HARBOR + warp_def 12, 5, 0, 1, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F + warp_def 71, 5, 1, 0, MAP_MAGMA_HIDEOUT_1F LilycoveCity_MapBGEvents:: @ 838037C bg_event 19, 7, 0, 0, 0, LilycoveCity_EventScript_14CC82 diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/events/LilycoveCity_ContestHall.inc index 4246afd33..307f23974 100644 --- a/data/maps/events/LilycoveCity_ContestHall.inc +++ b/data/maps/events/LilycoveCity_ContestHall.inc @@ -33,10 +33,10 @@ LilycoveCity_ContestHall_MapObjects:: @ 8389A18 object_event 32, MAP_OBJ_GFX_SAILOR, 0, 23, 0, 26, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590B6, 0, 0, 0 LilycoveCity_ContestHall_MapWarps:: @ 8389D18 - warp_def 19, 32, 0, 2, LilycoveCity_ContestLobby - warp_def 30, 32, 0, 3, LilycoveCity_ContestLobby - warp_def 20, 32, 0, 2, LilycoveCity_ContestLobby - warp_def 31, 32, 0, 3, LilycoveCity_ContestLobby + warp_def 19, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY + warp_def 30, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY + warp_def 20, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY + warp_def 31, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY LilycoveCity_ContestHall_MapBGEvents:: @ 8389D38 bg_event 27, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15930C diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/events/LilycoveCity_ContestLobby.inc index 2e41e6e49..ccbc645b2 100644 --- a/data/maps/events/LilycoveCity_ContestLobby.inc +++ b/data/maps/events/LilycoveCity_ContestLobby.inc @@ -2,23 +2,23 @@ LilycoveCity_ContestLobby_MapObjects:: @ 838984C object_event 1, MAP_OBJ_GFX_TEALA, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_158EB0, 0, 0, 0 object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_158B85, 0, 0, 0 object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 17, 0, 9, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B77AB, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ARTIST, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 774, 0, 0 + object_event 4, MAP_OBJ_GFX_ARTIST, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1, 0, 0 object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15901E, 0, 0, 0 object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 3, 0, 10, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159027, 0, 0, 0 object_event 7, MAP_OBJ_GFX_ARTIST, 0, 20, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159042, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_REPORTER_M, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1AE0B6, 802, 0, 0 + object_event 8, MAP_OBJ_GFX_REPORTER_M, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_LILYCOVE, 0, 0 object_event 9, MAP_OBJ_GFX_BOY_1, 0, 18, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15907B, 0, 0, 0 object_event 10, MAP_OBJ_GFX_GIRL_1, 0, 19, 0, 9, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159084, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_ARTIST, 0, 13, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 895, 0, 0 + object_event 11, MAP_OBJ_GFX_ARTIST, 0, 13, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_ARTIST_LILCOVE_CONTEST, 0, 0 object_event 12, MAP_OBJ_GFX_FISHERMAN, 0, 13, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159054, 0, 0, 0 object_event 13, MAP_OBJ_GFX_FAT_MAN, 0, 1, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15904B, 0, 0, 0 object_event 14, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 7, 0, 3, 3, 16, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15905D, 0, 0, 0 LilycoveCity_ContestLobby_MapWarps:: @ 838999C - warp_def 6, 11, 0, 4, LilycoveCity - warp_def 7, 11, 0, 4, LilycoveCity - warp_def 1, 1, 0, 0, LilycoveCity_ContestHall - warp_def 13, 1, 0, 1, LilycoveCity_ContestHall + warp_def 6, 11, 0, 4, MAP_LILYCOVE_CITY + warp_def 7, 11, 0, 4, MAP_LILYCOVE_CITY + warp_def 1, 1, 0, 0, MAP_LILYCOVE_CITY_CONTEST_HALL + warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL LilycoveCity_ContestLobby_MapBGEvents:: @ 83899BC bg_event 18, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B7835 diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc index 31bd1c94f..ec57d4ba8 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc @@ -2,9 +2,9 @@ LilycoveCity_CoveLilyMotel_1F_MapObjects:: @ 8389464 object_event 1, MAP_OBJ_GFX_MAN_1, 0, 10, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5, 0, 0, 0 LilycoveCity_CoveLilyMotel_1F_MapWarps:: @ 838947C - warp_def 5, 8, 0, 1, LilycoveCity - warp_def 6, 8, 0, 1, LilycoveCity - warp_def 2, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F + warp_def 5, 8, 0, 1, MAP_LILYCOVE_CITY + warp_def 6, 8, 0, 1, MAP_LILYCOVE_CITY + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F LilycoveCity_CoveLilyMotel_1F_MapCoordEvents:: @ 8389494 coord_event 10, 2, 3, 0, 0x4001, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_15834D diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc index 2117774f0..32c1181de 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc @@ -1,13 +1,13 @@ LilycoveCity_CoveLilyMotel_2F_MapObjects:: @ 83894B8 - object_event 1, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1, 925, 0, 0 - object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 1, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7, 925, 0, 0 - object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 7, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158400, 925, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_5, 0, 10, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE, 925, 0, 0 - object_event 5, MAP_OBJ_GFX_BOY_5, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158412, 925, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 4, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158409, 925, 0, 0 + object_event 1, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0 + object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 1, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0 + object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 7, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158400, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_5, 0, 10, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0 + object_event 5, MAP_OBJ_GFX_BOY_5, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158412, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0 + object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 4, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158409, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0 LilycoveCity_CoveLilyMotel_2F_MapWarps:: @ 8389548 - warp_def 2, 1, 0, 2, LilycoveCity_CoveLilyMotel_1F + warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8389550 map_events LilycoveCity_CoveLilyMotel_2F_MapObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc index 896a96649..eea28d624 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc @@ -2,8 +2,8 @@ LilycoveCity_DepartmentStoreElevator_MapObjects:: @ 838A624 object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A39C, 0, 0, 0 LilycoveCity_DepartmentStoreElevator_MapWarps:: @ 838A63C - warp_def 1, 5, 3, 127, NONE - warp_def 2, 5, 3, 127, NONE + warp_def 1, 5, 3, 127, MAP_NONE + warp_def 2, 5, 3, 127, MAP_NONE LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 838A64C map_events LilycoveCity_DepartmentStoreElevator_MapObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc index ac72a87c1..c5f094b3f 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc @@ -1,10 +1,10 @@ LilycoveCity_DepartmentStoreRooftop_MapObjects:: @ 838A5A8 object_event 1, MAP_OBJ_GFX_MAN_2, 0, 4, 0, 4, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0, 0, 0, 0 object_event 2, MAP_OBJ_GFX_MAN_4, 0, 7, 0, 5, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 0, 1, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A167, 962, 0, 0 + object_event 3, MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 0, 1, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A167, FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART, 0, 0 LilycoveCity_DepartmentStoreRooftop_MapWarps:: @ 838A5F0 - warp_def 13, 3, 0, 2, LilycoveCity_DepartmentStore_5F + warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F LilycoveCity_DepartmentStoreRooftop_MapBGEvents:: @ 838A5F8 bg_event 9, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc index 28bc93a75..b9104a1ee 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc @@ -7,10 +7,10 @@ LilycoveCity_DepartmentStore_1F_MapObjects:: @ 838A218 object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 2, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EF2, 0, 0, 0 LilycoveCity_DepartmentStore_1F_MapWarps:: @ 838A2A8 - warp_def 8, 7, 0, 0, LilycoveCity - warp_def 9, 7, 0, 0, LilycoveCity - warp_def 16, 1, 0, 0, LilycoveCity_DepartmentStore_2F - warp_def 2, 1, 0, 0, LilycoveCity_DepartmentStoreElevator + warp_def 8, 7, 0, 0, MAP_LILYCOVE_CITY + warp_def 9, 7, 0, 0, MAP_LILYCOVE_CITY + warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_1F_MapBGEvents:: @ 838A2C8 bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_159F05 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc index fc8872103..441c43a4c 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc @@ -6,9 +6,9 @@ LilycoveCity_DepartmentStore_2F_MapObjects:: @ 838A2E8 object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 7, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F2A, 0, 0, 0 LilycoveCity_DepartmentStore_2F_MapWarps:: @ 838A360 - warp_def 16, 1, 0, 2, LilycoveCity_DepartmentStore_1F - warp_def 13, 1, 0, 0, LilycoveCity_DepartmentStore_3F - warp_def 2, 1, 0, 0, LilycoveCity_DepartmentStoreElevator + warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F + warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_2F_MapEvents:: @ 838A378 map_events LilycoveCity_DepartmentStore_2F_MapObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc index bf3d1647f..920327ab8 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc @@ -6,9 +6,9 @@ LilycoveCity_DepartmentStore_3F_MapObjects:: @ 838A38C object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 10, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FB8, 0, 0, 0 LilycoveCity_DepartmentStore_3F_MapWarps:: @ 838A404 - warp_def 13, 1, 0, 1, LilycoveCity_DepartmentStore_2F - warp_def 16, 1, 0, 0, LilycoveCity_DepartmentStore_4F - warp_def 2, 1, 0, 0, LilycoveCity_DepartmentStoreElevator + warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F + warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_3F_MapEvents:: @ 838A41C map_events LilycoveCity_DepartmentStore_3F_MapObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc index 007cc8bf4..a387cfbf2 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc @@ -6,9 +6,9 @@ LilycoveCity_DepartmentStore_4F_MapObjects:: @ 838A430 object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 9, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A03C, 0, 0, 0 LilycoveCity_DepartmentStore_4F_MapWarps:: @ 838A4A8 - warp_def 16, 1, 0, 1, LilycoveCity_DepartmentStore_3F - warp_def 13, 1, 0, 0, LilycoveCity_DepartmentStore_5F - warp_def 2, 1, 0, 0, LilycoveCity_DepartmentStoreElevator + warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F + warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_4F_MapEvents:: @ 838A4C0 map_events LilycoveCity_DepartmentStore_4F_MapObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc index 85cf2431f..e794452b9 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc @@ -8,9 +8,9 @@ LilycoveCity_DepartmentStore_5F_MapObjects:: @ 838A4D4 object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 9, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A12D, 0, 0, 0 LilycoveCity_DepartmentStore_5F_MapWarps:: @ 838A57C - warp_def 13, 1, 0, 1, LilycoveCity_DepartmentStore_4F - warp_def 2, 1, 0, 0, LilycoveCity_DepartmentStoreElevator - warp_def 16, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop + warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR + warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP LilycoveCity_DepartmentStore_5F_MapEvents:: @ 838A594 map_events LilycoveCity_DepartmentStore_5F_MapObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_EmptyMap.inc b/data/maps/events/LilycoveCity_EmptyMap.inc index 906453882..4ac5c42b8 100644 --- a/data/maps/events/LilycoveCity_EmptyMap.inc +++ b/data/maps/events/LilycoveCity_EmptyMap.inc @@ -1,5 +1,5 @@ LilycoveCity_EmptyMap_MapWarps:: @ 838A028 - warp_def 7, 5, 0, 2, LilycoveCity_Harbor + warp_def 7, 5, 0, 2, MAP_LILYCOVE_CITY_HARBOR LilycoveCity_EmptyMap_MapEvents:: @ 838A030 map_events 0x0, LilycoveCity_EmptyMap_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/events/LilycoveCity_Harbor.inc index 5682ada0e..3f7c592d1 100644 --- a/data/maps/events/LilycoveCity_Harbor.inc +++ b/data/maps/events/LilycoveCity_Harbor.inc @@ -1,14 +1,14 @@ LilycoveCity_Harbor_MapObjects:: @ 8389F94 - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_1598A2, 908, 0, 0 - object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 861, 0, 0 + object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_1598A2, FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE, 0, 0 + object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR, 0, 0 object_event 3, MAP_OBJ_GFX_SAILOR, 0, 3, 0, 13, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_159A8D, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SAILOR, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 909, 0, 0 + object_event 4, MAP_OBJ_GFX_SAILOR, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_FERRY_SAILOR_LILYCOVE, 0, 0 LilycoveCity_Harbor_MapWarps:: @ 8389FF4 - warp_def 11, 14, 0, 12, LilycoveCity - warp_def 12, 14, 0, 12, LilycoveCity - warp_def 20, 15, 0, 0, LilycoveCity_EmptyMap - warp_def 21, 15, 0, 0, LilycoveCity_EmptyMap + warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY + warp_def 12, 14, 0, 12, MAP_LILYCOVE_CITY + warp_def 20, 15, 0, 0, MAP_LILYCOVE_CITY_EMPTY_MAP + warp_def 21, 15, 0, 0, MAP_LILYCOVE_CITY_EMPTY_MAP LilycoveCity_Harbor_MapEvents:: @ 838A014 map_events LilycoveCity_Harbor_MapObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/events/LilycoveCity_House1.inc index cdae83007..8d6e6b8ce 100644 --- a/data/maps/events/LilycoveCity_House1.inc +++ b/data/maps/events/LilycoveCity_House1.inc @@ -3,8 +3,8 @@ LilycoveCity_House1_MapObjects:: @ 838A080 object_event 2, MAP_OBJ_GFX_KECLEON_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_House1_EventScript_159B8F, 0, 0, 0 LilycoveCity_House1_MapWarps:: @ 838A0B0 - warp_def 3, 8, 0, 8, LilycoveCity - warp_def 4, 8, 0, 8, LilycoveCity + warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY + warp_def 4, 8, 0, 8, MAP_LILYCOVE_CITY LilycoveCity_House1_MapEvents:: @ 838A0C0 map_events LilycoveCity_House1_MapObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/events/LilycoveCity_House2.inc index 50b44e253..8cb92dfa4 100644 --- a/data/maps/events/LilycoveCity_House2.inc +++ b/data/maps/events/LilycoveCity_House2.inc @@ -2,8 +2,8 @@ LilycoveCity_House2_MapObjects:: @ 838A0D4 object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_House2_EventScript_159BA3, 0, 0, 0 LilycoveCity_House2_MapWarps:: @ 838A0EC - warp_def 2, 7, 0, 9, LilycoveCity - warp_def 3, 7, 0, 9, LilycoveCity + warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY + warp_def 3, 7, 0, 9, MAP_LILYCOVE_CITY LilycoveCity_House2_MapEvents:: @ 838A0FC map_events LilycoveCity_House2_MapObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/events/LilycoveCity_House3.inc index 43a1068f1..db7113ef1 100644 --- a/data/maps/events/LilycoveCity_House3.inc +++ b/data/maps/events/LilycoveCity_House3.inc @@ -7,8 +7,8 @@ LilycoveCity_House3_MapObjects:: @ 838A110 object_event 6, MAP_OBJ_GFX_MAN_1, 0, 7, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159C32, 0, 0, 0 LilycoveCity_House3_MapWarps:: @ 838A1A0 - warp_def 3, 7, 0, 10, LilycoveCity - warp_def 4, 7, 0, 10, LilycoveCity + warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY + warp_def 4, 7, 0, 10, MAP_LILYCOVE_CITY LilycoveCity_House3_MapEvents:: @ 838A1B0 map_events LilycoveCity_House3_MapObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/events/LilycoveCity_House4.inc index 88522497d..376afb431 100644 --- a/data/maps/events/LilycoveCity_House4.inc +++ b/data/maps/events/LilycoveCity_House4.inc @@ -3,8 +3,8 @@ LilycoveCity_House4_MapObjects:: @ 838A1C4 object_event 2, MAP_OBJ_GFX_MAN_1, 0, 7, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_House4_EventScript_159D4B, 0, 0, 0 LilycoveCity_House4_MapWarps:: @ 838A1F4 - warp_def 3, 8, 0, 11, LilycoveCity - warp_def 4, 8, 0, 11, LilycoveCity + warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY + warp_def 4, 8, 0, 11, MAP_LILYCOVE_CITY LilycoveCity_House4_MapEvents:: @ 838A204 map_events LilycoveCity_House4_MapObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc index 983736d73..1ee241c5c 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc @@ -1,19 +1,19 @@ LilycoveCity_LilycoveMuseum_1F_MapObjects:: @ 8389564 object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 5, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15841C, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 16, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158425, 775, 0, 0 + object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 16, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158425, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, 0, 0 object_event 3, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 13, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158558, 0, 0, 0 object_event 4, MAP_OBJ_GFX_ARTIST, 0, 13, 0, 10, 0, 3, 5, 2, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158561, 0, 0, 0 object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15856A, 0, 0, 0 object_event 6, MAP_OBJ_GFX_WOMAN_5, 0, 3, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158573, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 11, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15857C, 776, 0, 0 - object_event 8, MAP_OBJ_GFX_ARTIST, 0, 19, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15858E, 779, 0, 0 - object_event 9, MAP_OBJ_GFX_FAT_MAN, 0, 2, 0, 2, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3, 780, 0, 0 - object_event 10, MAP_OBJ_GFX_PSYCHIC_M, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, 778, 0, 0 + object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 11, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15857C, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY, 0, 0 + object_event 8, MAP_OBJ_GFX_ARTIST, 0, 19, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15858E, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER, 0, 0 + object_event 9, MAP_OBJ_GFX_FAT_MAN, 0, 2, 0, 2, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0 + object_event 10, MAP_OBJ_GFX_PSYCHIC_M, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN, 0, 0 LilycoveCity_LilycoveMuseum_1F_MapWarps:: @ 8389654 - warp_def 9, 13, 0, 3, LilycoveCity - warp_def 10, 13, 0, 13, LilycoveCity - warp_def 16, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F + warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY + warp_def 10, 13, 0, 13, MAP_LILYCOVE_CITY + warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F LilycoveCity_LilycoveMuseum_1F_MapBGEvents:: @ 838966C bg_event 1, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc index 98c1aa9cd..83077f069 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc @@ -1,11 +1,11 @@ LilycoveCity_LilycoveMuseum_2F_MapObjects:: @ 8389740 object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 10, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 19, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158805, 777, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15880E, 780, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_4, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, 780, 0, 0 + object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 19, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158805, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15880E, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0 + object_event 4, MAP_OBJ_GFX_BOY_4, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0 LilycoveCity_LilycoveMuseum_2F_MapWarps:: @ 83897A0 - warp_def 13, 1, 0, 2, LilycoveCity_LilycoveMuseum_1F + warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F LilycoveCity_LilycoveMuseum_2F_MapBGEvents:: @ 83897A8 bg_event 14, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc index 563052712..d4969c39e 100644 --- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc +++ b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc @@ -2,8 +2,8 @@ LilycoveCity_MoveDeletersHouse_MapObjects:: @ 838A044 object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_159AAE, 0, 0, 0 LilycoveCity_MoveDeletersHouse_MapWarps:: @ 838A05C - warp_def 3, 7, 0, 7, LilycoveCity - warp_def 4, 7, 0, 7, LilycoveCity + warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY + warp_def 4, 7, 0, 7, MAP_LILYCOVE_CITY LilycoveCity_MoveDeletersHouse_MapEvents:: @ 838A06C map_events LilycoveCity_MoveDeletersHouse_MapObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc index c33a07b6a..c0f27f6c7 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc +++ b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ LilycoveCity_PokemonCenter_1F_MapObjects:: @ 8389D94 object_event 3, MAP_OBJ_GFX_MANIAC, 0, 11, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159348, 0, 0, 0 LilycoveCity_PokemonCenter_1F_MapWarps:: @ 8389DDC - warp_def 7, 8, 3, 2, LilycoveCity - warp_def 6, 8, 3, 2, LilycoveCity - warp_def 1, 6, 4, 0, LilycoveCity_PokemonCenter_2F + warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY + warp_def 6, 8, 3, 2, MAP_LILYCOVE_CITY + warp_def 1, 6, 4, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_2F LilycoveCity_PokemonCenter_1F_MapEvents:: @ 8389DF4 map_events LilycoveCity_PokemonCenter_1F_MapObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc index 736ef1151..e1723d489 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc +++ b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ LilycoveCity_PokemonCenter_2F_MapObjects:: @ 8389E08 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159383, 0, 0, 0 LilycoveCity_PokemonCenter_2F_MapWarps:: @ 8389E50 - warp_def 1, 5, 4, 2, LilycoveCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8389E78 map_events LilycoveCity_PokemonCenter_2F_MapObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc index 38007b34f..59e8e03a3 100644 --- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc @@ -3,14 +3,14 @@ LilycoveCity_PokemonTrainerFanClub_MapObjects:: @ 8389EB0 object_event 2, MAP_OBJ_GFX_MAN_5, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15952F, 0, 0, 0 object_event 3, MAP_OBJ_GFX_MAN_3, 0, 6, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15961D, 0, 0, 0 object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159694, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15970B, 791, 0, 0 - object_event 6, MAP_OBJ_GFX_BOY_2, 0, 1, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15976D, 790, 0, 0 - object_event 7, MAP_OBJ_GFX_WOMAN_4, 0, 3, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF, 792, 0, 0 - object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 10, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, 789, 0, 0 + object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15970B, FLAG_HIDE_FANCLUB_LITTLE_BOY, 0, 0 + object_event 6, MAP_OBJ_GFX_BOY_2, 0, 1, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15976D, FLAG_HIDE_FANCLUB_BOY, 0, 0 + object_event 7, MAP_OBJ_GFX_WOMAN_4, 0, 3, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF, FLAG_HIDE_FANCLUB_LADY, 0, 0 + object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 10, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, FLAG_HIDE_FANCLUB_OLD_LADY, 0, 0 LilycoveCity_PokemonTrainerFanClub_MapWarps:: @ 8389F70 - warp_def 6, 13, 0, 5, LilycoveCity - warp_def 5, 13, 0, 5, LilycoveCity + warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY + warp_def 5, 13, 0, 5, MAP_LILYCOVE_CITY LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8389F80 map_events LilycoveCity_PokemonTrainerFanClub_MapObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_UnusedMart.inc b/data/maps/events/LilycoveCity_UnusedMart.inc index 1eefb6a8f..4a0127506 100644 --- a/data/maps/events/LilycoveCity_UnusedMart.inc +++ b/data/maps/events/LilycoveCity_UnusedMart.inc @@ -1,6 +1,6 @@ LilycoveCity_UnusedMart_MapWarps:: @ 8389E8C - warp_def 3, 7, 0, 0, LilycoveCity - warp_def 4, 7, 0, 0, LilycoveCity + warp_def 3, 7, 0, 0, MAP_LILYCOVE_CITY + warp_def 4, 7, 0, 0, MAP_LILYCOVE_CITY LilycoveCity_UnusedMart_MapEvents:: @ 8389E9C map_events 0x0, LilycoveCity_UnusedMart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/events/LinkContestRoom1.inc index 6c1e09430..18d1dcd74 100644 --- a/data/maps/events/LinkContestRoom1.inc +++ b/data/maps/events/LinkContestRoom1.inc @@ -11,7 +11,7 @@ LinkContestRoom1_MapObjects:: @ 839149C object_event 10, 249, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 11, 250, 0, 12, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 12, 245, 0, 2, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 86, 0, 0 + object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_ROOM_POKEBALL, 0, 0 object_event 14, 243, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 15, MAP_OBJ_GFX_ARTIST, 0, 12, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc index 62a564821..23debe434 100644 --- a/data/maps/events/LittlerootTown.inc +++ b/data/maps/events/LittlerootTown.inc @@ -1,15 +1,15 @@ LittlerootTown_MapObjects:: @ 83808FC object_event 1, MAP_OBJ_GFX_LITTLE_BOY_3, 0, 16, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6DF, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 12, 0, 13, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6CD, 868, 0, 0 + object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 12, 0, 13, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6CD, FLAG_HIDE_FAT_MAN_LITTLEROOT, 0, 0 object_event 3, MAP_OBJ_GFX_BOY_2, 0, 14, 0, 17, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6D6, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MOM, 0, 5, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14DCE2, 752, 0, 0 - object_event 5, MAP_OBJ_GFX_TRUCK, 0, 2, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 761, 0, 0 - object_event 6, MAP_OBJ_GFX_TRUCK, 0, 11, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 762, 0, 0 + object_event 4, MAP_OBJ_GFX_MOM, 0, 5, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14DCE2, FLAG_HIDE_MOM_LITTLEROOT, 0, 0 + object_event 5, MAP_OBJ_GFX_TRUCK, 0, 2, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_BRENDAN, 0, 0 + object_event 6, MAP_OBJ_GFX_TRUCK, 0, 11, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_MAY, 0, 0 LittlerootTown_MapWarps:: @ 838098C - warp_def 14, 8, 0, 1, LittlerootTown_MaysHouse_1F - warp_def 5, 8, 0, 1, LittlerootTown_BrendansHouse_1F - warp_def 7, 16, 0, 0, LittlerootTown_ProfessorBirchsLab + warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F + warp_def 5, 8, 0, 1, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F + warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB LittlerootTown_MapCoordEvents:: @ 83809A4 coord_event 10, 1, 3, 0, 0x4050, 0, 0, LittlerootTown_EventScript_14D739 diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc index f60a59018..bb3d3b195 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc @@ -1,14 +1,14 @@ LittlerootTown_BrendansHouse_1F_MapObjects:: @ 8385674 - object_event 1, MAP_OBJ_GFX_MOM, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9, 758, 0, 0 - object_event 2, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 0, 3, 0, 3, 28, 3, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, 755, 0, 0 - object_event 3, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, 754, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, 784, 0, 0 - object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 734, 0, 0 + object_event 1, MAP_OBJ_GFX_MOM, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9, FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS, 0, 0 + object_event 2, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 0, 3, 0, 3, 28, 3, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2, 0, 0 + object_event 3, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, FLAG_HIDE_BRENDAN_MOM, 0, 0 + object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0 LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC - warp_def 9, 8, 0, 1, LittlerootTown - warp_def 8, 8, 0, 1, LittlerootTown - warp_def 8, 2, 0, 0, LittlerootTown_BrendansHouse_2F + warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN + warp_def 8, 8, 0, 1, MAP_LITTLEROOT_TOWN + warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F LittlerootTown_BrendansHouse_1F_MapCoordEvents:: @ 8385704 coord_event 8, 8, 0, 0, 0x4092, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_152789 diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc index a28a2d0d1..b7367b1d0 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc @@ -1,21 +1,21 @@ LittlerootTown_BrendansHouse_2F_MapObjects:: @ 8385728 - object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, 760, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 4, 1, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 5, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, MAP_OBJ_GFX_MOM, 0, 7, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, 757, 0, 0 + object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, FLAG_HIDE_BRENDAN_UPSTAIRS, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 4, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 5, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_MOM, 0, 7, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS, 0, 0 LittlerootTown_BrendansHouse_2F_MapWarps:: @ 8385878 - warp_def 7, 1, 0, 2, LittlerootTown_BrendansHouse_1F + warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F LittlerootTown_BrendansHouse_2F_MapBGEvents:: @ 8385880 bg_event 0, 1, 0, 1, 0, LittlerootTown_BrendansHouse_2F_EventScript_15281E diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc index d5874624b..27a0efbed 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc @@ -1,14 +1,14 @@ LittlerootTown_MaysHouse_1F_MapObjects:: @ 83858C4 - object_event 1, MAP_OBJ_GFX_MOM, 0, 8, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6BE9, 759, 0, 0 - object_event 2, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, 754, 0, 0 - object_event 3, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 0, 3, 0, 3, 27, 3, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, 755, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 8, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, 785, 0, 0 - object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, 734, 0, 0 + object_event 1, MAP_OBJ_GFX_MOM, 0, 8, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6BE9, FLAG_HIDE_MAY_MOM_DOWNSTAIRS, 0, 0 + object_event 2, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1, 0, 0 + object_event 3, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 0, 3, 0, 3, 27, 3, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 8, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, FLAG_HIDE_MAY_MOM, 0, 0 + object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0 LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C - warp_def 1, 8, 0, 0, LittlerootTown - warp_def 2, 8, 0, 0, LittlerootTown - warp_def 2, 2, 0, 0, LittlerootTown_MaysHouse_2F + warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN + warp_def 2, 8, 0, 0, MAP_LITTLEROOT_TOWN + warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F LittlerootTown_MaysHouse_1F_MapCoordEvents:: @ 8385954 coord_event 2, 8, 0, 0, 0x4092, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_152A35 diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc index 3a3656287..fbec5e0e7 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc @@ -1,22 +1,22 @@ LittlerootTown_MaysHouse_2F_MapObjects:: @ 8385978 - object_event 1, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, 722, 0, 0 - object_event 2, 240, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 2, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 4, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 5, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 2, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 3, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, MAP_OBJ_GFX_MOM, 0, 1, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, 757, 0, 0 - object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 3, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, 0x0, 849, 0, 0 + object_event 1, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, FLAG_HIDE_MAY_UPSTAIRS, 0, 0 + object_event 2, 240, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 2, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 4, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 5, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 2, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 3, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_MOM, 0, 1, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS, 0, 0 + object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 3, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MAY_PICHU_DOLL, 0, 0 LittlerootTown_MaysHouse_2F_MapWarps:: @ 8385AE0 - warp_def 1, 1, 0, 2, LittlerootTown_MaysHouse_1F + warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F LittlerootTown_MaysHouse_2F_MapBGEvents:: @ 8385AE8 bg_event 5, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152870 diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc index cbc1e4154..fbe8df720 100644 --- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc @@ -1,11 +1,11 @@ LittlerootTown_ProfessorBirchsLab_MapObjects:: @ 8385B2C object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 9, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D63, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, 721, 0, 0 - object_event 3, 240, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, 889, 0, 0 + object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, FLAG_HIDE_BIRCH_IN_LAB, 0, 0 + object_event 3, 240, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, FLAG_HIDE_RIVAL_BIRCH_LAB, 0, 0 LittlerootTown_ProfessorBirchsLab_MapWarps:: @ 8385B74 - warp_def 6, 12, 0, 2, LittlerootTown - warp_def 7, 12, 0, 2, LittlerootTown + warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN + warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN LittlerootTown_ProfessorBirchsLab_MapBGEvents:: @ 8385B84 bg_event 10, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/events/MagmaHideout_1F.inc index b90e53ff8..2a41a962f 100644 --- a/data/maps/events/MagmaHideout_1F.inc +++ b/data/maps/events/MagmaHideout_1F.inc @@ -1,11 +1,11 @@ MagmaHideout_1F_MapObjects:: @ 838E9BC - object_event 1, 241, 0, 13, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7CE, 821, 0, 0 - object_event 2, 241, 0, 14, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7ED, 822, 0, 0 + object_event 1, 241, 0, 13, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0 + object_event 2, 241, 0, 14, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0 object_event 3, 241, 0, 20, 0, 3, 0, 3, 50, 110, 0, 1, 0, 3, 0, MagmaHideout_1F_EventScript_15D80C, 0, 0, 0 MagmaHideout_1F_MapWarps:: @ 838EA04 - warp_def 13, 27, 1, 14, LilycoveCity - warp_def 13, 1, 3, 0, MagmaHideout_B1F + warp_def 13, 27, 1, 14, MAP_LILYCOVE_CITY + warp_def 13, 1, 3, 0, MAP_MAGMA_HIDEOUT_B1F MagmaHideout_1F_MapEvents:: @ 838EA14 map_events MagmaHideout_1F_MapObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_B1F.inc b/data/maps/events/MagmaHideout_B1F.inc index c9f1101cc..3ed63b847 100644 --- a/data/maps/events/MagmaHideout_B1F.inc +++ b/data/maps/events/MagmaHideout_B1F.inc @@ -2,42 +2,42 @@ MagmaHideout_B1F_MapObjects:: @ 838EA28 object_event 1, 241, 0, 33, 0, 3, 0, 3, 9, 17, 0, 1, 0, 5, 0, MagmaHideout_B1F_EventScript_15D850, 0, 0, 0 object_event 2, 241, 0, 41, 0, 17, 0, 3, 23, 17, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D875, 0, 0, 0 object_event 3, 242, 0, 33, 0, 19, 0, 3, 27, 20, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D89A, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, 1125, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, 1126, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, 977, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19CF, 1134, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A051B, 978, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, FLAG_ITEM_MAGMA_HIDEOUT_B1F_1, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, FLAG_ITEM_MAGMA_HIDEOUT_B1F_2, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19CF, FLAG_ITEM_MAGMA_HIDEOUT_B1F_3, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT, 0, 0 MagmaHideout_B1F_MapWarps:: @ 838EAE8 - warp_def 3, 3, 3, 1, MagmaHideout_1F - warp_def 14, 3, 3, 0, MagmaHideout_B2F - warp_def 23, 1, 3, 1, MagmaHideout_B2F - warp_def 29, 1, 3, 2, MagmaHideout_B2F - warp_def 8, 5, 3, 6, MagmaHideout_B1F - warp_def 8, 7, 3, 9, MagmaHideout_B1F - warp_def 14, 8, 3, 4, MagmaHideout_B1F - warp_def 23, 5, 3, 10, MagmaHideout_B1F - warp_def 39, 5, 3, 13, MagmaHideout_B1F - warp_def 16, 16, 3, 5, MagmaHideout_B1F - warp_def 21, 14, 3, 7, MagmaHideout_B1F - warp_def 21, 20, 3, 12, MagmaHideout_B1F - warp_def 38, 11, 3, 11, MagmaHideout_B1F - warp_def 43, 19, 3, 8, MagmaHideout_B1F - warp_def 34, 11, 3, 28, MagmaHideout_B1F - warp_def 41, 11, 3, 16, MagmaHideout_B1F - warp_def 56, 3, 3, 15, MagmaHideout_B1F - warp_def 56, 5, 3, 16, MagmaHideout_B1F - warp_def 53, 5, 3, 22, MagmaHideout_B1F - warp_def 59, 5, 3, 20, MagmaHideout_B1F - warp_def 53, 9, 3, 19, MagmaHideout_B1F - warp_def 56, 9, 3, 24, MagmaHideout_B1F - warp_def 59, 9, 3, 18, MagmaHideout_B1F - warp_def 53, 13, 3, 17, MagmaHideout_B1F - warp_def 56, 13, 3, 21, MagmaHideout_B1F - warp_def 59, 13, 3, 26, MagmaHideout_B1F - warp_def 53, 17, 3, 25, MagmaHideout_B1F - warp_def 56, 17, 3, 21, MagmaHideout_B1F - warp_def 59, 17, 3, 14, MagmaHideout_B1F + warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_1F + warp_def 14, 3, 3, 0, MAP_MAGMA_HIDEOUT_B2F + warp_def 23, 1, 3, 1, MAP_MAGMA_HIDEOUT_B2F + warp_def 29, 1, 3, 2, MAP_MAGMA_HIDEOUT_B2F + warp_def 8, 5, 3, 6, MAP_MAGMA_HIDEOUT_B1F + warp_def 8, 7, 3, 9, MAP_MAGMA_HIDEOUT_B1F + warp_def 14, 8, 3, 4, MAP_MAGMA_HIDEOUT_B1F + warp_def 23, 5, 3, 10, MAP_MAGMA_HIDEOUT_B1F + warp_def 39, 5, 3, 13, MAP_MAGMA_HIDEOUT_B1F + warp_def 16, 16, 3, 5, MAP_MAGMA_HIDEOUT_B1F + warp_def 21, 14, 3, 7, MAP_MAGMA_HIDEOUT_B1F + warp_def 21, 20, 3, 12, MAP_MAGMA_HIDEOUT_B1F + warp_def 38, 11, 3, 11, MAP_MAGMA_HIDEOUT_B1F + warp_def 43, 19, 3, 8, MAP_MAGMA_HIDEOUT_B1F + warp_def 34, 11, 3, 28, MAP_MAGMA_HIDEOUT_B1F + warp_def 41, 11, 3, 16, MAP_MAGMA_HIDEOUT_B1F + warp_def 56, 3, 3, 15, MAP_MAGMA_HIDEOUT_B1F + warp_def 56, 5, 3, 16, MAP_MAGMA_HIDEOUT_B1F + warp_def 53, 5, 3, 22, MAP_MAGMA_HIDEOUT_B1F + warp_def 59, 5, 3, 20, MAP_MAGMA_HIDEOUT_B1F + warp_def 53, 9, 3, 19, MAP_MAGMA_HIDEOUT_B1F + warp_def 56, 9, 3, 24, MAP_MAGMA_HIDEOUT_B1F + warp_def 59, 9, 3, 18, MAP_MAGMA_HIDEOUT_B1F + warp_def 53, 13, 3, 17, MAP_MAGMA_HIDEOUT_B1F + warp_def 56, 13, 3, 21, MAP_MAGMA_HIDEOUT_B1F + warp_def 59, 13, 3, 26, MAP_MAGMA_HIDEOUT_B1F + warp_def 53, 17, 3, 25, MAP_MAGMA_HIDEOUT_B1F + warp_def 56, 17, 3, 21, MAP_MAGMA_HIDEOUT_B1F + warp_def 59, 17, 3, 14, MAP_MAGMA_HIDEOUT_B1F MagmaHideout_B1F_MapEvents:: @ 838EBD0 map_events MagmaHideout_B1F_MapObjects, MagmaHideout_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_B2F.inc b/data/maps/events/MagmaHideout_B2F.inc index 258592732..16ac562b5 100644 --- a/data/maps/events/MagmaHideout_B2F.inc +++ b/data/maps/events/MagmaHideout_B2F.inc @@ -1,19 +1,19 @@ MagmaHideout_B2F_MapObjects:: @ 838EBE4 - object_event 1, 241, 0, 8, 0, 19, 0, 3, 10, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, 924, 0, 0 - object_event 2, 241, 0, 31, 0, 11, 0, 3, 51, 71, 0, 1, 0, 3, 0, MagmaHideout_B2F_EventScript_15D962, 924, 0, 0 - object_event 3, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 0, 20, 0, 1, 10, 17, 0, 0, 0, 0, 0, 0x0, 943, 0, 0 - object_event 4, 242, 0, 13, 0, 3, 0, 3, 9, 17, 0, 1, 0, 4, 0, MagmaHideout_B2F_EventScript_15D987, 924, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, 1127, 0, 0 + object_event 1, 241, 0, 8, 0, 19, 0, 3, 10, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 2, 241, 0, 31, 0, 11, 0, 3, 51, 71, 0, 1, 0, 3, 0, MagmaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 3, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 0, 20, 0, 1, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT, 0, 0 + object_event 4, 242, 0, 13, 0, 3, 0, 3, 9, 17, 0, 1, 0, 4, 0, MagmaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, FLAG_ITEM_MAGMA_HIDEOUT_B2F_1, 0, 0 MagmaHideout_B2F_MapWarps:: @ 838EC5C - warp_def 3, 3, 3, 1, MagmaHideout_B1F - warp_def 12, 1, 3, 2, MagmaHideout_B1F - warp_def 18, 1, 3, 3, MagmaHideout_B1F - warp_def 2, 14, 3, 4, MagmaHideout_B1F - warp_def 12, 13, 3, 5, MagmaHideout_B2F - warp_def 17, 13, 3, 4, MagmaHideout_B2F - warp_def 31, 4, 3, 7, MagmaHideout_B2F - warp_def 31, 16, 3, 6, MagmaHideout_B2F + warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_B1F + warp_def 12, 1, 3, 2, MAP_MAGMA_HIDEOUT_B1F + warp_def 18, 1, 3, 3, MAP_MAGMA_HIDEOUT_B1F + warp_def 2, 14, 3, 4, MAP_MAGMA_HIDEOUT_B1F + warp_def 12, 13, 3, 5, MAP_MAGMA_HIDEOUT_B2F + warp_def 17, 13, 3, 4, MAP_MAGMA_HIDEOUT_B2F + warp_def 31, 4, 3, 7, MAP_MAGMA_HIDEOUT_B2F + warp_def 31, 16, 3, 6, MAP_MAGMA_HIDEOUT_B2F MagmaHideout_B2F_MapCoordEvents:: @ 838EC9C coord_event 7, 16, 3, 0, 0x4001, 0, 0, MagmaHideout_B2F_EventScript_15D8BD diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc index 4d228a92c..fee44bb1e 100644 --- a/data/maps/events/MauvilleCity.inc +++ b/data/maps/events/MauvilleCity.inc @@ -4,19 +4,19 @@ MauvilleCity_MapObjects:: @ 837FB90 object_event 3, MAP_OBJ_GFX_MANIAC, 0, 14, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C063, 0, 0, 0 object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 18, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C06C, 0, 0, 0 object_event 5, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 17, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0A2, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_WALLY, 0, 8, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, 804, 0, 0 - object_event 7, MAP_OBJ_GFX_MAN_3, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, 805, 0, 0 - object_event 8, MAP_OBJ_GFX_WATTSON, 0, 29, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, 912, 0, 0 - object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 19, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_EventScript_1B171E, 1116, 0, 0 + object_event 6, MAP_OBJ_GFX_WALLY, 0, 8, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, FLAG_HIDE_WALLY_MAUVILLE, 0, 0 + object_event 7, MAP_OBJ_GFX_MAN_3, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, FLAG_HIDE_WALLY_FATHER_MAUVILLE, 0, 0 + object_event 8, MAP_OBJ_GFX_WATTSON, 0, 29, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, FLAG_HIDE_WATTSON_MAUVILLE, 0, 0 + object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 19, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_EventScript_1B171E, FLAG_ITEM_MAUVILLE_1, 0, 0 MauvilleCity_MapWarps:: @ 837FC68 - warp_def 8, 5, 0, 0, MauvilleCity_Gym - warp_def 22, 5, 0, 0, MauvilleCity_PokemonCenter_1F - warp_def 35, 5, 0, 0, MauvilleCity_BikeShop - warp_def 23, 14, 0, 0, MauvilleCity_Mart - warp_def 32, 14, 0, 0, MauvilleCity_House1 - warp_def 8, 13, 0, 0, MauvilleCity_GameCorner - warp_def 19, 14, 0, 0, MauvilleCity_House2 + warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM + warp_def 22, 5, 0, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F + warp_def 35, 5, 0, 0, MAP_MAUVILLE_CITY_BIKE_SHOP + warp_def 23, 14, 0, 0, MAP_MAUVILLE_CITY_MART + warp_def 32, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE1 + warp_def 8, 13, 0, 0, MAP_MAUVILLE_CITY_GAME_CORNER + warp_def 19, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE2 MauvilleCity_MapBGEvents:: @ 837FCA0 bg_event 23, 5, 0, 1, 0, MauvilleCity_EventScript_1A00EA diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/events/MauvilleCity_BikeShop.inc index 6c064a1f7..c215f96b0 100644 --- a/data/maps/events/MauvilleCity_BikeShop.inc +++ b/data/maps/events/MauvilleCity_BikeShop.inc @@ -3,8 +3,8 @@ MauvilleCity_BikeShop_MapObjects:: @ 8388318 object_event 2, MAP_OBJ_GFX_MAN_6, 0, 7, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_15690B, 0, 0, 0 MauvilleCity_BikeShop_MapWarps:: @ 8388348 - warp_def 3, 8, 0, 2, MauvilleCity - warp_def 4, 8, 0, 2, MauvilleCity + warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY + warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY MauvilleCity_BikeShop_MapBGEvents:: @ 8388358 bg_event 8, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156914 diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/events/MauvilleCity_GameCorner.inc index ed8549079..bd0b472a2 100644 --- a/data/maps/events/MauvilleCity_GameCorner.inc +++ b/data/maps/events/MauvilleCity_GameCorner.inc @@ -13,8 +13,8 @@ MauvilleCity_GameCorner_MapObjects:: @ 83883C0 object_event 12, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_157125, 0, 0, 0 MauvilleCity_GameCorner_MapWarps:: @ 83884E0 - warp_def 11, 10, 3, 5, MauvilleCity - warp_def 12, 10, 3, 5, MauvilleCity + warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY + warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY MauvilleCity_GameCorner_MapBGEvents:: @ 83884F0 bg_event 2, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157135 diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/events/MauvilleCity_Gym.inc index 4a9ee563f..d30c6b275 100644 --- a/data/maps/events/MauvilleCity_Gym.inc +++ b/data/maps/events/MauvilleCity_Gym.inc @@ -1,5 +1,5 @@ MauvilleCity_Gym_MapObjects:: @ 838821C - object_event 1, MAP_OBJ_GFX_WATTSON, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_1565AB, 913, 0, 0 + object_event 1, MAP_OBJ_GFX_WATTSON, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_1565AB, FLAG_HIDE_WATTSON_MAUVILLE_GYM, 0, 0 object_event 2, MAP_OBJ_GFX_MAN_6, 0, 6, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, MauvilleCity_Gym_EventScript_1566FD, 0, 0, 0 object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 7, 0, 11, 0, 3, 8, 0, 0, 1, 0, 1, 0, MauvilleCity_Gym_EventScript_15672B, 0, 0, 0 object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 1, 0, 13, 0, 3, 10, 0, 0, 1, 0, 1, 0, MauvilleCity_Gym_EventScript_156714, 0, 0, 0 @@ -7,8 +7,8 @@ MauvilleCity_Gym_MapObjects:: @ 838821C object_event 6, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 20, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_156742, 0, 0, 0 MauvilleCity_Gym_MapWarps:: @ 83882AC - warp_def 4, 20, 0, 0, MauvilleCity - warp_def 5, 20, 0, 0, MauvilleCity + warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY + warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY MauvilleCity_Gym_MapCoordEvents:: @ 83882BC coord_event 0, 9, 3, 0, 0x4000, 0, 0, MauvilleCity_Gym_EventScript_15664B diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/events/MauvilleCity_House1.inc index 12d6d8cc8..86b07e3dd 100644 --- a/data/maps/events/MauvilleCity_House1.inc +++ b/data/maps/events/MauvilleCity_House1.inc @@ -2,8 +2,8 @@ MauvilleCity_House1_MapObjects:: @ 8388384 object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_House1_EventScript_1569FD, 0, 0, 0 MauvilleCity_House1_MapWarps:: @ 838839C - warp_def 3, 7, 0, 4, MauvilleCity - warp_def 4, 7, 0, 4, MauvilleCity + warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY + warp_def 4, 7, 0, 4, MAP_MAUVILLE_CITY MauvilleCity_House1_MapEvents:: @ 83883AC map_events MauvilleCity_House1_MapObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/events/MauvilleCity_House2.inc index 9feaafe2c..2e5a39157 100644 --- a/data/maps/events/MauvilleCity_House2.inc +++ b/data/maps/events/MauvilleCity_House2.inc @@ -2,8 +2,8 @@ MauvilleCity_House2_MapObjects:: @ 8388624 object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 4, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_House2_EventScript_1572C0, 0, 0, 0 MauvilleCity_House2_MapWarps:: @ 838863C - warp_def 3, 8, 0, 6, MauvilleCity - warp_def 4, 8, 0, 6, MauvilleCity + warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY + warp_def 4, 8, 0, 6, MAP_MAUVILLE_CITY MauvilleCity_House2_MapEvents:: @ 838864C map_events MauvilleCity_House2_MapObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/events/MauvilleCity_Mart.inc index 05951f578..3453c6fce 100644 --- a/data/maps/events/MauvilleCity_Mart.inc +++ b/data/maps/events/MauvilleCity_Mart.inc @@ -4,8 +4,8 @@ MauvilleCity_Mart_MapObjects:: @ 83887A0 object_event 3, MAP_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573FD, 0, 0, 0 MauvilleCity_Mart_MapWarps:: @ 83887E8 - warp_def 3, 7, 0, 3, MauvilleCity - warp_def 4, 7, 0, 3, MauvilleCity + warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY + warp_def 4, 7, 0, 3, MAP_MAUVILLE_CITY MauvilleCity_Mart_MapEvents:: @ 83887F8 map_events MauvilleCity_Mart_MapObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc index 0f8e80d5c..da60ac284 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc +++ b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc @@ -6,9 +6,9 @@ MauvilleCity_PokemonCenter_1F_MapObjects:: @ 8388660 object_event 5, MAP_OBJ_GFX_YOUNGSTER, 0, 2, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157389, 0, 0, 0 MauvilleCity_PokemonCenter_1F_MapWarps:: @ 83886D8 - warp_def 7, 8, 3, 1, MauvilleCity - warp_def 6, 8, 3, 1, MauvilleCity - warp_def 1, 6, 4, 0, MauvilleCity_PokemonCenter_2F + warp_def 7, 8, 3, 1, MAP_MAUVILLE_CITY + warp_def 6, 8, 3, 1, MAP_MAUVILLE_CITY + warp_def 1, 6, 4, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_2F MauvilleCity_PokemonCenter_1F_MapEvents:: @ 83886F0 map_events MauvilleCity_PokemonCenter_1F_MapObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc index dbd55e499..501c40012 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc +++ b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc @@ -5,11 +5,11 @@ MauvilleCity_PokemonCenter_2F_MapObjects:: @ 8388704 object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 6, 0, 7, 0, 3, 5, 1, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573B4, 0, 0, 0 MauvilleCity_PokemonCenter_2F_MapWarps:: @ 8388764 - warp_def 1, 5, 4, 2, MauvilleCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM MauvilleCity_PokemonCenter_2F_MapEvents:: @ 838878C map_events MauvilleCity_PokemonCenter_2F_MapObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc index 1178bf543..abccfa283 100644 --- a/data/maps/events/MeteorFalls_1F_1R.inc +++ b/data/maps/events/MeteorFalls_1F_1R.inc @@ -1,21 +1,21 @@ MeteorFalls_1F_1R_MapObjects:: @ 838BACC - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B17FB, 1044, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1815, 1046, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1808, 1045, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1822, 1047, 0, 0 - object_event 5, 241, 0, 12, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 938, 0, 0 - object_event 6, 241, 0, 14, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 938, 0, 0 - object_event 7, 247, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 939, 0, 0 - object_event 8, 244, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 939, 0, 0 - object_event 9, 244, 0, 6, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 939, 0, 0 - object_event 10, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 23, 0, 3, 21, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, 942, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B17FB, FLAG_ITEM_METEOR_FALLS_1F_1R_1, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1815, FLAG_ITEM_METEOR_FALLS_1F_1R_3, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1808, FLAG_ITEM_METEOR_FALLS_1F_1R_2, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1822, FLAG_ITEM_METEOR_FALLS_1F_1R_4, 0, 0 + object_event 5, 241, 0, 12, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0 + object_event 6, 241, 0, 14, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0 + object_event 7, 247, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0 + object_event 8, 244, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0 + object_event 9, 244, 0, 6, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0 + object_event 10, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 23, 0, 3, 21, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, FLAG_HIDE_PROF_COSMO_METEOR_FALLS, 0, 0 MeteorFalls_1F_1R_MapWarps:: @ 838BBBC - warp_def 27, 18, 4, 0, Route114 - warp_def 6, 39, 3, 0, Route115 - warp_def 10, 3, 3, 0, MeteorFalls_1F_2R - warp_def 5, 4, 3, 4, MeteorFalls_B1F_1R - warp_def 26, 28, 3, 5, MeteorFalls_B1F_1R + warp_def 27, 18, 4, 0, MAP_ROUTE114 + warp_def 6, 39, 3, 0, MAP_ROUTE115 + warp_def 10, 3, 3, 0, MAP_METEOR_FALLS_1F_2R + warp_def 5, 4, 3, 4, MAP_METEOR_FALLS_B1F_1R + warp_def 26, 28, 3, 5, MAP_METEOR_FALLS_B1F_1R MeteorFalls_1F_1R_MapCoordEvents:: @ 838BBE4 coord_event 14, 18, 4, 0, 0x40bf, 0, 0, MeteorFalls_1F_1R_EventScript_15C49C diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/events/MeteorFalls_1F_2R.inc index 549620aa9..060f9a84d 100644 --- a/data/maps/events/MeteorFalls_1F_2R.inc +++ b/data/maps/events/MeteorFalls_1F_2R.inc @@ -4,10 +4,10 @@ MeteorFalls_1F_2R_MapObjects:: @ 838BC20 object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 7, 0, 12, 0, 3, 8, 17, 0, 1, 0, 0, 0, MeteorFalls_1F_2R_EventScript_15C6FD, 0, 0, 0 MeteorFalls_1F_2R_MapWarps:: @ 838BC68 - warp_def 10, 29, 3, 2, MeteorFalls_1F_1R - warp_def 4, 14, 3, 0, MeteorFalls_B1F_1R - warp_def 7, 20, 3, 1, MeteorFalls_B1F_1R - warp_def 21, 23, 3, 2, MeteorFalls_B1F_1R + warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R + warp_def 4, 14, 3, 0, MAP_METEOR_FALLS_B1F_1R + warp_def 7, 20, 3, 1, MAP_METEOR_FALLS_B1F_1R + warp_def 21, 23, 3, 2, MAP_METEOR_FALLS_B1F_1R MeteorFalls_1F_2R_MapBGEvents:: @ 838BC88 bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_2R_EventScript_14E842 diff --git a/data/maps/events/MeteorFalls_B1F_1R.inc b/data/maps/events/MeteorFalls_B1F_1R.inc index 796e31cd2..053c932ce 100644 --- a/data/maps/events/MeteorFalls_B1F_1R.inc +++ b/data/maps/events/MeteorFalls_B1F_1R.inc @@ -1,10 +1,10 @@ MeteorFalls_B1F_1R_MapWarps:: @ 838BCB4 - warp_def 5, 6, 4, 1, MeteorFalls_1F_2R - warp_def 7, 11, 5, 2, MeteorFalls_1F_2R - warp_def 18, 15, 4, 3, MeteorFalls_1F_2R - warp_def 17, 3, 3, 0, MeteorFalls_B1F_2R - warp_def 3, 23, 5, 3, MeteorFalls_1F_1R - warp_def 20, 36, 3, 4, MeteorFalls_1F_1R + warp_def 5, 6, 4, 1, MAP_METEOR_FALLS_1F_2R + warp_def 7, 11, 5, 2, MAP_METEOR_FALLS_1F_2R + warp_def 18, 15, 4, 3, MAP_METEOR_FALLS_1F_2R + warp_def 17, 3, 3, 0, MAP_METEOR_FALLS_B1F_2R + warp_def 3, 23, 5, 3, MAP_METEOR_FALLS_1F_1R + warp_def 20, 36, 3, 4, MAP_METEOR_FALLS_1F_1R MeteorFalls_B1F_1R_MapEvents:: @ 838BCE4 map_events 0x0, MeteorFalls_B1F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/events/MeteorFalls_B1F_2R.inc index abdad1f03..13e39d682 100644 --- a/data/maps/events/MeteorFalls_B1F_2R.inc +++ b/data/maps/events/MeteorFalls_B1F_2R.inc @@ -1,8 +1,8 @@ MeteorFalls_B1F_2R_MapObjects:: @ 838BCF8 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_1B182F, 1080, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_1B182F, FLAG_ITEM_METEOR_FALLS_B1F_2R_1, 0, 0 MeteorFalls_B1F_2R_MapWarps:: @ 838BD10 - warp_def 5, 15, 3, 3, MeteorFalls_B1F_1R + warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R MeteorFalls_B1F_2R_MapEvents:: @ 838BD18 map_events MeteorFalls_B1F_2R_MapObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc index b73bc64f3..a5b4fa74a 100644 --- a/data/maps/events/MossdeepCity.inc +++ b/data/maps/events/MossdeepCity.inc @@ -4,22 +4,22 @@ MossdeepCity_MapObjects:: @ 838042C object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 32, 0, 12, 0, 5, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFAE, 0, 0, 0 object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 26, 0, 21, 0, 5, 3, 16, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFC0, 0, 0, 0 object_event 5, MAP_OBJ_GFX_GIRL_1, 0, 45, 0, 18, 0, 7, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFD2, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 62, 0, 35, 0, 5, 1, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_1B1745, 1043, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 62, 0, 35, 0, 5, 1, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_1B1745, FLAG_ITEM_MOSSDEEP_1, 0, 0 object_event 7, MAP_OBJ_GFX_MAN_1, 0, 53, 0, 5, 0, 7, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14D011, 0, 0, 0 object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 56, 0, 21, 0, 7, 10, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFDB, 0, 0, 0 object_event 9, MAP_OBJ_GFX_BOY_2, 0, 23, 0, 13, 0, 5, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14D027, 0, 0, 0 MossdeepCity_MapWarps:: @ 8380504 - warp_def 28, 9, 0, 0, MossdeepCity_House1 - warp_def 38, 9, 0, 0, MossdeepCity_Gym - warp_def 28, 16, 0, 0, MossdeepCity_PokemonCenter_1F - warp_def 67, 24, 0, 0, MossdeepCity_House2 - warp_def 37, 18, 0, 0, MossdeepCity_Mart - warp_def 49, 6, 0, 0, MossdeepCity_House3 - warp_def 19, 10, 0, 0, MossdeepCity_StevensHouse - warp_def 18, 16, 0, 1, MossdeepCity_House4 - warp_def 64, 13, 0, 0, MossdeepCity_SpaceCenter_1F - warp_def 36, 24, 0, 0, MossdeepCity_GameCorner_1F + warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1 + warp_def 38, 9, 0, 0, MAP_MOSSDEEP_CITY_GYM + warp_def 28, 16, 0, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F + warp_def 67, 24, 0, 0, MAP_MOSSDEEP_CITY_HOUSE2 + warp_def 37, 18, 0, 0, MAP_MOSSDEEP_CITY_MART + warp_def 49, 6, 0, 0, MAP_MOSSDEEP_CITY_HOUSE3 + warp_def 19, 10, 0, 0, MAP_MOSSDEEP_CITY_STEVENS_HOUSE + warp_def 18, 16, 0, 1, MAP_MOSSDEEP_CITY_HOUSE4 + warp_def 64, 13, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F + warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F MossdeepCity_MapCoordEvents:: @ 8380554 coord_event 25, 25, 0, 0, 0x4001, 0, 0, MossdeepCity_EventScript_14D008 diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/events/MossdeepCity_GameCorner_1F.inc index 99350c4b0..f525533b2 100644 --- a/data/maps/events/MossdeepCity_GameCorner_1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_1F.inc @@ -2,9 +2,9 @@ MossdeepCity_GameCorner_1F_MapObjects:: @ 838AC6C object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AD42, 0, 0, 0 MossdeepCity_GameCorner_1F_MapWarps:: @ 838AC84 - warp_def 3, 7, 0, 9, MossdeepCity - warp_def 4, 7, 0, 9, MossdeepCity - warp_def 3, 1, 0, 0, MossdeepCity_GameCorner_B1F + warp_def 3, 7, 0, 9, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 9, MAP_MOSSDEEP_CITY + warp_def 3, 1, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F MossdeepCity_GameCorner_1F_MapBGEvents:: @ 838AC9C bg_event 3, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AE4C diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/events/MossdeepCity_GameCorner_B1F.inc index 98c843f52..58acb3300 100644 --- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_B1F.inc @@ -2,7 +2,7 @@ MossdeepCity_GameCorner_B1F_MapObjects:: @ 838ACBC object_event 1, 240, 0, 6, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 MossdeepCity_GameCorner_B1F_MapWarps:: @ 838ACD4 - warp_def 3, 1, 0, 2, MossdeepCity_GameCorner_1F + warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F MossdeepCity_GameCorner_B1F_MapEvents:: @ 838ACDC map_events MossdeepCity_GameCorner_B1F_MapObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/events/MossdeepCity_Gym.inc index d80237a3a..80812cc4d 100644 --- a/data/maps/events/MossdeepCity_Gym.inc +++ b/data/maps/events/MossdeepCity_Gym.inc @@ -10,8 +10,8 @@ MossdeepCity_Gym_MapObjects:: @ 838A660 object_event 9, MAP_OBJ_GFX_LIZA, 0, 9, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0, 0, 0 MossdeepCity_Gym_MapWarps:: @ 838A738 - warp_def 9, 29, 0, 1, MossdeepCity - warp_def 10, 29, 0, 1, MossdeepCity + warp_def 9, 29, 0, 1, MAP_MOSSDEEP_CITY + warp_def 10, 29, 0, 1, MAP_MOSSDEEP_CITY MossdeepCity_Gym_MapCoordEvents:: @ 838A748 coord_event 12, 3, 3, 0, 0x4001, 0, 0, MossdeepCity_Gym_EventScript_15A742 diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/events/MossdeepCity_House1.inc index 251440343..ec7bbdc58 100644 --- a/data/maps/events/MossdeepCity_House1.inc +++ b/data/maps/events/MossdeepCity_House1.inc @@ -3,8 +3,8 @@ MossdeepCity_House1_MapObjects:: @ 838A7B4 object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_House1_EventScript_15A85F, 0, 0, 0 MossdeepCity_House1_MapWarps:: @ 838A7E4 - warp_def 3, 7, 0, 0, MossdeepCity - warp_def 4, 7, 0, 0, MossdeepCity + warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 0, MAP_MOSSDEEP_CITY MossdeepCity_House1_MapEvents:: @ 838A7F4 map_events MossdeepCity_House1_MapObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/events/MossdeepCity_House2.inc index 31ef3ab7b..6752007d7 100644 --- a/data/maps/events/MossdeepCity_House2.inc +++ b/data/maps/events/MossdeepCity_House2.inc @@ -1,11 +1,11 @@ MossdeepCity_House2_MapObjects:: @ 838A808 object_event 1, MAP_OBJ_GFX_MAN_5, 0, 6, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A869, 0, 0, 0 object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A872, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WINGULL, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A87B, 934, 0, 0 + object_event 3, MAP_OBJ_GFX_WINGULL, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A87B, FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE, 0, 0 MossdeepCity_House2_MapWarps:: @ 838A850 - warp_def 3, 8, 0, 3, MossdeepCity - warp_def 4, 8, 0, 3, MossdeepCity + warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY + warp_def 4, 8, 0, 3, MAP_MOSSDEEP_CITY MossdeepCity_House2_MapEvents:: @ 838A860 map_events MossdeepCity_House2_MapObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/events/MossdeepCity_House3.inc index b1503decc..37c96933c 100644 --- a/data/maps/events/MossdeepCity_House3.inc +++ b/data/maps/events/MossdeepCity_House3.inc @@ -2,8 +2,8 @@ MossdeepCity_House3_MapObjects:: @ 838AA08 object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_House3_EventScript_15A972, 0, 0, 0 MossdeepCity_House3_MapWarps:: @ 838AA20 - warp_def 3, 7, 0, 5, MossdeepCity - warp_def 4, 7, 0, 5, MossdeepCity + warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 5, MAP_MOSSDEEP_CITY MossdeepCity_House3_MapEvents:: @ 838AA30 map_events MossdeepCity_House3_MapObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/events/MossdeepCity_House4.inc index dc0fdfed8..6c07d0101 100644 --- a/data/maps/events/MossdeepCity_House4.inc +++ b/data/maps/events/MossdeepCity_House4.inc @@ -4,8 +4,8 @@ MossdeepCity_House4_MapObjects:: @ 838AAF8 object_event 3, MAP_OBJ_GFX_SKITTY, 0, 2, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB77, 0, 0, 0 MossdeepCity_House4_MapWarps:: @ 838AB40 - warp_def 4, 7, 0, 7, MossdeepCity - warp_def 3, 7, 0, 7, MossdeepCity + warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY + warp_def 3, 7, 0, 7, MAP_MOSSDEEP_CITY MossdeepCity_House4_MapEvents:: @ 838AB50 map_events MossdeepCity_House4_MapObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/events/MossdeepCity_Mart.inc index 80514f1f8..74141c0cc 100644 --- a/data/maps/events/MossdeepCity_Mart.inc +++ b/data/maps/events/MossdeepCity_Mart.inc @@ -5,8 +5,8 @@ MossdeepCity_Mart_MapObjects:: @ 838A984 object_event 4, MAP_OBJ_GFX_SAILOR, 0, 5, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A968, 0, 0, 0 MossdeepCity_Mart_MapWarps:: @ 838A9E4 - warp_def 3, 7, 0, 4, MossdeepCity - warp_def 4, 7, 0, 4, MossdeepCity + warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 4, MAP_MOSSDEEP_CITY MossdeepCity_Mart_MapEvents:: @ 838A9F4 map_events MossdeepCity_Mart_MapObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc index d7cf07f6a..a9555d59b 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc +++ b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ MossdeepCity_PokemonCenter_1F_MapObjects:: @ 838A874 object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 3, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8F1, 0, 0, 0 MossdeepCity_PokemonCenter_1F_MapWarps:: @ 838A8BC - warp_def 7, 8, 3, 2, MossdeepCity - warp_def 6, 8, 3, 2, MossdeepCity - warp_def 1, 6, 4, 0, MossdeepCity_PokemonCenter_2F + warp_def 7, 8, 3, 2, MAP_MOSSDEEP_CITY + warp_def 6, 8, 3, 2, MAP_MOSSDEEP_CITY + warp_def 1, 6, 4, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F MossdeepCity_PokemonCenter_1F_MapEvents:: @ 838A8D4 map_events MossdeepCity_PokemonCenter_1F_MapObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc index 337467351..3f3d05e5a 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc +++ b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc @@ -5,11 +5,11 @@ MossdeepCity_PokemonCenter_2F_MapObjects:: @ 838A8E8 object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 6, 0, 3, 5, 18, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A90A, 0, 0, 0 MossdeepCity_PokemonCenter_2F_MapWarps:: @ 838A948 - warp_def 1, 5, 4, 2, MossdeepCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM MossdeepCity_PokemonCenter_2F_MapEvents:: @ 838A970 map_events MossdeepCity_PokemonCenter_2F_MapObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc index d79459eb8..ab9872c2f 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc +++ b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc @@ -6,9 +6,9 @@ MossdeepCity_SpaceCenter_1F_MapObjects:: @ 838AB64 object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 14, 0, 7, 0, 3, 3, 17, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC16, 0, 0, 0 MossdeepCity_SpaceCenter_1F_MapWarps:: @ 838ABDC - warp_def 7, 9, 0, 8, MossdeepCity - warp_def 8, 9, 0, 8, MossdeepCity - warp_def 13, 1, 0, 0, MossdeepCity_SpaceCenter_2F + warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY + warp_def 8, 9, 0, 8, MAP_MOSSDEEP_CITY + warp_def 13, 1, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_2F MossdeepCity_SpaceCenter_1F_MapEvents:: @ 838ABF4 map_events MossdeepCity_SpaceCenter_1F_MapObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc index 2dc4f843a..bcef30b09 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc +++ b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc @@ -4,7 +4,7 @@ MossdeepCity_SpaceCenter_2F_MapObjects:: @ 838AC08 object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 5, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC37, 0, 0, 0 MossdeepCity_SpaceCenter_2F_MapWarps:: @ 838AC50 - warp_def 13, 1, 0, 2, MossdeepCity_SpaceCenter_1F + warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F MossdeepCity_SpaceCenter_2F_MapEvents:: @ 838AC58 map_events MossdeepCity_SpaceCenter_2F_MapObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/events/MossdeepCity_StevensHouse.inc index ce240d81f..1428a7d8a 100644 --- a/data/maps/events/MossdeepCity_StevensHouse.inc +++ b/data/maps/events/MossdeepCity_StevensHouse.inc @@ -1,12 +1,12 @@ MossdeepCity_StevensHouse_MapObjects:: @ 838AA44 - object_event 1, MAP_OBJ_GFX_STEVEN, 0, 9, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, 967, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, 968, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, 1133, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, 727, 0, 0 + object_event 1, MAP_OBJ_GFX_STEVEN, 0, 9, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, FLAG_HIDE_STEVEN_STEVENS_HOUSE, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1, 0, 0 + object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, FLAG_HIDE_STEVENS_LETTER, 0, 0 MossdeepCity_StevensHouse_MapWarps:: @ 838AAA4 - warp_def 3, 7, 0, 6, MossdeepCity - warp_def 4, 7, 0, 6, MossdeepCity + warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY MossdeepCity_StevensHouse_MapBGEvents:: @ 838AAB4 bg_event 0, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 diff --git a/data/maps/events/MtChimney.inc b/data/maps/events/MtChimney.inc index 468edda1d..7bc90433c 100644 --- a/data/maps/events/MtChimney.inc +++ b/data/maps/events/MtChimney.inc @@ -1,38 +1,38 @@ MtChimney_MapObjects:: @ 838C330 - object_event 1, 247, 0, 24, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, 927, 0, 0 - object_event 2, 246, 0, 13, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, 926, 0, 0 - object_event 3, 241, 0, 12, 0, 11, 0, 3, 9, 0, 0, 1, 0, 2, 0, MtChimney_EventScript_15D110, 926, 0, 0 - object_event 4, 241, 0, 32, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, 926, 0, 0 - object_event 5, 241, 0, 28, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D159, 926, 0, 0 - object_event 6, 244, 0, 19, 0, 39, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, 927, 0, 0 - object_event 7, 244, 0, 29, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, 927, 0, 0 - object_event 8, 244, 0, 31, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D107, 927, 0, 0 - object_event 9, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 16, 0, 37, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15CF95, 877, 0, 0 - object_event 10, 241, 0, 22, 0, 39, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, 926, 0, 0 - object_event 11, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 19, 0, 3, 74, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, 927, 0, 0 - object_event 12, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 18, 0, 3, 64, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 - object_event 13, 241, 0, 23, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, 926, 0, 0 - object_event 14, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 20, 0, 3, 65, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 - object_event 15, MAP_OBJ_GFX_POOCHYENA, 0, 22, 0, 19, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 - object_event 16, 241, 0, 23, 0, 21, 0, 3, 7, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D150, 926, 0, 0 - object_event 17, 241, 0, 21, 0, 19, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, 926, 0, 0 - object_event 18, MAP_OBJ_GFX_POOCHYENA, 0, 30, 0, 12, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, 927, 0, 0 - object_event 19, MAP_OBJ_GFX_POOCHYENA, 0, 29, 0, 12, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 - object_event 20, MAP_OBJ_GFX_POOCHYENA, 0, 30, 0, 5, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, 927, 0, 0 - object_event 21, MAP_OBJ_GFX_POOCHYENA, 0, 31, 0, 5, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 - object_event 22, 241, 0, 9, 0, 15, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D127, 926, 0, 0 - object_event 23, MAP_OBJ_GFX_POOCHYENA, 0, 20, 0, 39, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, 927, 0, 0 - object_event 24, MAP_OBJ_GFX_POOCHYENA, 0, 21, 0, 39, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 - object_event 25, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 16, 0, 18, 0, 3, 13, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D1E3, 877, 0, 0 - object_event 26, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 7, 0, 3, 70, 0, 0, 1, 0, 4, 0, MtChimney_EventScript_15D221, 877, 0, 0 - object_event 27, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D238, 877, 0, 0 - object_event 28, MAP_OBJ_GFX_BEAUTY, 0, 27, 0, 17, 0, 3, 16, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D24F, 877, 0, 0 + object_event 1, 247, 0, 24, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 2, 246, 0, 13, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 3, 241, 0, 12, 0, 11, 0, 3, 9, 0, 0, 1, 0, 2, 0, MtChimney_EventScript_15D110, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 4, 241, 0, 32, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 5, 241, 0, 28, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D159, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 6, 244, 0, 19, 0, 39, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 7, 244, 0, 29, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 8, 244, 0, 31, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D107, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 9, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 16, 0, 37, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15CF95, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 + object_event 10, 241, 0, 22, 0, 39, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 11, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 19, 0, 3, 74, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 12, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 18, 0, 3, 64, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 13, 241, 0, 23, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 14, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 20, 0, 3, 65, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 15, MAP_OBJ_GFX_POOCHYENA, 0, 22, 0, 19, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 16, 241, 0, 23, 0, 21, 0, 3, 7, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D150, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 17, 241, 0, 21, 0, 19, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 18, MAP_OBJ_GFX_POOCHYENA, 0, 30, 0, 12, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 19, MAP_OBJ_GFX_POOCHYENA, 0, 29, 0, 12, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 20, MAP_OBJ_GFX_POOCHYENA, 0, 30, 0, 5, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 21, MAP_OBJ_GFX_POOCHYENA, 0, 31, 0, 5, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 22, 241, 0, 9, 0, 15, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D127, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 23, MAP_OBJ_GFX_POOCHYENA, 0, 20, 0, 39, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 24, MAP_OBJ_GFX_POOCHYENA, 0, 21, 0, 39, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 25, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 16, 0, 18, 0, 3, 13, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D1E3, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 + object_event 26, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 7, 0, 3, 70, 0, 0, 1, 0, 4, 0, MtChimney_EventScript_15D221, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 + object_event 27, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D238, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 + object_event 28, MAP_OBJ_GFX_BEAUTY, 0, 27, 0, 17, 0, 3, 16, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D24F, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 MtChimney_MapWarps:: @ 838C5D0 - warp_def 17, 36, 0, 0, MtChimney_CableCarStation - warp_def 18, 36, 0, 1, MtChimney_CableCarStation - warp_def 20, 41, 3, 2, JaggedPass - warp_def 21, 41, 3, 3, JaggedPass + warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION + warp_def 18, 36, 0, 1, MAP_MT_CHIMNEY_CABLE_CAR_STATION + warp_def 20, 41, 3, 2, MAP_JAGGED_PASS + warp_def 21, 41, 3, 3, MAP_JAGGED_PASS MtChimney_MapBGEvents:: @ 838C5F0 bg_event 14, 6, 0, 0, 0, MtChimney_EventScript_15D17D diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/events/MtChimney_CableCarStation.inc index db4eef0fa..971dcda65 100644 --- a/data/maps/events/MtChimney_CableCarStation.inc +++ b/data/maps/events/MtChimney_CableCarStation.inc @@ -3,8 +3,8 @@ MtChimney_CableCarStation_MapObjects:: @ 838B828 object_event 2, MAP_OBJ_GFX_CABLE_CAR, 0, 6, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 MtChimney_CableCarStation_MapWarps:: @ 838B858 - warp_def 6, 11, 0, 0, MtChimney - warp_def 7, 11, 0, 1, MtChimney + warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY + warp_def 7, 11, 0, 1, MAP_MT_CHIMNEY MtChimney_CableCarStation_MapEvents:: @ 838B868 map_events MtChimney_CableCarStation_MapObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/events/MtPyre_1F.inc index 3f4263f9e..480bcdbe9 100644 --- a/data/maps/events/MtPyre_1F.inc +++ b/data/maps/events/MtPyre_1F.inc @@ -4,12 +4,12 @@ MtPyre_1F_MapObjects:: @ 838C7FC object_event 3, MAP_OBJ_GFX_MAN_5, 0, 13, 0, 10, 0, 3, 9, 17, 0, 0, 0, 0, 0, MtPyre_1F_EventScript_15D365, 0, 0, 0 MtPyre_1F_MapWarps:: @ 838C844 - warp_def 17, 18, 3, 0, Route122 - warp_def 3, 6, 3, 0, MtPyre_Exterior - warp_def 18, 18, 3, 0, Route122 - warp_def 4, 6, 3, 0, MtPyre_Exterior - warp_def 11, 1, 3, 0, MtPyre_2F - warp_def 20, 9, 3, 4, MtPyre_2F + warp_def 17, 18, 3, 0, MAP_ROUTE122 + warp_def 3, 6, 3, 0, MAP_MT_PYRE_EXTERIOR + warp_def 18, 18, 3, 0, MAP_ROUTE122 + warp_def 4, 6, 3, 0, MAP_MT_PYRE_EXTERIOR + warp_def 11, 1, 3, 0, MAP_MT_PYRE_2F + warp_def 20, 9, 3, 4, MAP_MT_PYRE_2F MtPyre_1F_MapEvents:: @ 838C874 map_events MtPyre_1F_MapObjects, MtPyre_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/events/MtPyre_2F.inc index 320be57af..16e1d98b0 100644 --- a/data/maps/events/MtPyre_2F.inc +++ b/data/maps/events/MtPyre_2F.inc @@ -1,17 +1,17 @@ MtPyre_2F_MapObjects:: @ 838C888 object_event 1, MAP_OBJ_GFX_MANIAC, 0, 6, 0, 6, 0, 3, 17, 17, 0, 1, 0, 2, 0, MtPyre_2F_EventScript_15D39B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_1B1933, 1129, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_1B1933, FLAG_ITEM_MT_PYRE_2F_1, 0, 0 object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 5, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_15D389, 0, 0, 0 object_event 4, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_15D392, 0, 0, 0 object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 8, 0, 3, 8, 17, 0, 1, 0, 0, 0, MtPyre_2F_EventScript_15D3CD, 0, 0, 0 object_event 6, MAP_OBJ_GFX_MAN_5, 0, 3, 0, 8, 0, 3, 8, 17, 0, 1, 0, 0, 0, MtPyre_2F_EventScript_15D3B2, 0, 0, 0 MtPyre_2F_MapWarps:: @ 838C918 - warp_def 2, 1, 3, 4, MtPyre_1F - warp_def 10, 1, 3, 0, MtPyre_3F - warp_def 10, 12, 3, 4, MtPyre_3F - warp_def 6, 12, 3, 5, MtPyre_3F - warp_def 11, 9, 3, 5, MtPyre_1F + warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F + warp_def 10, 1, 3, 0, MAP_MT_PYRE_3F + warp_def 10, 12, 3, 4, MAP_MT_PYRE_3F + warp_def 6, 12, 3, 5, MAP_MT_PYRE_3F + warp_def 11, 9, 3, 5, MAP_MT_PYRE_1F MtPyre_2F_MapEvents:: @ 838C940 map_events MtPyre_2F_MapObjects, MtPyre_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/events/MtPyre_3F.inc index ba5428cb2..818d61533 100644 --- a/data/maps/events/MtPyre_3F.inc +++ b/data/maps/events/MtPyre_3F.inc @@ -1,15 +1,15 @@ MtPyre_3F_MapObjects:: @ 838C954 object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 1, 0, 4, 0, 3, 18, 17, 0, 1, 0, 3, 0, MtPyre_3F_EventScript_15D3E9, 0, 0, 0 object_event 2, MAP_OBJ_GFX_LASS, 0, 12, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtPyre_3F_EventScript_15D400, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_3F_EventScript_1B1940, 1120, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_3F_EventScript_1B1940, FLAG_ITEM_MT_PYRE_3F_1, 0, 0 MtPyre_3F_MapWarps:: @ 838C99C - warp_def 10, 1, 3, 1, MtPyre_2F - warp_def 2, 1, 3, 1, MtPyre_4F - warp_def 9, 10, 3, 4, MtPyre_4F - warp_def 1, 12, 3, 5, MtPyre_4F - warp_def 10, 12, 3, 2, MtPyre_2F - warp_def 6, 12, 3, 3, MtPyre_2F + warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F + warp_def 2, 1, 3, 1, MAP_MT_PYRE_4F + warp_def 9, 10, 3, 4, MAP_MT_PYRE_4F + warp_def 1, 12, 3, 5, MAP_MT_PYRE_4F + warp_def 10, 12, 3, 2, MAP_MT_PYRE_2F + warp_def 6, 12, 3, 3, MAP_MT_PYRE_2F MtPyre_3F_MapEvents:: @ 838C9CC map_events MtPyre_3F_MapObjects, MtPyre_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/events/MtPyre_4F.inc index c54b36645..4b954a45e 100644 --- a/data/maps/events/MtPyre_4F.inc +++ b/data/maps/events/MtPyre_4F.inc @@ -1,14 +1,14 @@ MtPyre_4F_MapObjects:: @ 838C9E0 object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 11, 0, 7, 0, 3, 24, 17, 0, 1, 0, 2, 0, MtPyre_4F_EventScript_15D418, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_4F_EventScript_1B194D, 1130, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_4F_EventScript_1B194D, FLAG_ITEM_MT_PYRE_4F_1, 0, 0 MtPyre_4F_MapWarps:: @ 838CA10 - warp_def 10, 1, 3, 1, MtPyre_5F - warp_def 2, 5, 3, 1, MtPyre_3F - warp_def 12, 10, 3, 3, MtPyre_5F - warp_def 12, 12, 3, 4, MtPyre_5F - warp_def 9, 10, 3, 2, MtPyre_3F - warp_def 2, 12, 3, 3, MtPyre_3F + warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F + warp_def 2, 5, 3, 1, MAP_MT_PYRE_3F + warp_def 12, 10, 3, 3, MAP_MT_PYRE_5F + warp_def 12, 12, 3, 4, MAP_MT_PYRE_5F + warp_def 9, 10, 3, 2, MAP_MT_PYRE_3F + warp_def 2, 12, 3, 3, MAP_MT_PYRE_3F MtPyre_4F_MapEvents:: @ 838CA40 map_events MtPyre_4F_MapObjects, MtPyre_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/events/MtPyre_5F.inc index 73b97a40d..9043c95de 100644 --- a/data/maps/events/MtPyre_5F.inc +++ b/data/maps/events/MtPyre_5F.inc @@ -1,13 +1,13 @@ MtPyre_5F_MapObjects:: @ 838CA54 object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 3, 0, 7, 0, 3, 17, 17, 0, 1, 0, 2, 0, MtPyre_5F_EventScript_15D430, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_5F_EventScript_1B195A, 1052, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_5F_EventScript_1B195A, FLAG_ITEM_MT_PYRE_5F_1, 0, 0 MtPyre_5F_MapWarps:: @ 838CA84 - warp_def 2, 1, 3, 0, MtPyre_6F - warp_def 10, 5, 3, 0, MtPyre_4F - warp_def 1, 10, 3, 1, MtPyre_6F - warp_def 12, 10, 3, 2, MtPyre_4F - warp_def 12, 12, 3, 3, MtPyre_4F + warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F + warp_def 10, 5, 3, 0, MAP_MT_PYRE_4F + warp_def 1, 10, 3, 1, MAP_MT_PYRE_6F + warp_def 12, 10, 3, 2, MAP_MT_PYRE_4F + warp_def 12, 12, 3, 3, MAP_MT_PYRE_4F MtPyre_5F_MapEvents:: @ 838CAAC map_events MtPyre_5F_MapObjects, MtPyre_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/events/MtPyre_6F.inc index 70228bc42..67597ff58 100644 --- a/data/maps/events/MtPyre_6F.inc +++ b/data/maps/events/MtPyre_6F.inc @@ -1,10 +1,10 @@ MtPyre_6F_MapObjects:: @ 838CAC0 object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 6, 0, 3, 0, 3, 23, 17, 0, 1, 0, 2, 0, MtPyre_6F_EventScript_15D448, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_6F_EventScript_1B1967, 1089, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_6F_EventScript_1B1967, FLAG_ITEM_MT_PYRE_6F_1, 0, 0 MtPyre_6F_MapWarps:: @ 838CAF0 - warp_def 2, 1, 3, 0, MtPyre_5F - warp_def 1, 10, 3, 2, MtPyre_5F + warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F + warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F MtPyre_6F_MapEvents:: @ 838CB00 map_events MtPyre_6F_MapObjects, MtPyre_6F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/events/MtPyre_Exterior.inc index ac372a2f0..71cb2095a 100644 --- a/data/maps/events/MtPyre_Exterior.inc +++ b/data/maps/events/MtPyre_Exterior.inc @@ -1,11 +1,11 @@ MtPyre_Exterior_MapObjects:: @ 838CB14 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1974, 1073, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 40, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1981, 1074, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1974, FLAG_ITEM_MT_PYRE_EXTERIOR_1, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 40, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1981, FLAG_ITEM_MT_PYRE_EXTERIOR_2, 0, 0 MtPyre_Exterior_MapWarps:: @ 838CB44 - warp_def 10, 42, 3, 1, MtPyre_1F - warp_def 19, 10, 3, 1, MtPyre_Summit - warp_def 20, 10, 3, 1, MtPyre_Summit + warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F + warp_def 19, 10, 3, 1, MAP_MT_PYRE_SUMMIT + warp_def 20, 10, 3, 1, MAP_MT_PYRE_SUMMIT MtPyre_Exterior_MapCoordEvents:: @ 838CB5C coord_event 24, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc index 4f5047765..21217ac8f 100644 --- a/data/maps/events/MtPyre_Summit.inc +++ b/data/maps/events/MtPyre_Summit.inc @@ -1,15 +1,15 @@ MtPyre_Summit_MapObjects:: @ 838CBD8 object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 22, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D5EF, 0, 0, 0 - object_event 2, 246, 0, 23, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 916, 0, 0 + object_event 2, 246, 0, 23, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEADER_MT_PYRE_SUMMIT, 0, 0 object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 23, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D623, 0, 0, 0 - object_event 4, 241, 0, 21, 0, 18, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DA9, 917, 0, 0 - object_event 5, 241, 0, 25, 0, 15, 0, 3, 9, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DC0, 917, 0, 0 - object_event 6, 241, 0, 21, 0, 11, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DD7, 917, 0, 0 + object_event 4, 241, 0, 21, 0, 18, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DA9, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0 + object_event 5, 241, 0, 25, 0, 15, 0, 3, 9, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DC0, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0 + object_event 6, 241, 0, 21, 0, 11, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DD7, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0 MtPyre_Summit_MapWarps:: @ 838CC68 - warp_def 22, 31, 3, 1, MtPyre_Exterior - warp_def 23, 31, 3, 1, MtPyre_Exterior - warp_def 24, 31, 3, 1, MtPyre_Exterior + warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR + warp_def 23, 31, 3, 1, MAP_MT_PYRE_EXTERIOR + warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR MtPyre_Summit_MapCoordEvents:: @ 838CC80 coord_event 22, 7, 3, 0, 0x40b9, 0, 0, MtPyre_Summit_EventScript_15D4BD diff --git a/data/maps/events/NewMauville_Entrance.inc b/data/maps/events/NewMauville_Entrance.inc index 482ff83ca..65405fbe7 100644 --- a/data/maps/events/NewMauville_Entrance.inc +++ b/data/maps/events/NewMauville_Entrance.inc @@ -1,6 +1,6 @@ NewMauville_Entrance_MapWarps:: @ 838DED4 - warp_def 4, 6, 3, 0, Route110 - warp_def 4, 1, 3, 0, NewMauville_Inside + warp_def 4, 6, 3, 0, MAP_ROUTE110 + warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE NewMauville_Entrance_MapCoordEvents:: @ 838DEE4 coord_event 4, 2, 3, 0, 0x40ba, 0, 0, NewMauville_Entrance_EventScript_15E4DC diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc index a7384520d..a3b7ffbe2 100644 --- a/data/maps/events/NewMauville_Inside.inc +++ b/data/maps/events/NewMauville_Inside.inc @@ -1,15 +1,15 @@ NewMauville_Inside_MapObjects:: @ 838DF08 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B183C, 1075, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 22, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1849, 1076, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1856, 1110, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1863, 1122, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1870, 1123, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E900, 974, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E91E, 975, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E93C, 976, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B183C, FLAG_ITEM_NEW_MAUVILLE_INSIDE_1, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 22, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1849, FLAG_ITEM_NEW_MAUVILLE_INSIDE_2, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1856, FLAG_ITEM_NEW_MAUVILLE_INSIDE_3, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1863, FLAG_ITEM_NEW_MAUVILLE_INSIDE_4, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1870, FLAG_ITEM_NEW_MAUVILLE_INSIDE_5, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E900, FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E91E, FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E93C, FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE, 0, 0 NewMauville_Inside_MapWarps:: @ 838DFC8 - warp_def 32, 33, 3, 1, NewMauville_Entrance + warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE NewMauville_Inside_MapCoordEvents:: @ 838DFD0 coord_event 30, 38, 3, 0, 0x4001, 0, 0, NewMauville_Inside_EventScript_15E5AA diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc index a09a08fe2..828ffc986 100644 --- a/data/maps/events/OldaleTown.inc +++ b/data/maps/events/OldaleTown.inc @@ -2,13 +2,13 @@ OldaleTown_MapObjects:: @ 8380A78 object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 16, 0, 11, 0, 3, 9, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DDB3, 0, 0, 0 object_event 2, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 13, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DDBC, 0, 0, 0 object_event 3, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 9, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DEDF, 0, 0, 0 - object_event 4, 240, 0, 11, 0, 19, 0, 3, 7, 17, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DF30, 979, 0, 0 + object_event 4, 240, 0, 11, 0, 19, 0, 3, 7, 17, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DF30, FLAG_HIDE_RIVAL_OLDALE_TOWN, 0, 0 OldaleTown_MapWarps:: @ 8380AD8 - warp_def 5, 7, 0, 0, OldaleTown_House1 - warp_def 15, 16, 0, 0, OldaleTown_House2 - warp_def 6, 16, 0, 0, OldaleTown_PokemonCenter_1F - warp_def 14, 6, 0, 0, OldaleTown_Mart + warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1 + warp_def 15, 16, 0, 0, MAP_OLDALE_TOWN_HOUSE2 + warp_def 6, 16, 0, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_1F + warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART OldaleTown_MapCoordEvents:: @ 8380AF8 coord_event 0, 10, 3, 0, 0x4051, 0, 0, OldaleTown_EventScript_14DEFF diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/events/OldaleTown_House1.inc index 16f29b00e..1c2eb5bce 100644 --- a/data/maps/events/OldaleTown_House1.inc +++ b/data/maps/events/OldaleTown_House1.inc @@ -2,8 +2,8 @@ OldaleTown_House1_MapObjects:: @ 8385C4C object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, OldaleTown_House1_EventScript_152EEC, 0, 0, 0 OldaleTown_House1_MapWarps:: @ 8385C64 - warp_def 3, 8, 0, 0, OldaleTown - warp_def 4, 8, 0, 0, OldaleTown + warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN + warp_def 4, 8, 0, 0, MAP_OLDALE_TOWN OldaleTown_House1_MapEvents:: @ 8385C74 map_events OldaleTown_House1_MapObjects, OldaleTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/events/OldaleTown_House2.inc index 904291576..458ca9420 100644 --- a/data/maps/events/OldaleTown_House2.inc +++ b/data/maps/events/OldaleTown_House2.inc @@ -3,8 +3,8 @@ OldaleTown_House2_MapObjects:: @ 8385C88 object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EFF, 0, 0, 0 OldaleTown_House2_MapWarps:: @ 8385CB8 - warp_def 3, 7, 0, 1, OldaleTown - warp_def 4, 7, 0, 1, OldaleTown + warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN + warp_def 4, 7, 0, 1, MAP_OLDALE_TOWN OldaleTown_House2_MapEvents:: @ 8385CC8 map_events OldaleTown_House2_MapObjects, OldaleTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/events/OldaleTown_Mart.inc index a06ece505..839ec3b49 100644 --- a/data/maps/events/OldaleTown_Mart.inc +++ b/data/maps/events/OldaleTown_Mart.inc @@ -4,8 +4,8 @@ OldaleTown_Mart_MapObjects:: @ 8385DEC object_event 3, MAP_OBJ_GFX_BOY_1, 0, 9, 0, 4, 0, 3, 3, 16, 0, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152FE5, 0, 0, 0 OldaleTown_Mart_MapWarps:: @ 8385E34 - warp_def 3, 7, 0, 3, OldaleTown - warp_def 4, 7, 0, 3, OldaleTown + warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN + warp_def 4, 7, 0, 3, MAP_OLDALE_TOWN OldaleTown_Mart_MapEvents:: @ 8385E44 map_events OldaleTown_Mart_MapObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/events/OldaleTown_PokemonCenter_1F.inc index 161baec86..0c9bdfe8c 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_1F.inc +++ b/data/maps/events/OldaleTown_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ OldaleTown_PokemonCenter_1F_MapObjects:: @ 8385CDC object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 3, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F37, 0, 0, 0 OldaleTown_PokemonCenter_1F_MapWarps:: @ 8385D3C - warp_def 7, 8, 3, 2, OldaleTown - warp_def 6, 8, 3, 2, OldaleTown - warp_def 1, 6, 4, 0, OldaleTown_PokemonCenter_2F + warp_def 7, 8, 3, 2, MAP_OLDALE_TOWN + warp_def 6, 8, 3, 2, MAP_OLDALE_TOWN + warp_def 1, 6, 4, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_2F OldaleTown_PokemonCenter_1F_MapEvents:: @ 8385D54 map_events OldaleTown_PokemonCenter_1F_MapObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/events/OldaleTown_PokemonCenter_2F.inc index e2675bb14..e94d29970 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc +++ b/data/maps/events/OldaleTown_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ OldaleTown_PokemonCenter_2F_MapObjects:: @ 8385D68 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F72, 0, 0, 0 OldaleTown_PokemonCenter_2F_MapWarps:: @ 8385DB0 - warp_def 1, 5, 4, 2, OldaleTown_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM OldaleTown_PokemonCenter_2F_MapEvents:: @ 8385DD8 map_events OldaleTown_PokemonCenter_2F_MapObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/events/PacifidlogTown.inc index 1823e9afd..2161172a5 100644 --- a/data/maps/events/PacifidlogTown.inc +++ b/data/maps/events/PacifidlogTown.inc @@ -4,12 +4,12 @@ PacifidlogTown_MapObjects:: @ 838100C object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 9, 0, 16, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_EventScript_14E900, 0, 0, 0 PacifidlogTown_MapWarps:: @ 8381054 - warp_def 8, 15, 0, 0, PacifidlogTown_PokemonCenter_1F - warp_def 16, 13, 0, 0, PacifidlogTown_House1 - warp_def 3, 22, 0, 0, PacifidlogTown_House2 - warp_def 12, 24, 0, 0, PacifidlogTown_House3 - warp_def 2, 12, 0, 0, PacifidlogTown_House4 - warp_def 17, 21, 0, 0, PacifidlogTown_House5 + warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F + warp_def 16, 13, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE1 + warp_def 3, 22, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE2 + warp_def 12, 24, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE3 + warp_def 2, 12, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE4 + warp_def 17, 21, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE5 PacifidlogTown_MapBGEvents:: @ 8381084 bg_event 9, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/events/PacifidlogTown_House1.inc index 233fa7604..3e0e7dc23 100644 --- a/data/maps/events/PacifidlogTown_House1.inc +++ b/data/maps/events/PacifidlogTown_House1.inc @@ -3,8 +3,8 @@ PacifidlogTown_House1_MapObjects:: @ 8386F40 object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_15415E, 0, 0, 0 PacifidlogTown_House1_MapWarps:: @ 8386F70 - warp_def 4, 8, 0, 1, PacifidlogTown - warp_def 5, 8, 0, 1, PacifidlogTown + warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 1, MAP_PACIFIDLOG_TOWN PacifidlogTown_House1_MapEvents:: @ 8386F80 map_events PacifidlogTown_House1_MapObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/events/PacifidlogTown_House2.inc index aa1940d29..7c4de826c 100644 --- a/data/maps/events/PacifidlogTown_House2.inc +++ b/data/maps/events/PacifidlogTown_House2.inc @@ -4,8 +4,8 @@ PacifidlogTown_House2_MapObjects:: @ 8386F94 object_event 3, MAP_OBJ_GFX_AZURILL, 0, 1, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, PacifidlogTown_House2_EventScript_154282, 0, 0, 0 PacifidlogTown_House2_MapWarps:: @ 8386FDC - warp_def 4, 8, 0, 2, PacifidlogTown - warp_def 5, 8, 0, 2, PacifidlogTown + warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 2, MAP_PACIFIDLOG_TOWN PacifidlogTown_House2_MapEvents:: @ 8386FEC map_events PacifidlogTown_House2_MapObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/events/PacifidlogTown_House3.inc index 80ab8d7f5..642613434 100644 --- a/data/maps/events/PacifidlogTown_House3.inc +++ b/data/maps/events/PacifidlogTown_House3.inc @@ -3,8 +3,8 @@ PacifidlogTown_House3_MapObjects:: @ 8387000 object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 4, 0, 2, 0, 3, 10, 17, 0, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_15429E, 0, 0, 0 PacifidlogTown_House3_MapWarps:: @ 8387030 - warp_def 4, 8, 0, 3, PacifidlogTown - warp_def 5, 8, 0, 3, PacifidlogTown + warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 3, MAP_PACIFIDLOG_TOWN PacifidlogTown_House3_MapEvents:: @ 8387040 map_events PacifidlogTown_House3_MapObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/events/PacifidlogTown_House4.inc index a7dd1469b..bf010eaf3 100644 --- a/data/maps/events/PacifidlogTown_House4.inc +++ b/data/maps/events/PacifidlogTown_House4.inc @@ -4,8 +4,8 @@ PacifidlogTown_House4_MapObjects:: @ 8387054 object_event 3, MAP_OBJ_GFX_BOY_1, 0, 7, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_15435E, 0, 0, 0 PacifidlogTown_House4_MapWarps:: @ 838709C - warp_def 4, 8, 0, 4, PacifidlogTown - warp_def 5, 8, 0, 4, PacifidlogTown + warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 4, MAP_PACIFIDLOG_TOWN PacifidlogTown_House4_MapEvents:: @ 83870AC map_events PacifidlogTown_House4_MapObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/events/PacifidlogTown_House5.inc index 963a319cf..cd7c5dae0 100644 --- a/data/maps/events/PacifidlogTown_House5.inc +++ b/data/maps/events/PacifidlogTown_House5.inc @@ -3,8 +3,8 @@ PacifidlogTown_House5_MapObjects:: @ 83870C0 object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 3, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_1543BA, 0, 0, 0 PacifidlogTown_House5_MapWarps:: @ 83870F0 - warp_def 4, 8, 0, 5, PacifidlogTown - warp_def 5, 8, 0, 5, PacifidlogTown + warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 5, MAP_PACIFIDLOG_TOWN PacifidlogTown_House5_MapEvents:: @ 8387100 map_events PacifidlogTown_House5_MapObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc index 432ba616d..e0990b224 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ PacifidlogTown_PokemonCenter_1F_MapObjects:: @ 8386E30 object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154120, 0, 0, 0 PacifidlogTown_PokemonCenter_1F_MapWarps:: @ 8386E90 - warp_def 7, 8, 3, 0, PacifidlogTown - warp_def 6, 8, 3, 0, PacifidlogTown - warp_def 1, 6, 4, 0, PacifidlogTown_PokemonCenter_2F + warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN + warp_def 6, 8, 3, 0, MAP_PACIFIDLOG_TOWN + warp_def 1, 6, 4, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F PacifidlogTown_PokemonCenter_1F_MapEvents:: @ 8386EA8 map_events PacifidlogTown_PokemonCenter_1F_MapObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc index f4110623f..fb594733e 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc +++ b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ PacifidlogTown_PokemonCenter_2F_MapObjects:: @ 8386EBC object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_15414E, 0, 0, 0 PacifidlogTown_PokemonCenter_2F_MapWarps:: @ 8386F04 - warp_def 1, 5, 4, 2, PacifidlogTown_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 1, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 1, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 8386F2C map_events PacifidlogTown_PokemonCenter_2F_MapObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc index 4c36c49ab..739cbf905 100644 --- a/data/maps/events/PetalburgCity.inc +++ b/data/maps/events/PetalburgCity.inc @@ -1,21 +1,21 @@ PetalburgCity_MapObjects:: @ 837F5F0 - object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 16, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7C3, 728, 0, 0 - object_event 2, MAP_OBJ_GFX_WALLY, 0, 15, 0, 10, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 726, 0, 0 + object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 16, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7C3, FLAG_HIDE_WALLY_MOM_PETALBURG_1, 0, 0 + object_event 2, MAP_OBJ_GFX_WALLY, 0, 15, 0, 10, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG, 0, 0 object_event 3, MAP_OBJ_GFX_BOY_1, 0, 8, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7AC, 0, 0, 0 object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 20, 0, 10, 0, 3, 3, 16, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B824, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_1, 0, 15, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 811, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 14, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 812, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1704, 1039, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 28, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1711, 1040, 0, 0 + object_event 5, MAP_OBJ_GFX_MAN_1, 0, 15, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_FATHER_PETALBURG, 0, 0 + object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 14, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_MOTHER_PETALBURG, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1704, FLAG_ITEM_PETALBURG_1, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 28, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1711, FLAG_ITEM_PETALBURG_2, 0, 0 object_event 9, MAP_OBJ_GFX_BOY_2, 0, 12, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14BA2D, 0, 0, 0 PetalburgCity_MapWarps:: @ 837F6C8 - warp_def 10, 19, 0, 0, PetalburgCity_House1 - warp_def 7, 5, 0, 0, PetalburgCity_WallysHouse - warp_def 15, 8, 0, 0, PetalburgCity_Gym - warp_def 20, 16, 0, 0, PetalburgCity_PokemonCenter_1F - warp_def 20, 24, 0, 0, PetalburgCity_House2 - warp_def 25, 12, 0, 0, PetalburgCity_Mart + warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1 + warp_def 7, 5, 0, 0, MAP_PETALBURG_CITY_WALLYS_HOUSE + warp_def 15, 8, 0, 0, MAP_PETALBURG_CITY_GYM + warp_def 20, 16, 0, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_1F + warp_def 20, 24, 0, 0, MAP_PETALBURG_CITY_HOUSE2 + warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART PetalburgCity_MapCoordEvents:: @ 837F6F8 coord_event 8, 10, 3, 0, 0x4057, 0, 0, PetalburgCity_EventScript_14B836 diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/events/PetalburgCity_Gym.inc index 47205e253..781de130d 100644 --- a/data/maps/events/PetalburgCity_Gym.inc +++ b/data/maps/events/PetalburgCity_Gym.inc @@ -1,5 +1,5 @@ PetalburgCity_Gym_MapObjects:: @ 8387168 - object_event 1, MAP_OBJ_GFX_NORMAN, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_1545B9, 772, 0, 0 + object_event 1, MAP_OBJ_GFX_NORMAN, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_1545B9, FLAG_HIDE_NORMAN_PETALBURG_GYM, 0, 0 object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 94, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154EE6, 0, 0, 0 object_event 3, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 81, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154DF6, 0, 0, 0 object_event 4, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 42, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154E32, 0, 0, 0 @@ -7,48 +7,48 @@ PetalburgCity_Gym_MapObjects:: @ 8387168 object_event 6, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 68, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154E6E, 0, 0, 0 object_event 7, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 16, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154F5E, 0, 0, 0 object_event 8, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 29, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154EAA, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 109, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_15518B, 781, 0, 0 - object_event 10, MAP_OBJ_GFX_WALLY, 0, 4, 0, 111, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 866, 0, 0 + object_event 9, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 109, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_15518B, FLAG_HIDE_PETALBURG_GYM_GUIDE, 0, 0 + object_event 10, MAP_OBJ_GFX_WALLY, 0, 4, 0, 111, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG_GYM, 0, 0 PetalburgCity_Gym_MapWarps:: @ 8387258 - warp_def 4, 111, 3, 2, PetalburgCity - warp_def 5, 111, 3, 2, PetalburgCity - warp_def 1, 105, 3, 3, PetalburgCity_Gym - warp_def 7, 85, 3, 2, PetalburgCity_Gym - warp_def 6, 85, 3, 2, PetalburgCity_Gym - warp_def 7, 105, 3, 6, PetalburgCity_Gym - warp_def 1, 98, 3, 5, PetalburgCity_Gym - warp_def 2, 98, 3, 5, PetalburgCity_Gym - warp_def 1, 79, 3, 10, PetalburgCity_Gym - warp_def 7, 79, 3, 12, PetalburgCity_Gym - warp_def 7, 46, 3, 8, PetalburgCity_Gym - warp_def 6, 46, 3, 8, PetalburgCity_Gym - warp_def 1, 59, 3, 9, PetalburgCity_Gym - warp_def 2, 59, 3, 9, PetalburgCity_Gym - warp_def 1, 92, 3, 16, PetalburgCity_Gym - warp_def 7, 92, 3, 18, PetalburgCity_Gym - warp_def 7, 59, 3, 14, PetalburgCity_Gym - warp_def 6, 59, 3, 14, PetalburgCity_Gym - warp_def 1, 72, 3, 15, PetalburgCity_Gym - warp_def 2, 72, 3, 15, PetalburgCity_Gym - warp_def 7, 40, 3, 24, PetalburgCity_Gym - warp_def 1, 53, 3, 26, PetalburgCity_Gym - warp_def 7, 53, 3, 28, PetalburgCity_Gym - warp_def 1, 66, 3, 30, PetalburgCity_Gym - warp_def 1, 20, 3, 20, PetalburgCity_Gym - warp_def 2, 20, 3, 20, PetalburgCity_Gym - warp_def 7, 20, 3, 21, PetalburgCity_Gym - warp_def 6, 20, 3, 21, PetalburgCity_Gym - warp_def 1, 33, 3, 22, PetalburgCity_Gym - warp_def 2, 33, 3, 22, PetalburgCity_Gym - warp_def 7, 33, 3, 23, PetalburgCity_Gym - warp_def 6, 33, 3, 23, PetalburgCity_Gym - warp_def 7, 14, 3, 34, PetalburgCity_Gym - warp_def 1, 27, 3, 36, PetalburgCity_Gym - warp_def 1, 7, 3, 32, PetalburgCity_Gym - warp_def 2, 7, 3, 32, PetalburgCity_Gym - warp_def 7, 7, 3, 33, PetalburgCity_Gym - warp_def 6, 7, 3, 33, PetalburgCity_Gym + warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY + warp_def 5, 111, 3, 2, MAP_PETALBURG_CITY + warp_def 1, 105, 3, 3, MAP_PETALBURG_CITY_GYM + warp_def 7, 85, 3, 2, MAP_PETALBURG_CITY_GYM + warp_def 6, 85, 3, 2, MAP_PETALBURG_CITY_GYM + warp_def 7, 105, 3, 6, MAP_PETALBURG_CITY_GYM + warp_def 1, 98, 3, 5, MAP_PETALBURG_CITY_GYM + warp_def 2, 98, 3, 5, MAP_PETALBURG_CITY_GYM + warp_def 1, 79, 3, 10, MAP_PETALBURG_CITY_GYM + warp_def 7, 79, 3, 12, MAP_PETALBURG_CITY_GYM + warp_def 7, 46, 3, 8, MAP_PETALBURG_CITY_GYM + warp_def 6, 46, 3, 8, MAP_PETALBURG_CITY_GYM + warp_def 1, 59, 3, 9, MAP_PETALBURG_CITY_GYM + warp_def 2, 59, 3, 9, MAP_PETALBURG_CITY_GYM + warp_def 1, 92, 3, 16, MAP_PETALBURG_CITY_GYM + warp_def 7, 92, 3, 18, MAP_PETALBURG_CITY_GYM + warp_def 7, 59, 3, 14, MAP_PETALBURG_CITY_GYM + warp_def 6, 59, 3, 14, MAP_PETALBURG_CITY_GYM + warp_def 1, 72, 3, 15, MAP_PETALBURG_CITY_GYM + warp_def 2, 72, 3, 15, MAP_PETALBURG_CITY_GYM + warp_def 7, 40, 3, 24, MAP_PETALBURG_CITY_GYM + warp_def 1, 53, 3, 26, MAP_PETALBURG_CITY_GYM + warp_def 7, 53, 3, 28, MAP_PETALBURG_CITY_GYM + warp_def 1, 66, 3, 30, MAP_PETALBURG_CITY_GYM + warp_def 1, 20, 3, 20, MAP_PETALBURG_CITY_GYM + warp_def 2, 20, 3, 20, MAP_PETALBURG_CITY_GYM + warp_def 7, 20, 3, 21, MAP_PETALBURG_CITY_GYM + warp_def 6, 20, 3, 21, MAP_PETALBURG_CITY_GYM + warp_def 1, 33, 3, 22, MAP_PETALBURG_CITY_GYM + warp_def 2, 33, 3, 22, MAP_PETALBURG_CITY_GYM + warp_def 7, 33, 3, 23, MAP_PETALBURG_CITY_GYM + warp_def 6, 33, 3, 23, MAP_PETALBURG_CITY_GYM + warp_def 7, 14, 3, 34, MAP_PETALBURG_CITY_GYM + warp_def 1, 27, 3, 36, MAP_PETALBURG_CITY_GYM + warp_def 1, 7, 3, 32, MAP_PETALBURG_CITY_GYM + warp_def 2, 7, 3, 32, MAP_PETALBURG_CITY_GYM + warp_def 7, 7, 3, 33, MAP_PETALBURG_CITY_GYM + warp_def 6, 7, 3, 33, MAP_PETALBURG_CITY_GYM PetalburgCity_Gym_MapBGEvents:: @ 8387388 bg_event 1, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_154B73 diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/events/PetalburgCity_House1.inc index 2d6a28056..9faa2873a 100644 --- a/data/maps/events/PetalburgCity_House1.inc +++ b/data/maps/events/PetalburgCity_House1.inc @@ -3,8 +3,8 @@ PetalburgCity_House1_MapObjects:: @ 8387444 object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_House1_EventScript_1551DF, 0, 0, 0 PetalburgCity_House1_MapWarps:: @ 8387474 - warp_def 3, 8, 0, 0, PetalburgCity - warp_def 4, 8, 0, 0, PetalburgCity + warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY + warp_def 4, 8, 0, 0, MAP_PETALBURG_CITY PetalburgCity_House1_MapEvents:: @ 8387484 map_events PetalburgCity_House1_MapObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/events/PetalburgCity_House2.inc index 0797b9bab..29a2226d1 100644 --- a/data/maps/events/PetalburgCity_House2.inc +++ b/data/maps/events/PetalburgCity_House2.inc @@ -3,8 +3,8 @@ PetalburgCity_House2_MapObjects:: @ 8387498 object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_House2_EventScript_1551FB, 0, 0, 0 PetalburgCity_House2_MapWarps:: @ 83874C8 - warp_def 3, 7, 0, 4, PetalburgCity - warp_def 4, 7, 0, 4, PetalburgCity + warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY + warp_def 4, 7, 0, 4, MAP_PETALBURG_CITY PetalburgCity_House2_MapEvents:: @ 83874D8 map_events PetalburgCity_House2_MapObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/events/PetalburgCity_Mart.inc index 2fbed4b9d..358618d7e 100644 --- a/data/maps/events/PetalburgCity_Mart.inc +++ b/data/maps/events/PetalburgCity_Mart.inc @@ -5,8 +5,8 @@ PetalburgCity_Mart_MapObjects:: @ 8387614 object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15531A, 0, 0, 0 PetalburgCity_Mart_MapWarps:: @ 8387674 - warp_def 3, 7, 0, 5, PetalburgCity - warp_def 4, 7, 0, 5, PetalburgCity + warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY + warp_def 4, 7, 0, 5, MAP_PETALBURG_CITY PetalburgCity_Mart_MapEvents:: @ 8387684 map_events PetalburgCity_Mart_MapObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc index 5fb3186e5..8bdc1e1bf 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc +++ b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc @@ -6,9 +6,9 @@ PetalburgCity_PokemonCenter_1F_MapObjects:: @ 83874EC object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155233, 0, 0, 0 PetalburgCity_PokemonCenter_1F_MapWarps:: @ 8387564 - warp_def 7, 8, 3, 3, PetalburgCity - warp_def 6, 8, 3, 3, PetalburgCity - warp_def 1, 6, 4, 0, PetalburgCity_PokemonCenter_2F + warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY + warp_def 6, 8, 3, 3, MAP_PETALBURG_CITY + warp_def 1, 6, 4, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_2F PetalburgCity_PokemonCenter_1F_MapEvents:: @ 838757C map_events PetalburgCity_PokemonCenter_1F_MapObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc index eab3d7dd5..cdbefe565 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc +++ b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ PetalburgCity_PokemonCenter_2F_MapObjects:: @ 8387590 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A9, 0, 0, 0 PetalburgCity_PokemonCenter_2F_MapWarps:: @ 83875D8 - warp_def 1, 5, 4, 2, PetalburgCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM PetalburgCity_PokemonCenter_2F_MapEvents:: @ 8387600 map_events PetalburgCity_PokemonCenter_2F_MapObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/events/PetalburgCity_WallysHouse.inc index 724b84f0f..4485f518d 100644 --- a/data/maps/events/PetalburgCity_WallysHouse.inc +++ b/data/maps/events/PetalburgCity_WallysHouse.inc @@ -3,8 +3,8 @@ PetalburgCity_WallysHouse_MapObjects:: @ 8387114 object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_154445, 0, 0, 0 PetalburgCity_WallysHouse_MapWarps:: @ 8387144 - warp_def 3, 7, 0, 1, PetalburgCity - warp_def 4, 7, 0, 1, PetalburgCity + warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY + warp_def 4, 7, 0, 1, MAP_PETALBURG_CITY PetalburgCity_WallysHouse_MapEvents:: @ 8387154 map_events PetalburgCity_WallysHouse_MapObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc index cb0ff7ca1..e80b33c13 100644 --- a/data/maps/events/PetalburgWoods.inc +++ b/data/maps/events/PetalburgWoods.inc @@ -1,25 +1,25 @@ PetalburgWoods_MapObjects:: @ 838C14C - object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 - object_event 3, 241, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 725, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 724, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 45, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, 1056, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 35, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, 1055, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B176C, 1058, 0, 0 + object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 + object_event 3, 241, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_DEVON_PETALBURG_WOODS, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 45, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, FLAG_ITEM_PETALBURG_WOODS_2, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 35, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, FLAG_ITEM_PETALBURG_WOODS_1, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B176C, FLAG_ITEM_PETALBURG_WOODS_3, 0, 0 object_event 8, MAP_OBJ_GFX_BOY_2, 0, 15, 0, 19, 0, 3, 3, 33, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CECA, 0, 0, 0 object_event 9, MAP_OBJ_GFX_BUG_CATCHER, 0, 7, 0, 32, 0, 3, 22, 0, 0, 1, 0, 3, 0, PetalburgWoods_EventScript_15CF27, 0, 0, 0 object_event 10, MAP_OBJ_GFX_BUG_CATCHER, 0, 4, 0, 14, 0, 3, 20, 0, 0, 1, 0, 3, 0, PetalburgWoods_EventScript_15CF3E, 0, 0, 0 object_event 11, MAP_OBJ_GFX_BOY_3, 0, 30, 0, 34, 0, 3, 2, 18, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CED3, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1779, 1117, 0, 0 + object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1779, FLAG_ITEM_PETALBURG_WOODS_4, 0, 0 object_event 13, MAP_OBJ_GFX_GIRL_2, 0, 33, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CEDC, 0, 0, 0 PetalburgWoods_MapWarps:: @ 838C284 - warp_def 14, 5, 0, 2, Route104 - warp_def 15, 5, 0, 3, Route104 - warp_def 16, 38, 0, 4, Route104 - warp_def 17, 38, 0, 5, Route104 - warp_def 36, 38, 0, 6, Route104 - warp_def 37, 38, 0, 7, Route104 + warp_def 14, 5, 0, 2, MAP_ROUTE104 + warp_def 15, 5, 0, 3, MAP_ROUTE104 + warp_def 16, 38, 0, 4, MAP_ROUTE104 + warp_def 17, 38, 0, 5, MAP_ROUTE104 + warp_def 36, 38, 0, 6, MAP_ROUTE104 + warp_def 37, 38, 0, 7, MAP_ROUTE104 PetalburgWoods_MapCoordEvents:: @ 838C2B4 coord_event 26, 23, 3, 0, 0x4098, 0, 0, PetalburgWoods_EventScript_15CCA8 diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc index 7062f61ea..df26386b3 100644 --- a/data/maps/events/RecordCorner.inc +++ b/data/maps/events/RecordCorner.inc @@ -2,10 +2,10 @@ RecordCorner_MapObjects:: @ 839139C object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 10, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, RecordCorner_EventScript_1A44BC, 0, 0, 0 RecordCorner_MapWarps:: @ 83913B4 - warp_def 8, 9, 3, 127, NONE - warp_def 9, 9, 3, 127, NONE - warp_def 11, 9, 3, 127, NONE - warp_def 10, 9, 3, 127, NONE + warp_def 8, 9, 3, 127, MAP_NONE + warp_def 9, 9, 3, 127, MAP_NONE + warp_def 11, 9, 3, 127, MAP_NONE + warp_def 10, 9, 3, 127, MAP_NONE RecordCorner_MapCoordEvents:: @ 83913D4 coord_event 6, 4, 3, 0, 0x4000, 0, 0, RecordCorner_EventScript_1A4418 diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc index bad4e3ba9..a527ada51 100644 --- a/data/maps/events/Route101.inc +++ b/data/maps/events/Route101.inc @@ -1,10 +1,10 @@ Route101_MapObjects:: @ 83810BC object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 16, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA64, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 9, 0, 13, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0x0, 720, 0, 0 - object_event 3, MAP_OBJ_GFX_BIRCHS_BAG, 0, 7, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA7F, 700, 0, 0 - object_event 4, MAP_OBJ_GFX_POOCHYENA, 0, 10, 0, 13, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0x0, 750, 0, 0 - object_event 5, MAP_OBJ_GFX_PROF_BIRCH, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_1A037F, 897, 0, 0 - object_event 6, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route101_EventScript_14EA6D, 991, 0, 0 + object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 9, 0, 13, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_BATTLE_POOCHYENA, 0, 0 + object_event 3, MAP_OBJ_GFX_BIRCHS_BAG, 0, 7, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA7F, FLAG_HIDE_BIRCH_STARTERS_BAG, 0, 0 + object_event 4, MAP_OBJ_GFX_POOCHYENA, 0, 10, 0, 13, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_POOCHYENA_ROUTE101, 0, 0 + object_event 5, MAP_OBJ_GFX_PROF_BIRCH, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE101, 0, 0 + object_event 6, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route101_EventScript_14EA6D, FLAG_HIDE_BOY_ROUTE101, 0, 0 Route101_MapCoordEvents:: @ 838114C coord_event 10, 19, 3, 0, 0x4060, 1, 0, Route101_EventScript_14E948 diff --git a/data/maps/events/Route102.inc b/data/maps/events/Route102.inc index 7ffa0e191..2736c7a61 100644 --- a/data/maps/events/Route102.inc +++ b/data/maps/events/Route102.inc @@ -4,7 +4,7 @@ Route102_MapObjects:: @ 83811FC object_event 3, MAP_OBJ_GFX_BUG_CATCHER, 0, 25, 0, 15, 0, 3, 7, 0, 0, 1, 0, 2, 0, Route102_EventScript_14EB3C, 0, 0, 0 object_event 4, MAP_OBJ_GFX_LASS, 0, 8, 0, 7, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route102_EventScript_14EB53, 0, 0, 0 object_event 5, MAP_OBJ_GFX_BOY_1, 0, 37, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route102_EventScript_14EAF5, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 15, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route102_EventScript_1B1439, 1000, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 15, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route102_EventScript_1B1439, FLAG_ITEM_ROUTE102_1, 0, 0 object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 2, 0, 3, 12, 0, 0, 0, 0, 2, 0, S_BerryTree, 0, 0, 0 object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 2, 0, 3, 12, 0, 0, 0, 0, 1, 0, S_BerryTree, 0, 0, 0 object_event 9, MAP_OBJ_GFX_YOUNGSTER, 0, 19, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route102_EventScript_14EB6A, 0, 0, 0 diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc index 462fe1a3b..580e8a91b 100644 --- a/data/maps/events/Route103.inc +++ b/data/maps/events/Route103.inc @@ -1,6 +1,6 @@ Route103_MapObjects:: @ 8381300 object_event 1, MAP_OBJ_GFX_MAN_4, 0, 49, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route103_EventScript_14ED82, 0, 0, 0 - object_event 2, 240, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route103_EventScript_14EB92, 723, 0, 0 + object_event 2, 240, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route103_EventScript_14EB92, FLAG_HIDE_RIVAL_ROUTE103, 0, 0 object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 71, 0, 10, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route103_EventScript_14ED94, 0, 0, 0 object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDF1, 0, 0, 0 object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDAB, 0, 0, 0 @@ -9,11 +9,11 @@ Route103_MapObjects:: @ 8381300 object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 59, 0, 5, 0, 3, 12, 0, 0, 0, 0, 6, 0, S_BerryTree, 0, 0, 0 object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 60, 0, 5, 0, 3, 12, 0, 0, 0, 0, 7, 0, S_BerryTree, 0, 0, 0 object_event 10, MAP_OBJ_GFX_BOY_1, 0, 20, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, Route103_EventScript_14ED79, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route103_EventScript_1A037F, 898, 0, 0 + object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route103_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE103, 0, 0 object_event 12, MAP_OBJ_GFX_MAN_3, 0, 56, 0, 12, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route103_EventScript_14EE4E, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 63, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B1446, 1114, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 + object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 63, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B1446, FLAG_ITEM_ROUTE103_1, 0, 0 + object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 Route103_MapBGEvents:: @ 8381468 bg_event 11, 9, 0, 0, 0, Route103_EventScript_14ED8B diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc index b4c8a2834..f7034ff26 100644 --- a/data/maps/events/Route104.inc +++ b/data/maps/events/Route104.inc @@ -5,8 +5,8 @@ Route104_MapObjects:: @ 8381488 object_event 4, MAP_OBJ_GFX_BOY_1, 0, 27, 0, 63, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route104_EventScript_14EF81, 0, 0, 0 object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 30, 0, 50, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF8A, 0, 0, 0 object_event 6, MAP_OBJ_GFX_GIRL_3, 0, 28, 0, 74, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route104_EventScript_14EFCC, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 54, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, 742, 0, 0 - object_event 8, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 51, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 738, 0, 0 + object_event 7, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 54, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104, 0, 0 + object_event 8, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 51, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_ROUTE104, 0, 0 object_event 9, MAP_OBJ_GFX_FISHERMAN, 0, 29, 0, 8, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F172, 0, 0, 0 object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 6, 0, 3, 12, 0, 0, 0, 0, 8, 0, S_BerryTree, 0, 0, 0 object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 6, 0, 3, 12, 0, 0, 0, 0, 9, 0, S_BerryTree, 0, 0, 0 @@ -19,28 +19,28 @@ Route104_MapObjects:: @ 8381488 object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 23, 0, 3, 12, 0, 0, 0, 0, 4, 0, S_BerryTree, 0, 0, 0 object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 24, 0, 3, 12, 0, 0, 0, 0, 75, 0, S_BerryTree, 0, 0, 0 object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 25, 0, 3, 12, 0, 0, 0, 0, 76, 0, S_BerryTree, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route104_EventScript_1B1453, 1002, 0, 0 - object_event 22, MAP_OBJ_GFX_WOMAN_7, 0, 8, 0, 19, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_EventScript_14EF09, 906, 0, 0 + object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route104_EventScript_1B1453, FLAG_ITEM_ROUTE104_1, 0, 0 + object_event 22, MAP_OBJ_GFX_WOMAN_7, 0, 8, 0, 19, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_EventScript_14EF09, FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE, 0, 0 object_event 23, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F25A, 0, 0, 0 object_event 24, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F279, 0, 0, 0 object_event 25, MAP_OBJ_GFX_BOY_4, 0, 11, 0, 44, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route104_EventScript_14F1DE, 0, 0, 0 object_event 26, MAP_OBJ_GFX_WOMAN_3, 0, 22, 0, 25, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route104_EventScript_14F21C, 0, 0, 0 - object_event 27, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B1460, 1057, 0, 0 + object_event 27, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B1460, FLAG_ITEM_ROUTE104_2, 0, 0 object_event 28, MAP_OBJ_GFX_YOUNGSTER, 0, 18, 0, 67, 0, 3, 46, 101, 0, 1, 0, 2, 0, Route104_EventScript_14F189, 0, 0, 0 - object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B146D, 1115, 0, 0 - object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 - object_event 31, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B147A, 1135, 0, 0 + object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B146D, FLAG_ITEM_ROUTE104_3, 0, 0 + object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 31, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B147A, FLAG_ITEM_ROUTE104_4, 0, 0 object_event 32, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF93, 0, 0, 0 Route104_MapWarps:: @ 8381788 - warp_def 17, 50, 0, 0, Route104_MrBrineysHouse - warp_def 5, 18, 0, 0, Route104_PrettyPetalFlowerShop - warp_def 10, 30, 3, 0, PetalburgWoods - warp_def 11, 30, 3, 1, PetalburgWoods - warp_def 10, 38, 3, 2, PetalburgWoods - warp_def 11, 38, 3, 3, PetalburgWoods - warp_def 32, 42, 3, 4, PetalburgWoods - warp_def 33, 42, 3, 5, PetalburgWoods + warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE + warp_def 5, 18, 0, 0, MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP + warp_def 10, 30, 3, 0, MAP_PETALBURG_WOODS + warp_def 11, 30, 3, 1, MAP_PETALBURG_WOODS + warp_def 10, 38, 3, 2, MAP_PETALBURG_WOODS + warp_def 11, 38, 3, 3, MAP_PETALBURG_WOODS + warp_def 32, 42, 3, 4, MAP_PETALBURG_WOODS + warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS Route104_MapBGEvents:: @ 83817C8 bg_event 20, 50, 0, 0, 0, Route104_EventScript_14EF54 diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/events/Route104_MrBrineysHouse.inc index d8b2ff252..d77b2977a 100644 --- a/data/maps/events/Route104_MrBrineysHouse.inc +++ b/data/maps/events/Route104_MrBrineysHouse.inc @@ -1,10 +1,10 @@ Route104_MrBrineysHouse_MapObjects:: @ 838B654 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 3, 0, 3, 50, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BCEB, 739, 0, 0 - object_event 2, MAP_OBJ_GFX_WINGULL, 0, 6, 0, 3, 0, 3, 8, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, 881, 0, 0 + object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 3, 0, 3, 50, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BCEB, FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE, 0, 0 + object_event 2, MAP_OBJ_GFX_WINGULL, 0, 6, 0, 3, 0, 3, 8, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, FLAG_HIDE_PEEKO_BRINEY_HOUSE, 0, 0 Route104_MrBrineysHouse_MapWarps:: @ 838B684 - warp_def 5, 8, 0, 0, Route104 - warp_def 6, 8, 0, 0, Route104 + warp_def 5, 8, 0, 0, MAP_ROUTE104 + warp_def 6, 8, 0, 0, MAP_ROUTE104 Route104_MrBrineysHouse_MapEvents:: @ 838B694 map_events Route104_MrBrineysHouse_MapObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrettyPetalFlowerShop.inc index 0c540e940..c02950add 100644 --- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc +++ b/data/maps/events/Route104_PrettyPetalFlowerShop.inc @@ -4,8 +4,8 @@ Route104_PrettyPetalFlowerShop_MapObjects:: @ 838B6A8 object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 11, 0, 6, 0, 4, 2, 34, 0, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEDA, 0, 0, 0 Route104_PrettyPetalFlowerShop_MapWarps:: @ 838B6F0 - warp_def 2, 8, 0, 1, Route104 - warp_def 3, 8, 0, 1, Route104 + warp_def 2, 8, 0, 1, MAP_ROUTE104 + warp_def 3, 8, 0, 1, MAP_ROUTE104 Route104_PrettyPetalFlowerShop_MapEvents:: @ 838B700 map_events Route104_PrettyPetalFlowerShop_MapObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route104_Prototype.inc b/data/maps/events/Route104_Prototype.inc index 6748fe0ed..80dcf5108 100644 --- a/data/maps/events/Route104_Prototype.inc +++ b/data/maps/events/Route104_Prototype.inc @@ -13,7 +13,7 @@ Route104_Prototype_MapObjects:: @ 8391F2C object_event 12, MAP_OBJ_GFX_MAN_3, 0, 11, 0, 28, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route104_Prototype_EventScript_160D0A, 0, 0, 0 Route104_Prototype_MapWarps:: @ 839204C - warp_def 5, 24, 0, 0, Route104_PrototypePrettyPetalFlowerShop + warp_def 5, 24, 0, 0, MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP Route104_Prototype_MapBGEvents:: @ 8392054 bg_event 7, 26, 0, 0, 0, Route104_Prototype_EventScript_160D1C diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc index 96cac1e71..4ec99895c 100644 --- a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc +++ b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc @@ -2,8 +2,8 @@ Route104_PrototypePrettyPetalFlowerShop_MapObjects:: @ 8392080 object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route104_PrototypePrettyPetalFlowerShop_EventScript_160DC1, 0, 0, 0 Route104_PrototypePrettyPetalFlowerShop_MapWarps:: @ 8392098 - warp_def 2, 8, 0, 0, Route104_Prototype - warp_def 3, 8, 0, 0, Route104_Prototype + warp_def 2, 8, 0, 0, MAP_ROUTE104_PROTOTYPE + warp_def 3, 8, 0, 0, MAP_ROUTE104_PROTOTYPE Route104_PrototypePrettyPetalFlowerShop_MapEvents:: @ 83920A8 map_events Route104_PrototypePrettyPetalFlowerShop_MapObjects, Route104_PrototypePrettyPetalFlowerShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route105.inc b/data/maps/events/Route105.inc index 5f7f6c13d..45c0866e3 100644 --- a/data/maps/events/Route105.inc +++ b/data/maps/events/Route105.inc @@ -3,11 +3,11 @@ Route105_MapObjects:: @ 8381854 object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 10, 0, 44, 0, 1, 27, 7, 0, 1, 0, 3, 0, Route105_EventScript_14F2E9, 0, 0, 0 object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 26, 0, 36, 0, 1, 25, 112, 0, 1, 0, 3, 0, Route105_EventScript_14F300, 0, 0, 0 object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 19, 0, 9, 0, 1, 24, 80, 0, 1, 0, 3, 0, Route105_EventScript_14F317, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 73, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route105_EventScript_1B1487, 1003, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 73, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route105_EventScript_1B1487, FLAG_ITEM_ROUTE105_1, 0, 0 object_event 6, MAP_OBJ_GFX_HIKER, 0, 12, 0, 51, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route105_EventScript_14F2BB, 0, 0, 0 Route105_MapWarps:: @ 83818E4 - warp_def 9, 20, 0, 0, IslandCave + warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE Route105_MapBGEvents:: @ 83818EC bg_event 15, 68, 3, 7, 0, ITEM_HEART_SCALE, 89, 0 diff --git a/data/maps/events/Route106.inc b/data/maps/events/Route106.inc index 51c093fe5..991e12f74 100644 --- a/data/maps/events/Route106.inc +++ b/data/maps/events/Route106.inc @@ -3,10 +3,10 @@ Route106_MapObjects:: @ 838190C object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 18, 0, 5, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route106_EventScript_14F34F, 0, 0, 0 object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 51, 0, 14, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route106_EventScript_14F366, 0, 0, 0 object_event 4, MAP_OBJ_GFX_FISHERMAN, 0, 65, 0, 14, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route106_EventScript_14F3A4, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route106_EventScript_1B1494, 1004, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route106_EventScript_1B1494, FLAG_ITEM_ROUTE106_1, 0, 0 Route106_MapWarps:: @ 8381984 - warp_def 48, 16, 0, 0, GraniteCave_1F + warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F Route106_MapBGEvents:: @ 838198C bg_event 41, 11, 3, 7, 0, ITEM_POKE_BALL, 63, 0 diff --git a/data/maps/events/Route108.inc b/data/maps/events/Route108.inc index 1f49a1e0c..ad695e8b9 100644 --- a/data/maps/events/Route108.inc +++ b/data/maps/events/Route108.inc @@ -5,7 +5,7 @@ Route108_MapObjects:: @ 8381A74 object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 36, 0, 12, 0, 1, 51, 54, 0, 1, 0, 3, 0, Route108_EventScript_14F4BB, 0, 0, 0 Route108_MapWarps:: @ 8381AD4 - warp_def 29, 6, 3, 0, AbandonedShip_Deck + warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK Route108_MapBGEvents:: @ 8381ADC bg_event 38, 14, 3, 7, 0, ITEM_RARE_CANDY, 86, 0 diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc index 511579650..5924bc0d2 100644 --- a/data/maps/events/Route109.inc +++ b/data/maps/events/Route109.inc @@ -1,6 +1,6 @@ Route109_MapObjects:: @ 8381AFC - object_event 1, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 0, 26, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, 744, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 21, 0, 24, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route109_EventScript_14F680, 741, 0, 0 + object_event 1, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 0, 26, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 21, 0, 24, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route109_EventScript_14F680, FLAG_HIDE_MR_BRINEY_ROUTE109, 0, 0 object_event 3, MAP_OBJ_GFX_SWIMMER_M, 0, 12, 0, 36, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route109_EventScript_14F7AD, 0, 0, 0 object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 25, 0, 42, 0, 3, 15, 0, 0, 1, 0, 5, 0, Route109_EventScript_14F7C4, 0, 0, 0 object_event 5, MAP_OBJ_GFX_SAILOR, 0, 19, 0, 19, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route109_EventScript_14F7DB, 0, 0, 0 @@ -8,7 +8,7 @@ Route109_MapObjects:: @ 8381AFC object_event 7, MAP_OBJ_GFX_TUBER_M, 0, 21, 0, 11, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F809, 0, 0, 0 object_event 8, MAP_OBJ_GFX_TUBER_F, 0, 28, 0, 8, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route109_EventScript_14F847, 0, 0, 0 object_event 9, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route109_EventScript_14F705, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 48, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route109_EventScript_1B14A1, 1005, 0, 0 + object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 48, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route109_EventScript_1B14A1, FLAG_ITEM_ROUTE109_1, 0, 0 object_event 11, MAP_OBJ_GFX_TUBER_F, 0, 29, 0, 32, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F89C, 0, 0, 0 object_event 12, MAP_OBJ_GFX_TUBER_F, 0, 28, 0, 31, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F885, 0, 0, 0 object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 15, 0, 52, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route109_EventScript_14F8B3, 0, 0, 0 @@ -21,7 +21,7 @@ Route109_MapObjects:: @ 8381AFC object_event 20, MAP_OBJ_GFX_ZIGZAGOON, 0, 32, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F788, 0, 0, 0 Route109_MapWarps:: @ 8381CDC - warp_def 12, 5, 0, 0, Route109_SeashoreHouse + warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE Route109_MapBGEvents:: @ 8381CE4 bg_event 15, 5, 0, 0, 0, Route109_EventScript_14F79B diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/events/Route109_SeashoreHouse.inc index 5036df1e7..abaf7abcc 100644 --- a/data/maps/events/Route109_SeashoreHouse.inc +++ b/data/maps/events/Route109_SeashoreHouse.inc @@ -5,8 +5,8 @@ Route109_SeashoreHouse_MapObjects:: @ 83920BC object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 10, 0, 5, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route109_SeashoreHouse_EventScript_160ED3, 0, 0, 0 Route109_SeashoreHouse_MapWarps:: @ 839211C - warp_def 6, 9, 0, 0, Route109 - warp_def 7, 9, 0, 0, Route109 + warp_def 6, 9, 0, 0, MAP_ROUTE109 + warp_def 7, 9, 0, 0, MAP_ROUTE109 Route109_SeashoreHouse_MapEvents:: @ 839212C map_events Route109_SeashoreHouse_MapObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index 3db4ce8e8..91531dbe5 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -17,27 +17,27 @@ Route110_MapObjects:: @ 8381D58 object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 11, 0, 3, 12, 0, 0, 0, 0, 16, 0, S_BerryTree, 0, 0, 0 object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 11, 0, 3, 12, 0, 0, 0, 0, 17, 0, S_BerryTree, 0, 0, 0 object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 11, 0, 3, 12, 0, 0, 0, 0, 18, 0, S_BerryTree, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 69, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14BB, 1007, 0, 0 - object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14AE, 1006, 0, 0 + object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 69, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14BB, FLAG_ITEM_ROUTE110_2, 0, 0 + object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14AE, FLAG_ITEM_ROUTE110_1, 0, 0 object_event 21, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 0, 92, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14FA53, 0, 0, 0 - object_event 22, 241, 0, 7, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F946, 900, 0, 0 - object_event 23, 241, 0, 8, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F95C, 900, 0, 0 - object_event 24, 241, 0, 9, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F972, 900, 0, 0 - object_event 25, 241, 0, 10, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F988, 900, 0, 0 - object_event 26, 241, 0, 8, 0, 82, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 900, 0, 0 + object_event 22, 241, 0, 7, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F946, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 23, 241, 0, 8, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F95C, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 24, 241, 0, 9, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F972, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 25, 241, 0, 10, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F988, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 26, 241, 0, 8, 0, 82, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 object_event 27, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 0, 78, 0, 4, 51, 23, 0, 1, 0, 2, 0, Route110_EventScript_14FB11, 0, 0, 0 - object_event 28, 240, 0, 34, 0, 54, 0, 3, 14, 0, 0, 0, 0, 0, 0, 0x0, 919, 0, 0 - object_event 29, 243, 0, 34, 0, 54, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 922, 0, 0 + object_event 28, 240, 0, 34, 0, 54, 0, 3, 14, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE110, 0, 0 + object_event 29, 243, 0, 34, 0, 54, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110, 0, 0 object_event 30, MAP_OBJ_GFX_YOUNGSTER, 0, 33, 0, 69, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FC10, 0, 0, 0 object_event 31, MAP_OBJ_GFX_WOMAN_2, 0, 11, 0, 73, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route110_EventScript_14FBD2, 0, 0, 0 Route110_MapWarps:: @ 8382040 - warp_def 35, 24, 3, 0, NewMauville_Entrance - warp_def 11, 66, 0, 0, Route110_TrickHouseEntrance - warp_def 15, 16, 0, 0, Route110_SeasideCyclingRoadNorthEntrance - warp_def 18, 16, 0, 2, Route110_SeasideCyclingRoadNorthEntrance - warp_def 16, 88, 0, 0, Route110_SeasideCyclingRoadSouthEntrance - warp_def 19, 88, 0, 2, Route110_SeasideCyclingRoadSouthEntrance + warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE + warp_def 11, 66, 0, 0, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 15, 16, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE + warp_def 18, 16, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE + warp_def 16, 88, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE + warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE Route110_MapCoordEvents:: @ 8382070 coord_event 28, 92, 3, 0, 0x40a9, 2, 0, Route110_EventScript_14FC27 diff --git a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc index e1ca6b4de..9051ad929 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -2,10 +2,10 @@ Route110_SeasideCyclingRoadNorthEntrance_MapObjects:: @ 8392CAC object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB, 0, 0, 0 Route110_SeasideCyclingRoadNorthEntrance_MapWarps:: @ 8392CC4 - warp_def 1, 5, 0, 2, Route110 - warp_def 2, 5, 0, 2, Route110 - warp_def 12, 5, 0, 3, Route110 - warp_def 13, 5, 0, 3, Route110 + warp_def 1, 5, 0, 2, MAP_ROUTE110 + warp_def 2, 5, 0, 2, MAP_ROUTE110 + warp_def 12, 5, 0, 3, MAP_ROUTE110 + warp_def 13, 5, 0, 3, MAP_ROUTE110 Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents:: @ 8392CE4 coord_event 7, 4, 3, 0, 0x4001, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7 diff --git a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc index 24ae3600f..947cc714a 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -2,10 +2,10 @@ Route110_SeasideCyclingRoadSouthEntrance_MapObjects:: @ 8392C40 object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F, 0, 0, 0 Route110_SeasideCyclingRoadSouthEntrance_MapWarps:: @ 8392C58 - warp_def 1, 5, 0, 4, Route110 - warp_def 2, 5, 0, 4, Route110 - warp_def 12, 5, 0, 5, Route110 - warp_def 13, 5, 0, 5, Route110 + warp_def 1, 5, 0, 4, MAP_ROUTE110 + warp_def 2, 5, 0, 4, MAP_ROUTE110 + warp_def 12, 5, 0, 5, MAP_ROUTE110 + warp_def 13, 5, 0, 5, MAP_ROUTE110 Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents:: @ 8392C78 coord_event 7, 4, 3, 0, 0x4001, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B diff --git a/data/maps/events/Route110_TrickHouseCorridor.inc b/data/maps/events/Route110_TrickHouseCorridor.inc index 105701e55..4b7e39efd 100644 --- a/data/maps/events/Route110_TrickHouseCorridor.inc +++ b/data/maps/events/Route110_TrickHouseCorridor.inc @@ -1,8 +1,8 @@ Route110_TrickHouseCorridor_MapWarps:: @ 8392228 - warp_def 13, 3, 3, 1, Route110_TrickHouseEnd - warp_def 14, 3, 3, 1, Route110_TrickHouseEnd - warp_def 4, 23, 3, 2, Route110_TrickHouseEntrance - warp_def 5, 23, 3, 2, Route110_TrickHouseEntrance + warp_def 13, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END + warp_def 14, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END + warp_def 4, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 5, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE Route110_TrickHouseCorridor_MapEvents:: @ 8392248 map_events 0x0, Route110_TrickHouseCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc index f050e3270..8c3cf7e11 100644 --- a/data/maps/events/Route110_TrickHouseEnd.inc +++ b/data/maps/events/Route110_TrickHouseEnd.inc @@ -1,9 +1,9 @@ Route110_TrickHouseEnd_MapObjects:: @ 83921D0 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, 899, 0, 0 + object_event 1, MAP_OBJ_GFX_MAN_1, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, FLAG_HIDE_TRICKMASTER_END, 0, 0 Route110_TrickHouseEnd_MapWarps:: @ 83921E8 - warp_def 10, 1, 3, 2, Route110_TrickHousePuzzle1 - warp_def 2, 1, 3, 0, Route110_TrickHouseCorridor + warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 + warp_def 2, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_CORRIDOR Route110_TrickHouseEnd_MapCoordEvents:: @ 83921F8 coord_event 2, 2, 3, 0, 0x4002, 0, 0, Route110_TrickHouseEnd_EventScript_161CA0 diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc index a1f67bd3d..9f6e305cc 100644 --- a/data/maps/events/Route110_TrickHouseEntrance.inc +++ b/data/maps/events/Route110_TrickHouseEntrance.inc @@ -1,10 +1,10 @@ Route110_TrickHouseEntrance_MapObjects:: @ 8392140 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 6, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, 872, 0, 0 + object_event 1, MAP_OBJ_GFX_MAN_1, 0, 6, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, FLAG_HIDE_TRICKMASTER_ENTRANCE, 0, 0 Route110_TrickHouseEntrance_MapWarps:: @ 8392158 - warp_def 5, 7, 3, 1, Route110 - warp_def 6, 7, 3, 1, Route110 - warp_def 5, 2, 3, 0, Route110_TrickHousePuzzle1 + warp_def 5, 7, 3, 1, MAP_ROUTE110 + warp_def 6, 7, 3, 1, MAP_ROUTE110 + warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 Route110_TrickHouseEntrance_MapCoordEvents:: @ 8392170 coord_event 4, 7, 3, 0, 0x40a5, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc index 3660e3c3f..61ae942ee 100644 --- a/data/maps/events/Route110_TrickHousePuzzle1.inc +++ b/data/maps/events/Route110_TrickHousePuzzle1.inc @@ -2,27 +2,27 @@ Route110_TrickHousePuzzle1_MapObjects:: @ 839225C object_event 1, MAP_OBJ_GFX_LASS, 0, 13, 0, 21, 0, 3, 9, 0, 0, 1, 0, 5, 0, Route110_TrickHousePuzzle1_EventScript_161D31, 0, 0, 0 object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 13, 0, 7, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle1_EventScript_161D48, 0, 0, 0 object_event 3, MAP_OBJ_GFX_LASS, 0, 3, 0, 8, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route110_TrickHousePuzzle1_EventScript_161D5F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 - object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 - object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 - object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0 - object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 23, 0, 0 - object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 22, 0, 0 - object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 21, 0, 0 - object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 25, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 24, 0, 0 - object_event 13, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 26, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 28, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 27, 0, 0 - object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 29, 0, 0 - object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 30, 0, 0 - object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, 1060, 0, 0 - object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 31, 0, 0 + object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 + object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 + object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0 + object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_17, 0, 0 + object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_16, 0, 0 + object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_15, 0, 0 + object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_19, 0, 0 + object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_18, 0, 0 + object_event 13, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1A, 0, 0 + object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1C, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1B, 0, 0 + object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1D, 0, 0 + object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1E, 0, 0 + object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1, 0, 0 + object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1F, 0, 0 Route110_TrickHousePuzzle1_MapWarps:: @ 8392424 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle1_MapBGEvents:: @ 839243C bg_event 14, 8, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_161D14 diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/events/Route110_TrickHousePuzzle2.inc index d77fd66a1..264465641 100644 --- a/data/maps/events/Route110_TrickHousePuzzle2.inc +++ b/data/maps/events/Route110_TrickHousePuzzle2.inc @@ -2,13 +2,13 @@ Route110_TrickHousePuzzle2_MapObjects:: @ 839245C object_event 1, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 13, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle2_EventScript_161E78, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 0, 10, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle2_EventScript_161E8F, 0, 0, 0 object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 9, 0, 7, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route110_TrickHousePuzzle2_EventScript_161EA6, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 19, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A6B, 1062, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A5E, 1061, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 19, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A6B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A5E, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_1, 0, 0 Route110_TrickHousePuzzle2_MapWarps:: @ 83924D4 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle2_MapCoordEvents:: @ 83924EC coord_event 14, 21, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DE0 diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc index abccae1d4..5c360ac6c 100644 --- a/data/maps/events/Route110_TrickHousePuzzle3.inc +++ b/data/maps/events/Route110_TrickHousePuzzle3.inc @@ -2,19 +2,19 @@ Route110_TrickHousePuzzle3_MapObjects:: @ 839254C object_event 1, MAP_OBJ_GFX_CAMPER, 0, 10, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162708, 0, 0, 0 object_event 2, MAP_OBJ_GFX_PICNICKER, 0, 1, 0, 13, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_16271F, 0, 0, 0 object_event 3, MAP_OBJ_GFX_HIKER, 0, 11, 0, 4, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162736, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, 1064, 0, 0 - object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, 1063, 0, 0 - object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 + object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2, 0, 0 + object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1, 0, 0 + object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 + object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0 Route110_TrickHousePuzzle3_MapWarps:: @ 8392654 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle3_MapCoordEvents:: @ 839266C coord_event 5, 20, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625AB diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc index ef450800d..6c630a082 100644 --- a/data/maps/events/Route110_TrickHousePuzzle4.inc +++ b/data/maps/events/Route110_TrickHousePuzzle4.inc @@ -2,23 +2,23 @@ Route110_TrickHousePuzzle4_MapObjects:: @ 83926FC object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 12, 0, 8, 0, 3, 9, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle4_EventScript_16276B, 0, 0, 0 object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 4, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle4_EventScript_162799, 0, 0, 0 object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 7, 0, 4, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle4_EventScript_162782, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, 1065, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0 - object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 - object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 - object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0 - object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0 - object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 26, 0, 0 - object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 27, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 + object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 + object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 + object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0 + object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0 + object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A, 0, 0 + object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B, 0, 0 Route110_TrickHousePuzzle4_MapWarps:: @ 8392864 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle4_MapBGEvents:: @ 839287C bg_event 0, 5, 3, 0, 0, Route110_TrickHousePuzzle4_EventScript_16274E diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/events/Route110_TrickHousePuzzle5.inc index be38ef452..ac40ffef4 100644 --- a/data/maps/events/Route110_TrickHousePuzzle5.inc +++ b/data/maps/events/Route110_TrickHousePuzzle5.inc @@ -6,9 +6,9 @@ Route110_TrickHousePuzzle5_MapObjects:: @ 839289C object_event 5, MAP_OBJ_GFX_MAN_1, 0, 1, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162876, 0, 0, 0 Route110_TrickHousePuzzle5_MapWarps:: @ 8392914 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle5_MapCoordEvents:: @ 839292C coord_event 8, 19, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_162897 diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/events/Route110_TrickHousePuzzle6.inc index 1e6c7869b..f01d5783d 100644 --- a/data/maps/events/Route110_TrickHousePuzzle6.inc +++ b/data/maps/events/Route110_TrickHousePuzzle6.inc @@ -2,12 +2,12 @@ Route110_TrickHousePuzzle6_MapObjects:: @ 8392A2C object_event 1, MAP_OBJ_GFX_PICNICKER, 0, 10, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle6_EventScript_163107, 0, 0, 0 object_event 2, MAP_OBJ_GFX_MAN_6, 0, 14, 0, 12, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle6_EventScript_16311E, 0, 0, 0 object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 0, 3, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route110_TrickHousePuzzle6_EventScript_163135, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_1B1A9F, 1067, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_1B1A9F, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_1, 0, 0 Route110_TrickHousePuzzle6_MapWarps:: @ 8392A8C - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle6_MapBGEvents:: @ 8392AA4 bg_event 13, 9, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_1630EA diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/events/Route110_TrickHousePuzzle7.inc index d5e4f14af..5beae5e18 100644 --- a/data/maps/events/Route110_TrickHousePuzzle7.inc +++ b/data/maps/events/Route110_TrickHousePuzzle7.inc @@ -2,12 +2,12 @@ Route110_TrickHousePuzzle7_MapObjects:: @ 8392AC4 object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 0, 3, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle7_EventScript_1633D6, 0, 0, 0 object_event 2, MAP_OBJ_GFX_LASS, 0, 14, 0, 3, 0, 3, 7, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle7_EventScript_163404, 0, 0, 0 object_event 3, MAP_OBJ_GFX_HEX_MANIAC, 0, 9, 0, 10, 0, 3, 23, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle7_EventScript_1633ED, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_1B1AAC, 1068, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_1B1AAC, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_1, 0, 0 Route110_TrickHousePuzzle7_MapWarps:: @ 8392B24 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle7_MapCoordEvents:: @ 8392B3C coord_event 9, 2, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632A8 diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/events/Route110_TrickHousePuzzle8.inc index accb0b3a2..2df410599 100644 --- a/data/maps/events/Route110_TrickHousePuzzle8.inc +++ b/data/maps/events/Route110_TrickHousePuzzle8.inc @@ -2,12 +2,12 @@ Route110_TrickHousePuzzle8_MapObjects:: @ 8392BA8 object_event 1, MAP_OBJ_GFX_MAN_4, 0, 12, 0, 21, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle8_EventScript_163439, 0, 0, 0 object_event 2, MAP_OBJ_GFX_MAN_4, 0, 12, 0, 11, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle8_EventScript_163467, 0, 0, 0 object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 11, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle8_EventScript_163450, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_1B1AB9, 1069, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_1B1AB9, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_1, 0, 0 Route110_TrickHousePuzzle8_MapWarps:: @ 8392C08 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 0, 0, Route110_TrickHouseEnd + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 0, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle8_MapBGEvents:: @ 8392C20 bg_event 7, 11, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_16341C diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index e36cd7e74..b282c7a8d 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -1,8 +1,8 @@ Route111_MapObjects:: @ 83821A0 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 13, 0, 114, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1501D1, 768, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 769, 0, 0 - object_event 3, MAP_OBJ_GFX_LASS, 0, 13, 0, 113, 0, 0, 8, 1, 0, 0, 0, 0, 0, 0x0, 770, 0, 0 - object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 771, 0, 0 + object_event 1, MAP_OBJ_GFX_MAN_1, 0, 13, 0, 114, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1501D1, FLAG_HIDE_VICTOR_WINSTRATE, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICTORIA_WINSTRATE, 0, 0 + object_event 3, MAP_OBJ_GFX_LASS, 0, 13, 0, 113, 0, 0, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VIVI_WINSTRATE, 0, 0 + object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICKI_WINSTRATE, 0, 0 object_event 5, MAP_OBJ_GFX_PICNICKER, 0, 28, 0, 51, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503BE, 0, 0, 0 object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 5, 0, 3, 12, 0, 0, 0, 0, 19, 0, S_BerryTree, 0, 0, 0 object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 5, 0, 3, 12, 0, 0, 0, 0, 20, 0, S_BerryTree, 0, 0, 0 @@ -11,35 +11,35 @@ Route111_MapObjects:: @ 83821A0 object_event 10, MAP_OBJ_GFX_HIKER, 0, 27, 0, 69, 0, 3, 50, 34, 0, 1, 0, 2, 0, Route111_EventScript_150403, 0, 0, 0 object_event 11, MAP_OBJ_GFX_CAMPER, 0, 21, 0, 47, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route111_EventScript_1503D5, 0, 0, 0 object_event 12, MAP_OBJ_GFX_PICNICKER, 0, 32, 0, 72, 0, 3, 24, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503EC, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE442, 796, 0, 0 - object_event 14, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE422, 796, 0, 0 - object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 - object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0 + object_event 13, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE442, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1, 0, 0 + object_event 14, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE422, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1, 0, 0 + object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 + object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 23, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route111_EventScript_1500C5, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 105, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14C8, 1008, 0, 0 + object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 105, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14C8, FLAG_ITEM_ROUTE111_1, 0, 0 object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, S_BerryTree, 0, 0, 0 object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, S_BerryTree, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE4E2, 799, 0, 0 - object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE502, 799, 0, 0 - object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE562, 903, 0, 0 - object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE582, 903, 0, 0 - object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 54, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14D5, 1009, 0, 0 - object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 114, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14E2, 1010, 0, 0 - object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 + object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE4E2, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 0, 0 + object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE502, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 0, 0 + object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3, 0, 0 + object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3, 0, 0 + object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 54, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14D5, FLAG_ITEM_ROUTE111_2, 0, 0 + object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 114, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14E2, FLAG_ITEM_ROUTE111_3, 0, 0 + object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 object_event 28, MAP_OBJ_GFX_PICNICKER, 0, 10, 0, 82, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route111_EventScript_150458, 0, 0, 0 object_event 29, MAP_OBJ_GFX_CAMPER, 0, 11, 0, 71, 0, 3, 22, 0, 0, 1, 0, 3, 0, Route111_EventScript_150441, 0, 0, 0 object_event 30, MAP_OBJ_GFX_BLACK_BELT, 0, 32, 0, 29, 0, 3, 28, 1, 0, 1, 0, 2, 0, Route111_EventScript_15046F, 0, 0, 0 object_event 31, MAP_OBJ_GFX_WOMAN_7, 0, 11, 0, 12, 0, 3, 7, 4, 0, 1, 0, 4, 0, Route111_EventScript_1504C4, 0, 0, 0 object_event 32, MAP_OBJ_GFX_MAN_4, 0, 9, 0, 27, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route111_EventScript_150486, 0, 0, 0 - object_event 33, MAP_OBJ_GFX_BOY_1, 0, 13, 0, 20, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route111_EventScript_1A3858, 960, 0, 0 - object_event 34, MAP_OBJ_GFX_FOSSIL, 0, 32, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150023, 963, 0, 0 - object_event 35, MAP_OBJ_GFX_FOSSIL, 0, 33, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150069, 964, 0, 0 + object_event 33, MAP_OBJ_GFX_BOY_1, 0, 13, 0, 20, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route111_EventScript_1A3858, FLAG_HIDE_SECRET_POWER_MAN, 0, 0 + object_event 34, MAP_OBJ_GFX_FOSSIL, 0, 32, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150023, FLAG_HIDE_ROOT_FOSSIL, 0, 0 + object_event 35, MAP_OBJ_GFX_FOSSIL, 0, 33, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150069, FLAG_HIDE_CLAW_FOSSIL, 0, 0 object_event 36, MAP_OBJ_GFX_MAN_5, 0, 20, 0, 114, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route111_EventScript_15039E, 0, 0, 0 Route111_MapWarps:: @ 8382500 - warp_def 13, 113, 0, 0, Route111_WinstrateFamilysHouse - warp_def 29, 87, 0, 0, DesertRuins - warp_def 26, 18, 0, 0, Route111_OldLadysRestStop + warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE + warp_def 29, 87, 0, 0, MAP_DESERT_RUINS + warp_def 26, 18, 0, 0, MAP_ROUTE111_OLD_LADYS_REST_STOP Route111_MapCoordEvents:: @ 8382518 coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/events/Route111_OldLadysRestStop.inc index c295aa0c9..fbd9b7ab1 100644 --- a/data/maps/events/Route111_OldLadysRestStop.inc +++ b/data/maps/events/Route111_OldLadysRestStop.inc @@ -2,8 +2,8 @@ Route111_OldLadysRestStop_MapObjects:: @ 838B798 object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 6, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_15BFDB, 0, 0, 0 Route111_OldLadysRestStop_MapWarps:: @ 838B7B0 - warp_def 3, 7, 0, 2, Route111 - warp_def 4, 7, 0, 2, Route111 + warp_def 3, 7, 0, 2, MAP_ROUTE111 + warp_def 4, 7, 0, 2, MAP_ROUTE111 Route111_OldLadysRestStop_MapEvents:: @ 838B7C0 map_events Route111_OldLadysRestStop_MapObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/events/Route111_WinstrateFamilysHouse.inc index 8cb265965..ef2286c97 100644 --- a/data/maps/events/Route111_WinstrateFamilysHouse.inc +++ b/data/maps/events/Route111_WinstrateFamilysHouse.inc @@ -5,8 +5,8 @@ Route111_WinstrateFamilysHouse_MapObjects:: @ 838B714 object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF95, 0, 0, 0 Route111_WinstrateFamilysHouse_MapWarps:: @ 838B774 - warp_def 3, 7, 0, 0, Route111 - warp_def 4, 7, 0, 0, Route111 + warp_def 3, 7, 0, 0, MAP_ROUTE111 + warp_def 4, 7, 0, 0, MAP_ROUTE111 Route111_WinstrateFamilysHouse_MapEvents:: @ 838B784 map_events Route111_WinstrateFamilysHouse_MapObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc index a4991a907..c739f9d0b 100644 --- a/data/maps/events/Route112.inc +++ b/data/maps/events/Route112.inc @@ -1,24 +1,24 @@ Route112_MapObjects:: @ 8382818 - object_event 1, 241, 0, 26, 0, 30, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route112_EventScript_150513, 819, 0, 0 + object_event 1, 241, 0, 26, 0, 30, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route112_EventScript_150513, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0 object_event 2, MAP_OBJ_GFX_HIKER, 0, 24, 0, 34, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route112_EventScript_150549, 0, 0, 0 object_event 3, MAP_OBJ_GFX_CAMPER, 0, 29, 0, 49, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route112_EventScript_15059E, 0, 0, 0 object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 22, 0, 46, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route112_EventScript_1505B5, 0, 0, 0 object_event 5, MAP_OBJ_GFX_HIKER, 0, 17, 0, 40, 0, 3, 16, 0, 0, 1, 0, 4, 0, Route112_EventScript_150560, 0, 0, 0 - object_event 6, 241, 0, 27, 0, 30, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_EventScript_15051C, 819, 0, 0 + object_event 6, 241, 0, 27, 0, 30, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_EventScript_15051C, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0 object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, S_BerryTree, 0, 0, 0 object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, S_BerryTree, 0, 0, 0 object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, S_BerryTree, 0, 0, 0 object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 6, 0, 3, 12, 0, 0, 0, 0, 21, 0, S_BerryTree, 0, 0, 0 object_event 11, MAP_OBJ_GFX_HIKER, 0, 8, 0, 50, 0, 3, 26, 48, 0, 0, 0, 0, 0, Route112_EventScript_150540, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 43, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route112_EventScript_1B14EF, 1011, 0, 0 + object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 43, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route112_EventScript_1B14EF, FLAG_ITEM_ROUTE112_1, 0, 0 Route112_MapWarps:: @ 8382938 - warp_def 28, 27, 0, 0, Route112_CableCarStation - warp_def 29, 27, 0, 1, Route112_CableCarStation - warp_def 6, 46, 3, 0, JaggedPass - warp_def 7, 46, 3, 1, JaggedPass - warp_def 11, 36, 0, 0, FieryPath - warp_def 22, 10, 0, 1, FieryPath + warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION + warp_def 29, 27, 0, 1, MAP_ROUTE112_CABLE_CAR_STATION + warp_def 6, 46, 3, 0, MAP_JAGGED_PASS + warp_def 7, 46, 3, 1, MAP_JAGGED_PASS + warp_def 11, 36, 0, 0, MAP_FIERY_PATH + warp_def 22, 10, 0, 1, MAP_FIERY_PATH Route112_MapBGEvents:: @ 8382968 bg_event 19, 44, 3, 0, 0, Route112_EventScript_15052E diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/events/Route112_CableCarStation.inc index 6ca18059b..cc2dfa38a 100644 --- a/data/maps/events/Route112_CableCarStation.inc +++ b/data/maps/events/Route112_CableCarStation.inc @@ -3,8 +3,8 @@ Route112_CableCarStation_MapObjects:: @ 838B7D4 object_event 2, MAP_OBJ_GFX_CABLE_CAR, 0, 6, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 Route112_CableCarStation_MapWarps:: @ 838B804 - warp_def 6, 11, 0, 0, Route112 - warp_def 7, 11, 0, 1, Route112 + warp_def 6, 11, 0, 0, MAP_ROUTE112 + warp_def 7, 11, 0, 1, MAP_ROUTE112 Route112_CableCarStation_MapEvents:: @ 838B814 map_events Route112_CableCarStation_MapObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc index ee145eb76..dec48e2e1 100644 --- a/data/maps/events/Route113.inc +++ b/data/maps/events/Route113.inc @@ -4,15 +4,15 @@ Route113_MapObjects:: @ 83829A0 object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 62, 0, 8, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route113_EventScript_15063B, 0, 0, 0 object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 21, 0, 11, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route113_EventScript_150652, 0, 0, 0 object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 51, 0, 11, 0, 3, 23, 0, 0, 1, 0, 2, 0, Route113_EventScript_150669, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 53, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B14FC, 1012, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 78, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B1509, 1013, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 53, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B14FC, FLAG_ITEM_ROUTE113_1, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 78, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B1509, FLAG_ITEM_ROUTE113_2, 0, 0 object_event 8, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 66, 0, 3, 0, 3, 63, 0, 0, 3, 0, 1, 0, Route113_EventScript_1506A7, 0, 0, 0 object_event 9, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 29, 0, 6, 0, 3, 63, 0, 0, 3, 0, 1, 0, Route113_EventScript_1506E5, 0, 0, 0 object_event 10, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 0, 6, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route113_EventScript_1506FC, 0, 0, 0 object_event 11, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 0, 6, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route113_EventScript_150717, 0, 0, 0 Route113_MapWarps:: @ 8382AA8 - warp_def 33, 5, 0, 0, Route113_GlassWorkshop + warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP Route113_MapCoordEvents:: @ 8382AB0 coord_event 19, 11, 3, 0, 8, 0, 0, 0x0 diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/events/Route113_GlassWorkshop.inc index 68b47709d..74953c4da 100644 --- a/data/maps/events/Route113_GlassWorkshop.inc +++ b/data/maps/events/Route113_GlassWorkshop.inc @@ -3,8 +3,8 @@ Route113_GlassWorkshop_MapObjects:: @ 8392D18 object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_1639D6, 0, 0, 0 Route113_GlassWorkshop_MapWarps:: @ 8392D48 - warp_def 3, 8, 0, 0, Route113 - warp_def 4, 8, 0, 0, Route113 + warp_def 3, 8, 0, 0, MAP_ROUTE113 + warp_def 4, 8, 0, 0, MAP_ROUTE113 Route113_GlassWorkshop_MapEvents:: @ 8392D58 map_events Route113_GlassWorkshop_MapObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc index 1f4d761e3..0e4097651 100644 --- a/data/maps/events/Route114.inc +++ b/data/maps/events/Route114.inc @@ -7,26 +7,26 @@ Route114_MapObjects:: @ 8382C48 object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 19, 0, 35, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route114_EventScript_150836, 0, 0, 0 object_event 7, MAP_OBJ_GFX_MANIAC, 0, 20, 0, 56, 0, 3, 7, 0, 0, 1, 0, 3, 0, Route114_EventScript_15084D, 0, 0, 0 object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 45, 0, 3, 12, 0, 0, 0, 0, 68, 0, S_BerryTree, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1516, 1014, 0, 0 - object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 37, 0, 4, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1523, 1015, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 + object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1516, FLAG_ITEM_ROUTE114_1, 0, 0 + object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 37, 0, 4, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1523, FLAG_ITEM_ROUTE114_2, 0, 0 + object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 object_event 12, MAP_OBJ_GFX_GENTLEMAN, 0, 19, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_150782, 0, 0, 0 object_event 13, MAP_OBJ_GFX_POOCHYENA, 0, 19, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_1507C3, 0, 0, 0 object_event 14, MAP_OBJ_GFX_MAN_5, 0, 27, 0, 42, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route114_EventScript_150733, 0, 0, 0 object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 23, 0, 20, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508E0, 0, 0, 0 object_event 16, MAP_OBJ_GFX_FISHERMAN, 0, 19, 0, 26, 0, 3, 9, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508C9, 0, 0, 0 object_event 17, MAP_OBJ_GFX_MAN_6, 0, 30, 0, 58, 0, 5, 23, 0, 0, 1, 0, 3, 0, Route114_EventScript_15088B, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0 - object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0 - object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0 - object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0 + object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 + object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 + object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0 + object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 object_event 22, MAP_OBJ_GFX_LASS, 0, 24, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_150912, 0, 0, 0 object_event 23, MAP_OBJ_GFX_LASS, 0, 23, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_1508F7, 0, 0, 0 Route114_MapWarps:: @ 8382E70 - warp_def 8, 63, 0, 0, MeteorFalls_1F_1R - warp_def 29, 5, 0, 0, Route114_FossilManiacsHouse - warp_def 27, 36, 0, 0, Route114_LanettesHouse + warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R + warp_def 29, 5, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE + warp_def 27, 36, 0, 0, MAP_ROUTE114_LANETTES_HOUSE Route114_MapBGEvents:: @ 8382E88 bg_event 7, 64, 0, 0, 0, Route114_EventScript_1507D6 diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/events/Route114_FossilManiacsHouse.inc index f7bf465e9..01fc6106f 100644 --- a/data/maps/events/Route114_FossilManiacsHouse.inc +++ b/data/maps/events/Route114_FossilManiacsHouse.inc @@ -2,9 +2,9 @@ Route114_FossilManiacsHouse_MapObjects:: @ 838B87C object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 3, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route114_FossilManiacsHouse_EventScript_15C1C3, 0, 0, 0 Route114_FossilManiacsHouse_MapWarps:: @ 838B894 - warp_def 4, 7, 0, 1, Route114 - warp_def 5, 7, 0, 1, Route114 - warp_def 4, 1, 0, 0, Route114_FossilManiacsTunnel + warp_def 4, 7, 0, 1, MAP_ROUTE114 + warp_def 5, 7, 0, 1, MAP_ROUTE114 + warp_def 4, 1, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL Route114_FossilManiacsHouse_MapBGEvents:: @ 838B8AC bg_event 5, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C1FC diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/events/Route114_FossilManiacsTunnel.inc index 89c231d7e..259445d43 100644 --- a/data/maps/events/Route114_FossilManiacsTunnel.inc +++ b/data/maps/events/Route114_FossilManiacsTunnel.inc @@ -2,8 +2,8 @@ Route114_FossilManiacsTunnel_MapObjects:: @ 838B8F0 object_event 1, MAP_OBJ_GFX_MANIAC, 0, 5, 0, 3, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route114_FossilManiacsTunnel_EventScript_15C20F, 0, 0, 0 Route114_FossilManiacsTunnel_MapWarps:: @ 838B908 - warp_def 6, 25, 3, 2, Route114_FossilManiacsHouse - warp_def 7, 25, 3, 2, Route114_FossilManiacsHouse + warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE + warp_def 7, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE Route114_FossilManiacsTunnel_MapEvents:: @ 838B918 map_events Route114_FossilManiacsTunnel_MapObjects, Route114_FossilManiacsTunnel_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/events/Route114_LanettesHouse.inc index e62f6e0ad..3c14720a6 100644 --- a/data/maps/events/Route114_LanettesHouse.inc +++ b/data/maps/events/Route114_LanettesHouse.inc @@ -1,9 +1,9 @@ Route114_LanettesHouse_MapObjects:: @ 838B92C - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, 870, 0, 0 + object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, FLAG_HIDE_LANETTE, 0, 0 Route114_LanettesHouse_MapWarps:: @ 838B944 - warp_def 5, 7, 0, 2, Route114 - warp_def 6, 7, 0, 2, Route114 + warp_def 5, 7, 0, 2, MAP_ROUTE114 + warp_def 6, 7, 0, 2, MAP_ROUTE114 Route114_LanettesHouse_MapBGEvents:: @ 838B954 bg_event 5, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C299 diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc index ddca08fad..83c7e97b8 100644 --- a/data/maps/events/Route115.inc +++ b/data/maps/events/Route115.inc @@ -8,16 +8,16 @@ Route115_MapObjects:: @ 8382F2C object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 15, 0, 50, 0, 3, 64, 0, 0, 1, 0, 3, 0, Route115_EventScript_1509DC, 0, 0, 0 object_event 8, MAP_OBJ_GFX_BLACK_BELT, 0, 17, 0, 17, 0, 3, 50, 51, 0, 1, 0, 2, 0, Route115_EventScript_150987, 0, 0, 0 object_event 9, MAP_OBJ_GFX_MANIAC, 0, 25, 0, 61, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route115_EventScript_150A1A, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 60, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B1530, 1016, 0, 0 - object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B153D, 1017, 0, 0 - object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B154A, 1018, 0, 0 + object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 60, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B1530, FLAG_ITEM_ROUTE115_1, 0, 0 + object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B153D, FLAG_ITEM_ROUTE115_2, 0, 0 + object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B154A, FLAG_ITEM_ROUTE115_3, 0, 0 object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 64, 0, 3, 12, 0, 0, 0, 0, 55, 0, S_BerryTree, 0, 0, 0 object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 65, 0, 3, 12, 0, 0, 0, 0, 56, 0, S_BerryTree, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 - object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B1557, 1118, 0, 0 + object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 + object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B1557, FLAG_ITEM_ROUTE115_4, 0, 0 Route115_MapWarps:: @ 83830AC - warp_def 27, 37, 0, 1, MeteorFalls_1F_1R + warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R Route115_MapBGEvents:: @ 83830B4 bg_event 32, 6, 0, 8, 0, 72, 0, 0 diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index b5f922524..77262f4c1 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -2,30 +2,30 @@ Route116_MapObjects:: @ 8383170 object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 2, 0, 3, 12, 0, 0, 0, 0, 25, 0, S_BerryTree, 0, 0, 0 object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 2, 0, 3, 12, 0, 0, 0, 0, 26, 0, S_BerryTree, 0, 0, 0 object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 12, 0, 7, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route116_EventScript_150C62, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 - object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 + object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 object_event 6, MAP_OBJ_GFX_BUG_CATCHER, 0, 13, 0, 17, 0, 3, 24, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C79, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B1571, 1019, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B157E, 1020, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B1571, FLAG_ITEM_ROUTE116_2, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B157E, FLAG_ITEM_ROUTE116_3, 0, 0 object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, S_BerryTree, 0, 0, 0 object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, S_BerryTree, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 46, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_150B5D, 891, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 + object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 46, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_150B5D, FLAG_HIDE_BRINEY_ROUTE116, 0, 0 + object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 object_event 13, MAP_OBJ_GFX_HIKER, 0, 36, 0, 15, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CCE, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0 - object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 80, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B158B, 1021, 0, 0 + object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0 + object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 80, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B158B, FLAG_ITEM_ROUTE116_4, 0, 0 object_event 16, MAP_OBJ_GFX_LASS, 0, 22, 0, 16, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route116_EventScript_150CE5, 0, 0, 0 object_event 17, MAP_OBJ_GFX_GIRL_3, 0, 25, 0, 4, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CFC, 0, 0, 0 object_event 18, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 31, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C90, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_MAN_2, 0, 46, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A7B, 947, 0, 0 - object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 56, 0, 12, 0, 4, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_1B1564, 1001, 0, 0 - object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 38, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A49, 894, 0, 0 - object_event 22, MAP_OBJ_GFX_MANIAC, 0, 74, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150B8F, 813, 0, 0 + object_event 19, MAP_OBJ_GFX_MAN_2, 0, 46, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A7B, FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116, 0, 0 + object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 56, 0, 12, 0, 4, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_1B1564, FLAG_ITEM_ROUTE116_1, 0, 0 + object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 38, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A49, FLAG_HIDE_TUNNER_DIGGER_ROUTE116, 0, 0 + object_event 22, MAP_OBJ_GFX_MANIAC, 0, 74, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150B8F, FLAG_HIDE_LOST_GLASSES_MAN, 0, 0 Route116_MapWarps:: @ 8383380 - warp_def 47, 8, 0, 0, RusturfTunnel - warp_def 38, 8, 0, 0, Route116_TunnelersRestHouse - warp_def 65, 10, 0, 2, RusturfTunnel + warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL + warp_def 38, 8, 0, 0, MAP_ROUTE116_TUNNELERS_REST_HOUSE + warp_def 65, 10, 0, 2, MAP_RUSTURF_TUNNEL Route116_MapCoordEvents:: @ 8383398 coord_event 47, 9, 3, 0, 0x406f, 1, 0, Route116_EventScript_150B6E diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/events/Route116_TunnelersRestHouse.inc index 4e4553567..2676d7a68 100644 --- a/data/maps/events/Route116_TunnelersRestHouse.inc +++ b/data/maps/events/Route116_TunnelersRestHouse.inc @@ -4,8 +4,8 @@ Route116_TunnelersRestHouse_MapObjects:: @ 838B98C object_event 3, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2F1, 0, 0, 0 Route116_TunnelersRestHouse_MapWarps:: @ 838B9D4 - warp_def 4, 8, 0, 1, Route116 - warp_def 5, 8, 0, 1, Route116 + warp_def 4, 8, 0, 1, MAP_ROUTE116 + warp_def 5, 8, 0, 1, MAP_ROUTE116 Route116_TunnelersRestHouse_MapEvents:: @ 838B9E4 map_events Route116_TunnelersRestHouse_MapObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc index bf6aeb5d0..90f3e1f8f 100644 --- a/data/maps/events/Route117.inc +++ b/data/maps/events/Route117.inc @@ -12,9 +12,9 @@ Route117_MapObjects:: @ 8383440 object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 41, 0, 13, 0, 3, 12, 0, 0, 0, 0, 29, 0, S_BerryTree, 0, 0, 0 object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 42, 0, 13, 0, 3, 12, 0, 0, 0, 0, 28, 0, S_BerryTree, 0, 0, 0 object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 43, 0, 13, 0, 3, 12, 0, 0, 0, 0, 27, 0, S_BerryTree, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B1598, 1022, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 - object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B15A5, 1023, 0, 0 + object_event 14, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B1598, FLAG_ITEM_ROUTE117_1, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B15A5, FLAG_ITEM_ROUTE117_2, 0, 0 object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 21, 0, 1, 0, 3, 40, 68, 0, 1, 0, 3, 0, Route117_EventScript_150E47, 0, 0, 0 object_event 18, MAP_OBJ_GFX_MANIAC, 0, 17, 0, 12, 0, 3, 7, 17, 0, 1, 0, 4, 0, Route117_EventScript_150E85, 0, 0, 0 object_event 19, MAP_OBJ_GFX_LASS, 0, 46, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route117_EventScript_150EE2, 0, 0, 0 @@ -22,7 +22,7 @@ Route117_MapObjects:: @ 8383440 object_event 21, MAP_OBJ_GFX_GIRL_2, 0, 48, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route117_EventScript_150D69, 0, 0, 0 Route117_MapWarps:: @ 8383638 - warp_def 51, 5, 0, 0, Route117_PokemonDayCare + warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE Route117_MapBGEvents:: @ 8383640 bg_event 16, 6, 0, 0, 0, Route117_EventScript_150D72 diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/events/Route117_PokemonDayCare.inc index 69ede9610..b1df05d06 100644 --- a/data/maps/events/Route117_PokemonDayCare.inc +++ b/data/maps/events/Route117_PokemonDayCare.inc @@ -2,8 +2,8 @@ Route117_PokemonDayCare_MapObjects:: @ 838B9F8 object_event 1, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_1B2327, 0, 0, 0 Route117_PokemonDayCare_MapWarps:: @ 838BA10 - warp_def 2, 8, 0, 0, Route117 - warp_def 3, 8, 0, 0, Route117 + warp_def 2, 8, 0, 0, MAP_ROUTE117 + warp_def 3, 8, 0, 0, MAP_ROUTE117 Route117_PokemonDayCare_MapEvents:: @ 838BA20 map_events Route117_PokemonDayCare_MapObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc index df887ba1e..2faff5e7d 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/events/Route118.inc @@ -3,22 +3,22 @@ Route118_MapObjects:: @ 8383684 object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 5, 0, 3, 12, 0, 0, 0, 0, 32, 0, S_BerryTree, 0, 0, 0 object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 37, 0, 5, 0, 3, 12, 0, 0, 0, 0, 33, 0, S_BerryTree, 0, 0, 0 object_event 4, MAP_OBJ_GFX_MAN_6, 0, 64, 0, 10, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route118_EventScript_151139, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE462, 797, 0, 0 - object_event 6, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE482, 797, 0, 0 + object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE462, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1, 0, 0 + object_event 6, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE482, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1, 0, 0 object_event 7, MAP_OBJ_GFX_GIRL_2, 0, 12, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route118_EventScript_150F93, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE522, 901, 0, 0 - object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE542, 901, 0, 0 - object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE562, 904, 0, 0 - object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE582, 904, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 + object_event 8, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE522, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2, 0, 0 + object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE542, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2, 0, 0 + object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3, 0, 0 + object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3, 0, 0 + object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 28, 0, 8, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route118_EventScript_150F34, 0, 0, 0 object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 10, 0, 3, 24, 0, 0, 1, 0, 4, 0, Route118_EventScript_15108F, 0, 0, 0 object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 14, 0, 14, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route118_EventScript_1510E4, 0, 0, 0 object_event 16, MAP_OBJ_GFX_MAN_6, 0, 56, 0, 7, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route118_EventScript_151150, 0, 0, 0 object_event 17, MAP_OBJ_GFX_FISHERMAN, 0, 39, 0, 15, 0, 3, 1, 0, 0, 1, 0, 2, 0, Route118_EventScript_1510CD, 0, 0, 0 object_event 18, MAP_OBJ_GFX_MAN_6, 0, 17, 0, 11, 0, 3, 15, 17, 0, 1, 0, 3, 0, Route118_EventScript_1510FB, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_STEVEN, 0, 44, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 966, 0, 0 - object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route118_EventScript_1B15B2, 1121, 0, 0 + object_event 19, MAP_OBJ_GFX_STEVEN, 0, 44, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE118, 0, 0 + object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route118_EventScript_1B15B2, FLAG_ITEM_ROUTE118_1, 0, 0 Route118_MapCoordEvents:: @ 8383864 coord_event 43, 11, 3, 0, 0x4071, 0, 0, Route118_EventScript_150FAE diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index 08e6e3649..506256be0 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -14,32 +14,32 @@ Route119_MapObjects:: @ 8383914 object_event 13, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 49, 0, 3, 58, 0, 0, 1, 0, 3, 0, Route119_EventScript_151580, 0, 0, 0 object_event 14, MAP_OBJ_GFX_MAN_6, 0, 10, 0, 50, 0, 4, 10, 0, 0, 1, 0, 3, 0, Route119_EventScript_15153B, 0, 0, 0 object_event 15, MAP_OBJ_GFX_MAN_6, 0, 8, 0, 62, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route119_EventScript_151552, 0, 0, 0 - object_event 16, 240, 0, 25, 0, 32, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 851, 0, 0 - object_event 17, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 121, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15BF, 1024, 0, 0 - object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 96, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15CC, 1025, 0, 0 - object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15D9, 1026, 0, 0 - object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 76, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15E6, 1027, 0, 0 - object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15F3, 1028, 0, 0 - object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 117, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B1600, 1029, 0, 0 - object_event 23, 241, 0, 13, 0, 33, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515C5, 890, 0, 0 - object_event 24, 241, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, 890, 0, 0 - object_event 25, 243, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, 923, 0, 0 + object_event 16, 240, 0, 25, 0, 32, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119, 0, 0 + object_event 17, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 121, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15BF, FLAG_ITEM_ROUTE119_1, 0, 0 + object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 96, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15CC, FLAG_ITEM_ROUTE119_2, 0, 0 + object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15D9, FLAG_ITEM_ROUTE119_3, 0, 0 + object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 76, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15E6, FLAG_ITEM_ROUTE119_4, 0, 0 + object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15F3, FLAG_ITEM_ROUTE119_5, 0, 0 + object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 117, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B1600, FLAG_ITEM_ROUTE119_6, 0, 0 + object_event 23, 241, 0, 13, 0, 33, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515C5, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 24, 241, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 25, 243, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE, 0, 0 object_event 26, MAP_OBJ_GFX_BOY_3, 0, 31, 0, 109, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515F3, 0, 0, 0 object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 8, 0, 23, 0, 3, 12, 0, 0, 0, 0, 83, 0, S_BerryTree, 0, 0, 0 object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 23, 0, 3, 12, 0, 0, 0, 0, 84, 0, S_BerryTree, 0, 0, 0 object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 90, 0, 3, 12, 0, 0, 0, 0, 85, 0, S_BerryTree, 0, 0, 0 object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 90, 0, 3, 12, 0, 0, 0, 0, 86, 0, S_BerryTree, 0, 0, 0 object_event 31, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 0, 133, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route119_EventScript_15141A, 0, 0, 0 - object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route119_EventScript_1B160D, 1106, 0, 0 + object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route119_EventScript_1B160D, FLAG_ITEM_ROUTE119_7, 0, 0 object_event 33, MAP_OBJ_GFX_BOY_2, 0, 35, 0, 93, 0, 4, 2, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515FC, 0, 0, 0 object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 29, 0, 6, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route119_EventScript_151597, 0, 0, 0 - object_event 35, MAP_OBJ_GFX_KECLEON_1, 0, 31, 0, 6, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A057A, 989, 0, 0 - object_event 36, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 13, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A0587, 990, 0, 0 + object_event 35, MAP_OBJ_GFX_KECLEON_1, 0, 31, 0, 6, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A057A, FLAG_HIDE_KECLEON_ROUTE119_1, 0, 0 + object_event 36, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 13, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A0587, FLAG_HIDE_KECLEON_ROUTE119_2, 0, 0 object_event 37, MAP_OBJ_GFX_FISHERMAN, 0, 13, 0, 104, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route119_EventScript_1515AE, 0, 0, 0 Route119_MapWarps:: @ 8383C8C - warp_def 6, 32, 0, 0, Route119_WeatherInstitute_1F - warp_def 33, 109, 0, 0, Route119_House + warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F + warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE Route119_MapCoordEvents:: @ 8383C9C coord_event 25, 31, 0, 0, 0x4072, 0, 0, Route119_EventScript_1511C5 diff --git a/data/maps/events/Route119_House.inc b/data/maps/events/Route119_House.inc index 45267ca0e..255913651 100644 --- a/data/maps/events/Route119_House.inc +++ b/data/maps/events/Route119_House.inc @@ -8,8 +8,8 @@ Route119_House_MapObjects:: @ 8392F40 object_event 7, MAP_OBJ_GFX_WINGULL, 0, 5, 0, 3, 0, 3, 2, 49, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0 Route119_House_MapWarps:: @ 8392FE8 - warp_def 3, 8, 0, 1, Route119 - warp_def 4, 8, 0, 1, Route119 + warp_def 3, 8, 0, 1, MAP_ROUTE119 + warp_def 4, 8, 0, 1, MAP_ROUTE119 Route119_House_MapEvents:: @ 8392FF8 map_events Route119_House_MapObjects, Route119_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/events/Route119_WeatherInstitute_1F.inc index 1472fb569..920439340 100644 --- a/data/maps/events/Route119_WeatherInstitute_1F.inc +++ b/data/maps/events/Route119_WeatherInstitute_1F.inc @@ -1,14 +1,14 @@ Route119_WeatherInstitute_1F_MapObjects:: @ 8392DC0 - object_event 1, 241, 0, 15, 0, 3, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route119_WeatherInstitute_1F_EventScript_163C94, 890, 0, 0 - object_event 2, 242, 0, 10, 0, 5, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_1F_EventScript_163CAB, 890, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_5, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, 892, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_5, 0, 2, 0, 11, 0, 3, 1, 1, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, 892, 0, 0 + object_event 1, 241, 0, 15, 0, 3, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route119_WeatherInstitute_1F_EventScript_163C94, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 2, 242, 0, 10, 0, 5, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_1F_EventScript_163CAB, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_5, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_5, 0, 2, 0, 11, 0, 3, 1, 1, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F, 0, 0 object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 14, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C4D, 0, 0, 0 Route119_WeatherInstitute_1F_MapWarps:: @ 8392E38 - warp_def 9, 12, 0, 0, Route119 - warp_def 10, 12, 0, 0, Route119 - warp_def 17, 1, 0, 0, Route119_WeatherInstitute_2F + warp_def 9, 12, 0, 0, MAP_ROUTE119 + warp_def 10, 12, 0, 0, MAP_ROUTE119 + warp_def 17, 1, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_2F Route119_WeatherInstitute_1F_MapBGEvents:: @ 8392E50 bg_event 1, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/events/Route119_WeatherInstitute_2F.inc index d2dbce24d..4a2db97f1 100644 --- a/data/maps/events/Route119_WeatherInstitute_2F.inc +++ b/data/maps/events/Route119_WeatherInstitute_2F.inc @@ -1,13 +1,13 @@ Route119_WeatherInstitute_2F_MapObjects:: @ 8392E94 - object_event 1, 241, 0, 15, 0, 6, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route119_WeatherInstitute_2F_EventScript_163CFC, 890, 0, 0 - object_event 2, 241, 0, 10, 0, 8, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_2F_EventScript_163D13, 890, 0, 0 - object_event 3, 242, 0, 4, 0, 6, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, 890, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 893, 0, 0 + object_event 1, 241, 0, 15, 0, 6, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route119_WeatherInstitute_2F_EventScript_163CFC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 2, 241, 0, 10, 0, 8, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_2F_EventScript_163D13, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 3, 242, 0, 4, 0, 6, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F, 0, 0 object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 18, 0, 6, 0, 3, 1, 18, 0, 0, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163DCC, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_5, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 893, 0, 0 + object_event 6, MAP_OBJ_GFX_MAN_5, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F, 0, 0 Route119_WeatherInstitute_2F_MapWarps:: @ 8392F24 - warp_def 17, 1, 0, 2, Route119_WeatherInstitute_1F + warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F Route119_WeatherInstitute_2F_MapEvents:: @ 8392F2C map_events Route119_WeatherInstitute_2F_MapObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index 81fa21c7f..4ddfe4978 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -14,36 +14,36 @@ Route120_MapObjects:: @ 8383F30 object_event 13, MAP_OBJ_GFX_CAMPER, 0, 27, 0, 51, 0, 3, 9, 0, 0, 1, 0, 7, 0, Route120_EventScript_151A08, 0, 0, 0 object_event 14, MAP_OBJ_GFX_PICNICKER, 0, 36, 0, 45, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route120_EventScript_151A1F, 0, 0, 0 object_event 15, MAP_OBJ_GFX_MANIAC, 0, 19, 0, 80, 0, 5, 15, 0, 0, 1, 0, 3, 0, Route120_EventScript_151A36, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 55, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B161A, 1030, 0, 0 - object_event 17, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4C2, 798, 0, 0 - object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, 798, 0, 0 - object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE562, 902, 0, 0 - object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE582, 902, 0, 0 - object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 - object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 89, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B1627, 1031, 0, 0 + object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 55, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B161A, FLAG_ITEM_ROUTE120_1, 0, 0 + object_event 17, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4C2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1, 0, 0 + object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1, 0, 0 + object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2, 0, 0 + object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2, 0, 0 + object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 89, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B1627, FLAG_ITEM_ROUTE120_2, 0, 0 object_event 23, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 92, 0, 5, 5, 1, 0, 0, 0, 0, 0, Route120_EventScript_151739, 0, 0, 0 object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 28, 0, 35, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route120_EventScript_151A74, 0, 0, 0 object_event 25, MAP_OBJ_GFX_HIKER, 0, 9, 0, 60, 0, 3, 21, 0, 0, 1, 0, 4, 0, Route120_EventScript_151A8B, 0, 0, 0 object_event 26, MAP_OBJ_GFX_WOMAN_7, 0, 16, 0, 6, 0, 3, 23, 0, 0, 1, 0, 4, 0, Route120_EventScript_151AA2, 0, 0, 0 object_event 27, MAP_OBJ_GFX_WOMAN_7, 0, 18, 0, 34, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route120_EventScript_151AB9, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_ITEM_BALL, 0, 22, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1641, 1108, 0, 0 - object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 82, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1634, 1107, 0, 0 - object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 12, 0, 16, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_151998, 970, 0, 0 - object_event 31, MAP_OBJ_GFX_STEVEN, 0, 13, 0, 15, 0, 4, 8, 17, 0, 0, 0, 0, 0, Route120_EventScript_151853, 972, 0, 0 - object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0 - object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 + object_event 28, MAP_OBJ_GFX_ITEM_BALL, 0, 22, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1641, FLAG_ITEM_ROUTE120_4, 0, 0 + object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 82, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1634, FLAG_ITEM_ROUTE120_3, 0, 0 + object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 12, 0, 16, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_151998, FLAG_HIDE_KECLEON_ROUTE120_1, 0, 0 + object_event 31, MAP_OBJ_GFX_STEVEN, 0, 13, 0, 15, 0, 4, 8, 17, 0, 0, 0, 0, 0, Route120_EventScript_151853, FLAG_HIDE_STEVEN_ROUTE120, 0, 0 + object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0 + object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 10, 0, 72, 0, 3, 58, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AD0, 0, 0, 0 object_event 35, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 28, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AE7, 0, 0, 0 - object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 981, 0, 0 - object_event 37, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 11, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0539, 982, 0, 0 - object_event 38, MAP_OBJ_GFX_KECLEON_1, 0, 27, 0, 2, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0546, 985, 0, 0 - object_event 39, MAP_OBJ_GFX_KECLEON_1, 0, 4, 0, 77, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0553, 986, 0, 0 - object_event 40, MAP_OBJ_GFX_KECLEON_1, 0, 7, 0, 51, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A056D, 988, 0, 0 - object_event 41, MAP_OBJ_GFX_KECLEON_1, 0, 19, 0, 48, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0560, 987, 0, 0 + object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_KECLEON_ROUTE120_2, 0, 0 + object_event 37, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 11, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0539, FLAG_HIDE_KECLEON_ROUTE120_3, 0, 0 + object_event 38, MAP_OBJ_GFX_KECLEON_1, 0, 27, 0, 2, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0546, FLAG_HIDE_KECLEON_ROUTE120_4, 0, 0 + object_event 39, MAP_OBJ_GFX_KECLEON_1, 0, 4, 0, 77, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0553, FLAG_HIDE_KECLEON_ROUTE120_5, 0, 0 + object_event 40, MAP_OBJ_GFX_KECLEON_1, 0, 7, 0, 51, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A056D, FLAG_HIDE_KECLEON_ROUTE120_7, 0, 0 + object_event 41, MAP_OBJ_GFX_KECLEON_1, 0, 19, 0, 48, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0560, FLAG_HIDE_KECLEON_ROUTE120_6, 0, 0 Route120_MapWarps:: @ 8384308 - warp_def 7, 55, 0, 0, AncientTomb - warp_def 19, 23, 1, 0, ScorchedSlab + warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB + warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB Route120_MapCoordEvents:: @ 8384318 coord_event 7, 15, 0, 0, 3, 0, 0, 0x0 diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc index 9961344a8..b97f956c2 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -10,20 +10,20 @@ Route121_MapObjects:: @ 8384504 object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 67, 0, 14, 0, 3, 12, 0, 0, 0, 0, 54, 0, S_BerryTree, 0, 0, 0 object_event 10, MAP_OBJ_GFX_LASS, 0, 39, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BDE, 0, 0, 0 object_event 11, MAP_OBJ_GFX_LASS, 0, 40, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BF9, 0, 0, 0 - object_event 12, 241, 0, 30, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 - object_event 13, 241, 0, 30, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 - object_event 14, 241, 0, 31, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 - object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 + object_event 12, 241, 0, 30, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0 + object_event 13, 241, 0, 30, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0 + object_event 14, 241, 0, 31, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 object_event 17, MAP_OBJ_GFX_WOMAN_2, 0, 63, 0, 5, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route121_EventScript_151B72, 0, 0, 0 object_event 18, MAP_OBJ_GFX_GENTLEMAN, 0, 55, 0, 8, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route121_EventScript_151B89, 0, 0, 0 object_event 19, MAP_OBJ_GFX_HEX_MANIAC, 0, 11, 0, 10, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route121_EventScript_151BC7, 0, 0, 0 object_event 20, MAP_OBJ_GFX_BEAUTY, 0, 22, 0, 5, 0, 3, 17, 0, 0, 1, 0, 4, 0, Route121_EventScript_151C14, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 55, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route121_EventScript_1B164E, 1103, 0, 0 - object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 + object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 55, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route121_EventScript_1B164E, FLAG_ITEM_ROUTE121_1, 0, 0 + object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 Route121_MapWarps:: @ 8384714 - warp_def 37, 5, 0, 2, Route121_SafariZoneEntrance + warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE Route121_MapCoordEvents:: @ 838471C coord_event 25, 5, 3, 0, 0x4074, 0, 0, Route121_EventScript_151B25 diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/events/Route121_SafariZoneEntrance.inc index c3880d4b3..68ee79ca1 100644 --- a/data/maps/events/Route121_SafariZoneEntrance.inc +++ b/data/maps/events/Route121_SafariZoneEntrance.inc @@ -4,10 +4,10 @@ Route121_SafariZoneEntrance_MapObjects:: @ 838BA34 object_event 3, MAP_OBJ_GFX_CAMPER, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 Route121_SafariZoneEntrance_MapWarps:: @ 838BA7C - warp_def 2, 5, 0, 0, SafariZone_Southeast - warp_def 3, 5, 0, 0, SafariZone_Southeast - warp_def 14, 13, 0, 0, Route121 - warp_def 15, 13, 0, 0, Route121 + warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTHEAST + warp_def 3, 5, 0, 0, MAP_SAFARI_ZONE_SOUTHEAST + warp_def 14, 13, 0, 0, MAP_ROUTE121 + warp_def 15, 13, 0, 0, MAP_ROUTE121 Route121_SafariZoneEntrance_MapCoordEvents:: @ 838BA9C coord_event 8, 4, 3, 0, 0x4001, 0, 0, Route121_SafariZoneEntrance_EventScript_15C383 diff --git a/data/maps/events/Route122.inc b/data/maps/events/Route122.inc index 217c28ee1..3bad2b895 100644 --- a/data/maps/events/Route122.inc +++ b/data/maps/events/Route122.inc @@ -1,5 +1,5 @@ Route122_MapWarps:: @ 83847DC - warp_def 22, 29, 0, 0, MtPyre_1F + warp_def 22, 29, 0, 0, MAP_MT_PYRE_1F Route122_MapEvents:: @ 83847E4 map_events 0x0, Route122_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc index dc5ac0fb4..ff4f066b8 100644 --- a/data/maps/events/Route123.inc +++ b/data/maps/events/Route123.inc @@ -16,11 +16,11 @@ Route123_MapObjects:: @ 83847F8 object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 3, 0, 3, 12, 0, 0, 0, 0, 14, 0, S_BerryTree, 0, 0, 0 object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 15, 0, S_BerryTree, 0, 0, 0 object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 30, 0, S_BerryTree, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 - object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 - object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 - object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B165B, 1032, 0, 0 - object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 139, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B1668, 1033, 0, 0 + object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 + object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 + object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B165B, FLAG_ITEM_ROUTE123_1, 0, 0 + object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 139, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B1668, FLAG_ITEM_ROUTE123_2, 0, 0 object_event 23, MAP_OBJ_GFX_GIRL_3, 0, 108, 0, 13, 0, 3, 15, 0, 0, 0, 0, 0, 0, Route123_EventScript_151C5D, 0, 0, 0 object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 109, 0, 13, 0, 3, 12, 0, 0, 0, 0, 87, 0, S_BerryTree, 0, 0, 0 object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 110, 0, 13, 0, 3, 12, 0, 0, 0, 0, 88, 0, S_BerryTree, 0, 0, 0 @@ -31,11 +31,11 @@ Route123_MapObjects:: @ 83847F8 object_event 30, MAP_OBJ_GFX_PSYCHIC_M, 0, 138, 0, 12, 0, 3, 9, 0, 0, 1, 0, 6, 0, Route123_EventScript_151D16, 0, 0, 0 object_event 31, MAP_OBJ_GFX_LASS, 0, 50, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route123_EventScript_151D54, 0, 0, 0 object_event 32, MAP_OBJ_GFX_HEX_MANIAC, 0, 87, 0, 14, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route123_EventScript_151DC8, 0, 0, 0 - object_event 33, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1675, 1104, 0, 0 - object_event 34, MAP_OBJ_GFX_ITEM_BALL, 0, 75, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1682, 1109, 0, 0 + object_event 33, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1675, FLAG_ITEM_ROUTE123_3, 0, 0 + object_event 34, MAP_OBJ_GFX_ITEM_BALL, 0, 75, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1682, FLAG_ITEM_ROUTE123_4, 0, 0 Route123_MapWarps:: @ 8384B28 - warp_def 22, 6, 0, 0, Route123_BerryMastersHouse + warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE Route123_MapCoordEvents:: @ 8384B30 coord_event 90, 16, 3, 0, 21, 0, 0, 0x0 diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/events/Route123_BerryMastersHouse.inc index 183e19415..a17a04e19 100644 --- a/data/maps/events/Route123_BerryMastersHouse.inc +++ b/data/maps/events/Route123_BerryMastersHouse.inc @@ -3,8 +3,8 @@ Route123_BerryMastersHouse_MapObjects:: @ 8392D6C object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_163A64, 0, 0, 0 Route123_BerryMastersHouse_MapWarps:: @ 8392D9C - warp_def 3, 7, 0, 0, Route123 - warp_def 4, 7, 0, 0, Route123 + warp_def 3, 7, 0, 0, MAP_ROUTE123 + warp_def 4, 7, 0, 0, MAP_ROUTE123 Route123_BerryMastersHouse_MapEvents:: @ 8392DAC map_events Route123_BerryMastersHouse_MapObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route124.inc b/data/maps/events/Route124.inc index 83db7f24b..eb92f81a4 100644 --- a/data/maps/events/Route124.inc +++ b/data/maps/events/Route124.inc @@ -4,14 +4,14 @@ Route124_MapObjects:: @ 8384D10 object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 14, 0, 27, 0, 1, 24, 0, 0, 1, 0, 3, 0, Route124_EventScript_151E26, 0, 0, 0 object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 49, 0, 45, 0, 1, 24, 134, 0, 1, 0, 3, 0, Route124_EventScript_151E64, 0, 0, 0 object_event 5, MAP_OBJ_GFX_SWIMMER_M, 0, 60, 0, 74, 0, 1, 28, 7, 0, 1, 0, 2, 0, Route124_EventScript_151E7B, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B168F, 1092, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B169C, 1093, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 58, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B16A9, 1066, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B168F, FLAG_ITEM_ROUTE124_2, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B169C, FLAG_ITEM_ROUTE124_3, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 58, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B16A9, FLAG_ITEM_ROUTE124_1, 0, 0 object_event 9, MAP_OBJ_GFX_SWIMMER_F, 0, 18, 0, 44, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route124_EventScript_151E92, 0, 0, 0 object_event 10, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 0, 44, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route124_EventScript_151ED8, 0, 0, 0 Route124_MapWarps:: @ 8384E00 - warp_def 70, 48, 3, 0, Route124_DivingTreasureHuntersHouse + warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE Route124_MapBGEvents:: @ 8384E08 bg_event 73, 48, 3, 0, 0, Route124_EventScript_151DEF diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc new file mode 100755 index 000000000..17ec713de --- /dev/null +++ b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc @@ -0,0 +1,12 @@ +Route124_DivingTreasureHuntersHouse_MapObjects:: @ 839300C + object_event 1, MAP_OBJ_GFX_MAN_6, 0, 5, 0, 4, 0, 0, 9, 0, 0, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_163E04, 0, 0, 0 + +Route124_DivingTreasureHuntersHouse_MapWarps:: @ 8393024 + warp_def 3, 8, 0, 0, MAP_ROUTE124 + warp_def 4, 8, 0, 0, MAP_ROUTE124 + +Route124_DivingTreasureHuntersHouse_MapBGEvents:: @ 8393034 + bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_164335 + +Route124_DivingTreasureHuntersHouse_MapEvents:: @ 8393040 + map_events Route124_DivingTreasureHuntersHouse_MapObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents diff --git a/data/maps/events/Route125.inc b/data/maps/events/Route125.inc index 0c7d12643..585296ac3 100644 --- a/data/maps/events/Route125.inc +++ b/data/maps/events/Route125.inc @@ -8,7 +8,7 @@ Route125_MapObjects:: @ 8384E28 object_event 7, MAP_OBJ_GFX_LASS, 0, 21, 0, 21, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route125_EventScript_151FE3, 0, 0, 0 Route125_MapWarps:: @ 8384ED0 - warp_def 22, 19, 0, 0, ShoalCave_LowTideEntranceRoom + warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM Route125_MapBGEvents:: @ 8384ED8 bg_event 53, 10, 0, 8, 0, ITEM_ULTRA_BALL, 0, 0 diff --git a/data/maps/events/Route126.inc b/data/maps/events/Route126.inc index 50d1dca52..a8855c41f 100644 --- a/data/maps/events/Route126.inc +++ b/data/maps/events/Route126.inc @@ -3,7 +3,7 @@ Route126_MapObjects:: @ 8384F1C object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 33, 0, 63, 0, 1, 28, 9, 0, 1, 0, 3, 0, Route126_EventScript_152025, 0, 0, 0 object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 9, 0, 49, 0, 1, 7, 0, 0, 1, 0, 3, 0, Route126_EventScript_15203C, 0, 0, 0 object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 64, 0, 44, 0, 1, 24, 0, 0, 1, 0, 3, 0, Route126_EventScript_152053, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route126_EventScript_1B16B6, 1105, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route126_EventScript_1B16B6, FLAG_ITEM_ROUTE126_1, 0, 0 Route126_MapEvents:: @ 8384F94 map_events Route126_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route127.inc b/data/maps/events/Route127.inc index b3744194e..d71b15c74 100644 --- a/data/maps/events/Route127.inc +++ b/data/maps/events/Route127.inc @@ -1,8 +1,8 @@ Route127_MapObjects:: @ 8384FA8 object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 18, 0, 68, 0, 1, 14, 0, 0, 1, 0, 2, 0, Route127_EventScript_15207A, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 45, 0, 44, 0, 1, 21, 0, 0, 1, 0, 4, 0, Route127_EventScript_152091, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16C3, 1034, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 64, 0, 39, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16D0, 1035, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16C3, FLAG_ITEM_ROUTE127_1, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 64, 0, 39, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16D0, FLAG_ITEM_ROUTE127_2, 0, 0 object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 53, 0, 13, 0, 3, 7, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520A8, 0, 0, 0 object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 52, 0, 25, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520D6, 0, 0, 0 object_event 7, MAP_OBJ_GFX_FISHERMAN, 0, 64, 0, 19, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520BF, 0, 0, 0 diff --git a/data/maps/events/Route128.inc b/data/maps/events/Route128.inc index 74f99d02c..1f86907bd 100644 --- a/data/maps/events/Route128.inc +++ b/data/maps/events/Route128.inc @@ -1,9 +1,9 @@ Route128_MapObjects:: @ 83850D0 object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 77, 0, 24, 0, 1, 48, 85, 0, 1, 0, 3, 0, Route128_EventScript_1522A4, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 35, 0, 34, 0, 1, 28, 5, 0, 1, 0, 7, 0, Route128_EventScript_1522E2, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_STEVEN, 0, 40, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 834, 0, 0 - object_event 4, 246, 0, 37, 0, 22, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 944, 0, 0 - object_event 5, 247, 0, 38, 0, 21, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 945, 0, 0 + object_event 3, MAP_OBJ_GFX_STEVEN, 0, 40, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE128, 0, 0 + object_event 4, 246, 0, 37, 0, 22, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_ROUTE128, 0, 0 + object_event 5, 247, 0, 38, 0, 21, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_ROUTE128, 0, 0 object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 63, 0, 28, 0, 3, 7, 17, 0, 1, 0, 0, 0, Route128_EventScript_15234E, 0, 0, 0 object_event 7, MAP_OBJ_GFX_MAN_4, 0, 24, 0, 8, 0, 3, 17, 17, 0, 1, 0, 2, 0, Route128_EventScript_152337, 0, 0, 0 object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 47, 0, 9, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route128_EventScript_152320, 0, 0, 0 diff --git a/data/maps/events/Route130.inc b/data/maps/events/Route130.inc index 009604d4b..027519c2d 100644 --- a/data/maps/events/Route130.inc +++ b/data/maps/events/Route130.inc @@ -1,7 +1,7 @@ Route130_MapObjects:: @ 838523C object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 7, 0, 26, 0, 1, 29, 99, 0, 1, 0, 3, 0, Route130_EventScript_152410, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 68, 0, 22, 0, 1, 13, 17, 0, 1, 0, 3, 0, Route130_EventScript_152427, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, S_BerryTree, 17, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, S_BerryTree, FLAG_TEMP_11, 0, 0 Route130_MapEvents:: @ 8385284 map_events Route130_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route131.inc b/data/maps/events/Route131.inc index ed1a33768..d387233d2 100644 --- a/data/maps/events/Route131.inc +++ b/data/maps/events/Route131.inc @@ -7,7 +7,7 @@ Route131_MapObjects:: @ 8385298 object_event 6, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 0, 16, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route131_EventScript_1524C9, 0, 0, 0 Route131_MapWarps:: @ 8385328 - warp_def 36, 6, 3, 0, SkyPillar_Entrance + warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE Route131_MapEvents:: @ 8385330 map_events Route131_MapObjects, Route131_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route132.inc b/data/maps/events/Route132.inc index b19e96363..97fc3d5db 100644 --- a/data/maps/events/Route132.inc +++ b/data/maps/events/Route132.inc @@ -1,7 +1,7 @@ Route132_MapObjects:: @ 8385344 object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 7, 0, 3, 0, 1, 46, 51, 0, 1, 0, 2, 0, Route132_EventScript_1524E5, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 41, 0, 16, 0, 1, 49, 68, 0, 1, 0, 2, 0, Route132_EventScript_1524FC, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route132_EventScript_1B16DD, 1036, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route132_EventScript_1B16DD, FLAG_ITEM_ROUTE132_1, 0, 0 object_event 4, MAP_OBJ_GFX_BLACK_BELT, 0, 46, 0, 28, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route132_EventScript_15252A, 0, 0, 0 object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 9, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route132_EventScript_152513, 0, 0, 0 diff --git a/data/maps/events/Route133.inc b/data/maps/events/Route133.inc index 1461293e8..3d73ef1c9 100644 --- a/data/maps/events/Route133.inc +++ b/data/maps/events/Route133.inc @@ -2,8 +2,8 @@ Route133_MapObjects:: @ 83853D0 object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 6, 0, 4, 0, 1, 1, 0, 0, 1, 0, 3, 0, Route133_EventScript_152542, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 68, 0, 24, 0, 1, 8, 0, 0, 1, 0, 3, 0, Route133_EventScript_152570, 0, 0, 0 object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 69, 0, 24, 0, 1, 8, 0, 0, 1, 0, 3, 0, Route133_EventScript_152559, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 58, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16EA, 1037, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16F7, 1038, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 58, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16EA, FLAG_ITEM_ROUTE133_1, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16F7, FLAG_ITEM_ROUTE133_2, 0, 0 object_event 6, MAP_OBJ_GFX_MAN_6, 0, 37, 0, 16, 0, 3, 13, 17, 0, 1, 0, 1, 0, Route133_EventScript_15259E, 0, 0, 0 object_event 7, MAP_OBJ_GFX_MAN_4, 0, 7, 0, 14, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route133_EventScript_152587, 0, 0, 0 diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc index 4bbf0a6a2..c16bfcdb0 100644 --- a/data/maps/events/RustboroCity.inc +++ b/data/maps/events/RustboroCity.inc @@ -7,26 +7,26 @@ RustboroCity_MapObjects:: @ 837FD14 object_event 6, MAP_OBJ_GFX_MAN_4, 0, 26, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3BA, 0, 0, 0 object_event 7, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 24, 0, 51, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C449, 0, 0, 0 object_event 8, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 0, 51, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C45F, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_2, 0, 30, 0, 10, 0, 3, 10, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C5FF, 732, 0, 0 - object_event 10, 241, 0, 13, 0, 21, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 731, 0, 0 + object_event 9, MAP_OBJ_GFX_MAN_2, 0, 30, 0, 10, 0, 3, 10, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C5FF, FLAG_HIDE_DEVON_RUSTBORO, 0, 0 + object_event 10, 241, 0, 13, 0, 21, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_RUSTBORO, 0, 0 object_event 11, MAP_OBJ_GFX_MAN_7, 0, 13, 0, 34, 0, 3, 2, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3A5, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 36, 0, 51, 0, 3, 1, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, 1041, 0, 0 + object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 36, 0, 51, 0, 3, 1, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, FLAG_ITEM_RUSTBORO_1, 0, 0 object_event 13, MAP_OBJ_GFX_MAN_5, 0, 19, 0, 27, 0, 3, 8, 16, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C475, 0, 0, 0 - object_event 14, 240, 0, 16, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C8DA, 814, 0, 0 + object_event 14, 240, 0, 16, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C8DA, FLAG_HIDE_RIVAL_RUSTBORO, 0, 0 RustboroCity_MapWarps:: @ 837FE64 - warp_def 27, 19, 0, 0, RustboroCity_Gym - warp_def 13, 30, 0, 0, RustboroCity_Flat1_1F - warp_def 16, 45, 0, 0, RustboroCity_Mart - warp_def 16, 38, 0, 0, RustboroCity_PokemonCenter_1F - warp_def 27, 34, 0, 0, RustboroCity_PokemonSchool - warp_def 11, 15, 0, 0, RustboroCity_DevonCorp_1F - warp_def 12, 15, 0, 1, RustboroCity_DevonCorp_1F - warp_def 33, 19, 0, 0, RustboroCity_House1 - warp_def 9, 38, 0, 0, RustboroCity_CuttersHouse - warp_def 30, 28, 0, 0, RustboroCity_House2 - warp_def 5, 51, 0, 0, RustboroCity_Flat2_1F - warp_def 26, 46, 0, 0, RustboroCity_House3 + warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM + warp_def 13, 30, 0, 0, MAP_RUSTBORO_CITY_FLAT1_1F + warp_def 16, 45, 0, 0, MAP_RUSTBORO_CITY_MART + warp_def 16, 38, 0, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F + warp_def 27, 34, 0, 0, MAP_RUSTBORO_CITY_POKEMON_SCHOOL + warp_def 11, 15, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_1F + warp_def 12, 15, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_1F + warp_def 33, 19, 0, 0, MAP_RUSTBORO_CITY_HOUSE1 + warp_def 9, 38, 0, 0, MAP_RUSTBORO_CITY_CUTTERS_HOUSE + warp_def 30, 28, 0, 0, MAP_RUSTBORO_CITY_HOUSE2 + warp_def 5, 51, 0, 0, MAP_RUSTBORO_CITY_FLAT2_1F + warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3 RustboroCity_MapCoordEvents:: @ 837FEC4 coord_event 23, 20, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C481 diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/events/RustboroCity_CuttersHouse.inc index b38fc9afe..e26127f38 100644 --- a/data/maps/events/RustboroCity_CuttersHouse.inc +++ b/data/maps/events/RustboroCity_CuttersHouse.inc @@ -3,8 +3,8 @@ RustboroCity_CuttersHouse_MapObjects:: @ 8388D9C object_event 2, MAP_OBJ_GFX_LASS, 0, 9, 0, 2, 0, 3, 5, 1, 0, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D5D, 0, 0, 0 RustboroCity_CuttersHouse_MapWarps:: @ 8388DCC - warp_def 5, 8, 0, 8, RustboroCity - warp_def 6, 8, 0, 8, RustboroCity + warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 8, MAP_RUSTBORO_CITY RustboroCity_CuttersHouse_MapEvents:: @ 8388DDC map_events RustboroCity_CuttersHouse_MapObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/events/RustboroCity_DevonCorp_1F.inc index 72437229c..165089ee7 100644 --- a/data/maps/events/RustboroCity_DevonCorp_1F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_1F.inc @@ -4,9 +4,9 @@ RustboroCity_DevonCorp_1F_MapObjects:: @ 838880C object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 5, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_15748F, 0, 0, 0 RustboroCity_DevonCorp_1F_MapWarps:: @ 8388854 - warp_def 5, 8, 0, 5, RustboroCity - warp_def 6, 8, 0, 6, RustboroCity - warp_def 14, 1, 0, 0, RustboroCity_DevonCorp_2F + warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 6, MAP_RUSTBORO_CITY + warp_def 14, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_2F RustboroCity_DevonCorp_1F_MapEvents:: @ 838886C map_events RustboroCity_DevonCorp_1F_MapObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/events/RustboroCity_DevonCorp_2F.inc index 3ca57bf10..93335d22e 100644 --- a/data/maps/events/RustboroCity_DevonCorp_2F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_2F.inc @@ -6,8 +6,8 @@ RustboroCity_DevonCorp_2F_MapObjects:: @ 8388880 object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 14, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157564, 0, 0, 0 RustboroCity_DevonCorp_2F_MapWarps:: @ 83888F8 - warp_def 14, 1, 0, 2, RustboroCity_DevonCorp_1F - warp_def 2, 1, 0, 0, RustboroCity_DevonCorp_3F + warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F + warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_3F RustboroCity_DevonCorp_2F_MapEvents:: @ 8388908 map_events RustboroCity_DevonCorp_2F_MapObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/events/RustboroCity_DevonCorp_3F.inc index f0f8fadec..41f37c7b1 100644 --- a/data/maps/events/RustboroCity_DevonCorp_3F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_3F.inc @@ -1,10 +1,10 @@ RustboroCity_DevonCorp_3F_MapObjects:: @ 838891C object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 17, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578B0, 949, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578B0, FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F, 0, 0 object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 15, 0, 5, 0, 3, 76, 17, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0, 0, 0 RustboroCity_DevonCorp_3F_MapWarps:: @ 8388964 - warp_def 2, 1, 0, 1, RustboroCity_DevonCorp_2F + warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F RustboroCity_DevonCorp_3F_MapBGEvents:: @ 838896C bg_event 1, 5, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578CF diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/events/RustboroCity_Flat1_1F.inc index 9c637f0fb..d44df7638 100644 --- a/data/maps/events/RustboroCity_Flat1_1F.inc +++ b/data/maps/events/RustboroCity_Flat1_1F.inc @@ -3,9 +3,9 @@ RustboroCity_Flat1_1F_MapObjects:: @ 8388CB8 object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 12, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C69, 0, 0, 0 RustboroCity_Flat1_1F_MapWarps:: @ 8388CE8 - warp_def 6, 7, 0, 1, RustboroCity - warp_def 7, 7, 0, 1, RustboroCity - warp_def 2, 1, 0, 0, RustboroCity_Flat1_2F + warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY + warp_def 7, 7, 0, 1, MAP_RUSTBORO_CITY + warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT1_2F RustboroCity_Flat1_1F_MapEvents:: @ 8388D00 map_events RustboroCity_Flat1_1F_MapObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/events/RustboroCity_Flat1_2F.inc index 2d1d187e9..91f1d2f20 100644 --- a/data/maps/events/RustboroCity_Flat1_2F.inc +++ b/data/maps/events/RustboroCity_Flat1_2F.inc @@ -2,7 +2,7 @@ RustboroCity_Flat1_2F_MapObjects:: @ 8388D14 object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 8, 0, 6, 0, 3, 5, 19, 0, 0, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_157C73, 0, 0, 0 RustboroCity_Flat1_2F_MapWarps:: @ 8388D2C - warp_def 2, 1, 0, 2, RustboroCity_Flat1_1F + warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F RustboroCity_Flat1_2F_MapEvents:: @ 8388D34 map_events RustboroCity_Flat1_2F_MapObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/events/RustboroCity_Flat2_1F.inc index bd9f4904e..17c11b21f 100644 --- a/data/maps/events/RustboroCity_Flat2_1F.inc +++ b/data/maps/events/RustboroCity_Flat2_1F.inc @@ -3,9 +3,9 @@ RustboroCity_Flat2_1F_MapObjects:: @ 8388E44 object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 8, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D7A, 0, 0, 0 RustboroCity_Flat2_1F_MapWarps:: @ 8388E74 - warp_def 2, 8, 0, 10, RustboroCity - warp_def 3, 8, 0, 10, RustboroCity - warp_def 3, 1, 0, 0, RustboroCity_Flat2_2F + warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY + warp_def 3, 8, 0, 10, MAP_RUSTBORO_CITY + warp_def 3, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_2F RustboroCity_Flat2_1F_MapEvents:: @ 8388E8C map_events RustboroCity_Flat2_1F_MapObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/events/RustboroCity_Flat2_2F.inc index 988e3797d..b881e1bd2 100644 --- a/data/maps/events/RustboroCity_Flat2_2F.inc +++ b/data/maps/events/RustboroCity_Flat2_2F.inc @@ -3,8 +3,8 @@ RustboroCity_Flat2_2F_MapObjects:: @ 8388EA0 object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 3, 0, 3, 5, 2, 0, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157DA0, 0, 0, 0 RustboroCity_Flat2_2F_MapWarps:: @ 8388ED0 - warp_def 3, 1, 0, 2, RustboroCity_Flat2_1F - warp_def 1, 1, 0, 0, RustboroCity_Flat2_3F + warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F + warp_def 1, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_3F RustboroCity_Flat2_2F_MapEvents:: @ 8388EE0 map_events RustboroCity_Flat2_2F_MapObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/events/RustboroCity_Flat2_3F.inc index 3c09ce553..4a00bb8f4 100644 --- a/data/maps/events/RustboroCity_Flat2_3F.inc +++ b/data/maps/events/RustboroCity_Flat2_3F.inc @@ -3,7 +3,7 @@ RustboroCity_Flat2_3F_MapObjects:: @ 8388EF4 object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DE3, 0, 0, 0 RustboroCity_Flat2_3F_MapWarps:: @ 8388F24 - warp_def 1, 1, 0, 1, RustboroCity_Flat2_2F + warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F RustboroCity_Flat2_3F_MapEvents:: @ 8388F2C map_events RustboroCity_Flat2_3F_MapObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/events/RustboroCity_Gym.inc index cfe9f420d..e77b55b7f 100644 --- a/data/maps/events/RustboroCity_Gym.inc +++ b/data/maps/events/RustboroCity_Gym.inc @@ -5,8 +5,8 @@ RustboroCity_Gym_MapObjects:: @ 8388998 object_event 4, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_Gym_EventScript_15798E, 0, 0, 0 RustboroCity_Gym_MapWarps:: @ 83889F8 - warp_def 5, 18, 0, 0, RustboroCity - warp_def 6, 18, 0, 0, RustboroCity + warp_def 5, 18, 0, 0, MAP_RUSTBORO_CITY + warp_def 6, 18, 0, 0, MAP_RUSTBORO_CITY RustboroCity_Gym_MapBGEvents:: @ 8388A08 bg_event 2, 17, 0, 1, 0, RustboroCity_Gym_EventScript_1579AD diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/events/RustboroCity_House1.inc index 8e1cb1c7e..a6471da2e 100644 --- a/data/maps/events/RustboroCity_House1.inc +++ b/data/maps/events/RustboroCity_House1.inc @@ -3,8 +3,8 @@ RustboroCity_House1_MapObjects:: @ 8388D48 object_event 2, MAP_OBJ_GFX_HIKER, 0, 9, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_House1_EventScript_157D1D, 0, 0, 0 RustboroCity_House1_MapWarps:: @ 8388D78 - warp_def 5, 7, 0, 7, RustboroCity - warp_def 6, 7, 0, 7, RustboroCity + warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY + warp_def 6, 7, 0, 7, MAP_RUSTBORO_CITY RustboroCity_House1_MapEvents:: @ 8388D88 map_events RustboroCity_House1_MapObjects, RustboroCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/events/RustboroCity_House2.inc index 33159faa4..5cdb4fc6c 100644 --- a/data/maps/events/RustboroCity_House2.inc +++ b/data/maps/events/RustboroCity_House2.inc @@ -3,8 +3,8 @@ RustboroCity_House2_MapObjects:: @ 8388DF0 object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D70, 0, 0, 0 RustboroCity_House2_MapWarps:: @ 8388E20 - warp_def 5, 8, 0, 9, RustboroCity - warp_def 6, 8, 0, 9, RustboroCity + warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 9, MAP_RUSTBORO_CITY RustboroCity_House2_MapEvents:: @ 8388E30 map_events RustboroCity_House2_MapObjects, RustboroCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/events/RustboroCity_House3.inc index 696350f00..96c2f2699 100644 --- a/data/maps/events/RustboroCity_House3.inc +++ b/data/maps/events/RustboroCity_House3.inc @@ -4,8 +4,8 @@ RustboroCity_House3_MapObjects:: @ 8388F40 object_event 3, MAP_OBJ_GFX_PIKACHU, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DFF, 0, 0, 0 RustboroCity_House3_MapWarps:: @ 8388F88 - warp_def 5, 8, 0, 11, RustboroCity - warp_def 6, 8, 0, 11, RustboroCity + warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 11, MAP_RUSTBORO_CITY RustboroCity_House3_MapEvents:: @ 8388F98 map_events RustboroCity_House3_MapObjects, RustboroCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/events/RustboroCity_Mart.inc index 3949dcd2e..b95aa32af 100644 --- a/data/maps/events/RustboroCity_Mart.inc +++ b/data/maps/events/RustboroCity_Mart.inc @@ -5,8 +5,8 @@ RustboroCity_Mart_MapObjects:: @ 8388C34 object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 8, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C56, 0, 0, 0 RustboroCity_Mart_MapWarps:: @ 8388C94 - warp_def 3, 7, 0, 2, RustboroCity - warp_def 4, 7, 0, 2, RustboroCity + warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY + warp_def 4, 7, 0, 2, MAP_RUSTBORO_CITY RustboroCity_Mart_MapEvents:: @ 8388CA4 map_events RustboroCity_Mart_MapObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/events/RustboroCity_PokemonCenter_1F.inc index a0e7a3f76..83655d001 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_1F.inc +++ b/data/maps/events/RustboroCity_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ RustboroCity_PokemonCenter_1F_MapObjects:: @ 8388B24 object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157BA8, 0, 0, 0 RustboroCity_PokemonCenter_1F_MapWarps:: @ 8388B84 - warp_def 7, 8, 3, 3, RustboroCity - warp_def 6, 8, 3, 3, RustboroCity - warp_def 1, 6, 4, 0, RustboroCity_PokemonCenter_2F + warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY + warp_def 6, 8, 3, 3, MAP_RUSTBORO_CITY + warp_def 1, 6, 4, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_2F RustboroCity_PokemonCenter_1F_MapEvents:: @ 8388B9C map_events RustboroCity_PokemonCenter_1F_MapObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/events/RustboroCity_PokemonCenter_2F.inc index c75817126..d0c39d80f 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc +++ b/data/maps/events/RustboroCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ RustboroCity_PokemonCenter_2F_MapObjects:: @ 8388BB0 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BCD, 0, 0, 0 RustboroCity_PokemonCenter_2F_MapWarps:: @ 8388BF8 - warp_def 1, 5, 4, 2, RustboroCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM RustboroCity_PokemonCenter_2F_MapEvents:: @ 8388C20 map_events RustboroCity_PokemonCenter_2F_MapObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/events/RustboroCity_PokemonSchool.inc index 5ae481bad..ef873edb8 100644 --- a/data/maps/events/RustboroCity_PokemonSchool.inc +++ b/data/maps/events/RustboroCity_PokemonSchool.inc @@ -7,8 +7,8 @@ RustboroCity_PokemonSchool_MapObjects:: @ 8388A34 object_event 6, MAP_OBJ_GFX_GENTLEMAN, 0, 5, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157ACE, 0, 0, 0 RustboroCity_PokemonSchool_MapWarps:: @ 8388AC4 - warp_def 5, 10, 0, 4, RustboroCity - warp_def 6, 10, 0, 4, RustboroCity + warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY + warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY RustboroCity_PokemonSchool_MapBGEvents:: @ 8388AD4 bg_event 5, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc index ef1559687..4c25d2131 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/events/RusturfTunnel.inc @@ -1,19 +1,19 @@ RusturfTunnel_MapObjects:: @ 838BD2C - object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 23, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, 807, 0, 0 - object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 931, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, 1048, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, 1049, 0, 0 - object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 879, 0, 0 - object_event 6, 241, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, 878, 0, 0 - object_event 7, MAP_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, 880, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, S_BreakableRock, 932, 0, 0 + object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 23, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL, 0, 0 + object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, FLAG_ITEM_RUSTURF_TUNNEL_1, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, FLAG_ITEM_RUSTURF_TUNNEL_2, 0, 0 + object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BRINEY_RUSTURF_TUNNEL, 0, 0 + object_event 6, 241, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, FLAG_HIDE_GRUNT_RUSTURF_TUNNEL, 0, 0 + object_event 7, MAP_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2, 0, 0 object_event 9, MAP_OBJ_GFX_HIKER, 0, 32, 0, 13, 0, 3, 9, 17, 0, 1, 0, 3, 0, RusturfTunnel_EventScript_15CACD, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, 983, 0, 0 + object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL, 0, 0 RusturfTunnel_MapWarps:: @ 838BE1C - warp_def 4, 10, 3, 0, Route116 - warp_def 29, 16, 3, 4, VerdanturfTown - warp_def 18, 20, 3, 2, Route116 + warp_def 4, 10, 3, 0, MAP_ROUTE116 + warp_def 29, 16, 3, 4, MAP_VERDANTURF_TOWN + warp_def 18, 20, 3, 2, MAP_ROUTE116 RusturfTunnel_MapCoordEvents:: @ 838BE34 coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C999 diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/events/SSTidalCorridor.inc index b7eb1eb8f..9ca3db288 100644 --- a/data/maps/events/SSTidalCorridor.inc +++ b/data/maps/events/SSTidalCorridor.inc @@ -1,19 +1,19 @@ SSTidalCorridor_MapObjects:: @ 83916F8 object_event 1, MAP_OBJ_GFX_SAILOR, 0, 1, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FDD6, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SAILOR, 0, 16, 0, 7, 0, 3, 3, 32, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FE60, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD96, 950, 0, 0 - object_event 4, MAP_OBJ_GFX_WINGULL, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD9F, 950, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD96, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL, 0, 0 + object_event 4, MAP_OBJ_GFX_WINGULL, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD9F, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL, 0, 0 SSTidalCorridor_MapWarps:: @ 8391758 - warp_def 4, 9, 3, 0, SSTidalRooms - warp_def 7, 9, 3, 2, SSTidalRooms - warp_def 10, 9, 3, 4, SSTidalRooms - warp_def 13, 9, 3, 6, SSTidalRooms - warp_def 4, 3, 3, 8, SSTidalRooms - warp_def 7, 3, 3, 9, SSTidalRooms - warp_def 10, 3, 3, 10, SSTidalRooms - warp_def 13, 3, 3, 11, SSTidalRooms - warp_def 16, 2, 3, 0, SSTidalLowerDeck + warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS + warp_def 7, 9, 3, 2, MAP_SS_TIDAL_ROOMS + warp_def 10, 9, 3, 4, MAP_SS_TIDAL_ROOMS + warp_def 13, 9, 3, 6, MAP_SS_TIDAL_ROOMS + warp_def 4, 3, 3, 8, MAP_SS_TIDAL_ROOMS + warp_def 7, 3, 3, 9, MAP_SS_TIDAL_ROOMS + warp_def 10, 3, 3, 10, MAP_SS_TIDAL_ROOMS + warp_def 13, 3, 3, 11, MAP_SS_TIDAL_ROOMS + warp_def 16, 2, 3, 0, MAP_SS_TIDAL_LOWER_DECK SSTidalCorridor_MapBGEvents:: @ 83917A0 bg_event 2, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/events/SSTidalLowerDeck.inc index 6e8530c36..74c8458ce 100644 --- a/data/maps/events/SSTidalLowerDeck.inc +++ b/data/maps/events/SSTidalLowerDeck.inc @@ -3,7 +3,7 @@ SSTidalLowerDeck_MapObjects:: @ 8391844 object_event 2, MAP_OBJ_GFX_SAILOR, 0, 7, 0, 4, 0, 3, 50, 71, 0, 1, 0, 3, 0, SSTidalLowerDeck_EventScript_15FEEE, 0, 0, 0 SSTidalLowerDeck_MapWarps:: @ 8391874 - warp_def 15, 2, 3, 8, SSTidalCorridor + warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR SSTidalLowerDeck_MapBGEvents:: @ 839187C bg_event 0, 2, 0, 7, 0, ITEM_LEFTOVERS, 35, 0 diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/events/SSTidalRooms.inc index 0ffe1cbe7..af5fdbfa4 100644 --- a/data/maps/events/SSTidalRooms.inc +++ b/data/maps/events/SSTidalRooms.inc @@ -6,21 +6,21 @@ SSTidalRooms_MapObjects:: @ 839189C object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FFBD, 0, 0, 0 object_event 6, MAP_OBJ_GFX_BOY_4, 0, 22, 0, 11, 0, 3, 8, 17, 0, 1, 0, 3, 0, SSTidalRooms_EventScript_15FFD8, 0, 0, 0 object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 15, 0, 6, 0, 3, 9, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FFEF, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_MANIAC, 0, 28, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSTidalRooms_EventScript_15FF06, 951, 0, 0 + object_event 8, MAP_OBJ_GFX_MANIAC, 0, 28, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSTidalRooms_EventScript_15FF06, FLAG_HIDE_TM_49_GIVER_SS_TIDAL, 0, 0 SSTidalRooms_MapWarps:: @ 839195C - warp_def 4, 16, 0, 0, SSTidalCorridor - warp_def 5, 16, 0, 0, SSTidalCorridor - warp_def 13, 16, 0, 1, SSTidalCorridor - warp_def 14, 16, 0, 1, SSTidalCorridor - warp_def 22, 16, 0, 2, SSTidalCorridor - warp_def 23, 16, 0, 2, SSTidalCorridor - warp_def 31, 16, 0, 3, SSTidalCorridor - warp_def 32, 16, 0, 3, SSTidalCorridor - warp_def 4, 1, 0, 4, SSTidalCorridor - warp_def 13, 1, 0, 5, SSTidalCorridor - warp_def 22, 1, 0, 6, SSTidalCorridor - warp_def 31, 1, 0, 7, SSTidalCorridor + warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR + warp_def 5, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR + warp_def 13, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR + warp_def 14, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR + warp_def 22, 16, 0, 2, MAP_SS_TIDAL_CORRIDOR + warp_def 23, 16, 0, 2, MAP_SS_TIDAL_CORRIDOR + warp_def 31, 16, 0, 3, MAP_SS_TIDAL_CORRIDOR + warp_def 32, 16, 0, 3, MAP_SS_TIDAL_CORRIDOR + warp_def 4, 1, 0, 4, MAP_SS_TIDAL_CORRIDOR + warp_def 13, 1, 0, 5, MAP_SS_TIDAL_CORRIDOR + warp_def 22, 1, 0, 6, MAP_SS_TIDAL_CORRIDOR + warp_def 31, 1, 0, 7, MAP_SS_TIDAL_CORRIDOR SSTidalRooms_MapBGEvents:: @ 83919BC bg_event 15, 11, 0, 0, 0, SSTidalRooms_EventScript_15FF47 diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/events/SafariZone_Northeast.inc index cea87fb14..68c32e585 100644 --- a/data/maps/events/SafariZone_Northeast.inc +++ b/data/maps/events/SafariZone_Northeast.inc @@ -1,13 +1,13 @@ SafariZone_Northeast_MapObjects:: @ 8391A2C object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 22, 0, 9, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_160011, 0, 0, 0 object_event 2, MAP_OBJ_GFX_MAN_5, 0, 6, 0, 29, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_16001A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0 - object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B1919, 1119, 0, 0 + object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 + object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0 + object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B1919, FLAG_ITEM_SAFARI_ZONE_NORTHEAST_1, 0, 0 SafariZone_Northeast_MapEvents:: @ 8391B04 map_events SafariZone_Northeast_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/events/SafariZone_Northwest.inc index 0a1846b29..e2cabbd38 100644 --- a/data/maps/events/SafariZone_Northwest.inc +++ b/data/maps/events/SafariZone_Northwest.inc @@ -1,6 +1,6 @@ SafariZone_Northwest_MapObjects:: @ 83919E8 object_event 1, MAP_OBJ_GFX_MAN_1, 0, 8, 0, 8, 0, 5, 8, 0, 0, 0, 0, 0, 0, SafariZone_Northwest_EventScript_160007, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northwest_EventScript_1B190C, 1094, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northwest_EventScript_1B190C, FLAG_ITEM_SAFARI_ZONE_NORTHWEST_1, 0, 0 SafariZone_Northwest_MapEvents:: @ 8391A18 map_events SafariZone_Northwest_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/events/SafariZone_RestHouse.inc index d6de3f747..f52e734b7 100644 --- a/data/maps/events/SafariZone_RestHouse.inc +++ b/data/maps/events/SafariZone_RestHouse.inc @@ -4,8 +4,8 @@ SafariZone_RestHouse_MapObjects:: @ 8391EC0 object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 2, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, SafariZone_RestHouse_EventScript_160C41, 0, 0, 0 SafariZone_RestHouse_MapWarps:: @ 8391F08 - warp_def 3, 8, 0, 0, SafariZone_Southwest - warp_def 4, 8, 0, 0, SafariZone_Southwest + warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST + warp_def 4, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST SafariZone_RestHouse_MapEvents:: @ 8391F18 map_events SafariZone_RestHouse_MapObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/events/SafariZone_Southeast.inc index d67f018ab..c40dc967d 100644 --- a/data/maps/events/SafariZone_Southeast.inc +++ b/data/maps/events/SafariZone_Southeast.inc @@ -5,7 +5,7 @@ SafariZone_Southeast_MapObjects:: @ 8391B70 object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 15, 0, 31, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Southeast_EventScript_16009E, 0, 0, 0 SafariZone_Southeast_MapWarps:: @ 8391BD0 - warp_def 32, 33, 0, 0, Route121_SafariZoneEntrance + warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE SafariZone_Southeast_MapEvents:: @ 8391BD8 map_events SafariZone_Southeast_MapObjects, SafariZone_Southeast_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/events/SafariZone_Southwest.inc index 4f7f21de5..2beec82ae 100644 --- a/data/maps/events/SafariZone_Southwest.inc +++ b/data/maps/events/SafariZone_Southwest.inc @@ -1,9 +1,9 @@ SafariZone_Southwest_MapObjects:: @ 8391B18 object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 22, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SafariZone_Southwest_EventScript_160024, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Southwest_EventScript_1B1926, 1131, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Southwest_EventScript_1B1926, FLAG_ITEM_SAFARI_ZONE_SOUTHWEST, 0, 0 SafariZone_Southwest_MapWarps:: @ 8391B48 - warp_def 29, 7, 3, 0, SafariZone_RestHouse + warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE SafariZone_Southwest_MapBGEvents:: @ 8391B50 bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_16002D diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/events/ScorchedSlab.inc index 4b6625b52..1a4f4d92d 100644 --- a/data/maps/events/ScorchedSlab.inc +++ b/data/maps/events/ScorchedSlab.inc @@ -1,8 +1,8 @@ ScorchedSlab_MapObjects:: @ 838E988 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, ScorchedSlab_EventScript_1B18FF, 1079, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, ScorchedSlab_EventScript_1B18FF, FLAG_ITEM_SCORCHED_SLAB_1, 0, 0 ScorchedSlab_MapWarps:: @ 838E9A0 - warp_def 7, 16, 1, 1, Route120 + warp_def 7, 16, 1, 1, MAP_ROUTE120 ScorchedSlab_MapEvents:: @ 838E9A8 map_events ScorchedSlab_MapObjects, ScorchedSlab_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/events/SeafloorCavern_Entrance.inc index a7f08532c..4f6fa0c07 100644 --- a/data/maps/events/SeafloorCavern_Entrance.inc +++ b/data/maps/events/SeafloorCavern_Entrance.inc @@ -1,6 +1,6 @@ SeafloorCavern_Entrance_MapWarps:: @ 838D094 - warp_def 10, 18, 3, 0, Underwater4 - warp_def 10, 1, 3, 0, SeafloorCavern_Room1 + warp_def 10, 18, 3, 0, MAP_UNDERWATER4 + warp_def 10, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM1 SeafloorCavern_Entrance_MapEvents:: @ 838D0A4 map_events 0x0, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc index 093934481..b86a61cb8 100644 --- a/data/maps/events/SeafloorCavern_Room1.inc +++ b/data/maps/events/SeafloorCavern_Room1.inc @@ -1,14 +1,14 @@ SeafloorCavern_Room1_MapObjects:: @ 838D0B8 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0 - object_event 4, 241, 0, 8, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, SeafloorCavern_Room1_EventScript_15DA6D, 946, 0, 0 - object_event 5, 241, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, 946, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 + object_event 4, 241, 0, 8, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, SeafloorCavern_Room1_EventScript_15DA6D, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 + object_event 5, 241, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 SeafloorCavern_Room1_MapWarps:: @ 838D130 - warp_def 5, 18, 3, 1, SeafloorCavern_Entrance - warp_def 17, 13, 3, 0, SeafloorCavern_Room5 - warp_def 6, 2, 3, 0, SeafloorCavern_Room2 + warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE + warp_def 17, 13, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM5 + warp_def 6, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM2 SeafloorCavern_Room1_MapEvents:: @ 838D148 map_events SeafloorCavern_Room1_MapObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/events/SeafloorCavern_Room2.inc index 86a0354e4..e9da0033e 100644 --- a/data/maps/events/SeafloorCavern_Room2.inc +++ b/data/maps/events/SeafloorCavern_Room2.inc @@ -1,19 +1,19 @@ SeafloorCavern_Room2_MapObjects:: @ 838D15C - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 24, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 25, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_18, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 SeafloorCavern_Room2_MapWarps:: @ 838D234 - warp_def 12, 19, 3, 2, SeafloorCavern_Room1 - warp_def 5, 19, 3, 0, SeafloorCavern_Room4 - warp_def 5, 2, 3, 0, SeafloorCavern_Room6 - warp_def 12, 2, 3, 0, SeafloorCavern_Room7 + warp_def 12, 19, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 + warp_def 5, 19, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM4 + warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM6 + warp_def 12, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM7 SeafloorCavern_Room2_MapEvents:: @ 838D254 map_events SeafloorCavern_Room2_MapObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc index 5c5c9c219..a78848955 100644 --- a/data/maps/events/SeafloorCavern_Room3.inc +++ b/data/maps/events/SeafloorCavern_Room3.inc @@ -1,19 +1,19 @@ SeafloorCavern_Room3_MapObjects:: @ 838D268 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0 - object_event 10, 242, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, 946, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 + object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0 + object_event 10, 242, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 SeafloorCavern_Room3_MapWarps:: @ 838D358 - warp_def 8, 1, 3, 1, SeafloorCavern_Room8 - warp_def 10, 13, 3, 1, SeafloorCavern_Room7 - warp_def 4, 15, 3, 1, SeafloorCavern_Room6 + warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 + warp_def 10, 13, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM7 + warp_def 4, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM6 SeafloorCavern_Room3_MapEvents:: @ 838D370 map_events SeafloorCavern_Room3_MapObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/events/SeafloorCavern_Room4.inc index 3233123b3..565bcfcae 100644 --- a/data/maps/events/SeafloorCavern_Room4.inc +++ b/data/maps/events/SeafloorCavern_Room4.inc @@ -1,11 +1,11 @@ SeafloorCavern_Room4_MapObjects:: @ 838D384 - object_event 1, 241, 0, 4, 0, 8, 0, 3, 23, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room4_EventScript_15DACB, 946, 0, 0 + object_event 1, 241, 0, 4, 0, 8, 0, 3, 23, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room4_EventScript_15DACB, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 SeafloorCavern_Room4_MapWarps:: @ 838D39C - warp_def 13, 1, 3, 1, SeafloorCavern_Room2 - warp_def 4, 1, 3, 1, SeafloorCavern_Room5 - warp_def 9, 10, 3, 2, SeafloorCavern_Room5 - warp_def 10, 15, 3, 1, SeafloorCavern_Entrance + warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2 + warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM5 + warp_def 9, 10, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM5 + warp_def 10, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE SeafloorCavern_Room4_MapEvents:: @ 838D3BC map_events SeafloorCavern_Room4_MapObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/events/SeafloorCavern_Room5.inc index 37a501512..887ee1eb9 100644 --- a/data/maps/events/SeafloorCavern_Room5.inc +++ b/data/maps/events/SeafloorCavern_Room5.inc @@ -1,15 +1,15 @@ SeafloorCavern_Room5_MapObjects:: @ 838D3D0 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 SeafloorCavern_Room5_MapWarps:: @ 838D460 - warp_def 4, 1, 3, 1, SeafloorCavern_Room1 - warp_def 15, 12, 3, 1, SeafloorCavern_Room4 - warp_def 7, 17, 3, 2, SeafloorCavern_Room4 + warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1 + warp_def 15, 12, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM4 + warp_def 7, 17, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM4 SeafloorCavern_Room5_MapEvents:: @ 838D478 map_events SeafloorCavern_Room5_MapObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room6.inc b/data/maps/events/SeafloorCavern_Room6.inc index 9055af75b..adf36455a 100644 --- a/data/maps/events/SeafloorCavern_Room6.inc +++ b/data/maps/events/SeafloorCavern_Room6.inc @@ -1,7 +1,7 @@ SeafloorCavern_Room6_MapWarps:: @ 838D48C - warp_def 11, 21, 3, 2, SeafloorCavern_Room2 - warp_def 4, 1, 3, 2, SeafloorCavern_Room3 - warp_def 14, 8, 1, 1, SeafloorCavern_Entrance + warp_def 11, 21, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM2 + warp_def 4, 1, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM3 + warp_def 14, 8, 1, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE SeafloorCavern_Room6_MapEvents:: @ 838D4A4 map_events 0x0, SeafloorCavern_Room6_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room7.inc b/data/maps/events/SeafloorCavern_Room7.inc index 7125027fd..616376e32 100644 --- a/data/maps/events/SeafloorCavern_Room7.inc +++ b/data/maps/events/SeafloorCavern_Room7.inc @@ -1,6 +1,6 @@ SeafloorCavern_Room7_MapWarps:: @ 838D4B8 - warp_def 3, 23, 3, 3, SeafloorCavern_Room2 - warp_def 5, 1, 3, 1, SeafloorCavern_Room3 + warp_def 3, 23, 3, 3, MAP_SEAFLOOR_CAVERN_ROOM2 + warp_def 5, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM3 SeafloorCavern_Room7_MapEvents:: @ 838D4C8 map_events 0x0, SeafloorCavern_Room7_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/events/SeafloorCavern_Room8.inc index 2d7329aec..35d230ff2 100644 --- a/data/maps/events/SeafloorCavern_Room8.inc +++ b/data/maps/events/SeafloorCavern_Room8.inc @@ -1,20 +1,20 @@ SeafloorCavern_Room8_MapObjects:: @ 838D4DC - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0 - object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 26, 0, 0 - object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 27, 0, 0 - object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 28, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 + object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0 + object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A, 0, 0 + object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B, 0, 0 + object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1C, 0, 0 SeafloorCavern_Room8_MapWarps:: @ 838D5FC - warp_def 5, 2, 3, 0, SeafloorCavern_Room9 - warp_def 5, 12, 3, 0, SeafloorCavern_Room3 + warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 + warp_def 5, 12, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM3 SeafloorCavern_Room8_MapEvents:: @ 838D60C map_events SeafloorCavern_Room8_MapObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc index 2fccd4fec..77719389b 100644 --- a/data/maps/events/SeafloorCavern_Room9.inc +++ b/data/maps/events/SeafloorCavern_Room9.inc @@ -1,14 +1,14 @@ SeafloorCavern_Room9_MapObjects:: @ 838D620 - object_event 1, 248, 0, 17, 0, 38, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 859, 0, 0 - object_event 2, 246, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 828, 0, 0 - object_event 3, 247, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 829, 0, 0 - object_event 4, 244, 0, 8, 0, 41, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 831, 0, 0 - object_event 5, 245, 0, 8, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 831, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, 1090, 0, 0 - object_event 7, 249, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 733, 0, 0 + object_event 1, 248, 0, 17, 0, 38, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN, 0, 0 + object_event 2, 246, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN, 0, 0 + object_event 3, 247, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN, 0, 0 + object_event 4, 244, 0, 8, 0, 41, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 + object_event 5, 245, 0, 8, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1, 0, 0 + object_event 7, 249, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN, 0, 0 SeafloorCavern_Room9_MapWarps:: @ 838D6C8 - warp_def 5, 4, 3, 0, SeafloorCavern_Room8 + warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 SeafloorCavern_Room9_MapCoordEvents:: @ 838D6D0 coord_event 17, 42, 3, 0, 0x40a2, 0, 0, SeafloorCavern_Room9_EventScript_15DAFA diff --git a/data/maps/events/SealedChamber_InnerRoom.inc b/data/maps/events/SealedChamber_InnerRoom.inc index 260de2dd9..a457a4e03 100644 --- a/data/maps/events/SealedChamber_InnerRoom.inc +++ b/data/maps/events/SealedChamber_InnerRoom.inc @@ -1,5 +1,5 @@ SealedChamber_InnerRoom_MapWarps:: @ 838E900 - warp_def 10, 19, 3, 0, SealedChamber_OuterRoom + warp_def 10, 19, 3, 0, MAP_SEALED_CHAMBER_OUTER_ROOM SealedChamber_InnerRoom_MapBGEvents:: @ 838E908 bg_event 10, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 diff --git a/data/maps/events/SealedChamber_OuterRoom.inc b/data/maps/events/SealedChamber_OuterRoom.inc index 5251d401a..634f41f60 100644 --- a/data/maps/events/SealedChamber_OuterRoom.inc +++ b/data/maps/events/SealedChamber_OuterRoom.inc @@ -1,5 +1,5 @@ SealedChamber_OuterRoom_MapWarps:: @ 838E788 - warp_def 10, 2, 3, 0, SealedChamber_InnerRoom + warp_def 10, 2, 3, 0, MAP_SEALED_CHAMBER_INNER_ROOM SealedChamber_OuterRoom_MapBGEvents:: @ 838E790 bg_event 5, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc index 25bab40da..1ef513e65 100644 --- a/data/maps/events/SecretBase_BlueCave1.inc +++ b/data/maps/events/SecretBase_BlueCave1.inc @@ -1,22 +1,22 @@ SecretBase_BlueCave1_MapObjects:: @ 838F18C - object_event 1, 255, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BlueCave1_MapWarps:: @ 838F2F4 - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_BlueCave1_MapEvents:: @ 838F2FC map_events SecretBase_BlueCave1_MapObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc index a7eac24a4..2a2fdb421 100644 --- a/data/maps/events/SecretBase_BlueCave2.inc +++ b/data/maps/events/SecretBase_BlueCave2.inc @@ -1,22 +1,22 @@ SecretBase_BlueCave2_MapObjects:: @ 838FAA4 - object_event 1, 255, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BlueCave2_MapWarps:: @ 838FC0C - warp_def 7, 5, 0, 126, NONE + warp_def 7, 5, 0, 126, MAP_NONE SecretBase_BlueCave2_MapEvents:: @ 838FC14 map_events SecretBase_BlueCave2_MapObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc index 202c2bc4e..8fc65ad54 100644 --- a/data/maps/events/SecretBase_BlueCave3.inc +++ b/data/maps/events/SecretBase_BlueCave3.inc @@ -1,22 +1,22 @@ SecretBase_BlueCave3_MapObjects:: @ 83903BC - object_event 1, 255, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BlueCave3_MapWarps:: @ 8390524 - warp_def 4, 15, 0, 126, NONE + warp_def 4, 15, 0, 126, MAP_NONE SecretBase_BlueCave3_MapEvents:: @ 839052C map_events SecretBase_BlueCave3_MapObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc index 2975c0b37..497123d44 100644 --- a/data/maps/events/SecretBase_BlueCave4.inc +++ b/data/maps/events/SecretBase_BlueCave4.inc @@ -1,22 +1,22 @@ SecretBase_BlueCave4_MapObjects:: @ 8390CD4 - object_event 1, 255, 0, 5, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BlueCave4_MapWarps:: @ 8390E3C - warp_def 4, 15, 0, 126, NONE + warp_def 4, 15, 0, 126, MAP_NONE SecretBase_BlueCave4_MapEvents:: @ 8390E44 map_events SecretBase_BlueCave4_MapObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc index 31e2d0117..2db31b4d2 100644 --- a/data/maps/events/SecretBase_BrownCave1.inc +++ b/data/maps/events/SecretBase_BrownCave1.inc @@ -1,22 +1,22 @@ SecretBase_BrownCave1_MapObjects:: @ 838F008 - object_event 1, 255, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BrownCave1_MapWarps:: @ 838F170 - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_BrownCave1_MapEvents:: @ 838F178 map_events SecretBase_BrownCave1_MapObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc index 93f9a3c03..72fb53a86 100644 --- a/data/maps/events/SecretBase_BrownCave2.inc +++ b/data/maps/events/SecretBase_BrownCave2.inc @@ -1,22 +1,22 @@ SecretBase_BrownCave2_MapObjects:: @ 838F920 - object_event 1, 255, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BrownCave2_MapWarps:: @ 838FA88 - warp_def 1, 7, 0, 126, NONE + warp_def 1, 7, 0, 126, MAP_NONE SecretBase_BrownCave2_MapEvents:: @ 838FA90 map_events SecretBase_BrownCave2_MapObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc index 5aa5aed7a..2b320d6bb 100644 --- a/data/maps/events/SecretBase_BrownCave3.inc +++ b/data/maps/events/SecretBase_BrownCave3.inc @@ -1,22 +1,22 @@ SecretBase_BrownCave3_MapObjects:: @ 8390238 - object_event 1, 255, 0, 1, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 1, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BrownCave3_MapWarps:: @ 83903A0 - warp_def 11, 9, 0, 126, NONE + warp_def 11, 9, 0, 126, MAP_NONE SecretBase_BrownCave3_MapEvents:: @ 83903A8 map_events SecretBase_BrownCave3_MapObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc index fc66e8fb5..26b0f2537 100644 --- a/data/maps/events/SecretBase_BrownCave4.inc +++ b/data/maps/events/SecretBase_BrownCave4.inc @@ -1,22 +1,22 @@ SecretBase_BrownCave4_MapObjects:: @ 8390B50 - object_event 1, 255, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BrownCave4_MapWarps:: @ 8390CB8 - warp_def 2, 8, 0, 126, NONE + warp_def 2, 8, 0, 126, MAP_NONE SecretBase_BrownCave4_MapEvents:: @ 8390CC0 map_events SecretBase_BrownCave4_MapObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc index dbc8c7593..733d4d808 100644 --- a/data/maps/events/SecretBase_RedCave1.inc +++ b/data/maps/events/SecretBase_RedCave1.inc @@ -1,22 +1,22 @@ SecretBase_RedCave1_MapObjects:: @ 838EE84 - object_event 1, 255, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_RedCave1_MapWarps:: @ 838EFEC - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_RedCave1_MapEvents:: @ 838EFF4 map_events SecretBase_RedCave1_MapObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc index 910b2c074..84fcd52f0 100644 --- a/data/maps/events/SecretBase_RedCave2.inc +++ b/data/maps/events/SecretBase_RedCave2.inc @@ -1,22 +1,22 @@ SecretBase_RedCave2_MapObjects:: @ 838F79C - object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_RedCave2_MapWarps:: @ 838F904 - warp_def 3, 14, 0, 126, NONE + warp_def 3, 14, 0, 126, MAP_NONE SecretBase_RedCave2_MapEvents:: @ 838F90C map_events SecretBase_RedCave2_MapObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc index 8745b272f..f129a82fb 100644 --- a/data/maps/events/SecretBase_RedCave3.inc +++ b/data/maps/events/SecretBase_RedCave3.inc @@ -1,22 +1,22 @@ SecretBase_RedCave3_MapObjects:: @ 83900B4 - object_event 1, 255, 0, 12, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 12, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_RedCave3_MapWarps:: @ 839021C - warp_def 3, 6, 0, 126, NONE + warp_def 3, 6, 0, 126, MAP_NONE SecretBase_RedCave3_MapEvents:: @ 8390224 map_events SecretBase_RedCave3_MapObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc index 60928ef5c..97e71648e 100644 --- a/data/maps/events/SecretBase_RedCave4.inc +++ b/data/maps/events/SecretBase_RedCave4.inc @@ -1,22 +1,22 @@ SecretBase_RedCave4_MapObjects:: @ 83909CC - object_event 1, 255, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_RedCave4_MapWarps:: @ 8390B34 - warp_def 2, 12, 0, 126, NONE + warp_def 2, 12, 0, 126, MAP_NONE SecretBase_RedCave4_MapEvents:: @ 8390B3C map_events SecretBase_RedCave4_MapObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc index 17c2f2530..7727f5efb 100644 --- a/data/maps/events/SecretBase_Shrub1.inc +++ b/data/maps/events/SecretBase_Shrub1.inc @@ -1,22 +1,22 @@ SecretBase_Shrub1_MapObjects:: @ 838F618 - object_event 1, 255, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Shrub1_MapWarps:: @ 838F780 - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_Shrub1_MapEvents:: @ 838F788 map_events SecretBase_Shrub1_MapObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc index 6b973e730..32b495b05 100644 --- a/data/maps/events/SecretBase_Shrub2.inc +++ b/data/maps/events/SecretBase_Shrub2.inc @@ -1,22 +1,22 @@ SecretBase_Shrub2_MapObjects:: @ 838FF30 - object_event 1, 255, 0, 13, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 13, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Shrub2_MapWarps:: @ 8390098 - warp_def 7, 5, 0, 126, NONE + warp_def 7, 5, 0, 126, MAP_NONE SecretBase_Shrub2_MapEvents:: @ 83900A0 map_events SecretBase_Shrub2_MapObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc index 12e2c7c81..173305a86 100644 --- a/data/maps/events/SecretBase_Shrub3.inc +++ b/data/maps/events/SecretBase_Shrub3.inc @@ -1,22 +1,22 @@ SecretBase_Shrub3_MapObjects:: @ 8390848 - object_event 1, 255, 0, 5, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Shrub3_MapWarps:: @ 83909B0 - warp_def 6, 9, 0, 126, NONE + warp_def 6, 9, 0, 126, MAP_NONE SecretBase_Shrub3_MapEvents:: @ 83909B8 map_events SecretBase_Shrub3_MapObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc index bd3b94522..1920bbd08 100644 --- a/data/maps/events/SecretBase_Shrub4.inc +++ b/data/maps/events/SecretBase_Shrub4.inc @@ -1,22 +1,22 @@ SecretBase_Shrub4_MapObjects:: @ 8391160 - object_event 1, 255, 0, 9, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 9, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Shrub4_MapWarps:: @ 83912C8 - warp_def 11, 8, 0, 126, NONE + warp_def 11, 8, 0, 126, MAP_NONE SecretBase_Shrub4_MapEvents:: @ 83912D0 map_events SecretBase_Shrub4_MapObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc index 465a0d2be..a43b1ad76 100644 --- a/data/maps/events/SecretBase_Tree1.inc +++ b/data/maps/events/SecretBase_Tree1.inc @@ -1,22 +1,22 @@ SecretBase_Tree1_MapObjects:: @ 838F494 - object_event 1, 255, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Tree1_MapWarps:: @ 838F5FC - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_Tree1_MapEvents:: @ 838F604 map_events SecretBase_Tree1_MapObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc index d780ed779..aa0ef4b7d 100644 --- a/data/maps/events/SecretBase_Tree2.inc +++ b/data/maps/events/SecretBase_Tree2.inc @@ -1,22 +1,22 @@ SecretBase_Tree2_MapObjects:: @ 838FDAC - object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Tree2_MapWarps:: @ 838FF14 - warp_def 3, 14, 0, 126, NONE + warp_def 3, 14, 0, 126, MAP_NONE SecretBase_Tree2_MapEvents:: @ 838FF1C map_events SecretBase_Tree2_MapObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc index 0c8888764..69414c222 100644 --- a/data/maps/events/SecretBase_Tree3.inc +++ b/data/maps/events/SecretBase_Tree3.inc @@ -1,22 +1,22 @@ SecretBase_Tree3_MapObjects:: @ 83906C4 - object_event 1, 255, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Tree3_MapWarps:: @ 839082C - warp_def 8, 6, 0, 126, NONE + warp_def 8, 6, 0, 126, MAP_NONE SecretBase_Tree3_MapEvents:: @ 8390834 map_events SecretBase_Tree3_MapObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc index 675ee1b8e..3ea6c57ea 100644 --- a/data/maps/events/SecretBase_Tree4.inc +++ b/data/maps/events/SecretBase_Tree4.inc @@ -1,22 +1,22 @@ SecretBase_Tree4_MapObjects:: @ 8390FDC - object_event 1, 255, 0, 10, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 10, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Tree4_MapWarps:: @ 8391144 - warp_def 7, 12, 0, 126, NONE + warp_def 7, 12, 0, 126, MAP_NONE SecretBase_Tree4_MapEvents:: @ 839114C map_events SecretBase_Tree4_MapObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc index 8c6999f9b..12fd311e3 100644 --- a/data/maps/events/SecretBase_YellowCave1.inc +++ b/data/maps/events/SecretBase_YellowCave1.inc @@ -1,22 +1,22 @@ SecretBase_YellowCave1_MapObjects:: @ 838F310 - object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_YellowCave1_MapWarps:: @ 838F478 - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_YellowCave1_MapEvents:: @ 838F480 map_events SecretBase_YellowCave1_MapObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc index 8825836bf..5e3abde63 100644 --- a/data/maps/events/SecretBase_YellowCave2.inc +++ b/data/maps/events/SecretBase_YellowCave2.inc @@ -1,22 +1,22 @@ SecretBase_YellowCave2_MapObjects:: @ 838FC28 - object_event 1, 255, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_YellowCave2_MapWarps:: @ 838FD90 - warp_def 12, 7, 0, 126, NONE + warp_def 12, 7, 0, 126, MAP_NONE SecretBase_YellowCave2_MapEvents:: @ 838FD98 map_events SecretBase_YellowCave2_MapObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc index a88e44190..3a139d2d9 100644 --- a/data/maps/events/SecretBase_YellowCave3.inc +++ b/data/maps/events/SecretBase_YellowCave3.inc @@ -1,22 +1,22 @@ SecretBase_YellowCave3_MapObjects:: @ 8390540 - object_event 1, 255, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_YellowCave3_MapWarps:: @ 83906A8 - warp_def 5, 9, 0, 126, NONE + warp_def 5, 9, 0, 126, MAP_NONE SecretBase_YellowCave3_MapEvents:: @ 83906B0 map_events SecretBase_YellowCave3_MapObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc index 0280e088a..5812a25e0 100644 --- a/data/maps/events/SecretBase_YellowCave4.inc +++ b/data/maps/events/SecretBase_YellowCave4.inc @@ -1,22 +1,22 @@ SecretBase_YellowCave4_MapObjects:: @ 8390E58 - object_event 1, 255, 0, 9, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 9, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_YellowCave4_MapWarps:: @ 8390FC0 - warp_def 6, 12, 0, 126, NONE + warp_def 6, 12, 0, 126, MAP_NONE SecretBase_YellowCave4_MapEvents:: @ 8390FC8 map_events SecretBase_YellowCave4_MapObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc index a9381d0c4..8d38fb3ee 100644 --- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc @@ -1,12 +1,12 @@ ShoalCave_LowTideEntranceRoom_MapObjects:: @ 838DCDC - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_1B19F6, 1081, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_1B19F6, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1, 0, 0 object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 18, 0, 15, 0, 3, 9, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_15E076, 0, 0, 0 ShoalCave_LowTideEntranceRoom_MapWarps:: @ 838DD0C - warp_def 20, 30, 3, 0, Route125 - warp_def 19, 5, 3, 0, ShoalCave_LowTideInnerRoom - warp_def 6, 2, 3, 6, ShoalCave_LowTideInnerRoom - warp_def 27, 2, 3, 7, ShoalCave_LowTideInnerRoom + warp_def 20, 30, 3, 0, MAP_ROUTE125 + warp_def 19, 5, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 6, 2, 3, 6, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 27, 2, 3, 7, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM ShoalCave_LowTideEntranceRoom_MapEvents:: @ 838DD2C map_events ShoalCave_LowTideEntranceRoom_MapObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/events/ShoalCave_LowTideIceRoom.inc index 2d5958a37..6e1b36d08 100644 --- a/data/maps/events/ShoalCave_LowTideIceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideIceRoom.inc @@ -1,9 +1,9 @@ ShoalCave_LowTideIceRoom_MapObjects:: @ 838EDE0 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A1D, 1112, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 21, 0, 4, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A2A, 1113, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A1D, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_1, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 21, 0, 4, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A2A, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_2, 0, 0 ShoalCave_LowTideIceRoom_MapWarps:: @ 838EE10 - warp_def 17, 10, 3, 3, ShoalCave_LowTideLowerRoom + warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM ShoalCave_LowTideIceRoom_MapEvents:: @ 838EE18 map_events ShoalCave_LowTideIceRoom_MapObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/events/ShoalCave_LowTideInnerRoom.inc index 954c4c5e9..c699b5e11 100644 --- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideInnerRoom.inc @@ -1,15 +1,15 @@ ShoalCave_LowTideInnerRoom_MapObjects:: @ 838DD40 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 14, 0, 5, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_1B1A03, 1082, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 14, 0, 5, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_1B1A03, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_INNER_ROOM_1, 0, 0 ShoalCave_LowTideInnerRoom_MapWarps:: @ 838DD58 - warp_def 34, 29, 3, 1, ShoalCave_LowTideEntranceRoom - warp_def 38, 15, 3, 0, ShoalCave_LowTideStairsRoom - warp_def 42, 4, 3, 1, ShoalCave_LowTideStairsRoom - warp_def 19, 14, 4, 0, ShoalCave_LowTideLowerRoom - warp_def 15, 19, 3, 1, ShoalCave_LowTideLowerRoom - warp_def 30, 25, 3, 2, ShoalCave_LowTideLowerRoom - warp_def 14, 33, 5, 2, ShoalCave_LowTideEntranceRoom - warp_def 40, 33, 5, 3, ShoalCave_LowTideEntranceRoom + warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM + warp_def 38, 15, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM + warp_def 42, 4, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM + warp_def 19, 14, 4, 0, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM + warp_def 15, 19, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM + warp_def 30, 25, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM + warp_def 14, 33, 5, 2, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM + warp_def 40, 33, 5, 3, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM ShoalCave_LowTideInnerRoom_MapBGEvents:: @ 838DD98 bg_event 31, 8, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E329 diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/events/ShoalCave_LowTideLowerRoom.inc index 858f919e0..ba5a0f495 100644 --- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideLowerRoom.inc @@ -1,12 +1,12 @@ ShoalCave_LowTideLowerRoom_MapObjects:: @ 838DE3C - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 11, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0, 0, 0 ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C - warp_def 7, 2, 3, 3, ShoalCave_LowTideInnerRoom - warp_def 2, 6, 3, 4, ShoalCave_LowTideInnerRoom - warp_def 19, 11, 3, 5, ShoalCave_LowTideInnerRoom - warp_def 28, 11, 3, 0, ShoalCave_LowTideIceRoom + warp_def 7, 2, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 2, 6, 3, 4, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 19, 11, 3, 5, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 28, 11, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM ShoalCave_LowTideLowerRoom_MapBGEvents:: @ 838DE8C bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E413 diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/events/ShoalCave_LowTideStairsRoom.inc index 878b1fca0..f4027a22f 100644 --- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc +++ b/data/maps/events/ShoalCave_LowTideStairsRoom.inc @@ -1,9 +1,9 @@ ShoalCave_LowTideStairsRoom_MapObjects:: @ 838DDF4 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_1B1A10, 1083, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_1B1A10, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM_1, 0, 0 ShoalCave_LowTideStairsRoom_MapWarps:: @ 838DE0C - warp_def 3, 12, 3, 1, ShoalCave_LowTideInnerRoom - warp_def 7, 4, 3, 2, ShoalCave_LowTideInnerRoom + warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 7, 4, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM ShoalCave_LowTideStairsRoom_MapBGEvents:: @ 838DE1C bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_15E3B7 diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc index 1d4b51476..181195444 100644 --- a/data/maps/events/SingleBattleColosseum.inc +++ b/data/maps/events/SingleBattleColosseum.inc @@ -2,8 +2,8 @@ SingleBattleColosseum_MapObjects:: @ 83912E4 object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 9, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SingleBattleColosseum_EventScript_1A449E, 0, 0, 0 SingleBattleColosseum_MapWarps:: @ 83912FC - warp_def 6, 8, 3, 127, NONE - warp_def 7, 8, 3, 127, NONE + warp_def 6, 8, 3, 127, MAP_NONE + warp_def 7, 8, 3, 127, MAP_NONE SingleBattleColosseum_MapCoordEvents:: @ 839130C coord_event 3, 5, 3, 0, 0x4000, 0, 0, SingleBattleColosseum_EventScript_1A436F diff --git a/data/maps/events/SkyPillar_1F.inc b/data/maps/events/SkyPillar_1F.inc index eaf7fa955..2af7aaa76 100644 --- a/data/maps/events/SkyPillar_1F.inc +++ b/data/maps/events/SkyPillar_1F.inc @@ -1,7 +1,7 @@ SkyPillar_1F_MapWarps:: @ 838ED38 - warp_def 6, 13, 3, 1, SkyPillar_Outside - warp_def 7, 13, 3, 1, SkyPillar_Outside - warp_def 10, 1, 3, 0, SkyPillar_2F + warp_def 6, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE + warp_def 7, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE + warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_2F SkyPillar_1F_MapEvents:: @ 838ED50 map_events 0x0, SkyPillar_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_2F.inc b/data/maps/events/SkyPillar_2F.inc index ffd0d7d25..48fcb9fec 100644 --- a/data/maps/events/SkyPillar_2F.inc +++ b/data/maps/events/SkyPillar_2F.inc @@ -1,6 +1,6 @@ SkyPillar_2F_MapWarps:: @ 838ED64 - warp_def 10, 1, 3, 2, SkyPillar_1F - warp_def 3, 1, 3, 0, SkyPillar_3F + warp_def 10, 1, 3, 2, MAP_SKY_PILLAR_1F + warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_3F SkyPillar_2F_MapEvents:: @ 838ED74 map_events 0x0, SkyPillar_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_3F.inc b/data/maps/events/SkyPillar_3F.inc index c34440ab7..4aeda3339 100644 --- a/data/maps/events/SkyPillar_3F.inc +++ b/data/maps/events/SkyPillar_3F.inc @@ -1,7 +1,7 @@ SkyPillar_3F_MapWarps:: @ 838ED88 - warp_def 3, 1, 3, 1, SkyPillar_2F - warp_def 11, 1, 3, 0, SkyPillar_4F - warp_def 7, 1, 3, 1, SkyPillar_4F + warp_def 3, 1, 3, 1, MAP_SKY_PILLAR_2F + warp_def 11, 1, 3, 0, MAP_SKY_PILLAR_4F + warp_def 7, 1, 3, 1, MAP_SKY_PILLAR_4F SkyPillar_3F_MapEvents:: @ 838EDA0 map_events 0x0, SkyPillar_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_4F.inc b/data/maps/events/SkyPillar_4F.inc index 77586a25a..3e908ed74 100644 --- a/data/maps/events/SkyPillar_4F.inc +++ b/data/maps/events/SkyPillar_4F.inc @@ -1,7 +1,7 @@ SkyPillar_4F_MapWarps:: @ 838EDB4 - warp_def 11, 1, 3, 1, SkyPillar_3F - warp_def 7, 1, 3, 2, SkyPillar_3F - warp_def 3, 1, 3, 0, SkyPillar_5F + warp_def 11, 1, 3, 1, MAP_SKY_PILLAR_3F + warp_def 7, 1, 3, 2, MAP_SKY_PILLAR_3F + warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_5F SkyPillar_4F_MapEvents:: @ 838EDCC map_events 0x0, SkyPillar_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_5F.inc b/data/maps/events/SkyPillar_5F.inc index 7c4ea5a97..badae77af 100644 --- a/data/maps/events/SkyPillar_5F.inc +++ b/data/maps/events/SkyPillar_5F.inc @@ -1,6 +1,6 @@ SkyPillar_5F_MapWarps:: @ 838EE2C - warp_def 3, 1, 3, 2, SkyPillar_4F - warp_def 10, 1, 3, 0, SkyPillar_Top + warp_def 3, 1, 3, 2, MAP_SKY_PILLAR_4F + warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_TOP SkyPillar_5F_MapEvents:: @ 838EE3C map_events 0x0, SkyPillar_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_Entrance.inc b/data/maps/events/SkyPillar_Entrance.inc index d27442989..904b3b9ae 100644 --- a/data/maps/events/SkyPillar_Entrance.inc +++ b/data/maps/events/SkyPillar_Entrance.inc @@ -1,6 +1,6 @@ SkyPillar_Entrance_MapWarps:: @ 838ECF0 - warp_def 6, 16, 3, 0, Route131 - warp_def 14, 4, 3, 0, SkyPillar_Outside + warp_def 6, 16, 3, 0, MAP_ROUTE131 + warp_def 14, 4, 3, 0, MAP_SKY_PILLAR_OUTSIDE SkyPillar_Entrance_MapEvents:: @ 838ED00 map_events 0x0, SkyPillar_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_Outside.inc b/data/maps/events/SkyPillar_Outside.inc index 05ffe4df8..120cd982b 100644 --- a/data/maps/events/SkyPillar_Outside.inc +++ b/data/maps/events/SkyPillar_Outside.inc @@ -1,6 +1,6 @@ SkyPillar_Outside_MapWarps:: @ 838ED14 - warp_def 17, 13, 3, 1, SkyPillar_Entrance - warp_def 14, 5, 3, 0, SkyPillar_1F + warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE + warp_def 14, 5, 3, 0, MAP_SKY_PILLAR_1F SkyPillar_Outside_MapEvents:: @ 838ED24 map_events 0x0, SkyPillar_Outside_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/events/SkyPillar_Top.inc index 6c9d8abc6..5d5fc52d4 100644 --- a/data/maps/events/SkyPillar_Top.inc +++ b/data/maps/events/SkyPillar_Top.inc @@ -1,8 +1,8 @@ SkyPillar_Top_MapObjects:: @ 838EE50 - object_event 1, MAP_OBJ_GFX_RAYQUAZA, 0, 14, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, SkyPillar_Top_EventScript_15F316, 773, 0, 0 + object_event 1, MAP_OBJ_GFX_RAYQUAZA, 0, 14, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, SkyPillar_Top_EventScript_15F316, FLAG_HIDE_RAYQUAZA, 0, 0 SkyPillar_Top_MapWarps:: @ 838EE68 - warp_def 16, 14, 3, 1, SkyPillar_5F + warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F SkyPillar_Top_MapEvents:: @ 838EE70 map_events SkyPillar_Top_MapObjects, SkyPillar_Top_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc index bef2bf0d9..adb85b96f 100644 --- a/data/maps/events/SlateportCity.inc +++ b/data/maps/events/SlateportCity.inc @@ -3,13 +3,13 @@ SlateportCity_MapObjects:: @ 837F7AC object_event 2, MAP_OBJ_GFX_MAN_1, 0, 35, 0, 27, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBF3, 0, 0, 0 object_event 3, MAP_OBJ_GFX_BOY_4, 0, 15, 0, 13, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBB5, 0, 0, 0 object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 26, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BC14, 0, 0, 0 - object_event 5, 240, 0, 31, 0, 27, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, 882, 0, 0 + object_event 5, 240, 0, 31, 0, 27, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 object_event 6, MAP_OBJ_GFX_COOK, 0, 5, 0, 43, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB3F, 0, 0, 0 object_event 7, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 20, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB60, 0, 0, 0 object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 8, 0, 42, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB81, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 29, 0, 13, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C017, 835, 0, 0 - object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 28, 0, 14, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C020, 835, 0, 0 - object_event 11, MAP_OBJ_GFX_SCIENTIST_1, 0, 28, 0, 13, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BEBC, 840, 0, 0 + object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 29, 0, 13, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C017, FLAG_HIDE_GABBY_AND_TY_SLATEPORT, 0, 0 + object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 28, 0, 14, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C020, FLAG_HIDE_GABBY_AND_TY_SLATEPORT, 0, 0 + object_event 11, MAP_OBJ_GFX_SCIENTIST_1, 0, 28, 0, 13, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BEBC, FLAG_HIDE_STERN_SLATEPORT, 0, 0 object_event 12, MAP_OBJ_GFX_SAILOR, 0, 35, 0, 36, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCE2, 0, 0, 0 object_event 13, MAP_OBJ_GFX_SAILOR, 0, 28, 0, 46, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCEB, 0, 0, 0 object_event 14, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 50, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCF4, 0, 0, 0 @@ -17,32 +17,32 @@ SlateportCity_MapObjects:: @ 837F7AC object_event 16, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 12, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD06, 0, 0, 0 object_event 17, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 24, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCB8, 0, 0, 0 object_event 18, MAP_OBJ_GFX_WOMAN_7, 0, 15, 0, 31, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCD9, 0, 0, 0 - object_event 19, 241, 0, 30, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, 882, 0, 0 - object_event 20, 241, 0, 29, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, 882, 0, 0 + object_event 19, 241, 0, 30, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 20, 241, 0, 29, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 object_event 21, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 6, 0, 38, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE20, 0, 0, 0 object_event 22, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 5, 0, 51, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDF2, 0, 0, 0 object_event 23, MAP_OBJ_GFX_MAN_6, 0, 34, 0, 51, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C029, 0, 0, 0 object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 47, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BAE0, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 11, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE9A, 948, 0, 0 + object_event 25, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 11, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE9A, FLAG_HIDE_TM_SALESMAN_SLATEPORT, 0, 0 object_event 26, MAP_OBJ_GFX_MAN_3, 0, 5, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BAB6, 0, 0, 0 - object_event 27, 241, 0, 22, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD7F, 882, 0, 0 - object_event 28, 241, 0, 23, 0, 27, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD96, 882, 0, 0 - object_event 29, 241, 0, 24, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDAD, 882, 0, 0 - object_event 30, 241, 0, 21, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDC4, 882, 0, 0 - object_event 31, 241, 0, 20, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDDB, 882, 0, 0 + object_event 27, 241, 0, 22, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD7F, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 28, 241, 0, 23, 0, 27, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD96, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 29, 241, 0, 24, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDAD, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 30, 241, 0, 21, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDC4, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 31, 241, 0, 20, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDDB, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 SlateportCity_MapWarps:: @ 837FA94 - warp_def 19, 19, 0, 0, SlateportCity_PokemonCenter_1F - warp_def 13, 26, 0, 0, SlateportCity_Mart - warp_def 26, 38, 0, 0, SlateportCity_SternsShipyard_1F - warp_def 10, 12, 0, 0, SlateportCity_ContestLobby - warp_def 4, 26, 0, 0, SlateportCity_PokemonFanClub - warp_def 30, 26, 0, 0, SlateportCity_OceanicMuseum_1F - warp_def 5, 19, 0, 0, SlateportCity_House1 - warp_def 31, 26, 0, 1, SlateportCity_OceanicMuseum_1F - warp_def 28, 12, 0, 0, SlateportCity_Harbor - warp_def 40, 7, 0, 2, SlateportCity_Harbor - warp_def 21, 44, 0, 0, SlateportCity_House2 + warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F + warp_def 13, 26, 0, 0, MAP_SLATEPORT_CITY_MART + warp_def 26, 38, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F + warp_def 10, 12, 0, 0, MAP_SLATEPORT_CITY_CONTEST_LOBBY + warp_def 4, 26, 0, 0, MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB + warp_def 30, 26, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F + warp_def 5, 19, 0, 0, MAP_SLATEPORT_CITY_HOUSE1 + warp_def 31, 26, 0, 1, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F + warp_def 28, 12, 0, 0, MAP_SLATEPORT_CITY_HARBOR + warp_def 40, 7, 0, 2, MAP_SLATEPORT_CITY_HARBOR + warp_def 21, 44, 0, 0, MAP_SLATEPORT_CITY_HOUSE2 SlateportCity_MapBGEvents:: @ 837FAEC bg_event 8, 19, 0, 0, 0, SlateportCity_EventScript_14BCAF diff --git a/data/maps/events/SlateportCity_ContestHall.inc b/data/maps/events/SlateportCity_ContestHall.inc index ae3e4ea7b..6bb6a4285 100644 --- a/data/maps/events/SlateportCity_ContestHall.inc +++ b/data/maps/events/SlateportCity_ContestHall.inc @@ -14,8 +14,8 @@ SlateportCity_ContestHall_MapObjects:: @ 83878A4 object_event 13, MAP_OBJ_GFX_SAILOR, 0, 0, 0, 17, 0, 3, 2, 65, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15555E, 0, 0, 0 SlateportCity_ContestHall_MapWarps:: @ 83879DC - warp_def 10, 17, 0, 2, SlateportCity_ContestLobby - warp_def 11, 17, 0, 2, SlateportCity_ContestLobby + warp_def 10, 17, 0, 2, MAP_SLATEPORT_CITY_CONTEST_LOBBY + warp_def 11, 17, 0, 2, MAP_SLATEPORT_CITY_CONTEST_LOBBY SlateportCity_ContestHall_MapBGEvents:: @ 83879EC bg_event 12, 14, 3, 0, 0, SlateportCity_ContestHall_EventScript_155671 diff --git a/data/maps/events/SlateportCity_ContestLobby.inc b/data/maps/events/SlateportCity_ContestLobby.inc index 74a8bc131..0c701e0ca 100644 --- a/data/maps/events/SlateportCity_ContestLobby.inc +++ b/data/maps/events/SlateportCity_ContestLobby.inc @@ -3,15 +3,15 @@ SlateportCity_ContestLobby_MapObjects:: @ 8387788 object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7795, 0, 0, 0 object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554DE, 0, 0, 0 object_event 4, MAP_OBJ_GFX_GIRL_1, 0, 9, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554E7, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1AE0B6, 803, 0, 0 + object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_SLATEPORT, 0, 0 object_event 6, MAP_OBJ_GFX_BOY_1, 0, 13, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_155536, 0, 0, 0 object_event 7, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F9, 0, 0, 0 object_event 8, MAP_OBJ_GFX_WOMAN_3, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F0, 0, 0, 0 SlateportCity_ContestLobby_MapWarps:: @ 8387848 - warp_def 5, 6, 0, 3, SlateportCity - warp_def 6, 6, 0, 3, SlateportCity - warp_def 1, 1, 0, 0, SlateportCity_ContestHall + warp_def 5, 6, 0, 3, MAP_SLATEPORT_CITY + warp_def 6, 6, 0, 3, MAP_SLATEPORT_CITY + warp_def 1, 1, 0, 0, MAP_SLATEPORT_CITY_CONTEST_HALL SlateportCity_ContestLobby_MapBGEvents:: @ 8387860 bg_event 10, 3, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7829 diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc index 3fbbd72c2..801f16779 100644 --- a/data/maps/events/SlateportCity_Harbor.inc +++ b/data/maps/events/SlateportCity_Harbor.inc @@ -1,18 +1,18 @@ SlateportCity_Harbor_MapObjects:: @ 8387F30 - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1560C4, 905, 0, 0 - object_event 2, MAP_OBJ_GFX_SAILOR, 0, 4, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1561FF, 905, 0, 0 - object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 1, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, 905, 0, 0 - object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, 841, 0, 0 - object_event 5, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 860, 0, 0 - object_event 6, 241, 0, 7, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 845, 0, 0 - object_event 7, 246, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 846, 0, 0 - object_event 8, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 848, 0, 0 + object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1560C4, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0 + object_event 2, MAP_OBJ_GFX_SAILOR, 0, 4, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1561FF, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0 + object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 1, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0 + object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, FLAG_HIDE_STERN_SLATEPORT_HARBOR, 0, 0 + object_event 5, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR, 0, 0 + object_event 6, 241, 0, 7, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR, 0, 0 + object_event 7, 246, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR, 0, 0 + object_event 8, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR, 0, 0 SlateportCity_Harbor_MapWarps:: @ 8387FF0 - warp_def 11, 14, 0, 8, SlateportCity - warp_def 12, 14, 0, 8, SlateportCity - warp_def 19, 15, 0, 9, SlateportCity - warp_def 20, 15, 0, 9, SlateportCity + warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY + warp_def 12, 14, 0, 8, MAP_SLATEPORT_CITY + warp_def 19, 15, 0, 9, MAP_SLATEPORT_CITY + warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY SlateportCity_Harbor_MapCoordEvents:: @ 8388010 coord_event 8, 11, 3, 0, 0x40a0, 1, 0, SlateportCity_Harbor_EventScript_155F9B diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/events/SlateportCity_House1.inc index 3379b7fef..6f5f72944 100644 --- a/data/maps/events/SlateportCity_House1.inc +++ b/data/maps/events/SlateportCity_House1.inc @@ -2,8 +2,8 @@ SlateportCity_House1_MapObjects:: @ 8387A18 object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_House1_EventScript_15567B, 0, 0, 0 SlateportCity_House1_MapWarps:: @ 8387A30 - warp_def 3, 7, 0, 6, SlateportCity - warp_def 4, 7, 0, 6, SlateportCity + warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY + warp_def 4, 7, 0, 6, MAP_SLATEPORT_CITY SlateportCity_House1_MapEvents:: @ 8387A40 map_events SlateportCity_House1_MapObjects, SlateportCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/events/SlateportCity_House2.inc index a147ec7ce..ae3f01900 100644 --- a/data/maps/events/SlateportCity_House2.inc +++ b/data/maps/events/SlateportCity_House2.inc @@ -3,8 +3,8 @@ SlateportCity_House2_MapObjects:: @ 8388064 object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_House2_EventScript_156399, 0, 0, 0 SlateportCity_House2_MapWarps:: @ 8388094 - warp_def 3, 7, 0, 10, SlateportCity - warp_def 4, 7, 0, 10, SlateportCity + warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY + warp_def 4, 7, 0, 10, MAP_SLATEPORT_CITY SlateportCity_House2_MapEvents:: @ 83880A4 map_events SlateportCity_House2_MapObjects, SlateportCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/events/SlateportCity_Mart.inc index 54072eccc..ae111b933 100644 --- a/data/maps/events/SlateportCity_Mart.inc +++ b/data/maps/events/SlateportCity_Mart.inc @@ -4,8 +4,8 @@ SlateportCity_Mart_MapObjects:: @ 83881B0 object_event 3, MAP_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156447, 0, 0, 0 SlateportCity_Mart_MapWarps:: @ 83881F8 - warp_def 3, 7, 0, 1, SlateportCity - warp_def 4, 7, 0, 1, SlateportCity + warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY + warp_def 4, 7, 0, 1, MAP_SLATEPORT_CITY SlateportCity_Mart_MapEvents:: @ 8388208 map_events SlateportCity_Mart_MapObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc index 9756d6745..a4c92861d 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc @@ -1,23 +1,23 @@ SlateportCity_OceanicMuseum_1F_MapObjects:: @ 8387B38 object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 7, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0, 0, 0 - object_event 2, 241, 0, 18, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, 883, 0, 0 - object_event 3, 241, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, 883, 0, 0 - object_event 4, 241, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, 883, 0, 0 - object_event 5, 240, 0, 3, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, 883, 0, 0 - object_event 6, 241, 0, 14, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, 883, 0, 0 + object_event 2, 241, 0, 18, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 3, 241, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 4, 241, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 5, 240, 0, 3, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 6, 241, 0, 14, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 object_event 7, MAP_OBJ_GFX_BEAUTY, 0, 12, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0, 0, 0 - object_event 8, 241, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, 883, 0, 0 - object_event 9, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, 961, 0, 0 - object_event 10, MAP_OBJ_GFX_MANIAC, 0, 10, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, 961, 0, 0 - object_event 11, MAP_OBJ_GFX_MAN_3, 0, 17, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, 961, 0, 0 - object_event 12, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C31, 961, 0, 0 - object_event 13, 241, 0, 9, 0, 4, 0, 3, 21, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, 965, 0, 0 - object_event 14, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, 961, 0, 0 + object_event 8, 241, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 9, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 + object_event 10, MAP_OBJ_GFX_MANIAC, 0, 10, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 + object_event 11, MAP_OBJ_GFX_MAN_3, 0, 17, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 + object_event 12, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C31, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 + object_event 13, 241, 0, 9, 0, 4, 0, 3, 21, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM, 0, 0 + object_event 14, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88 - warp_def 9, 8, 0, 5, SlateportCity - warp_def 10, 8, 0, 7, SlateportCity - warp_def 6, 1, 0, 0, SlateportCity_OceanicMuseum_2F + warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY + warp_def 10, 8, 0, 7, MAP_SLATEPORT_CITY + warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F SlateportCity_OceanicMuseum_1F_MapCoordEvents:: @ 8387CA0 coord_event 9, 7, 3, 0, 0x40aa, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AE4 diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc index a081e15d3..911d8e7e2 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc @@ -1,14 +1,14 @@ SlateportCity_OceanicMuseum_2F_MapObjects:: @ 8387D70 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, 887, 0, 0 - object_event 2, 246, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 886, 0, 0 - object_event 3, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 884, 0, 0 - object_event 4, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 885, 0, 0 - object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 12, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, 961, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, 961, 0, 0 - object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, 961, 0, 0 + object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F, 0, 0 + object_event 2, 246, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F, 0, 0 + object_event 3, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F, 0, 0 + object_event 4, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F, 0, 0 + object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 12, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 + object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 + object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 SlateportCity_OceanicMuseum_2F_MapWarps:: @ 8387E18 - warp_def 6, 1, 0, 2, SlateportCity_OceanicMuseum_1F + warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F SlateportCity_OceanicMuseum_2F_MapBGEvents:: @ 8387E20 bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EDA diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/events/SlateportCity_PokemonCenter_1F.inc index dfd38dc51..bdfabe5c6 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_1F.inc +++ b/data/maps/events/SlateportCity_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ SlateportCity_PokemonCenter_1F_MapObjects:: @ 83880B8 object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563E5, 0, 0, 0 SlateportCity_PokemonCenter_1F_MapWarps:: @ 8388100 - warp_def 7, 8, 3, 0, SlateportCity - warp_def 6, 8, 3, 0, SlateportCity - warp_def 1, 6, 4, 0, SlateportCity_PokemonCenter_2F + warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY + warp_def 6, 8, 3, 0, MAP_SLATEPORT_CITY + warp_def 1, 6, 4, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_2F SlateportCity_PokemonCenter_1F_MapEvents:: @ 8388118 map_events SlateportCity_PokemonCenter_1F_MapObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/events/SlateportCity_PokemonCenter_2F.inc index db723fa33..2ecc48423 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc +++ b/data/maps/events/SlateportCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ SlateportCity_PokemonCenter_2F_MapObjects:: @ 838812C object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_15640A, 0, 0, 0 SlateportCity_PokemonCenter_2F_MapWarps:: @ 8388174 - warp_def 1, 5, 4, 2, SlateportCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM SlateportCity_PokemonCenter_2F_MapEvents:: @ 838819C map_events SlateportCity_PokemonCenter_2F_MapObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/events/SlateportCity_PokemonFanClub.inc index 8003a3439..481886da8 100644 --- a/data/maps/events/SlateportCity_PokemonFanClub.inc +++ b/data/maps/events/SlateportCity_PokemonFanClub.inc @@ -9,8 +9,8 @@ SlateportCity_PokemonFanClub_MapObjects:: @ 8387A54 object_event 8, MAP_OBJ_GFX_AZUMARILL, 0, 10, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AB7, 0, 0, 0 SlateportCity_PokemonFanClub_MapWarps:: @ 8387B14 - warp_def 6, 10, 0, 4, SlateportCity - warp_def 7, 10, 0, 4, SlateportCity + warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY + warp_def 7, 10, 0, 4, MAP_SLATEPORT_CITY SlateportCity_PokemonFanClub_MapEvents:: @ 8387B24 map_events SlateportCity_PokemonFanClub_MapObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/events/SlateportCity_SternsShipyard_1F.inc index 38d14fa4e..a20a2f1b6 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_1F.inc @@ -2,12 +2,12 @@ SlateportCity_SternsShipyard_1F_MapObjects:: @ 8387698 object_event 1, MAP_OBJ_GFX_MAN_1, 0, 5, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_155336, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553E3, 0, 0, 0 object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 18, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553EC, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 11, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, 869, 0, 0 + object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 11, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD, 0, 0 SlateportCity_SternsShipyard_1F_MapWarps:: @ 83876F8 - warp_def 2, 14, 0, 2, SlateportCity - warp_def 3, 14, 0, 2, SlateportCity - warp_def 3, 1, 0, 0, SlateportCity_SternsShipyard_2F + warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY + warp_def 3, 14, 0, 2, MAP_SLATEPORT_CITY + warp_def 3, 1, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F SlateportCity_SternsShipyard_1F_MapEvents:: @ 8387710 map_events SlateportCity_SternsShipyard_1F_MapObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/events/SlateportCity_SternsShipyard_2F.inc index cd26ed1cc..e6d3e7636 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_2F.inc @@ -4,7 +4,7 @@ SlateportCity_SternsShipyard_2F_MapObjects:: @ 8387724 object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 9, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_155408, 0, 0, 0 SlateportCity_SternsShipyard_2F_MapWarps:: @ 838776C - warp_def 3, 1, 0, 2, SlateportCity_SternsShipyard_1F + warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F SlateportCity_SternsShipyard_2F_MapEvents:: @ 8387774 map_events SlateportCity_SternsShipyard_2F_MapObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc index a93db6a93..3bbd87f0b 100644 --- a/data/maps/events/SootopolisCity.inc +++ b/data/maps/events/SootopolisCity.inc @@ -1,29 +1,29 @@ SootopolisCity_MapObjects:: @ 8380608 - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D18D, 855, 0, 0 - object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 33, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D196, 856, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 36, 0, 21, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D16E, 854, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 47, 0, 42, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D268, 854, 0, 0 - object_event 5, MAP_OBJ_GFX_WALLACE, 0, 32, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D48F, 816, 0, 0 - object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 9, 0, 43, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D19F, 854, 0, 0 - object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 51, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, 854, 0, 0 - object_event 8, MAP_OBJ_GFX_BOY_1, 0, 43, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, 854, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_1, 0, 26, 0, 4, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D287, 854, 0, 0 - object_event 10, MAP_OBJ_GFX_STEVEN, 0, 30, 0, 21, 0, 3, 10, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D498, 973, 0, 0 - object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 49, 0, 34, 0, 3, 3, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2A6, 854, 0, 0 + object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D18D, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1, 0, 0 + object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 33, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D196, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 36, 0, 21, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D16E, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 47, 0, 42, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D268, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 5, MAP_OBJ_GFX_WALLACE, 0, 32, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D48F, FLAG_HIDE_WALLACE_SOOTOPOLIS, 0, 0 + object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 9, 0, 43, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D19F, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 51, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 8, MAP_OBJ_GFX_BOY_1, 0, 43, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 9, MAP_OBJ_GFX_MAN_1, 0, 26, 0, 4, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D287, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 10, MAP_OBJ_GFX_STEVEN, 0, 30, 0, 21, 0, 3, 10, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D498, FLAG_HIDE_STEVEN_SOOTOPOLIS, 0, 0 + object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 49, 0, 34, 0, 3, 3, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2A6, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 SootopolisCity_MapWarps:: @ 8380710 - warp_def 43, 31, 0, 0, SootopolisCity_PokemonCenter_1F - warp_def 17, 29, 0, 0, SootopolisCity_Mart - warp_def 31, 32, 0, 0, SootopolisCity_Gym_1F - warp_def 31, 16, 3, 0, CaveOfOrigin_Entrance - warp_def 9, 6, 0, 0, SootopolisCity_House1 - warp_def 45, 6, 0, 0, SootopolisCity_House2 - warp_def 9, 17, 0, 0, SootopolisCity_House3 - warp_def 44, 17, 0, 0, SootopolisCity_House4 - warp_def 9, 26, 0, 0, SootopolisCity_House5 - warp_def 53, 28, 0, 0, SootopolisCity_House6 - warp_def 8, 35, 0, 0, SootopolisCity_House7 - warp_def 48, 25, 0, 0, SootopolisCity_House8 + warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F + warp_def 17, 29, 0, 0, MAP_SOOTOPOLIS_CITY_MART + warp_def 31, 32, 0, 0, MAP_SOOTOPOLIS_CITY_GYM_1F + warp_def 31, 16, 3, 0, MAP_CAVE_OF_ORIGIN_ENTRANCE + warp_def 9, 6, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE1 + warp_def 45, 6, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE2 + warp_def 9, 17, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE3 + warp_def 44, 17, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE4 + warp_def 9, 26, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE5 + warp_def 53, 28, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE6 + warp_def 8, 35, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE7 + warp_def 48, 25, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE8 SootopolisCity_MapCoordEvents:: @ 8380770 coord_event 25, 6, 3, 0, 0x405e, 1, 0, SootopolisCity_EventScript_14D308 diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/events/SootopolisCity_Gym_1F.inc index 88707692e..4e655191d 100644 --- a/data/maps/events/SootopolisCity_Gym_1F.inc +++ b/data/maps/events/SootopolisCity_Gym_1F.inc @@ -1,11 +1,11 @@ SootopolisCity_Gym_1F_MapObjects:: @ 838ACF0 - object_event 1, MAP_OBJ_GFX_WALLACE, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15AFFF, 815, 0, 0 + object_event 1, MAP_OBJ_GFX_WALLACE, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15AFFF, FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM, 0, 0 object_event 2, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 24, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B084, 0, 0, 0 SootopolisCity_Gym_1F_MapWarps:: @ 838AD20 - warp_def 8, 25, 0, 2, SootopolisCity - warp_def 9, 25, 0, 2, SootopolisCity - warp_def 11, 22, 3, 0, SootopolisCity_Gym_B1F + warp_def 8, 25, 0, 2, MAP_SOOTOPOLIS_CITY + warp_def 9, 25, 0, 2, MAP_SOOTOPOLIS_CITY + warp_def 11, 22, 3, 0, MAP_SOOTOPOLIS_CITY_GYM_B1F SootopolisCity_Gym_1F_MapBGEvents:: @ 838AD38 bg_event 6, 24, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B0A3 diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/events/SootopolisCity_Gym_B1F.inc index 44827aaf5..a1f3c92cb 100644 --- a/data/maps/events/SootopolisCity_Gym_B1F.inc +++ b/data/maps/events/SootopolisCity_Gym_B1F.inc @@ -9,7 +9,7 @@ SootopolisCity_Gym_B1F_MapObjects:: @ 838AD64 object_event 8, MAP_OBJ_GFX_BEAUTY, 0, 12, 0, 7, 0, 3, 9, 0, 0, 1, 0, 3, 0, SootopolisCity_Gym_B1F_EventScript_15B14B, 0, 0, 0 SootopolisCity_Gym_B1F_MapWarps:: @ 838AE24 - warp_def 11, 22, 3, 2, SootopolisCity_Gym_1F + warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F SootopolisCity_Gym_B1F_MapEvents:: @ 838AE2C map_events SootopolisCity_Gym_B1F_MapObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/events/SootopolisCity_House1.inc index bddda2d88..fc6a57516 100644 --- a/data/maps/events/SootopolisCity_House1.inc +++ b/data/maps/events/SootopolisCity_House1.inc @@ -3,8 +3,8 @@ SootopolisCity_House1_MapObjects:: @ 838AFA4 object_event 2, MAP_OBJ_GFX_KECLEON_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B2D1, 0, 0, 0 SootopolisCity_House1_MapWarps:: @ 838AFD4 - warp_def 3, 6, 0, 4, SootopolisCity - warp_def 4, 6, 0, 4, SootopolisCity + warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 4, MAP_SOOTOPOLIS_CITY SootopolisCity_House1_MapEvents:: @ 838AFE4 map_events SootopolisCity_House1_MapObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/events/SootopolisCity_House2.inc index 01cf77ddb..5fac2c45e 100644 --- a/data/maps/events/SootopolisCity_House2.inc +++ b/data/maps/events/SootopolisCity_House2.inc @@ -2,8 +2,8 @@ SootopolisCity_House2_MapObjects:: @ 838AFF8 object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 3, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House2_EventScript_15B2E5, 0, 0, 0 SootopolisCity_House2_MapWarps:: @ 838B010 - warp_def 3, 6, 0, 5, SootopolisCity - warp_def 4, 6, 0, 5, SootopolisCity + warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 5, MAP_SOOTOPOLIS_CITY SootopolisCity_House2_MapEvents:: @ 838B020 map_events SootopolisCity_House2_MapObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/events/SootopolisCity_House3.inc index dfae0f969..343bc0d2b 100644 --- a/data/maps/events/SootopolisCity_House3.inc +++ b/data/maps/events/SootopolisCity_House3.inc @@ -3,8 +3,8 @@ SootopolisCity_House3_MapObjects:: @ 838B034 object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House3_EventScript_15B343, 0, 0, 0 SootopolisCity_House3_MapWarps:: @ 838B064 - warp_def 3, 6, 0, 6, SootopolisCity - warp_def 4, 6, 0, 6, SootopolisCity + warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 6, MAP_SOOTOPOLIS_CITY SootopolisCity_House3_MapEvents:: @ 838B074 map_events SootopolisCity_House3_MapObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/events/SootopolisCity_House4.inc index 766dbc682..f50aa1fe1 100644 --- a/data/maps/events/SootopolisCity_House4.inc +++ b/data/maps/events/SootopolisCity_House4.inc @@ -4,8 +4,8 @@ SootopolisCity_House4_MapObjects:: @ 838B088 object_event 3, MAP_OBJ_GFX_AZUMARILL, 0, 2, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B35F, 0, 0, 0 SootopolisCity_House4_MapWarps:: @ 838B0D0 - warp_def 3, 6, 0, 7, SootopolisCity - warp_def 4, 6, 0, 7, SootopolisCity + warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 7, MAP_SOOTOPOLIS_CITY SootopolisCity_House4_MapEvents:: @ 838B0E0 map_events SootopolisCity_House4_MapObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/events/SootopolisCity_House5.inc index 499bc26de..f574443e8 100644 --- a/data/maps/events/SootopolisCity_House5.inc +++ b/data/maps/events/SootopolisCity_House5.inc @@ -3,8 +3,8 @@ SootopolisCity_House5_MapObjects:: @ 838B0F4 object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 6, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B37C, 0, 0, 0 SootopolisCity_House5_MapWarps:: @ 838B124 - warp_def 3, 6, 0, 8, SootopolisCity - warp_def 4, 6, 0, 8, SootopolisCity + warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 8, MAP_SOOTOPOLIS_CITY SootopolisCity_House5_MapEvents:: @ 838B134 map_events SootopolisCity_House5_MapObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/events/SootopolisCity_House6.inc index 9fcb17f50..a943baf27 100644 --- a/data/maps/events/SootopolisCity_House6.inc +++ b/data/maps/events/SootopolisCity_House6.inc @@ -2,8 +2,8 @@ SootopolisCity_House6_MapObjects:: @ 838B148 object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 4, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House6_EventScript_15B386, 0, 0, 0 SootopolisCity_House6_MapWarps:: @ 838B160 - warp_def 3, 6, 0, 9, SootopolisCity - warp_def 4, 6, 0, 9, SootopolisCity + warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 9, MAP_SOOTOPOLIS_CITY SootopolisCity_House6_MapEvents:: @ 838B170 map_events SootopolisCity_House6_MapObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/events/SootopolisCity_House7.inc index d23992a32..f1ac930cc 100644 --- a/data/maps/events/SootopolisCity_House7.inc +++ b/data/maps/events/SootopolisCity_House7.inc @@ -3,8 +3,8 @@ SootopolisCity_House7_MapObjects:: @ 838B184 object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 1, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House7_EventScript_15B3F7, 0, 0, 0 SootopolisCity_House7_MapWarps:: @ 838B1B4 - warp_def 3, 6, 0, 10, SootopolisCity - warp_def 4, 6, 0, 10, SootopolisCity + warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 10, MAP_SOOTOPOLIS_CITY SootopolisCity_House7_MapEvents:: @ 838B1C4 map_events SootopolisCity_House7_MapObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House8.inc b/data/maps/events/SootopolisCity_House8.inc index 4fd384f2b..b6f35a8d0 100644 --- a/data/maps/events/SootopolisCity_House8.inc +++ b/data/maps/events/SootopolisCity_House8.inc @@ -3,8 +3,8 @@ SootopolisCity_House8_MapObjects:: @ 838B1D8 object_event 2, MAP_OBJ_GFX_HIKER, 0, 5, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B401, 0, 0, 0 SootopolisCity_House8_MapWarps:: @ 838B208 - warp_def 3, 6, 0, 11, SootopolisCity - warp_def 4, 6, 0, 11, SootopolisCity + warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY SootopolisCity_House8_MapBGEvents:: @ 838B218 bg_event 5, 1, 0, 0, 0, SootopolisCity_House8_EventScript_15B523 diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/events/SootopolisCity_Mart.inc index 144a2b79b..0cc9dc532 100644 --- a/data/maps/events/SootopolisCity_Mart.inc +++ b/data/maps/events/SootopolisCity_Mart.inc @@ -4,8 +4,8 @@ SootopolisCity_Mart_MapObjects:: @ 838AF38 object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 9, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B272, 0, 0, 0 SootopolisCity_Mart_MapWarps:: @ 838AF80 - warp_def 3, 7, 0, 1, SootopolisCity - warp_def 4, 7, 0, 1, SootopolisCity + warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY + warp_def 4, 7, 0, 1, MAP_SOOTOPOLIS_CITY SootopolisCity_Mart_MapEvents:: @ 838AF90 map_events SootopolisCity_Mart_MapObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc index c69ebb84c..94091956e 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc +++ b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ SootopolisCity_PokemonCenter_1F_MapObjects:: @ 838AE40 object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 7, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1D0, 0, 0, 0 SootopolisCity_PokemonCenter_1F_MapWarps:: @ 838AE88 - warp_def 7, 8, 3, 0, SootopolisCity - warp_def 6, 8, 3, 0, SootopolisCity - warp_def 1, 6, 4, 0, SootopolisCity_PokemonCenter_2F + warp_def 7, 8, 3, 0, MAP_SOOTOPOLIS_CITY + warp_def 6, 8, 3, 0, MAP_SOOTOPOLIS_CITY + warp_def 1, 6, 4, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F SootopolisCity_PokemonCenter_1F_MapEvents:: @ 838AEA0 map_events SootopolisCity_PokemonCenter_1F_MapObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc index 217185c78..4ce8631e8 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc +++ b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ SootopolisCity_PokemonCenter_2F_MapObjects:: @ 838AEB4 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B214, 0, 0, 0 SootopolisCity_PokemonCenter_2F_MapWarps:: @ 838AEFC - warp_def 1, 5, 4, 2, SootopolisCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM SootopolisCity_PokemonCenter_2F_MapEvents:: @ 838AF24 map_events SootopolisCity_PokemonCenter_2F_MapObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/events/SouthernIsland_Exterior.inc index 062b72d1f..da65af081 100644 --- a/data/maps/events/SouthernIsland_Exterior.inc +++ b/data/maps/events/SouthernIsland_Exterior.inc @@ -3,8 +3,8 @@ SouthernIsland_Exterior_MapObjects:: @ 8391E00 object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 13, 0, 25, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 SouthernIsland_Exterior_MapWarps:: @ 8391E30 - warp_def 14, 5, 3, 0, SouthernIsland_Interior - warp_def 15, 5, 3, 1, SouthernIsland_Interior + warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR + warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR SouthernIsland_Exterior_MapBGEvents:: @ 8391E40 bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_160B4A diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/events/SouthernIsland_Interior.inc index 77073fc85..bab1d1baf 100644 --- a/data/maps/events/SouthernIsland_Interior.inc +++ b/data/maps/events/SouthernIsland_Interior.inc @@ -1,10 +1,10 @@ SouthernIsland_Interior_MapObjects:: @ 8391E60 - object_event 1, 240, 0, 13, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 910, 0, 0 - object_event 2, 241, 0, 13, 0, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 911, 0, 0 + object_event 1, 240, 0, 13, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_FLYING, 0, 0 + object_event 2, 241, 0, 13, 0, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY, 0, 0 SouthernIsland_Interior_MapWarps:: @ 8391E90 - warp_def 13, 18, 3, 0, SouthernIsland_Exterior - warp_def 14, 18, 3, 1, SouthernIsland_Exterior + warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR + warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR SouthernIsland_Interior_MapBGEvents:: @ 8391EA0 bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_160B9B diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc index 8c5ff5578..8ecbb7e09 100644 --- a/data/maps/events/TradeCenter.inc +++ b/data/maps/events/TradeCenter.inc @@ -2,8 +2,8 @@ TradeCenter_MapObjects:: @ 8391340 object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, TradeCenter_EventScript_1A44AD, 0, 0, 0 TradeCenter_MapWarps:: @ 8391358 - warp_def 5, 8, 3, 127, NONE - warp_def 6, 8, 3, 127, NONE + warp_def 5, 8, 3, 127, MAP_NONE + warp_def 6, 8, 3, 127, MAP_NONE TradeCenter_MapCoordEvents:: @ 8391368 coord_event 4, 5, 3, 0, 0x4000, 0, 0, TradeCenter_EventScript_1A43F0 diff --git a/data/maps/events/Underwater2.inc b/data/maps/events/Underwater2.inc index a9ecbd465..89b36919b 100644 --- a/data/maps/events/Underwater2.inc +++ b/data/maps/events/Underwater2.inc @@ -1,5 +1,5 @@ Underwater2_MapWarps:: @ 8385580 - warp_def 45, 65, 0, 0, Underwater_SootopolisCity + warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY Underwater2_MapBGEvents:: @ 8385588 bg_event 30, 17, 3, 7, 0, ITEM_HEART_SCALE, 14, 0 diff --git a/data/maps/events/Underwater4.inc b/data/maps/events/Underwater4.inc index 711131621..1d3938031 100644 --- a/data/maps/events/Underwater4.inc +++ b/data/maps/events/Underwater4.inc @@ -1,5 +1,5 @@ Underwater4_MapWarps:: @ 8385640 - warp_def 38, 26, 3, 0, Underwater_SeafloorCavern + warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN Underwater4_MapBGEvents:: @ 8385648 bg_event 38, 19, 3, 7, 0, ITEM_PROTEIN, 25, 0 diff --git a/data/maps/events/Underwater_Route134.inc b/data/maps/events/Underwater_Route134.inc index f6c734112..6dc462c80 100644 --- a/data/maps/events/Underwater_Route134.inc +++ b/data/maps/events/Underwater_Route134.inc @@ -1,5 +1,5 @@ Underwater_Route134_MapWarps:: @ 838E744 - warp_def 8, 8, 0, 0, Underwater_SealedChamber + warp_def 8, 8, 0, 0, MAP_UNDERWATER_SEALED_CHAMBER Underwater_Route134_MapEvents:: @ 838E74C map_events 0x0, Underwater_Route134_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/events/Underwater_SeafloorCavern.inc index e06e0a498..fa8c12c65 100644 --- a/data/maps/events/Underwater_SeafloorCavern.inc +++ b/data/maps/events/Underwater_SeafloorCavern.inc @@ -1,11 +1,11 @@ Underwater_SeafloorCavern_MapObjects:: @ 838D018 - object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0 - object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0 - object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0 - object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0 + object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0 + object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0 + object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0 + object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0 Underwater_SeafloorCavern_MapWarps:: @ 838D078 - warp_def 6, 7, 0, 0, Underwater4 + warp_def 6, 7, 0, 0, MAP_UNDERWATER4 Underwater_SeafloorCavern_MapEvents:: @ 838D080 map_events Underwater_SeafloorCavern_MapObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater_SealedChamber.inc b/data/maps/events/Underwater_SealedChamber.inc index 867527aaf..ede501142 100644 --- a/data/maps/events/Underwater_SealedChamber.inc +++ b/data/maps/events/Underwater_SealedChamber.inc @@ -1,5 +1,5 @@ Underwater_SealedChamber_MapWarps:: @ 838E760 - warp_def 7, 1, 0, 0, Underwater_Route134 + warp_def 7, 1, 0, 0, MAP_UNDERWATER_ROUTE134 Underwater_SealedChamber_MapBGEvents:: @ 838E768 bg_event 12, 43, 0, 0, 0, Underwater_SealedChamber_EventScript_15F0B8 diff --git a/data/maps/events/Underwater_SootopolisCity.inc b/data/maps/events/Underwater_SootopolisCity.inc index fb48a32fb..f745dc557 100644 --- a/data/maps/events/Underwater_SootopolisCity.inc +++ b/data/maps/events/Underwater_SootopolisCity.inc @@ -1,6 +1,6 @@ Underwater_SootopolisCity_MapWarps:: @ 838BE98 - warp_def 9, 8, 0, 0, Underwater2 - warp_def 10, 8, 0, 0, Underwater2 + warp_def 9, 8, 0, 0, MAP_UNDERWATER2 + warp_def 10, 8, 0, 0, MAP_UNDERWATER2 Underwater_SootopolisCity_MapEvents:: @ 838BEA8 map_events 0x0, Underwater_SootopolisCity_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/events/VerdanturfTown.inc index 1d40f7f53..b8f74073e 100644 --- a/data/maps/events/VerdanturfTown.inc +++ b/data/maps/events/VerdanturfTown.inc @@ -5,13 +5,13 @@ VerdanturfTown_MapObjects:: @ 8380F00 object_event 4, MAP_OBJ_GFX_CAMPER, 0, 6, 0, 10, 0, 3, 5, 1, 0, 0, 0, 0, 0, VerdanturfTown_EventScript_14E8A2, 0, 0, 0 VerdanturfTown_MapWarps:: @ 8380F60 - warp_def 4, 7, 0, 0, VerdanturfTown_ContestLobby - warp_def 12, 3, 0, 0, VerdanturfTown_Mart - warp_def 16, 3, 0, 0, VerdanturfTown_PokemonCenter_1F - warp_def 10, 14, 0, 0, VerdanturfTown_WandasHouse - warp_def 8, 1, 0, 1, RusturfTunnel - warp_def 1, 14, 0, 0, VerdanturfTown_FriendshipRatersHouse - warp_def 17, 15, 0, 0, VerdanturfTown_House + warp_def 4, 7, 0, 0, MAP_VERDANTURF_TOWN_CONTEST_LOBBY + warp_def 12, 3, 0, 0, MAP_VERDANTURF_TOWN_MART + warp_def 16, 3, 0, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F + warp_def 10, 14, 0, 0, MAP_VERDANTURF_TOWN_WANDAS_HOUSE + warp_def 8, 1, 0, 1, MAP_RUSTURF_TUNNEL + warp_def 1, 14, 0, 0, MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE + warp_def 17, 15, 0, 0, MAP_VERDANTURF_TOWN_HOUSE VerdanturfTown_MapBGEvents:: @ 8380F98 bg_event 14, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00E1 diff --git a/data/maps/events/VerdanturfTown_ContestHall.inc b/data/maps/events/VerdanturfTown_ContestHall.inc index 36f4d58e4..4e21027c4 100644 --- a/data/maps/events/VerdanturfTown_ContestHall.inc +++ b/data/maps/events/VerdanturfTown_ContestHall.inc @@ -4,8 +4,8 @@ VerdanturfTown_ContestHall_MapObjects:: @ 8386AEC object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 0, 8, 0, 3, 2, 34, 0, 0, 0, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA0, 0, 0, 0 VerdanturfTown_ContestHall_MapWarps:: @ 8386B34 - warp_def 11, 17, 0, 2, VerdanturfTown_ContestLobby - warp_def 10, 17, 0, 2, VerdanturfTown_ContestLobby + warp_def 11, 17, 0, 2, MAP_VERDANTURF_TOWN_CONTEST_LOBBY + warp_def 10, 17, 0, 2, MAP_VERDANTURF_TOWN_CONTEST_LOBBY VerdanturfTown_ContestHall_MapBGEvents:: @ 8386B44 bg_event 12, 14, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EB2 diff --git a/data/maps/events/VerdanturfTown_ContestLobby.inc b/data/maps/events/VerdanturfTown_ContestLobby.inc index ec9d88d71..465bb2fde 100644 --- a/data/maps/events/VerdanturfTown_ContestLobby.inc +++ b/data/maps/events/VerdanturfTown_ContestLobby.inc @@ -3,13 +3,13 @@ VerdanturfTown_ContestLobby_MapObjects:: @ 8386A00 object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B77A0, 0, 0, 0 object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 14, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E47, 0, 0, 0 object_event 4, MAP_OBJ_GFX_BOY_2, 0, 1, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E3E, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1AE0B6, 801, 0, 0 + object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_VERDANTURF, 0, 0 object_event 6, MAP_OBJ_GFX_BOY_3, 0, 0, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E80, 0, 0, 0 VerdanturfTown_ContestLobby_MapWarps:: @ 8386A90 - warp_def 5, 6, 0, 0, VerdanturfTown - warp_def 6, 6, 0, 0, VerdanturfTown - warp_def 1, 1, 0, 1, VerdanturfTown_ContestHall + warp_def 5, 6, 0, 0, MAP_VERDANTURF_TOWN + warp_def 6, 6, 0, 0, MAP_VERDANTURF_TOWN + warp_def 1, 1, 0, 1, MAP_VERDANTURF_TOWN_CONTEST_HALL VerdanturfTown_ContestLobby_MapBGEvents:: @ 8386AA8 bg_event 10, 3, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B782F diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc index 6ec948511..8a731fab0 100644 --- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc @@ -3,8 +3,8 @@ VerdanturfTown_FriendshipRatersHouse_MapObjects:: @ 8386D88 object_event 2, MAP_OBJ_GFX_PIKACHU, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9, 0, 0, 0 VerdanturfTown_FriendshipRatersHouse_MapWarps:: @ 8386DB8 - warp_def 3, 7, 0, 5, VerdanturfTown - warp_def 4, 7, 0, 5, VerdanturfTown + warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN + warp_def 4, 7, 0, 5, MAP_VERDANTURF_TOWN VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 8386DC8 map_events VerdanturfTown_FriendshipRatersHouse_MapObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/events/VerdanturfTown_House.inc index 91a54684b..5bf1c7cae 100644 --- a/data/maps/events/VerdanturfTown_House.inc +++ b/data/maps/events/VerdanturfTown_House.inc @@ -3,8 +3,8 @@ VerdanturfTown_House_MapObjects:: @ 8386DDC object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540F6, 0, 0, 0 VerdanturfTown_House_MapWarps:: @ 8386E0C - warp_def 3, 8, 0, 6, VerdanturfTown - warp_def 4, 8, 0, 6, VerdanturfTown + warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN + warp_def 4, 8, 0, 6, MAP_VERDANTURF_TOWN VerdanturfTown_House_MapEvents:: @ 8386E1C map_events VerdanturfTown_House_MapObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/events/VerdanturfTown_Mart.inc index 90e1cf014..341055a52 100644 --- a/data/maps/events/VerdanturfTown_Mart.inc +++ b/data/maps/events/VerdanturfTown_Mart.inc @@ -5,8 +5,8 @@ VerdanturfTown_Mart_MapObjects:: @ 8386B70 object_event 4, MAP_OBJ_GFX_LASS, 0, 3, 0, 2, 0, 3, 9, 17, 0, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153F00, 0, 0, 0 VerdanturfTown_Mart_MapWarps:: @ 8386BD0 - warp_def 3, 7, 0, 1, VerdanturfTown - warp_def 4, 7, 0, 1, VerdanturfTown + warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN + warp_def 4, 7, 0, 1, MAP_VERDANTURF_TOWN VerdanturfTown_Mart_MapEvents:: @ 8386BE0 map_events VerdanturfTown_Mart_MapObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc index 3db30796c..db6d4400b 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ VerdanturfTown_PokemonCenter_1F_MapObjects:: @ 8386BF4 object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F2F, 0, 0, 0 VerdanturfTown_PokemonCenter_1F_MapWarps:: @ 8386C3C - warp_def 7, 8, 3, 2, VerdanturfTown - warp_def 6, 8, 3, 2, VerdanturfTown - warp_def 1, 6, 4, 0, VerdanturfTown_PokemonCenter_2F + warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN + warp_def 6, 8, 3, 2, MAP_VERDANTURF_TOWN + warp_def 1, 6, 4, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F VerdanturfTown_PokemonCenter_1F_MapEvents:: @ 8386C54 map_events VerdanturfTown_PokemonCenter_1F_MapObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc index 89f02e31f..43cd0dc12 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc +++ b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ VerdanturfTown_PokemonCenter_2F_MapObjects:: @ 8386C68 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F54, 0, 0, 0 VerdanturfTown_PokemonCenter_2F_MapWarps:: @ 8386CB0 - warp_def 1, 5, 4, 2, VerdanturfTown_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 8386CD8 map_events VerdanturfTown_PokemonCenter_2F_MapObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/events/VerdanturfTown_WandasHouse.inc index 5d0f3e572..26c178a87 100644 --- a/data/maps/events/VerdanturfTown_WandasHouse.inc +++ b/data/maps/events/VerdanturfTown_WandasHouse.inc @@ -1,13 +1,13 @@ VerdanturfTown_WandasHouse_MapObjects:: @ 8386CEC - object_event 1, MAP_OBJ_GFX_WALLY, 0, 14, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F5B, 806, 0, 0 - object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, 808, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, 809, 0, 0 + object_event 1, MAP_OBJ_GFX_WALLY, 0, 14, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F5B, FLAG_HIDE_WALLY_WANDAS_HOUSE, 0, 0 + object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE, 0, 0 object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FEA, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, 984, 0, 0 + object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE, 0, 0 VerdanturfTown_WandasHouse_MapWarps:: @ 8386D64 - warp_def 7, 7, 0, 3, VerdanturfTown - warp_def 8, 7, 0, 3, VerdanturfTown + warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN + warp_def 8, 7, 0, 3, MAP_VERDANTURF_TOWN VerdanturfTown_WandasHouse_MapEvents:: @ 8386D74 map_events VerdanturfTown_WandasHouse_MapObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc index f3f8dcad6..593f2df02 100644 --- a/data/maps/events/VictoryRoad_1F.inc +++ b/data/maps/events/VictoryRoad_1F.inc @@ -2,17 +2,17 @@ VictoryRoad_1F_MapObjects:: @ 838D8E4 object_event 1, MAP_OBJ_GFX_MAN_4, 0, 33, 0, 22, 0, 3, 8, 0, 0, 1, 0, 3, 0, VictoryRoad_1F_EventScript_15DF6F, 0, 0, 0 object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 6, 0, 15, 0, 4, 9, 0, 0, 1, 0, 4, 0, VictoryRoad_1F_EventScript_15DF9D, 0, 0, 0 object_event 3, MAP_OBJ_GFX_MAN_4, 0, 27, 0, 34, 0, 3, 18, 0, 0, 1, 0, 3, 0, VictoryRoad_1F_EventScript_15DF86, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WALLY, 0, 31, 0, 12, 0, 3, 7, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF28, 858, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 40, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AC6, 1084, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 39, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AD3, 1085, 0, 0 - object_event 7, MAP_OBJ_GFX_WALLY, 0, 31, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF31, 751, 0, 0 + object_event 4, MAP_OBJ_GFX_WALLY, 0, 31, 0, 12, 0, 3, 7, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF28, FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 40, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AC6, FLAG_ITEM_VICTORY_ROAD_1F_1, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 39, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AD3, FLAG_ITEM_VICTORY_ROAD_1F_2, 0, 0 + object_event 7, MAP_OBJ_GFX_WALLY, 0, 31, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF31, FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD, 0, 0 VictoryRoad_1F_MapWarps:: @ 838D98C - warp_def 15, 40, 3, 2, EverGrandeCity - warp_def 39, 5, 3, 3, EverGrandeCity - warp_def 21, 32, 3, 5, VictoryRoad_B1F - warp_def 42, 38, 4, 2, VictoryRoad_B1F - warp_def 9, 14, 4, 4, VictoryRoad_B1F + warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY + warp_def 39, 5, 3, 3, MAP_EVER_GRANDE_CITY + warp_def 21, 32, 3, 5, MAP_VICTORY_ROAD_B1F + warp_def 42, 38, 4, 2, MAP_VICTORY_ROAD_B1F + warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F VictoryRoad_1F_MapCoordEvents:: @ 838D9B4 coord_event 34, 3, 3, 0, 0x40c3, 0, 0, VictoryRoad_1F_EventScript_15DE97 diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc index b00074990..0c30a96fa 100644 --- a/data/maps/events/VictoryRoad_B1F.inc +++ b/data/maps/events/VictoryRoad_B1F.inc @@ -1,32 +1,32 @@ VictoryRoad_B1F_MapObjects:: @ 838DA04 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 30, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 25, 0, 0 - object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 26, 0, 0 - object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 27, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 28, 0, 0 - object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 29, 0, 0 - object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 31, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1E, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19, 0, 0 + object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1A, 0, 0 + object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1B, 0, 0 + object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1C, 0, 0 + object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1D, 0, 0 + object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1F, 0, 0 object_event 14, MAP_OBJ_GFX_MAN_4, 0, 37, 0, 12, 0, 3, 9, 0, 0, 1, 0, 3, 0, VictoryRoad_B1F_EventScript_15DFB5, 0, 0, 0 object_event 15, MAP_OBJ_GFX_WOMAN_7, 0, 26, 0, 16, 0, 3, 7, 0, 0, 1, 0, 4, 0, VictoryRoad_B1F_EventScript_15DFCC, 0, 0, 0 object_event 16, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 21, 0, 3, 9, 0, 0, 1, 0, 2, 0, VictoryRoad_B1F_EventScript_15DFE3, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 32, 0, 0 - object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 42, 0, 8, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, 1086, 0, 0 - object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, 1087, 0, 0 + object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_VICTORY_ROAD_ROCK, 0, 0 + object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 42, 0, 8, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, FLAG_ITEM_VICTORY_ROAD_B1F_1, 0, 0 + object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, FLAG_ITEM_VICTORY_ROAD_B1F_2, 0, 0 VictoryRoad_B1F_MapWarps:: @ 838DBCC - warp_def 30, 25, 3, 0, VictoryRoad_B2F - warp_def 17, 16, 3, 2, VictoryRoad_B2F - warp_def 42, 25, 3, 3, VictoryRoad_1F - warp_def 42, 2, 4, 1, VictoryRoad_B2F - warp_def 8, 3, 3, 4, VictoryRoad_1F - warp_def 20, 21, 3, 2, VictoryRoad_1F - warp_def 5, 26, 3, 3, VictoryRoad_B2F + warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F + warp_def 17, 16, 3, 2, MAP_VICTORY_ROAD_B2F + warp_def 42, 25, 3, 3, MAP_VICTORY_ROAD_1F + warp_def 42, 2, 4, 1, MAP_VICTORY_ROAD_B2F + warp_def 8, 3, 3, 4, MAP_VICTORY_ROAD_1F + warp_def 20, 21, 3, 2, MAP_VICTORY_ROAD_1F + warp_def 5, 26, 3, 3, MAP_VICTORY_ROAD_B2F VictoryRoad_B1F_MapEvents:: @ 838DC04 map_events VictoryRoad_B1F_MapObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/events/VictoryRoad_B2F.inc index b4aa07e59..e9d549f04 100644 --- a/data/maps/events/VictoryRoad_B2F.inc +++ b/data/maps/events/VictoryRoad_B2F.inc @@ -3,13 +3,13 @@ VictoryRoad_B2F_MapObjects:: @ 838DC18 object_event 2, MAP_OBJ_GFX_MAN_4, 0, 43, 0, 14, 0, 3, 7, 17, 0, 1, 0, 4, 0, VictoryRoad_B2F_EventScript_15E012, 0, 0, 0 object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 2, 0, 17, 0, 3, 8, 17, 0, 1, 0, 2, 0, VictoryRoad_B2F_EventScript_15E029, 0, 0, 0 object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 35, 0, 22, 0, 3, 9, 17, 0, 1, 0, 2, 0, VictoryRoad_B2F_EventScript_15E040, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B2F_EventScript_1B1AFA, 1088, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B2F_EventScript_1B1AFA, FLAG_ITEM_VICTORY_ROAD_B2F_1, 0, 0 VictoryRoad_B2F_MapWarps:: @ 838DC90 - warp_def 30, 25, 3, 0, VictoryRoad_B1F - warp_def 43, 2, 3, 3, VictoryRoad_B1F - warp_def 19, 12, 3, 1, VictoryRoad_B1F - warp_def 5, 26, 3, 6, VictoryRoad_B1F + warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F + warp_def 43, 2, 3, 3, MAP_VICTORY_ROAD_B1F + warp_def 19, 12, 3, 1, MAP_VICTORY_ROAD_B1F + warp_def 5, 26, 3, 6, MAP_VICTORY_ROAD_B1F VictoryRoad_B2F_MapBGEvents:: @ 838DCB0 bg_event 28, 5, 3, 7, 0, ITEM_ELIXIR, 82, 0 diff --git a/data/matsuda_debug_menu.s b/data/matsuda_debug_menu.s deleted file mode 100644 index c4f7adcb7..000000000 --- a/data/matsuda_debug_menu.s +++ /dev/null @@ -1,201 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -@ 83C9150 - .string "テストです$" @ "test" - -gMatsudaDebugMenu_ActionContestText: - .string "Contest$" - -gMatsudaDebugMenu_ActionContestResultsText: - .string "Contest results$" - .string "パラメータへんこう$" @ "Change parameter" - .string "わざ へんこう$" @ "Change move" - -gMatsudaDebugMenu_ActionContestCommText: - .string "Contest (comm.)$" - -gMatsudaDebugMenu_ActionCommTestText: - .string "Init comm. data$" - -gMatsudaDebugMenu_ActionSetHighScoreText: - .string "Set highest score$" - -gMatsudaDebugMenu_ActionResetHighScoreText: - .string "Reset highest score$" - -gMatsudaDebugMenu_ActionSetAllArtMuseumText: - .string "Set all art museum items$" - - .align 2 -gMatsudaDebugMenuActions:: @ 83C91F0 - .4byte gMatsudaDebugMenu_ActionContestText, MatsudaDebugMenu_Contest - .4byte gMatsudaDebugMenu_ActionContestResultsText, MatsudaDebugMenu_ContestResults - .4byte gMatsudaDebugMenu_ActionContestCommText, MatsudaDebugMenu_ContestComm - .4byte gMatsudaDebugMenu_ActionCommTestText, MatsudaDebugMenu_CommTest - .4byte gMatsudaDebugMenu_ActionSetHighScoreText, MatsudaDebugMenu_SetHighScore - .4byte gMatsudaDebugMenu_ActionResetHighScoreText, MatsudaDebugMenu_ResetHighScore - .4byte gMatsudaDebugMenu_ActionSetAllArtMuseumText, MatsudaDebugMenu_SetArtMuseumItems - -gMatsudaDebugMenu_UnknownByteArray:: @ 83C9228 - .byte 0xFC, 0x02, 0x0F, 0x00, 0xFF - -Unknown_083C922D: - .incbin "graphics/unknown/ball.4bpp" - - .align 1 -Unknown_083C924E: - .incbin "graphics/unknown/ball.gbapal" - -gUnknown_083C926E:: @ 83C926E - .byte 2, 0 - .byte 17, 0 - .byte 2, 2 - .byte 17, 2 - -gMatsudaDebugMenuContestTopLeft:: @ 83C9276 - .byte 0, 6 - .byte 15, 6 - .byte 0, 8 - .byte 15, 8 - .byte 0, 10 - .byte 15, 10 - -gUnknown_083C9282:: @ 83C9282 - .byte 7, 6 - .byte 22, 6 - .byte 7, 8 - .byte 22, 8 - .byte 7, 10 - .byte 22, 10 - -gUnknown_083C928E:: @ 83C928E - .byte 2, 14 - .byte 17, 14 - .byte 2, 16 - .byte 17, 16 - -gUnknown_083C9296:: @ 83C9296 - .byte 0x08, 0x80, 0x08, 0x80, 0x10, 0x10, 0x30, 0xA8, 0x30, 0xA8, 0x30, 0xA8, 0x08, 0x80, 0x08, 0x80, 0x10, 0x88 - -gUnknown_083C92A8:: @ 83C92A8 - .byte 0x08, 0x18, 0x28, 0x38, 0x48, 0x58, 0x78, 0x88, 0x98 - - .align 2 -gUnknown_083C92B4:: @ 83C92B4 - obj_tiles Unknown_083C922D, 32, 0x04b0 - - .align 2 -gUnknown_083C92BC:: @ 83C92BC - obj_pal Unknown_083C924E, 0x04B0 - - .align 2 -gOamData_83C92C4:: @ 83C92C4 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gSpriteTemplate_83C92CC:: @ 83C92CC - spr_template 1200, 1200, gOamData_83C92C4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AA754 - - .align 2 -gUnknown_083C92E4:: @ 83C92E4 - .4byte sub_80AA8C8 - .4byte sub_80AA8D8 - .4byte sub_80AA8E8 - .4byte sub_80AA8F8 - .4byte sub_80AAC5C - .4byte sub_80AAC5C - .4byte sub_80AA930 - .4byte sub_80AA974 - .4byte sub_80AA9B8 - .4byte sub_80AA9FC - .4byte sub_80AAA40 - .4byte sub_80AAA84 - .4byte sub_80AAAF0 - .4byte sub_80AAB30 - .4byte sub_80AAB70 - .4byte sub_80AABB0 - .4byte sub_80AABF0 - .4byte sub_80AAD44 - -gMatsudaDebugMenu_StartText:: @ 83C932C - .string "{COLOR CYAN}{HIGHLIGHT RED}$" - .string "かいし$" @ Start - -gMatsudaDebugMenu_GoBackText:: @ 83C9337 - .string "もどる$" @ Go Back - -gMatsudaDebugMenu_BattlePointsText:: @ 83C933B -.ifdef ENGLISH - .string "{COLOR MAGENTA}BP.$" -.else - .string "{COLOR MAGENTA}BP,$" -.endif - -MatsudaDebugMenuText_Cool: - .string "かっこよさ$" @ coolness -MatsudaDebugMenuText_Cute: - .string "かわいさ$" @ cuteness -MatsudaDebugMenuText_Beauty: - .string "うつくしさ$" @ beauty -MatsudaDebugMenuText_Smart: - .string "かしこさ$" @ smartness -MatsudaDebugMenuText_Tough: - .string "たくましさ$" @ toughness -MatsudaDebugMenuText_Sheen: - .string "けづや$" @ sheen - - .align 2 -gMatsudaDebugMenuTextList1:: @ 83C9364 - .4byte MatsudaDebugMenuText_Cool - .4byte MatsudaDebugMenuText_Cute - .4byte MatsudaDebugMenuText_Beauty - .4byte MatsudaDebugMenuText_Smart - .4byte MatsudaDebugMenuText_Tough - .4byte MatsudaDebugMenuText_Sheen - -MatsudaDebugMenuText_CoolContest: - .string "かっこよさコンテスト$" @ Cool Contest -MatsudaDebugMenuText_BeautyContest: - .string "うつくしさコンテスト$" @ Beauty Contest -MatsudaDebugMenuText_CuteContest: - .string "かわいさコンテスト $" @ Cute Contest -MatsudaDebugMenuText_SmartContest: - .string "かしこさコンテスト $" @ Smart Contest -MatsudaDebugMenuText_ToughContest: - .string "たくましさコンテスト$" @ Tough Contest - - .align 2 -gMatsudaDebugMenuTextList2:: @ 83C93B4 - .4byte MatsudaDebugMenuText_CoolContest - .4byte MatsudaDebugMenuText_BeautyContest - .4byte MatsudaDebugMenuText_CuteContest - .4byte MatsudaDebugMenuText_SmartContest - .4byte MatsudaDebugMenuText_ToughContest - -MatsudaDebugMenuText_Fallarbor: - .string "ハジツゲ/ノーマル$" @ Fallarbor / Normal -MatsudaDebugMenuText_Verdanturf: - .string "シダケ/スーパー $" @ Verdanturf / Super -MatsudaDebugMenuText_Slateport: - .string "カイナ/ハイパー $" @ Slateport / Hyper -MatsudaDebugMenuText_Lilycove: - .string "ミナモ/マスター $" @ Lilycove / Master - - .align 2 -gMatsudaDebugMenuTextList3:: @ 83C93F0 - .4byte MatsudaDebugMenuText_Fallarbor @ Normal - .4byte MatsudaDebugMenuText_Verdanturf @ Super - .4byte MatsudaDebugMenuText_Slateport @ Hyper - .4byte MatsudaDebugMenuText_Lilycove @ Master - -@ OamData - .align 2 -gUnknown_083C9400:: @ 83C9400 - .2byte 0x4000 - .2byte 0x4000 - .2byte 0xF3FF diff --git a/data/mon_markings.s b/data/mon_markings.s deleted file mode 100644 index b9ec7735f..000000000 --- a/data/mon_markings.s +++ /dev/null @@ -1,207 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_083E49F4:: @ 83E49F4 - .incbin "graphics/misc/mon_markings.gbapal" - - .align 2 -gUnknown_083E4A14:: @ 83E4A14 - .incbin "graphics/misc/mon_markings.4bpp" - - .align 2 -gOamData_83E5214:: @ 83E5214 - .2byte 0x0 - .2byte 0xC000 - .2byte 0x0 - - .align 2 -gOamData_83E521C:: @ 83E521C - .2byte 0x0 - .2byte 0x0 - .2byte 0x0 - - .align 2 -gSpriteAnim_83E5224:: @ 83E5224 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E522C:: @ 83E522C - obj_image_anim_frame 1, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E5234:: @ 83E5234 - obj_image_anim_frame 2, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E523C:: @ 83E523C - obj_image_anim_frame 3, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E5244:: @ 83E5244 - obj_image_anim_frame 4, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E524C:: @ 83E524C - obj_image_anim_frame 5, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E5254:: @ 83E5254 - obj_image_anim_frame 6, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E525C:: @ 83E525C - obj_image_anim_frame 7, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E5264:: @ 83E5264 - obj_image_anim_frame 8, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E526C:: @ 83E526C - obj_image_anim_frame 9, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83E5274:: @ 83E5274 - .4byte gSpriteAnim_83E5224 - .4byte gSpriteAnim_83E522C - .4byte gSpriteAnim_83E5234 - .4byte gSpriteAnim_83E523C - .4byte gSpriteAnim_83E5244 - .4byte gSpriteAnim_83E524C - .4byte gSpriteAnim_83E5254 - .4byte gSpriteAnim_83E525C - .4byte gSpriteAnim_83E5264 - .4byte gSpriteAnim_83E526C - - .align 2 -gSpriteAnim_83E529C:: @ 83E529C - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E52A4:: @ 83E52A4 - obj_image_anim_frame 64, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83E52AC:: @ 83E52AC - .4byte gSpriteAnim_83E529C - .4byte gSpriteAnim_83E52A4 - - .align 2 -gOamData_83E52B4:: @ 83E52B4 - .2byte 0x4000 - .2byte 0x4000 - .2byte 0x0 - - .align 2 -gSpriteAnim_83E52BC:: @ 83E52BC - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E52C4:: @ 83E52C4 - obj_image_anim_frame 4, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E52CC:: @ 83E52CC - obj_image_anim_frame 8, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E52D4:: @ 83E52D4 - obj_image_anim_frame 12, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E52DC:: @ 83E52DC - obj_image_anim_frame 16, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E52E4:: @ 83E52E4 - obj_image_anim_frame 20, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E52EC:: @ 83E52EC - obj_image_anim_frame 24, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E52F4:: @ 83E52F4 - obj_image_anim_frame 28, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E52FC:: @ 83E52FC - obj_image_anim_frame 32, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E5304:: @ 83E5304 - obj_image_anim_frame 36, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E530C:: @ 83E530C - obj_image_anim_frame 40, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E5314:: @ 83E5314 - obj_image_anim_frame 44, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E531C:: @ 83E531C - obj_image_anim_frame 48, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E5324:: @ 83E5324 - obj_image_anim_frame 52, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E532C:: @ 83E532C - obj_image_anim_frame 56, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E5334:: @ 83E5334 - obj_image_anim_frame 60, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83E533C:: @ 83E533C - .4byte gSpriteAnim_83E52BC - .4byte gSpriteAnim_83E52C4 - .4byte gSpriteAnim_83E52CC - .4byte gSpriteAnim_83E52D4 - .4byte gSpriteAnim_83E52DC - .4byte gSpriteAnim_83E52E4 - .4byte gSpriteAnim_83E52EC - .4byte gSpriteAnim_83E52F4 - .4byte gSpriteAnim_83E52FC - .4byte gSpriteAnim_83E5304 - .4byte gSpriteAnim_83E530C - .4byte gSpriteAnim_83E5314 - .4byte gSpriteAnim_83E531C - .4byte gSpriteAnim_83E5324 - .4byte gSpriteAnim_83E532C - .4byte gSpriteAnim_83E5334 diff --git a/data/money.s b/data/money.s deleted file mode 100644 index 04e54a836..000000000 --- a/data/money.s +++ /dev/null @@ -1,31 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gOamData_83CF558:: @ 83CF558 - .2byte 0x4000 - .2byte 0x8000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_83CF560:: @ 83CF560 - obj_image_anim_frame 0, 0 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83CF568:: @ 83CF568 - .4byte gSpriteAnim_83CF560 - - .align 2 -gSpriteTemplate_83CF56C:: @ 83CF56C - spr_template 10018, 10018, gOamData_83CF558, gSpriteAnimTable_83CF568, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_083CF584:: @ 83CF584 - obj_tiles gMenuMoneyGfx, 256, 0x2722 - - .align 2 -gUnknown_083CF58C:: @ 83CF58C - obj_pal gMenuMoneyPal, 0x2722 diff --git a/data/mori_debug_menu.s b/data/mori_debug_menu.s deleted file mode 100644 index 2545b2b15..000000000 --- a/data/mori_debug_menu.s +++ /dev/null @@ -1,72 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -@ These seem to be strings for keypad test code. -gUnknown_0839B22C:: @ 839B22C - .string " A$" @ A - .string " B$" @ B - .string "SL$" @ SELECT - .string "ST$" @ START - .string "RK$" @ right - .string "LK$" @ left - .string "UK$" @ up - .string "DK$" @ down - .string "RT$" @ R - .string "LT$" @ L - -gUnknown_0839B24A:: @ 839B24A - .string "ND$" - -gUnknown_0839B24D:: @ 839B24D - .string "の こどもは\n$" @ "'s child <topic-particle>" - -gUnknown_0839B255:: @ 839B255 - .string " $" - -gUnknown_0839B257:: @ 839B257 - .string "ながいなまえぽけもん$" @ "long name pokemon" (used as test name) - -Text_39B262: @ 839B262 - .string "Search a child$" - -Text_39B271: @ 839B271 - .string "Egg$" - -Text_39B275: @ 839B275 - .string "Egg (male)$" - -Text_39B280: @ 839B280 - .string "1000 steps$" - -Text_39B28B: @ 839B28B - .string "10000 steps$" - -Text_39B297: @ 839B297 - .string "MOVE TUTOR$" - -Text_39B2A2: @ 839B2A2 - .string "Breed an egg$" - -Text_39B2AF: @ 839B2AF - .string "Long name$" - -Text_39B2B9: @ 839B2B9 -.ifdef ENGLISH - .string "ポロックけす$" @ "{POKEBLOCK} CASE$" -.else - .string "Delete {POKEBLOCK}$" -.endif - - .align 2 -gMoriDebugMenuActions:: @ 839B2C0 - .4byte Text_39B262, MoriDebugMenu_SearchChild - .4byte Text_39B271, MoriDebugMenu_Egg - .4byte Text_39B275, MoriDebugMenu_MaleEgg - .4byte Text_39B280, MoriDebugMenu_1000Steps - .4byte Text_39B28B, MoriDebugMenu_10000Steps - .4byte Text_39B297, MoriDebugMenu_MoveTutor - .4byte Text_39B2A2, MoriDebugMenu_BreedEgg - .4byte Text_39B2AF, MoriDebugMenu_LongName - .4byte Text_39B2B9, MoriDebugMenu_PokeblockCase diff --git a/data/pc_screen_effect.s b/data/pc_screen_effect.s new file mode 100755 index 000000000..c33957945 --- /dev/null +++ b/data/pc_screen_effect.s @@ -0,0 +1,27 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gOamData_83D18D8:: @ 83D18D8 + .2byte 0x4000 + .2byte 0x4000 + .2byte 0x0000 + + .align 2 +gSpriteAnim_83D18E0:: @ 83D18E0 + obj_image_anim_frame 0, 5 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_83D18E8:: @ 83D18E8 + .4byte gSpriteAnim_83D18E0 + + .align 2 +gUnknownPal_083D18EC:: + .incbin "graphics/unknown/unknown_3D18EC.gbapal" + + .align 2 +gUnknownGfx_083D190C:: + .incbin "graphics/unknown/unknown_3D190C.4bpp" diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s index 9c23f8e89..0d15169d0 100644 --- a/data/pokedex_area_screen.s +++ b/data/pokedex_area_screen.s @@ -20,13 +20,13 @@ gUnknown_083F856E:: @ 83F856E .align 1 gUnknown_083F857A:: @ 83F857A - .2byte 85, 2142 - .2byte 68, 2119 + .2byte 85, 2142 @ FLAG_LANDMARK_SKY_PILLAR + .2byte 68, 2119 @ FLAG_LANDMARK_SEAFLOOR_CAVERN .2byte 88, 0 @ XXX: what is this? .align 2 - .4byte 0x2000000 + .4byte gSharedMem .align 2 gUnknown_083F858C:: @ 83F858C @@ -60,7 +60,7 @@ gUnknown_083F865C:: @ 83F865C .align 2 gUnknown_083F8664:: @ 83F8664 - obj_tiles 0x02000FB4, 0x600, 3 + obj_tiles gSharedMem + 0xFB4, 0x600, 3 .align 2 gOamData_83F866C:: @ 83F866C diff --git a/data/pokedex_cry_screen.s b/data/pokedex_cry_screen.s index d5faa24de..0908ddacb 100644 --- a/data/pokedex_cry_screen.s +++ b/data/pokedex_cry_screen.s @@ -37,7 +37,7 @@ gUnknown_083FB274:: @ 83FB274 .2byte 0x3,0x7,0xB,0xF,0x13,0x17,0x1B,0x1F,0x403,0x407,0x40B,0x40F,0x413,0x417,0x41B,0x41F,0x803,0x807,0x80B,0x80F,0x813,0x817,0x81B,0x81F,0xC03,0xC07,0xC0B,0xC0F,0xC13,0xC17,0xC1B,0xC1F,0x1003,0x1007,0x100B,0x100F,0x1013,0x1017,0x101B,0x101F,0x1403,0x1407,0x140B,0x140F,0x1413,0x1417,0x141B,0x141F,0x1803,0x1807,0x180B,0x180F,0x1813,0x1817,0x181B,0x181F,0x1C03,0x1C07,0x1C0B,0x1C0F,0x1C13,0x1C17,0x1C1B,0x1C1F,0x2003,0x2007,0x200B,0x200F,0x2013,0x2017,0x201B,0x201F .align 2 - .4byte 0x201C000 + .4byte gSharedMem + 0x1C000 .align 1 gUnknown_083FB6F8:: @ 83FB6F8 diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index e5d3e9282..b765656f7 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -126,7 +126,7 @@ gUnknown_083B6D94:: @ 83B6D94 .align 2 gUnknown_083B6DB4:: @ 83B6DB4 - .4byte 0x02000000 + .4byte gSharedMem .align 2 gUnknown_083B6DB8:: @ 83B6DB8 @@ -142,11 +142,11 @@ gWaveformSpriteSheet:: @ 83B6DC4 .align 2 gUnknown_083B6DCC:: @ 83B6DCC - obj_tiles 0x02002784, 0x800, 2 + obj_tiles gSharedMem + 0x2784, 0x800, 2 .align 2 gUnknown_083B6DD4:: @ 83B6DD4 - obj_pal 0x02002704, 56007 + obj_pal gSharedMem + 0x2704, 56007 .align 2 gSpriteTemplate_83B6DDC:: @ 83B6DDC diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s deleted file mode 100644 index 5d577ca84..000000000 --- a/data/pokemon_summary_screen.s +++ /dev/null @@ -1,393 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -@ 83BC680 - .include "data/text/move_descriptions.inc" - -@ 83C0F60 - .include "data/text/nature_names.inc" - - .align 2 -gUnknown_083C1068:: @ 83C1068 - .4byte gEmptyString_81E72B0 - .4byte OtherText_PokeInfo - .4byte OtherText_PokeSkills - .4byte OtherText_BattleMoves - .4byte OtherText_ContestMoves - .4byte OtherText_Switch - .4byte OtherText_Info - .4byte gOtherText_CancelNoTerminator - - .align 2 -gSpriteAffineAnim_83C1088:: @ 83C1088 - obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_83C1098:: @ 83C1098 - .4byte gSpriteAffineAnim_83C1088 - - .align 2 -gOamData_83C109C:: @ 83C109C - .2byte 0x4000 - .2byte 0x8000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_83C10A4:: @ 83C10A4 - obj_image_anim_frame 0, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10AC:: @ 83C10AC - obj_image_anim_frame 8, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10B4:: @ 83C10B4 - obj_image_anim_frame 16, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10BC:: @ 83C10BC - obj_image_anim_frame 24, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10C4:: @ 83C10C4 - obj_image_anim_frame 32, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10CC:: @ 83C10CC - obj_image_anim_frame 40, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10D4:: @ 83C10D4 - obj_image_anim_frame 48, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10DC:: @ 83C10DC - obj_image_anim_frame 56, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10E4:: @ 83C10E4 - obj_image_anim_frame 64, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10EC:: @ 83C10EC - obj_image_anim_frame 72, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10F4:: @ 83C10F4 - obj_image_anim_frame 80, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10FC:: @ 83C10FC - obj_image_anim_frame 88, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1104:: @ 83C1104 - obj_image_anim_frame 96, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C110C:: @ 83C110C - obj_image_anim_frame 104, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1114:: @ 83C1114 - obj_image_anim_frame 112, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C111C:: @ 83C111C - obj_image_anim_frame 120, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1124:: @ 83C1124 - obj_image_anim_frame 128, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C112C:: @ 83C112C - obj_image_anim_frame 136, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1134:: @ 83C1134 - obj_image_anim_frame 144, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C113C:: @ 83C113C - obj_image_anim_frame 152, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1144:: @ 83C1144 - obj_image_anim_frame 160, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C114C:: @ 83C114C - obj_image_anim_frame 168, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1154:: @ 83C1154 - obj_image_anim_frame 176, 0 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83C115C:: @ 83C115C - .4byte gSpriteAnim_83C10A4 - .4byte gSpriteAnim_83C10AC - .4byte gSpriteAnim_83C10B4 - .4byte gSpriteAnim_83C10BC - .4byte gSpriteAnim_83C10C4 - .4byte gSpriteAnim_83C10CC - .4byte gSpriteAnim_83C10D4 - .4byte gSpriteAnim_83C10DC - .4byte gSpriteAnim_83C10E4 - .4byte gSpriteAnim_83C10EC - .4byte gSpriteAnim_83C10F4 - .4byte gSpriteAnim_83C10FC - .4byte gSpriteAnim_83C1104 - .4byte gSpriteAnim_83C110C - .4byte gSpriteAnim_83C1114 - .4byte gSpriteAnim_83C111C - .4byte gSpriteAnim_83C1124 - .4byte gSpriteAnim_83C112C - .4byte gSpriteAnim_83C1134 - .4byte gSpriteAnim_83C113C - .4byte gSpriteAnim_83C1144 - .4byte gSpriteAnim_83C114C - .4byte gSpriteAnim_83C1154 - - .align 2 -gUnknown_083C11B8:: @ 83C11B8 - obj_tiles gMoveTypes_Gfx, 5888, 0x7532 - - .align 2 -gSpriteTemplate_83C11C0:: @ 83C11C0 - spr_template 30002, 30002, gOamData_83C109C, gSpriteAnimTable_83C115C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_083C11D8:: @ 83C11D8 - .byte 0xD,0xD,0xE,0xE,0xD,0xD,0xF,0xE,0xD,0xF,0xD,0xE,0xF,0xD,0xE,0xE,0xF,0xD,0xD,0xE,0xE,0xF,0xD - - .align 2 -gOamData_83C11F0:: @ 83C11F0 - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_83C11F8:: @ 83C11F8 - obj_image_anim_frame 0, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1200:: @ 83C1200 - obj_image_anim_frame 4, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1208:: @ 83C1208 - obj_image_anim_frame 8, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1210:: @ 83C1210 - obj_image_anim_frame 12, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1218:: @ 83C1218 - obj_image_anim_frame 16, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1220:: @ 83C1220 - obj_image_anim_frame 16, 0, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1228:: @ 83C1228 - obj_image_anim_frame 20, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1230:: @ 83C1230 - obj_image_anim_frame 24, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1238:: @ 83C1238 - obj_image_anim_frame 24, 0, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1240:: @ 83C1240 - obj_image_anim_frame 28, 0 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83C1248:: @ 83C1248 - .4byte gSpriteAnim_83C11F8 - .4byte gSpriteAnim_83C1200 - .4byte gSpriteAnim_83C1208 - .4byte gSpriteAnim_83C1210 - .4byte gSpriteAnim_83C1218 - .4byte gSpriteAnim_83C1220 - .4byte gSpriteAnim_83C1228 - .4byte gSpriteAnim_83C1230 - .4byte gSpriteAnim_83C1238 - .4byte gSpriteAnim_83C1240 - - .align 2 -gUnknown_083C1270:: @ 83C1270 - obj_tiles gMenuSummaryGfx, 1024, 0x7530 - - .align 2 -gUnknown_083C1278:: @ 83C1278 - obj_pal gMenuSummaryPal, 0x7530 - - .align 2 -gSpriteTemplate_83C1280:: @ 83C1280 - spr_template 30000, 30000, gOamData_83C11F0, gSpriteAnimTable_83C1248, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gOamData_83C1298:: @ 83C1298 - .2byte 0x4000 - .2byte 0x4000 - .2byte 0x0C00 - - .align 2 -gSpriteAnim_83C12A0:: @ 83C12A0 - obj_image_anim_frame 0, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C12A8:: @ 83C12A8 - obj_image_anim_frame 4, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C12B0:: @ 83C12B0 - obj_image_anim_frame 8, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C12B8:: @ 83C12B8 - obj_image_anim_frame 12, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C12C0:: @ 83C12C0 - obj_image_anim_frame 16, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C12C8:: @ 83C12C8 - obj_image_anim_frame 20, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C12D0:: @ 83C12D0 - obj_image_anim_frame 24, 0 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83C12D8:: @ 83C12D8 - .4byte gSpriteAnim_83C12A0 - .4byte gSpriteAnim_83C12A8 - .4byte gSpriteAnim_83C12B0 - .4byte gSpriteAnim_83C12B8 - .4byte gSpriteAnim_83C12C0 - .4byte gSpriteAnim_83C12C8 - .4byte gSpriteAnim_83C12D0 - - .align 2 -gUnknown_083C12F4:: @ 83C12F4 - obj_tiles gStatusGfx_Icons, 896, 0x7531 - - .align 2 -gUnknown_083C12FC:: @ 83C12FC - obj_pal gStatusPal_Icons, 0x7531 - - .align 2 -gSpriteTemplate_83C1304:: @ 83C1304 - spr_template 30001, 30001, gOamData_83C1298, gSpriteAnimTable_83C12D8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSummaryScreenMonMarkingsPalette:: @ 83C131C - .incbin "graphics/summary_screen/mon_markings.gbapal" - -.ifdef ENGLISH - .align 2 -gSummaryScreenTextTiles:: @ 83C133C - .incbin "graphics/summary_screen/text.4bpp" -.endif - - .align 2 -gSummaryScreenButtonTiles:: @ 83C147C - .incbin "graphics/summary_screen/buttons.4bpp" - - .align 1 -gUnknown_083C157C:: @ 83C157C - .2byte 0x5F5A @ palette color - - .align 1 -gUnknown_083C157E:: @ 83C157E - .2byte 0x6FDE @ palette color - - .align 2 -gUnknown_083C1580:: @ 83C1580 - .4byte sub_809FC0C - .4byte sub_809FEB8 - - .align 2 -gUnknown_083C1588:: @ 83C1588 - .4byte sub_809F63C - .4byte sub_809F650 - .4byte sub_809F664 - .4byte sub_809F664 - - .align 2 -gUnknown_083C1598:: @ 83C1598 - .4byte sub_809FE6C - .4byte sub_80A0090 - .4byte sub_80A015C - .4byte sub_80A015C - -gUnknown_083C15A8:: @ 83C15A8 - .byte 0, 2, 3, 1, 4, 5 - -gUnknown_083C15AE:: @ 83C15AE - .string "{STR_VAR_1}{CLEAR_TO 64}$" - -gUnknown_083C15B4:: @ 83C15B4 - .string "{STR_VAR_1}{CLEAR_TO 72}$" - - .align 2 -gUnknown_083C15BC:: @ 83C15BC - .byte 9, 1, 0, 2 - .byte 10, 3, 0, 4 - .byte 8, 5, 0, 6 - .byte 11, 7, 0, 8 - .byte 14, 9, 0, 10 - .byte 12, 11, 0, 12 - .byte 13, 13, 0, 14 - .byte -1, 15, 0, 10 diff --git a/data/pokenav.s b/data/pokenav.s index 3ea704c03..f84e45596 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -5,7 +5,7 @@ .align 2 gUnknown_083DFEC4:: @ 83DFEC4 - .4byte 0x2000000 + .4byte gSharedMem .align 2 gUnknown_083DFEC8:: @ 83DFEC8 diff --git a/data/reset_rtc_screen.s b/data/reset_rtc_screen.s deleted file mode 100644 index a9a3ac847..000000000 --- a/data/reset_rtc_screen.s +++ /dev/null @@ -1,67 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_08376420:: @ 8376420 - .byte 3, 0, 1, 0, 15, 39, 0, 2, 0, 0, 0, 0 - .byte 4, 0, 0, 0, 23, 0, 1, 3, 0, 0, 0, 0 - .byte 5, 0, 0, 0, 59, 0, 2, 4, 0, 0, 0, 0 - .byte 6, 0, 0, 0, 59, 0, 3, 5, 0, 0, 0, 0 - .byte 7, 0, 0, 0, 0, 0, 4, 0, 6, 0, 0, 0 - - .align 2 -gOamData_837645C:: @ 837645C - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gSpriteImage_8376464:: @ 8376464 - .incbin "graphics/unknown_sprites/83764AC/0.4bpp" - - .align 2 -gSpriteImage_8376484:: @ 8376484 - .incbin "graphics/unknown_sprites/83764AC/1.4bpp" - - .align 2 -Palette_3764A4: @ 83764A4 - .incbin "graphics/unknown/83764A4.gbapal" - - .align 2 -gSpriteImageTable_83764AC:: @ 83764AC - obj_frame_tiles gSpriteImage_8376464, 0x20 - obj_frame_tiles gSpriteImage_8376484, 0x20 - - .align 2 -gUnknown_083764BC:: @ 83764BC - obj_pal Palette_3764A4, 0x1000 - - .align 2 -gSpriteAnim_83764C4:: @ 83764C4 - obj_image_anim_frame 0, 30 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83764CC:: @ 83764CC - obj_image_anim_frame 0, 30, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83764D4:: @ 83764D4 - obj_image_anim_frame 1, 30 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_83764DC:: @ 83764DC - .4byte gSpriteAnim_83764C4 - .4byte gSpriteAnim_83764CC - .4byte gSpriteAnim_83764D4 - - .align 2 -gSpriteTemplate_83764E8:: @ 83764E8 - spr_template 0xFFFF, 0x1000, gOamData_837645C, gSpriteAnimTable_83764DC, gSpriteImageTable_83764AC, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_08376500:: @ 8376500 - .string " : $" diff --git a/data/roulette.s b/data/roulette.s index 47aa45215..64b7b82e2 100644 --- a/data/roulette.s +++ b/data/roulette.s @@ -621,10 +621,10 @@ gOamData_83FA328:: @ 83FA328 .align 2 gSpriteImageTable_83FA330:: @ 83FA330 - obj_frame_tiles 0x02017E00, 0x80 - obj_frame_tiles 0x02017E80, 0x80 - obj_frame_tiles 0x02017F00, 0x80 - obj_frame_tiles 0x02017F80, 0x80 + obj_frame_tiles gSharedMem + 0x17E00, 0x80 + obj_frame_tiles gSharedMem + 0x17E80, 0x80 + obj_frame_tiles gSharedMem + 0x17F00, 0x80 + obj_frame_tiles gSharedMem + 0x17F80, 0x80 .align 2 gSpriteAnim_83FA350:: @ 83FA350 @@ -732,13 +732,13 @@ gOamData_83FA454:: @ 83FA454 .align 2 gSpriteImageTable_83FA45C:: @ 83FA45C - obj_frame_tiles 0x02017000, 0x200 - obj_frame_tiles 0x02017200, 0x200 - obj_frame_tiles 0x02017400, 0x200 - obj_frame_tiles 0x02017600, 0x200 - obj_frame_tiles 0x02017800, 0x200 - obj_frame_tiles 0x02017A00, 0x200 - obj_frame_tiles 0x02017C00, 0x200 + obj_frame_tiles gSharedMem + 0x17000, 0x200 + obj_frame_tiles gSharedMem + 0x17200, 0x200 + obj_frame_tiles gSharedMem + 0x17400, 0x200 + obj_frame_tiles gSharedMem + 0x17600, 0x200 + obj_frame_tiles gSharedMem + 0x17800, 0x200 + obj_frame_tiles gSharedMem + 0x17A00, 0x200 + obj_frame_tiles gSharedMem + 0x17C00, 0x200 .align 2 gSpriteAnim_83FA494:: @ 83FA494 @@ -825,11 +825,11 @@ gOamData_83FA54C:: @ 83FA54C .align 2 gSpriteImageTable_83FA554: @ 83FA554 - obj_frame_tiles 0x02018000, 0x80 + obj_frame_tiles gSharedMem + 0x18000, 0x80 .align 2 gSpriteImageTable_83FA55C: @ 83FA55C - obj_frame_tiles 0x02018080, 0x100 + obj_frame_tiles gSharedMem + 0x18080, 0x100 .align 2 gSpriteAffineAnim_83FA564:: @ 83FA564 diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index b6b7401f3..3f47da1da 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -67,18 +67,18 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_setdivewarp @ 0x40 .4byte ScrCmd_setholewarp @ 0x41 .4byte ScrCmd_getplayerxy @ 0x42 - .4byte ScrCmd_countpokemon @ 0x43 - .4byte ScrCmd_additem @ 0x44 - .4byte ScrCmd_removeitem @ 0x45 + .4byte ScrCmd_getpartysize @ 0x43 + .4byte ScrCmd_giveitem @ 0x44 + .4byte ScrCmd_takeitem @ 0x45 .4byte ScrCmd_checkitemspace @ 0x46 .4byte ScrCmd_checkitem @ 0x47 .4byte ScrCmd_checkitemtype @ 0x48 - .4byte ScrCmd_addpcitem @ 0x49 + .4byte ScrCmd_givepcitem @ 0x49 .4byte ScrCmd_checkpcitem @ 0x4A - .4byte ScrCmd_adddecor @ 0x4B - .4byte ScrCmd_removedecor @ 0x4C - .4byte ScrCmd_hasdecor @ 0x4D - .4byte ScrCmd_checkdecor @ 0x4E + .4byte ScrCmd_givedecoration @ 0x4B + .4byte ScrCmd_takedecoration @ 0x4C + .4byte ScrCmd_checkdecor @ 0x4D + .4byte ScrCmd_checkdecorspace @ 0x4E .4byte ScrCmd_applymovement @ 0x4F .4byte ScrCmd_applymovement_at @ 0x50 .4byte ScrCmd_waitmovement @ 0x51 @@ -88,14 +88,14 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_addobject @ 0x55 .4byte ScrCmd_addobject_at @ 0x56 .4byte ScrCmd_setobjectxy @ 0x57 - .4byte ScrCmd_showobject @ 0x58 - .4byte ScrCmd_hideobject @ 0x59 + .4byte ScrCmd_showobjectat @ 0x58 + .4byte ScrCmd_hideobjectat @ 0x59 .4byte ScrCmd_faceplayer @ 0x5A .4byte ScrCmd_turnobject @ 0x5B .4byte ScrCmd_trainerbattle @ 0x5C - .4byte ScrCmd_battlebegin @ 0x5D - .4byte ScrCmd_ontrainerbattleend @ 0x5E - .4byte ScrCmd_ontrainerbattleendgoto @ 0x5F + .4byte ScrCmd_trainerbattlebegin @ 0x5D + .4byte ScrCmd_gotopostbattlescript @ 0x5E + .4byte ScrCmd_gotobeatenscript @ 0x5F .4byte ScrCmd_checktrainerflag @ 0x60 .4byte ScrCmd_settrainerflag @ 0x61 .4byte ScrCmd_cleartrainerflag @ 0x62 @@ -109,7 +109,7 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_lock @ 0x6A .4byte ScrCmd_releaseall @ 0x6B .4byte ScrCmd_release @ 0x6C - .4byte ScrCmd_waitbutton @ 0x6D + .4byte ScrCmd_waitbuttonpress @ 0x6D .4byte ScrCmd_yesnobox @ 0x6E .4byte ScrCmd_multichoice @ 0x6F .4byte ScrCmd_multichoicedefault @ 0x70 @@ -117,29 +117,29 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_drawbox @ 0x72 .4byte ScrCmd_erasebox @ 0x73 .4byte ScrCmd_drawboxtext @ 0x74 - .4byte ScrCmd_drawpokepic @ 0x75 - .4byte ScrCmd_erasepokepic @ 0x76 + .4byte ScrCmd_drawmonpic @ 0x75 + .4byte ScrCmd_erasemonpic @ 0x76 .4byte ScrCmd_drawcontestwinner @ 0x77 .4byte ScrCmd_braillemessage @ 0x78 - .4byte ScrCmd_givepoke @ 0x79 + .4byte ScrCmd_givemon @ 0x79 .4byte ScrCmd_giveegg @ 0x7A - .4byte ScrCmd_setpokemove @ 0x7B - .4byte ScrCmd_checkpokemove @ 0x7C - .4byte ScrCmd_getspeciesname @ 0x7D - .4byte ScrCmd_getfirstpartypokename @ 0x7E - .4byte ScrCmd_getpartypokename @ 0x7F - .4byte ScrCmd_getitemname @ 0x80 - .4byte ScrCmd_getdecorname @ 0x81 - .4byte ScrCmd_getmovename @ 0x82 - .4byte ScrCmd_getnumberstring @ 0x83 - .4byte ScrCmd_getstdstring @ 0x84 - .4byte ScrCmd_getstring @ 0x85 + .4byte ScrCmd_setmonmove @ 0x7B + .4byte ScrCmd_checkpartymove @ 0x7C + .4byte ScrCmd_bufferspeciesname @ 0x7D + .4byte ScrCmd_bufferleadmonspeciesname @ 0x7E + .4byte ScrCmd_bufferpartymonnick @ 0x7F + .4byte ScrCmd_bufferitemname @ 0x80 + .4byte ScrCmd_bufferdecorationname @ 0x81 + .4byte ScrCmd_buffermovename @ 0x82 + .4byte ScrCmd_buffernumberstring @ 0x83 + .4byte ScrCmd_bufferstdstring @ 0x84 + .4byte ScrCmd_bufferstring @ 0x85 .4byte ScrCmd_pokemart @ 0x86 - .4byte ScrCmd_pokemartdecor @ 0x87 - .4byte ScrCmd_pokemartbp @ 0x88 + .4byte ScrCmd_pokemartdecoration @ 0x87 + .4byte ScrCmd_pokemartdecoration2 @ 0x88 .4byte ScrCmd_playslotmachine @ 0x89 - .4byte ScrCmd_plantberrytree @ 0x8A - .4byte ScrCmd_choosecontestpkmn @ 0x8B + .4byte ScrCmd_setberrytree @ 0x8A + .4byte ScrCmd_choosecontestmon @ 0x8B .4byte ScrCmd_startcontest @ 0x8C .4byte ScrCmd_showcontestresults @ 0x8D .4byte ScrCmd_contestlinktransfer @ 0x8E @@ -152,21 +152,21 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_updatemoneybox @ 0x95 .4byte ScrCmd_getpricereduction @ 0x96 .4byte ScrCmd_fadescreen @ 0x97 - .4byte ScrCmd_fadescreendelay @ 0x98 - .4byte ScrCmd_setdarklevel @ 0x99 - .4byte ScrCmd_animdarklevel @ 0x9A + .4byte ScrCmd_fadescreenspeed @ 0x98 + .4byte ScrCmd_setflashradius @ 0x99 + .4byte ScrCmd_animateflash @ 0x9A .4byte ScrCmd_messageautoscroll @ 0x9B .4byte ScrCmd_dofieldeffect @ 0x9C - .4byte ScrCmd_setfieldeffect @ 0x9D + .4byte ScrCmd_setfieldeffectargument @ 0x9D .4byte ScrCmd_waitfieldeffect @ 0x9E - .4byte ScrCmd_sethealplace @ 0x9F + .4byte ScrCmd_setrespawn @ 0x9F .4byte ScrCmd_checkplayergender @ 0xA0 - .4byte ScrCmd_playpokecry @ 0xA1 - .4byte ScrCmd_setmaptile @ 0xA2 + .4byte ScrCmd_playmoncry @ 0xA1 + .4byte ScrCmd_setmetatile @ 0xA2 .4byte ScrCmd_resetweather @ 0xA3 .4byte ScrCmd_setweather @ 0xA4 .4byte ScrCmd_doweather @ 0xA5 - .4byte ScrCmd_tileeffect @ 0xA6 + .4byte ScrCmd_setstepcallback @ 0xA6 .4byte ScrCmd_setmaplayoutindex @ 0xA7 .4byte ScrCmd_setobjectpriority @ 0xA8 .4byte ScrCmd_resetobjectpriority @ 0xA9 @@ -190,14 +190,14 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_vgoto_if @ 0xBB .4byte ScrCmd_vcall_if @ 0xBC .4byte ScrCmd_vmessage @ 0xBD - .4byte ScrCmd_vloadword @ 0xBE - .4byte ScrCmd_vgetstring @ 0xBF + .4byte ScrCmd_vloadptr @ 0xBE + .4byte ScrCmd_vbufferstring @ 0xBF .4byte ScrCmd_showcoinsbox @ 0xC0 .4byte ScrCmd_hidecoinsbox @ 0xC1 .4byte ScrCmd_updatecoinsbox @ 0xC2 .4byte ScrCmd_incrementgamestat @ 0xC3 .4byte ScrCmd_setescapewarp @ 0xC4 - .4byte ScrCmd_waitpokecry @ 0xC5 + .4byte ScrCmd_waitmoncry @ 0xC5 gScriptCmdTableEnd:: .4byte ScrCmd_nop diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 9e219a339..ab700cbc3 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -14,7 +14,7 @@ Route102_EventScript_1A1533:: @ 81A1533 lockall message Route102_Text_1A1946 waitmessage - waitbutton + waitbuttonpress releaseall end @@ -26,7 +26,7 @@ Route102_EventScript_1A153D:: @ 81A153D goto_if_eq Route102_EventScript_1A1558 message Route102_Text_1A16B6 waitmessage - waitbutton + waitbuttonpress release end @@ -41,11 +41,11 @@ Route102_EventScript_1A1558:: @ 81A1558 Route102_EventScript_1A1577:: @ 81A1577 fadescreen 1 closemessage - special sub_80B4EE4 + special Berry_FadeAndGoToBerryBagMenu waitstate compare ITEM_ID, 0 goto_if_eq Route102_EventScript_1A1593 - removeitem ITEM_ID, 1 + takeitem ITEM_ID, 1 call Route102_EventScript_1A16A9 Route102_EventScript_1A1593:: @ 81A1593 @@ -56,21 +56,21 @@ Route102_EventScript_1A1595:: @ 81A1595 lockall message Route102_Text_1A172C waitmessage - waitbutton + waitbuttonpress goto Route102_EventScript_1A165F Route102_EventScript_1A15A2:: @ 81A15A2 lockall message Route102_Text_1A174B waitmessage - waitbutton + waitbuttonpress goto Route102_EventScript_1A165F Route102_EventScript_1A15AF:: @ 81A15AF lockall message Route102_Text_1A175C waitmessage - waitbutton + waitbuttonpress goto Route102_EventScript_1A165F Route102_EventScript_1A15BC:: @ 81A15BC @@ -78,7 +78,7 @@ Route102_EventScript_1A15BC:: @ 81A15BC lockall message Route102_Text_1A177D waitmessage - waitbutton + waitbuttonpress goto Route102_EventScript_1A165F Route102_EventScript_1A15CE:: @ 81A15CE @@ -86,19 +86,19 @@ Route102_EventScript_1A15CE:: @ 81A15CE goto_if_eq Route102_EventScript_1A15F2 compare 0x8005, 4 goto_if_eq Route102_EventScript_1A15EB - getstring 1, Route102_Text_1A17B7 + bufferstring 1, Route102_Text_1A17B7 return Route102_EventScript_1A15EB:: @ 81A15EB - getstring 1, Route102_Text_1A179F + bufferstring 1, Route102_Text_1A179F return Route102_EventScript_1A15F2:: @ 81A15F2 - getstring 1, Route102_Text_1A17B0 + bufferstring 1, Route102_Text_1A17B0 return Route102_EventScript_1A15F9:: @ 81A15F9 - getnumberstring 1, 0x8006 + buffernumberstring 1, 0x8006 lock faceplayer msgbox Route102_Text_1A17C0, 5 @@ -116,24 +116,24 @@ Route102_EventScript_1A161D:: @ 81A161D playfanfare 387 waitmessage waitfanfare - waitbutton + waitbuttonpress message Route102_Text_1A181A waitmessage - waitbutton + waitbuttonpress release end Route102_EventScript_1A1642:: @ 81A1642 message Route102_Text_1A1881 waitmessage - waitbutton + waitbuttonpress release end Route102_EventScript_1A164B:: @ 81A164B message Route102_Text_1A18C5 waitmessage - waitbutton + waitbuttonpress release end @@ -170,7 +170,7 @@ Route102_EventScript_1A1693:: @ 81A1693 waitstate message Route102_Text_1A1925 waitmessage - waitbutton + waitbuttonpress releaseall end @@ -179,5 +179,5 @@ Route102_EventScript_1A16A9:: @ 81A16A9 incrementgamestat GAME_STAT_PLANTED_BERRIES message Route102_Text_1A16FB waitmessage - waitbutton + waitbuttonpress return diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 9f44e131b..0cedcd0d5 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -52,15 +52,15 @@ VerdanturfTown_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 end OldaleTown_PokemonCenter_2F_EventScript_1A3D6A:: @ 81A3D6A - setmaptile 5, 3, 514, 0 + setmetatile 5, 3, 514, 0 end OldaleTown_PokemonCenter_2F_EventScript_1A3D74:: @ 81A3D74 - setmaptile 8, 3, 514, 0 + setmetatile 8, 3, 514, 0 end OldaleTown_PokemonCenter_2F_EventScript_1A3D7E:: @ 81A3D7E - setmaptile 11, 3, 514, 0 + setmetatile 11, 3, 514, 0 end DewfordTown_PokemonCenter_2F_MapScript2_1A3D88:: @ 81A3D88 @@ -119,7 +119,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E0C:: @ 81A3E0C OldaleTown_PokemonCenter_2F_EventScript_1A3E17:: @ 81A3E17 lockall call OldaleTown_PokemonCenter_2F_EventScript_1A3E30 - setmaptile 8, 3, 605, 1 + setmetatile 8, 3, 605, 1 special DrawWholeMapView erasebox 0, 0, 29, 19 releaseall @@ -147,14 +147,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 OldaleTown_PokemonCenter_2F_EventScript_1A3E7B:: @ 81A3E7B call OldaleTown_PokemonCenter_2F_EventScript_1A3DB2 - setmaptile 11, 3, 605, 1 + setmetatile 11, 3, 605, 1 special DrawWholeMapView end OldaleTown_PokemonCenter_2F_EventScript_1A3E8D:: @ 81A3E8D lockall call OldaleTown_PokemonCenter_2F_EventScript_1A3DDA - setmaptile 5, 3, 605, 1 + setmetatile 5, 3, 605, 1 special DrawWholeMapView erasebox 0, 0, 29, 19 releaseall @@ -174,7 +174,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 SlateportCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 SootopolisCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 - checkflag 2049 + checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4342 copyvar 0x8007, LAST_TALKED lock @@ -221,7 +221,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E copyvar 0x4087, 0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage - setmaptile 5, 3, 514, 0 + setmetatile 5, 3, 514, 0 special DrawWholeMapView delay 60 applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 @@ -233,21 +233,21 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY closedoor 5, 1 waitdooranim release compare 0x8004, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3FCD special SetCableClubWarp - warp SingleBattleColosseum, 255, 6, 8 + warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 special DoCableClubWarp waitstate end OldaleTown_PokemonCenter_2F_EventScript_1A3FCD:: @ 81A3FCD special SetCableClubWarp - warp DoubleBattleColosseum, 255, 5, 8 + warp MAP_DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8 special DoCableClubWarp waitstate end @@ -255,7 +255,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3FCD:: @ 81A3FCD OldaleTown_PokemonCenter_2F_EventScript_1A3FDD:: @ 81A3FDD message OldaleTown_PokemonCenter_2F_Text_1A4696 waitmessage - waitbutton + waitbuttonpress message OldaleTown_PokemonCenter_2F_Text_1A4826 waitmessage goto OldaleTown_PokemonCenter_2F_EventScript_1A3EBC @@ -289,7 +289,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042 OldaleTown_PokemonCenter_2F_EventScript_1A4056:: @ 81A4056 message OldaleTown_PokemonCenter_2F_Text_1A486A waitmessage - waitbutton + waitbuttonpress goto OldaleTown_PokemonCenter_2F_EventScript_1A3FEF OldaleTown_PokemonCenter_2F_EventScript_1A4062:: @ 81A4062 @@ -307,28 +307,28 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4093:: @ 81A4093 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4C03 waitmessage - waitbutton + waitbuttonpress goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0 OldaleTown_PokemonCenter_2F_EventScript_1A40A2:: @ 81A40A2 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4BCC waitmessage - waitbutton + waitbuttonpress goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0 OldaleTown_PokemonCenter_2F_EventScript_1A40B1:: @ 81A40B1 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B95 waitmessage - waitbutton + waitbuttonpress goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0 OldaleTown_PokemonCenter_2F_EventScript_1A40C0:: @ 81A40C0 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4C38 waitmessage - waitbutton + waitbuttonpress release end @@ -346,7 +346,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC SlateportCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC SootopolisCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC - checkflag 2049 + checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4339 copyvar 0x8007, LAST_TALKED lock @@ -386,7 +386,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 copyvar 0x4087, 0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage - setmaptile 8, 3, 514, 0 + setmetatile 8, 3, 514, 0 special DrawWholeMapView delay 60 applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 @@ -398,7 +398,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY closedoor 8, 1 waitdooranim release @@ -417,14 +417,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A41BB:: @ 81A41BB OldaleTown_PokemonCenter_2F_EventScript_1A41E1:: @ 81A41E1 message OldaleTown_PokemonCenter_2F_Text_1A48A3 waitmessage - waitbutton + waitbuttonpress setvar RESULT, 0 return OldaleTown_PokemonCenter_2F_EventScript_1A41EE:: @ 81A41EE message OldaleTown_PokemonCenter_2F_Text_1A48DD waitmessage - waitbutton + waitbuttonpress setvar RESULT, 0 return @@ -443,7 +443,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB SlateportCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB SootopolisCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB - checkflag 2072 + checkflag FLAG_VISITED_MAUVILLE_CITY goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A434B copyvar 0x8007, LAST_TALKED lock @@ -484,7 +484,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 copyvar 0x4087, 0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage - setmaptile 11, 3, 514, 0 + setmetatile 11, 3, 514, 0 special DrawWholeMapView delay 60 applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 @@ -496,7 +496,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY closedoor 11, 1 waitdooranim release @@ -506,7 +506,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A42E9:: @ 81A42E9 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4AC8 waitmessage - waitbutton + waitbuttonpress release end @@ -514,7 +514,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A42F5:: @ 81A42F5 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4A85 waitmessage - waitbutton + waitbuttonpress release end @@ -522,7 +522,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4301:: @ 81A4301 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4A30 waitmessage - waitbutton + waitbuttonpress release end @@ -530,7 +530,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A430D:: @ 81A430D special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B1D waitmessage - waitbutton + waitbuttonpress release end @@ -538,7 +538,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4319:: @ 81A4319 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B59 waitmessage - waitbutton + waitbuttonpress release end @@ -552,7 +552,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A432D:: @ 81A432D special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B6C waitmessage - waitbutton + waitbuttonpress release end @@ -598,7 +598,7 @@ OldaleTown_PokemonCenter_2F_Movement_1A4361:: @ 81A4361 gUnknown_081A4363:: @ 81A4363 lockall special ShowLinkBattleRecords - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -719,17 +719,17 @@ RecordCorner_EventScript_1A4457:: @ 81A4457 end RecordCorner_EventScript_1A446C:: @ 81A446C - getitemname 1, 0x4001 + bufferitemname 1, 0x4001 message RecordCorner_Text_1A4E3B waitmessage - waitbutton + waitbuttonpress releaseall end TradeRoom_ReadTrainerCard1:: @ 81A4479 message CableClub_LookAtTrainerCard1 waitmessage - waitbutton + waitbuttonpress fadescreen 1 special sub_8083BDC waitstate @@ -738,7 +738,7 @@ TradeRoom_ReadTrainerCard1:: @ 81A4479 TradeRoom_ReadTrainerCard2:: @ 81A4487 message CableClub_LookAtTrainerCard2 waitmessage - waitbutton + waitbuttonpress fadescreen 1 special sub_8083BDC waitstate @@ -747,7 +747,7 @@ TradeRoom_ReadTrainerCard2:: @ 81A4487 TradeRoom_TooBusyToNotice:: @ 81A4495 message CableClub_TooBusyToNotice waitmessage - waitbutton + waitbuttonpress closemessage end @@ -755,7 +755,7 @@ SingleBattleColosseum_EventScript_1A449E:: @ 81A449E special sub_8064EAC message SingleBattleColosseum_Text_1A4D7E waitmessage - waitbutton + waitbuttonpress special sub_8064ED4 closemessage end @@ -764,7 +764,7 @@ TradeCenter_EventScript_1A44AD:: @ 81A44AD special sub_8064EAC message TradeCenter_Text_1A4DAB waitmessage - waitbutton + waitbuttonpress special sub_8064ED4 closemessage end @@ -775,7 +775,7 @@ RecordCorner_EventScript_1A44BC:: @ 81A44BC special sub_8064EAC message RecordCorner_Text_1A4DD7 waitmessage - waitbutton + waitbuttonpress special sub_8064ED4 closemessage end @@ -784,7 +784,7 @@ RecordCorner_EventScript_1A44D6:: @ 81A44D6 special sub_8064EAC message RecordCorner_Text_1A4DF7 waitmessage - waitbutton + waitbuttonpress special sub_8064ED4 closemessage end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 1b5c29fee..50202c7d6 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -9,19 +9,19 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92 call_if 1, FallarborTown_ContestLobby_EventScript_1A4EDD compare 0x408a, 0 goto_if 5, FallarborTown_ContestLobby_EventScript_1A4F4E - checkflag 1 + checkflag FLAG_TEMP_1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F8F - getstdstring 0, 0x800b + bufferstdstring 0, 0x800b msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4 checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4EE1 - setflag 1 + setflag FLAG_TEMP_1 goto FallarborTown_ContestLobby_EventScript_1A4F8F end FallarborTown_ContestLobby_EventScript_1A4EDD:: @ 81A4EDD - clearflag 1 + clearflag FLAG_TEMP_1 return FallarborTown_ContestLobby_EventScript_1A4EE1:: @ 81A4EE1 @@ -40,12 +40,12 @@ FallarborTown_ContestLobby_EventScript_1A4EF6:: @ 81A4EF6 end FallarborTown_ContestLobby_EventScript_1A4F13:: @ 81A4F13 - checkflag 150 + checkflag FLAG_RECEIVED_CONTEST_PASS goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F44 msgbox FallarborTown_ContestLobby_Text_1A6583, 4 - giveitem ITEM_CONTEST_PASS - setflag 150 - setflag 1 + giveitem_std ITEM_CONTEST_PASS + setflag FLAG_RECEIVED_CONTEST_PASS + setflag FLAG_TEMP_1 msgbox FallarborTown_ContestLobby_Text_1A5E98, 4 goto FallarborTown_ContestLobby_EventScript_1A4F8F end @@ -62,7 +62,7 @@ FallarborTown_ContestLobby_EventScript_1A4F4E:: @ 81A4F4E end FallarborTown_ContestLobby_EventScript_1A4F67:: @ 81A4F67 - giveitem ITEM_LUXURY_BALL + giveitem_std ITEM_LUXURY_BALL compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F86 setvar 0x408a, 0 @@ -119,7 +119,7 @@ FallarborTown_ContestLobby_EventScript_1A503E:: @ 81A503E FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048 msgbox FallarborTown_ContestLobby_Text_1A6319, 4 - choosecontestpkmn + choosecontestmon compare 0x8004, 255 goto_if_eq FallarborTown_ContestLobby_EventScript_1A5097 special sub_80C43F4 @@ -260,8 +260,8 @@ LinkContestRoom1_EventScript_1A523F:: @ 81A523F return LinkContestRoom1_EventScript_1A5245:: @ 81A5245 - getstdstring 1, 0x8008 - getstdstring 2, 0x8009 + bufferstdstring 1, 0x8008 + bufferstdstring 2, 0x8009 call LinkContestRoom1_EventScript_1A525F lockall applymovement 1, LinkContestRoom1_Movement_1A5D87 @@ -339,7 +339,7 @@ LinkContestRoom1_EventScript_1A5311:: @ 81A5311 LinkContestRoom1_EventScript_1A5323:: @ 81A5323 special sub_80C4C64 addvar 0x8006, 1 - getnumberstring 1, 0x8006 + buffernumberstring 1, 0x8006 lockall applymovement 0x800b, LinkContestRoom1_Movement_1A5D9C waitmovement 0 @@ -885,7 +885,7 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 special sub_80C47F0 special sub_80C4858 addvar 0x8005, 1 - getnumberstring 1, 0x8005 + buffernumberstring 1, 0x8005 addvar 0x8005, -1 call LinkContestRoom1_EventScript_1A5A75 applymovement 0x4003, LinkContestRoom1_Movement_1A5D99 @@ -996,7 +996,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5C4C call LinkContestRoom1_EventScript_1A5C12 - checkflag 2 + checkflag FLAG_TEMP_2 goto_if_eq LinkContestRoom1_EventScript_1A5BF6 msgbox LinkContestRoom1_Text_1A6DC5, 3 waitmessage @@ -1035,14 +1035,14 @@ LinkContestRoom1_EventScript_1A5C23:: @ 81A5C23 LinkContestRoom1_EventScript_1A5C32:: @ 81A5C32 compare CONTEST_RANK, 3 goto_if_eq LinkContestRoom1_EventScript_1A5C41 - setflag 2 + setflag FLAG_TEMP_2 return LinkContestRoom1_EventScript_1A5C41:: @ 81A5C41 return LinkContestRoom1_EventScript_1A5C42:: @ 81A5C42 - setflag 270 + setflag FLAG_CONTEST_SKETCH_CREATED return LinkContestRoom1_EventScript_1A5C46:: @ 81A5C46 @@ -1134,7 +1134,7 @@ LinkContestRoom1_EventScript_1A5D2D:: @ 81A5D2D return LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B - giveitem ITEM_LUXURY_BALL + giveitem_std ITEM_LUXURY_BALL compare RESULT, 0 goto_if_eq LinkContestRoom1_EventScript_1A5D2D msgbox LinkContestRoom1_Text_1A6DF1, 3 @@ -1143,7 +1143,7 @@ LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B special sub_80C44C0 incrementgamestat GAME_STAT_RECEIVED_RIBBONS - setflag 2107 + setflag FLAG_SYS_RIBBON_GET lockall msgbox LinkContestRoom1_Text_1A6D6A, 4 playfanfare 370 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index f8151b86a..fd3273c78 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -1,8 +1,8 @@ Route117_EventScript_1B222D:: @ 81B222D lock faceplayer - special sp0B5_daycare - specialvar RESULT, sp0B6_daycare + special GetDaycareMonNicknames + specialvar RESULT, GetDaycareState compare RESULT, 1 goto_if_eq Route117_EventScript_1B2262 compare RESULT, 2 @@ -21,8 +21,8 @@ Route117_EventScript_1B2262:: @ 81B2262 compare RESULT, 1 goto_if_eq Route117_EventScript_1B2298 msgbox Route117_Text_1B2745, 4 - clearflag 134 - special sub_8041E7C + clearflag FLAG_PENDING_DAYCARE_EGG + special RejectEggFromDayCare release end @@ -39,10 +39,10 @@ Route117_EventScript_1B22B2:: @ 81B22B2 playfanfare 367 waitfanfare waitmessage - waitbutton + waitbuttonpress msgbox Route117_Text_1B27CD, 4 - special sp0B8_daycare - clearflag 134 + special GiveEggFromDaycare + clearflag FLAG_PENDING_DAYCARE_EGG release end @@ -57,7 +57,7 @@ Route117_EventScript_1B22DE:: @ 81B22DE return Route117_EventScript_1B22E7:: @ 81B22E7 - special sp0B5_daycare + special GetDaycareMonNicknames msgbox Route117_Text_1B2710, 4 setvar 0x8004, 0 call Route117_EventScript_1B22CD @@ -65,12 +65,12 @@ Route117_EventScript_1B22E7:: @ 81B22E7 end Route117_EventScript_1B22FE:: @ 81B22FE - special sp0B5_daycare + special GetDaycareMonNicknames msgbox Route117_Text_1B2897, 4 - special sp0B9_daycare_relationship_comment + special SetDaycareCompatibilityString special ShowFieldMessageStringVar4 waitmessage - waitbutton + waitbuttonpress setvar 0x8004, 0 call Route117_EventScript_1B22CD setvar 0x8004, 1 @@ -81,7 +81,7 @@ Route117_EventScript_1B22FE:: @ 81B22FE Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 lock faceplayer - specialvar RESULT, sp0B6_daycare + specialvar RESULT, GetDaycareState compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B2407 compare RESULT, 2 @@ -108,14 +108,14 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C specialvar RESULT, sub_8095C10 compare RESULT, 0 goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD - specialvar 0x8005, sub_8042328 + specialvar 0x8005, GetSelectedDaycareMonNickname waitse - playpokecry 0x8005, 0 + playmoncry 0x8005, 0 msgbox Route117_PokemonDayCare_Text_1B296E, 4 - waitpokecry - special Daycare_SendPokemon_Special + waitmoncry + special StoreSelectedPokemonInDaycare incrementgamestat GAME_STAT_USED_DAYCARE - specialvar RESULT, sp0B6_daycare + specialvar RESULT, GetDaycareState compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23DA release @@ -153,7 +153,7 @@ Route117_PokemonDayCare_EventScript_1B2411:: @ 81B2411 return Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A - specialvar RESULT, sub_80417B8 + specialvar RESULT, GetNumLevelsGainedFromDaycare compare RESULT, 0 call_if 5, Route117_PokemonDayCare_EventScript_1B2411 return @@ -175,7 +175,7 @@ Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 specialvar RESULT, CalculatePlayerPartyCount compare RESULT, 6 goto_if_eq Route117_PokemonDayCare_EventScript_1B2539 - specialvar RESULT, sp0B6_daycare + specialvar RESULT, GetDaycareState setvar 0x8004, 0 compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B24A8 @@ -188,7 +188,7 @@ Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 end Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8 - special sub_8041770 + special GetDaycareCost msgbox Route117_PokemonDayCare_Text_1B2B49, 5 compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B24C4 @@ -206,15 +206,15 @@ Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4 Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE applymovement 1, Route117_PokemonDayCare_Movement_1B2543 waitmovement 0 - specialvar RESULT, sub_8041648 + specialvar RESULT, TakePokemonFromDaycare special sub_80B7D0C playse 95 msgbox Route117_PokemonDayCare_Text_1B2B75, 4 waitse - playpokecry RESULT, 0 + playmoncry RESULT, 0 msgbox Route117_PokemonDayCare_Text_1B2B93, 4 - waitpokecry - specialvar RESULT, sp0B6_daycare + waitmoncry + specialvar RESULT, GetDaycareState compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B2520 goto Route117_PokemonDayCare_EventScript_1B23D0 @@ -276,7 +276,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 copyvar 0x8004, RESULT - specialvar RESULT, sub_8041648 + specialvar RESULT, TakePokemonFromDaycare msgbox Route117_PokemonDayCare_Text_1B2B75, 4 msgbox Route117_PokemonDayCare_Text_1B2A76, 4 release diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 214c61142..a3d79d09e 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -60,67 +60,67 @@ Route111_EventScript_1AE3D7:: @ 81AE3D7 return Route111_EventScript_1AE3E2:: @ 81AE3E2 - setflag 796 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_1 return Route111_EventScript_1AE3E6:: @ 81AE3E6 - clearflag 796 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_1 return Route111_EventScript_1AE3EA:: @ 81AE3EA - setflag 797 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 return Route111_EventScript_1AE3EE:: @ 81AE3EE - clearflag 797 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 return Route111_EventScript_1AE3F2:: @ 81AE3F2 - setflag 798 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1 return Route111_EventScript_1AE3F6:: @ 81AE3F6 - clearflag 798 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1 return Route111_EventScript_1AE3FA:: @ 81AE3FA - setflag 799 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 return Route111_EventScript_1AE3FE:: @ 81AE3FE - clearflag 799 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 return Route111_EventScript_1AE402:: @ 81AE402 - setflag 901 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 return Route111_EventScript_1AE406:: @ 81AE406 - clearflag 901 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 return Route111_EventScript_1AE40A:: @ 81AE40A - setflag 902 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_2 return Route111_EventScript_1AE40E:: @ 81AE40E - clearflag 902 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_2 return Route111_EventScript_1AE412:: @ 81AE412 - setflag 903 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_3 return Route111_EventScript_1AE416:: @ 81AE416 - clearflag 903 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_3 return Route111_EventScript_1AE41A:: @ 81AE41A - setflag 904 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_3 return Route111_EventScript_1AE41E:: @ 81AE41E - clearflag 904 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_3 return Route111_EventScript_1AE422:: @ 81AE422 @@ -208,7 +208,7 @@ Route111_EventScript_1AE5A2:: @ 81AE5A2 call_if 1, Route111_EventScript_1AE5EB compare FACING, 4 call_if 1, Route111_EventScript_1AE5FD - checkflag 1 + checkflag FLAG_TEMP_1 goto_if_eq Route111_EventScript_1AE73A msgbox Route111_Text_1AC015, 5 goto Route111_EventScript_1AE6F3 @@ -242,7 +242,7 @@ Route120_EventScript_1AE60F:: @ 81AE60F call_if 1, Route111_EventScript_1AE5EB compare FACING, 4 call_if 1, Route111_EventScript_1AE5FD - checkflag 1 + checkflag FLAG_TEMP_1 goto_if_eq Route111_EventScript_1AE73A specialvar RESULT, GabbyAndTyGetLastQuote compare RESULT, 0 @@ -311,13 +311,13 @@ Route111_EventScript_1AE6F3:: @ 81AE6F3 goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC487, 4 special sub_80BDC14 - setflag 1 + setflag FLAG_TEMP_1 release end Route111_EventScript_1AE72D:: @ 81AE72D msgbox Route111_Text_1AC553, 4 - setflag 1 + setflag FLAG_TEMP_1 release end diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index f13b319f4..d104b52d4 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -1,14 +1,14 @@ MtChimney_EventScript_1B2C95:: @ 81B2C95 lock faceplayer - checkflag 219 + checkflag FLAG_EVIL_LEADER_PLEASE_STOP call_if 0, MtChimney_EventScript_1B2CB9 - checkflag 219 + checkflag FLAG_EVIL_LEADER_PLEASE_STOP call_if 1, MtChimney_EventScript_1B2CC2 closemessage applymovement 1, MtChimney_Movement_1A083D waitmovement 0 - setflag 219 + setflag FLAG_EVIL_LEADER_PLEASE_STOP release end @@ -63,7 +63,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB removeobject 2 removeobject 3 removeobject 22 - setflag 926 + setflag FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY fadescreen 0 setobjectxyperm 1, 10, 12 addobject 1 @@ -84,10 +84,10 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB compare FACING, 2 call_if 1, MtChimney_EventScript_1B2D9E removeobject 1 - setflag 927 - setflag 139 - clearflag 928 - setflag 942 + setflag FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + setflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY + clearflag FLAG_HIDE_PROF_COSMO_FALLARBOR + setflag FLAG_HIDE_PROF_COSMO_METEOR_FALLS releaseall end diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc index eb912028a..2430ba4af 100644 --- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc +++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc @@ -4,12 +4,12 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 815EAF4 AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5 lock faceplayer - checkflag 294 + checkflag FLAG_EXCHANGED_SCANNER goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D checkitem ITEM_SCANNER, 1 compare RESULT, 1 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23 - checkflag 1078 + checkflag FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D msgbox AbandonedShip_CaptainsOffice_Text_198C85, 4 release diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index f3c3c0aa0..c27951abb 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -4,22 +4,22 @@ AbandonedShip_Corridors_B1F_MapScripts:: @ 815E98F .byte 0 AbandonedShip_Corridors_B1F_MapScript1_15E99A:: @ 815E99A - setdivewarp AbandonedShip_Underwater1, 255, 5, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 end AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3 - checkflag 239 + checkflag FLAG_USED_STORAGE_KEY call_if 0, AbandonedShip_Corridors_B1F_EventScript_15E9B6 - checkflag 239 + checkflag FLAG_USED_STORAGE_KEY call_if 1, AbandonedShip_Corridors_B1F_EventScript_15E9C0 end AbandonedShip_Corridors_B1F_EventScript_15E9B6:: @ 815E9B6 - setmaptile 11, 4, 563, 1 + setmetatile 11, 4, 563, 1 return AbandonedShip_Corridors_B1F_EventScript_15E9C0:: @ 815E9C0 - setmaptile 11, 4, 555, 1 + setmetatile 11, 4, 555, 1 return AbandonedShip_Corridors_B1F_EventScript_15E9CA:: @ 815E9CA @@ -28,15 +28,15 @@ AbandonedShip_Corridors_B1F_EventScript_15E9CA:: @ 815E9CA AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 lockall - checkflag 239 + checkflag FLAG_USED_STORAGE_KEY goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA14 checkitem ITEM_STORAGE_KEY, 1 compare RESULT, 0 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 playse 21 - removeitem ITEM_STORAGE_KEY, 1 - setflag 239 + takeitem ITEM_STORAGE_KEY, 1 + setflag FLAG_USED_STORAGE_KEY call AbandonedShip_Corridors_B1F_EventScript_15E9C0 special DrawWholeMapView releaseall diff --git a/data/scripts/maps/AbandonedShip_Deck.inc b/data/scripts/maps/AbandonedShip_Deck.inc index 49f837744..68d872f01 100644 --- a/data/scripts/maps/AbandonedShip_Deck.inc +++ b/data/scripts/maps/AbandonedShip_Deck.inc @@ -3,5 +3,5 @@ AbandonedShip_Deck_MapScripts:: @ 815E95A .byte 0 AbandonedShip_Deck_MapScript1_15E960:: @ 815E960 - setflag 2110 + setflag FLAG_LANDMARK_ABANDONED_SHIP end diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index 29a89a620..35e86543b 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -4,71 +4,71 @@ AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 815EB46 .byte 0 AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51:: @ 815EB51 - setdivewarp AbandonedShip_Underwater1, 255, 5, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 end AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A - checkflag 240 + checkflag FLAG_USED_ROOM_1_KEY call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB - checkflag 241 + checkflag FLAG_USED_ROOM_2_KEY call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5 - checkflag 242 + checkflag FLAG_USED_ROOM_4_KEY call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF - checkflag 243 + checkflag FLAG_USED_ROOM_6_KEY call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9 - checkflag 240 + checkflag FLAG_USED_ROOM_1_KEY call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 - checkflag 241 + checkflag FLAG_USED_ROOM_2_KEY call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD - checkflag 242 + checkflag FLAG_USED_ROOM_4_KEY call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 - checkflag 243 + checkflag FLAG_USED_ROOM_6_KEY call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 end AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3:: @ 815EBA3 - setmaptile 3, 8, 555, 1 + setmetatile 3, 8, 555, 1 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD:: @ 815EBAD - setmaptile 6, 8, 555, 1 + setmetatile 6, 8, 555, 1 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7:: @ 815EBB7 - setmaptile 3, 3, 538, 0 + setmetatile 3, 3, 538, 0 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1:: @ 815EBC1 - setmaptile 9, 3, 538, 0 + setmetatile 9, 3, 538, 0 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB:: @ 815EBCB - setmaptile 3, 8, 563, 1 + setmetatile 3, 8, 563, 1 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5:: @ 815EBD5 - setmaptile 6, 8, 563, 1 + setmetatile 6, 8, 563, 1 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF:: @ 815EBDF - setmaptile 3, 3, 564, 0 + setmetatile 3, 3, 564, 0 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9:: @ 815EBE9 - setmaptile 9, 3, 564, 0 + setmetatile 9, 3, 564, 0 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 lockall - checkflag 240 + checkflag FLAG_USED_ROOM_1_KEY goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_1_KEY, 1 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 - removeitem ITEM_ROOM_1_KEY, 1 - setflag 240 + takeitem ITEM_ROOM_1_KEY, 1 + setflag FLAG_USED_ROOM_1_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 special DrawWholeMapView releaseall @@ -76,15 +76,15 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A lockall - checkflag 241 + checkflag FLAG_USED_ROOM_2_KEY goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_2_KEY, 1 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 - removeitem ITEM_ROOM_2_KEY, 1 - setflag 241 + takeitem ITEM_ROOM_2_KEY, 1 + setflag FLAG_USED_ROOM_2_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD special DrawWholeMapView releaseall @@ -92,15 +92,15 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 lockall - checkflag 242 + checkflag FLAG_USED_ROOM_4_KEY goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_4_KEY, 1 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 - removeitem ITEM_ROOM_4_KEY, 1 - setflag 242 + takeitem ITEM_ROOM_4_KEY, 1 + setflag FLAG_USED_ROOM_4_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 special DrawWholeMapView releaseall @@ -108,15 +108,15 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 lockall - checkflag 243 + checkflag FLAG_USED_ROOM_6_KEY goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_6_KEY, 1 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 - removeitem ITEM_ROOM_6_KEY, 1 - setflag 243 + takeitem ITEM_ROOM_6_KEY, 1 + setflag FLAG_USED_ROOM_6_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 special DrawWholeMapView releaseall diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index eb5c1dccd..c1e77a8c7 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -39,9 +39,9 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED95:: @ 815ED95 AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B delay 20 - setfieldeffect 0, 10 - setfieldeffect 1, 10 - setfieldeffect 2, 0 + setfieldeffectargument 0, 10 + setfieldeffectargument 1, 10 + setfieldeffectargument 2, 0 dofieldeffect 54 specialvar RESULT, sub_810F4D4 compare RESULT, 0 @@ -69,13 +69,13 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEA:: @ 815EDEA AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB delay 20 - setfieldeffect 0, 8 - setfieldeffect 1, 5 - setfieldeffect 2, 0 + setfieldeffectargument 0, 8 + setfieldeffectargument 1, 5 + setfieldeffectargument 2, 0 dofieldeffect 54 - setfieldeffect 0, 11 - setfieldeffect 1, 3 - setfieldeffect 2, 0 + setfieldeffectargument 0, 11 + setfieldeffectargument 1, 3 + setfieldeffectargument 2, 0 dofieldeffect 54 specialvar RESULT, sub_810F4FC compare RESULT, 0 @@ -86,17 +86,17 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 delay 20 - setfieldeffect 0, 16 - setfieldeffect 1, 3 - setfieldeffect 2, 0 + setfieldeffectargument 0, 16 + setfieldeffectargument 1, 3 + setfieldeffectargument 2, 0 dofieldeffect 54 - setfieldeffect 0, 25 - setfieldeffect 1, 2 - setfieldeffect 2, 0 + setfieldeffectargument 0, 25 + setfieldeffectargument 1, 2 + setfieldeffectargument 2, 0 dofieldeffect 54 - setfieldeffect 0, 24 - setfieldeffect 1, 6 - setfieldeffect 2, 0 + setfieldeffectargument 0, 24 + setfieldeffectargument 1, 6 + setfieldeffectargument 2, 0 dofieldeffect 54 specialvar RESULT, sub_810F4B0 compare RESULT, 0 @@ -109,30 +109,30 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE6A:: @ 815EE6A end AbandonedShip_HiddenFloorRooms_EventScript_15EE6B:: @ 815EE6B - setfieldeffect 0, 42 - setfieldeffect 1, 10 - setfieldeffect 2, 0 + setfieldeffectargument 0, 42 + setfieldeffectargument 1, 10 + setfieldeffectargument 2, 0 dofieldeffect 54 return AbandonedShip_HiddenFloorRooms_EventScript_15EE7B:: @ 815EE7B - setfieldeffect 0, 20 - setfieldeffect 1, 5 - setfieldeffect 2, 0 + setfieldeffectargument 0, 20 + setfieldeffectargument 1, 5 + setfieldeffectargument 2, 0 dofieldeffect 54 return AbandonedShip_HiddenFloorRooms_EventScript_15EE8B:: @ 815EE8B - setfieldeffect 0, 1 - setfieldeffect 1, 12 - setfieldeffect 2, 0 + setfieldeffectargument 0, 1 + setfieldeffectargument 1, 12 + setfieldeffectargument 2, 0 dofieldeffect 54 return AbandonedShip_HiddenFloorRooms_EventScript_15EE9B:: @ 815EE9B - setfieldeffect 0, 1 - setfieldeffect 1, 2 - setfieldeffect 2, 0 + setfieldeffectargument 0, 1 + setfieldeffectargument 1, 2 + setfieldeffectargument 2, 0 dofieldeffect 54 return diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc index 218f1a2ca..4299c7da4 100644 --- a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms_B1F_MapScripts:: @ 815EA35 .byte 0 AbandonedShip_Rooms_B1F_MapScript1_15EA3B:: @ 815EA3B - setdivewarp AbandonedShip_Underwater2, 255, 17, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4 end AbandonedShip_Rooms_B1F_EventScript_15EA44:: @ 815EA44 diff --git a/data/scripts/maps/AbandonedShip_Underwater1.inc b/data/scripts/maps/AbandonedShip_Underwater1.inc index afac470ea..52ba61136 100644 --- a/data/scripts/maps/AbandonedShip_Underwater1.inc +++ b/data/scripts/maps/AbandonedShip_Underwater1.inc @@ -3,5 +3,5 @@ AbandonedShip_Underwater1_MapScripts:: @ 815EA57 .byte 0 AbandonedShip_Underwater1_MapScript1_15EA5D:: @ 815EA5D - setdivewarp AbandonedShip_HiddenFloorCorridors, 255, 0, 10 + setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10 end diff --git a/data/scripts/maps/AbandonedShip_Underwater2.inc b/data/scripts/maps/AbandonedShip_Underwater2.inc index b8facc4ec..22113661a 100644 --- a/data/scripts/maps/AbandonedShip_Underwater2.inc +++ b/data/scripts/maps/AbandonedShip_Underwater2.inc @@ -3,5 +3,5 @@ AbandonedShip_Underwater2_MapScripts:: @ 815EB37 .byte 0 AbandonedShip_Underwater2_MapScript1_15EB3D:: @ 815EB3D - setdivewarp AbandonedShip_Rooms_B1F, 255, 13, 7 + setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7 end diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 188691e73..b849f41ba 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -5,7 +5,7 @@ AncientTomb_MapScripts:: @ 815EFBE .byte 0 AncientTomb_MapScript1_15EFCE:: @ 815EFCE - checkflag 2145 + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, AncientTomb_EventScript_15EFD8 end @@ -14,29 +14,29 @@ AncientTomb_EventScript_15EFD8:: @ 815EFD8 return AncientTomb_MapScript1_15EFDC:: @ 815EFDC - setflag 2137 + setflag FLAG_LANDMARK_ANCIENT_TOMB end AncientTomb_MapScript1_15EFE0:: @ 815EFE0 - checkflag 2130 + checkflag FLAG_SYS_BRAILLE_FLY call_if 0, AncientTomb_EventScript_15EFEA end AncientTomb_EventScript_15EFEA:: @ 815EFEA - setmaptile 7, 19, 553, 1 - setmaptile 8, 19, 553, 1 - setmaptile 9, 19, 553, 1 - setmaptile 7, 20, 565, 1 - setmaptile 8, 20, 565, 1 - setmaptile 9, 20, 565, 1 + setmetatile 7, 19, 553, 1 + setmetatile 8, 19, 553, 1 + setmetatile 9, 19, 553, 1 + setmetatile 7, 20, 565, 1 + setmetatile 8, 20, 565, 1 + setmetatile 9, 20, 565, 1 return AncientTomb_EventScript_15F021:: @ 815F021 lockall - checkflag 2130 + checkflag FLAG_SYS_BRAILLE_FLY goto_if_eq AncientTomb_EventScript_15F038 braillemessage AncientTomb_Braille_1C552E - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -49,7 +49,7 @@ AncientTomb_EventScript_15F038:: @ 815F038 AncientTomb_EventScript_15F042:: @ 815F042 lockall braillemessage AncientTomb_Braille_1C552E - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -58,14 +58,14 @@ AncientTomb_EventScript_15F050:: @ 815F050 lock faceplayer waitse - playpokecry SPECIES_REGISTEEL, 2 + playmoncry SPECIES_REGISTEEL, 2 delay 40 - waitpokecry + waitmoncry setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE - setflag 937 - setflag 2145 + setflag FLAG_HIDE_REGISTEEL + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate - clearflag 2145 + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/scripts/maps/AquaHideout_1F.inc index 2eb2ae7e9..028a0ee7b 100644 --- a/data/scripts/maps/AquaHideout_1F.inc +++ b/data/scripts/maps/AquaHideout_1F.inc @@ -10,7 +10,7 @@ AquaHideout_1F_EventScript_15D7CE:: @ 815D7CE MagmaHideout_1F_EventScript_15D7CE:: @ 815D7CE lock faceplayer - checkflag 111 + checkflag FLAG_MT_PYRE_ORB_STOLEN goto_if_eq AquaHideout_1F_EventScript_15D7E3 msgbox AquaHideout_1F_Text_196AFD, 4 release @@ -25,7 +25,7 @@ AquaHideout_1F_EventScript_15D7ED:: @ 815D7ED MagmaHideout_1F_EventScript_15D7ED:: @ 815D7ED lock faceplayer - checkflag 111 + checkflag FLAG_MT_PYRE_ORB_STOLEN goto_if_eq AquaHideout_1F_EventScript_15D802 msgbox AquaHideout_1F_Text_196C83, 4 release diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc index 0001d7574..82d0c10c5 100644 --- a/data/scripts/maps/AquaHideout_B1F.inc +++ b/data/scripts/maps/AquaHideout_B1F.inc @@ -4,7 +4,7 @@ AquaHideout_B1F_MapScripts:: @ 815D831 .byte 0 AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C - checkflag 2145 + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, AquaHideout_B1F_EventScript_15D846 end diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index 230d0e2db..a587fcc92 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -64,8 +64,8 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 waitmovement 0 msgbox AquaHideout_B2F_Text_1971AE, 4 - setflag 112 - setflag 852 + setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE + setflag FLAG_HIDE_GRUNTS_LILYCOVE release end diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 3f1aad4a0..3065c0cbb 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -16,8 +16,8 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA addobject 1 applymovement 1, BattleTower_BattleRoom_Movement_160AC0 waitmovement 0 - special sub_8135474 - msgbox 0x20234cc, 4 + special PrintBattleTowerTrainerGreeting + msgbox gStringVar4, 4 waitmessage closemessage special ScrSpecial_HealPlayerParty @@ -35,7 +35,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA special sub_8135668 setvar 0x8004, 3 special sub_810FF60 - warp BattleTower_Lobby, 255, 6, 6 + warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160961:: @ 8160961 @@ -101,7 +101,7 @@ BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 special sub_8135668 setvar 0x8004, 3 special sub_810FF60 - warp BattleTower_Lobby, 255, 6, 6 + warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 @@ -116,7 +116,7 @@ BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 BattleTower_BattleRoom_EventScript_160AB1:: @ 8160AB1 fadescreen 1 - special sub_8135C38 + special BattleTower_SoftReset end BattleTower_BattleRoom_Movement_160AB7:: @ 8160AB7 diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index 9d4fbc844..828d975fc 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -6,13 +6,13 @@ BattleTower_Corridor_MapScripts:: @ 8160845 BattleTower_Corridor_MapScript1_160850:: @ 8160850 compare 0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_16086E - setmaptile 12, 0, 519, 0 - setmaptile 12, 1, 527, 0 + setmetatile 12, 0, 519, 0 + setmetatile 12, 1, 527, 0 end BattleTower_Corridor_EventScript_16086E:: @ 816086E - setmaptile 15, 0, 519, 0 - setmaptile 15, 1, 527, 0 + setmetatile 15, 0, 519, 0 + setmetatile 15, 1, 527, 0 end BattleTower_Corridor_MapScript2_160881:: @ 8160881 @@ -35,7 +35,7 @@ BattleTower_Corridor_EventScript_1608B1:: @ 81608B1 BattleTower_Corridor_EventScript_1608C2:: @ 81608C2 setvar 0x4000, 0 - warp BattleTower_BattleRoom, 255, 4, 8 + warp MAP_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 waitstate end diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index a147a3b5a..c006cdffe 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -19,7 +19,7 @@ BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 applymovement 255, BattleTower_Elevator_Movement_160841 waitmovement 0 setvar 0x4000, 0 - warp BattleTower_Corridor, 255, 8, 1 + warp MAP_BATTLE_TOWER_CORRIDOR, 255, 8, 1 waitstate end diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 3227df991..69db45ede 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -13,14 +13,14 @@ BattleTower_Lobby_MapScript1_160293:: @ 8160293 BattleTower_Lobby_EventScript_16029C:: @ 816029C setvar 0x8004, 10 special sub_8135668 - checkflag 238 + checkflag FLAG_RECEIVED_GOLD_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602E4 - checkflag 237 + checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602CD specialvar 0x8007, sub_810F404 compare 0x8007, 50 goto_if 0, BattleTower_Lobby_EventScript_1602E4 - clearflag 941 + clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC return @@ -28,12 +28,12 @@ BattleTower_Lobby_EventScript_1602CD:: @ 81602CD specialvar 0x8007, sub_810F404 compare 0x8007, 100 goto_if 0, BattleTower_Lobby_EventScript_1602E4 - clearflag 941 + clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC return BattleTower_Lobby_EventScript_1602E4:: @ 81602E4 - setflag 941 + setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER return BattleTower_Lobby_MapScript1_1602E8:: @ 81602E8 @@ -79,7 +79,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 special sub_81358A4 compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_16037D - special sub_8135E50 + special AwardBattleTowerRibbons compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE @@ -97,7 +97,7 @@ BattleTower_Lobby_EventScript_16037D:: @ 816037D waitmessage setvar 0x8004, 13 special sub_8135668 - special sub_8135D84 + special DetermineBattleTowerPrize setvar 0x8004, 3 special sub_8135BA0 playse 55 @@ -109,7 +109,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD special sub_8135668 message BattleTower_Lobby_Text_19A4BB waitmessage - special sub_8135DEC + special GiveBattleTowerPrize switch RESULT case 0, BattleTower_Lobby_EventScript_160408 message BattleTower_Lobby_Text_19A506 @@ -177,7 +177,7 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage call BattleTower_Lobby_EventScript_160664 - warp BattleTower_Elevator, 255, 1, 6 + warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6 setvar 0x4000, 0 waitstate @@ -254,7 +254,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage call BattleTower_Lobby_EventScript_160664 - warp BattleTower_Elevator, 255, 1, 6 + warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6 setvar 0x4000, 0 waitstate @@ -379,7 +379,7 @@ BattleTower_Lobby_EventScript_16071E:: @ 816071E BattleTower_Lobby_EventScript_160727:: @ 8160727 lockall special ShowBattleTowerRecords - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -387,16 +387,16 @@ BattleTower_Lobby_EventScript_160727:: @ 8160727 BattleTower_Lobby_EventScript_160733:: @ 8160733 lock faceplayer - checkflag 238 + checkflag FLAG_RECEIVED_GOLD_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1607C5 - checkflag 237 + checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_160773 msgbox BattleTower_Lobby_Text_19A9EE, 4 - setvar 0x8008, 42 - givedecoration 42 + setvar 0x8008, DECOR_SILVER_SHIELD + givedecoration_std DECOR_SILVER_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF - setflag 237 + setflag FLAG_RECEIVED_SILVER_SHIELD msgbox BattleTower_Lobby_Text_19ABAA, 4 release end @@ -406,17 +406,17 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 compare RESULT, 100 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 - setvar 0x8008, 43 - givedecoration 43 + setvar 0x8008, DECOR_GOLD_SHIELD + givedecoration_std DECOR_GOLD_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF - setflag 238 + setflag FLAG_RECEIVED_GOLD_SHIELD msgbox BattleTower_Lobby_Text_19ABAA, 4 release end BattleTower_Lobby_EventScript_1607AF:: @ 81607AF - getdecorname 1, 0x8008 + bufferdecorationname 1, 0x8008 msgbox BattleTower_Lobby_Text_1A0CEF, 4 msgbox BattleTower_Lobby_Text_19ABED, 4 release diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 95c5a9d77..e0aba0b9c 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -3,9 +3,9 @@ BattleTower_Outside_MapScripts:: @ 8160156 .byte 0 BattleTower_Outside_MapScript1_16015C:: @ 816015C - setflag 2120 + setflag FLAG_LANDMARK_BATTLE_TOWER setvar 0x40bc, 0 - setflag 918 + setflag FLAG_HIDE_REPORTER_BATTLE_TOWER end BattleTower_Outside_EventScript_160168:: @ 8160168 @@ -40,7 +40,7 @@ BattleTower_Outside_EventScript_1601D0:: @ 81601D0 goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 - warp SlateportCity_Harbor, 255, 8, 11 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release end @@ -51,7 +51,7 @@ BattleTower_Outside_EventScript_1601FB:: @ 81601FB goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 - warp LilycoveCity_Harbor, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end @@ -67,7 +67,7 @@ BattleTower_Outside_EventScript_160232:: @ 8160232 applymovement LAST_TALKED, BattleTower_Outside_Movement_1A0845 waitmovement 0 delay 30 - hideobject 5, 26, 4 + hideobjectat 5, MAP_BATTLE_TOWER_OUTSIDE setvar 0x8004, 4 call BattleTower_Outside_EventScript_1A047C return diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/scripts/maps/CaveOfOrigin_1F.inc index 3ad36cc18..6411aad49 100644 --- a/data/scripts/maps/CaveOfOrigin_1F.inc +++ b/data/scripts/maps/CaveOfOrigin_1F.inc @@ -3,6 +3,6 @@ CaveOfOrigin_1F_MapScripts:: @ 815DD6C .byte 0 CaveOfOrigin_1F_MapScript1_15DD72:: @ 815DD72 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, CaveOfOrigin_1F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/scripts/maps/CaveOfOrigin_B1F.inc index c3bbdd45f..b8d4149b6 100644 --- a/data/scripts/maps/CaveOfOrigin_B1F.inc +++ b/data/scripts/maps/CaveOfOrigin_B1F.inc @@ -3,6 +3,6 @@ CaveOfOrigin_B1F_MapScripts:: @ 815DD7C .byte 0 CaveOfOrigin_B1F_MapScript1_15DD82:: @ 815DD82 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, CaveOfOrigin_B1F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B2F.inc b/data/scripts/maps/CaveOfOrigin_B2F.inc index fb65de171..9b014d0e9 100644 --- a/data/scripts/maps/CaveOfOrigin_B2F.inc +++ b/data/scripts/maps/CaveOfOrigin_B2F.inc @@ -3,6 +3,6 @@ CaveOfOrigin_B2F_MapScripts:: @ 815DD8C .byte 0 CaveOfOrigin_B2F_MapScript1_15DD92:: @ 815DD92 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, CaveOfOrigin_B2F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B3F.inc b/data/scripts/maps/CaveOfOrigin_B3F.inc index c21b04e91..d6f7bdaf1 100644 --- a/data/scripts/maps/CaveOfOrigin_B3F.inc +++ b/data/scripts/maps/CaveOfOrigin_B3F.inc @@ -3,6 +3,6 @@ CaveOfOrigin_B3F_MapScripts:: @ 815DD9C .byte 0 CaveOfOrigin_B3F_MapScript1_15DDA2:: @ 815DDA2 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, CaveOfOrigin_B3F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index c6c3cd45e..1b5146760 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -4,7 +4,7 @@ CaveOfOrigin_B4F_MapScripts:: @ 815DDAC .byte 0 CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7 - checkflag 2145 + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, CaveOfOrigin_B4F_EventScript_15DDC1 end @@ -19,7 +19,7 @@ CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5 setmaplayoutindex 313 .endif call CaveOfOrigin_B4F_EventScript_1A01B5 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, CaveOfOrigin_B4F_EventScript_1A04E3 end @@ -38,9 +38,9 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 special WaitWeather waitstate playse 209 - setfieldeffect 0, 9 - setfieldeffect 1, 13 - setfieldeffect 2, 0 + setfieldeffectargument 0, 9 + setfieldeffectargument 1, 13 + setfieldeffectargument 2, 0 dofieldeffect 54 waitfieldeffect 54 .ifdef SAPPHIRE @@ -58,26 +58,26 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 delay 60 setwildbattle SPECIES_GROUDON_OR_KYOGRE, 45, ITEM_NONE waitse - playpokecry SPECIES_GROUDON_OR_KYOGRE, 2 + playmoncry SPECIES_GROUDON_OR_KYOGRE, 2 delay 40 - waitpokecry - setflag 2145 + waitmoncry + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartGroudonKyogreBattle waitstate - clearflag 2145 + clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar RESULT, sub_810E300 compare RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 - setflag 816 - setflag 855 - setflag 856 - clearflag 815 + setflag FLAG_HIDE_WALLACE_SOOTOPOLIS + setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 + setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 + clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM setvar 0x409b, 1 - setflag 113 - clearflag 854 - clearflag 2090 + setflag FLAG_LEGENDARY_BATTLE_COMPLETED + clearflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS + clearflag FLAG_SYS_WEATHER_CTRL setvar 0x40b9, 2 - clearflag 916 + clearflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT releaseall end diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 9f6f7b388..7aa56a82d 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -5,7 +5,7 @@ DesertRuins_MapScripts:: @ 815CAF3 .byte 0 DesertRuins_MapScript1_15CB03:: @ 815CB03 - checkflag 2145 + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, DesertRuins_EventScript_15CB0D end @@ -14,29 +14,29 @@ DesertRuins_EventScript_15CB0D:: @ 815CB0D return DesertRuins_MapScript1_15CB11:: @ 815CB11 - checkflag 2128 + checkflag FLAG_SYS_BRAILLE_STRENGTH call_if 0, DesertRuins_EventScript_15CB1B end DesertRuins_EventScript_15CB1B:: @ 815CB1B - setmaptile 7, 19, 553, 1 - setmaptile 8, 19, 553, 1 - setmaptile 9, 19, 553, 1 - setmaptile 7, 20, 565, 1 - setmaptile 8, 20, 565, 1 - setmaptile 9, 20, 565, 1 + setmetatile 7, 19, 553, 1 + setmetatile 8, 19, 553, 1 + setmetatile 9, 19, 553, 1 + setmetatile 7, 20, 565, 1 + setmetatile 8, 20, 565, 1 + setmetatile 9, 20, 565, 1 return DesertRuins_MapScript1_15CB52:: @ 815CB52 - setflag 2134 + setflag FLAG_LANDMARK_DESERT_RUINS end DesertRuins_EventScript_15CB56:: @ 815CB56 lockall - checkflag 2128 + checkflag FLAG_SYS_BRAILLE_STRENGTH goto_if_eq DesertRuins_EventScript_15CB6D braillemessage DesertRuins_Braille_1C54C8 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -49,7 +49,7 @@ DesertRuins_EventScript_15CB6D:: @ 815CB6D DesertRuins_EventScript_15CB77:: @ 815CB77 lockall braillemessage DesertRuins_Braille_1C54C8 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -58,14 +58,14 @@ DesertRuins_EventScript_15CB85:: @ 815CB85 lock faceplayer waitse - playpokecry SPECIES_REGIROCK, 2 + playmoncry SPECIES_REGIROCK, 2 delay 40 - waitpokecry + waitmoncry setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE - setflag 935 - setflag 2145 + setflag FLAG_HIDE_REGIROCK + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate - clearflag 2145 + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index aa3584741..bb1fdeda4 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -3,13 +3,13 @@ DewfordTown_MapScripts:: @ 814DFF8 .byte 0 DewfordTown_MapScript1_14DFFE:: @ 814DFFE - setflag 2065 + setflag FLAG_VISITED_DEWFORD_TOWN end DewfordTown_EventScript_14E002:: @ 814E002 lock faceplayer - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if 0, DewfordTown_EventScript_14E076 message DewfordTown_Text_16B522 waitmessage @@ -74,7 +74,7 @@ DewfordTown_EventScript_14E0BD:: @ 814E0BD DewfordTown_EventScript_14E0C6:: @ 814E0C6 lock faceplayer - checkflag 257 + checkflag FLAG_RECEIVED_OLD_ROD goto_if_eq DewfordTown_EventScript_14E11B msgbox DewfordTown_Text_16B665, 5 compare RESULT, 1 @@ -85,8 +85,8 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6 DewfordTown_EventScript_14E0F0:: @ 814E0F0 msgbox DewfordTown_Text_16B6A8, 4 - giveitem ITEM_OLD_ROD - setflag 257 + giveitem_std ITEM_OLD_ROD + setflag FLAG_RECEIVED_OLD_ROD msgbox DewfordTown_Text_16B6F9, 4 release end @@ -118,31 +118,31 @@ DewfordTown_EventScript_14E147:: @ 814E147 DewfordTown_EventScript_14E151:: @ 814E151 call DewfordTown_EventScript_1A010C - setobjectpriority 2, 0, 11, 0 - setobjectpriority 255, 0, 11, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + setobjectpriority 255, MAP_DEWFORD_TOWN, 0 applymovement 2, DewfordTown_Movement_14E40E waitmovement 0 removeobject 2 applymovement 255, DewfordTown_Movement_14E402 waitmovement 0 - hideobject 255, 0, 11 + hideobjectat 255, MAP_DEWFORD_TOWN call DewfordTown_EventScript_1A02E7 applymovement 4, DewfordTown_Movement_14E293 applymovement 255, DewfordTown_Movement_14E293 waitmovement 0 - showobject 255, 0, 19 + showobjectat 255, MAP_ROUTE104 call DewfordTown_EventScript_1A02EF applymovement 255, DewfordTown_Movement_14E405 waitmovement 0 - showobject 255, 0, 19 - clearflag 739 - clearflag 881 - clearflag 742 - setflag 743 - hideobject 4, 0, 11 + showobjectat 255, MAP_ROUTE104 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + hideobjectat 4, MAP_DEWFORD_TOWN setvar 0x408e, 2 - resetobjectpriority 255, 0, 11 - warp Route104_MrBrineysHouse, 255, 5, 4 + resetobjectpriority 255, MAP_DEWFORD_TOWN + warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 copyvar 0x4096, 0x8008 waitstate release @@ -150,40 +150,40 @@ DewfordTown_EventScript_14E151:: @ 814E151 DewfordTown_EventScript_14E1D8:: @ 814E1D8 call DewfordTown_EventScript_1A010C - setobjectpriority 2, 0, 11, 0 - setobjectpriority 255, 0, 11, 1 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + setobjectpriority 255, MAP_DEWFORD_TOWN, 1 applymovement 2, DewfordTown_Movement_14E40E waitmovement 0 removeobject 2 applymovement 255, DewfordTown_Movement_14E402 waitmovement 0 - hideobject 255, 0, 11 + hideobjectat 255, MAP_DEWFORD_TOWN call DewfordTown_EventScript_1A02E7 applymovement 4, DewfordTown_Movement_14E356 applymovement 255, DewfordTown_Movement_14E356 waitmovement 0 call DewfordTown_EventScript_1A02EF - showobject 255, 0, 24 + showobjectat 255, MAP_ROUTE109 applymovement 255, DewfordTown_Movement_14E409 waitmovement 0 setobjectxyperm 2, 21, 26 addobject 2 - setobjectpriority 2, 0, 24, 0 + setobjectpriority 2, MAP_ROUTE109, 0 applymovement 2, DewfordTown_Movement_14E410 waitmovement 0 - clearflag 741 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE109 addobject 1 - clearflag 744 - setflag 743 - hideobject 4, 0, 11 - checkflag 149 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + hideobjectat 4, MAP_DEWFORD_TOWN + checkflag FLAG_DELIVERED_DEVON_GOODS call_if 0, DewfordTown_EventScript_14E281 - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS call_if 1, DewfordTown_EventScript_14E28A closemessage copyvar 0x4096, 0x8008 - resetobjectpriority 255, 0, 11 - resetobjectpriority 2, 0, 24 + resetobjectpriority 255, MAP_DEWFORD_TOWN + resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 release end diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 92776afb1..afd918a96 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -20,23 +20,23 @@ DewfordTown_Gym_EventScript_153071:: @ 8153071 goto DewfordTown_Gym_EventScript_1530AE DewfordTown_Gym_EventScript_1530AA:: @ 81530AA - setdarklevel 0 + setflashradius 0 return DewfordTown_Gym_EventScript_1530AE:: @ 81530AE - setdarklevel 1 + setflashradius 1 return DewfordTown_Gym_EventScript_1530B2:: @ 81530B2 - setdarklevel 2 + setflashradius 2 return DewfordTown_Gym_EventScript_1530B6:: @ 81530B6 - setdarklevel 3 + setflashradius 3 return DewfordTown_Gym_EventScript_1530BA:: @ 81530BA - setdarklevel 4 + setflashradius 4 return DewfordTown_Gym_EventScript_1530BE:: @ 81530BE @@ -57,25 +57,25 @@ DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 DewfordTown_Gym_EventScript_1530F6:: @ 81530F6 playse 35 - animdarklevel 3 + animateflash 3 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153101:: @ 8153101 playse 35 - animdarklevel 2 + animateflash 2 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_15310C:: @ 815310C playse 35 - animdarklevel 1 + animateflash 1 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153117:: @ 8153117 playse 35 - animdarklevel 0 + animateflash 0 call DewfordTown_Gym_EventScript_153071 return @@ -100,7 +100,7 @@ DewfordTown_Gym_EventScript_153151:: @ 8153151 DewfordTown_Gym_EventScript_153152:: @ 8153152 trainerbattle 1, OPPONENT_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 - checkflag 166 + checkflag FLAG_RECEIVED_TM08 goto_if 0, DewfordTown_Gym_EventScript_1531B5 msgbox DewfordTown_Gym_Text_175412, 4 release @@ -112,8 +112,8 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 waitmessage call DewfordTown_Gym_EventScript_1A02C5 msgbox DewfordTown_Gym_Text_1752E6, 4 - setflag 1204 - setflag 2056 + setflag FLAG_DEFEATED_DEWFORD_GYM + setflag FLAG_BADGE02_GET addvar 0x4085, 1 compare 0x4085, 6 call_if 1, DewfordTown_Gym_EventScript_1A00FB @@ -123,11 +123,11 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 end DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 - giveitem ITEM_TM08 + giveitem_std ITEM_TM08 compare RESULT, 0 goto_if_eq DewfordTown_Gym_EventScript_1A029B msgbox DewfordTown_Gym_Text_1753BF, 4 - setflag 166 + setflag FLAG_RECEIVED_TM08 release end @@ -164,7 +164,7 @@ DewfordTown_Gym_EventScript_153238:: @ 8153238 DewfordTown_Gym_EventScript_15323F:: @ 815323F lock faceplayer - checkflag 1204 + checkflag FLAG_DEFEATED_DEWFORD_GYM goto_if_eq DewfordTown_Gym_EventScript_153254 msgbox DewfordTown_Gym_Text_174D98, 4 release @@ -177,14 +177,14 @@ DewfordTown_Gym_EventScript_153254:: @ 8153254 DewfordTown_Gym_EventScript_15325E:: @ 815325E lockall - checkflag 2056 + checkflag FLAG_BADGE02_GET goto_if_eq DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end DewfordTown_Gym_EventScript_15326E:: @ 815326E lockall - checkflag 2056 + checkflag FLAG_BADGE02_GET goto_if_eq DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index ea4016147..a3830ebb8 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -252,13 +252,13 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D lock faceplayer call DewfordTown_Hall_EventScript_1A0102 - checkflag 230 + checkflag FLAG_RECEIVED_TM36 goto_if_eq DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, 4 - giveitem ITEM_TM36 + giveitem_std ITEM_TM36 compare RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_1A029B - setflag 230 + setflag FLAG_RECEIVED_TM36 release end diff --git a/data/scripts/maps/DewfordTown_House1.inc b/data/scripts/maps/DewfordTown_House1.inc index e8897b974..4a112eea2 100644 --- a/data/scripts/maps/DewfordTown_House1.inc +++ b/data/scripts/maps/DewfordTown_House1.inc @@ -13,8 +13,8 @@ DewfordTown_House1_EventScript_153001:: @ 8153001 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox DewfordTown_House1_Text_174CC8, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc index befe47404..e704efa50 100644 --- a/data/scripts/maps/DewfordTown_House2.inc +++ b/data/scripts/maps/DewfordTown_House2.inc @@ -4,13 +4,13 @@ DewfordTown_House2_MapScripts:: @ 81535DB DewfordTown_House2_EventScript_1535DC:: @ 81535DC lock faceplayer - checkflag 289 + checkflag FLAG_RECEIVED_SILK_SCARF goto_if_eq DewfordTown_House2_EventScript_153615 msgbox DewfordTown_House2_Text_175EFE, 4 - giveitem ITEM_SILK_SCARF + giveitem_std ITEM_SILK_SCARF compare RESULT, 0 goto_if_eq DewfordTown_House2_EventScript_15360B - setflag 289 + setflag FLAG_RECEIVED_SILK_SCARF release end diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc index 70e75492e..c1288078f 100644 --- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 8153014 .byte 0 DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A - sethealplace 15 + setrespawn 15 call DewfordTown_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ DewfordTown_PokemonCenter_1F_EventScript_153023:: @ 8153023 setvar 0x800b, 1 call DewfordTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc index c9768d006..b4fa64cae 100644 --- a/data/scripts/maps/EverGrandeCity.inc +++ b/data/scripts/maps/EverGrandeCity.inc @@ -3,7 +3,7 @@ EverGrandeCity_MapScripts:: @ 814D4D5 .byte 0 EverGrandeCity_MapScript1_14D4DB:: @ 814D4DB - checkflag 2090 + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, EverGrandeCity_EventScript_1A02C1 end @@ -20,6 +20,6 @@ EverGrandeCity_EventScript_14D4F7:: @ 814D4F7 end EverGrandeCity_EventScript_14D500:: @ 814D500 - setflag 2078 + setflag FLAG_VISITED_EVER_GRANDE_CITY setvar 0x4001, 1 end diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 90df9ab4e..d59476417 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -46,8 +46,8 @@ EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 playse 8 - setmaptile 6, 1, 838, 0 - setmaptile 6, 2, 839, 0 + setmetatile 6, 1, 838, 0 + setmetatile 6, 2, 839, 0 special DrawWholeMapView msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4 closemessage @@ -136,8 +136,8 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0 waitmovement 0 - setflag 781 - warp EverGrandeCity_HallOfFame, 255, 7, 16 + setflag FLAG_HIDE_PETALBURG_GYM_GUIDE + warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 waitstate releaseall end diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index 3d3d56ff9..f7088e821 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -24,7 +24,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736 end EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743 - checkflag 1248 + checkflag FLAG_DEFEATED_ELITE_4_DRAKE call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B758 compare 0x409c, 4 call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B75E @@ -41,7 +41,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B75E:: @ 815B75E EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 lock faceplayer - checkflag 1248 + checkflag FLAG_DEFEATED_ELITE_4_DRAKE goto_if_eq EverGrandeCity_DrakesRoom_EventScript_15B78B playbgm 450, 0 msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 @@ -57,7 +57,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795 setvar 0x8004, 0 special sub_810FF60 - setflag 1248 + setflag FLAG_DEFEATED_ELITE_4_DRAKE call EverGrandeCity_DrakesRoom_EventScript_1A0693 msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4 release diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index 07f6e8877..be9e7a897 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -24,7 +24,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C end EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9 - checkflag 1247 + checkflag FLAG_DEFEATED_ELITE_4_GLACIA call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE compare 0x409c, 3 call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4 @@ -41,7 +41,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6C4:: @ 815B6C4 EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA lock faceplayer - checkflag 1247 + checkflag FLAG_DEFEATED_ELITE_4_GLACIA goto_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6F1 playbgm 450, 0 msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 @@ -55,7 +55,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6F1:: @ 815B6F1 end EverGrandeCity_GlaciasRoom_EventScript_15B6FB:: @ 815B6FB - setflag 1247 + setflag FLAG_DEFEATED_ELITE_4_GLACIA call EverGrandeCity_GlaciasRoom_EventScript_1A0693 msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, 4 release diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index d9baaee89..904dc7531 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -51,16 +51,16 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 end EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41 - sethealplace 1 - fadescreendelay 1, 24 + setrespawn 1 + fadescreenspeed 1, 24 special GameClear waitstate releaseall end EverGrandeCity_HallOfFame_EventScript_15BC4D:: @ 815BC4D - sethealplace 2 - fadescreendelay 1, 24 + setrespawn 2 + fadescreenspeed 1, 24 special GameClear waitstate releaseall diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index b7c1618ba..5ffa16d37 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -24,7 +24,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602 end EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F - checkflag 1246 + checkflag FLAG_DEFEATED_ELITE_4_PHOEBE call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B624 compare 0x409c, 2 call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A @@ -41,7 +41,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B62A:: @ 815B62A EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 lock faceplayer - checkflag 1246 + checkflag FLAG_DEFEATED_ELITE_4_PHOEBE goto_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B657 playbgm 450, 0 msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 @@ -55,7 +55,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B657:: @ 815B657 end EverGrandeCity_PhoebesRoom_EventScript_15B661:: @ 815B661 - setflag 1246 + setflag FLAG_DEFEATED_ELITE_4_PHOEBE call EverGrandeCity_PhoebesRoom_EventScript_1A0693 msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, 4 release diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc index 57262b211..018658416 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 815BC66 .byte 0 EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C:: @ 815BC6C - sethealplace 11 + setrespawn 11 end EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 @@ -11,7 +11,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 setvar 0x800b, 1 call SootopolisCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index acbdac899..4a8919b98 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -3,9 +3,9 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75 .byte 0 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B - sethealplace 20 - setflag 2132 - checkflag 263 + setrespawn 20 + setflag FLAG_SYS_POKEMON_LEAGUE_FLY + checkflag FLAG_ENTERED_ELITE_FOUR call_if 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B end @@ -18,7 +18,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A setvar 0x800b, 1 call EverGrandeCity_PokemonLeague_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end @@ -47,7 +47,7 @@ EverGrandeCity_PokemonLeague_Items:: @ 815BAC0 EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 lockall - checkflag 263 + checkflag FLAG_ENTERED_ELITE_FOUR goto_if_eq EverGrandeCity_PokemonLeague_EventScript_15BB57 getplayerxy 0x4000, 0x4001 compare 0x4000, 11 @@ -57,7 +57,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 message EverGrandeCity_PokemonLeague_Text_1916FD waitmessage delay 75 - checkflag 2060 + checkflag FLAG_BADGE06_GET goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A closemessage applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E @@ -71,7 +71,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 closemessage moveobjectoffscreen 3 moveobjectoffscreen 4 - setflag 263 + setflag FLAG_ENTERED_ELITE_FOUR releaseall end diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index daca98176..6e958aeed 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -5,7 +5,7 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F .byte 0 EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F - checkflag 1245 + checkflag FLAG_DEFEATED_ELITE_4_SYDNEY call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B564 compare 0x409c, 1 call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B56A @@ -42,7 +42,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589 EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 lock faceplayer - checkflag 1245 + checkflag FLAG_DEFEATED_ELITE_4_SYDNEY goto_if_eq EverGrandeCity_SidneysRoom_EventScript_15B5BD playbgm 450, 0 msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 @@ -56,7 +56,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B5BD:: @ 815B5BD end EverGrandeCity_SidneysRoom_EventScript_15B5C7:: @ 815B5C7 - setflag 1245 + setflag FLAG_DEFEATED_ELITE_4_SYDNEY call EverGrandeCity_SidneysRoom_EventScript_1A0693 msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4 release diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index 13c8a9f2e..8ea580e28 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -3,16 +3,16 @@ FallarborTown_MapScripts:: @ 814E7E0 .byte 0 FallarborTown_MapScript1_14E7E6:: @ 814E7E6 - setflag 2067 + setflag FLAG_VISITED_FALLARBOR_TOWN setvar 0x4086, 0 - setflag 800 - clearflag 270 + setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR + clearflag FLAG_CONTEST_SKETCH_CREATED end FallarborTown_EventScript_14E7F5:: @ 814E7F5 lock faceplayer - checkflag 139 + checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY goto_if_eq FallarborTown_EventScript_14E80A msgbox FallarborTown_Text_16C7FF, 4 release @@ -35,9 +35,9 @@ FallarborTown_EventScript_14E826:: @ 814E826 lock faceplayer waitse - playpokecry SPECIES_AZURILL, 0 + playmoncry SPECIES_AZURILL, 0 msgbox FallarborTown_Text_16C92C, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index c4c590b53..72da4cd40 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -14,7 +14,7 @@ FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD special sub_80C4BF0 call FallarborTown_ContestLobby_EventScript_15FBDB setvar 0x4088, 2 - warp LinkContestRoom1, 255, 7, 5 + warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end @@ -23,14 +23,14 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 applymovement 1, FallarborTown_ContestLobby_Movement_153A7C waitmovement 0 playse 71 - setmaptile 4, 2, 545, 1 - setmaptile 4, 3, 609, 1 + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, FallarborTown_ContestLobby_Movement_153A7F waitmovement 0 playse 71 - setmaptile 4, 2, 721, 1 - setmaptile 4, 3, 729, 1 + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 special DrawWholeMapView delay 20 applymovement 1, FallarborTown_ContestLobby_Movement_153A8C @@ -92,7 +92,7 @@ FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E end FallarborTown_ContestLobby_EventScript_153A97:: @ 8153A97 - checkflag 270 + checkflag FLAG_CONTEST_SKETCH_CREATED goto_if_eq FallarborTown_ContestLobby_EventScript_153AA9 msgbox FallarborTown_ContestLobby_Text_177246, 2 end @@ -115,7 +115,7 @@ FallarborTown_ContestLobby_EventScript_153ABB:: @ 8153ABB FallarborTown_ContestLobby_EventScript_153AC2:: @ 8153AC2 lockall special ShowBerryBlenderRecordWindow - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 0228fe25d..17267f926 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -8,7 +8,7 @@ FallarborTown_House1_MapScript1_153BB4:: @ 8153BB4 FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 lock faceplayer - checkflag 229 + checkflag FLAG_RECEIVED_TM27 goto_if_eq FallarborTown_House1_EventScript_153C54 checkitem ITEM_METEORITE, 1 compare RESULT, 1 @@ -18,19 +18,19 @@ FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 end FallarborTown_House1_EventScript_153BDA:: @ 8153BDA - checkflag 2 + checkflag FLAG_TEMP_2 call_if 0, FallarborTown_House1_EventScript_153C2D - checkflag 2 + checkflag FLAG_TEMP_2 call_if 1, FallarborTown_House1_EventScript_153C3E compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 - giveitem ITEM_TM27 + giveitem_std ITEM_TM27 compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_1A029B setvar 0x8004, 280 call FallarborTown_House1_EventScript_1A067F - setflag 229 + setflag FLAG_RECEIVED_TM27 msgbox FallarborTown_House1_Text_177910, 4 release end @@ -45,7 +45,7 @@ FallarborTown_House1_EventScript_153C3E:: @ 8153C3E return FallarborTown_House1_EventScript_153C47:: @ 8153C47 - setflag 2 + setflag FLAG_TEMP_2 msgbox FallarborTown_House1_Text_17797D, 4 release end @@ -58,9 +58,9 @@ FallarborTown_House1_EventScript_153C54:: @ 8153C54 FallarborTown_House1_EventScript_153C5E:: @ 8153C5E lock faceplayer - checkflag 229 + checkflag FLAG_RECEIVED_TM27 goto_if_eq FallarborTown_House1_EventScript_153C86 - checkflag 139 + checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY goto_if_eq FallarborTown_House1_EventScript_153C7C msgbox FallarborTown_House1_Text_177A2B, 4 release diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 3b215a697..001863d5c 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -5,10 +5,10 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91 lockall applymovement 1, FallarborTown_House2_Movement_1A0839 waitmovement 0 - checkflag 1 + checkflag FLAG_TEMP_1 goto_if_eq FallarborTown_House2_EventScript_153CB6 msgbox FallarborTown_House2_Text_177AF4, 4 - setflag 1 + setflag FLAG_TEMP_1 goto FallarborTown_House2_EventScript_153CB6 end @@ -43,7 +43,7 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A compare 0x8004, 0 goto_if_eq FallarborTown_House2_EventScript_153CE4 msgbox FallarborTown_House2_Text_177CC3, 4 - removeitem ITEM_HEART_SCALE, 1 + takeitem ITEM_HEART_SCALE, 1 goto FallarborTown_House2_EventScript_153D60 end diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/scripts/maps/FallarborTown_Mart.inc index e6f715697..cfd239e8a 100644 --- a/data/scripts/maps/FallarborTown_Mart.inc +++ b/data/scripts/maps/FallarborTown_Mart.inc @@ -41,8 +41,8 @@ FallarborTown_Mart_EventScript_1539AE:: @ 81539AE lock faceplayer waitse - playpokecry SPECIES_SKITTY, 0 + playmoncry SPECIES_SKITTY, 0 msgbox FallarborTown_Mart_Text_1770D3, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 5b1f1c948..dd6e83be3 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8153AF3 .byte 0 FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 - sethealplace 17 + setrespawn 17 call FallarborTown_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 setvar 0x800b, 1 call FallarborTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end @@ -48,7 +48,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 playse 18 removeobject 4 - clearflag 870 + clearflag FLAG_HIDE_LANETTE release end diff --git a/data/scripts/maps/FieryPath.inc b/data/scripts/maps/FieryPath.inc index bd984ad20..f0bd22071 100644 --- a/data/scripts/maps/FieryPath.inc +++ b/data/scripts/maps/FieryPath.inc @@ -3,5 +3,5 @@ FieryPath_MapScripts:: @ 815D318 .byte 0 FieryPath_MapScript1_15D31E:: @ 815D31E - setflag 2122 + setflag FLAG_LANDMARK_FIERY_PATH end diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index 6ea89dcb7..239c1410d 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -4,11 +4,11 @@ FortreeCity_MapScripts:: @ 814C943 .byte 0 FortreeCity_MapScript1_14C94E:: @ 814C94E - setflag 2074 + setflag FLAG_VISITED_FORTREE_CITY end FortreeCity_MapScript1_14C952:: @ 814C952 - tileeffect 2 + setstepcallback 2 end FortreeCity_EventScript_14C955:: @ 814C955 @@ -18,7 +18,7 @@ FortreeCity_EventScript_14C955:: @ 814C955 FortreeCity_EventScript_14C95E:: @ 814C95E lock faceplayer - checkflag 295 + checkflag FLAG_KECLEON_FLED_FORTREE goto_if_eq FortreeCity_EventScript_14C973 msgbox FortreeCity_Text_1675C2, 4 release @@ -76,13 +76,13 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4 applymovement LAST_TALKED, FortreeCity_Movement_1A0662 waitmovement 0 waitse - playpokecry SPECIES_KECLEON, 2 + playmoncry SPECIES_KECLEON, 2 delay 40 - waitpokecry + waitmoncry applymovement LAST_TALKED, FortreeCity_Movement_14CA13 waitmovement 0 removeobject LAST_TALKED - setflag 295 + setflag FLAG_KECLEON_FLED_FORTREE release end diff --git a/data/scripts/maps/FortreeCity_DecorationShop.inc b/data/scripts/maps/FortreeCity_DecorationShop.inc index fca20b866..56a360708 100644 --- a/data/scripts/maps/FortreeCity_DecorationShop.inc +++ b/data/scripts/maps/FortreeCity_DecorationShop.inc @@ -14,7 +14,7 @@ FortreeCity_DecorationShop_EventScript_15826A:: @ 815826A faceplayer message FortreeCity_DecorationShop_Text_1A0BE4 waitmessage - pokemartdecor FortreeCity_DecorationShop_Decorations1 + pokemartdecoration FortreeCity_DecorationShop_Decorations1 msgbox FortreeCity_DecorationShop_Text_1A0C02, 4 release end @@ -38,7 +38,7 @@ FortreeCity_DecorationShop_EventScript_158298:: @ 8158298 faceplayer message FortreeCity_DecorationShop_Text_1A0BE4 waitmessage - pokemartdecor FortreeCity_DecorationShop_Decorations2 + pokemartdecoration FortreeCity_DecorationShop_Decorations2 msgbox FortreeCity_DecorationShop_Text_1A0C02, 4 release end diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 7309be0bb..a0eb6186a 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -17,7 +17,7 @@ FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 trainerbattle 1, OPPONENT_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 - checkflag 170 + checkflag FLAG_RECEIVED_TM40 goto_if 0, FortreeCity_Gym_EventScript_157F3E msgbox FortreeCity_Gym_Text_185F98, 4 release @@ -28,19 +28,19 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 waitmessage call FortreeCity_Gym_EventScript_1A02C5 msgbox FortreeCity_Gym_Text_185E73, 4 - setflag 1225 - setflag 2060 + setflag FLAG_DEFEATED_FORTREE_GYM + setflag FLAG_BADGE06_GET setvar 0x8008, 6 call FortreeCity_Gym_EventScript_1A01C0 goto FortreeCity_Gym_EventScript_157F3E end FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E - giveitem ITEM_TM40 + giveitem_std ITEM_TM40 compare RESULT, 0 goto_if_eq FortreeCity_Gym_EventScript_1A029B msgbox FortreeCity_Gym_Text_185F4A, 4 - setflag 170 + setflag FLAG_RECEIVED_TM40 release end @@ -67,7 +67,7 @@ FortreeCity_Gym_EventScript_157FA7:: @ 8157FA7 FortreeCity_Gym_EventScript_157FBE:: @ 8157FBE lock faceplayer - checkflag 1225 + checkflag FLAG_DEFEATED_FORTREE_GYM goto_if_eq FortreeCity_Gym_EventScript_157FD3 msgbox FortreeCity_Gym_Text_18589C, 4 release @@ -80,14 +80,14 @@ FortreeCity_Gym_EventScript_157FD3:: @ 8157FD3 FortreeCity_Gym_EventScript_157FDD:: @ 8157FDD lockall - checkflag 2060 + checkflag FLAG_BADGE06_GET goto_if_eq FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end FortreeCity_Gym_EventScript_157FED:: @ 8157FED lockall - checkflag 2060 + checkflag FLAG_BADGE06_GET goto_if_eq FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 7b7ef0b2e..14b9b2c31 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -4,7 +4,7 @@ FortreeCity_House1_MapScripts:: @ 8157E12 FortreeCity_House1_EventScript_157E13:: @ 8157E13 lock faceplayer - checkflag 155 + checkflag FLAG_FORTREE_NPC_TRADE_COMPLETED goto_if_eq FortreeCity_House1_EventScript_157EAD setvar 0x8008, 1 copyvar 0x8004, 0x8008 @@ -28,9 +28,9 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 special sub_804DB68 special sub_804E174 waitstate - getspeciesname 0, 0x8009 + bufferspeciesname 0, 0x8009 msgbox FortreeCity_House1_Text_1856F7, 4 - setflag 155 + setflag FLAG_FORTREE_NPC_TRADE_COMPLETED release end @@ -40,7 +40,7 @@ FortreeCity_House1_EventScript_157E95:: @ 8157E95 end FortreeCity_House1_EventScript_157E9F:: @ 8157E9F - getspeciesname 0, 0x8009 + bufferspeciesname 0, 0x8009 msgbox FortreeCity_House1_Text_185737, 4 release end @@ -58,8 +58,8 @@ FortreeCity_House1_EventScript_157EC0:: @ 8157EC0 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox FortreeCity_House1_Text_185888, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index f210dd3ac..ae70b8644 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -4,9 +4,9 @@ FortreeCity_House2_MapScripts:: @ 81580B3 FortreeCity_House2_EventScript_1580B4:: @ 81580B4 lock faceplayer - checkflag 264 + checkflag FLAG_RECEIVED_TM10 goto_if_eq FortreeCity_House2_EventScript_158157 - checkflag 118 + checkflag FLAG_MET_HIDDEN_POWER_GIVER call_if 0, FortreeCity_House2_EventScript_15814B msgbox FortreeCity_House2_Text_186360, 4 multichoice 21, 8, 54, 1 @@ -21,17 +21,17 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 switch RESULT case 0, FortreeCity_House2_EventScript_158161 msgbox FortreeCity_House2_Text_1864C6, 4 - giveitem ITEM_TM10 + giveitem_std ITEM_TM10 compare RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_1A029B - setflag 264 + setflag FLAG_RECEIVED_TM10 msgbox FortreeCity_House2_Text_18652F, 4 release end FortreeCity_House2_EventScript_15814B:: @ 815814B msgbox FortreeCity_House2_Text_186306, 4 - setflag 118 + setflag FLAG_MET_HIDDEN_POWER_GIVER return FortreeCity_House2_EventScript_158157:: @ 8158157 diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index b261e14fb..1b1b41877 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -7,16 +7,16 @@ FortreeCity_House4_EventScript_15817F:: @ 815817F FortreeCity_House4_EventScript_158188:: @ 8158188 lockall - checkflag 223 + checkflag FLAG_RECEIVED_MENTAL_HERB goto_if_eq FortreeCity_House4_EventScript_158204 - checkflag 224 + checkflag FLAG_WINGULL_DELIVERED_MAIL goto_if_eq FortreeCity_House4_EventScript_1581D6 - checkflag 222 + checkflag FLAG_WINGULL_SENT_ON_ERRAND goto_if_eq FortreeCity_House4_EventScript_1581C2 msgbox FortreeCity_House4_Text_186835, 4 closemessage - setflag 222 - clearflag 934 + setflag FLAG_WINGULL_SENT_ON_ERRAND + clearflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE applymovement 3, FortreeCity_House4_Movement_158218 waitmovement 0 removeobject 3 @@ -34,10 +34,10 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6 applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839 waitmovement 0 msgbox FortreeCity_House4_Text_186881, 4 - giveitem ITEM_MENTAL_HERB + giveitem_std ITEM_MENTAL_HERB compare RESULT, 0 goto_if_eq FortreeCity_House4_EventScript_1A029B - setflag 223 + setflag FLAG_RECEIVED_MENTAL_HERB releaseall end @@ -60,8 +60,8 @@ FortreeCity_House4_EventScript_15821E:: @ 815821E lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox FortreeCity_House4_Text_18695C, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/FortreeCity_House5.inc b/data/scripts/maps/FortreeCity_House5.inc index fe10b53b0..888ebe0e2 100644 --- a/data/scripts/maps/FortreeCity_House5.inc +++ b/data/scripts/maps/FortreeCity_House5.inc @@ -13,8 +13,8 @@ FortreeCity_House5_EventScript_158244:: @ 8158244 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox FortreeCity_House5_Text_186A4F, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc index 5268cbeed..b82927be1 100644 --- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc @@ -3,14 +3,14 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 8158011 .byte 0 FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017 - sethealplace 7 + setrespawn 7 end FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B setvar 0x800b, 1 call FortreeCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/scripts/maps/GraniteCave_1F.inc index f389a774e..33296e510 100644 --- a/data/scripts/maps/GraniteCave_1F.inc +++ b/data/scripts/maps/GraniteCave_1F.inc @@ -4,11 +4,11 @@ GraniteCave_1F_MapScripts:: @ 815CBA6 GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7 lock faceplayer - checkflag 109 + checkflag FLAG_RECEIVED_HM05 goto_if_eq GraniteCave_1F_EventScript_15CBD3 msgbox GraniteCave_1F_Text_194917, 4 - giveitem ITEM_HM05 - setflag 109 + giveitem_std ITEM_HM05 + setflag FLAG_RECEIVED_HM05 msgbox GraniteCave_1F_Text_194A3E, 4 release end diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/scripts/maps/GraniteCave_B1F.inc index aa8d705c7..c6be3feca 100644 --- a/data/scripts/maps/GraniteCave_B1F.inc +++ b/data/scripts/maps/GraniteCave_B1F.inc @@ -5,6 +5,6 @@ GraniteCave_B1F_MapScripts:: @ 815CBDD .byte 0 GraniteCave_B1F_MapScript1_15CBED:: @ 815CBED - tileeffect 7 - setholewarp GraniteCave_B2F, 255, 0, 0 + setstepcallback 7 + setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 end diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 070276e58..344ccd479 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -5,11 +5,11 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA lock faceplayer msgbox GraniteCave_StevensRoom_Text_194AE5, 4 - setvar 0x8004, 274 + setvar 0x8004, ITEM_LETTER call GraniteCave_StevensRoom_EventScript_1A067F - setflag 189 + setflag FLAG_DELIVERED_STEVEN_LETTER msgbox GraniteCave_StevensRoom_Text_194BDD, 4 - giveitem ITEM_TM47 + giveitem_std ITEM_TM47 compare RESULT, 0 call_if 1, GraniteCave_StevensRoom_EventScript_15CC83 msgbox GraniteCave_StevensRoom_Text_194C8D, 4 diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index fc2930aa5..18cfb904d 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -4,13 +4,13 @@ InsideOfTruck_MapScripts:: @ 815FBFF .byte 0 InsideOfTruck_MapScript1_15FC0A:: @ 815FC0A - setmaptile 4, 1, 520, 0 - setmaptile 4, 2, 528, 0 - setmaptile 4, 3, 536, 0 + setmetatile 4, 1, 520, 0 + setmetatile 4, 2, 528, 0 + setmetatile 4, 3, 536, 0 end InsideOfTruck_MapScript1_15FC26:: @ 815FC26 - tileeffect 5 + setstepcallback 5 end InsideOfTruck_EventScript_15FC29:: @ 815FC29 @@ -24,26 +24,26 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29 end InsideOfTruck_EventScript_15FC45:: @ 815FC45 - sethealplace 1 + setrespawn 1 setvar 0x4092, 1 - setflag 759 - setflag 762 - setflag 784 - setflag 760 + setflag FLAG_HIDE_MAY_MOM_DOWNSTAIRS + setflag FLAG_HIDE_MOVING_TRUCK_MAY + setflag FLAG_HIDE_BRENDAN_MOM + setflag FLAG_HIDE_BRENDAN_UPSTAIRS setvar 0x408c, 1 - setdynamicwarp LittlerootTown, 255, 3, 10 + setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 releaseall end InsideOfTruck_EventScript_15FC68:: @ 815FC68 - sethealplace 2 + setrespawn 2 setvar 0x4092, 2 - setflag 758 - setflag 761 - setflag 785 - setflag 722 + setflag FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS + setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN + setflag FLAG_HIDE_MAY_MOM + setflag FLAG_HIDE_MAY_UPSTAIRS setvar 0x4082, 1 - setdynamicwarp LittlerootTown, 255, 12, 10 + setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 releaseall end diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 75399bde8..dbc71b6bb 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -5,7 +5,7 @@ IslandCave_MapScripts:: @ 815EEB6 .byte 0 IslandCave_MapScript1_15EEC6:: @ 815EEC6 - checkflag 2145 + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, IslandCave_EventScript_15EED0 end @@ -14,38 +14,38 @@ IslandCave_EventScript_15EED0:: @ 815EED0 return IslandCave_MapScript1_15EED4:: @ 815EED4 - checkflag 2129 + checkflag FLAG_SYS_BRAILLE_WAIT call_if 0, IslandCave_EventScript_15EEDE end IslandCave_EventScript_15EEDE:: @ 815EEDE - setmaptile 7, 19, 553, 1 - setmaptile 8, 19, 553, 1 - setmaptile 9, 19, 553, 1 - setmaptile 7, 20, 565, 1 - setmaptile 8, 20, 565, 1 - setmaptile 9, 20, 565, 1 + setmetatile 7, 19, 553, 1 + setmetatile 8, 19, 553, 1 + setmetatile 9, 19, 553, 1 + setmetatile 7, 20, 565, 1 + setmetatile 8, 20, 565, 1 + setmetatile 9, 20, 565, 1 return IslandCave_MapScript1_15EF15:: @ 815EF15 - setflag 2133 + setflag FLAG_LANDMARK_ISLAND_CAVE end S_OpenRegiceChamber:: @ 815EF19 - setmaptile 7, 19, 554, 1 - setmaptile 8, 19, 555, 1 - setmaptile 9, 19, 556, 1 - setmaptile 7, 20, 562, 1 - setmaptile 8, 20, 563, 0 - setmaptile 9, 20, 564, 1 + setmetatile 7, 19, 554, 1 + setmetatile 8, 19, 555, 1 + setmetatile 9, 19, 556, 1 + setmetatile 7, 20, 562, 1 + setmetatile 8, 20, 563, 0 + setmetatile 9, 20, 564, 1 special DrawWholeMapView playse SE_BAN - setflag 2129 + setflag FLAG_SYS_BRAILLE_WAIT end IslandCave_EventScript_15EF59:: @ 815EF59 lockall - checkflag 2129 + checkflag FLAG_SYS_BRAILLE_WAIT goto_if_eq IslandCave_EventScript_15EF72 braillemessage IslandCave_Braille_1C54FC special DoBrailleWait @@ -61,7 +61,7 @@ IslandCave_EventScript_15EF72:: @ 815EF72 IslandCave_EventScript_15EF7C:: @ 815EF7C lockall braillemessage IslandCave_Braille_1C54FC - checkflag 2129 + checkflag FLAG_SYS_BRAILLE_WAIT goto_if_eq IslandCave_EventScript_15EF95 special DoBrailleWait waitstate @@ -69,7 +69,7 @@ IslandCave_EventScript_15EF7C:: @ 815EF7C end IslandCave_EventScript_15EF95:: @ 815EF95 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -78,14 +78,14 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D lock faceplayer waitse - playpokecry SPECIES_REGICE, 2 + playmoncry SPECIES_REGICE, 2 delay 40 - waitpokecry + waitmoncry setwildbattle SPECIES_REGICE, 40, ITEM_NONE - setflag 936 - setflag 2145 + setflag FLAG_HIDE_REGICE + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate - clearflag 2145 + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index 6f910d0ad..c7efee318 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -4,7 +4,7 @@ JaggedPass_MapScripts:: @ 815D266 .byte 0 JaggedPass_MapScript1_15D271:: @ 815D271 - tileeffect 1 + setstepcallback 1 end JaggedPass_MapScript1_15D274:: @ 815D274 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 5192176a7..8b4384ed8 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -4,8 +4,8 @@ LavaridgeTown_MapScripts:: @ 814E4A3 .byte 0 LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE - setflag 2066 - checkflag 139 + setflag FLAG_VISITED_LAVARIDGE_TOWN + checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY call_if 1, LavaridgeTown_EventScript_14E4DF call LavaridgeTown_EventScript_1A014E call LavaridgeTown_EventScript_1A0172 @@ -19,7 +19,7 @@ LavaridgeTown_EventScript_14E4D0:: @ 814E4D0 return LavaridgeTown_EventScript_14E4DF:: @ 814E4DF - clearflag 877 + clearflag FLAG_HIDE_MT_CHIMNEY_PEOPLE return LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3 @@ -83,16 +83,16 @@ LavaridgeTown_EventScript_14E575:: @ 814E575 LavaridgeTown_EventScript_14E5AB:: @ 814E5AB msgbox LavaridgeTown_Text_16BDA4, 4 - giveitem ITEM_GO_GOGGLES - setflag 221 + giveitem_std ITEM_GO_GOGGLES + setflag FLAG_RECEIVED_GO_GOGGLES msgbox LavaridgeTown_Text_16BE7D, 4 goto LavaridgeTown_EventScript_14E5F5 end LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 msgbox LavaridgeTown_Text_16BF92, 4 - giveitem ITEM_GO_GOGGLES - setflag 221 + giveitem_std ITEM_GO_GOGGLES + setflag FLAG_RECEIVED_GO_GOGGLES msgbox LavaridgeTown_Text_16C020, 4 goto LavaridgeTown_EventScript_14E5F5 end @@ -272,16 +272,16 @@ LavaridgeTown_EventScript_14E751:: @ 814E751 LavaridgeTown_EventScript_14E75A:: @ 814E75A lock faceplayer - checkflag 266 + checkflag FLAG_RECEIVED_LAVARIDGE_EGG goto_if_eq LavaridgeTown_EventScript_14E79E msgbox LavaridgeTown_Text_16C174, 5 compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E7B2 - countpokemon + getpartysize compare RESULT, 6 goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, 4 - setflag 266 + setflag FLAG_RECEIVED_LAVARIDGE_EGG playfanfare 370 message LavaridgeTown_Text_16C2EA waitfanfare diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 2edffe9f0..9dd1ae59d 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -70,7 +70,7 @@ LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741 trainerbattle 1, OPPONENT_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 - checkflag 168 + checkflag FLAG_RECEIVED_TM50 goto_if 0, LavaridgeTown_Gym_1F_EventScript_1537A7 msgbox LavaridgeTown_Gym_1F_Text_176C4A, 4 release @@ -81,24 +81,24 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 waitmessage call LavaridgeTown_Gym_1F_EventScript_1A02C5 msgbox LavaridgeTown_Gym_1F_Text_176A8C, 4 - setflag 1213 - setflag 2058 + setflag FLAG_DEFEATED_LAVARIDGE_GYM + setflag FLAG_BADGE04_GET addvar 0x4085, 1 compare 0x4085, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB setvar 0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 - setflag 806 + setflag FLAG_HIDE_WALLY_WANDAS_HOUSE setvar 0x4053, 1 goto LavaridgeTown_Gym_1F_EventScript_1537A7 end LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 - giveitem ITEM_TM50 + giveitem_std ITEM_TM50 compare RESULT, 0 goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4 - setflag 168 + setflag FLAG_RECEIVED_TM50 release end @@ -135,7 +135,7 @@ LavaridgeTown_Gym_1F_EventScript_15383E:: @ 815383E LavaridgeTown_Gym_1F_EventScript_153859:: @ 8153859 lock faceplayer - checkflag 1213 + checkflag FLAG_DEFEATED_LAVARIDGE_GYM goto_if_eq LavaridgeTown_Gym_1F_EventScript_15386E msgbox LavaridgeTown_Gym_1F_Text_176312, 4 release @@ -148,14 +148,14 @@ LavaridgeTown_Gym_1F_EventScript_15386E:: @ 815386E LavaridgeTown_Gym_1F_EventScript_153878:: @ 8153878 lockall - checkflag 2058 + checkflag FLAG_BADGE04_GET goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end LavaridgeTown_Gym_1F_EventScript_153888:: @ 8153888 lockall - checkflag 2058 + checkflag FLAG_BADGE04_GET goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc index 5ec6731d4..913734dd5 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc @@ -28,13 +28,13 @@ LavaridgeTown_HerbShop_EventScript_15364C:: @ 815364C LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 lock faceplayer - checkflag 254 + checkflag FLAG_RECEIVED_CHARCOAL goto_if_eq LavaridgeTown_HerbShop_EventScript_153684 msgbox LavaridgeTown_HerbShop_Text_1761A2, 4 - giveitem ITEM_CHARCOAL + giveitem_std ITEM_CHARCOAL compare RESULT, 0 goto_if_eq LavaridgeTown_HerbShop_EventScript_1A029B - setflag 254 + setflag FLAG_RECEIVED_CHARCOAL release end diff --git a/data/scripts/maps/LavaridgeTown_House.inc b/data/scripts/maps/LavaridgeTown_House.inc index c75cb9e4b..6fc14e0b6 100644 --- a/data/scripts/maps/LavaridgeTown_House.inc +++ b/data/scripts/maps/LavaridgeTown_House.inc @@ -9,8 +9,8 @@ LavaridgeTown_House_EventScript_1538B7:: @ 81538B7 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox LavaridgeTown_House_Text_176D94, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc index 9d0f31059..0efda9c1e 100644 --- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 815390C .byte 0 LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912 - sethealplace 16 + setrespawn 16 call LavaridgeTown_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ LavaridgeTown_PokemonCenter_1F_EventScript_15391B:: @ 815391B setvar 0x800b, 1 call LavaridgeTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index cf8e2e07d..6494f2a6f 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -4,10 +4,10 @@ LilycoveCity_MapScripts:: @ 814CA15 .byte 0 LilycoveCity_MapScript1_14CA20:: @ 814CA20 - setflag 2075 + setflag FLAG_VISITED_LILYCOVE_CITY setvar 0x4086, 0 - setflag 802 - checkflag 2090 + setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, LilycoveCity_EventScript_1A02C1 call LilycoveCity_EventScript_1A0196 call LilycoveCity_EventScript_1A014E @@ -15,64 +15,64 @@ LilycoveCity_MapScript1_14CA20:: @ 814CA20 LilycoveCity_MapScript1_14CA3F:: @ 814CA3F .ifndef SAPPHIRE - setmaptile 69, 4, 169, 1 - setmaptile 70, 4, 680, 1 - setmaptile 71, 4, 681, 1 - setmaptile 72, 4, 682, 1 - setmaptile 69, 5, 145, 1 - setmaptile 70, 5, 688, 1 - setmaptile 71, 5, 689, 0 - setmaptile 72, 5, 690, 1 - setmaptile 69, 6, 446, 0 - setmaptile 70, 6, 447, 0 - setmaptile 71, 6, 368, 0 - setmaptile 72, 6, 445, 0 + setmetatile 69, 4, 169, 1 + setmetatile 70, 4, 680, 1 + setmetatile 71, 4, 681, 1 + setmetatile 72, 4, 682, 1 + setmetatile 69, 5, 145, 1 + setmetatile 70, 5, 688, 1 + setmetatile 71, 5, 689, 0 + setmetatile 72, 5, 690, 1 + setmetatile 69, 6, 446, 0 + setmetatile 70, 6, 447, 0 + setmetatile 71, 6, 368, 0 + setmetatile 72, 6, 445, 0 .endif - checkflag 112 + checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE call_if 0, LilycoveCity_EventScript_14CABE - checkflag 2061 + checkflag FLAG_BADGE07_GET call_if 1, LilycoveCity_EventScript_14CB2B end LilycoveCity_EventScript_14CABE:: @ 814CABE - setmaptile 76, 12, 656, 1 - setmaptile 77, 12, 657, 1 - setmaptile 76, 13, 672, 1 - setmaptile 77, 13, 673, 1 - setmaptile 76, 14, 664, 1 - setmaptile 77, 14, 665, 1 - setmaptile 76, 15, 672, 1 - setmaptile 77, 15, 673, 1 - setmaptile 77, 16, 664, 1 - setmaptile 78, 16, 665, 1 - setmaptile 77, 17, 672, 1 - setmaptile 78, 17, 673, 1 + setmetatile 76, 12, 656, 1 + setmetatile 77, 12, 657, 1 + setmetatile 76, 13, 672, 1 + setmetatile 77, 13, 673, 1 + setmetatile 76, 14, 664, 1 + setmetatile 77, 14, 665, 1 + setmetatile 76, 15, 672, 1 + setmetatile 77, 15, 673, 1 + setmetatile 77, 16, 664, 1 + setmetatile 78, 16, 665, 1 + setmetatile 77, 17, 672, 1 + setmetatile 78, 17, 673, 1 return LilycoveCity_EventScript_14CB2B:: @ 814CB2B - setmaptile 69, 4, 169, 1 - setmaptile 70, 4, 169, 1 - setmaptile 71, 4, 169, 1 - setmaptile 72, 4, 169, 1 - setmaptile 69, 5, 145, 1 - setmaptile 70, 5, 145, 1 - setmaptile 71, 5, 145, 1 - setmaptile 72, 5, 145, 1 + setmetatile 69, 4, 169, 1 + setmetatile 70, 4, 169, 1 + setmetatile 71, 4, 169, 1 + setmetatile 72, 4, 169, 1 + setmetatile 69, 5, 145, 1 + setmetatile 70, 5, 145, 1 + setmetatile 71, 5, 145, 1 + setmetatile 72, 5, 145, 1 return LilycoveCity_EventScript_14CB74:: @ 814CB74 lock faceplayer dodailyevents - checkflag 2255 + checkflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE goto_if_eq LilycoveCity_EventScript_14CBB4 msgbox LilycoveCity_Text_1C5A7A, 4 random 10 - addvar RESULT, 133 - giveitem RESULT + addvar RESULT, ITEM_CHERI_BERRY + giveitem_std RESULT compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_1A029B - setflag 2255 + setflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE msgbox LilycoveCity_Text_1C5B1D, 4 release end @@ -89,7 +89,7 @@ LilycoveCity_EventScript_14CBBE:: @ 814CBBE LilycoveCity_EventScript_14CBC7:: @ 814CBC7 lock faceplayer - checkflag 2061 + checkflag FLAG_BADGE07_GET goto_if_eq LilycoveCity_EventScript_14CBDC msgbox LilycoveCity_Text_168750, 4 release @@ -107,7 +107,7 @@ LilycoveCity_EventScript_14CBE6:: @ 814CBE6 LilycoveCity_EventScript_14CBEF:: @ 814CBEF lock faceplayer - checkflag 112 + checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE goto_if_eq LilycoveCity_EventScript_14CC04 msgbox LilycoveCity_Text_1688C1, 4 release @@ -121,7 +121,7 @@ LilycoveCity_EventScript_14CC04:: @ 814CC04 LilycoveCity_EventScript_14CC0E:: @ 814CC0E lock faceplayer - checkflag 112 + checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE goto_if_eq LilycoveCity_EventScript_14CC23 msgbox LilycoveCity_Text_1689BF, 4 release @@ -147,7 +147,7 @@ LilycoveCity_EventScript_14CC3F:: @ 814CC3F LilycoveCity_EventScript_14CC48:: @ 814CC48 lock faceplayer - checkflag 2061 + checkflag FLAG_BADGE07_GET goto_if_eq LilycoveCity_EventScript_14CC5D msgbox LilycoveCity_Text_168C16, 4 release @@ -186,7 +186,7 @@ LilycoveCity_EventScript_14CCA2:: @ 814CCA2 LilycoveCity_EventScript_14CCAC:: @ 814CCAC lockall - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_EventScript_14CCC0 msgbox LilycoveCity_Text_168EDA, 4 releaseall @@ -211,7 +211,7 @@ LilycoveCity_EventScript_14CCDC:: @ 814CCDC LilycoveCity_EventScript_14CCE5:: @ 814CCE5 lockall - checkflag 218 + checkflag FLAG_MET_WAILMER_TRAINER goto_if_eq LilycoveCity_EventScript_14CD18 msgbox LilycoveCity_Text_16864A, 4 applymovement LAST_TALKED, LilycoveCity_Movement_1A0839 @@ -219,7 +219,7 @@ LilycoveCity_EventScript_14CCE5:: @ 814CCE5 msgbox LilycoveCity_Text_168675, 4 applymovement LAST_TALKED, LilycoveCity_Movement_1A083D waitmovement 0 - setflag 218 + setflag FLAG_MET_WAILMER_TRAINER releaseall end @@ -256,9 +256,9 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 LilycoveCity_EventScript_14CD60:: @ 814CD60 playbgm 415, 1 - checkflag 286 + checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 1, LilycoveCity_EventScript_14CDB0 - checkflag 286 + checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 0, LilycoveCity_EventScript_14CDB9 compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CDC2 @@ -278,7 +278,7 @@ LilycoveCity_EventScript_14CDB9:: @ 814CDB9 return LilycoveCity_EventScript_14CDC2:: @ 814CDC2 - setflag 286 + setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE msgbox LilycoveCity_Text_167AEB, 4 savebgm 0 fadedefaultbgm @@ -287,9 +287,9 @@ LilycoveCity_EventScript_14CDC2:: @ 814CDC2 LilycoveCity_EventScript_14CDD3:: @ 814CDD3 playbgm 421, 1 - checkflag 286 + checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 1, LilycoveCity_EventScript_14CE23 - checkflag 286 + checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 0, LilycoveCity_EventScript_14CE2C compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CE35 @@ -309,7 +309,7 @@ LilycoveCity_EventScript_14CE2C:: @ 814CE2C return LilycoveCity_EventScript_14CE35:: @ 814CE35 - setflag 286 + setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE msgbox LilycoveCity_Text_16802C, 4 savebgm 0 fadedefaultbgm @@ -349,19 +349,19 @@ LilycoveCity_EventScript_14CE96:: @ 814CE96 LilycoveCity_EventScript_14CEA6:: @ 814CEA6 msgbox LilycoveCity_Text_167C6B, 4 setvar RESULT, 0 - checkflag 2060 + checkflag FLAG_BADGE06_GET call_if 1, LilycoveCity_EventScript_14CEDE compare RESULT, 0 call_if 1, LilycoveCity_EventScript_14CEEE compare RESULT, 1 call_if 1, LilycoveCity_EventScript_14CEF7 - clearflag 722 - clearflag 849 + clearflag FLAG_HIDE_MAY_UPSTAIRS + clearflag FLAG_HIDE_MAY_PICHU_DOLL goto LilycoveCity_EventScript_14CF6B end LilycoveCity_EventScript_14CEDE:: @ 814CEDE - checkflag 2062 + checkflag FLAG_BADGE08_GET goto_if_eq LilycoveCity_EventScript_14CEE8 return @@ -374,7 +374,7 @@ LilycoveCity_EventScript_14CEEE:: @ 814CEEE return LilycoveCity_EventScript_14CEF7:: @ 814CEF7 - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_EventScript_14CF09 msgbox LilycoveCity_Text_167DDD, 4 return @@ -386,13 +386,13 @@ LilycoveCity_EventScript_14CF09:: @ 814CF09 LilycoveCity_EventScript_14CF12:: @ 814CF12 msgbox LilycoveCity_Text_168149, 4 setvar RESULT, 0 - checkflag 2060 + checkflag FLAG_BADGE06_GET call_if 1, LilycoveCity_EventScript_14CEDE compare RESULT, 0 call_if 1, LilycoveCity_EventScript_14CF47 compare RESULT, 1 call_if 1, LilycoveCity_EventScript_14CF50 - clearflag 760 + clearflag FLAG_HIDE_BRENDAN_UPSTAIRS goto LilycoveCity_EventScript_14CF6B end @@ -401,7 +401,7 @@ LilycoveCity_EventScript_14CF47:: @ 814CF47 return LilycoveCity_EventScript_14CF50:: @ 814CF50 - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_EventScript_14CF62 msgbox LilycoveCity_Text_168282, 4 return @@ -415,13 +415,13 @@ LilycoveCity_EventScript_14CF6B:: @ 814CF6B applymovement LAST_TALKED, LilycoveCity_Movement_1A0845 waitmovement 0 delay 50 - setfieldeffect 0, 1 + setfieldeffectargument 0, 1 dofieldeffect 30 delay 15 removeobject LAST_TALKED waitfieldeffect 30 savebgm 0 fadedefaultbgm - setflag 292 + setflag FLAG_MET_RIVAL_LILYCOVE release end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index a8c32a4fe..c97a01989 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -13,7 +13,7 @@ LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877 .2byte 0 LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889 - checkflag 775 + checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR goto_if_eq LilycoveCity_ContestLobby_EventScript_158898 setvar 0x4099, 0 end @@ -97,23 +97,23 @@ LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994 return LilycoveCity_ContestLobby_EventScript_1589D6:: @ 81589D6 - clearflag 776 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY return LilycoveCity_ContestLobby_EventScript_1589DA:: @ 81589DA - clearflag 777 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL return LilycoveCity_ContestLobby_EventScript_1589DE:: @ 81589DE - clearflag 778 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN return LilycoveCity_ContestLobby_EventScript_1589E2:: @ 81589E2 - clearflag 779 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER return LilycoveCity_ContestLobby_EventScript_1589E6:: @ 81589E6 - clearflag 780 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS return LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA @@ -126,23 +126,23 @@ LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA return LilycoveCity_ContestLobby_EventScript_158A27:: @ 8158A27 - setflag 160 + setflag FLAG_COOL_PAINTING_MADE return LilycoveCity_ContestLobby_EventScript_158A2B:: @ 8158A2B - setflag 161 + setflag FLAG_BEAUTY_PAINTING_MADE return LilycoveCity_ContestLobby_EventScript_158A2F:: @ 8158A2F - setflag 162 + setflag FLAG_CUTE_PAINTING_MADE return LilycoveCity_ContestLobby_EventScript_158A33:: @ 8158A33 - setflag 163 + setflag FLAG_SMART_PAINTING_MADE return LilycoveCity_ContestLobby_EventScript_158A37:: @ 8158A37 - setflag 164 + setflag FLAG_TOUGH_PAINTING_MADE return LilycoveCity_ContestLobby_Movement_158A3B:: @ 8158A3B @@ -188,7 +188,7 @@ LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52 step_end LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B - checkflag 775 + checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR goto_if_eq LilycoveCity_ContestLobby_EventScript_158A6A setvar 0x4099, 0 end @@ -307,11 +307,11 @@ LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA - checkflag 2 + checkflag FLAG_TEMP_2 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BAE message LilycoveCity_ContestLobby_Text_18848C waitmessage - setflag 2 + setflag FLAG_TEMP_2 goto LilycoveCity_ContestLobby_EventScript_158BF0 end @@ -334,7 +334,7 @@ LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4 erasebox 0, 0, 15, 9 compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 - setflag 3 + setflag FLAG_TEMP_3 return LilycoveCity_ContestLobby_EventScript_158BF0:: @ 8158BF0 @@ -354,13 +354,13 @@ LilycoveCity_ContestLobby_EventScript_158C27:: @ 8158C27 LilycoveCity_ContestLobby_EventScript_158C35:: @ 8158C35 msgbox LilycoveCity_ContestLobby_Text_188559, 4 releaseall - clearflag 3 + clearflag FLAG_TEMP_3 end LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 msgbox LilycoveCity_ContestLobby_Text_188703, 4 setvar CONTEST_RANK, 0 - choosecontestpkmn + choosecontestmon compare 0x8004, 255 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA special sub_80C43F4 @@ -402,7 +402,7 @@ LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0 end LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA - checkflag 3 + checkflag FLAG_TEMP_3 call_if 0, LilycoveCity_ContestLobby_EventScript_158BC4 message LilycoveCity_ContestLobby_Text_1886DC waitmessage @@ -445,7 +445,7 @@ LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90 msgbox LilycoveCity_ContestLobby_Text_18878D, 4 closemessage releaseall - clearflag 3 + clearflag FLAG_TEMP_3 end LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1 @@ -453,7 +453,7 @@ LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1 msgbox LilycoveCity_ContestLobby_Text_1887F4, 4 closemessage releaseall - clearflag 3 + clearflag FLAG_TEMP_3 end LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2 @@ -461,7 +461,7 @@ LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2 msgbox LilycoveCity_ContestLobby_Text_18881F, 4 closemessage releaseall - clearflag 3 + clearflag FLAG_TEMP_3 end LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 @@ -472,7 +472,7 @@ LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 special sub_80C496C addvar 0x8004, 1 - getnumberstring 1, 32772 + buffernumberstring 1, 32772 messageautoscroll LilycoveCity_ContestLobby_Text_188845 waitmessage addvar 0x8004, 65535 @@ -497,14 +497,14 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C waitmovement 0 playse 71 - setmaptile 9, 2, 545, 1 - setmaptile 9, 3, 609, 1 + setmetatile 9, 2, 545, 1 + setmetatile 9, 3, 609, 1 special DrawWholeMapView applymovement 2, LilycoveCity_ContestLobby_Movement_158EA0 waitmovement 0 playse 71 - setmaptile 9, 2, 721, 1 - setmaptile 9, 3, 729, 1 + setmetatile 9, 2, 721, 1 + setmetatile 9, 3, 729, 1 special DrawWholeMapView delay 20 applymovement 2, LilycoveCity_ContestLobby_Movement_158EAE @@ -583,13 +583,13 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 end LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 - setflag 775 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR copyvar 0x4094, 0x1 - additem ITEM_CONTEST_PASS, 1 + giveitem ITEM_CONTEST_PASS, 1 setvar 0x800b, 8 setvar CONTEST_RANK, 3 setvar 0x4099, 1 - setflag 2107 + setflag FLAG_SYS_RIBBON_GET end LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08 @@ -602,31 +602,31 @@ LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08 return LilycoveCity_ContestLobby_EventScript_158F45:: @ 8158F45 - setwarp LinkContestRoom4, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM4, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F52:: @ 8158F52 - setwarp LinkContestRoom2, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM2, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F5F:: @ 8158F5F - setwarp LinkContestRoom6, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM6, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F6C:: @ 8158F6C - setwarp LinkContestRoom5, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM5, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F79:: @ 8158F79 - setwarp LinkContestRoom3, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM3, 255, 7, 5 special sub_8081334 waitstate return @@ -636,14 +636,14 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 applymovement 1, LilycoveCity_ContestLobby_Movement_15900B waitmovement 0 playse 71 - setmaptile 4, 2, 545, 1 - setmaptile 4, 3, 609, 1 + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, LilycoveCity_ContestLobby_Movement_15900F waitmovement 0 playse 71 - setmaptile 4, 2, 721, 1 - setmaptile 4, 3, 729, 1 + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 special DrawWholeMapView delay 20 applymovement 1, LilycoveCity_ContestLobby_Movement_15901C @@ -707,7 +707,7 @@ LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E end LilycoveCity_ContestLobby_EventScript_159027:: @ 8159027 - checkflag 150 + checkflag FLAG_RECEIVED_CONTEST_PASS goto_if 0, LilycoveCity_ContestLobby_EventScript_159039 msgbox LilycoveCity_ContestLobby_Text_188DDA, 2 end @@ -765,7 +765,7 @@ LilycoveCity_ContestLobby_EventScript_15908D:: @ 815908D SlateportCity_ContestLobby_EventScript_15908D:: @ 815908D lockall special ShowBerryBlenderRecordWindow - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index 7b602b2c7..3e4caf100 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -3,9 +3,9 @@ LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 81582C4 LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5 lockall - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_158326 - checkflag 2061 + checkflag FLAG_BADGE07_GET goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, 4 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index fd9ea8a58..00a10b655 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -4,9 +4,9 @@ LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 81583A0 LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 lock faceplayer - checkflag 2 + checkflag FLAG_TEMP_2 call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 - checkflag 2 + checkflag FLAG_TEMP_2 call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD specialvar RESULT, sub_8090FC0 compare RESULT, 1 @@ -19,7 +19,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7 return LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0 - setflag 2 + setflag FLAG_TEMP_2 playfanfare 370 waitfanfare goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 9d04d2e33..ca60bbc89 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -4,7 +4,7 @@ LilycoveCity_DepartmentStoreElevator_MapScripts:: @ 815A39B LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C lock faceplayer - checkflag 2 + checkflag FLAG_TEMP_2 call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF copyvar 0x8005, 0x4043 special sub_810E944 @@ -21,7 +21,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C end LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 - setdynamicwarp LilycoveCity_DepartmentStore_1F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 compare 0x4043, 0 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -30,7 +30,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 end LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 - setdynamicwarp LilycoveCity_DepartmentStore_2F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 compare 0x4043, 1 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -39,7 +39,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 end LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 - setdynamicwarp LilycoveCity_DepartmentStore_3F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 compare 0x4043, 2 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -48,7 +48,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 end LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B - setdynamicwarp LilycoveCity_DepartmentStore_4F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 compare 0x4043, 3 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -57,7 +57,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B end LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E - setdynamicwarp LilycoveCity_DepartmentStore_5F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 compare 0x4043, 4 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -76,7 +76,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8 waitmovement 0 special sub_810EBEC waitstate - setflag 2 + setflag FLAG_TEMP_2 return LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF:: @ 815A4CF diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 29914a9b5..2806b6125 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -11,11 +11,11 @@ LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F:: @ 815A15F - clearflag 962 + clearflag FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART return LilycoveCity_DepartmentStoreRooftop_EventScript_15A163:: @ 815A163 - setflag 962 + setflag FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART return LilycoveCity_DepartmentStoreRooftop_EventScript_15A167:: @ 815A167 @@ -23,7 +23,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A167:: @ 815A167 faceplayer message LilycoveCity_DepartmentStoreRooftop_Text_1A0BE4 waitmessage - pokemartdecor LilycoveCity_DepartmentStoreRooftop_Decorations + pokemartdecoration LilycoveCity_DepartmentStoreRooftop_Decorations msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C02, 4 release end @@ -146,12 +146,12 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoneybox 0, 0 nop - getitemname 0, 0x4000 + bufferitemname 0, 0x4000 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4 - additem 0x4000, 1 - getitemname 1, 0x4000 - getstdstring 2, 14 + giveitem 0x4000, 1 + bufferitemname 1, 0x4000 + bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 @@ -161,9 +161,9 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 - additem 0x4000, 1 - getitemname 1, 0x4000 - getstdstring 2, 14 + giveitem 0x4000, 1 + bufferitemname 1, 0x4000 + bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 @@ -173,9 +173,9 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 - additem 0x4000, 1 - getitemname 1, 0x4000 - getstdstring 2, 14 + giveitem 0x4000, 1 + bufferitemname 1, 0x4000 + bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 7acd29523..dbfd79e98 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -11,12 +11,12 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E dodailyevents compare 0x4045, 0 goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 - checkflag 2250 + checkflag FLAG_DAILY_PICKED_LOTTO_TICKET goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, 5 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 - setflag 2250 + setflag FLAG_DAILY_PICKED_LOTTO_TICKET message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 waitmessage special RetrieveLotteryNumber @@ -40,7 +40,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A compare 0x8006, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 - getitemname 0, 0x8005 + bufferitemname 0, 0x8005 compare 0x8004, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 compare 0x8004, 2 @@ -49,7 +49,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A compare 0x8004, 4 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 - giveitem 0x8005 + giveitem_std 0x8005 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E @@ -111,7 +111,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EA7:: @ 8159EA7 LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1 msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, 4 - giveitem 0x4045 + giveitem_std 0x4045 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159EA7 setvar 0x4045, 0 @@ -134,9 +134,9 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EF2:: @ 8159EF2 lock faceplayer waitse - playpokecry SPECIES_AZUMARILL, 0 + playmoncry SPECIES_AZUMARILL, 0 msgbox LilycoveCity_DepartmentStore_1F_Text_18C0C3, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc index 835a0f48d..184d3b816 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc @@ -6,7 +6,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A061:: @ 815A061 faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 waitmessage - pokemartbp LilycoveCity_DepartmentStore_5F_Items1 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items1 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release end @@ -34,7 +34,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A094:: @ 815A094 faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 waitmessage - pokemartbp LilycoveCity_DepartmentStore_5F_Items2 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items2 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release end @@ -59,7 +59,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A0C2:: @ 815A0C2 faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 waitmessage - pokemartbp LilycoveCity_DepartmentStore_5F_Items3 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items3 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release end @@ -84,7 +84,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A0F2:: @ 815A0F2 faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 waitmessage - pokemartbp LilycoveCity_DepartmentStore_5F_Items4 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items4 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 7e14db994..9687c73fe 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -3,7 +3,7 @@ LilycoveCity_Harbor_MapScripts:: @ 8159893 .byte 0 LilycoveCity_Harbor_MapScript1_159899:: @ 8159899 - setescapewarp LilycoveCity, 255, 12, 33 + setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33 end LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 @@ -16,7 +16,7 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 end LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_Harbor_EventScript_1598CD msgbox LilycoveCity_Harbor_Text_18B306, 4 release @@ -52,7 +52,7 @@ LilycoveCity_Harbor_EventScript_159933:: @ 8159933 goto_if_eq LilycoveCity_Harbor_EventScript_15997E setvar 0x40b4, 5 call LilycoveCity_Harbor_EventScript_15998A - warp SSTidalCorridor, 255, 1, 10 + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end @@ -62,7 +62,7 @@ LilycoveCity_Harbor_EventScript_15995B:: @ 815995B compare RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_15997E call LilycoveCity_Harbor_EventScript_15998A - warp BattleTower_Outside, 255, 19, 23 + warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23 waitstate release end @@ -79,13 +79,13 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - hideobject LAST_TALKED, 13, 10 + hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR compare FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 compare FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E return @@ -106,18 +106,18 @@ LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4 end LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, LilycoveCity_Harbor_EventScript_1598BA - checkflag 206 + checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS goto_if_eq LilycoveCity_Harbor_EventScript_1598BA - checkflag 2131 + checkflag FLAG_SYS_HAS_EON_TICKET goto_if 0, LilycoveCity_Harbor_EventScript_1598BA msgbox LilycoveCity_Harbor_Text_1C50F2, 4 closemessage applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - hideobject LAST_TALKED, 13, 10 + hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR delay 60 addobject 4 delay 30 @@ -134,11 +134,11 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE compare FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY special ScrSpecial_HealPlayerParty setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E - warp SouthernIsland_Exterior, 255, 13, 22 + warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 waitstate release end @@ -159,7 +159,7 @@ LilycoveCity_Harbor_Movement_159A89:: @ 8159A89 LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D lock faceplayer - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_Harbor_EventScript_159AA2 msgbox LilycoveCity_Harbor_Text_18B504, 4 release diff --git a/data/scripts/maps/LilycoveCity_House1.inc b/data/scripts/maps/LilycoveCity_House1.inc index 4defe37b8..15535a122 100644 --- a/data/scripts/maps/LilycoveCity_House1.inc +++ b/data/scripts/maps/LilycoveCity_House1.inc @@ -9,8 +9,8 @@ LilycoveCity_House1_EventScript_159B8F:: @ 8159B8F lock faceplayer waitse - playpokecry SPECIES_KECLEON, 0 + playmoncry SPECIES_KECLEON, 0 msgbox LilycoveCity_House1_Text_18B82B, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc index d3399f5ac..d0065c9e8 100644 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ b/data/scripts/maps/LilycoveCity_House2.inc @@ -4,13 +4,13 @@ LilycoveCity_House2_MapScripts:: @ 8159BA2 LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 lock faceplayer - checkflag 234 + checkflag FLAG_RECEIVED_TM44 goto_if_eq LilycoveCity_House2_EventScript_159BDA msgbox LilycoveCity_House2_Text_18B83C, 4 - giveitem ITEM_TM44 + giveitem_std ITEM_TM44 compare RESULT, 0 goto_if_eq LilycoveCity_House2_EventScript_1A029B - setflag 234 + setflag FLAG_RECEIVED_TM44 msgbox LilycoveCity_House2_Text_18B883, 4 release end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 06e82d5f8..5d5b04114 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -49,7 +49,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD:: @ 81584BD lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158504 waitmovement 0 - warp LilycoveCity_LilycoveMuseum_2F, 255, 11, 8 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end @@ -57,7 +57,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2:: @ 81584D2 lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_1584FE waitmovement 0 - warp LilycoveCity_LilycoveMuseum_2F, 255, 11, 8 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end @@ -65,7 +65,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7:: @ 81584E7 lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158501 waitmovement 0 - warp LilycoveCity_LilycoveMuseum_2F, 255, 11, 8 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index a4599f14a..577805fb2 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -4,61 +4,61 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 81585AC .byte 0 LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7:: @ 81585B7 - checkflag 160 + checkflag FLAG_COOL_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6:: @ 81585C6 - checkflag 161 + checkflag FLAG_BEAUTY_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158615 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5:: @ 81585D5 - checkflag 162 + checkflag FLAG_CUTE_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15862D goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4:: @ 81585E4 - checkflag 163 + checkflag FLAG_SMART_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158645 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3 - checkflag 164 + checkflag FLAG_TOUGH_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15865D end LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD:: @ 81585FD - setmaptile 10, 6, 606, 1 - setmaptile 11, 6, 607, 1 + setmetatile 10, 6, 606, 1 + setmetatile 11, 6, 607, 1 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 end LilycoveCity_LilycoveMuseum_2F_EventScript_158615:: @ 8158615 - setmaptile 18, 6, 604, 1 - setmaptile 19, 6, 605, 1 + setmetatile 18, 6, 604, 1 + setmetatile 19, 6, 605, 1 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 end LilycoveCity_LilycoveMuseum_2F_EventScript_15862D:: @ 815862D - setmaptile 14, 10, 608, 1 - setmaptile 15, 10, 609, 1 + setmetatile 14, 10, 608, 1 + setmetatile 15, 10, 609, 1 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 end LilycoveCity_LilycoveMuseum_2F_EventScript_158645:: @ 8158645 - setmaptile 6, 10, 602, 1 - setmaptile 7, 10, 603, 1 + setmetatile 6, 10, 602, 1 + setmetatile 7, 10, 603, 1 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_15865D:: @ 815865D - setmaptile 2, 6, 610, 1 - setmaptile 3, 6, 611, 1 + setmetatile 2, 6, 610, 1 + setmetatile 3, 6, 611, 1 end LilycoveCity_LilycoveMuseum_2F_MapScript2_158670:: @ 8158670 @@ -96,7 +96,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5 LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 lockall - checkflag 236 + checkflag FLAG_RECEIVED_GLASS_ORNAMENT goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158793 specialvar 0x8004, sub_80C4D50 switch 0x8004 @@ -124,10 +124,10 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158735:: @ 8158735 LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4 - givedecoration 44 + givedecoration_std DECOR_GLASS_ORNAMENT compare RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 - setflag 236 + setflag FLAG_RECEIVED_GLASS_ORNAMENT closemessage releaseall end @@ -146,35 +146,35 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158793:: @ 8158793 LilycoveCity_LilycoveMuseum_2F_EventScript_15879D:: @ 815879D lockall - checkflag 162 + checkflag FLAG_CUTE_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15883C msgbox LilycoveCity_LilycoveMuseum_2F_Text_188219, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0:: @ 81587B0 lockall - checkflag 164 + checkflag FLAG_TOUGH_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158858 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18824C, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3:: @ 81587C3 lockall - checkflag 160 + checkflag FLAG_COOL_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158820 msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882B4, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6:: @ 81587D6 lockall - checkflag 161 + checkflag FLAG_BEAUTY_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15882E msgbox LilycoveCity_LilycoveMuseum_2F_Text_188281, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9:: @ 81587E9 lockall - checkflag 163 + checkflag FLAG_SMART_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15884A msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882E6, 3 end diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index 20b5c5f13..38428311b 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -3,14 +3,14 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 8159327 .byte 0 LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D - sethealplace 8 + setrespawn 8 end LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331 setvar 0x800b, 1 call LilycoveCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end @@ -21,7 +21,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_15933F:: @ 815933F LilycoveCity_PokemonCenter_1F_EventScript_159348:: @ 8159348 lock faceplayer - checkflag 2061 + checkflag FLAG_BADGE07_GET goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_15935D msgbox LilycoveCity_PokemonCenter_1F_Text_18A048, 4 release diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 220aeead7..13c18d51e 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -4,10 +4,10 @@ LittlerootTown_MapScripts:: @ 814D509 .byte 0 LittlerootTown_MapScript1_14D514:: @ 814D514 - setflag 2063 + setflag FLAG_VISITED_LITTLEROOT_TOWN compare 0x4092, 2 call_if 1, LittlerootTown_EventScript_14D57B - checkflag 82 + checkflag FLAG_RESCUED_BIRCH call_if 0, LittlerootTown_EventScript_14D583 compare 0x4050, 3 call_if 1, LittlerootTown_EventScript_14D5A6 @@ -22,12 +22,12 @@ LittlerootTown_MapScript1_14D514:: @ 814D514 end LittlerootTown_EventScript_14D563:: @ 814D563 - setflag 301 + setflag FLAG_RIVAL_LEFT_FOR_ROUTE103 return LittlerootTown_EventScript_14D567:: @ 814D567 setvar 0x40c7, 2 - setflag 979 + setflag FLAG_HIDE_RIVAL_OLDALE_TOWN return LittlerootTown_EventScript_14D570:: @ 814D570 @@ -52,7 +52,7 @@ LittlerootTown_EventScript_14D59A:: @ 814D59A return LittlerootTown_EventScript_14D5A6:: @ 814D5A6 - clearflag 752 + clearflag FLAG_HIDE_MOM_LITTLEROOT setobjectmovementtype 4, 8 checkplayergender compare RESULT, 0 @@ -80,8 +80,8 @@ LittlerootTown_EventScript_14D5EF:: @ 814D5EF setvar 0x8004, 5 setvar 0x8005, 8 call LittlerootTown_EventScript_14D62B - setflag 761 - warpsilent LittlerootTown_BrendansHouse_1F, 255, 8, 8 + setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN + warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 waitstate releaseall end @@ -91,8 +91,8 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D setvar 0x8004, 14 setvar 0x8005, 8 call LittlerootTown_EventScript_14D62B - setflag 762 - warpsilent LittlerootTown_MaysHouse_1F, 255, 2, 8 + setflag FLAG_HIDE_MOVING_TRUCK_MAY + warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 waitstate releaseall end @@ -122,12 +122,12 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B applymovement 4, LittlerootTown_Movement_14D6B5 applymovement 255, LittlerootTown_Movement_14D6BD waitmovement 0 - setflag 752 + setflag FLAG_HIDE_MOM_LITTLEROOT setvar 0x4092, 3 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY closedoor 0x8004, 0x8005 waitdooranim - clearflag 868 + clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT clearflag 0x4000 return @@ -187,9 +187,9 @@ LittlerootTown_EventScript_14D6D6:: @ 814D6D6 LittlerootTown_EventScript_14D6DF:: @ 814D6DF lock faceplayer - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED goto_if_eq LittlerootTown_EventScript_14D72F - checkflag 82 + checkflag FLAG_RESCUED_BIRCH goto_if_eq LittlerootTown_EventScript_14D722 compare 0x4050, 0 goto_if 5, LittlerootTown_EventScript_14D708 @@ -599,7 +599,7 @@ LittlerootTown_EventScript_14DB46:: @ 814DB46 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -611,7 +611,7 @@ LittlerootTown_EventScript_14DB6C:: @ 814DB6C waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -623,7 +623,7 @@ LittlerootTown_EventScript_14DB92:: @ 814DB92 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -635,7 +635,7 @@ LittlerootTown_EventScript_14DBB8:: @ 814DBB8 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -647,7 +647,7 @@ LittlerootTown_EventScript_14DBDE:: @ 814DBDE waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -659,7 +659,7 @@ LittlerootTown_EventScript_14DC04:: @ 814DC04 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -671,7 +671,7 @@ LittlerootTown_EventScript_14DC2A:: @ 814DC2A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -683,7 +683,7 @@ LittlerootTown_EventScript_14DC50:: @ 814DC50 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -853,7 +853,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim goto LittlerootTown_EventScript_14DD2B @@ -861,7 +861,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 LittlerootTown_EventScript_14DD2B:: @ 814DD2B removeobject 4 - setflag 2144 + setflag FLAG_SYS_B_DASH setvar 0x4050, 4 release end @@ -872,7 +872,7 @@ LittlerootTown_EventScript_14DD38:: @ 814DD38 message LittlerootTown_Text_16AA32 waitfanfare waitmessage - setflag 274 + setflag FLAG_RECEIVED_RUNNING_SHOES msgbox LittlerootTown_Text_16AA5C, 4 msgbox LittlerootTown_Text_16AB10, 4 closemessage diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 04256cacb..d4dd94aae 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -7,13 +7,13 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B compare 0x4092, 6 call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_152660 - checkflag 274 + checkflag FLAG_RECEIVED_RUNNING_SHOES call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_152673 end LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 - setmaptile 5, 4, 624, 1 - setmaptile 5, 2, 616, 1 + setmetatile 5, 4, 624, 1 + setmetatile 5, 2, 616, 1 return LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 @@ -23,7 +23,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 return LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 - setmaptile 3, 7, 659, 1 + setmetatile 3, 7, 659, 1 return LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A @@ -65,7 +65,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_152720 applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_152720 waitmovement 0 - warp LittlerootTown_BrendansHouse_2F, 255, 7, 1 + warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 waitstate releaseall end @@ -100,7 +100,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 waitmovement 0 special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1730C2, 4 - setflag 87 + setflag FLAG_MET_RIVAL_MOM setvar 0x4082, 2 releaseall end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 8ff7f8b81..8f3b07312 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -4,7 +4,7 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4 .byte 0 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF - checkflag 130 + checkflag FLAG_DEFEATED_RIVAL_ROUTE103 call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE compare 0x4092, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 14c7f5d8a..e23a05243 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -7,13 +7,13 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 compare 0x4092, 6 call_if 0, LittlerootTown_MaysHouse_1F_EventScript_15289E - checkflag 274 + checkflag FLAG_RECEIVED_RUNNING_SHOES call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1 end LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E - setmaptile 5, 4, 624, 1 - setmaptile 5, 2, 616, 1 + setmetatile 5, 4, 624, 1 + setmetatile 5, 2, 616, 1 return LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 @@ -23,7 +23,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 return LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE - setmaptile 6, 7, 659, 1 + setmetatile 6, 7, 659, 1 return LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 @@ -65,7 +65,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938 applymovement 255, LittlerootTown_MaysHouse_1F_Movement_15295E applymovement 1, LittlerootTown_MaysHouse_1F_Movement_15295E waitmovement 0 - warp LittlerootTown_MaysHouse_2F, 255, 1, 1 + warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1 waitstate releaseall end @@ -100,7 +100,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 waitmovement 0 special GetRivalSonDaughterString msgbox LittlerootTown_MaysHouse_1F_Text_1730C2, 4 - setflag 87 + setflag FLAG_MET_RIVAL_MOM setvar 0x408c, 2 releaseall end @@ -135,9 +135,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_1529EB:: @ 81529EB LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB lock faceplayer - checkflag 130 + checkflag FLAG_DEFEATED_RIVAL_ROUTE103 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21 - checkflag 301 + checkflag FLAG_RIVAL_LEFT_FOR_ROUTE103 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17 compare 0x408d, 3 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 68bdf0fcb..020c39eac 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -4,7 +4,7 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50 .byte 0 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B - checkflag 130 + checkflag FLAG_DEFEATED_RIVAL_ROUTE103 call_if 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A compare 0x4092, 4 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950 @@ -30,7 +30,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D lockall - checkflag 292 + checkflag FLAG_MET_RIVAL_LILYCOVE goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BB5 checkplayergender compare RESULT, 0 @@ -117,18 +117,18 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BED - setflag 293 + setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE releaseall end LittlerootTown_BrendansHouse_2F_EventScript_152BDB:: @ 8152BDB - checkflag 293 + checkflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BFF msgbox LittlerootTown_BrendansHouse_2F_Text_1737AE, 4 return LittlerootTown_BrendansHouse_2F_EventScript_152BED:: @ 8152BED - checkflag 293 + checkflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152C08 msgbox LittlerootTown_BrendansHouse_2F_Text_1738F2, 4 return diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index e7ccd73f6..6792c5932 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -24,7 +24,7 @@ LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE lockall - getfirstpartypokename 0 + bufferleadmonspeciesname 0 message LittlerootTown_ProfessorBirchsLab_Text_173D94 waitmessage playfanfare 370 @@ -52,7 +52,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 msgbox LittlerootTown_ProfessorBirchsLab_Text_174015, 4 - clearflag 991 + clearflag FLAG_HIDE_BOY_ROUTE101 setvar 0x4084, 3 releaseall end @@ -87,10 +87,10 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 faceplayer compare 0x4084, 3 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90 - checkflag 88 + checkflag FLAG_BIRCH_AIDE_MET goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D86 msgbox LittlerootTown_ProfessorBirchsLab_Text_173B29, 4 - setflag 88 + setflag FLAG_BIRCH_AIDE_MET release end @@ -107,7 +107,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D90:: @ 8152D90 LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A lock faceplayer - checkflag 896 + checkflag FLAG_UNKNOWN_BIRCH_380 goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F compare 0x4084, 5 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B @@ -129,7 +129,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA compare RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40 setvar 0x4084, 5 - setflag 116 + setflag FLAG_ADVENTURE_STARTED setvar 0x4051, 1 setvar 0x408d, 4 setvar 0x4050, 3 @@ -138,7 +138,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4 - giveitem ITEM_POKE_BALL, 5 + giveitem_std ITEM_POKE_BALL, 5 compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E85 msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4 @@ -147,7 +147,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4 - giveitem ITEM_POKE_BALL, 5 + giveitem_std ITEM_POKE_BALL, 5 compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E8E msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4 @@ -159,7 +159,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D message LittlerootTown_ProfessorBirchsLab_Text_17422F waitfanfare waitmessage - setflag 2049 + setflag FLAG_SYS_POKEDEX_GET return LittlerootTown_ProfessorBirchsLab_EventScript_152E7B:: @ 8152E7B diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/scripts/maps/MagmaHideout_B1F.inc index 780eea4f5..6dbdc0461 100644 --- a/data/scripts/maps/MagmaHideout_B1F.inc +++ b/data/scripts/maps/MagmaHideout_B1F.inc @@ -3,7 +3,7 @@ MagmaHideout_B1F_MapScripts:: @ 815F2A8 .byte 0 MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE - checkflag 2145 + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, MagmaHideout_B1F_EventScript_15F2B8 end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 5c93aa252..6a7e02848 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -3,18 +3,18 @@ MauvilleCity_MapScripts:: @ 814C032 .byte 0 MauvilleCity_MapScript1_14C038:: @ 814C038 - setflag 2072 - clearflag 961 - setflag 2098 - clearflag 99 + setflag FLAG_VISITED_MAUVILLE_CITY + clearflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + setflag FLAG_SYS_TV_START + clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE setvar 0x4093, 0 - checkflag 209 + checkflag FLAG_RECEIVED_TM24 call_if 1, MauvilleCity_EventScript_14C053 end MauvilleCity_EventScript_14C053:: @ 814C053 - clearflag 913 - setflag 912 + clearflag FLAG_HIDE_WATTSON_MAUVILLE_GYM + setflag FLAG_HIDE_WATTSON_MAUVILLE return MauvilleCity_EventScript_14C05A:: @ 814C05A @@ -52,10 +52,10 @@ MauvilleCity_EventScript_14C099:: @ 814C099 MauvilleCity_EventScript_14C0A2:: @ 814C0A2 lock faceplayer - checkflag 98 + checkflag FLAG_TV_EXPLAINED goto_if_eq MauvilleCity_EventScript_14C0BA msgbox MauvilleCity_Text_16674A, 4 - setflag 98 + setflag FLAG_TV_EXPLAINED release end @@ -67,7 +67,7 @@ MauvilleCity_EventScript_14C0BA:: @ 814C0BA MauvilleCity_EventScript_14C0C4:: @ 814C0C4 lock faceplayer - checkflag 284 + checkflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE goto_if_eq MauvilleCity_EventScript_14C0E4 msgbox MauvilleCity_Text_165B76, 4 closemessage @@ -86,7 +86,7 @@ MauvilleCity_EventScript_14C0E4:: @ 814C0E4 MauvilleCity_EventScript_14C0F9:: @ 814C0F9 lockall - checkflag 284 + checkflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE goto_if_eq MauvilleCity_EventScript_14C292 applymovement 6, MauvilleCity_Movement_1A0843 waitmovement 0 @@ -156,9 +156,9 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9 MauvilleCity_EventScript_14C22B:: @ 814C22B removeobject 6 removeobject 7 - clearflag 806 - clearflag 809 - setflag 190 + clearflag FLAG_HIDE_WALLY_WANDAS_HOUSE + clearflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE + setflag FLAG_DEFEATED_WALLY_MAUVILLE releaseall end @@ -177,7 +177,7 @@ MauvilleCity_EventScript_14C23C:: @ 814C23C return MauvilleCity_EventScript_14C285:: @ 814C285 - setflag 284 + setflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE msgbox MauvilleCity_Text_165DE8, 4 release end @@ -284,15 +284,15 @@ MauvilleCity_Movement_14C2E8:: @ 814C2E8 MauvilleCity_EventScript_14C2F2:: @ 814C2F2 lock faceplayer - checkflag 209 + checkflag FLAG_RECEIVED_TM24 goto_if_eq MauvilleCity_EventScript_14C368 compare 0x40ba, 2 goto_if_eq MauvilleCity_EventScript_14C33C - checkflag 208 + checkflag FLAG_RECEIVED_BASEMENT_KEY goto_if_eq MauvilleCity_EventScript_14C332 msgbox MauvilleCity_Text_1661C1, 4 - giveitem ITEM_BASEMENT_KEY - setflag 208 + giveitem_std ITEM_BASEMENT_KEY + setflag FLAG_RECEIVED_BASEMENT_KEY msgbox MauvilleCity_Text_166331, 4 release end @@ -304,10 +304,10 @@ MauvilleCity_EventScript_14C332:: @ 814C332 MauvilleCity_EventScript_14C33C:: @ 814C33C msgbox MauvilleCity_Text_1663EB, 4 - giveitem ITEM_TM24 + giveitem_std ITEM_TM24 compare RESULT, 0 goto_if_eq MauvilleCity_EventScript_1A029B - setflag 209 + setflag FLAG_RECEIVED_TM24 msgbox MauvilleCity_Text_166488, 4 release end diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index a93ff5170..6c2dc57e1 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -4,9 +4,9 @@ MauvilleCity_BikeShop_MapScripts:: @ 8156795 MauvilleCity_BikeShop_EventScript_156796:: @ 8156796 lock faceplayer - checkflag 90 + checkflag FLAG_RECEIVED_BIKE goto_if_eq MauvilleCity_BikeShop_EventScript_15686E - checkflag 89 + checkflag FLAG_DECLINED_BIKE goto_if_eq MauvilleCity_BikeShop_EventScript_1567D1 msgbox MauvilleCity_BikeShop_Text_180F9F, 4 msgbox MauvilleCity_BikeShop_Text_181016, 5 @@ -34,25 +34,25 @@ MauvilleCity_BikeShop_EventScript_1567F0:: @ 81567F0 end MauvilleCity_BikeShop_EventScript_156817:: @ 8156817 - setflag 89 + setflag FLAG_DECLINED_BIKE msgbox MauvilleCity_BikeShop_Text_181067, 4 release end MauvilleCity_BikeShop_EventScript_156824:: @ 8156824 - setflag 90 + setflag FLAG_RECEIVED_BIKE goto MauvilleCity_BikeShop_EventScript_1567F0 end MauvilleCity_BikeShop_EventScript_15682D:: @ 815682D msgbox MauvilleCity_BikeShop_Text_181332, 4 - giveitem ITEM_MACH_BIKE + giveitem_std ITEM_MACH_BIKE goto MauvilleCity_BikeShop_EventScript_156861 end MauvilleCity_BikeShop_EventScript_156847:: @ 8156847 msgbox MauvilleCity_BikeShop_Text_18134A, 4 - giveitem ITEM_ACRO_BIKE + giveitem_std ITEM_ACRO_BIKE goto MauvilleCity_BikeShop_EventScript_156861 end @@ -90,16 +90,16 @@ MauvilleCity_BikeShop_EventScript_1568BF:: @ 81568BF MauvilleCity_BikeShop_EventScript_1568C9:: @ 81568C9 incrementgamestat GAME_STAT_TRADED_BIKES msgbox MauvilleCity_BikeShop_Text_181439, 4 - removeitem ITEM_ACRO_BIKE, 1 - giveitem ITEM_MACH_BIKE + takeitem ITEM_ACRO_BIKE, 1 + giveitem_std ITEM_MACH_BIKE goto MauvilleCity_BikeShop_EventScript_156861 end MauvilleCity_BikeShop_EventScript_1568EA:: @ 81568EA incrementgamestat GAME_STAT_TRADED_BIKES msgbox MauvilleCity_BikeShop_Text_181408, 4 - removeitem ITEM_MACH_BIKE, 1 - giveitem ITEM_ACRO_BIKE + takeitem ITEM_MACH_BIKE, 1 + giveitem_std ITEM_ACRO_BIKE goto MauvilleCity_BikeShop_EventScript_156861 end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 2e0231287..8228238f3 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -129,17 +129,17 @@ MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6 MauvilleCity_GameCorner_EventScript_156BE2:: @ 8156BE2 setvar 0x4001, 1 - getdecorname 0, 88 + bufferdecorationname 0, 88 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BF0:: @ 8156BF0 setvar 0x4001, 2 - getdecorname 0, 89 + bufferdecorationname 0, 89 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE setvar 0x4001, 3 - getdecorname 0, 90 + bufferdecorationname 0, 90 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C @@ -156,12 +156,12 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - getdecorname 1, 88 - checkdecor 88 + bufferdecorationname 1, 88 + checkdecorspace 88 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - adddecor 88 + givedecoration 88 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -172,12 +172,12 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - getdecorname 1, 89 - checkdecor 89 + bufferdecorationname 1, 89 + checkdecorspace 89 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - adddecor 89 + givedecoration 89 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -188,12 +188,12 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - getdecorname 1, 90 - checkdecor 90 + bufferdecorationname 1, 90 + checkdecorspace 90 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - adddecor 90 + givedecoration 90 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -252,27 +252,27 @@ MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 MauvilleCity_GameCorner_EventScript_156DA6:: @ 8156DA6 setvar 0x4001, 1 - getitemname 0, ITEM_TM32 + bufferitemname 0, ITEM_TM32 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DB4:: @ 8156DB4 setvar 0x4001, 2 - getitemname 0, ITEM_TM29 + bufferitemname 0, ITEM_TM29 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DC2:: @ 8156DC2 setvar 0x4001, 3 - getitemname 0, ITEM_TM35 + bufferitemname 0, ITEM_TM35 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DD0:: @ 8156DD0 setvar 0x4001, 4 - getitemname 0, ITEM_TM24 + bufferitemname 0, ITEM_TM24 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE setvar 0x4001, 5 - getitemname 0, ITEM_TM13 + bufferitemname 0, ITEM_TM13 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC @@ -295,7 +295,7 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 1500 - additem ITEM_TM32, 1 + giveitem ITEM_TM32, 1 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -310,7 +310,7 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 3500 - additem ITEM_TM29, 1 + giveitem ITEM_TM29, 1 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -325,7 +325,7 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 - additem ITEM_TM35, 1 + giveitem ITEM_TM35, 1 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -340,7 +340,7 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 - additem ITEM_TM24, 1 + giveitem ITEM_TM24, 1 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -355,7 +355,7 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 - additem ITEM_TM13, 1 + giveitem ITEM_TM13, 1 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -389,7 +389,7 @@ MauvilleCity_GameCorner_EventScript_156F8D:: @ 8156F8D MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 lock faceplayer - checkflag 226 + checkflag FLAG_RECEIVED_STARTER_DOLL goto_if_eq MauvilleCity_GameCorner_EventScript_157072 msgbox MauvilleCity_GameCorner_Text_181F3D, 5 compare RESULT, 0 @@ -401,35 +401,35 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 end MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB - getdecorname 1, 88 - checkdecor 88 + bufferdecorationname 1, DECOR_TREECKO_DOLL + checkdecorspace DECOR_TREECKO_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration 88 - setflag 226 + givedecoration_std DECOR_TREECKO_DOLL + setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 - getdecorname 1, 89 - checkdecor 89 + bufferdecorationname 1, DECOR_TORCHIC_DOLL + checkdecorspace DECOR_TORCHIC_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration 89 - setflag 226 + givedecoration_std DECOR_TORCHIC_DOLL + setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F - getdecorname 1, 90 - checkdecor 90 + bufferdecorationname 1, DECOR_MUDKIP_DOLL + checkdecorspace DECOR_MUDKIP_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration 90 - setflag 226 + givedecoration_std DECOR_MUDKIP_DOLL + setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end @@ -460,12 +460,12 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C end MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C - checkflag 225 + checkflag FLAG_RECEIVED_20_COINS goto_if_eq MauvilleCity_GameCorner_EventScript_1570CA checkcoins 16385 compare 0x4001, 1 goto_if 4, MauvilleCity_GameCorner_EventScript_1570CA - setflag 225 + setflag FLAG_RECEIVED_20_COINS givecoins 20 msgbox MauvilleCity_GameCorner_Text_18208E, 4 playse 95 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 5221add7a..799fb0992 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -3,7 +3,7 @@ MauvilleCity_Gym_MapScripts:: @ 8156450 .byte 0 MauvilleCity_Gym_MapScript1_156456:: @ 8156456 - checkflag 1208 + checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1565A7 switch 0x4093 case 0, MauvilleCity_Gym_EventScript_156491 @@ -13,36 +13,36 @@ MauvilleCity_Gym_MapScript1_156456:: @ 8156456 end MauvilleCity_Gym_EventScript_156491:: @ 8156491 - checkflag 99 + checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE goto_if_eq MauvilleCity_Gym_EventScript_15649B end MauvilleCity_Gym_EventScript_15649B:: @ 815649B - setmaptile 4, 7, 560, 0 - setmaptile 4, 8, 568, 0 - setmaptile 5, 7, 561, 0 - setmaptile 5, 8, 569, 0 - setmaptile 3, 8, 578, 1 - setmaptile 3, 9, 538, 0 - setmaptile 3, 10, 593, 0 - setmaptile 1, 10, 546, 0 - setmaptile 1, 11, 554, 1 - setmaptile 2, 10, 547, 0 - setmaptile 2, 11, 555, 1 - setmaptile 4, 10, 546, 0 - setmaptile 4, 11, 554, 1 - setmaptile 5, 10, 547, 0 - setmaptile 5, 11, 555, 1 - setmaptile 6, 11, 578, 1 - setmaptile 6, 12, 538, 0 - setmaptile 6, 13, 593, 0 - setmaptile 3, 11, 577, 1 - setmaptile 3, 12, 585, 1 - setmaptile 3, 13, 592, 1 - setmaptile 4, 13, 560, 0 - setmaptile 4, 14, 568, 0 - setmaptile 5, 13, 561, 0 - setmaptile 5, 14, 569, 0 + setmetatile 4, 7, 560, 0 + setmetatile 4, 8, 568, 0 + setmetatile 5, 7, 561, 0 + setmetatile 5, 8, 569, 0 + setmetatile 3, 8, 578, 1 + setmetatile 3, 9, 538, 0 + setmetatile 3, 10, 593, 0 + setmetatile 1, 10, 546, 0 + setmetatile 1, 11, 554, 1 + setmetatile 2, 10, 547, 0 + setmetatile 2, 11, 555, 1 + setmetatile 4, 10, 546, 0 + setmetatile 4, 11, 554, 1 + setmetatile 5, 10, 547, 0 + setmetatile 5, 11, 555, 1 + setmetatile 6, 11, 578, 1 + setmetatile 6, 12, 538, 0 + setmetatile 6, 13, 593, 0 + setmetatile 3, 11, 577, 1 + setmetatile 3, 12, 585, 1 + setmetatile 3, 13, 592, 1 + setmetatile 4, 13, 560, 0 + setmetatile 4, 14, 568, 0 + setmetatile 5, 13, 561, 0 + setmetatile 5, 14, 569, 0 end MauvilleCity_Gym_EventScript_15657D:: @ 815657D @@ -69,7 +69,7 @@ MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB - checkflag 167 + checkflag FLAG_RECEIVED_TM34 goto_if 0, MauvilleCity_Gym_EventScript_15661D compare 0x40ba, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 @@ -82,8 +82,8 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB waitmessage call MauvilleCity_Gym_EventScript_1A02C5 msgbox MauvilleCity_Gym_Text_180DDA, 4 - setflag 1208 - setflag 2057 + setflag FLAG_DEFEATED_MAUVILLE_GYM + setflag FLAG_BADGE03_GET addvar 0x4085, 1 compare 0x4085, 6 call_if 1, MauvilleCity_Gym_EventScript_1A00FB @@ -96,11 +96,11 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB end MauvilleCity_Gym_EventScript_15661D:: @ 815661D - giveitem ITEM_TM34 + giveitem_std ITEM_TM34 compare RESULT, 0 goto_if_eq MauvilleCity_Gym_EventScript_1A029B msgbox MauvilleCity_Gym_Text_180E76, 4 - setflag 167 + setflag FLAG_RECEIVED_TM34 release end @@ -111,7 +111,7 @@ MauvilleCity_Gym_EventScript_156641:: @ 8156641 MauvilleCity_Gym_EventScript_15664B:: @ 815664B lockall - checkflag 1208 + checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1566DA compare 0x4093, 1 goto_if_eq MauvilleCity_Gym_EventScript_1566DA @@ -122,7 +122,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B MauvilleCity_Gym_EventScript_156670:: @ 8156670 lockall - checkflag 1208 + checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1566DA compare 0x4093, 2 goto_if_eq MauvilleCity_Gym_EventScript_1566DA @@ -133,7 +133,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 MauvilleCity_Gym_EventScript_156695:: @ 8156695 lockall - checkflag 1208 + checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1566DA compare 0x4093, 3 goto_if_eq MauvilleCity_Gym_EventScript_1566DA @@ -147,9 +147,9 @@ MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA special MauvilleGymSpecial1 special DrawWholeMapView playse 44 - checkflag 99 + checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE goto_if_eq MauvilleCity_Gym_EventScript_1566E1 - checkflag 99 + checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE goto_if 0, MauvilleCity_Gym_EventScript_1566DC releaseall end @@ -159,12 +159,12 @@ MauvilleCity_Gym_EventScript_1566DA:: @ 81566DA end MauvilleCity_Gym_EventScript_1566DC:: @ 81566DC - setflag 99 + setflag FLAG_MAUVILLE_GYM_BARRIERS_STATE releaseall end MauvilleCity_Gym_EventScript_1566E1:: @ 81566E1 - clearflag 99 + clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE releaseall end @@ -191,7 +191,7 @@ MauvilleCity_Gym_EventScript_15672B:: @ 815672B MauvilleCity_Gym_EventScript_156742:: @ 8156742 lock faceplayer - checkflag 1208 + checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_156757 msgbox MauvilleCity_Gym_Text_180815, 4 release @@ -204,14 +204,14 @@ MauvilleCity_Gym_EventScript_156757:: @ 8156757 MauvilleCity_Gym_EventScript_156761:: @ 8156761 lockall - checkflag 2057 + checkflag FLAG_BADGE03_GET goto_if_eq MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end MauvilleCity_Gym_EventScript_156771:: @ 8156771 lockall - checkflag 2057 + checkflag FLAG_BADGE03_GET goto_if_eq MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/scripts/maps/MauvilleCity_House1.inc index e76564847..210288517 100644 --- a/data/scripts/maps/MauvilleCity_House1.inc +++ b/data/scripts/maps/MauvilleCity_House1.inc @@ -4,11 +4,11 @@ MauvilleCity_House1_MapScripts:: @ 81569FC MauvilleCity_House1_EventScript_1569FD:: @ 81569FD lock faceplayer - checkflag 107 + checkflag FLAG_RECEIVED_HM06 goto_if_eq MauvilleCity_House1_EventScript_156A29 msgbox MauvilleCity_House1_Text_181B1A, 4 - giveitem ITEM_HM06 - setflag 107 + giveitem_std ITEM_HM06 + setflag FLAG_RECEIVED_HM06 msgbox MauvilleCity_House1_Text_181B64, 4 release end diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index a500a246e..a058003bc 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -4,7 +4,7 @@ MauvilleCity_House2_MapScripts:: @ 81572BF MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 lock faceplayer - checkflag 258 + checkflag FLAG_RECEIVED_COIN_CASE goto_if_eq MauvilleCity_House2_EventScript_15733D msgbox MauvilleCity_House2_Text_18244E, 4 checkitem ITEM_HARBOR_MAIL, 1 @@ -28,9 +28,9 @@ MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 MauvilleCity_House2_EventScript_15731B:: @ 815731B msgbox MauvilleCity_House2_Text_182515, 4 - removeitem ITEM_HARBOR_MAIL, 1 - giveitem ITEM_COIN_CASE - setflag 258 + takeitem ITEM_HARBOR_MAIL, 1 + giveitem_std ITEM_COIN_CASE + setflag FLAG_RECEIVED_COIN_CASE goto MauvilleCity_House2_EventScript_15733D end diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc index 7122b8c3c..de30e21cd 100644 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8157351 .byte 0 MauvilleCity_PokemonCenter_1F_MapScript1_157357:: @ 8157357 - sethealplace 5 + setrespawn 5 call MauvilleCity_PokemonCenter_1F_EventScript_19FD1B goto MauvilleCity_PokemonCenter_1F_EventScript_157365 end @@ -16,7 +16,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369 setvar 0x800b, 1 call MauvilleCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 06abbc8f6..7ce6e3704 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -77,7 +77,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C removeobject 7 removeobject 8 removeobject 9 - setflag 819 + setflag FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR setvar 0x40bf, 1 releaseall end @@ -215,9 +215,9 @@ MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F MeteorFalls_1F_1R_EventScript_15C656:: @ 815C656 lock faceplayer - checkflag 244 + checkflag FLAG_MET_PROF_COSMO goto_if_eq MeteorFalls_1F_1R_EventScript_15C66E - setflag 244 + setflag FLAG_MET_PROF_COSMO msgbox MeteorFalls_1F_1R_Text_1937EB, 4 release end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 44deb9d63..f165bd3ef 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -3,11 +3,11 @@ MossdeepCity_MapScripts:: @ 814CF92 .byte 0 MossdeepCity_MapScript1_14CF98:: @ 814CF98 - clearflag 100 - clearflag 101 - clearflag 102 - clearflag 103 - checkflag 2090 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, MossdeepCity_EventScript_1A02C1 end @@ -52,7 +52,7 @@ MossdeepCity_EventScript_14CFFF:: @ 814CFFF end MossdeepCity_EventScript_14D008:: @ 814D008 - setflag 2076 + setflag FLAG_VISITED_MOSSDEEP_CITY setvar 0x4001, 1 end @@ -68,16 +68,16 @@ MossdeepCity_EventScript_14D011:: @ 814D011 MossdeepCity_EventScript_14D027:: @ 814D027 lock faceplayer - checkflag 276 + checkflag FLAG_RECEIVED_KINGS_ROCK goto_if_eq MossdeepCity_EventScript_14D069 msgbox MossdeepCity_Text_1690A9, 5 compare RESULT, 0 goto_if_eq MossdeepCity_EventScript_14D073 msgbox MossdeepCity_Text_169117, 4 - giveitem ITEM_KINGS_ROCK + giveitem_std ITEM_KINGS_ROCK compare RESULT, 0 goto_if_eq MossdeepCity_EventScript_1A029B - setflag 276 + setflag FLAG_RECEIVED_KINGS_ROCK release end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 66ad747f9..75fc3c6b8 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -5,18 +5,18 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52 .byte 0 MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 - special sub_813601C + special ValidateEReaderTrainer compare RESULT, 1 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC71 end MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 - setmaptile 3, 0, 653, 1 - setmaptile 3, 1, 661, 1 + setmetatile 3, 0, 653, 1 + setmetatile 3, 1, 661, 1 return MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 - special sub_813601C + special ValidateEReaderTrainer compare RESULT, 0 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E compare 0x40c0, 0 @@ -117,7 +117,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE16 compare FACING, 3 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE28 - warp MossdeepCity_GameCorner_B1F, 255, 3, 1 + warp MAP_MOSSDEEP_CITY_GAME_CORNER_B1F, 255, 3, 1 waitstate release end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 886c64d29..12a94154b 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -4,7 +4,7 @@ MossdeepCity_GameCorner_B1F_MapScripts:: @ 815AE55 .byte 0 MossdeepCity_GameCorner_B1F_MapScript1_15AE60:: @ 815AE60 - special sub_8134AB4 + special SetEReaderTrainerGfxId end MossdeepCity_GameCorner_B1F_MapScript2_15AE64:: @ 815AE64 @@ -15,8 +15,8 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E lockall applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEF9 waitmovement 0 - special sub_81360C0 - msgbox 0x20234cc, 4 + special PrintEReaderTrainerGreeting + msgbox gStringVar4, 4 closemessage setvar 0x8004, 2 setvar 0x8005, 0 @@ -34,7 +34,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E waitmovement 0 special LoadPlayerParty setvar 0x4001, 1 - warp MossdeepCity_GameCorner_1F, 255, 3, 1 + warp MAP_MOSSDEEP_CITY_GAME_CORNER_1F, 255, 3, 1 waitstate releaseall end @@ -48,14 +48,14 @@ MossdeepCity_GameCorner_B1F_EventScript_15AEE3:: @ 815AEE3 setvar 0x40c0, 1 special ShowFieldMessageStringVar4 waitmessage - waitbutton + waitbuttonpress return MossdeepCity_GameCorner_B1F_EventScript_15AEEE:: @ 815AEEE setvar 0x40c0, 2 special ShowFieldMessageStringVar4 waitmessage - waitbutton + waitbuttonpress return MossdeepCity_GameCorner_B1F_Movement_15AEF9:: @ 815AEF9 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 944860f2d..b1550a4c1 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -3,54 +3,54 @@ MossdeepCity_Gym_MapScripts:: @ 815A4D3 .byte 0 MossdeepCity_Gym_MapScript1_15A4D9:: @ 815A4D9 - checkflag 100 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_1 goto_if_eq MossdeepCity_Gym_EventScript_15A510 goto MossdeepCity_Gym_EventScript_15A4E8 end MossdeepCity_Gym_EventScript_15A4E8:: @ 815A4E8 - checkflag 101 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_2 goto_if_eq MossdeepCity_Gym_EventScript_15A528 goto MossdeepCity_Gym_EventScript_15A4F7 end MossdeepCity_Gym_EventScript_15A4F7:: @ 815A4F7 - checkflag 102 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_3 goto_if_eq MossdeepCity_Gym_EventScript_15A540 goto MossdeepCity_Gym_EventScript_15A506 end MossdeepCity_Gym_EventScript_15A506:: @ 815A506 - checkflag 103 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_4 goto_if_eq MossdeepCity_Gym_EventScript_15A558 end MossdeepCity_Gym_EventScript_15A510:: @ 815A510 - setmaptile 5, 5, 516, 0 - setmaptile 2, 7, 569, 1 + setmetatile 5, 5, 516, 0 + setmetatile 2, 7, 569, 1 goto MossdeepCity_Gym_EventScript_15A4E8 end MossdeepCity_Gym_EventScript_15A528:: @ 815A528 - setmaptile 8, 14, 516, 0 - setmaptile 8, 10, 569, 1 + setmetatile 8, 14, 516, 0 + setmetatile 8, 10, 569, 1 goto MossdeepCity_Gym_EventScript_15A4F7 end MossdeepCity_Gym_EventScript_15A540:: @ 815A540 - setmaptile 15, 17, 524, 0 - setmaptile 17, 15, 569, 1 + setmetatile 15, 17, 524, 0 + setmetatile 17, 15, 569, 1 goto MossdeepCity_Gym_EventScript_15A506 end MossdeepCity_Gym_EventScript_15A558:: @ 815A558 - setmaptile 1, 23, 525, 0 - setmaptile 5, 24, 569, 1 + setmetatile 1, 23, 525, 0 + setmetatile 5, 24, 569, 1 end MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B trainerbattle 8, OPPONENT_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 - checkflag 171 + checkflag FLAG_RECEIVED_TM04 goto_if 0, MossdeepCity_Gym_EventScript_15A5C6 msgbox MossdeepCity_Gym_Text_18D273, 4 release @@ -61,34 +61,34 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 waitmessage call MossdeepCity_Gym_EventScript_1A02C5 msgbox MossdeepCity_Gym_Text_18D128, 4 - setflag 1229 - setflag 2061 - clearflag 869 - clearflag 915 + setflag FLAG_DEFEATED_MOSSDEEP_GYM + setflag FLAG_BADGE07_GET + clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD + clearflag FLAG_UNKNOWN_393 setvar 0x8008, 7 call MossdeepCity_Gym_EventScript_1A01C0 - clearflag 905 + clearflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR goto MossdeepCity_Gym_EventScript_15A5C6 end MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 - giveitem ITEM_TM04 + giveitem_std ITEM_TM04 compare RESULT, 0 goto_if_eq MossdeepCity_Gym_EventScript_1A029B msgbox MossdeepCity_Gym_Text_18D1CF, 4 - setflag 171 + setflag FLAG_RECEIVED_TM04 release end MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA lockall - checkflag 100 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_1 goto_if_eq MossdeepCity_Gym_EventScript_15A621 - setflag 100 + setflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 5, 5, 516, 0 - setmaptile 2, 7, 569, 1 + setmetatile 5, 5, 516, 0 + setmetatile 2, 7, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -99,80 +99,80 @@ MossdeepCity_Gym_EventScript_15A619:: @ 815A619 end MossdeepCity_Gym_EventScript_15A621:: @ 815A621 - clearflag 100 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 5, 5, 524, 0 - setmaptile 2, 7, 568, 1 + setmetatile 5, 5, 524, 0 + setmetatile 2, 7, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A646:: @ 815A646 lockall - checkflag 101 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_2 goto_if_eq MossdeepCity_Gym_EventScript_15A675 - setflag 101 + setflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 8, 14, 516, 0 - setmaptile 8, 10, 569, 1 + setmetatile 8, 14, 516, 0 + setmetatile 8, 10, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A675:: @ 815A675 - clearflag 101 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 8, 14, 517, 0 - setmaptile 8, 10, 568, 1 + setmetatile 8, 14, 517, 0 + setmetatile 8, 10, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A lockall - checkflag 102 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_3 goto_if_eq MossdeepCity_Gym_EventScript_15A6C9 - setflag 102 + setflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 15, 17, 524, 0 - setmaptile 17, 15, 569, 1 + setmetatile 15, 17, 524, 0 + setmetatile 17, 15, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 - clearflag 102 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 15, 17, 516, 0 - setmaptile 17, 15, 568, 1 + setmetatile 15, 17, 516, 0 + setmetatile 17, 15, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE lockall - checkflag 103 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_4 goto_if_eq MossdeepCity_Gym_EventScript_15A71D - setflag 103 + setflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 1, 23, 525, 0 - setmaptile 5, 24, 569, 1 + setmetatile 1, 23, 525, 0 + setmetatile 5, 24, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D - clearflag 103 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 1, 23, 516, 0 - setmaptile 5, 24, 568, 1 + setmetatile 1, 23, 516, 0 + setmetatile 5, 24, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A742:: @ 815A742 lockall - warpteleport MossdeepCity_Gym, 255, 14, 29 + warpteleport MAP_MOSSDEEP_CITY_GYM, 255, 14, 29 waitstate releaseall end @@ -210,7 +210,7 @@ MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1 MossdeepCity_Gym_EventScript_15A7D8:: @ 815A7D8 lock faceplayer - checkflag 1229 + checkflag FLAG_DEFEATED_MOSSDEEP_GYM goto_if_eq MossdeepCity_Gym_EventScript_15A7ED msgbox MossdeepCity_Gym_Text_18C7E3, 4 release @@ -228,14 +228,14 @@ MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7 MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA lockall - checkflag 2061 + checkflag FLAG_BADGE07_GET goto_if_eq MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A lockall - checkflag 2061 + checkflag FLAG_BADGE07_GET goto_if_eq MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index 62edffc8b..97a5fc452 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -4,7 +4,7 @@ MossdeepCity_House1_MapScripts:: @ 815A82E MossdeepCity_House1_EventScript_15A82F:: @ 815A82F lock faceplayer - getfirstpartypokename 0 + bufferleadmonspeciesname 0 msgbox MossdeepCity_House1_Text_18D465, 4 specialvar RESULT, GetPokeblockNameByMonNature compare RESULT, 0 diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index f7f66b843..1da204ff0 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -13,12 +13,12 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox MossdeepCity_House2_Text_18D61E, 4 - waitpokecry + waitmoncry closemessage - setflag 224 - clearflag 933 + setflag FLAG_WINGULL_DELIVERED_MAIL + clearflag FLAG_HIDE_WINGULL_FORTREE_HOUSE compare FACING, 2 call_if 1, MossdeepCity_House2_EventScript_15A8AE compare FACING, 3 diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index 8f9bf4dc5..6632ac793 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -4,14 +4,14 @@ MossdeepCity_House3_MapScripts:: @ 815A971 MossdeepCity_House3_EventScript_15A972:: @ 815A972 lock faceplayer - checkflag 152 + checkflag FLAG_RECEIVED_SUPER_ROD goto_if_eq MossdeepCity_House3_EventScript_15A9B1 msgbox MossdeepCity_House3_Text_18D909, 5 compare RESULT, 0 goto_if_eq MossdeepCity_House3_EventScript_15A9BB msgbox MossdeepCity_House3_Text_18D9A9, 4 - giveitem ITEM_SUPER_ROD - setflag 152 + giveitem_std ITEM_SUPER_ROD + setflag FLAG_RECEIVED_SUPER_ROD msgbox MossdeepCity_House3_Text_18D9E3, 4 release end diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index fd173899d..856ee1287 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -4,7 +4,7 @@ MossdeepCity_House4_MapScripts:: @ 815AB30 MossdeepCity_House4_EventScript_15AB31:: @ 815AB31 lock faceplayer - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq MossdeepCity_House4_EventScript_15AB46 msgbox MossdeepCity_House4_Text_18E0E3, 4 release @@ -35,8 +35,8 @@ MossdeepCity_House4_EventScript_15AB77:: @ 815AB77 lock faceplayer waitse - playpokecry SPECIES_SKITTY, 0 + playmoncry SPECIES_SKITTY, 0 msgbox MossdeepCity_House4_Text_18E1E1, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc index 4ed3ea57e..c26238102 100644 --- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc @@ -3,14 +3,14 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 815A8D0 .byte 0 MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6 - sethealplace 9 + setrespawn 9 end MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA setvar 0x800b, 1 call MossdeepCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 260cb4b6e..884124567 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -6,7 +6,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B faceplayer dodailyevents specialvar RESULT, GetWeekCount - getnumberstring 0, RESULT + buffernumberstring 0, RESULT compare RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA compare RESULT, 1 @@ -32,13 +32,13 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABCC:: @ 815ABCC MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 lock faceplayer - checkflag 192 + checkflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4 - giveitem ITEM_SUN_STONE + giveitem_std ITEM_SUN_STONE compare RESULT, 0 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B - setflag 192 + setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, 4 release end diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 8bf899780..7e08cfa69 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -5,12 +5,12 @@ MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5 .byte 0 MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5 - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR call_if 0, MossdeepCity_StevensHouse_EventScript_15A9DF end MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF - setmaptile 6, 4, 753, 1 + setmetatile 6, 4, 753, 1 return MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 @@ -39,9 +39,9 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B applymovement 1, MossdeepCity_StevensHouse_Movement_15AA6E waitmovement 0 msgbox MossdeepCity_StevensHouse_Text_18DA77, 4 - giveitem ITEM_HM08 - setflag 123 - setflag 302 + giveitem_std ITEM_HM08 + setflag FLAG_RECEIVED_HM08 + setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER msgbox MossdeepCity_StevensHouse_Text_18DB22, 4 closemessage delay 20 @@ -74,7 +74,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C msgbox MossdeepCity_StevensHouse_Text_18DD12, 5 compare RESULT, 0 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6 - countpokemon + getpartysize compare RESULT, 6 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar 0x8004, RESULT @@ -83,13 +83,13 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C message MossdeepCity_StevensHouse_Text_18DD61 waitfanfare waitmessage - givepoke SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 - getspeciesname 1, SPECIES_BELDUM + givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 + bufferspeciesname 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 compare RESULT, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 - setflag 968 - setflag 298 + setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE + setflag FLAG_RECEIVED_BELDUM releaseall end @@ -113,7 +113,7 @@ MossdeepCity_StevensHouse_EventScript_15AAF9:: @ 815AAF9 MossdeepCity_StevensHouse_EventScript_15AB02:: @ 815AB02 lockall - checkflag 302 + checkflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER goto_if_eq MossdeepCity_StevensHouse_EventScript_15AB16 msgbox MossdeepCity_StevensHouse_Text_18DF1A, 4 releaseall @@ -125,6 +125,6 @@ MossdeepCity_StevensHouse_EventScript_15AB16:: @ 815AB16 end MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20 - giveitem ITEM_HM08, 1, 1 - setflag 123 + giveitem_std ITEM_HM08, 1, 1 + setflag FLAG_RECEIVED_HM08 end diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index a8eec9a32..a51695b59 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -9,7 +9,7 @@ MtChimney_MapScript1_15CF87:: @ 815CF87 end MtChimney_MapScript1_15CF92:: @ 815CF92 - tileeffect 1 + setstepcallback 1 end MtChimney_EventScript_15CF95:: @ 815CF95 @@ -27,7 +27,7 @@ MtChimney_EventScript_15CF95:: @ 815CF95 checkitemspace ITEM_LAVA_COOKIE, 1 compare RESULT, 1 call_if 1, MtChimney_EventScript_15D000 - giveitem ITEM_LAVA_COOKIE + giveitem_std ITEM_LAVA_COOKIE compare RESULT, 0 goto_if_eq MtChimney_EventScript_15CFF3 hidemoneybox 0, 0 @@ -406,16 +406,16 @@ MtChimney_EventScript_15D174:: @ 815D174 MtChimney_EventScript_15D17D:: @ 815D17D lockall - checkflag 139 + checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY goto_if 0, MtChimney_EventScript_15D1D0 - checkflag 115 + checkflag FLAG_RECEIVED_METEORITE goto_if_eq MtChimney_EventScript_15D1C6 msgbox MtChimney_Text_195870, 5 compare RESULT, 0 goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 - giveitem ITEM_METEORITE - setflag 115 + giveitem_std ITEM_METEORITE + setflag FLAG_RECEIVED_METEORITE releaseall end diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc index 026d54bfe..7073000d5 100644 --- a/data/scripts/maps/MtPyre_1F.inc +++ b/data/scripts/maps/MtPyre_1F.inc @@ -4,13 +4,13 @@ MtPyre_1F_MapScripts:: @ 815D322 MtPyre_1F_EventScript_15D323:: @ 815D323 lock faceplayer - checkflag 282 + checkflag FLAG_RECEIVED_CLEANSE_TAG goto_if_eq MtPyre_1F_EventScript_15D352 msgbox MtPyre_1F_Text_196151, 4 - giveitem ITEM_CLEANSE_TAG + giveitem_std ITEM_CLEANSE_TAG compare RESULT, 0 goto_if_eq MtPyre_1F_EventScript_1A029B - setflag 282 + setflag FLAG_RECEIVED_CLEANSE_TAG release end diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/scripts/maps/MtPyre_2F.inc index 8d48dac84..1d2368597 100644 --- a/data/scripts/maps/MtPyre_2F.inc +++ b/data/scripts/maps/MtPyre_2F.inc @@ -5,8 +5,8 @@ MtPyre_2F_MapScripts:: @ 815D36E .byte 0 MtPyre_2F_MapScript1_15D37E:: @ 815D37E - tileeffect 7 - setholewarp MtPyre_1F, 255, 0, 0 + setstepcallback 7 + setholewarp MAP_MT_PYRE_1F, 255, 0, 0 end MtPyre_2F_EventScript_15D389:: @ 815D389 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 533fb6e90..73e2e4d97 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -47,8 +47,8 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 removeobject 4 removeobject 5 removeobject 6 - setflag 916 - setflag 917 + setflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT + setflag FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT fadescreen 0 delay 20 call MtPyre_Summit_EventScript_15D57A @@ -63,16 +63,16 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 .else msgbox MtPyre_Summit_Text_1B5FE6, 4 .endif - giveitem ITEM_RED_OR_BLUE_ORB - setflag 212 + giveitem_std ITEM_RED_OR_BLUE_ORB + setflag FLAG_RECEIVED_RED_OR_BLUE_ORB releaseall end MtPyre_Summit_EventScript_15D57A:: @ 815D57A - setflag 111 + setflag FLAG_MT_PYRE_ORB_STOLEN setvar 0x4058, 1 - clearflag 840 - clearflag 835 + clearflag FLAG_HIDE_STERN_SLATEPORT + clearflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT setvar 0x40a0, 1 setvar 0x40b9, 1 return @@ -169,11 +169,11 @@ MtPyre_Summit_EventScript_15D61A:: @ 815D61A MtPyre_Summit_EventScript_15D623:: @ 815D623 lock faceplayer - checkflag 259 + checkflag FLAG_RETURNED_RED_OR_BLUE_ORB goto_if_eq MtPyre_Summit_EventScript_15D6C4 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq MtPyre_Summit_EventScript_15D64A - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if_eq MtPyre_Summit_EventScript_15D6BA .ifdef SAPPHIRE msgbox UnknownString_81B54BE, 4 @@ -210,7 +210,7 @@ MtPyre_Summit_EventScript_15D669:: @ 815D669 .else msgbox MtPyre_Summit_Text_1B639C, 4 .endif - setflag 259 + setflag FLAG_RETURNED_RED_OR_BLUE_ORB release end diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 6429ff2f9..a88b35087 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -9,16 +9,16 @@ NewMauville_Entrance_MapScript1_15E495:: @ 815E495 end NewMauville_Entrance_EventScript_15E4A1:: @ 815E4A1 - setmaptile 3, 0, 788, 1 - setmaptile 4, 0, 789, 1 - setmaptile 5, 0, 790, 1 - setmaptile 3, 1, 796, 1 - setmaptile 4, 1, 797, 1 - setmaptile 5, 1, 798, 1 + setmetatile 3, 0, 788, 1 + setmetatile 4, 0, 789, 1 + setmetatile 5, 0, 790, 1 + setmetatile 3, 1, 796, 1 + setmetatile 4, 1, 797, 1 + setmetatile 5, 1, 798, 1 return NewMauville_Entrance_MapScript1_15E4D8:: @ 815E4D8 - setflag 2112 + setflag FLAG_LANDMARK_NEW_MAUVILLE end NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC @@ -33,12 +33,12 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC compare RESULT, 0 goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982EA, 4 - setmaptile 3, 0, 707, 0 - setmaptile 4, 0, 708, 0 - setmaptile 5, 0, 709, 0 - setmaptile 3, 1, 715, 1 - setmaptile 4, 1, 716, 0 - setmaptile 5, 1, 717, 1 + setmetatile 3, 0, 707, 0 + setmetatile 4, 0, 708, 0 + setmetatile 5, 0, 709, 0 + setmetatile 3, 1, 715, 1 + setmetatile 4, 1, 716, 0 + setmetatile 5, 1, 717, 1 special DrawWholeMapView playse 20 setvar 0x40ba, 1 diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 2d2a46ab4..aefb23c61 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -9,7 +9,7 @@ NewMauville_Inside_MapScript1_15E56F:: @ 815E56F call_if 1, NewMauville_Inside_EventScript_15E5DA compare 0x4002, 1 call_if 1, NewMauville_Inside_EventScript_15E728 - checkflag 2145 + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, NewMauville_Inside_EventScript_15E58F end @@ -48,83 +48,83 @@ NewMauville_Inside_EventScript_15E5C2:: @ 815E5C2 end NewMauville_Inside_EventScript_15E5DA:: @ 815E5DA - setmaptile 23, 34, 617, 1 - setmaptile 23, 35, 625, 1 - setmaptile 23, 36, 621, 0 - setmaptile 23, 37, 641, 0 - setmaptile 10, 16, 617, 1 - setmaptile 10, 17, 625, 1 - setmaptile 10, 18, 621, 0 - setmaptile 10, 19, 641, 0 - setmaptile 10, 0, 617, 1 - setmaptile 10, 1, 625, 1 - setmaptile 10, 2, 621, 0 - setmaptile 10, 3, 641, 0 - setmaptile 37, 33, 694, 1 - setmaptile 37, 34, 702, 1 - setmaptile 37, 35, 710, 1 - setmaptile 37, 36, 718, 1 - setmaptile 28, 22, 694, 1 - setmaptile 28, 23, 702, 1 - setmaptile 28, 24, 710, 1 - setmaptile 28, 25, 718, 1 - setmaptile 10, 24, 694, 1 - setmaptile 10, 25, 702, 1 - setmaptile 10, 26, 710, 1 - setmaptile 10, 27, 718, 1 - setmaptile 21, 2, 694, 1 - setmaptile 21, 3, 702, 1 - setmaptile 21, 4, 710, 1 - setmaptile 21, 5, 718, 1 - setmaptile 6, 11, 591, 0 - setmaptile 13, 10, 591, 0 - setmaptile 16, 22, 591, 0 - setmaptile 4, 26, 591, 0 - setmaptile 30, 38, 591, 0 - setmaptile 2, 11, 558, 0 - setmaptile 17, 10, 558, 0 - setmaptile 25, 18, 558, 0 - setmaptile 18, 36, 558, 0 + setmetatile 23, 34, 617, 1 + setmetatile 23, 35, 625, 1 + setmetatile 23, 36, 621, 0 + setmetatile 23, 37, 641, 0 + setmetatile 10, 16, 617, 1 + setmetatile 10, 17, 625, 1 + setmetatile 10, 18, 621, 0 + setmetatile 10, 19, 641, 0 + setmetatile 10, 0, 617, 1 + setmetatile 10, 1, 625, 1 + setmetatile 10, 2, 621, 0 + setmetatile 10, 3, 641, 0 + setmetatile 37, 33, 694, 1 + setmetatile 37, 34, 702, 1 + setmetatile 37, 35, 710, 1 + setmetatile 37, 36, 718, 1 + setmetatile 28, 22, 694, 1 + setmetatile 28, 23, 702, 1 + setmetatile 28, 24, 710, 1 + setmetatile 28, 25, 718, 1 + setmetatile 10, 24, 694, 1 + setmetatile 10, 25, 702, 1 + setmetatile 10, 26, 710, 1 + setmetatile 10, 27, 718, 1 + setmetatile 21, 2, 694, 1 + setmetatile 21, 3, 702, 1 + setmetatile 21, 4, 710, 1 + setmetatile 21, 5, 718, 1 + setmetatile 6, 11, 591, 0 + setmetatile 13, 10, 591, 0 + setmetatile 16, 22, 591, 0 + setmetatile 4, 26, 591, 0 + setmetatile 30, 38, 591, 0 + setmetatile 2, 11, 558, 0 + setmetatile 17, 10, 558, 0 + setmetatile 25, 18, 558, 0 + setmetatile 18, 36, 558, 0 return NewMauville_Inside_EventScript_15E728:: @ 815E728 - setmaptile 23, 34, 695, 1 - setmaptile 23, 35, 703, 1 - setmaptile 23, 36, 711, 1 - setmaptile 23, 37, 719, 1 - setmaptile 10, 16, 695, 1 - setmaptile 10, 17, 703, 1 - setmaptile 10, 18, 711, 1 - setmaptile 10, 19, 719, 1 - setmaptile 10, 0, 695, 1 - setmaptile 10, 1, 703, 1 - setmaptile 10, 2, 711, 1 - setmaptile 10, 3, 719, 1 - setmaptile 37, 33, 617, 1 - setmaptile 37, 34, 625, 1 - setmaptile 37, 35, 621, 0 - setmaptile 37, 36, 641, 0 - setmaptile 28, 22, 617, 1 - setmaptile 28, 23, 625, 1 - setmaptile 28, 24, 621, 0 - setmaptile 28, 25, 641, 0 - setmaptile 10, 24, 617, 1 - setmaptile 10, 25, 625, 1 - setmaptile 10, 26, 621, 0 - setmaptile 10, 27, 641, 0 - setmaptile 21, 2, 617, 1 - setmaptile 21, 3, 625, 1 - setmaptile 21, 4, 621, 0 - setmaptile 21, 5, 641, 0 - setmaptile 2, 11, 591, 0 - setmaptile 17, 10, 591, 0 - setmaptile 25, 18, 591, 0 - setmaptile 18, 36, 591, 0 - setmaptile 6, 11, 566, 0 - setmaptile 13, 10, 566, 0 - setmaptile 16, 22, 566, 0 - setmaptile 4, 26, 566, 0 - setmaptile 30, 38, 566, 0 + setmetatile 23, 34, 695, 1 + setmetatile 23, 35, 703, 1 + setmetatile 23, 36, 711, 1 + setmetatile 23, 37, 719, 1 + setmetatile 10, 16, 695, 1 + setmetatile 10, 17, 703, 1 + setmetatile 10, 18, 711, 1 + setmetatile 10, 19, 719, 1 + setmetatile 10, 0, 695, 1 + setmetatile 10, 1, 703, 1 + setmetatile 10, 2, 711, 1 + setmetatile 10, 3, 719, 1 + setmetatile 37, 33, 617, 1 + setmetatile 37, 34, 625, 1 + setmetatile 37, 35, 621, 0 + setmetatile 37, 36, 641, 0 + setmetatile 28, 22, 617, 1 + setmetatile 28, 23, 625, 1 + setmetatile 28, 24, 621, 0 + setmetatile 28, 25, 641, 0 + setmetatile 10, 24, 617, 1 + setmetatile 10, 25, 625, 1 + setmetatile 10, 26, 621, 0 + setmetatile 10, 27, 641, 0 + setmetatile 21, 2, 617, 1 + setmetatile 21, 3, 625, 1 + setmetatile 21, 4, 621, 0 + setmetatile 21, 5, 641, 0 + setmetatile 2, 11, 591, 0 + setmetatile 17, 10, 591, 0 + setmetatile 25, 18, 591, 0 + setmetatile 18, 36, 591, 0 + setmetatile 6, 11, 566, 0 + setmetatile 13, 10, 566, 0 + setmetatile 16, 22, 566, 0 + setmetatile 4, 26, 566, 0 + setmetatile 30, 38, 566, 0 return NewMauville_Inside_EventScript_15E876:: @ 815E876 @@ -136,15 +136,15 @@ NewMauville_Inside_EventScript_15E876:: @ 815E876 end NewMauville_Inside_EventScript_15E88B:: @ 815E88B - setmaptile 33, 6, 591, 0 - setmaptile 32, 2, 752, 1 - setmaptile 33, 2, 753, 1 - setmaptile 34, 2, 754, 1 - setmaptile 35, 2, 755, 1 - setmaptile 32, 3, 756, 1 - setmaptile 33, 3, 757, 1 - setmaptile 34, 3, 758, 1 - setmaptile 35, 3, 759, 1 + setmetatile 33, 6, 591, 0 + setmetatile 32, 2, 752, 1 + setmetatile 33, 2, 753, 1 + setmetatile 34, 2, 754, 1 + setmetatile 35, 2, 755, 1 + setmetatile 32, 3, 756, 1 + setmetatile 33, 3, 757, 1 + setmetatile 34, 3, 758, 1 + setmetatile 35, 3, 759, 1 special DrawWholeMapView return @@ -166,13 +166,13 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900 faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE waitse - playpokecry SPECIES_VOLTORB, 2 + playmoncry SPECIES_VOLTORB, 2 delay 40 - waitpokecry - setflag 974 - setflag 2145 + waitmoncry + setflag FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag 2145 + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end @@ -181,13 +181,13 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE waitse - playpokecry SPECIES_VOLTORB, 2 + playmoncry SPECIES_VOLTORB, 2 delay 40 - waitpokecry - setflag 975 - setflag 2145 + waitmoncry + setflag FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag 2145 + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end @@ -196,12 +196,12 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE waitse - playpokecry SPECIES_VOLTORB, 2 + playmoncry SPECIES_VOLTORB, 2 delay 40 - waitpokecry - setflag 976 - setflag 2145 + waitmoncry + setflag FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag 2145 + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index e80df2cd2..465cbcfc6 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -4,12 +4,12 @@ OldaleTown_MapScripts:: @ 814DD62 OldaleTown_MapScript1_14DD68:: @ 814DD68 call OldaleTown_EventScript_1A014E - setflag 2064 - checkflag 116 + setflag FLAG_VISITED_OLDALE_TOWN + checkflag FLAG_ADVENTURE_STARTED call_if 0, OldaleTown_EventScript_14DD92 - checkflag 132 + checkflag FLAG_RECEIVED_POTION_OLDALE call_if 0, OldaleTown_EventScript_14DD9E - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED call_if 1, OldaleTown_EventScript_14DD8C end @@ -38,11 +38,11 @@ OldaleTown_EventScript_14DDB3:: @ 814DDB3 OldaleTown_EventScript_14DDBC:: @ 814DDBC lock faceplayer - checkflag 132 + checkflag FLAG_RECEIVED_POTION_OLDALE goto_if_eq OldaleTown_EventScript_14DE79 - checkflag 1 + checkflag FLAG_TEMP_1 goto_if_eq OldaleTown_EventScript_14DE79 - setflag 1 + setflag FLAG_TEMP_1 playbgm 420, 0 msgbox OldaleTown_Text_16AEF2, 4 closemessage @@ -75,11 +75,11 @@ OldaleTown_EventScript_14DE35:: @ 814DE35 OldaleTown_EventScript_14DE4C:: @ 814DE4C msgbox OldaleTown_Text_16AF2F, 4 - giveitem ITEM_POTION + giveitem_std ITEM_POTION compare RESULT, 0 goto_if_eq OldaleTown_EventScript_14DE83 msgbox OldaleTown_Text_16AFE1, 4 - setflag 132 + setflag FLAG_RECEIVED_POTION_OLDALE fadedefaultbgm release end @@ -195,7 +195,7 @@ OldaleTown_Movement_14DECB:: @ 814DECB OldaleTown_EventScript_14DEDF:: @ 814DEDF lock faceplayer - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED goto_if_eq OldaleTown_EventScript_14DF26 msgbox OldaleTown_Text_16B0CC, 4 closemessage @@ -279,7 +279,7 @@ OldaleTown_EventScript_14DFC6:: @ 814DFC6 waitmovement 0 removeobject 4 setvar 0x40c7, 2 - setflag 979 + setflag FLAG_HIDE_RIVAL_OLDALE_TOWN releaseall end diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/scripts/maps/OldaleTown_Mart.inc index b9698b58f..f90c787c2 100644 --- a/data/scripts/maps/OldaleTown_Mart.inc +++ b/data/scripts/maps/OldaleTown_Mart.inc @@ -6,7 +6,7 @@ OldaleTown_Mart_EventScript_152F79:: @ 8152F79 faceplayer message OldaleTown_Mart_Text_1A0BE4 waitmessage - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED goto_if_eq OldaleTown_Mart_EventScript_152FA8 pokemart OldaleTown_Mart_Items1 msgbox OldaleTown_Mart_Text_1A0C02, 4 @@ -43,7 +43,7 @@ OldaleTown_Mart_Items2:: @ 8152FB8 OldaleTown_Mart_EventScript_152FC6:: @ 8152FC6 lock faceplayer - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED goto_if_eq OldaleTown_Mart_EventScript_152FDB msgbox OldaleTown_Mart_Text_174A8A, 4 release diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index 494f109fe..cbf3acd27 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 8152F08 .byte 0 OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E - sethealplace 14 + setrespawn 14 call OldaleTown_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ OldaleTown_PokemonCenter_1F_EventScript_152F17:: @ 8152F17 setvar 0x800b, 1 call OldaleTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end @@ -26,7 +26,7 @@ OldaleTown_PokemonCenter_1F_EventScript_152F2E:: @ 8152F2E OldaleTown_PokemonCenter_1F_EventScript_152F37:: @ 8152F37 lock faceplayer - checkflag 2049 + checkflag FLAG_SYS_POKEDEX_GET goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_152F4C msgbox OldaleTown_PokemonCenter_1F_Text_1749C0, 4 release diff --git a/data/scripts/maps/PacifidlogTown.inc b/data/scripts/maps/PacifidlogTown.inc index c7cfb08df..d7ac80a0a 100644 --- a/data/scripts/maps/PacifidlogTown.inc +++ b/data/scripts/maps/PacifidlogTown.inc @@ -4,11 +4,11 @@ PacifidlogTown_MapScripts:: @ 814E8EE .byte 0 PacifidlogTown_MapScript1_14E8F9:: @ 814E8F9 - setflag 2069 + setflag FLAG_VISITED_PACIFIDLOG_TOWN end PacifidlogTown_MapScript1_14E8FD:: @ 814E8FD - tileeffect 3 + setstepcallback 3 end PacifidlogTown_EventScript_14E900:: @ 814E900 diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index e04a8caae..f073201ca 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -6,13 +6,13 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 faceplayer dodailyevents call PacifidlogTown_House2_EventScript_1541B4 - checkflag 299 + checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK goto_if_eq PacifidlogTown_House2_EventScript_154254 - checkflag 300 + checkflag FLAG_MET_FANCLUB_YOUNGER_BROTHER call_if 1, PacifidlogTown_House2_EventScript_1541CE - checkflag 300 + checkflag FLAG_MET_FANCLUB_YOUNGER_BROTHER call_if 0, PacifidlogTown_House2_EventScript_1541D7 - setflag 300 + setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER specialvar RESULT, GetLeadMonFriendshipScore compare RESULT, 4 goto_if 4, PacifidlogTown_House2_EventScript_1541EC @@ -23,7 +23,7 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 end PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 - checkflag 299 + checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK goto_if 0, PacifidlogTown_House2_EventScript_1A14DC specialvar RESULT, sub_810F908 compare RESULT, 0 @@ -40,15 +40,15 @@ PacifidlogTown_House2_EventScript_1541D7:: @ 81541D7 return PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8 - clearflag 299 + clearflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK return PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC msgbox PacifidlogTown_House2_Text_179169, 4 - giveitem ITEM_TM27 + giveitem_std ITEM_TM27 compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B - setflag 299 + setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special sub_810F950 msgbox PacifidlogTown_House2_Text_179283, 4 release @@ -61,10 +61,10 @@ PacifidlogTown_House2_EventScript_15421B:: @ 815421B PacifidlogTown_House2_EventScript_154225:: @ 8154225 msgbox PacifidlogTown_House2_Text_17922D, 4 - giveitem ITEM_TM21 + giveitem_std ITEM_TM21 compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B - setflag 299 + setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special sub_810F950 msgbox PacifidlogTown_House2_Text_179283, 4 release @@ -72,7 +72,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 PacifidlogTown_House2_EventScript_154254:: @ 8154254 specialvar RESULT, sub_810F908 - getnumberstring 0, RESULT + buffernumberstring 0, RESULT msgbox PacifidlogTown_House2_Text_1792F2, 4 release end @@ -81,9 +81,9 @@ PacifidlogTown_House2_EventScript_154267:: @ 8154267 lock faceplayer waitse - playpokecry SPECIES_AZURILL, 0 + playmoncry SPECIES_AZURILL, 0 msgbox PacifidlogTown_House2_Text_17938B, 4 - waitpokecry + waitmoncry msgbox PacifidlogTown_House2_Text_17939B, 4 release end @@ -92,9 +92,9 @@ PacifidlogTown_House2_EventScript_154282:: @ 8154282 lock faceplayer waitse - playpokecry SPECIES_AZURILL, 2 + playmoncry SPECIES_AZURILL, 2 msgbox PacifidlogTown_House2_Text_1793CC, 4 - waitpokecry + waitmoncry msgbox PacifidlogTown_House2_Text_1793DD, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index 28b9dbd80..624a221d5 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -4,7 +4,7 @@ PacifidlogTown_House3_MapScripts:: @ 815429D PacifidlogTown_House3_EventScript_15429E:: @ 815429E lock faceplayer - checkflag 154 + checkflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED goto_if_eq PacifidlogTown_House3_EventScript_154338 setvar 0x8008, 2 copyvar 0x8004, 0x8008 @@ -28,9 +28,9 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E special sub_804DB68 special sub_804E174 waitstate - getspeciesname 0, 0x8009 + bufferspeciesname 0, 0x8009 msgbox PacifidlogTown_House3_Text_1794C4, 4 - setflag 154 + setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED release end @@ -40,7 +40,7 @@ PacifidlogTown_House3_EventScript_154320:: @ 8154320 end PacifidlogTown_House3_EventScript_15432A:: @ 815432A - getspeciesname 0, 0x8009 + bufferspeciesname 0, 0x8009 msgbox PacifidlogTown_House3_Text_1794DF, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc index 64dd5008c..95d5448e8 100644 --- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc @@ -3,14 +3,14 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 81540FF .byte 0 PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105 - sethealplace 19 + setrespawn 19 end @ 8154109 setvar 0x800b, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 1c2711b83..45cdce991 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -4,7 +4,7 @@ PetalburgCity_MapScripts:: @ 814B70C .byte 0 PetalburgCity_MapScript1_14B717:: @ 814B717 - setflag 2070 + setflag FLAG_VISITED_PETALBURG_CITY compare 0x4057, 0 call_if 1, PetalburgCity_EventScript_14B731 compare 0x4057, 2 @@ -45,7 +45,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747 clearflag 0x4001 special LoadPlayerParty setvar 0x4085, 1 - warp PetalburgCity_Gym, 255, 4, 108 + warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 waitstate releaseall end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index b2d104894..add786bf0 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -48,7 +48,7 @@ PetalburgCity_Gym_MapScript1_15451B:: @ 815451B call_if 1, PetalburgCity_Gym_EventScript_15453B compare 0x4085, 6 call_if 0, PetalburgCity_Gym_EventScript_154543 - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR call_if 1, PetalburgCity_Gym_EventScript_15454B end @@ -86,7 +86,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C waitmovement 0 playse 9 removeobject 10 - setflag 726 + setflag FLAG_HIDE_WALLY_PETALBURG delay 30 applymovement 255, PetalburgCity_Gym_Movement_1A0841 waitmovement 0 @@ -205,14 +205,14 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_154872 removeobject 10 - setflag 728 + setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1 setvar 0x4085, 1 setvar 0x4057, 2 - clearflag 726 - clearflag 866 - setflag 889 + clearflag FLAG_HIDE_WALLY_PETALBURG + clearflag FLAG_HIDE_WALLY_PETALBURG_GYM + setflag FLAG_HIDE_RIVAL_BIRCH_LAB special InitBirchState - warp PetalburgCity, 255, 15, 8 + warp MAP_PETALBURG_CITY, 255, 15, 8 waitstate release end @@ -354,9 +354,9 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D call PetalburgCity_Gym_EventScript_154969 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B8 - checkflag 169 + checkflag FLAG_RECEIVED_TM42 goto_if 0, PetalburgCity_Gym_EventScript_154A2C - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq PetalburgCity_Gym_EventScript_154B69 msgbox PetalburgCity_Gym_Text_17AA6B, 4 release @@ -383,7 +383,7 @@ PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2 return PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 - giveitem ITEM_ENIGMA_BERRY + giveitem_std ITEM_ENIGMA_BERRY compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setvar 0x402d, 0 @@ -397,25 +397,25 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 waitmessage call PetalburgCity_Gym_EventScript_1A02C5 msgbox PetalburgCity_Gym_Text_17A805, 4 - setflag 1217 + setflag FLAG_DEFEATED_PETALBURG_GYM setvar 0x4085, 7 - setflag 2059 + setflag FLAG_BADGE05_GET call PetalburgCity_Gym_EventScript_1A0424 - setflag 913 - clearflag 912 + setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM + clearflag FLAG_HIDE_WATTSON_MAUVILLE setvar 0x8008, 5 call PetalburgCity_Gym_EventScript_1A01C0 - clearflag 940 + clearflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL call PetalburgCity_Gym_EventScript_1544ED special DrawWholeMapView goto PetalburgCity_Gym_EventScript_154A2C end PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C - giveitem ITEM_TM42 + giveitem_std ITEM_TM42 compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B - setflag 169 + setflag FLAG_RECEIVED_TM42 msgbox PetalburgCity_Gym_Text_17A8CF, 4 msgbox PetalburgCity_Gym_Text_17A976, 4 closemessage @@ -606,7 +606,7 @@ PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 PetalburgCity_Gym_EventScript_154BA8:: @ 8154BA8 closemessage delay 30 - warpdoor PetalburgCity_Gym, 255, 32776, 32777 + warpdoor MAP_PETALBURG_CITY_GYM, 255, 32776, 32777 waitstate releaseall end @@ -765,7 +765,7 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154E29 msgbox PetalburgCity_Gym_Text_17AE30, 6 end @@ -783,7 +783,7 @@ PetalburgCity_Gym_EventScript_154E29:: @ 8154E29 PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154E65 msgbox PetalburgCity_Gym_Text_17AFD3, 6 end @@ -801,7 +801,7 @@ PetalburgCity_Gym_EventScript_154E65:: @ 8154E65 PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154EA1 msgbox PetalburgCity_Gym_Text_17B12C, 6 end @@ -819,7 +819,7 @@ PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1 PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154EDD msgbox PetalburgCity_Gym_Text_17B2E4, 6 end @@ -837,7 +837,7 @@ PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154F19 msgbox PetalburgCity_Gym_Text_17B46F, 6 end @@ -855,7 +855,7 @@ PetalburgCity_Gym_EventScript_154F19:: @ 8154F19 PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154F55 msgbox PetalburgCity_Gym_Text_17B5EA, 6 end @@ -873,7 +873,7 @@ PetalburgCity_Gym_EventScript_154F55:: @ 8154F55 PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154F91 msgbox PetalburgCity_Gym_Text_17B749, 6 end @@ -962,51 +962,51 @@ PetalburgCity_Gym_EventScript_155081:: @ 8155081 return PetalburgCity_Gym_EventScript_1550A2:: @ 81550A2 - setmaptile 6, 85, 528, 0 - setmaptile 7, 85, 529, 0 - setmaptile 1, 98, 528, 0 - setmaptile 2, 98, 529, 0 + setmetatile 6, 85, 528, 0 + setmetatile 7, 85, 529, 0 + setmetatile 1, 98, 528, 0 + setmetatile 2, 98, 529, 0 return PetalburgCity_Gym_EventScript_1550C7:: @ 81550C7 - setmaptile 6, 46, 528, 0 - setmaptile 7, 46, 529, 0 - setmaptile 1, 59, 528, 0 - setmaptile 2, 59, 529, 0 + setmetatile 6, 46, 528, 0 + setmetatile 7, 46, 529, 0 + setmetatile 1, 59, 528, 0 + setmetatile 2, 59, 529, 0 return PetalburgCity_Gym_EventScript_1550EC:: @ 81550EC - setmaptile 6, 59, 528, 0 - setmaptile 7, 59, 529, 0 - setmaptile 1, 72, 528, 0 - setmaptile 2, 72, 529, 0 + setmetatile 6, 59, 528, 0 + setmetatile 7, 59, 529, 0 + setmetatile 1, 72, 528, 0 + setmetatile 2, 72, 529, 0 return PetalburgCity_Gym_EventScript_155111:: @ 8155111 - setmaptile 1, 20, 528, 0 - setmaptile 2, 20, 529, 0 + setmetatile 1, 20, 528, 0 + setmetatile 2, 20, 529, 0 return PetalburgCity_Gym_EventScript_155124:: @ 8155124 - setmaptile 6, 20, 528, 0 - setmaptile 7, 20, 529, 0 - setmaptile 1, 33, 528, 0 - setmaptile 2, 33, 529, 0 + setmetatile 6, 20, 528, 0 + setmetatile 7, 20, 529, 0 + setmetatile 1, 33, 528, 0 + setmetatile 2, 33, 529, 0 return PetalburgCity_Gym_EventScript_155149:: @ 8155149 - setmaptile 6, 33, 528, 0 - setmaptile 7, 33, 529, 0 + setmetatile 6, 33, 528, 0 + setmetatile 7, 33, 529, 0 return PetalburgCity_Gym_EventScript_15515C:: @ 815515C - setmaptile 1, 7, 528, 0 - setmaptile 2, 7, 529, 0 + setmetatile 1, 7, 528, 0 + setmetatile 2, 7, 529, 0 return PetalburgCity_Gym_EventScript_15516F:: @ 815516F - setmaptile 6, 7, 528, 0 - setmaptile 7, 7, 529, 0 + setmetatile 6, 7, 528, 0 + setmetatile 7, 7, 529, 0 return PetalburgCity_Gym_EventScript_155182:: @ 8155182 @@ -1021,7 +1021,7 @@ PetalburgCity_Gym_EventScript_155187:: @ 8155187 PetalburgCity_Gym_EventScript_15518B:: @ 815518B lock faceplayer - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_1551A0 msgbox PetalburgCity_Gym_Text_17AB96, 4 release @@ -1034,14 +1034,14 @@ PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0 PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA lockall - checkflag 2059 + checkflag FLAG_BADGE05_GET goto_if_eq PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA lockall - checkflag 2059 + checkflag FLAG_BADGE05_GET goto_if_eq PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/scripts/maps/PetalburgCity_Mart.inc index e4186eaae..66e247323 100644 --- a/data/scripts/maps/PetalburgCity_Mart.inc +++ b/data/scripts/maps/PetalburgCity_Mart.inc @@ -6,7 +6,7 @@ PetalburgCity_Mart_EventScript_1552B0:: @ 81552B0 faceplayer message PetalburgCity_Mart_Text_1A0BE4 waitmessage - checkflag 296 + checkflag FLAG_PETALBURG_MART_EXPANDED_ITEMS goto_if_eq PetalburgCity_Mart_EventScript_1552EA pokemart PetalburgCity_Mart_Items1 msgbox PetalburgCity_Mart_Text_1A0C02, 4 diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index e2013a1d6..1dc99159a 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 8155204 .byte 0 PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A - sethealplace 3 + setrespawn 3 call PetalburgCity_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_155213:: @ 8155213 setvar 0x800b, 1 call PetalburgCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc index d8e95d8c6..08bbcb0c7 100644 --- a/data/scripts/maps/PetalburgCity_WallysHouse.inc +++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc @@ -4,29 +4,29 @@ PetalburgCity_WallysHouse_MapScripts:: @ 81543C3 PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4 lock faceplayer - checkflag 126 + checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD goto_if_eq PetalburgCity_WallysHouse_EventScript_1543F7 - checkflag 122 + checkflag FLAG_RECEIVED_HM03 goto_if_eq PetalburgCity_WallysHouse_EventScript_154427 - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_WallysHouse_EventScript_154406 - checkflag 135 + checkflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY goto_if_eq PetalburgCity_WallysHouse_EventScript_15443B msgbox PetalburgCity_WallysHouse_Text_179805, 4 - setflag 135 + setflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY release end PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 - checkflag 122 + checkflag FLAG_RECEIVED_HM03 goto_if_eq PetalburgCity_WallysHouse_EventScript_154431 goto PetalburgCity_WallysHouse_EventScript_154406 end PetalburgCity_WallysHouse_EventScript_154406:: @ 8154406 msgbox PetalburgCity_WallysHouse_Text_179996, 4 - giveitem ITEM_HM03 - setflag 122 + giveitem_std ITEM_HM03 + setflag FLAG_RECEIVED_HM03 msgbox PetalburgCity_WallysHouse_Text_179B14, 4 release end @@ -49,9 +49,9 @@ PetalburgCity_WallysHouse_EventScript_15443B:: @ 815443B PetalburgCity_WallysHouse_EventScript_154445:: @ 8154445 lock faceplayer - checkflag 122 + checkflag FLAG_RECEIVED_HM03 goto_if_eq PetalburgCity_WallysHouse_EventScript_15446D - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_WallysHouse_EventScript_154463 msgbox PetalburgCity_WallysHouse_Text_179C2C, 4 release diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 0b0c72f70..be74cbf4c 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -90,7 +90,7 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA applymovement 255, PetalburgWoods_Movement_1A0845 waitmovement 0 msgbox PetalburgWoods_Text_19507E, 4 - giveitem ITEM_GREAT_BALL + giveitem_std ITEM_GREAT_BALL compare RESULT, 0 goto_if_eq PetalburgWoods_EventScript_15CE3F goto PetalburgWoods_EventScript_15CE4D @@ -241,13 +241,13 @@ PetalburgWoods_EventScript_15CED3:: @ 815CED3 PetalburgWoods_EventScript_15CEDC:: @ 815CEDC lock faceplayer - checkflag 297 + checkflag FLAG_RECEIVED_MIRACLE_SEED goto_if_eq PetalburgWoods_EventScript_15CF0B msgbox PetalburgWoods_Text_19549E, 4 - giveitem ITEM_MIRACLE_SEED + giveitem_std ITEM_MIRACLE_SEED compare RESULT, 0 goto_if_eq PetalburgWoods_EventScript_1A029B - setflag 297 + setflag FLAG_RECEIVED_MIRACLE_SEED release end diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 2fe80e098..1810a6495 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -217,8 +217,8 @@ Route101_EventScript_14EA76:: @ 814EA76 Route101_EventScript_14EA7F:: @ 814EA7F lock faceplayer - setflag 2048 - setflag 82 + setflag FLAG_SYS_POKEMON_GET + setflag FLAG_RESCUED_BIRCH fadescreen 1 removeobject 4 setobjectxy 255, 6, 13 @@ -230,13 +230,13 @@ Route101_EventScript_14EA7F:: @ 814EA7F waitmovement 0 msgbox Route101_Text_16D191, 4 special ScrSpecial_HealPlayerParty - setflag 720 - clearflag 721 - setflag 700 + setflag FLAG_HIDE_BIRCH_BATTLE_POOCHYENA + clearflag FLAG_HIDE_BIRCH_IN_LAB + setflag FLAG_HIDE_BIRCH_STARTERS_BAG setvar 0x4084, 2 setvar 0x4060, 3 clearflag 0x4000 - warp LittlerootTown_ProfessorBirchsLab, 255, 6, 5 + warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate release end diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index ff0ccce30..ee9decedc 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -119,10 +119,10 @@ Route103_EventScript_14ED46:: @ 814ED46 removeobject 2 setvar 0x4062, 1 setvar 0x4084, 4 - clearflag 889 - setflag 130 + clearflag FLAG_HIDE_RIVAL_BIRCH_LAB + setflag FLAG_DEFEATED_RIVAL_ROUTE103 setvar 0x40c7, 1 - clearflag 979 + clearflag FLAG_HIDE_RIVAL_OLDALE_TOWN savebgm 0 fadedefaultbgm releaseall diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 651f2afb4..a04dcd86d 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -17,27 +17,27 @@ Route104_MapScript1_14EEA8:: @ 814EEA8 end Route104_EventScript_14EEAE:: @ 814EEAE - checkflag 127 + checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if 0, Route104_EventScript_14EEC4 - checkflag 2057 + checkflag FLAG_BADGE03_GET goto_if 0, Route104_EventScript_14EEC4 - clearflag 906 + clearflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE return Route104_EventScript_14EEC4:: @ 814EEC4 - setflag 906 + setflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE return Route104_EventScript_14EEC8:: @ 814EEC8 lock faceplayer - checkflag 246 + checkflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 goto_if_eq Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 - giveitem ITEM_CHESTO_BERRY + giveitem_std ITEM_CHESTO_BERRY compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B - setflag 246 + setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 msgbox Route104_Text_1C5665, 4 release end @@ -50,13 +50,13 @@ Route104_EventScript_14EEFF:: @ 814EEFF Route104_EventScript_14EF09:: @ 814EF09 lock faceplayer - checkflag 279 + checkflag FLAG_RECEIVED_WHITE_HERB goto_if_eq Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 - giveitem ITEM_WHITE_HERB + giveitem_std ITEM_WHITE_HERB compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B - setflag 279 + setflag FLAG_RECEIVED_WHITE_HERB release end @@ -104,13 +104,13 @@ Route104_EventScript_14EF8A:: @ 814EF8A Route104_EventScript_14EF93:: @ 814EF93 lock faceplayer - checkflag 262 + checkflag FLAG_RECEIVED_TM09 goto_if_eq Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 - giveitem ITEM_TM09 + giveitem_std ITEM_TM09 compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B - setflag 262 + setflag FLAG_RECEIVED_TM09 release end @@ -124,14 +124,14 @@ Route104_EventScript_14EFCC:: @ 814EFCC end Route104_EventScript_14EFD5:: @ 814EFD5 - setobjectpriority 8, 0, 19, 0 - setobjectpriority 255, 0, 19, 0 + setobjectpriority 8, MAP_ROUTE104, 0 + setobjectpriority 255, MAP_ROUTE104, 0 applymovement 8, Route104_Movement_14F16C waitmovement 0 removeobject 8 applymovement 255, Route104_Movement_14F162 waitmovement 0 - hideobject 255, 0, 19 + hideobjectat 255, MAP_ROUTE104 call Route104_EventScript_1A02E7 applymovement 7, Route104_Movement_14F09F applymovement 255, Route104_Movement_14F09F @@ -139,28 +139,28 @@ Route104_EventScript_14EFD5:: @ 814EFD5 applymovement 255, Route104_Movement_14F166 waitmovement 0 call Route104_EventScript_1A02EF - showobject 255, 0, 11 + showobjectat 255, MAP_DEWFORD_TOWN applymovement 255, Route104_Movement_14F168 waitmovement 0 setobjectxyperm 2, 12, 8 addobject 2 - setobjectpriority 2, 0, 11, 0 - clearflag 740 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN applymovement 2, Route104_Movement_14F16F waitmovement 0 addobject 4 - clearflag 743 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD call Route104_EventScript_1A02EF - setflag 742 - hideobject 7, 0, 19 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + hideobjectat 7, MAP_ROUTE104 copyvar 0x4096, 0x8008 - resetobjectpriority 255, 0, 19 - resetobjectpriority 2, 0, 11 + resetobjectpriority 255, MAP_ROUTE104 + resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 setvar 0x408e, 0 - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if 0, Route104_EventScript_14F08B - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if_eq Route104_EventScript_14F095 end diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index f24e92cd4..4eb1d9705 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -3,15 +3,15 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2 .byte 0 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 - setflag 2109 + setflag FLAG_LANDMARK_MR_BRINEY_HOUSE compare 0x4090, 1 call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4 - checkflag 188 + checkflag FLAG_RECEIVED_POKENAV call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0 end Route104_MrBrineysHouse_EventScript_15BCD0:: @ 815BCD0 - setflag 814 + setflag FLAG_HIDE_RIVAL_RUSTBORO return Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4 @@ -24,17 +24,17 @@ Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4 Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB lock faceplayer - checkflag 147 + checkflag FLAG_MR_BRINEY_SAILING_INTRO call_if 0, Route104_MrBrineysHouse_EventScript_15BD0E - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if 0, Route104_MrBrineysHouse_EventScript_15BD65 - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS goto_if 0, Route104_MrBrineysHouse_EventScript_15BD7E goto Route104_MrBrineysHouse_EventScript_15BD32 end Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E - setflag 147 + setflag FLAG_MR_BRINEY_SAILING_INTRO msgbox Route104_MrBrineysHouse_Text_191A82, 4 msgbox Route104_MrBrineysHouse_Text_191AAD, 5 compare RESULT, 0 @@ -80,10 +80,10 @@ Route104_MrBrineysHouse_EventScript_15BDAB:: @ 815BDAB msgbox Route104_MrBrineysHouse_Text_191BFD, 4 call Route104_MrBrineysHouse_EventScript_1A010C setvar 0x408e, 1 - clearflag 738 - setflag 739 - setflag 881 - warp Route104, 255, 13, 51 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + warp MAP_ROUTE104, 255, 13, 51 waitstate releaseall end @@ -92,8 +92,8 @@ Route104_MrBrineysHouse_EventScript_15BDD1:: @ 815BDD1 lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox Route104_MrBrineysHouse_Text_191FB9, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 4c5becf88..2de6bf51f 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -3,12 +3,12 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 815BDE4 .byte 0 Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA - setflag 2108 - checkflag 127 + setflag FLAG_LANDMARK_FLOWER_SHOP + checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 - checkflag 2057 + checkflag FLAG_BADGE03_GET goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 - setflag 1 + setflag FLAG_TEMP_1 end Route104_PrettyPetalFlowerShop_EventScript_15BE03:: @ 815BE03 @@ -18,12 +18,12 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE03:: @ 815BE03 Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B lock faceplayer - checkflag 1 + checkflag FLAG_TEMP_1 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE7C msgbox Route104_PrettyPetalFlowerShop_Text_1C5EC6, 4 - checkflag 127 + checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE4A - setflag 127 + setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, 5 compare RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A @@ -52,7 +52,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE73:: @ 815BE73 Route104_PrettyPetalFlowerShop_EventScript_15BE7C:: @ 815BE7C message Route104_PrettyPetalFlowerShop_Text_1A0C42 waitmessage - pokemartbp Route104_PrettyPetalFlowerShop_Items + pokemartdecoration2 Route104_PrettyPetalFlowerShop_Items msgbox Route104_PrettyPetalFlowerShop_Text_1A0C02, 4 release end @@ -72,7 +72,7 @@ Route104_PrettyPetalFlowerShop_Items:: @ 815BE94 Route104_PrettyPetalFlowerShop_EventScript_15BEA4:: @ 815BEA4 lock faceplayer - checkflag 94 + checkflag FLAG_RECEIVED_WAILMER_PAIL goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BEB9 msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4 release @@ -80,9 +80,9 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEA4:: @ 815BEA4 Route104_PrettyPetalFlowerShop_EventScript_15BEB9:: @ 815BEB9 msgbox Route104_PrettyPetalFlowerShop_Text_1C6158, 4 - giveitem ITEM_WAILMER_PAIL + giveitem_std ITEM_WAILMER_PAIL msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4 - setflag 94 + setflag FLAG_RECEIVED_WAILMER_PAIL release end @@ -90,15 +90,15 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA lock faceplayer dodailyevents - checkflag 2256 + checkflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BF1A msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4 random 8 - addvar RESULT, 133 - giveitem RESULT + addvar RESULT, ITEM_CHERI_BERRY + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B - setflag 2256 + setflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, 4 release end diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc index 3c218747a..b3b256d79 100644 --- a/data/scripts/maps/Route104_Prototype.inc +++ b/data/scripts/maps/Route104_Prototype.inc @@ -16,9 +16,9 @@ Route104_Prototype_EventScript_160C4B:: @ 8160C4B goto_if 0, Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_MIKE_1 goto_if 0, Route104_Prototype_EventScript_160C99 - setflag 215 + setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 msgbox Route104_Prototype_Text_19B267, 4 - checkflag 216 + checkflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 goto_if_eq Route104_Prototype_EventScript_160CFB release end @@ -43,9 +43,9 @@ Route104_Prototype_EventScript_160CA3:: @ 8160CA3 goto_if 0, Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_MIKE_1 goto_if 0, Route104_Prototype_EventScript_160CF1 - setflag 216 + setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 msgbox Route104_Prototype_Text_19B2E9, 4 - checkflag 215 + checkflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 goto_if_eq Route104_Prototype_EventScript_160CFB release end diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc index 1182dae7e..30157e52f 100644 --- a/data/scripts/maps/Route105.inc +++ b/data/scripts/maps/Route105.inc @@ -3,13 +3,13 @@ Route105_MapScripts:: @ 814F298 .byte 0 Route105_MapScript1_14F29E:: @ 814F29E - checkflag 228 + checkflag FLAG_REGI_DOORS_OPENED call_if 0, Route105_EventScript_14F2A8 end Route105_EventScript_14F2A8:: @ 814F2A8 - setmaptile 9, 19, 124, 1 - setmaptile 9, 20, 145, 1 + setmetatile 9, 19, 124, 1 + setmetatile 9, 20, 145, 1 return Route105_EventScript_14F2BB:: @ 814F2BB diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 9f0ef8c8d..a9fa7d906 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -3,8 +3,8 @@ Route109_MapScripts:: @ 814F4D2 Route109_EventScript_14F4D3:: @ 814F4D3 call Route109_EventScript_1A010C - setobjectpriority 2, 0, 24, 0 - setobjectpriority 255, 0, 24, 0 + setobjectpriority 2, MAP_ROUTE109, 0 + setobjectpriority 255, MAP_ROUTE109, 0 applymovement 2, Route109_Movement_14F67B waitmovement 0 removeobject 2 @@ -33,30 +33,30 @@ Route109_EventScript_14F538:: @ 814F538 end Route109_EventScript_14F548:: @ 814F548 - hideobject 255, 0, 24 + hideobjectat 255, MAP_ROUTE109 call Route109_EventScript_1A02E7 applymovement 1, Route109_Movement_14F5BF applymovement 255, Route109_Movement_14F5BF waitmovement 0 call Route109_EventScript_1A02EF - showobject 255, 0, 11 + showobjectat 255, MAP_DEWFORD_TOWN applymovement 255, Route109_Movement_14F670 waitmovement 0 addobject 4 - clearflag 743 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD setobjectxyperm 2, 12, 8 addobject 2 - setobjectpriority 2, 0, 11, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 applymovement 2, Route109_Movement_14F67D waitmovement 0 - clearflag 740 - setflag 744 - hideobject 1, 0, 24 + clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + hideobjectat 1, MAP_ROUTE109 msgbox Route109_Text_16B4B5, 4 closemessage copyvar 0x4096, 0x8008 - resetobjectpriority 255, 0, 24 - resetobjectpriority 2, 0, 11 + resetobjectpriority 255, MAP_ROUTE109 + resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 release end @@ -271,7 +271,7 @@ Route109_Movement_14F67D:: @ 814F67D Route109_EventScript_14F680:: @ 814F680 lock faceplayer - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS goto_if 0, Route109_EventScript_14F691 goto Route109_EventScript_14F6AF end @@ -328,16 +328,16 @@ Route109_EventScript_14F725:: @ 814F725 lock faceplayer special GetPlayerBigGuyGirlString - checkflag 280 + checkflag FLAG_RECEIVED_SOFT_SAND goto_if_eq Route109_EventScript_14F762 msgbox Route109_Text_16E433, 4 - giveitem ITEM_SOFT_SAND + giveitem_std ITEM_SOFT_SAND compare RESULT, 0 goto_if_eq Route109_EventScript_1A029B closemessage applymovement LAST_TALKED, Route109_Movement_1A083D waitmovement 0 - setflag 280 + setflag FLAG_RECEIVED_SOFT_SAND release end @@ -360,9 +360,9 @@ Route109_EventScript_14F788:: @ 814F788 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox Route109_Text_16E5CA, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 4d8d363aa..7a12f5850 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -3,20 +3,20 @@ Route109_SeashoreHouse_MapScripts:: @ 8160DCA .byte 0 Route109_SeashoreHouse_MapScript1_160DD0:: @ 8160DD0 - setflag 2111 + setflag FLAG_LANDMARK_SEASHORE_HOUSE end Route109_SeashoreHouse_EventScript_160DD4:: @ 8160DD4 lock faceplayer - checkflag 140 + checkflag FLAG_RECEIVED_6_SODA_POP goto_if_eq Route109_SeashoreHouse_EventScript_160E36 - checkflag 141 + checkflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS goto_if_eq Route109_SeashoreHouse_EventScript_160E08 - checkflag 2 + checkflag FLAG_TEMP_2 goto_if_eq Route109_SeashoreHouse_EventScript_160DFE msgbox Route109_SeashoreHouse_Text_19B4D9, 4 - setflag 2 + setflag FLAG_TEMP_2 release end @@ -27,10 +27,10 @@ Route109_SeashoreHouse_EventScript_160DFE:: @ 8160DFE Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08 msgbox Route109_SeashoreHouse_Text_19B609, 4 - giveitem ITEM_SODA_POP, 6 + giveitem_std ITEM_SODA_POP, 6 compare RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E2C - setflag 140 + setflag FLAG_RECEIVED_6_SODA_POP release end @@ -61,7 +61,7 @@ Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A takemoney 0x12c, 0 updatemoneybox 0, 0 nop - giveitem ITEM_SODA_POP + giveitem_std ITEM_SODA_POP hidemoneybox 0, 0 release end @@ -100,7 +100,7 @@ Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09 goto_if 0, Route109_SeashoreHouse_EventScript_160F29 checktrainerflag OPPONENT_SIMON goto_if 0, Route109_SeashoreHouse_EventScript_160F29 - setflag 141 + setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS release end diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 146be5959..5e10782e9 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -420,7 +420,7 @@ Route110_EventScript_14FE8A:: @ 814FE8A end Route110_EventScript_14FEA5:: @ 814FEA5 - giveitem ITEM_ITEMFINDER + giveitem_std ITEM_ITEMFINDER return Route110_EventScript_14FEB2:: @ 814FEB2 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index c60bc366e..8e33517ca 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -28,7 +28,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 - setflag 2091 + setflag FLAG_SYS_CYCLING_ROAD setvar 0x4001, 1 releaseall end @@ -55,7 +55,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A @ Coord event directly in front of the gatesman heading right to left lockall setvar 0x40a9, 0 - clearflag 2091 + clearflag FLAG_SYS_CYCLING_ROAD setvar 0x4001, 0 releaseall end diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index cf18a8e36..51cab5ddd 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -13,7 +13,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B specialvar RESULT, GetPlayerAvatarBike compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 - setflag 2091 + setflag FLAG_SYS_CYCLING_ROAD setvar 0x4001, 1 releaseall end @@ -32,7 +32,7 @@ Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB:: @ 81634BB Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD lockall - clearflag 2091 + clearflag FLAG_SYS_CYCLING_ROAD setvar 0x4001, 0 releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 12309207c..813cbb9e9 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -22,7 +22,7 @@ Route110_TrickHouseEnd_MapScript2_161965:: @ 8161965 Route110_TrickHouseEnd_EventScript_16196F:: @ 816196F addobject 1 - showobject 1, 29, 1 + showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_END turnobject 1, 4 end @@ -37,7 +37,7 @@ Route110_TrickHouseEnd_EventScript_161986:: @ 8161986 end Route110_TrickHouseEnd_EventScript_161994:: @ 8161994 - setmaptile 10, 1, 539, 1 + setmetatile 10, 1, 539, 1 return Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E @@ -60,7 +60,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B msgbox Route110_TrickHouseEnd_Text_19C2B2, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_RARE_CANDY + giveitem_std ITEM_RARE_CANDY compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -73,7 +73,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 msgbox Route110_TrickHouseEnd_Text_19C333, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_TIMER_BALL + giveitem_std ITEM_TIMER_BALL compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -86,7 +86,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 msgbox Route110_TrickHouseEnd_Text_19C3A7, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_HARD_STONE + giveitem_std ITEM_HARD_STONE compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -99,7 +99,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF msgbox Route110_TrickHouseEnd_Text_19C41F, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_SMOKE_BALL + giveitem_std ITEM_SMOKE_BALL compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -112,7 +112,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB msgbox Route110_TrickHouseEnd_Text_19C491, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_TM12 + giveitem_std ITEM_TM12 compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -125,7 +125,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 msgbox Route110_TrickHouseEnd_Text_19C515, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_MAGNET + giveitem_std ITEM_MAGNET compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -138,7 +138,7 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 msgbox Route110_TrickHouseEnd_Text_19C567, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_PP_MAX + giveitem_std ITEM_PP_MAX compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -167,9 +167,9 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C691, 4 setvar 0x40c1, 0 .ifdef SAPPHIRE - givedecoration 32 + givedecoration_std 32 .else - givedecoration 31 + givedecoration_std 31 .endc compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C61 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 568ba2af6..b9582b64c 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -5,7 +5,7 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B .byte 0 Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B - setflag 2114 + setflag FLAG_LANDMARK_TRICK_HOUSE compare 0x40b5, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE compare 0x40c1, 1 @@ -63,37 +63,37 @@ Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE return Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C - checkflag 2057 + checkflag FLAG_BADGE03_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046 - checkflag 2058 + checkflag FLAG_BADGE04_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050 - checkflag 2059 + checkflag FLAG_BADGE05_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A - checkflag 2060 + checkflag FLAG_BADGE06_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064 - checkflag 2061 + checkflag FLAG_BADGE07_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E - checkflag 2062 + checkflag FLAG_BADGE08_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078 - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return @@ -139,14 +139,14 @@ Route110_TrickHouseEntrance_MapScript2_1610B2:: @ 81610B2 Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4 addobject 1 - showobject 1, 29, 0 + showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE turnobject 1, 4 turnobject 255, 3 end Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105 addobject 1 - hideobject 1, 29, 0 + hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE switch 0x4044 case 0, Route110_TrickHouseEntrance_EventScript_16116B case 1, Route110_TrickHouseEntrance_EventScript_161173 @@ -266,7 +266,7 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D call_if 1, Route110_TrickHouseEntrance_EventScript_16130C closemessage setvar 0x40a6, 1 - warp Route110_TrickHouseEntrance, 255, 6, 2 + warp MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 waitstate releaseall end @@ -368,7 +368,7 @@ Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E end Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE - giveitem ITEM_RARE_CANDY + giveitem_std ITEM_RARE_CANDY compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -378,7 +378,7 @@ Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE end Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA - giveitem ITEM_TIMER_BALL + giveitem_std ITEM_TIMER_BALL compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -388,7 +388,7 @@ Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA end Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 - giveitem ITEM_HARD_STONE + giveitem_std ITEM_HARD_STONE compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -398,7 +398,7 @@ Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 end Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 - giveitem ITEM_SMOKE_BALL + giveitem_std ITEM_SMOKE_BALL compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -408,7 +408,7 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 end Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E - giveitem ITEM_TM12 + giveitem_std ITEM_TM12 compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -418,7 +418,7 @@ Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E end Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA - giveitem ITEM_MAGNET + giveitem_std ITEM_MAGNET compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -428,7 +428,7 @@ Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA end Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 - giveitem ITEM_PP_MAX + giveitem_std ITEM_PP_MAX compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -450,9 +450,9 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19C128, 4 .ifdef SAPPHIRE - givedecoration 32 + givedecoration_std 32 .else - givedecoration 31 + givedecoration_std 31 .endif compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 @@ -501,7 +501,7 @@ Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 end Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD - setmaptile 5, 1, 537, 0 + setmetatile 5, 1, 537, 0 special DrawWholeMapView delay 20 applymovement 255, Route110_TrickHouseEntrance_Movement_1A0856 @@ -524,49 +524,49 @@ Route110_TrickHouseEntrance_Movement_16165E:: @ 816165E step_end Route110_TrickHouseEntrance_EventScript_161660:: @ 8161660 - warp Route110_TrickHousePuzzle1, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_16166B:: @ 816166B - warp Route110_TrickHousePuzzle2, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_161676:: @ 8161676 - warp Route110_TrickHousePuzzle3, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_161681:: @ 8161681 - warp Route110_TrickHousePuzzle4, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_16168C:: @ 816168C - warp Route110_TrickHousePuzzle5, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_161697:: @ 8161697 - warp Route110_TrickHousePuzzle6, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_1616A2:: @ 81616A2 - warp Route110_TrickHousePuzzle7, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_1616AD:: @ 81616AD - warp Route110_TrickHousePuzzle8, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21 waitstate releaseall end @@ -607,7 +607,7 @@ Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 msgbox UnknownString_819CAD1, 4 playse SE_PIN setvar 0x40AB, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -618,7 +618,7 @@ Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 msgbox UnknownString_819CCCB, 4 playse SE_PIN setvar 0x40AC, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -629,7 +629,7 @@ Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 msgbox UnknownString_819CEF9, 4 playse SE_PIN setvar 0x40AD, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -640,7 +640,7 @@ Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB msgbox UnknownString_819D164, 4 playse SE_PIN setvar 0x40AE, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -651,7 +651,7 @@ Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 msgbox UnknownString_819D3A5, 4 playse SE_PIN setvar 0x40AF, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -662,7 +662,7 @@ Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D msgbox UnknownString_819DC0A, 4 playse SE_PIN setvar 0x40B0, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -673,7 +673,7 @@ Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 msgbox UnknownString_819DE8D, 4 playse SE_PIN setvar 0x40B1, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -684,7 +684,7 @@ Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F msgbox UnknownString_819E0FF, 4 playse SE_PIN setvar 0x40B2, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -757,9 +757,9 @@ Route110_TrickHouseEntrance_EventScript_16190B:: @ 816190B return Route110_TrickHouseEntrance_EventScript_161920:: @ 8161920 - setfieldeffect 0, 32772 - setfieldeffect 1, 32773 - setfieldeffect 2, 32774 + setfieldeffectargument 0, 32772 + setfieldeffectargument 1, 32773 + setfieldeffectargument 2, 32774 dofieldeffect 54 waitfieldeffect 54 delay 10 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/scripts/maps/Route110_TrickHousePuzzle1.inc index 3a89c2db1..4fffd9914 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE end Route110_TrickHousePuzzle1_EventScript_161D0A:: @ 8161D0A - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 end Route110_TrickHousePuzzle1_EventScript_161D14:: @ 8161D14 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index f71a9611a..6425d05cb 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -70,23 +70,23 @@ Route110_TrickHousePuzzle2_EventScript_161E19:: @ 8161E19 end Route110_TrickHousePuzzle2_EventScript_161E2C:: @ 8161E2C - setmaptile 14, 21, 601, 0 - setmaptile 1, 12, 618, 0 + setmetatile 14, 21, 601, 0 + setmetatile 1, 12, 618, 0 return Route110_TrickHousePuzzle2_EventScript_161E3F:: @ 8161E3F - setmaptile 8, 17, 601, 0 - setmaptile 12, 13, 618, 0 + setmetatile 8, 17, 601, 0 + setmetatile 12, 13, 618, 0 return Route110_TrickHousePuzzle2_EventScript_161E52:: @ 8161E52 - setmaptile 4, 10, 601, 0 - setmaptile 8, 4, 618, 0 + setmetatile 4, 10, 601, 0 + setmetatile 8, 4, 618, 0 return Route110_TrickHousePuzzle2_EventScript_161E65:: @ 8161E65 - setmaptile 5, 2, 601, 0 - setmaptile 12, 5, 618, 0 + setmetatile 5, 2, 601, 0 + setmetatile 12, 5, 618, 0 return Route110_TrickHousePuzzle2_EventScript_161E78:: @ 8161E78 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index a50ecd3ce..54cea16c9 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -24,13 +24,13 @@ Route110_TrickHousePuzzle3_MapScript1_161EE4:: @ 8161EE4 end Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 - setmaptile 5, 20, 600, 0 - setmaptile 4, 12, 600, 0 - setmaptile 11, 10, 600, 0 - setmaptile 3, 8, 600, 0 - setmaptile 13, 7, 600, 0 - setmaptile 1, 3, 600, 0 - setmaptile 10, 2, 600, 0 + setmetatile 5, 20, 600, 0 + setmetatile 4, 12, 600, 0 + setmetatile 11, 10, 600, 0 + setmetatile 3, 8, 600, 0 + setmetatile 13, 7, 600, 0 + setmetatile 1, 3, 600, 0 + setmetatile 10, 2, 600, 0 compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161F9F compare 0x4008, 2 @@ -48,201 +48,201 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 return Route110_TrickHousePuzzle3_EventScript_161F9F:: @ 8161F9F - setmaptile 5, 20, 601, 0 + setmetatile 5, 20, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FA9:: @ 8161FA9 - setmaptile 4, 12, 601, 0 + setmetatile 4, 12, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FB3:: @ 8161FB3 - setmaptile 11, 10, 601, 0 + setmetatile 11, 10, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FBD:: @ 8161FBD - setmaptile 3, 8, 601, 0 + setmetatile 3, 8, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FC7:: @ 8161FC7 - setmaptile 13, 7, 601, 0 + setmetatile 13, 7, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FD1:: @ 8161FD1 - setmaptile 1, 3, 601, 0 + setmetatile 1, 3, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FDB:: @ 8161FDB - setmaptile 10, 2, 601, 0 + setmetatile 10, 2, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FE5:: @ 8161FE5 - setmaptile 1, 6, 587, 0 - setmaptile 2, 6, 588, 0 - setmaptile 1, 7, 595, 0 - setmaptile 2, 7, 596, 0 - setmaptile 4, 9, 587, 0 - setmaptile 5, 9, 588, 0 - setmaptile 4, 10, 595, 0 - setmaptile 5, 10, 596, 0 - setmaptile 4, 18, 587, 0 - setmaptile 5, 18, 588, 0 - setmaptile 4, 19, 595, 0 - setmaptile 5, 19, 596, 0 - setmaptile 7, 3, 587, 0 - setmaptile 8, 3, 588, 0 - setmaptile 7, 4, 595, 0 - setmaptile 8, 4, 596, 0 - setmaptile 7, 9, 587, 0 - setmaptile 8, 9, 588, 0 - setmaptile 7, 10, 595, 0 - setmaptile 8, 10, 596, 0 - setmaptile 7, 18, 587, 0 - setmaptile 8, 18, 588, 0 - setmaptile 7, 19, 595, 0 - setmaptile 8, 19, 596, 0 - setmaptile 13, 3, 587, 0 - setmaptile 14, 3, 588, 0 - setmaptile 13, 4, 595, 0 - setmaptile 14, 4, 596, 0 - setmaptile 13, 9, 587, 0 - setmaptile 14, 9, 588, 0 - setmaptile 13, 10, 595, 0 - setmaptile 14, 10, 596, 0 - setmaptile 13, 15, 587, 0 - setmaptile 14, 15, 588, 0 - setmaptile 13, 16, 595, 0 - setmaptile 14, 16, 596, 0 - setmaptile 3, 13, 589, 1 - setmaptile 3, 14, 597, 0 - setmaptile 6, 7, 589, 1 - setmaptile 6, 8, 597, 0 - setmaptile 9, 16, 589, 1 - setmaptile 9, 17, 597, 0 - setmaptile 12, 4, 589, 1 - setmaptile 12, 5, 597, 0 - setmaptile 12, 10, 589, 1 - setmaptile 12, 11, 597, 0 - setmaptile 1, 15, 568, 0 - setmaptile 2, 15, 569, 0 - setmaptile 1, 16, 576, 1 - setmaptile 2, 16, 577, 1 - setmaptile 4, 6, 568, 0 - setmaptile 5, 6, 569, 0 - setmaptile 4, 7, 576, 1 - setmaptile 5, 7, 577, 1 - setmaptile 7, 12, 568, 0 - setmaptile 8, 12, 569, 0 - setmaptile 7, 13, 576, 1 - setmaptile 8, 13, 577, 1 - setmaptile 10, 12, 568, 0 - setmaptile 11, 12, 569, 0 - setmaptile 10, 13, 576, 1 - setmaptile 11, 13, 577, 1 - setmaptile 10, 18, 568, 0 - setmaptile 11, 18, 569, 0 - setmaptile 10, 19, 576, 1 - setmaptile 11, 19, 577, 1 - setmaptile 3, 4, 570, 1 - setmaptile 3, 5, 578, 1 - setmaptile 6, 10, 570, 1 - setmaptile 6, 11, 578, 1 - setmaptile 6, 13, 570, 1 - setmaptile 6, 14, 578, 1 - setmaptile 6, 16, 570, 1 - setmaptile 6, 17, 578, 1 - setmaptile 9, 4, 570, 1 - setmaptile 9, 5, 578, 1 - setmaptile 9, 7, 570, 1 - setmaptile 9, 8, 578, 1 - setmaptile 12, 13, 570, 1 - setmaptile 12, 14, 578, 1 - setmaptile 12, 16, 570, 1 - setmaptile 12, 17, 578, 1 + setmetatile 1, 6, 587, 0 + setmetatile 2, 6, 588, 0 + setmetatile 1, 7, 595, 0 + setmetatile 2, 7, 596, 0 + setmetatile 4, 9, 587, 0 + setmetatile 5, 9, 588, 0 + setmetatile 4, 10, 595, 0 + setmetatile 5, 10, 596, 0 + setmetatile 4, 18, 587, 0 + setmetatile 5, 18, 588, 0 + setmetatile 4, 19, 595, 0 + setmetatile 5, 19, 596, 0 + setmetatile 7, 3, 587, 0 + setmetatile 8, 3, 588, 0 + setmetatile 7, 4, 595, 0 + setmetatile 8, 4, 596, 0 + setmetatile 7, 9, 587, 0 + setmetatile 8, 9, 588, 0 + setmetatile 7, 10, 595, 0 + setmetatile 8, 10, 596, 0 + setmetatile 7, 18, 587, 0 + setmetatile 8, 18, 588, 0 + setmetatile 7, 19, 595, 0 + setmetatile 8, 19, 596, 0 + setmetatile 13, 3, 587, 0 + setmetatile 14, 3, 588, 0 + setmetatile 13, 4, 595, 0 + setmetatile 14, 4, 596, 0 + setmetatile 13, 9, 587, 0 + setmetatile 14, 9, 588, 0 + setmetatile 13, 10, 595, 0 + setmetatile 14, 10, 596, 0 + setmetatile 13, 15, 587, 0 + setmetatile 14, 15, 588, 0 + setmetatile 13, 16, 595, 0 + setmetatile 14, 16, 596, 0 + setmetatile 3, 13, 589, 1 + setmetatile 3, 14, 597, 0 + setmetatile 6, 7, 589, 1 + setmetatile 6, 8, 597, 0 + setmetatile 9, 16, 589, 1 + setmetatile 9, 17, 597, 0 + setmetatile 12, 4, 589, 1 + setmetatile 12, 5, 597, 0 + setmetatile 12, 10, 589, 1 + setmetatile 12, 11, 597, 0 + setmetatile 1, 15, 568, 0 + setmetatile 2, 15, 569, 0 + setmetatile 1, 16, 576, 1 + setmetatile 2, 16, 577, 1 + setmetatile 4, 6, 568, 0 + setmetatile 5, 6, 569, 0 + setmetatile 4, 7, 576, 1 + setmetatile 5, 7, 577, 1 + setmetatile 7, 12, 568, 0 + setmetatile 8, 12, 569, 0 + setmetatile 7, 13, 576, 1 + setmetatile 8, 13, 577, 1 + setmetatile 10, 12, 568, 0 + setmetatile 11, 12, 569, 0 + setmetatile 10, 13, 576, 1 + setmetatile 11, 13, 577, 1 + setmetatile 10, 18, 568, 0 + setmetatile 11, 18, 569, 0 + setmetatile 10, 19, 576, 1 + setmetatile 11, 19, 577, 1 + setmetatile 3, 4, 570, 1 + setmetatile 3, 5, 578, 1 + setmetatile 6, 10, 570, 1 + setmetatile 6, 11, 578, 1 + setmetatile 6, 13, 570, 1 + setmetatile 6, 14, 578, 1 + setmetatile 6, 16, 570, 1 + setmetatile 6, 17, 578, 1 + setmetatile 9, 4, 570, 1 + setmetatile 9, 5, 578, 1 + setmetatile 9, 7, 570, 1 + setmetatile 9, 8, 578, 1 + setmetatile 12, 13, 570, 1 + setmetatile 12, 14, 578, 1 + setmetatile 12, 16, 570, 1 + setmetatile 12, 17, 578, 1 return Route110_TrickHousePuzzle3_EventScript_1622C8:: @ 81622C8 - setmaptile 1, 6, 571, 0 - setmaptile 2, 6, 572, 0 - setmaptile 1, 7, 579, 1 - setmaptile 2, 7, 580, 1 - setmaptile 4, 9, 571, 0 - setmaptile 5, 9, 572, 0 - setmaptile 4, 10, 579, 1 - setmaptile 5, 10, 580, 1 - setmaptile 4, 18, 571, 0 - setmaptile 5, 18, 572, 0 - setmaptile 4, 19, 579, 1 - setmaptile 5, 19, 580, 1 - setmaptile 7, 3, 571, 0 - setmaptile 8, 3, 572, 0 - setmaptile 7, 4, 579, 1 - setmaptile 8, 4, 580, 1 - setmaptile 7, 9, 571, 0 - setmaptile 8, 9, 572, 0 - setmaptile 7, 10, 579, 1 - setmaptile 8, 10, 580, 1 - setmaptile 7, 18, 571, 0 - setmaptile 8, 18, 572, 0 - setmaptile 7, 19, 579, 1 - setmaptile 8, 19, 580, 1 - setmaptile 13, 3, 571, 0 - setmaptile 14, 3, 572, 0 - setmaptile 13, 4, 579, 1 - setmaptile 14, 4, 580, 1 - setmaptile 13, 9, 571, 0 - setmaptile 14, 9, 572, 0 - setmaptile 13, 10, 579, 1 - setmaptile 14, 10, 580, 1 - setmaptile 13, 15, 571, 0 - setmaptile 14, 15, 572, 0 - setmaptile 13, 16, 579, 1 - setmaptile 14, 16, 580, 1 - setmaptile 3, 13, 573, 1 - setmaptile 3, 14, 581, 1 - setmaptile 6, 7, 573, 1 - setmaptile 6, 8, 581, 1 - setmaptile 9, 16, 573, 1 - setmaptile 9, 17, 581, 1 - setmaptile 12, 4, 573, 1 - setmaptile 12, 5, 581, 1 - setmaptile 12, 10, 573, 1 - setmaptile 12, 11, 581, 1 - setmaptile 1, 15, 584, 0 - setmaptile 2, 15, 585, 0 - setmaptile 1, 16, 592, 0 - setmaptile 2, 16, 593, 0 - setmaptile 4, 6, 584, 0 - setmaptile 5, 6, 585, 0 - setmaptile 4, 7, 592, 0 - setmaptile 5, 7, 593, 0 - setmaptile 7, 12, 584, 0 - setmaptile 8, 12, 585, 0 - setmaptile 7, 13, 592, 0 - setmaptile 8, 13, 593, 0 - setmaptile 10, 12, 584, 0 - setmaptile 11, 12, 585, 0 - setmaptile 10, 13, 592, 0 - setmaptile 11, 13, 593, 0 - setmaptile 10, 18, 584, 0 - setmaptile 11, 18, 585, 0 - setmaptile 10, 19, 592, 0 - setmaptile 11, 19, 593, 0 - setmaptile 3, 4, 586, 1 - setmaptile 3, 5, 594, 0 - setmaptile 6, 10, 586, 1 - setmaptile 6, 11, 594, 0 - setmaptile 6, 13, 586, 1 - setmaptile 6, 14, 594, 0 - setmaptile 6, 16, 586, 1 - setmaptile 6, 17, 594, 0 - setmaptile 9, 4, 586, 1 - setmaptile 9, 5, 594, 0 - setmaptile 9, 7, 586, 1 - setmaptile 9, 8, 594, 0 - setmaptile 12, 13, 586, 1 - setmaptile 12, 14, 594, 0 - setmaptile 12, 16, 586, 1 - setmaptile 12, 17, 594, 0 + setmetatile 1, 6, 571, 0 + setmetatile 2, 6, 572, 0 + setmetatile 1, 7, 579, 1 + setmetatile 2, 7, 580, 1 + setmetatile 4, 9, 571, 0 + setmetatile 5, 9, 572, 0 + setmetatile 4, 10, 579, 1 + setmetatile 5, 10, 580, 1 + setmetatile 4, 18, 571, 0 + setmetatile 5, 18, 572, 0 + setmetatile 4, 19, 579, 1 + setmetatile 5, 19, 580, 1 + setmetatile 7, 3, 571, 0 + setmetatile 8, 3, 572, 0 + setmetatile 7, 4, 579, 1 + setmetatile 8, 4, 580, 1 + setmetatile 7, 9, 571, 0 + setmetatile 8, 9, 572, 0 + setmetatile 7, 10, 579, 1 + setmetatile 8, 10, 580, 1 + setmetatile 7, 18, 571, 0 + setmetatile 8, 18, 572, 0 + setmetatile 7, 19, 579, 1 + setmetatile 8, 19, 580, 1 + setmetatile 13, 3, 571, 0 + setmetatile 14, 3, 572, 0 + setmetatile 13, 4, 579, 1 + setmetatile 14, 4, 580, 1 + setmetatile 13, 9, 571, 0 + setmetatile 14, 9, 572, 0 + setmetatile 13, 10, 579, 1 + setmetatile 14, 10, 580, 1 + setmetatile 13, 15, 571, 0 + setmetatile 14, 15, 572, 0 + setmetatile 13, 16, 579, 1 + setmetatile 14, 16, 580, 1 + setmetatile 3, 13, 573, 1 + setmetatile 3, 14, 581, 1 + setmetatile 6, 7, 573, 1 + setmetatile 6, 8, 581, 1 + setmetatile 9, 16, 573, 1 + setmetatile 9, 17, 581, 1 + setmetatile 12, 4, 573, 1 + setmetatile 12, 5, 581, 1 + setmetatile 12, 10, 573, 1 + setmetatile 12, 11, 581, 1 + setmetatile 1, 15, 584, 0 + setmetatile 2, 15, 585, 0 + setmetatile 1, 16, 592, 0 + setmetatile 2, 16, 593, 0 + setmetatile 4, 6, 584, 0 + setmetatile 5, 6, 585, 0 + setmetatile 4, 7, 592, 0 + setmetatile 5, 7, 593, 0 + setmetatile 7, 12, 584, 0 + setmetatile 8, 12, 585, 0 + setmetatile 7, 13, 592, 0 + setmetatile 8, 13, 593, 0 + setmetatile 10, 12, 584, 0 + setmetatile 11, 12, 585, 0 + setmetatile 10, 13, 592, 0 + setmetatile 11, 13, 593, 0 + setmetatile 10, 18, 584, 0 + setmetatile 11, 18, 585, 0 + setmetatile 10, 19, 592, 0 + setmetatile 11, 19, 593, 0 + setmetatile 3, 4, 586, 1 + setmetatile 3, 5, 594, 0 + setmetatile 6, 10, 586, 1 + setmetatile 6, 11, 594, 0 + setmetatile 6, 13, 586, 1 + setmetatile 6, 14, 594, 0 + setmetatile 6, 16, 586, 1 + setmetatile 6, 17, 594, 0 + setmetatile 9, 4, 586, 1 + setmetatile 9, 5, 594, 0 + setmetatile 9, 7, 586, 1 + setmetatile 9, 8, 594, 0 + setmetatile 12, 13, 586, 1 + setmetatile 12, 14, 594, 0 + setmetatile 12, 16, 586, 1 + setmetatile 12, 17, 594, 0 return Route110_TrickHousePuzzle3_EventScript_1625AB:: @ 81625AB diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 222a71138..4b9031715 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -401,7 +401,7 @@ Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 closemessage msgbox Route110_TrickHousePuzzle5_Text_19D615, 4 closemessage - warp Route110_TrickHousePuzzle5, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 waitstate releaseall end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 3361e3e9d..4ff925639 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -10,76 +10,76 @@ Route110_TrickHousePuzzle7_MapScript1_163161:: @ 8163161 end Route110_TrickHousePuzzle7_EventScript_163167:: @ 8163167 - checkflag 194 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 call_if 1, Route110_TrickHousePuzzle7_EventScript_163195 - checkflag 195 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631A8 - checkflag 196 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631BB - checkflag 197 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631CE - checkflag 198 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631E1 return Route110_TrickHousePuzzle7_EventScript_163195:: @ 8163195 - setmaptile 13, 17, 610, 0 - setmaptile 12, 16, 575, 1 + setmetatile 13, 17, 610, 0 + setmetatile 12, 16, 575, 1 return Route110_TrickHousePuzzle7_EventScript_1631A8:: @ 81631A8 - setmaptile 12, 13, 610, 0 - setmaptile 12, 11, 575, 1 + setmetatile 12, 13, 610, 0 + setmetatile 12, 11, 575, 1 return Route110_TrickHousePuzzle7_EventScript_1631BB:: @ 81631BB - setmaptile 7, 12, 610, 0 - setmaptile 5, 10, 575, 1 + setmetatile 7, 12, 610, 0 + setmetatile 5, 10, 575, 1 return Route110_TrickHousePuzzle7_EventScript_1631CE:: @ 81631CE - setmaptile 6, 6, 636, 0 - setmaptile 4, 4, 575, 1 + setmetatile 6, 6, 636, 0 + setmetatile 4, 4, 575, 1 return Route110_TrickHousePuzzle7_EventScript_1631E1:: @ 81631E1 - setmaptile 8, 4, 609, 0 - setmaptile 7, 5, 575, 1 + setmetatile 8, 4, 609, 0 + setmetatile 7, 5, 575, 1 return Route110_TrickHousePuzzle7_EventScript_1631F4:: @ 81631F4 - setmaptile 13, 17, 611, 0 - setmaptile 12, 16, 574, 1 + setmetatile 13, 17, 611, 0 + setmetatile 12, 16, 574, 1 return Route110_TrickHousePuzzle7_EventScript_163207:: @ 8163207 - setmaptile 12, 13, 609, 0 - setmaptile 12, 11, 574, 1 + setmetatile 12, 13, 609, 0 + setmetatile 12, 11, 574, 1 return Route110_TrickHousePuzzle7_EventScript_16321A:: @ 816321A - setmaptile 7, 12, 611, 0 - setmaptile 5, 10, 574, 1 + setmetatile 7, 12, 611, 0 + setmetatile 5, 10, 574, 1 return Route110_TrickHousePuzzle7_EventScript_16322D:: @ 816322D - setmaptile 6, 6, 635, 0 - setmaptile 4, 4, 574, 1 + setmetatile 6, 6, 635, 0 + setmetatile 4, 4, 574, 1 return Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240 - setmaptile 8, 4, 608, 0 - setmaptile 7, 5, 574, 1 + setmetatile 8, 4, 608, 0 + setmetatile 7, 5, 574, 1 return Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 compare 0x40b6, 1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16326E - clearflag 194 - clearflag 195 - clearflag 196 - clearflag 197 - clearflag 198 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 end Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E @@ -113,7 +113,7 @@ Route110_TrickHousePuzzle7_EventScript_16329D:: @ 816329D Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 lockall setvar 0x40b6, 1 - warpteleport Route110_TrickHousePuzzle7, 255, 3, 19 + warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19 waitstate releaseall end @@ -121,125 +121,125 @@ Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 lockall delay 32 - checkflag 194 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 call_if 0, Route110_TrickHousePuzzle7_EventScript_163195 - checkflag 194 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631F4 special DrawWholeMapView playse 36 - checkflag 194 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633A4 - checkflag 194 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633A9 end Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 lockall delay 32 - checkflag 195 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631A8 - checkflag 195 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 call_if 1, Route110_TrickHousePuzzle7_EventScript_163207 special DrawWholeMapView playse 36 - checkflag 195 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633AE - checkflag 195 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633B3 end Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 lockall delay 32 - checkflag 196 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631BB - checkflag 196 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 call_if 1, Route110_TrickHousePuzzle7_EventScript_16321A special DrawWholeMapView playse 36 - checkflag 196 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633B8 - checkflag 196 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633BD end Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 lockall delay 32 - checkflag 197 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631CE - checkflag 197 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 call_if 1, Route110_TrickHousePuzzle7_EventScript_16322D special DrawWholeMapView playse 36 - checkflag 197 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633C2 - checkflag 197 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633C7 end Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375 lockall delay 32 - checkflag 198 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631E1 - checkflag 198 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 call_if 1, Route110_TrickHousePuzzle7_EventScript_163240 special DrawWholeMapView playse 36 - checkflag 198 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633CC - checkflag 198 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633D1 end Route110_TrickHousePuzzle7_EventScript_1633A4:: @ 81633A4 - setflag 194 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 releaseall end Route110_TrickHousePuzzle7_EventScript_1633A9:: @ 81633A9 - clearflag 194 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 releaseall end Route110_TrickHousePuzzle7_EventScript_1633AE:: @ 81633AE - setflag 195 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 releaseall end Route110_TrickHousePuzzle7_EventScript_1633B3:: @ 81633B3 - clearflag 195 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 releaseall end Route110_TrickHousePuzzle7_EventScript_1633B8:: @ 81633B8 - setflag 196 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 releaseall end Route110_TrickHousePuzzle7_EventScript_1633BD:: @ 81633BD - clearflag 196 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 releaseall end Route110_TrickHousePuzzle7_EventScript_1633C2:: @ 81633C2 - setflag 197 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 releaseall end Route110_TrickHousePuzzle7_EventScript_1633C7:: @ 81633C7 - clearflag 197 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 releaseall end Route110_TrickHousePuzzle7_EventScript_1633CC:: @ 81633CC - setflag 198 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 releaseall end Route110_TrickHousePuzzle7_EventScript_1633D1:: @ 81633D1 - clearflag 198 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 releaseall end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 545e62921..0a7e6befc 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -4,13 +4,13 @@ Route111_MapScripts:: @ 814FF91 .byte 0 Route111_MapScript1_14FF9C:: @ 814FF9C - checkflag 228 + checkflag FLAG_REGI_DOORS_OPENED call_if 0, Route111_EventScript_14FFA6 end Route111_EventScript_14FFA6:: @ 814FFA6 - setmaptile 29, 86, 124, 1 - setmaptile 29, 87, 145, 1 + setmetatile 29, 86, 124, 1 + setmetatile 29, 87, 145, 1 return Route111_MapScript1_14FFB9:: @ 814FFB9 @@ -40,10 +40,10 @@ Route111_EventScript_15000C:: @ 815000C return Route111_EventScript_15000D:: @ 815000D - clearflag 768 - setflag 769 - setflag 770 - setflag 771 + clearflag FLAG_HIDE_VICTOR_WINSTRATE + setflag FLAG_HIDE_VICTORIA_WINSTRATE + setflag FLAG_HIDE_VIVI_WINSTRATE + setflag FLAG_HIDE_VICKI_WINSTRATE cleartrainerflag OPPONENT_VICTOR cleartrainerflag OPPONENT_VICTORIA cleartrainerflag OPPONENT_VIVI @@ -54,10 +54,10 @@ Route111_EventScript_150023:: @ 8150023 msgbox Route111_Text_16FA54, 5 compare RESULT, 0 goto_if_eq Route111_EventScript_15005F - giveitem ITEM_ROOT_FOSSIL + giveitem_std ITEM_ROOT_FOSSIL closemessage - setflag 963 - setflag 964 + setflag FLAG_HIDE_ROOT_FOSSIL + setflag FLAG_HIDE_CLAW_FOSSIL removeobject 34 delay 30 applymovement 35, Route111_Movement_1500AF @@ -76,10 +76,10 @@ Route111_EventScript_150069:: @ 8150069 msgbox Route111_Text_16FAED, 5 compare RESULT, 0 goto_if_eq Route111_EventScript_1500A5 - giveitem ITEM_CLAW_FOSSIL + giveitem_std ITEM_CLAW_FOSSIL closemessage - setflag 964 - setflag 963 + setflag FLAG_HIDE_CLAW_FOSSIL + setflag FLAG_HIDE_ROOT_FOSSIL removeobject 35 delay 30 applymovement 34, Route111_Movement_1500AF @@ -121,13 +121,13 @@ Route111_EventScript_1500C5:: @ 81500C5 lock faceplayer dodailyevents - checkflag 2252 + checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111 goto_if_eq Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 - giveitem ITEM_RAZZ_BERRY + giveitem_std ITEM_RAZZ_BERRY compare RESULT, 0 goto_if_eq Route111_EventScript_1A029B - setflag 2252 + setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111 special GetPlayerBigGuyGirlString msgbox Route111_Text_1C5781, 4 release @@ -236,7 +236,7 @@ Route111_EventScript_1501C9:: @ 81501C9 Route111_EventScript_1501D1:: @ 81501D1 lock faceplayer - setflag 2115 + setflag FLAG_LANDMARK_WINSTRATE_FAMILY msgbox Route111_Text_16F705, 5 compare RESULT, 1 goto_if_eq Route111_EventScript_1501F3 diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc index 5576a44ff..c0fb6f489 100644 --- a/data/scripts/maps/Route111_OldLadysRestStop.inc +++ b/data/scripts/maps/Route111_OldLadysRestStop.inc @@ -3,7 +3,7 @@ Route111_OldLadysRestStop_MapScripts:: @ 815BFD1 .byte 0 Route111_OldLadysRestStop_MapScript1_15BFD7:: @ 815BFD7 - setflag 2113 + setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP end Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index d9a94ce75..981971e41 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -13,13 +13,13 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A lock faceplayer setvar 0x8008, 3 - checkflag 277 + checkflag FLAG_RECEIVED_MACHO_BRACE goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 - giveitem ITEM_MACHO_BRACE + giveitem_std ITEM_MACHO_BRACE compare RESULT, 0 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B - setflag 277 + setflag FLAG_RECEIVED_MACHO_BRACE goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end @@ -40,10 +40,10 @@ Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95 lock faceplayer setvar 0x8008, 4 - checkflag 4 + checkflag FLAG_TEMP_4 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BFB6 msgbox Route111_WinstrateFamilysHouse_Text_192219, 4 - setflag 4 + setflag FLAG_TEMP_4 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 22534aa77..d414ca8ed 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -4,7 +4,7 @@ Route112_CableCarStation_MapScripts:: @ 815C033 .byte 0 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E - setescapewarp Route112, 255, 28, 28 + setescapewarp MAP_ROUTE112, 255, 28, 28 compare 0x40a3, 2 call_if 1, Route112_CableCarStation_EventScript_15C052 end diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 2eb34cdf3..37fd0ed3f 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -4,7 +4,7 @@ Route113_MapScripts:: @ 81505CC .byte 0 Route113_MapScript1_1505D7:: @ 81505D7 - tileeffect 1 + setstepcallback 1 end Route113_MapScript1_1505DA:: @ 81505DA diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index d0b608339..8d853b88d 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -3,7 +3,7 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A .byte 0 Route113_GlassWorkshop_MapScript1_163550:: @ 8163550 - setflag 2116 + setflag FLAG_LANDMARK_GLASS_WORKSHOP compare 0x40be, 1 call_if 1, Route113_GlassWorkshop_EventScript_16355F end @@ -22,7 +22,7 @@ Route113_GlassWorkshop_EventScript_163565:: @ 8163565 compare 0x40be, 1 goto_if_eq Route113_GlassWorkshop_EventScript_1635AB msgbox Route113_GlassWorkshop_Text_19E4E6, 4 - giveitem ITEM_SOOT_SACK + giveitem_std ITEM_SOOT_SACK setvar 0x40be, 1 msgbox Route113_GlassWorkshop_Text_19E59B, 4 release @@ -68,7 +68,7 @@ Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE Route113_GlassWorkshop_EventScript_163660:: @ 8163660 setvar 0x8008, 39 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 setvar 0x800a, 250 compare 0x4048, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -82,7 +82,7 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 Route113_GlassWorkshop_EventScript_16369C:: @ 816369C setvar 0x8008, 40 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 setvar 0x800a, 500 compare 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -96,7 +96,7 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 setvar 0x8008, 41 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 setvar 0x800a, 500 compare 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -110,7 +110,7 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 Route113_GlassWorkshop_EventScript_163714:: @ 8163714 setvar 0x8008, 43 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 setvar 0x800a, 1000 compare 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -124,7 +124,7 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 Route113_GlassWorkshop_EventScript_163750:: @ 8163750 setvar 0x8008, 42 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 setvar 0x800a, 1000 compare 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -139,7 +139,7 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar 0x8009, 1 setvar 0x8008, 13 - getdecorname 0, 0x8008 + bufferdecorationname 0, 0x8008 setvar 0x800a, 6000 compare 0x4048, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -154,7 +154,7 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar 0x8009, 1 setvar 0x8008, 6 - getdecorname 0, 0x8008 + bufferdecorationname 0, 0x8008 setvar 0x800a, 8000 compare 0x4048, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -174,14 +174,14 @@ Route113_GlassWorkshop_EventScript_16380E:: @ 816380E Route113_GlassWorkshop_EventScript_163818:: @ 8163818 setvar 0x800a, 250 subvar 0x800a, 16456 - getnumberstring 0, 32778 + buffernumberstring 0, 32778 msgbox Route113_GlassWorkshop_Text_19E697, 4 release end Route113_GlassWorkshop_EventScript_163830:: @ 8163830 subvar 0x800a, 16456 - getnumberstring 1, 32778 + buffernumberstring 1, 32778 message Route113_GlassWorkshop_Text_19E890 waitmessage goto Route113_GlassWorkshop_EventScript_1635EE @@ -210,13 +210,13 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 end Route113_GlassWorkshop_EventScript_163889:: @ 8163889 - giveitem 0x8008 + giveitem_std 0x8008 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 return Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 - givedecoration 0x8008 + givedecoration_std 0x8008 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638C3 return @@ -247,49 +247,49 @@ Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 Route113_GlassWorkshop_EventScript_163925:: @ 8163925 setvar 0x8009, 0 setvar 0x8008, 39 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163939:: @ 8163939 setvar 0x8009, 0 setvar 0x8008, 40 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16394D:: @ 816394D setvar 0x8009, 0 setvar 0x8008, 41 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163961:: @ 8163961 setvar 0x8009, 0 setvar 0x8008, 43 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163975:: @ 8163975 setvar 0x8009, 0 setvar 0x8008, 42 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163989:: @ 8163989 setvar 0x8009, 1 setvar 0x8008, 13 - getdecorname 0, 13 + bufferdecorationname 0, 13 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16399D:: @ 816399D setvar 0x8009, 1 setvar 0x8008, 6 - getdecorname 0, 6 + bufferdecorationname 0, 6 goto Route113_GlassWorkshop_EventScript_1639B1 end diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 0730db23a..302c162b0 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -5,16 +5,16 @@ Route114_EventScript_150733:: @ 8150733 lock faceplayer dodailyevents - checkflag 2251 + checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 goto_if_eq Route114_EventScript_150778 msgbox Route114_Text_1C5803, 4 random 5 addvar RESULT, 15 addvar RESULT, 133 - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B - setflag 2251 + setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 msgbox Route114_Text_1C5861, 4 release end @@ -27,13 +27,13 @@ Route114_EventScript_150778:: @ 8150778 Route114_EventScript_150782:: @ 8150782 lock faceplayer - checkflag 231 + checkflag FLAG_RECEIVED_TM05 goto_if_eq Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 - giveitem ITEM_TM05 + giveitem_std ITEM_TM05 compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B - setflag 231 + setflag FLAG_RECEIVED_TM05 msgbox Route114_Text_1701C5, 4 release end @@ -47,9 +47,9 @@ Route114_EventScript_1507C3:: @ 81507C3 lock faceplayer waitse - playpokecry SPECIES_POOCHYENA, 2 + playmoncry SPECIES_POOCHYENA, 2 msgbox Route114_Text_1701F9, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index b217f24c4..1a1445fde 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -3,19 +3,19 @@ Route114_FossilManiacsHouse_MapScripts:: @ 815C1B9 .byte 0 Route114_FossilManiacsHouse_MapScript1_15C1BF:: @ 815C1BF - setflag 2135 + setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE end Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 lock faceplayer - checkflag 261 + checkflag FLAG_RECEIVED_TM28 goto_if_eq Route114_FossilManiacsHouse_EventScript_15C1F2 msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 - giveitem ITEM_TM28 + giveitem_std ITEM_TM28 compare RESULT, 0 goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B - setflag 261 + setflag FLAG_RECEIVED_TM28 release end diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/scripts/maps/Route114_FossilManiacsTunnel.inc index 13843f758..2ce9c1bfa 100644 --- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc +++ b/data/scripts/maps/Route114_FossilManiacsTunnel.inc @@ -4,7 +4,7 @@ Route114_FossilManiacsTunnel_MapScripts:: @ 815C20E Route114_FossilManiacsTunnel_EventScript_15C20F:: @ 815C20F lock faceplayer - checkflag 267 + checkflag FLAG_RECEIVED_FOSSIL_MON goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C24E checkitem ITEM_ROOT_FOSSIL, 1 compare RESULT, 1 diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index e4334647c..f8ff5de73 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -3,24 +3,24 @@ Route114_LanettesHouse_MapScripts:: @ 815C258 .byte 0 Route114_LanettesHouse_MapScript1_15C25E:: @ 815C25E - setflag 2117 + setflag FLAG_LANDMARK_LANETTES_HOUSE end Route114_LanettesHouse_EventScript_15C262:: @ 815C262 lock faceplayer - checkflag 131 + checkflag FLAG_RECEIVED_DOLL_LANETTE goto_if_eq Route114_LanettesHouse_EventScript_15C28F - setflag 2123 + setflag FLAG_SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_192A0D, 4 .ifdef SAPPHIRE - givedecoration 99 + givedecoration_std DECOR_LOTAD_DOLL .else - givedecoration 100 + givedecoration_std DECOR_SEEDOT_DOLL .endif compare RESULT, 0 goto_if_eq Route114_LanettesHouse_EventScript_1A02AE - setflag 131 + setflag FLAG_RECEIVED_DOLL_LANETTE release end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index beb01e083..9aadedb32 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -3,7 +3,7 @@ Route116_MapScripts:: @ 8150A31 .byte 0 Route116_MapScript1_150A37:: @ 8150A37 - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS call_if 1, Route116_EventScript_150A41 end @@ -14,9 +14,9 @@ Route116_EventScript_150A41:: @ 8150A41 Route116_EventScript_150A49:: @ 8150A49 lock faceplayer - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS goto_if_eq Route116_EventScript_150A67 - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq Route116_EventScript_150A71 msgbox Route116_Text_1703CF, 4 release @@ -35,15 +35,15 @@ Route116_EventScript_150A71:: @ 8150A71 Route116_EventScript_150A7B:: @ 8150A7B lock faceplayer - checkflag 287 + checkflag FLAG_MET_DEVON_EMPLOYEE goto_if_eq Route116_EventScript_150B04 msgbox Route116_Text_1705AE, 4 goto Route116_EventScript_150A94 end Route116_EventScript_150A94:: @ 8150A94 - setflag 287 - giveitem ITEM_REPEAT_BALL + setflag FLAG_MET_DEVON_EMPLOYEE + giveitem_std ITEM_REPEAT_BALL compare RESULT, 0 goto_if_eq Route116_EventScript_150B12 msgbox Route116_Text_1707B8, 4 @@ -57,8 +57,8 @@ Route116_EventScript_150A94:: @ 8150A94 compare FACING, 4 call_if 1, Route116_EventScript_150AF9 removeobject LAST_TALKED - clearflag 949 - setflag 256 + clearflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F + setflag FLAG_RECEIVED_REPEAT_BALL release end diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/scripts/maps/Route116_TunnelersRestHouse.inc index 10991c38c..24091c4ac 100644 --- a/data/scripts/maps/Route116_TunnelersRestHouse.inc +++ b/data/scripts/maps/Route116_TunnelersRestHouse.inc @@ -3,7 +3,7 @@ Route116_TunnelersRestHouse_MapScripts:: @ 815C2DE .byte 0 Route116_TunnelersRestHouse_MapScript1_15C2E4:: @ 815C2E4 - setflag 2138 + setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE end Route116_TunnelersRestHouse_EventScript_15C2E8:: @ 815C2E8 @@ -17,7 +17,7 @@ Route116_TunnelersRestHouse_EventScript_15C2F1:: @ 815C2F1 Route116_TunnelersRestHouse_EventScript_15C2FA:: @ 815C2FA lock faceplayer - checkflag 199 + checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_if_eq Route116_TunnelersRestHouse_EventScript_15C30F msgbox Route116_TunnelersRestHouse_Text_193135, 4 release diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 40affd3fd..44c4c156c 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -7,7 +7,7 @@ Route117_MapScript1_150D40:: @ 8150D40 end Route117_EventScript_150D46:: @ 8150D46 - checkflag 134 + checkflag FLAG_PENDING_DAYCARE_EGG goto_if 0, Route117_EventScript_150D56 setobjectxyperm 3, 47, 6 diff --git a/data/scripts/maps/Route117_PokemonDayCare.inc b/data/scripts/maps/Route117_PokemonDayCare.inc index 2a3ee79e1..9ad740b4e 100644 --- a/data/scripts/maps/Route117_PokemonDayCare.inc +++ b/data/scripts/maps/Route117_PokemonDayCare.inc @@ -3,5 +3,5 @@ Route117_PokemonDayCare_MapScripts:: @ 815C319 .byte 0 Route117_PokemonDayCare_MapScript1_15C31F:: @ 815C31F - setflag 2118 + setflag FLAG_LANDMARK_POKEMON_DAYCARE end diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index b96346f15..ca69e01c4 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -9,7 +9,7 @@ Route118_MapScript1_150F2E:: @ 8150F2E Route118_EventScript_150F34:: @ 8150F34 lock faceplayer - checkflag 227 + checkflag FLAG_RECEIVED_GOOD_ROD goto_if_eq Route118_EventScript_150F89 msgbox Route118_Text_170F12, 5 compare RESULT, 1 @@ -20,8 +20,8 @@ Route118_EventScript_150F34:: @ 8150F34 Route118_EventScript_150F5E:: @ 8150F5E msgbox Route118_Text_170F46, 4 - giveitem ITEM_GOOD_ROD - setflag 227 + giveitem_std ITEM_GOOD_ROD + setflag FLAG_RECEIVED_GOOD_ROD msgbox Route118_Text_170F7E, 4 release end diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 2179a7e18..aff1254a9 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -4,7 +4,7 @@ Route119_MapScripts:: @ 8151167 .byte 0 Route119_MapScript1_151172:: @ 8151172 - checkflag 2145 + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, Route119_EventScript_15117C end @@ -33,8 +33,8 @@ Route119_MapScript1_15119B:: @ 815119B end Route119_EventScript_1511B9:: @ 81511B9 - setflag 893 - clearflag 892 + setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F + clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F setvar 0x40b3, 2 return @@ -148,8 +148,8 @@ Route119_EventScript_151337:: @ 8151337 end Route119_EventScript_151352:: @ 8151352 - giveitem ITEM_HM02 - setflag 110 + giveitem_std ITEM_HM02 + setflag FLAG_RECEIVED_HM02 return Route119_EventScript_151362:: @ 8151362 diff --git a/data/scripts/maps/Route119_House.inc b/data/scripts/maps/Route119_House.inc index 42cc89068..76763c68e 100644 --- a/data/scripts/maps/Route119_House.inc +++ b/data/scripts/maps/Route119_House.inc @@ -9,8 +9,8 @@ Route119_House_EventScript_163DE7:: @ 8163DE7 lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox Route119_House_Text_19F406, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index ac64904a2..991725b8c 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -39,10 +39,10 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 msgbox Route119_WeatherInstitute_2F_Text_19F11B, 4 closemessage setvar 0x40b3, 1 - clearflag 893 + clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F fadedefaultbgm fadescreen 1 - setflag 890 + setflag FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE removeobject 1 removeobject 2 removeobject 3 @@ -55,15 +55,15 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A msgbox Route119_WeatherInstitute_2F_Text_19F1CF, 4 - countpokemon + getpartysize compare RESULT, 6 goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 playfanfare 370 message Route119_WeatherInstitute_2F_Text_19F267 waitfanfare waitmessage - givepoke SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 - setflag 151 + givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 + setflag FLAG_RECEIVED_CASTFORM msgbox Route119_WeatherInstitute_2F_Text_19F27D, 4 release end @@ -87,7 +87,7 @@ Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8 Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC lock faceplayer - checkflag 151 + checkflag FLAG_RECEIVED_CASTFORM goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DBE goto Route119_WeatherInstitute_2F_EventScript_163D7A end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 868d00324..cd84f95af 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -5,7 +5,7 @@ Route120_MapScripts:: @ 815160E .byte 0 Route120_MapScript1_15161E:: @ 815161E - checkflag 2145 + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, Route120_EventScript_151628 end @@ -50,24 +50,24 @@ Route120_EventScript_151682:: @ 8151682 return Route120_MapScript1_151686:: @ 8151686 - checkflag 228 + checkflag FLAG_REGI_DOORS_OPENED call_if 0, Route120_EventScript_1516A2 - checkflag 285 + checkflag FLAG_RECEIVED_DEVON_SCOPE call_if 1, Route120_EventScript_1516B5 - checkflag 285 + checkflag FLAG_RECEIVED_DEVON_SCOPE call_if 0, Route120_EventScript_1516DA end Route120_EventScript_1516A2:: @ 81516A2 - setmaptile 7, 54, 124, 1 - setmaptile 7, 55, 145, 1 + setmetatile 7, 54, 124, 1 + setmetatile 7, 55, 145, 1 return Route120_EventScript_1516B5:: @ 81516B5 - setmaptile 13, 15, 663, 0 - setmaptile 12, 16, 671, 0 - setmaptile 12, 17, 161, 0 - setmaptile 13, 17, 161, 0 + setmetatile 13, 15, 663, 0 + setmetatile 12, 16, 671, 0 + setmetatile 12, 17, 161, 0 + setmetatile 13, 17, 161, 0 return Route120_EventScript_1516DA:: @ 81516DA @@ -113,7 +113,7 @@ Route120_EventScript_151739:: @ 8151739 lock faceplayer dodailyevents - checkflag 2254 + checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 goto_if_eq Route120_EventScript_151837 msgbox Route120_Text_1C58F1, 5 compare RESULT, 1 @@ -135,35 +135,35 @@ Route120_EventScript_151739:: @ 8151739 end Route120_EventScript_1517DC:: @ 81517DC - setvar 0x8004, 143 + setvar 0x8004, ITEM_FIGY_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517E7:: @ 81517E7 - setvar 0x8004, 144 + setvar 0x8004, ITEM_WIKI_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517F2:: @ 81517F2 - setvar 0x8004, 145 + setvar 0x8004, ITEM_MAGO_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517FD:: @ 81517FD - setvar 0x8004, 146 + setvar 0x8004, ITEM_AGUAV_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151808:: @ 8151808 - setvar 0x8004, 147 + setvar 0x8004, ITEM_IAPAPA_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151813:: @ 8151813 - giveitem 0x8004 + giveitem_std 0x8004 compare RESULT, 0 goto_if_eq Route120_EventScript_1A029B - setflag 2254 + setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 msgbox Route120_Text_1C5A0B, 4 release end @@ -184,7 +184,7 @@ Route120_EventScript_15184A:: @ 815184A Route120_EventScript_151853:: @ 8151853 lock faceplayer - checkflag 290 + checkflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120 goto_if_eq Route120_EventScript_151884 msgbox Route120_Text_171827, 5 compare RESULT, 0 @@ -194,7 +194,7 @@ Route120_EventScript_151853:: @ 8151853 Route120_EventScript_151877:: @ 8151877 msgbox Route120_Text_17193D, 4 - setflag 290 + setflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120 release end @@ -222,14 +222,14 @@ Route120_EventScript_15189D:: @ 815189D applymovement 30, Route120_Movement_1A0662 waitmovement 0 waitse - playpokecry SPECIES_KECLEON, 2 + playmoncry SPECIES_KECLEON, 2 delay 40 - waitpokecry + waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE setvar 0x8004, 0 - setflag 2145 + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag 2145 + clearflag FLAG_SYS_CTRL_OBJ_DELETE goto Route120_EventScript_151908 end @@ -238,22 +238,22 @@ Route120_EventScript_151908:: @ 8151908 applymovement 255, Route120_Movement_1A0841 waitmovement 0 msgbox Route120_Text_171A40, 4 - giveitem ITEM_DEVON_SCOPE - setflag 285 + giveitem_std ITEM_DEVON_SCOPE + setflag FLAG_RECEIVED_DEVON_SCOPE msgbox Route120_Text_171B0E, 4 closemessage applymovement 31, Route120_Movement_1A0845 waitmovement 0 delay 50 - setfieldeffect 0, 1 + setfieldeffectargument 0, 1 dofieldeffect 30 delay 15 removeobject 31 waitfieldeffect 30 - setmaptile 13, 15, 663, 0 - setmaptile 12, 16, 671, 0 - setmaptile 12, 17, 161, 0 - setmaptile 13, 17, 161, 0 + setmetatile 13, 15, 663, 0 + setmetatile 12, 16, 671, 0 + setmetatile 12, 17, 161, 0 + setmetatile 13, 17, 161, 0 special DrawWholeMapView release end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 9649271f4..431444dae 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -82,12 +82,12 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 waitmovement 0 special EnterSafariMode setvar 0x40a4, 2 - warp SafariZone_Southeast, 255, 32, 33 + warp MAP_SAFARI_ZONE_SOUTHEAST, 255, 32, 33 waitstate end Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 - countpokemon + getpartysize compare RESULT, 6 goto_if 5, Route121_SafariZoneEntrance_EventScript_15C44F specialvar RESULT, CheckFreePokemonStorageSpace diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 14c5a2dba..adfebfe08 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -9,17 +9,17 @@ Route123_MapScript1_151C59:: @ 8151C59 Route123_EventScript_151C5D:: @ 8151C5D lock faceplayer - checkflag 232 + checkflag FLAG_RECEIVED_TM19 goto_if_eq Route123_EventScript_151CAC msgbox Route123_Text_171D83, 4 special IsGrassTypeInParty compare RESULT, 0 goto_if_eq Route123_EventScript_151CAA msgbox Route123_Text_171DC2, 4 - giveitem ITEM_TM19 + giveitem_std ITEM_TM19 compare RESULT, 0 goto_if_eq Route123_EventScript_1A029B - setflag 232 + setflag FLAG_RECEIVED_TM19 msgbox Route123_Text_171E34, 4 release end diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 64888759d..6948bff87 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -3,28 +3,28 @@ Route123_BerryMastersHouse_MapScripts:: @ 81639DF .byte 0 Route123_BerryMastersHouse_MapScript1_1639E5:: @ 81639E5 - setflag 2147 + setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE end Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 lock faceplayer dodailyevents - checkflag 2253 + checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER goto_if_eq Route123_BerryMastersHouse_EventScript_163A5A msgbox Route123_BerryMastersHouse_Text_1C5BC4, 4 random 10 addvar RESULT, 20 addvar RESULT, 133 - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B - setflag 2253 + setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER msgbox Route123_BerryMastersHouse_Text_1C5C66, 4 random 10 addvar RESULT, 20 addvar RESULT, 133 - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B msgbox Route123_BerryMastersHouse_Text_1C5C83, 4 @@ -40,7 +40,7 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 lock faceplayer dodailyevents - checkflag 2257 + checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE goto_if_eq Route123_BerryMastersHouse_EventScript_163C13 msgbox Route123_BerryMastersHouse_Text_1C5D24, 4 setvar 0x8004, 13 @@ -77,8 +77,8 @@ Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 msgbox Route123_BerryMastersHouse_Text_1C5E0E, 4 random 10 - addvar RESULT, 133 - giveitem RESULT + addvar RESULT, ITEM_CHERI_BERRY + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B goto Route123_BerryMastersHouse_EventScript_163C1D @@ -86,57 +86,57 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 end Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E - checkflag 248 + checkflag FLAG_RECEIVED_SPELON_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem ITEM_SPELON_BERRY + giveitem_std ITEM_SPELON_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B - setflag 248 + setflag FLAG_RECEIVED_SPELON_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F - checkflag 249 + checkflag FLAG_RECEIVED_PAMTRE_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem ITEM_PAMTRE_BERRY + giveitem_std ITEM_PAMTRE_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B - setflag 249 + setflag FLAG_RECEIVED_PAMTRE_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 - checkflag 250 + checkflag FLAG_RECEIVED_WATMEL_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem ITEM_WATMEL_BERRY + giveitem_std ITEM_WATMEL_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B - setflag 250 + setflag FLAG_RECEIVED_WATMEL_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 - checkflag 251 + checkflag FLAG_RECEIVED_DURIN_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem ITEM_DURIN_BERRY + giveitem_std ITEM_DURIN_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B - setflag 251 + setflag FLAG_RECEIVED_DURIN_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 - checkflag 252 + checkflag FLAG_RECEIVED_BELUE_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem ITEM_BELUE_BERRY + giveitem_std ITEM_BELUE_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B - setflag 252 + setflag FLAG_RECEIVED_BELUE_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end @@ -146,7 +146,7 @@ Route123_BerryMastersHouse_EventScript_163C13:: @ 8163C13 end Route123_BerryMastersHouse_EventScript_163C1D:: @ 8163C1D - setflag 2257 + setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE msgbox Route123_BerryMastersHouse_Text_1C5E59, 4 release end diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index ffe4cef97..3e062bfdc 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -3,7 +3,7 @@ Route124_MapScripts:: @ 8151DDF .byte 0 Route124_MapScript1_151DE5:: @ 8151DE5 - checkflag 2090 + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route124_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 7421e94e0..4902d9f08 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -3,16 +3,16 @@ Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8163DFA .byte 0 Route124_DivingTreasureHuntersHouse_MapScript1_163E00:: @ 8163E00 - setflag 2139 + setflag FLAG_LANDMARK_HUNTERS_HOUSE end Route124_DivingTreasureHuntersHouse_EventScript_163E04:: @ 8163E04 lock faceplayer - checkflag 217 + checkflag FLAG_MET_DIVING_TREASURE_HUNTER goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E20 msgbox Route124_DivingTreasureHuntersHouse_Text_19F416, 4 - setflag 217 + setflag FLAG_MET_DIVING_TREASURE_HUNTER goto Route124_DivingTreasureHuntersHouse_EventScript_163E2E end @@ -244,8 +244,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 - getitemname 0, 0x8008 - getitemname 1, 0x8009 + bufferitemname 0, 0x8008 + bufferitemname 1, 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F @@ -259,8 +259,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 end Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 - removeitem 0x8008, 1 - giveitem 0x8009 + takeitem 0x8008, 1 + giveitem_std 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 compare 0x4001, 0 diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 489a7314b..ea24434e2 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -3,7 +3,7 @@ Route125_MapScripts:: @ 8151F1E .byte 0 Route125_MapScript1_151F24:: @ 8151F24 - checkflag 2090 + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route125_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route126.inc b/data/scripts/maps/Route126.inc index 729922681..a89087994 100644 --- a/data/scripts/maps/Route126.inc +++ b/data/scripts/maps/Route126.inc @@ -3,7 +3,7 @@ Route126_MapScripts:: @ 8151FFE .byte 0 Route126_MapScript1_152004:: @ 8152004 - checkflag 2090 + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route126_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc index 284d1fbd4..5fb122821 100644 --- a/data/scripts/maps/Route127.inc +++ b/data/scripts/maps/Route127.inc @@ -3,7 +3,7 @@ Route127_MapScripts:: @ 815206A .byte 0 Route127_MapScript1_152070:: @ 8152070 - checkflag 2090 + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route127_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 615662fc1..a81e73c3e 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -4,7 +4,7 @@ Route128_MapScripts:: @ 815211B .byte 0 Route128_MapScript1_152126:: @ 8152126 - checkflag 2090 + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route128_EventScript_1A02C1 call Route128_EventScript_1A0196 end @@ -52,7 +52,7 @@ Route128_EventScript_15213F:: @ 815213F removeobject 5 removeobject 4 delay 100 - setfieldeffect 0, 1 + setfieldeffectargument 0, 1 dofieldeffect 30 waitfieldeffect 30 addobject 3 @@ -77,7 +77,7 @@ Route128_EventScript_15213F:: @ 815213F applymovement 3, Route128_Movement_1A0845 waitmovement 0 delay 50 - setfieldeffect 0, 1 + setfieldeffectargument 0, 1 dofieldeffect 30 delay 15 removeobject 3 diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index 69da29471..b0381969d 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -6,22 +6,22 @@ Route130_MapScript1_1523C8:: @ 81523C8 specialvar RESULT, IsMirageIslandPresent compare RESULT, 1 goto_if_eq Route130_EventScript_15240C - setflag 17 - setflag 18 - setflag 19 - setflag 20 - setflag 21 - setflag 22 - setflag 23 - setflag 24 - setflag 25 - setflag 26 - setflag 27 - setflag 28 - setflag 29 - setflag 30 - setflag 31 - setflag 32 + setflag FLAG_TEMP_11 + setflag FLAG_TEMP_12 + setflag FLAG_TEMP_13 + setflag FLAG_TEMP_14 + setflag FLAG_TEMP_15 + setflag FLAG_TEMP_16 + setflag FLAG_TEMP_17 + setflag FLAG_TEMP_18 + setflag FLAG_TEMP_19 + setflag FLAG_TEMP_1A + setflag FLAG_TEMP_1B + setflag FLAG_TEMP_1C + setflag FLAG_TEMP_1D + setflag FLAG_TEMP_1E + setflag FLAG_TEMP_1F + setflag FLAG_TEMP_20 setmaplayoutindex 264 end diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc index 50ad4222b..efa26ecd2 100644 --- a/data/scripts/maps/Route131.inc +++ b/data/scripts/maps/Route131.inc @@ -3,7 +3,7 @@ Route131_MapScripts:: @ 815243E .byte 0 Route131_MapScript1_152444:: @ 8152444 - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR call_if 1, Route131_EventScript_15244E end diff --git a/data/scripts/maps/Route134.inc b/data/scripts/maps/Route134.inc index 6b4d330d1..06b53ce31 100644 --- a/data/scripts/maps/Route134.inc +++ b/data/scripts/maps/Route134.inc @@ -3,7 +3,7 @@ Route134_MapScripts:: @ 81525B5 .byte 0 Route134_MapScript1_1525BB:: @ 81525BB - setdivewarp Underwater_Route134, 255, 8, 6 + setdivewarp MAP_UNDERWATER_ROUTE134, 255, 8, 6 end Route134_EventScript_1525C4:: @ 81525C4 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 916eb8108..c45389b9f 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -3,7 +3,7 @@ RustboroCity_MapScripts:: @ 814C372 .byte 0 RustboroCity_MapScript1_14C378:: @ 814C378 - setflag 2073 + setflag FLAG_VISITED_RUSTBORO_CITY call RustboroCity_EventScript_1A0196 call RustboroCity_EventScript_1A014E end @@ -11,7 +11,7 @@ RustboroCity_MapScript1_14C378:: @ 814C378 RustboroCity_EventScript_14C386:: @ 814C386 lock faceplayer - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq RustboroCity_EventScript_14C39B msgbox RustboroCity_Text_16689D, 4 release @@ -36,7 +36,7 @@ RustboroCity_EventScript_14C3B1:: @ 814C3B1 RustboroCity_EventScript_14C3BA:: @ 814C3BA lock faceplayer - checkflag 2055 + checkflag FLAG_BADGE01_GET goto_if_eq RustboroCity_EventScript_14C3CF msgbox RustboroCity_Text_16696D, 4 release @@ -50,7 +50,7 @@ RustboroCity_EventScript_14C3CF:: @ 814C3CF RustboroCity_EventScript_14C3D9:: @ 814C3D9 lock faceplayer - checkflag 188 + checkflag FLAG_RECEIVED_POKENAV goto_if_eq RustboroCity_EventScript_14C3EE msgbox RustboroCity_Text_166B86, 4 release @@ -178,16 +178,16 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 waitmovement 0 removeobject 9 setobjectxyperm 9, 30, 10 - clearflag 732 - setflag 142 + clearflag FLAG_HIDE_DEVON_RUSTBORO + setflag FLAG_DEVON_GOODS_STOLEN setvar 0x405a, 2 setvar 0x409a, 2 setvar 0x406f, 1 - clearflag 891 - clearflag 880 - clearflag 878 - setflag 739 - setflag 881 + clearflag FLAG_HIDE_BRINEY_ROUTE116 + clearflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL + clearflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE releaseall end @@ -326,7 +326,7 @@ RustboroCity_Movement_14C5F7:: @ 814C5F7 RustboroCity_EventScript_14C5FF:: @ 814C5FF lock faceplayer - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS goto_if_eq RustboroCity_EventScript_14C614 msgbox RustboroCity_Text_166F6B, 4 release @@ -371,7 +371,7 @@ RustboroCity_EventScript_14C650:: @ 814C650 call_if 1, RustboroCity_EventScript_14C6E9 compare 0x4001, 3 call_if 1, RustboroCity_EventScript_14C715 - setflag 159 + setflag FLAG_UNKNOWN_9F setvar 0x405a, 3 moveobjectoffscreen 9 msgbox RustboroCity_Text_166EA5, 4 @@ -468,16 +468,16 @@ RustboroCity_EventScript_14C77D:: @ 814C77D compare 0x4001, 4 call_if 1, RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 - giveitem ITEM_GREAT_BALL + giveitem_std ITEM_GREAT_BALL compare RESULT, 0 call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 closemessage - setflag 144 - setflag 732 + setflag FLAG_RETURNED_DEVON_GOODS + setflag FLAG_HIDE_DEVON_RUSTBORO setvar 0x405a, 5 delay 30 - warp RustboroCity_DevonCorp_3F, 255, 2, 2 + warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 waitstate releaseall end @@ -549,7 +549,7 @@ RustboroCity_EventScript_14C8B8:: @ 814C8B8 RustboroCity_EventScript_14C8DA:: @ 814C8DA lock faceplayer - checkflag 288 + checkflag FLAG_MET_RIVAL_RUSTBORO goto_if_eq RustboroCity_EventScript_14C917 checkplayergender compare RESULT, 0 @@ -559,13 +559,13 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA end RustboroCity_EventScript_14C8FD:: @ 814C8FD - setflag 288 + setflag FLAG_MET_RIVAL_RUSTBORO msgbox RustboroCity_Text_1670A7, 4 release end RustboroCity_EventScript_14C90A:: @ 814C90A - setflag 288 + setflag FLAG_MET_RIVAL_RUSTBORO msgbox RustboroCity_Text_167213, 4 release end diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/scripts/maps/RustboroCity_CuttersHouse.inc index 3e98746f3..3371005c0 100644 --- a/data/scripts/maps/RustboroCity_CuttersHouse.inc +++ b/data/scripts/maps/RustboroCity_CuttersHouse.inc @@ -4,11 +4,11 @@ RustboroCity_CuttersHouse_MapScripts:: @ 8157D26 RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27 lock faceplayer - checkflag 137 + checkflag FLAG_RECEIVED_HM01 goto_if_eq RustboroCity_CuttersHouse_EventScript_157D53 msgbox RustboroCity_CuttersHouse_Text_18509C, 4 - giveitem ITEM_HM01 - setflag 137 + giveitem_std ITEM_HM01 + setflag FLAG_RECEIVED_HM01 msgbox RustboroCity_CuttersHouse_Text_1851C9, 4 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc index 48d8aaf9f..f9e902763 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8157406 .byte 0 RustboroCity_DevonCorp_1F_MapScript1_15740C:: @ 815740C - checkflag 144 + checkflag FLAG_RETURNED_DEVON_GOODS call_if 0, RustboroCity_DevonCorp_1F_EventScript_157416 end @@ -15,9 +15,9 @@ RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416 RustboroCity_DevonCorp_1F_EventScript_157422:: @ 8157422 lock faceplayer - checkflag 144 + checkflag FLAG_RETURNED_DEVON_GOODS goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15744A - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157440 msgbox RustboroCity_DevonCorp_1F_Text_1829A4, 4 release @@ -36,11 +36,11 @@ RustboroCity_DevonCorp_1F_EventScript_15744A:: @ 815744A RustboroCity_DevonCorp_1F_EventScript_157454:: @ 8157454 lock faceplayer - checkflag 144 + checkflag FLAG_RETURNED_DEVON_GOODS goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15747B - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485 - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485 msgbox RustboroCity_DevonCorp_1F_Text_182AF0, 4 release @@ -59,11 +59,11 @@ RustboroCity_DevonCorp_1F_EventScript_157485:: @ 8157485 RustboroCity_DevonCorp_1F_EventScript_15748F:: @ 815748F lock faceplayer - checkflag 144 + checkflag FLAG_RETURNED_DEVON_GOODS goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574B6 - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0 - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0 msgbox RustboroCity_DevonCorp_1F_Text_1828EE, 4 release diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index f40c1b87b..89d59258d 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -25,7 +25,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9 faceplayer compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC - checkflag 287 + checkflag FLAG_MET_DEVON_EMPLOYEE goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157519 msgbox RustboroCity_DevonCorp_2F_Text_182BD8, 4 release @@ -41,7 +41,7 @@ RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523 faceplayer compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC - checkflag 188 + checkflag FLAG_RECEIVED_POKENAV goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157543 msgbox RustboroCity_DevonCorp_2F_Text_182D2A, 4 release @@ -88,9 +88,9 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 - getitemname 0, ITEM_ROOT_FOSSIL + bufferitemname 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 - removeitem ITEM_ROOT_FOSSIL, 1 + takeitem ITEM_ROOT_FOSSIL, 1 setvar 0x40c4, 1 setvar 0x40c5, 1 release @@ -106,9 +106,9 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 - getitemname 0, ITEM_CLAW_FOSSIL + bufferitemname 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 - removeitem ITEM_CLAW_FOSSIL, 1 + takeitem ITEM_CLAW_FOSSIL, 1 setvar 0x40c4, 1 setvar 0x40c5, 2 release @@ -132,19 +132,19 @@ RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A end RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 - getspeciesname 1, SPECIES_LILEEP + bufferspeciesname 1, SPECIES_LILEEP msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 - countpokemon + getpartysize compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT setvar 0x40c4, 0 - setflag 267 + setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage - givepoke SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 + givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 compare RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 @@ -152,19 +152,19 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 end RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 - getspeciesname 1, SPECIES_ANORITH + bufferspeciesname 1, SPECIES_ANORITH msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 - countpokemon + getpartysize compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT setvar 0x40c4, 0 - setflag 267 + setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage - givepoke SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 + givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 compare RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 6f0152e60..e2e70d4c0 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -48,22 +48,22 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 applymovement 255, RustboroCity_DevonCorp_3F_Movement_157835 waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4 - giveitem ITEM_LETTER + giveitem_std ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4 playfanfare 370 message RustboroCity_DevonCorp_3F_Text_183422 waitfanfare waitmessage - setflag 2050 - setflag 188 + setflag FLAG_SYS_POKENAV_GET + setflag FLAG_RECEIVED_POKENAV msgbox RustboroCity_DevonCorp_3F_Text_183439, 4 - setflag 894 - clearflag 807 - clearflag 983 - clearflag 739 - clearflag 881 + setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116 + clearflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL + clearflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL + clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE setvar 0x4096, 1 - clearflag 814 + clearflag FLAG_HIDE_RIVAL_RUSTBORO setvar 0x408f, 1 releaseall end @@ -146,9 +146,9 @@ RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835 RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B lock faceplayer - checkflag 272 + checkflag FLAG_RECEIVED_EXP_SHARE goto_if_eq RustboroCity_DevonCorp_3F_EventScript_15789B - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if_eq RustboroCity_DevonCorp_3F_EventScript_157864 msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4 closemessage @@ -159,10 +159,10 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4 - giveitem ITEM_EXP_SHARE + giveitem_std ITEM_EXP_SHARE compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B - setflag 272 + setflag FLAG_RECEIVED_EXP_SHARE msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4 closemessage applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D @@ -181,7 +181,7 @@ RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0 lock faceplayer - checkflag 256 + checkflag FLAG_RECEIVED_REPEAT_BALL goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1578C5 msgbox RustboroCity_DevonCorp_3F_Text_18395C, 4 release diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.inc b/data/scripts/maps/RustboroCity_Flat2_1F.inc index b6b8b41b1..a6ba54ce7 100644 --- a/data/scripts/maps/RustboroCity_Flat2_1F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_1F.inc @@ -9,8 +9,8 @@ RustboroCity_Flat2_1F_EventScript_157D83:: @ 8157D83 lock faceplayer waitse - playpokecry SPECIES_SKITTY, 0 + playmoncry SPECIES_SKITTY, 0 msgbox RustboroCity_Flat2_1F_Text_185410, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc index 0dfec5cfa..3a2242c7a 100644 --- a/data/scripts/maps/RustboroCity_Flat2_2F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc @@ -8,13 +8,13 @@ RustboroCity_Flat2_2F_EventScript_157D97:: @ 8157D97 RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 lock faceplayer - checkflag 213 + checkflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO goto_if_eq RustboroCity_Flat2_2F_EventScript_157DCF msgbox RustboroCity_Flat2_2F_Text_185461, 4 - giveitem ITEM_PREMIER_BALL + giveitem_std ITEM_PREMIER_BALL compare RESULT, 0 goto_if_eq RustboroCity_Flat2_2F_EventScript_1A029B - setflag 213 + setflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO release end diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index b1bbfb8d8..0dc403ec7 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -3,7 +3,7 @@ RustboroCity_Gym_MapScripts:: @ 81578D8 RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 trainerbattle 1, OPPONENT_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE - checkflag 165 + checkflag FLAG_RECEIVED_TM39 goto_if 0, RustboroCity_Gym_EventScript_15793C msgbox RustboroCity_Gym_Text_184252, 4 release @@ -14,8 +14,8 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE waitmessage call RustboroCity_Gym_EventScript_1A02C5 msgbox RustboroCity_Gym_Text_1840D5, 4 - setflag 1201 - setflag 2055 + setflag FLAG_DEFEATED_RUSTBORO_GYM + setflag FLAG_BADGE01_GET setvar 0x405a, 1 addvar 0x4085, 1 setvar 0x8008, 1 @@ -26,10 +26,10 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE end RustboroCity_Gym_EventScript_15793C:: @ 815793C - giveitem ITEM_TM39 + giveitem_std ITEM_TM39 compare RESULT, 0 goto_if_eq RustboroCity_Gym_EventScript_1A029B - setflag 165 + setflag FLAG_RECEIVED_TM39 msgbox RustboroCity_Gym_Text_184170, 4 release end @@ -47,7 +47,7 @@ RustboroCity_Gym_EventScript_157977:: @ 8157977 RustboroCity_Gym_EventScript_15798E:: @ 815798E lock faceplayer - checkflag 1201 + checkflag FLAG_DEFEATED_RUSTBORO_GYM goto_if_eq RustboroCity_Gym_EventScript_1579A3 msgbox RustboroCity_Gym_Text_183A4B, 4 release @@ -60,14 +60,14 @@ RustboroCity_Gym_EventScript_1579A3:: @ 81579A3 RustboroCity_Gym_EventScript_1579AD:: @ 81579AD lockall - checkflag 2055 + checkflag FLAG_BADGE01_GET goto_if_eq RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end RustboroCity_Gym_EventScript_1579BD:: @ 81579BD lockall - checkflag 2055 + checkflag FLAG_BADGE01_GET goto_if_eq RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index b983617e0..0cad33204 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -4,7 +4,7 @@ RustboroCity_House1_MapScripts:: @ 8157C7C RustboroCity_House1_EventScript_157C7D:: @ 8157C7D lock faceplayer - checkflag 153 + checkflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED goto_if_eq RustboroCity_House1_EventScript_157D13 setvar 0x8008, 0 copyvar 0x8004, 0x8008 @@ -29,7 +29,7 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D special sub_804E174 waitstate msgbox RustboroCity_House1_Text_184F6B, 4 - setflag 153 + setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED release end @@ -39,7 +39,7 @@ RustboroCity_House1_EventScript_157CFB:: @ 8157CFB end RustboroCity_House1_EventScript_157D05:: @ 8157D05 - getspeciesname 0, 0x8009 + bufferspeciesname 0, 0x8009 msgbox RustboroCity_House1_Text_184F8F, 4 release end diff --git a/data/scripts/maps/RustboroCity_House3.inc b/data/scripts/maps/RustboroCity_House3.inc index a5088175e..86d77c18e 100644 --- a/data/scripts/maps/RustboroCity_House3.inc +++ b/data/scripts/maps/RustboroCity_House3.inc @@ -13,8 +13,8 @@ RustboroCity_House3_EventScript_157DFF:: @ 8157DFF lock faceplayer waitse - playpokecry SPECIES_PIKACHU, 0 + playmoncry SPECIES_PIKACHU, 0 msgbox RustboroCity_House3_Text_18567D, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/scripts/maps/RustboroCity_Mart.inc index cb722a6af..69f977e79 100644 --- a/data/scripts/maps/RustboroCity_Mart.inc +++ b/data/scripts/maps/RustboroCity_Mart.inc @@ -6,9 +6,9 @@ RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4 faceplayer message RustboroCity_Mart_Text_1A0BE4 waitmessage - checkflag 287 + checkflag FLAG_MET_DEVON_EMPLOYEE goto_if 0, RustboroCity_Mart_EventScript_157BEF - checkflag 287 + checkflag FLAG_MET_DEVON_EMPLOYEE goto_if_eq RustboroCity_Mart_EventScript_157C18 end diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc index 53b481832..a1c0ac31b 100644 --- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8157B79 .byte 0 RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F - sethealplace 6 + setrespawn 6 call RustboroCity_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 setvar 0x800b, 1 call RustboroCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 73b364f5e..21fdf3d3b 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -77,20 +77,20 @@ RustboroCity_PokemonSchool_EventScript_157AC5:: @ 8157AC5 RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE lock faceplayer - checkflag 275 + checkflag FLAG_RECEIVED_QUICK_CLAW goto_if_eq RustboroCity_PokemonSchool_EventScript_157B34 compare FACING, 4 call_if 1, RustboroCity_PokemonSchool_EventScript_157B1E compare FACING, 3 call_if 1, RustboroCity_PokemonSchool_EventScript_157B29 msgbox RustboroCity_PokemonSchool_Text_1846A2, 4 - giveitem ITEM_QUICK_CLAW + giveitem_std ITEM_QUICK_CLAW compare RESULT, 0 goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B closemessage applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 waitmovement 0 - setflag 275 + setflag FLAG_RECEIVED_QUICK_CLAW release end diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 28f6f0ad4..64fce8118 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -32,9 +32,9 @@ RusturfTunnel_EventScript_15C782:: @ 815C782 RusturfTunnel_EventScript_15C799:: @ 815C799 lock faceplayer - checkflag 1 + checkflag FLAG_TEMP_1 goto_if_eq RusturfTunnel_EventScript_15C7BC - setflag 1 + setflag FLAG_TEMP_1 msgbox RusturfTunnel_Text_1944C5, 4 closemessage applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D @@ -64,8 +64,8 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 call_if 1, RusturfTunnel_EventScript_15C8EB compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8EB - giveitem ITEM_HM04 - setflag 106 + giveitem_std ITEM_HM04 + setflag FLAG_RECEIVED_HM04 msgbox RusturfTunnel_Text_194693, 4 closemessage compare 0x4001, 1 @@ -300,9 +300,9 @@ RusturfTunnel_EventScript_15C9D7:: @ 815C9D7 lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox RusturfTunnel_Text_194188, 4 - waitpokecry + waitmoncry release end @@ -313,7 +313,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA msgbox RusturfTunnel_Text_19419B, 4 trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 msgbox RusturfTunnel_Text_194274, 4 - giveitem ITEM_DEVON_GOODS + giveitem_std ITEM_DEVON_GOODS closemessage applymovement 255, RusturfTunnel_Movement_15CA99 applymovement 6, RusturfTunnel_Movement_15CAA2 @@ -332,20 +332,20 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA message RusturfTunnel_Text_19434F waitmessage waitse - playpokecry SPECIES_WINGULL, 0 - waitbutton - waitpokecry + playmoncry SPECIES_WINGULL, 0 + waitbuttonpress + waitmoncry closemessage applymovement 5, RusturfTunnel_Movement_15CAB4 applymovement 7, RusturfTunnel_Movement_15CAC3 waitmovement 0 removeobject 5 removeobject 7 - clearflag 142 - setflag 143 + clearflag FLAG_DEVON_GOODS_STOLEN + setflag FLAG_RECOVERED_DEVON_GOODS setvar 0x405a, 4 setvar 0x4090, 1 - setflag 891 + setflag FLAG_HIDE_BRINEY_ROUTE116 release end diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 2c55a9443..8e9a404a2 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -88,9 +88,9 @@ SSTidalCorridor_EventScript_15FD9F:: @ 815FD9F lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox SSTidalCorridor_Text_199388, 4 - waitpokecry + waitmoncry release end @@ -122,27 +122,27 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 end SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 - sethealplace 8 + setrespawn 8 msgbox SSTidalCorridor_Text_1991F4, 4 - checkflag 260 + checkflag FLAG_RECEIVED_TM49 call_if 1, SSTidalCorridor_EventScript_15FE36 - warp LilycoveCity_Harbor, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end SSTidalCorridor_EventScript_15FE17:: @ 815FE17 - sethealplace 4 + setrespawn 4 msgbox SSTidalCorridor_Text_1991F4, 4 - checkflag 260 + checkflag FLAG_RECEIVED_TM49 call_if 1, SSTidalCorridor_EventScript_15FE36 - warp SlateportCity_Harbor, 255, 8, 11 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release end SSTidalCorridor_EventScript_15FE36:: @ 815FE36 - setflag 951 + setflag FLAG_HIDE_TM_49_GIVER_SS_TIDAL return SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A @@ -163,7 +163,7 @@ SSTidalCorridor_EventScript_15FE5B:: @ 815FE5B SSTidalCorridor_EventScript_15FE60:: @ 815FE60 lock faceplayer - checkflag 247 + checkflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto_if_eq SSTidalCorridor_EventScript_15FE7A call SSTidalCorridor_EventScript_15FE84 msgbox SSTidalCorridor_Text_199203, 4 @@ -192,7 +192,7 @@ SSTidalCorridor_EventScript_15FE84:: @ 815FE84 goto_if 0, SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_ANETTE goto_if 0, SSTidalCorridor_EventScript_15FED5 - setflag 247 + setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto SSTidalCorridor_EventScript_15FE7A return diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index c7cd4447d..0390177de 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -4,13 +4,13 @@ SSTidalRooms_MapScripts:: @ 815FF05 SSTidalRooms_EventScript_15FF06:: @ 815FF06 lock faceplayer - checkflag 260 + checkflag FLAG_RECEIVED_TM49 goto_if_eq SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 - giveitem ITEM_TM49 + giveitem_std ITEM_TM49 compare RESULT, 0 goto_if_eq SSTidalRooms_EventScript_1A029B - setflag 260 + setflag FLAG_RECEIVED_TM49 msgbox SSTidalRooms_Text_199C1A, 4 release end diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 06a400810..6d31cf981 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -94,7 +94,7 @@ SafariZone_Southeast_EventScript_16011F:: @ 816011F SafariZone_Southeast_EventScript_160139:: @ 8160139 setvar 0x40a4, 1 special ExitSafariMode - warpdoor Route121_SafariZoneEntrance, 255, 2, 5 + warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate end diff --git a/data/scripts/maps/ScorchedSlab.inc b/data/scripts/maps/ScorchedSlab.inc index 112289083..f0ed9c005 100644 --- a/data/scripts/maps/ScorchedSlab.inc +++ b/data/scripts/maps/ScorchedSlab.inc @@ -3,5 +3,5 @@ ScorchedSlab_MapScripts:: @ 815F29D .byte 0 ScorchedSlab_MapScript1_15F2A3:: @ 815F2A3 - setflag 2136 + setflag FLAG_LANDMARK_SCORCHED_SLAB end diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/scripts/maps/SeafloorCavern_Entrance.inc index 7ea46d9b0..9d59279ea 100644 --- a/data/scripts/maps/SeafloorCavern_Entrance.inc +++ b/data/scripts/maps/SeafloorCavern_Entrance.inc @@ -3,6 +3,6 @@ SeafloorCavern_Entrance_MapScripts:: @ 815DA4A .byte 0 SeafloorCavern_Entrance_MapScript1_15DA50:: @ 815DA50 - setdivewarp Underwater_SeafloorCavern, 255, 6, 5 - setescapewarp Underwater_SeafloorCavern, 255, 6, 5 + setdivewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 + setescapewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 end diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index eb3d108a6..b31e8fc25 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -79,9 +79,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA setvar RESULT, 0 .endif playse 209 - setfieldeffect 0, 16 - setfieldeffect 1, 42 - setfieldeffect 2, 0 + setfieldeffectargument 0, 16 + setfieldeffectargument 1, 42 + setfieldeffectargument 2, 0 dofieldeffect 54 waitfieldeffect 54 .ifdef SAPPHIRE @@ -192,25 +192,25 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4ECA, 4 .endif setvar 0x407b, 1 - clearflag 855 - clearflag 856 - clearflag 816 - clearflag 973 + clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 + clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 + clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS + clearflag FLAG_HIDE_STEVEN_SOOTOPOLIS setvar 0x405e, 1 - clearflag 944 - clearflag 945 - setflag 2090 - setflag 854 - setflag 129 - setflag 967 + clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128 + clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128 + setflag FLAG_SYS_WEATHER_CTRL + setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS + setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN + setflag FLAG_HIDE_STEVEN_STEVENS_HOUSE setvar 0x40c6, 1 setvar 0x40a2, 1 - setflag 828 - setflag 829 - setflag 831 - setflag 859 - setflag 946 - warp Route128, 255, 38, 22 + setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN + setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN + setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN + setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN + setflag FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN + warp MAP_ROUTE128, 255, 38, 22 waitstate releaseall end diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index 526ada367..cd778202c 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -4,9 +4,9 @@ SealedChamber_InnerRoom_MapScripts:: @ 815F1E7 SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 lockall braillemessage SealedChamber_InnerRoom_Braille_1C53C1 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 - checkflag 228 + checkflag FLAG_REGI_DOORS_OPENED goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 specialvar RESULT, CheckRelicanthWailord compare RESULT, 0 @@ -31,7 +31,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 msgbox SealedChamber_InnerRoom_Text_1A138B, 4 closemessage fadeinbgm 0 - setflag 228 + setflag FLAG_REGI_DOORS_OPENED releaseall end @@ -42,7 +42,7 @@ SealedChamber_InnerRoom_EventScript_15F247:: @ 815F247 SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249 lockall braillemessage SealedChamber_InnerRoom_Braille_1C53F2 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -50,7 +50,7 @@ SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249 SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257 lockall braillemessage SealedChamber_InnerRoom_Braille_1C5414 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -58,7 +58,7 @@ SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257 SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265 lockall braillemessage SealedChamber_InnerRoom_Braille_1C5435 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -66,7 +66,7 @@ SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265 SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273 lockall braillemessage SealedChamber_InnerRoom_Braille_1C545C - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -74,7 +74,7 @@ SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273 SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281 lockall braillemessage SealedChamber_InnerRoom_Braille_1C5470 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -82,7 +82,7 @@ SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281 SealedChamber_InnerRoom_EventScript_15F28F:: @ 815F28F lockall braillemessage SealedChamber_InnerRoom_Braille_1C549B - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index f16a88802..ad17819c2 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -5,32 +5,32 @@ SealedChamber_OuterRoom_MapScripts:: @ 815F0C6 .byte 0 SealedChamber_OuterRoom_MapScript1_15F0D6:: @ 815F0D6 - setdivewarp Underwater_SealedChamber, 255, 12, 44 - setescapewarp Underwater_SealedChamber, 255, 12, 44 + setdivewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 + setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 end SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7 - setflag 2140 + setflag FLAG_LANDMARK_SEALED_CHAMBER end SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB - checkflag 2127 + checkflag FLAG_SYS_BRAILLE_DIG call_if 0, SealedChamber_OuterRoom_EventScript_15F0F5 end SealedChamber_OuterRoom_EventScript_15F0F5:: @ 815F0F5 - setmaptile 9, 1, 553, 1 - setmaptile 10, 1, 553, 1 - setmaptile 11, 1, 553, 1 - setmaptile 9, 2, 565, 1 - setmaptile 10, 2, 565, 1 - setmaptile 11, 2, 565, 1 + setmetatile 9, 1, 553, 1 + setmetatile 10, 1, 553, 1 + setmetatile 11, 1, 553, 1 + setmetatile 9, 2, 565, 1 + setmetatile 10, 2, 565, 1 + setmetatile 11, 2, 565, 1 return SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C lockall braillemessage SealedChamber_OuterRoom_Braille_1C534F - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -38,7 +38,7 @@ SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A lockall braillemessage SealedChamber_OuterRoom_Braille_1C5359 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -46,7 +46,7 @@ SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148 lockall braillemessage SealedChamber_OuterRoom_Braille_1C5363 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -54,7 +54,7 @@ SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148 SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156 lockall braillemessage SealedChamber_OuterRoom_Braille_1C536D - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -62,7 +62,7 @@ SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156 SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164 lockall braillemessage SealedChamber_OuterRoom_Braille_1C5377 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -70,7 +70,7 @@ SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164 SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172 lockall braillemessage SealedChamber_OuterRoom_Braille_1C5381 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -78,7 +78,7 @@ SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172 SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180 lockall braillemessage SealedChamber_OuterRoom_Braille_1C538B - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -86,7 +86,7 @@ SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180 SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E lockall braillemessage SealedChamber_OuterRoom_Braille_1C5396 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -94,7 +94,7 @@ SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C lockall braillemessage SealedChamber_OuterRoom_Braille_1C539E - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -102,17 +102,17 @@ SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA lockall braillemessage SealedChamber_OuterRoom_Braille_1C53A9 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 lockall - checkflag 2127 + checkflag FLAG_SYS_BRAILLE_DIG goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF braillemessage SealedChamber_OuterRoom_Braille_1C53B1 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -125,7 +125,7 @@ SealedChamber_OuterRoom_EventScript_15F1CF:: @ 815F1CF SealedChamber_OuterRoom_EventScript_15F1D9:: @ 815F1D9 lockall braillemessage SealedChamber_OuterRoom_Braille_1C53B1 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/SecretBase_YellowCave4.inc b/data/scripts/maps/SecretBase_YellowCave4.inc index 302bc3930..f72c3d76e 100644 --- a/data/scripts/maps/SecretBase_YellowCave4.inc +++ b/data/scripts/maps/SecretBase_YellowCave4.inc @@ -6,7 +6,7 @@ SecretBase_YellowCave4_MapScripts:: @ 815F337 .byte 0 SecretBase_RedCave1_MapScript1_15F34C:: @ 815F34C - tileeffect 6 + setstepcallback 6 end SecretBase_RedCave1_MapScript1_15F34F:: @ 815F34F diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 52d430db5..533c46850 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -4,7 +4,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 815E057 ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D special UpdateShoalTideFlag - checkflag 2106 + checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E06E goto ShoalCave_LowTideEntranceRoom_EventScript_15E072 @@ -20,7 +20,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 lock faceplayer dodailyevents - checkflag 2143 + checkflag FLAG_SYS_SHOAL_ITEM call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 compare RESULT, 0 @@ -37,13 +37,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 compare RESULT, 2 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4 - removeitem ITEM_SHOAL_SALT, 4 - removeitem ITEM_SHOAL_SHELL, 4 - giveitem ITEM_SHELL_BELL + takeitem ITEM_SHOAL_SALT, 4 + takeitem ITEM_SHOAL_SHELL, 4 + giveitem_std ITEM_SHELL_BELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4 - setflag 2 + setflag FLAG_TEMP_2 release end @@ -90,13 +90,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E16C:: @ 815E16C end ShoalCave_LowTideEntranceRoom_EventScript_15E176:: @ 815E176 - clearflag 952 - clearflag 953 - clearflag 954 - clearflag 955 - clearflag 956 - clearflag 957 - clearflag 958 - clearflag 959 - clearflag 2143 + clearflag FLAG_HIDE_TOOK_SHOAL_SALT_1 + clearflag FLAG_HIDE_TOOK_SHOAL_SALT_2 + clearflag FLAG_HIDE_TOOK_SHOAL_SALT_3 + clearflag FLAG_HIDE_TOOK_SHOAL_SALT_4 + clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 + clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 + clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 + clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 + clearflag FLAG_SYS_SHOAL_ITEM return diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index ada997023..b6aba9523 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -4,7 +4,7 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 815E192 .byte 0 ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D - checkflag 2106 + checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1AB goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF @@ -21,48 +21,48 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3 end ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 - checkflag 952 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA - checkflag 2106 + checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA - setmaptile 31, 8, 856, 1 + setmetatile 31, 8, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA end ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA - checkflag 953 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB - checkflag 2106 + checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB - setmaptile 14, 26, 856, 1 + setmetatile 14, 26, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB end ShoalCave_LowTideInnerRoom_EventScript_15E1FB:: @ 815E1FB - checkflag 956 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E213 - setmaptile 41, 20, 857, 1 + setmetatile 41, 20, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E213 end ShoalCave_LowTideInnerRoom_EventScript_15E213:: @ 815E213 - checkflag 957 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E22B - setmaptile 41, 10, 857, 1 + setmetatile 41, 10, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E22B end ShoalCave_LowTideInnerRoom_EventScript_15E22B:: @ 815E22B - checkflag 958 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E243 - setmaptile 6, 9, 857, 1 + setmetatile 6, 9, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E243 end ShoalCave_LowTideInnerRoom_EventScript_15E243:: @ 815E243 - checkflag 959 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E256 - setmaptile 16, 13, 857, 1 + setmetatile 16, 13, 857, 1 return ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256 @@ -70,14 +70,14 @@ ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256 ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 lockall - checkflag 956 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 - giveitem ITEM_SHOAL_SHELL + giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 41, 20, 859, 0 + setmetatile 41, 20, 859, 0 special DrawWholeMapView - setflag 956 + setflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 releaseall end @@ -88,53 +88,53 @@ ShoalCave_LowTideInnerRoom_EventScript_15E289:: @ 815E289 ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 lockall - checkflag 957 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 - giveitem ITEM_SHOAL_SHELL + giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 41, 10, 859, 0 + setmetatile 41, 10, 859, 0 special DrawWholeMapView - setflag 957 + setflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 releaseall end ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 lockall - checkflag 958 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 - giveitem ITEM_SHOAL_SHELL + giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 6, 9, 859, 0 + setmetatile 6, 9, 859, 0 special DrawWholeMapView - setflag 958 + setflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 releaseall end ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 lockall - checkflag 959 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 - giveitem ITEM_SHOAL_SHELL + giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 16, 13, 859, 0 + setmetatile 16, 13, 859, 0 special DrawWholeMapView - setflag 959 + setflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 releaseall end ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 lockall - checkflag 952 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B - giveitem ITEM_SHOAL_SALT + giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 31, 8, 858, 0 + setmetatile 31, 8, 858, 0 special DrawWholeMapView - setflag 952 + setflag FLAG_HIDE_TOOK_SHOAL_SALT_1 releaseall end @@ -145,13 +145,13 @@ ShoalCave_LowTideInnerRoom_EventScript_15E35B:: @ 815E35B ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 lockall - checkflag 953 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B - giveitem ITEM_SHOAL_SALT + giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 14, 26, 858, 0 + setmetatile 14, 26, 858, 0 special DrawWholeMapView - setflag 953 + setflag FLAG_HIDE_TOOK_SHOAL_SALT_2 releaseall end diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index db5779efe..c7cb08a9b 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -7,9 +7,9 @@ ShoalCave_LowTideLowerRoom_MapScript1_15E3F9:: @ 815E3F9 end ShoalCave_LowTideLowerRoom_EventScript_15E3FF:: @ 815E3FF - checkflag 955 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E412 - setmaptile 18, 2, 856, 1 + setmetatile 18, 2, 856, 1 return ShoalCave_LowTideLowerRoom_EventScript_15E412:: @ 815E412 @@ -17,14 +17,14 @@ ShoalCave_LowTideLowerRoom_EventScript_15E412:: @ 815E412 ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 lockall - checkflag 955 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E445 - giveitem ITEM_SHOAL_SALT + giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B - setmaptile 18, 2, 858, 0 + setmetatile 18, 2, 858, 0 special DrawWholeMapView - setflag 955 + setflag FLAG_HIDE_TOOK_SHOAL_SALT_4 releaseall end @@ -36,13 +36,13 @@ ShoalCave_LowTideLowerRoom_EventScript_15E445:: @ 815E445 ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F lock faceplayer - checkflag 283 + checkflag FLAG_RECEIVED_FOCUS_BAND goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E47E msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4 - giveitem ITEM_FOCUS_BAND + giveitem_std ITEM_FOCUS_BAND compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B - setflag 283 + setflag FLAG_RECEIVED_FOCUS_BAND release end diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc index bffb7bd49..efcad59d3 100644 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc @@ -7,9 +7,9 @@ ShoalCave_LowTideStairsRoom_MapScript1_15E39D:: @ 815E39D end ShoalCave_LowTideStairsRoom_EventScript_15E3A3:: @ 815E3A3 - checkflag 954 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3B6 - setmaptile 11, 11, 856, 1 + setmetatile 11, 11, 856, 1 return ShoalCave_LowTideStairsRoom_EventScript_15E3B6:: @ 815E3B6 @@ -17,14 +17,14 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B6:: @ 815E3B6 ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 lockall - checkflag 954 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3E9 - giveitem ITEM_SHOAL_SALT + giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B - setmaptile 11, 11, 858, 0 + setmetatile 11, 11, 858, 0 special DrawWholeMapView - setflag 954 + setflag FLAG_HIDE_TOOK_SHOAL_SALT_3 releaseall end diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/scripts/maps/SkyPillar_2F.inc index 3b3585bf8..bd87e8562 100644 --- a/data/scripts/maps/SkyPillar_2F.inc +++ b/data/scripts/maps/SkyPillar_2F.inc @@ -5,6 +5,6 @@ SkyPillar_2F_MapScripts:: @ 815F2C9 .byte 0 SkyPillar_2F_MapScript1_15F2D9:: @ 815F2D9 - tileeffect 7 - setholewarp SkyPillar_1F, 255, 0, 0 + setstepcallback 7 + setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0 end diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/scripts/maps/SkyPillar_4F.inc index 3d535a25a..860f35b48 100644 --- a/data/scripts/maps/SkyPillar_4F.inc +++ b/data/scripts/maps/SkyPillar_4F.inc @@ -5,6 +5,6 @@ SkyPillar_4F_MapScripts:: @ 815F2E5 .byte 0 SkyPillar_4F_MapScript1_15F2F5:: @ 815F2F5 - tileeffect 7 - setholewarp SkyPillar_3F, 255, 0, 0 + setstepcallback 7 + setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0 end diff --git a/data/scripts/maps/SkyPillar_Entrance.inc b/data/scripts/maps/SkyPillar_Entrance.inc index 7a3927332..ab991d845 100644 --- a/data/scripts/maps/SkyPillar_Entrance.inc +++ b/data/scripts/maps/SkyPillar_Entrance.inc @@ -3,5 +3,5 @@ SkyPillar_Entrance_MapScripts:: @ 815F2BD .byte 0 SkyPillar_Entrance_MapScript1_15F2C3:: @ 815F2C3 - setflag 2142 + setflag FLAG_LANDMARK_SKY_PILLAR end diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index 1dee6e9c4..07a78d2c4 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -3,7 +3,7 @@ SkyPillar_Top_MapScripts:: @ 815F302 .byte 0 SkyPillar_Top_MapScript1_15F308:: @ 815F308 - checkflag 2145 + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, SkyPillar_Top_EventScript_15F312 end @@ -16,13 +16,13 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316 faceplayer setwildbattle SPECIES_RAYQUAZA, 70, ITEM_NONE waitse - playpokecry SPECIES_RAYQUAZA, 2 + playmoncry SPECIES_RAYQUAZA, 2 delay 40 - waitpokecry - setflag 773 - setflag 2145 + waitmoncry + setflag FLAG_HIDE_RAYQUAZA + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRayquazaBattle waitstate - clearflag 2145 + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index bea1455a7..56fc0e59b 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -17,9 +17,9 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C end SlateportCity_EventScript_14BA5C:: @ 814BA5C - setflag 2071 + setflag FLAG_VISITED_SLATEPORT_CITY setvar 0x4086, 0 - setflag 803 + setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT return SlateportCity_EventScript_14BA68:: @ 814BA68 @@ -64,7 +64,7 @@ SlateportCity_Items1:: @ 814BAD0 SlateportCity_EventScript_14BAE0:: @ 814BAE0 lock faceplayer - getfirstpartypokename 0 + bufferleadmonspeciesname 0 msgbox SlateportCity_Text_164682, 4 specialvar RESULT, LeadMonHasEffortRibbon compare RESULT, 1 @@ -125,7 +125,7 @@ SlateportCity_EventScript_14BB81:: @ 814BB81 faceplayer compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BBA1 - checkflag 96 + checkflag FLAG_RECEIVED_SECRET_POWER goto_if_eq SlateportCity_EventScript_14BBAB msgbox SlateportCity_Text_164937, 4 release @@ -182,7 +182,7 @@ SlateportCity_EventScript_14BC0A:: @ 814BC0A SlateportCity_EventScript_14BC14:: @ 814BC14 lock faceplayer - checkflag 148 + checkflag FLAG_DOCK_REJECTED_DEVON_GOODS goto_if_eq SlateportCity_EventScript_14BC29 msgbox SlateportCity_Text_164BBF, 4 release @@ -199,9 +199,9 @@ SlateportCity_EventScript_14BC33:: @ 814BC33 SlateportCity_EventScript_14BC3C:: @ 814BC3C lockall - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_EventScript_14BC63 - checkflag 2061 + checkflag FLAG_BADGE07_GET goto_if_eq SlateportCity_EventScript_14BC59 msgbox SlateportCity_Text_1658A0, 4 releaseall @@ -235,7 +235,7 @@ SlateportCity_EventScript_14BC88:: @ 814BC88 SlateportCity_EventScript_14BC91:: @ 814BC91 lockall - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_EventScript_14BCA5 msgbox SlateportCity_Text_165A8B, 4 releaseall @@ -388,7 +388,7 @@ SlateportCity_EventScript_14BDF2:: @ 814BDF2 faceplayer message SlateportCity_Text_1A0BE4 waitmessage - pokemartdecor SlateportCity_Decorations1 + pokemartdecoration SlateportCity_Decorations1 msgbox SlateportCity_Text_1A0C02, 4 release end @@ -410,11 +410,11 @@ SlateportCity_EventScript_14BE16:: @ 814BE16 SlateportCity_EventScript_14BE20:: @ 814BE20 lock faceplayer - checkflag 96 + checkflag FLAG_RECEIVED_SECRET_POWER goto_if 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waitmessage - pokemartdecor SlateportCity_Decorations2 + pokemartdecoration SlateportCity_Decorations2 msgbox SlateportCity_Text_1A0C02, 4 release end @@ -442,11 +442,11 @@ SlateportCity_Decorations2:: @ 814BE40 @ 814BE60 lock faceplayer - checkflag 96 + checkflag FLAG_RECEIVED_SECRET_POWER goto_if 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waitmessage - pokemartdecor SlateportCity_Decorations3 + pokemartdecoration SlateportCity_Decorations3 msgbox SlateportCity_Text_1A0C02, 4 release end @@ -533,12 +533,12 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC applymovement 255, SlateportCity_Movement_14C008 waitmovement 0 removeobject 11 - clearflag 841 - clearflag 848 - clearflag 845 - clearflag 846 + clearflag FLAG_HIDE_STERN_SLATEPORT_HARBOR + clearflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR + clearflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR + clearflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR setvar 0x4058, 2 - warp SlateportCity_Harbor, 255, 11, 14 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 waitstate releaseall end diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc index f8070f1a1..0a6f40c75 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.inc +++ b/data/scripts/maps/SlateportCity_ContestHall.inc @@ -12,13 +12,13 @@ SlateportCity_ContestHall_EventScript_155555:: @ 8155555 SlateportCity_ContestHall_EventScript_15555E:: @ 815555E lock faceplayer - checkflag 265 + checkflag FLAG_RECEIVED_TM41 goto_if_eq SlateportCity_ContestHall_EventScript_155595 msgbox SlateportCity_ContestHall_Text_17CCE2, 4 - giveitem ITEM_TM41 + giveitem_std ITEM_TM41 compare RESULT, 0 goto_if_eq SlateportCity_ContestHall_EventScript_1A029B - setflag 265 + setflag FLAG_RECEIVED_TM41 msgbox SlateportCity_ContestHall_Text_17CE28, 4 release end diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index cb4632d77..c4a44d9c9 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -14,7 +14,7 @@ SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D special sub_80C4BF0 call SlateportCity_ContestLobby_EventScript_15FBDB setvar 0x4088, 3 - warp LinkContestRoom1, 255, 7, 5 + warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end @@ -23,14 +23,14 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 applymovement 1, SlateportCity_ContestLobby_Movement_1554CC waitmovement 0 playse 71 - setmaptile 4, 2, 545, 1 - setmaptile 4, 3, 609, 1 + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, SlateportCity_ContestLobby_Movement_1554CF waitmovement 0 playse 71 - setmaptile 4, 2, 721, 1 - setmaptile 4, 3, 729, 1 + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 special DrawWholeMapView delay 20 applymovement 1, SlateportCity_ContestLobby_Movement_1554DC @@ -101,13 +101,13 @@ SlateportCity_ContestLobby_EventScript_1554F0:: @ 81554F0 SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9 lockall - checkflag 95 + checkflag FLAG_RECEIVED_POKEBLOCK_CASE goto_if_eq SlateportCity_ContestLobby_EventScript_155526 applymovement 7, SlateportCity_ContestLobby_Movement_1A0839 waitmovement 0 msgbox SlateportCity_ContestLobby_Text_17CA67, 4 - giveitem ITEM_POKEBLOCK_CASE - setflag 95 + giveitem_std ITEM_POKEBLOCK_CASE + setflag FLAG_RECEIVED_POKEBLOCK_CASE releaseall end @@ -129,7 +129,7 @@ SlateportCity_ContestLobby_EventScript_155536:: @ 8155536 @ 815553F lockall special ShowBerryBlenderRecordWindow - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index f145c4a3d..304013b08 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -3,23 +3,23 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D .byte 0 SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 - setescapewarp SlateportCity, 255, 28, 13 + setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar 0x4001, 0 compare 0x40a0, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR call_if 1, SlateportCity_Harbor_EventScript_155F85 end SlateportCity_Harbor_EventScript_155F85:: @ 8155F85 - clearflag 860 + clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR return SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 savebgm BGM_EVIL_TEAM setobjectxyperm 4, 12, 13 setobjectmovementtype 4, 9 - setflag 905 + setflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR return SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B @@ -73,8 +73,8 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 call_if 1, SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closemessage - setflag 821 - setflag 822 + setflag FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT + setflag FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT moveobjectoffscreen 4 setobjectmovementtype 4, 10 releaseall @@ -159,7 +159,7 @@ SlateportCity_Harbor_Movement_1560C2:: @ 81560C2 SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 lock faceplayer - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_Harbor_EventScript_1560D9 msgbox SlateportCity_Harbor_Text_17FA0A, 4 release @@ -195,7 +195,7 @@ SlateportCity_Harbor_EventScript_15613F:: @ 815613F goto_if_eq SlateportCity_Harbor_EventScript_15618A setvar 0x40b4, 1 call SlateportCity_Harbor_EventScript_156196 - warp SSTidalCorridor, 255, 1, 10 + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end @@ -205,7 +205,7 @@ SlateportCity_Harbor_EventScript_156167:: @ 8156167 compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_15618A call SlateportCity_Harbor_EventScript_156196 - warp BattleTower_Outside, 255, 19, 23 + warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23 waitstate release end @@ -222,13 +222,13 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - hideobject LAST_TALKED, 9, 8 + hideobjectat LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR compare FACING, 2 call_if 1, SlateportCity_Harbor_EventScript_1561EF compare FACING, 4 call_if 1, SlateportCity_Harbor_EventScript_1561E4 delay 30 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY setvar 0x8004, 5 call SlateportCity_Harbor_EventScript_1A040E return @@ -268,11 +268,11 @@ SlateportCity_Harbor_EventScript_156208:: @ 8156208 SlateportCity_Harbor_EventScript_156211:: @ 8156211 lock faceplayer - checkflag 2061 + checkflag FLAG_BADGE07_GET goto_if_eq SlateportCity_Harbor_EventScript_15626F - checkflag 271 + checkflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE goto_if_eq SlateportCity_Harbor_EventScript_156265 - checkflag 112 + checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE goto_if_eq SlateportCity_Harbor_EventScript_156258 compare 0x40a0, 2 goto_if_eq SlateportCity_Harbor_EventScript_15624E @@ -289,7 +289,7 @@ SlateportCity_Harbor_EventScript_15624E:: @ 815624E end SlateportCity_Harbor_EventScript_156258:: @ 8156258 - setflag 271 + setflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE msgbox SlateportCity_Harbor_Text_17FF35, 4 release end @@ -305,7 +305,7 @@ SlateportCity_Harbor_EventScript_15626F:: @ 815626F checkitem ITEM_SCANNER, 1 compare RESULT, 1 goto_if_eq SlateportCity_Harbor_EventScript_1562A7 - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_Harbor_EventScript_15629D msgbox SlateportCity_Harbor_Text_18017B, 4 release @@ -335,12 +335,12 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA msgbox SlateportCity_Harbor_Text_1803DD, 5 compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156374 - giveitem ITEM_DEEP_SEA_TOOTH + giveitem_std ITEM_DEEP_SEA_TOOTH compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B - removeitem ITEM_SCANNER, 1 + takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 - setflag 294 + setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_156380 end @@ -348,12 +348,12 @@ SlateportCity_Harbor_EventScript_15632A:: @ 815632A msgbox SlateportCity_Harbor_Text_180412, 5 compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156374 - giveitem ITEM_DEEP_SEA_SCALE + giveitem_std ITEM_DEEP_SEA_SCALE compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B - removeitem ITEM_SCANNER, 1 + takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 - setflag 294 + setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_156380 end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 1ee8ff39b..9e002e61e 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -57,7 +57,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D end SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_155B7B msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4 closemessage @@ -164,10 +164,10 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835 waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4 - giveitem ITEM_TM46 + giveitem_std ITEM_TM46 compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 - setflag 269 + setflag FLAG_RECEIVED_TM46 msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, 4 closemessage compare FACING, 2 @@ -179,7 +179,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3 waitmovement 0 - setflag 965 + setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM playse 9 removeobject 13 release @@ -188,7 +188,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC waitmovement 0 - setflag 965 + setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM playse 9 removeobject 13 release diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index e379c633d..7fcd0fff1 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -74,7 +74,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 removeobject 4 fadescreen 0 delay 30 - setflag 883 + setflag FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4 @@ -86,10 +86,10 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 waitmovement 0 playse 9 removeobject 1 - setflag 900 - setflag 149 - clearflag 947 - setflag 949 + setflag FLAG_HIDE_EVIL_TEAM_ROUTE110 + setflag FLAG_DELIVERED_DEVON_GOODS + clearflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116 + setflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F release end diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc index 9aa326f70..ac4e8f240 100644 --- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 81563BF .byte 0 SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5 - sethealplace 4 + setrespawn 4 call SlateportCity_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ SlateportCity_PokemonCenter_1F_EventScript_1563CE:: @ 81563CE setvar 0x800b, 1 call SlateportCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 4195ad43a..593e18fee 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -23,15 +23,15 @@ SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795 SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 setvar 0x4002, 0 - checkflag 204 + checkflag FLAG_RECEIVED_YELLOW_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag 203 + checkflag FLAG_RECEIVED_GREEN_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag 202 + checkflag FLAG_RECEIVED_PINK_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag 201 + checkflag FLAG_RECEIVED_BLUE_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag 200 + checkflag FLAG_RECEIVED_RED_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 compare 0x4002, 5 call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D @@ -49,17 +49,17 @@ SlateportCity_PokemonFanClub_EventScript_1557FE:: @ 81557FE SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 msgbox SlateportCity_PokemonFanClub_Text_17DA49, 4 setvar 0x4001, 0 - checkflag 204 + checkflag FLAG_RECEIVED_YELLOW_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559FE - checkflag 203 + checkflag FLAG_RECEIVED_GREEN_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559E7 - checkflag 202 + checkflag FLAG_RECEIVED_PINK_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559D0 - checkflag 201 + checkflag FLAG_RECEIVED_BLUE_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559B9 - checkflag 200 + checkflag FLAG_RECEIVED_RED_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2 - getfirstpartypokename 0 + bufferleadmonspeciesname 0 switch 0x4001 case 0, SlateportCity_PokemonFanClub_EventScript_155899 case 1, SlateportCity_PokemonFanClub_EventScript_1558A3 @@ -88,8 +88,8 @@ SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 - setflag 200 - giveitem ITEM_RED_SCARF + setflag FLAG_RECEIVED_RED_SCARF + giveitem_std ITEM_RED_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DC1B, 4 release end @@ -99,8 +99,8 @@ SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 - setflag 201 - giveitem ITEM_BLUE_SCARF + setflag FLAG_RECEIVED_BLUE_SCARF + giveitem_std ITEM_BLUE_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DC74, 4 release end @@ -110,8 +110,8 @@ SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 - setflag 202 - giveitem ITEM_PINK_SCARF + setflag FLAG_RECEIVED_PINK_SCARF + giveitem_std ITEM_PINK_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DCCB, 4 release end @@ -121,8 +121,8 @@ SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 - setflag 203 - giveitem ITEM_GREEN_SCARF + setflag FLAG_RECEIVED_GREEN_SCARF + giveitem_std ITEM_GREEN_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DD27, 4 release end @@ -132,8 +132,8 @@ SlateportCity_PokemonFanClub_EventScript_155967:: @ 8155967 compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 - setflag 204 - giveitem ITEM_YELLOW_SCARF + setflag FLAG_RECEIVED_YELLOW_SCARF + giveitem_std ITEM_YELLOW_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DD78, 4 release end @@ -196,7 +196,7 @@ SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 lock faceplayer - checkflag 278 + checkflag FLAG_RECEIVED_SOOTHE_BELL goto_if_eq SlateportCity_PokemonFanClub_EventScript_155A75 msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4 specialvar RESULT, GetLeadMonFriendshipScore @@ -212,10 +212,10 @@ SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A applymovement LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0835 waitmovement 0 msgbox SlateportCity_PokemonFanClub_Text_17DF57, 4 - giveitem ITEM_SOOTHE_BELL + giveitem_std ITEM_SOOTHE_BELL compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1A029B - setflag 278 + setflag FLAG_RECEIVED_SOOTHE_BELL release end @@ -236,9 +236,9 @@ SlateportCity_PokemonFanClub_EventScript_155A91:: @ 8155A91 lock faceplayer waitse - playpokecry SPECIES_SKITTY, 0 + playmoncry SPECIES_SKITTY, 0 msgbox SlateportCity_PokemonFanClub_Text_17E14E, 4 - waitpokecry + waitmoncry release end @@ -246,9 +246,9 @@ SlateportCity_PokemonFanClub_EventScript_155AA4:: @ 8155AA4 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox SlateportCity_PokemonFanClub_Text_17E164, 4 - waitpokecry + waitmoncry release end @@ -256,8 +256,8 @@ SlateportCity_PokemonFanClub_EventScript_155AB7:: @ 8155AB7 lock faceplayer waitse - playpokecry SPECIES_AZUMARILL, 0 + playmoncry SPECIES_AZUMARILL, 0 msgbox SlateportCity_PokemonFanClub_Text_17E178, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index 9fe7f1f1a..46dc8419c 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -3,13 +3,13 @@ SlateportCity_SternsShipyard_1F_MapScripts:: @ 8155335 SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 lockall - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_155388 - checkflag 2061 + checkflag FLAG_BADGE07_GET goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_15539C - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553CF - checkflag 148 + checkflag FLAG_DOCK_REJECTED_DEVON_GOODS goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553B0 msgbox SlateportCity_SternsShipyard_1F_Text_17C14B, 4 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 @@ -18,8 +18,8 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 closemessage applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D waitmovement 0 - setflag 148 - setflag 882 + setflag FLAG_DOCK_REJECTED_DEVON_GOODS + setflag FLAG_HIDE_EVIL_TEAM_SLATEPORT releaseall end diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index bddc5965d..f4842bd40 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -5,39 +5,39 @@ SootopolisCity_MapScripts:: @ 814D07D .byte 0 SootopolisCity_MapScript1_14D08D:: @ 814D08D - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN call_if 0, SootopolisCity_EventScript_14D0A0 - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN call_if 1, SootopolisCity_EventScript_14D0B1 end SootopolisCity_EventScript_14D0A0:: @ 814D0A0 setobjectxyperm 3, 31, 18 - setmaptile 31, 32, 592, 1 + setmetatile 31, 32, 592, 1 return SootopolisCity_EventScript_14D0B1:: @ 814D0B1 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 0, SootopolisCity_EventScript_14D0BB return SootopolisCity_EventScript_14D0BB:: @ 814D0BB - setmaptile 9, 6, 584, 1 - setmaptile 9, 17, 584, 1 - setmaptile 9, 26, 584, 1 - setmaptile 44, 17, 584, 1 - setmaptile 8, 35, 584, 1 - setmaptile 53, 28, 584, 1 - setmaptile 45, 6, 584, 1 - setmaptile 48, 25, 584, 1 - setmaptile 31, 32, 592, 1 + setmetatile 9, 6, 584, 1 + setmetatile 9, 17, 584, 1 + setmetatile 9, 26, 584, 1 + setmetatile 44, 17, 584, 1 + setmetatile 8, 35, 584, 1 + setmetatile 53, 28, 584, 1 + setmetatile 45, 6, 584, 1 + setmetatile 48, 25, 584, 1 + setmetatile 31, 32, 592, 1 return SootopolisCity_MapScript1_14D10D:: @ 814D10D - setflag 2077 - checkflag 113 + setflag FLAG_VISITED_SOOTOPOLIS_CITY + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, SootopolisCity_EventScript_14D159 - checkflag 2090 + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, SootopolisCity_EventScript_14D123 end @@ -62,13 +62,13 @@ SootopolisCity_EventScript_14D159:: @ 814D159 return SootopolisCity_MapScript1_14D165:: @ 814D165 - setdivewarp Underwater_SootopolisCity, 255, 9, 6 + setdivewarp MAP_UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6 end SootopolisCity_EventScript_14D16E:: @ 814D16E lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_EventScript_14D183 msgbox SootopolisCity_Text_1696A4, 4 release @@ -92,16 +92,16 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F faceplayer dodailyevents special GetPlayerBigGuyGirlString - checkflag 2258 + checkflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS goto_if_eq SootopolisCity_EventScript_14D241 msgbox SootopolisCity_Text_1C63F2, 4 random 10 addvar RESULT, 20 - addvar RESULT, 133 - giveitem RESULT + addvar RESULT, ITEM_CHERI_BERRY + giveitem_std RESULT compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B - setflag 2258 + setflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS msgbox SootopolisCity_Text_1C64D0, 4 random 2 compare RESULT, 0 @@ -111,7 +111,7 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F end SootopolisCity_EventScript_14D1FF:: @ 814D1FF - giveitem ITEM_FIGY_BERRY + giveitem_std ITEM_FIGY_BERRY compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 @@ -119,7 +119,7 @@ SootopolisCity_EventScript_14D1FF:: @ 814D1FF end SootopolisCity_EventScript_14D220:: @ 814D220 - giveitem ITEM_IAPAPA_BERRY + giveitem_std ITEM_IAPAPA_BERRY compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 @@ -142,7 +142,7 @@ SootopolisCity_EventScript_14D25E:: @ 814D25E SootopolisCity_EventScript_14D268:: @ 814D268 lock faceplayer - checkflag 1236 + checkflag FLAG_DEFEATED_SOOTOPOLIS_GYM goto_if_eq SootopolisCity_EventScript_14D27D msgbox SootopolisCity_Text_16A4D6, 4 release @@ -156,7 +156,7 @@ SootopolisCity_EventScript_14D27D:: @ 814D27D SootopolisCity_EventScript_14D287:: @ 814D287 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_EventScript_14D29C msgbox SootopolisCity_Text_169813, 4 release @@ -170,7 +170,7 @@ SootopolisCity_EventScript_14D29C:: @ 814D29C SootopolisCity_EventScript_14D2A6:: @ 814D2A6 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_EventScript_14D2BB msgbox SootopolisCity_Text_1698A0, 4 release @@ -184,7 +184,7 @@ SootopolisCity_EventScript_14D2BB:: @ 814D2BB SootopolisCity_EventScript_14D2C5:: @ 814D2C5 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_EventScript_14D2DA msgbox SootopolisCity_Text_1697A7, 4 release @@ -445,7 +445,7 @@ SootopolisCity_EventScript_14D48F:: @ 814D48F SootopolisCity_EventScript_14D498:: @ 814D498 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_EventScript_14D4AD .ifdef SAPPHIRE msgbox SootopolisCity_Text_169DA6, 4 @@ -461,7 +461,7 @@ SootopolisCity_EventScript_14D4AD:: @ 814D4AD applymovement LAST_TALKED, SootopolisCity_Movement_1A0845 waitmovement 0 delay 50 - setfieldeffect 0, 1 + setfieldeffectargument 0, 1 dofieldeffect 30 delay 15 removeobject LAST_TALKED diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 51b67ee4b..65ed13d87 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -10,7 +10,7 @@ SootopolisCity_Gym_1F_MapScript1_15AF1C:: @ 815AF1C end SootopolisCity_Gym_1F_MapScript1_15AF22:: @ 815AF22 - tileeffect 4 + setstepcallback 4 end SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 @@ -25,16 +25,16 @@ SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF73 compare 0x4022, 69 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF61 - setmaptile 8, 4, 519, 0 - setmaptile 8, 5, 519, 0 + setmetatile 8, 4, 519, 0 + setmetatile 8, 5, 519, 0 SootopolisCity_Gym_1F_EventScript_15AF61:: @ 815AF61 - setmaptile 8, 10, 519, 0 - setmaptile 8, 11, 519, 0 + setmetatile 8, 10, 519, 0 + setmetatile 8, 11, 519, 0 SootopolisCity_Gym_1F_EventScript_15AF73:: @ 815AF73 - setmaptile 8, 15, 519, 0 - setmaptile 8, 16, 519, 0 + setmetatile 8, 15, 519, 0 + setmetatile 8, 16, 519, 0 SootopolisCity_Gym_1F_EventScript_15AF85:: @ 815AF85 return @@ -77,7 +77,7 @@ SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 waitmovement 0 playse 43 delay 60 - warphole SootopolisCity_Gym_B1F + warphole MAP_SOOTOPOLIS_CITY_GYM_B1F waitstate end @@ -87,9 +87,9 @@ SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D - checkflag 172 + checkflag FLAG_RECEIVED_TM03 goto_if 0, SootopolisCity_Gym_1F_EventScript_15B056 - checkflag 2060 + checkflag FLAG_BADGE06_GET goto_if 0, SootopolisCity_Gym_1F_EventScript_15B07A msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4 release @@ -100,19 +100,19 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D waitmessage call SootopolisCity_Gym_1F_EventScript_1A02C5 msgbox SootopolisCity_Gym_1F_Text_18F36B, 4 - setflag 1236 - setflag 2062 + setflag FLAG_DEFEATED_SOOTOPOLIS_GYM + setflag FLAG_BADGE08_GET setvar 0x8008, 8 call SootopolisCity_Gym_1F_EventScript_1A01C0 goto SootopolisCity_Gym_1F_EventScript_15B056 end SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 - giveitem ITEM_TM03 + giveitem_std ITEM_TM03 compare RESULT, 0 goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B msgbox SootopolisCity_Gym_1F_Text_18F466, 4 - setflag 172 + setflag FLAG_RECEIVED_TM03 release end @@ -124,7 +124,7 @@ SootopolisCity_Gym_1F_EventScript_15B07A:: @ 815B07A SootopolisCity_Gym_1F_EventScript_15B084:: @ 815B084 lock faceplayer - checkflag 1236 + checkflag FLAG_DEFEATED_SOOTOPOLIS_GYM goto_if_eq SootopolisCity_Gym_1F_EventScript_15B099 msgbox SootopolisCity_Gym_1F_Text_18E8A5, 4 release @@ -137,14 +137,14 @@ SootopolisCity_Gym_1F_EventScript_15B099:: @ 815B099 SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3 lockall - checkflag 2062 + checkflag FLAG_BADGE08_GET goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3 lockall - checkflag 2062 + checkflag FLAG_BADGE08_GET goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc index 4877d6d6e..074c9a179 100644 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ b/data/scripts/maps/SootopolisCity_House1.inc @@ -4,11 +4,11 @@ SootopolisCity_House1_MapScripts:: @ 815B29A SootopolisCity_House1_EventScript_15B29B:: @ 815B29B lock faceplayer - checkflag 121 + checkflag FLAG_RECEIVED_TM31 goto_if_eq SootopolisCity_House1_EventScript_15B2C7 msgbox SootopolisCity_House1_Text_18F991, 4 - giveitem ITEM_TM31 - setflag 121 + giveitem_std ITEM_TM31 + setflag FLAG_RECEIVED_TM31 msgbox SootopolisCity_House1_Text_18FA03, 4 release end @@ -22,8 +22,8 @@ SootopolisCity_House1_EventScript_15B2D1:: @ 815B2D1 lock faceplayer waitse - playpokecry SPECIES_KECLEON, 0 + playmoncry SPECIES_KECLEON, 0 msgbox SootopolisCity_House1_Text_18FA50, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/SootopolisCity_House4.inc b/data/scripts/maps/SootopolisCity_House4.inc index c192a0340..b552cc6d6 100644 --- a/data/scripts/maps/SootopolisCity_House4.inc +++ b/data/scripts/maps/SootopolisCity_House4.inc @@ -13,8 +13,8 @@ SootopolisCity_House4_EventScript_15B35F:: @ 815B35F lock faceplayer waitse - playpokecry SPECIES_AZUMARILL, 0 + playmoncry SPECIES_AZUMARILL, 0 msgbox SootopolisCity_House4_Text_18FDD8, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index a0fdc5ca4..fb91202f3 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -4,16 +4,16 @@ SootopolisCity_House6_MapScripts:: @ 815B385 SootopolisCity_House6_EventScript_15B386:: @ 815B386 lock faceplayer - checkflag 245 + checkflag FLAG_RECEIVED_WAILMER_DOLL goto_if_eq SootopolisCity_House6_EventScript_15B3CD msgbox SootopolisCity_House6_Text_18FEA1, 5 compare RESULT, 0 call_if 1, SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 - givedecoration 117 + givedecoration_std DECOR_WAILMER_DOLL compare RESULT, 0 goto_if_eq SootopolisCity_House6_EventScript_15B3D7 - setflag 245 + setflag FLAG_RECEIVED_WAILMER_DOLL release end @@ -28,7 +28,7 @@ SootopolisCity_House6_EventScript_15B3CD:: @ 815B3CD end SootopolisCity_House6_EventScript_15B3D7:: @ 815B3D7 - getdecorname 1, 117 + bufferdecorationname 1, DECOR_WAILMER_DOLL msgbox SootopolisCity_House6_Text_1A0CEF, 4 msgbox SootopolisCity_House6_Text_18FF28, 4 release diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index df536004e..bdff79375 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -38,7 +38,7 @@ SootopolisCity_House8_EventScript_15B45C:: @ 815B45C SootopolisCity_House8_EventScript_15B466:: @ 815B466 msgbox SootopolisCity_House8_Text_19021D, 4 - giveitem ITEM_ELIXIR + giveitem_std ITEM_ELIXIR compare RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B488 closemessage @@ -87,7 +87,7 @@ SootopolisCity_House8_EventScript_15B4ED:: @ 815B4ED SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7 msgbox SootopolisCity_House8_Text_190536, 4 - giveitem ITEM_ELIXIR + giveitem_std ITEM_ELIXIR compare RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B519 closemessage diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc index b88347002..115ed0453 100644 --- a/data/scripts/maps/SootopolisCity_Mart.inc +++ b/data/scripts/maps/SootopolisCity_Mart.inc @@ -29,9 +29,9 @@ SootopolisCity_Mart_Items:: @ 815B234 SootopolisCity_Mart_EventScript_15B24A:: @ 815B24A lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_Mart_EventScript_15B268 - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if 0, SootopolisCity_Mart_EventScript_15B268 msgbox SootopolisCity_Mart_Text_18F8D7, 4 release @@ -45,9 +45,9 @@ SootopolisCity_Mart_EventScript_15B268:: @ 815B268 SootopolisCity_Mart_EventScript_15B272:: @ 815B272 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_Mart_EventScript_15B290 - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if 0, SootopolisCity_Mart_EventScript_15B290 msgbox SootopolisCity_Mart_Text_18F96B, 4 release diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index cb09d8856..7b87bc7fc 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -3,23 +3,23 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 815B190 .byte 0 SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 - sethealplace 10 + setrespawn 10 end @ 815B19A setvar 0x800B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end SootopolisCity_PokemonCenter_1F_EventScript_15B1A8:: @ 815B1A8 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 msgbox SootopolisCity_PokemonCenter_1F_Text_18F770, 4 release @@ -33,9 +33,9 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1C6:: @ 815B1C6 SootopolisCity_PokemonCenter_1F_EventScript_15B1D0:: @ 815B1D0 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1EE - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE msgbox SootopolisCity_PokemonCenter_1F_Text_18F860, 4 release diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 3c6426024..f62becf08 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -3,7 +3,7 @@ SouthernIsland_Exterior_MapScripts:: @ 8160AD6 .byte 0 SouthernIsland_Exterior_MapScript1_160ADC:: @ 8160ADC - setflag 2121 + setflag FLAG_LANDMARK_SOUTHERN_ISLAND end SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 @@ -17,10 +17,10 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 applymovement LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 waitmovement 0 delay 30 - hideobject 1, 26, 9 + hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR setvar 0x8004, 2 call SouthernIsland_Exterior_EventScript_1A047C - warp LilycoveCity_Harbor, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index bcb316f96..ea2f852f4 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -4,7 +4,7 @@ SouthernIsland_Interior_MapScripts:: @ 8160B53 .byte 0 SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E - checkflag 2145 + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, SouthernIsland_Interior_EventScript_160B68 end @@ -44,19 +44,19 @@ SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B end SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 - checkflag 206 + checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS goto_if_eq SouthernIsland_Interior_EventScript_160C08 - checkflag 2131 + checkflag FLAG_SYS_HAS_EON_TICKET goto_if 0, SouthernIsland_Interior_EventScript_160C08 - setflag 206 + setflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS special SpawnCameraDummy applymovement 127, SouthernIsland_Interior_Movement_160C12 waitmovement 0 delay 50 waitse - playpokecry SPECIES_LATIAS_OR_LATIOS, 0 + playmoncry SPECIES_LATIAS_OR_LATIOS, 0 delay 30 - waitpokecry + waitmoncry addobject 2 delay 30 applymovement 127, SouthernIsland_Interior_Movement_160C16 @@ -65,11 +65,11 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 delay 50 special RemoveCameraDummy setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW - setflag 911 - setflag 2145 + setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartSouthernIslandBattle waitstate - clearflag 2145 + clearflag FLAG_SYS_CTRL_OBJ_DELETE releaseall end diff --git a/data/scripts/maps/Underwater_Route134.inc b/data/scripts/maps/Underwater_Route134.inc index bbe7e1ce2..464731b10 100644 --- a/data/scripts/maps/Underwater_Route134.inc +++ b/data/scripts/maps/Underwater_Route134.inc @@ -3,5 +3,5 @@ Underwater_Route134_MapScripts:: @ 815F071 .byte 0 Underwater_Route134_MapScript1_15F077:: @ 815F077 - setdivewarp Route134, 255, 60, 31 + setdivewarp MAP_ROUTE134, 255, 60, 31 end diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index 3d2fe81b2..d991a7096 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -5,37 +5,37 @@ Underwater_SeafloorCavern_MapScripts:: @ 815D99E .byte 0 Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE - setflag 2119 - checkflag 129 + setflag FLAG_LANDMARK_SEAFLOOR_CAVERN + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if_eq Underwater_SeafloorCavern_EventScript_15D9BB end Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB - setflag 980 + setflag FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION end Underwater_SeafloorCavern_MapScript1_15D9BF:: @ 815D9BF - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN call_if 1, Underwater_SeafloorCavern_EventScript_15D9C9 end Underwater_SeafloorCavern_EventScript_15D9C9:: @ 815D9C9 - setmaptile 5, 3, 542, 1 - setmaptile 6, 3, 542, 1 - setmaptile 7, 3, 542, 1 - setmaptile 8, 3, 542, 1 - setmaptile 5, 4, 552, 0 - setmaptile 6, 4, 552, 0 - setmaptile 7, 4, 552, 0 - setmaptile 8, 4, 552, 0 - setmaptile 5, 5, 552, 0 - setmaptile 6, 5, 552, 0 - setmaptile 7, 5, 552, 0 - setmaptile 8, 5, 552, 0 + setmetatile 5, 3, 542, 1 + setmetatile 6, 3, 542, 1 + setmetatile 7, 3, 542, 1 + setmetatile 8, 3, 542, 1 + setmetatile 5, 4, 552, 0 + setmetatile 6, 4, 552, 0 + setmetatile 7, 4, 552, 0 + setmetatile 8, 4, 552, 0 + setmetatile 5, 5, 552, 0 + setmetatile 6, 5, 552, 0 + setmetatile 7, 5, 552, 0 + setmetatile 8, 5, 552, 0 return Underwater_SeafloorCavern_MapScript1_15DA36:: @ 815DA36 - setdivewarp SeafloorCavern_Entrance, 255, 10, 17 + setdivewarp MAP_SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17 end Underwater_SeafloorCavern_EventScript_15DA3F:: @ 815DA3F diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 836ad86e2..cb5c713ee 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -11,17 +11,17 @@ Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 goto Underwater_SealedChamber_EventScript_15F0AF Underwater_SealedChamber_EventScript_15F0A6:: @ 815F0A6 - setdivewarp Route134, 255, 60, 31 + setdivewarp MAP_ROUTE134, 255, 60, 31 end Underwater_SealedChamber_EventScript_15F0AF:: @ 815F0AF - setdivewarp SealedChamber_OuterRoom, 255, 10, 19 + setdivewarp MAP_SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19 end Underwater_SealedChamber_EventScript_15F0B8:: @ 815F0B8 lockall braillemessage Underwater_SealedChamber_Braille_1C533D - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/Underwater_SootopolisCity.inc b/data/scripts/maps/Underwater_SootopolisCity.inc index c9405dfd7..bba04eec8 100644 --- a/data/scripts/maps/Underwater_SootopolisCity.inc +++ b/data/scripts/maps/Underwater_SootopolisCity.inc @@ -3,5 +3,5 @@ Underwater_SootopolisCity_MapScripts:: @ 815CAE4 .byte 0 Underwater_SootopolisCity_MapScript1_15CAEA:: @ 815CAEA - setdivewarp SootopolisCity, 255, 29, 53 + setdivewarp MAP_SOOTOPOLIS_CITY, 255, 29, 53 end diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 34d0bb70b..1e0f14728 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -68,7 +68,7 @@ LinkContestRoom1_EventScript_15F61A:: @ 815F61A end LinkContestRoom1_EventScript_15F625:: @ 815F625 - hideobject 255, 0, 9 + hideobjectat 255, MAP_LITTLEROOT_TOWN call LinkContestRoom1_EventScript_15F919 end @@ -382,30 +382,30 @@ LinkContestRoom1_EventScript_15FB64:: @ 815FB64 LinkContestRoom1_EventScript_15FBA1:: @ 815FBA1 incrementgamestat GAME_STAT_ENTERED_CONTEST - warp VerdanturfTown_ContestLobby, 255, 5, 4 + warp MAP_VERDANTURF_TOWN_CONTEST_LOBBY, 255, 5, 4 waitstate end LinkContestRoom1_EventScript_15FBAD:: @ 815FBAD incrementgamestat GAME_STAT_ENTERED_CONTEST - warp FallarborTown_ContestLobby, 255, 5, 4 + warp MAP_FALLARBOR_TOWN_CONTEST_LOBBY, 255, 5, 4 waitstate end LinkContestRoom1_EventScript_15FBB9:: @ 815FBB9 incrementgamestat GAME_STAT_ENTERED_CONTEST - warp SlateportCity_ContestLobby, 255, 5, 4 + warp MAP_SLATEPORT_CITY_CONTEST_LOBBY, 255, 5, 4 waitstate end LinkContestRoom1_EventScript_15FBC5:: @ 815FBC5 incrementgamestat GAME_STAT_ENTERED_CONTEST - warp LilycoveCity_ContestLobby, 255, 6, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 6, 4 waitstate end LinkContestRoom1_EventScript_15FBD1:: @ 815FBD1 - warp LilycoveCity_ContestLobby, 255, 7, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 7, 4 waitstate end diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc index 3e8f02302..b9e9b85a5 100644 --- a/data/scripts/maps/VerdanturfTown.inc +++ b/data/scripts/maps/VerdanturfTown.inc @@ -3,15 +3,15 @@ VerdanturfTown_MapScripts:: @ 814E854 .byte 0 VerdanturfTown_MapScript1_14E85A:: @ 814E85A - setflag 2068 + setflag FLAG_VISITED_VERDANTURF_TOWN setvar 0x4086, 0 - setflag 801 + setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF end VerdanturfTown_EventScript_14E866:: @ 814E866 lock faceplayer - checkflag 199 + checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_if_eq VerdanturfTown_EventScript_14E885 msgbox VerdanturfTown_Text_16CAEB, 4 applymovement 2, VerdanturfTown_Movement_1A083D @@ -37,7 +37,7 @@ VerdanturfTown_EventScript_14E8A2:: @ 814E8A2 VerdanturfTown_EventScript_14E8AB:: @ 814E8AB lock faceplayer - checkflag 199 + checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_if_eq VerdanturfTown_EventScript_14E8C0 msgbox VerdanturfTown_Text_16CD4D, 4 release diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 8462892e6..3694f089d 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -14,7 +14,7 @@ VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76 special sub_80C4BF0 call VerdanturfTown_ContestLobby_EventScript_15FBDB setvar 0x4088, 1 - warp LinkContestRoom1, 255, 7, 5 + warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end @@ -23,14 +23,14 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 applymovement 1, VerdanturfTown_ContestLobby_Movement_153E25 waitmovement 0 playse 71 - setmaptile 4, 2, 545, 1 - setmaptile 4, 3, 609, 1 + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, VerdanturfTown_ContestLobby_Movement_153E28 waitmovement 0 playse 71 - setmaptile 4, 2, 721, 1 - setmaptile 4, 3, 729, 1 + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 special DrawWholeMapView delay 20 applymovement 1, VerdanturfTown_ContestLobby_Movement_153E35 @@ -101,13 +101,13 @@ VerdanturfTown_ContestLobby_EventScript_153E3E:: @ 8153E3E VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 lock faceplayer - checkflag 235 + checkflag FLAG_RECEIVED_TM45 goto_if_eq VerdanturfTown_ContestLobby_EventScript_153E76 msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 - giveitem ITEM_TM45 + giveitem_std ITEM_TM45 compare RESULT, 0 goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B - setflag 235 + setflag FLAG_RECEIVED_TM45 release end @@ -123,7 +123,7 @@ VerdanturfTown_ContestLobby_EventScript_153E80:: @ 8153E80 VerdanturfTown_ContestLobby_EventScript_153E89:: @ 8153E89 lockall special ShowBerryBlenderRecordWindow - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc index 1cfa785d3..ed60ec1c7 100644 --- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc @@ -56,8 +56,8 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9:: @ 81540D9 lock faceplayer waitse - playpokecry SPECIES_PIKACHU, 0 + playmoncry SPECIES_PIKACHU, 0 msgbox VerdanturfTown_FriendshipRatersHouse_Text_178CFD, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc index a0b1f87de..598c3f60b 100644 --- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8153F09 .byte 0 VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F:: @ 8153F0F - sethealplace 18 + setrespawn 18 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B end @@ -12,7 +12,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 setvar 0x800b, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/scripts/maps/VerdanturfTown_WandasHouse.inc index fad64292b..205a4315c 100644 --- a/data/scripts/maps/VerdanturfTown_WandasHouse.inc +++ b/data/scripts/maps/VerdanturfTown_WandasHouse.inc @@ -4,10 +4,10 @@ VerdanturfTown_WandasHouse_MapScripts:: @ 8153F5A VerdanturfTown_WandasHouse_EventScript_153F5B:: @ 8153F5B lock faceplayer - checkflag 193 + checkflag FLAG_WALLY_SPEECH goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F73 msgbox VerdanturfTown_WandasHouse_Text_1783F6, 4 - setflag 193 + setflag FLAG_WALLY_SPEECH release end @@ -19,9 +19,9 @@ VerdanturfTown_WandasHouse_EventScript_153F73:: @ 8153F73 VerdanturfTown_WandasHouse_EventScript_153F7D:: @ 8153F7D lock faceplayer - checkflag 126 + checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FA5 - checkflag 1213 + checkflag FLAG_DEFEATED_LAVARIDGE_GYM goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F9B msgbox VerdanturfTown_WandasHouse_Text_17859A, 4 release @@ -44,9 +44,9 @@ VerdanturfTown_WandasHouse_EventScript_153FAF:: @ 8153FAF VerdanturfTown_WandasHouse_EventScript_153FB8:: @ 8153FB8 lock faceplayer - checkflag 1213 + checkflag FLAG_DEFEATED_LAVARIDGE_GYM goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FE0 - checkflag 190 + checkflag FLAG_DEFEATED_WALLY_MAUVILLE goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FD6 msgbox VerdanturfTown_WandasHouse_Text_1787FB, 4 release @@ -65,11 +65,11 @@ VerdanturfTown_WandasHouse_EventScript_153FE0:: @ 8153FE0 VerdanturfTown_WandasHouse_EventScript_153FEA:: @ 8153FEA lock faceplayer - checkflag 126 + checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD goto_if_eq VerdanturfTown_WandasHouse_EventScript_154025 - checkflag 1213 + checkflag FLAG_DEFEATED_LAVARIDGE_GYM goto_if_eq VerdanturfTown_WandasHouse_EventScript_15401B - checkflag 199 + checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_if_eq VerdanturfTown_WandasHouse_EventScript_154011 msgbox VerdanturfTown_WandasHouse_Text_1788B1, 4 release diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index fe775d793..7e48d3d90 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -3,12 +3,12 @@ VictoryRoad_1F_MapScripts:: @ 815DE83 .byte 0 VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89 - checkflag 126 + checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD call_if 1, VictoryRoad_1F_EventScript_15DE93 end VictoryRoad_1F_EventScript_15DE93:: @ 815DE93 - setflag 858 + setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD return VictoryRoad_1F_EventScript_15DE97:: @ 815DE97 @@ -41,9 +41,9 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 msgbox VictoryRoad_1F_Text_19782B, 4 trainerbattle 3, OPPONENT_WALLY_1, 0, VictoryRoad_1F_Text_197943 msgbox VictoryRoad_1F_Text_197967, 4 - clearflag 858 + clearflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD moveobjectoffscreen 4 - setflag 126 + setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD setvar 0x40c3, 1 releaseall end diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 402afae23..3ccfbeb29 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -1,11 +1,4 @@ -@ From mauville_old_man.h -@ TODO: Put these in a header - -MAUVILLE_MAN_BARD = 0 -MAUVILLE_MAN_HIPSTER = 1 -MAUVILLE_MAN_TRADER = 2 -MAUVILLE_MAN_STORYTELLER = 3 -MAUVILLE_MAN_GIDDY = 4 +#include "constants/mauville_man.h" MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744 special ScrSpecial_GetCurrentMauvilleMan @@ -91,7 +84,7 @@ dont_write_lyrics: SpeakToHipster: lock faceplayer - setflag 2054 + setflag FLAG_SYS_HIPSTER_MEET msgbox gTextHipster_TheyCallMeTheHipster, 4 special ScrSpecial_GetHipsterSpokenFlag compare RESULT, FALSE @@ -240,7 +233,7 @@ choose_story: setvar 0x8008, 1 special ScrSpecial_StorytellerDisplayStory waitmessage - waitbutton + waitbuttonpress specialvar RESULT, ScrSpecial_StorytellerUpdateStat compare RESULT, FALSE goto_if_eq no_stat_update diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index df097fc19..d8f628709 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -1,7 +1,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B14:: @ 81B1B14 lock faceplayer - checkflag 2053 + checkflag FLAG_SYS_CHAT_USED goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB msgbox PetalburgCity_PokemonCenter_1F_Text_1B1C97, 4 goto PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D @@ -97,11 +97,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C6D:: @ 81B1C6D end PetalburgCity_PokemonCenter_1F_EventScript_1B1C77:: @ 81B1C77 - checkflag 2059 + checkflag FLAG_BADGE05_GET goto_if 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 - checkflag 2124 + checkflag FLAG_SYS_EXDATA_ENABLE goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 - setflag 2124 + setflag FLAG_SYS_EXDATA_ENABLE msgbox PetalburgCity_PokemonCenter_1F_Text_1B21CC, 3 release end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 69a4dc3e9..ea8128ee3 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -59,15 +59,15 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69DF:: @ 81B69DF LittlerootTown_BrendansHouse_2F_EventScript_1B69EB:: @ 81B69EB LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB - checkflag 81 + checkflag FLAG_SET_WALL_CLOCK goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A91 msgbox LittlerootTown_BrendansHouse_2F_Text_172E18, 4 call LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B delay 30 setvar 0x4092, 6 - setflag 81 - setflag 754 - setflag 755 + setflag FLAG_SET_WALL_CLOCK + setflag FLAG_HIDE_MACHOKE_MOVER_1 + setflag FLAG_HIDE_MACHOKE_MOVER_2 checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A31 @@ -222,7 +222,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE msgbox LittlerootTown_BrendansHouse_1F_Text_172841, 4 fadedefaultbgm special TurnOffTVScreen - setflag 2096 + setflag FLAG_SYS_TV_HOME delay 35 return @@ -256,9 +256,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 compare 0x408c, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 - checkflag 2059 + checkflag FLAG_BADGE05_GET goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D - checkflag 82 + checkflag FLAG_RESCUED_BIRCH goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 compare 0x4001, 1 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80 @@ -274,14 +274,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C33:: @ 81B6C33 end LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D - checkflag 133 + checkflag FLAG_RECEIVED_AMULET_COIN goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 msgbox LittlerootTown_BrendansHouse_1F_Text_172782, 4 - giveitem ITEM_AMULET_COIN + giveitem_std ITEM_AMULET_COIN compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1A029B msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, 4 - setflag 133 + setflag FLAG_RECEIVED_AMULET_COIN release end @@ -313,9 +313,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CA6:: @ 81B6CA6 lock faceplayer waitse - playpokecry SPECIES_MACHOKE, 0 + playmoncry SPECIES_MACHOKE, 0 msgbox LittlerootTown_BrendansHouse_1F_Text_17281D, 4 - waitpokecry + waitmoncry release end @@ -324,9 +324,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CB9:: @ 81B6CB9 lock faceplayer waitse - playpokecry SPECIES_MACHOKE, 0 + playmoncry SPECIES_MACHOKE, 0 msgbox LittlerootTown_BrendansHouse_1F_Text_172831, 4 - waitpokecry + waitmoncry release end @@ -383,7 +383,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE compare 0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8 msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4 - giveitem ITEM_SS_TICKET + giveitem_std ITEM_SS_TICKET msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4 closemessage compare 0x8008, 0 @@ -398,7 +398,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B playse 8 removeobject 0x8009 - setflag 291 + setflag FLAG_RECEIVED_SS_TICKET setvar 0x4082, 4 setvar 0x408c, 4 releaseall diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 6fe754097..42e73e17c 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -76,7 +76,7 @@ FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E msgbox FallarborTown_ContestLobby_Text_1B6FF0, 4 dodailyevents - checkflag 2241 + checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR goto_if_eq FallarborTown_ContestLobby_EventScript_1B774F goto FallarborTown_ContestLobby_EventScript_1B7759 end @@ -106,8 +106,8 @@ FallarborTown_ContestLobby_EventScript_1B774F:: @ 81B774F FallarborTown_ContestLobby_EventScript_1B7759:: @ 81B7759 msgbox FallarborTown_ContestLobby_Text_1B704A, 4 - giveitem ITEM_PECHA_BERRY - setflag 2241 + giveitem_std ITEM_PECHA_BERRY + setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR goto FallarborTown_ContestLobby_EventScript_1B76EF end @@ -162,7 +162,7 @@ FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6 dodailyevents - checkflag 2241 + checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR goto_if_eq FallarborTown_ContestLobby_EventScript_1B77F6 goto FallarborTown_ContestLobby_EventScript_1B7800 end @@ -174,8 +174,8 @@ FallarborTown_ContestLobby_EventScript_1B77F6:: @ 81B77F6 FallarborTown_ContestLobby_EventScript_1B7800:: @ 81B7800 msgbox FallarborTown_ContestLobby_Text_1B74B4, 4 - giveitem ITEM_PECHA_BERRY - setflag 2241 + giveitem_std ITEM_PECHA_BERRY + setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR msgbox FallarborTown_ContestLobby_Text_1B753A, 4 release end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index d0283f072..892630ac8 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -1,13 +1,13 @@ gUnknown_081C340A:: @ 81C340A setvar 0x40a4, 1 special ExitSafariMode - setwarp Route121_SafariZoneEntrance, 255, 2, 5 + setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 end EventScript_1C341B: @ 81C341B setvar 0x40a4, 1 special ExitSafariMode - warp Route121_SafariZoneEntrance, 255, 2, 5 + warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate end @@ -27,7 +27,7 @@ gUnknown_081C3448:: @ 81C3448 playse 73 message UnknownString_81C34E4 waitmessage - waitbutton + waitbuttonpress releaseall goto EventScript_1C341B @@ -36,7 +36,7 @@ gUnknown_081C3459:: @ 81C3459 playse 73 message UnknownString_81C3514 waitmessage - waitbutton + waitbuttonpress releaseall goto EventScript_1C341B @@ -62,13 +62,13 @@ EventScript_1C348E: EventScript_1C34A0: message UnknownString_81C35A9 waitmessage - waitbutton + waitbuttonpress releaseall end EventScript_1C34A9: message UnknownString_81C3583 waitmessage - waitbutton + waitbuttonpress releaseall end diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index f3c03a853..deb30187f 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -9,13 +9,13 @@ Route111_EventScript_1A3858:: @ 81A3858 end Route111_EventScript_1A3877:: @ 81A3877 - giveitem ITEM_TM43 + giveitem_std ITEM_TM43 compare RESULT, 0 goto_if_eq Route111_EventScript_1A38D9 msgbox Route111_Text_1A35C5, 4 closemessage - setflag 96 - clearflag 948 + setflag FLAG_RECEIVED_SECRET_POWER + clearflag FLAG_HIDE_TM_SALESMAN_SLATEPORT compare FACING, 3 call_if 1, Route111_EventScript_1A38C3 compare FACING, 4 diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 425f42a85..cf5fb26c5 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -7,9 +7,9 @@ Event_TV:: @ 81A6E72 goto_if_eq EventScript_1A6F01 compare RESULT, 1 goto_if_eq EventScript_1A6F0B - checkflag 2098 + checkflag FLAG_SYS_TV_START goto_if 0, EventScript_1A6EF1 - checkflag 2097 + checkflag FLAG_SYS_TV_WATCH goto_if_eq EventScript_1A6EF1 specialvar RESULT, IsTVShowInSearchOfTrainersAiring compare RESULT, 1 @@ -49,8 +49,8 @@ EventScript_1A6F0B: msgbox UnknownString_8172C50, 4 .endif special InitRoamer - clearflag 2141 - setflag 255 + clearflag FLAG_SYS_TV_LATI + setflag FLAG_LATIOS_OR_LATIAS_ROAMING special TurnOffTVScreen releaseall end @@ -58,7 +58,7 @@ EventScript_1A6F0B: EventScript_1A6F21: special DoTVShow waitmessage - waitbutton + waitbuttonpress compare RESULT, 1 goto_if 5, EventScript_1A6F21 goto EventScript_1A6F37 @@ -66,7 +66,7 @@ EventScript_1A6F21: EventScript_1A6F37: special TurnOffTVScreen - setflag 2097 + setflag FLAG_SYS_TV_WATCH releaseall end @@ -81,14 +81,14 @@ EventScript_1A6F50: compare RESULT, 0 goto_if_eq EventScript_1A6EBB waitmessage - waitbutton + waitbuttonpress goto EventScript_1A6F37 end EventScript_1A6F66: special DoTVShowInSearchOfTrainers waitmessage - waitbutton + waitbuttonpress compare RESULT, 0 goto_if_eq EventScript_1A6F66 goto EventScript_1A6F37 diff --git a/data/secret_base.s b/data/secret_base.s deleted file mode 100644 index 59ded8ddf..000000000 --- a/data/secret_base.s +++ /dev/null @@ -1,77 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 1 -gUnknown_083D1358:: @ 83D1358 - .2byte 0x26, 0x36 - .2byte 0x27, 0x37 - .2byte 0x1A0, 0x1A1 - .2byte 0x1A8, 0x1A9 - .2byte 0x1B0, 0x1B1 - .2byte 0x208, 0x210 - .2byte 0x271, 0x278 - -gUnknown_083D1374:: @ 83D1374 - .byte 0, 0 - .byte 1, 3 - .byte 6, 0 - .byte 5, 9 - .byte 12, 0 - .byte 1, 3 - .byte 18, 0 - .byte 7, 13 - .byte 1, 0 - .byte 2, 3 - .byte 7, 0 - .byte 9, 2 - .byte 13, 0 - .byte 13, 4 - .byte 19, 0 - .byte 1, 2 - .byte 2, 0 - .byte 1, 3 - .byte 8, 0 - .byte 1, 2 - .byte 14, 0 - .byte 3, 15 - .byte 20, 0 - .byte 3, 14 - .byte 3, 0 - .byte 9, 3 - .byte 9, 0 - .byte 8, 7 - .byte 15, 0 - .byte 3, 6 - .byte 21, 0 - .byte 5, 9 - .byte 4, 0 - .byte 2, 3 - .byte 10, 0 - .byte 5, 6 - .byte 16, 0 - .byte 15, 3 - .byte 22, 0 - .byte 4, 10 - .byte 5, 0 - .byte 3, 3 - .byte 11, 0 - .byte 1, 2 - .byte 17, 0 - .byte 7, 8 - .byte 23, 0 - .byte 9, 6 - - .align 2 -gUnknown_083D13D4:: @ 83D13D4 - .4byte SecretBaseText_DelRegist, sub_80BCA84 - .4byte gUnknownText_Exit, sub_80BCBF8 - - .align 2 -gUnknown_083D13E4:: @ 83D13E4 - .4byte sub_80BCB90 - .4byte sub_80BCBC0 - -gUnknown_083D13EC:: @ 83D13EC - .byte 0x23,0x24,0xF,0x1F,0x21,0x2F,0xE,0x14,0x20,0x22,0x0,0x0 diff --git a/data/slot_machine.s b/data/slot_machine.s index 5f97c1f5e..9bd6fe5c9 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -534,23 +534,23 @@ gOamData_83ED0B8:: @ 83ED0B8 .align 2 gSpriteImageTable_83ED0C0:: @ 83ED0C0 - obj_frame_tiles 0x02013200, 0x800 - obj_frame_tiles 0x02013A00, 0x800 - obj_frame_tiles 0x02014200, 0x800 - obj_frame_tiles 0x02014A00, 0x800 - obj_frame_tiles 0x02015200, 0x800 + obj_frame_tiles gSharedMem + 0x13200, 0x800 + obj_frame_tiles gSharedMem + 0x13A00, 0x800 + obj_frame_tiles gSharedMem + 0x14200, 0x800 + obj_frame_tiles gSharedMem + 0x14A00, 0x800 + obj_frame_tiles gSharedMem + 0x15200, 0x800 .align 2 gSpriteImageTable_83ED0E8:: @ 83ED0E8 - obj_frame_tiles 0x02015A00, 0x300 + obj_frame_tiles gSharedMem + 0x15A00, 0x300 .align 2 gSpriteImageTable_83ED0F0:: @ 83ED0F0 - obj_frame_tiles 0x02015D00, 0x500 + obj_frame_tiles gSharedMem + 0x15D00, 0x500 .align 2 gSpriteImageTable_83ED0F8:: @ 83ED0F8 - obj_frame_tiles 0x02016200, 0x600 + obj_frame_tiles gSharedMem + 0x16200, 0x600 .align 2 gSpriteImageTable_83ED100:: @ 83ED100 @@ -593,67 +593,67 @@ gSpriteImageTable_83ED170:: @ 83ED170 .align 2 gSpriteImageTable_83ED178:: @ 83ED178 - obj_frame_tiles 0x02010000, 0x600 + obj_frame_tiles gSharedMem + 0x10000, 0x600 .align 2 gSpriteImageTable_83ED180:: @ 83ED180 - obj_frame_tiles 0x02010600, 0x200 + obj_frame_tiles gSharedMem + 0x10600, 0x200 .align 2 gSpriteImageTable_83ED188:: @ 83ED188 - obj_frame_tiles 0x02010800, 0x200 + obj_frame_tiles gSharedMem + 0x10800, 0x200 .align 2 gSpriteImageTable_83ED190:: @ 83ED190 - obj_frame_tiles 0x02010A00, 0x200 + obj_frame_tiles gSharedMem + 0x10A00, 0x200 .align 2 gSpriteImageTable_83ED198:: @ 83ED198 - obj_frame_tiles 0x02010C00, 0x300 + obj_frame_tiles gSharedMem + 0x10C00, 0x300 .align 2 gSpriteImageTable_83ED1A0:: @ 83ED1A0 - obj_frame_tiles 0x02011000, 0x400 + obj_frame_tiles gSharedMem + 0x11000, 0x400 .align 2 gSpriteImageTable_83ED1A8:: @ 83ED1A8 - obj_frame_tiles 0x02011400, 0x200 + obj_frame_tiles gSharedMem + 0x11400, 0x200 .align 2 gSpriteImageTable_83ED1B0:: @ 83ED1B0 - obj_frame_tiles 0x02011600, 0x300 + obj_frame_tiles gSharedMem + 0x11600, 0x300 .align 2 gSpriteImageTable_83ED1B8:: @ 83ED1B8 - obj_frame_tiles 0x02011900, 0x300 + obj_frame_tiles gSharedMem + 0x11900, 0x300 .align 2 gSpriteImageTable_83ED1C0:: @ 83ED1C0 - obj_frame_tiles 0x02011C00, 0x200 - obj_frame_tiles 0x02011E00, 0x200 - obj_frame_tiles 0x02011E00, 0x200 + obj_frame_tiles gSharedMem + 0x11C00, 0x200 + obj_frame_tiles gSharedMem + 0x11E00, 0x200 + obj_frame_tiles gSharedMem + 0x11E00, 0x200 @ is this a typo? .align 2 gSpriteImageTable_83ED1D8:: @ 83ED1D8 - obj_frame_tiles 0x02012000, 0x280 + obj_frame_tiles gSharedMem + 0x12000, 0x280 .align 2 gSpriteImageTable_83ED1E0:: @ 83ED1E0 - obj_frame_tiles 0x02012280, 0x80 - obj_frame_tiles 0x02012300, 0x80 - obj_frame_tiles 0x02012380, 0x80 - obj_frame_tiles 0x02012400, 0x80 - obj_frame_tiles 0x02012480, 0x80 + obj_frame_tiles gSharedMem + 0x12280, 0x80 + obj_frame_tiles gSharedMem + 0x12300, 0x80 + obj_frame_tiles gSharedMem + 0x12380, 0x80 + obj_frame_tiles gSharedMem + 0x12400, 0x80 + obj_frame_tiles gSharedMem + 0x12480, 0x80 .align 2 gSpriteImageTable_83ED208:: @ 83ED208 - obj_frame_tiles 0x02012600, 0x480 - obj_frame_tiles 0x02012A80, 0x480 + obj_frame_tiles gSharedMem + 0x12600, 0x480 + obj_frame_tiles gSharedMem + 0x12A80, 0x480 .align 2 gSpriteImageTable_83ED218:: @ 83ED218 - obj_frame_tiles 0x02012F00, 0x180 - obj_frame_tiles 0x02013080, 0x180 + obj_frame_tiles gSharedMem + 0x12F00, 0x180 + obj_frame_tiles gSharedMem + 0x13080, 0x180 .align 2 gSpriteImageTable_83ED228:: @ 83ED228 @@ -1402,15 +1402,15 @@ gUnknown_083EDC2C:: @ 83EDC2C obj_tiles gSlotMachineNumber7Tiles, 0x40, 14 obj_tiles gSlotMachineNumber8Tiles, 0x40, 15 obj_tiles gSlotMachineNumber9Tiles, 0x40, 16 - obj_tiles 0x2010a00, 0x200, 18 - obj_tiles 0x2011400, 0x200, 19 - obj_tiles 0x2011600, 0x300, 20 - obj_tiles 0x2011900, 0x300, 21 + obj_tiles gSharedMem + 0x10A00, 0x200, 18 + obj_tiles gSharedMem + 0x11400, 0x200, 19 + obj_tiles gSharedMem + 0x11600, 0x300, 20 + obj_tiles gSharedMem + 0x11900, 0x300, 21 null_obj_tiles .align 2 gUnknown_083EDCDC:: @ 83EDCDC - obj_tiles 0x02010000, 2048, 0x0011 + obj_tiles gSharedMem + 0x10000, 2048, 0x0011 .align 2 gUnknown_083EDCE4:: @ 83EDCE4 diff --git a/data/specials.inc b/data/specials.inc index 6ce9b5b1e..2924f2173 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -33,7 +33,7 @@ gSpecials:: def_special sub_8100A7C def_special sub_80BBC78 def_special sub_80BCE4C - def_special sub_80C683C + def_special DoSecretBasePCTurnOffEffect def_special sub_80B929C def_special sub_808347C def_special sub_80834E4 @@ -51,7 +51,7 @@ gSpecials:: def_special sub_80C5568 def_special sub_8083BDC def_special FieldObjectInteractionGetBerryTreeData - def_special sub_80B4EE4 + def_special Berry_FadeAndGoToBerryBagMenu def_special FieldObjectInteractionPlantBerryTree def_special FieldObjectInteractionPickBerryTree def_special FieldObjectInteractionRemoveBerryTree @@ -188,18 +188,18 @@ gSpecials:: def_special sub_80BDD18 def_special GabbyAndTySetScriptVarsToFieldObjectLocalIds def_special sub_810E300 - def_special sp0B5_daycare - def_special sp0B6_daycare - def_special sub_8041E7C - def_special sp0B8_daycare - def_special sp0B9_daycare_relationship_comment - def_special sub_8042328 - def_special Daycare_SendPokemon_Special + def_special GetDaycareMonNicknames + def_special GetDaycareState + def_special RejectEggFromDayCare + def_special GiveEggFromDaycare + def_special SetDaycareCompatibilityString + def_special GetSelectedDaycareMonNickname + def_special StoreSelectedPokemonInDaycare def_special ChooseSendDaycareMon def_special ShowDaycareLevelMenu - def_special sub_80417B8 - def_special sub_8041770 - def_special sub_8041648 + def_special GetNumLevelsGainedFromDaycare + def_special GetDaycareCost + def_special TakePokemonFromDaycare def_special ScriptHatchMon def_special EggHatch def_special sub_8042B4C @@ -241,19 +241,19 @@ gSpecials:: def_special sub_8134548 def_special sub_81347F8 def_special CheckPartyBattleTowerBanlist - def_special sub_8135474 - def_special sub_81360C0 + def_special PrintBattleTowerTrainerGreeting + def_special PrintEReaderTrainerGreeting def_special sub_813556C def_special sub_8135668 def_special sub_81358A4 def_special sub_8135A14 def_special sub_8135BA0 - def_special sub_8135C38 - def_special sub_8135D84 - def_special sub_8135DEC - def_special sub_8135E50 + def_special BattleTower_SoftReset + def_special DetermineBattleTowerPrize + def_special GiveBattleTowerPrize + def_special AwardBattleTowerRibbons def_special ChooseBattleTowerPlayerParty - def_special sub_813601C + def_special ValidateEReaderTrainer def_special sub_810F404 def_special ReducePlayerPartyToThree def_special BedroomPC @@ -329,7 +329,7 @@ gSpecials:: def_special sp13F_fall_to_last_warp def_special ShowContestEntryMonPic def_special sub_80C5164 - def_special sub_8134AB4 + def_special SetEReaderTrainerGfxId def_special ScrSpecial_StartSouthernIslandBattle def_special SetRoute119Weather def_special SetRoute123Weather diff --git a/data/text/battle_strings.inc b/data/text/battle_strings.inc deleted file mode 100644 index 7a47caa0e..000000000 --- a/data/text/battle_strings.inc +++ /dev/null @@ -1,1830 +0,0 @@ -BattleText_UnknownString: - .string "{STRING 33}$" -BattleText_GainExpPoints: - .string "{STRING 0} gained{STRING 1}\n{STRING 42} EXP. Points!\p$" -BattleText_Terminator: - .string "$" -BattleText_BoostedExp: - .string " a boosted$" -BattleText_GrewLevel: - .string "{STRING 0} grew to\nLV. {STRING 1}!{UNKNOWN_A}\p$" -BattleText_LearnedMove: - .string "{STRING 0} learned\n{STRING 1}!{UNKNOWN_A}\p$" -BattleText_TryingToLearnMove: - .string "{STRING 0} is trying to\nlearn {STRING 1}.\p$" -BattleText_CantLearnMore: - .string "But, {STRING 0} can’t learn\nmore than four moves.\p$" -BattleText_DeleteMove: - .string "Delete a move to make\nroom for {STRING 1}?$" -BattleText_DeletedMove: - .string "{STRING 0} forgot\n{STRING 1}.\p$" -BattleText_StopLearning: - .string "{PAUSE 32}Stop learning\n{STRING 1}?$" -BattleText_DidNotLearn: - .string "{STRING 0} did not learn\n{STRING 1}.\p$" -BattleText_UseNext: - .string "Use next POKéMON?$" -BattleText_AttackMissed: - .string "{ATTACKING_MON}’s\nattack missed!$" -BattleText_ProtectedItself: - .string "{DEFENDING_MON}\nprotected itself!$" -BattleText_AvoidedDamage: - .string "{DEFENDING_MON} avoided\ndamage with {STRING 22}!$" -BattleText_GroundMoveNegate: - .string "{DEFENDING_MON} makes GROUND\nmoves miss with {STRING 22}!$" -BattleText_AvoidedAttack: - .string "{DEFENDING_MON} avoided\nthe attack!$" -BattleText_DoesntAffect: - .string "It doesn’t affect\n{DEFENDING_MON}...$" -BattleText_AttackingFainted: - .string "{ATTACKING_MON}\nfainted!\p$" -BattleText_DefendingFainted: - .string "{DEFENDING_MON}\nfainted!\p$" -BattleText_WinningPrize: - .string "{STRING 32} got ¥{STRING 0}\nfor winning!\p$" -BattleText_OutOfUsablePoke: - .string "{STRING 32} is out of\nuseable POKéMON!\p$" -BattleText_WhitedOut: - .string "{STRING 32} whited out!{PAUSE_UNTIL_PRESS}$" -BattleText_PreventEscape: - .string "{STRING 16} prevents\nescape with {STRING 23}!\p$" -BattleText_CantEscape: - .string "Can’t escape!\p$" -BattleText_AttackingCantEscape: - .string "{ATTACKING_MON}\ncan’t escape!$" -BattleText_HitMulti: - .string "Hit {STRING 0} time(s)!$" -BattleText_FellAsleep: - .string "{STRING 14}\nfell asleep!$" -BattleText_MadeAsleep: - .string "{STRING 16}’s {STRING 23}\nmade {STRING 14} sleep!$" -BattleText_DefendingAsleep: - .string "{DEFENDING_MON} is\nalready asleep!$" -BattleText_AttackingAsleep: - .string "{ATTACKING_MON} is\nalready asleep!$" -BattleText_WasntAffected: - .string "{DEFENDING_MON}\nwasn’t affected!$" -BattleText_Poisoned: - .string "{STRING 14}\nwas poisoned!$" -BattleText_Poisoned2: - .string "{STRING 16}’s {STRING 23}\npoisoned {STRING 14}!$" -BattleText_PoisonHurt: - .string "{ATTACKING_MON} is hurt\nby poison!$" -BattleText_AlreadyPoisoned: - .string "{DEFENDING_MON} is already\npoisoned.$" -BattleText_BadlyPoisoned: - .string "{STRING 14} is badly\npoisoned!$" -BattleText_EnergyDrained: - .string "{DEFENDING_MON} had its\nenergy drained!$" -BattleText_Burned: - .string "{STRING 14} was burned!$" -BattleText_Burned2: - .string "{STRING 16}’s {STRING 23}\nburned {STRING 14}!$" -BattleText_BurnHurt: - .string "{ATTACKING_MON} is hurt\nby its burn!$" -BattleText_AlreadyBurned: - .string "{DEFENDING_MON} already\nhas a burn.$" -BattleText_Frozen: - .string "{STRING 14} was\nfrozen solid!$" -BattleText_Frozen2: - .string "{STRING 16}’s {STRING 23}\nfroze {STRING 14} solid!$" -BattleText_FrozenSolid: - .string "{ATTACKING_MON} is\nfrozen solid!$" -BattleText_DefendingDefrosted: - .string "{DEFENDING_MON} was\ndefrosted!$" -BattleText_AttackingDefrosted: - .string "{ATTACKING_MON} was\ndefrosted!$" -BattleText_Defrosted: - .string "{ATTACKING_MON} was\ndefrosted by {STRING 17}!$" -BattleText_Paralyzed: - .string "{STRING 14} is paralyzed!\nIt may be unable to move!$" -BattleText_Paralyzed2: - .string "{STRING 16}’s {STRING 23}\nparalyzed {STRING 14}!\lIt may be unable to move!$" -BattleText_Paralyzed3: - .string "{ATTACKING_MON} is paralyzed!\nIt can’t move!$" -BattleText_AlreadyParalyzed: - .string "{DEFENDING_MON} is\nalready paralyzed!$" -BattleText_ParalysisHealed: - .string "{DEFENDING_MON} was\nhealed of paralysis!$" -BattleText_DreamEaten: - .string "{DEFENDING_MON}’s\ndream was eaten!$" -BattleText_AttackingStatNoHigher: - .string "{ATTACKING_MON}’s {STRING 0}\nwon’t go higher!$" -BattleText_DefendingStatNoHigher: - .string "{DEFENDING_MON}’s {STRING 0}\nwon’t go lower!$" -BattleText_StoppedWorking: - .string "Your team’s {STRING 0}\nstopped working!$" -BattleText_StoppedWorking2: - .string "The foe’s {STRING 0}\nstopped working!$" -BattleText_Confused: - .string "{ATTACKING_MON} is\nconfused!$" -BattleText_ConfusionSnapOut: - .string "{ATTACKING_MON} snapped\nout of confusion!$" -BattleText_BecameConfused: - .string "{STRING 14} became\nconfused!$" -BattleText_AlreadyConfused: - .string "{DEFENDING_MON} is\nalready confused!$" -BattleText_FellLove: - .string "{DEFENDING_MON}\nfell in love!$" -BattleText_InLoveWith: - .string "{ATTACKING_MON} is in love\nwith {STRING 16}!$" -BattleText_ImmobilizedBy: - .string "{ATTACKING_MON} is\nimmobilized by love!$" -BattleText_BlownAway: - .string "{DEFENDING_MON} was\nblown away!$" -BattleText_TypeTransform: - .string "{ATTACKING_MON} transformed\ninto the {STRING 0} type!$" -BattleText_Flinched: - .string "{ATTACKING_MON} flinched!$" -BattleText_RegainedHealth: - .string "{DEFENDING_MON} regained\nhealth!$" -BattleText_HPFull: - .string "{DEFENDING_MON}’s\nHP is full!$" -BattleText_RaisedSpDef: - .string "{STRING 38}’s {STRING 17}\nraised SP. DEF!$" -BattleText_RaisedSpDefLittle: - .string "{STRING 38}’s {STRING 17}\nraised SP. DEF a little!$" -BattleText_RaisedDefense: - .string "{STRING 38}’s {STRING 17}\nraised DEFENSE!$" -BattleText_RaisedDefenseLittle: - .string "{STRING 38}’s {STRING 17}\nraised DEFENSE a little!$" -BattleText_CoveredVeil: - .string "{STRING 38} is covered\nby a veil!$" -BattleText_SafeguardActive: - .string "{DEFENDING_MON} is protected\nby SAFEGUARD!$" -BattleText_SafeguardFaded: - .string "{STRING 40}’s SAFEGUARD\nfaded!$" -BattleText_WentToSleep: - .string "{ATTACKING_MON} went\nto sleep!$" -BattleText_SpeltHealthy: - .string "{ATTACKING_MON} slept and\nbecame healthy!$" -BattleText_WhipWhirlwind: - .string "{ATTACKING_MON} whipped\nup a whirlwind!$" -BattleText_TookSunlight: - .string "{ATTACKING_MON} took\nin sunlight!$" -BattleText_LoweredHead: - .string "{ATTACKING_MON} lowered\nits head!$" -BattleText_IsGlowing: - .string "{ATTACKING_MON} is glowing!$" -BattleText_FlewHigh: - .string "{ATTACKING_MON} flew\nup high!$" -BattleText_DugHole: - .string "{ATTACKING_MON} dug a hole!$" -BattleText_HidUnderwater: - .string "{ATTACKING_MON} hid\nunderwater!$" -BattleText_SprangUp: - .string "{ATTACKING_MON} sprang up!$" -BattleText_SqueezedBind: - .string "{DEFENDING_MON} was squeezed by\n{ATTACKING_MON}’s BIND!$" -BattleText_TrappedVortex: - .string "{DEFENDING_MON} was trapped\nin the vortex!$" -BattleText_SandTombTrapped: - .string "{DEFENDING_MON} was trapped\nby SAND TOMB!$" -BattleText_Wrapped: - .string "{DEFENDING_MON} was WRAPPED by\n{ATTACKING_MON}!$" -BattleText_Clamped: - .string "{ATTACKING_MON} CLAMPED\n{DEFENDING_MON}!$" -BattleText_HurtBy: - .string "{ATTACKING_MON} is hurt\nby {STRING 0}!$" -BattleText_FreedFrom: - .string "{ATTACKING_MON} was freed\nfrom {STRING 0}!$" -BattleText_KeptGoingCrash: - .string "{ATTACKING_MON} kept going\nand crashed!$" - -gUnknown_083FEE5D:: @ 83FEE5D -BattleText_MistShroud: - .string "{STRING 38} became\nshrouded in MIST!$" -BattleText_MistProtect: - .string "{STRING 16} is protected\nby MIST!$" - -gUnknown_083FEE92:: @ 83FEE92 -BattleText_GetPumped: - .string "{ATTACKING_MON} is getting\npumped!$" -BattleText_HitRecoil: - .string "{ATTACKING_MON} is hit\nwith recoil!$" -BattleText_ProtectedItself2: - .string "{ATTACKING_MON} protected\nitself!$" -BattleText_SandBuffeted: - .string "{ATTACKING_MON} is buffeted\nby the sandstorm!$" -BattleText_HailStricken: - .string "{ATTACKING_MON} is stricken\nby HAIL!$" -BattleText_WoreOff: - .string "{STRING 36}’s {STRING 0}\nwore off!$" -BattleText_WasSeeded: - .string "{DEFENDING_MON} was seeded!$" -BattleText_EvadedAttack: - .string "{DEFENDING_MON} evaded\nthe attack!$" -BattleText_HealthSapped: - .string "{ATTACKING_MON}’s health is\nsapped by LEECH SEED!$" -BattleText_FastAsleep: - .string "{ATTACKING_MON} is fast\nasleep.$" -BattleText_WokeUp: - .string "{ATTACKING_MON} woke up!$" -BattleText_UproarAwake: - .string "But {STRING 16}’s UPROAR\nkept it awake!$" -BattleText_UproarWoke: - .string "{ATTACKING_MON} woke up\nin the UPROAR!$" -BattleText_UproarCaused: - .string "{ATTACKING_MON} caused\nan UPROAR!$" -BattleText_UproarMaking: - .string "{ATTACKING_MON} is making\nan UPROAR!$" -BattleText_CalmedDown: - .string "{ATTACKING_MON} calmed down.$" -BattleText_UproarCantSleep: - .string "But {DEFENDING_MON} can’t\nsleep in an UPROAR!$" -BattleText_Stockpiled: - .string "{ATTACKING_MON} STOCKPILED\n{STRING 0}!$" -BattleText_StockpiledCant: - .string "{ATTACKING_MON} can’t\nSTOCKPILE any more!$" -BattleText_UproarCantSleep2: - .string "But {DEFENDING_MON} can’t\nsleep in an UPROAR!$" -BattleText_UproarKeptAwake: - .string "But the UPROAR kept\n{DEFENDING_MON} awake!$" -BattleText_StayedAwake: - .string "{DEFENDING_MON} stayed awake\nusing its {STRING 22}!$" -BattleText_StoringEnergy: - .string "{ATTACKING_MON} is storing\nenergy!$" -BattleText_UnleashedEnergy: - .string "{ATTACKING_MON} unleashed\nenergy!$" -BattleText_FatigueConfuse: - .string "{ATTACKING_MON} became\nconfused out of fatigue!$" -BattleText_PickedUpYen: - .string "{STRING 32} picked up\n¥{STRING 0}!\p$" -BattleText_Unaffected: - .string "{DEFENDING_MON} is\nunaffected!$" -BattleText_Transformed: - .string "{ATTACKING_MON} transformed\ninto {STRING 0}!$" -BattleText_SubMade: - .string "{ATTACKING_MON} made\na SUBSTITUTE!$" -BattleText_SubAlready: - .string "{ATTACKING_MON} already\nhas a SUBSTITUTE!$" -BattleText_SubTookDamage: - .string "The SUBSTITUTE took damage\nfor {DEFENDING_MON}!\p$" -BattleText_SubFaded: - .string "{DEFENDING_MON}’s\nSUBSTITUTE faded!\p$" -BattleText_MustRecharge: - .string "{ATTACKING_MON} must\nrecharge!$" -BattleText_RageBuilding: - .string "{DEFENDING_MON}’s RAGE\nis building!$" -BattleText_MoveWasDisabled: - .string "{DEFENDING_MON}’s {STRING 0}\nwas disabled!$" -BattleText_DisabledNoMore: - .string "{ATTACKING_MON} is disabled\nno more!$" -BattleText_EncoreGot: - .string "{DEFENDING_MON} got\nan ENCORE!$" -BattleText_EncoreEnded: - .string "{ATTACKING_MON}’s ENCORE\nended!$" -BattleText_TookAim: - .string "{ATTACKING_MON} took aim\nat {DEFENDING_MON}!$" -BattleText_SketchedMove: - .string "{ATTACKING_MON} SKETCHED\n{STRING 0}!$" -BattleText_DestinyBondTake: - .string "{ATTACKING_MON} is trying\nto take its foe with it!$" -BattleText_DestinyBondTaken: - .string "{DEFENDING_MON} took\n{ATTACKING_MON} with it!$" -BattleText_ReducedBy: - .string "Reduced {DEFENDING_MON}’s\n{STRING 0} by {STRING 1}!$" -BattleText_StoleSomething: - .string "{ATTACKING_MON} stole\n{DEFENDING_MON}’s {STRING 19}!$" -BattleText_CantEscapeNow: - .string "{DEFENDING_MON} can’t\nescape now!$" -BattleText_NightmareStart: - .string "{DEFENDING_MON} fell into\na NIGHTMARE!$" -BattleText_NightmareLock: - .string "{ATTACKING_MON} is locked\nin a NIGHTMARE!$" -BattleText_CurseLay: - .string "{ATTACKING_MON} cut its own HP\nand laid a CURSE on\l{DEFENDING_MON}!$" -BattleText_CurseAfflict: - .string "{ATTACKING_MON} is afflicted\nby the CURSE!$" -BattleText_SpikesScattered: - .string "{STRING 37} POKéMON team had SPIKES\nscattered around it!$" -BattleText_SpikesHurt: - .string "{STRING 16} is hurt\nby SPIKES!$" -BattleText_IdentifiedPoke: - .string "{ATTACKING_MON} identified\n{DEFENDING_MON}!$" -BattleText_PerishSongFell: - .string "{ATTACKING_MON}’s PERISH count\nfell to {STRING 0}!$" -BattleText_BracedItself: - .string "{ATTACKING_MON} braced\nitself!$" -BattleText_EnduredHit: - .string "{DEFENDING_MON} ENDURED\nthe hit!$" -BattleText_MagnitudeCount: - .string "MAGNITUDE {STRING 0}!$" -BattleText_CutHPMaxATK: - .string "{ATTACKING_MON} cut its own HP\nand maximized ATTACK!$" -BattleText_CopyStatChanges: - .string "{ATTACKING_MON} copied\n{DEFENDING_MON}’s stat changes!$" -BattleText_GotFreeFrom: - .string "{ATTACKING_MON} got free of\n{DEFENDING_MON}’s {STRING 0}!$" -BattleText_LeechShed: - .string "{ATTACKING_MON} shed\nLEECH SEED!$" -BattleText_SpikesBlownAway: - .string "{ATTACKING_MON} blew away\nSPIKES!$" -BattleText_FledBattle: - .string "{ATTACKING_MON} fled from\nbattle!$" -BattleText_ForesawAttack: - .string "{ATTACKING_MON} foresaw\nan attack!$" -BattleText_TookAttack: - .string "{DEFENDING_MON} took\n{STRING 0}’s attack!$" -BattleText_ChoseDestiny: - .string "{ATTACKING_MON} chose\n{STRING 17} as its destiny!$" -BattleText_PokeAttack: - .string "{STRING 0}’s attack!$" -BattleText_CenterAttention: - .string "{ATTACKING_MON} became the\ncenter of attention!$" -BattleText_ChargingPower: - .string "{ATTACKING_MON} began\ncharging power!$" -BattleText_NaturePower: - .string "NATURE POWER turned into\n{STRING 17}!$" -BattleText_StatusNormal: - .string "{ATTACKING_MON}’s status\nreturned to normal!$" -BattleText_TormentSubject: - .string "{DEFENDING_MON} was subjected\nto TORMENT!$" -BattleText_TightenFocus: - .string "{ATTACKING_MON} is tightening\nits focus!$" -BattleText_TauntFell: - .string "{DEFENDING_MON} fell for\nthe TAUNT!$" -BattleText_ReadyToHelp: - .string "{ATTACKING_MON} is ready to\nhelp {DEFENDING_MON}!$" -BattleText_SwitchedItems: - .string "{ATTACKING_MON} switched\nitems with its opponent!$" -BattleText_Obtained1: - .string "{ATTACKING_MON} obtained\n{STRING 0}.$" -BattleText_Obtained2: - .string "{DEFENDING_MON} obtained\n{STRING 1}.$" -BattleText_Obtained3: - .string "{ATTACKING_MON} obtained\n{STRING 0}.\p{DEFENDING_MON} obtained\n{STRING 1}.$" -BattleText_CopiedObject: - .string "{ATTACKING_MON} copied\n{DEFENDING_MON}’s {STRING 22}!$" -BattleText_WishMade: - .string "{ATTACKING_MON} made a WISH!$" -BattleText_WishTrue: - .string "{STRING 0}’s WISH\ncame true!$" -BattleText_PlantedRoots: - .string "{ATTACKING_MON} planted its roots!$" -BattleText_AbsorbNutrients: - .string "{ATTACKING_MON} absorbed\nnutrients with its roots!$" -BattleText_AnchoredItself: - .string "{DEFENDING_MON} anchored\nitself with its roots!$" -BattleText_DrowsyMade: - .string "{ATTACKING_MON} made\n{DEFENDING_MON} drowsy!$" -BattleText_KnockedOffItem: - .string "{ATTACKING_MON} knocked off\n{DEFENDING_MON}’s {STRING 19}!$" -BattleText_AbilitySwap: - .string "{ATTACKING_MON} swapped abilities\nwith its opponent!$" -BattleText_SealedMove: - .string "{ATTACKING_MON} sealed the\nopponent’s move(s)!$" -BattleText_GrudgeBear: - .string "{ATTACKING_MON} wants the\nopponent to bear a GRUDGE!$" -BattleText_GrudgeLosePP: - .string "{ATTACKING_MON}’s {STRING 0}\nlost all its PP due to\lthe GRUDGE!$" -BattleText_ShroudedItself: - .string "{ATTACKING_MON} shrouded\nitself in {STRING 17}!$" -BattleText_MagicCoatBounce: - .string "{ATTACKING_MON}’s {STRING 17}\nwas bounced back by MAGIC COAT!$" -BattleText_AwaitMove: - .string "{ATTACKING_MON} awaits its foe\nto make a move!$" -BattleText_SnatchedMove: - .string "{DEFENDING_MON} SNATCHED\n{STRING 16}’s move!$" -BattleText_ElecWeakened: - .string "Electricity’s power was\nweakened!$" -BattleText_FireWeakened: - .string "Fire’s power was\nweakened!$" -BattleText_FoundOne: - .string "{ATTACKING_MON} found\none {STRING 19}!$" -BattleText_SoothingAroma: - .string "A soothing aroma wafted\nthrough the area!$" -BattleText_CantUseItems: - .string "Items can’t be used now.{PAUSE 64}$" -BattleText_UnknownString2: - .string "For {STRING 16},\n{STRING 19} {STRING 0}$" -BattleText_HustleUse: - .string "{STRING 16} used\n{STRING 19} to hustle!$" -BattleText_LostFocus: - .string "{ATTACKING_MON} lost its\nfocus and couldn’t move!$" -BattleText_DraggedOut: - .string "{DEFENDING_MON} was\ndragged out!\p$" -BattleText_BrokeWall: - .string "The wall shattered!$" -BattleText_NoEffect: - .string "But it had no effect!$" -BattleText_NoMovesLeft: - .string "{STRING 15} has no\nmoves left!\p$" -BattleText_MoveIsDisabled: - .string "{STRING 15}’s {STRING 17}\nis disabled!\p$" -BattleText_TormentNoUse: - .string "{STRING 15} can’t use the same\nmove twice in a row due to the TORMENT!\p$" -BattleText_TauntNoUse: - .string "{STRING 15} can’t use\n{STRING 17} after the TAUNT!\p$" -BattleText_SealedNoUse: - .string "{STRING 15} can’t use the\nsealed {STRING 17}!\p$" -BattleText_RainMade: - .string "{STRING 16}’s {STRING 23}\nmade it rain!$" -BattleText_SpeedRisen: - .string "{STRING 16}’s {STRING 23}\nraised its SPEED!$" -BattleText_ProtectedBy: - .string "{DEFENDING_MON} was protected\nby {STRING 22}!$" -BattleText_PreventedBy: - .string "{DEFENDING_MON}’s {STRING 22}\nprevents {ATTACKING_MON}\lfrom using {STRING 17}!$" -BattleText_HPRestoredUsing: - .string "{DEFENDING_MON} restored HP\nusing its {STRING 22}!$" -BattleText_MadeUseless: - .string "{DEFENDING_MON}’s {STRING 22}\nmade {STRING 17} useless!$" -BattleText_MadeType: - .string "{DEFENDING_MON}’s {STRING 22}\nmade it the {STRING 0} type!$" -BattleText_PreventedPara: - .string "{STRING 14}’s {STRING 22}\nprevents paralysis!$" -BattleText_PreventedRomance: - .string "{DEFENDING_MON}’s {STRING 22}\nprevents romance!$" -BattleText_PreventedPoison: - .string "{STRING 14}’s {STRING 22}\nprevents poisoning!$" -BattleText_PreventedConfusion: - .string "{DEFENDING_MON}’s {STRING 22}\nprevents confusion!$" -BattleText_RaisedFirePower: - .string "{DEFENDING_MON}’s {STRING 22}\nraised its FIRE power!$" -BattleText_AnchorsItself: - .string "{DEFENDING_MON} anchors\nitself with {STRING 22}!$" -BattleText_CutsAttack: - .string "{STRING 16}’s {STRING 23}\ncuts {DEFENDING_MON}’s ATTACK!$" -BattleText_PreventedStatLoss: - .string "{STRING 16}’s {STRING 23}\nprevents stat loss!$" -BattleText_HurtOther: - .string "{DEFENDING_MON}’s {STRING 22}\nhurt {ATTACKING_MON}!$" -BattleText_Traced: - .string "{STRING 16} TRACED\n{STRING 0}’s {STRING 1}!$" -BattleText_PreventedBurn: - .string "{STRING 14}’s {STRING 24}\nprevents burns!$" -BattleText_BlocksOther: - .string "{DEFENDING_MON}’s {STRING 22}\nblocks {STRING 17}!$" -BattleText_BlocksOther2: - .string "{STRING 16}’s {STRING 23}\nblocks {STRING 17}!$" -BattleText_RestoredHPByItem: - .string "{ATTACKING_MON}’s {STRING 21}\nrestored some HP!$" -BattleText_WhipSandstorm: - .string "{STRING 16}’s {STRING 23}\nwhipped up a sandstorm!$" -BattleText_SunIntensified: - .string "{STRING 16}’s {STRING 23}\nintensified the sun’s rays!$" -BattleText_PreventedLoss: - .string "{STRING 16}’s {STRING 23}\nprevents {STRING 0} loss!$" -BattleText_InfatuatedPoke: - .string "{DEFENDING_MON}’s {STRING 22}\ninfatuated {ATTACKING_MON}!$" -BattleText_MadeIneffective: - .string "{DEFENDING_MON}’s {STRING 22}\nmade {STRING 17} ineffective!$" -BattleText_CuredProblem: - .string "{STRING 16}’s {STRING 23}\ncured its {STRING 0} problem!$" -BattleText_OozeSuckup: - .string "It sucked up the\nLIQUID OOZE!$" -BattleText_Transformed2: - .string "{STRING 16} transformed!$" -BattleText_TookAttack2: - .string "{DEFENDING_MON}’s {STRING 22}\ntook the attack!$" - -gUnknown_083FFCCA:: @ 83FFCCA -BattleText_PreventedSwitch:: - .string "{STRING 0}’s {STRING 20}\nprevents switching!\p$" -BattleText_PreventedOther: - .string "{DEFENDING_MON}’s {STRING 22}\nprevented {STRING 16}’s\l{STRING 0} from working!$" -BattleText_MadeIneffective2: - .string "{STRING 16}’s {STRING 23}\nmade it ineffective!$" -BattleText_PreventedFlinching: - .string "{STRING 14}’s {STRING 24}\nprevents flinching!$" -BattleText_PreventedOther2: - .string "{ATTACKING_MON}’s {STRING 21}\nprevents {DEFENDING_MON}’s\l{STRING 22} from working!$" -BattleText_CuredOfProblem: - .string "{STRING 16}’s {STRING 23}\ncured its {STRING 0} problem!$" -BattleText_NoEffectOn: - .string "{STRING 16}’s {STRING 23}\nhad no effect on {STRING 14}!$" -BattleText_Sharply: - .string "sharply $" - -gUnknown_083FFDB3:: @ 83FFDB3 -BattleText_Rose: - .string "rose!$" -BattleText_Harshly: - .string "harshly $" -BattleText_Fell: - .string "fell!$" -BattleText_UnknownString7: - .string "{ATTACKING_MON}’s {STRING 0}\n{STRING 1}$" - -gUnknown_083FFDD3:: @ 83FFDD3 -BattleText_UnknownString3: - .string "{DEFENDING_MON}’s {STRING 0}\n{STRING 1}$" -BattleText_UnknownString4: - .string "Using {STRING 19}, the {STRING 0}\nof {STRING 16} {STRING 1}$" -BattleText_UnknownString5: - .string "{ATTACKING_MON}’s {STRING 0}\n{STRING 1}$" -BattleText_UnknownString6: - .string "{DEFENDING_MON}’s {STRING 0}\n{STRING 1}$" -BattleText_StatNoHigher: - .string "{ATTACKING_MON}’s stats won’t\ngo any higher!$" -BattleText_StatNoLower: - .string "{DEFENDING_MON}’s stats won’t\ngo any lower!$" -BattleText_Critical: - .string "A critical hit!$" -BattleText_GrandSlam: - .string "It’s a one-hit KO!$" -BattleText_MoveForget123: - .string "{PAUSE 32}1, {PAUSE 15}2 and...{PAUSE 15} ...{PAUSE 15} ...{PAUSE 15}\n{PAUSE 15}{PLAY_SE SE_KON}Poof!\p$" -BattleText_MoveForgetAnd: - .string "And...\p$" -BattleText_CantForgetHM: - .string "HM moves can’t be\nforgotten now.\p$" -BattleText_NotEffective: - .string "It’s not very effective...$" -BattleText_SuperEffective: - .string "It’s super effective!$" - -gUnknown_083FFEFC:: @ 83FFEFC -BattleText_GotAwaySafely: - .string "{PLAY_SE SE_NIGERU}Got away safely!\p$" -BattleText_FledUsingItem: - .string "{PLAY_SE SE_NIGERU}{ATTACKING_MON} fled\nusing its {STRING 19}!\p$" -BattleText_FledUsingOther: - .string "{PLAY_SE SE_NIGERU}{ATTACKING_MON} fled\nusing {STRING 21}!\p$" -BattleText_FledWild: - .string "{PLAY_SE SE_NIGERU}Wild {STRING 0} fled!$" - -gUnknown_083FFF56:: @ 83FFF56 -BattleText_PlayerDefeatedTrainer: - .string "Player defeated\n{STRING 29}!$" - -gUnknown_083FFF6A:: @ 83FFF6A -BattleText_PlayerDefeatedTrainers: - .string "Player beat {STRING 30}\nand {STRING 29}!$" - -gUnknown_083FFF81:: @ 83FFF81 -BattleText_PlayerLostTrainer: - .string "Player lost against\n{STRING 29}!$" - -gUnknown_083FFF99:: @ 83FFF99 -BattleText_PlayerLostTrainers: - .string "Player lost to {STRING 30}\nand {STRING 29}!$" - -gUnknown_083FFFB3:: @ 83FFFB3 -BattleText_PlayerTiedTrainer: - .string "Player tied against\n{STRING 29}!$" - -gUnknown_083FFFCB:: @ 83FFFCB -BattleText_PlayerTiedTrainers: - .string "Player tied against {STRING 30}\nand {STRING 29}!$" - -gUnknown_083FFFEA:: @ 83FFFEA -BattleText_FledSingle: - .string "{PLAY_SE SE_NIGERU}{STRING 29} fled!$" - -gUnknown_083FFFF7:: @ 83FFFF7 -BattleText_FledDouble: - .string "{PLAY_SE SE_NIGERU}{STRING 29} and\n{STRING 30} fled!$" -BattleText_NoRunning: - .string "No! There’s no running\nfrom a TRAINER battle!\p$" -BattleText_CantEscape2: - .string "Can’t escape!\p$" -BattleText_BirchDontLeaveMe: - .string "PROF. BIRCH: D-don’t leave\nme here like this!\p$" -BattleText_Nothing: - .string "But nothing happened!$" -BattleText_Failed: - .string "But it failed!$" -BattleText_HurtItself: - .string "It hurt itself in its\nconfusion!$" -BattleText_MirrorFail: - .string "The MIRROR MOVE failed!$" -BattleText_RainStart: - .string "It started to rain!$" -BattleText_PourStart: - .string "A downpour started!$" -BattleText_RainCont1: - .string "Rain continues to fall.$" -BattleText_PourCont: - .string "The downpour continues.$" -BattleText_RainStop: - .string "The rain stopped.$" -BattleText_SandBrewed: - .string "A sandstorm brewed!$" -BattleText_SandRages: - .string "The sandstorm rages.$" -BattleText_SandSubsided: - .string "The sandstorm subsided.$" -BattleText_SunBright: - .string "The sunlight got bright!$" -BattleText_SunStrong: - .string "The sunlight is strong.$" -BattleText_SunFaded: - .string "The sunlight faded.$" -BattleText_HailStart: - .string "It started to hail!$" -BattleText_HailCont: - .string "Hail continues to fall.$" -BattleText_HailStop: - .string "The hail stopped.$" -BattleText_SpitUpFail: - .string "But it failed to SPIT UP\na thing!$" -BattleText_SwallowFail: - .string "But it failed to SWALLOW\na thing!$" -BattleText_WindHeatWave: - .string "The wind turned into a\nHEAT WAVE!$" -BattleText_StatElim: - .string "All stat changes were\neliminated!$" -BattleText_CoinScatter: - .string "Coins scattered everywhere!$" -BattleText_SubWeak: - .string "It was too weak to make\na SUBSTITUTE!$" -BattleText_PainSplit: - .string "The battlers shared\ntheir pain!$" -BattleText_BellChime: - .string "A bell chimed!$" -BattleText_PerishSong: - .string "All affected POKéMON will\nfaint in 3 turns!$" -BattleText_NoPP1: - .string "There’s no PP left for\nthis move!\p$" -BattleText_NoPP2: - .string "But there was no PP left\nfor the move!$" -BattleText_IgnoredOrdersSLP: - .string "{ATTACKING_MON} ignored\norders while asleep!$" -BattleText_IgnoredOrders: - .string "{ATTACKING_MON} ignored\norders!$" -BattleText_BeganNap: - .string "{ATTACKING_MON} began to nap!$" -BattleText_LoafingAround: - .string "{ATTACKING_MON} is\nloafing around!$" -BattleText_WontObey: - .string "{ATTACKING_MON} won’t\nobey!$" -BattleText_TurnedAway: - .string "{ATTACKING_MON} turned away!$" -BattleText_NotNotice: - .string "{ATTACKING_MON} pretended\nto not notice!$" -BattleText_WillSwitch: - .string "{STRING 25} {STRING 26} is\nabout to use {STRING 1}.\pWill {STRING 32} change\nPOKéMON?$" -BattleText_LearnedMove2: - .string "{ATTACKING_MON} learned\n{STRING 0}!$" -BattleText_PlayerDefeatedTrainer2: - .string "Player defeated\n{STRING 25} {STRING 26}!\p$" -BattleText_CreptCloser: - .string "{STRING 32} crept closer to\n{STRING 3}!$" -BattleText_CantGetCloser: - .string "{STRING 32} can’t get any closer!$" -BattleText_WatchingCarefully: - .string "{STRING 3} is watching\ncarefully!$" -BattleText_CuriousAbout: - .string "{STRING 3} is curious about\nthe {STRING 0}!$" -BattleText_EnthralledBy: - .string "{STRING 3} is enthralled by\nthe {STRING 0}!$" -BattleText_IgnoredThing: - .string "{STRING 3} completely ignored\nthe {STRING 0}!$" -BattleText_ThrewBlock: - .string "{STRING 32} threw a {POKEBLOCK}\nat the {STRING 3}!$" -BattleText_SafariOver: - .string "{PLAY_SE SE_PINPON}ANNOUNCER: You’re out of\nSAFARI BALLS! Game over!\p$" - -gUnknown_08400555:: @ 8400555 -BattleText_WildAppeared1: - .string "Wild {STRING 3} appeared!\p$" - -gUnknown_08400568:: @ 8400568 -BattleText_WildAppeared2: - .string "Wild {STRING 3} appeared!\p$" - -gUnknown_0840057B:: @ 840057B -BattleText_WildAppeared3: - .string "Wild {STRING 3} appeared!{PAUSE 127}$" - -gUnknown_08400590:: @ 8400590 -BattleText_WildDoubleAppeared: - .string "Wild {STRING 5} and\n{STRING 3} appeared!\p$" - -gUnknown_084005AA:: @ 84005AA -BattleText_SingleWantToBattle1: - .string "{STRING 25} {STRING 26}\nwould like to battle!\p$" - -gUnknown_084005C7:: @ 84005C7 -BattleText_SingleWantToBattle2: - .string "{STRING 29}\nwants to battle!$" - -gUnknown_084005DB:: @ 84005DB -BattleText_DoubleWantToBattle: - .string "{STRING 29} and {STRING 30}\nwant to battle!$" - -gUnknown_084005F5:: @ 84005F5 -BattleText_SentOutSingle1: - .string "{STRING 25} {STRING 26} sent\nout {STRING 3}!$" - -gUnknown_08400608:: @ 8400608 -BattleText_SentOutDouble1: - .string "{STRING 25} {STRING 26} sent\nout {STRING 3} and {STRING 5}!$" - -gUnknown_08400622:: @ 8400622 -BattleText_SentOutSingle2: - .string "{STRING 25} {STRING 26} sent\nout {STRING 0}!$" - -gUnknown_08400635:: @ 8400635 -BattleText_SentOutSingle3: - .string "{STRING 29} sent\nout {STRING 3}!$" - -gUnknown_08400645:: @ 8400645 -BattleText_SentOutDouble2: - .string "{STRING 29} sent out\n{STRING 3} and {STRING 5}!$" - -gUnknown_0840065C:: @ 840065C -BattleText_SentOutDouble3: - .string "{STRING 29} sent out\n{STRING 7}!\p{STRING 30} sent out\n{STRING 9}!$" - -gUnknown_0840067C:: @ 840067C -BattleText_SentOutSingle4: - .string "{STRING 29} sent out\n{STRING 0}!$" - -gUnknown_0840068C:: @ 840068C -BattleText_SentOutSingle5: - .string "{STRING 31} sent out\n{STRING 0}!$" - -gUnknown_0840069C:: @ 840069C -BattleText_SentOutSingle6: - .string "Go! {STRING 2}!$" - -gUnknown_084006A4:: @ 84006A4 -BattleText_SentOutDouble4: - .string "Go! {STRING 2} and\n{STRING 4}!$" - -gUnknown_084006B3:: @ 84006B3 -BattleText_SentOutSingle7: - .string "Go! {STRING 0}!$" - -gUnknown_084006BB:: @ 84006BB -BattleText_SentOutSingle8: - .string "Do it! {STRING 0}!$" - -gUnknown_084006C6:: @ 84006C6 -BattleText_SentOutSingle9: - .string "Go for it, {STRING 0}!$" - -gUnknown_084006D5:: @ 84006D5 -BattleText_SentOutSingle10: - .string "Your foe’s weak!\nGet’m, {STRING 0}!$" - -gUnknown_084006F1:: @ 84006F1 -BattleText_SentOutSingle11: - .string "{STRING 28} sent out\n{STRING 8}!\pGo! {STRING 6}!$" - -gUnknown_08400709:: @ 8400709 -BattleText_ComeBackSingle1: - .string "{STRING 0}, that’s enough!\nCome back!$" - -gUnknown_08400727:: @ 8400727 -BattleText_ComeBackSingle2: - .string "{STRING 0}, come back!$" - -gUnknown_08400736:: @ 8400736 -BattleText_ComeBackSingle3: - .string "{STRING 0}, OK!\nCome back!$" - -gUnknown_08400749:: @ 8400749 -BattleText_ComeBackSingle4: - .string "{STRING 0}, good!\nCome back!$" - -gUnknown_0840075E:: @ 840075E -BattleText_WithdrewPoke1: - .string "{STRING 25} {STRING 26}\nwithdrew {STRING 0}!$" - -gUnknown_08400771:: @ 8400771 -BattleText_WithdrewPoke2: - .string "{STRING 29} withdrew\n{STRING 0}!$" - -gUnknown_08400781:: @ 8400781 -BattleText_WithdrewPoke3: - .string "{STRING 31} withdrew\n{STRING 0}!$" - -gUnknown_08400791:: @ 8400791 -BattleText_Wild: - .string "Wild $" - -gUnknown_08400797:: @ 8400797 -BattleText_Foe: - .string "Foe $" - -gUnknown_0840079C:: @ 840079C -BattleText_Foe2: - .string "Foe $" - -gUnknown_084007A1:: @ 84007A1 -BattleText_Ally: - .string "Ally $" - -gUnknown_084007A7:: @ 84007A7 -BattleText_Foe3: - .string "Foe $" - -gUnknown_084007AC:: @ 84007AC -BattleText_Ally2: - .string "Ally $" - -gUnknown_084007B2:: @ 84007B2 -BattleText_Foe4: - .string "Foe $" - -gUnknown_084007B7:: @ 84007B7 -BattleText_Ally3: - .string "Ally $" - -gUnknown_084007BD:: @ 84007BD -BattleText_OpponentUsedMove: - .string "{ATTACKING_MON} used\n{STRING 1}$" - -gUnknown_084007C8:: @ 84007C8 -BattleText_Exclamation2: @ out of order but whatever - .string "!$" - -gUnknown_084007CA:: @ 84007CA -BattleText_Exclamation3: - .string "!$" - -gUnknown_084007CC:: @ 84007CC -BattleText_Exclamation4: - .string "!$" - -gUnknown_084007CE:: @ 84007CE -BattleText_Exclamation5: - .string "!$" - -gUnknown_084007D0:: @ 84007D0 -BattleText_Exclamation: - .string "!$" -BattleStatText_HP: - .string "HP$" -BattleStatText_Attack: - .string "ATTACK$" -BattleStatText_Defense: - .string "DEFENSE$" -BattleStatText_Speed: - .string "SPEED$" -BattleStatText_SpAtk: - .string "SP. ATK$" -BattleStatText_SpDef: - .string "SP. DEF$" -BattleStatText_Accuracy: - .string "accuracy$" -BattleStatText_Evasion: - .string "evasiveness$" -ContestStatText_TooSpicy: - .string "was too spicy!$" -ContestStatText_TooDry: - .string "was too dry!$" -ContestStatText_TooSweet: - .string "was too sweet!$" -ContestStatText_TooBitter: - .string "was too bitter!$" -ContestStatText_TooSour: - .string "was too sour!$" -BattleText_Used1: - .string "{STRING 32} used\n{STRING 19}!$" -BattleText_TutorialUsed: - .string "WALLY used\n{STRING 19}!$" -BattleText_Used2: - .string "{STRING 25} {STRING 26}\nused {STRING 19}!$" -BattleText_BlockBall: - .string "The TRAINER blocked the BALL!$" -BattleText_DontBeAThief: - .string "Don’t be a thief!$" -BattleText_DodgeBall: - .string "It dodged the thrown BALL!\nThis POKéMON can’t be caught!$" -BattleText_MissPoke: - .string "You missed the POKéMON!$" -BattleText_BallBrokeOhNo: - .string "Oh, no!\nThe POKéMON broke free!$" -BattleText_BallBrokeAppeared: - .string "Aww!\nIt appeared to be caught!$" -BattleText_BallBrokeAlmost: - .string "Aargh!\nAlmost had it!$" -BattleText_BallBrokeSoClose: - .string "Shoot!\nIt was so close, too!$" -BattleText_BallCaught1: - .string "Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM BGM_KACHI22}\p$" -BattleText_BallCaught2: - .string "Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM BGM_KACHI22}{PAUSE 127}$" -BattleText_GiveNickname: - .string "Give a nickname to the\ncaptured {STRING 3}?$" -BattleText_SentToPC: - .string "{STRING 3} was sent to\n{STRING 35} PC.$" - -gUnknown_084009ED:: @ 84009ED -BattleText_Someone: - .string "someone’s$" - -gUnknown_084009F7:: @ 84009F7 -BattleText_Lanette: - .string "LANETTE’s$" -BattleText_AddedToDex: - .string "{STRING 3}’s data was\nadded to the POKéDEX.\p$" -BattleText_Raining: - .string "It is raining.$" -BattleText_Sandstorm: - .string "A sandstorm is raging.$" -BattleText_BoxFull: - .string "The BOX is full!\nYou can’t catch any more!\p$" - -gUnknown_08400A78:: @ 8400A78 -BattleText_EnigmaBerry: - .string "ENIGMA BERRY$" - -gUnknown_08400A85:: @ 8400A85 -BattleText_Berry: - .string " BERRY$" -BattleText_CuredParalysis: - .string "{STRING 16}’s {STRING 19}\ncured paralysis!$" -BattleText_CuredPoison: - .string "{STRING 16}’s {STRING 19}\ncured poison!$" -BattleText_CuredBurn: - .string "{STRING 16}’s {STRING 19}\nhealed its burn!$" -BattleText_CuredFreeze: - .string "{STRING 16}’s {STRING 19}\ndefrosted it!$" -BattleText_CuredSleep: - .string "{STRING 16}’s {STRING 19}\nwoke it from its sleep!$" -BattleText_CuredConfusion: - .string "{STRING 16}’s {STRING 19}\nsnapped it out of confusion!$" -BattleText_CuredStatus: - .string "{STRING 16}’s {STRING 19}\ncured its {STRING 0} problem!$" -BattleText_NormalizedStatus: - .string "{STRING 16}’s {STRING 19}\nnormalized its status!$" -BattleText_RestoredHealth: - .string "{STRING 16}’s {STRING 19}\nrestored health!$" -BattleText_RestoredPP: - .string "{STRING 16}’s {STRING 19}\nrestored {STRING 0}’s PP!$" -BattleText_RestoredStatus: - .string "{STRING 16}’s {STRING 19}\nrestored its status!$" -BattleText_RestoredHPLittle: - .string "{STRING 16}’s {STRING 19}\nrestored its HP a little!$" -BattleText_ChoiceBand: - .string "{STRING 19} allows the\nuse of only {STRING 17}!\p$" -BattleText_FocusSash: - .string "{DEFENDING_MON} hung on\nusing its {STRING 19}!$" -BattleText_Terminator2: - .string "$" -BattleText_WallyBall: - .string "You throw a BALL now, right?\nI... I’ll do my best!$" - -gUnknown_08400C4A:: @ 8400C4A -BattleText_StartEvo: - .string "What?\n{STRING 2} is evolving!$" - -gUnknown_08400C60:: @ 8400C60 -BattleText_FinishEvo: - .string "Congratulations! Your {STRING 2}\nevolved into {STRING 3}!{UNKNOWN_A}\p$" - -gUnknown_08400C8D:: @ 8400C8D -BattleText_StopEvo: - .string "Huh? {STRING 2}\nstopped evolving!\p$" - -gUnknown_08400CA8:: @ 8400CA8 -BattleText_OtherMenu: - .string "What should\n{STRING 15} do?$" - -gUnknown_08400CBB:: @ 8400CBB -BattleText_PlayerMenu: - .string "What will\n{STRING 32} do?$" - -gUnknown_08400CCC:: @ 8400CCC -BattleText_WallyMenu: - .string "What will\nWALLY do?$" - -gUnknown_08400CE0:: @ 8400CE0 -BattleText_LinkStandby: - .string "{PAUSE 16}Link standby...$" - -gUnknown_08400CF3:: @ 8400CF3 -BattleText_MenuOptions: - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}FIGHT{CLEAR_TO 0x2E}BAG\nPOKéMON{CLEAR_TO 0x2E}RUN$" - -gUnknown_08400D15:: @ 8400D15 -BattleText_MenuOptionsSafari: - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}BALL{CLEAR_TO 0x2E}{POKEBLOCK}\nGO NEAR{CLEAR_TO 0x2E}RUN$" - -gUnknown_08400D38:: @ 8400D38 -BattleText_PP: - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}PP\nTYPE/$" - -gUnknown_08400D49:: @ 8400D49 -BattleText_Format: @ cant think of a better name - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}$" - -gUnknown_08400D52:: @ 8400D52 -BattleText_ForgetMove: - .string "{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}{PALETTE 5}Which move should\nbe forgotten?$" - -gUnknown_08400D7A:: @ 8400D7A -BattleText_YesNo: - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}Yes\nNo$" - -gUnknown_08400D89:: @ 8400D89 -BattleText_SwitchWhich: - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}Switch\nwhich?$" - -gUnknown_08400D9F:: @ 8400D9F -BattleText_Format2: - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}$" -BattleText_RightArrow: - .string "{RIGHT_ARROW}$" - -gUnknown_08400DAA:: @ 8400DAA -BattleText_Plus: - .string "+$" - -gUnknown_08400DAC:: @ 8400DAC -@ someone improve the formatting of this please -BattleText_Dash: - .string "-$" -BattleText_HP: - .string "HP $" -BattleText_Attack: - .string "ATTACK $" -BattleText_Defense: - .string "DEFENSE$" -BattleText_SpAtk: - .string "SP. ATK$" -BattleText_SpDef: - .string "SP. DEF$" - -gUnknown_08400DD6:: @ 8400DD6 -BattleText_SafariBalls:: - .string "{HIGHLIGHT RED}SAFARI BALLS$" - -gUnknown_08400DE6:: @ 8400DE6 -BattleText_SafariBallsLeft:: - .string "{HIGHLIGHT RED}Left: $" - -gUnknown_08400DF0:: @ 8400DF0 -BattleText_HighlightRed:: - .string "{HIGHLIGHT RED}$" - -BattleText_Sleep:: - .string "sleep$" -BattleText_PoisonStatus:: - .string "poison$" -BattleText_Burn:: - .string "burn$" -BattleText_Paralysis:: - .string "paralysis$" -BattleText_IceStatus:: - .string "ice$" -BattleText_Confusion:: - .string "confusion$" -BattleText_Love:: - .string "love$" - -gUnknown_08400E23:: @ 8400E23 -BattleText_Format3: - .string " and $" - -gUnknown_08400E29:: @ 8400E29 -BattleText_Format4: - .string ", $" - -gUnknown_08400E2C:: @ 8400E2C -BattleText_Format5: - .string " $" - -gUnknown_08400E2E:: @ 8400E2E -BattleText_Format6: - .string "\l$" - -gUnknown_08400E30:: @ 8400E30 -BattleText_Format7: - .string "\n$" - -gUnknown_08400E32:: @ 8400E32 -BattleText_Format8: - .string "are$" - -gUnknown_08400E36:: @ 8400E36 -BattleText_Format9: - .string "are$" - -gBadEggNickname:: @ 8400E3A - .string "Bad EGG$" - -gUnknown_08400E42:: @ 8400E42 -BattleText_Wally:: - .string "WALLY$" - -BattleText_Win:: @ 8400E48 - .string "{HIGHLIGHT TRANSPARENT}Win$" - -BattleText_Loss:: @ 8400E4F - .string "{HIGHLIGHT TRANSPARENT}Loss$" - -BattleText_Tie:: @ 8400E57 - .string "{HIGHLIGHT TRANSPARENT}Tie$" - -gUnknown_08400E5E:: @ 8400E5E -BattleText_Format10: - .string " is$" - -gUnknown_08400E62:: @ 8400E62 -BattleText_Format11: - .string "’s$" -BattleText_Normal: - .string "a NORMAL move$" -BattleText_Fighting: - .string "a FIGHTING move$" -BattleText_Flying: - .string "a FLYING move$" -BattleText_Poison: - .string "a POISON move$" -BattleText_Ground: - .string "a GROUND move$" -BattleText_Rock: - .string "a ROCK move$" -BattleText_Bug: - .string "a BUG move$" -BattleText_Ghost: - .string "a GHOST move$" -BattleText_Steel: - .string "a STEEL move$" -BattleText_Typeless: - .string "a ??? move$" -BattleText_Fire: - .string "a FIRE move$" -BattleText_Water: - .string "a WATER move$" -BattleText_Grass: - .string "a GRASS move$" -BattleText_Electric: - .string "an ELECTRIC move$" -BattleText_Psychic: - .string "a PSYCHIC move$" -BattleText_Ice: - .string "an ICE move$" -BattleText_Dragon: - .string "a DRAGON move$" -BattleText_Dark: - .string "a DARK move$" - - .align 2 -gUnknown_08400F58:: @ 8400F58 - .4byte BattleStatText_HP - .4byte BattleStatText_Attack - .4byte BattleStatText_Defense - .4byte BattleStatText_Speed - .4byte BattleStatText_SpAtk - .4byte BattleStatText_SpDef - .4byte BattleStatText_Accuracy - .4byte BattleStatText_Evasion - - .align 2 -gUnknown_08400F78:: @ 8400F78 - .4byte ContestStatText_TooSpicy - .4byte ContestStatText_TooDry - .4byte ContestStatText_TooSweet - .4byte ContestStatText_TooBitter - .4byte ContestStatText_TooSour - - .align 2 -gBattleStringsTable:: @ 8400F8C - .4byte BattleText_UnknownString - .4byte BattleText_GainExpPoints - .4byte BattleText_GrewLevel - .4byte BattleText_LearnedMove - .4byte BattleText_TryingToLearnMove - .4byte BattleText_CantLearnMore - .4byte BattleText_DeleteMove - .4byte BattleText_DeletedMove - .4byte BattleText_StopLearning - .4byte BattleText_DidNotLearn - .4byte BattleText_LearnedMove2 - .4byte BattleText_AttackMissed - .4byte BattleText_ProtectedItself - .4byte BattleText_StatNoHigher - .4byte BattleText_AvoidedDamage - .4byte BattleText_DoesntAffect - .4byte BattleText_AttackingFainted - .4byte BattleText_DefendingFainted - .4byte BattleText_WinningPrize - .4byte BattleText_OutOfUsablePoke - .4byte BattleText_WhitedOut - .4byte BattleText_PreventEscape - .4byte BattleText_HitMulti - .4byte BattleText_FellAsleep - .4byte BattleText_MadeAsleep - .4byte BattleText_DefendingAsleep - .4byte BattleText_AttackingAsleep - .4byte BattleText_WasntAffected - .4byte BattleText_Poisoned - .4byte BattleText_Poisoned2 - .4byte BattleText_PoisonHurt - .4byte BattleText_AlreadyPoisoned - .4byte BattleText_BadlyPoisoned - .4byte BattleText_EnergyDrained - .4byte BattleText_Burned - .4byte BattleText_Burned2 - .4byte BattleText_BurnHurt - .4byte BattleText_Frozen - .4byte BattleText_Frozen2 - .4byte BattleText_FrozenSolid - .4byte BattleText_DefendingDefrosted - .4byte BattleText_AttackingDefrosted - .4byte BattleText_Defrosted - .4byte BattleText_Paralyzed - .4byte BattleText_Paralyzed2 - .4byte BattleText_Paralyzed3 - .4byte BattleText_AlreadyParalyzed - .4byte BattleText_ParalysisHealed - .4byte BattleText_DreamEaten - .4byte BattleText_AttackingStatNoHigher - .4byte BattleText_DefendingStatNoHigher - .4byte BattleText_StoppedWorking - .4byte BattleText_StoppedWorking2 - .4byte BattleText_Confused - .4byte BattleText_ConfusionSnapOut - .4byte BattleText_BecameConfused - .4byte BattleText_AlreadyConfused - .4byte BattleText_FellLove - .4byte BattleText_InLoveWith - .4byte BattleText_ImmobilizedBy - .4byte BattleText_BlownAway - .4byte BattleText_TypeTransform - .4byte BattleText_Flinched - .4byte BattleText_RegainedHealth - .4byte BattleText_HPFull - .4byte BattleText_RaisedSpDef - .4byte BattleText_RaisedDefense - .4byte BattleText_CoveredVeil - .4byte BattleText_SafeguardActive - .4byte BattleText_SafeguardFaded - .4byte BattleText_WentToSleep - .4byte BattleText_SpeltHealthy - .4byte BattleText_WhipWhirlwind - .4byte BattleText_TookSunlight - .4byte BattleText_LoweredHead - .4byte BattleText_IsGlowing - .4byte BattleText_FlewHigh - .4byte BattleText_DugHole - .4byte BattleText_SqueezedBind - .4byte BattleText_TrappedVortex - .4byte BattleText_Wrapped - .4byte BattleText_Clamped - .4byte BattleText_HurtBy - .4byte BattleText_FreedFrom - .4byte BattleText_KeptGoingCrash - .4byte BattleText_MistShroud - .4byte BattleText_MistProtect - .4byte BattleText_GetPumped - .4byte BattleText_HitRecoil - .4byte BattleText_ProtectedItself2 - .4byte BattleText_SandBuffeted - .4byte BattleText_HailStricken - .4byte BattleText_WasSeeded - .4byte BattleText_EvadedAttack - .4byte BattleText_HealthSapped - .4byte BattleText_FastAsleep - .4byte BattleText_WokeUp - .4byte BattleText_UproarAwake - .4byte BattleText_UproarWoke - .4byte BattleText_UproarCaused - .4byte BattleText_UproarMaking - .4byte BattleText_CalmedDown - .4byte BattleText_UproarCantSleep - .4byte BattleText_Stockpiled - .4byte BattleText_StockpiledCant - .4byte BattleText_UproarCantSleep2 - .4byte BattleText_UproarKeptAwake - .4byte BattleText_StayedAwake - .4byte BattleText_StoringEnergy - .4byte BattleText_UnleashedEnergy - .4byte BattleText_FatigueConfuse - .4byte BattleText_PickedUpYen - .4byte BattleText_Unaffected - .4byte BattleText_Transformed - .4byte BattleText_SubMade - .4byte BattleText_SubAlready - .4byte BattleText_SubTookDamage - .4byte BattleText_SubFaded - .4byte BattleText_MustRecharge - .4byte BattleText_RageBuilding - .4byte BattleText_MoveWasDisabled - .4byte BattleText_MoveIsDisabled - .4byte BattleText_DisabledNoMore - .4byte BattleText_EncoreGot - .4byte BattleText_EncoreEnded - .4byte BattleText_TookAim - .4byte BattleText_SketchedMove - .4byte BattleText_DestinyBondTake - .4byte BattleText_DestinyBondTaken - .4byte BattleText_ReducedBy - .4byte BattleText_StoleSomething - .4byte BattleText_CantEscapeNow - .4byte BattleText_NightmareStart - .4byte BattleText_NightmareLock - .4byte BattleText_CurseLay - .4byte BattleText_CurseAfflict - .4byte BattleText_SpikesScattered - .4byte BattleText_SpikesHurt - .4byte BattleText_IdentifiedPoke - .4byte BattleText_PerishSongFell - .4byte BattleText_BracedItself - .4byte BattleText_EnduredHit - .4byte BattleText_MagnitudeCount - .4byte BattleText_CutHPMaxATK - .4byte BattleText_CopyStatChanges - .4byte BattleText_GotFreeFrom - .4byte BattleText_LeechShed - .4byte BattleText_SpikesBlownAway - .4byte BattleText_FledBattle - .4byte BattleText_ForesawAttack - .4byte BattleText_TookAttack - .4byte BattleText_PokeAttack - .4byte BattleText_CenterAttention - .4byte BattleText_ChargingPower - .4byte BattleText_NaturePower - .4byte BattleText_StatusNormal - .4byte BattleText_NoMovesLeft - .4byte BattleText_TormentSubject - .4byte BattleText_TormentNoUse - .4byte BattleText_TightenFocus - .4byte BattleText_TauntFell - .4byte BattleText_TauntNoUse - .4byte BattleText_ReadyToHelp - .4byte BattleText_SwitchedItems - .4byte BattleText_CopiedObject - .4byte BattleText_WishMade - .4byte BattleText_WishTrue - .4byte BattleText_PlantedRoots - .4byte BattleText_AbsorbNutrients - .4byte BattleText_AnchoredItself - .4byte BattleText_DrowsyMade - .4byte BattleText_KnockedOffItem - .4byte BattleText_AbilitySwap - .4byte BattleText_SealedMove - .4byte BattleText_SealedNoUse - .4byte BattleText_GrudgeBear - .4byte BattleText_GrudgeLosePP - .4byte BattleText_ShroudedItself - .4byte BattleText_MagicCoatBounce - .4byte BattleText_AwaitMove - .4byte BattleText_SnatchedMove - .4byte BattleText_RainMade - .4byte BattleText_SpeedRisen - .4byte BattleText_ProtectedBy - .4byte BattleText_PreventedBy - .4byte BattleText_HPRestoredUsing - .4byte BattleText_MadeType - .4byte BattleText_PreventedPara - .4byte BattleText_PreventedRomance - .4byte BattleText_PreventedPoison - .4byte BattleText_PreventedConfusion - .4byte BattleText_RaisedFirePower - .4byte BattleText_AnchorsItself - .4byte BattleText_CutsAttack - .4byte BattleText_PreventedStatLoss - .4byte BattleText_HurtOther - .4byte BattleText_Traced - .4byte BattleText_Sharply - .4byte BattleText_Rose - .4byte BattleText_Harshly - .4byte BattleText_Fell - .4byte BattleText_UnknownString7 - .4byte BattleText_UnknownString3 - .4byte BattleText_UnknownString5 - .4byte BattleText_UnknownString6 - .4byte BattleText_Critical - .4byte BattleText_GrandSlam - .4byte BattleText_MoveForget123 - .4byte BattleText_MoveForgetAnd - .4byte BattleText_NotEffective - .4byte BattleText_SuperEffective - .4byte BattleText_GotAwaySafely - .4byte BattleText_FledWild - .4byte BattleText_NoRunning - .4byte BattleText_CantEscape2 - .4byte BattleText_BirchDontLeaveMe - .4byte BattleText_Nothing - .4byte BattleText_Failed - .4byte BattleText_HurtItself - .4byte BattleText_MirrorFail - .4byte BattleText_RainStart - .4byte BattleText_PourStart - .4byte BattleText_RainCont1 - .4byte BattleText_PourCont - .4byte BattleText_RainStop - .4byte BattleText_SandBrewed - .4byte BattleText_SandRages - .4byte BattleText_SandSubsided - .4byte BattleText_SunBright - .4byte BattleText_SunStrong - .4byte BattleText_SunFaded - .4byte BattleText_HailStart - .4byte BattleText_HailCont - .4byte BattleText_HailStop - .4byte BattleText_SpitUpFail - .4byte BattleText_SwallowFail - .4byte BattleText_WindHeatWave - .4byte BattleText_StatElim - .4byte BattleText_CoinScatter - .4byte BattleText_SubWeak - .4byte BattleText_PainSplit - .4byte BattleText_BellChime - .4byte BattleText_PerishSong - .4byte BattleText_NoPP1 - .4byte BattleText_NoPP2 - .4byte BattleText_Used1 - .4byte BattleText_TutorialUsed - .4byte BattleText_BlockBall - .4byte BattleText_DontBeAThief - .4byte BattleText_DodgeBall - .4byte BattleText_MissPoke - .4byte BattleText_BallBrokeOhNo - .4byte BattleText_BallBrokeAppeared - .4byte BattleText_BallBrokeAlmost - .4byte BattleText_BallBrokeSoClose - .4byte BattleText_BallCaught1 - .4byte BattleText_BallCaught2 - .4byte BattleText_GiveNickname - .4byte BattleText_SentToPC - .4byte BattleText_AddedToDex - .4byte BattleText_Raining - .4byte BattleText_Sandstorm - .4byte BattleText_CantEscape - .4byte BattleText_IgnoredOrdersSLP - .4byte BattleText_IgnoredOrders - .4byte BattleText_BeganNap - .4byte BattleText_LoafingAround - .4byte BattleText_WontObey - .4byte BattleText_TurnedAway - .4byte BattleText_NotNotice - .4byte BattleText_WillSwitch - .4byte BattleText_CreptCloser - .4byte BattleText_CantGetCloser - .4byte BattleText_WatchingCarefully - .4byte BattleText_CuriousAbout - .4byte BattleText_EnthralledBy - .4byte BattleText_IgnoredThing - .4byte BattleText_ThrewBlock - .4byte BattleText_SafariOver - .4byte BattleText_CuredParalysis - .4byte BattleText_CuredPoison - .4byte BattleText_CuredBurn - .4byte BattleText_CuredFreeze - .4byte BattleText_CuredSleep - .4byte BattleText_CuredConfusion - .4byte BattleText_CuredStatus - .4byte BattleText_RestoredHealth - .4byte BattleText_RestoredPP - .4byte BattleText_RestoredStatus - .4byte BattleText_RestoredHPLittle - .4byte BattleText_ChoiceBand - .4byte BattleText_FocusSash - .4byte BattleText_Terminator2 @ terminator? - .4byte BattleText_PreventedBurn - .4byte BattleText_BlocksOther - .4byte BattleText_RestoredHPByItem - .4byte BattleText_WhipSandstorm - .4byte BattleText_PreventedLoss - .4byte BattleText_InfatuatedPoke - .4byte BattleText_MadeIneffective - .4byte BattleText_CuredProblem - .4byte BattleText_OozeSuckup - .4byte BattleText_Transformed2 - .4byte BattleText_ElecWeakened - .4byte BattleText_FireWeakened - .4byte BattleText_HidUnderwater - .4byte BattleText_SprangUp - .4byte BattleText_CantForgetHM - .4byte BattleText_FoundOne - .4byte BattleText_PlayerDefeatedTrainer2 - .4byte BattleText_SoothingAroma - .4byte BattleText_CantUseItems - .4byte BattleText_UnknownString2 - .4byte BattleText_UnknownString4 - .4byte BattleText_HustleUse - .4byte BattleText_MadeUseless - .4byte BattleText_SandTombTrapped @ sand tomb - .4byte BattleText_Terminator - .4byte BattleText_BoostedExp - .4byte BattleText_SunIntensified - .4byte BattleText_GroundMoveNegate - .4byte BattleText_WallyBall - .4byte BattleText_TookAttack2 - .4byte BattleText_ChoseDestiny - .4byte BattleText_LostFocus - .4byte BattleText_UseNext - .4byte BattleText_FledUsingItem - .4byte BattleText_FledUsingOther - .4byte BattleText_DraggedOut - .4byte BattleText_PreventedOther - .4byte BattleText_NormalizedStatus - .4byte BattleText_Used2 - .4byte BattleText_BoxFull - .4byte BattleText_AvoidedAttack - .4byte BattleText_MadeIneffective2 - .4byte BattleText_PreventedFlinching - .4byte BattleText_AlreadyBurned - .4byte BattleText_StatNoLower - .4byte BattleText_BlocksOther2 - .4byte BattleText_WoreOff - .4byte BattleText_RaisedDefenseLittle - .4byte BattleText_RaisedSpDefLittle - .4byte BattleText_BrokeWall - .4byte BattleText_PreventedOther2 - .4byte BattleText_CuredOfProblem - .4byte BattleText_AttackingCantEscape - .4byte BattleText_Obtained1 - .4byte BattleText_Obtained2 - .4byte BattleText_Obtained3 - .4byte BattleText_NoEffect - .4byte BattleText_NoEffectOn - - .align 1 -gMissStrings:: @ 8401508 -@ Each entry refers to a text pointer in gBattleStringsTable, but the values are offset -@ by 0xc. For example, 0x0017 refers to BattleText_AttackMissed because it is the -@ 11th entry in the pointer table. - .2byte BATTLE_TEXT_AttackMissed - .2byte BATTLE_TEXT_ProtectedItself - .2byte BATTLE_TEXT_AvoidedAttack - .2byte BATTLE_TEXT_AvoidedDamage - .2byte BATTLE_TEXT_GroundMoveNegate - -BattleTextList_401512:: @ 8401512 - .2byte BATTLE_TEXT_CantEscape2 - .2byte BATTLE_TEXT_BirchDontLeaveMe - .2byte BATTLE_TEXT_PreventEscape - .2byte BATTLE_TEXT_CantEscape - .2byte BATTLE_TEXT_AttackingCantEscape - -BattleTextList_40151C:: @ 840151C - .2byte BATTLE_TEXT_RainStart - .2byte BATTLE_TEXT_PourStart - .2byte BATTLE_TEXT_Failed - .2byte BATTLE_TEXT_SandBrewed - .2byte BATTLE_TEXT_SunBright - .2byte BATTLE_TEXT_HailStart - -BattleTextList_401528:: @ 8401528 - .2byte BATTLE_TEXT_SandRages - .2byte BATTLE_TEXT_HailCont - -BattleTextList_40152C:: @ 840152C - .2byte BATTLE_TEXT_SandBuffeted - .2byte BATTLE_TEXT_HailStricken - -BattleTextList_401530:: @ 8401530 - .2byte BATTLE_TEXT_SandSubsided - .2byte BATTLE_TEXT_HailStop - -BattleTextList_401534:: @ 8401534 - .2byte BATTLE_TEXT_RainCont1 - .2byte BATTLE_TEXT_PourCont - .2byte BATTLE_TEXT_RainStop - -BattleTextList_40153A:: @ 840153A - .2byte BATTLE_TEXT_ProtectedItself2 - .2byte BATTLE_TEXT_BracedItself - .2byte BATTLE_TEXT_Failed - -BattleTextList_401540:: @ 8401540 - .2byte BATTLE_TEXT_Failed - .2byte BATTLE_TEXT_RaisedDefense - .2byte BATTLE_TEXT_RaisedDefenseLittle - .2byte BATTLE_TEXT_RaisedSpDef - .2byte BATTLE_TEXT_RaisedSpDefLittle - .2byte BATTLE_TEXT_CoveredVeil - -BattleTextList_40154C:: @ 840154C - .2byte BATTLE_TEXT_WasSeeded - .2byte BATTLE_TEXT_EvadedAttack - .2byte BATTLE_TEXT_DoesntAffect - .2byte BATTLE_TEXT_HealthSapped - .2byte BATTLE_TEXT_OozeSuckup - -BattleTextList_401556:: @ 8401556 - .2byte BATTLE_TEXT_WentToSleep - .2byte BATTLE_TEXT_SpeltHealthy - -BattleTextList_40155A:: @ 840155A - .2byte BATTLE_TEXT_UproarMaking - .2byte BATTLE_TEXT_CalmedDown - -BattleTextList_40155E:: @ 840155E - .2byte BATTLE_TEXT_Stockpiled - .2byte BATTLE_TEXT_StockpiledCant - -BattleTextList_401562:: @ 8401562 - .2byte BATTLE_TEXT_WokeUp - .2byte BATTLE_TEXT_UproarWoke - -BattleTextList_401566:: @ 8401566 - .2byte BATTLE_TEXT_SwallowFail - .2byte BATTLE_TEXT_HPFull - -BattleTextList_40156A:: @ 840156A - .2byte BATTLE_TEXT_UproarCantSleep2 - .2byte BATTLE_TEXT_UproarKeptAwake - .2byte BATTLE_TEXT_StayedAwake - -BattleTextList_401570:: @ 8401570 - .2byte BATTLE_TEXT_UnknownString7 - .2byte BATTLE_TEXT_UnknownString3 - .2byte BATTLE_TEXT_AttackingStatNoHigher - .2byte BATTLE_TEXT_Terminator2 - .2byte BATTLE_TEXT_UnknownString4 - .2byte BATTLE_TEXT_HustleUse - -BattleTextList_40157C:: @ 840157C - .2byte BATTLE_TEXT_UnknownString5 - .2byte BATTLE_TEXT_UnknownString6 - .2byte BATTLE_TEXT_DefendingStatNoHigher - .2byte BATTLE_TEXT_Terminator2 - -BattleTextList_401584:: @ 8401584 - .2byte BATTLE_TEXT_WhipWhirlwind - .2byte BATTLE_TEXT_TookSunlight - .2byte BATTLE_TEXT_LoweredHead - .2byte BATTLE_TEXT_IsGlowing - .2byte BATTLE_TEXT_FlewHigh - .2byte BATTLE_TEXT_DugHole - .2byte BATTLE_TEXT_HidUnderwater - .2byte BATTLE_TEXT_SprangUp - -BattleTextList_401594:: @ 8401594 - .2byte BATTLE_TEXT_SqueezedBind - .2byte BATTLE_TEXT_Wrapped - .2byte BATTLE_TEXT_TrappedVortex - .2byte BATTLE_TEXT_Clamped - .2byte BATTLE_TEXT_TrappedVortex - .2byte BATTLE_TEXT_SandTombTrapped - -BattleTextList_4015A0:: @ 84015A0 - .2byte BATTLE_TEXT_MistShroud - .2byte BATTLE_TEXT_Failed - -BattleTextList_4015A4:: @ 84015A4 - .2byte BATTLE_TEXT_GetPumped - .2byte BATTLE_TEXT_Failed - -BattleTextList_4015A8:: @ 84015A8 - .2byte BATTLE_TEXT_Transformed - .2byte BATTLE_TEXT_Failed - -BattleTextList_4015AC:: @ 84015AC - .2byte BATTLE_TEXT_SubMade - .2byte BATTLE_TEXT_SubWeak - -BattleTextList_4015B0:: @ 84015B0 - .2byte BATTLE_TEXT_Poisoned - .2byte BATTLE_TEXT_Poisoned2 - -BattleTextList_4015B4:: @ 84015B4 - .2byte BATTLE_TEXT_Paralyzed - .2byte BATTLE_TEXT_Paralyzed2 - -BattleTextList_4015B8:: @ 84015B8 - .2byte BATTLE_TEXT_FellAsleep - .2byte BATTLE_TEXT_MadeAsleep - -BattleTextList_4015BC:: @ 84015BC - .2byte BATTLE_TEXT_Burned - .2byte BATTLE_TEXT_Burned2 - -BattleTextList_4015C0:: @ 84015C0 - .2byte BATTLE_TEXT_Frozen - .2byte BATTLE_TEXT_Frozen2 - -BattleTextList_4015C4:: @ 84015C4 - .2byte BATTLE_TEXT_AttackingDefrosted - .2byte BATTLE_TEXT_Defrosted - -BattleTextList_4015C8:: @ 84015C8 - .2byte BATTLE_TEXT_AttackMissed - .2byte BATTLE_TEXT_Unaffected - .2byte BATTLE_TEXT_FellLove - .2byte BATTLE_TEXT_InfatuatedPoke - -BattleTextList_4015D0:: @ 84015D0 - .2byte BATTLE_TEXT_EnergyDrained - .2byte BATTLE_TEXT_OozeSuckup - -BattleTextList_4015D4:: @ 84015D4 - .2byte BATTLE_TEXT_ElecWeakened - .2byte BATTLE_TEXT_FireWeakened - -BattleTextList_4015D8:: @ 84015D8 - .2byte BATTLE_TEXT_BellChime - .2byte BATTLE_TEXT_BellChime - .2byte BATTLE_TEXT_BellChime - .2byte BATTLE_TEXT_BellChime - .2byte BATTLE_TEXT_SoothingAroma - -BattleTextList_4015E2:: @ 84015E2 - .2byte BATTLE_TEXT_ForesawAttack - .2byte BATTLE_TEXT_ChoseDestiny - -BattleTextList_4015E6:: @ 84015E6 - .2byte BATTLE_TEXT_BallBrokeOhNo - .2byte BATTLE_TEXT_BallBrokeAppeared - .2byte BATTLE_TEXT_BallBrokeAlmost - .2byte BATTLE_TEXT_BallBrokeSoClose - -BattleTextList_4015EE:: @ 84015EE - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Sandstorm - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_SunStrong - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - -BattleTextList_40160E:: @ 840160E - .2byte BATTLE_TEXT_LoafingAround - .2byte BATTLE_TEXT_WontObey - .2byte BATTLE_TEXT_TurnedAway - .2byte BATTLE_TEXT_NotNotice - -BattleTextList_401616:: @ 8401616 - .2byte BATTLE_TEXT_CreptCloser - .2byte BATTLE_TEXT_CantGetCloser - -BattleTextList_40161A:: @ 840161A - .2byte BATTLE_TEXT_CuriousAbout - .2byte BATTLE_TEXT_EnthralledBy - .2byte BATTLE_TEXT_IgnoredThing - -BattleTextList_401620:: @ 8401620 - .2byte BATTLE_TEXT_CuredConfusion - .2byte BATTLE_TEXT_CuredParalysis - .2byte BATTLE_TEXT_CuredFreeze - .2byte BATTLE_TEXT_CuredBurn - .2byte BATTLE_TEXT_CuredPoison - .2byte BATTLE_TEXT_CuredSleep - -BattleTextList_40162C:: @ 840162C - .2byte BATTLE_TEXT_CuredStatus - .2byte BATTLE_TEXT_NormalizedStatus - -BattleTextList_401630:: @ 8401630 - .2byte BATTLE_TEXT_PreventedBurn - .2byte BATTLE_TEXT_PreventedOther2 - .2byte BATTLE_TEXT_NoEffectOn - -BattleTextList_401636:: @ 8401636 - .2byte BATTLE_TEXT_PreventedPara - .2byte BATTLE_TEXT_PreventedOther2 - .2byte BATTLE_TEXT_NoEffectOn - -BattleTextList_40163C:: @ 840163C - .2byte BATTLE_TEXT_PreventedPoison - .2byte BATTLE_TEXT_PreventedOther2 - .2byte BATTLE_TEXT_NoEffectOn - -BattleTextList_401642:: @ 8401642 - .2byte BATTLE_TEXT_Obtained1 - .2byte BATTLE_TEXT_Obtained2 - .2byte BATTLE_TEXT_Obtained3 - -BattleTextList_401648:: @ 8401648 - .2byte BATTLE_TEXT_RaisedFirePower - .2byte BATTLE_TEXT_MadeIneffective - -gTrappingMoves:: @ 840164C - .2byte MOVE_BIND - .2byte MOVE_WRAP - .2byte MOVE_FIRE_SPIN - .2byte MOVE_CLAMP - .2byte MOVE_WHIRLPOOL - .2byte MOVE_SAND_TOMB - .2byte 0xFFFF - - .align 2 -gUnknown_0840165C:: @ 840165C - .4byte BattleText_HP - .4byte BattleText_SpAtk - .4byte BattleText_Attack - .4byte BattleText_SpDef - .4byte BattleText_Defense - .4byte BattleStatText_Speed - - .align 2 -gUnknown_08401674:: @ 8401674 - .4byte BattleText_Normal - .4byte BattleText_Fighting - .4byte BattleText_Flying - .4byte BattleText_Poison - .4byte BattleText_Ground - .4byte BattleText_Rock - .4byte BattleText_Bug - .4byte BattleText_Ghost - .4byte BattleText_Steel - .4byte BattleText_Typeless - .4byte BattleText_Fire - .4byte BattleText_Water - .4byte BattleText_Grass - .4byte BattleText_Electric - .4byte BattleText_Psychic - .4byte BattleText_Ice - .4byte BattleText_Dragon - .4byte BattleText_Dark diff --git a/data/text/contest_strings.inc b/data/text/contest_strings.inc index 4c4f37fc4..94366cc41 100644 --- a/data/text/contest_strings.inc +++ b/data/text/contest_strings.inc @@ -96,7 +96,7 @@ ContestString_DescStopExcitement: .string "Temporarily stops the\ncrowd from growing excited.$" .align 2 -gUnknown_083CADD4:: @ 83CADD4 +gContestEffectStrings:: @ 83CADD4 .4byte ContestString_DescHighlyAppealing .4byte ContestString_DescStartled1 .4byte ContestString_DescGreatLock diff --git a/data/text/credits.inc b/data/text/credits.inc deleted file mode 100644 index 29abccf91..000000000 --- a/data/text/credits.inc +++ /dev/null @@ -1,1011 +0,0 @@ -Category_Credits: - .string "{PALETTE 9}Credits$" -Category_ExecutiveDirector: - .string "{PALETTE 9}Executive Director$" -Category_Director: - .string "{PALETTE 9}Director$" -Category_ArtDirector: - .string "{PALETTE 9}Art Director$" -Category_BattleDirector: - .string "{PALETTE 9}Battle Director$" -Category_MainProgrammer: - .string "{PALETTE 9}Main Programmer$" -Category_BattleSystemProgrammer: - .string "{PALETTE 9}Battle System Programmer$" -Category_FieldSystemProgrammer: - .string "{PALETTE 9}Field System Programmer$" -Category_Programmers: - .string "{PALETTE 9}Programmers$" -Category_MainGraphicDesigner: - .string "{PALETTE 9}Main Graphic Designer$" -Category_POKeMONGraphicDesigners: - .string "{PALETTE 9}POKéMON & Graphic Designers$" -Category_POKeMONDesigners: - .string "{PALETTE 9}POKéMON Designers$" -Category_MusicComposition: - .string "{PALETTE 9}Music Composition$" -Category_SoundEffectsPOKeMONVoices: - .string "{PALETTE 9}Sound Effects & POKéMON Voices$" -Category_GameDesigners: - .string "{PALETTE 9}Game Designers$" -Category_PlotScenario: - .string "{PALETTE 9}Plot Scenario$" -Category_GameScenario: - .string "{PALETTE 9}Game Scenario$" -Category_ScriptDesigners: - .string "{PALETTE 9}Script Designers$" -Category_MapDesigners: - .string "{PALETTE 9}Map Designers$" -Category_MapDataDesigners: - .string "{PALETTE 9}Map Data Designers$" -Category_ParametricDesigners: - .string "{PALETTE 9}Parametric Designers$" -Category_POKeDEXText: - .string "{PALETTE 9}POKéDEX Text$" -Category_EnvironmentToolProgrammers: - .string "{PALETTE 9}Environment & Tool Programmers$" -Category_ProductTesting: - .string "{PALETTE 9}Product Testing$" -Category_SpecialThanks: - .string "{PALETTE 9}Special Thanks$" -Category_Coordinators: - .string "{PALETTE 9}Coordinators$" -Category_Producers: - .string "{PALETTE 9}Producers$" -Category_ExecutiveProducers: - .string "{PALETTE 9}Executive Producers$" -Category_InformationSupervisors: - .string "{PALETTE 9}Information Supervisors$" -Category_TaskManagers: - .string "{PALETTE 9}Task Managers$" -Category_BrailleCodeCheck: - .string "{PALETTE 9}Braille Code Check$" -Category_EnglishVersionCoordinators: - .string "{PALETTE 9}English Version Coordinators$" -Category_Translator: - .string "{PALETTE 9}Translator$" -Category_ProductSupport: - .string "{PALETTE 9}Product Support$" -Category_Artwork: - .string "{PALETTE 9}Artwork$" -Category_TextEditor: - .string "{PALETTE 9}Text Editor$" -Category_NOAProductTesting: - .string "{PALETTE 9}NOA Product Testing$" -Category_GraphicDesigners: - .string "{PALETTE 9}Graphic Designers$" -Text_SatoshiTajiri: - .string "Satoshi Tajiri$" -Text_Masuda: - .string "Junichi Masuda$" -Text_Sugimori: - .string "Ken Sugimori$" -Text_Morimoto: - .string "Shigeki Morimoto$" -Text_TetsuyaWatanabe: - .string "Tetsuya Watanabe$" -Text_Sogabe: - .string "Hisashi Sogabe$" -Text_Tamada: - .string "Sousuke Tamada$" -Text_Mori: - .string "Akito Mori$" -Text_Kagaya: - .string "Keita Kagaya$" -Text_Matsuda: - .string "Yoshinori Matsuda$" -Text_HiroyukiNakamura: - .string "Hiroyuki Nakamura$" -Text_Taya: - .string "Masao Taya$" -Text_Nohara: - .string "Satoshi Nohara$" -Text_TomomichiOhta: - .string "Tomomichi Ohta$" -Text_Iwasawa: - .string "Miyuki Iwasawa$" -Text_TakenoriOhta: - .string "Takenori Ohta$" -Text_Yoshida: - .string "Hironobu Yoshida$" -Text_Fujiwara: - .string "Motofumi Fujiwara$" -Text_SatoshiOhta: - .string "Satoshi Ohta$" -Text_Iwashita: - .string "Asuka Iwashita$" -Text_Tomita: - .string "Aimi Tomita$" -Text_Unno: - .string "Takao Unno$" -Text_Eo: - .string "Kanako Eo$" -Text_Okutani: - .string "Jun Okutani$" -Text_Nishida: - .string "Atsuko Nishida$" -Text_Saito: - .string "Muneo Saito$" -Text_Yoshikawa: - .string "Rena Yoshikawa$" -Text_Ichinose: - .string "Go Ichinose$" -Text_Aoki: - .string "Morikazu Aoki$" -Text_Nishino: - .string "Koji Nishino$" -Text_Matsushima: - .string "Kenji Matsushima$" -Text_TetsujiOhta: - .string "Tetsuji Ohta$" -Text_Sato: - .string "Hitomi Sato$" -Text_Kawachimaru: - .string "Takeshi Kawachimaru$" -Text_Shimoyamada: - .string "Teruyuki Shimoyamada$" -Text_Ohmori: - .string "Shigeru Ohmori$" -Text_Takahashi: - .string "Tadashi Takahashi$" -Text_ToshinobuMatsumiya: - .string "Toshinobu Matsumiya$" -Text_Tomisawa: - .string "Akihito Tomisawa$" -Text_Enomoto: - .string "Hiroki Enomoto$" -Text_Terada: - .string "Kazuyuki Terada$" -Text_Sakurai: - .string "Yuri Sakurai$" -Text_Sagawa: - .string "Hiromi Sagawa$" -Text_Tominaga: - .string "Kenji Tominaga$" -Text_YoshioTajiri: - .string "Yoshio Tajiri$" -Text_Sasaki: - .string "Teiko Sasaki$" -Text_Hamano: - .string "Sachiko Hamano$" -Text_ChieMatsumiya: - .string "Chie Matsumiya$" -Text_Shinozaki: - .string "Akiko Shinozaki$" -Text_Fujii: - .string "Atsuko Fujii$" -Text_SuperMarioClub: - .string "NCL Super Mario Club$" -Text_Tada: - .string "Atsushi Tada$" -Text_Ohnishi: - .string "Takahiro Ohnishi$" -Text_Okamura: - .string "Norihide Okamura$" -Text_HiroNakamura: - .string "Hiro Nakamura$" -Text_Uesugi: - .string "Hiroyuki Uesugi$" -Text_Murakawa: - .string "Teruki Murakawa$" -Text_Kinashi: - .string "Akira Kinashi$" -Text_Takizawa: - .string "Michiko Takizawa$" -Text_Takada: - .string "Makiko Takada$" -Text_Kondo: - .string "Takanao Kondo$" -Text_Mashima: - .string "Ai Mashima$" -Text_Nomoto: - .string "Gakuji Nomoto$" -Text_Izushi: - .string "Takehiro Izushi$" -Text_Yamagami: - .string "Hitoshi Yamagami$" -Text_KyokoWatanabe: - .string "Kyoko Watanabe$" -Text_Nakano: - .string "Takao Nakano$" -Text_Jinnai: - .string "Hiroyuki Jinnai$" -Text_Tsuru: - .string "Hiroaki Tsuru$" -Text_Ishihara: - .string "Tsunekaz Ishihara$" -Text_Iwata: - .string "Satoru Iwata$" -Text_Suyama: - .string "Kazuya Suyama$" -Text_Mitsuhara: - .string "Satoshi Mitsuhara$" -Text_JapanBrailleLibrary: - .string "Japan Braille Library$" -Text_Komura: - .string "Tomotaka Komura$" -Text_Ohashi: - .string "Mikiko Ohashi$" -Text_McMahill: - .string "Seth McMahill$" -Text_Ogasawara: - .string "Nob Ogasawara$" -Text_Yamamoto: - .string "Souichi Yamamoto$" -Text_Funakoshi: - .string "Masanori Funakoshi$" -Text_Fujihara: - .string "Kazuhiro Fujihara$" -Text_Nakamichi: - .string "Kimiko Nakamichi$" -Text_Hara: - .string "Daisuke Hara$" -Text_Okada: - .string "Atsushi Okada$" -Text_Lillygren: - .string "Teresa Lillygren$" -Text_Hertzog: - .string "Thomas Hertzog$" -Text_Ridgeway: - .string "Ed Ridgeway$" -Text_NFotB: - .string "National Federation of the Blind$" -Text_Maurer: - .string "Patricia A. Maurer$" -Text_Ford: - .string "Sayoko Blodgett-Ford$" -Text_Barlow: - .string "Nicola Pratt-Barlow$" -Text_Uyama: - .string "Koji Uyama$" -Text_Howitt: - .string "Anthony Howitt$" -Text_Tilden: - .string "Gail Tilden$" -Text_EBU: - .string "European Blind Union$" -Text_ABA: - .string "Australian Braille Authority$" -Text_RNZFotB: - .string "Royal New Zealand Federation for the Blind$" -Text_CreditsTerminator: - .string "$" -Text_Version: - .ifdef SAPPHIRE - .string "{PALETTE 9}POKéMON SAPPHIRE VERSION$" - .else - .string "{PALETTE 9}POKéMON RUBY VERSION$" - .endif - -@ pointer table - -CreditsTerminator:: - credits_entry 0, Text_CreditsTerminator - -CreditsVersion:: - .ifdef SAPPHIRE - credits_entry 7, Text_Version - .else - credits_entry 8, Text_Version - .endif - -CreditsCredits:: - credits_entry 11, Category_Credits - -CreditsExecutiveDirector:: - credits_entry 8, Category_ExecutiveDirector - -CreditsDirector:: - credits_entry 12, Category_Director - -CreditsArtDirector:: - credits_entry 10, Category_ArtDirector - -CreditsBattleDirector:: - credits_entry 10, Category_BattleDirector - -CreditsMainProgrammer:: - credits_entry 10, Category_MainProgrammer - -CreditsBattleSystemProgrammer:: - credits_entry 8, Category_BattleSystemProgrammer - -CreditsFieldSystemProgrammer:: - credits_entry 7, Category_FieldSystemProgrammer - -CreditsProgrammers:: - credits_entry 12, Category_Programmers - -CreditsMainGraphicDesigner:: - credits_entry 7, Category_MainGraphicDesigner - -CreditsPOKeMONGraphicDesigners:: - credits_entry 6, Category_POKeMONGraphicDesigners - -CreditsPOKeMONDesigners:: - credits_entry 10, Category_POKeMONDesigners - -CreditsMusicComposition:: - credits_entry 13, Category_MusicComposition - -CreditsSoundEffectsPOKeMONVoices:: - credits_entry 4, Category_SoundEffectsPOKeMONVoices - -CreditsGameDesigners:: - credits_entry 11, Category_GameDesigners - -CreditsPlotScenario:: - credits_entry 11, Category_PlotScenario - -CreditsGameScenario:: - credits_entry 13, Category_GameScenario - -CreditsScriptDesigners:: - credits_entry 10, Category_ScriptDesigners - -CreditsMapDesigners:: - credits_entry 11, Category_MapDesigners - -CreditsMapDataDesigners:: - credits_entry 9, Category_MapDataDesigners - -CreditsParametricDesigners:: - credits_entry 9, Category_ParametricDesigners - -CreditsPOKeDEXText:: - credits_entry 11, Category_POKeDEXText - -CreditsEnvironmentToolProgrammers:: - credits_entry 6, Category_EnvironmentToolProgrammers - -CreditsProductTesting:: - credits_entry 11, Category_ProductTesting - -CreditsSpecialThanks:: - credits_entry 10, Category_SpecialThanks - -CreditsCoordinators:: - credits_entry 11, Category_Coordinators - -CreditsProducers:: - credits_entry 11, Category_Producers - -CreditsExecutiveProducers:: - credits_entry 7, Category_ExecutiveProducers - -CreditsInformationSupervisors:: - credits_entry 10, Category_InformationSupervisors - -CreditsTaskManagers:: - credits_entry 8, Category_TaskManagers - -CreditsBrailleCodeCheck:: - credits_entry 10, Category_BrailleCodeCheck - -CreditsSatoshiTajiri:: - credits_entry 11, Text_SatoshiTajiri - -CreditsMasuda:: - credits_entry 11, Text_Masuda - -CreditsSugimori:: - credits_entry 11, Text_Sugimori - -CreditsMorimoto:: - credits_entry 11, Text_Morimoto - -CreditsTetsuyaWatanabe:: - credits_entry 11, Text_TetsuyaWatanabe - -CreditsSogabe:: - credits_entry 11, Text_Sogabe - -CreditsTamada:: - credits_entry 11, Text_Tamada - -CreditsMori:: - credits_entry 11, Text_Mori - -CreditsKagaya:: - credits_entry 11, Text_Kagaya - -CreditsMatsuda:: - credits_entry 11, Text_Matsuda - -CreditsHiroyukiNakamura:: - credits_entry 11, Text_HiroyukiNakamura - -CreditsTaya:: - credits_entry 11, Text_Taya - -CreditsNohara:: - credits_entry 11, Text_Nohara - -CreditsTomomichiOhta:: - credits_entry 11, Text_TomomichiOhta - -CreditsIwasawa:: - credits_entry 11, Text_Iwasawa - -CreditsTakenoriOhta:: - credits_entry 11, Text_TakenoriOhta - -CreditsYoshida:: - credits_entry 11, Text_Yoshida - -CreditsFujiwara:: - credits_entry 11, Text_Fujiwara - -CreditsSatoshiOhta:: - credits_entry 11, Text_SatoshiOhta - -CreditsIwashita:: - credits_entry 11, Text_Iwashita - -CreditsTomita:: - credits_entry 11, Text_Tomita - -CreditsUnno:: - credits_entry 11, Text_Unno - -CreditsEo:: - credits_entry 11, Text_Eo - -CreditsOkutani:: - credits_entry 11, Text_Okutani - -CreditsNishida:: - credits_entry 11, Text_Nishida - -CreditsSaito:: - credits_entry 11, Text_Saito - -CreditsYoshikawa:: - credits_entry 11, Text_Yoshikawa - -CreditsIchinose:: - credits_entry 11, Text_Ichinose - -CreditsAoki:: - credits_entry 11, Text_Aoki - -CreditsNishino:: - credits_entry 11, Text_Nishino - -CreditsMatsushima:: - credits_entry 11, Text_Matsushima - -CreditsTetsujiOhta:: - credits_entry 11, Text_TetsujiOhta - -CreditsSato:: - credits_entry 11, Text_Sato - -CreditsKawachimaru:: - credits_entry 11, Text_Kawachimaru - -CreditsShimoyamada:: - credits_entry 11, Text_Shimoyamada - -CreditsOhmori:: - credits_entry 11, Text_Ohmori - -CreditsTakahashi:: - credits_entry 11, Text_Takahashi - -CreditsToshinobuMatsumiya:: - credits_entry 11, Text_ToshinobuMatsumiya - -CreditsTomisawa:: - credits_entry 11, Text_Tomisawa - -CreditsEnomoto:: - credits_entry 11, Text_Enomoto - -CreditsTerada:: - credits_entry 11, Text_Terada - -CreditsSakurai:: - credits_entry 11, Text_Sakurai - -CreditsSagawa:: - credits_entry 11, Text_Sagawa - -CreditsTominaga:: - credits_entry 11, Text_Tominaga - -CreditsYoshiroTajiri:: - credits_entry 11, Text_YoshioTajiri - -CreditsSasaki:: - credits_entry 11, Text_Sasaki - -CreditsHamano:: - credits_entry 11, Text_Hamano - -CreditsChieMatsumiya:: - credits_entry 11, Text_ChieMatsumiya - -CreditsShinozaki:: - credits_entry 11, Text_Shinozaki - -CreditsFujii:: - credits_entry 11, Text_Fujii - -CreditsSuperMarioClub:: - credits_entry 11, Text_SuperMarioClub - -CreditsTada:: - credits_entry 11, Text_Tada - -CreditsOhnishi:: - credits_entry 11, Text_Ohnishi - -CreditsOkamura:: - credits_entry 11, Text_Okamura - -CreditsHiroNakamura:: - credits_entry 11, Text_HiroNakamura - -CreditsUesugi:: - credits_entry 11, Text_Uesugi - -CreditsMurakawa:: - credits_entry 11, Text_Murakawa - -CreditsKinashi:: - credits_entry 11, Text_Kinashi - -CreditsTakizawa:: - credits_entry 11, Text_Takizawa - -CreditsTakada:: - credits_entry 11, Text_Takada - -CreditsKondo:: - credits_entry 11, Text_Kondo - -CreditsMashima:: - credits_entry 11, Text_Mashima - -CreditsNomoto:: - credits_entry 11, Text_Nomoto - -CreditsIzushi:: - credits_entry 11, Text_Izushi - -CreditsYamagami:: - credits_entry 11, Text_Yamagami - -CreditsKyokoWatanabe:: - credits_entry 11, Text_KyokoWatanabe - -CreditsNakano:: - credits_entry 11, Text_Nakano - -CreditsJinnai:: - credits_entry 11, Text_Jinnai - -CreditsTsuru:: - credits_entry 11, Text_Tsuru - -CreditsIshihara:: - credits_entry 11, Text_Ishihara - -CreditsIwata:: - credits_entry 11, Text_Iwata - -CreditsSuyama:: - credits_entry 11, Text_Suyama - -CreditsMitsuhara:: - credits_entry 11, Text_Mitsuhara - -CreditsJapanBrailleLibrary:: - credits_entry 9, Text_JapanBrailleLibrary - -CreditsKomura:: - credits_entry 11, Text_Komura - -CreditsOhashi:: - credits_entry 11, Text_Ohashi - -CreditsEnglishVersionCoordinators:: - credits_entry 0, Category_EnglishVersionCoordinators - -CreditsTranslator:: - credits_entry 0, Category_Translator - -CreditsProductSupport:: - credits_entry 0, Category_ProductSupport - -CreditsArtwork:: - credits_entry 0, Category_Artwork - -CreditsTextEditor:: - credits_entry 0, Category_TextEditor - -CreditsNOAProductTesting:: - credits_entry 0, Category_NOAProductTesting - -CreditsGraphicDesigners:: - credits_entry 0, Category_GraphicDesigners - -CreditsMcMahill:: - credits_entry 0, Text_McMahill - -CreditsOgasawara:: - credits_entry 0, Text_Ogasawara - -CreditsYamamoto:: - credits_entry 0, Text_Yamamoto - -CreditsFunakoshi:: - credits_entry 0, Text_Funakoshi - -CreditsFujihara:: - credits_entry 0, Text_Fujihara - -CreditsNakamichi:: - credits_entry 0, Text_Nakamichi - -CreditsHara:: - credits_entry 0, Text_Hara - -CreditsOkada:: - credits_entry 0, Text_Okada - -CreditsLillygren:: - credits_entry 0, Text_Lillygren - -CreditsHertzog:: - credits_entry 0, Text_Hertzog - -CreditsRidgeway:: - credits_entry 0, Text_Ridgeway - -CreditsNFotB:: - credits_entry 0, Text_NFotB - -CreditsMaurer:: - credits_entry 0, Text_Maurer - -CreditsFord:: - credits_entry 0, Text_Ford - -CreditsBarlow:: - credits_entry 0, Text_Barlow - -CreditsUyama:: - credits_entry 0, Text_Uyama - -CreditsHowitt:: - credits_entry 0, Text_Howitt - -CreditsTilden:: - credits_entry 0, Text_Tilden - -CreditsEBU:: - credits_entry 0, Text_EBU - -CreditsABA:: - credits_entry 0, Text_ABA - -CreditsRNZFotB:: - credits_entry 0, Text_RNZFotB - -@ pointer table to credits entries - - .align 2 -gCreditsEntryPointerTable:: @ 840C5F0 - .4byte CreditsTerminator - .4byte CreditsVersion - .4byte CreditsCredits - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsDirector - .4byte CreditsMasuda - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsArtDirector - .4byte CreditsSugimori - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsBattleDirector - .4byte CreditsMorimoto - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsMainProgrammer - .4byte CreditsTetsuyaWatanabe - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsBattleSystemProgrammer - .4byte CreditsSogabe - .4byte CreditsFieldSystemProgrammer - .4byte CreditsTamada - .4byte CreditsTerminator - - .4byte CreditsProgrammers - .4byte CreditsMori - .4byte CreditsKagaya - .4byte CreditsMatsuda - .4byte CreditsTerminator - - .4byte CreditsProgrammers - .4byte CreditsHiroyukiNakamura - .4byte CreditsTaya - .4byte CreditsNohara - .4byte CreditsTerminator - - .4byte CreditsProgrammers - .4byte CreditsTomomichiOhta - .4byte CreditsIwasawa - .4byte CreditsTakenoriOhta - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsMainGraphicDesigner - .4byte CreditsYoshida - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsPOKeMONGraphicDesigners - .4byte CreditsSugimori - .4byte CreditsYoshida - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsPOKeMONGraphicDesigners - .4byte CreditsFujiwara - .4byte CreditsSatoshiOhta - .4byte CreditsIwashita - .4byte CreditsTerminator - - .4byte CreditsPOKeMONGraphicDesigners - .4byte CreditsTomita - .4byte CreditsUnno - .4byte CreditsEo - .4byte CreditsTerminator - - .4byte CreditsPOKeMONDesigners - .4byte CreditsMorimoto - .4byte CreditsOkutani - .4byte CreditsNishida - .4byte CreditsTerminator - - .4byte CreditsPOKeMONDesigners - .4byte CreditsSaito - .4byte CreditsYoshikawa - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsMusicComposition - .4byte CreditsIchinose - .4byte CreditsAoki - .4byte CreditsMasuda - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsSoundEffectsPOKeMONVoices - .4byte CreditsAoki - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsGameDesigners - .4byte CreditsMasuda - .4byte CreditsMorimoto - .4byte CreditsNishino - .4byte CreditsTerminator - - .4byte CreditsGameDesigners - .4byte CreditsMatsushima - .4byte CreditsTetsujiOhta - .4byte CreditsSato - .4byte CreditsKawachimaru - - .4byte CreditsGameDesigners - .4byte CreditsShimoyamada - .4byte CreditsOhmori - .4byte CreditsTakahashi - .4byte CreditsTerminator - - .4byte CreditsPlotScenario - .4byte CreditsMasuda - .4byte CreditsTomisawa - .4byte CreditsNishino - .4byte CreditsTerminator - - .4byte CreditsGameScenario - .4byte CreditsToshinobuMatsumiya - .4byte CreditsTomisawa - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsScriptDesigners - .4byte CreditsNohara - .4byte CreditsTetsujiOhta - .4byte CreditsTomomichiOhta - .4byte CreditsTerminator - - .4byte CreditsMapDesigners - .4byte CreditsOhmori - .4byte CreditsTetsujiOhta - .4byte CreditsNishino - .4byte CreditsTerminator - - .4byte CreditsMapDataDesigners - .4byte CreditsTetsujiOhta - .4byte CreditsTakahashi - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsParametricDesigners - .4byte CreditsNishino - .4byte CreditsMorimoto - .4byte CreditsTetsujiOhta - .4byte CreditsShimoyamada - - .4byte CreditsTerminator - .4byte CreditsPOKeDEXText - .4byte CreditsMatsushima - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsEnvironmentToolProgrammers - .4byte CreditsSogabe - .4byte CreditsTamada - .4byte CreditsHiroyukiNakamura - .4byte CreditsMori - - .4byte CreditsProductTesting - .4byte CreditsSuperMarioClub - .4byte CreditsTada - .4byte CreditsOhnishi - .4byte CreditsOkamura - - .4byte CreditsSpecialThanks - .4byte CreditsTominaga - .4byte CreditsYoshiroTajiri - .4byte CreditsSasaki - .4byte CreditsTerminator - - .4byte CreditsSpecialThanks - .4byte CreditsHamano - .4byte CreditsChieMatsumiya - .4byte CreditsShinozaki - .4byte CreditsFujii - - .4byte CreditsSpecialThanks - .4byte CreditsSuyama - .4byte CreditsMitsuhara - .4byte CreditsKomura - .4byte CreditsOhashi - - .4byte CreditsSpecialThanks - .4byte CreditsTakizawa - .4byte CreditsTakada - .4byte CreditsKondo - .4byte CreditsMashima - - .4byte CreditsInformationSupervisors - .4byte CreditsEnomoto - .4byte CreditsTerada - .4byte CreditsSakurai - .4byte CreditsSagawa - - .4byte CreditsCoordinators - .4byte CreditsKyokoWatanabe - .4byte CreditsNakano - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTaskManagers - .4byte CreditsYamagami - .4byte CreditsNomoto - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsProducers - .4byte CreditsJinnai - .4byte CreditsIzushi - .4byte CreditsTsuru - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsExecutiveDirector - .4byte CreditsSatoshiTajiri - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsExecutiveProducers - .4byte CreditsIwata - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsExecutiveProducers - .4byte CreditsIshihara - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsEnglishVersionCoordinators - .4byte CreditsHiroNakamura - .4byte CreditsMcMahill - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsTranslator - .4byte CreditsOgasawara - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsProgrammers - .4byte CreditsMurakawa - .4byte CreditsYamamoto - .4byte CreditsFunakoshi - .4byte CreditsKinashi - - .4byte CreditsGraphicDesigners - .4byte CreditsYamamoto - .4byte CreditsKinashi - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsProductSupport - .4byte CreditsNakamichi - .4byte CreditsHara - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsArtwork - .4byte CreditsOkada - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsTextEditor - .4byte CreditsLillygren - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsNOAProductTesting - .4byte CreditsHertzog - .4byte CreditsRidgeway - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsBrailleCodeCheck - .4byte CreditsNFotB - .4byte CreditsMaurer - .4byte CreditsJapanBrailleLibrary - .4byte CreditsEBU - - .4byte CreditsBrailleCodeCheck - .4byte CreditsABA - .4byte CreditsRNZFotB - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsSpecialThanks - .4byte CreditsFord - .4byte CreditsBarlow - .4byte CreditsUesugi - .4byte CreditsUyama - - .4byte CreditsSpecialThanks - .4byte CreditsHowitt - .4byte CreditsTilden - .4byte CreditsFujihara - .4byte CreditsTerminator diff --git a/data/text/easy_chat/words_by_letter.inc b/data/text/easy_chat/words_by_letter.inc index 86fba988e..3c7f5bafc 100644 --- a/data/text/easy_chat/words_by_letter.inc +++ b/data/text/easy_chat/words_by_letter.inc @@ -1,1893 +1,1893 @@ .align 1 gEasyChatWordsAlphabetized:: @ 83DE138 gEasyChatWordsByLetter_Others: - ec_word EXCL - ec_word EXCL_EXCL - ec_word DASH - ec_word DASH_DASH_DASH - ec_word ELLIPSIS - ec_word ELLIPSIS_EXCL - ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS - ec_word 1_HIT_KO_EXCL - ec_word QUES - ec_word QUES_EXCL + .2byte EC_WORD_EXCL + .2byte EC_WORD_EXCL_EXCL + .2byte EC_WORD_DASH + .2byte EC_WORD_DASH_DASH_DASH + .2byte EC_WORD_ELLIPSIS + .2byte EC_WORD_ELLIPSIS_EXCL + .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS + .2byte EC_WORD_1_HIT_KO_EXCL + .2byte EC_WORD_QUES + .2byte EC_WORD_QUES_EXCL gEasyChatWordsByLetter_A: - ec_word A - ec_word A_LITTLE - ec_word A_LOT - ec_word A_TINY_BIT - ec_word ABOUT - ec_word ABOVE - ec_duplicates 2 - ec_pokemon1 ABRA - ec_pokemon2 ABRA - ec_word ABSENT - ec_pokemon1 ABSOL - ec_word ABSOLUTELY - ec_move1 ABSORB - ec_word ACCEPT - ec_move2 ACID - ec_move2 ACID_ARMOR - ec_word ADORE - ec_word ADULT - ec_word ADVENTURE - ec_move2 AERIAL_ACE - ec_move1 AEROBLAST - ec_pokemon2 AERODACTYL - ec_word AFTER - ec_word AGE - ec_pokemon1 AGGRON - ec_move1 AGILITY - ec_word AGREE - ec_word AHAHA - ec_word AIM - ec_pokemon2 AIPOM - ec_move1 AIR_CUTTER - ec_word AIR_LOCK - ec_word AIYEEH - ec_duplicates 2 - ec_pokemon1 ALAKAZAM - ec_pokemon2 ALAKAZAM - ec_word ALL - ec_word ALL_RIGHT - ec_word ALLOW - ec_word ALLOWANCE - ec_word ALLY - ec_word ALMOST - ec_word ALONE - ec_word ALSO - ec_word ALT_COLOR - ec_pokemon1 ALTARIA - ec_word ALTHOUGH - ec_word ALWAYS - ec_word AM - ec_move2 AMNESIA - ec_pokemon2 AMPHAROS - ec_word AMUSING - ec_word AN - ec_move1 ANCIENT_POWER - ec_word AND - ec_word ANGER - ec_word ANGERS - ec_word ANGRY - ec_word ANIME - ec_pokemon1 ANORITH - ec_word ANOTHER - ec_word ANTICIPATION - ec_word ANY - ec_word ANYWHERE - ec_word APOLOGIZE - ec_word APPEAL - ec_word APPEAR - ec_word APPEARS - ec_word APPRECIATE - ec_word APPROVED - ec_pokemon2 ARBOK - ec_pokemon2 ARCANINE - ec_word ARE - ec_word AREN_T - ec_word ARENA_TRAP - ec_pokemon2 ARIADOS - ec_move2 ARM_THRUST - ec_pokemon1 ARMALDO - ec_move1 AROMATHERAPY - ec_pokemon1 ARON - ec_word AROUND - ec_word ARRGH - ec_pokemon2 ARTICUNO - ec_word AS - ec_word AS_IF - ec_word AS_MUCH_AS - ec_move2 ASSIST - ec_move1 ASTONISH - ec_word AT - ec_word ATTACK - ec_move2 ATTRACT - ec_word AUNT - ec_move1 AURORA_BEAM - ec_word AVANT_GARDE - ec_word AWAY - ec_word AWESOME - ec_word AWFUL - ec_word AWFULLY - ec_word AWW - ec_duplicates 2 - ec_pokemon1 AZUMARILL - ec_pokemon2 AZUMARILL - ec_pokemon1 AZURILL + .2byte EC_WORD_A + .2byte EC_WORD_A_LITTLE + .2byte EC_WORD_A_LOT + .2byte EC_WORD_A_TINY_BIT + .2byte EC_WORD_ABOUT + .2byte EC_WORD_ABOVE + ec_duplicates 2 + .2byte EC_POKEMON(ABRA) + .2byte EC_POKEMON2(ABRA) + .2byte EC_WORD_ABSENT + .2byte EC_POKEMON(ABSOL) + .2byte EC_WORD_ABSOLUTELY + .2byte EC_MOVE(ABSORB) + .2byte EC_WORD_ACCEPT + .2byte EC_MOVE2(ACID) + .2byte EC_MOVE2(ACID_ARMOR) + .2byte EC_WORD_ADORE + .2byte EC_WORD_ADULT + .2byte EC_WORD_ADVENTURE + .2byte EC_MOVE2(AERIAL_ACE) + .2byte EC_MOVE(AEROBLAST) + .2byte EC_POKEMON2(AERODACTYL) + .2byte EC_WORD_AFTER + .2byte EC_WORD_AGE + .2byte EC_POKEMON(AGGRON) + .2byte EC_MOVE(AGILITY) + .2byte EC_WORD_AGREE + .2byte EC_WORD_AHAHA + .2byte EC_WORD_AIM + .2byte EC_POKEMON2(AIPOM) + .2byte EC_MOVE(AIR_CUTTER) + .2byte EC_WORD_AIR_LOCK + .2byte EC_WORD_AIYEEH + ec_duplicates 2 + .2byte EC_POKEMON(ALAKAZAM) + .2byte EC_POKEMON2(ALAKAZAM) + .2byte EC_WORD_ALL + .2byte EC_WORD_ALL_RIGHT + .2byte EC_WORD_ALLOW + .2byte EC_WORD_ALLOWANCE + .2byte EC_WORD_ALLY + .2byte EC_WORD_ALMOST + .2byte EC_WORD_ALONE + .2byte EC_WORD_ALSO + .2byte EC_WORD_ALT_COLOR + .2byte EC_POKEMON(ALTARIA) + .2byte EC_WORD_ALTHOUGH + .2byte EC_WORD_ALWAYS + .2byte EC_WORD_AM + .2byte EC_MOVE2(AMNESIA) + .2byte EC_POKEMON2(AMPHAROS) + .2byte EC_WORD_AMUSING + .2byte EC_WORD_AN + .2byte EC_MOVE(ANCIENT_POWER) + .2byte EC_WORD_AND + .2byte EC_WORD_ANGER + .2byte EC_WORD_ANGERS + .2byte EC_WORD_ANGRY + .2byte EC_WORD_ANIME + .2byte EC_POKEMON(ANORITH) + .2byte EC_WORD_ANOTHER + .2byte EC_WORD_ANTICIPATION + .2byte EC_WORD_ANY + .2byte EC_WORD_ANYWHERE + .2byte EC_WORD_APOLOGIZE + .2byte EC_WORD_APPEAL + .2byte EC_WORD_APPEAR + .2byte EC_WORD_APPEARS + .2byte EC_WORD_APPRECIATE + .2byte EC_WORD_APPROVED + .2byte EC_POKEMON2(ARBOK) + .2byte EC_POKEMON2(ARCANINE) + .2byte EC_WORD_ARE + .2byte EC_WORD_AREN_T + .2byte EC_WORD_ARENA_TRAP + .2byte EC_POKEMON2(ARIADOS) + .2byte EC_MOVE2(ARM_THRUST) + .2byte EC_POKEMON(ARMALDO) + .2byte EC_MOVE(AROMATHERAPY) + .2byte EC_POKEMON(ARON) + .2byte EC_WORD_AROUND + .2byte EC_WORD_ARRGH + .2byte EC_POKEMON2(ARTICUNO) + .2byte EC_WORD_AS + .2byte EC_WORD_AS_IF + .2byte EC_WORD_AS_MUCH_AS + .2byte EC_MOVE2(ASSIST) + .2byte EC_MOVE(ASTONISH) + .2byte EC_WORD_AT + .2byte EC_WORD_ATTACK + .2byte EC_MOVE2(ATTRACT) + .2byte EC_WORD_AUNT + .2byte EC_MOVE(AURORA_BEAM) + .2byte EC_WORD_AVANT_GARDE + .2byte EC_WORD_AWAY + .2byte EC_WORD_AWESOME + .2byte EC_WORD_AWFUL + .2byte EC_WORD_AWFULLY + .2byte EC_WORD_AWW + ec_duplicates 2 + .2byte EC_POKEMON(AZUMARILL) + .2byte EC_POKEMON2(AZUMARILL) + .2byte EC_POKEMON(AZURILL) gEasyChatWordsByLetter_B: - ec_word BABE - ec_word BABY - ec_word BACK - ec_word BAD - ec_word BADLY - ec_pokemon1 BAGON - ec_word BALL - ec_pokemon1 BALTOY - ec_pokemon1 BANETTE - ec_word BANG - ec_pokemon1 BARBOACH - ec_move2 BARRAGE - ec_move2 BARRIER - ec_word BATH - ec_move2 BATON_PASS - ec_word BATTLE - ec_word BATTLE_ARMOR - ec_word BATTLE_ROOM - ec_word BATTLE_TOWER - ec_pokemon2 BAYLEEF - ec_word BE - ec_word BEAT - ec_move2 BEAT_UP - ec_pokemon1 BEAUTIFLY - ec_word BEAUTIFUL - ec_word BEAUTY - ec_word BECOMES - ec_pokemon2 BEEDRILL - ec_word BEEN - ec_word BEFORE - ec_word BEGINNING - ec_word BEING - ec_pokemon1 BELDUM - ec_word BELIEVE - ec_duplicates 2 - ec_pokemon1 BELLOSSOM - ec_pokemon2 BELLOSSOM - ec_pokemon2 BELLSPROUT - ec_move2 BELLY_DRUM - ec_word BELONGS_TO - ec_word BELOW - ec_word BERRY - ec_word BESIDE - ec_word BEST - ec_word BETTER - ec_move1 BIDE - ec_word BIG - ec_word BIKE - ec_move1 BIND - ec_move1 BITE - ec_pokemon2 BLASTOISE - ec_word BLAZE - ec_move2 BLAZE_KICK - ec_pokemon1 BLAZIKEN - ec_word BLEND - ec_pokemon2 BLISSEY - ec_move2 BLIZZARD - ec_move2 BLOCK - ec_word BOARD - ec_move2 BODY_SLAM - ec_move2 BONE_CLUB - ec_move2 BONE_RUSH - ec_move2 BONEMERANG - ec_word BOOK - ec_word BORED - ec_word BORING - ec_move2 BOUNCE - ec_word BOY - ec_word BRAG - ec_word BREAK - ec_pokemon1 BRELOOM - ec_move1 BRICK_BREAK - ec_word BROTHER - ec_move1 BUBBLE - ec_move2 BUBBLE_BEAM - ec_word BUG - ec_pokemon2 BULBASAUR - ec_move2 BULK_UP - ec_move2 BULLET_SEED - ec_word BUSY - ec_word BUT - ec_pokemon2 BUTTERFREE - ec_word BYE_BYE + .2byte EC_WORD_BABE + .2byte EC_WORD_BABY + .2byte EC_WORD_BACK + .2byte EC_WORD_BAD + .2byte EC_WORD_BADLY + .2byte EC_POKEMON(BAGON) + .2byte EC_WORD_BALL + .2byte EC_POKEMON(BALTOY) + .2byte EC_POKEMON(BANETTE) + .2byte EC_WORD_BANG + .2byte EC_POKEMON(BARBOACH) + .2byte EC_MOVE2(BARRAGE) + .2byte EC_MOVE2(BARRIER) + .2byte EC_WORD_BATH + .2byte EC_MOVE2(BATON_PASS) + .2byte EC_WORD_BATTLE + .2byte EC_WORD_BATTLE_ARMOR + .2byte EC_WORD_BATTLE_ROOM + .2byte EC_WORD_BATTLE_TOWER + .2byte EC_POKEMON2(BAYLEEF) + .2byte EC_WORD_BE + .2byte EC_WORD_BEAT + .2byte EC_MOVE2(BEAT_UP) + .2byte EC_POKEMON(BEAUTIFLY) + .2byte EC_WORD_BEAUTIFUL + .2byte EC_WORD_BEAUTY + .2byte EC_WORD_BECOMES + .2byte EC_POKEMON2(BEEDRILL) + .2byte EC_WORD_BEEN + .2byte EC_WORD_BEFORE + .2byte EC_WORD_BEGINNING + .2byte EC_WORD_BEING + .2byte EC_POKEMON(BELDUM) + .2byte EC_WORD_BELIEVE + ec_duplicates 2 + .2byte EC_POKEMON(BELLOSSOM) + .2byte EC_POKEMON2(BELLOSSOM) + .2byte EC_POKEMON2(BELLSPROUT) + .2byte EC_MOVE2(BELLY_DRUM) + .2byte EC_WORD_BELONGS_TO + .2byte EC_WORD_BELOW + .2byte EC_WORD_BERRY + .2byte EC_WORD_BESIDE + .2byte EC_WORD_BEST + .2byte EC_WORD_BETTER + .2byte EC_MOVE(BIDE) + .2byte EC_WORD_BIG + .2byte EC_WORD_BIKE + .2byte EC_MOVE(BIND) + .2byte EC_MOVE(BITE) + .2byte EC_POKEMON2(BLASTOISE) + .2byte EC_WORD_BLAZE + .2byte EC_MOVE2(BLAZE_KICK) + .2byte EC_POKEMON(BLAZIKEN) + .2byte EC_WORD_BLEND + .2byte EC_POKEMON2(BLISSEY) + .2byte EC_MOVE2(BLIZZARD) + .2byte EC_MOVE2(BLOCK) + .2byte EC_WORD_BOARD + .2byte EC_MOVE2(BODY_SLAM) + .2byte EC_MOVE2(BONE_CLUB) + .2byte EC_MOVE2(BONE_RUSH) + .2byte EC_MOVE2(BONEMERANG) + .2byte EC_WORD_BOOK + .2byte EC_WORD_BORED + .2byte EC_WORD_BORING + .2byte EC_MOVE2(BOUNCE) + .2byte EC_WORD_BOY + .2byte EC_WORD_BRAG + .2byte EC_WORD_BREAK + .2byte EC_POKEMON(BRELOOM) + .2byte EC_MOVE(BRICK_BREAK) + .2byte EC_WORD_BROTHER + .2byte EC_MOVE(BUBBLE) + .2byte EC_MOVE2(BUBBLE_BEAM) + .2byte EC_WORD_BUG + .2byte EC_POKEMON2(BULBASAUR) + .2byte EC_MOVE2(BULK_UP) + .2byte EC_MOVE2(BULLET_SEED) + .2byte EC_WORD_BUSY + .2byte EC_WORD_BUT + .2byte EC_POKEMON2(BUTTERFREE) + .2byte EC_WORD_BYE_BYE gEasyChatWordsByLetter_C: - ec_pokemon1 CACNEA - ec_pokemon1 CACTURNE - ec_move2 CALM_MIND - ec_word CAME - ec_word CAMERA - ec_pokemon1 CAMERUPT - ec_move2 CAMOUFLAGE - ec_word CAN - ec_word CAN_WIN - ec_word CAN_T - ec_word CAN_T_WIN - ec_word CANCEL - ec_word CAPABLE - ec_word CARDS - ec_word CARE - ec_word CARES - ec_pokemon1 CARVANHA - ec_pokemon1 CASCOON - ec_word CASE - ec_pokemon1 CASTFORM - ec_pokemon2 CATERPIE - ec_word CAUSE - ec_pokemon2 CELEBI - ec_word CENTER - ec_word CHALLENGE - ec_word CHANGE - ec_word CHANNEL - ec_pokemon2 CHANSEY - ec_move1 CHARGE - ec_pokemon2 CHARIZARD - ec_move1 CHARM - ec_pokemon2 CHARMANDER - ec_pokemon2 CHARMELEON - ec_word CHAT - ec_pokemon2 CHIKORITA - ec_word CHILD_S_PLAY - ec_word CHILDREN - ec_pokemon1 CHIMECHO - ec_duplicates 2 - ec_pokemon1 CHINCHOU - ec_pokemon2 CHINCHOU - ec_word CHLOROPHYLL - ec_word CHOICE - ec_word CHOOSE - ec_word CHORES - ec_move1 CLAMP - ec_pokemon1 CLAMPERL - ec_word CLASS - ec_pokemon1 CLAYDOL - ec_word CLEAR_BODY - ec_pokemon2 CLEFABLE - ec_pokemon2 CLEFAIRY - ec_pokemon2 CLEFFA - ec_word CLOSE - ec_word CLOUD_NINE - ec_pokemon2 CLOYSTER - ec_word COLD - ec_word COLLECT - ec_word COLLECTION - ec_word COLOR - ec_word COLOR_CHANGE - ec_pokemon1 COMBUSKEN - ec_word COME - ec_word COME_ON - ec_word COME_OVER - ec_move2 COMET_PUNCH - ec_word COMICS - ec_word COMMEMORATE - ec_word COMPLETE - ec_word COMPOUNDEYES - ec_word CONCEDE - ec_move1 CONFUSE_RAY - ec_word CONFUSED - ec_move2 CONFUSION - ec_word CONGRATS - ec_move1 CONSTRICT - ec_word CONTEST - ec_word CONVERSATION - ec_move2 CONVERSION - ec_move2 CONVERSION_2 - ec_word COOL - ec_word COOLNESS - ec_pokemon1 CORPHISH - ec_word CORRECT - ec_duplicates 2 - ec_pokemon1 CORSOLA - ec_pokemon2 CORSOLA - ec_move1 COSMIC_POWER - ec_move2 COTTON_SPORE - ec_word COULD - ec_word COULDN_T - ec_word COUNT_ON - ec_move1 COUNTER - ec_word COUPLE - ec_move2 COVET - ec_move1 CRABHAMMER - ec_pokemon1 CRADILY - ec_pokemon1 CRAWDAUNT - ec_word CRIES - ec_duplicates 2 - ec_pokemon1 CROBAT - ec_pokemon2 CROBAT - ec_pokemon2 CROCONAW - ec_move1 CROSS_CHOP - ec_move1 CRUNCH - ec_move2 CRUSH_CLAW - ec_word CRY - ec_pokemon2 CUBONE - ec_word CURRENT - ec_move2 CURSE - ec_move1 CUT - ec_word CUTE - ec_word CUTE_CHARM - ec_word CUTENESS - ec_pokemon2 CYNDAQUIL + .2byte EC_POKEMON(CACNEA) + .2byte EC_POKEMON(CACTURNE) + .2byte EC_MOVE2(CALM_MIND) + .2byte EC_WORD_CAME + .2byte EC_WORD_CAMERA + .2byte EC_POKEMON(CAMERUPT) + .2byte EC_MOVE2(CAMOUFLAGE) + .2byte EC_WORD_CAN + .2byte EC_WORD_CAN_WIN + .2byte EC_WORD_CAN_T + .2byte EC_WORD_CAN_T_WIN + .2byte EC_WORD_CANCEL + .2byte EC_WORD_CAPABLE + .2byte EC_WORD_CARDS + .2byte EC_WORD_CARE + .2byte EC_WORD_CARES + .2byte EC_POKEMON(CARVANHA) + .2byte EC_POKEMON(CASCOON) + .2byte EC_WORD_CASE + .2byte EC_POKEMON(CASTFORM) + .2byte EC_POKEMON2(CATERPIE) + .2byte EC_WORD_CAUSE + .2byte EC_POKEMON2(CELEBI) + .2byte EC_WORD_CENTER + .2byte EC_WORD_CHALLENGE + .2byte EC_WORD_CHANGE + .2byte EC_WORD_CHANNEL + .2byte EC_POKEMON2(CHANSEY) + .2byte EC_MOVE(CHARGE) + .2byte EC_POKEMON2(CHARIZARD) + .2byte EC_MOVE(CHARM) + .2byte EC_POKEMON2(CHARMANDER) + .2byte EC_POKEMON2(CHARMELEON) + .2byte EC_WORD_CHAT + .2byte EC_POKEMON2(CHIKORITA) + .2byte EC_WORD_CHILD_S_PLAY + .2byte EC_WORD_CHILDREN + .2byte EC_POKEMON(CHIMECHO) + ec_duplicates 2 + .2byte EC_POKEMON(CHINCHOU) + .2byte EC_POKEMON2(CHINCHOU) + .2byte EC_WORD_CHLOROPHYLL + .2byte EC_WORD_CHOICE + .2byte EC_WORD_CHOOSE + .2byte EC_WORD_CHORES + .2byte EC_MOVE(CLAMP) + .2byte EC_POKEMON(CLAMPERL) + .2byte EC_WORD_CLASS + .2byte EC_POKEMON(CLAYDOL) + .2byte EC_WORD_CLEAR_BODY + .2byte EC_POKEMON2(CLEFABLE) + .2byte EC_POKEMON2(CLEFAIRY) + .2byte EC_POKEMON2(CLEFFA) + .2byte EC_WORD_CLOSE + .2byte EC_WORD_CLOUD_NINE + .2byte EC_POKEMON2(CLOYSTER) + .2byte EC_WORD_COLD + .2byte EC_WORD_COLLECT + .2byte EC_WORD_COLLECTION + .2byte EC_WORD_COLOR + .2byte EC_WORD_COLOR_CHANGE + .2byte EC_POKEMON(COMBUSKEN) + .2byte EC_WORD_COME + .2byte EC_WORD_COME_ON + .2byte EC_WORD_COME_OVER + .2byte EC_MOVE2(COMET_PUNCH) + .2byte EC_WORD_COMICS + .2byte EC_WORD_COMMEMORATE + .2byte EC_WORD_COMPLETE + .2byte EC_WORD_COMPOUNDEYES + .2byte EC_WORD_CONCEDE + .2byte EC_MOVE(CONFUSE_RAY) + .2byte EC_WORD_CONFUSED + .2byte EC_MOVE2(CONFUSION) + .2byte EC_WORD_CONGRATS + .2byte EC_MOVE(CONSTRICT) + .2byte EC_WORD_CONTEST + .2byte EC_WORD_CONVERSATION + .2byte EC_MOVE2(CONVERSION) + .2byte EC_MOVE2(CONVERSION_2) + .2byte EC_WORD_COOL + .2byte EC_WORD_COOLNESS + .2byte EC_POKEMON(CORPHISH) + .2byte EC_WORD_CORRECT + ec_duplicates 2 + .2byte EC_POKEMON(CORSOLA) + .2byte EC_POKEMON2(CORSOLA) + .2byte EC_MOVE(COSMIC_POWER) + .2byte EC_MOVE2(COTTON_SPORE) + .2byte EC_WORD_COULD + .2byte EC_WORD_COULDN_T + .2byte EC_WORD_COUNT_ON + .2byte EC_MOVE(COUNTER) + .2byte EC_WORD_COUPLE + .2byte EC_MOVE2(COVET) + .2byte EC_MOVE(CRABHAMMER) + .2byte EC_POKEMON(CRADILY) + .2byte EC_POKEMON(CRAWDAUNT) + .2byte EC_WORD_CRIES + ec_duplicates 2 + .2byte EC_POKEMON(CROBAT) + .2byte EC_POKEMON2(CROBAT) + .2byte EC_POKEMON2(CROCONAW) + .2byte EC_MOVE(CROSS_CHOP) + .2byte EC_MOVE(CRUNCH) + .2byte EC_MOVE2(CRUSH_CLAW) + .2byte EC_WORD_CRY + .2byte EC_POKEMON2(CUBONE) + .2byte EC_WORD_CURRENT + .2byte EC_MOVE2(CURSE) + .2byte EC_MOVE(CUT) + .2byte EC_WORD_CUTE + .2byte EC_WORD_CUTE_CHARM + .2byte EC_WORD_CUTENESS + .2byte EC_POKEMON2(CYNDAQUIL) gEasyChatWordsByLetter_D: - ec_word DAILY - ec_word DAMP - ec_word DANCE - ec_word DANGER - ec_word DARK - ec_word DARN - ec_word DATE - ec_word DAUGHTER - ec_word DAY - ec_word DAYS - ec_word DAYTIME - ec_word DECIDE - ec_word DECIDED - ec_word DEEP - ec_word DEFEATED - ec_move2 DEFENSE_CURL - ec_pokemon1 DELCATTY - ec_pokemon2 DELIBIRD - ec_pokemon1 DEOXYS - ec_word DEPT_STORE - ec_word DESIGN - ec_word DESTINY - ec_move2 DESTINY_BOND - ec_word DESTROYED - ec_move2 DETECT - ec_pokemon2 DEWGONG - ec_word DID - ec_word DIDN_T - ec_word DIET - ec_word DIFFERENT - ec_move1 DIG - ec_word DIGITAL - ec_pokemon2 DIGLETT - ec_move1 DISABLE - ec_word DISAPPEAR - ec_word DISAPPOINT - ec_word DISAPPOINTED - ec_word DISAPPOINTS - ec_word DISASTER - ec_word DISLIKE - ec_word DISLIKES - ec_pokemon2 DITTO - ec_move2 DIVE - ec_move2 DIZZY_PUNCH - ec_word DO - ec_word DOCILE - ec_duplicates 2 - ec_pokemon1 DODRIO - ec_pokemon2 DODRIO - ec_duplicates 2 - ec_pokemon1 DODUO - ec_pokemon2 DODUO - ec_word DOES - ec_word DOESN_T - ec_word DON_T - ec_word DONE - ec_duplicates 2 - ec_pokemon1 DONPHAN - ec_pokemon2 DONPHAN - ec_move2 DOUBLE_KICK - ec_move1 DOUBLE_TEAM - ec_move1 DOUBLE_EDGE - ec_move1 DOUBLE_SLAP - ec_word DOWN - ec_word DOWNCAST - ec_word DRAGON - ec_move2 DRAGON_CLAW - ec_move2 DRAGON_DANCE - ec_move2 DRAGON_RAGE - ec_pokemon2 DRAGONAIR - ec_move2 DRAGON_BREATH - ec_pokemon2 DRAGONITE - ec_pokemon2 DRATINI - ec_word DREAM - ec_move2 DREAM_EATER - ec_move2 DRILL_PECK - ec_word DRINK - ec_word DRINKS - ec_word DRIZZLE - ec_word DROOLING - ec_word DROUGHT - ec_pokemon2 DROWZEE - ec_word DUDE - ec_pokemon2 DUGTRIO - ec_pokemon2 DUNSPARCE - ec_pokemon1 DUSCLOPS - ec_pokemon1 DUSKULL - ec_pokemon1 DUSTOX - ec_move2 DYNAMIC_PUNCH + .2byte EC_WORD_DAILY + .2byte EC_WORD_DAMP + .2byte EC_WORD_DANCE + .2byte EC_WORD_DANGER + .2byte EC_WORD_DARK + .2byte EC_WORD_DARN + .2byte EC_WORD_DATE + .2byte EC_WORD_DAUGHTER + .2byte EC_WORD_DAY + .2byte EC_WORD_DAYS + .2byte EC_WORD_DAYTIME + .2byte EC_WORD_DECIDE + .2byte EC_WORD_DECIDED + .2byte EC_WORD_DEEP + .2byte EC_WORD_DEFEATED + .2byte EC_MOVE2(DEFENSE_CURL) + .2byte EC_POKEMON(DELCATTY) + .2byte EC_POKEMON2(DELIBIRD) + .2byte EC_POKEMON(DEOXYS) + .2byte EC_WORD_DEPT_STORE + .2byte EC_WORD_DESIGN + .2byte EC_WORD_DESTINY + .2byte EC_MOVE2(DESTINY_BOND) + .2byte EC_WORD_DESTROYED + .2byte EC_MOVE2(DETECT) + .2byte EC_POKEMON2(DEWGONG) + .2byte EC_WORD_DID + .2byte EC_WORD_DIDN_T + .2byte EC_WORD_DIET + .2byte EC_WORD_DIFFERENT + .2byte EC_MOVE(DIG) + .2byte EC_WORD_DIGITAL + .2byte EC_POKEMON2(DIGLETT) + .2byte EC_MOVE(DISABLE) + .2byte EC_WORD_DISAPPEAR + .2byte EC_WORD_DISAPPOINT + .2byte EC_WORD_DISAPPOINTED + .2byte EC_WORD_DISAPPOINTS + .2byte EC_WORD_DISASTER + .2byte EC_WORD_DISLIKE + .2byte EC_WORD_DISLIKES + .2byte EC_POKEMON2(DITTO) + .2byte EC_MOVE2(DIVE) + .2byte EC_MOVE2(DIZZY_PUNCH) + .2byte EC_WORD_DO + .2byte EC_WORD_DOCILE + ec_duplicates 2 + .2byte EC_POKEMON(DODRIO) + .2byte EC_POKEMON2(DODRIO) + ec_duplicates 2 + .2byte EC_POKEMON(DODUO) + .2byte EC_POKEMON2(DODUO) + .2byte EC_WORD_DOES + .2byte EC_WORD_DOESN_T + .2byte EC_WORD_DON_T + .2byte EC_WORD_DONE + ec_duplicates 2 + .2byte EC_POKEMON(DONPHAN) + .2byte EC_POKEMON2(DONPHAN) + .2byte EC_MOVE2(DOUBLE_KICK) + .2byte EC_MOVE(DOUBLE_TEAM) + .2byte EC_MOVE(DOUBLE_EDGE) + .2byte EC_MOVE(DOUBLE_SLAP) + .2byte EC_WORD_DOWN + .2byte EC_WORD_DOWNCAST + .2byte EC_WORD_DRAGON + .2byte EC_MOVE2(DRAGON_CLAW) + .2byte EC_MOVE2(DRAGON_DANCE) + .2byte EC_MOVE2(DRAGON_RAGE) + .2byte EC_POKEMON2(DRAGONAIR) + .2byte EC_MOVE2(DRAGON_BREATH) + .2byte EC_POKEMON2(DRAGONITE) + .2byte EC_POKEMON2(DRATINI) + .2byte EC_WORD_DREAM + .2byte EC_MOVE2(DREAM_EATER) + .2byte EC_MOVE2(DRILL_PECK) + .2byte EC_WORD_DRINK + .2byte EC_WORD_DRINKS + .2byte EC_WORD_DRIZZLE + .2byte EC_WORD_DROOLING + .2byte EC_WORD_DROUGHT + .2byte EC_POKEMON2(DROWZEE) + .2byte EC_WORD_DUDE + .2byte EC_POKEMON2(DUGTRIO) + .2byte EC_POKEMON2(DUNSPARCE) + .2byte EC_POKEMON(DUSCLOPS) + .2byte EC_POKEMON(DUSKULL) + .2byte EC_POKEMON(DUSTOX) + .2byte EC_MOVE2(DYNAMIC_PUNCH) gEasyChatWordsByLetter_E: - ec_word EARLIER - ec_word EARLY_BIRD - ec_move1 EARTHQUAKE - ec_word EASY - ec_word EAT - ec_word EATS - ec_word EEK - ec_pokemon2 EEVEE - ec_word EFFECT_SPORE - ec_word EGG - ec_move2 EGG_BOMB - ec_word EH_QUES - ec_word EHEHE - ec_pokemon2 EKANS - ec_pokemon2 ELECTABUZZ - ec_word ELECTRIC - ec_pokemon1 ELECTRIKE - ec_duplicates 2 - ec_pokemon1 ELECTRODE - ec_pokemon2 ELECTRODE - ec_pokemon2 ELEKID - ec_word ELSE - ec_move2 EMBER - ec_move1 ENCORE - ec_word ENCYCLOPEDIA - ec_word END - ec_move1 ENDEAVOR - ec_move1 ENDURE - ec_word ENJOY - ec_word ENJOYS - ec_word ENOUGH - ec_pokemon2 ENTEI - ec_word ENTERTAINING - ec_move2 ERUPTION - ec_word ESCAPE - ec_pokemon2 ESPEON - ec_word EVEN_SO - ec_word EVENT - ec_word EVENTS - ec_word EVER - ec_word EVERY - ec_word EVOLUTION - ec_word EVOLVE - ec_word EXCELLENT - ec_word EXCESS - ec_word EXCITE - ec_word EXCITING - ec_word EXCUSE - ec_word EXCUSE_ME - ec_pokemon2 EXEGGCUTE - ec_pokemon2 EXEGGUTOR - ec_word EXISTS - ec_word EXPENSIVE - ec_move2 EXPLOSION - ec_pokemon1 EXPLOUD - ec_move1 EXTRASENSORY - ec_move1 EXTREME_SPEED + .2byte EC_WORD_EARLIER + .2byte EC_WORD_EARLY_BIRD + .2byte EC_MOVE(EARTHQUAKE) + .2byte EC_WORD_EASY + .2byte EC_WORD_EAT + .2byte EC_WORD_EATS + .2byte EC_WORD_EEK + .2byte EC_POKEMON2(EEVEE) + .2byte EC_WORD_EFFECT_SPORE + .2byte EC_WORD_EGG + .2byte EC_MOVE2(EGG_BOMB) + .2byte EC_WORD_EH_QUES + .2byte EC_WORD_EHEHE + .2byte EC_POKEMON2(EKANS) + .2byte EC_POKEMON2(ELECTABUZZ) + .2byte EC_WORD_ELECTRIC + .2byte EC_POKEMON(ELECTRIKE) + ec_duplicates 2 + .2byte EC_POKEMON(ELECTRODE) + .2byte EC_POKEMON2(ELECTRODE) + .2byte EC_POKEMON2(ELEKID) + .2byte EC_WORD_ELSE + .2byte EC_MOVE2(EMBER) + .2byte EC_MOVE(ENCORE) + .2byte EC_WORD_ENCYCLOPEDIA + .2byte EC_WORD_END + .2byte EC_MOVE(ENDEAVOR) + .2byte EC_MOVE(ENDURE) + .2byte EC_WORD_ENJOY + .2byte EC_WORD_ENJOYS + .2byte EC_WORD_ENOUGH + .2byte EC_POKEMON2(ENTEI) + .2byte EC_WORD_ENTERTAINING + .2byte EC_MOVE2(ERUPTION) + .2byte EC_WORD_ESCAPE + .2byte EC_POKEMON2(ESPEON) + .2byte EC_WORD_EVEN_SO + .2byte EC_WORD_EVENT + .2byte EC_WORD_EVENTS + .2byte EC_WORD_EVER + .2byte EC_WORD_EVERY + .2byte EC_WORD_EVOLUTION + .2byte EC_WORD_EVOLVE + .2byte EC_WORD_EXCELLENT + .2byte EC_WORD_EXCESS + .2byte EC_WORD_EXCITE + .2byte EC_WORD_EXCITING + .2byte EC_WORD_EXCUSE + .2byte EC_WORD_EXCUSE_ME + .2byte EC_POKEMON2(EXEGGCUTE) + .2byte EC_POKEMON2(EXEGGUTOR) + .2byte EC_WORD_EXISTS + .2byte EC_WORD_EXPENSIVE + .2byte EC_MOVE2(EXPLOSION) + .2byte EC_POKEMON(EXPLOUD) + .2byte EC_MOVE(EXTRASENSORY) + .2byte EC_MOVE(EXTREME_SPEED) gEasyChatWordsByLetter_F: - ec_word FABULOUS - ec_move1 FACADE - ec_word FAINT - ec_move2 FAINT_ATTACK - ec_word FAINTED - ec_move2 FAKE_OUT - ec_move1 FAKE_TEARS - ec_word FALL - ec_move2 FALSE_SWIPE - ec_word FAMILY - ec_word FANTASTIC - ec_word FAR - ec_pokemon2 FARFETCHD - ec_word FASHION - ec_word FAST - ec_word FATHER - ec_word FEAR - ec_pokemon2 FEAROW - ec_move2 FEATHER_DANCE - ec_pokemon1 FEEBAS - ec_word FEELING - ec_pokemon2 FERALIGATR - ec_word FESTIVAL - ec_word FEVER - ec_word FIERY - ec_word FIGHT - ec_word FIGHTING - ec_word FIGHTS - ec_word FINAL - ec_word FINALLY - ec_word FINISH - ec_word FIRE - ec_move2 FIRE_BLAST - ec_move2 FIRE_PUNCH - ec_move2 FIRE_SPIN - ec_word FISHING - ec_move1 FISSURE - ec_pokemon2 FLAAFFY - ec_move1 FLAIL - ec_word FLAME_BODY - ec_move1 FLAME_WHEEL - ec_move1 FLAMETHROWER - ec_pokemon2 FLAREON - ec_move2 FLASH - ec_word FLASH_FIRE - ec_word FLATTEN - ec_move1 FLATTER - ec_word FLOWERS - ec_move1 FLY - ec_pokemon1 FLYGON - ec_word FLYING - ec_move1 FOCUS_ENERGY - ec_move1 FOCUS_PUNCH - ec_word FOE - ec_move1 FOLLOW_ME - ec_word FOR - ec_word FOR_NOW - ec_word FORECAST - ec_move2 FORESIGHT - ec_word FOREVER - ec_word FORGET - ec_word FORGETS - ec_word FORGIVE - ec_pokemon2 FORRETRESS - ec_word FRIDAY - ec_word FRIEND - ec_word FROM - ec_word FRONT - ec_move2 FRUSTRATION - ec_word FUFUFU - ec_word FULL - ec_word FUNNY - ec_pokemon2 FURRET - ec_move2 FURY_ATTACK - ec_move2 FURY_CUTTER - ec_move2 FURY_SWIPES - ec_move2 FUTURE_SIGHT + .2byte EC_WORD_FABULOUS + .2byte EC_MOVE(FACADE) + .2byte EC_WORD_FAINT + .2byte EC_MOVE2(FAINT_ATTACK) + .2byte EC_WORD_FAINTED + .2byte EC_MOVE2(FAKE_OUT) + .2byte EC_MOVE(FAKE_TEARS) + .2byte EC_WORD_FALL + .2byte EC_MOVE2(FALSE_SWIPE) + .2byte EC_WORD_FAMILY + .2byte EC_WORD_FANTASTIC + .2byte EC_WORD_FAR + .2byte EC_POKEMON2(FARFETCHD) + .2byte EC_WORD_FASHION + .2byte EC_WORD_FAST + .2byte EC_WORD_FATHER + .2byte EC_WORD_FEAR + .2byte EC_POKEMON2(FEAROW) + .2byte EC_MOVE2(FEATHER_DANCE) + .2byte EC_POKEMON(FEEBAS) + .2byte EC_WORD_FEELING + .2byte EC_POKEMON2(FERALIGATR) + .2byte EC_WORD_FESTIVAL + .2byte EC_WORD_FEVER + .2byte EC_WORD_FIERY + .2byte EC_WORD_FIGHT + .2byte EC_WORD_FIGHTING + .2byte EC_WORD_FIGHTS + .2byte EC_WORD_FINAL + .2byte EC_WORD_FINALLY + .2byte EC_WORD_FINISH + .2byte EC_WORD_FIRE + .2byte EC_MOVE2(FIRE_BLAST) + .2byte EC_MOVE2(FIRE_PUNCH) + .2byte EC_MOVE2(FIRE_SPIN) + .2byte EC_WORD_FISHING + .2byte EC_MOVE(FISSURE) + .2byte EC_POKEMON2(FLAAFFY) + .2byte EC_MOVE(FLAIL) + .2byte EC_WORD_FLAME_BODY + .2byte EC_MOVE(FLAME_WHEEL) + .2byte EC_MOVE(FLAMETHROWER) + .2byte EC_POKEMON2(FLAREON) + .2byte EC_MOVE2(FLASH) + .2byte EC_WORD_FLASH_FIRE + .2byte EC_WORD_FLATTEN + .2byte EC_MOVE(FLATTER) + .2byte EC_WORD_FLOWERS + .2byte EC_MOVE(FLY) + .2byte EC_POKEMON(FLYGON) + .2byte EC_WORD_FLYING + .2byte EC_MOVE(FOCUS_ENERGY) + .2byte EC_MOVE(FOCUS_PUNCH) + .2byte EC_WORD_FOE + .2byte EC_MOVE(FOLLOW_ME) + .2byte EC_WORD_FOR + .2byte EC_WORD_FOR_NOW + .2byte EC_WORD_FORECAST + .2byte EC_MOVE2(FORESIGHT) + .2byte EC_WORD_FOREVER + .2byte EC_WORD_FORGET + .2byte EC_WORD_FORGETS + .2byte EC_WORD_FORGIVE + .2byte EC_POKEMON2(FORRETRESS) + .2byte EC_WORD_FRIDAY + .2byte EC_WORD_FRIEND + .2byte EC_WORD_FROM + .2byte EC_WORD_FRONT + .2byte EC_MOVE2(FRUSTRATION) + .2byte EC_WORD_FUFUFU + .2byte EC_WORD_FULL + .2byte EC_WORD_FUNNY + .2byte EC_POKEMON2(FURRET) + .2byte EC_MOVE2(FURY_ATTACK) + .2byte EC_MOVE2(FURY_CUTTER) + .2byte EC_MOVE2(FURY_SWIPES) + .2byte EC_MOVE2(FUTURE_SIGHT) gEasyChatWordsByLetter_G: - ec_word GAME - ec_pokemon1 GARDEVOIR - ec_pokemon2 GASTLY - ec_pokemon2 GENGAR - ec_word GENIUS - ec_duplicates 2 - ec_pokemon1 GEODUDE - ec_pokemon2 GEODUDE - ec_word GET - ec_word GETS - ec_word GHOST - ec_word GIDDY - ec_move1 GIGA_DRAIN - ec_word GIGGLE - ec_word GIMME - ec_duplicates 2 - ec_pokemon1 GIRAFARIG - ec_pokemon2 GIRAFARIG - ec_word GIRL - ec_word GIVE - ec_word GIVE_ME - ec_word GIVE_UP - ec_word GIVES - ec_pokemon1 GLALIE - ec_move2 GLARE - ec_pokemon2 GLIGAR - ec_duplicates 2 - ec_pokemon1 GLOOM - ec_pokemon2 GLOOM - ec_word GO - ec_word GO_AHEAD - ec_word GO_EASY - ec_word GO_HOME - ec_word GOES - ec_word GOING - ec_duplicates 2 - ec_pokemon1 GOLBAT - ec_pokemon2 GOLBAT - ec_duplicates 2 - ec_pokemon1 GOLDEEN - ec_pokemon2 GOLDEEN - ec_duplicates 2 - ec_pokemon1 GOLDUCK - ec_pokemon2 GOLDUCK - ec_duplicates 2 - ec_pokemon1 GOLEM - ec_pokemon2 GOLEM - ec_word GOOD - ec_word GOOD_BYE - ec_pokemon1 GOREBYSS - ec_word GOT - ec_word GOTCHA - ec_word GOURMET - ec_word GRAAAH - ec_pokemon2 GRANBULL - ec_word GRANDFATHER - ec_word GRANDMOTHER - ec_word GRASS - ec_move1 GRASS_WHISTLE - ec_duplicates 2 - ec_pokemon1 GRAVELER - ec_pokemon2 GRAVELER - ec_word GREAT - ec_duplicates 2 - ec_pokemon1 GRIMER - ec_pokemon2 GRIMER - ec_pokemon1 GROUDON - ec_word GROUND - ec_word GROUP - ec_pokemon1 GROVYLE - ec_move2 GROWL - ec_pokemon2 GROWLITHE - ec_move1 GROWTH - ec_move1 GRUDGE - ec_pokemon1 GRUMPIG - ec_word GUARD - ec_move2 GUILLOTINE - ec_pokemon1 GULPIN - ec_move1 GUST - ec_word GUTS - ec_word GUTSY - ec_word GWAH - ec_word GWAHAHAHA - ec_duplicates 2 - ec_pokemon1 GYARADOS - ec_pokemon2 GYARADOS + .2byte EC_WORD_GAME + .2byte EC_POKEMON(GARDEVOIR) + .2byte EC_POKEMON2(GASTLY) + .2byte EC_POKEMON2(GENGAR) + .2byte EC_WORD_GENIUS + ec_duplicates 2 + .2byte EC_POKEMON(GEODUDE) + .2byte EC_POKEMON2(GEODUDE) + .2byte EC_WORD_GET + .2byte EC_WORD_GETS + .2byte EC_WORD_GHOST + .2byte EC_WORD_GIDDY + .2byte EC_MOVE(GIGA_DRAIN) + .2byte EC_WORD_GIGGLE + .2byte EC_WORD_GIMME + ec_duplicates 2 + .2byte EC_POKEMON(GIRAFARIG) + .2byte EC_POKEMON2(GIRAFARIG) + .2byte EC_WORD_GIRL + .2byte EC_WORD_GIVE + .2byte EC_WORD_GIVE_ME + .2byte EC_WORD_GIVE_UP + .2byte EC_WORD_GIVES + .2byte EC_POKEMON(GLALIE) + .2byte EC_MOVE2(GLARE) + .2byte EC_POKEMON2(GLIGAR) + ec_duplicates 2 + .2byte EC_POKEMON(GLOOM) + .2byte EC_POKEMON2(GLOOM) + .2byte EC_WORD_GO + .2byte EC_WORD_GO_AHEAD + .2byte EC_WORD_GO_EASY + .2byte EC_WORD_GO_HOME + .2byte EC_WORD_GOES + .2byte EC_WORD_GOING + ec_duplicates 2 + .2byte EC_POKEMON(GOLBAT) + .2byte EC_POKEMON2(GOLBAT) + ec_duplicates 2 + .2byte EC_POKEMON(GOLDEEN) + .2byte EC_POKEMON2(GOLDEEN) + ec_duplicates 2 + .2byte EC_POKEMON(GOLDUCK) + .2byte EC_POKEMON2(GOLDUCK) + ec_duplicates 2 + .2byte EC_POKEMON(GOLEM) + .2byte EC_POKEMON2(GOLEM) + .2byte EC_WORD_GOOD + .2byte EC_WORD_GOOD_BYE + .2byte EC_POKEMON(GOREBYSS) + .2byte EC_WORD_GOT + .2byte EC_WORD_GOTCHA + .2byte EC_WORD_GOURMET + .2byte EC_WORD_GRAAAH + .2byte EC_POKEMON2(GRANBULL) + .2byte EC_WORD_GRANDFATHER + .2byte EC_WORD_GRANDMOTHER + .2byte EC_WORD_GRASS + .2byte EC_MOVE(GRASS_WHISTLE) + ec_duplicates 2 + .2byte EC_POKEMON(GRAVELER) + .2byte EC_POKEMON2(GRAVELER) + .2byte EC_WORD_GREAT + ec_duplicates 2 + .2byte EC_POKEMON(GRIMER) + .2byte EC_POKEMON2(GRIMER) + .2byte EC_POKEMON(GROUDON) + .2byte EC_WORD_GROUND + .2byte EC_WORD_GROUP + .2byte EC_POKEMON(GROVYLE) + .2byte EC_MOVE2(GROWL) + .2byte EC_POKEMON2(GROWLITHE) + .2byte EC_MOVE(GROWTH) + .2byte EC_MOVE(GRUDGE) + .2byte EC_POKEMON(GRUMPIG) + .2byte EC_WORD_GUARD + .2byte EC_MOVE2(GUILLOTINE) + .2byte EC_POKEMON(GULPIN) + .2byte EC_MOVE(GUST) + .2byte EC_WORD_GUTS + .2byte EC_WORD_GUTSY + .2byte EC_WORD_GWAH + .2byte EC_WORD_GWAHAHAHA + ec_duplicates 2 + .2byte EC_POKEMON(GYARADOS) + .2byte EC_POKEMON2(GYARADOS) gEasyChatWordsByLetter_H: - ec_word HABIT - ec_word HAH - ec_word HAHAHA - ec_move1 HAIL - ec_word HALL_OF_FAME - ec_word HAPPENING - ec_word HAPPILY - ec_word HAPPINESS - ec_word HAPPY - ec_word HARD - ec_move1 HARDEN - ec_pokemon1 HARIYAMA - ec_word HAS - ec_word HASSLE - ec_pokemon2 HAUNTER - ec_word HAVE - ec_word HAVEN_T - ec_move1 HAZE - ec_word HE - ec_word HE_S - ec_move1 HEADBUTT - ec_move1 HEAL_BELL - ec_word HEALTHY - ec_word HEAR - ec_word HEARING - ec_word HEARS - ec_word HEART - ec_move2 HEAT_WAVE - ec_word HEH - ec_word HEHE - ec_word HEHEHE - ec_word HELLO - ec_move2 HELPING_HAND - ec_word HER - ec_word HERS - ec_duplicates 2 - ec_pokemon1 HERACROSS - ec_pokemon2 HERACROSS - ec_word HERE - ec_word HERE_GOES - ec_word HERE_I_COME - ec_word HERE_IT_IS - ec_word HERO - ec_word HEROINE - ec_word HEY - ec_word HEY_THERE - ec_word HEY_QUES - ec_word HI - ec_move2 HI_JUMP_KICK - ec_word HIDDEN - ec_move2 HIDDEN_POWER - ec_word HIGH - ec_word HIGHS - ec_word HIM - ec_word HIP_AND - ec_word HIS - ec_word HIT - ec_pokemon2 HITMONCHAN - ec_pokemon2 HITMONLEE - ec_pokemon2 HITMONTOP - ec_word HIYAH - ec_word HMM - ec_pokemon2 HO_OH - ec_word HOBBY - ec_word HOHOHO - ec_word HOLIDAY - ec_word HOME - ec_word HOO_HAH - ec_pokemon2 HOOTHOOT - ec_word HOPELESS - ec_pokemon2 HOPPIP - ec_move2 HORN_ATTACK - ec_move2 HORN_DRILL - ec_duplicates 2 - ec_pokemon1 HORSEA - ec_pokemon2 HORSEA - ec_word HOT - ec_pokemon2 HOUNDOOM - ec_pokemon2 HOUNDOUR - ec_word HOW - ec_word HOW_DO - ec_word HOWEVER - ec_move2 HOWL - ec_word HUGE_POWER - ec_word HUH_QUES - ec_word HUMPH - ec_word HUNGRY - ec_pokemon1 HUNTAIL - ec_word HURRIED - ec_word HUSTLE - ec_move2 HYDRO_PUMP - ec_word HYPER - ec_move2 HYPER_BEAM - ec_word HYPER_CUTTER - ec_move2 HYPER_FANG - ec_move2 HYPER_VOICE - ec_pokemon2 HYPNO - ec_move1 HYPNOSIS + .2byte EC_WORD_HABIT + .2byte EC_WORD_HAH + .2byte EC_WORD_HAHAHA + .2byte EC_MOVE(HAIL) + .2byte EC_WORD_HALL_OF_FAME + .2byte EC_WORD_HAPPENING + .2byte EC_WORD_HAPPILY + .2byte EC_WORD_HAPPINESS + .2byte EC_WORD_HAPPY + .2byte EC_WORD_HARD + .2byte EC_MOVE(HARDEN) + .2byte EC_POKEMON(HARIYAMA) + .2byte EC_WORD_HAS + .2byte EC_WORD_HASSLE + .2byte EC_POKEMON2(HAUNTER) + .2byte EC_WORD_HAVE + .2byte EC_WORD_HAVEN_T + .2byte EC_MOVE(HAZE) + .2byte EC_WORD_HE + .2byte EC_WORD_HE_S + .2byte EC_MOVE(HEADBUTT) + .2byte EC_MOVE(HEAL_BELL) + .2byte EC_WORD_HEALTHY + .2byte EC_WORD_HEAR + .2byte EC_WORD_HEARING + .2byte EC_WORD_HEARS + .2byte EC_WORD_HEART + .2byte EC_MOVE2(HEAT_WAVE) + .2byte EC_WORD_HEH + .2byte EC_WORD_HEHE + .2byte EC_WORD_HEHEHE + .2byte EC_WORD_HELLO + .2byte EC_MOVE2(HELPING_HAND) + .2byte EC_WORD_HER + .2byte EC_WORD_HERS + ec_duplicates 2 + .2byte EC_POKEMON(HERACROSS) + .2byte EC_POKEMON2(HERACROSS) + .2byte EC_WORD_HERE + .2byte EC_WORD_HERE_GOES + .2byte EC_WORD_HERE_I_COME + .2byte EC_WORD_HERE_IT_IS + .2byte EC_WORD_HERO + .2byte EC_WORD_HEROINE + .2byte EC_WORD_HEY + .2byte EC_WORD_HEY_THERE + .2byte EC_WORD_HEY_QUES + .2byte EC_WORD_HI + .2byte EC_MOVE2(HI_JUMP_KICK) + .2byte EC_WORD_HIDDEN + .2byte EC_MOVE2(HIDDEN_POWER) + .2byte EC_WORD_HIGH + .2byte EC_WORD_HIGHS + .2byte EC_WORD_HIM + .2byte EC_WORD_HIP_AND + .2byte EC_WORD_HIS + .2byte EC_WORD_HIT + .2byte EC_POKEMON2(HITMONCHAN) + .2byte EC_POKEMON2(HITMONLEE) + .2byte EC_POKEMON2(HITMONTOP) + .2byte EC_WORD_HIYAH + .2byte EC_WORD_HMM + .2byte EC_POKEMON2(HO_OH) + .2byte EC_WORD_HOBBY + .2byte EC_WORD_HOHOHO + .2byte EC_WORD_HOLIDAY + .2byte EC_WORD_HOME + .2byte EC_WORD_HOO_HAH + .2byte EC_POKEMON2(HOOTHOOT) + .2byte EC_WORD_HOPELESS + .2byte EC_POKEMON2(HOPPIP) + .2byte EC_MOVE2(HORN_ATTACK) + .2byte EC_MOVE2(HORN_DRILL) + ec_duplicates 2 + .2byte EC_POKEMON(HORSEA) + .2byte EC_POKEMON2(HORSEA) + .2byte EC_WORD_HOT + .2byte EC_POKEMON2(HOUNDOOM) + .2byte EC_POKEMON2(HOUNDOUR) + .2byte EC_WORD_HOW + .2byte EC_WORD_HOW_DO + .2byte EC_WORD_HOWEVER + .2byte EC_MOVE2(HOWL) + .2byte EC_WORD_HUGE_POWER + .2byte EC_WORD_HUH_QUES + .2byte EC_WORD_HUMPH + .2byte EC_WORD_HUNGRY + .2byte EC_POKEMON(HUNTAIL) + .2byte EC_WORD_HURRIED + .2byte EC_WORD_HUSTLE + .2byte EC_MOVE2(HYDRO_PUMP) + .2byte EC_WORD_HYPER + .2byte EC_MOVE2(HYPER_BEAM) + .2byte EC_WORD_HYPER_CUTTER + .2byte EC_MOVE2(HYPER_FANG) + .2byte EC_MOVE2(HYPER_VOICE) + .2byte EC_POKEMON2(HYPNO) + .2byte EC_MOVE(HYPNOSIS) gEasyChatWordsByLetter_I: - ec_word I - ec_word I_AM - ec_word I_CHOOSE_YOU - ec_word I_WAS - ec_word I_VE - ec_word I_VE_ARRIVED - ec_word ICE - ec_move1 ICE_BALL - ec_move2 ICE_BEAM - ec_move2 ICE_PUNCH - ec_move1 ICY_WIND - ec_word IDOL - ec_word IF - ec_word IF_I_LOSE - ec_word IF_I_WIN - ec_duplicates 2 - ec_pokemon1 IGGLYBUFF - ec_pokemon2 IGGLYBUFF - ec_word IGNORANT - ec_word ILLUMINATE - ec_pokemon1 ILLUMISE - ec_word IMMUNITY - ec_word IMPORTANT - ec_word IMPOSSIBLE - ec_move2 IMPRISON - ec_word IN - ec_word INCREASING - ec_word INCREDIBLE - ec_word INFORMATION - ec_move2 INGRAIN - ec_word INNER_FOCUS - ec_word INSIDE - ec_word INSOMNIA - ec_word INSTEAD - ec_word INTIMIDATE - ec_word INVINCIBLE - ec_move2 IRON_DEFENSE - ec_move1 IRON_TAIL - ec_word IS - ec_word IS_IT_QUES - ec_word ISN_T - ec_word ISN_T_IT_QUES - ec_word IT - ec_word IT_S - ec_word ITEM - ec_pokemon2 IVYSAUR + .2byte EC_WORD_I + .2byte EC_WORD_I_AM + .2byte EC_WORD_I_CHOOSE_YOU + .2byte EC_WORD_I_WAS + .2byte EC_WORD_I_VE + .2byte EC_WORD_I_VE_ARRIVED + .2byte EC_WORD_ICE + .2byte EC_MOVE(ICE_BALL) + .2byte EC_MOVE2(ICE_BEAM) + .2byte EC_MOVE2(ICE_PUNCH) + .2byte EC_MOVE(ICY_WIND) + .2byte EC_WORD_IDOL + .2byte EC_WORD_IF + .2byte EC_WORD_IF_I_LOSE + .2byte EC_WORD_IF_I_WIN + ec_duplicates 2 + .2byte EC_POKEMON(IGGLYBUFF) + .2byte EC_POKEMON2(IGGLYBUFF) + .2byte EC_WORD_IGNORANT + .2byte EC_WORD_ILLUMINATE + .2byte EC_POKEMON(ILLUMISE) + .2byte EC_WORD_IMMUNITY + .2byte EC_WORD_IMPORTANT + .2byte EC_WORD_IMPOSSIBLE + .2byte EC_MOVE2(IMPRISON) + .2byte EC_WORD_IN + .2byte EC_WORD_INCREASING + .2byte EC_WORD_INCREDIBLE + .2byte EC_WORD_INFORMATION + .2byte EC_MOVE2(INGRAIN) + .2byte EC_WORD_INNER_FOCUS + .2byte EC_WORD_INSIDE + .2byte EC_WORD_INSOMNIA + .2byte EC_WORD_INSTEAD + .2byte EC_WORD_INTIMIDATE + .2byte EC_WORD_INVINCIBLE + .2byte EC_MOVE2(IRON_DEFENSE) + .2byte EC_MOVE(IRON_TAIL) + .2byte EC_WORD_IS + .2byte EC_WORD_IS_IT_QUES + .2byte EC_WORD_ISN_T + .2byte EC_WORD_ISN_T_IT_QUES + .2byte EC_WORD_IT + .2byte EC_WORD_IT_S + .2byte EC_WORD_ITEM + .2byte EC_POKEMON2(IVYSAUR) gEasyChatWordsByLetter_J: ec_duplicates 2 - ec_pokemon1 JIGGLYPUFF - ec_pokemon2 JIGGLYPUFF - ec_pokemon1 JIRACHI - ec_word JOKING - ec_pokemon2 JOLTEON - ec_word JOY - ec_word JUDGE - ec_move2 JUMP_KICK - ec_pokemon2 JUMPLUFF - ec_word JUST - ec_pokemon2 JYNX + .2byte EC_POKEMON(JIGGLYPUFF) + .2byte EC_POKEMON2(JIGGLYPUFF) + .2byte EC_POKEMON(JIRACHI) + .2byte EC_WORD_JOKING + .2byte EC_POKEMON2(JOLTEON) + .2byte EC_WORD_JOY + .2byte EC_WORD_JUDGE + .2byte EC_MOVE2(JUMP_KICK) + .2byte EC_POKEMON2(JUMPLUFF) + .2byte EC_WORD_JUST + .2byte EC_POKEMON2(JYNX) gEasyChatWordsByLetter_K: - ec_pokemon2 KABUTO - ec_pokemon2 KABUTOPS - ec_duplicates 2 - ec_pokemon1 KADABRA - ec_pokemon2 KADABRA - ec_pokemon2 KAKUNA - ec_pokemon2 KANGASKHAN - ec_move1 KARATE_CHOP - ec_pokemon1 KECLEON - ec_word KEEN_EYE - ec_word KID - ec_word KIDDING - ec_word KIND - ec_word KINDERGARTEN - ec_move1 KINESIS - ec_duplicates 2 - ec_pokemon1 KINGDRA - ec_pokemon2 KINGDRA - ec_pokemon2 KINGLER - ec_pokemon1 KIRLIA - ec_move2 KNOCK_OFF - ec_word KNOCKOUT - ec_word KNOW - ec_word KNOWS - ec_duplicates 2 - ec_pokemon1 KOFFING - ec_pokemon2 KOFFING - ec_pokemon2 KRABBY - ec_word KTHX_BYE - ec_pokemon1 KYOGRE + .2byte EC_POKEMON2(KABUTO) + .2byte EC_POKEMON2(KABUTOPS) + ec_duplicates 2 + .2byte EC_POKEMON(KADABRA) + .2byte EC_POKEMON2(KADABRA) + .2byte EC_POKEMON2(KAKUNA) + .2byte EC_POKEMON2(KANGASKHAN) + .2byte EC_MOVE(KARATE_CHOP) + .2byte EC_POKEMON(KECLEON) + .2byte EC_WORD_KEEN_EYE + .2byte EC_WORD_KID + .2byte EC_WORD_KIDDING + .2byte EC_WORD_KIND + .2byte EC_WORD_KINDERGARTEN + .2byte EC_MOVE(KINESIS) + ec_duplicates 2 + .2byte EC_POKEMON(KINGDRA) + .2byte EC_POKEMON2(KINGDRA) + .2byte EC_POKEMON2(KINGLER) + .2byte EC_POKEMON(KIRLIA) + .2byte EC_MOVE2(KNOCK_OFF) + .2byte EC_WORD_KNOCKOUT + .2byte EC_WORD_KNOW + .2byte EC_WORD_KNOWS + ec_duplicates 2 + .2byte EC_POKEMON(KOFFING) + .2byte EC_POKEMON2(KOFFING) + .2byte EC_POKEMON2(KRABBY) + .2byte EC_WORD_KTHX_BYE + .2byte EC_POKEMON(KYOGRE) gEasyChatWordsByLetter_L: - ec_word LACKING - ec_word LACKS - ec_word LADY - ec_pokemon1 LAIRON - ec_word LALALA - ec_duplicates 2 - ec_pokemon1 LANTURN - ec_pokemon2 LANTURN - ec_pokemon2 LAPRAS - ec_pokemon2 LARVITAR - ec_word LAST - ec_word LATE - ec_word LATER - ec_pokemon1 LATIAS - ec_pokemon1 LATIOS - ec_word LAVISH - ec_word LAY - ec_word LEADER - ec_word LEADERS - ec_move2 LEAF_BLADE - ec_word LEARN - ec_pokemon2 LEDIAN - ec_pokemon2 LEDYBA - ec_move1 LEECH_LIFE - ec_move2 LEECH_SEED - ec_move2 LEER - ec_word LEFT - ec_word LEGEND - ec_word LESS - ec_word LESSONS - ec_word LET_ME_WIN - ec_word LET_S - ec_word LETTER - ec_word LEVEL - ec_word LEVITATE - ec_move1 LICK - ec_pokemon2 LICKITUNG - ec_word LIE - ec_word LIFE - ec_move2 LIGHT_SCREEN - ec_word LIGHTNINGROD - ec_word LIKE - ec_word LIKELY_TO - ec_word LIKES - ec_pokemon1 LILEEP - ec_word LIMBER - ec_word LINK - ec_pokemon1 LINOONE - ec_word LIQUID_OOZE - ec_word LISTEN - ec_word LISTENING - ec_word LISTENS - ec_word LIVING - ec_move2 LOCK_ON - ec_word LOCOMOTIVE - ec_word LOL - ec_word LOLLING - ec_pokemon1 LOMBRE - ec_word LONESOME - ec_word LOOK - ec_word LOOKS - ec_word LOSE - ec_word LOSER - ec_word LOSING - ec_word LOSS - ec_word LOST - ec_pokemon1 LOTAD - ec_pokemon1 LOUDRED - ec_word LOUSY - ec_move1 LOVELY_KISS - ec_word LOVEY_DOVEY - ec_word LOW - ec_move1 LOW_KICK - ec_word LOWS - ec_pokemon1 LUDICOLO - ec_pokemon2 LUGIA - ec_word LUKEWARM - ec_pokemon1 LUNATONE - ec_move2 LUSTER_PURGE - ec_pokemon1 LUVDISC + .2byte EC_WORD_LACKING + .2byte EC_WORD_LACKS + .2byte EC_WORD_LADY + .2byte EC_POKEMON(LAIRON) + .2byte EC_WORD_LALALA + ec_duplicates 2 + .2byte EC_POKEMON(LANTURN) + .2byte EC_POKEMON2(LANTURN) + .2byte EC_POKEMON2(LAPRAS) + .2byte EC_POKEMON2(LARVITAR) + .2byte EC_WORD_LAST + .2byte EC_WORD_LATE + .2byte EC_WORD_LATER + .2byte EC_POKEMON(LATIAS) + .2byte EC_POKEMON(LATIOS) + .2byte EC_WORD_LAVISH + .2byte EC_WORD_LAY + .2byte EC_WORD_LEADER + .2byte EC_WORD_LEADERS + .2byte EC_MOVE2(LEAF_BLADE) + .2byte EC_WORD_LEARN + .2byte EC_POKEMON2(LEDIAN) + .2byte EC_POKEMON2(LEDYBA) + .2byte EC_MOVE(LEECH_LIFE) + .2byte EC_MOVE2(LEECH_SEED) + .2byte EC_MOVE2(LEER) + .2byte EC_WORD_LEFT + .2byte EC_WORD_LEGEND + .2byte EC_WORD_LESS + .2byte EC_WORD_LESSONS + .2byte EC_WORD_LET_ME_WIN + .2byte EC_WORD_LET_S + .2byte EC_WORD_LETTER + .2byte EC_WORD_LEVEL + .2byte EC_WORD_LEVITATE + .2byte EC_MOVE(LICK) + .2byte EC_POKEMON2(LICKITUNG) + .2byte EC_WORD_LIE + .2byte EC_WORD_LIFE + .2byte EC_MOVE2(LIGHT_SCREEN) + .2byte EC_WORD_LIGHTNINGROD + .2byte EC_WORD_LIKE + .2byte EC_WORD_LIKELY_TO + .2byte EC_WORD_LIKES + .2byte EC_POKEMON(LILEEP) + .2byte EC_WORD_LIMBER + .2byte EC_WORD_LINK + .2byte EC_POKEMON(LINOONE) + .2byte EC_WORD_LIQUID_OOZE + .2byte EC_WORD_LISTEN + .2byte EC_WORD_LISTENING + .2byte EC_WORD_LISTENS + .2byte EC_WORD_LIVING + .2byte EC_MOVE2(LOCK_ON) + .2byte EC_WORD_LOCOMOTIVE + .2byte EC_WORD_LOL + .2byte EC_WORD_LOLLING + .2byte EC_POKEMON(LOMBRE) + .2byte EC_WORD_LONESOME + .2byte EC_WORD_LOOK + .2byte EC_WORD_LOOKS + .2byte EC_WORD_LOSE + .2byte EC_WORD_LOSER + .2byte EC_WORD_LOSING + .2byte EC_WORD_LOSS + .2byte EC_WORD_LOST + .2byte EC_POKEMON(LOTAD) + .2byte EC_POKEMON(LOUDRED) + .2byte EC_WORD_LOUSY + .2byte EC_MOVE(LOVELY_KISS) + .2byte EC_WORD_LOVEY_DOVEY + .2byte EC_WORD_LOW + .2byte EC_MOVE(LOW_KICK) + .2byte EC_WORD_LOWS + .2byte EC_POKEMON(LUDICOLO) + .2byte EC_POKEMON2(LUGIA) + .2byte EC_WORD_LUKEWARM + .2byte EC_POKEMON(LUNATONE) + .2byte EC_MOVE2(LUSTER_PURGE) + .2byte EC_POKEMON(LUVDISC) gEasyChatWordsByLetter_M: - ec_move2 MACH_PUNCH - ec_duplicates 2 - ec_pokemon1 MACHAMP - ec_pokemon2 MACHAMP - ec_word MACHINE - ec_duplicates 2 - ec_pokemon1 MACHOKE - ec_pokemon2 MACHOKE - ec_duplicates 2 - ec_pokemon1 MACHOP - ec_pokemon2 MACHOP - ec_word MAGAZINE - ec_pokemon2 MAGBY - ec_duplicates 2 - ec_pokemon1 MAGCARGO - ec_pokemon2 MAGCARGO - ec_move2 MAGIC_COAT - ec_move2 MAGICAL_LEAF - ec_duplicates 2 - ec_pokemon1 MAGIKARP - ec_pokemon2 MAGIKARP - ec_word MAGMA_ARMOR - ec_pokemon2 MAGMAR - ec_duplicates 2 - ec_pokemon1 MAGNEMITE - ec_pokemon2 MAGNEMITE - ec_word MAGNET_PULL - ec_duplicates 2 - ec_pokemon1 MAGNETON - ec_pokemon2 MAGNETON - ec_move2 MAGNITUDE - ec_word MAIL - ec_word MAKE - ec_word MAKING - ec_pokemon1 MAKUHITA - ec_word MAN - ec_pokemon1 MANECTRIC - ec_pokemon2 MANKEY - ec_pokemon2 MANTINE - ec_pokemon2 MAREEP - ec_duplicates 2 - ec_pokemon1 MARILL - ec_pokemon2 MARILL - ec_pokemon2 MAROWAK - ec_pokemon1 MARSHTOMP - ec_word MARVEL_SCALE - ec_pokemon1 MASQUERAIN - ec_word MASTER - ec_word MATCH - ec_word MATCH_UP - ec_pokemon1 MAWILE - ec_word MAYBE - ec_word MC - ec_word ME - ec_word MEAN - ec_move1 MEAN_LOOK - ec_pokemon1 MEDICHAM - ec_move2 MEDITATE - ec_pokemon1 MEDITITE - ec_word MEET - ec_word MEET_YOU - ec_word MEETS - ec_word MEGA - ec_move2 MEGA_DRAIN - ec_move2 MEGA_KICK - ec_move2 MEGA_PUNCH - ec_move2 MEGAHORN - ec_pokemon2 MEGANIUM - ec_move1 MEMENTO - ec_pokemon2 MEOWTH - ec_word MESSAGE - ec_pokemon1 METAGROSS - ec_move2 METAL_CLAW - ec_move1 METAL_SOUND - ec_pokemon1 METANG - ec_pokemon2 METAPOD - ec_move1 METEOR_MASH - ec_move2 METRONOME - ec_pokemon2 MEW - ec_pokemon2 MEWTWO - ec_pokemon1 MIGHTYENA - ec_move2 MILK_DRINK - ec_pokemon1 MILOTIC - ec_pokemon2 MILTANK - ec_move2 MIMIC - ec_move1 MIND_READER - ec_move2 MINIMIZE - ec_pokemon1 MINUN - ec_word MINUS - ec_move2 MIRROR_COAT - ec_move1 MIRROR_MOVE - ec_pokemon2 MISDREAVUS - ec_word MISHEARD - ec_word MISS - ec_move1 MIST - ec_move2 MIST_BALL - ec_word MISTAKE - ec_word MMM - ec_word MODE - ec_word MODERN - ec_pokemon2 MOLTRES - ec_word MOMENTUM - ec_word MONDAY - ec_word MONEY - ec_word MONTH - ec_word MOOD - ec_move2 MOONLIGHT - ec_word MORE - ec_word MORNING - ec_move1 MORNING_SUN - ec_word MOTHER - ec_word MOVE - ec_word MOVIE - ec_word MR - ec_pokemon2 MR_MIME - ec_word MRS - ec_word MUCH - ec_word MUCH_OBLIGED - ec_move2 MUD_SHOT - ec_move2 MUD_SPORT - ec_move2 MUD_SLAP - ec_move2 MUDDY_WATER - ec_pokemon1 MUDKIP - ec_word MUFUFU - ec_duplicates 2 - ec_pokemon1 MUK - ec_pokemon2 MUK - ec_pokemon2 MURKROW - ec_word MUSIC - ec_word MUST_BE - ec_word MY - ec_word MYSELF - ec_word MYSTERY + .2byte EC_MOVE2(MACH_PUNCH) + ec_duplicates 2 + .2byte EC_POKEMON(MACHAMP) + .2byte EC_POKEMON2(MACHAMP) + .2byte EC_WORD_MACHINE + ec_duplicates 2 + .2byte EC_POKEMON(MACHOKE) + .2byte EC_POKEMON2(MACHOKE) + ec_duplicates 2 + .2byte EC_POKEMON(MACHOP) + .2byte EC_POKEMON2(MACHOP) + .2byte EC_WORD_MAGAZINE + .2byte EC_POKEMON2(MAGBY) + ec_duplicates 2 + .2byte EC_POKEMON(MAGCARGO) + .2byte EC_POKEMON2(MAGCARGO) + .2byte EC_MOVE2(MAGIC_COAT) + .2byte EC_MOVE2(MAGICAL_LEAF) + ec_duplicates 2 + .2byte EC_POKEMON(MAGIKARP) + .2byte EC_POKEMON2(MAGIKARP) + .2byte EC_WORD_MAGMA_ARMOR + .2byte EC_POKEMON2(MAGMAR) + ec_duplicates 2 + .2byte EC_POKEMON(MAGNEMITE) + .2byte EC_POKEMON2(MAGNEMITE) + .2byte EC_WORD_MAGNET_PULL + ec_duplicates 2 + .2byte EC_POKEMON(MAGNETON) + .2byte EC_POKEMON2(MAGNETON) + .2byte EC_MOVE2(MAGNITUDE) + .2byte EC_WORD_MAIL + .2byte EC_WORD_MAKE + .2byte EC_WORD_MAKING + .2byte EC_POKEMON(MAKUHITA) + .2byte EC_WORD_MAN + .2byte EC_POKEMON(MANECTRIC) + .2byte EC_POKEMON2(MANKEY) + .2byte EC_POKEMON2(MANTINE) + .2byte EC_POKEMON2(MAREEP) + ec_duplicates 2 + .2byte EC_POKEMON(MARILL) + .2byte EC_POKEMON2(MARILL) + .2byte EC_POKEMON2(MAROWAK) + .2byte EC_POKEMON(MARSHTOMP) + .2byte EC_WORD_MARVEL_SCALE + .2byte EC_POKEMON(MASQUERAIN) + .2byte EC_WORD_MASTER + .2byte EC_WORD_MATCH + .2byte EC_WORD_MATCH_UP + .2byte EC_POKEMON(MAWILE) + .2byte EC_WORD_MAYBE + .2byte EC_WORD_MC + .2byte EC_WORD_ME + .2byte EC_WORD_MEAN + .2byte EC_MOVE(MEAN_LOOK) + .2byte EC_POKEMON(MEDICHAM) + .2byte EC_MOVE2(MEDITATE) + .2byte EC_POKEMON(MEDITITE) + .2byte EC_WORD_MEET + .2byte EC_WORD_MEET_YOU + .2byte EC_WORD_MEETS + .2byte EC_WORD_MEGA + .2byte EC_MOVE2(MEGA_DRAIN) + .2byte EC_MOVE2(MEGA_KICK) + .2byte EC_MOVE2(MEGA_PUNCH) + .2byte EC_MOVE2(MEGAHORN) + .2byte EC_POKEMON2(MEGANIUM) + .2byte EC_MOVE(MEMENTO) + .2byte EC_POKEMON2(MEOWTH) + .2byte EC_WORD_MESSAGE + .2byte EC_POKEMON(METAGROSS) + .2byte EC_MOVE2(METAL_CLAW) + .2byte EC_MOVE(METAL_SOUND) + .2byte EC_POKEMON(METANG) + .2byte EC_POKEMON2(METAPOD) + .2byte EC_MOVE(METEOR_MASH) + .2byte EC_MOVE2(METRONOME) + .2byte EC_POKEMON2(MEW) + .2byte EC_POKEMON2(MEWTWO) + .2byte EC_POKEMON(MIGHTYENA) + .2byte EC_MOVE2(MILK_DRINK) + .2byte EC_POKEMON(MILOTIC) + .2byte EC_POKEMON2(MILTANK) + .2byte EC_MOVE2(MIMIC) + .2byte EC_MOVE(MIND_READER) + .2byte EC_MOVE2(MINIMIZE) + .2byte EC_POKEMON(MINUN) + .2byte EC_WORD_MINUS + .2byte EC_MOVE2(MIRROR_COAT) + .2byte EC_MOVE(MIRROR_MOVE) + .2byte EC_POKEMON2(MISDREAVUS) + .2byte EC_WORD_MISHEARD + .2byte EC_WORD_MISS + .2byte EC_MOVE(MIST) + .2byte EC_MOVE2(MIST_BALL) + .2byte EC_WORD_MISTAKE + .2byte EC_WORD_MMM + .2byte EC_WORD_MODE + .2byte EC_WORD_MODERN + .2byte EC_POKEMON2(MOLTRES) + .2byte EC_WORD_MOMENTUM + .2byte EC_WORD_MONDAY + .2byte EC_WORD_MONEY + .2byte EC_WORD_MONTH + .2byte EC_WORD_MOOD + .2byte EC_MOVE2(MOONLIGHT) + .2byte EC_WORD_MORE + .2byte EC_WORD_MORNING + .2byte EC_MOVE(MORNING_SUN) + .2byte EC_WORD_MOTHER + .2byte EC_WORD_MOVE + .2byte EC_WORD_MOVIE + .2byte EC_WORD_MR + .2byte EC_POKEMON2(MR_MIME) + .2byte EC_WORD_MRS + .2byte EC_WORD_MUCH + .2byte EC_WORD_MUCH_OBLIGED + .2byte EC_MOVE2(MUD_SHOT) + .2byte EC_MOVE2(MUD_SPORT) + .2byte EC_MOVE2(MUD_SLAP) + .2byte EC_MOVE2(MUDDY_WATER) + .2byte EC_POKEMON(MUDKIP) + .2byte EC_WORD_MUFUFU + ec_duplicates 2 + .2byte EC_POKEMON(MUK) + .2byte EC_POKEMON2(MUK) + .2byte EC_POKEMON2(MURKROW) + .2byte EC_WORD_MUSIC + .2byte EC_WORD_MUST_BE + .2byte EC_WORD_MY + .2byte EC_WORD_MYSELF + .2byte EC_WORD_MYSTERY gEasyChatWordsByLetter_N: - ec_word NAME - ec_word NAP - ec_duplicates 2 - ec_pokemon1 NATU - ec_pokemon2 NATU - ec_word NATURAL - ec_word NATURAL_CURE - ec_word NATURALLY - ec_word NATURE - ec_move1 NATURE_POWER - ec_word NEAR - ec_word NEARLY - ec_word NEED - ec_move2 NEEDLE_ARM - ec_word NEGATIVE - ec_word NEVER - ec_word NEW - ec_word NEWS - ec_word NEXT - ec_word NICE - ec_pokemon2 NIDOKING - ec_pokemon2 NIDOQUEEN - ec_pokemon2 NIDORAN_F - ec_pokemon2 NIDORAN_M - ec_pokemon2 NIDORINA - ec_pokemon2 NIDORINO - ec_word NIGHT - ec_move2 NIGHT_SHADE - ec_move1 NIGHTMARE - ec_word NIGHTTIME - ec_pokemon1 NINCADA - ec_duplicates 2 - ec_pokemon1 NINETALES - ec_pokemon2 NINETALES - ec_pokemon1 NINJASK - ec_word NITWIT - ec_word NO - ec_word NO_MATCH - ec_word NO_1 - ec_pokemon2 NOCTOWL - ec_word NOISY - ec_word NON_STOP - ec_word NONE - ec_word NOPE - ec_word NORMAL - ec_pokemon1 NOSEPASS - ec_word NOT - ec_word NOT_VERY - ec_word NOTHING - ec_word NOW - ec_pokemon1 NUMEL - ec_pokemon1 NUZLEAF + .2byte EC_WORD_NAME + .2byte EC_WORD_NAP + ec_duplicates 2 + .2byte EC_POKEMON(NATU) + .2byte EC_POKEMON2(NATU) + .2byte EC_WORD_NATURAL + .2byte EC_WORD_NATURAL_CURE + .2byte EC_WORD_NATURALLY + .2byte EC_WORD_NATURE + .2byte EC_MOVE(NATURE_POWER) + .2byte EC_WORD_NEAR + .2byte EC_WORD_NEARLY + .2byte EC_WORD_NEED + .2byte EC_MOVE2(NEEDLE_ARM) + .2byte EC_WORD_NEGATIVE + .2byte EC_WORD_NEVER + .2byte EC_WORD_NEW + .2byte EC_WORD_NEWS + .2byte EC_WORD_NEXT + .2byte EC_WORD_NICE + .2byte EC_POKEMON2(NIDOKING) + .2byte EC_POKEMON2(NIDOQUEEN) + .2byte EC_POKEMON2(NIDORAN_F) + .2byte EC_POKEMON2(NIDORAN_M) + .2byte EC_POKEMON2(NIDORINA) + .2byte EC_POKEMON2(NIDORINO) + .2byte EC_WORD_NIGHT + .2byte EC_MOVE2(NIGHT_SHADE) + .2byte EC_MOVE(NIGHTMARE) + .2byte EC_WORD_NIGHTTIME + .2byte EC_POKEMON(NINCADA) + ec_duplicates 2 + .2byte EC_POKEMON(NINETALES) + .2byte EC_POKEMON2(NINETALES) + .2byte EC_POKEMON(NINJASK) + .2byte EC_WORD_NITWIT + .2byte EC_WORD_NO + .2byte EC_WORD_NO_MATCH + .2byte EC_WORD_NO_1 + .2byte EC_POKEMON2(NOCTOWL) + .2byte EC_WORD_NOISY + .2byte EC_WORD_NON_STOP + .2byte EC_WORD_NONE + .2byte EC_WORD_NOPE + .2byte EC_WORD_NORMAL + .2byte EC_POKEMON(NOSEPASS) + .2byte EC_WORD_NOT + .2byte EC_WORD_NOT_VERY + .2byte EC_WORD_NOTHING + .2byte EC_WORD_NOW + .2byte EC_POKEMON(NUMEL) + .2byte EC_POKEMON(NUZLEAF) gEasyChatWordsByLetter_O: - ec_word OBLIVIOUS - ec_move1 OCTAZOOKA - ec_pokemon2 OCTILLERY - ec_duplicates 2 - ec_pokemon1 ODDISH - ec_pokemon2 ODDISH - ec_move1 ODOR_SLEUTH - ec_word OF - ec_word OFF - ec_word OFFENSIVE - ec_word OH - ec_word OH_DEAR - ec_word OH_YEAH - ec_word OH_KAY - ec_word OH_QUES - ec_word OI - ec_word OI_OI_OI - ec_word OK_QUES - ec_word OKAY - ec_word OLD - ec_word OLDEN - ec_pokemon2 OMANYTE - ec_pokemon2 OMASTAR - ec_word ON - ec_word ONCE - ec_pokemon2 ONIX - ec_word ONLY - ec_word OOPS - ec_word OPPONENT - ec_word OPPOSITE - ec_word OR - ec_word OTHER - ec_word OUR - ec_word OUT - ec_move1 OUTRAGE - ec_word OUTSIDE - ec_word OVER - ec_word OVERDO - ec_word OVERGROW - ec_move1 OVERHEAT - ec_word OVERWHELMING - ec_word OWN - ec_word OWN_TEMPO + .2byte EC_WORD_OBLIVIOUS + .2byte EC_MOVE(OCTAZOOKA) + .2byte EC_POKEMON2(OCTILLERY) + ec_duplicates 2 + .2byte EC_POKEMON(ODDISH) + .2byte EC_POKEMON2(ODDISH) + .2byte EC_MOVE(ODOR_SLEUTH) + .2byte EC_WORD_OF + .2byte EC_WORD_OFF + .2byte EC_WORD_OFFENSIVE + .2byte EC_WORD_OH + .2byte EC_WORD_OH_DEAR + .2byte EC_WORD_OH_YEAH + .2byte EC_WORD_OH_KAY + .2byte EC_WORD_OH_QUES + .2byte EC_WORD_OI + .2byte EC_WORD_OI_OI_OI + .2byte EC_WORD_OK_QUES + .2byte EC_WORD_OKAY + .2byte EC_WORD_OLD + .2byte EC_WORD_OLDEN + .2byte EC_POKEMON2(OMANYTE) + .2byte EC_POKEMON2(OMASTAR) + .2byte EC_WORD_ON + .2byte EC_WORD_ONCE + .2byte EC_POKEMON2(ONIX) + .2byte EC_WORD_ONLY + .2byte EC_WORD_OOPS + .2byte EC_WORD_OPPONENT + .2byte EC_WORD_OPPOSITE + .2byte EC_WORD_OR + .2byte EC_WORD_OTHER + .2byte EC_WORD_OUR + .2byte EC_WORD_OUT + .2byte EC_MOVE(OUTRAGE) + .2byte EC_WORD_OUTSIDE + .2byte EC_WORD_OVER + .2byte EC_WORD_OVERDO + .2byte EC_WORD_OVERGROW + .2byte EC_MOVE(OVERHEAT) + .2byte EC_WORD_OVERWHELMING + .2byte EC_WORD_OWN + .2byte EC_WORD_OWN_TEMPO gEasyChatWordsByLetter_P: - ec_move1 PAIN_SPLIT - ec_pokemon2 PARAS - ec_pokemon2 PARASECT - ec_word PARDON - ec_word PARENT - ec_word PARTNER - ec_word PARTY - ec_word PATTERN - ec_move2 PAY_DAY - ec_word PC - ec_move2 PECK - ec_pokemon1 PELIPPER - ec_word PERFECT - ec_word PERFECTION - ec_move2 PERISH_SONG - ec_pokemon2 PERSIAN - ec_word PERSON - ec_move2 PETAL_DANCE - ec_duplicates 2 - ec_pokemon1 PHANPY - ec_pokemon2 PHANPY - ec_word PHONE - ec_duplicates 2 - ec_pokemon1 PICHU - ec_pokemon2 PICHU - ec_word PICKUP - ec_pokemon2 PIDGEOT - ec_pokemon2 PIDGEOTTO - ec_pokemon2 PIDGEY - ec_duplicates 2 - ec_pokemon1 PIKACHU - ec_pokemon2 PIKACHU - ec_pokemon2 PILOSWINE - ec_move2 PIN_MISSILE - ec_pokemon2 PINECO - ec_duplicates 2 - ec_pokemon1 PINSIR - ec_pokemon2 PINSIR - ec_word PKRS - ec_word PLACE - ec_word PLANS - ec_word PLAY - ec_word PLAYED - ec_word PLAYS - ec_word PLEASE - ec_word PLUS - ec_word PLUSH_DOLL - ec_pokemon1 PLUSLE - ec_word POINTS - ec_word POISON - ec_move2 POISON_FANG - ec_move2 POISON_GAS - ec_word POISON_POINT - ec_move2 POISON_STING - ec_move2 POISON_TAIL - ec_move2 POISON_POWDER - ec_word POKEBLOCK - ec_word POKEDEX - ec_word POKEMON - ec_word POKENAV - ec_pokemon2 POLITOED - ec_pokemon2 POLIWAG - ec_pokemon2 POLIWHIRL - ec_pokemon2 POLIWRATH - ec_pokemon2 PONYTA - ec_pokemon1 POOCHYENA - ec_word POPULAR - ec_pokemon2 PORYGON - ec_pokemon2 PORYGON2 - ec_move2 POUND - ec_move1 POWDER_SNOW - ec_word POWER - ec_word PRAISE - ec_word PREPOSTEROUS - ec_move2 PRESENT - ec_word PRESSURE - ec_word PRETEND - ec_word PRETTY - ec_pokemon2 PRIMEAPE - ec_word PROBABLY - ec_word PROMISE - ec_move2 PROTECT - ec_move1 PSYBEAM - ec_move1 PSYCH_UP - ec_duplicates 2 - ec_word PSYCHIC - ec_move1 PSYCHIC - ec_duplicates 2 - ec_pokemon1 PSYDUCK - ec_pokemon2 PSYDUCK - ec_move1 PSYWAVE - ec_pokemon2 PUPITAR - ec_word PURE_POWER - ec_move1 PURSUIT - ec_word PUSHOVER + .2byte EC_MOVE(PAIN_SPLIT) + .2byte EC_POKEMON2(PARAS) + .2byte EC_POKEMON2(PARASECT) + .2byte EC_WORD_PARDON + .2byte EC_WORD_PARENT + .2byte EC_WORD_PARTNER + .2byte EC_WORD_PARTY + .2byte EC_WORD_PATTERN + .2byte EC_MOVE2(PAY_DAY) + .2byte EC_WORD_PC + .2byte EC_MOVE2(PECK) + .2byte EC_POKEMON(PELIPPER) + .2byte EC_WORD_PERFECT + .2byte EC_WORD_PERFECTION + .2byte EC_MOVE2(PERISH_SONG) + .2byte EC_POKEMON2(PERSIAN) + .2byte EC_WORD_PERSON + .2byte EC_MOVE2(PETAL_DANCE) + ec_duplicates 2 + .2byte EC_POKEMON(PHANPY) + .2byte EC_POKEMON2(PHANPY) + .2byte EC_WORD_PHONE + ec_duplicates 2 + .2byte EC_POKEMON(PICHU) + .2byte EC_POKEMON2(PICHU) + .2byte EC_WORD_PICKUP + .2byte EC_POKEMON2(PIDGEOT) + .2byte EC_POKEMON2(PIDGEOTTO) + .2byte EC_POKEMON2(PIDGEY) + ec_duplicates 2 + .2byte EC_POKEMON(PIKACHU) + .2byte EC_POKEMON2(PIKACHU) + .2byte EC_POKEMON2(PILOSWINE) + .2byte EC_MOVE2(PIN_MISSILE) + .2byte EC_POKEMON2(PINECO) + ec_duplicates 2 + .2byte EC_POKEMON(PINSIR) + .2byte EC_POKEMON2(PINSIR) + .2byte EC_WORD_PKRS + .2byte EC_WORD_PLACE + .2byte EC_WORD_PLANS + .2byte EC_WORD_PLAY + .2byte EC_WORD_PLAYED + .2byte EC_WORD_PLAYS + .2byte EC_WORD_PLEASE + .2byte EC_WORD_PLUS + .2byte EC_WORD_PLUSH_DOLL + .2byte EC_POKEMON(PLUSLE) + .2byte EC_WORD_POINTS + .2byte EC_WORD_POISON + .2byte EC_MOVE2(POISON_FANG) + .2byte EC_MOVE2(POISON_GAS) + .2byte EC_WORD_POISON_POINT + .2byte EC_MOVE2(POISON_STING) + .2byte EC_MOVE2(POISON_TAIL) + .2byte EC_MOVE2(POISON_POWDER) + .2byte EC_WORD_POKEBLOCK + .2byte EC_WORD_POKEDEX + .2byte EC_WORD_POKEMON + .2byte EC_WORD_POKENAV + .2byte EC_POKEMON2(POLITOED) + .2byte EC_POKEMON2(POLIWAG) + .2byte EC_POKEMON2(POLIWHIRL) + .2byte EC_POKEMON2(POLIWRATH) + .2byte EC_POKEMON2(PONYTA) + .2byte EC_POKEMON(POOCHYENA) + .2byte EC_WORD_POPULAR + .2byte EC_POKEMON2(PORYGON) + .2byte EC_POKEMON2(PORYGON2) + .2byte EC_MOVE2(POUND) + .2byte EC_MOVE(POWDER_SNOW) + .2byte EC_WORD_POWER + .2byte EC_WORD_PRAISE + .2byte EC_WORD_PREPOSTEROUS + .2byte EC_MOVE2(PRESENT) + .2byte EC_WORD_PRESSURE + .2byte EC_WORD_PRETEND + .2byte EC_WORD_PRETTY + .2byte EC_POKEMON2(PRIMEAPE) + .2byte EC_WORD_PROBABLY + .2byte EC_WORD_PROMISE + .2byte EC_MOVE2(PROTECT) + .2byte EC_MOVE(PSYBEAM) + .2byte EC_MOVE(PSYCH_UP) + ec_duplicates 2 + .2byte EC_WORD_PSYCHIC + .2byte EC_MOVE(PSYCHIC) + ec_duplicates 2 + .2byte EC_POKEMON(PSYDUCK) + .2byte EC_POKEMON2(PSYDUCK) + .2byte EC_MOVE(PSYWAVE) + .2byte EC_POKEMON2(PUPITAR) + .2byte EC_WORD_PURE_POWER + .2byte EC_MOVE(PURSUIT) + .2byte EC_WORD_PUSHOVER gEasyChatWordsByLetter_Q: - ec_pokemon2 QUAGSIRE - ec_word QUESTION - ec_move2 QUICK_ATTACK - ec_pokemon2 QUILAVA - ec_word QUITE - ec_pokemon2 QWILFISH + .2byte EC_POKEMON2(QUAGSIRE) + .2byte EC_WORD_QUESTION + .2byte EC_MOVE2(QUICK_ATTACK) + .2byte EC_POKEMON2(QUILAVA) + .2byte EC_WORD_QUITE + .2byte EC_POKEMON2(QWILFISH) gEasyChatWordsByLetter_R: - ec_word RADIO - ec_move1 RAGE - ec_duplicates 2 - ec_pokemon1 RAICHU - ec_pokemon2 RAICHU - ec_pokemon2 RAIKOU - ec_move1 RAIN_DANCE - ec_word RAIN_DISH - ec_pokemon1 RALTS - ec_word RANK - ec_move1 RAPID_SPIN - ec_pokemon2 RAPIDASH - ec_word RARE - ec_word RATHER - ec_pokemon2 RATICATE - ec_pokemon2 RATTATA - ec_pokemon1 RAYQUAZA - ec_move2 RAZOR_LEAF - ec_move1 RAZOR_WIND - ec_word READY - ec_word REALLY - ec_word REAR - ec_word RECEIVED - ec_word RECOMMEND - ec_move1 RECOVER - ec_move2 RECYCLE - ec_move2 REFLECT - ec_move2 REFRESH - ec_word REFRESHING - ec_word REFUSE - ec_pokemon1 REGICE - ec_pokemon1 REGIROCK - ec_pokemon1 REGISTEEL - ec_word REJECT - ec_word RELEASE - ec_pokemon1 RELICANTH - ec_pokemon2 REMORAID - ec_word RENTAL - ec_move2 REST - ec_word RESUSCITATE - ec_move1 RETURN - ec_move2 REVENGE - ec_move1 REVERSAL - ec_duplicates 2 - ec_pokemon1 RHYDON - ec_pokemon2 RHYDON - ec_duplicates 2 - ec_pokemon1 RHYHORN - ec_pokemon2 RHYHORN - ec_word RIBBON - ec_word RICKETY - ec_word RIGHT - ec_word RIPPED - ec_word RIVAL - ec_move2 ROAR - ec_word ROCK - ec_move2 ROCK_BLAST - ec_word ROCK_HEAD - ec_move1 ROCK_SLIDE - ec_move1 ROCK_SMASH - ec_move1 ROCK_THROW - ec_move1 ROCK_TOMB - ec_word ROCK_SOLID - ec_move2 ROLE_PLAY - ec_move2 ROLLING_KICK - ec_move1 ROLLOUT - ec_word ROMANTIC - ec_pokemon1 ROSELIA - ec_word ROUGH_SKIN - ec_word RPG - ec_word RUBY - ec_word RULE - ec_word RUN - ec_word RUN_AWAY - ec_word RUNS + .2byte EC_WORD_RADIO + .2byte EC_MOVE(RAGE) + ec_duplicates 2 + .2byte EC_POKEMON(RAICHU) + .2byte EC_POKEMON2(RAICHU) + .2byte EC_POKEMON2(RAIKOU) + .2byte EC_MOVE(RAIN_DANCE) + .2byte EC_WORD_RAIN_DISH + .2byte EC_POKEMON(RALTS) + .2byte EC_WORD_RANK + .2byte EC_MOVE(RAPID_SPIN) + .2byte EC_POKEMON2(RAPIDASH) + .2byte EC_WORD_RARE + .2byte EC_WORD_RATHER + .2byte EC_POKEMON2(RATICATE) + .2byte EC_POKEMON2(RATTATA) + .2byte EC_POKEMON(RAYQUAZA) + .2byte EC_MOVE2(RAZOR_LEAF) + .2byte EC_MOVE(RAZOR_WIND) + .2byte EC_WORD_READY + .2byte EC_WORD_REALLY + .2byte EC_WORD_REAR + .2byte EC_WORD_RECEIVED + .2byte EC_WORD_RECOMMEND + .2byte EC_MOVE(RECOVER) + .2byte EC_MOVE2(RECYCLE) + .2byte EC_MOVE2(REFLECT) + .2byte EC_MOVE2(REFRESH) + .2byte EC_WORD_REFRESHING + .2byte EC_WORD_REFUSE + .2byte EC_POKEMON(REGICE) + .2byte EC_POKEMON(REGIROCK) + .2byte EC_POKEMON(REGISTEEL) + .2byte EC_WORD_REJECT + .2byte EC_WORD_RELEASE + .2byte EC_POKEMON(RELICANTH) + .2byte EC_POKEMON2(REMORAID) + .2byte EC_WORD_RENTAL + .2byte EC_MOVE2(REST) + .2byte EC_WORD_RESUSCITATE + .2byte EC_MOVE(RETURN) + .2byte EC_MOVE2(REVENGE) + .2byte EC_MOVE(REVERSAL) + ec_duplicates 2 + .2byte EC_POKEMON(RHYDON) + .2byte EC_POKEMON2(RHYDON) + ec_duplicates 2 + .2byte EC_POKEMON(RHYHORN) + .2byte EC_POKEMON2(RHYHORN) + .2byte EC_WORD_RIBBON + .2byte EC_WORD_RICKETY + .2byte EC_WORD_RIGHT + .2byte EC_WORD_RIPPED + .2byte EC_WORD_RIVAL + .2byte EC_MOVE2(ROAR) + .2byte EC_WORD_ROCK + .2byte EC_MOVE2(ROCK_BLAST) + .2byte EC_WORD_ROCK_HEAD + .2byte EC_MOVE(ROCK_SLIDE) + .2byte EC_MOVE(ROCK_SMASH) + .2byte EC_MOVE(ROCK_THROW) + .2byte EC_MOVE(ROCK_TOMB) + .2byte EC_WORD_ROCK_SOLID + .2byte EC_MOVE2(ROLE_PLAY) + .2byte EC_MOVE2(ROLLING_KICK) + .2byte EC_MOVE(ROLLOUT) + .2byte EC_WORD_ROMANTIC + .2byte EC_POKEMON(ROSELIA) + .2byte EC_WORD_ROUGH_SKIN + .2byte EC_WORD_RPG + .2byte EC_WORD_RUBY + .2byte EC_WORD_RULE + .2byte EC_WORD_RUN + .2byte EC_WORD_RUN_AWAY + .2byte EC_WORD_RUNS gEasyChatWordsByLetter_S: - ec_pokemon1 SABLEYE - ec_move1 SACRED_FIRE - ec_word SAD - ec_word SADLY - ec_move1 SAFEGUARD - ec_word SAID - ec_pokemon1 SALAMENCE - ec_word SAND_STREAM - ec_move1 SAND_TOMB - ec_word SAND_VEIL - ec_move1 SAND_ATTACK - ec_duplicates 2 - ec_pokemon1 SANDSHREW - ec_pokemon2 SANDSHREW - ec_duplicates 2 - ec_pokemon1 SANDSLASH - ec_pokemon2 SANDSLASH - ec_move1 SANDSTORM - ec_word SAPPHIRE - ec_word SATISFIED - ec_word SATURDAY - ec_word SAYS - ec_word SCARY - ec_move1 SCARY_FACE - ec_word SCATTER - ec_pokemon1 SCEPTILE - ec_word SCHOOL - ec_pokemon2 SCIZOR - ec_move2 SCRATCH - ec_move1 SCREECH - ec_pokemon2 SCYTHER - ec_duplicates 2 - ec_pokemon1 SEADRA - ec_pokemon2 SEADRA - ec_duplicates 2 - ec_pokemon1 SEAKING - ec_pokemon2 SEAKING - ec_pokemon1 SEALEO - ec_word SEARCH - ec_word SECRET - ec_word SECRET_BASE - ec_move2 SECRET_POWER - ec_word SEE - ec_word SEE_YA - ec_pokemon1 SEEDOT - ec_word SEEK - ec_pokemon2 SEEL - ec_word SEEMS - ec_word SEES - ec_move2 SEISMIC_TOSS - ec_move1 SELF_DESTRUCT - ec_word SENSE - ec_pokemon2 SENTRET - ec_word SERENE_GRACE - ec_word SERIOUS - ec_word SERIOUSLY - ec_word SERVICE - ec_pokemon1 SEVIPER - ec_move1 SHADOW_BALL - ec_move1 SHADOW_PUNCH - ec_word SHADOW_TAG - ec_word SHADY - ec_word SHAKE - ec_word SHAKY - ec_word SHALLOW - ec_pokemon1 SHARPEDO - ec_move1 SHARPEN - ec_word SHE - ec_word SHE_IS - ec_word SHE_WAS - ec_word SHED_SKIN - ec_pokemon1 SHEDINJA - ec_move1 SHEER_COLD - ec_pokemon1 SHELGON - ec_word SHELL_ARMOR - ec_pokemon2 SHELLDER - ec_word SHIELD_DUST - ec_pokemon1 SHIFTRY - ec_word SHINE - ec_move2 SHOCK_WAVE - ec_word SHOCKED - ec_word SHOPPING - ec_word SHOULD - ec_word SHOW - ec_word SHREDDED - ec_pokemon1 SHROOMISH - ec_pokemon2 SHUCKLE - ec_pokemon1 SHUPPET - ec_word SIBLINGS - ec_word SIGH - ec_move1 SIGNAL_BEAM - ec_pokemon1 SILCOON - ec_word SILKY - ec_move1 SILVER_WIND - ec_word SIMPLE - ec_word SINCE - ec_move1 SING - ec_word SINK - ec_word SISTER - ec_duplicates 2 - ec_pokemon1 SKARMORY - ec_pokemon2 SKARMORY - ec_move1 SKETCH - ec_word SKILL - ec_move1 SKILL_SWAP - ec_word SKILLED - ec_pokemon2 SKIPLOOM - ec_pokemon1 SKITTY - ec_move2 SKULL_BASH - ec_move1 SKY_ATTACK - ec_move1 SKY_UPPERCUT - ec_move2 SLACK_OFF - ec_pokemon1 SLAKING - ec_pokemon1 SLAKOTH - ec_move2 SLAM - ec_move1 SLASH - ec_word SLEEP - ec_move2 SLEEP_POWDER - ec_move2 SLEEP_TALK - ec_word SLEPT - ec_word SLIDE - ec_word SLIMY - ec_pokemon2 SLOWBRO - ec_pokemon2 SLOWKING - ec_pokemon2 SLOWPOKE - ec_move2 SLUDGE - ec_move2 SLUDGE_BOMB - ec_duplicates 2 - ec_pokemon1 SLUGMA - ec_pokemon2 SLUGMA - ec_word SMACK - ec_word SMALL - ec_word SMART - ec_word SMARTNESS - ec_pokemon2 SMEARGLE - ec_word SMELL - ec_word SMELL_YA - ec_move1 SMELLING_SALT - ec_word SMITE - ec_move1 SMOG - ec_move1 SMOKESCREEN - ec_pokemon2 SMOOCHUM - ec_word SMOOTH - ec_move2 SNATCH - ec_pokemon2 SNEASEL - ec_move1 SNORE - ec_pokemon2 SNORLAX - ec_word SNORT - ec_pokemon1 SNORUNT - ec_pokemon2 SNUBBULL - ec_word SO - ec_move2 SOFT_BOILED - ec_word SOFTWARE - ec_move1 SOLAR_BEAM - ec_pokemon1 SOLROCK - ec_word SOME - ec_word SOMEHOW - ec_word SOMEONE - ec_word SOMETHING - ec_word SOMETIME - ec_word SON - ec_word SONG - ec_word SONGS - ec_move1 SONIC_BOOM - ec_word SOON - ec_word SORRY - ec_word SOUNDPROOF - ec_word SP_ABILITY - ec_move1 SPARK - ec_pokemon2 SPEAROW - ec_word SPECTATOR - ec_word SPEED_BOOST - ec_pokemon1 SPHEAL - ec_move1 SPIDER_WEB - ec_move2 SPIKE_CANNON - ec_move2 SPIKES - ec_pokemon2 SPINARAK - ec_pokemon1 SPINDA - ec_word SPIRALING - ec_word SPIRIT - ec_move2 SPIT_UP - ec_move1 SPITE - ec_move2 SPLASH - ec_pokemon1 SPOINK - ec_move1 SPORE - ec_word SPORTS - ec_word SPRING - ec_pokemon2 SQUIRTLE - ec_word STAGE - ec_pokemon2 STANTLER - ec_duplicates 2 - ec_pokemon1 STARMIE - ec_pokemon2 STARMIE - ec_word START - ec_duplicates 2 - ec_pokemon1 STARYU - ec_pokemon2 STARYU - ec_word STATIC - ec_word STAY_AT_HOME - ec_word STEEL - ec_move2 STEEL_WING - ec_pokemon2 STEELIX - ec_word STENCH - ec_word STICKY_HOLD - ec_move2 STOCKPILE - ec_move2 STOMP - ec_word STOP - ec_word STORE - ec_word STORES - ec_word STORY - ec_word STRATEGY - ec_move1 STRENGTH - ec_move1 STRING_SHOT - ec_word STRONG - ec_move2 STRUGGLE - ec_word STUDY - ec_move1 STUN_SPORE - ec_word STURDY - ec_move1 SUBMISSION - ec_move2 SUBSTITUTE - ec_word SUCTION_CUPS - ec_pokemon2 SUDOWOODO - ec_pokemon2 SUICUNE - ec_word SUMMER - ec_word SUNDAY - ec_pokemon2 SUNFLORA - ec_pokemon2 SUNKERN - ec_move2 SUNNY_DAY - ec_word SUPER - ec_move1 SUPER_FANG - ec_move2 SUPERPOWER - ec_move2 SUPERSONIC - ec_move2 SURF - ec_word SURPRISE - ec_word SURRENDER - ec_pokemon1 SURSKIT - ec_pokemon1 SWABLU - ec_move1 SWAGGER - ec_move2 SWALLOW - ec_pokemon1 SWALOT - ec_pokemon1 SWAMPERT - ec_word SWARM - ec_move2 SWEET_KISS - ec_move1 SWEET_SCENT - ec_word SWEETS - ec_pokemon1 SWELLOW - ec_move1 SWIFT - ec_word SWIFT_SWIM - ec_pokemon2 SWINUB - ec_move2 SWORDS_DANCE - ec_word SYNCHRONIZE - ec_move1 SYNTHESIS - ec_word SYSTEM + .2byte EC_POKEMON(SABLEYE) + .2byte EC_MOVE(SACRED_FIRE) + .2byte EC_WORD_SAD + .2byte EC_WORD_SADLY + .2byte EC_MOVE(SAFEGUARD) + .2byte EC_WORD_SAID + .2byte EC_POKEMON(SALAMENCE) + .2byte EC_WORD_SAND_STREAM + .2byte EC_MOVE(SAND_TOMB) + .2byte EC_WORD_SAND_VEIL + .2byte EC_MOVE(SAND_ATTACK) + ec_duplicates 2 + .2byte EC_POKEMON(SANDSHREW) + .2byte EC_POKEMON2(SANDSHREW) + ec_duplicates 2 + .2byte EC_POKEMON(SANDSLASH) + .2byte EC_POKEMON2(SANDSLASH) + .2byte EC_MOVE(SANDSTORM) + .2byte EC_WORD_SAPPHIRE + .2byte EC_WORD_SATISFIED + .2byte EC_WORD_SATURDAY + .2byte EC_WORD_SAYS + .2byte EC_WORD_SCARY + .2byte EC_MOVE(SCARY_FACE) + .2byte EC_WORD_SCATTER + .2byte EC_POKEMON(SCEPTILE) + .2byte EC_WORD_SCHOOL + .2byte EC_POKEMON2(SCIZOR) + .2byte EC_MOVE2(SCRATCH) + .2byte EC_MOVE(SCREECH) + .2byte EC_POKEMON2(SCYTHER) + ec_duplicates 2 + .2byte EC_POKEMON(SEADRA) + .2byte EC_POKEMON2(SEADRA) + ec_duplicates 2 + .2byte EC_POKEMON(SEAKING) + .2byte EC_POKEMON2(SEAKING) + .2byte EC_POKEMON(SEALEO) + .2byte EC_WORD_SEARCH + .2byte EC_WORD_SECRET + .2byte EC_WORD_SECRET_BASE + .2byte EC_MOVE2(SECRET_POWER) + .2byte EC_WORD_SEE + .2byte EC_WORD_SEE_YA + .2byte EC_POKEMON(SEEDOT) + .2byte EC_WORD_SEEK + .2byte EC_POKEMON2(SEEL) + .2byte EC_WORD_SEEMS + .2byte EC_WORD_SEES + .2byte EC_MOVE2(SEISMIC_TOSS) + .2byte EC_MOVE(SELF_DESTRUCT) + .2byte EC_WORD_SENSE + .2byte EC_POKEMON2(SENTRET) + .2byte EC_WORD_SERENE_GRACE + .2byte EC_WORD_SERIOUS + .2byte EC_WORD_SERIOUSLY + .2byte EC_WORD_SERVICE + .2byte EC_POKEMON(SEVIPER) + .2byte EC_MOVE(SHADOW_BALL) + .2byte EC_MOVE(SHADOW_PUNCH) + .2byte EC_WORD_SHADOW_TAG + .2byte EC_WORD_SHADY + .2byte EC_WORD_SHAKE + .2byte EC_WORD_SHAKY + .2byte EC_WORD_SHALLOW + .2byte EC_POKEMON(SHARPEDO) + .2byte EC_MOVE(SHARPEN) + .2byte EC_WORD_SHE + .2byte EC_WORD_SHE_IS + .2byte EC_WORD_SHE_WAS + .2byte EC_WORD_SHED_SKIN + .2byte EC_POKEMON(SHEDINJA) + .2byte EC_MOVE(SHEER_COLD) + .2byte EC_POKEMON(SHELGON) + .2byte EC_WORD_SHELL_ARMOR + .2byte EC_POKEMON2(SHELLDER) + .2byte EC_WORD_SHIELD_DUST + .2byte EC_POKEMON(SHIFTRY) + .2byte EC_WORD_SHINE + .2byte EC_MOVE2(SHOCK_WAVE) + .2byte EC_WORD_SHOCKED + .2byte EC_WORD_SHOPPING + .2byte EC_WORD_SHOULD + .2byte EC_WORD_SHOW + .2byte EC_WORD_SHREDDED + .2byte EC_POKEMON(SHROOMISH) + .2byte EC_POKEMON2(SHUCKLE) + .2byte EC_POKEMON(SHUPPET) + .2byte EC_WORD_SIBLINGS + .2byte EC_WORD_SIGH + .2byte EC_MOVE(SIGNAL_BEAM) + .2byte EC_POKEMON(SILCOON) + .2byte EC_WORD_SILKY + .2byte EC_MOVE(SILVER_WIND) + .2byte EC_WORD_SIMPLE + .2byte EC_WORD_SINCE + .2byte EC_MOVE(SING) + .2byte EC_WORD_SINK + .2byte EC_WORD_SISTER + ec_duplicates 2 + .2byte EC_POKEMON(SKARMORY) + .2byte EC_POKEMON2(SKARMORY) + .2byte EC_MOVE(SKETCH) + .2byte EC_WORD_SKILL + .2byte EC_MOVE(SKILL_SWAP) + .2byte EC_WORD_SKILLED + .2byte EC_POKEMON2(SKIPLOOM) + .2byte EC_POKEMON(SKITTY) + .2byte EC_MOVE2(SKULL_BASH) + .2byte EC_MOVE(SKY_ATTACK) + .2byte EC_MOVE(SKY_UPPERCUT) + .2byte EC_MOVE2(SLACK_OFF) + .2byte EC_POKEMON(SLAKING) + .2byte EC_POKEMON(SLAKOTH) + .2byte EC_MOVE2(SLAM) + .2byte EC_MOVE(SLASH) + .2byte EC_WORD_SLEEP + .2byte EC_MOVE2(SLEEP_POWDER) + .2byte EC_MOVE2(SLEEP_TALK) + .2byte EC_WORD_SLEPT + .2byte EC_WORD_SLIDE + .2byte EC_WORD_SLIMY + .2byte EC_POKEMON2(SLOWBRO) + .2byte EC_POKEMON2(SLOWKING) + .2byte EC_POKEMON2(SLOWPOKE) + .2byte EC_MOVE2(SLUDGE) + .2byte EC_MOVE2(SLUDGE_BOMB) + ec_duplicates 2 + .2byte EC_POKEMON(SLUGMA) + .2byte EC_POKEMON2(SLUGMA) + .2byte EC_WORD_SMACK + .2byte EC_WORD_SMALL + .2byte EC_WORD_SMART + .2byte EC_WORD_SMARTNESS + .2byte EC_POKEMON2(SMEARGLE) + .2byte EC_WORD_SMELL + .2byte EC_WORD_SMELL_YA + .2byte EC_MOVE(SMELLING_SALT) + .2byte EC_WORD_SMITE + .2byte EC_MOVE(SMOG) + .2byte EC_MOVE(SMOKESCREEN) + .2byte EC_POKEMON2(SMOOCHUM) + .2byte EC_WORD_SMOOTH + .2byte EC_MOVE2(SNATCH) + .2byte EC_POKEMON2(SNEASEL) + .2byte EC_MOVE(SNORE) + .2byte EC_POKEMON2(SNORLAX) + .2byte EC_WORD_SNORT + .2byte EC_POKEMON(SNORUNT) + .2byte EC_POKEMON2(SNUBBULL) + .2byte EC_WORD_SO + .2byte EC_MOVE2(SOFT_BOILED) + .2byte EC_WORD_SOFTWARE + .2byte EC_MOVE(SOLAR_BEAM) + .2byte EC_POKEMON(SOLROCK) + .2byte EC_WORD_SOME + .2byte EC_WORD_SOMEHOW + .2byte EC_WORD_SOMEONE + .2byte EC_WORD_SOMETHING + .2byte EC_WORD_SOMETIME + .2byte EC_WORD_SON + .2byte EC_WORD_SONG + .2byte EC_WORD_SONGS + .2byte EC_MOVE(SONIC_BOOM) + .2byte EC_WORD_SOON + .2byte EC_WORD_SORRY + .2byte EC_WORD_SOUNDPROOF + .2byte EC_WORD_SP_ABILITY + .2byte EC_MOVE(SPARK) + .2byte EC_POKEMON2(SPEAROW) + .2byte EC_WORD_SPECTATOR + .2byte EC_WORD_SPEED_BOOST + .2byte EC_POKEMON(SPHEAL) + .2byte EC_MOVE(SPIDER_WEB) + .2byte EC_MOVE2(SPIKE_CANNON) + .2byte EC_MOVE2(SPIKES) + .2byte EC_POKEMON2(SPINARAK) + .2byte EC_POKEMON(SPINDA) + .2byte EC_WORD_SPIRALING + .2byte EC_WORD_SPIRIT + .2byte EC_MOVE2(SPIT_UP) + .2byte EC_MOVE(SPITE) + .2byte EC_MOVE2(SPLASH) + .2byte EC_POKEMON(SPOINK) + .2byte EC_MOVE(SPORE) + .2byte EC_WORD_SPORTS + .2byte EC_WORD_SPRING + .2byte EC_POKEMON2(SQUIRTLE) + .2byte EC_WORD_STAGE + .2byte EC_POKEMON2(STANTLER) + ec_duplicates 2 + .2byte EC_POKEMON(STARMIE) + .2byte EC_POKEMON2(STARMIE) + .2byte EC_WORD_START + ec_duplicates 2 + .2byte EC_POKEMON(STARYU) + .2byte EC_POKEMON2(STARYU) + .2byte EC_WORD_STATIC + .2byte EC_WORD_STAY_AT_HOME + .2byte EC_WORD_STEEL + .2byte EC_MOVE2(STEEL_WING) + .2byte EC_POKEMON2(STEELIX) + .2byte EC_WORD_STENCH + .2byte EC_WORD_STICKY_HOLD + .2byte EC_MOVE2(STOCKPILE) + .2byte EC_MOVE2(STOMP) + .2byte EC_WORD_STOP + .2byte EC_WORD_STORE + .2byte EC_WORD_STORES + .2byte EC_WORD_STORY + .2byte EC_WORD_STRATEGY + .2byte EC_MOVE(STRENGTH) + .2byte EC_MOVE(STRING_SHOT) + .2byte EC_WORD_STRONG + .2byte EC_MOVE2(STRUGGLE) + .2byte EC_WORD_STUDY + .2byte EC_MOVE(STUN_SPORE) + .2byte EC_WORD_STURDY + .2byte EC_MOVE(SUBMISSION) + .2byte EC_MOVE2(SUBSTITUTE) + .2byte EC_WORD_SUCTION_CUPS + .2byte EC_POKEMON2(SUDOWOODO) + .2byte EC_POKEMON2(SUICUNE) + .2byte EC_WORD_SUMMER + .2byte EC_WORD_SUNDAY + .2byte EC_POKEMON2(SUNFLORA) + .2byte EC_POKEMON2(SUNKERN) + .2byte EC_MOVE2(SUNNY_DAY) + .2byte EC_WORD_SUPER + .2byte EC_MOVE(SUPER_FANG) + .2byte EC_MOVE2(SUPERPOWER) + .2byte EC_MOVE2(SUPERSONIC) + .2byte EC_MOVE2(SURF) + .2byte EC_WORD_SURPRISE + .2byte EC_WORD_SURRENDER + .2byte EC_POKEMON(SURSKIT) + .2byte EC_POKEMON(SWABLU) + .2byte EC_MOVE(SWAGGER) + .2byte EC_MOVE2(SWALLOW) + .2byte EC_POKEMON(SWALOT) + .2byte EC_POKEMON(SWAMPERT) + .2byte EC_WORD_SWARM + .2byte EC_MOVE2(SWEET_KISS) + .2byte EC_MOVE(SWEET_SCENT) + .2byte EC_WORD_SWEETS + .2byte EC_POKEMON(SWELLOW) + .2byte EC_MOVE(SWIFT) + .2byte EC_WORD_SWIFT_SWIM + .2byte EC_POKEMON2(SWINUB) + .2byte EC_MOVE2(SWORDS_DANCE) + .2byte EC_WORD_SYNCHRONIZE + .2byte EC_MOVE(SYNTHESIS) + .2byte EC_WORD_SYSTEM gEasyChatWordsByLetter_T: - ec_move2 TACKLE - ec_move2 TAIL_GLOW - ec_move1 TAIL_WHIP - ec_pokemon1 TAILLOW - ec_word TAKE - ec_move2 TAKE_DOWN - ec_word TAKE_THAT - ec_word TALENT - ec_word TALK - ec_word TALKING - ec_pokemon2 TANGELA - ec_word TASTY - ec_move2 TAUNT - ec_pokemon2 TAUROS - ec_word TCH - ec_word TEACH - ec_word TEACHER - ec_word TEACHES - ec_pokemon2 TEDDIURSA - ec_move2 TEETER_DANCE - ec_move2 TELEPORT - ec_word TELEVISION - ec_duplicates 2 - ec_pokemon1 TENTACOOL - ec_pokemon2 TENTACOOL - ec_duplicates 2 - ec_pokemon1 TENTACRUEL - ec_pokemon2 TENTACRUEL - ec_word TERRIBLE - ec_word TEST - ec_word THAN - ec_word THANK_YOU - ec_word THANKS - ec_word THAT - ec_word THAT_WAS - ec_word THAT_S - ec_word THAT_S_IT_EXCL - ec_word THE - ec_word THEIR - ec_word THERE - ec_word THESE - ec_word THESE_WERE - ec_word THEY - ec_word THEY_WERE - ec_word THEY_RE - ec_word THEY_VE - ec_word THICK - ec_word THICK_FAT - ec_move2 THIEF - ec_word THIN - ec_word THING - ec_word THINGS - ec_word THINK - ec_word THINKS - ec_word THIRSTY - ec_word THIS - ec_word THIS_IS_IT_EXCL - ec_word THOSE - ec_word THOSE_ARE - ec_word THOSE_WERE - ec_move1 THRASH - ec_word THROW - ec_move1 THUNDER - ec_move2 THUNDER_WAVE - ec_move1 THUNDERBOLT - ec_move1 THUNDER_PUNCH - ec_move2 THUNDER_SHOCK - ec_word THURSDAY - ec_move1 TICKLE - ec_word TICKLISH - ec_word TIGHT - ec_word TIME - ec_word TIMES - ec_word TIRED - ec_word TO - ec_word TO_HER - ec_word TO_ME - ec_word TO_THEM - ec_word TO_US - ec_word TO_WHOM - ec_word TODAY - ec_pokemon2 TOGEPI - ec_word TOGETHER - ec_pokemon2 TOGETIC - ec_word TOMORROW - ec_word TOO - ec_word TOO_LATE - ec_word TOO_STRONG - ec_word TOO_WEAK - ec_word TOP - ec_pokemon1 TORCHIC - ec_pokemon1 TORKOAL - ec_move1 TORMENT - ec_word TORRENT - ec_word TOTALLY - ec_pokemon2 TOTODILE - ec_word TOUGH - ec_word TOUGHNESS - ec_word TOURNAMENT - ec_move2 TOXIC - ec_word TOYS - ec_word TRACE - ec_word TRADE - ec_word TRAIN - ec_word TRAINER - ec_word TRAINS - ec_move2 TRANSFORM - ec_pokemon1 TRAPINCH - ec_word TRAVEL - ec_word TREASURE - ec_pokemon1 TREECKO - ec_word TRENDY - ec_move2 TRI_ATTACK - ec_move2 TRICK - ec_word TRIES - ec_move2 TRIPLE_KICK - ec_pokemon1 TROPIUS - ec_word TRUANT - ec_word TRULY - ec_word TRUMP_CARD - ec_word TRUST - ec_word TRY - ec_word TUESDAY - ec_move2 TWINEEDLE - ec_word TWIRLING - ec_move2 TWISTER - ec_word TYPE - ec_pokemon2 TYPHLOSION - ec_pokemon2 TYRANITAR - ec_pokemon2 TYROGUE + .2byte EC_MOVE2(TACKLE) + .2byte EC_MOVE2(TAIL_GLOW) + .2byte EC_MOVE(TAIL_WHIP) + .2byte EC_POKEMON(TAILLOW) + .2byte EC_WORD_TAKE + .2byte EC_MOVE2(TAKE_DOWN) + .2byte EC_WORD_TAKE_THAT + .2byte EC_WORD_TALENT + .2byte EC_WORD_TALK + .2byte EC_WORD_TALKING + .2byte EC_POKEMON2(TANGELA) + .2byte EC_WORD_TASTY + .2byte EC_MOVE2(TAUNT) + .2byte EC_POKEMON2(TAUROS) + .2byte EC_WORD_TCH + .2byte EC_WORD_TEACH + .2byte EC_WORD_TEACHER + .2byte EC_WORD_TEACHES + .2byte EC_POKEMON2(TEDDIURSA) + .2byte EC_MOVE2(TEETER_DANCE) + .2byte EC_MOVE2(TELEPORT) + .2byte EC_WORD_TELEVISION + ec_duplicates 2 + .2byte EC_POKEMON(TENTACOOL) + .2byte EC_POKEMON2(TENTACOOL) + ec_duplicates 2 + .2byte EC_POKEMON(TENTACRUEL) + .2byte EC_POKEMON2(TENTACRUEL) + .2byte EC_WORD_TERRIBLE + .2byte EC_WORD_TEST + .2byte EC_WORD_THAN + .2byte EC_WORD_THANK_YOU + .2byte EC_WORD_THANKS + .2byte EC_WORD_THAT + .2byte EC_WORD_THAT_WAS + .2byte EC_WORD_THAT_S + .2byte EC_WORD_THAT_S_IT_EXCL + .2byte EC_WORD_THE + .2byte EC_WORD_THEIR + .2byte EC_WORD_THERE + .2byte EC_WORD_THESE + .2byte EC_WORD_THESE_WERE + .2byte EC_WORD_THEY + .2byte EC_WORD_THEY_WERE + .2byte EC_WORD_THEY_RE + .2byte EC_WORD_THEY_VE + .2byte EC_WORD_THICK + .2byte EC_WORD_THICK_FAT + .2byte EC_MOVE2(THIEF) + .2byte EC_WORD_THIN + .2byte EC_WORD_THING + .2byte EC_WORD_THINGS + .2byte EC_WORD_THINK + .2byte EC_WORD_THINKS + .2byte EC_WORD_THIRSTY + .2byte EC_WORD_THIS + .2byte EC_WORD_THIS_IS_IT_EXCL + .2byte EC_WORD_THOSE + .2byte EC_WORD_THOSE_ARE + .2byte EC_WORD_THOSE_WERE + .2byte EC_MOVE(THRASH) + .2byte EC_WORD_THROW + .2byte EC_MOVE(THUNDER) + .2byte EC_MOVE2(THUNDER_WAVE) + .2byte EC_MOVE(THUNDERBOLT) + .2byte EC_MOVE(THUNDER_PUNCH) + .2byte EC_MOVE2(THUNDER_SHOCK) + .2byte EC_WORD_THURSDAY + .2byte EC_MOVE(TICKLE) + .2byte EC_WORD_TICKLISH + .2byte EC_WORD_TIGHT + .2byte EC_WORD_TIME + .2byte EC_WORD_TIMES + .2byte EC_WORD_TIRED + .2byte EC_WORD_TO + .2byte EC_WORD_TO_HER + .2byte EC_WORD_TO_ME + .2byte EC_WORD_TO_THEM + .2byte EC_WORD_TO_US + .2byte EC_WORD_TO_WHOM + .2byte EC_WORD_TODAY + .2byte EC_POKEMON2(TOGEPI) + .2byte EC_WORD_TOGETHER + .2byte EC_POKEMON2(TOGETIC) + .2byte EC_WORD_TOMORROW + .2byte EC_WORD_TOO + .2byte EC_WORD_TOO_LATE + .2byte EC_WORD_TOO_STRONG + .2byte EC_WORD_TOO_WEAK + .2byte EC_WORD_TOP + .2byte EC_POKEMON(TORCHIC) + .2byte EC_POKEMON(TORKOAL) + .2byte EC_MOVE(TORMENT) + .2byte EC_WORD_TORRENT + .2byte EC_WORD_TOTALLY + .2byte EC_POKEMON2(TOTODILE) + .2byte EC_WORD_TOUGH + .2byte EC_WORD_TOUGHNESS + .2byte EC_WORD_TOURNAMENT + .2byte EC_MOVE2(TOXIC) + .2byte EC_WORD_TOYS + .2byte EC_WORD_TRACE + .2byte EC_WORD_TRADE + .2byte EC_WORD_TRAIN + .2byte EC_WORD_TRAINER + .2byte EC_WORD_TRAINS + .2byte EC_MOVE2(TRANSFORM) + .2byte EC_POKEMON(TRAPINCH) + .2byte EC_WORD_TRAVEL + .2byte EC_WORD_TREASURE + .2byte EC_POKEMON(TREECKO) + .2byte EC_WORD_TRENDY + .2byte EC_MOVE2(TRI_ATTACK) + .2byte EC_MOVE2(TRICK) + .2byte EC_WORD_TRIES + .2byte EC_MOVE2(TRIPLE_KICK) + .2byte EC_POKEMON(TROPIUS) + .2byte EC_WORD_TRUANT + .2byte EC_WORD_TRULY + .2byte EC_WORD_TRUMP_CARD + .2byte EC_WORD_TRUST + .2byte EC_WORD_TRY + .2byte EC_WORD_TUESDAY + .2byte EC_MOVE2(TWINEEDLE) + .2byte EC_WORD_TWIRLING + .2byte EC_MOVE2(TWISTER) + .2byte EC_WORD_TYPE + .2byte EC_POKEMON2(TYPHLOSION) + .2byte EC_POKEMON2(TYRANITAR) + .2byte EC_POKEMON2(TYROGUE) gEasyChatWordsByLetter_U: - ec_word UGLY - ec_word UH_HUH - ec_word UH_OH - ec_word UM - ec_pokemon2 UMBREON - ec_word UNAVOIDABLE - ec_word UNBELIEVABLE - ec_word UNCLE - ec_word UNDERSTAND - ec_word UNDERSTANDS - ec_word UNDERSTOOD - ec_pokemon2 UNOWN - ec_word UNTIL - ec_word UP - ec_word UPBEAT - ec_move1 UPROAR - ec_word UPSIDE_DOWN - ec_word URGH - ec_pokemon2 URSARING - ec_word USE - ec_word USELESS - ec_word USES - ec_word USING + .2byte EC_WORD_UGLY + .2byte EC_WORD_UH_HUH + .2byte EC_WORD_UH_OH + .2byte EC_WORD_UM + .2byte EC_POKEMON2(UMBREON) + .2byte EC_WORD_UNAVOIDABLE + .2byte EC_WORD_UNBELIEVABLE + .2byte EC_WORD_UNCLE + .2byte EC_WORD_UNDERSTAND + .2byte EC_WORD_UNDERSTANDS + .2byte EC_WORD_UNDERSTOOD + .2byte EC_POKEMON2(UNOWN) + .2byte EC_WORD_UNTIL + .2byte EC_WORD_UP + .2byte EC_WORD_UPBEAT + .2byte EC_MOVE(UPROAR) + .2byte EC_WORD_UPSIDE_DOWN + .2byte EC_WORD_URGH + .2byte EC_POKEMON2(URSARING) + .2byte EC_WORD_USE + .2byte EC_WORD_USELESS + .2byte EC_WORD_USES + .2byte EC_WORD_USING gEasyChatWordsByLetter_V: - ec_word VACATION - ec_pokemon2 VAPOREON - ec_pokemon2 VENOMOTH - ec_pokemon2 VENONAT - ec_pokemon2 VENUSAUR - ec_word VERSION - ec_word VERSUS - ec_word VERY - ec_pokemon1 VIBRAVA - ec_move2 VICE_GRIP - ec_word VICTORY - ec_pokemon2 VICTREEBEL - ec_word VIEWING - ec_pokemon1 VIGOROTH - ec_duplicates 2 - ec_pokemon1 VILEPLUME - ec_pokemon2 VILEPLUME - ec_move2 VINE_WHIP - ec_word VITAL_SPIRIT - ec_move1 VITAL_THROW - ec_pokemon1 VOLBEAT - ec_word VOLT_ABSORB - ec_duplicates 2 - ec_pokemon1 VOLTORB - ec_pokemon2 VOLTORB - ec_word VORACIOUS - ec_duplicates 2 - ec_pokemon1 VULPIX - ec_pokemon2 VULPIX + .2byte EC_WORD_VACATION + .2byte EC_POKEMON2(VAPOREON) + .2byte EC_POKEMON2(VENOMOTH) + .2byte EC_POKEMON2(VENONAT) + .2byte EC_POKEMON2(VENUSAUR) + .2byte EC_WORD_VERSION + .2byte EC_WORD_VERSUS + .2byte EC_WORD_VERY + .2byte EC_POKEMON(VIBRAVA) + .2byte EC_MOVE2(VICE_GRIP) + .2byte EC_WORD_VICTORY + .2byte EC_POKEMON2(VICTREEBEL) + .2byte EC_WORD_VIEWING + .2byte EC_POKEMON(VIGOROTH) + ec_duplicates 2 + .2byte EC_POKEMON(VILEPLUME) + .2byte EC_POKEMON2(VILEPLUME) + .2byte EC_MOVE2(VINE_WHIP) + .2byte EC_WORD_VITAL_SPIRIT + .2byte EC_MOVE(VITAL_THROW) + .2byte EC_POKEMON(VOLBEAT) + .2byte EC_WORD_VOLT_ABSORB + ec_duplicates 2 + .2byte EC_POKEMON(VOLTORB) + .2byte EC_POKEMON2(VOLTORB) + .2byte EC_WORD_VORACIOUS + ec_duplicates 2 + .2byte EC_POKEMON(VULPIX) + .2byte EC_POKEMON2(VULPIX) gEasyChatWordsByLetter_W: - ec_word WAAAH - ec_word WAHAHAHA - ec_pokemon1 WAILMER - ec_pokemon1 WAILORD - ec_word WAIT - ec_word WAKE_UP - ec_word WAKES_UP - ec_word WALK - ec_word WALKING - ec_word WALKS - ec_pokemon1 WALREIN - ec_word WANDERING - ec_word WANNABE - ec_word WANT - ec_word WANTS - ec_pokemon2 WARTORTLE - ec_word WAS - ec_word WASN_T - ec_word WATER - ec_word WATER_ABSORB - ec_move2 WATER_GUN - ec_move2 WATER_PULSE - ec_move2 WATER_SPORT - ec_move1 WATER_SPOUT - ec_word WATER_VEIL - ec_move2 WATERFALL - ec_word WAY - ec_word WE - ec_word WE_RE - ec_word WE_VE - ec_word WEAK - ec_word WEAKENED - ec_move1 WEATHER_BALL - ec_word WEDNESDAY - ec_pokemon2 WEEDLE - ec_word WEEK - ec_pokemon2 WEEPINBELL - ec_duplicates 2 - ec_pokemon1 WEEZING - ec_pokemon2 WEEZING - ec_word WEIRD - ec_word WELCOME - ec_word WELL - ec_word WELL_THEN - ec_word WENT - ec_word WERE - ec_word WEREN_T - ec_word WHAT - ec_word WHAT_S_UP_QUES - ec_word WHEN - ec_word WHEN_I_WIN - ec_word WHERE - ec_word WHICH - ec_word WHILE - ec_move1 WHIRLPOOL - ec_move2 WHIRLWIND - ec_pokemon1 WHISCASH - ec_pokemon1 WHISMUR - ec_word WHITE_SMOKE - ec_word WHO - ec_word WHO_IS - ec_word WHO_WAS - ec_word WHOAH - ec_word WHOM - ec_word WHOSE - ec_word WHY - ec_duplicates 2 - ec_pokemon1 WIGGLYTUFF - ec_pokemon2 WIGGLYTUFF - ec_word WILD - ec_word WILL - ec_word WILL_BE_HERE - ec_move1 WILL_O_WISP - ec_word WIMPY - ec_word WIN - ec_move2 WING_ATTACK - ec_pokemon1 WINGULL - ec_word WINNER - ec_word WINS - ec_word WINTER - ec_move2 WISH - ec_word WITH - ec_move1 WITHDRAW - ec_word WITHOUT - ec_word WOBBLY - ec_duplicates 2 - ec_pokemon1 WOBBUFFET - ec_pokemon2 WOBBUFFET - ec_word WOMAN - ec_word WON - ec_word WON_T - ec_word WONDER - ec_word WONDER_GUARD - ec_pokemon2 WOOPER - ec_word WORD - ec_word WORK - ec_word WORKING - ec_word WORKS - ec_word WORLD - ec_word WORRY - ec_word WOULD - ec_word WOW - ec_word WOWEE - ec_move2 WRAP - ec_word WROOOAAR_EXCL - ec_pokemon1 WURMPLE - ec_pokemon1 WYNAUT + .2byte EC_WORD_WAAAH + .2byte EC_WORD_WAHAHAHA + .2byte EC_POKEMON(WAILMER) + .2byte EC_POKEMON(WAILORD) + .2byte EC_WORD_WAIT + .2byte EC_WORD_WAKE_UP + .2byte EC_WORD_WAKES_UP + .2byte EC_WORD_WALK + .2byte EC_WORD_WALKING + .2byte EC_WORD_WALKS + .2byte EC_POKEMON(WALREIN) + .2byte EC_WORD_WANDERING + .2byte EC_WORD_WANNABE + .2byte EC_WORD_WANT + .2byte EC_WORD_WANTS + .2byte EC_POKEMON2(WARTORTLE) + .2byte EC_WORD_WAS + .2byte EC_WORD_WASN_T + .2byte EC_WORD_WATER + .2byte EC_WORD_WATER_ABSORB + .2byte EC_MOVE2(WATER_GUN) + .2byte EC_MOVE2(WATER_PULSE) + .2byte EC_MOVE2(WATER_SPORT) + .2byte EC_MOVE(WATER_SPOUT) + .2byte EC_WORD_WATER_VEIL + .2byte EC_MOVE2(WATERFALL) + .2byte EC_WORD_WAY + .2byte EC_WORD_WE + .2byte EC_WORD_WE_RE + .2byte EC_WORD_WE_VE + .2byte EC_WORD_WEAK + .2byte EC_WORD_WEAKENED + .2byte EC_MOVE(WEATHER_BALL) + .2byte EC_WORD_WEDNESDAY + .2byte EC_POKEMON2(WEEDLE) + .2byte EC_WORD_WEEK + .2byte EC_POKEMON2(WEEPINBELL) + ec_duplicates 2 + .2byte EC_POKEMON(WEEZING) + .2byte EC_POKEMON2(WEEZING) + .2byte EC_WORD_WEIRD + .2byte EC_WORD_WELCOME + .2byte EC_WORD_WELL + .2byte EC_WORD_WELL_THEN + .2byte EC_WORD_WENT + .2byte EC_WORD_WERE + .2byte EC_WORD_WEREN_T + .2byte EC_WORD_WHAT + .2byte EC_WORD_WHAT_S_UP_QUES + .2byte EC_WORD_WHEN + .2byte EC_WORD_WHEN_I_WIN + .2byte EC_WORD_WHERE + .2byte EC_WORD_WHICH + .2byte EC_WORD_WHILE + .2byte EC_MOVE(WHIRLPOOL) + .2byte EC_MOVE2(WHIRLWIND) + .2byte EC_POKEMON(WHISCASH) + .2byte EC_POKEMON(WHISMUR) + .2byte EC_WORD_WHITE_SMOKE + .2byte EC_WORD_WHO + .2byte EC_WORD_WHO_IS + .2byte EC_WORD_WHO_WAS + .2byte EC_WORD_WHOAH + .2byte EC_WORD_WHOM + .2byte EC_WORD_WHOSE + .2byte EC_WORD_WHY + ec_duplicates 2 + .2byte EC_POKEMON(WIGGLYTUFF) + .2byte EC_POKEMON2(WIGGLYTUFF) + .2byte EC_WORD_WILD + .2byte EC_WORD_WILL + .2byte EC_WORD_WILL_BE_HERE + .2byte EC_MOVE(WILL_O_WISP) + .2byte EC_WORD_WIMPY + .2byte EC_WORD_WIN + .2byte EC_MOVE2(WING_ATTACK) + .2byte EC_POKEMON(WINGULL) + .2byte EC_WORD_WINNER + .2byte EC_WORD_WINS + .2byte EC_WORD_WINTER + .2byte EC_MOVE2(WISH) + .2byte EC_WORD_WITH + .2byte EC_MOVE(WITHDRAW) + .2byte EC_WORD_WITHOUT + .2byte EC_WORD_WOBBLY + ec_duplicates 2 + .2byte EC_POKEMON(WOBBUFFET) + .2byte EC_POKEMON2(WOBBUFFET) + .2byte EC_WORD_WOMAN + .2byte EC_WORD_WON + .2byte EC_WORD_WON_T + .2byte EC_WORD_WONDER + .2byte EC_WORD_WONDER_GUARD + .2byte EC_POKEMON2(WOOPER) + .2byte EC_WORD_WORD + .2byte EC_WORD_WORK + .2byte EC_WORD_WORKING + .2byte EC_WORD_WORKS + .2byte EC_WORD_WORLD + .2byte EC_WORD_WORRY + .2byte EC_WORD_WOULD + .2byte EC_WORD_WOW + .2byte EC_WORD_WOWEE + .2byte EC_MOVE2(WRAP) + .2byte EC_WORD_WROOOAAR_EXCL + .2byte EC_POKEMON(WURMPLE) + .2byte EC_POKEMON(WYNAUT) gEasyChatWordsByLetter_X: ec_duplicates 2 - ec_pokemon1 XATU - ec_pokemon2 XATU + .2byte EC_POKEMON(XATU) + .2byte EC_POKEMON2(XATU) gEasyChatWordsByLetter_Y: - ec_word YAHOO - ec_pokemon2 YANMA - ec_move1 YAWN - ec_word YAY - ec_word YEAH - ec_word YEAH_YEAH - ec_word YEEHAW_EXCL - ec_word YES - ec_word YES_SIR_EXCL - ec_word YESTERDAY - ec_word YET - ec_word YO - ec_word YOU - ec_word YOU_RE - ec_word YOU_VE - ec_word YOUNG - ec_word YOUR - ec_word YOURS - ec_word YUP + .2byte EC_WORD_YAHOO + .2byte EC_POKEMON2(YANMA) + .2byte EC_MOVE(YAWN) + .2byte EC_WORD_YAY + .2byte EC_WORD_YEAH + .2byte EC_WORD_YEAH_YEAH + .2byte EC_WORD_YEEHAW_EXCL + .2byte EC_WORD_YES + .2byte EC_WORD_YES_SIR_EXCL + .2byte EC_WORD_YESTERDAY + .2byte EC_WORD_YET + .2byte EC_WORD_YO + .2byte EC_WORD_YOU + .2byte EC_WORD_YOU_RE + .2byte EC_WORD_YOU_VE + .2byte EC_WORD_YOUNG + .2byte EC_WORD_YOUR + .2byte EC_WORD_YOURS + .2byte EC_WORD_YUP gEasyChatWordsByLetter_Z: - ec_pokemon1 ZANGOOSE - ec_move2 ZAP_CANNON - ec_pokemon2 ZAPDOS - ec_pokemon1 ZIGZAGOON + .2byte EC_POKEMON(ZANGOOSE) + .2byte EC_MOVE2(ZAP_CANNON) + .2byte EC_POKEMON2(ZAPDOS) + .2byte EC_POKEMON(ZIGZAGOON) ec_duplicates 2 - ec_pokemon1 ZUBAT - ec_pokemon2 ZUBAT + .2byte EC_POKEMON(ZUBAT) + .2byte EC_POKEMON2(ZUBAT) gEasyChatWordsByLetter_End: .align 1 diff --git a/data/text/move_descriptions.inc b/data/text/move_descriptions.inc deleted file mode 100644 index 29e325ad7..000000000 --- a/data/text/move_descriptions.inc +++ /dev/null @@ -1,1772 +0,0 @@ -gMoveDescription_Pound: @ 83BC680 - .string "Pounds the foe with\n" - .string "forelegs or tail.$" - -gMoveDescription_KarateChop: @ 83BC6A6 - .string "A chopping attack with a\n" - .string "high critical-hit ratio.$" - -gMoveDescription_DoubleSlap: @ 83BC6D8 - .string "Repeatedly slaps the foe\n" - .string "2 to 5 times.$" - -gMoveDescription_CometPunch: @ 83BC6FF - .string "Repeatedly punches the foe\n" - .string "2 to 5 times.$" - -gMoveDescription_MegaPunch: @ 83BC728 - .string "A strong punch thrown with\n" - .string "incredible power.$" - -gMoveDescription_PayDay: @ 83BC755 - .string "Throws coins at the foe.\n" - .string "Money is recovered after.$" - -gMoveDescription_FirePunch: @ 83BC788 - .string "A fiery punch that may burn\n" - .string "the foe.$" - -gMoveDescription_IcePunch: @ 83BC7AD - .string "An icy punch that may\n" - .string "freeze the foe.$" - -gMoveDescription_ThunderPunch: @ 83BC7D3 - .string "An electrified punch that\n" - .string "may paralyze the foe.$" - -gMoveDescription_Scratch: @ 83BC803 - .string "Scratches the foe with\n" - .string "sharp claws.$" - -gMoveDescription_ViceGrip: @ 83BC827 - .string "Grips the foe with large and\n" - .string "powerful pincers.$" - -gMoveDescription_Guillotine: @ 83BC856 - .string "A powerful pincer attack\n" - .string "that may cause fainting.$" - -gMoveDescription_RazorWind: @ 83BC888 - .string "A 2-turn move that strikes\n" - .string "the foe on the 2nd turn.$" - -gMoveDescription_SwordsDance: @ 83BC8BC - .string "A fighting dance that\n" - .string "sharply raises ATTACK.$" - -gMoveDescription_Cut: @ 83BC8E9 - .string "Cuts the foe with sharp\n" - .string "scythes, claws, etc.$" - -gMoveDescription_Gust: @ 83BC916 - .string "Strikes the foe with a gust\n" - .string "of wind whipped up by wings.$" - -gMoveDescription_WingAttack: @ 83BC94F - .string "Strikes the foe with wings\n" - .string "spread wide.$" - -gMoveDescription_Whirlwind: @ 83BC977 - .string "Blows away the foe with\n" - .string "wind and ends the battle.$" - -gMoveDescription_Fly: @ 83BC9A9 - .string "Flies up on the first turn,\n" - .string "then strikes the next turn.$" - -gMoveDescription_Bind: @ 83BC9E1 - .string "Binds and squeezes the foe\n" - .string "for 2 to 5 turns.$" - -gMoveDescription_Slam: @ 83BCA0E - .string "Slams the foe with a long\n" - .string "tail, vine, etc.$" - -gMoveDescription_VineWhip: @ 83BCA39 - .string "Strikes the foe with\n" - .string "slender, whiplike vines.$" - -gMoveDescription_Stomp: @ 83BCA67 - .string "Stomps the enemy with a big\n" - .string "foot. May cause flinching.$" - -gMoveDescription_DoubleKick: @ 83BCA9E - .string "A double-kicking attack\n" - .string "that strikes the foe twice.$" - -gMoveDescription_MegaKick: @ 83BCAD2 - .string "An extremely powerful kick\n" - .string "with intense force.$" - -gMoveDescription_JumpKick: @ 83BCB01 - .string "A strong jumping kick. May\n" - .string "miss and hurt the kicker.$" - -gMoveDescription_RollingKick: @ 83BCB36 - .string "A fast kick delivered from\n" - .string "a rapid spin.$" - -gMoveDescription_SandAttack: @ 83BCB5F - .string "Reduces the foe’s accuracy\n" - .string "by hurling sand in its face.$" - -gMoveDescription_Headbutt: @ 83BCB97 - .string "A ramming attack that may\n" - .string "cause flinching.$" - -gMoveDescription_HornAttack: @ 83BCBC2 - .string "Jabs the foe with sharp\n" - .string "horns.$" - -gMoveDescription_FuryAttack: @ 83BCBE1 - .string "Jabs the foe 2 to 5 times\n" - .string "with sharp horns, etc.$" - -gMoveDescription_HornDrill: @ 83BCC12 - .string "A one-hit KO attack that\n" - .string "uses a horn like a drill.$" - -gMoveDescription_Tackle: @ 83BCC45 - .string "Charges the foe with a full-\n" - .string "body tackle.$" - -gMoveDescription_BodySlam: @ 83BCC6F - .string "A full-body slam that may\n" - .string "cause paralysis.$" - -gMoveDescription_Wrap: @ 83BCC9A - .string "Wraps and squeezes the foe\n" - .string "2 to 5 times with vines, etc.$" - -gMoveDescription_TakeDown: @ 83BCCD3 - .string "A reckless charge attack\n" - .string "that also hurts the user.$" - -gMoveDescription_Thrash: @ 83BCD06 - .string "A rampage of 2 to 3 turns\n" - .string "that confuses the user.$" - -gMoveDescription_DoubleEdge: @ 83BCD38 - .string "A life-risking tackle that\n" - .string "also hurts the user.$" - -gMoveDescription_TailWhip: @ 83BCD68 - .string "Wags the tail to lower the\n" - .string "foe’s DEFENSE.$" - -gMoveDescription_PoisonSting: @ 83BCD92 - .string "A toxic attack with barbs,\n" - .string "etc., that may poison.$" - -gMoveDescription_Twineedle: @ 83BCDC4 - .string "Stingers on the forelegs\n" - .string "jab the foe twice.$" - -gMoveDescription_PinMissile: @ 83BCDF0 - .string "Sharp pins are fired to\n" - .string "strike 2 to 5 times.$" - -gMoveDescription_Leer: @ 83BCE1D - .string "Frightens the foe with a\n" - .string "leer to lower DEFENSE.$" - -gMoveDescription_Bite: @ 83BCE4D - .string "Bites with vicious fangs.\n" - .string "May cause flinching.$" - -gMoveDescription_Growl: @ 83BCE7C - .string "Growls cutely to reduce the\n" - .string "foe’s ATTACK.$" - -gMoveDescription_Roar: @ 83BCEA6 - .string "Makes the foe flee to end\n" - .string "the battle.$" - -gMoveDescription_Sing: @ 83BCECC - .string "A soothing song lulls the\n" - .string "foe into a deep slumber.$" - -gMoveDescription_Supersonic: @ 83BCEFF - .string "Emits bizarre sound waves\n" - .string "that may confuse the foe.$" - -gMoveDescription_SonicBoom: @ 83BCF33 - .string "Launches shock waves that\n" - .string "always inflict 20 HP damage.$" - -gMoveDescription_Disable: @ 83BCF6A - .string "Psychically disables one of\n" - .string "the foe’s moves.$" - -gMoveDescription_Acid: @ 83BCF97 - .string "Sprays a hide-melting acid.\n" - .string "May lower DEFENSE.$" - -gMoveDescription_Ember: @ 83BCFC6 - .string "A weak fire attack that may\n" - .string "inflict a burn.$" - -gMoveDescription_Flamethrower: @ 83BCFF2 - .string "A powerful fire attack that\n" - .string "may inflict a burn.$" - -gMoveDescription_Mist: @ 83BD022 - .string "Creates a mist that stops\n" - .string "reduction of abilities.$" - -gMoveDescription_WaterGun: @ 83BD054 - .string "Squirts water to attack\n" - .string "the foe.$" - -gMoveDescription_HydroPump: @ 83BD075 - .string "Blasts water at high power\n" - .string "to strike the foe.$" - -gMoveDescription_Surf: @ 83BD0A3 - .string "Creates a huge wave, then\n" - .string "crashes it down on the foe.$" - -gMoveDescription_IceBeam: @ 83BD0D9 - .string "Blasts the foe with an icy\n" - .string "beam that may freeze it.$" - -gMoveDescription_Blizzard: @ 83BD10D - .string "Hits the foe with an icy\n" - .string "storm that may freeze it.$" - -gMoveDescription_Psybeam: @ 83BD140 - .string "Fires a peculiar ray that\n" - .string "may confuse the foe.$" - -gMoveDescription_BubbleBeam: @ 83BD16F - .string "Forcefully sprays bubbles\n" - .string "that may lower SPEED.$" - -gMoveDescription_AuroraBeam: @ 83BD19F - .string "Fires a rainbow-colored\n" - .string "beam that may lower ATTACK.$" - -gMoveDescription_HyperBeam: @ 83BD1D3 - .string "Powerful, but leaves the\n" - .string "user immobile the next turn.$" - -gMoveDescription_Peck: @ 83BD209 - .string "Attacks the foe with a\n" - .string "jabbing beak, etc.$" - -gMoveDescription_DrillPeck: @ 83BD233 - .string "A corkscrewing attack with\n" - .string "the beak acting as a drill.$" - -gMoveDescription_Submission: @ 83BD26A - .string "A reckless body slam that\n" - .string "also hurts the user.$" - -gMoveDescription_LowKick: @ 83BD299 - .string "A kick that inflicts more\n" - .string "damage on heavier foes.$" - -gMoveDescription_Counter: @ 83BD2CB - .string "Retaliates any physical hit\n" - .string "with double the power.$" - -gMoveDescription_SeismicToss: @ 83BD2FE - .string "Inflicts damage identical\n" - .string "to the user’s level.$" - -gMoveDescription_Strength: @ 83BD32D - .string "Builds enormous power,\n" - .string "then slams the foe.$" - -gMoveDescription_Absorb: @ 83BD358 - .string "An attack that absorbs\n" - .string "half the damage inflicted.$" - -gMoveDescription_MegaDrain: @ 83BD38A - .string "An attack that absorbs\n" - .string "half the damage inflicted.$" - -gMoveDescription_LeechSeed: @ 83BD3BC - .string "Plants a seed on the foe to\n" - .string "steal HP on every turn.$" - -gMoveDescription_Growth: @ 83BD3F0 - .string "Forces the body to grow\n" - .string "and heightens SP. ATK.$" - -gMoveDescription_RazorLeaf: @ 83BD41F - .string "Cuts the enemy with leaves.\n" - .string "High critical-hit ratio.$" - -gMoveDescription_SolarBeam: @ 83BD454 - .string "Absorbs light in one turn,\n" - .string "then attacks next turn.$" - -gMoveDescription_PoisonPowder: @ 83BD487 - .string "Scatters a toxic powder\n" - .string "that may poison the foe.$" - -gMoveDescription_StunSpore: @ 83BD4B8 - .string "Scatters a powder that may\n" - .string "paralyze the foe.$" - -gMoveDescription_SleepPowder: @ 83BD4E5 - .string "Scatters a powder that may\n" - .string "cause the foe to sleep.$" - -gMoveDescription_PetalDance: @ 83BD518 - .string "A rampage of 2 to 3 turns\n" - .string "that confuses the user.$" - -gMoveDescription_StringShot: @ 83BD54A - .string "Binds the foe with string\n" - .string "to reduce its SPEED.$" - -gMoveDescription_DragonRage: @ 83BD579 - .string "Launches shock waves that\n" - .string "always inflict 40 HP damage.$" - -gMoveDescription_FireSpin: @ 83BD5B0 - .string "Traps the foe in a ring of\n" - .string "fire for 2 to 5 turns.$" - -gMoveDescription_ThunderShock: @ 83BD5E2 - .string "An electrical attack that\n" - .string "may paralyze the foe.$" - -gMoveDescription_Thunderbolt: @ 83BD612 - .string "A strong electrical attack\n" - .string "that may paralyze the foe.$" - -gMoveDescription_ThunderWave: @ 83BD648 - .string "A weak jolt of electricity\n" - .string "that paralyzes the foe.$" - -gMoveDescription_Thunder: @ 83BD67B - .string "A lightning attack that may\n" - .string "cause paralysis.$" - -gMoveDescription_RockThrow: @ 83BD6A8 - .string "Throws small rocks to\n" - .string "strike the foe.$" - -gMoveDescription_Earthquake: @ 83BD6CE - .string "A powerful quake, but has\n" - .string "no effect on flying foes.$" - -gMoveDescription_Fissure: @ 83BD702 - .string "A one-hit KO move that\n" - .string "drops the foe in a fissure.$" - -gMoveDescription_Dig: @ 83BD735 - .string "Digs underground the first\n" - .string "turn and strikes next turn.$" - -gMoveDescription_Toxic: @ 83BD76C - .string "Poisons the foe with an\n" - .string "intensifying toxin.$" - -gMoveDescription_Confusion: @ 83BD798 - .string "A psychic attack that may\n" - .string "cause confusion.$" - -gMoveDescription_Psychic: @ 83BD7C3 - .string "A powerful psychic attack\n" - .string "that may lower SP. DEF.$" - -gMoveDescription_Hypnosis: @ 83BD7F5 - .string "A hypnotizing move that\n" - .string "may induce sleep.$" - -gMoveDescription_Meditate: @ 83BD81F - .string "Meditates in a peaceful\n" - .string "fashion to raise ATTACK.$" - -gMoveDescription_Agility: @ 83BD850 - .string "Relaxes the body to sharply\n" - .string "boost SPEED.$" - -gMoveDescription_QuickAttack: @ 83BD879 - .string "An extremely fast attack\n" - .string "that always strikes first.$" - -gMoveDescription_Rage: @ 83BD8AD - .string "Raises the user’s ATTACK\n" - .string "every time it is hit.$" - -gMoveDescription_Teleport: @ 83BD8DC - .string "A psychic move for fleeing\n" - .string "from battle instantly.$" - -gMoveDescription_NightShade: @ 83BD90E - .string "Inflicts damage identical\n" - .string "to the user’s level.$" - -gMoveDescription_Mimic: @ 83BD93D - .string "Copies a move used by the\n" - .string "foe during one battle.$" - -gMoveDescription_Screech: @ 83BD96E - .string "Emits a screech to sharply\n" - .string "reduce the foe’s DEFENSE.$" - -gMoveDescription_DoubleTeam: @ 83BD9A3 - .string "Creates illusory copies to\n" - .string "raise evasiveness.$" - -gMoveDescription_Recover: @ 83BD9D1 - .string "Recovers up to half the\n" - .string "user’s maximum HP.$" - -gMoveDescription_Harden: @ 83BD9FC - .string "Stiffens the body’s \n" - .string "muscles to raise DEFENSE.$" - -gMoveDescription_Minimize: @ 83BDA2B - .string "Minimizes the user’s size\n" - .string "to raise evasiveness.$" - -gMoveDescription_Smokescreen: @ 83BDA5B - .string "Lowers the foe’s accuracy\n" - .string "using smoke, ink, etc.$" - -gMoveDescription_ConfuseRay: @ 83BDA8C - .string "A sinister ray that\n" - .string "confuses the foe.$" - -gMoveDescription_Withdraw: @ 83BDAB2 - .string "Withdraws the body into its\n" - .string "hard shell to raise DEFENSE.$" - -gMoveDescription_DefenseCurl: @ 83BDAEB - .string "Curls up to conceal weak\n" - .string "spots and raise DEFENSE.$" - -gMoveDescription_Barrier: @ 83BDB1D - .string "Creates a barrier that\n" - .string "sharply raises DEFENSE.$" - -gMoveDescription_LightScreen: @ 83BDB4C - .string "Creates a wall of light that\n" - .string "lowers SP. ATK damage.$" - -gMoveDescription_Haze: @ 83BDB80 - .string "Creates a black haze that\n" - .string "eliminates all stat changes.$" - -gMoveDescription_Reflect: @ 83BDBB7 - .string "Creates a wall of light that\n" - .string "weakens physical attacks.$" - -gMoveDescription_FocusEnergy: @ 83BDBEE - .string "Focuses power to raise the\n" - .string "critical-hit ratio.$" - -gMoveDescription_Bide: @ 83BDC1D - .string "Endures attack for 2\n" - .string "turns to retaliate double.$" - -gMoveDescription_Metronome: @ 83BDC4D - .string "Waggles a finger to use any\n" - .string "POKéMON move at random.$" - -gMoveDescription_MirrorMove: @ 83BDC81 - .string "Counters the foe’s attack\n" - .string "with the same move.$" - -gMoveDescription_SelfDestruct: @ 83BDCAF - .string "Inflicts severe damage but\n" - .string "makes the user faint.$" - -gMoveDescription_EggBomb: @ 83BDCE0 - .string "An egg is forcibly hurled at\n" - .string "the foe.$" - -gMoveDescription_Lick: @ 83BDD06 - .string "Licks with a long tongue to\n" - .string "injure. May also paralyze.$" - -gMoveDescription_Smog: @ 83BDD3D - .string "An exhaust-gas attack\n" - .string "that may also poison.$" - -gMoveDescription_Sludge: @ 83BDD69 - .string "Sludge is hurled to inflict\n" - .string "damage. May also poison.$" - -gMoveDescription_BoneClub: @ 83BDD9E - .string "Clubs the foe with a bone.\n" - .string "May cause flinching.$" - -gMoveDescription_FireBlast: @ 83BDDCE - .string "A fiery blast that scorches\n" - .string "all. May cause a burn.$" - -gMoveDescription_Waterfall: @ 83BDE01 - .string "Charges the foe with speed\n" - .string "to climb waterfalls.$" - -gMoveDescription_Clamp: @ 83BDE31 - .string "Traps and squeezes the\n" - .string "foe for 2 to 5 turns.$" - -gMoveDescription_Swift: @ 83BDE5E - .string "Sprays star-shaped rays\n" - .string "that never miss.$" - -gMoveDescription_SkullBash: @ 83BDE87 - .string "Tucks in the head, then\n" - .string "attacks on the next turn.$" - -gMoveDescription_SpikeCannon: @ 83BDEB9 - .string "Launches sharp spikes that\n" - .string "strike 2 to 5 times.$" - -gMoveDescription_Constrict: @ 83BDEE9 - .string "Constricts to inflict pain.\n" - .string "May lower SPEED.$" - -gMoveDescription_Amnesia: @ 83BDF16 - .string "Forgets about something\n" - .string "and sharply raises SP. DEF.$" - -gMoveDescription_Kinesis: @ 83BDF4A - .string "Distracts the foe.\n" - .string "May lower accuracy.$" - -gMoveDescription_SoftBoiled: @ 83BDF71 - .string "Recovers up to half the\n" - .string "user’s maximum HP.$" - -gMoveDescription_HiJumpKick: @ 83BDF9C - .string "A jumping knee kick. If it\n" - .string "misses, the user is hurt.$" - -gMoveDescription_Glare: @ 83BDFD1 - .string "Intimidates and frightens\n" - .string "the foe into paralysis.$" - -gMoveDescription_DreamEater: @ 83BE003 - .string "Takes one half the damage\n" - .string "inflicted on a sleeping foe.$" - -gMoveDescription_PoisonGas: @ 83BE03A - .string "Envelops the foe in a toxic\n" - .string "gas that may poison.$" - -gMoveDescription_Barrage: @ 83BE06B - .string "Hurls round objects at the\n" - .string "foe 2 to 5 times.$" - -gMoveDescription_LeechLife: @ 83BE098 - .string "An attack that steals half\n" - .string "the damage inflicted.$" - -gMoveDescription_LovelyKiss: @ 83BE0C9 - .string "Demands a kiss with a scary\n" - .string "face that induces sleep.$" - -gMoveDescription_SkyAttack: @ 83BE0FE - .string "Searches out weak spots,\n" - .string "then strikes the next turn.$" - -gMoveDescription_Transform: @ 83BE133 - .string "Alters the user’s cells to\n" - .string "become a copy of the foe.$" - -gMoveDescription_Bubble: @ 83BE168 - .string "An attack using bubbles.\n" - .string "May lower the foe’s SPEED.$" - -gMoveDescription_DizzyPunch: @ 83BE19C - .string "A rhythmic punch that may\n" - .string "confuse the foe.$" - -gMoveDescription_Spore: @ 83BE1C7 - .string "Scatters a cloud of spores\n" - .string "that always induce sleep.$" - -gMoveDescription_Flash: @ 83BE1FC - .string "Looses a powerful blast of\n" - .string "light that cuts accuracy.$" - -gMoveDescription_Psywave: @ 83BE231 - .string "Attacks with a psychic\n" - .string "wave of varying intensity.$" - -gMoveDescription_Splash: @ 83BE263 - .string "It’s just a splash...\n" - .string "Has no effect whatsoever.$" - -gMoveDescription_AcidArmor: @ 83BE293 - .string "Liquifies the user’s body\n" - .string "to sharply raise DEFENSE.$" - -gMoveDescription_Crabhammer: @ 83BE2C7 - .string "Hammers with a pincer. Has a\n" - .string "high critical-hit ratio.$" - -gMoveDescription_Explosion: @ 83BE2FD - .string "Inflicts severe damage but\n" - .string "makes the user faint.$" - -gMoveDescription_FurySwipes: @ 83BE32E - .string "Rakes the foe with sharp\n" - .string "claws, etc., 2 to 5 times.$" - -gMoveDescription_Bonemerang: @ 83BE362 - .string "Throws a bone boomerang\n" - .string "that strikes twice.$" - -gMoveDescription_Rest: @ 83BE38E - .string "The user sleeps for 2 turns,\n" - .string "restoring HP and status.$" - -gMoveDescription_RockSlide: @ 83BE3C4 - .string "Large boulders are hurled.\n" - .string "May cause flinching.$" - -gMoveDescription_HyperFang: @ 83BE3F4 - .string "Attacks with sharp fangs.\n" - .string "May cause flinching.$" - -gMoveDescription_Sharpen: @ 83BE423 - .string "Reduces the polygon count\n" - .string "and raises ATTACK.$" - -gMoveDescription_Conversion: @ 83BE450 - .string "Changes the user’s type\n" - .string "into an own move’s type.$" - -gMoveDescription_TriAttack: @ 83BE481 - .string "Fires three types of beams\n" - .string "at the same time.$" - -gMoveDescription_SuperFang: @ 83BE4AE - .string "Attacks with sharp fangs\n" - .string "and cuts half the foe’s HP.$" - -gMoveDescription_Slash: @ 83BE4E3 - .string "Slashes with claws, etc. Has\n" - .string "a high critical-hit ratio.$" - -gMoveDescription_Substitute: @ 83BE51B - .string "Creates a decoy using 1/4\n" - .string "of the user’s maximum HP.$" - -gMoveDescription_Struggle: @ 83BE54F - .string "Used only if all PP are gone.\n" - .string "Also hurts the user a little.$" - -gMoveDescription_Sketch: @ 83BE58B - .string "Copies the foe’s last move\n" - .string "permanently.$" - -gMoveDescription_TripleKick: @ 83BE5B3 - .string "Kicks the foe 3 times in a\n" - .string "row with rising intensity.$" - -gMoveDescription_Thief: @ 83BE5E9 - .string "While attacking, it may\n" - .string "steal the foe’s held item.$" - -gMoveDescription_SpiderWeb: @ 83BE61C - .string "Ensnares the foe to stop it\n" - .string "from fleeing or switching.$" - -gMoveDescription_MindReader: @ 83BE653 - .string "Senses the foe’s action to\n" - .string "ensure the next move’s hit.$" - -gMoveDescription_Nightmare: @ 83BE68A - .string "Inflicts 1/4 damage on a\n" - .string "sleeping foe every turn.$" - -gMoveDescription_FlameWheel: @ 83BE6BC - .string "A fiery charge attack that\n" - .string "may inflict a burn.$" - -gMoveDescription_Snore: @ 83BE6EB - .string "A loud attack that can be\n" - .string "used only while asleep.$" - -gMoveDescription_Curse: @ 83BE71D - .string "A move that functions\n" - .string "differently for GHOSTS.$" - -gMoveDescription_Flail: @ 83BE74B - .string "Inflicts more damage when\n" - .string "the user’s HP is down.$" - -gMoveDescription_Conversion2: @ 83BE77C - .string "Makes the user resistant\n" - .string "to the last attack’s type.$" - -gMoveDescription_Aeroblast: @ 83BE7B0 - .string "Launches a vacuumed blast.\n" - .string "High critical-hit ratio.$" - -gMoveDescription_CottonSpore: @ 83BE7E4 - .string "Spores cling to the foe,\n" - .string "sharply reducing SPEED.$" - -gMoveDescription_Reversal: @ 83BE815 - .string "Inflicts more damage when\n" - .string "the user’s HP is down.$" - -gMoveDescription_Spite: @ 83BE846 - .string "Spitefully cuts the PP\n" - .string "of the foe’s last move.$" - -gMoveDescription_PowderSnow: @ 83BE875 - .string "Blasts the foe with a snowy\n" - .string "gust. May cause freezing.$" - -gMoveDescription_Protect: @ 83BE8AB - .string "Evades attack, but may fail\n" - .string "if used in succession.$" - -gMoveDescription_MachPunch: @ 83BE8DE - .string "A punch is thrown at wicked\n" - .string "speed to strike first.$" - -gMoveDescription_ScaryFace: @ 83BE911 - .string "Frightens with a scary face\n" - .string "to sharply reduce SPEED.$" - -gMoveDescription_FaintAttack: @ 83BE946 - .string "Draws the foe close, then\n" - .string "strikes without fail.$" - -gMoveDescription_SweetKiss: @ 83BE976 - .string "Demands a kiss with a cute\n" - .string "look. May cause confusion.$" - -gMoveDescription_BellyDrum: @ 83BE9AC - .string "Maximizes ATTACK while\n" - .string "sacrificing HP.$" - -gMoveDescription_SludgeBomb: @ 83BE9D3 - .string "Sludge is hurled to inflict\n" - .string "damage. May also poison.$" - -gMoveDescription_MudSlap: @ 83BEA08 - .string "Hurls mud in the foe’s face\n" - .string "to reduce its accuracy.$" - -gMoveDescription_Octazooka: @ 83BEA3C - .string "Fires a lump of ink to\n" - .string "damage and cut accuracy.$" - -gMoveDescription_Spikes: @ 83BEA6C - .string "Sets spikes that hurt a \n" - .string "foe switching out.$" - -gMoveDescription_ZapCannon: @ 83BEA98 - .string "Powerful and sure to cause\n" - .string "paralysis, but inaccurate.$" - -gMoveDescription_Foresight: @ 83BEACE - .string "Negates the foe’s efforts\n" - .string "to heighten evasiveness.$" - -gMoveDescription_DestinyBond: @ 83BEB01 - .string "If the user faints, the foe\n" - .string "is also made to faint.$" - -gMoveDescription_PerishSong: @ 83BEB34 - .string "Any POKéMON hearing this\n" - .string "song faints in 3 turns.$" - -gMoveDescription_IcyWind: @ 83BEB65 - .string "A chilling attack that\n" - .string "lowers the foe’s SPEED.$" - -gMoveDescription_Detect: @ 83BEB94 - .string "Evades attack, but may fail\n" - .string "if used in succession.$" - -gMoveDescription_BoneRush: @ 83BEBC7 - .string "Strikes the foe with a bone\n" - .string "in hand 2 to 5 times.$" - -gMoveDescription_LockOn: @ 83BEBF9 - .string "Locks on to the foe to\n" - .string "ensure the next move hits.$" - -gMoveDescription_Outrage: @ 83BEC2B - .string "A rampage of 2 to 3 turns\n" - .string "that confuses the user.$" - -gMoveDescription_Sandstorm: @ 83BEC5D - .string "Causes a sandstorm that\n" - .string "rages for several turns.$" - -gMoveDescription_GigaDrain: @ 83BEC8E - .string "An attack that steals half\n" - .string "the damage inflicted.$" - -gMoveDescription_Endure: @ 83BECBF - .string "Endures any attack for\n" - .string "1 turn, leaving at least 1HP.$" - -gMoveDescription_Charm: @ 83BECF4 - .string "Charms the foe and sharply\n" - .string "reduces its ATTACK.$" - -gMoveDescription_Rollout: @ 83BED23 - .string "An attack lasting 5 turns\n" - .string "with rising intensity.$" - -gMoveDescription_FalseSwipe: @ 83BED54 - .string "An attack that leaves the\n" - .string "foe with at least 1 HP.$" - -gMoveDescription_Swagger: @ 83BED86 - .string "Confuses the foe, but also\n" - .string "sharply raises ATTACK.$" - -gMoveDescription_MilkDrink: @ 83BEDB8 - .string "Recovers up to half the\n" - .string "user’s maximum HP.$" - -gMoveDescription_Spark: @ 83BEDE3 - .string "An electrified tackle that\n" - .string "may paralyze the foe.$" - -gMoveDescription_FuryCutter: @ 83BEE14 - .string "An attack that intensifies\n" - .string "on each successive hit.$" - -gMoveDescription_SteelWing: @ 83BEE47 - .string "Strikes the foe with hard\n" - .string "wings spread wide.$" - -gMoveDescription_MeanLook: @ 83BEE74 - .string "Fixes the foe with a mean\n" - .string "look that prevents escape.$" - -gMoveDescription_Attract: @ 83BEEA9 - .string "Makes the opposite gender\n" - .string "less likely to attack.$" - -gMoveDescription_SleepTalk: @ 83BEEDA - .string "Uses an own move randomly\n" - .string "while asleep.$" - -gMoveDescription_HealBell: @ 83BEF02 - .string "Chimes soothingly to heal\n" - .string "all status abnormalities.$" - -gMoveDescription_Return: @ 83BEF36 - .string "An attack that increases\n" - .string "in power with friendship.$" - -gMoveDescription_Present: @ 83BEF69 - .string "A gift in the form of a\n" - .string "bomb. May restore HP.$" - -gMoveDescription_Frustration: @ 83BEF97 - .string "An attack that is stronger\n" - .string "if the TRAINER is disliked.$" - -gMoveDescription_Safeguard: @ 83BEFCE - .string "A mystical force prevents\n" - .string "all status problems.$" - -gMoveDescription_PainSplit: @ 83BEFFD - .string "Adds the user and foe’s HP,\n" - .string "then shares them equally.$" - -gMoveDescription_SacredFire: @ 83BF033 - .string "A mystical fire attack that\n" - .string "may inflict a burn.$" - -gMoveDescription_Magnitude: @ 83BF063 - .string "A ground-shaking attack\n" - .string "of random intensity.$" - -gMoveDescription_DynamicPunch: @ 83BF090 - .string "Powerful and sure to cause\n" - .string "confusion, but inaccurate.$" - -gMoveDescription_Megahorn: @ 83BF0C6 - .string "A brutal ramming attack\n" - .string "using out-thrust horns.$" - -gMoveDescription_DragonBreath: @ 83BF0F6 - .string "Strikes the foe with an\n" - .string "incredible blast of breath.$" - -gMoveDescription_BatonPass: @ 83BF12A - .string "Switches out the user while\n" - .string "keeping effects in play.$" - -gMoveDescription_Encore: @ 83BF15F - .string "Makes the foe repeat its\n" - .string "last move over 2 to 6 turns.$" - -gMoveDescription_Pursuit: @ 83BF195 - .string "Inflicts bad damage if used\n" - .string "on a foe switching out.$" - -gMoveDescription_RapidSpin: @ 83BF1C9 - .string "Spins the body at high\n" - .string "speed to strike the foe.$" - -gMoveDescription_SweetScent: @ 83BF1F9 - .string "Allures the foe to reduce\n" - .string "evasiveness.$" - -gMoveDescription_IronTail: @ 83BF220 - .string "Attacks with a rock-hard\n" - .string "tail. May lower DEFENSE.$" - -gMoveDescription_MetalClaw: @ 83BF252 - .string "A claw attack that may\n" - .string "raise the user’s ATTACK.$" - -gMoveDescription_VitalThrow: @ 83BF282 - .string "Makes the user’s move last,\n" - .string "but it never misses.$" - -gMoveDescription_MorningSun: @ 83BF2B3 - .string "Restores HP. The amount\n" - .string "varies with the weather.$" - -gMoveDescription_Synthesis: @ 83BF2E4 - .string "Restores HP. The amount\n" - .string "varies with the weather.$" - -gMoveDescription_Moonlight: @ 83BF315 - .string "Restores HP. The amount\n" - .string "varies with the weather.$" - -gMoveDescription_HiddenPower: @ 83BF346 - .string "The effectiveness varies\n" - .string "with the user.$" - -gMoveDescription_CrossChop: @ 83BF36E - .string "A double-chopping attack.\n" - .string "High critical-hit ratio.$" - -gMoveDescription_Twister: @ 83BF3A1 - .string "Whips up a vicious twister\n" - .string "to tear at the foe.$" - -gMoveDescription_RainDance: @ 83BF3D0 - .string "Boosts the power of WATER-\n" - .string "type moves for 5 turns.$" - -gMoveDescription_SunnyDay: @ 83BF403 - .string "Boosts the power of FIRE-\n" - .string "type moves for 5 turns.$" - -gMoveDescription_Crunch: @ 83BF435 - .string "Crunches with sharp fangs.\n" - .string "May lower SP. DEF.$" - -gMoveDescription_MirrorCoat: @ 83BF463 - .string "Counters the foe’s special\n" - .string "attack at double the power.$" - -gMoveDescription_PsychUp: @ 83BF49A - .string "Copies the foe’s effect(s)\n" - .string "and gives to the user.$" - -gMoveDescription_ExtremeSpeed: @ 83BF4CC - .string "An extremely fast and\n" - .string "powerful attack.$" - -gMoveDescription_AncientPower: @ 83BF4F3 - .string "An attack that may raise\n" - .string "all stats.$" - -gMoveDescription_ShadowBall: @ 83BF517 - .string "Hurls a black blob that may\n" - .string "lower the foe’s SP. DEF.$" - -gMoveDescription_FutureSight: @ 83BF54C - .string "Heightens inner power to\n" - .string "strike 2 turns later.$" - -gMoveDescription_RockSmash: @ 83BF57B - .string "A rock-crushing attack\n" - .string "that may lower DEFENSE.$" - -gMoveDescription_Whirlpool: @ 83BF5AA - .string "Traps and hurts the foe in\n" - .string "a whirlpool for 2 to 5 turns.$" - -gMoveDescription_BeatUp: @ 83BF5E3 - .string "Summons party POKéMON to\n" - .string "join in the attack.$" - -gMoveDescription_FakeOut: @ 83BF610 - .string "A 1st-turn, 1st-strike move\n" - .string "that causes flinching.$" - -gMoveDescription_Uproar: @ 83BF643 - .string "Causes an uproar for 2 to 5\n" - .string "turns and prevents sleep.$" - -gMoveDescription_Stockpile: @ 83BF679 - .string "Charges up power for up to\n" - .string "3 turns.$" - -gMoveDescription_SpitUp: @ 83BF69D - .string "Releases stockpiled power\n" - .string "(the more the better).$" - -gMoveDescription_Swallow: @ 83BF6CE - .string "Absorbs stockpiled power\n" - .string "and restores HP.$" - -gMoveDescription_HeatWave: @ 83BF6F8 - .string "Exhales a hot breath on the\n" - .string "foe. May inflict a burn.$" - -gMoveDescription_Hail: @ 83BF72D - .string "Summons a hailstorm that\n" - .string "strikes every turn.$" - -gMoveDescription_Torment: @ 83BF75A - .string "Torments the foe and stops\n" - .string "successive use of a move.$" - -gMoveDescription_Flatter: @ 83BF78F - .string "Confuses the foe, but\n" - .string "raises its SP. ATK.$" - -gMoveDescription_WillOWisp: @ 83BF7B9 - .string "Inflicts a burn on the foe\n" - .string "with intense fire.$" - -gMoveDescription_Memento: @ 83BF7E7 - .string "The user faints and lowers\n" - .string "the foe’s abilities.$" - -gMoveDescription_Facade: @ 83BF817 - .string "Boosts ATTACK when burned,\n" - .string "paralyzed, or poisoned.$" - -gMoveDescription_FocusPunch: @ 83BF84A - .string "A powerful loyalty attack.\n" - .string "The user flinches if hit.$" - -gMoveDescription_SmellingSalt: @ 83BF87F - .string "Powerful against paralyzed\n" - .string "foes, but also heals them.$" - -gMoveDescription_FollowMe: @ 83BF8B5 - .string "Draws attention to make\n" - .string "foes attack only the user.$" - -gMoveDescription_NaturePower: @ 83BF8E8 - .string "The type of attack varies\n" - .string "depending on the location.$" - -gMoveDescription_Charge: @ 83BF91D - .string "Charges power to boost the\n" - .string "electric move used next.$" - -gMoveDescription_Taunt: @ 83BF951 - .string "Taunts the foe into only\n" - .string "using attack moves.$" - -gMoveDescription_HelpingHand: @ 83BF97E - .string "Boosts the power of the\n" - .string "recipient’s moves.$" - -gMoveDescription_Trick: @ 83BF9A9 - .string "Tricks the foe into trading\n" - .string "held items.$" - -gMoveDescription_RolePlay: @ 83BF9D1 - .string "Mimics the target and\n" - .string "copies its special ability.$" - -gMoveDescription_Wish: @ 83BFA03 - .string "A wish that restores HP.\n" - .string "It takes time to work.$" - -gMoveDescription_Assist: @ 83BFA33 - .string "Attacks randomly with one\n" - .string "of the partner’s moves.$" - -gMoveDescription_Ingrain: @ 83BFA65 - .string "Lays roots that restore HP.\n" - .string "The user can’t switch out.$" - -gMoveDescription_Superpower: @ 83BFA9C - .string "Boosts strength sharply,\n" - .string "but lowers abilities.$" - -gMoveDescription_MagicCoat: @ 83BFACB - .string "Reflects special effects\n" - .string "back to the attacker.$" - -gMoveDescription_Recycle: @ 83BFAFA - .string "Recycles a used item for\n" - .string "one more use.$" - -gMoveDescription_Revenge: @ 83BFB21 - .string "An attack that gains power\n" - .string "if injured by the foe.$" - -gMoveDescription_BrickBreak: @ 83BFB53 - .string "Destroys barriers such as\n" - .string "REFLECT and causes damage.$" - -gMoveDescription_Yawn: @ 83BFB88 - .string "Lulls the foe into yawning,\n" - .string "then sleeping next turn.$" - -gMoveDescription_KnockOff: @ 83BFBBD - .string "Knocks down the foe’s held\n" - .string "item to prevent its use.$" - -gMoveDescription_Endeavor: @ 83BFBF1 - .string "Gains power if the user’s HP\n" - .string "is lower than the foe’s HP.$" - -gMoveDescription_Eruption: @ 83BFC2A - .string "The higher the user’s HP,\n" - .string "the more damage caused.$" - -gMoveDescription_SkillSwap: @ 83BFC5C - .string "The user swaps special\n" - .string "abilities with the target.$" - -gMoveDescription_Imprison: @ 83BFC8E - .string "Prevents foes from using\n" - .string "moves known by the user.$" - -gMoveDescription_Refresh: @ 83BFCC0 - .string "Heals poisoning, paralysis,\n" - .string "or a burn.$" - -gMoveDescription_Grudge: @ 83BFCE7 - .string "If the user faints, deletes\n" - .string "the PP of the final move.$" - -gMoveDescription_Snatch: @ 83BFD1D - .string "Steals the effects of the\n" - .string "move the foe uses next.$" - -gMoveDescription_SecretPower: @ 83BFD4F - .string "An attack with effects\n" - .string "that vary by location.$" - -gMoveDescription_Dive: @ 83BFD7D - .string "Dives underwater the first\n" - .string "turn and strikes next turn.$" - -gMoveDescription_ArmThrust: @ 83BFDB4 - .string "Straight-arm punches that\n" - .string "strike the foe 2 to 5 times.$" - -gMoveDescription_Camouflage: @ 83BFDEB - .string "Alters the POKéMON’s type\n" - .string "depending on the location.$" - -gMoveDescription_TailGlow: @ 83BFE20 - .string "Flashes a light that sharply\n" - .string "raises SP. ATK.$" - -gMoveDescription_LusterPurge: @ 83BFE4D - .string "Attacks with a burst of\n" - .string "light. May lower SP. DEF.$" - -gMoveDescription_MistBall: @ 83BFE7F - .string "Attacks with a flurry of\n" - .string "down. May lower SP. ATK.$" - -gMoveDescription_FeatherDance: @ 83BFEB1 - .string "Envelops the foe with down\n" - .string "to sharply reduce ATTACK.$" - -gMoveDescription_TeeterDance: @ 83BFEE6 - .string "Confuses all POKéMON on\n" - .string "the scene.$" - -gMoveDescription_BlazeKick: @ 83BFF09 - .string "A kick with a high critical-\n" - .string "hit ratio. May cause a burn.$" - -gMoveDescription_MudSport: @ 83BFF43 - .string "Covers the user in mud to\n" - .string "raise electrical resistance.$" - -gMoveDescription_IceBall: @ 83BFF7A - .string "A 5-turn attack that gains\n" - .string "power on successive hits.$" - -gMoveDescription_NeedleArm: @ 83BFFAF - .string "Attacks with thorny arms.\n" - .string "May cause flinching.$" - -gMoveDescription_SlackOff: @ 83BFFDE - .string "Slacks off and restores\n" - .string "half the maximum HP.$" - -gMoveDescription_HyperVoice: @ 83C000B - .string "A loud attack that uses\n" - .string "sound waves to injure.$" - -gMoveDescription_PoisonFang: @ 83C003A - .string "A sharp-fanged attack.\n" - .string "May badly poison the foe.$" - -gMoveDescription_CrushClaw: @ 83C006B - .string "Tears at the foe with sharp\n" - .string "claws. May lower DEFENSE.$" - -gMoveDescription_BlastBurn: @ 83C00A1 - .string "Powerful, but leaves the\n" - .string "user immobile the next turn.$" - -gMoveDescription_HydroCannon: @ 83C00D7 - .string "Powerful, but leaves the\n" - .string "user immobile the next turn.$" - -gMoveDescription_MeteorMash: @ 83C010D - .string "Fires a meteor-like punch.\n" - .string "May raise ATTACK.$" - -gMoveDescription_Astonish: @ 83C013A - .string "An attack that may shock\n" - .string "the foe into flinching.$" - -gMoveDescription_WeatherBall: @ 83C016B - .string "The move’s type and power\n" - .string "change with the weather.$" - -gMoveDescription_Aromatherapy: @ 83C019E - .string "Heals all status problems\n" - .string "with a soothing scent.$" - -gMoveDescription_FakeTears: @ 83C01CF - .string "Feigns crying to sharply\n" - .string "lower the foe’s SP. DEF.$" - -gMoveDescription_AirCutter: @ 83C0201 - .string "Hacks with razorlike wind.\n" - .string "High critical-hit ratio.$" - -gMoveDescription_Overheat: @ 83C0235 - .string "Allows a full-power attack,\n" - .string "but sharply lowers SP. ATK.$" - -gMoveDescription_OdorSleuth: @ 83C026D - .string "Negates the foe’s efforts\n" - .string "to heighten evasiveness.$" - -gMoveDescription_RockTomb: @ 83C02A0 - .string "Stops the foe from moving\n" - .string "with rocks and cuts SPEED.$" - -gMoveDescription_SilverWind: @ 83C02D5 - .string "A powdery attack that may\n" - .string "raise abilities.$" - -gMoveDescription_MetalSound: @ 83C0300 - .string "Emits a horrible screech\n" - .string "that sharply lowers SP. DEF.$" - -gMoveDescription_GrassWhistle: @ 83C0336 - .string "Lulls the foe into sleep\n" - .string "with a pleasant melody.$" - -gMoveDescription_Tickle: @ 83C0367 - .string "Makes the foe laugh to\n" - .string "lower ATTACK and DEFENSE.$" - -gMoveDescription_CosmicPower: @ 83C0398 - .string "Raises DEFENSE and SP. DEF\n" - .string "with a mystic power.$" - -gMoveDescription_WaterSpout: @ 83C03C8 - .string "Inflicts more damage if the\n" - .string "user’s HP is high.$" - -gMoveDescription_SignalBeam: @ 83C03F7 - .string "A strange beam attack that\n" - .string "may confuse the foe.$" - -gMoveDescription_ShadowPunch: @ 83C0427 - .string "An unavoidable punch that\n" - .string "is thrown from shadows.$" - -gMoveDescription_Extrasensory: @ 83C0459 - .string "Attacks with a peculiar\n" - .string "power. May cause flinching.$" - -gMoveDescription_SkyUppercut: @ 83C048D - .string "An uppercut thrown as if\n" - .string "leaping into the sky.$" - -gMoveDescription_SandTomb: @ 83C04BC - .string "Traps and hurts the foe in\n" - .string "quicksand for 2 to 5 turns.$" - -gMoveDescription_SheerCold: @ 83C04F3 - .string "A chilling attack that\n" - .string "causes fainting if it hits.$" - -gMoveDescription_MuddyWater: @ 83C0526 - .string "Attacks with muddy water.\n" - .string "May lower accuracy.$" - -gMoveDescription_BulletSeed: @ 83C0554 - .string "Shoots 2 to 5 seeds in a row\n" - .string "to strike the foe.$" - -gMoveDescription_AerialAce: @ 83C0584 - .string "An extremely speedy and\n" - .string "unavoidable attack.$" - -gMoveDescription_IcicleSpear: @ 83C05B0 - .string "Attacks the foe by firing\n" - .string "2 to 5 icicles in a row.$" - -gMoveDescription_IronDefense: @ 83C05E3 - .string "Hardens the body’s surface\n" - .string "to sharply raise DEFENSE.$" - -gMoveDescription_Block: @ 83C0618 - .string "Blocks the foe’s way to\n" - .string "prevent escape.$" - -gMoveDescription_Howl: @ 83C0640 - .string "Howls to raise the spirit\n" - .string "and boosts ATTACK.$" - -gMoveDescription_DragonClaw: @ 83C066D - .string "Slashes the foe with sharp\n" - .string "claws.$" - -gMoveDescription_FrenzyPlant: @ 83C068F - .string "Powerful, but leaves the\n" - .string "user immobile the next turn.$" - -gMoveDescription_BulkUp: @ 83C06C5 - .string "Bulks up the body to boost\n" - .string "both ATTACK and DEFENSE.$" - -gMoveDescription_Bounce: @ 83C06F9 - .string "Bounces up, then down the\n" - .string "next turn. May paralyze.$" - -gMoveDescription_MudShot: @ 83C072C - .string "Hurls mud at the foe and\n" - .string "reduces SPEED.$" - -gMoveDescription_PoisonTail: @ 83C0754 - .string "Has a high critical-hit\n" - .string "ratio. May also poison.$" - -gMoveDescription_Covet: @ 83C0784 - .string "Cutely begs to obtain an\n" - .string "item held by the foe.$" - -gMoveDescription_VoltTackle: @ 83C07B3 - .string "A life-risking tackle that\n" - .string "slightly hurts the user.$" - -gMoveDescription_MagicalLeaf: @ 83C07E7 - .string "Attacks with a strange leaf\n" - .string "that cannot be evaded.$" - -gMoveDescription_WaterSport: @ 83C081A - .string "The user becomes soaked to\n" - .string "raise resistance to fire.$" - -gMoveDescription_CalmMind: @ 83C084F - .string "Raises SP. ATK and SP. DEF\n" - .string "by focusing the mind.$" - -gMoveDescription_LeafBlade: @ 83C0880 - .string "Slashes with a sharp leaf.\n" - .string "High critical-hit ratio.$" - -gMoveDescription_DragonDance: @ 83C08B4 - .string "A mystical dance that ups\n" - .string "ATTACK and SPEED.$" - -gMoveDescription_RockBlast: @ 83C08E0 - .string "Hurls boulders at the foe\n" - .string "2 to 5 times in a row.$" - -gMoveDescription_ShockWave: @ 83C0911 - .string "A fast and unavoidable\n" - .string "electric attack.$" - -gMoveDescription_WaterPulse: @ 83C0939 - .string "Attacks with ultrasonic\n" - .string "waves. May confuse the foe$" - -gMoveDescription_DoomDesire: @ 83C096C - .string "Summons strong sunlight to\n" - .string "attack 2 turns later.$" - -gMoveDescription_PsychoBoost: @ 83C099D - .string "Allows a full-power attack,\n" - .string "but sharply lowers SP. ATK.$" - - .align 2 -gMoveDescriptions:: @ 83C09D8 - .4byte gMoveDescription_Pound - .4byte gMoveDescription_KarateChop - .4byte gMoveDescription_DoubleSlap - .4byte gMoveDescription_CometPunch - .4byte gMoveDescription_MegaPunch - .4byte gMoveDescription_PayDay - .4byte gMoveDescription_FirePunch - .4byte gMoveDescription_IcePunch - .4byte gMoveDescription_ThunderPunch - .4byte gMoveDescription_Scratch - .4byte gMoveDescription_ViceGrip - .4byte gMoveDescription_Guillotine - .4byte gMoveDescription_RazorWind - .4byte gMoveDescription_SwordsDance - .4byte gMoveDescription_Cut - .4byte gMoveDescription_Gust - .4byte gMoveDescription_WingAttack - .4byte gMoveDescription_Whirlwind - .4byte gMoveDescription_Fly - .4byte gMoveDescription_Bind - .4byte gMoveDescription_Slam - .4byte gMoveDescription_VineWhip - .4byte gMoveDescription_Stomp - .4byte gMoveDescription_DoubleKick - .4byte gMoveDescription_MegaKick - .4byte gMoveDescription_JumpKick - .4byte gMoveDescription_RollingKick - .4byte gMoveDescription_SandAttack - .4byte gMoveDescription_Headbutt - .4byte gMoveDescription_HornAttack - .4byte gMoveDescription_FuryAttack - .4byte gMoveDescription_HornDrill - .4byte gMoveDescription_Tackle - .4byte gMoveDescription_BodySlam - .4byte gMoveDescription_Wrap - .4byte gMoveDescription_TakeDown - .4byte gMoveDescription_Thrash - .4byte gMoveDescription_DoubleEdge - .4byte gMoveDescription_TailWhip - .4byte gMoveDescription_PoisonSting - .4byte gMoveDescription_Twineedle - .4byte gMoveDescription_PinMissile - .4byte gMoveDescription_Leer - .4byte gMoveDescription_Bite - .4byte gMoveDescription_Growl - .4byte gMoveDescription_Roar - .4byte gMoveDescription_Sing - .4byte gMoveDescription_Supersonic - .4byte gMoveDescription_SonicBoom - .4byte gMoveDescription_Disable - .4byte gMoveDescription_Acid - .4byte gMoveDescription_Ember - .4byte gMoveDescription_Flamethrower - .4byte gMoveDescription_Mist - .4byte gMoveDescription_WaterGun - .4byte gMoveDescription_HydroPump - .4byte gMoveDescription_Surf - .4byte gMoveDescription_IceBeam - .4byte gMoveDescription_Blizzard - .4byte gMoveDescription_Psybeam - .4byte gMoveDescription_BubbleBeam - .4byte gMoveDescription_AuroraBeam - .4byte gMoveDescription_HyperBeam - .4byte gMoveDescription_Peck - .4byte gMoveDescription_DrillPeck - .4byte gMoveDescription_Submission - .4byte gMoveDescription_LowKick - .4byte gMoveDescription_Counter - .4byte gMoveDescription_SeismicToss - .4byte gMoveDescription_Strength - .4byte gMoveDescription_Absorb - .4byte gMoveDescription_MegaDrain - .4byte gMoveDescription_LeechSeed - .4byte gMoveDescription_Growth - .4byte gMoveDescription_RazorLeaf - .4byte gMoveDescription_SolarBeam - .4byte gMoveDescription_PoisonPowder - .4byte gMoveDescription_StunSpore - .4byte gMoveDescription_SleepPowder - .4byte gMoveDescription_PetalDance - .4byte gMoveDescription_StringShot - .4byte gMoveDescription_DragonRage - .4byte gMoveDescription_FireSpin - .4byte gMoveDescription_ThunderShock - .4byte gMoveDescription_Thunderbolt - .4byte gMoveDescription_ThunderWave - .4byte gMoveDescription_Thunder - .4byte gMoveDescription_RockThrow - .4byte gMoveDescription_Earthquake - .4byte gMoveDescription_Fissure - .4byte gMoveDescription_Dig - .4byte gMoveDescription_Toxic - .4byte gMoveDescription_Confusion - .4byte gMoveDescription_Psychic - .4byte gMoveDescription_Hypnosis - .4byte gMoveDescription_Meditate - .4byte gMoveDescription_Agility - .4byte gMoveDescription_QuickAttack - .4byte gMoveDescription_Rage - .4byte gMoveDescription_Teleport - .4byte gMoveDescription_NightShade - .4byte gMoveDescription_Mimic - .4byte gMoveDescription_Screech - .4byte gMoveDescription_DoubleTeam - .4byte gMoveDescription_Recover - .4byte gMoveDescription_Harden - .4byte gMoveDescription_Minimize - .4byte gMoveDescription_Smokescreen - .4byte gMoveDescription_ConfuseRay - .4byte gMoveDescription_Withdraw - .4byte gMoveDescription_DefenseCurl - .4byte gMoveDescription_Barrier - .4byte gMoveDescription_LightScreen - .4byte gMoveDescription_Haze - .4byte gMoveDescription_Reflect - .4byte gMoveDescription_FocusEnergy - .4byte gMoveDescription_Bide - .4byte gMoveDescription_Metronome - .4byte gMoveDescription_MirrorMove - .4byte gMoveDescription_SelfDestruct - .4byte gMoveDescription_EggBomb - .4byte gMoveDescription_Lick - .4byte gMoveDescription_Smog - .4byte gMoveDescription_Sludge - .4byte gMoveDescription_BoneClub - .4byte gMoveDescription_FireBlast - .4byte gMoveDescription_Waterfall - .4byte gMoveDescription_Clamp - .4byte gMoveDescription_Swift - .4byte gMoveDescription_SkullBash - .4byte gMoveDescription_SpikeCannon - .4byte gMoveDescription_Constrict - .4byte gMoveDescription_Amnesia - .4byte gMoveDescription_Kinesis - .4byte gMoveDescription_SoftBoiled - .4byte gMoveDescription_HiJumpKick - .4byte gMoveDescription_Glare - .4byte gMoveDescription_DreamEater - .4byte gMoveDescription_PoisonGas - .4byte gMoveDescription_Barrage - .4byte gMoveDescription_LeechLife - .4byte gMoveDescription_LovelyKiss - .4byte gMoveDescription_SkyAttack - .4byte gMoveDescription_Transform - .4byte gMoveDescription_Bubble - .4byte gMoveDescription_DizzyPunch - .4byte gMoveDescription_Spore - .4byte gMoveDescription_Flash - .4byte gMoveDescription_Psywave - .4byte gMoveDescription_Splash - .4byte gMoveDescription_AcidArmor - .4byte gMoveDescription_Crabhammer - .4byte gMoveDescription_Explosion - .4byte gMoveDescription_FurySwipes - .4byte gMoveDescription_Bonemerang - .4byte gMoveDescription_Rest - .4byte gMoveDescription_RockSlide - .4byte gMoveDescription_HyperFang - .4byte gMoveDescription_Sharpen - .4byte gMoveDescription_Conversion - .4byte gMoveDescription_TriAttack - .4byte gMoveDescription_SuperFang - .4byte gMoveDescription_Slash - .4byte gMoveDescription_Substitute - .4byte gMoveDescription_Struggle - .4byte gMoveDescription_Sketch - .4byte gMoveDescription_TripleKick - .4byte gMoveDescription_Thief - .4byte gMoveDescription_SpiderWeb - .4byte gMoveDescription_MindReader - .4byte gMoveDescription_Nightmare - .4byte gMoveDescription_FlameWheel - .4byte gMoveDescription_Snore - .4byte gMoveDescription_Curse - .4byte gMoveDescription_Flail - .4byte gMoveDescription_Conversion2 - .4byte gMoveDescription_Aeroblast - .4byte gMoveDescription_CottonSpore - .4byte gMoveDescription_Reversal - .4byte gMoveDescription_Spite - .4byte gMoveDescription_PowderSnow - .4byte gMoveDescription_Protect - .4byte gMoveDescription_MachPunch - .4byte gMoveDescription_ScaryFace - .4byte gMoveDescription_FaintAttack - .4byte gMoveDescription_SweetKiss - .4byte gMoveDescription_BellyDrum - .4byte gMoveDescription_SludgeBomb - .4byte gMoveDescription_MudSlap - .4byte gMoveDescription_Octazooka - .4byte gMoveDescription_Spikes - .4byte gMoveDescription_ZapCannon - .4byte gMoveDescription_Foresight - .4byte gMoveDescription_DestinyBond - .4byte gMoveDescription_PerishSong - .4byte gMoveDescription_IcyWind - .4byte gMoveDescription_Detect - .4byte gMoveDescription_BoneRush - .4byte gMoveDescription_LockOn - .4byte gMoveDescription_Outrage - .4byte gMoveDescription_Sandstorm - .4byte gMoveDescription_GigaDrain - .4byte gMoveDescription_Endure - .4byte gMoveDescription_Charm - .4byte gMoveDescription_Rollout - .4byte gMoveDescription_FalseSwipe - .4byte gMoveDescription_Swagger - .4byte gMoveDescription_MilkDrink - .4byte gMoveDescription_Spark - .4byte gMoveDescription_FuryCutter - .4byte gMoveDescription_SteelWing - .4byte gMoveDescription_MeanLook - .4byte gMoveDescription_Attract - .4byte gMoveDescription_SleepTalk - .4byte gMoveDescription_HealBell - .4byte gMoveDescription_Return - .4byte gMoveDescription_Present - .4byte gMoveDescription_Frustration - .4byte gMoveDescription_Safeguard - .4byte gMoveDescription_PainSplit - .4byte gMoveDescription_SacredFire - .4byte gMoveDescription_Magnitude - .4byte gMoveDescription_DynamicPunch - .4byte gMoveDescription_Megahorn - .4byte gMoveDescription_DragonBreath - .4byte gMoveDescription_BatonPass - .4byte gMoveDescription_Encore - .4byte gMoveDescription_Pursuit - .4byte gMoveDescription_RapidSpin - .4byte gMoveDescription_SweetScent - .4byte gMoveDescription_IronTail - .4byte gMoveDescription_MetalClaw - .4byte gMoveDescription_VitalThrow - .4byte gMoveDescription_MorningSun - .4byte gMoveDescription_Synthesis - .4byte gMoveDescription_Moonlight - .4byte gMoveDescription_HiddenPower - .4byte gMoveDescription_CrossChop - .4byte gMoveDescription_Twister - .4byte gMoveDescription_RainDance - .4byte gMoveDescription_SunnyDay - .4byte gMoveDescription_Crunch - .4byte gMoveDescription_MirrorCoat - .4byte gMoveDescription_PsychUp - .4byte gMoveDescription_ExtremeSpeed - .4byte gMoveDescription_AncientPower - .4byte gMoveDescription_ShadowBall - .4byte gMoveDescription_FutureSight - .4byte gMoveDescription_RockSmash - .4byte gMoveDescription_Whirlpool - .4byte gMoveDescription_BeatUp - .4byte gMoveDescription_FakeOut - .4byte gMoveDescription_Uproar - .4byte gMoveDescription_Stockpile - .4byte gMoveDescription_SpitUp - .4byte gMoveDescription_Swallow - .4byte gMoveDescription_HeatWave - .4byte gMoveDescription_Hail - .4byte gMoveDescription_Torment - .4byte gMoveDescription_Flatter - .4byte gMoveDescription_WillOWisp - .4byte gMoveDescription_Memento - .4byte gMoveDescription_Facade - .4byte gMoveDescription_FocusPunch - .4byte gMoveDescription_SmellingSalt - .4byte gMoveDescription_FollowMe - .4byte gMoveDescription_NaturePower - .4byte gMoveDescription_Charge - .4byte gMoveDescription_Taunt - .4byte gMoveDescription_HelpingHand - .4byte gMoveDescription_Trick - .4byte gMoveDescription_RolePlay - .4byte gMoveDescription_Wish - .4byte gMoveDescription_Assist - .4byte gMoveDescription_Ingrain - .4byte gMoveDescription_Superpower - .4byte gMoveDescription_MagicCoat - .4byte gMoveDescription_Recycle - .4byte gMoveDescription_Revenge - .4byte gMoveDescription_BrickBreak - .4byte gMoveDescription_Yawn - .4byte gMoveDescription_KnockOff - .4byte gMoveDescription_Endeavor - .4byte gMoveDescription_Eruption - .4byte gMoveDescription_SkillSwap - .4byte gMoveDescription_Imprison - .4byte gMoveDescription_Refresh - .4byte gMoveDescription_Grudge - .4byte gMoveDescription_Snatch - .4byte gMoveDescription_SecretPower - .4byte gMoveDescription_Dive - .4byte gMoveDescription_ArmThrust - .4byte gMoveDescription_Camouflage - .4byte gMoveDescription_TailGlow - .4byte gMoveDescription_LusterPurge - .4byte gMoveDescription_MistBall - .4byte gMoveDescription_FeatherDance - .4byte gMoveDescription_TeeterDance - .4byte gMoveDescription_BlazeKick - .4byte gMoveDescription_MudSport - .4byte gMoveDescription_IceBall - .4byte gMoveDescription_NeedleArm - .4byte gMoveDescription_SlackOff - .4byte gMoveDescription_HyperVoice - .4byte gMoveDescription_PoisonFang - .4byte gMoveDescription_CrushClaw - .4byte gMoveDescription_BlastBurn - .4byte gMoveDescription_HydroCannon - .4byte gMoveDescription_MeteorMash - .4byte gMoveDescription_Astonish - .4byte gMoveDescription_WeatherBall - .4byte gMoveDescription_Aromatherapy - .4byte gMoveDescription_FakeTears - .4byte gMoveDescription_AirCutter - .4byte gMoveDescription_Overheat - .4byte gMoveDescription_OdorSleuth - .4byte gMoveDescription_RockTomb - .4byte gMoveDescription_SilverWind - .4byte gMoveDescription_MetalSound - .4byte gMoveDescription_GrassWhistle - .4byte gMoveDescription_Tickle - .4byte gMoveDescription_CosmicPower - .4byte gMoveDescription_WaterSpout - .4byte gMoveDescription_SignalBeam - .4byte gMoveDescription_ShadowPunch - .4byte gMoveDescription_Extrasensory - .4byte gMoveDescription_SkyUppercut - .4byte gMoveDescription_SandTomb - .4byte gMoveDescription_SheerCold - .4byte gMoveDescription_MuddyWater - .4byte gMoveDescription_BulletSeed - .4byte gMoveDescription_AerialAce - .4byte gMoveDescription_IcicleSpear - .4byte gMoveDescription_IronDefense - .4byte gMoveDescription_Block - .4byte gMoveDescription_Howl - .4byte gMoveDescription_DragonClaw - .4byte gMoveDescription_FrenzyPlant - .4byte gMoveDescription_BulkUp - .4byte gMoveDescription_Bounce - .4byte gMoveDescription_MudShot - .4byte gMoveDescription_PoisonTail - .4byte gMoveDescription_Covet - .4byte gMoveDescription_VoltTackle - .4byte gMoveDescription_MagicalLeaf - .4byte gMoveDescription_WaterSport - .4byte gMoveDescription_CalmMind - .4byte gMoveDescription_LeafBlade - .4byte gMoveDescription_DragonDance - .4byte gMoveDescription_RockBlast - .4byte gMoveDescription_ShockWave - .4byte gMoveDescription_WaterPulse - .4byte gMoveDescription_DoomDesire - .4byte gMoveDescription_PsychoBoost diff --git a/data/text/nature_names.inc b/data/text/nature_names.inc deleted file mode 100644 index f191f80ba..000000000 --- a/data/text/nature_names.inc +++ /dev/null @@ -1,102 +0,0 @@ -gNatureName_Hardy: @ 83C0F60 - .string "HARDY$" - -gNatureName_Lonely: @ 83C0F66 - .string "LONELY$" - -gNatureName_Brave: @ 83C0F6D - .string "BRAVE$" - -gNatureName_Adamant: @ 83C0F73 - .string "ADAMANT$" - -gNatureName_Naughty: @ 83C0F7B - .string "NAUGHTY$" - -gNatureName_Bold: @ 83C0F83 - .string "BOLD$" - -gNatureName_Docile: @ 83C0F88 - .string "DOCILE$" - -gNatureName_Relaxed: @ 83C0F8F - .string "RELAXED$" - -gNatureName_Impish: @ 83C0F97 - .string "IMPISH$" - -gNatureName_Lax: @ 83C0F9E - .string "LAX$" - -gNatureName_Timid: @ 83C0FA2 - .string "TIMID$" - -gNatureName_Hasty: @ 83C0FA8 - .string "HASTY$" - -gNatureName_Serious: @ 83C0FAE - .string "SERIOUS$" - -gNatureName_Jolly: @ 83C0FB6 - .string "JOLLY$" - -gNatureName_Naive: @ 83C0FBC - .string "NAIVE$" - -gNatureName_Modest: @ 83C0FC2 - .string "MODEST$" - -gNatureName_Mild: @ 83C0FC9 - .string "MILD$" - -gNatureName_Quiet: @ 83C0FCE - .string "QUIET$" - -gNatureName_Bashful: @ 83C0FD4 - .string "BASHFUL$" - -gNatureName_Rash: @ 83C0FDC - .string "RASH$" - -gNatureName_Calm: @ 83C0FE1 - .string "CALM$" - -gNatureName_Gentle: @ 83C0FE6 - .string "GENTLE$" - -gNatureName_Sassy: @ 83C0FED - .string "SASSY$" - -gNatureName_Careful: @ 83C0FF3 - .string "CAREFUL$" - -gNatureName_Quirky: @ 83C0FFB - .string "QUIRKY$" - - .align 2 -gNatureNames:: @ 83C1004 - .4byte gNatureName_Hardy - .4byte gNatureName_Lonely - .4byte gNatureName_Brave - .4byte gNatureName_Adamant - .4byte gNatureName_Naughty - .4byte gNatureName_Bold - .4byte gNatureName_Docile - .4byte gNatureName_Relaxed - .4byte gNatureName_Impish - .4byte gNatureName_Lax - .4byte gNatureName_Timid - .4byte gNatureName_Hasty - .4byte gNatureName_Serious - .4byte gNatureName_Jolly - .4byte gNatureName_Naive - .4byte gNatureName_Modest - .4byte gNatureName_Mild - .4byte gNatureName_Quiet - .4byte gNatureName_Bashful - .4byte gNatureName_Rash - .4byte gNatureName_Calm - .4byte gNatureName_Gentle - .4byte gNatureName_Sassy - .4byte gNatureName_Careful - .4byte gNatureName_Quirky diff --git a/data/text_window.s b/data/text_window.s deleted file mode 100644 index d8a3dbb38..000000000 --- a/data/text_window.s +++ /dev/null @@ -1,31 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_083761F0:: @ 83761F0 - .4byte gTextWindowFrame1_Gfx, gTextWindowFrame1_Pal - .4byte gTextWindowFrame2_Gfx, gTextWindowFrame2_Pal - .4byte gTextWindowFrame3_Gfx, gTextWindowFrame3_Pal - .4byte gTextWindowFrame4_Gfx, gTextWindowFrame4_Pal - .4byte gTextWindowFrame5_Gfx, gTextWindowFrame5_Pal - .4byte gTextWindowFrame6_Gfx, gTextWindowFrame6_Pal - .4byte gTextWindowFrame7_Gfx, gTextWindowFrame7_Pal - .4byte gTextWindowFrame8_Gfx, gTextWindowFrame8_Pal - .4byte gTextWindowFrame9_Gfx, gTextWindowFrame9_Pal - .4byte gTextWindowFrame10_Gfx, gTextWindowFrame10_Pal - .4byte gTextWindowFrame11_Gfx, gTextWindowFrame11_Pal - .4byte gTextWindowFrame12_Gfx, gTextWindowFrame12_Pal - .4byte gTextWindowFrame13_Gfx, gTextWindowFrame13_Pal - .4byte gTextWindowFrame14_Gfx, gTextWindowFrame14_Pal - .4byte gTextWindowFrame15_Gfx, gTextWindowFrame15_Pal - .4byte gTextWindowFrame16_Gfx, gTextWindowFrame16_Pal - .4byte gTextWindowFrame17_Gfx, gTextWindowFrame17_Pal - .4byte gTextWindowFrame18_Gfx, gTextWindowFrame18_Pal - .4byte gTextWindowFrame19_Gfx, gTextWindowFrame19_Pal - .4byte gTextWindowFrame20_Gfx, gTextWindowFrame20_Pal - - .align 1 -gMessageBoxTilemap:: @ 8376290 - .incbin "graphics/text_window/message_box_map.bin" diff --git a/data/tileset_anim.s b/data/tileset_anim.s deleted file mode 100644 index e34d50953..000000000 --- a/data/tileset_anim.s +++ /dev/null @@ -1,637 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -TilesetAnimTiles_General_0_1: @ 8376D84 - .incbin "data/tilesets/primary/general/anim/0/1.4bpp" - - .align 2 -TilesetAnimTiles_General_0_0: @ 8376E04 - .incbin "data/tilesets/primary/general/anim/0/0.4bpp" - - .align 2 -TilesetAnimTiles_General_0_2: @ 8376E84 - .incbin "data/tilesets/primary/general/anim/0/2.4bpp" - - .space 32 - - .align 2 -gTilesetAnimTable_General_0:: @ 8376F24 - .4byte TilesetAnimTiles_General_0_0 - .4byte TilesetAnimTiles_General_0_1 - .4byte TilesetAnimTiles_General_0_0 - .4byte TilesetAnimTiles_General_0_2 - - .align 2 -TilesetAnimTiles_General_1_0: @ 8376F34 - .incbin "data/tilesets/primary/general/anim/1/0.4bpp" - - .align 2 -TilesetAnimTiles_General_1_1: @ 83772F4 - .incbin "data/tilesets/primary/general/anim/1/1.4bpp" - - .align 2 -TilesetAnimTiles_General_1_2: @ 83776B4 - .incbin "data/tilesets/primary/general/anim/1/2.4bpp" - - .align 2 -TilesetAnimTiles_General_1_3: @ 8377A74 - .incbin "data/tilesets/primary/general/anim/1/3.4bpp" - - .align 2 -TilesetAnimTiles_General_1_4: @ 8377E34 - .incbin "data/tilesets/primary/general/anim/1/4.4bpp" - - .align 2 -TilesetAnimTiles_General_1_5: @ 83781F4 - .incbin "data/tilesets/primary/general/anim/1/5.4bpp" - - .align 2 -TilesetAnimTiles_General_1_6: @ 83785B4 - .incbin "data/tilesets/primary/general/anim/1/6.4bpp" - - .align 2 -TilesetAnimTiles_General_1_7: @ 8378974 - .incbin "data/tilesets/primary/general/anim/1/7.4bpp" - - .align 2 -gTilesetAnimTable_General_1:: @ 8378D34 - .4byte TilesetAnimTiles_General_1_0 - .4byte TilesetAnimTiles_General_1_1 - .4byte TilesetAnimTiles_General_1_2 - .4byte TilesetAnimTiles_General_1_3 - .4byte TilesetAnimTiles_General_1_4 - .4byte TilesetAnimTiles_General_1_5 - .4byte TilesetAnimTiles_General_1_6 - .4byte TilesetAnimTiles_General_1_7 - - .align 2 -TilesetAnimTiles_General_2_0: @ 8378D54 - .incbin "data/tilesets/primary/general/anim/2/0.4bpp" - - .align 2 -TilesetAnimTiles_General_2_1: @ 8378E94 - .incbin "data/tilesets/primary/general/anim/2/1.4bpp" - - .align 2 -TilesetAnimTiles_General_2_2: @ 8378FD4 - .incbin "data/tilesets/primary/general/anim/2/2.4bpp" - - .align 2 -TilesetAnimTiles_General_2_3: @ 8379114 - .incbin "data/tilesets/primary/general/anim/2/3.4bpp" - - .align 2 -TilesetAnimTiles_General_2_4: @ 8379254 - .incbin "data/tilesets/primary/general/anim/2/4.4bpp" - - .align 2 -TilesetAnimTiles_General_2_5: @ 8379394 - .incbin "data/tilesets/primary/general/anim/2/5.4bpp" - - .align 2 -TilesetAnimTiles_General_2_6: @ 83794D4 - .incbin "data/tilesets/primary/general/anim/2/6.4bpp" - - .align 2 -gTilesetAnimTable_General_2:: @ 8379614 - .4byte TilesetAnimTiles_General_2_0 - .4byte TilesetAnimTiles_General_2_1 - .4byte TilesetAnimTiles_General_2_2 - .4byte TilesetAnimTiles_General_2_3 - .4byte TilesetAnimTiles_General_2_4 - .4byte TilesetAnimTiles_General_2_5 - .4byte TilesetAnimTiles_General_2_6 - .4byte TilesetAnimTiles_General_2_0 - - .align 2 -TilesetAnimTiles_General_3_0: @ 8379634 - .incbin "data/tilesets/primary/general/anim/3/0.4bpp" - - .align 2 -TilesetAnimTiles_General_3_1: @ 83796F4 - .incbin "data/tilesets/primary/general/anim/3/1.4bpp" - - .align 2 -TilesetAnimTiles_General_3_2: @ 83797B4 - .incbin "data/tilesets/primary/general/anim/3/2.4bpp" - - .align 2 -TilesetAnimTiles_General_3_3: @ 8379874 - .incbin "data/tilesets/primary/general/anim/3/3.4bpp" - - .align 2 -gTilesetAnimTable_General_3:: @ 8379934 - .4byte TilesetAnimTiles_General_3_0 - .4byte TilesetAnimTiles_General_3_1 - .4byte TilesetAnimTiles_General_3_2 - .4byte TilesetAnimTiles_General_3_3 - - .align 2 -TilesetAnimTiles_General_4_0: @ 8379944 - .incbin "data/tilesets/primary/general/anim/4/0.4bpp" - - .align 2 -TilesetAnimTiles_General_4_1: @ 8379A84 - .incbin "data/tilesets/primary/general/anim/4/1.4bpp" - - .align 2 -TilesetAnimTiles_General_4_2: @ 8379BC4 - .incbin "data/tilesets/primary/general/anim/4/2.4bpp" - - .align 2 -TilesetAnimTiles_General_4_3: @ 8379D04 - .incbin "data/tilesets/primary/general/anim/4/3.4bpp" - - .align 2 -gTilesetAnimTable_General_4:: @ 8379E44 - .4byte TilesetAnimTiles_General_4_0 - .4byte TilesetAnimTiles_General_4_1 - .4byte TilesetAnimTiles_General_4_2 - .4byte TilesetAnimTiles_General_4_3 - - .align 2 -TilesetAnimTiles_Lavaridge_0: @ 8379E54 - .incbin "data/tilesets/secondary/lavaridge/anim/0.4bpp" - - .align 2 -TilesetAnimTiles_Lavaridge_1: @ 8379ED4 - .incbin "data/tilesets/secondary/lavaridge/anim/1.4bpp" - - .align 2 -TilesetAnimTiles_Lavaridge_2: @ 8379F54 - .incbin "data/tilesets/secondary/lavaridge/anim/2.4bpp" - - .align 2 -TilesetAnimTiles_Lavaridge_3: @ 8379FD4 - .incbin "data/tilesets/secondary/lavaridge/anim/3.4bpp" - - .align 2 -gTilesetAnimTable_Lavaridge:: @ 837A054 - .4byte TilesetAnimTiles_Lavaridge_0 - .4byte TilesetAnimTiles_Lavaridge_1 - .4byte TilesetAnimTiles_Lavaridge_2 - .4byte TilesetAnimTiles_Lavaridge_3 - - .align 2 -TilesetAnimTiles_Pacifidlog_0_0: @ 837A064 - .incbin "data/tilesets/secondary/pacifidlog/anim/0/0.4bpp" - - .align 2 -TilesetAnimTiles_Pacifidlog_0_1: @ 837A424 - .incbin "data/tilesets/secondary/pacifidlog/anim/0/1.4bpp" - - .align 2 -TilesetAnimTiles_Pacifidlog_0_2: @ 837A7E4 - .incbin "data/tilesets/secondary/pacifidlog/anim/0/2.4bpp" - - .align 2 -gTilesetAnimTable_Pacifidlog_0:: @ 837ABA4 - .4byte TilesetAnimTiles_Pacifidlog_0_0 - .4byte TilesetAnimTiles_Pacifidlog_0_1 - .4byte TilesetAnimTiles_Pacifidlog_0_2 - .4byte TilesetAnimTiles_Pacifidlog_0_1 - - .align 2 -TilesetAnimTiles_Underwater_0: @ 837ABB4 - .incbin "data/tilesets/secondary/underwater/anim/0.4bpp" - - .align 2 -TilesetAnimTiles_Underwater_1: @ 837AC34 - .incbin "data/tilesets/secondary/underwater/anim/1.4bpp" - - .align 2 -TilesetAnimTiles_Underwater_2: @ 837ACB4 - .incbin "data/tilesets/secondary/underwater/anim/2.4bpp" - - .align 2 -TilesetAnimTiles_Underwater_3: @ 837AD34 - .incbin "data/tilesets/secondary/underwater/anim/3.4bpp" - - .align 2 -gTilesetAnimTable_Underwater:: @ 837ADB4 - .4byte TilesetAnimTiles_Underwater_0 - .4byte TilesetAnimTiles_Underwater_1 - .4byte TilesetAnimTiles_Underwater_2 - .4byte TilesetAnimTiles_Underwater_3 - - .align 2 -TilesetAnimTiles_Pacifidlog_1_0: @ 837ADC4 - .incbin "data/tilesets/secondary/pacifidlog/anim/1/0.4bpp" - - .align 2 -TilesetAnimTiles_Pacifidlog_1_1: @ 837AEC4 - .incbin "data/tilesets/secondary/pacifidlog/anim/1/1.4bpp" - - .align 2 -TilesetAnimTiles_Pacifidlog_1_2: @ 837AFC4 - .incbin "data/tilesets/secondary/pacifidlog/anim/1/2.4bpp" - - .align 2 -TilesetAnimTiles_Pacifidlog_1_3: @ 837B0C4 - .incbin "data/tilesets/secondary/pacifidlog/anim/1/3.4bpp" - - .align 2 -TilesetAnimTiles_Pacifidlog_1_4: @ 837B1C4 - .incbin "data/tilesets/secondary/pacifidlog/anim/1/4.4bpp" - - .align 2 -TilesetAnimTiles_Pacifidlog_1_5: @ 837B2C4 - .incbin "data/tilesets/secondary/pacifidlog/anim/1/5.4bpp" - - .align 2 -TilesetAnimTiles_Pacifidlog_1_6: @ 837B3C4 - .incbin "data/tilesets/secondary/pacifidlog/anim/1/6.4bpp" - - .align 2 -TilesetAnimTiles_Pacifidlog_1_7: @ 837B4C4 - .incbin "data/tilesets/secondary/pacifidlog/anim/1/7.4bpp" - - .align 2 -gTilesetAnimTable_Pacifidlog_1:: @ 837B5C4 - .4byte TilesetAnimTiles_Pacifidlog_1_0 - .4byte TilesetAnimTiles_Pacifidlog_1_1 - .4byte TilesetAnimTiles_Pacifidlog_1_2 - .4byte TilesetAnimTiles_Pacifidlog_1_3 - .4byte TilesetAnimTiles_Pacifidlog_1_4 - .4byte TilesetAnimTiles_Pacifidlog_1_5 - .4byte TilesetAnimTiles_Pacifidlog_1_6 - .4byte TilesetAnimTiles_Pacifidlog_1_7 - - .align 2 -TilesetAnimTiles_Mauville_0_0: @ 837B5E4 - .incbin "data/tilesets/secondary/mauville/anim/0/0.4bpp" - - .align 2 -TilesetAnimTiles_Mauville_0_1: @ 837B664 - .incbin "data/tilesets/secondary/mauville/anim/0/1.4bpp" - - .align 2 -TilesetAnimTiles_Mauville_0_2: @ 837B6E4 - .incbin "data/tilesets/secondary/mauville/anim/0/2.4bpp" - - .align 2 -TilesetAnimTiles_Mauville_0_3: @ 837B764 - .incbin "data/tilesets/secondary/mauville/anim/0/3.4bpp" - - .align 2 -TilesetAnimTiles_Mauville_0_4: @ 837B7E4 - .incbin "data/tilesets/secondary/mauville/anim/0/4.4bpp" - - .align 2 -TilesetAnimTiles_Mauville_1_0: @ 837B864 - .incbin "data/tilesets/secondary/mauville/anim/1/0.4bpp" - - .align 2 -TilesetAnimTiles_Mauville_1_1: @ 837B8E4 - .incbin "data/tilesets/secondary/mauville/anim/1/1.4bpp" - - .align 2 -TilesetAnimTiles_Mauville_1_2: @ 837B964 - .incbin "data/tilesets/secondary/mauville/anim/1/2.4bpp" - - .align 2 -TilesetAnimTiles_Mauville_1_3: @ 837B9E4 - .incbin "data/tilesets/secondary/mauville/anim/1/3.4bpp" - - .align 2 -TilesetAnimTiles_Mauville_1_4: @ 837BA64 - .incbin "data/tilesets/secondary/mauville/anim/1/4.4bpp" - - .align 2 -gUnknown_0837BAE4:: @ 837BAE4 - .4byte 0x06004C00 - .4byte 0x06004C80 - .4byte 0x06004D00 - .4byte 0x06004D80 - .4byte 0x06004E00 - .4byte 0x06004E80 - .4byte 0x06004F00 - .4byte 0x06004F80 - - .align 2 -gUnknown_0837BB04:: @ 837BB04 - .4byte 0x06005000 - .4byte 0x06005080 - .4byte 0x06005100 - .4byte 0x06005180 - .4byte 0x06005200 - .4byte 0x06005280 - .4byte 0x06005300 - .4byte 0x06005380 - - .align 2 -gTilesetAnimTable_Mauville_0A:: @ 837BB24 - .4byte TilesetAnimTiles_Mauville_0_0 - .4byte TilesetAnimTiles_Mauville_0_0 - .4byte TilesetAnimTiles_Mauville_0_1 - .4byte TilesetAnimTiles_Mauville_0_2 - .4byte TilesetAnimTiles_Mauville_0_3 - .4byte TilesetAnimTiles_Mauville_0_3 - .4byte TilesetAnimTiles_Mauville_0_3 - .4byte TilesetAnimTiles_Mauville_0_3 - .4byte TilesetAnimTiles_Mauville_0_3 - .4byte TilesetAnimTiles_Mauville_0_3 - .4byte TilesetAnimTiles_Mauville_0_2 - .4byte TilesetAnimTiles_Mauville_0_1 - - .align 2 -gTilesetAnimTable_Mauville_1A:: @ 837BB54 - .4byte TilesetAnimTiles_Mauville_1_0 - .4byte TilesetAnimTiles_Mauville_1_0 - .4byte TilesetAnimTiles_Mauville_1_1 - .4byte TilesetAnimTiles_Mauville_1_2 - .4byte TilesetAnimTiles_Mauville_1_3 - .4byte TilesetAnimTiles_Mauville_1_3 - .4byte TilesetAnimTiles_Mauville_1_3 - .4byte TilesetAnimTiles_Mauville_1_3 - .4byte TilesetAnimTiles_Mauville_1_3 - .4byte TilesetAnimTiles_Mauville_1_3 - .4byte TilesetAnimTiles_Mauville_1_2 - .4byte TilesetAnimTiles_Mauville_1_1 - - .align 2 -gTilesetAnimTable_Mauville_0B:: @ 837BB84 - .4byte TilesetAnimTiles_Mauville_0_0 - .4byte TilesetAnimTiles_Mauville_0_0 - .4byte TilesetAnimTiles_Mauville_0_4 - .4byte TilesetAnimTiles_Mauville_0_4 - - .align 2 -gTilesetAnimTable_Mauville_1B:: @ 837BB94 - .4byte TilesetAnimTiles_Mauville_1_0 - .4byte TilesetAnimTiles_Mauville_1_0 - .4byte TilesetAnimTiles_Mauville_1_4 - .4byte TilesetAnimTiles_Mauville_1_4 - - .align 2 -TilesetAnimTiles_Rustboro_0_0: @ 837BBA4 - .incbin "data/tilesets/secondary/rustboro/anim/0/0.4bpp" - - .align 2 -TilesetAnimTiles_Rustboro_0_1: @ 837BC24 - .incbin "data/tilesets/secondary/rustboro/anim/0/1.4bpp" - - .align 2 -TilesetAnimTiles_Rustboro_0_2: @ 837BCA4 - .incbin "data/tilesets/secondary/rustboro/anim/0/2.4bpp" - - .align 2 -TilesetAnimTiles_Rustboro_0_3: @ 837BD24 - .incbin "data/tilesets/secondary/rustboro/anim/0/3.4bpp" - - .align 2 -TilesetAnimTiles_Rustboro_0_4: @ 837BDA4 - .incbin "data/tilesets/secondary/rustboro/anim/0/4.4bpp" - - .align 2 -TilesetAnimTiles_Rustboro_0_5: @ 837BE24 - .incbin "data/tilesets/secondary/rustboro/anim/0/5.4bpp" - - .align 2 -TilesetAnimTiles_Rustboro_0_6: @ 837BEA4 - .incbin "data/tilesets/secondary/rustboro/anim/0/6.4bpp" - - .align 2 -TilesetAnimTiles_Rustboro_0_7: @ 837BF24 - .incbin "data/tilesets/secondary/rustboro/anim/0/7.4bpp" - - .align 2 -gUnknown_0837BFA4:: @ 837BFA4 - .4byte 0x06005000 - .4byte 0x06005080 - .4byte 0x06005100 - .4byte 0x06005180 - .4byte 0x06005200 - .4byte 0x06005280 - .4byte 0x06005300 - .4byte 0x06005380 - - .align 2 -gTilesetAnimTable_Rustboro_0:: @ 837BFC4 - .4byte TilesetAnimTiles_Rustboro_0_0 - .4byte TilesetAnimTiles_Rustboro_0_1 - .4byte TilesetAnimTiles_Rustboro_0_2 - .4byte TilesetAnimTiles_Rustboro_0_3 - .4byte TilesetAnimTiles_Rustboro_0_4 - .4byte TilesetAnimTiles_Rustboro_0_5 - .4byte TilesetAnimTiles_Rustboro_0_6 - .4byte TilesetAnimTiles_Rustboro_0_7 - - .align 2 -TilesetAnimTiles_Rustboro_1_0: @ 837BFE4 - .incbin "data/tilesets/secondary/rustboro/anim/1/0.4bpp" - - .align 2 -TilesetAnimTiles_Rustboro_1_1: @ 837C064 - .incbin "data/tilesets/secondary/rustboro/anim/1/1.4bpp" - - .align 2 -gTilesetAnimTable_Rustboro_1:: @ 837C0E4 - .4byte TilesetAnimTiles_Rustboro_1_0 - .4byte TilesetAnimTiles_Rustboro_1_1 - - .align 2 -TilesetAnimTiles_Cave_0: @ 837C0EC - .incbin "data/tilesets/secondary/cave/anim/0.4bpp" - - .align 2 -TilesetAnimTiles_Cave_1: @ 837C16C - .incbin "data/tilesets/secondary/cave/anim/1.4bpp" - - .align 2 -TilesetAnimTiles_Cave_2: @ 837C1EC - .incbin "data/tilesets/secondary/cave/anim/2.4bpp" - - .align 2 -TilesetAnimTiles_Cave_3: @ 837C26C - .incbin "data/tilesets/secondary/cave/anim/3.4bpp" - - .incbin "data/tilesets/secondary/cave/anim/unused/0.4bpp" - .incbin "data/tilesets/secondary/cave/anim/unused/1.4bpp" - .incbin "data/tilesets/secondary/cave/anim/unused/2.4bpp" - .incbin "data/tilesets/secondary/cave/anim/unused/3.4bpp" - - .space 32 - - .align 2 -gTilesetAnimTable_Cave:: @ 837C50C - .4byte TilesetAnimTiles_Cave_0 - .4byte TilesetAnimTiles_Cave_1 - .4byte TilesetAnimTiles_Cave_2 - .4byte TilesetAnimTiles_Cave_3 - - .align 2 -TilesetAnimTiles_EverGrande_0: @ 837C51C - .incbin "data/tilesets/secondary/ever_grande/anim/0.4bpp" - - .align 2 -TilesetAnimTiles_EverGrande_1: @ 837C59C - .incbin "data/tilesets/secondary/ever_grande/anim/1.4bpp" - - .align 2 -TilesetAnimTiles_EverGrande_2: @ 837C61C - .incbin "data/tilesets/secondary/ever_grande/anim/2.4bpp" - - .align 2 -TilesetAnimTiles_EverGrande_3: @ 837C69C - .incbin "data/tilesets/secondary/ever_grande/anim/3.4bpp" - - .align 2 -TilesetAnimTiles_EverGrande_4: @ 837C71C - .incbin "data/tilesets/secondary/ever_grande/anim/4.4bpp" - - .align 2 -TilesetAnimTiles_EverGrande_5: @ 837C79C - .incbin "data/tilesets/secondary/ever_grande/anim/5.4bpp" - - .align 2 -TilesetAnimTiles_EverGrande_6: @ 837C81C - .incbin "data/tilesets/secondary/ever_grande/anim/6.4bpp" - - .align 2 -TilesetAnimTiles_EverGrande_7: @ 837C89C - .incbin "data/tilesets/secondary/ever_grande/anim/7.4bpp" - - .space 32 - - .align 2 -gUnknown_0837C93C:: @ 837C93C - .4byte 0x06005C00 - .4byte 0x06005C80 - .4byte 0x06005D00 - .4byte 0x06005D80 - .4byte 0x06005E00 - .4byte 0x06005E80 - .4byte 0x06005F00 - .4byte 0x06005F80 - - .align 2 -gTilesetAnimTable_EverGrande:: @ 837C95C - .4byte TilesetAnimTiles_EverGrande_0 - .4byte TilesetAnimTiles_EverGrande_1 - .4byte TilesetAnimTiles_EverGrande_2 - .4byte TilesetAnimTiles_EverGrande_3 - .4byte TilesetAnimTiles_EverGrande_4 - .4byte TilesetAnimTiles_EverGrande_5 - .4byte TilesetAnimTiles_EverGrande_6 - .4byte TilesetAnimTiles_EverGrande_7 - - .align 2 -TilesetAnimTiles_Building_0: @ 837C97C - .incbin "data/tilesets/primary/building/anim/0.4bpp" - - .align 2 -TilesetAnimTiles_Building_1: @ 837C9FC - .incbin "data/tilesets/primary/building/anim/1.4bpp" - - .align 2 -gTilesetAnimTable_Building:: @ 837CA7C - .4byte TilesetAnimTiles_Building_0 - .4byte TilesetAnimTiles_Building_1 - - .align 2 -TilesetAnimTiles_SootopolisGym_0_0: @ 837CA84 - .incbin "data/tilesets/secondary/sootopolis_gym/anim/0/0.4bpp" - - .align 2 -TilesetAnimTiles_SootopolisGym_0_1: @ 837CC04 - .incbin "data/tilesets/secondary/sootopolis_gym/anim/0/1.4bpp" - - .align 2 -TilesetAnimTiles_SootopolisGym_0_2: @ 837CD84 - .incbin "data/tilesets/secondary/sootopolis_gym/anim/0/2.4bpp" - - .align 2 -TilesetAnimTiles_SootopolisGym_1_0: @ 837CF04 - .incbin "data/tilesets/secondary/sootopolis_gym/anim/1/0.4bpp" - - .align 2 -TilesetAnimTiles_SootopolisGym_1_1: @ 837D184 - .incbin "data/tilesets/secondary/sootopolis_gym/anim/1/1.4bpp" - - .align 2 -TilesetAnimTiles_SootopolisGym_1_2: @ 837D404 - .incbin "data/tilesets/secondary/sootopolis_gym/anim/1/2.4bpp" - - .align 2 -gTilesetAnimTable_SootopolisGym_0:: @ 837D684 - .4byte TilesetAnimTiles_SootopolisGym_0_0 - .4byte TilesetAnimTiles_SootopolisGym_0_1 - .4byte TilesetAnimTiles_SootopolisGym_0_2 - - .align 2 -gTilesetAnimTable_SootopolisGym_1:: @ 837D690 - .4byte TilesetAnimTiles_SootopolisGym_1_0 - .4byte TilesetAnimTiles_SootopolisGym_1_1 - .4byte TilesetAnimTiles_SootopolisGym_1_2 - - .align 2 -TilesetAnimTiles_EliteFour_1_0: @ 837D69C - .incbin "data/tilesets/secondary/elite_four/anim/1/0.4bpp" - - .align 2 -TilesetAnimTiles_EliteFour_1_1: @ 837D71C - .incbin "data/tilesets/secondary/elite_four/anim/1/1.4bpp" - - .align 2 -TilesetAnimTiles_EliteFour_0_0: @ 837D79C - .incbin "data/tilesets/secondary/elite_four/anim/0/0.4bpp" - - .align 2 -TilesetAnimTiles_EliteFour_0_1: @ 837D7BC - .incbin "data/tilesets/secondary/elite_four/anim/0/1.4bpp" - - .align 2 -TilesetAnimTiles_EliteFour_0_2: @ 837D7DC - .incbin "data/tilesets/secondary/elite_four/anim/0/2.4bpp" - - .align 2 -TilesetAnimTiles_EliteFour_0_3: @ 837D7FC - .incbin "data/tilesets/secondary/elite_four/anim/0/3.4bpp" - - .space 32 - - .align 2 -gTilesetAnimTable_EliteFour_0:: @ 837D83C - .4byte TilesetAnimTiles_EliteFour_0_0 - .4byte TilesetAnimTiles_EliteFour_0_1 - .4byte TilesetAnimTiles_EliteFour_0_2 - .4byte TilesetAnimTiles_EliteFour_0_3 - - .align 2 -gTilesetAnimTable_EliteFour_1:: @ 837D84C - .4byte TilesetAnimTiles_EliteFour_1_0 - .4byte TilesetAnimTiles_EliteFour_1_1 - - .align 2 -TilesetAnimTiles_MauvilleGym_0: @ 837D854 - .incbin "data/tilesets/secondary/mauville_gym/anim/0.4bpp" - - .align 2 -TilesetAnimTiles_MauvilleGym_1: @ 837DA54 - .incbin "data/tilesets/secondary/mauville_gym/anim/1.4bpp" - - .space 32 - - .align 2 -gTilesetAnimTable_MauvilleGym:: @ 837DC74 - .4byte TilesetAnimTiles_MauvilleGym_0 - .4byte TilesetAnimTiles_MauvilleGym_1 - - .align 2 -TilesetAnimTiles_BikeShop_0: @ 837DC7C - .incbin "data/tilesets/secondary/bike_shop/anim/0.4bpp" - - .align 2 -TilesetAnimTiles_BikeShop_1: @ 837DD9C - .incbin "data/tilesets/secondary/bike_shop/anim/1.4bpp" - - .space 32 - - .align 2 -gTilesetAnimTable_BikeShop:: @ 837DEDC - .4byte TilesetAnimTiles_BikeShop_0 - .4byte TilesetAnimTiles_BikeShop_1 diff --git a/data/tv.s b/data/tv.s deleted file mode 100644 index 293f84217..000000000 --- a/data/tv.s +++ /dev/null @@ -1,205 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gPokeOutbreakSpeciesList:: @ 83D13F8 - .2byte SPECIES_SURSKIT - .2byte MOVE_BUBBLE, MOVE_QUICK_ATTACK, MOVE_NONE, MOVE_NONE - .byte 3 - .byte MAPSEC_Route102 - - .2byte SPECIES_SURSKIT - .2byte MOVE_BUBBLE, MOVE_QUICK_ATTACK, MOVE_NONE, MOVE_NONE - .byte 15 - .byte MAPSEC_Route114 - - .2byte SPECIES_SURSKIT - .2byte MOVE_BUBBLE, MOVE_QUICK_ATTACK, MOVE_NONE, MOVE_NONE - .byte 15 - .byte MAPSEC_Route117 - - .2byte SPECIES_SURSKIT - .2byte MOVE_BUBBLE, MOVE_QUICK_ATTACK, MOVE_NONE, MOVE_NONE - .byte 28 - .byte MAPSEC_Route120 - - .2byte SPECIES_SKITTY - .2byte MOVE_GROWL, MOVE_TACKLE, MOVE_NONE, MOVE_NONE - .byte 15 - .byte MAPSEC_Route116 - - .align 2 -gTVNewsTextGroup1:: @ 83D1434 - .4byte 0x0 - .4byte gTVNewsText_EnergyGuru1 - .4byte gTVNewsText_GameCorner1 - .4byte gTVNewsText_LilycoveDepartment1 - - .align 2 -gTVNewsTextGroup2:: @ 83D1444 - .4byte 0x0 - .4byte gTVNewsText_EnergyGuru2 - .4byte gTVNewsText_GameCorner2 - .4byte gTVNewsText_LilycoveDepartment2 - - .align 2 -gTVNewsTextGroup3:: @ 83D1454 - .4byte 0x0 - .4byte gTVNewsText_EnergyGuru3 - .4byte gTVNewsText_GameCorner3 - .4byte gTVNewsText_LilycoveDepartment3 - - .align 2 -gUnknown_083D1464:: @ 83D1464 - .4byte gStringVar1 - .4byte gStringVar2 - .4byte gStringVar3 - - .align 2 -gTVFanClubTextGroup:: @ 83D1470 - .4byte gTVFanClubText1 - .4byte gTVFanClubText2 - .4byte gTVFanClubText3 - .4byte gTVFanClubText4 - .4byte gTVFanClubText5 - .4byte gTVFanClubText6 - .4byte gTVFanClubText7 - .4byte gTVFanClubText8 - - .align 2 -gTVRecentHappeningsTextGroup:: @ 83D1490 - .4byte gTVRecentHappeningsText1 - .4byte gTVRecentHappeningsText2 - .4byte gTVRecentHappeningsText3 - .4byte gTVRecentHappeningsText4 - .4byte gTVRecentHappeningsText5 - .4byte gTVRecentHappeningsText6 - - .align 2 -gTVFanClubOpinionsTextGroup:: @ 83D14A8 - .4byte gTVFanClubOpinionsText1 - .4byte gTVFanClubOpinionsText2 - .4byte gTVFanClubOpinionsText3 - .4byte gTVFanClubOpinionsText4 - .4byte gTVFanClubOpinionsText5 - - .align 2 -gTVPokemonOutbreakTextGroup:: @ 83D14BC - .4byte gTVPokemonOutbreakText - - .align 2 -gTVPokemonTodayTextGroup:: @ 83D14C0 - .4byte gTVPokemonTodayText1 - .4byte gTVPokemonTodayText2 - .4byte gTVPokemonTodayText3 - .4byte gTVPokemonTodayText4 - .4byte gTVPokemonTodayText5 - .4byte gTVPokemonTodayText6 - .4byte gTVPokemonTodayText7 - .4byte gTVPokemonTodayText8 - .4byte gTVPokemonTodayText9 - .4byte gTVPokemonTodayText10 - .4byte gTVPokemonTodayText11 - .4byte gTVPokemonTodayText12 - - .align 2 -gTVSmartShopperTextGroup:: @ 83D14F0 - .4byte gTVSmartShopperText1 - .4byte gTVSmartShopperText2 - .4byte gTVSmartShopperText3 - .4byte gTVSmartShopperText4 - .4byte gTVSmartShopperText5 - .4byte gTVSmartShopperText6 - .4byte gTVSmartShopperText7 - .4byte gTVSmartShopperText8 - .4byte gTVSmartShopperText9 - .4byte gTVSmartShopperText10 - .4byte gTVSmartShopperText11 - .4byte gTVSmartShopperText12 - .4byte gTVSmartShopperText13 - - .align 2 -gTVBravoTrainerTextGroup:: @ 83D1524 - .4byte gTVBravoTrainerText1 - .4byte gTVBravoTrainerText2 - .4byte gTVBravoTrainerText3 - .4byte gTVBravoTrainerText4 - .4byte gTVBravoTrainerText5 - .4byte gTVBravoTrainerText6 - .4byte gTVBravoTrainerText7 - .4byte gTVBravoTrainerText8 - .4byte gTVBravoTrainerText9 - - .align 2 -gTVBravoTrainerBattleTowerTextGroup:: @ 83D1548 - .4byte gTVBravoTrainerBattleTowerText1 - .4byte gTVBravoTrainerBattleTowerText2 - .4byte gTVBravoTrainerBattleTowerText3 - .4byte gTVBravoTrainerBattleTowerText4 - .4byte gTVBravoTrainerBattleTowerText5 - .4byte gTVBravoTrainerBattleTowerText6 - .4byte gTVBravoTrainerBattleTowerText7 - .4byte gTVBravoTrainerBattleTowerText8 - .4byte gTVBravoTrainerBattleTowerText9 - .4byte gTVBravoTrainerBattleTowerText10 - .4byte gTVBravoTrainerBattleTowerText11 - .4byte gTVBravoTrainerBattleTowerText12 - .4byte gTVBravoTrainerBattleTowerText13 - .4byte gTVBravoTrainerBattleTowerText14 - .4byte gTVBravoTrainerBattleTowerText15 - - .align 2 -gTVNameRaterTextGroup:: @ 83D1584 - .4byte gTVNameRaterText1 - .4byte gTVNameRaterText2 - .4byte gTVNameRaterText3 - .4byte gTVNameRaterText4 - .4byte gTVNameRaterText5 - .4byte gTVNameRaterText6 - .4byte gTVNameRaterText7 - .4byte gTVNameRaterText8 - .4byte gTVNameRaterText9 - .4byte gTVNameRaterText10 - .4byte gTVNameRaterText11 - .4byte gTVNameRaterText12 - .4byte gTVNameRaterText13 - .4byte gTVNameRaterText14 - .4byte gTVNameRaterText15 - .4byte gTVNameRaterText16 - .4byte gTVNameRaterText17 - .4byte gTVNameRaterText18 - .4byte gTVNameRaterText19 - - .align 2 -gTVPokemonTodayFailedCaptureTextGroup:: @ 83D15D0 - .4byte gTVPokemonTodayFailedCaptureText1 - .4byte gTVPokemonTodayFailedCaptureText2 - .4byte gTVPokemonTodayFailedCaptureText3 - .4byte gTVPokemonTodayFailedCaptureText4 - .4byte gTVPokemonTodayFailedCaptureText5 - .4byte gTVPokemonTodayFailedCaptureText6 - .4byte gTVPokemonTodayFailedCaptureText7 - - .align 2 -gTVFishingGuruAdviceTextGroup:: @ 83D15EC - .4byte gTVFishingGuruAdviceText1 - .4byte gTVFishingGuruAdviceText2 - - .align 2 -gTVWorldOfMastersTextGroup:: @ 83D15F4 - .4byte gTVWorldOfMastersText1 - .4byte gTVWorldOfMastersText2 - .4byte gTVWorldOfMastersText3 - - .align 2 -gTVGabbyAndTyTextGroup:: @ 83D1600 - .4byte gTVGabbyAndTyText1 - .4byte gTVGabbyAndTyText2 - .4byte gTVGabbyAndTyText3 - .4byte gTVGabbyAndTyText4 - .4byte gTVGabbyAndTyText5 - .4byte gTVGabbyAndTyText6 - .4byte gTVGabbyAndTyText7 - .4byte gTVGabbyAndTyText8 - .4byte gTVGabbyAndTyText9 diff --git a/data/wild_encounter.s b/data/wild_encounter.s deleted file mode 100644 index 317502aa9..000000000 --- a/data/wild_encounter.s +++ /dev/null @@ -1,18 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -@ 839B540 - .include "data/wild_mons.inc" - - .align 2 -gWildFeebasRoute119Data:: @ 839DBFC - .byte 20, 25 @ Min/Max level - .2byte SPECIES_FEEBAS - - .align 2 -gRoute119WaterTileData:: @ 839DC00 - .2byte 0x0, 0x2D, 0x0 - .2byte 0x2E, 0x5B, 0x83 - .2byte 0x5C, 0x8B, 0x12A diff --git a/data/wild_mons.inc b/data/wild_mons.inc deleted file mode 100644 index 01ebd8a16..000000000 --- a/data/wild_mons.inc +++ /dev/null @@ -1,688 +0,0 @@ - - .align 2 -gWildMonHeaders:: - map PetalburgCity - .2byte 0 @ padding - .4byte NULL - .4byte PetalburgCity_WaterMonsInfo - .4byte NULL - .4byte PetalburgCity_FishingMonsInfo - - map SlateportCity - .2byte 0 @ padding - .4byte NULL - .4byte SlateportCity_WaterMonsInfo - .4byte NULL - .4byte SlateportCity_FishingMonsInfo - - map LilycoveCity - .2byte 0 @ padding - .4byte NULL - .4byte LilycoveCity_WaterMonsInfo - .4byte NULL - .4byte LilycoveCity_FishingMonsInfo - - map MossdeepCity - .2byte 0 @ padding - .4byte NULL - .4byte MossdeepCity_WaterMonsInfo - .4byte NULL - .4byte MossdeepCity_FishingMonsInfo - - map SootopolisCity - .2byte 0 @ padding - .4byte NULL - .4byte SootopolisCity_WaterMonsInfo - .4byte NULL - .4byte SootopolisCity_FishingMonsInfo - - map EverGrandeCity - .2byte 0 @ padding - .4byte NULL - .4byte EverGrandeCity_WaterMonsInfo - .4byte NULL - .4byte EverGrandeCity_FishingMonsInfo - - map MeteorFalls_1F_1R - .2byte 0 @ padding - .4byte MeteorFalls_1F_1R_LandMonsInfo - .4byte MeteorFalls_1F_1R_WaterMonsInfo - .4byte NULL - .4byte MeteorFalls_1F_1R_FishingMonsInfo - - map MeteorFalls_1F_2R - .2byte 0 @ padding - .4byte MeteorFalls_1F_2R_LandMonsInfo - .4byte MeteorFalls_1F_2R_WaterMonsInfo - .4byte NULL - .4byte MeteorFalls_1F_2R_FishingMonsInfo - - map MeteorFalls_B1F_1R - .2byte 0 @ padding - .4byte MeteorFalls_B1F_1R_LandMonsInfo - .4byte MeteorFalls_B1F_1R_WaterMonsInfo - .4byte NULL - .4byte MeteorFalls_B1F_1R_FishingMonsInfo - - map MeteorFalls_B1F_2R - .2byte 0 @ padding - .4byte MeteorFalls_B1F_2R_LandMonsInfo - .4byte MeteorFalls_B1F_2R_WaterMonsInfo - .4byte NULL - .4byte MeteorFalls_B1F_2R_FishingMonsInfo - - map RusturfTunnel - .2byte 0 @ padding - .4byte RusturfTunnel_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map GraniteCave_1F - .2byte 0 @ padding - .4byte GraniteCave_1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map GraniteCave_B1F - .2byte 0 @ padding - .4byte GraniteCave_B1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map GraniteCave_B2F - .2byte 0 @ padding - .4byte GraniteCave_B2F_LandMonsInfo - .4byte NULL - .4byte GraniteCave_B2F_RockSmashMonsInfo - .4byte NULL - - map GraniteCave_StevensRoom - .2byte 0 @ padding - .4byte GraniteCave_StevensRoom_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map PetalburgWoods - .2byte 0 @ padding - .4byte PetalburgWoods_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map JaggedPass - .2byte 0 @ padding - .4byte JaggedPass_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map FieryPath - .2byte 0 @ padding - .4byte FieryPath_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_1F - .2byte 0 @ padding - .4byte MtPyre_1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_2F - .2byte 0 @ padding - .4byte MtPyre_2F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_3F - .2byte 0 @ padding - .4byte MtPyre_3F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_4F - .2byte 0 @ padding - .4byte MtPyre_4F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_5F - .2byte 0 @ padding - .4byte MtPyre_5F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_6F - .2byte 0 @ padding - .4byte MtPyre_6F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_Exterior - .2byte 0 @ padding - .4byte MtPyre_Exterior_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_Summit - .2byte 0 @ padding - .4byte MtPyre_Summit_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SeafloorCavern_Entrance - .2byte 0 @ padding - .4byte NULL - .4byte SeafloorCavern_Entrance_WaterMonsInfo - .4byte NULL - .4byte SeafloorCavern_Entrance_FishingMonsInfo - - map SeafloorCavern_Room1 - .2byte 0 @ padding - .4byte SeafloorCavern_Room1_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SeafloorCavern_Room2 - .2byte 0 @ padding - .4byte SeafloorCavern_Room2_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SeafloorCavern_Room3 - .2byte 0 @ padding - .4byte SeafloorCavern_Room3_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SeafloorCavern_Room4 - .2byte 0 @ padding - .4byte SeafloorCavern_Room4_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SeafloorCavern_Room5 - .2byte 0 @ padding - .4byte SeafloorCavern_Room5_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SeafloorCavern_Room6 - .2byte 0 @ padding - .4byte SeafloorCavern_Room6_LandMonsInfo - .4byte SeafloorCavern_Room6_WaterMonsInfo - .4byte NULL - .4byte SeafloorCavern_Room6_FishingMonsInfo - - map SeafloorCavern_Room7 - .2byte 0 @ padding - .4byte SeafloorCavern_Room7_LandMonsInfo - .4byte SeafloorCavern_Room7_WaterMonsInfo - .4byte NULL - .4byte SeafloorCavern_Room7_FishingMonsInfo - - map SeafloorCavern_Room8 - .2byte 0 @ padding - .4byte SeafloorCavern_Room8_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map CaveOfOrigin_Entrance - .2byte 0 @ padding - .4byte CaveOfOrigin_Entrance_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map CaveOfOrigin_1F - .2byte 0 @ padding - .4byte CaveOfOrigin_1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map CaveOfOrigin_B1F - .2byte 0 @ padding - .4byte CaveOfOrigin_B1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map CaveOfOrigin_B2F - .2byte 0 @ padding - .4byte CaveOfOrigin_B2F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map CaveOfOrigin_B3F - .2byte 0 @ padding - .4byte CaveOfOrigin_B3F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map VictoryRoad_1F - .2byte 0 @ padding - .4byte VictoryRoad_1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map VictoryRoad_B1F - .2byte 0 @ padding - .4byte VictoryRoad_B1F_LandMonsInfo - .4byte NULL - .4byte VictoryRoad_B1F_RockSmashMonsInfo - .4byte NULL - - map VictoryRoad_B2F - .2byte 0 @ padding - .4byte VictoryRoad_B2F_LandMonsInfo - .4byte VictoryRoad_B2F_WaterMonsInfo - .4byte NULL - .4byte VictoryRoad_B2F_FishingMonsInfo - - map ShoalCave_LowTideEntranceRoom - .2byte 0 @ padding - .4byte ShoalCave_LowTideEntranceRoom_LandMonsInfo - .4byte ShoalCave_LowTideEntranceRoom_WaterMonsInfo - .4byte NULL - .4byte ShoalCave_LowTideEntranceRoom_FishingMonsInfo - - map ShoalCave_LowTideInnerRoom - .2byte 0 @ padding - .4byte ShoalCave_LowTideInnerRoom_LandMonsInfo - .4byte ShoalCave_LowTideInnerRoom_WaterMonsInfo - .4byte NULL - .4byte ShoalCave_LowTideInnerRoom_FishingMonsInfo - - map ShoalCave_LowTideStairsRoom - .2byte 0 @ padding - .4byte ShoalCave_LowTideStairsRoom_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map ShoalCave_LowTideLowerRoom - .2byte 0 @ padding - .4byte ShoalCave_LowTideLowerRoom_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map ShoalCave_LowTideIceRoom - .2byte 0 @ padding - .4byte ShoalCave_LowTideIceRoom_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map NewMauville_Entrance - .2byte 0 @ padding - .4byte NewMauville_Entrance_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map NewMauville_Inside - .2byte 0 @ padding - .4byte NewMauville_Inside_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map AbandonedShip_Rooms_B1F - .2byte 0 @ padding - .4byte NULL - .4byte AbandonedShip_Rooms_B1F_WaterMonsInfo - .4byte NULL - .4byte AbandonedShip_Rooms_B1F_FishingMonsInfo - - map AbandonedShip_HiddenFloorCorridors - .2byte 0 @ padding - .4byte NULL - .4byte AbandonedShip_HiddenFloorCorridors_WaterMonsInfo - .4byte NULL - .4byte AbandonedShip_HiddenFloorCorridors_FishingMonsInfo - - map SkyPillar_1F - .2byte 0 @ padding - .4byte SkyPillar_1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SkyPillar_3F - .2byte 0 @ padding - .4byte SkyPillar_3F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SkyPillar_5F - .2byte 0 @ padding - .4byte SkyPillar_5F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map Route101 - .2byte 0 @ padding - .4byte Route101_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map Route102 - .2byte 0 @ padding - .4byte Route102_LandMonsInfo - .4byte Route102_WaterMonsInfo - .4byte NULL - .4byte Route102_FishingMonsInfo - - map Route103 - .2byte 0 @ padding - .4byte Route103_LandMonsInfo - .4byte Route103_WaterMonsInfo - .4byte NULL - .4byte Route103_FishingMonsInfo - - map Route104 - .2byte 0 @ padding - .4byte Route104_LandMonsInfo - .4byte Route104_WaterMonsInfo - .4byte NULL - .4byte Route104_FishingMonsInfo - - map Route105 - .2byte 0 @ padding - .4byte NULL - .4byte Route105_WaterMonsInfo - .4byte NULL - .4byte Route105_FishingMonsInfo - - map Route106 - .2byte 0 @ padding - .4byte NULL - .4byte Route106_WaterMonsInfo - .4byte NULL - .4byte Route106_FishingMonsInfo - - map Route107 - .2byte 0 @ padding - .4byte NULL - .4byte Route107_WaterMonsInfo - .4byte NULL - .4byte Route107_FishingMonsInfo - - map Route108 - .2byte 0 @ padding - .4byte NULL - .4byte Route108_WaterMonsInfo - .4byte NULL - .4byte Route108_FishingMonsInfo - - map Route109 - .2byte 0 @ padding - .4byte NULL - .4byte Route109_WaterMonsInfo - .4byte NULL - .4byte Route109_FishingMonsInfo - - map Route110 - .2byte 0 @ padding - .4byte Route110_LandMonsInfo - .4byte Route110_WaterMonsInfo - .4byte NULL - .4byte Route110_FishingMonsInfo - - map Route111 - .2byte 0 @ padding - .4byte Route111_LandMonsInfo - .4byte Route111_WaterMonsInfo - .4byte Route111_RockSmashMonsInfo - .4byte Route111_FishingMonsInfo - - map Route112 - .2byte 0 @ padding - .4byte Route112_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map Route113 - .2byte 0 @ padding - .4byte Route113_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map Route114 - .2byte 0 @ padding - .4byte Route114_LandMonsInfo - .4byte Route114_WaterMonsInfo - .4byte Route114_RockSmashMonsInfo - .4byte Route114_FishingMonsInfo - - map Route115 - .2byte 0 @ padding - .4byte Route115_LandMonsInfo - .4byte Route115_WaterMonsInfo - .4byte NULL - .4byte Route115_FishingMonsInfo - - map Route116 - .2byte 0 @ padding - .4byte Route116_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map Route117 - .2byte 0 @ padding - .4byte Route117_LandMonsInfo - .4byte Route117_WaterMonsInfo - .4byte NULL - .4byte Route117_FishingMonsInfo - - map Route118 - .2byte 0 @ padding - .4byte Route118_LandMonsInfo - .4byte Route118_WaterMonsInfo - .4byte NULL - .4byte Route118_FishingMonsInfo - - map Route119 - .2byte 0 @ padding - .4byte Route119_LandMonsInfo - .4byte Route119_WaterMonsInfo - .4byte NULL - .4byte Route119_FishingMonsInfo - - map Route120 - .2byte 0 @ padding - .4byte Route120_LandMonsInfo - .4byte Route120_WaterMonsInfo - .4byte NULL - .4byte Route120_FishingMonsInfo - - map Route121 - .2byte 0 @ padding - .4byte Route121_LandMonsInfo - .4byte Route121_WaterMonsInfo - .4byte NULL - .4byte Route121_FishingMonsInfo - - map Route122 - .2byte 0 @ padding - .4byte NULL - .4byte Route122_WaterMonsInfo - .4byte NULL - .4byte Route122_FishingMonsInfo - - map Route123 - .2byte 0 @ padding - .4byte Route123_LandMonsInfo - .4byte Route123_WaterMonsInfo - .4byte NULL - .4byte Route123_FishingMonsInfo - - map Route124 - .2byte 0 @ padding - .4byte NULL - .4byte Route124_WaterMonsInfo - .4byte NULL - .4byte Route124_FishingMonsInfo - - map Route125 - .2byte 0 @ padding - .4byte NULL - .4byte Route125_WaterMonsInfo - .4byte NULL - .4byte Route125_FishingMonsInfo - - map Route126 - .2byte 0 @ padding - .4byte NULL - .4byte Route126_WaterMonsInfo - .4byte NULL - .4byte Route126_FishingMonsInfo - - map Route127 - .2byte 0 @ padding - .4byte NULL - .4byte Route127_WaterMonsInfo - .4byte NULL - .4byte Route127_FishingMonsInfo - - map Route128 - .2byte 0 @ padding - .4byte NULL - .4byte Route128_WaterMonsInfo - .4byte NULL - .4byte Route128_FishingMonsInfo - - map Route129 - .2byte 0 @ padding - .4byte NULL - .4byte Route129_WaterMonsInfo - .4byte NULL - .4byte Route129_FishingMonsInfo - - map Route130 - .2byte 0 @ padding - .4byte Route130_LandMonsInfo - .4byte Route130_WaterMonsInfo - .4byte NULL - .4byte Route130_FishingMonsInfo - - map Route131 - .2byte 0 @ padding - .4byte NULL - .4byte Route131_WaterMonsInfo - .4byte NULL - .4byte Route131_FishingMonsInfo - - map Route132 - .2byte 0 @ padding - .4byte NULL - .4byte Route132_WaterMonsInfo - .4byte NULL - .4byte Route132_FishingMonsInfo - - map Route133 - .2byte 0 @ padding - .4byte NULL - .4byte Route133_WaterMonsInfo - .4byte NULL - .4byte Route133_FishingMonsInfo - - map Route134 - .2byte 0 @ padding - .4byte NULL - .4byte Route134_WaterMonsInfo - .4byte NULL - .4byte Route134_FishingMonsInfo - - map SafariZone_Northwest - .2byte 0 @ padding - .4byte SafariZone_Northwest_LandMonsInfo - .4byte SafariZone_Northwest_WaterMonsInfo - .4byte NULL - .4byte SafariZone_Northwest_FishingMonsInfo - - map SafariZone_Northeast - .2byte 0 @ padding - .4byte SafariZone_Northeast_LandMonsInfo - .4byte NULL - .4byte SafariZone_Northeast_RockSmashMonsInfo - .4byte NULL - - map SafariZone_Southwest - .2byte 0 @ padding - .4byte SafariZone_Southwest_LandMonsInfo - .4byte SafariZone_Southwest_WaterMonsInfo - .4byte NULL - .4byte SafariZone_Southwest_FishingMonsInfo - - map SafariZone_Southeast - .2byte 0 @ padding - .4byte SafariZone_Southeast_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map DewfordTown - .2byte 0 @ padding - .4byte NULL - .4byte DewfordTown_WaterMonsInfo - .4byte NULL - .4byte DewfordTown_FishingMonsInfo - - map PacifidlogTown - .2byte 0 @ padding - .4byte NULL - .4byte PacifidlogTown_WaterMonsInfo - .4byte NULL - .4byte PacifidlogTown_FishingMonsInfo - - map Underwater1 - .2byte 0 @ padding - .4byte NULL - .4byte Underwater1_WaterMonsInfo - .4byte NULL - .4byte NULL - - map Underwater2 - .2byte 0 @ padding - .4byte NULL - .4byte Underwater2_WaterMonsInfo - .4byte NULL - .4byte NULL - - map UNDEFINED - .2byte 0 @ padding - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL |