From 9adf3efe5b136802f7b69ba0fa04df96b2c5ffc9 Mon Sep 17 00:00:00 2001 From: travis Date: Mon, 29 Jun 2020 16:28:06 +0000 Subject: [PATCH] Merge branch 'master' of https://github.com/pret/pokegold --- pokegold.sym | 305 ++++++++++++++++++++++++------------------------- pokesilver.sym | 305 ++++++++++++++++++++++++------------------------- 2 files changed, 300 insertions(+), 310 deletions(-) diff --git a/pokegold.sym b/pokegold.sym index 7905335d..487c0dd1 100644 --- a/pokegold.sym +++ b/pokegold.sym @@ -7896,19 +7896,19 @@ 0e:462f AI_Types.checkmove 0e:465e AI_Types.noteffective 0e:466c AI_Types.checkmove2 -0e:4684 AI_Types.asm_38684 -0e:4685 AI_Types.asm_38685 +0e:4684 AI_Types.damaging +0e:4685 AI_Types.movesdone 0e:468f AI_Types.immune 0e:4694 AI_Offensive 0e:469c AI_Offensive.checkmove 0e:46b0 AI_Smart 0e:46b8 AI_Smart.checkmove 0e:46de AI_Smart.nextmove -0e:46e4 AI_Smart.table_386e4 +0e:46e4 AI_Smart_EffectHandlers 0e:47d5 AI_Smart_Sleep -0e:47e2 AI_Smart_Sleep.asm_387e2 +0e:47e2 AI_Smart_Sleep.encourage 0e:47e9 AI_Smart_LeechHit -0e:4807 AI_Smart_LeechHit.asm_38807 +0e:4807 AI_Smart_LeechHit.discourage 0e:480f AI_Smart_LockOn 0e:4826 AI_Smart_LockOn.asm_38826 0e:4841 AI_Smart_LockOn.asm_38841 @@ -7919,10 +7919,10 @@ 0e:487d AI_Smart_LockOn.asm_3887d 0e:4894 AI_Smart_LockOn.asm_38894 0e:4898 AI_Smart_Selfdestruct -0e:48a7 AI_Smart_Selfdestruct.asm_388a7 +0e:48a7 AI_Smart_Selfdestruct.discourage 0e:48ab AI_Smart_DreamEater 0e:48b5 AI_Smart_EvasionUp -0e:48d0 AI_Smart_EvasionUp.asm_388d0 +0e:48d0 AI_Smart_EvasionUp.encourage 0e:48d3 AI_Smart_EvasionUp.asm_388d3 0e:48eb AI_Smart_EvasionUp.asm_388eb 0e:48f0 AI_Smart_EvasionUp.asm_388f0 @@ -7931,11 +7931,11 @@ 0e:4919 AI_Smart_EvasionUp.asm_38919 0e:4922 AI_Smart_EvasionUp.asm_38922 0e:4928 AI_Smart_AlwaysHit -0e:4935 AI_Smart_AlwaysHit.asm_38935 +0e:4935 AI_Smart_AlwaysHit.encourage 0e:493c AI_Smart_MirrorMove -0e:4949 AI_Smart_MirrorMove.asm_38949 +0e:4949 AI_Smart_MirrorMove.usedmove 0e:4966 AI_Smart_AccuracyDown -0e:497e AI_Smart_AccuracyDown.asm_3897e +0e:497e AI_Smart_AccuracyDown.encourage 0e:4981 AI_Smart_AccuracyDown.asm_38981 0e:4999 AI_Smart_AccuracyDown.asm_38999 0e:499e AI_Smart_AccuracyDown.asm_3899e @@ -7944,26 +7944,26 @@ 0e:49c7 AI_Smart_AccuracyDown.asm_389c7 0e:49d0 AI_Smart_AccuracyDown.asm_389d0 0e:49d6 AI_Smart_ResetStats -0e:49dc AI_Smart_ResetStats.asm_389dc -0e:49e6 AI_Smart_ResetStats.asm_389e6 -0e:49eb AI_Smart_ResetStats.asm_389eb -0e:49f3 AI_Smart_ResetStats.asm_389f3 -0e:49fc AI_Smart_ResetStats.asm_389fc +0e:49dc AI_Smart_ResetStats.enemystatsloop +0e:49e6 AI_Smart_ResetStats.enemystatsdone +0e:49eb AI_Smart_ResetStats.playerstatsloop +0e:49f3 AI_Smart_ResetStats.encourage +0e:49fc AI_Smart_ResetStats.discourage 0e:49ff AI_Smart_Bide 0e:4a0b AI_Smart_ForceSwitch 0e:4a1b AI_Smart_Heal 0e:4a1b AI_Smart_MorningSun 0e:4a1b AI_Smart_Synthesis 0e:4a1b AI_Smart_Moonlight -0e:4a26 AI_Smart_Moonlight.asm_38a26 +0e:4a26 AI_Smart_Moonlight.encourage 0e:4a2f AI_Smart_Toxic 0e:4a2f AI_Smart_LeechSeed 0e:4a35 AI_Smart_LightScreen 0e:4a35 AI_Smart_Reflect 0e:4a41 AI_Smart_Ohko 0e:4a52 AI_Smart_TrapTarget -0e:4a6c AI_Smart_TrapTarget.asm_38a6c -0e:4a72 AI_Smart_TrapTarget.asm_38a72 +0e:4a6c AI_Smart_TrapTarget.discourage +0e:4a72 AI_Smart_TrapTarget.encourage 0e:4a7d AI_Smart_RazorWind 0e:4a7d AI_Smart_Unused2B 0e:4a8b AI_Smart_Unused2B.asm_38a8b @@ -7973,48 +7973,48 @@ 0e:4ab4 AI_Smart_Unused2B.asm_38ab4 0e:4ab6 AI_Smart_Unused2B.asm_38ab6 0e:4abc AI_Smart_Confuse -0e:4ac8 AI_Smart_Confuse.asm_38ac8 +0e:4ac8 AI_Smart_Confuse.skipdiscourage 0e:4ace AI_Smart_SpDefenseUp2 -0e:4aea AI_Smart_SpDefenseUp2.asm_38aea -0e:4af1 AI_Smart_SpDefenseUp2.asm_38af1 +0e:4aea AI_Smart_SpDefenseUp2.encourage +0e:4af1 AI_Smart_SpDefenseUp2.discourage 0e:4af3 AI_Smart_Fly 0e:4b01 AI_Smart_SuperFang 0e:4b07 AI_Smart_Paralyze -0e:4b1b AI_Smart_Paralyze.asm_38b1b +0e:4b1b AI_Smart_Paralyze.discourage 0e:4b21 AI_Smart_SpeedDownHit 0e:4b3d AI_Smart_Substitute 0e:4b44 AI_Smart_HyperBeam -0e:4b53 AI_Smart_HyperBeam.asm_38b53 +0e:4b53 AI_Smart_HyperBeam.discourage 0e:4b60 AI_Smart_Rage -0e:4b6d AI_Smart_Rage.asm_38b6d -0e:4b7c AI_Smart_Rage.asm_38b7c -0e:4b87 AI_Smart_Rage.asm_38b87 +0e:4b6d AI_Smart_Rage.skipencourage +0e:4b7c AI_Smart_Rage.notbuilding +0e:4b87 AI_Smart_Rage.discourage 0e:4b89 AI_Smart_Mimic 0e:4bb5 AI_Smart_Mimic.asm_38bb5 0e:4bca AI_Smart_Mimic.asm_38bca 0e:4bd0 AI_Smart_Mimic.asm_38bd0 0e:4bd2 AI_Smart_Counter -0e:4bda AI_Smart_Counter.asm_38bda -0e:4bef AI_Smart_Counter.asm_38c0e -0e:4c11 AI_Smart_Counter.asm_38c11 -0e:4c19 AI_Smart_Counter.asm_38c19 -0e:4c1a AI_Smart_Counter.asm_38c1a +0e:4bda AI_Smart_Counter.playermoveloop +0e:4bef AI_Smart_Counter.skipmove +0e:4c11 AI_Smart_Counter.encourage +0e:4c19 AI_Smart_Counter.done +0e:4c1a AI_Smart_Counter.discourage 0e:4c1c AI_Smart_Encore -0e:4c49 AI_Smart_Encore.asm_38c49 -0e:4c59 AI_Smart_Encore.asm_38c59 -0e:4c62 AI_Smart_Encore.asm_38c62 +0e:4c49 AI_Smart_Encore.weakmove +0e:4c59 AI_Smart_Encore.encourage +0e:4c62 AI_Smart_Encore.discourage 0e:4c66 EncoreMoves 0e:4c85 AI_Smart_PainSplit 0e:4c9b AI_Smart_Snore 0e:4c9b AI_Smart_SleepTalk -0e:4ca8 AI_Smart_SleepTalk.asm_38ca8 +0e:4ca8 AI_Smart_SleepTalk.discourage 0e:4cac AI_Smart_DefrostOpponent 0e:4cb6 AI_Smart_Spite -0e:4cc8 AI_Smart_Spite.asm_38cc8 -0e:4cd2 AI_Smart_Spite.asm_38cd2 -0e:4cdc AI_Smart_Spite.asm_38cdc -0e:4cec AI_Smart_Spite.asm_38cec -0e:4cee AI_Smart_Spite.asm_38cee +0e:4cc8 AI_Smart_Spite.usedmove +0e:4cd2 AI_Smart_Spite.moveloop +0e:4cdc AI_Smart_Spite.foundmove +0e:4cec AI_Smart_Spite.discourage +0e:4cee AI_Smart_Spite.encourage 0e:4cfa AI_Smart_DestinyBond 0e:4cfa AI_Smart_Reversal 0e:4cfa AI_Smart_SkullBash @@ -8026,16 +8026,16 @@ 0e:4d3b AI_Smart_PriorityHit 0e:4d74 AI_Smart_Thief 0e:4d79 AI_Smart_Conversion2 -0e:4daa AI_Smart_Conversion2.asm_38daa +0e:4daa AI_Smart_Conversion2.discourage 0e:4db2 AI_Smart_Disable -0e:4dcf AI_Smart_Disable.asm_38dcf -0e:4dd4 AI_Smart_Disable.asm_38dd4 +0e:4dcf AI_Smart_Disable.notencourage +0e:4dd4 AI_Smart_Disable.discourage 0e:4ddc AI_Smart_MeanLook -0e:4e05 AI_Smart_MeanLook.asm_38e05 -0e:4e07 AI_Smart_MeanLook.asm_38e07 +0e:4e05 AI_Smart_MeanLook.discourage +0e:4e07 AI_Smart_MeanLook.encourage 0e:4e0f AICheckLastPlayerMon 0e:4e1b AICheckLastPlayerMon.loop -0e:4e25 AICheckLastPlayerMon.asm_38e25 +0e:4e25 AICheckLastPlayerMon.skip 0e:4e2b AI_Smart_Nightmare 0e:4e31 AI_Smart_FlameWheel 0e:4e3d AI_Smart_Curse @@ -8072,9 +8072,9 @@ 0e:5019 AI_Smart_Earthquake.could_dig 0e:5023 AI_Smart_BatonPass 0e:5033 AI_Smart_Pursuit -0e:503e AI_Smart_Pursuit.asm_3903e +0e:503e AI_Smart_Pursuit.encourage 0e:5045 AI_Smart_RapidSpin -0e:5058 AI_Smart_RapidSpin.asm_39058 +0e:5058 AI_Smart_RapidSpin.encourage 0e:505f AI_Smart_HiddenPower 0e:5088 AI_Smart_HiddenPower.good 0e:508a AI_Smart_HiddenPower.bad @@ -8087,30 +8087,30 @@ 0e:50f2 AIGoodWeatherType.good 0e:50f5 SunnyDayMoves 0e:50fe AI_Smart_BellyDrum -0e:510e AI_Smart_BellyDrum.asm_3910e +0e:510e AI_Smart_BellyDrum.discourage 0e:5113 AI_Smart_PsychUp 0e:511b AI_Smart_PsychUp.asm_3911b 0e:512a AI_Smart_PsychUp.asm_3912a 0e:514f AI_Smart_PsychUp.asm_3914f 0e:5151 AI_Smart_MirrorCoat -0e:5159 AI_Smart_MirrorCoat.asm_39159 -0e:516e AI_Smart_MirrorCoat.asm_3916e -0e:5190 AI_Smart_MirrorCoat.asm_39190 -0e:5198 AI_Smart_MirrorCoat.asm_39198 -0e:5199 AI_Smart_MirrorCoat.asm_39199 +0e:5159 AI_Smart_MirrorCoat.playermoveloop +0e:516e AI_Smart_MirrorCoat.skipmove +0e:5190 AI_Smart_MirrorCoat.encourage +0e:5198 AI_Smart_MirrorCoat.done +0e:5199 AI_Smart_MirrorCoat.discourage 0e:519b AI_Smart_Twister 0e:519b AI_Smart_Gust 0e:51af AI_Smart_Gust.couldFly 0e:51b9 AI_Smart_FutureSight 0e:51c6 AI_Smart_Stomp 0e:51d1 AI_Smart_Solarbeam -0e:51e4 AI_Smart_Solarbeam.asm_391e4 +0e:51e4 AI_Smart_Solarbeam.encourage 0e:51eb AI_Smart_Thunder 0e:51f9 AICompareSpeed 0e:520c AICheckPlayerMaxHP 0e:5217 AICheckEnemyMaxHP 0e:5220 AICheckMaxHP -0e:522f AICheckMaxHP.asm_3922f +0e:522f AICheckMaxHP.not_max 0e:5234 AICheckPlayerHalfHP 0e:5247 AICheckEnemyHalfHP 0e:525e AICheckEnemyQuarterHP @@ -8125,9 +8125,9 @@ 0e:52c3 AIHasMoveInArray.done 0e:52c7 UsefulMoves 0e:52db AI_Opportunist -0e:52e8 AI_Opportunist.asm_392e8 +0e:52e8 AI_Opportunist.lowhp 0e:52f0 AI_Opportunist.checkmove -0e:530d AI_Opportunist.asm_3930d +0e:530d AI_Opportunist.done 0e:530e StallMoves 0e:532f AI_Aggressive 0e:5338 AI_Aggressive.checkmove @@ -8137,10 +8137,10 @@ 0e:53a7 AI_Aggressive.done 0e:53a8 RecklessMoves 0e:53ad AIDamageCalc -0e:53c6 AIDamageCalc.asm_393c6 +0e:53c6 AIDamageCalc.notconstant 0e:53d9 ConstantDamageEffects 0e:53de AI_Cautious -0e:53eb AI_Cautious.asm_393eb +0e:53eb AI_Cautious.loop 0e:540c ResidualMoves 0e:5419 AI_Status 0e:5421 AI_Status.checkmove @@ -18057,9 +18057,9 @@ 3c:61c0 Sfx_SwordsDance_Ch8 3c:61d0 Sfx_Thunder_Ch8 3c:61e6 Sfx_Supersonic_Ch5 -3c:61ec Sfx_Supersonic_branch_f21ec +3c:61ec Sfx_Supersonic_Ch5.loop 3c:61f9 Sfx_Supersonic_Ch6 -3c:61ff Sfx_Supersonic_branch_f21ff +3c:61ff Sfx_Supersonic_Ch6.loop 3c:620c Sfx_Supersonic_Ch8 3c:6217 Sfx_Leer_Ch5 3c:6226 Sfx_Leer_Ch6 @@ -18098,9 +18098,9 @@ 3c:64a2 Sfx_Sing_Ch5 3c:64b3 Sfx_Sing_Ch6 3c:64c7 Sfx_HyperBeam_Ch5 -3c:64f5 Sfx_HyperBeam_branch_f24f5 +3c:64f5 Sfx_HyperBeam_Ch5.loop 3c:6506 Sfx_HyperBeam_Ch6 -3c:6534 Sfx_HyperBeam_branch_f2534 +3c:6534 Sfx_HyperBeam_Ch6.loop 3c:6545 Sfx_HyperBeam_Ch8 3c:6550 Sfx_Unknown60_Ch8 3c:6569 Sfx_Unknown61_Ch8 @@ -18114,7 +18114,7 @@ 3c:65bb Sfx_PayDay_Ch6 3c:65ca Sfx_Metronome_Ch5 3c:65f5 Sfx_Unknown5F_Ch5 -3c:65f5 Sfx_Unknown5F_branch_f25f5 +3c:65f5 Sfx_Unknown5F_Ch5.loop 3c:6602 Sfx_Unknown5F_Ch6 3c:6613 Sfx_Fanfare2_Ch5 3c:6636 Sfx_Fanfare2_Ch6 @@ -18126,7 +18126,7 @@ 3c:66dd Sfx_NoSignal_Ch5 3c:66ec Sfx_Sandstorm_Ch8 3c:6700 Sfx_Elevator_Ch5 -3c:6704 Sfx_Elevator_branch_f2704 +3c:6704 Sfx_Elevator_Ch5.loop 3c:6729 Sfx_Elevator_Ch6 3c:6729 Sfx_Elevator_Ch7 3c:6732 Sfx_Elevator_Ch8 @@ -18169,7 +18169,7 @@ 3c:6e74 Cry_Magcargo_Ch5 3c:6e93 Cry_Magcargo_Ch6 3c:6eb2 Cry_Magcargo_Ch8 -3c:6eb5 Cry_Magcargo_branch_f2eb5 +3c:6eb5 Cry_Magcargo_Ch8.loop 3c:6ec3 Cry_Dunsparce_Ch5 3c:6ee6 Cry_Dunsparce_Ch6 3c:6ef1 Cry_Dunsparce_Ch8 @@ -18184,7 +18184,6 @@ 3c:6fcc Cry_Marill_Ch8 3c:6fdf Cry_Togepi_Ch5 3c:6fe2 Cry_Togepi_Ch6 -3c:6fe2 Cry_Togetic_branch_f2fe2 3c:6ff5 Cry_Togetic_Ch5 3c:6ff8 Cry_Togetic_Ch6 3c:7008 Cry_Spinarak_Ch5 @@ -18195,20 +18194,19 @@ 3c:707d Cry_Raikou_Ch8 3c:7096 Cry_Hoothoot_Ch5 3c:70b9 Cry_Hoothoot_Ch6 -3c:70bb Cry_Hoothoot_branch_f30bb -3c:70c3 Cry_Hoothoot_branch_f30c3 +3c:70bb Cry_Hoothoot_Ch6.loop1 +3c:70c3 Cry_Hoothoot_Ch6.loop2 3c:70d4 Cry_Hoothoot_Ch8 3c:70e1 Cry_Sentret_Ch5 3c:70e9 Cry_Sentret_Ch6 -3c:70eb Cry_Sentret_branch_f30eb +3c:70eb Cry_Sentret_Ch6.body 3c:70fb Cry_Mareep_Ch5 3c:7103 Cry_Mareep_Ch6 -3c:7105 Cry_Mareep_branch_f3105 -3c:7105 Cry_Gligar_branch_f3105 +3c:7105 Cry_Mareep_Ch6.body 3c:7116 Cry_Cyndaquil_Ch5 3c:7119 Cry_Cyndaquil_Ch6 -3c:711f Cry_Cyndaquil_branch_f311f -3c:712b Cry_Cyndaquil_branch_f312b +3c:711f Cry_Cyndaquil_Ch6.loop1 +3c:712b Cry_Cyndaquil_Ch6.loop2 3c:7138 Cry_Cyndaquil_Ch8 3c:7138 Cry_Gligar_Ch8 3c:713f Cry_Chikorita_Ch5 @@ -18217,13 +18215,13 @@ 3c:7160 Cry_Gligar_Ch5 3c:7165 Cry_Girafarig_Ch5 3c:716d Cry_Girafarig_Ch6 -3c:716f Cry_Girafarig_branch_f316f +3c:716f Cry_Girafarig_Ch6.body 3c:7184 Cry_Girafarig_Ch8 3c:7194 Cry_Slugma_Ch5 3c:71ab Cry_Slugma_Ch8 3c:71b8 Cry_Ledyba_Ch5 3c:71c0 Cry_Ledyba_Ch6 -3c:71c2 Cry_Ledyba_branch_f31c2 +3c:71c2 Cry_Ledyba_Ch6.body 3c:71db Cry_Ledyba_Ch8 3c:71ee Cry_Wooper_Ch5 3c:71ee Cry_Donphan_Ch5 @@ -18233,33 +18231,32 @@ 3c:7234 Cry_Donphan_Ch8 3c:7244 Cry_Typhlosion_Ch5 3c:7244 Cry_Teddiursa_Ch5 -3c:7246 Cry_Teddiursa_branch_f3246 -3c:724e Cry_Teddiursa_branch_f324e -3c:7256 Cry_Teddiursa_branch_f3256 -3c:7262 Cry_Teddiursa_branch_f3262 -3c:726e Cry_Teddiursa_branch_f326e +3c:7246 Cry_Typhlosion_Ch5.loop1 +3c:724e Cry_Typhlosion_Ch5.loop2 +3c:7256 Cry_Typhlosion_Ch5.loop3 +3c:7262 Cry_Typhlosion_Ch5.loop4 +3c:726e Cry_Typhlosion_Ch5.loop5 3c:727b Cry_Typhlosion_Ch6 3c:727b Cry_Teddiursa_Ch6 3c:729a Cry_Typhlosion_Ch8 3c:72a7 Cry_Natu_Ch5 -3c:72a9 Cry_Sunflora_branch_f32a9 -3c:72a9 Cry_Mantine_branch_f32a9 -3c:72b5 Cry_Mantine_branch_f32b5 +3c:72a9 Cry_Natu_Ch5.body1 +3c:72b5 Cry_Natu_Ch5.body2 3c:72c2 Cry_Natu_Ch6 3c:72c2 Cry_Sunflora_Ch6 -3c:72c2 Cry_Mantine_branch_f32c2 -3c:72d0 Cry_Mantine_branch_f32d0 +3c:72c2 Cry_Sunflora_Ch6.body1 +3c:72d0 Cry_Sunflora_Ch6.body2 3c:72dd Cry_Natu_Ch8 3c:72dd Cry_Sunflora_Ch8 -3c:72dd Cry_Mantine_branch_f32dd -3c:72e6 Cry_Mantine_branch_f32e6 +3c:72dd Cry_Sunflora_Ch8.body1 +3c:72e6 Cry_Sunflora_Ch8.body2 3c:72f0 Cry_Teddiursa_Ch8 3c:72f7 Cry_Sunflora_Ch5 3c:72fc Cry_Mantine_Ch5 3c:7305 Cry_Mantine_Ch6 3c:730c Cry_Mantine_Ch8 3c:7313 Cry_Ampharos_Ch5 -3c:7315 Cry_Ampharos_branch_f3315 +3c:7315 Cry_Ampharos_Ch5.loop 3c:7330 Cry_Ampharos_Ch6 3c:7347 Cry_Ampharos_Ch8 3c:735a Cry_Totodile_Ch5 @@ -18270,9 +18267,9 @@ 3c:73cf Cry_Cleffa_Ch8 3c:73e2 Cry_Aipom_Ch5 3c:7401 Cry_Aipom_Ch6 -3c:7403 Cry_Aipom_branch_f3403 -3c:740b Cry_Aipom_branch_f340b -3c:7413 Cry_Aipom_branch_f3413 +3c:7403 Cry_Aipom_Ch6.loop1 +3c:740b Cry_Aipom_Ch6.loop2 +3c:7413 Cry_Aipom_Ch6.loop3 3c:7420 Cry_Aipom_Ch8 3c:743d Cry_Nidoran_M 3c:7446 Cry_Nidoran_F @@ -29629,7 +29626,7 @@ 01:ad9f sBoxMon1Unused1 01:ada0 sBoxMon1Unused2 01:ada1 sBoxMon1Level -01:ada2 sBoxMon1End +01:ada2 sBoxMon1BoxEnd 01:ada2 sBoxMon2 01:b002 sBoxMonOT 01:b0de sBoxMonNicknames @@ -31053,7 +31050,7 @@ 02:a034 sBox1Mon1Unused2 02:a035 sBox1Mon1Level 02:a036 sBox1Mon2 -02:a036 sBox1Mon1End +02:a036 sBox1Mon1BoxEnd 02:a296 sBox1MonOT 02:a372 sBox1MonNicknames 02:a44e sBox1End @@ -31081,8 +31078,8 @@ 02:a483 sBox2Mon1Unused1 02:a484 sBox2Mon1Unused2 02:a485 sBox2Mon1Level +02:a486 sBox2Mon1BoxEnd 02:a486 sBox2Mon2 -02:a486 sBox2Mon1End 02:a6e6 sBox2MonOT 02:a7c2 sBox2MonNicknames 02:a89e sBox2End @@ -31110,8 +31107,8 @@ 02:a8d3 sBox3Mon1Unused1 02:a8d4 sBox3Mon1Unused2 02:a8d5 sBox3Mon1Level +02:a8d6 sBox3Mon1BoxEnd 02:a8d6 sBox3Mon2 -02:a8d6 sBox3Mon1End 02:ab36 sBox3MonOT 02:ac12 sBox3MonNicknames 02:acee sBox3End @@ -31140,7 +31137,7 @@ 02:ad24 sBox4Mon1Unused2 02:ad25 sBox4Mon1Level 02:ad26 sBox4Mon2 -02:ad26 sBox4Mon1End +02:ad26 sBox4Mon1BoxEnd 02:af86 sBox4MonOT 02:b062 sBox4MonNicknames 02:b13e sBox4End @@ -31168,8 +31165,8 @@ 02:b173 sBox5Mon1Unused1 02:b174 sBox5Mon1Unused2 02:b175 sBox5Mon1Level -02:b176 sBox5Mon1End 02:b176 sBox5Mon2 +02:b176 sBox5Mon1BoxEnd 02:b3d6 sBox5MonOT 02:b4b2 sBox5MonNicknames 02:b58e sBox5MonNicknamesEnd @@ -31197,8 +31194,8 @@ 02:b5c3 sBox6Mon1Unused1 02:b5c4 sBox6Mon1Unused2 02:b5c5 sBox6Mon1Level -02:b5c6 sBox6Mon1End 02:b5c6 sBox6Mon2 +02:b5c6 sBox6Mon1BoxEnd 02:b826 sBox6MonOT 02:b902 sBox6MonNicknames 02:b9de sBox6End @@ -31226,8 +31223,8 @@ 02:ba13 sBox7Mon1Unused1 02:ba14 sBox7Mon1Unused2 02:ba15 sBox7Mon1Level -02:ba16 sBox7Mon1End 02:ba16 sBox7Mon2 +02:ba16 sBox7Mon1BoxEnd 02:bc76 sBox7MonOT 02:bd52 sBox7MonNicknames 02:be2e sBox7End @@ -31255,8 +31252,8 @@ 03:a033 sBox8Mon1Unused1 03:a034 sBox8Mon1Unused2 03:a035 sBox8Mon1Level +03:a036 sBox8Mon1BoxEnd 03:a036 sBox8Mon2 -03:a036 sBox8Mon1End 03:a296 sBox8MonOT 03:a372 sBox8MonNicknames 03:a44e sBox8MonNicknamesEnd @@ -31284,8 +31281,8 @@ 03:a483 sBox9Mon1Unused1 03:a484 sBox9Mon1Unused2 03:a485 sBox9Mon1Level -03:a486 sBox9Mon1End 03:a486 sBox9Mon2 +03:a486 sBox9Mon1BoxEnd 03:a6e6 sBox9MonOT 03:a7c2 sBox9MonNicknames 03:a89e sBox9MonNicknamesEnd @@ -31313,7 +31310,7 @@ 03:a8d3 sBox10Mon1Unused1 03:a8d4 sBox10Mon1Unused2 03:a8d5 sBox10Mon1Level -03:a8d6 sBox10Mon1End +03:a8d6 sBox10Mon1BoxEnd 03:a8d6 sBox10Mon2 03:ab36 sBox10MonOT 03:ac12 sBox10MonNicknames @@ -31342,7 +31339,7 @@ 03:ad23 sBox11Mon1Unused1 03:ad24 sBox11Mon1Unused2 03:ad25 sBox11Mon1Level -03:ad26 sBox11Mon1End +03:ad26 sBox11Mon1BoxEnd 03:ad26 sBox11Mon2 03:af86 sBox11MonOT 03:b062 sBox11MonNicknames @@ -31372,7 +31369,7 @@ 03:b174 sBox12Mon1Unused2 03:b175 sBox12Mon1Level 03:b176 sBox12Mon2 -03:b176 sBox12Mon1End +03:b176 sBox12Mon1BoxEnd 03:b3d6 sBox12MonOT 03:b4b2 sBox12MonNicknames 03:b58e sBox12End @@ -31400,7 +31397,7 @@ 03:b5c3 sBox13Mon1Unused1 03:b5c4 sBox13Mon1Unused2 03:b5c5 sBox13Mon1Level -03:b5c6 sBox13Mon1End +03:b5c6 sBox13Mon1BoxEnd 03:b5c6 sBox13Mon2 03:b826 sBox13MonOT 03:b902 sBox13MonNicknames @@ -31429,7 +31426,7 @@ 03:ba13 sBox14Mon1Unused1 03:ba14 sBox14Mon1Unused2 03:ba15 sBox14Mon1Level -03:ba16 sBox14Mon1End +03:ba16 sBox14Mon1BoxEnd 03:ba16 sBox14Mon2 03:bc76 sBox14MonOT 03:bd52 sBox14MonNicknames @@ -32498,7 +32495,7 @@ 00:c732 wHallOfFamePokemonListMon4ID 00:c732 wLinkPlayerPartyMon1Level 00:c733 wLinkPlayerPartyMon1Status -00:c733 wLinkPlayerPartyMon1End +00:c733 wLinkPlayerPartyMon1BoxEnd 00:c734 wTimeCapsulePartyMon1Level 00:c734 wLinkPlayerPartyMon1Unused 00:c734 wHallOfFamePokemonListMon4DVs @@ -32526,10 +32523,10 @@ 00:c741 wHallOfFamePokemonListMon5 00:c742 wHallOfFamePokemonListMon5ID 00:c742 wTimeCapsulePartyMon2BoxLevel -00:c743 wLinkPlayerPartyMon1StatsEnd 00:c743 wTimeCapsulePartyMon2Status 00:c743 wLinkPlayerPartyMon2Species 00:c743 wLinkPlayerPartyMon2 +00:c743 wLinkPlayerPartyMon1StructEnd 00:c744 wTimeCapsulePartyMon2Type 00:c744 wTimeCapsulePartyMon2Type1 00:c744 wHallOfFamePokemonListMon5DVs @@ -32578,7 +32575,7 @@ 00:c761 wHallOfFamePokemonListMon6End 00:c762 wLinkPlayerPartyMon2Level 00:c763 wTimeCapsulePartyMon2Attack -00:c763 wLinkPlayerPartyMon2End +00:c763 wLinkPlayerPartyMon2BoxEnd 00:c763 wLinkPlayerPartyMon2Status 00:c764 wLinkPlayerPartyMon2Unused 00:c765 wLinkPlayerPartyMon2HP @@ -32603,7 +32600,7 @@ 00:c772 wTimeCapsulePartyMon3CatchRate 00:c773 wTimeCapsulePartyMon3Moves 00:c773 wLinkPlayerPartyMon3Species -00:c773 wLinkPlayerPartyMon2StatsEnd +00:c773 wLinkPlayerPartyMon2StructEnd 00:c773 wLinkPlayerPartyMon3 00:c774 wLinkPlayerPartyMon3Item 00:c775 wLinkPlayerPartyMon3Moves @@ -32638,8 +32635,8 @@ 00:c791 wTimeCapsulePartyMon3Defense 00:c791 wLinkPlayerPartyMon3Unused2 00:c792 wLinkPlayerPartyMon3Level +00:c793 wLinkPlayerPartyMon3BoxEnd 00:c793 wTimeCapsulePartyMon3Speed -00:c793 wLinkPlayerPartyMon3End 00:c793 wLinkPlayerPartyMon3Status 00:c794 wLinkPlayerPartyMon3Unused 00:c795 wTimeCapsulePartyMon3Special @@ -32663,7 +32660,7 @@ 00:c7a0 wLYOverrides2 00:c7a1 wLinkPlayerPartyMon3SpclDef 00:c7a3 wLinkPlayerPartyMon4Species -00:c7a3 wLinkPlayerPartyMon3StatsEnd +00:c7a3 wLinkPlayerPartyMon3StructEnd 00:c7a3 wLinkPlayerPartyMon4 00:c7a3 wTimeCapsulePartyMon4OTID 00:c7a4 wLinkPlayerPartyMon4Item @@ -32698,8 +32695,8 @@ 00:c7c1 wTimeCapsulePartyMon4Special 00:c7c1 wLinkPlayerPartyMon4Unused2 00:c7c2 wLinkPlayerPartyMon4Level +00:c7c3 wLinkPlayerPartyMon4BoxEnd 00:c7c3 wLinkPlayerPartyMon4Status -00:c7c3 wLinkPlayerPartyMon4End 00:c7c3 wTimeCapsulePartyMon5 00:c7c3 wTimeCapsulePartyMon5Species 00:c7c4 wLinkPlayerPartyMon4Unused @@ -32722,7 +32719,7 @@ 00:c7d1 wLinkPlayerPartyMon4SpclDef 00:c7d1 wTimeCapsulePartyMon5Exp 00:c7d3 wLinkPlayerPartyMon5Species -00:c7d3 wLinkPlayerPartyMon4StatsEnd +00:c7d3 wLinkPlayerPartyMon4StructEnd 00:c7d3 wLinkPlayerPartyMon5 00:c7d4 wTimeCapsulePartyMon5HPExp 00:c7d4 wLinkPlayerPartyMon5Item @@ -32759,9 +32756,9 @@ 00:c7f1 wLinkPlayerPartyMon5Unused2 00:c7f2 wTimeCapsulePartyMon6BoxLevel 00:c7f2 wLinkPlayerPartyMon5Level +00:c7f3 wLinkPlayerPartyMon5BoxEnd 00:c7f3 wLinkPlayerPartyMon5Status 00:c7f3 wTimeCapsulePartyMon6Status -00:c7f3 wLinkPlayerPartyMon5End 00:c7f4 wTimeCapsulePartyMon6Type 00:c7f4 wLinkPlayerPartyMon5Unused 00:c7f4 wTimeCapsulePartyMon6Type1 @@ -32784,7 +32781,7 @@ 00:c801 wMysteryGiftPartnerID 00:c801 wLinkPlayerPartyMon5SpclDef 00:c802 wTimeCapsulePartyMon6AttackExp -00:c803 wLinkPlayerPartyMon5StatsEnd +00:c803 wLinkPlayerPartyMon5StructEnd 00:c803 wLinkPlayerPartyMon6 00:c803 wMysteryGiftPartnerName 00:c803 wLinkPlayerPartyMon6Species @@ -32826,7 +32823,7 @@ 00:c821 wLinkPlayerPartyMon6Unused2 00:c822 wLinkPlayerPartyMon6Level 00:c823 wLinkPlayerPartyMon6Status -00:c823 wLinkPlayerPartyMon6End +00:c823 wLinkPlayerPartyMon6BoxEnd 00:c824 wLinkPlayerPartyMon6Unused 00:c825 wLinkPlayerPartyMon6HP 00:c827 wLinkPlayerPartyMon6MaxHP @@ -32837,8 +32834,8 @@ 00:c82f wLinkPlayerPartyMon6SpclAtk 00:c830 wLYOverrides2End 00:c831 wLinkPlayerPartyMon6SpclDef -00:c833 wLinkPlayerPartyMon6StatsEnd 00:c833 wLinkPlayerPartyMonOTNames +00:c833 wLinkPlayerPartyMon6StructEnd 00:c850 wMysteryGiftPlayerData 00:c851 wMysteryGiftPlayerID 00:c853 wMysteryGiftPlayerName @@ -33248,7 +33245,6 @@ 00:cb26 wBattleMonSpclAtk 00:cb28 wBattleMonSpclDef 00:cb2a wBattleMonType -00:cb2a wBattleMonStatsEnd 00:cb2a wBattleMonType1 00:cb2b wBattleMonType2 00:cb2c wBattleMonStructEnd @@ -33662,7 +33658,7 @@ 00:cf21 wBufferMonUnused2 00:cf22 wBufferMonLevel 00:cf23 wBufferMonStatus -00:cf23 wBufferMonEnd +00:cf23 wBufferMonBoxEnd 00:cf24 wBufferMonUnused 00:cf25 wBufferMonHP 00:cf27 wBufferMonMaxHP @@ -33735,7 +33731,7 @@ 00:cf31 wBufferMonSpclDef 00:cf32 wWinTextPointer 00:cf32 wWalkingTile -00:cf33 wBufferMonStatsEnd +00:cf33 wBufferMonStructEnd 00:cf34 wLossTextPointer 00:cf36 wScriptAfterPointer 00:cf38 wRunningTrainerBattleScript @@ -33831,7 +33827,7 @@ 01:d029 wTempMonUnused2 01:d02a wTempMonLevel 01:d02b wTempMonStatus -01:d02b wTempMonEnd +01:d02b wTempMonBoxEnd 01:d02c wTempMonUnused 01:d02d wTempMonHP 01:d02f wTempMonMaxHP @@ -33841,7 +33837,7 @@ 01:d035 wTempMonSpeed 01:d037 wTempMonSpclAtk 01:d039 wTempMonSpclDef -01:d03b wTempMonStatsEnd +01:d03b wTempMonStructEnd 01:d03b wSpriteFlags 01:d03c wHandlePlayerStep 01:d03e wPartyMenuActionText @@ -33976,7 +33972,6 @@ 01:d107 wEnemyMonSpeed 01:d109 wEnemyMonSpclAtk 01:d10b wEnemyMonSpclDef -01:d10d wEnemyMonStatsEnd 01:d10d wEnemyMonType 01:d10d wEnemyMonType1 01:d10e wEnemyMonType2 @@ -34982,7 +34977,7 @@ 01:da48 wPartyMon1Unused2 01:da49 wPartyMon1Level 01:da4a wPartyMon1Status -01:da4a wPartyMon1End +01:da4a wPartyMon1BoxEnd 01:da4b wPartyMon1Unused 01:da4c wPartyMon1HP 01:da4e wPartyMon1MaxHP @@ -34992,8 +34987,8 @@ 01:da54 wPartyMon1Speed 01:da56 wPartyMon1SpclAtk 01:da58 wPartyMon1SpclDef +01:da5a wPartyMon1StructEnd 01:da5a wPartyMon2Species -01:da5a wPartyMon1StatsEnd 01:da5a wPartyMon2 01:da5b wPartyMon2Item 01:da5c wPartyMon2Moves @@ -35013,7 +35008,7 @@ 01:da78 wPartyMon2Unused2 01:da79 wPartyMon2Level 01:da7a wPartyMon2Status -01:da7a wPartyMon2End +01:da7a wPartyMon2BoxEnd 01:da7b wPartyMon2Unused 01:da7c wPartyMon2HP 01:da7e wPartyMon2MaxHP @@ -35023,8 +35018,8 @@ 01:da84 wPartyMon2Speed 01:da86 wPartyMon2SpclAtk 01:da88 wPartyMon2SpclDef -01:da8a wPartyMon2StatsEnd 01:da8a wPartyMon3Species +01:da8a wPartyMon2StructEnd 01:da8a wPartyMon3 01:da8b wPartyMon3Item 01:da8c wPartyMon3Moves @@ -35044,7 +35039,7 @@ 01:daa8 wPartyMon3Unused2 01:daa9 wPartyMon3Level 01:daaa wPartyMon3Status -01:daaa wPartyMon3End +01:daaa wPartyMon3BoxEnd 01:daab wPartyMon3Unused 01:daac wPartyMon3HP 01:daae wPartyMon3MaxHP @@ -35055,7 +35050,7 @@ 01:dab6 wPartyMon3SpclAtk 01:dab8 wPartyMon3SpclDef 01:daba wPartyMon4Species -01:daba wPartyMon3StatsEnd +01:daba wPartyMon3StructEnd 01:daba wPartyMon4 01:dabb wPartyMon4Item 01:dabc wPartyMon4Moves @@ -35074,8 +35069,8 @@ 01:dad7 wPartyMon4Unused1 01:dad8 wPartyMon4Unused2 01:dad9 wPartyMon4Level -01:dada wPartyMon4End 01:dada wPartyMon4Status +01:dada wPartyMon4BoxEnd 01:dadb wPartyMon4Unused 01:dadc wPartyMon4HP 01:dade wPartyMon4MaxHP @@ -35085,7 +35080,7 @@ 01:dae4 wPartyMon4Speed 01:dae6 wPartyMon4SpclAtk 01:dae8 wPartyMon4SpclDef -01:daea wPartyMon4StatsEnd +01:daea wPartyMon4StructEnd 01:daea wPartyMon5Species 01:daea wPartyMon5 01:daeb wPartyMon5Item @@ -35105,8 +35100,8 @@ 01:db07 wPartyMon5Unused1 01:db08 wPartyMon5Unused2 01:db09 wPartyMon5Level +01:db0a wPartyMon5BoxEnd 01:db0a wPartyMon5Status -01:db0a wPartyMon5End 01:db0b wPartyMon5Unused 01:db0c wPartyMon5HP 01:db0e wPartyMon5MaxHP @@ -35116,7 +35111,7 @@ 01:db14 wPartyMon5Speed 01:db16 wPartyMon5SpclAtk 01:db18 wPartyMon5SpclDef -01:db1a wPartyMon5StatsEnd +01:db1a wPartyMon5StructEnd 01:db1a wPartyMon6Species 01:db1a wPartyMon6 01:db1b wPartyMon6Item @@ -35136,8 +35131,8 @@ 01:db37 wPartyMon6Unused1 01:db38 wPartyMon6Unused2 01:db39 wPartyMon6Level -01:db3a wPartyMon6End 01:db3a wPartyMon6Status +01:db3a wPartyMon6BoxEnd 01:db3b wPartyMon6Unused 01:db3c wPartyMon6HP 01:db3e wPartyMon6MaxHP @@ -35147,8 +35142,8 @@ 01:db44 wPartyMon6Speed 01:db46 wPartyMon6SpclAtk 01:db48 wPartyMon6SpclDef +01:db4a wPartyMon6StructEnd 01:db4a wPartyMonOT -01:db4a wPartyMon6StatsEnd 01:db8c wPartyMonNicknames 01:dbce wPartyMonNicknamesEnd 01:dbe4 wPokedexCaught @@ -35181,8 +35176,8 @@ 01:dc74 wBreedMon1Unused1 01:dc75 wBreedMon1Unused2 01:dc76 wBreedMon1Level -01:dc77 wBreedMon1End 01:dc77 wDayCareLady +01:dc77 wBreedMon1BoxEnd 01:dc78 wStepsToEgg 01:dc79 wBreedMotherOrNonDitto 01:dc7a wBreedMon2 @@ -35208,7 +35203,7 @@ 01:dcae wBreedMon2Unused2 01:dcaf wBreedMon2Level 01:dcb0 wEggNick -01:dcb0 wBreedMon2End +01:dcb0 wBreedMon2BoxEnd 01:dcbb wEggOT 01:dcc6 wEggMonSpecies 01:dcc6 wEggMon @@ -35229,8 +35224,8 @@ 01:dce3 wEggMonUnused1 01:dce4 wEggMonUnused2 01:dce5 wEggMonLevel +01:dce6 wEggMonBoxEnd 01:dce6 wBugContestSecondPartySpecies -01:dce6 wEggMonEnd 01:dce7 wContestMon 01:dce7 wContestMonSpecies 01:dce8 wContestMonItem @@ -35251,7 +35246,7 @@ 01:dd05 wContestMonUnused2 01:dd06 wContestMonLevel 01:dd07 wContestMonStatus -01:dd07 wContestMonEnd +01:dd07 wContestMonBoxEnd 01:dd08 wContestMonUnused 01:dd09 wContestMonHP 01:dd0b wContestMonMaxHP @@ -35262,7 +35257,7 @@ 01:dd13 wContestMonSpclAtk 01:dd15 wContestMonSpclDef 01:dd17 wSwarmMapGroup -01:dd17 wContestMonStatsEnd +01:dd17 wContestMonStructEnd 01:dd18 wSwarmMapNumber 01:dd19 wFishingSwarmFlag 01:dd1a wRoamMon1Species @@ -35330,7 +35325,7 @@ 01:dd7b wDudeNumBalls 01:dd7c wOTPartyMon1Level 01:dd7c wDudeBalls -01:dd7d wOTPartyMon1End +01:dd7d wOTPartyMon1BoxEnd 01:dd7d wOTPartyMon1Status 01:dd7e wOTPartyMon1Unused 01:dd7f wOTPartyMon1HP @@ -35343,7 +35338,7 @@ 01:dd87 wOTPartyMon1Speed 01:dd89 wOTPartyMon1SpclAtk 01:dd8b wOTPartyMon1SpclDef -01:dd8d wOTPartyMon1StatsEnd +01:dd8d wOTPartyMon1StructEnd 01:dd8d wOTPartyMon2Species 01:dd8d wOTPartyMon2 01:dd8e wOTPartyMon2Item @@ -35363,8 +35358,8 @@ 01:ddaa wOTPartyMon2Unused1 01:ddab wOTPartyMon2Unused2 01:ddac wOTPartyMon2Level -01:ddad wOTPartyMon2End 01:ddad wOTPartyMon2Status +01:ddad wOTPartyMon2BoxEnd 01:ddae wOTPartyMon2Unused 01:ddaf wOTPartyMon2HP 01:ddb1 wOTPartyMon2MaxHP @@ -35374,7 +35369,7 @@ 01:ddb7 wOTPartyMon2Speed 01:ddb9 wOTPartyMon2SpclAtk 01:ddbb wOTPartyMon2SpclDef -01:ddbd wOTPartyMon2StatsEnd +01:ddbd wOTPartyMon2StructEnd 01:ddbd wOTPartyMon3Species 01:ddbd wOTPartyMon3 01:ddbe wOTPartyMon3Item @@ -35394,7 +35389,7 @@ 01:ddda wOTPartyMon3Unused1 01:dddb wOTPartyMon3Unused2 01:dddc wOTPartyMon3Level -01:dddd wOTPartyMon3End +01:dddd wOTPartyMon3BoxEnd 01:dddd wOTPartyMon3Status 01:ddde wOTPartyMon3Unused 01:dddf wOTPartyMon3HP @@ -35405,7 +35400,7 @@ 01:dde7 wOTPartyMon3Speed 01:dde9 wOTPartyMon3SpclAtk 01:ddeb wOTPartyMon3SpclDef -01:dded wOTPartyMon3StatsEnd +01:dded wOTPartyMon3StructEnd 01:dded wOTPartyMon4Species 01:dded wOTPartyMon4 01:ddee wOTPartyMon4Item @@ -35425,7 +35420,7 @@ 01:de0a wOTPartyMon4Unused1 01:de0b wOTPartyMon4Unused2 01:de0c wOTPartyMon4Level -01:de0d wOTPartyMon4End +01:de0d wOTPartyMon4BoxEnd 01:de0d wOTPartyMon4Status 01:de0e wOTPartyMon4Unused 01:de0f wOTPartyMon4HP @@ -35436,7 +35431,7 @@ 01:de17 wOTPartyMon4Speed 01:de19 wOTPartyMon4SpclAtk 01:de1b wOTPartyMon4SpclDef -01:de1d wOTPartyMon4StatsEnd +01:de1d wOTPartyMon4StructEnd 01:de1d wOTPartyMon5Species 01:de1d wOTPartyMon5 01:de1e wOTPartyMon5Item @@ -35456,7 +35451,7 @@ 01:de3a wOTPartyMon5Unused1 01:de3b wOTPartyMon5Unused2 01:de3c wOTPartyMon5Level -01:de3d wOTPartyMon5End +01:de3d wOTPartyMon5BoxEnd 01:de3d wOTPartyMon5Status 01:de3e wOTPartyMon5Unused 01:de3f wOTPartyMon5HP @@ -35467,7 +35462,7 @@ 01:de47 wOTPartyMon5Speed 01:de49 wOTPartyMon5SpclAtk 01:de4b wOTPartyMon5SpclDef -01:de4d wOTPartyMon5StatsEnd +01:de4d wOTPartyMon5StructEnd 01:de4d wOTPartyMon6Species 01:de4d wOTPartyMon6 01:de4e wOTPartyMon6Item @@ -35487,7 +35482,7 @@ 01:de6a wOTPartyMon6Unused1 01:de6b wOTPartyMon6Unused2 01:de6c wOTPartyMon6Level -01:de6d wOTPartyMon6End +01:de6d wOTPartyMon6BoxEnd 01:de6d wOTPartyMon6Status 01:de6e wOTPartyMon6Unused 01:de6f wOTPartyMon6HP @@ -35499,8 +35494,8 @@ 01:de79 wOTPartyMon6SpclAtk 01:de7b wOTPartyMon6SpclDef 01:de7d wOTPartyMonsEnd -01:de7d wOTPartyMon6StatsEnd 01:de7d wOTPartyMonOT +01:de7d wOTPartyMon6StructEnd 01:debf wOTPartyMonNicknames 01:df01 wGameDataEnd 01:df01 wPokemonDataEnd diff --git a/pokesilver.sym b/pokesilver.sym index decafc58..104a5ba0 100644 --- a/pokesilver.sym +++ b/pokesilver.sym @@ -7895,19 +7895,19 @@ 0e:462f AI_Types.checkmove 0e:465e AI_Types.noteffective 0e:466c AI_Types.checkmove2 -0e:4684 AI_Types.asm_38684 -0e:4685 AI_Types.asm_38685 +0e:4684 AI_Types.damaging +0e:4685 AI_Types.movesdone 0e:468f AI_Types.immune 0e:4694 AI_Offensive 0e:469c AI_Offensive.checkmove 0e:46b0 AI_Smart 0e:46b8 AI_Smart.checkmove 0e:46de AI_Smart.nextmove -0e:46e4 AI_Smart.table_386e4 +0e:46e4 AI_Smart_EffectHandlers 0e:47d5 AI_Smart_Sleep -0e:47e2 AI_Smart_Sleep.asm_387e2 +0e:47e2 AI_Smart_Sleep.encourage 0e:47e9 AI_Smart_LeechHit -0e:4807 AI_Smart_LeechHit.asm_38807 +0e:4807 AI_Smart_LeechHit.discourage 0e:480f AI_Smart_LockOn 0e:4826 AI_Smart_LockOn.asm_38826 0e:4841 AI_Smart_LockOn.asm_38841 @@ -7918,10 +7918,10 @@ 0e:487d AI_Smart_LockOn.asm_3887d 0e:4894 AI_Smart_LockOn.asm_38894 0e:4898 AI_Smart_Selfdestruct -0e:48a7 AI_Smart_Selfdestruct.asm_388a7 +0e:48a7 AI_Smart_Selfdestruct.discourage 0e:48ab AI_Smart_DreamEater 0e:48b5 AI_Smart_EvasionUp -0e:48d0 AI_Smart_EvasionUp.asm_388d0 +0e:48d0 AI_Smart_EvasionUp.encourage 0e:48d3 AI_Smart_EvasionUp.asm_388d3 0e:48eb AI_Smart_EvasionUp.asm_388eb 0e:48f0 AI_Smart_EvasionUp.asm_388f0 @@ -7930,11 +7930,11 @@ 0e:4919 AI_Smart_EvasionUp.asm_38919 0e:4922 AI_Smart_EvasionUp.asm_38922 0e:4928 AI_Smart_AlwaysHit -0e:4935 AI_Smart_AlwaysHit.asm_38935 +0e:4935 AI_Smart_AlwaysHit.encourage 0e:493c AI_Smart_MirrorMove -0e:4949 AI_Smart_MirrorMove.asm_38949 +0e:4949 AI_Smart_MirrorMove.usedmove 0e:4966 AI_Smart_AccuracyDown -0e:497e AI_Smart_AccuracyDown.asm_3897e +0e:497e AI_Smart_AccuracyDown.encourage 0e:4981 AI_Smart_AccuracyDown.asm_38981 0e:4999 AI_Smart_AccuracyDown.asm_38999 0e:499e AI_Smart_AccuracyDown.asm_3899e @@ -7943,26 +7943,26 @@ 0e:49c7 AI_Smart_AccuracyDown.asm_389c7 0e:49d0 AI_Smart_AccuracyDown.asm_389d0 0e:49d6 AI_Smart_ResetStats -0e:49dc AI_Smart_ResetStats.asm_389dc -0e:49e6 AI_Smart_ResetStats.asm_389e6 -0e:49eb AI_Smart_ResetStats.asm_389eb -0e:49f3 AI_Smart_ResetStats.asm_389f3 -0e:49fc AI_Smart_ResetStats.asm_389fc +0e:49dc AI_Smart_ResetStats.enemystatsloop +0e:49e6 AI_Smart_ResetStats.enemystatsdone +0e:49eb AI_Smart_ResetStats.playerstatsloop +0e:49f3 AI_Smart_ResetStats.encourage +0e:49fc AI_Smart_ResetStats.discourage 0e:49ff AI_Smart_Bide 0e:4a0b AI_Smart_ForceSwitch 0e:4a1b AI_Smart_Heal 0e:4a1b AI_Smart_MorningSun 0e:4a1b AI_Smart_Synthesis 0e:4a1b AI_Smart_Moonlight -0e:4a26 AI_Smart_Moonlight.asm_38a26 +0e:4a26 AI_Smart_Moonlight.encourage 0e:4a2f AI_Smart_Toxic 0e:4a2f AI_Smart_LeechSeed 0e:4a35 AI_Smart_LightScreen 0e:4a35 AI_Smart_Reflect 0e:4a41 AI_Smart_Ohko 0e:4a52 AI_Smart_TrapTarget -0e:4a6c AI_Smart_TrapTarget.asm_38a6c -0e:4a72 AI_Smart_TrapTarget.asm_38a72 +0e:4a6c AI_Smart_TrapTarget.discourage +0e:4a72 AI_Smart_TrapTarget.encourage 0e:4a7d AI_Smart_RazorWind 0e:4a7d AI_Smart_Unused2B 0e:4a8b AI_Smart_Unused2B.asm_38a8b @@ -7972,48 +7972,48 @@ 0e:4ab4 AI_Smart_Unused2B.asm_38ab4 0e:4ab6 AI_Smart_Unused2B.asm_38ab6 0e:4abc AI_Smart_Confuse -0e:4ac8 AI_Smart_Confuse.asm_38ac8 +0e:4ac8 AI_Smart_Confuse.skipdiscourage 0e:4ace AI_Smart_SpDefenseUp2 -0e:4aea AI_Smart_SpDefenseUp2.asm_38aea -0e:4af1 AI_Smart_SpDefenseUp2.asm_38af1 +0e:4aea AI_Smart_SpDefenseUp2.encourage +0e:4af1 AI_Smart_SpDefenseUp2.discourage 0e:4af3 AI_Smart_Fly 0e:4b01 AI_Smart_SuperFang 0e:4b07 AI_Smart_Paralyze -0e:4b1b AI_Smart_Paralyze.asm_38b1b +0e:4b1b AI_Smart_Paralyze.discourage 0e:4b21 AI_Smart_SpeedDownHit 0e:4b3d AI_Smart_Substitute 0e:4b44 AI_Smart_HyperBeam -0e:4b53 AI_Smart_HyperBeam.asm_38b53 +0e:4b53 AI_Smart_HyperBeam.discourage 0e:4b60 AI_Smart_Rage -0e:4b6d AI_Smart_Rage.asm_38b6d -0e:4b7c AI_Smart_Rage.asm_38b7c -0e:4b87 AI_Smart_Rage.asm_38b87 +0e:4b6d AI_Smart_Rage.skipencourage +0e:4b7c AI_Smart_Rage.notbuilding +0e:4b87 AI_Smart_Rage.discourage 0e:4b89 AI_Smart_Mimic 0e:4bb5 AI_Smart_Mimic.asm_38bb5 0e:4bca AI_Smart_Mimic.asm_38bca 0e:4bd0 AI_Smart_Mimic.asm_38bd0 0e:4bd2 AI_Smart_Counter -0e:4bda AI_Smart_Counter.asm_38bda -0e:4bef AI_Smart_Counter.asm_38c0e -0e:4c11 AI_Smart_Counter.asm_38c11 -0e:4c19 AI_Smart_Counter.asm_38c19 -0e:4c1a AI_Smart_Counter.asm_38c1a +0e:4bda AI_Smart_Counter.playermoveloop +0e:4bef AI_Smart_Counter.skipmove +0e:4c11 AI_Smart_Counter.encourage +0e:4c19 AI_Smart_Counter.done +0e:4c1a AI_Smart_Counter.discourage 0e:4c1c AI_Smart_Encore -0e:4c49 AI_Smart_Encore.asm_38c49 -0e:4c59 AI_Smart_Encore.asm_38c59 -0e:4c62 AI_Smart_Encore.asm_38c62 +0e:4c49 AI_Smart_Encore.weakmove +0e:4c59 AI_Smart_Encore.encourage +0e:4c62 AI_Smart_Encore.discourage 0e:4c66 EncoreMoves 0e:4c85 AI_Smart_PainSplit 0e:4c9b AI_Smart_Snore 0e:4c9b AI_Smart_SleepTalk -0e:4ca8 AI_Smart_SleepTalk.asm_38ca8 +0e:4ca8 AI_Smart_SleepTalk.discourage 0e:4cac AI_Smart_DefrostOpponent 0e:4cb6 AI_Smart_Spite -0e:4cc8 AI_Smart_Spite.asm_38cc8 -0e:4cd2 AI_Smart_Spite.asm_38cd2 -0e:4cdc AI_Smart_Spite.asm_38cdc -0e:4cec AI_Smart_Spite.asm_38cec -0e:4cee AI_Smart_Spite.asm_38cee +0e:4cc8 AI_Smart_Spite.usedmove +0e:4cd2 AI_Smart_Spite.moveloop +0e:4cdc AI_Smart_Spite.foundmove +0e:4cec AI_Smart_Spite.discourage +0e:4cee AI_Smart_Spite.encourage 0e:4cfa AI_Smart_DestinyBond 0e:4cfa AI_Smart_Reversal 0e:4cfa AI_Smart_SkullBash @@ -8025,16 +8025,16 @@ 0e:4d3b AI_Smart_PriorityHit 0e:4d74 AI_Smart_Thief 0e:4d79 AI_Smart_Conversion2 -0e:4daa AI_Smart_Conversion2.asm_38daa +0e:4daa AI_Smart_Conversion2.discourage 0e:4db2 AI_Smart_Disable -0e:4dcf AI_Smart_Disable.asm_38dcf -0e:4dd4 AI_Smart_Disable.asm_38dd4 +0e:4dcf AI_Smart_Disable.notencourage +0e:4dd4 AI_Smart_Disable.discourage 0e:4ddc AI_Smart_MeanLook -0e:4e05 AI_Smart_MeanLook.asm_38e05 -0e:4e07 AI_Smart_MeanLook.asm_38e07 +0e:4e05 AI_Smart_MeanLook.discourage +0e:4e07 AI_Smart_MeanLook.encourage 0e:4e0f AICheckLastPlayerMon 0e:4e1b AICheckLastPlayerMon.loop -0e:4e25 AICheckLastPlayerMon.asm_38e25 +0e:4e25 AICheckLastPlayerMon.skip 0e:4e2b AI_Smart_Nightmare 0e:4e31 AI_Smart_FlameWheel 0e:4e3d AI_Smart_Curse @@ -8071,9 +8071,9 @@ 0e:5019 AI_Smart_Earthquake.could_dig 0e:5023 AI_Smart_BatonPass 0e:5033 AI_Smart_Pursuit -0e:503e AI_Smart_Pursuit.asm_3903e +0e:503e AI_Smart_Pursuit.encourage 0e:5045 AI_Smart_RapidSpin -0e:5058 AI_Smart_RapidSpin.asm_39058 +0e:5058 AI_Smart_RapidSpin.encourage 0e:505f AI_Smart_HiddenPower 0e:5088 AI_Smart_HiddenPower.good 0e:508a AI_Smart_HiddenPower.bad @@ -8086,30 +8086,30 @@ 0e:50f2 AIGoodWeatherType.good 0e:50f5 SunnyDayMoves 0e:50fe AI_Smart_BellyDrum -0e:510e AI_Smart_BellyDrum.asm_3910e +0e:510e AI_Smart_BellyDrum.discourage 0e:5113 AI_Smart_PsychUp 0e:511b AI_Smart_PsychUp.asm_3911b 0e:512a AI_Smart_PsychUp.asm_3912a 0e:514f AI_Smart_PsychUp.asm_3914f 0e:5151 AI_Smart_MirrorCoat -0e:5159 AI_Smart_MirrorCoat.asm_39159 -0e:516e AI_Smart_MirrorCoat.asm_3916e -0e:5190 AI_Smart_MirrorCoat.asm_39190 -0e:5198 AI_Smart_MirrorCoat.asm_39198 -0e:5199 AI_Smart_MirrorCoat.asm_39199 +0e:5159 AI_Smart_MirrorCoat.playermoveloop +0e:516e AI_Smart_MirrorCoat.skipmove +0e:5190 AI_Smart_MirrorCoat.encourage +0e:5198 AI_Smart_MirrorCoat.done +0e:5199 AI_Smart_MirrorCoat.discourage 0e:519b AI_Smart_Twister 0e:519b AI_Smart_Gust 0e:51af AI_Smart_Gust.couldFly 0e:51b9 AI_Smart_FutureSight 0e:51c6 AI_Smart_Stomp 0e:51d1 AI_Smart_Solarbeam -0e:51e4 AI_Smart_Solarbeam.asm_391e4 +0e:51e4 AI_Smart_Solarbeam.encourage 0e:51eb AI_Smart_Thunder 0e:51f9 AICompareSpeed 0e:520c AICheckPlayerMaxHP 0e:5217 AICheckEnemyMaxHP 0e:5220 AICheckMaxHP -0e:522f AICheckMaxHP.asm_3922f +0e:522f AICheckMaxHP.not_max 0e:5234 AICheckPlayerHalfHP 0e:5247 AICheckEnemyHalfHP 0e:525e AICheckEnemyQuarterHP @@ -8124,9 +8124,9 @@ 0e:52c3 AIHasMoveInArray.done 0e:52c7 UsefulMoves 0e:52db AI_Opportunist -0e:52e8 AI_Opportunist.asm_392e8 +0e:52e8 AI_Opportunist.lowhp 0e:52f0 AI_Opportunist.checkmove -0e:530d AI_Opportunist.asm_3930d +0e:530d AI_Opportunist.done 0e:530e StallMoves 0e:532f AI_Aggressive 0e:5338 AI_Aggressive.checkmove @@ -8136,10 +8136,10 @@ 0e:53a7 AI_Aggressive.done 0e:53a8 RecklessMoves 0e:53ad AIDamageCalc -0e:53c6 AIDamageCalc.asm_393c6 +0e:53c6 AIDamageCalc.notconstant 0e:53d9 ConstantDamageEffects 0e:53de AI_Cautious -0e:53eb AI_Cautious.asm_393eb +0e:53eb AI_Cautious.loop 0e:540c ResidualMoves 0e:5419 AI_Status 0e:5421 AI_Status.checkmove @@ -18053,9 +18053,9 @@ 3c:61c0 Sfx_SwordsDance_Ch8 3c:61d0 Sfx_Thunder_Ch8 3c:61e6 Sfx_Supersonic_Ch5 -3c:61ec Sfx_Supersonic_branch_f21ec +3c:61ec Sfx_Supersonic_Ch5.loop 3c:61f9 Sfx_Supersonic_Ch6 -3c:61ff Sfx_Supersonic_branch_f21ff +3c:61ff Sfx_Supersonic_Ch6.loop 3c:620c Sfx_Supersonic_Ch8 3c:6217 Sfx_Leer_Ch5 3c:6226 Sfx_Leer_Ch6 @@ -18094,9 +18094,9 @@ 3c:64a2 Sfx_Sing_Ch5 3c:64b3 Sfx_Sing_Ch6 3c:64c7 Sfx_HyperBeam_Ch5 -3c:64f5 Sfx_HyperBeam_branch_f24f5 +3c:64f5 Sfx_HyperBeam_Ch5.loop 3c:6506 Sfx_HyperBeam_Ch6 -3c:6534 Sfx_HyperBeam_branch_f2534 +3c:6534 Sfx_HyperBeam_Ch6.loop 3c:6545 Sfx_HyperBeam_Ch8 3c:6550 Sfx_Unknown60_Ch8 3c:6569 Sfx_Unknown61_Ch8 @@ -18110,7 +18110,7 @@ 3c:65bb Sfx_PayDay_Ch6 3c:65ca Sfx_Metronome_Ch5 3c:65f5 Sfx_Unknown5F_Ch5 -3c:65f5 Sfx_Unknown5F_branch_f25f5 +3c:65f5 Sfx_Unknown5F_Ch5.loop 3c:6602 Sfx_Unknown5F_Ch6 3c:6613 Sfx_Fanfare2_Ch5 3c:6636 Sfx_Fanfare2_Ch6 @@ -18122,7 +18122,7 @@ 3c:66dd Sfx_NoSignal_Ch5 3c:66ec Sfx_Sandstorm_Ch8 3c:6700 Sfx_Elevator_Ch5 -3c:6704 Sfx_Elevator_branch_f2704 +3c:6704 Sfx_Elevator_Ch5.loop 3c:6729 Sfx_Elevator_Ch6 3c:6729 Sfx_Elevator_Ch7 3c:6732 Sfx_Elevator_Ch8 @@ -18165,7 +18165,7 @@ 3c:6e74 Cry_Magcargo_Ch5 3c:6e93 Cry_Magcargo_Ch6 3c:6eb2 Cry_Magcargo_Ch8 -3c:6eb5 Cry_Magcargo_branch_f2eb5 +3c:6eb5 Cry_Magcargo_Ch8.loop 3c:6ec3 Cry_Dunsparce_Ch5 3c:6ee6 Cry_Dunsparce_Ch6 3c:6ef1 Cry_Dunsparce_Ch8 @@ -18180,7 +18180,6 @@ 3c:6fcc Cry_Marill_Ch8 3c:6fdf Cry_Togepi_Ch5 3c:6fe2 Cry_Togepi_Ch6 -3c:6fe2 Cry_Togetic_branch_f2fe2 3c:6ff5 Cry_Togetic_Ch5 3c:6ff8 Cry_Togetic_Ch6 3c:7008 Cry_Spinarak_Ch5 @@ -18191,20 +18190,19 @@ 3c:707d Cry_Raikou_Ch8 3c:7096 Cry_Hoothoot_Ch5 3c:70b9 Cry_Hoothoot_Ch6 -3c:70bb Cry_Hoothoot_branch_f30bb -3c:70c3 Cry_Hoothoot_branch_f30c3 +3c:70bb Cry_Hoothoot_Ch6.loop1 +3c:70c3 Cry_Hoothoot_Ch6.loop2 3c:70d4 Cry_Hoothoot_Ch8 3c:70e1 Cry_Sentret_Ch5 3c:70e9 Cry_Sentret_Ch6 -3c:70eb Cry_Sentret_branch_f30eb +3c:70eb Cry_Sentret_Ch6.body 3c:70fb Cry_Mareep_Ch5 3c:7103 Cry_Mareep_Ch6 -3c:7105 Cry_Mareep_branch_f3105 -3c:7105 Cry_Gligar_branch_f3105 +3c:7105 Cry_Mareep_Ch6.body 3c:7116 Cry_Cyndaquil_Ch5 3c:7119 Cry_Cyndaquil_Ch6 -3c:711f Cry_Cyndaquil_branch_f311f -3c:712b Cry_Cyndaquil_branch_f312b +3c:711f Cry_Cyndaquil_Ch6.loop1 +3c:712b Cry_Cyndaquil_Ch6.loop2 3c:7138 Cry_Cyndaquil_Ch8 3c:7138 Cry_Gligar_Ch8 3c:713f Cry_Chikorita_Ch5 @@ -18213,13 +18211,13 @@ 3c:7160 Cry_Gligar_Ch5 3c:7165 Cry_Girafarig_Ch5 3c:716d Cry_Girafarig_Ch6 -3c:716f Cry_Girafarig_branch_f316f +3c:716f Cry_Girafarig_Ch6.body 3c:7184 Cry_Girafarig_Ch8 3c:7194 Cry_Slugma_Ch5 3c:71ab Cry_Slugma_Ch8 3c:71b8 Cry_Ledyba_Ch5 3c:71c0 Cry_Ledyba_Ch6 -3c:71c2 Cry_Ledyba_branch_f31c2 +3c:71c2 Cry_Ledyba_Ch6.body 3c:71db Cry_Ledyba_Ch8 3c:71ee Cry_Wooper_Ch5 3c:71ee Cry_Donphan_Ch5 @@ -18229,33 +18227,32 @@ 3c:7234 Cry_Donphan_Ch8 3c:7244 Cry_Typhlosion_Ch5 3c:7244 Cry_Teddiursa_Ch5 -3c:7246 Cry_Teddiursa_branch_f3246 -3c:724e Cry_Teddiursa_branch_f324e -3c:7256 Cry_Teddiursa_branch_f3256 -3c:7262 Cry_Teddiursa_branch_f3262 -3c:726e Cry_Teddiursa_branch_f326e +3c:7246 Cry_Typhlosion_Ch5.loop1 +3c:724e Cry_Typhlosion_Ch5.loop2 +3c:7256 Cry_Typhlosion_Ch5.loop3 +3c:7262 Cry_Typhlosion_Ch5.loop4 +3c:726e Cry_Typhlosion_Ch5.loop5 3c:727b Cry_Typhlosion_Ch6 3c:727b Cry_Teddiursa_Ch6 3c:729a Cry_Typhlosion_Ch8 3c:72a7 Cry_Natu_Ch5 -3c:72a9 Cry_Sunflora_branch_f32a9 -3c:72a9 Cry_Mantine_branch_f32a9 -3c:72b5 Cry_Mantine_branch_f32b5 +3c:72a9 Cry_Natu_Ch5.body1 +3c:72b5 Cry_Natu_Ch5.body2 3c:72c2 Cry_Natu_Ch6 3c:72c2 Cry_Sunflora_Ch6 -3c:72c2 Cry_Mantine_branch_f32c2 -3c:72d0 Cry_Mantine_branch_f32d0 +3c:72c2 Cry_Sunflora_Ch6.body1 +3c:72d0 Cry_Sunflora_Ch6.body2 3c:72dd Cry_Natu_Ch8 3c:72dd Cry_Sunflora_Ch8 -3c:72dd Cry_Mantine_branch_f32dd -3c:72e6 Cry_Mantine_branch_f32e6 +3c:72dd Cry_Sunflora_Ch8.body1 +3c:72e6 Cry_Sunflora_Ch8.body2 3c:72f0 Cry_Teddiursa_Ch8 3c:72f7 Cry_Sunflora_Ch5 3c:72fc Cry_Mantine_Ch5 3c:7305 Cry_Mantine_Ch6 3c:730c Cry_Mantine_Ch8 3c:7313 Cry_Ampharos_Ch5 -3c:7315 Cry_Ampharos_branch_f3315 +3c:7315 Cry_Ampharos_Ch5.loop 3c:7330 Cry_Ampharos_Ch6 3c:7347 Cry_Ampharos_Ch8 3c:735a Cry_Totodile_Ch5 @@ -18266,9 +18263,9 @@ 3c:73cf Cry_Cleffa_Ch8 3c:73e2 Cry_Aipom_Ch5 3c:7401 Cry_Aipom_Ch6 -3c:7403 Cry_Aipom_branch_f3403 -3c:740b Cry_Aipom_branch_f340b -3c:7413 Cry_Aipom_branch_f3413 +3c:7403 Cry_Aipom_Ch6.loop1 +3c:740b Cry_Aipom_Ch6.loop2 +3c:7413 Cry_Aipom_Ch6.loop3 3c:7420 Cry_Aipom_Ch8 3c:743d Cry_Nidoran_M 3c:7446 Cry_Nidoran_F @@ -29625,7 +29622,7 @@ 01:ad9f sBoxMon1Unused1 01:ada0 sBoxMon1Unused2 01:ada1 sBoxMon1Level -01:ada2 sBoxMon1End +01:ada2 sBoxMon1BoxEnd 01:ada2 sBoxMon2 01:b002 sBoxMonOT 01:b0de sBoxMonNicknames @@ -31049,7 +31046,7 @@ 02:a034 sBox1Mon1Unused2 02:a035 sBox1Mon1Level 02:a036 sBox1Mon2 -02:a036 sBox1Mon1End +02:a036 sBox1Mon1BoxEnd 02:a296 sBox1MonOT 02:a372 sBox1MonNicknames 02:a44e sBox1End @@ -31077,8 +31074,8 @@ 02:a483 sBox2Mon1Unused1 02:a484 sBox2Mon1Unused2 02:a485 sBox2Mon1Level +02:a486 sBox2Mon1BoxEnd 02:a486 sBox2Mon2 -02:a486 sBox2Mon1End 02:a6e6 sBox2MonOT 02:a7c2 sBox2MonNicknames 02:a89e sBox2End @@ -31106,8 +31103,8 @@ 02:a8d3 sBox3Mon1Unused1 02:a8d4 sBox3Mon1Unused2 02:a8d5 sBox3Mon1Level +02:a8d6 sBox3Mon1BoxEnd 02:a8d6 sBox3Mon2 -02:a8d6 sBox3Mon1End 02:ab36 sBox3MonOT 02:ac12 sBox3MonNicknames 02:acee sBox3End @@ -31136,7 +31133,7 @@ 02:ad24 sBox4Mon1Unused2 02:ad25 sBox4Mon1Level 02:ad26 sBox4Mon2 -02:ad26 sBox4Mon1End +02:ad26 sBox4Mon1BoxEnd 02:af86 sBox4MonOT 02:b062 sBox4MonNicknames 02:b13e sBox4End @@ -31164,8 +31161,8 @@ 02:b173 sBox5Mon1Unused1 02:b174 sBox5Mon1Unused2 02:b175 sBox5Mon1Level -02:b176 sBox5Mon1End 02:b176 sBox5Mon2 +02:b176 sBox5Mon1BoxEnd 02:b3d6 sBox5MonOT 02:b4b2 sBox5MonNicknames 02:b58e sBox5MonNicknamesEnd @@ -31193,8 +31190,8 @@ 02:b5c3 sBox6Mon1Unused1 02:b5c4 sBox6Mon1Unused2 02:b5c5 sBox6Mon1Level -02:b5c6 sBox6Mon1End 02:b5c6 sBox6Mon2 +02:b5c6 sBox6Mon1BoxEnd 02:b826 sBox6MonOT 02:b902 sBox6MonNicknames 02:b9de sBox6End @@ -31222,8 +31219,8 @@ 02:ba13 sBox7Mon1Unused1 02:ba14 sBox7Mon1Unused2 02:ba15 sBox7Mon1Level -02:ba16 sBox7Mon1End 02:ba16 sBox7Mon2 +02:ba16 sBox7Mon1BoxEnd 02:bc76 sBox7MonOT 02:bd52 sBox7MonNicknames 02:be2e sBox7End @@ -31251,8 +31248,8 @@ 03:a033 sBox8Mon1Unused1 03:a034 sBox8Mon1Unused2 03:a035 sBox8Mon1Level +03:a036 sBox8Mon1BoxEnd 03:a036 sBox8Mon2 -03:a036 sBox8Mon1End 03:a296 sBox8MonOT 03:a372 sBox8MonNicknames 03:a44e sBox8MonNicknamesEnd @@ -31280,8 +31277,8 @@ 03:a483 sBox9Mon1Unused1 03:a484 sBox9Mon1Unused2 03:a485 sBox9Mon1Level -03:a486 sBox9Mon1End 03:a486 sBox9Mon2 +03:a486 sBox9Mon1BoxEnd 03:a6e6 sBox9MonOT 03:a7c2 sBox9MonNicknames 03:a89e sBox9MonNicknamesEnd @@ -31309,7 +31306,7 @@ 03:a8d3 sBox10Mon1Unused1 03:a8d4 sBox10Mon1Unused2 03:a8d5 sBox10Mon1Level -03:a8d6 sBox10Mon1End +03:a8d6 sBox10Mon1BoxEnd 03:a8d6 sBox10Mon2 03:ab36 sBox10MonOT 03:ac12 sBox10MonNicknames @@ -31338,7 +31335,7 @@ 03:ad23 sBox11Mon1Unused1 03:ad24 sBox11Mon1Unused2 03:ad25 sBox11Mon1Level -03:ad26 sBox11Mon1End +03:ad26 sBox11Mon1BoxEnd 03:ad26 sBox11Mon2 03:af86 sBox11MonOT 03:b062 sBox11MonNicknames @@ -31368,7 +31365,7 @@ 03:b174 sBox12Mon1Unused2 03:b175 sBox12Mon1Level 03:b176 sBox12Mon2 -03:b176 sBox12Mon1End +03:b176 sBox12Mon1BoxEnd 03:b3d6 sBox12MonOT 03:b4b2 sBox12MonNicknames 03:b58e sBox12End @@ -31396,7 +31393,7 @@ 03:b5c3 sBox13Mon1Unused1 03:b5c4 sBox13Mon1Unused2 03:b5c5 sBox13Mon1Level -03:b5c6 sBox13Mon1End +03:b5c6 sBox13Mon1BoxEnd 03:b5c6 sBox13Mon2 03:b826 sBox13MonOT 03:b902 sBox13MonNicknames @@ -31425,7 +31422,7 @@ 03:ba13 sBox14Mon1Unused1 03:ba14 sBox14Mon1Unused2 03:ba15 sBox14Mon1Level -03:ba16 sBox14Mon1End +03:ba16 sBox14Mon1BoxEnd 03:ba16 sBox14Mon2 03:bc76 sBox14MonOT 03:bd52 sBox14MonNicknames @@ -32494,7 +32491,7 @@ 00:c732 wHallOfFamePokemonListMon4ID 00:c732 wLinkPlayerPartyMon1Level 00:c733 wLinkPlayerPartyMon1Status -00:c733 wLinkPlayerPartyMon1End +00:c733 wLinkPlayerPartyMon1BoxEnd 00:c734 wTimeCapsulePartyMon1Level 00:c734 wLinkPlayerPartyMon1Unused 00:c734 wHallOfFamePokemonListMon4DVs @@ -32522,10 +32519,10 @@ 00:c741 wHallOfFamePokemonListMon5 00:c742 wHallOfFamePokemonListMon5ID 00:c742 wTimeCapsulePartyMon2BoxLevel -00:c743 wLinkPlayerPartyMon1StatsEnd 00:c743 wTimeCapsulePartyMon2Status 00:c743 wLinkPlayerPartyMon2Species 00:c743 wLinkPlayerPartyMon2 +00:c743 wLinkPlayerPartyMon1StructEnd 00:c744 wTimeCapsulePartyMon2Type 00:c744 wTimeCapsulePartyMon2Type1 00:c744 wHallOfFamePokemonListMon5DVs @@ -32574,7 +32571,7 @@ 00:c761 wHallOfFamePokemonListMon6End 00:c762 wLinkPlayerPartyMon2Level 00:c763 wTimeCapsulePartyMon2Attack -00:c763 wLinkPlayerPartyMon2End +00:c763 wLinkPlayerPartyMon2BoxEnd 00:c763 wLinkPlayerPartyMon2Status 00:c764 wLinkPlayerPartyMon2Unused 00:c765 wLinkPlayerPartyMon2HP @@ -32599,7 +32596,7 @@ 00:c772 wTimeCapsulePartyMon3CatchRate 00:c773 wTimeCapsulePartyMon3Moves 00:c773 wLinkPlayerPartyMon3Species -00:c773 wLinkPlayerPartyMon2StatsEnd +00:c773 wLinkPlayerPartyMon2StructEnd 00:c773 wLinkPlayerPartyMon3 00:c774 wLinkPlayerPartyMon3Item 00:c775 wLinkPlayerPartyMon3Moves @@ -32634,8 +32631,8 @@ 00:c791 wTimeCapsulePartyMon3Defense 00:c791 wLinkPlayerPartyMon3Unused2 00:c792 wLinkPlayerPartyMon3Level +00:c793 wLinkPlayerPartyMon3BoxEnd 00:c793 wTimeCapsulePartyMon3Speed -00:c793 wLinkPlayerPartyMon3End 00:c793 wLinkPlayerPartyMon3Status 00:c794 wLinkPlayerPartyMon3Unused 00:c795 wTimeCapsulePartyMon3Special @@ -32659,7 +32656,7 @@ 00:c7a0 wLYOverrides2 00:c7a1 wLinkPlayerPartyMon3SpclDef 00:c7a3 wLinkPlayerPartyMon4Species -00:c7a3 wLinkPlayerPartyMon3StatsEnd +00:c7a3 wLinkPlayerPartyMon3StructEnd 00:c7a3 wLinkPlayerPartyMon4 00:c7a3 wTimeCapsulePartyMon4OTID 00:c7a4 wLinkPlayerPartyMon4Item @@ -32694,8 +32691,8 @@ 00:c7c1 wTimeCapsulePartyMon4Special 00:c7c1 wLinkPlayerPartyMon4Unused2 00:c7c2 wLinkPlayerPartyMon4Level +00:c7c3 wLinkPlayerPartyMon4BoxEnd 00:c7c3 wLinkPlayerPartyMon4Status -00:c7c3 wLinkPlayerPartyMon4End 00:c7c3 wTimeCapsulePartyMon5 00:c7c3 wTimeCapsulePartyMon5Species 00:c7c4 wLinkPlayerPartyMon4Unused @@ -32718,7 +32715,7 @@ 00:c7d1 wLinkPlayerPartyMon4SpclDef 00:c7d1 wTimeCapsulePartyMon5Exp 00:c7d3 wLinkPlayerPartyMon5Species -00:c7d3 wLinkPlayerPartyMon4StatsEnd +00:c7d3 wLinkPlayerPartyMon4StructEnd 00:c7d3 wLinkPlayerPartyMon5 00:c7d4 wTimeCapsulePartyMon5HPExp 00:c7d4 wLinkPlayerPartyMon5Item @@ -32755,9 +32752,9 @@ 00:c7f1 wLinkPlayerPartyMon5Unused2 00:c7f2 wTimeCapsulePartyMon6BoxLevel 00:c7f2 wLinkPlayerPartyMon5Level +00:c7f3 wLinkPlayerPartyMon5BoxEnd 00:c7f3 wLinkPlayerPartyMon5Status 00:c7f3 wTimeCapsulePartyMon6Status -00:c7f3 wLinkPlayerPartyMon5End 00:c7f4 wTimeCapsulePartyMon6Type 00:c7f4 wLinkPlayerPartyMon5Unused 00:c7f4 wTimeCapsulePartyMon6Type1 @@ -32780,7 +32777,7 @@ 00:c801 wMysteryGiftPartnerID 00:c801 wLinkPlayerPartyMon5SpclDef 00:c802 wTimeCapsulePartyMon6AttackExp -00:c803 wLinkPlayerPartyMon5StatsEnd +00:c803 wLinkPlayerPartyMon5StructEnd 00:c803 wLinkPlayerPartyMon6 00:c803 wMysteryGiftPartnerName 00:c803 wLinkPlayerPartyMon6Species @@ -32822,7 +32819,7 @@ 00:c821 wLinkPlayerPartyMon6Unused2 00:c822 wLinkPlayerPartyMon6Level 00:c823 wLinkPlayerPartyMon6Status -00:c823 wLinkPlayerPartyMon6End +00:c823 wLinkPlayerPartyMon6BoxEnd 00:c824 wLinkPlayerPartyMon6Unused 00:c825 wLinkPlayerPartyMon6HP 00:c827 wLinkPlayerPartyMon6MaxHP @@ -32833,8 +32830,8 @@ 00:c82f wLinkPlayerPartyMon6SpclAtk 00:c830 wLYOverrides2End 00:c831 wLinkPlayerPartyMon6SpclDef -00:c833 wLinkPlayerPartyMon6StatsEnd 00:c833 wLinkPlayerPartyMonOTNames +00:c833 wLinkPlayerPartyMon6StructEnd 00:c850 wMysteryGiftPlayerData 00:c851 wMysteryGiftPlayerID 00:c853 wMysteryGiftPlayerName @@ -33244,7 +33241,6 @@ 00:cb26 wBattleMonSpclAtk 00:cb28 wBattleMonSpclDef 00:cb2a wBattleMonType -00:cb2a wBattleMonStatsEnd 00:cb2a wBattleMonType1 00:cb2b wBattleMonType2 00:cb2c wBattleMonStructEnd @@ -33658,7 +33654,7 @@ 00:cf21 wBufferMonUnused2 00:cf22 wBufferMonLevel 00:cf23 wBufferMonStatus -00:cf23 wBufferMonEnd +00:cf23 wBufferMonBoxEnd 00:cf24 wBufferMonUnused 00:cf25 wBufferMonHP 00:cf27 wBufferMonMaxHP @@ -33731,7 +33727,7 @@ 00:cf31 wBufferMonSpclDef 00:cf32 wWinTextPointer 00:cf32 wWalkingTile -00:cf33 wBufferMonStatsEnd +00:cf33 wBufferMonStructEnd 00:cf34 wLossTextPointer 00:cf36 wScriptAfterPointer 00:cf38 wRunningTrainerBattleScript @@ -33827,7 +33823,7 @@ 01:d029 wTempMonUnused2 01:d02a wTempMonLevel 01:d02b wTempMonStatus -01:d02b wTempMonEnd +01:d02b wTempMonBoxEnd 01:d02c wTempMonUnused 01:d02d wTempMonHP 01:d02f wTempMonMaxHP @@ -33837,7 +33833,7 @@ 01:d035 wTempMonSpeed 01:d037 wTempMonSpclAtk 01:d039 wTempMonSpclDef -01:d03b wTempMonStatsEnd +01:d03b wTempMonStructEnd 01:d03b wSpriteFlags 01:d03c wHandlePlayerStep 01:d03e wPartyMenuActionText @@ -33972,7 +33968,6 @@ 01:d107 wEnemyMonSpeed 01:d109 wEnemyMonSpclAtk 01:d10b wEnemyMonSpclDef -01:d10d wEnemyMonStatsEnd 01:d10d wEnemyMonType 01:d10d wEnemyMonType1 01:d10e wEnemyMonType2 @@ -34978,7 +34973,7 @@ 01:da48 wPartyMon1Unused2 01:da49 wPartyMon1Level 01:da4a wPartyMon1Status -01:da4a wPartyMon1End +01:da4a wPartyMon1BoxEnd 01:da4b wPartyMon1Unused 01:da4c wPartyMon1HP 01:da4e wPartyMon1MaxHP @@ -34988,8 +34983,8 @@ 01:da54 wPartyMon1Speed 01:da56 wPartyMon1SpclAtk 01:da58 wPartyMon1SpclDef +01:da5a wPartyMon1StructEnd 01:da5a wPartyMon2Species -01:da5a wPartyMon1StatsEnd 01:da5a wPartyMon2 01:da5b wPartyMon2Item 01:da5c wPartyMon2Moves @@ -35009,7 +35004,7 @@ 01:da78 wPartyMon2Unused2 01:da79 wPartyMon2Level 01:da7a wPartyMon2Status -01:da7a wPartyMon2End +01:da7a wPartyMon2BoxEnd 01:da7b wPartyMon2Unused 01:da7c wPartyMon2HP 01:da7e wPartyMon2MaxHP @@ -35019,8 +35014,8 @@ 01:da84 wPartyMon2Speed 01:da86 wPartyMon2SpclAtk 01:da88 wPartyMon2SpclDef -01:da8a wPartyMon2StatsEnd 01:da8a wPartyMon3Species +01:da8a wPartyMon2StructEnd 01:da8a wPartyMon3 01:da8b wPartyMon3Item 01:da8c wPartyMon3Moves @@ -35040,7 +35035,7 @@ 01:daa8 wPartyMon3Unused2 01:daa9 wPartyMon3Level 01:daaa wPartyMon3Status -01:daaa wPartyMon3End +01:daaa wPartyMon3BoxEnd 01:daab wPartyMon3Unused 01:daac wPartyMon3HP 01:daae wPartyMon3MaxHP @@ -35051,7 +35046,7 @@ 01:dab6 wPartyMon3SpclAtk 01:dab8 wPartyMon3SpclDef 01:daba wPartyMon4Species -01:daba wPartyMon3StatsEnd +01:daba wPartyMon3StructEnd 01:daba wPartyMon4 01:dabb wPartyMon4Item 01:dabc wPartyMon4Moves @@ -35070,8 +35065,8 @@ 01:dad7 wPartyMon4Unused1 01:dad8 wPartyMon4Unused2 01:dad9 wPartyMon4Level -01:dada wPartyMon4End 01:dada wPartyMon4Status +01:dada wPartyMon4BoxEnd 01:dadb wPartyMon4Unused 01:dadc wPartyMon4HP 01:dade wPartyMon4MaxHP @@ -35081,7 +35076,7 @@ 01:dae4 wPartyMon4Speed 01:dae6 wPartyMon4SpclAtk 01:dae8 wPartyMon4SpclDef -01:daea wPartyMon4StatsEnd +01:daea wPartyMon4StructEnd 01:daea wPartyMon5Species 01:daea wPartyMon5 01:daeb wPartyMon5Item @@ -35101,8 +35096,8 @@ 01:db07 wPartyMon5Unused1 01:db08 wPartyMon5Unused2 01:db09 wPartyMon5Level +01:db0a wPartyMon5BoxEnd 01:db0a wPartyMon5Status -01:db0a wPartyMon5End 01:db0b wPartyMon5Unused 01:db0c wPartyMon5HP 01:db0e wPartyMon5MaxHP @@ -35112,7 +35107,7 @@ 01:db14 wPartyMon5Speed 01:db16 wPartyMon5SpclAtk 01:db18 wPartyMon5SpclDef -01:db1a wPartyMon5StatsEnd +01:db1a wPartyMon5StructEnd 01:db1a wPartyMon6Species 01:db1a wPartyMon6 01:db1b wPartyMon6Item @@ -35132,8 +35127,8 @@ 01:db37 wPartyMon6Unused1 01:db38 wPartyMon6Unused2 01:db39 wPartyMon6Level -01:db3a wPartyMon6End 01:db3a wPartyMon6Status +01:db3a wPartyMon6BoxEnd 01:db3b wPartyMon6Unused 01:db3c wPartyMon6HP 01:db3e wPartyMon6MaxHP @@ -35143,8 +35138,8 @@ 01:db44 wPartyMon6Speed 01:db46 wPartyMon6SpclAtk 01:db48 wPartyMon6SpclDef +01:db4a wPartyMon6StructEnd 01:db4a wPartyMonOT -01:db4a wPartyMon6StatsEnd 01:db8c wPartyMonNicknames 01:dbce wPartyMonNicknamesEnd 01:dbe4 wPokedexCaught @@ -35177,8 +35172,8 @@ 01:dc74 wBreedMon1Unused1 01:dc75 wBreedMon1Unused2 01:dc76 wBreedMon1Level -01:dc77 wBreedMon1End 01:dc77 wDayCareLady +01:dc77 wBreedMon1BoxEnd 01:dc78 wStepsToEgg 01:dc79 wBreedMotherOrNonDitto 01:dc7a wBreedMon2 @@ -35204,7 +35199,7 @@ 01:dcae wBreedMon2Unused2 01:dcaf wBreedMon2Level 01:dcb0 wEggNick -01:dcb0 wBreedMon2End +01:dcb0 wBreedMon2BoxEnd 01:dcbb wEggOT 01:dcc6 wEggMonSpecies 01:dcc6 wEggMon @@ -35225,8 +35220,8 @@ 01:dce3 wEggMonUnused1 01:dce4 wEggMonUnused2 01:dce5 wEggMonLevel +01:dce6 wEggMonBoxEnd 01:dce6 wBugContestSecondPartySpecies -01:dce6 wEggMonEnd 01:dce7 wContestMon 01:dce7 wContestMonSpecies 01:dce8 wContestMonItem @@ -35247,7 +35242,7 @@ 01:dd05 wContestMonUnused2 01:dd06 wContestMonLevel 01:dd07 wContestMonStatus -01:dd07 wContestMonEnd +01:dd07 wContestMonBoxEnd 01:dd08 wContestMonUnused 01:dd09 wContestMonHP 01:dd0b wContestMonMaxHP @@ -35258,7 +35253,7 @@ 01:dd13 wContestMonSpclAtk 01:dd15 wContestMonSpclDef 01:dd17 wSwarmMapGroup -01:dd17 wContestMonStatsEnd +01:dd17 wContestMonStructEnd 01:dd18 wSwarmMapNumber 01:dd19 wFishingSwarmFlag 01:dd1a wRoamMon1Species @@ -35326,7 +35321,7 @@ 01:dd7b wDudeNumBalls 01:dd7c wOTPartyMon1Level 01:dd7c wDudeBalls -01:dd7d wOTPartyMon1End +01:dd7d wOTPartyMon1BoxEnd 01:dd7d wOTPartyMon1Status 01:dd7e wOTPartyMon1Unused 01:dd7f wOTPartyMon1HP @@ -35339,7 +35334,7 @@ 01:dd87 wOTPartyMon1Speed 01:dd89 wOTPartyMon1SpclAtk 01:dd8b wOTPartyMon1SpclDef -01:dd8d wOTPartyMon1StatsEnd +01:dd8d wOTPartyMon1StructEnd 01:dd8d wOTPartyMon2Species 01:dd8d wOTPartyMon2 01:dd8e wOTPartyMon2Item @@ -35359,8 +35354,8 @@ 01:ddaa wOTPartyMon2Unused1 01:ddab wOTPartyMon2Unused2 01:ddac wOTPartyMon2Level -01:ddad wOTPartyMon2End 01:ddad wOTPartyMon2Status +01:ddad wOTPartyMon2BoxEnd 01:ddae wOTPartyMon2Unused 01:ddaf wOTPartyMon2HP 01:ddb1 wOTPartyMon2MaxHP @@ -35370,7 +35365,7 @@ 01:ddb7 wOTPartyMon2Speed 01:ddb9 wOTPartyMon2SpclAtk 01:ddbb wOTPartyMon2SpclDef -01:ddbd wOTPartyMon2StatsEnd +01:ddbd wOTPartyMon2StructEnd 01:ddbd wOTPartyMon3Species 01:ddbd wOTPartyMon3 01:ddbe wOTPartyMon3Item @@ -35390,7 +35385,7 @@ 01:ddda wOTPartyMon3Unused1 01:dddb wOTPartyMon3Unused2 01:dddc wOTPartyMon3Level -01:dddd wOTPartyMon3End +01:dddd wOTPartyMon3BoxEnd 01:dddd wOTPartyMon3Status 01:ddde wOTPartyMon3Unused 01:dddf wOTPartyMon3HP @@ -35401,7 +35396,7 @@ 01:dde7 wOTPartyMon3Speed 01:dde9 wOTPartyMon3SpclAtk 01:ddeb wOTPartyMon3SpclDef -01:dded wOTPartyMon3StatsEnd +01:dded wOTPartyMon3StructEnd 01:dded wOTPartyMon4Species 01:dded wOTPartyMon4 01:ddee wOTPartyMon4Item @@ -35421,7 +35416,7 @@ 01:de0a wOTPartyMon4Unused1 01:de0b wOTPartyMon4Unused2 01:de0c wOTPartyMon4Level -01:de0d wOTPartyMon4End +01:de0d wOTPartyMon4BoxEnd 01:de0d wOTPartyMon4Status 01:de0e wOTPartyMon4Unused 01:de0f wOTPartyMon4HP @@ -35432,7 +35427,7 @@ 01:de17 wOTPartyMon4Speed 01:de19 wOTPartyMon4SpclAtk 01:de1b wOTPartyMon4SpclDef -01:de1d wOTPartyMon4StatsEnd +01:de1d wOTPartyMon4StructEnd 01:de1d wOTPartyMon5Species 01:de1d wOTPartyMon5 01:de1e wOTPartyMon5Item @@ -35452,7 +35447,7 @@ 01:de3a wOTPartyMon5Unused1 01:de3b wOTPartyMon5Unused2 01:de3c wOTPartyMon5Level -01:de3d wOTPartyMon5End +01:de3d wOTPartyMon5BoxEnd 01:de3d wOTPartyMon5Status 01:de3e wOTPartyMon5Unused 01:de3f wOTPartyMon5HP @@ -35463,7 +35458,7 @@ 01:de47 wOTPartyMon5Speed 01:de49 wOTPartyMon5SpclAtk 01:de4b wOTPartyMon5SpclDef -01:de4d wOTPartyMon5StatsEnd +01:de4d wOTPartyMon5StructEnd 01:de4d wOTPartyMon6Species 01:de4d wOTPartyMon6 01:de4e wOTPartyMon6Item @@ -35483,7 +35478,7 @@ 01:de6a wOTPartyMon6Unused1 01:de6b wOTPartyMon6Unused2 01:de6c wOTPartyMon6Level -01:de6d wOTPartyMon6End +01:de6d wOTPartyMon6BoxEnd 01:de6d wOTPartyMon6Status 01:de6e wOTPartyMon6Unused 01:de6f wOTPartyMon6HP @@ -35495,8 +35490,8 @@ 01:de79 wOTPartyMon6SpclAtk 01:de7b wOTPartyMon6SpclDef 01:de7d wOTPartyMonsEnd -01:de7d wOTPartyMon6StatsEnd 01:de7d wOTPartyMonOT +01:de7d wOTPartyMon6StructEnd 01:debf wOTPartyMonNicknames 01:df01 wGameDataEnd 01:df01 wPokemonDataEnd