diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_scripts_1.s | 814 | ||||
| -rw-r--r-- | data/battle_scripts_2.s | 10 | ||||
| -rw-r--r-- | data/contest.s | 8 | ||||
| -rw-r--r-- | data/credits.s | 159 | ||||
| -rw-r--r-- | data/data2a.s | 32 | ||||
| -rw-r--r-- | data/data2b.s | 8 | ||||
| -rw-r--r-- | data/easy_chat.s | 18 | ||||
| -rw-r--r-- | data/field_weather.s | 34 | ||||
| -rw-r--r-- | data/mail.s | 2 | ||||
| -rw-r--r-- | data/pokedex_area_screen.s | 4 | ||||
| -rw-r--r-- | data/pokedex_cry_screen.s | 2 | ||||
| -rw-r--r-- | data/pokemon_storage_system.s | 6 | ||||
| -rw-r--r-- | data/pokenav.s | 2 | ||||
| -rw-r--r-- | data/roulette.s | 26 | ||||
| -rw-r--r-- | data/scripts/maps/BattleTower_BattleRoom.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 2 | ||||
| -rw-r--r-- | data/slot_machine.s | 70 | ||||
| -rw-r--r-- | data/text/credits.inc | 1011 |
18 files changed, 503 insertions, 1707 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index e046794b3..83bacd844 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -244,10 +244,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 +281,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 +313,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 +337,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 +361,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 +384,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 +402,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 +427,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 +437,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 +481,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 +498,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 +525,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 +535,7 @@ BattleScript_1D71CE: @ 81D71CE BattleScript_1D71D0: @ 81D71D0 atk47 - playanimation USER, 1, 0x20160a4 + playanimation USER, 1, gSharedMem + 0x160A4 BattleScript_1D71D8: @ 81D71D8 printfromtable BattleTextList_401570 @@ -545,29 +545,29 @@ BattleScript_1D71E0: @ 81D71E0 jump BattleScript_EndTurn BattleScript_StatUp:: @ 81D71E5 - playanimation 2, 1, 0x20160a4 + playanimation 2, 1, 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 +576,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 +585,7 @@ BattleScript_1D725F: @ 81D725F attackanimation waitanimation atk47 - playanimation TARGET, 1, 0x20160a4 + playanimation TARGET, 1, gSharedMem + 0x160A4 BattleScript_1D7269: @ 81D7269 printfromtable BattleTextList_40157C @@ -595,7 +595,7 @@ BattleScript_1D7271: @ 81D7271 jump BattleScript_EndTurn BattleScript_StatDown:: @ 81D7276 - playanimation 2, 1, 0x20160a4 + playanimation 2, 1, gSharedMem + 0x160A4 printfromtable BattleTextList_40157C waitmessage 64 return @@ -617,7 +617,7 @@ MoveEffect_Bide: @ 81D7297 ppreduce attackanimation waitanimation - orword 0x2024c6c, 0x8000000 + orword gHitMarker, 0x8000000 setbide jump BattleScript_EndTurn @@ -649,21 +649,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 +676,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 +689,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 +715,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 +725,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 +747,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 +760,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 +777,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 +812,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 +825,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 +846,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 +860,7 @@ MoveEffect_SuperFang: @ 81D7596 attackstring ppreduce atk6 - bicbyte 0x2024c68, 6 + bicbyte gBattleMoveFlags, 6 gethalfcurrentenemyhp jump BattleScript_1D6F48 @@ -870,22 +870,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 +895,7 @@ MoveEffect_DoubleHit: @ 81D760D ppreduce setloopcounter 2 atk8e - setbyte 0x2016112, 0 + setbyte gSharedMem + 0x16112, 0 jump BattleScript_1D7300 MoveEffect_RecoilIfMiss: @ 81D7625 @@ -909,19 +909,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 +948,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 +964,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 +977,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 +1008,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 +1051,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 +1064,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 +1084,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 +1141,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 +1165,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 +1176,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 +1205,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 +1254,7 @@ MoveEffect_LevelDamage: @ 81D7A17 attackstring ppreduce atk6 - bicbyte 0x2024c68, 6 + bicbyte gBattleMoveFlags, 6 nightshadedamageeffect atk69 jump BattleScript_1D6F48 @@ -1265,7 +1265,7 @@ MoveEffect_Psywave: @ 81D7A2F attackstring ppreduce atk6 - bicbyte 0x2024c68, 6 + bicbyte gBattleMoveFlags, 6 psywavedamageeffect atk69 jump BattleScript_1D6F48 @@ -1300,10 +1300,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 +1318,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 +1327,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 +1379,7 @@ BattleScript_1D7B52: @ 81D7B52 statusanimation USER attackstring ppreduce - orword 0x2024c6c, 0x800 + orword gHitMarker, 0x800 selectrandommovefromusermoves BattleScript_1D7B72 pause 64 jump BattleScript_ButItFailed @@ -1387,8 +1387,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 +1428,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 +1447,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 +1480,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 +1492,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 +1516,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 +1534,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 +1543,7 @@ BattleScript_1D7D1A: @ 81D7D1A MoveEffect_Minimize: @ 81D7D2E attackcanceler setminimize - setbyte 0x201601e, 23 + setbyte gSharedMem + 0x1601E, 23 jump BattleScript_1D71B3 MoveEffect_Curse: @ 81D7D3B @@ -1556,23 +1556,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 +1581,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 +1590,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 +1645,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 +1690,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, 1, 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 +1716,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 +1755,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 +1791,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 +1800,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 +1843,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 +1859,7 @@ MoveEffect_BellyDrum: @ 81D8038 attackstring ppreduce maxattackhalvehp BattleScript_ButItFailed - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 attackanimation waitanimation graphicalhpupdate USER @@ -1891,14 +1891,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, 1, gSharedMem + 0x160A4 printfromtable BattleTextList_401570 waitmessage 64 @@ -1907,11 +1907,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 +1923,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 +1951,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 +1962,7 @@ BattleScript_1D8165: @ 81D8165 missmessage resultmessage waitmessage 64 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 jumpwhiletargetvalid BattleScript_1D80FD end @@ -1980,52 +1980,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 +2034,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 +2058,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 +2067,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 +2092,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 +2113,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 +2131,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 +2147,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 +2158,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 +2173,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 +2195,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 +2260,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, 1, 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 +2288,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 +2306,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 +2314,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 +2359,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 +2372,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 +2476,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 +2492,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 +2531,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 +2574,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 +2583,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 +2591,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 +2675,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 +2700,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 +2748,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 +2756,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 +2770,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 +2792,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 +2807,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 +2826,7 @@ BattleScript_1D8AF0: @ 81D8AF0 jump BattleScript_EndTurn MoveEffect_SkyUppercut: @ 81D8AF5 - orword 0x2024c6c, 0x10000 + orword gHitMarker, 0x10000 jump BattleScript_1D6F14 MoveEffect_BulkUp: @ 81D8B03 @@ -2839,18 +2839,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 +2867,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 +2887,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 +2902,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 +2948,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 +3011,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 +3036,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 +3056,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 @@ -3121,8 +3121,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 +3152,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 +3178,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 +3195,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 +3209,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,7 +3237,7 @@ BattleScript_1D8F61: @ 81D8F61 gUnknown_081D8F62:: @ 81D8F62 printfromtable BattleTextList_401534 waitmessage 64 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8F7C + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8F7C playanimation USER, 10, 0x0 BattleScript_1D8F7C: @ 81D8F7C @@ -3246,16 +3246,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 +3264,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 @@ -3291,7 +3291,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 +3312,21 @@ gUnknown_081D9041:: @ 81D9041 end2 BattleScript_LeechSeedTurnDrain:: @ 81D904B - playanimation USER, 14, 0x20160a4 - orword 0x2024c6c, 0x100100 + playanimation USER, 14, 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 +3345,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 +3372,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 +3418,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 +3434,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 +3448,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 +3462,7 @@ gUnknown_081D91CD:: @ 81D91CD return BattleScript_1D91EE: @ 81D91EE - setbyte 0x201600f, 0 + setbyte gSharedMem + 0x1600F, 0 atk23 3 jump gUnknown_081D8C7B @@ -3474,7 +3474,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 +3493,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 +3549,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,7 +3558,7 @@ BattleScript_1D92F4: @ 81D92F4 BattleScript_1D92FB: @ 81D92FB atk8 - jumpifbyte 1, 0x2024d23, 0, BattleScript_1D9313 + jumpifbyte 1, gUnknown_02024D1F + 0x4, 0, BattleScript_1D9313 playanimation USER, 18, 0x0 jump BattleScript_1D931A @@ -3577,20 +3577,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 @@ -3629,7 +3629,7 @@ BattleScript_WishComesTrue:: @ 81D939A playanimation TARGET, 22, 0x0 printstring BATTLE_TEXT_WishTrue waitmessage 64 - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_RegainedHealth @@ -3648,7 +3648,7 @@ BattleScript_IngrainTurnHeal:: @ 81D93D1 playanimation USER, 21, 0x0 printstring BATTLE_TEXT_AbsorbNutrients waitmessage 64 - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER end2 @@ -3660,20 +3660,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 @@ -3706,7 +3706,7 @@ BattleScript_MagicCoatBounce:: @ 81D946F pause 32 printstring BATTLE_TEXT_MagicCoatBounce waitmessage 64 - orword 0x2024c6c, 0x800c00 + orword gHitMarker, 0x800c00 atk76 USER, 1 return @@ -3717,7 +3717,7 @@ BattleScript_SnatchedMove:: @ 81D9487 playanimation TARGET, 17, 0x0 printstring BATTLE_TEXT_SnatchedMove waitmessage 64 - orword 0x2024c6c, 0x800c00 + orword gHitMarker, 0x800c00 atk5f return @@ -3732,11 +3732,11 @@ 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 @@ -3758,7 +3758,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 +3778,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 +3836,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 +3846,7 @@ BattleScript_1D95AC: @ 81D95AC missmessage atk5c USER waitstateatk - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate USER datahpupdate USER faintpokemon USER, 0, 0x0 @@ -3866,7 +3866,7 @@ gUnknown_081D95DB:: @ 81D95DB return BattleScript_WrapTurnDmg:: @ 81D95E2 - playanimation USER, 6, 0x20160a4 + playanimation USER, 6, gSharedMem + 0x160A4 printstring BATTLE_TEXT_HurtBy waitmessage 64 jump BattleScript_1D9520 @@ -3976,11 +3976,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 @@ -4005,7 +4005,7 @@ BattleScript_DrizzleActivates:: @ 81D9704 end3 BattleScript_SpeedBoostActivates:: @ 81D9718 - playanimation USER, 1, 0x20160a4 + playanimation USER, 1, gSharedMem + 0x160A4 printstring BATTLE_TEXT_SpeedRisen waitmessage 64 end3 @@ -4019,7 +4019,7 @@ BattleScript_TraceActivates:: @ 81D9726 BattleScript_RainDishActivates:: @ 81D9730 printstring BATTLE_TEXT_RestoredHPByItem waitmessage 64 - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER end3 @@ -4039,12 +4039,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 +4066,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 +4076,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, 1, gSharedMem + 0x160A4 printstring BATTLE_TEXT_CutsAttack waitmessage 64 BattleScript_1D97E4: @ 81D97E4 - addbyte 0x2024c08, 1 + addbyte gBankTarget, 1 jump BattleScript_1D97A1 BattleScript_1D97EF: @ 81D97EF @@ -4108,7 +4108,7 @@ BattleScript_TookAttack:: @ 81D9812 pause 32 printstring BATTLE_TEXT_TookAttack2 waitmessage 64 - orword 0x2024c6c, 0x400 + orword gHitMarker, 0x400 return gUnknown_081D9826:: @ 81D9826 @@ -4129,12 +4129,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 +4145,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 +4218,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 +4233,7 @@ BattleScript_ColorChangeActivates:: @ 81D9921 return BattleScript_RoughSkinActivates:: @ 81D9928 - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate USER datahpupdate USER printstring BATTLE_TEXT_HurtOther @@ -4266,7 +4266,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 +4278,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 @@ -4399,7 +4399,7 @@ BattleScript_ItemHealHP_RemoveItem:: @ 81D9A74 playanimation USER, 7, 0x0 printstring BATTLE_TEXT_RestoredHealth waitmessage 64 - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER removeitem USER @@ -4420,7 +4420,7 @@ BattleScript_ItemHealHP_Ret:: @ 81D9AA7 playanimation USER, 7, 0x0 printstring BATTLE_TEXT_RestoredHPLittle waitmessage 64 - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER return @@ -4439,12 +4439,12 @@ BattleScript_BerryConfuseHealEnd2:: @ 81D9AD4 playanimation USER, 7, 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 @@ -4454,7 +4454,7 @@ BattleScript_BerryStatRaiseEnd2:: @ 81D9AFE statbuffchange 65, BattleScript_1D9B0B BattleScript_1D9B0B: @ 81D9B0B - setbyte 0x2024d23, 4 + setbyte gUnknown_02024D1F + 0x4, 4 callatk BattleScript_StatUp removeitem USER end2 diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index b10b7f96f..0833b7bf2 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -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 diff --git a/data/contest.s b/data/contest.s index 0e06e9290..181d5ed13 100644 --- a/data/contest.s +++ b/data/contest.s @@ -297,10 +297,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..30803120d 100644 --- a/data/data2a.s +++ b/data/data2a.s @@ -7,31 +7,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..e0844b902 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -45,7 +45,7 @@ gBerryMasterWifePhrases:: @ 83DB680 .endif gUnknown_083DB694:: @ 83DB694 - .4byte 0x02001000 + .4byte gSharedMem + 0x1000 .align 2 gUnknown_083DB698:: @ 83DB698 @@ -114,15 +114,15 @@ 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 diff --git a/data/field_weather.s b/data/field_weather.s index 836bfbe99..1b0076451 100644 --- a/data/field_weather.s +++ b/data/field_weather.s @@ -4,40 +4,6 @@ .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 diff --git a/data/mail.s b/data/mail.s index f5ae7f102..e82212a42 100644 --- a/data/mail.s +++ b/data/mail.s @@ -175,4 +175,4 @@ gUnknown_083E57A4:: @ 83E57A4 @ XXX: what is this? .align 2 - .4byte 0x2000000 + .4byte gSharedMem diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s index 9c23f8e89..0734a44d7 100644 --- a/data/pokedex_area_screen.s +++ b/data/pokedex_area_screen.s @@ -26,7 +26,7 @@ gUnknown_083F857A:: @ 83F857A @ 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/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/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/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index dbab17a8b..c3ff67902 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -17,7 +17,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA applymovement 1, BattleTower_BattleRoom_Movement_160AC0 waitmovement 0 special PrintBattleTowerTrainerGreeting - msgbox 0x20234cc, 4 + msgbox gStringVar4, 4 waitmessage closemessage special ScrSpecial_HealPlayerParty diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 11b3ce7a3..5a526bd60 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -16,7 +16,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEF9 waitmovement 0 special PrintEReaderTrainerGreeting - msgbox 0x20234cc, 4 + msgbox gStringVar4, 4 closemessage setvar 0x8004, 2 setvar 0x8005, 0 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/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 |